@energycap/components 0.39.16-schematics.20240426-1446 → 0.39.16-schematics.20240430-1745

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@energycap/components",
-  "version": "0.39.16-schematics.20240426-1446",
+  "version": "0.39.16-schematics.20240430-1745",
   "schematics": "./schematics/collection.json",
   "dependencies": {
     "tslib": "^2.0.0"

package/schematics/collection.json

@@ -3,7 +3,8 @@
   "schematics": {
     "rxjs-7-upgrade": {
       "description": "Upgrade your project to RxJS 7",
-      "factory": "./ng-generate/rxjs-7-upgrade/index#rxjs7Upgrade"
+      "factory": "./rxjs-7-upgrade/index#rxjs7Upgrade",
+      "schema": "./rxjs-7-upgrade/schema.json"
     }
   }
 }

package/schematics/rxjs-7-upgrade/index.d.ts

@@ -0,0 +1,3 @@
+import { Rule } from '@angular-devkit/schematics';
+import { Schema as RxJSUpgradeSchema } from './schema';
+export declare function rxjs7Upgrade(options: RxJSUpgradeSchema): Rule;

package/schematics/rxjs-7-upgrade/index.js

@@ -0,0 +1,68 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rxjs7Upgrade = void 0;
+const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
+const change_1 = require("@schematics/angular/utility/change");
+const path_1 = require("path");
+const ts = require("typescript");
+const typescript_1 = require("../utilities/typescript");
+const workspace_1 = require("../utilities/workspace");
+function rxjs7Upgrade(options) {
+    return (tree) => __awaiter(this, void 0, void 0, function* () {
+        const path = options.path || '/';
+        const workspace = yield (0, workspace_1.getWorkspace)(path, tree);
+        // Get all tsconfig paths from the workspace, including test tsconfigs
+        const tsConfigPaths = (0, workspace_1.getTsConfigPaths)(workspace, tree);
+        // The base path in the file system for the path argument, replacing all backslashes with forward slashes (for cross-system compatibility).
+        // The absolute file system path is needed for the typescript compiler to resolve files correctly. 
+        const basePath = process.cwd().replace(/\\/g, path);
+        tsConfigPaths.forEach(tsConfigPath => {
+            const program = (0, typescript_1.createTsProgram)(tree, tsConfigPath, basePath);
+            const checker = program.getTypeChecker();
+            for (const sourceFile of program.getSourceFiles()) {
+                // Skip declaration files and external library files
+                if (sourceFile.isDeclarationFile || program.isSourceFileFromExternalLibrary(sourceFile)) {
+                    continue;
+                }
+                const observableSymbols = ['Observable', 'Subject', 'BehaviorSubject', 'ReplaySubject', 'AsyncSubject'];
+                const toPromiseCalls = (0, ast_utils_1.findNodes)(sourceFile, ts.isCallExpression, undefined, true).filter(node => {
+                    if (ts.isPropertyAccessExpression(node.expression) && node.expression.name.text === 'toPromise') {
+                        const symbol = checker.getTypeAtLocation(node.expression.expression).symbol;
+                        return symbol && observableSymbols.includes(symbol.name);
+                    }
+                    return false;
+                });
+                if (toPromiseCalls.length) {
+                    const fileToEdit = (0, path_1.relative)(basePath, sourceFile.fileName);
+                    const recorder = tree.beginUpdate(fileToEdit);
+                    const changes = [];
+                    const printer = ts.createPrinter();
+                    // Add import for lastValueFrom
+                    changes.push((0, ast_utils_1.insertImport)(sourceFile, fileToEdit, 'lastValueFrom', 'rxjs'));
+                    // Replace toPromise calls with lastValueFrom
+                    toPromiseCalls.forEach(node => {
+                        if (ts.isPropertyAccessExpression(node.expression)) {
+                            const newCallExpression = ts.factory.createCallExpression(ts.factory.createIdentifier('lastValueFrom'), undefined, [node.expression.expression]);
+                            const newNodeText = printer.printNode(ts.EmitHint.Unspecified, newCallExpression, sourceFile);
+                            const change = new change_1.ReplaceChange(fileToEdit, node.getStart(), node.getText(), newNodeText);
+                            changes.push(change);
+                        }
+                    });
+                    (0, change_1.applyToUpdateRecorder)(recorder, changes);
+                    tree.commitUpdate(recorder);
+                }
+            }
+        });
+    });
+}
+exports.rxjs7Upgrade = rxjs7Upgrade;
+//# sourceMappingURL=index.js.map

package/schematics/rxjs-7-upgrade/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../projects/components/schematics/rxjs-7-upgrade/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qEAAgF;AAChF,+DAAkG;AAClG,+BAAgC;AAChC,iCAAiC;AACjC,wDAA0D;AAC1D,sDAAwE;AAGxE,SAAgB,YAAY,CAAC,OAA0B;IACrD,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,GAAG,CAAC;QACjC,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAEjD,sEAAsE;QACtE,MAAM,aAAa,GAAG,IAAA,4BAAgB,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAExD,2IAA2I;QAC3I,mGAAmG;QACnG,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAEpD,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YACnC,MAAM,OAAO,GAAG,IAAA,4BAAe,EAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;YAC9D,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;YAEzC,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,cAAc,EAAE,EAAE;gBACjD,oDAAoD;gBACpD,IAAI,UAAU,CAAC,iBAAiB,IAAI,OAAO,CAAC,+BAA+B,CAAC,UAAU,CAAC,EAAE;oBACvF,SAAS;iBACV;gBAED,MAAM,iBAAiB,GAAG,CAAC,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC;gBAExG,MAAM,cAAc,GAAG,IAAA,qBAAS,EAAC,UAAU,EAAE,EAAE,CAAC,gBAAgB,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;oBAC/F,IAAI,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,EAAE;wBAC/F,MAAM,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;wBAC5E,OAAO,MAAM,IAAI,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;qBAC1D;oBACD,OAAO,KAAK,CAAC;gBACf,CAAC,CAAC,CAAC;gBAEH,IAAI,cAAc,CAAC,MAAM,EAAE;oBACzB,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;oBAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;oBAC9C,MAAM,OAAO,GAAa,EAAE,CAAC;oBAC7B,MAAM,OAAO,GAAG,EAAE,CAAC,aAAa,EAAE,CAAC;oBAEnC,+BAA+B;oBAC/B,OAAO,CAAC,IAAI,CAAC,IAAA,wBAAY,EAAC,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;oBAE5E,6CAA6C;oBAC7C,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;wBAC5B,IAAI,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;4BAClD,MAAM,iBAAiB,GAAG,EAAE,CAAC,OAAO,CAAC,oBAAoB,CACvD,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,eAAe,CAAC,EAC5C,SAAS,EACT,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAC7B,CAAC;4BACF,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,EAAE,UAAU,CAAC,CAAC;4BAC9F,MAAM,MAAM,GAAG,IAAI,sBAAa,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,CAAC,CAAC;4BAC3F,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;yBACtB;oBACH,CAAC,CAAC,CAAC;oBAEH,IAAA,8BAAqB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;oBACzC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;iBAC7B;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAA,CAAA;AACH,CAAC;AA7DD,oCA6DC"}

package/schematics/rxjs-7-upgrade/schema.d.ts

@@ -0,0 +1,4 @@
+export interface Schema {
+    /** Path to the angular workspace. */
+    path?: string;
+}

package/schematics/rxjs-7-upgrade/schema.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=schema.js.map

package/schematics/rxjs-7-upgrade/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../projects/components/schematics/rxjs-7-upgrade/schema.ts"],"names":[],"mappings":""}

package/schematics/rxjs-7-upgrade/schema.json

@@ -0,0 +1,14 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "EnergyCAP.RxJS7UpgradeSchema",
+  "title": "RxJS 7 Upgrade Schema",
+  "type": "object",
+  "properties": {
+    "path": {
+      "type": "string",
+      "format": "path",
+      "description": "The path to complete the upgrade.",
+      "visible": false
+    }
+  }
+}

package/schematics/utilities/typescript.d.ts

@@ -0,0 +1,7 @@
+import { Tree } from '@angular-devkit/schematics';
+import * as ts from 'typescript';
+/** Parses the TSConfig file to be used in the TS Compiler Program. */
+export declare function parseTsConfig(absoluteTsConfigPath: string): ts.ParsedCommandLine;
+/** Creates a file host to be used with with a TS Compiler program. */
+export declare function createTsCompilerHost(tree: Tree, options: ts.CompilerOptions, basePath: string): ts.CompilerHost;
+export declare function createTsProgram(tree: Tree, tsConfigPath: string, basePath: string): ts.Program;

package/schematics/utilities/typescript.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createTsProgram = exports.createTsCompilerHost = exports.parseTsConfig = void 0;
+const path_1 = require("path");
+const ts = require("typescript");
+/** Parses the TSConfig file to be used in the TS Compiler Program. */
+function parseTsConfig(absoluteTsConfigPath) {
+    const { config } = ts.readConfigFile(absoluteTsConfigPath, ts.sys.readFile);
+    const parseHost = {
+        useCaseSensitiveFileNames: ts.sys.useCaseSensitiveFileNames,
+        fileExists: ts.sys.fileExists,
+        readFile: ts.sys.readFile,
+        readDirectory: ts.sys.readDirectory
+    };
+    return ts.parseJsonConfigFileContent(config, parseHost, (0, path_1.dirname)(absoluteTsConfigPath), {});
+}
+exports.parseTsConfig = parseTsConfig;
+/** Creates a file host to be used with with a TS Compiler program. */
+function createTsCompilerHost(tree, options, basePath) {
+    const host = ts.createCompilerHost(options);
+    // Read files from the virtual tree to prevent conflicting changes between project migrations
+    host.readFile = (fileName) => {
+        var _a;
+        // The angular schematic tree reads files using paths relative to the project root
+        const filePath = (0, path_1.relative)(basePath, fileName);
+        const result = (_a = tree.read(filePath)) === null || _a === void 0 ? void 0 : _a.toString();
+        // Remove BOM header to prevent TSC parsing errors
+        return result === null || result === void 0 ? void 0 : result.replace(/^\uFEFF/, '');
+    };
+    return host;
+}
+exports.createTsCompilerHost = createTsCompilerHost;
+function createTsProgram(tree, tsConfigPath, basePath) {
+    // Resolve the absolute file system path to the TSConfig file. This is needed for the TS Compiler to resolve files correctly.
+    const absoluteTsConfigPath = (0, path_1.resolve)(basePath, tsConfigPath);
+    const parsed = parseTsConfig(absoluteTsConfigPath);
+    const options = Object.assign(Object.assign({}, parsed.options), { skipLibCheck: true, skipDefaultLibCheck: true });
+    const host = createTsCompilerHost(tree, options, basePath);
+    return ts.createProgram(parsed.fileNames, options, host);
+}
+exports.createTsProgram = createTsProgram;
+//# sourceMappingURL=typescript.js.map

package/schematics/utilities/typescript.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../../projects/components/schematics/utilities/typescript.ts"],"names":[],"mappings":";;;AACA,+BAAkD;AAClD,iCAAiC;AAEjC,sEAAsE;AACtE,SAAgB,aAAa,CAAC,oBAA4B;IACxD,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,oBAAoB,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC5E,MAAM,SAAS,GAAG;QAChB,yBAAyB,EAAE,EAAE,CAAC,GAAG,CAAC,yBAAyB;QAC3D,UAAU,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU;QAC7B,QAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ;QACzB,aAAa,EAAE,EAAE,CAAC,GAAG,CAAC,aAAa;KACpC,CAAC;IAEF,OAAO,EAAE,CAAC,0BAA0B,CAAC,MAAM,EAAE,SAAS,EAAE,IAAA,cAAO,EAAC,oBAAoB,CAAC,EAAE,EAAE,CAAC,CAAC;AAC7F,CAAC;AAVD,sCAUC;AAED,sEAAsE;AACtE,SAAgB,oBAAoB,CAAC,IAAU,EAAE,OAA2B,EAAE,QAAgB;IAC5F,MAAM,IAAI,GAAG,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC5C,6FAA6F;IAC7F,IAAI,CAAC,QAAQ,GAAG,CAAC,QAAgB,EAAE,EAAE;;QACnC,kFAAkF;QAClF,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,0CAAE,QAAQ,EAAE,CAAC;QAC/C,kDAAkD;QAClD,OAAO,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IACxC,CAAC,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAXD,oDAWC;AAGD,SAAgB,eAAe,CAAC,IAAU,EAAE,YAAoB,EAAE,QAAgB;IAChF,6HAA6H;IAC7H,MAAM,oBAAoB,GAAG,IAAA,cAAO,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,aAAa,CAAC,oBAAoB,CAAC,CAAC;IACnD,MAAM,OAAO,mCAAQ,MAAM,CAAC,OAAO,KAAE,YAAY,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,GAAE,CAAC;IACrF,MAAM,IAAI,GAAG,oBAAoB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC3D,OAAO,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AAC3D,CAAC;AAPD,0CAOC"}

package/schematics/utilities/workspace.d.ts

@@ -0,0 +1,8 @@
+import { workspaces } from '@angular-devkit/core';
+import { Tree } from '@angular-devkit/schematics';
+/** Creates a file host to be used with Angular-Devkit's workspace utilities */
+export declare function createWorkspaceHost(tree: Tree): workspaces.WorkspaceHost;
+/** Returns the Angular workspace definition for the given path. The path must be a directory containing an angular.json or .angular.json file. */
+export declare function getWorkspace(path: string, tree: Tree): Promise<workspaces.WorkspaceDefinition>;
+/** Returns all tsconfig paths from the angular workspace, including testing tsconfigs. */
+export declare function getTsConfigPaths(workspace: workspaces.WorkspaceDefinition, tree: Tree): string[];

package/schematics/utilities/workspace.js

@@ -0,0 +1,72 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTsConfigPaths = exports.getWorkspace = exports.createWorkspaceHost = void 0;
+const core_1 = require("@angular-devkit/core");
+const workspace_1 = require("@schematics/angular/utility/workspace");
+/** Creates a file host to be used with Angular-Devkit's workspace utilities */
+function createWorkspaceHost(tree) {
+    return {
+        readFile(path) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const data = tree.read(path);
+                if (!data) {
+                    throw new Error(`File not found: ${path}`);
+                }
+                return core_1.virtualFs.fileBufferToString(data);
+            });
+        },
+        writeFile(path, data) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return tree.overwrite(path, data);
+            });
+        },
+        isDirectory(path) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return !tree.exists(path) && tree.getDir(path).subfiles.length > 0;
+            });
+        },
+        isFile(path) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return tree.exists(path);
+            });
+        }
+    };
+}
+exports.createWorkspaceHost = createWorkspaceHost;
+/** Returns the Angular workspace definition for the given path. The path must be a directory containing an angular.json or .angular.json file. */
+function getWorkspace(path, tree) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const host = createWorkspaceHost(tree);
+        const { workspace } = yield core_1.workspaces.readWorkspace(path, host);
+        return workspace;
+    });
+}
+exports.getWorkspace = getWorkspace;
+/** Returns all tsconfig paths from the angular workspace, including testing tsconfigs. */
+function getTsConfigPaths(workspace, tree) {
+    const buildPaths = new Set();
+    const testPaths = new Set();
+    for (const [name, target] of (0, workspace_1.allWorkspaceTargets)(workspace)) {
+        if (name !== 'build' && name !== 'test') {
+            continue;
+        }
+        for (const [, options] of (0, workspace_1.allTargetOptions)(target)) {
+            if (options.tsConfig && typeof options.tsConfig === 'string' && tree.exists(options.tsConfig)) {
+                const normalizedPath = (0, core_1.normalize)(options.tsConfig);
+                name === 'build' ? buildPaths.add(normalizedPath) : testPaths.add(normalizedPath);
+            }
+        }
+    }
+    return [...buildPaths, ...testPaths];
+}
+exports.getTsConfigPaths = getTsConfigPaths;
+//# sourceMappingURL=workspace.js.map

package/schematics/utilities/workspace.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../projects/components/schematics/utilities/workspace.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAwE;AAExE,qEAA8F;AAE9F,+EAA+E;AAC/E,SAAgB,mBAAmB,CAAC,IAAU;IAC5C,OAAO;QACC,QAAQ,CAAC,IAAY;;gBACzB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC7B,IAAI,CAAC,IAAI,EAAE;oBACT,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;iBAC5C;gBACD,OAAO,gBAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;YAC5C,CAAC;SAAA;QACK,SAAS,CAAC,IAAY,EAAE,IAAY;;gBACxC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACpC,CAAC;SAAA;QACK,WAAW,CAAC,IAAY;;gBAC5B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;YACrE,CAAC;SAAA;QACK,MAAM,CAAC,IAAY;;gBACvB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC3B,CAAC;SAAA;KACF,CAAA;AACH,CAAC;AAnBD,kDAmBC;AAED,kJAAkJ;AAClJ,SAAsB,YAAY,CAAC,IAAY,EAAE,IAAU;;QACzD,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,iBAAU,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACjE,OAAO,SAAS,CAAC;IACnB,CAAC;CAAA;AAJD,oCAIC;AAED,0FAA0F;AAC1F,SAAgB,gBAAgB,CAAC,SAAyC,EAAE,IAAU;IACpF,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IACrC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IAEpC,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,IAAA,+BAAmB,EAAC,SAAS,CAAC,EAAE;QAC3D,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,MAAM,EAAE;YACvC,SAAS;SACV;QAED,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,IAAA,4BAAgB,EAAC,MAAM,CAAC,EAAE;YAClD,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAC7F,MAAM,cAAc,GAAG,IAAA,gBAAS,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBACnD,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;aACnF;SACF;KACF;IAED,OAAO,CAAC,GAAG,UAAU,EAAE,GAAG,SAAS,CAAC,CAAC;AACvC,CAAC;AAlBD,4CAkBC"}

package/schematics/ng-generate/rxjs-7-upgrade/index.d.ts

@@ -1,2 +0,0 @@
-import { Rule } from '@angular-devkit/schematics';
-export declare function rxjs7Upgrade(): Rule;

package/schematics/ng-generate/rxjs-7-upgrade/index.js

@@ -1,140 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rxjs7Upgrade = void 0;
-const core_1 = require("@angular-devkit/core");
-const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
-const change_1 = require("@schematics/angular/utility/change");
-const workspace_1 = require("@schematics/angular/utility/workspace");
-const path_1 = require("path");
-const ts = require("typescript");
-function rxjs7Upgrade() {
-    return (tree) => __awaiter(this, void 0, void 0, function* () {
-        const workspaceHost = createWorkspaceHost(tree);
-        const { workspace } = yield core_1.workspaces.readWorkspace('/', workspaceHost);
-        // Get all tsconfig paths from the workspace, including test tsconfigs
-        const tsConfigPaths = getTsConfigPaths(workspace, tree);
-        // The base path in the file system for the workspace. This is needed for the typescript compiler to resolve files correctly.
-        const basePath = process.cwd().replace(/\\/g, '/');
-        tsConfigPaths.forEach(tsConfigPath => {
-            const program = createTsProgram(tree, tsConfigPath, basePath);
-            const checker = program.getTypeChecker();
-            for (const sourceFile of program.getSourceFiles()) {
-                // Skip declaration files and external library files
-                if (sourceFile.isDeclarationFile || program.isSourceFileFromExternalLibrary(sourceFile)) {
-                    continue;
-                }
-                const observables = ['Observable', 'Subject', 'BehaviorSubject', 'ReplaySubject', 'AsyncSubject'];
-                const toPromiseCalls = (0, ast_utils_1.findNodes)(sourceFile, ts.isCallExpression, undefined, true).filter(node => {
-                    if (ts.isPropertyAccessExpression(node.expression) && node.expression.name.text === 'toPromise') {
-                        const symbol = checker.getTypeAtLocation(node.expression.expression).symbol;
-                        return symbol && observables.includes(symbol.name);
-                    }
-                    return false;
-                });
-                if (toPromiseCalls.length) {
-                    const fileToEdit = (0, path_1.relative)(basePath, sourceFile.fileName);
-                    const recorder = tree.beginUpdate(fileToEdit);
-                    const changes = [];
-                    const printer = ts.createPrinter();
-                    // Add import for lastValueFrom
-                    changes.push((0, ast_utils_1.insertImport)(sourceFile, fileToEdit, 'lastValueFrom', 'rxjs'));
-                    // Replace toPromise calls with lastValueFrom
-                    toPromiseCalls.forEach(node => {
-                        if (ts.isPropertyAccessExpression(node.expression)) {
-                            const newCallExpression = ts.factory.createCallExpression(ts.factory.createIdentifier('lastValueFrom'), undefined, [node.expression.expression]);
-                            const newNodeText = printer.printNode(ts.EmitHint.Unspecified, newCallExpression, sourceFile);
-                            const change = new change_1.ReplaceChange(fileToEdit, node.getStart(), node.getText(), newNodeText);
-                            changes.push(change);
-                        }
-                    });
-                    (0, change_1.applyToUpdateRecorder)(recorder, changes);
-                    tree.commitUpdate(recorder);
-                }
-            }
-        });
-    });
-}
-exports.rxjs7Upgrade = rxjs7Upgrade;
-function createWorkspaceHost(tree) {
-    return {
-        readFile(path) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const data = tree.read(path);
-                if (!data) {
-                    throw new Error(`File not found: ${path}`);
-                }
-                return core_1.virtualFs.fileBufferToString(data);
-            });
-        },
-        writeFile(path, data) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return tree.overwrite(path, data);
-            });
-        },
-        isDirectory(path) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return !tree.exists(path) && tree.getDir(path).subfiles.length > 0;
-            });
-        },
-        isFile(path) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return tree.exists(path);
-            });
-        }
-    };
-}
-function getTsConfigPaths(workspace, tree) {
-    const buildPaths = new Set();
-    const testPaths = new Set();
-    for (const [name, target] of (0, workspace_1.allWorkspaceTargets)(workspace)) {
-        if (name !== 'build' && name !== 'test') {
-            continue;
-        }
-        for (const [, options] of (0, workspace_1.allTargetOptions)(target)) {
-            if (options.tsConfig && typeof options.tsConfig === 'string' && tree.exists(options.tsConfig)) {
-                const normalizedPath = (0, core_1.normalize)(options.tsConfig);
-                name === 'build' ? buildPaths.add(normalizedPath) : testPaths.add(normalizedPath);
-            }
-        }
-    }
-    return [...buildPaths, ...testPaths];
-}
-function createTsProgram(tree, tsConfigPath, basePath) {
-    tsConfigPath = (0, path_1.resolve)(basePath, tsConfigPath);
-    const parsed = parseTsConfig(tsConfigPath, (0, path_1.dirname)(tsConfigPath));
-    const options = Object.assign(Object.assign({}, parsed.options), { skipLibCheck: true, skipDefaultLibCheck: true });
-    const host = createTsCompilerHost(tree, options, basePath);
-    return ts.createProgram(parsed.fileNames, options, host);
-}
-function parseTsConfig(tsConfigPath, basePath) {
-    const { config } = ts.readConfigFile(tsConfigPath, ts.sys.readFile);
-    const parseHost = {
-        useCaseSensitiveFileNames: ts.sys.useCaseSensitiveFileNames,
-        fileExists: ts.sys.fileExists,
-        readFile: ts.sys.readFile,
-        readDirectory: ts.sys.readDirectory
-    };
-    return ts.parseJsonConfigFileContent(config, parseHost, basePath, {});
-}
-function createTsCompilerHost(tree, options, basePath) {
-    const host = ts.createCompilerHost(options);
-    // Read files from the virtual tree to prevent conflicting changes between project migrations
-    host.readFile = (fileName) => {
-        var _a;
-        const relativePath = (0, path_1.relative)(basePath, fileName);
-        const result = (_a = tree.read(relativePath)) === null || _a === void 0 ? void 0 : _a.toString();
-        // Remove BOM header to prevent TSC parsing errors
-        return result === null || result === void 0 ? void 0 : result.replace(/^\uFEFF/, '');
-    };
-    return host;
-}
-//# sourceMappingURL=index.js.map

package/schematics/ng-generate/rxjs-7-upgrade/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../projects/components/schematics/ng-generate/rxjs-7-upgrade/index.ts"],"names":[],"mappings":"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"}