Implement constraints, add doc. RE: temando#13

docs/schema.md

@@ -0,0 +1,54 @@
+# Schema support
+
+The `Schema` object in [Open API v3 spec][oaschema] describes several properties
+that are shared from JSON Schema, deviations from JSON Schema, or in addition
+to JSON Schema. The document descibes this project's support for these
+properties.
+
+## Properties
+
+The following properties are supported, and implemented according to the
+[JSON Schema Validation spec][jsschema]:
+
+- [x] multipleOf
+- [x] maximum
+- [x] exclusiveMaximum
+- [x] minimum
+- [x] exclusiveMinimum
+- [x] maxLength
+- [x] minLength
+- [x] pattern
+- [x] maxItems
+- [x] minItems
+- [x] uniqueItems
+- [x] maxProperties
+- [x] minProperties
+- [x] format
+- [x] required
+- [x] enum
+
+## Adjusted JSON Schema Properties
+
+The OpenAPI specification also supports several additional properties from JSON
+Schema, with some adjustments. This project attempts to honor these adjustments,
+with any exceptions outlined below:
+
+- [x] type - Value may be an array, multiple types are supported.
+- [x] allOf
+- [ ] oneOf
+- [ ] anyOf
+- [ ] not
+- [x] items
+- [x] properties
+- [ ] additionalProperties
+- [x] description
+- [x] format
+- [x] default
+
+## Fixed Fields
+
+At this time, the project supports no [fixed fields][ff].
+
+[ff]: https://github.com/OAI/OpenAPI-Specification/blob/OpenAPI.next/versions/3.0.md#fixed-fields-20
+[jsschema]: http://json-schema.org/latest/json-schema-validation.html#rfc.section.6
+[oaschema]: https://github.com/OAI/OpenAPI-Specification/blob/OpenAPI.next/versions/3.0.md#schemaObject

src/components/ArrayProperty/ArrayProperty.js

@@ -0,0 +1,53 @@
+import React, { PureComponent } from 'react';
+import PropTypes from 'prop-types';
+
+export default class ArrayProperty extends PureComponent {
+  render() {
+    const { constraints } = this.props;
+
+    if (!constraints) {
+      return null;
+    }
+
+    const { minItems, maxItems, uniqueItems } = constraints;
+    const validations = [];
+
+    if (uniqueItems) {
+      validations.push('items must be unique');
+    }
+
+    if (maxItems !== undefined && minItems !== undefined) {
+      // Be succint if the minItems is the same maxItems
+      // ie. value can only be of `x` length.
+      if (maxItems === minItems) {
+        validations.push(`${minItems} items`);
+      } else {
+        validations.push(`${minItems}-${maxItems} items`);
+      }
+    } else if (minItems !== undefined) {
+      validations.push(`at least ${minItems} items`);
+    } else if (maxItems !== undefined) {
+      validations.push(`at most ${maxItems} items`);
+    }
+
+    if (!validations.length) {
+      return null;
+    }
+
+    return (
+      <span>
+        {validations.map(constraint =>
+          <span key={constraint} className="array-constraints">{constraint}</span>
+        )}
+      </span>
+    );
+  }
+}
+
+ArrayProperty.propTypes = {
+  constraints: PropTypes.shape({
+    maxItems: PropTypes.number,
+    minItems: PropTypes.number,
+    uniqueItems: PropTypes.bool
+  })
+};

src/components/BodySchema/BodySchema.js

@@ -38,19 +38,20 @@ export default class BodySchema extends Component {
             if (properties.length === iterator) {
               isLast = true;
             }
-            if (property.type === 'array' && expandedProp.indexOf(property.name) !== -1 && property.properties !== undefined) {
+
+            if (property.type.includes('array') && expandedProp.includes(property.name) && property.properties !== undefined) {
               return createFragment({
                 property: this.renderPropertyRow(property, isLast, true),
                 subset: this.renderSubsetProperties(property, true)
               });
-            } else if (property.type === 'array' && property.properties !== undefined) {
+            } else if (property.type.includes('array') && property.properties !== undefined) {
               return this.renderPropertyRow(property, isLast, false);
-            } else if (property.type === 'object' && expandedProp.indexOf(property.name) !== -1 && property.properties !== undefined) {
+            } else if (property.type.includes('object') && expandedProp.includes(property.name) && property.properties !== undefined) {
               return createFragment({
                 property: this.renderPropertyRow(property, isLast, true),
                 subset: this.renderSubsetProperties(property)
               });
-            } else if (property.type === 'object' && property.properties !== undefined) {
+            } else if (property.type.includes('object') && property.properties !== undefined) {
               return this.renderPropertyRow(property, isLast, false);
             } else {
               return this.renderPropertyRow(property, isLast);
@@ -71,6 +72,7 @@ export default class BodySchema extends Component {
         description={property.description}
         enumValues={property.enum}
         defaultValue={property.defaultValue}
+        constraints={property.constraints}
         onClick={this.onClick.bind(this, property.name)}
         isRequired={property.required}
         isOpen={isOpen}
@@ -110,7 +112,7 @@ export default class BodySchema extends Component {
 
   onClick(propertyName) {
     const { expandedProp } = this.state;
-    if (expandedProp.indexOf(propertyName) !== -1) {
+    if (expandedProp.includes(propertyName)) {
       const newExpanded = expandedProp.filter((prop) => prop !== propertyName);
       this.setState({ expandedProp: newExpanded });
     } else {

src/components/Method/Method.js

@@ -75,14 +75,7 @@ export default class Method extends Component {
     return (
       <div className="method-responses">
         <h4>Responses</h4>
-        {responses.map((response) => {
-          return (
-            <Response
-              key={response.code}
-              response={response}
-            />
-          );
-        })}
+        {responses.map((r) => <Response key={r.code} response={r} />)}
       </div>
     );
   }

src/components/NumericProperty/NumericProperty.js

@@ -0,0 +1,58 @@
+import React, { PureComponent } from 'react';
+import PropTypes from 'prop-types';
+
+export default class NumericProperty extends PureComponent {
+  render() {
+    const { constraints } = this.props;
+
+    if (!constraints) {
+      return null;
+    }
+
+    const { exclusiveMinimum, exclusiveMaximum, maximum, minimum, multipleOf } = constraints;
+    const validations = [];
+
+    if (multipleOf) {
+      validations.push(`multiple of ${multipleOf}`);
+    }
+
+    // We're following JSON-Schema Draft 6, which states that exclusive* are
+    // integers, not boolean values. Also using `undefined` to prevent edge
+    // cases where the value is 0 or 1.
+    if (maximum !== undefined && minimum !== undefined) {
+      validations.push(`${minimum}…${maximum}`);
+    } else if (exclusiveMaximum !== undefined && exclusiveMinimum !== undefined) {
+      validations.push(`${exclusiveMinimum}…${exclusiveMaximum}`);
+    } else if (minimum !== undefined) {
+      validations.push(`≥ ${minimum}`);
+    } else if (maximum !== undefined) {
+      validations.push(`≤ ${maximum}`);
+    } else if (exclusiveMinimum !== undefined) {
+      validations.push(`> ${exclusiveMinimum}`);
+    } else if (exclusiveMaximum !== undefined) {
+      validations.push(`< ${exclusiveMaximum}`);
+    }
+
+    if (!validations.length) {
+      return null;
+    }
+
+    return (
+      <span>
+        {validations.map(constraint =>
+          <span key={constraint} className="numeric-constraints">{constraint}</span>
+        )}
+      </span>
+    );
+  }
+}
+
+NumericProperty.propTypes = {
+  constraints: PropTypes.shape({
+    exclusiveMinimum: PropTypes.number,
+    exclusiveMaximum: PropTypes.number,
+    maximum: PropTypes.number,
+    minimum: PropTypes.number,
+    multipleOf: PropTypes.number
+  })
+};

src/components/ObjectProperty/ObjectProperty.js

@@ -0,0 +1,48 @@
+import React, { PureComponent } from 'react';
+import PropTypes from 'prop-types';
+
+export default class ObjectProperty extends PureComponent {
+  render() {
+    const { constraints } = this.props;
+
+    if (!constraints) {
+      return null;
+    }
+
+    const { minProperties, maxProperties } = constraints;
+    const validations = [];
+
+    if (maxProperties !== undefined && minProperties !== undefined) {
+      // Be succint if the minProperties is the same maxProperties
+      // ie. value can only be of `x` length.
+      if (maxProperties === minProperties) {
+        validations.push(`${minProperties} properties`);
+      } else {
+        validations.push(`${minProperties}-${maxProperties} properties`);
+      }
+    } else if (minProperties !== undefined) {
+      validations.push(`at least ${minProperties} properties`);
+    } else if (maxProperties !== undefined) {
+      validations.push(`at most ${maxProperties} properties`);
+    }
+
+    if (!validations.length) {
+      return null;
+    }
+
+    return (
+      <span>
+        {validations.map(constraint =>
+          <span key={constraint} className="object-constraints">{constraint}</span>
+        )}
+      </span>
+    );
+  }
+}
+
+ObjectProperty.propTypes = {
+  constraints: PropTypes.shape({
+    maxProperties: PropTypes.number,
+    minProperties: PropTypes.number
+  })
+};

src/components/Property/Property.js

@@ -2,14 +2,20 @@ import React, { Component } from 'react';
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
 
+import ArrayProperty from '../ArrayProperty/ArrayProperty';
 import Description from '../Description/Description';
 import Indicator from '../Indicator/Indicator';
+import NumericProperty from '../NumericProperty/NumericProperty';
+import ObjectProperty from '../ObjectProperty/ObjectProperty';
+import StringProperty from '../StringProperty/StringProperty';
 
 import './Property.scss';
 
 export default class Property extends Component {
   render() {
-    const { name, type, description, isRequired, enumValues, defaultValue, onClick, isOpen, isLast } = this.props;
+    const {
+      name, type, description, constraints, isRequired, enumValues, defaultValue, onClick, isOpen, isLast
+    } = this.props;
 
     let subtype;
     if (type.includes('array')) {
@@ -20,6 +26,7 @@ export default class Property extends Component {
     if (isOpen !== undefined) {
       isClickable = true;
     }
+
     let status;
     if (isOpen) {
       status = 'open';
@@ -41,10 +48,18 @@ export default class Property extends Component {
           }
         </td>
         <td className="property-info">
-          <span>{type.join(', ')}</span>{subtype && <span> of {subtype}</span>}
+          <span className="property-type">
+            {!subtype ? type.join(', ') : <span className="property-subtype">{subtype}[]</span>}
+            {!subtype && constraints && constraints.format &&
+              <span className="property-format">&lt;{constraints.format}&gt;</span>}
+          </span>
           {isRequired && <span className="property-required">Required</span>}
+          {['number', 'integer'].some(t => type.includes(t)) && <NumericProperty constraints={constraints} />}
+          {type.includes('string') && <StringProperty constraints={constraints} />}
+          {type.includes('array') && <ArrayProperty constraints={constraints} />}
+          {type.includes('object') && <ObjectProperty constraints={constraints} />}
           {enumValues && this.renderEnumValues(enumValues)}
-          {defaultValue && this.renderDefaultValue(defaultValue)}
+          {defaultValue !== undefined && this.renderDefaultValue(defaultValue)}
           {description && <Description description={description}/>}
         </td>
       </tr>
@@ -97,10 +112,19 @@ Property.propTypes = {
   description: PropTypes.string,
   constraints: PropTypes.shape({
     format: PropTypes.string,
-    minLength: PropTypes.number,
-    exclusiveMinimum: PropTypes.bool,
+    exclusiveMinimum: PropTypes.number,
+    exclusiveMaximum: PropTypes.number,
+    maximum: PropTypes.number,
+    maxItems: PropTypes.number,
     maxLength: PropTypes.number,
-    exclusiveMaximum: PropTypes.bool
+    maxProperties: PropTypes.number,
+    minimum: PropTypes.number,
+    minItems: PropTypes.number,
+    minLength: PropTypes.number,
+    minProperties: PropTypes.number,
+    multipleOf: PropTypes.number,
+    pattern: PropTypes.string,
+    uniqueItems: PropTypes.bool
   }),
   enumValues: PropTypes.array,
   defaultValue: PropTypes.any,