fix(@angular-devkit/core): fix smart defaults on arrays

hansl · hansl · commit 9a3f17ff9297 · 2018-06-05T17:55:17.000-07:00
By adding undefined and empty arrays everywhere were preventing smart defaults
to work on arrays.

Also, when ending with an array or object, smart defaults path will have an extra
key.
diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -187,7 +187,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
             }),
             switchMap(([data, valid]) => {
               if (valid) {
-                let dataObs = observableOf(data);
+                let dataObs = this._applySmartDefaults(data);
                 this._post.forEach(visitor =>
                   dataObs = dataObs.pipe(
                     concatMap(data => {
@@ -203,8 +203,6 @@ export class CoreSchemaRegistry implements SchemaRegistry {
                 );
 
                 return dataObs.pipe(
-                  // Apply smart defaults.
-                  concatMap(data => this._applySmartDefaults(data)),
                   map(data => [data, valid]),
                 );
               } else {
@@ -280,7 +278,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
           // We cheat, heavily.
           this._smartDefaultRecord.set(
             // tslint:disable-next-line:no-any
-            JSON.stringify((it as any).dataPathArr.slice(1) as string[]),
+            JSON.stringify((it as any).dataPathArr.slice(1, (it as any).dataLevel + 1) as string[]),
             schema,
           );
 
@@ -334,8 +332,14 @@ export class CoreSchemaRegistry implements SchemaRegistry {
             .replace(/\\r/g, '\r')
             .replace(/\\f/g, '\f')
             .replace(/\\t/g, '\t');
+
+          // We know we need an object because the fragment is a property key.
+          if (!data && parent !== null && parentProperty) {
+            data = parent[parentProperty] = {};
+          }
           parent = data;
           parentProperty = property;
+
           data = data[property];
         } else {
           return;
diff --git a/packages/angular_devkit/core/src/json/schema/registry_spec.ts b/packages/angular_devkit/core/src/json/schema/registry_spec.ts
@@ -273,6 +273,9 @@ describe('CoreSchemaRegistry', () => {
 
       return schema['blue'];
     });
+    registry.addSmartDefaultProvider('test3', (schema) => {
+      return [ 1, 2, 3 ];
+    });
 
     registry
       .compile({
@@ -289,6 +292,20 @@ describe('CoreSchemaRegistry', () => {
               },
             },
           },
+          arr2: {
+            $ref: '#/definitions/test3',
+          },
+          obj: {
+            properties: {
+              deep: {
+                properties: {
+                  arr: {
+                    $ref: '#/definitions/test3',
+                  },
+                },
+              },
+            },
+          },
         },
         definitions: {
           example: {
@@ -304,6 +321,12 @@ describe('CoreSchemaRegistry', () => {
               blue: 'yep',
             },
           },
+          test3: {
+            type: 'array',
+            $default: {
+              $source: 'test3',
+            },
+          },
         },
       })
       .pipe(
@@ -312,6 +335,8 @@ describe('CoreSchemaRegistry', () => {
           expect(result.success).toBe(true);
           expect(data.bool).toBe(true);
           expect(data.arr[0].test).toBe('yep');
+          expect(data.arr2).toEqual([1, 2, 3]);
+          expect(data.obj.deep.arr).toEqual([1, 2, 3]);
         }),
       )
       .subscribe(done, done.fail);
