@angular-devkit/schematics 18.1.0-next.3 → 18.1.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-devkit/schematics",
-  "version": "18.1.0-next.3",
+  "version": "18.1.0-rc.0",
   "description": "Angular Schematics - Library",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
@@ -18,8 +18,8 @@
     "tooling"
   ],
   "dependencies": {
-    "@angular-devkit/core": "18.1.0-next.3",
-    "jsonc-parser": "3.2.1",
+    "@angular-devkit/core": "18.1.0-rc.0",
+    "jsonc-parser": "3.3.1",
     "magic-string": "0.30.10",
     "ora": "5.4.1",
     "rxjs": "7.8.1"

package/src/index.d.ts

@@ -24,7 +24,7 @@ export * from './rules/url';
 export * from './tree/delegate';
 export * from './tree/empty';
 export * from './tree/host-tree';
-export { UpdateRecorder } from './tree/interface';
+export type { UpdateRecorder } from './tree/interface';
 export * from './engine/schematic';
 export * from './sink/dryrun';
 export * from './sink/host';

package/tools/file-system-engine-host.js

@@ -107,7 +107,7 @@ class FileSystemEngineHost extends file_system_engine_host_base_1.FileSystemEngi
             try {
                 const path = require.resolve((0, path_1.join)(this._root, name));
                 // Default handling code is for old tasks that incorrectly export `default` with non-ESM module
-                return (0, rxjs_1.from)(Promise.resolve(`${path}`).then(s => __importStar(require(s))).then((mod) => (mod.default?.default || mod.default)())).pipe((0, rxjs_1.catchError)(() => (0, rxjs_1.throwError)(new src_1.UnregisteredTaskException(name))));
+                return (0, rxjs_1.from)(Promise.resolve(`${path}`).then(s => __importStar(require(s))).then((mod) => (mod.default?.default || mod.default)())).pipe((0, rxjs_1.catchError)(() => (0, rxjs_1.throwError)(() => new src_1.UnregisteredTaskException(name))));
             }
             catch { }
         }

package/tools/file-system-utility.js

@@ -12,11 +12,18 @@ const schematics_1 = require("@angular-devkit/schematics");
 const fs_1 = require("fs");
 const jsonc_parser_1 = require("jsonc-parser");
 function readJsonFile(path) {
-    if (!(0, fs_1.existsSync)(path)) {
-        throw new schematics_1.FileDoesNotExistException(path);
+    let data;
+    try {
+        data = (0, fs_1.readFileSync)(path, 'utf-8');
+    }
+    catch (e) {
+        if (e && typeof e === 'object' && 'code' in e && e.code === 'ENOENT') {
+            throw new schematics_1.FileDoesNotExistException(path);
+        }
+        throw e;
     }
     const errors = [];
-    const content = (0, jsonc_parser_1.parse)((0, fs_1.readFileSync)(path, 'utf-8'), errors, { allowTrailingComma: true });
+    const content = (0, jsonc_parser_1.parse)(data, errors, { allowTrailingComma: true });
     if (errors.length) {
         const { error, offset } = errors[0];
         throw new Error(`Failed to parse "${path}" as JSON AST Object. ${(0, jsonc_parser_1.printParseErrorCode)(error)} at location: ${offset}.`);

package/tools/node-modules-test-engine-host.d.ts

@@ -13,8 +13,7 @@ import { NodeModulesEngineHost } from './node-module-engine-host';
  * revert back to using node modules resolution. This is done for testing.
  */
 export declare class NodeModulesTestEngineHost extends NodeModulesEngineHost {
-    private _collections;
-    private _tasks;
+    #private;
     get tasks(): TaskConfiguration<{}>[];
     clearTasks(): void;
     registerCollection(name: string, path: string): void;

package/tools/node-modules-test-engine-host.js

@@ -14,31 +14,27 @@ const node_module_engine_host_1 = require("./node-module-engine-host");
  * revert back to using node modules resolution. This is done for testing.
  */
 class NodeModulesTestEngineHost extends node_module_engine_host_1.NodeModulesEngineHost {
-    _collections = new Map();
-    _tasks = [];
+    #collections = new Map();
+    #tasks = [];
     get tasks() {
-        return this._tasks;
+        return this.#tasks;
     }
     clearTasks() {
-        this._tasks = [];
+        this.#tasks = [];
     }
     registerCollection(name, path) {
-        this._collections.set(name, path);
+        this.#collections.set(name, path);
     }
     transformContext(context) {
-        const oldAddTask = context.addTask;
+        const oldAddTask = context.addTask.bind(context);
         context.addTask = (task, dependencies) => {
-            this._tasks.push(task.toConfiguration());
-            return oldAddTask.call(context, task, dependencies);
+            this.#tasks.push(task.toConfiguration());
+            return oldAddTask(task, dependencies);
         };
         return context;
     }
     _resolveCollectionPath(name, requester) {
-        const maybePath = this._collections.get(name);
-        if (maybePath) {
-            return maybePath;
-        }
-        return super._resolveCollectionPath(name, requester);
+        return this.#collections.get(name) ?? super._resolveCollectionPath(name, requester);
     }
 }
 exports.NodeModulesTestEngineHost = NodeModulesTestEngineHost;