@o3r/schematics 8.2.0-alpha.9 → 8.2.0-alpha.90

package/src/utility/modules.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isApplicationThatUsesRouterModule = exports.getMainFilePath = exports.getAppModuleFilePath = void 0;
+exports.insertBeforeModule = exports.addProviderToModuleFile = exports.insertImportToModuleFile = exports.addImportToModuleFile = exports.isApplicationThatUsesRouterModule = exports.getMainFilePath = exports.getAppModuleFilePath = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const ts = require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript");
 const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
+const change_1 = require("@schematics/angular/utility/change");
 const fs = require("node:fs");
 const globby_1 = require("globby");
 const path = require("node:path");
@@ -98,4 +99,103 @@ function isApplicationThatUsesRouterModule(tree) {
         });
 }
 exports.isApplicationThatUsesRouterModule = isApplicationThatUsesRouterModule;
+/**
+ * Add import to the main module
+ *
+ * @param name
+ * @param file
+ * @param sourceFile
+ * @param sourceFileContent
+ * @param context
+ * @param moduleFilePath
+ * @param moduleIndex
+ * @param recorder
+ * @param moduleFunction
+ * @param override
+ */
+function addImportToModuleFile(name, file, sourceFile, sourceFileContent, context, recorder, moduleFilePath, moduleIndex, moduleFunction, override = false) {
+    const importMatch = sourceFileContent.slice(moduleIndex).match(new RegExp(`(${name})(\\.[a-zA-Z\\s\\n]+\\()?(,\\n?)?`));
+    if (!!importMatch && !override) {
+        context.logger.warn(`Skipped ${name} (already imported)`);
+        return recorder;
+    }
+    else if (importMatch?.[2]) {
+        context.logger.warn(`Skipped ${name}${moduleFunction || ''} (already imported with method). Cannot override automatically`);
+        return recorder;
+    }
+    else if (override && (0, ast_utils_1.isImported)(sourceFile, name, file) && !!importMatch && !Number.isNaN(importMatch.index)) {
+        recorder = recorder.remove(moduleIndex + importMatch.index, importMatch[0].length);
+        recorder = recorder.insertLeft(moduleIndex + importMatch.index, moduleIndex + importMatch.index > moduleIndex ? name + moduleFunction + (importMatch[3] || '') : name);
+    }
+    else {
+        (0, ast_utils_1.addImportToModule)(sourceFile, moduleFilePath, name, file)
+            .forEach((change) => {
+            if (change instanceof change_1.InsertChange) {
+                recorder = recorder.insertLeft(change.pos, moduleFunction && change.pos > moduleIndex ? change.toAdd.replace(name, name + moduleFunction) : change.toAdd);
+            }
+        });
+    }
+    return recorder;
+}
+exports.addImportToModuleFile = addImportToModuleFile;
+/**
+ * Insert import on top of the main module file
+ *
+ * @param name
+ * @param file
+ * @param sourceFile
+ * @param recorder
+ * @param moduleFilePath
+ * @param isDefault
+ */
+function insertImportToModuleFile(name, file, sourceFile, recorder, moduleFilePath, isDefault) {
+    const importChange = (0, ast_utils_1.insertImport)(sourceFile, moduleFilePath, name, file, isDefault);
+    if (importChange instanceof change_1.InsertChange) {
+        return recorder.insertLeft(importChange.pos, importChange.toAdd);
+    }
+    return recorder;
+}
+exports.insertImportToModuleFile = insertImportToModuleFile;
+/**
+ * Add providers to the main module
+ *
+ * @param name
+ * @param file
+ * @param sourceFile
+ * @param sourceFileContent
+ * @param context
+ * @param recorder
+ * @param moduleFilePath
+ * @param moduleIndex
+ * @param customProvider
+ */
+function addProviderToModuleFile(name, file, sourceFile, sourceFileContent, context, recorder, moduleFilePath, moduleIndex, customProvider) {
+    if (new RegExp(name).test(sourceFileContent.substr(moduleIndex))) {
+        context.logger.warn(`Skipped ${name} (already provided)`);
+        return recorder;
+    }
+    (0, ast_utils_1.addProviderToModule)(sourceFile, moduleFilePath, name, file)
+        .forEach((change) => {
+        if (change instanceof change_1.InsertChange) {
+            recorder = recorder.insertLeft(change.pos, customProvider && change.pos > moduleIndex ? change.toAdd.replace(name, customProvider) : change.toAdd);
+        }
+    });
+    return recorder;
+}
+exports.addProviderToModuleFile = addProviderToModuleFile;
+/**
+ * Add custom code before the module definition
+ *
+ * @param line
+ * @param file
+ * @param recorder
+ * @param moduleIndex
+ */
+function insertBeforeModule(line, file, recorder, moduleIndex) {
+    if (file.indexOf(line.replace(/[\r\n ]*/g, '')) === -1) {
+        return recorder.insertLeft(moduleIndex - 1, `${line}\n\n`);
+    }
+    return recorder;
+}
+exports.insertBeforeModule = insertBeforeModule;
 //# sourceMappingURL=modules.js.map

package/src/utility/modules.js.map

@@ -1 +1 @@
-{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../../src/utility/modules.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../../src/utility/modules.ts"],"names":[],"mappings":";;;AAAA,2DAAuG;AACvG,qGAAqG;AACrG,qEAK+C;AAC/C,+DAAgE;AAChE,8BAA8B;AAC9B,mCAA0C;AAC1C,kCAAkC;AAClC,+BAAiD;AACjD,uCAA6C;AAE7C;;;;;GAKG;AACH,SAAgB,oBAAoB,CAAC,IAAU,EAAE,OAAyB;IACxE,MAAM,gBAAgB,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,CAAC;IAClD,6BAA6B;IAC7B,IAAI,gBAAgB,CAAC,WAAW,KAAK,aAAa,EAAE;QAClD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kEAAkE,CAAC,CAAC;QACzF,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,YAAY,GAAW,gBAAgB,CAAC,SAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;IAC5E,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAE,CAAC,QAAQ,EAAE,CAAC;IAErD,MAAM,2BAA2B,GAAG,QAAQ,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IAClF,IAAI,CAAC,2BAA2B,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC,EAAE;QACnE,MAAM,IAAI,gCAAmB,CAAC,iCAAiC,CAAC,CAAC;KAClE;IAED,MAAM,eAAe,GAAG,2BAA2B,CAAC,CAAC,CAAC,CAAC;IACvD,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,mBAAmB,eAAe,qCAAqC,EAAE,GAAG,CAAC,CAAC;IAE5G,MAAM,+BAA+B,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACnE,IAAI,CAAC,+BAA+B,IAAI,CAAC,+BAA+B,CAAC,CAAC,CAAC,EAAE;QAC3E,MAAM,IAAI,gCAAmB,CAAC,iCAAiC,CAAC,CAAC;KAClE;IAED,mCAAmC;IACnC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,+BAA+B,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;IAE3I,MAAM,0BAA0B,GAAG,IAAI,MAAM,CAAC,YAAY,eAAe,EAAE,EAAE,IAAI,CAAC,CAAC;IAEnF,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc,CAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,EAAE;QAC1G,OAAO,cAAc,CAAC;KACvB;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;IACrK,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,EAAE;QAChH,OAAO,iBAAiB,CAAC;KAC1B;IAED,wCAAwC;IACxC,MAAM,kBAAkB,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/E,MAAM,IAAI,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC;IAExD,MAAM,OAAO,GAAG,IAAA,gCAA0B,EAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;IAErE,MAAM,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;IAC5E,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;IAEtC,IAAI,qBAAqB,EAAE;QACzB,MAAM,oBAAoB,GAAG,OAAO,CAAC,qBAAqB,CAAC,qBAAqB,CAAC,CAAC;QAClF,MAAM,QAAQ,GAAG,oBAAoB,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,IAAI,eAAe,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC3G,MAAM,gBAAgB,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC9I,MAAM,cAAc,GAAG,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAChJ,IAAI,cAAc,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc,CAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAC,EAAE;YAC5H,OAAO,cAAc,CAAC;SACvB;KACF;IACD,MAAM,IAAI,gCAAmB,CAAC,kBAAkB,eAAe,cAAc,CAAC,CAAC;AAEjF,CAAC;AA1DD,oDA0DC;AAED;;;;;GAKG;AACH,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAyB;IACnE,MAAM,gBAAgB,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,CAAC;IAClD,6BAA6B;IAC7B,IAAI,gBAAgB,CAAC,WAAW,KAAK,aAAa,EAAE;QAClD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kEAAkE,CAAC,CAAC;QACzF,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,YAAY,GAAW,gBAAgB,CAAC,SAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;IAC5E,OAAO,YAAY,CAAC;AACtB,CAAC;AAVD,0CAUC;AAED;;;;;GAKG;AACH,SAAgB,iCAAiC,CAAC,IAAU;IAC1D,MAAM,gBAAgB,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,CAAC;IAClD,OAAO,gBAAgB,CAAC,WAAW,KAAK,aAAa,IAAI,gBAAgB,CAAC,UAAU;QAClF,IAAA,aAAU,EAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACvF,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACrH,IAAI;gBACF,OAAO,CAAC,CAAC,IAAA,sCAA0B,EAAC,UAAU,CAAC,CAAC;aACjD;YAAC,MAAM,GAAE;YACV,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;AACP,CAAC;AAVD,8EAUC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAgB,qBAAqB,CAAC,IAAY,EAAE,IAAY,EAAE,UAAyB,EAAE,iBAAyB,EAAE,OAAyB,EAAE,QAAwB,EACrI,cAAsB,EAAE,WAAmB,EAAE,cAAuB,EAAE,QAAQ,GAAG,KAAK;IAC1H,MAAM,WAAW,GAAG,iBAAiB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,IAAI,mCAAmC,CAAC,CAAC,CAAC;IACxH,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,QAAQ,EAAE;QAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,qBAAqB,CAAC,CAAC;QAC1D,OAAO,QAAQ,CAAC;KACjB;SAAM,IAAI,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE;QAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,GAAG,cAAc,IAAI,EAAE,gEAAgE,CAAC,CAAC;QAC5H,OAAO,QAAQ,CAAC;KACjB;SAAM,IAAI,QAAQ,IAAI,IAAA,sBAAU,EAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;QAC9G,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC,KAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACpF,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,WAAW,GAAG,WAAW,CAAC,KAAM,EAAE,WAAW,GAAG,WAAW,CAAC,KAAM,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,GAAG,cAAe,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;KAC3K;SAAM;QACL,IAAA,6BAAiB,EAAC,UAAU,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,CAAC;aACtD,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAClB,IAAI,MAAM,YAAY,qBAAY,EAAE;gBAClC,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE,cAAc,IAAI,MAAM,CAAC,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aAC3J;QACH,CAAC,CAAC,CAAC;KACN;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AArBD,sDAqBC;AAED;;;;;;;;;GASG;AACH,SAAgB,wBAAwB,CAAC,IAAY,EAAE,IAAY,EAAE,UAAyB,EAAE,QAAwB,EAAE,cAAsB,EAAE,SAAmB;IACnK,MAAM,YAAY,GAAG,IAAA,wBAAY,EAAC,UAAU,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IACrF,IAAI,YAAY,YAAY,qBAAY,EAAE;QACxC,OAAO,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;KAClE;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAND,4DAMC;AAGD;;;;;;;;;;;;GAYG;AACH,SAAgB,uBAAuB,CAAC,IAAY,EAAE,IAAY,EAAE,UAAyB,EAAE,iBAAyB,EAAE,OAAyB,EAAE,QAAwB,EACrI,cAAsB,EAAE,WAAmB,EAAE,cAAuB;IAC1G,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE;QAChE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,qBAAqB,CAAC,CAAC;QAC1D,OAAO,QAAQ,CAAC;KACjB;IACD,IAAA,+BAAmB,EAAC,UAAU,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,CAAC;SACxD,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAClB,IAAI,MAAM,YAAY,qBAAY,EAAE;YAClC,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE,cAAc,IAAI,MAAM,CAAC,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SACpJ;IACH,CAAC,CAAC,CAAC;IACL,OAAO,QAAQ,CAAC;AAClB,CAAC;AAbD,0DAaC;AAED;;;;;;;GAOG;AACH,SAAgB,kBAAkB,CAAC,IAAY,EAAE,IAAY,EAAE,QAAwB,EAAE,WAAmB;IAC1G,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE;QACtD,OAAO,QAAQ,CAAC,UAAU,CAAC,WAAW,GAAG,CAAC,EAAE,GAAG,IAAI,MAAM,CAAC,CAAC;KAC5D;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AALD,gDAKC"}

package/src/utility/package-manager-runner.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Get package manager used in runs
+ * Defaults to the package manager setup in process.env if no package manager set in angular.json
+ *
+ * @param angularJsonString Content of angular.json file
+ */
+export declare function getPackageManager(angularJsonString?: string | null): string;
+/**
+ * Get command to execute scripts with your package manager
+ *
+ * @param angularJsonString
+ */
+export declare function getPackageManagerRunner(angularJsonString?: string | null): "yarn" | "npx";
+//# sourceMappingURL=package-manager-runner.d.ts.map

package/src/utility/package-manager-runner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"package-manager-runner.d.ts","sourceRoot":"","sources":["../../../src/utility/package-manager-runner.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,UASlE;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,kBAExE"}

package/src/utility/package-manager-runner.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPackageManagerRunner = exports.getPackageManager = void 0;
+const commentJson = require("comment-json");
+/**
+ * Get package manager used in runs
+ * Defaults to the package manager setup in process.env if no package manager set in angular.json
+ *
+ * @param angularJsonString Content of angular.json file
+ */
+function getPackageManager(angularJsonString) {
+    let packageManager = process.env && process.env.npm_execpath && process.env.npm_execpath.indexOf('yarn') === -1 ? 'npm' : 'yarn';
+    if (angularJsonString) {
+        const angularJsonObj = commentJson.parse(angularJsonString);
+        if (angularJsonObj?.cli?.packageManager) {
+            packageManager = angularJsonObj.cli.packageManager;
+        }
+    }
+    return packageManager;
+}
+exports.getPackageManager = getPackageManager;
+/**
+ * Get command to execute scripts with your package manager
+ *
+ * @param angularJsonString
+ */
+function getPackageManagerRunner(angularJsonString) {
+    return getPackageManager(angularJsonString) === 'yarn' ? 'yarn' : 'npx';
+}
+exports.getPackageManagerRunner = getPackageManagerRunner;
+//# sourceMappingURL=package-manager-runner.js.map

package/src/utility/package-manager-runner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"package-manager-runner.js","sourceRoot":"","sources":["../../../src/utility/package-manager-runner.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAE5C;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,iBAAiC;IACjE,IAAI,cAAc,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;IACjI,IAAI,iBAAiB,EAAE;QACrB,MAAM,cAAc,GAAG,WAAW,CAAC,KAAK,CAAC,iBAAiB,CAAQ,CAAC;QACnE,IAAI,cAAc,EAAE,GAAG,EAAE,cAAc,EAAE;YACvC,cAAc,GAAG,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC;SACpD;KACF;IACD,OAAO,cAAc,CAAC;AACxB,CAAC;AATD,8CASC;AAED;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,iBAAiC;IACvE,OAAO,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;AAC1E,CAAC;AAFD,0DAEC"}

package/src/utility/routes.d.ts

@@ -34,6 +34,7 @@ export declare function getRoutesNodeArray(tree: Tree, context: SchematicContext
  * @param context Context of the rule
  * @param appRoutingModulePath Path of the App Routing Module
  * @param route The Route to insert
+ * @param standalone Whether the page component is standalone
  */
-export declare function insertRoute(tree: Tree, context: SchematicContext, appRoutingModulePath: string, route: Route): import("@angular-devkit/schematics/src/tree/interface").Tree;
+export declare function insertRoute(tree: Tree, context: SchematicContext, appRoutingModulePath: string, route: Route, standalone?: boolean): import("@angular-devkit/schematics/src/tree/interface").Tree;
 //# sourceMappingURL=routes.d.ts.map

package/src/utility/routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../src/utility/routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,KAAK,EAAE,MAAM,gFAAgF,CAAC;AAErG;;GAEG;AACH,MAAM,WAAW,KAAK;IACpB,yBAAyB;IACzB,IAAI,EAAE,MAAM,CAAC;IAEb,yCAAyC;IACzC,MAAM,EAAE,MAAM,CAAC;IAEf,kCAAkC;IAClC,MAAM,EAAE,MAAM,CAAC;CAChB;AAmCD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,GAAG,EAAE,CAAC,mBAAmB,GAAG,IAAI,CAuBvI;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,uBAAuB,CAAC,GAAG,IAAI,CAuBvJ;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,gEAe5G"}
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../src/utility/routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,KAAK,EAAE,MAAM,gFAAgF,CAAC;AAErG;;GAEG;AACH,MAAM,WAAW,KAAK;IACpB,yBAAyB;IACzB,IAAI,EAAE,MAAM,CAAC;IAEb,yCAAyC;IACzC,MAAM,EAAE,MAAM,CAAC;IAEf,kCAAkC;IAClC,MAAM,EAAE,MAAM,CAAC;CAChB;AAmCD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,GAAG,EAAE,CAAC,mBAAmB,GAAG,IAAI,CAuBvI;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,uBAAuB,CAAC,GAAG,IAAI,CAuBvJ;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,GAAE,OAAe,gEAezI"}

package/src/utility/routes.js

@@ -84,13 +84,14 @@ exports.getRoutesNodeArray = getRoutesNodeArray;
  * @param context Context of the rule
  * @param appRoutingModulePath Path of the App Routing Module
  * @param route The Route to insert
+ * @param standalone Whether the page component is standalone
  */
-function insertRoute(tree, context, appRoutingModulePath, route) {
+function insertRoute(tree, context, appRoutingModulePath, route, standalone = false) {
     const routes = getRoutesNodeArray(tree, context, appRoutingModulePath);
     if (routes) {
         const noStarRoutes = routes.filter((r) => !hasRoutePath(r, '**'));
         const index = noStarRoutes.length >= 1 ? noStarRoutes[noStarRoutes.length - 1].end : routes.end;
-        const routeString = `{path: '${route.path}', loadChildren: () => import('${route.import}').then((m) => m.${route.module})}`;
+        const routeString = `{path: '${route.path}', load${standalone ? 'Component' : 'Children'}: () => import('${route.import}').then((m) => m.${route.module})}`;
         const content = noStarRoutes.length >= 1 ? `,\n${routeString}` : routeString;
         const recorder = tree.beginUpdate(appRoutingModulePath);
         recorder.insertLeft(index, content);

package/src/utility/routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../src/utility/routes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../src/utility/routes.ts"],"names":[],"mappings":"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"}

package/src/utility/template-property.helper.js

@@ -168,7 +168,7 @@ function getLibraryNameFromPath(path) {
     if (!path) {
         return null;
     }
-    const libNameRes = /@[^/]*\/[^/]*/.exec(path.replace(/\\/g, '/'));
+    const libNameRes = /@[^@/]+\/[^/]+/.exec(path.replace(/\\/g, '/'));
     return libNameRes && libNameRes[0];
 }
 exports.getLibraryNameFromPath = getLibraryNameFromPath;

package/src/utility/template-property.helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"template-property.helper.js","sourceRoot":"","sources":["../../../src/utility/template-property.helper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"template-property.helper.js","sourceRoot":"","sources":["../../../src/utility/template-property.helper.ts"],"names":[],"mappings":"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"}

package/src/utility/update-imports.d.ts

@@ -0,0 +1,25 @@
+import * as ts from 'typescript';
+import { logging } from '@angular-devkit/core';
+import type { Tree } from '@angular-devkit/schematics';
+/** Map containing all import changes in otter packages */
+export interface ImportsMapping {
+    [packageName: string]: {
+        [importName: string]: {
+            newPackage: string;
+            newValue?: string;
+        };
+    };
+}
+/**
+ * Update the imports of a given file according to replace mapping
+ *
+ * @param logger Logger to report messages
+ * @param tree File System tree
+ * @param sourceFile Source file to analyze
+ * @param importsRegexp Regexp of the imports to replace
+ * @param renamePackagesRegexp Regexp of the packages to replace
+ * @param mapImports Map of the import to replace
+ * @param renamedPackages Map of the import package to replace
+ */
+export declare function updateImportsInFile(logger: logging.LoggerApi, tree: Tree, sourceFile: ts.SourceFile, importsRegexp: RegExp, renamePackagesRegexp: RegExp, mapImports?: ImportsMapping, renamedPackages?: Record<string, string>): number;
+//# sourceMappingURL=update-imports.d.ts.map

package/src/utility/update-imports.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-imports.d.ts","sourceRoot":"","sources":["../../../src/utility/update-imports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAavD,0DAA0D;AAC1D,MAAM,WAAW,cAAc;IAC7B,CAAC,WAAW,EAAE,MAAM,GAAG;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG;YAAE,UAAU,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;CAC5F;AAGD;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,OAAO,CAAC,SAAS,EACzB,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,aAAa,EAAE,MAAM,EACrB,oBAAoB,EAAE,MAAM,EAC5B,UAAU,GAAE,cAAmB,EAC/B,eAAe,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,UAkF7C"}

package/src/utility/update-imports.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateImportsInFile = void 0;
+const ts = require("typescript");
+const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
+/**
+ * Update the imports of a given file according to replace mapping
+ *
+ * @param logger Logger to report messages
+ * @param tree File System tree
+ * @param sourceFile Source file to analyze
+ * @param importsRegexp Regexp of the imports to replace
+ * @param renamePackagesRegexp Regexp of the packages to replace
+ * @param mapImports Map of the import to replace
+ * @param renamedPackages Map of the import package to replace
+ */
+function updateImportsInFile(logger, tree, sourceFile, importsRegexp, renamePackagesRegexp, mapImports = {}, renamedPackages = {}) {
+    const oldImportedSymbolsPerPackage = {};
+    const unResolvedImports = [];
+    const importNodes = [];
+    // First we look for all imports lines targeting an Otter package for which we know a mapping
+    (0, ast_utils_1.findNodes)(sourceFile, ts.SyntaxKind.ImportDeclaration).map((nodeImp) => {
+        const imp = nodeImp;
+        const importFrom = imp.moduleSpecifier.getText().replace(/['"]/g, '');
+        const renamePackageMatch = importFrom.match(renamePackagesRegexp);
+        const otterPackage = renamePackageMatch ? renamePackageMatch[0] : importFrom.match(importsRegexp)?.[0];
+        // If the import matched an Otter package
+        if (otterPackage) {
+            if (!oldImportedSymbolsPerPackage[otterPackage]) {
+                oldImportedSymbolsPerPackage[otterPackage] = [];
+            }
+            // We store the import line to be able to remove it afterwards
+            importNodes.push(imp);
+            // We retrieve all the symbols listed in the import statement
+            const namedImport = imp.importClause && imp.importClause.getChildAt(0);
+            const imports = namedImport && ts.isNamedImports(namedImport) ?
+                namedImport.elements.map((element) => ({ symbol: element.getText(), location: importFrom })) :
+                [];
+            // And associate them to the Otter package
+            oldImportedSymbolsPerPackage[otterPackage].push(...imports);
+        }
+    });
+    // If did not capture any interesting import line, do nothing
+    if (importNodes.length === 0) {
+        return 0;
+    }
+    // Iterate over the imports and look into the renamed packages and into the map to see the import new module
+    // If no mapping is found, we keep the original import location
+    const resolvedImports = Object.entries(oldImportedSymbolsPerPackage).reduce((acc, [oldPackageName, importsFromOldPackage]) => {
+        importsFromOldPackage.forEach((importSymbol) => {
+            let newPackageNameImport;
+            if (Object.keys(renamedPackages).indexOf(oldPackageName) > 0) {
+                newPackageNameImport = importSymbol.location.replace(oldPackageName, renamedPackages[oldPackageName]);
+            }
+            else {
+                newPackageNameImport = mapImports[oldPackageName]?.[importSymbol.symbol]?.newPackage;
+            }
+            const importFrom = newPackageNameImport || importSymbol.location;
+            if (!newPackageNameImport) {
+                unResolvedImports.push(importSymbol);
+            }
+            if (!acc[importFrom]) {
+                acc[importFrom] = [];
+            }
+            const newNameForExportedValue = mapImports[oldPackageName]?.[importSymbol.symbol]?.newValue;
+            acc[importFrom].push(newNameForExportedValue || importSymbol.symbol);
+        });
+        return acc;
+    }, {});
+    // Remove captured imports
+    const fileWithoutImports = tree.read(sourceFile.fileName).toString()
+        .replace(new RegExp(`(${importNodes.map((node) => node.getText()).join('|')})[\\n\\r]*`, 'g'), '');
+    // Add the computed imports at the top of the file
+    const fileWithNewImports = Object.entries(resolvedImports)
+        .map(([importFrom, imports]) => `import {${imports.join(', ')}} from '${importFrom}';`)
+        .join('\n') + '\n' + fileWithoutImports;
+    tree.overwrite(sourceFile.fileName, fileWithNewImports);
+    // Log details about imports for which we could not find an associated sub-entry
+    if (unResolvedImports.length > 0) {
+        logger.warn(`Some imports in file ${sourceFile.fileName} could not be resolved:`);
+        unResolvedImports.forEach((unResolvedImport) => logger.warn(`  |-- symbol "${unResolvedImport.symbol}" from module "${unResolvedImport.location}"`));
+    }
+    return unResolvedImports.length;
+}
+exports.updateImportsInFile = updateImportsInFile;
+//# sourceMappingURL=update-imports.js.map

package/src/utility/update-imports.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../src/utility/update-imports.ts"],"names":[],"mappings":"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"}