@angular-devkit/core 12.0.0 → 12.0.4

package/node/host.js

@@ -85,7 +85,7 @@ class NodeJsAsyncHost {
         return rxjs_1.from(fs_1.promises.readdir(src_1.getSystemPath(path))).pipe(operators_1.map((names) => names.map((name) => src_1.fragment(name))));
     }
     exists(path) {
-        return rxjs_1.from(exists(path));
+        return rxjs_1.from(exists(src_1.getSystemPath(path)));
     }
     isDirectory(path) {
         return this.stat(path).pipe(operators_1.map((stat) => stat.isDirectory()));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-devkit/core",
-  "version": "12.0.0",
+  "version": "12.0.4",
   "description": "Angular DevKit - Core Utility Library",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
@@ -25,7 +25,7 @@
     "url": "https://github.com/angular/angular-cli.git"
   },
   "engines": {
-    "node": "^12.14.1 || ^14.0.0",
+    "node": "^12.14.1 || >=14.0.0",
     "npm": "^6.11.0 || ^7.5.6",
     "yarn": ">= 1.13.0"
   },

package/src/json/schema/interface.d.ts

@@ -16,7 +16,7 @@ export interface SchemaValidatorResult {
     success: boolean;
     errors?: SchemaValidatorError[];
 }
-export declare type SchemaValidatorError = ErrorObject;
+export declare type SchemaValidatorError = Partial<ErrorObject>;
 export interface SchemaValidatorOptions {
     applyPreTransforms?: boolean;
     applyPostTransforms?: boolean;

package/src/json/schema/registry.d.ts

@@ -81,4 +81,5 @@ export declare class CoreSchemaRegistry implements SchemaRegistry {
      * @deprecated will be removed in version 13.
      */
     private _replaceDeprecatedSchemaIdKeyword;
+    private normalizeDataPathArr;
 }

package/src/json/schema/registry.js

@@ -36,9 +36,17 @@ class SchemaValidationException extends exception_1.BaseException {
             return [];
         }
         const messages = errors.map((err) => {
+            var _a;
             let message = `Data path ${JSON.stringify(err.instancePath)} ${err.message}`;
-            if (err.keyword === 'additionalProperties') {
-                message += `(${err.params.additionalProperty})`;
+            if (err.params) {
+                switch (err.keyword) {
+                    case 'additionalProperties':
+                        message += `(${err.params.additionalProperty})`;
+                        break;
+                    case 'enum':
+                        message += `. Allowed values are: ${(_a = err.params.allowedValues) === null || _a === void 0 ? void 0 : _a.map((v) => `"${v}"`).join(', ')}`;
+                        break;
+                }
             }
             return message + '.';
         });
@@ -212,6 +220,13 @@ class CoreSchemaRegistry {
         let validator;
         try {
             this._currentCompilationSchemaInfo = schemaInfo;
+            validator = this._ajv.compile(schema);
+        }
+        catch (e) {
+            // This should eventually be refactored so that we we handle race condition where the same schema is validated at the same time.
+            if (!(e instanceof ajv_1.default.MissingRefError)) {
+                throw e;
+            }
             validator = await this._ajv.compileAsync(schema);
         }
         finally {
@@ -253,9 +268,17 @@ class CoreSchemaRegistry {
                 }
             }
             // Validate using ajv
-            const success = await validator.call(validationContext, data);
-            if (!success) {
-                return { data, success, errors: (_a = validator.errors) !== null && _a !== void 0 ? _a : [] };
+            try {
+                const success = await validator.call(validationContext, data);
+                if (!success) {
+                    return { data, success, errors: (_a = validator.errors) !== null && _a !== void 0 ? _a : [] };
+                }
+            }
+            catch (error) {
+                if (error instanceof ajv_1.default.ValidationError) {
+                    return { data, success: false, errors: error.errors };
+                }
+                throw error;
             }
             // Apply post-validation transforms
             if (validationOptions.applyPostTransforms) {
@@ -286,9 +309,7 @@ class CoreSchemaRegistry {
                         return () => true;
                     }
                     // We cheat, heavily.
-                    const pathArray = it.dataPathArr
-                        .slice(1, it.dataLevel + 1)
-                        .map((p) => (typeof p === 'number' ? p : p.str.slice(1, -1)));
+                    const pathArray = this.normalizeDataPathArr(it);
                     compilationSchemInfo.smartDefaultRecord.set(JSON.stringify(pathArray), schema);
                     return () => true;
                 },
@@ -321,11 +342,7 @@ class CoreSchemaRegistry {
                 if (!compilationSchemInfo) {
                     return () => true;
                 }
-                const path = '/' +
-                    it.dataPathArr
-                        .slice(1, it.dataLevel + 1)
-                        .map((p) => (typeof p === 'number' ? p : p.str.slice(1, -1)))
-                        .join('/');
+                const path = '/' + this.normalizeDataPathArr(it).join('/');
                 let type;
                 let items;
                 let message;
@@ -454,8 +471,20 @@ class CoreSchemaRegistry {
     }
     static _set(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    data, fragments, value, parent = null, parentProperty, force) {
-        for (const fragment of fragments) {
+    data, fragments, value, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    parent = null, parentProperty, force) {
+        for (let index = 0; index < fragments.length; index++) {
+            const fragment = fragments[index];
+            if (/^i\d+$/.test(fragment)) {
+                if (!Array.isArray(data)) {
+                    return;
+                }
+                for (let dataIndex = 0; dataIndex < data.length; dataIndex++) {
+                    CoreSchemaRegistry._set(data[dataIndex], fragments.slice(index + 1), value, data, `${dataIndex}`);
+                }
+                return;
+            }
             if (!data && parent !== null && parentProperty) {
                 data = parent[parentProperty] = {};
             }
@@ -505,5 +534,10 @@ class CoreSchemaRegistry {
             console.warn(`"${schema.$id}" schema is using the keyword "id" which its support is deprecated. Use "$id" for schema ID.`);
         }
     }
+    normalizeDataPathArr(it) {
+        return it.dataPathArr
+            .slice(1, it.dataLevel + 1)
+            .map((p) => (typeof p === 'number' ? p : p.str.replace(/\"/g, '')));
+    }
 }
 exports.CoreSchemaRegistry = CoreSchemaRegistry;