@angular-devkit/core 12.1.0-next.3 → 12.1.0

package/node/BUILD.bazel

@@ -53,8 +53,6 @@ ts_library(
 jasmine_node_test(
     name = "node_test",
     srcs = [":node_test_lib"],
-    # TODO: Audit tests to determine if tests can be run in RBE environments
-    local = True,
     deps = [
         "@npm//chokidar",
         "@npm//temp",

package/node/experimental/index.js

@@ -6,7 +6,26 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jobs = void 0;
-const jobs = require("./jobs");
+const jobs = __importStar(require("./jobs"));
 exports.jobs = jobs;

package/node/host.js

@@ -50,7 +50,7 @@ class NodeJsAsyncHost {
         return { synchronous: false };
     }
     write(path, content) {
-        return rxjs_1.from(fs_1.promises.mkdir(src_1.getSystemPath(src_1.dirname(path)), { recursive: true })).pipe(operators_1.mergeMap(() => fs_1.promises.writeFile(src_1.getSystemPath(path), content)));
+        return rxjs_1.from(fs_1.promises.mkdir(src_1.getSystemPath(src_1.dirname(path)), { recursive: true })).pipe(operators_1.mergeMap(() => fs_1.promises.writeFile(src_1.getSystemPath(path), new Uint8Array(content))));
     }
     read(path) {
         return rxjs_1.from(fs_1.promises.readFile(src_1.getSystemPath(path))).pipe(operators_1.map((buffer) => new Uint8Array(buffer).buffer));
@@ -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/node/index.js

@@ -13,14 +13,26 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fs = exports.experimental = void 0;
-const experimental = require("./experimental/jobs/job-registry");
+const experimental = __importStar(require("./experimental/jobs/job-registry"));
 exports.experimental = experimental;
-const fs = require("./fs");
+const fs = __importStar(require("./fs"));
 exports.fs = fs;
 __exportStar(require("./cli-logger"), exports);
 __exportStar(require("./host"), exports);

package/node/testing/index.js

@@ -6,11 +6,30 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TempScopedNodeJsSyncHost = void 0;
-const fs = require("fs");
-const os = require("os");
-const path = require("path");
+const fs = __importStar(require("fs"));
+const os = __importStar(require("os"));
+const path = __importStar(require("path"));
 const src_1 = require("../../src");
 const host_1 = require("../host");
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-devkit/core",
-  "version": "12.1.0-next.3",
+  "version": "12.1.0",
   "description": "Angular DevKit - Core Utility Library",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
@@ -13,7 +13,7 @@
     "core"
   ],
   "dependencies": {
-    "ajv": "8.4.0",
+    "ajv": "8.6.0",
     "ajv-formats": "2.1.0",
     "fast-json-stable-stringify": "2.1.0",
     "magic-string": "0.25.7",
@@ -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/experimental.js

@@ -6,7 +6,26 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jobs = void 0;
-const jobs = require("./experimental/jobs/index");
+const jobs = __importStar(require("./experimental/jobs/index"));
 exports.jobs = jobs;

package/src/index.js

@@ -13,20 +13,32 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.workspaces = exports.logging = exports.json = exports.experimental = exports.analytics = void 0;
-const analytics = require("./analytics");
+const analytics = __importStar(require("./analytics"));
 exports.analytics = analytics;
-const experimental = require("./experimental");
+const experimental = __importStar(require("./experimental"));
 exports.experimental = experimental;
-const json = require("./json/index");
+const json = __importStar(require("./json/index"));
 exports.json = json;
-const logging = require("./logger/index");
+const logging = __importStar(require("./logger/index"));
 exports.logging = logging;
-const workspaces = require("./workspace");
+const workspaces = __importStar(require("./workspace"));
 exports.workspaces = workspaces;
 __exportStar(require("./exception/exception"), exports);
 __exportStar(require("./json/index"), exports);

package/src/json/index.js

@@ -13,12 +13,24 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.schema = void 0;
-const schema = require("./schema/index");
+const schema = __importStar(require("./schema/index"));
 exports.schema = schema;
 __exportStar(require("./interface"), exports);
 __exportStar(require("./parser"), exports);

package/src/json/schema/index.js

@@ -13,12 +13,24 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transforms = void 0;
-const transforms = require("./transforms");
+const transforms = __importStar(require("./transforms"));
 exports.transforms = transforms;
 __exportStar(require("./interface"), exports);
 __exportStar(require("./pointer"), exports);

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

@@ -6,15 +6,37 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreSchemaRegistry = exports.SchemaValidationException = void 0;
-const ajv_1 = require("ajv");
-const ajv_formats_1 = require("ajv-formats");
-const http = require("http");
-const https = require("https");
+const ajv_1 = __importDefault(require("ajv"));
+const ajv_formats_1 = __importDefault(require("ajv-formats"));
+const http = __importStar(require("http"));
+const https = __importStar(require("https"));
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const Url = require("url");
+const Url = __importStar(require("url"));
 const exception_1 = require("../../exception/exception");
 const utils_1 = require("../../utils");
 const interface_1 = require("../interface");
@@ -36,9 +58,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 + '.';
         });
@@ -214,6 +244,13 @@ class CoreSchemaRegistry {
             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 {
             this._currentCompilationSchemaInfo = undefined;
         }
@@ -253,9 +290,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 +331,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 +364,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 +493,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 +556,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;

package/src/utils/index.js

@@ -13,14 +13,26 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.strings = exports.tags = void 0;
-const tags = require("./literals");
+const tags = __importStar(require("./literals"));
 exports.tags = tags;
-const strings = require("./strings");
+const strings = __importStar(require("./strings"));
 exports.strings = strings;
 __exportStar(require("./array"), exports);
 __exportStar(require("./object"), exports);

package/src/virtual-fs/index.js

@@ -13,11 +13,23 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.virtualFs = void 0;
-const virtualFs = require("./host/index");
+const virtualFs = __importStar(require("./host/index"));
 exports.virtualFs = virtualFs;
 __exportStar(require("./path"), exports);

package/src/workspace/json/writer.js

@@ -6,9 +6,12 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeJsonWorkspace = void 0;
-const magic_string_1 = require("magic-string");
+const magic_string_1 = __importDefault(require("magic-string"));
 const metadata_1 = require("./metadata");
 const utilities_1 = require("./utilities");
 async function writeJsonWorkspace(workspace, host, path, options = {}) {