ALL tests passing again :-D

Author: Anthropic

dist/angular-schema-form.js

@@ -1,10 +1,10 @@
 /*!
  * angular-schema-form
- * @version 1.0.0-alpha.3
- * @date Fri, 30 Dec 2016 13:50:21 GMT
+ * @version 1.0.0-alpha.4
+ * @date Sun, 01 Jan 2017 11:54:39 GMT
  * @link https://github.com/json-schema-form/angular-schema-form
  * @license MIT
- * Copyright (c) 2014-2016 JSON Schema Form
+ * Copyright (c) 2014-2017 JSON Schema Form
  */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
@@ -1518,7 +1518,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
         });
 
         // Fetch our form.
-        scope.initialForm = sfSchema.lookup['f' + attrs.sfField];
+        scope.initialForm = Object.assign({}, sfSchema.lookup['f' + attrs.sfField]);
         scope.form = sfSchema.lookup['f' + attrs.sfField];
       },
       post: function post(scope, element, attrs, ctrl) {
@@ -1538,7 +1538,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 
             if (scope.form.key && scope.form.key.length) {
               if (typeof key[key.length - 1] === 'number' && scope.form.key.length >= 1) {
-                scope.completeKey = key.concat(scope.form.key.slice(-1));
+                var trim = scope.form.key.length - key.length;
+                scope.completeKey = key.concat(scope.form.key.slice(-trim));
               } else {
                 scope.completeKey = scope.form.key.slice();
               };
@@ -1818,17 +1819,16 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
   return {
     scope: true,
     require: ['?^^sfNewArray'],
-    controller: ['$scope', function SFKeyController($scope) {
-      this.key = $scope.form && $scope.form.key ? $scope.form.key.splice(0, -2) : [];
-    }],
     link: {
       pre: function pre(scope, element, attrs, ctrl) {
+        scope.parentKey = scope.parentKey || [];
+
         var currentKey = sfPath.parse(attrs.sfParentKey);
-        if (currentKey.length > 1) currentKey = currentKey.splice(-1);
+        var trim = currentKey.length - scope.parentKey.length;
 
-        scope.parentKey = scope.parentKey || [];
-        scope.parentKey = scope.parentKey.concat(currentKey, Number(attrs.sfIndex));
+        if (currentKey.length > 1) currentKey = currentKey.splice(-trim);
 
+        scope.parentKey = scope.parentKey.concat(currentKey, Number(attrs.sfIndex));
         scope.arrayIndex = Number(attrs.sfIndex);
         scope.arrayIndices = scope.arrayIndices || [];
         scope.arrayIndices = scope.arrayIndices.concat(scope.arrayIndex);

dist/angular-schema-form.min.js

@@ -26,7 +26,6 @@ module.exports = function(config) {
       'dist/angular-schema-form.js',
       include,
       'src/**/*.spec.js'
-      //'src/**/sf-schema.directive.spec.js'
     ],
 
     // list of files to exclude

karma.conf.js

@@ -1,6 +1,6 @@
 {
   "name": "angular-schema-form",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.4",
   "description": "Create complex forms from a JSON schema with angular.",
   "repository": "json-schema-form/angular-schema-form",
   "main": "dist/angular-schema-form.js",

package.json

@@ -17,9 +17,9 @@ sfPath, sfSelect) {
     require: ['^sfSchema', '?^form', '?^^sfKeyController'],
     link: {
       pre: function(scope, element, attrs, ctrl) {
-        var sfSchema = ctrl[0];
-        var formCtrl = ctrl[1];
-        var keyCtrl = ctrl[2];
+        let sfSchema = ctrl[0];
+        let formCtrl = ctrl[1];
+        let keyCtrl = ctrl[2];
 
         //The ngModelController is used in some templates and
         //is needed for error messages,
@@ -30,7 +30,7 @@ sfPath, sfSelect) {
         });
 
         // Fetch our form.
-        scope.initialForm = sfSchema.lookup['f' + attrs.sfField];
+        scope.initialForm = Object.assign({}, sfSchema.lookup['f' + attrs.sfField]);
         scope.form = sfSchema.lookup['f' + attrs.sfField];
       },
       post: function(scope, element, attrs, ctrl) {
@@ -50,7 +50,8 @@ sfPath, sfSelect) {
 
             if(scope.form.key && scope.form.key.length) {
               if(typeof key[key.length-1] === 'number' && scope.form.key.length >= 1) {
-                scope.completeKey = key.concat(scope.form.key.slice(-1));
+                let trim = scope.form.key.length - key.length;
+                scope.completeKey = key.concat(scope.form.key.slice(-trim));
               }
               else {
                 scope.completeKey = scope.form.key.slice();

src/directives/sf-field.directive.js

@@ -5,17 +5,16 @@ export default function(schemaForm, sfPath) {
   return {
     scope: true,
     require: ['?^^sfNewArray'],
-    controller: ['$scope', function SFKeyController($scope) {
-      this.key = ($scope.form && $scope.form.key) ? $scope.form.key.splice(0, -2) : [];
-    }],
     link: {
       pre: function(scope, element, attrs, ctrl) {
-        var currentKey = sfPath.parse(attrs.sfParentKey);
-        if(currentKey.length > 1) currentKey = currentKey.splice(-1);
-
         scope.parentKey = scope.parentKey || [];
-        scope.parentKey = scope.parentKey.concat(currentKey, Number(attrs.sfIndex));
 
+        let currentKey = sfPath.parse(attrs.sfParentKey);
+        let trim = currentKey.length - scope.parentKey.length;
+
+        if(currentKey.length > 1) currentKey = currentKey.splice(-trim);
+
+        scope.parentKey = scope.parentKey.concat(currentKey, Number(attrs.sfIndex));
         scope.arrayIndex = Number(attrs.sfIndex);
         scope.arrayIndices = scope.arrayIndices || [];
         scope.arrayIndices = scope.arrayIndices.concat(scope.arrayIndex);