Fixed array not defaulting

Author: Anthropic

bundle.js

@@ -214,7 +214,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    // Since have to ternary state we need a default
 	    if (obj.type === 'checkbox' && obj.schema['default'] === undefined) {
 	      obj.schema['default'] = false;
-	    }
+	    };
 
 	    // Special case: template type with tempplateUrl that's needs to be loaded before rendering
 	    // TODO: this is not a clean solution. Maybe something cleaner can be made when $ref support
@@ -591,9 +591,13 @@ return /******/ (function(modules) { // webpackBootstrap
 	/* Utils */
 	var stripNullType = function stripNullType(type) {
 	  if (Array.isArray(type) && type.length == 2) {
-	    if (type[0] === 'null') return type[1];
-	    if (type[1] === 'null') return type[0];
-	  }
+	    if (type[0] === 'null') {
+	      return type[1];
+	    };
+	    if (type[1] === 'null') {
+	      return type[0];
+	    };
+	  };
 	  return type;
 	};
 
@@ -685,7 +689,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  f.ngModelOptions = f.ngModelOptions || {};
 
 	  return f;
-	}
+	};
 
 	/*** Schema types to form type mappings, with defaults ***/
 	function text(name, schema, options) {
@@ -833,9 +837,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	    object: [fieldset],
 	    number: [number],
 	    integer: [integer],
-	    boolean: [checkbox], defaultForm: defaultForm
+	    boolean: [checkbox],
+	    array: [array],
+	    defaultForm: defaultForm
 	  };
-	}
+	};
 
 	/**
 	 * Create form defaults from schema

lib/merge.js

@@ -1,7 +1,6 @@
 import {stringify, parse} from './sfPath';
 import canonicalTitleMap from './canonicalTitleMap';
 
-
 //export function merge(schema, form, schemaDefaultTypes, ignore, options, readonly, asyncTemplates) {
 export function merge(lookup, form, options, readonly, asyncTemplates) {
   form  = form || [];
@@ -13,7 +12,7 @@ export function merge(lookup, form, options, readonly, asyncTemplates) {
 
     //handle the shortcut with just a name
     if (typeof obj === 'string') {
-      obj = {key: obj};
+      obj = { key: obj };
     }
 
     if (obj.key) {
@@ -65,7 +64,7 @@ export function merge(lookup, form, options, readonly, asyncTemplates) {
     // Since have to ternary state we need a default
     if (obj.type === 'checkbox' && obj.schema['default'] === undefined) {
       obj.schema['default'] = false;
-    }
+    };
 
     // Special case: template type with tempplateUrl that's needs to be loaded before rendering
     // TODO: this is not a clean solution. Maybe something cleaner can be made when $ref support

lib/schemaDefaults.js

@@ -4,24 +4,25 @@ import canonicalTitleMap from './canonicalTitleMap';
 /* Utils */
 const stripNullType = (type) => {
   if (Array.isArray(type) && type.length == 2) {
-    if (type[0] === 'null')
+    if (type[0] === 'null') {
       return type[1];
-    if (type[1] === 'null')
+    };
+    if (type[1] === 'null') {
       return type[0];
-  }
+    };
+  };
   return type;
 };
 
 //Creates an default titleMap list from an enum, i.e. a list of strings.
 const enumToTitleMap = (enm) => {
   const titleMap = []; //canonical titleMap format is a list.
   enm.forEach((name) => {
-    titleMap.push({name, value: name});
+    titleMap.push({ name, value: name });
   });
   return titleMap;
 };
 
-
 /**
  * Creates a default form definition from a schema.
  */
@@ -83,8 +84,7 @@ export function stdFormObj(name, schema, options) {
   f.ngModelOptions = f.ngModelOptions || {};
 
   return f;
-}
-
+};
 
 /*** Schema types to form type mappings, with defaults ***/
 export function text(name, schema, options) {
@@ -162,7 +162,7 @@ export function fieldset(name, schema, options, defaultFormDef) {
     f.items = [];
     options.lookup[stringify(options.path)] = f;
 
-    console.log('fieldset', f, schema)
+    console.log('fieldset', f, schema);
     //recurse down into properties
     if (schema.properties) {
       Object.keys(schema.properties).forEach((key) => {
@@ -207,13 +207,15 @@ export function array(name, schema, options, defaultFormDef) {
     const arrPath = options.path.slice();
     arrPath.push('');
 
-    f.items = [defaultFormDef(name, schema.items, {
-      path: arrPath,
-      required: required || false,
-      lookup: options.lookup,
-      ignore: options.ignore,
-      global: options.global
-    })];
+    f.items = [
+      defaultFormDef(name, schema.items, {
+        path: arrPath,
+        required: required || false,
+        lookup: options.lookup,
+        ignore: options.ignore,
+        global: options.global
+      })
+    ];
 
     return f;
   }
@@ -223,14 +225,15 @@ export function createDefaults() {
   //First sorted by schema type then a list.
   //Order has importance. First handler returning an form snippet will be used.
   return {
-    string:  [select, text],
-    object:  [fieldset],
-    number:  [number],
-    integer: [integer],
-    boolean: [checkbox],defaultForm
+    string:  [ select, text ],
+    object:  [ fieldset ],
+    number:  [ number ],
+    integer: [ integer ],
+    boolean: [ checkbox ],
+    array:   [ array ],
+    defaultForm: defaultForm
   };
-}
-
+};
 
 /**
  * Create form defaults from schema
@@ -246,7 +249,7 @@ export function defaultForm(schema, defaultSchemaTypes, ignore, globalOptions) {
       if (ignore[key] !== true) {
         const required = schema.required && schema.required.indexOf(key) !== -1;
         const def = defaultFormDefinition(defaultSchemaTypes, key, schema.properties[key], {
-          path: [key],         // Path to this property in bracket notation.
+          path: [ key ],         // Path to this property in bracket notation.
           lookup: lookup,    // Extra map to register with. Optimization for merger.
           ignore: ignore,    // The ignore list of paths (sans root level name)
           required: required, // Is it required? (v4 json schema style)
@@ -261,5 +264,5 @@ export function defaultForm(schema, defaultSchemaTypes, ignore, globalOptions) {
   } else {
     throw new Error('Not implemented. Only type "object" allowed at root level of schema.');
   }
-  return {form: form, lookup: lookup};
+  return { form: form, lookup: lookup };
 }