fix(@angular-devkit/core): correctly resolve schema references defaults

Closes #22600 (cherry picked from commit bf733d6)
angular · Feb 2, 2022 · c8826a9 · c8826a9
1 parent 76c08e2
commit c8826a9
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 3 deletions.
diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -209,9 +209,6 @@ export class CoreSchemaRegistry implements SchemaRegistry {
       }
     }
 
-    if (fullReference.startsWith('#')) {
-      fullReference = fullReference.slice(0, -1);
-    }
     const resolvedSchema = this._ajv.getSchema(fullReference);
 
     return {

diff --git a/packages/angular_devkit/core/src/json/schema/transforms.ts b/packages/angular_devkit/core/src/json/schema/transforms.ts
@@ -20,6 +20,8 @@ export function addUndefinedDefaults(
     return value;
   }
 
+  value ??= schema.default;
+
   const types = getTypesOfSchema(schema);
   if (types.size === 0) {
     return value;

diff --git a/packages/angular_devkit/core/src/json/schema/transforms_spec.ts b/packages/angular_devkit/core/src/json/schema/transforms_spec.ts
@@ -218,4 +218,42 @@ describe('addUndefinedDefaults', () => {
     expect(dataObj.obj.b).toBeTrue();
     expect(dataObj.obj.c).toBeFalse();
   });
+
+  it('should add defaults to undefined properties when using $refs', async () => {
+    const registry = new CoreSchemaRegistry();
+    registry.addPreTransform(addUndefinedDefaults);
+    const dataNoObj: Record<string, boolean> = {};
+
+    const dataObj: Record<string, boolean> = {
+      boolRef: true,
+    };
+
+    const validator = registry.compile({
+      definitions: {
+        boolRef: {
+          default: false,
+          type: 'boolean',
+        },
+      },
+      properties: {
+        bool: {
+          default: false,
+          type: 'boolean',
+        },
+        boolRef: {
+          $ref: '#/definitions/boolRef',
+        },
+      },
+    });
+
+    const result1 = await validator.pipe(mergeMap((validator) => validator(dataNoObj))).toPromise();
+    expect(result1.success).toBeTrue();
+    expect(dataNoObj['bool']).toBeFalse();
+    expect(dataNoObj['boolRef']).toBeFalse();
+
+    const result2 = await validator.pipe(mergeMap((validator) => validator(dataObj))).toPromise();
+    expect(result2.success).toBeTrue();
+    expect(dataObj['bool']).toBeFalse();
+    expect(dataObj['boolRef']).toBeTrue();
+  });
 });