Rest '...' key support thanks to @illiano

json-schema-form/angular-schema-form#748 was the reason for this change,
thanks @illiano

Author: Anthropic

docs/test.md

@@ -88,12 +88,24 @@ should handle a wildcard * in the form definition.
 (0, _merge.merge)(schema, ['*']).should.be.deep.equal(stdForm.form);
 ```
 
-should not handle a wildcard * if the schema is a lookup.
+should not handle a wildcard * if the schema is a lookup and cannot be inserted.
 
 ```js
 (0, _merge.merge)(stdForm.lookup, ['*']).should.not.be.deep.equal(stdForm.form);
 ```
 
+should handle a rest "..." key in the form definition.
+
+```js
+(0, _merge.merge)(schema, ['...', 'gender']).should.be.deep.equal(stdForm.form);
+```
+
+should not handle a rest "..." key in the form definition when the schema is a lookup and cannot be inserted.
+
+```js
+(0, _merge.merge)(stdForm.lookup, ['...', 'gender']).should.not.be.deep.equal(stdForm.form);
+```
+
 should combine a schema and form definition, regardless of order.
 
 ```js

src/lib/merge.js

@@ -5,13 +5,17 @@ import canonicalTitleMap from './canonical-title-map';
 // export function merge(schema, form, schemaDefaultTypes, ignore, options, readonly, asyncTemplates) {
 export function merge(lookup, form, ignore, options, readonly, asyncTemplates) {
   let formItems = [];
+  let formItemRest = [];
   form  = form || [];
   let idx = form.indexOf('*');
   options = options || {};
+  let stdForm = {};
 
+  let idxRest = form.indexOf('...');
   if(typeof lookup === 'object' && lookup.hasOwnProperty('properties')) {
     readonly = readonly || lookup.readonly || lookup.readOnly;
-    const stdForm = defaultForm(lookup, createDefaults(), ignore, options);
+    stdForm = defaultForm(lookup, createDefaults(), ignore, options);
+
     let defaultFormLookup = stdForm.lookup;
 
     lookup = defaultFormLookup || lookup;
@@ -20,6 +24,36 @@ export function merge(lookup, form, ignore, options, readonly, asyncTemplates) {
 
   if (idx !== -1) {
     form = form.slice(0, idx).concat(formItems).concat(form.slice(idx + 1));
+  }
+
+  //simple case, we have a "...", just put the formItemRest there
+  if (stdForm.form && idxRest !== -1) {
+    let formKeys = form.map(function(obj) {
+      if (typeof obj === 'string'){
+        return obj;
+      }
+      else if (obj.key) {
+        return obj.key;
+      };
+    }).filter(function(element) {
+      return element !== undefined;
+    });
+
+    formItemRest = formItemRest.concat(
+      stdForm.form.map(function(obj) {
+        let isInside = formKeys.indexOf(obj.key[0]) !== -1;
+        if (!isInside) {
+          return obj;
+        };
+      })
+      .filter(function(element) {
+        return element !== undefined;
+      })
+    );
+  };
+
+  if (idxRest !== -1) {
+    form = form.slice(0, idxRest).concat(formItemRest).concat(form.slice(idxRest + 1));
   };
 
   // ok let's merge!

src/lib/merge.spec.js

@@ -60,31 +60,39 @@ describe('merge.js', () => {
 
   describe('merge', () => {
     it('should handle a schema lookup or schema for first argument', () => {
-      merge(stdForm.lookup, ['name','shoe','gender']).should.be.deep.equal(stdForm.form);
-      merge(schema, ['*']).should.be.deep.equal(stdForm.form);
+      merge(stdForm.lookup, [ 'name', 'shoe', 'gender' ]).should.be.deep.equal(stdForm.form);
+      merge(schema, [ '*' ]).should.be.deep.equal(stdForm.form);
     });
 
     it('should handle a wildcard * in the form definition', () => {
-      merge(schema, ['*']).should.be.deep.equal(stdForm.form);
+      merge(schema, [ '*' ]).should.be.deep.equal(stdForm.form);
     });
 
-    it('should not handle a wildcard * if the schema is a lookup', () => {
-      merge(stdForm.lookup, ['*']).should.not.be.deep.equal(stdForm.form);
+    it('should not handle a wildcard * if the schema is a lookup and cannot be inserted', () => {
+      merge(stdForm.lookup, [ '*' ]).should.not.be.deep.equal(stdForm.form);
+    });
+
+    it('should handle a rest "..." key in the form definition', () => {
+      merge(schema, [ '...', 'gender' ]).should.be.deep.equal(stdForm.form);
+    });
+
+    it('should not handle a rest "..." key in the form definition when the schema is a lookup and cannot be inserted', () => {
+      merge(stdForm.lookup, [ '...', 'gender' ]).should.not.be.deep.equal(stdForm.form);
     });
 
     it('should combine a schema and form definition, regardless of order', () => {
-      merge(schema, ['name','shoe','gender']).should.be.deep.equal(stdForm.form);
-      merge(schema, ['gender']).should.be.deep.equal([stdForm.form[2]]);
-      merge(schema, ['gender','name']).should.be.deep.equal([stdForm.form[2],stdForm.form[0]]);
+      merge(schema, [ 'name', 'shoe', 'gender' ]).should.be.deep.equal(stdForm.form);
+      merge(schema, [ 'gender' ]).should.be.deep.equal([stdForm.form[2]]);
+      merge(schema, [ 'gender', 'name' ]).should.be.deep.equal([stdForm.form[2],stdForm.form[0]]);
     });
 
 
     it('should allow items that are not in the schema', () => {
-      merge(schema, ['*', { type:'fieldset' }]).should.be.deep.equal(stdForm.form.concat([{ type:'fieldset' }]));
+      merge(schema, [ '*', { type:'fieldset' }]).should.be.deep.equal(stdForm.form.concat([{ type:'fieldset' }]));
     });
 
     it('should translate "readOnly" in schema to "readonly" on the merged form defintion', () => {
-      var merged = merge(schema, ['gender']);
+      var merged = merge(schema, [ 'gender' ]);
       merged[0].should.have.property('readonly');
       merged[0].readonly.should.eq(true)
     });
@@ -113,7 +121,7 @@ describe('merge.js', () => {
         }
       };
 
-      var merged = merge(subschema, ['*']);
+      var merged = merge(subschema, [ '*' ]);
 
       //sub
       merged[0].should.have.property('readonly');