Merge pull request #105 from apiaryio/kylef/schema-empty-items

Handle empty items in JSON Schema arrays

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.12.0-beta.2
+
+## Bug Fixes
+
+- Data Structure generation from JSON Schema handles array items which
+  contain empty values.
+
 # 0.12.0-beta.1
 
 ## Enhancements

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fury-adapter-swagger",
-  "version": "0.12.0-beta.1",
+  "version": "0.12.0-beta.2",
   "description": "Swagger 2.0 parser for Fury.js",
   "main": "./lib/adapter.js",
   "tonicExampleFilename": "tonic-example.js",

src/schema.js

@@ -87,10 +87,16 @@ export default class DataStructureGenerator {
     if (schema.items) {
       if (_.isArray(schema.items)) {
         schema.items.forEach((item) => {
-          element.push(this.generateElement(item));
+          const itemElement = this.generateElement(item);
+          if (itemElement) {
+            element.push(itemElement);
+          }
         });
       } else {
-        element.push(this.generateElement(schema.items));
+        const itemElement = this.generateElement(schema.items);
+        if (itemElement) {
+          element.push(itemElement);
+        }
       }
     }
 

test/schema.js

@@ -509,6 +509,19 @@ describe('JSON Schema to Data Structure', () => {
       expect(dataStructure.content.description.toValue())
         .to.equal('- Array contents must be unique');
     });
+
+    it('produces empty array element with empty items', () => {
+      const schema = {
+        type: 'array',
+        items: {},
+      };
+
+      const dataStructure = schemaToDataStructure(schema);
+
+      expect(dataStructure.element).to.equal('dataStructure');
+      expect(dataStructure.content).to.be.instanceof(ArrayElement);
+      expect(dataStructure.content.content.length).to.be.equal(0);
+    });
   });
 
   it('exposes the schema title', () => {