Remove layoutPointer property from layoutNode to fix bug with layoutPointers in nested arrays.

Author: dschnelldavis

.gitignore

@@ -3,7 +3,7 @@
 # compiled output
 /compiled
 /dist
-/docs
+/docs/api
 /out-ngc
 /tmp
 

README.md

@@ -41,7 +41,7 @@ All the source code is in the `/src` folder. Inside that folder, you will find t
 * `demo` - the demonstration playground example application
 * `demo/assets/example-schemas` - JSON Schema examples used in the playground
 
-If you want detailed documentation describing the individual functions used in this library, run `npm run docs` to generate TypeDoc documentation, and then look in the newly generated `/docs` folder. (Angular JSON Schema Form is still a work in progress, so right now this documentation varies from highly detailed to completely missing.)
+If you want detailed documentation describing the individual functions used in this library, run `npm run docs` to generate TypeDoc documentation, and then look in the generated `/docs/api` folder. (Angular JSON Schema Form is still a work in progress, so right now this documentation varies from highly detailed to completely missing.)
 
 ### To install from NPM and use in your own project
 
@@ -155,7 +155,7 @@ Here is an example:
   [schema]="yourJsonSchema"
   [layout]="yourJsonFormLayout"
   [data]="yourData"
-  [options]="yourGlobalSettingsettings"
+  [options]="yourGlobalSettings"
   [widgets]="yourCustomWidgets"
   framework="bootstrap-3"
   loadExternalAssets="true"

package-lock.json

@@ -42,7 +42,7 @@
     "start": "ng serve",
     "test": "ng test",
     "lint": "ng lint",
-    "docs": "typedoc --options typedoc.json lib/src/json-schema-form.module.ts",
+    "docs": "typedoc src/lib/src/",
     "clean": "rimraf out-ngc dist/*",
     "prebuild": "npm run clean",
     "build": "node build.js",
@@ -55,7 +55,7 @@
     "deploy": "firebase deploy"
   },
   "dependencies": {
-    "ajv": "^5.2.4",
+    "ajv": "^5.3.0",
     "lodash": "4.x"
   },
   "peerDependencies": {
@@ -84,11 +84,11 @@
     "@angular/platform-browser-dynamic": "^4.4.6",
     "@angular/router": "^4.4.6",
     "@types/ace": "^0.0.35",
-    "@types/jasmine": "^2.6.0",
-    "@types/node": "^8.0.46",
+    "@types/jasmine": "^2.6.2",
+    "@types/node": "^8.0.47",
     "brace": "^0.10.0",
     "camelcase": "^4.0.0",
-    "codelyzer": "^3.2.1",
+    "codelyzer": "^3.2.2",
     "concurrently": "^3.2.0",
     "core-js": "^2.4.1",
     "glob": "^7.1.1",
@@ -109,7 +109,7 @@
     "rollup-plugin-node-resolve-angular": "^2.0.3",
     "rollup-plugin-sourcemaps": "^0.4.1",
     "rollup-plugin-uglify": "^2.0.1",
-    "rxjs": "^5.5.0",
+    "rxjs": "^5.5.2",
     "ts-node": "^3.0.0",
     "tslint": "^5.8.0",
     "typedoc": "^0.9.0",

package.json

@@ -29,30 +29,22 @@
         "items": {
           "type": "object",
           "properties": {
-            "number": { "type": "string" },
-            "type": {
-              "type": "string",
-              "enum": [ "cell", "home", "work" ]
-            }
+            "type": { "type": "string", "enum": [ "cell", "home", "work" ] },
+            "number": { "type": "string" }
           },
-          "required": [ "number", "type" ]
+          "required": [ "type", "number" ]
         }
       }
     },
     "required": [ "last_name" ]
   },
   "layout": [
-    { "type": "flex",
-      "flex-flow": "row wrap",
-      "fxLayoutGap": "12px",
-      "items": [ "first_name", "last_name" ]
-    },
+    { "type": "flex", "flex-flow": "row wrap", "items": [ "first_name", "last_name" ] },
     { "key": "address.street_1", "title": "Address", "placeholder": "Street" },
     { "key": "address.street_2", "notitle": true },
     { "type": "div",
       "display": "flex",
       "flex-direction": "row",
-      "fxLayoutGap": "12px",
       "items": [
         { "key": "address.city", "flex": "3 3 150px",
           "notitle": true, "placeholder": "City"
@@ -74,7 +66,6 @@
         "type": "div",
         "displayFlex": true,
         "flex-direction": "row",
-        "fxLayoutGap": "12px",
         "items": [
           { "key": "phone_numbers[].type", "flex": "1 1 50px",
             "notitle": true, "placeholder": "Type"
@@ -97,8 +88,8 @@
     },
     "birthday": "1999-09-09",
     "phone_numbers": [
-      { "number": "702-123-4567", "type": "cell" },
-      { "number": "702-987-6543", "type": "work" }
+      { "type": "cell", "number": "702-123-4567" },
+      { "type": "work", "number": "702-987-6543" }
     ]
   }
 }

src/demo/assets/example-schemas/ng-jsf-flex-layout.json

@@ -92,7 +92,6 @@ import { addClasses, inArray, JsonPointer, toTitleCase } from '../../shared';
 export class Bootstrap3FrameworkComponent implements OnInit, OnChanges {
   controlInitialized: boolean = false;
   widgetOptions: any; // Options passed to child widget
-  layoutPointer: string;
   widgetLayoutNode: any; // layoutNode passed to child widget
   options: any; // Options used in this framework
   formControl: any = null;
@@ -148,7 +147,6 @@ export class Bootstrap3FrameworkComponent implements OnInit, OnChanges {
         options: _.cloneDeep(this.layoutNode.options)
       };
       this.widgetOptions = this.widgetLayoutNode.options;
-      this.layoutPointer = this.jsf.getLayoutPointer(this);
       this.formControl = this.jsf.getFormControl(this);
 
       this.options.isInputWidget = inArray(this.layoutNode.type, [

src/lib/angular2-json-schema-form.ts

@@ -12,7 +12,9 @@ import { WidgetLibraryService } from './widget-library/widget-library.service';
 import { JsonSchemaFormService } from './json-schema-form.service';
 import { convertSchemaToDraft6 } from './shared/convert-schema-to-draft6.function';
 import { resolveSchemaReferences } from './shared/json-schema.functions';
-import { hasValue, inArray, isArray, isEmpty, isObject } from './shared/validator.functions';
+import {
+  hasValue, inArray, isArray, isEmpty, isNumber, isObject
+} from './shared/validator.functions';
 import { forEach, hasOwn } from './shared/utility.functions';
 import { JsonPointer } from './shared/jsonpointer.functions';
 
@@ -309,6 +311,7 @@ export class JsonSchemaFormComponent implements OnChanges, OnInit {
 
         // Add type = 'object' if missing
         if (isObject(this.jsf.schema.properties) ||
+          isObject(this.jsf.schema.patternProperties) ||
           isObject(this.jsf.schema.additionalProperties)
         ) {
           this.jsf.schema.type = 'object';