npm - @magic-xpa/cli - Versions diffs - 4.1300.0-dev4130.26 → 4.1300.0-dev4130.260 - Mend

@magic-xpa/cli 4.1300.0-dev4130.26 → 4.1300.0-dev4130.260

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (70) hide show

package/src/schematics/mg-add/index.js CHANGED Viewed

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mgAdd = mgAdd;
+const tslib_1 = require("tslib");
 const schematics_1 = require("@angular-devkit/schematics");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
 const package_1 = require("./../utils/package");
@@ -12,7 +13,7 @@ const Util_1 = require("../magic-utils/Util");
 const generate_rule_1 = require("../magic-utils/rules/generate.rule");
 const generated_file_types_enum_1 = require("../../types/enums/generated-file-types.enum");
 const ast_utils_1 = require("../utils/devkit-utils/ast-utils");
-const ts = require("typescript");
+const ts = tslib_1.__importStar(require("typescript"));
 const change_1 = require("../utils/devkit-utils/change");
 function mgAdd(options) {
     return (0, schematics_1.chain)([
@@ -24,7 +25,8 @@ function mgAdd(options) {
         updateAngularJsonWithMagicStyle(options),
         updateTsConfigAppJson(options),
         addLazyLoadProvider(),
-        // handel app.component.html
+        addZoneChangeDetectionProviderRule(),
+        //handel app.html
         //updateAppComponentHtmlFiles       (options),
         //handel package.Json
         //addMagicDependenciesToPackageJson (options),
@@ -32,8 +34,8 @@ function mgAdd(options) {
 }
 function updateAppComponentHtmlFiles(options) {
     return (0, generate_rule_1.generate)({
-        template: "./templates/angular/src/app/app.component.html.ejs",
-        name: "app.component.html",
+        template: "./templates/angular/src/app/app.html.ejs",
+        name: "app.html",
         destination: env_1.env.metadata.paths.rootMagicGenFolder,
         type: generated_file_types_enum_1.GeneratedFileTypes.HTML,
         data: {
@@ -43,19 +45,36 @@ function updateAppComponentHtmlFiles(options) {
 }
 function updateAngularJsonWithMagicStyle(options) {
     return (host, context) => {
+        var _a, _b, _c, _d;
         const project = env_1.env.project;
         let isDirty = false;
         let fullPathmagicStylePath = env_1.env.metadata.paths.magicStylePath;
-        if (!project.architect.test.options.styles.includes(fullPathmagicStylePath)) {
-            context.logger.info(`  [>]add file ${fullPathmagicStylePath} to test`);
-            project.architect.test.options.styles.push(fullPathmagicStylePath);
-            isDirty = true;
-        }
+        // if (!project.architect.test.options.styles.includes(fullPathmagicStylePath)) {
+        //   context.logger.info(`  [>]add file ${fullPathmagicStylePath} to test`);
+        //   project.architect.test.options.styles.push(fullPathmagicStylePath);
+        //   isDirty = true;
+        // }
         if (!project.architect.build.options.styles.includes(fullPathmagicStylePath)) {
             context.logger.info(`  [>]add file ${fullPathmagicStylePath} to build`);
             project.architect.build.options.styles.push(fullPathmagicStylePath);
             isDirty = true;
         }
+        const buildOptions = (_b = (_a = project === null || project === void 0 ? void 0 : project.architect) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.options;
+        const testOptions = (_d = (_c = project === null || project === void 0 ? void 0 : project.architect) === null || _c === void 0 ? void 0 : _c.test) === null || _d === void 0 ? void 0 : _d.options;
+        if (buildOptions) {
+            const changed = ensurePolyfills(buildOptions, ['zone.js']);
+            if (changed) {
+                context.logger.info(`  [>]add polyfill zone.js to build`);
+                isDirty = true;
+            }
+        }
+        if (testOptions) {
+            const changed = ensurePolyfills(testOptions, ['zone.js', 'zone.js/testing']);
+            if (changed) {
+                context.logger.info(`  [>]add polyfills zone.js, zone.js/testing to test`);
+                isDirty = true;
+            }
+        }
         if (isDirty) {
             let fullPath = env_1.env.metadata.paths.angularJsonPath;
             host.overwrite(fullPath, JSON.stringify(env_1.env.workspace, null, 2));
@@ -63,6 +82,26 @@ function updateAngularJsonWithMagicStyle(options) {
         return host;
     };
 }
+function ensurePolyfills(options, requiredPolyfills) {
+    let polyfills = [];
+    if (Array.isArray(options.polyfills)) {
+        polyfills = [...options.polyfills];
+    }
+    else if (typeof options.polyfills === 'string' && options.polyfills.trim()) {
+        polyfills = [options.polyfills];
+    }
+    let changed = !Array.isArray(options.polyfills);
+    for (const entry of requiredPolyfills) {
+        if (!polyfills.includes(entry)) {
+            polyfills.push(entry);
+            changed = true;
+        }
+    }
+    if (changed) {
+        options.polyfills = polyfills;
+    }
+    return changed;
+}
 // Angular 10 , does not include .ts file for compilation
 // So to avoid compilation error , add *.module.ts in includes section
 function updateTsConfigAppJson(option) {
@@ -78,6 +117,10 @@ function updateTsConfigAppJson(option) {
         //Add module files for compilation
         if (!config['include'].includes('src/**/*module.ts'))
             config['include'].push('src/**/*module.ts');
+        if (!config['compilerOptions'])
+            config['compilerOptions'] = {};
+        // Ensures forceConsistentCasingInFileNames is set to false inorder to avoid path casing differences while compilation
+        config['compilerOptions']['forceConsistentCasingInFileNames'] = false;
         // append the comment again and write the file
         host.overwrite(tsConfigPath, comment + "\n" + JSON.stringify(config, null, 2));
         return host;
@@ -123,7 +166,7 @@ function addMagicModuleToAppModule(options) {
 }
 function addLazyLoadProvider() {
     return (host) => {
-        const appmodule = env_1.env.metadata.paths.rootMagicGenFolder + '/app.module.ts';
+        const appmodule = env_1.env.metadata.paths.rootMagicGenFolder + '/app-module.ts';
         const lazyLoaderService = 'LazyLoaderService';
         const lazyLoaderServicePath = './magic/lazy-loader.service';
         let text = host.read(appmodule);
@@ -138,16 +181,92 @@ function addLazyLoadProvider() {
             }
         }
         host.commitUpdate(providerRecorder);
+        sourceText = host.read(appmodule).toString('utf-8');
+        source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);
         const lazyLoaderServiceImport = (0, ast_utils_1.insertImport)(source, appmodule, lazyLoaderService, lazyLoaderServicePath, false);
         const lazyLoaderServiceChangesRecorder = host.beginUpdate(appmodule);
         if (lazyLoaderServiceImport instanceof change_1.InsertChange)
             lazyLoaderServiceChangesRecorder.insertLeft(lazyLoaderServiceImport.pos, lazyLoaderServiceImport.toAdd);
         host.commitUpdate(lazyLoaderServiceChangesRecorder);
         // add import for MagicLazyLoaderService
+        sourceText = host.read(appmodule).toString('utf-8');
+        source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);
         const magicLazyLoaderServiceImportChanges = (0, ast_utils_1.insertImport)(source, appmodule, 'MagicLazyLoaderService', '@magic-xpa/angular', false);
         const magicImportChangesRecorder = host.beginUpdate(appmodule);
         magicImportChangesRecorder.insertLeft(magicLazyLoaderServiceImportChanges.pos, magicLazyLoaderServiceImportChanges.toAdd);
         host.commitUpdate(magicImportChangesRecorder);
     };
 }
+function addZoneChangeDetectionProviderRule() {
+    return (host) => {
+        // Resolve the generated root module path (src/app/app-module.ts in this project layout).
+        const appmodule = env_1.env.metadata.paths.rootMagicGenFolder + '/app-module.ts';
+        // Append provideZoneChangeDetection() to NgModule.providers if it does not already exist.
+        addZoneChangeDetectionProvider(host, appmodule);
+        // Re-parse from disk after provider update so import insertion uses fresh AST positions.
+        const sourceText = host.read(appmodule).toString('utf-8');
+        const source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);
+        // Ensure the symbol import exists; insertImport is idempotent and avoids duplicates.
+        const zoneChangeDetectionImport = (0, ast_utils_1.insertImport)(source, appmodule, 'provideZoneChangeDetection', '@angular/core', false);
+        const zoneChangeDetectionImportChangesRecorder = host.beginUpdate(appmodule);
+        if (zoneChangeDetectionImport instanceof change_1.InsertChange)
+            zoneChangeDetectionImportChangesRecorder.insertLeft(zoneChangeDetectionImport.pos, zoneChangeDetectionImport.toAdd);
+        host.commitUpdate(zoneChangeDetectionImportChangesRecorder);
+    };
+}
+function addZoneChangeDetectionProvider(host, appmodule) {
+    const zoneProvider = 'provideZoneChangeDetection()';
+    const sourceText = host.read(appmodule).toString('utf-8');
+    const source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);
+    // Locate the first @NgModule({...}) metadata object in app-module.ts.
+    const ngModules = (0, ast_utils_1.getDecoratorMetadata)(source, 'NgModule', '@angular/core');
+    if (!ngModules.length) {
+        return;
+    }
+    const ngModuleMetadata = ngModules[0];
+    // Find the `providers` property assignment inside @NgModule metadata.
+    const providersProperty = ngModuleMetadata.properties
+        .filter(ts.isPropertyAssignment)
+        .find((prop) => {
+        if (ts.isIdentifier(prop.name)) {
+            return prop.name.text === 'providers';
+        }
+        return ts.isStringLiteral(prop.name) && prop.name.text === 'providers';
+    });
+    if (!providersProperty || !ts.isArrayLiteralExpression(providersProperty.initializer)) {
+        return;
+    }
+    const providersArray = providersProperty.initializer;
+    // Keep this operation idempotent: do nothing if provider already exists.
+    const hasZoneProvider = providersArray.elements.some((el) => {
+        return el.getText(source).replace(/\s+/g, '') === zoneProvider;
+    });
+    if (hasZoneProvider) {
+        return;
+    }
+    let insertPos;
+    let toAdd;
+    if (providersArray.elements.length === 0) {
+        // Empty providers: inject the item directly between [].
+        insertPos = providersArray.getEnd() - 1;
+        toAdd = zoneProvider;
+    }
+    else {
+        // Non-empty providers: append after last provider, preserving line formatting when possible.
+        const lastProvider = providersArray.elements[providersArray.elements.length - 1];
+        insertPos = lastProvider.getEnd();
+        const lastProviderText = lastProvider.getFullText(source);
+        const newLineMatch = lastProviderText.match(/^\r?\n(\r?)\s+/);
+        if (newLineMatch) {
+            toAdd = `,${newLineMatch[0]}${zoneProvider}`;
+        }
+        else {
+            toAdd = `, ${zoneProvider}`;
+        }
+    }
+    // Apply the computed insertion at the exact Abstract Syntax Tree-derived position.
+    const recorder = host.beginUpdate(appmodule);
+    recorder.insertLeft(insertPos, toAdd);
+    host.commitUpdate(recorder);
+}
 //# sourceMappingURL=index.js.map

package/src/schematics/mg-add/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\r\n Rule,\r\n chain,\r\n Tree,\r\n SchematicContext\r\n} from \"@angular-devkit/schematics\";\r\nimport {NodePackageInstallTask} from \"@angular-devkit/schematics/tasks\";\r\n\r\nimport {addPackageToPackageJson} from './../utils/package';\r\nimport { dependencies, devDependencies, env} from \"../magic-utils/env\";\r\nimport { addImportTSModule, copyMagicFiles} from \"../magic-utils/utils\";\r\nimport { initMagicMetadata} from \"../magic-utils/rules/init-magic-metadata.rule\";\r\nimport { addModuleImportToRootModule } from \"../utils/ast\";\r\nimport { LogLn } from \"../magic-utils/Util\";\r\nimport { generate } from \"../magic-utils/rules/generate.rule\";\r\nimport { GeneratedFileTypes } from \"../../types/enums/generated-file-types.enum\";\r\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\r\nimport {addProviderToModule, insertImport} from \"../utils/devkit-utils/ast-utils\";\r\nimport * as ts from 'typescript';\r\nimport {InsertChange} from \"../utils/devkit-utils/change\";\r\nexport function mgAdd(options:MagicOptionScheme): Rule {\r\n return chain([\r\n initMagicMetadata (options),\r\n copyMagicFiles (options),\r\n\r\n // handel app.modules.ts\r\n addMagicModuleToAppModule (options),\r\n\r\n // handel Angular.json\r\n updateAngularJsonWithMagicStyle (options),\r\n\r\n updateTsConfigAppJson (options),\r\n\r\n addLazyLoadProvider(),\r\n // handel app.component.html\r\n //updateAppComponentHtmlFiles (options),\r\n\r\n //handel package.Json\r\n //addMagicDependenciesToPackageJson (options),\r\n ]);\r\n}\r\n\r\nfunction updateAppComponentHtmlFiles(options:MagicOptionScheme): Rule {\r\n return generate({\r\n template : \"./templates/angular/src/app/app.component.html.ejs\",\r\n name : \"app.component.html\",\r\n destination : env.metadata.paths.rootMagicGenFolder,\r\n type :GeneratedFileTypes.HTML,\r\n data : {\r\n skipHelp : options.skipHelp\r\n }\r\n },options)\r\n}\r\nfunction updateAngularJsonWithMagicStyle(options:MagicOptionScheme): Rule {\r\n return (host: Tree, context: SchematicContext) => {\r\n const project = env.project;\r\n let isDirty = false;\r\n\r\n let fullPathmagicStylePath = env.metadata.paths.magicStylePath;\r\n if (!project.architect.test.options.styles.includes(fullPathmagicStylePath)) {\r\n context.logger.info(` [>]add file ${fullPathmagicStylePath} to test`);\r\n project.architect.test.options.styles.push(fullPathmagicStylePath);\r\n isDirty = true;\r\n }\r\n\r\n if (!project.architect.build.options.styles.includes(fullPathmagicStylePath)) {\r\n context.logger.info(` [>]add file ${fullPathmagicStylePath} to build`);\r\n project.architect.build.options.styles.push(fullPathmagicStylePath);\r\n isDirty = true;\r\n }\r\n\r\n if(isDirty){\r\n let fullPath = env.metadata.paths.angularJsonPath;\r\n host.overwrite(fullPath, JSON.stringify(env.workspace, null, 2));\r\n }\r\n\r\n return host;\r\n };\r\n}\r\n\r\n// Angular 10 , does not include .ts file for compilation\r\n// So to avoid compilation error , add .module.ts in includes section\r\nfunction updateTsConfigAppJson (option: MagicOptionScheme): Rule{\r\n return (host: Tree, context: SchematicContext) => {\r\n\r\n const tsConfigPath = env.metadata.paths.tsConfigAppJsonPath;\r\n const tsConfig = host.read(tsConfigPath).toString();\r\n\r\n // extract the comment\r\n let firstIndex = tsConfig.indexOf('/');\r\n let secondIndex = tsConfig.indexOf('/', firstIndex + 2);\r\n let comment = tsConfig.substring(0, secondIndex + 2);\r\n\r\n // replace the comment as parsing json with comment throws exception\r\n var config = JSON.parse(tsConfig.replace(comment, ''));\r\n\r\n //Add module files for compilation\r\n if(!config['include'].includes('src//module.ts'))\r\n config['include'].push('src/*/module.ts');\r\n\r\n // append the comment again and write the file\r\n host.overwrite(tsConfigPath, comment + \"\\n\" + JSON.stringify(config, null , 2));\r\n return host;\r\n }\r\n}\r\n\r\nfunction addMagicDependenciesToPackageJson(option:MagicOptionScheme): Rule {\r\n\treturn (host: Tree, context: SchematicContext) => {\r\n\t if(!option.skipPackageJson){\r\n for (let dep of dependencies){\r\n LogLn(`[>] Add dependencies ${dep.name}`);\r\n addPackageToPackageJson(host, 'dependencies', dep.name, dep.version);\r\n }\r\n /\r\n // done in pre-install step\r\n for (let dep of devDependencies){\r\n LogLn(`[>] Add devDependencies ${dep.name}`);\r\n addPackageToPackageJson(host, 'devDependencies', dep.name, dep.version);\r\n }\r\n /\r\n }\r\n\r\n\t\tif(!option.skipInstall){\r\n LogLn(`[>] Install dependencies.`);\r\n context.addTask(new NodePackageInstallTask());\r\n }else{\r\n LogLn(`skipIstalls ${dependencies.length} dependencies`);\r\n LogLn(`skipIstalls ${devDependencies.length} devDependencies`);\r\n }\r\n\r\n\t\treturn host;\r\n\t};\r\n}\r\nfunction addMagicModuleToAppModule(options: MagicOptionScheme) : Rule {\r\n return (host: Tree , context : SchematicContext)=>{\r\n const workspace = env.workspace;\r\n const project = env.project;\r\n\r\n addModuleImportToRootModule(\r\n host,\r\n 'BrowserAnimationsModule',\r\n '@angular/platform-browser/animations',\r\n project);\r\n\r\n addModuleImportToRootModule(\r\n host,\r\n 'ReactiveFormsModule',\r\n '@angular/forms',\r\n project);\r\n\r\n\r\n addModuleImportToRootModule(\r\n host,\r\n 'MagicModule',\r\n \"@magic-xpa/angular\",\r\n project);\r\n\r\n addModuleImportToRootModule(\r\n host,\r\n 'MagicAngularMaterialModule',\r\n \"@magic-xpa/angular-material-core\",\r\n project);\r\n\r\n addModuleImportToRootModule(\r\n host,\r\n 'MagicGenLibModule',\r\n \"./magic/magic.gen.lib.module\",\r\n project);\r\n\r\n addModuleImportToRootModule(\r\n host,\r\n 'MagicRoutingModule',\r\n \"./app.routes\",\r\n project);\r\n\r\n\r\n }\r\n}\r\n\r\nfunction addLazyLoadProvider(): Rule {\r\n return (host: Tree) => {\r\n const appmodule = env.metadata.paths.rootMagicGenFolder + '/app.module.ts';\r\n\r\n const lazyLoaderService = 'LazyLoaderService';\r\n const lazyLoaderServicePath = './magic/lazy-loader.service';\r\n\r\n let text = host.read(appmodule);\r\n let sourceText = text.toString('utf-8');\r\n let source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);\r\n let providerChanges = addProviderToModule(source, appmodule, '{ provide: MagicLazyLoaderService, useClass: LazyLoaderService }', lazyLoaderServicePath)\r\n\r\n const providerRecorder = host.beginUpdate(appmodule);\r\n for (const change of providerChanges) {\r\n if (change instanceof InsertChange) {\r\n if (!change.toAdd.includes('import')) // skip import change\r\n providerRecorder.insertLeft(change.pos, change.toAdd);\r\n }\r\n }\r\n host.commitUpdate(providerRecorder);\r\n\r\n const lazyLoaderServiceImport = insertImport(source, appmodule, lazyLoaderService, lazyLoaderServicePath, false);\r\n const lazyLoaderServiceChangesRecorder = host.beginUpdate(appmodule);\r\n if (lazyLoaderServiceImport instanceof InsertChange)\r\n lazyLoaderServiceChangesRecorder.insertLeft(lazyLoaderServiceImport.pos, lazyLoaderServiceImport.toAdd);\r\n host.commitUpdate(lazyLoaderServiceChangesRecorder);\r\n\r\n // add import for MagicLazyLoaderService\r\n const magicLazyLoaderServiceImportChanges: InsertChange = <InsertChange>insertImport(source, appmodule, 'MagicLazyLoaderService', '@magic-xpa/angular', false);\r\n const magicImportChangesRecorder = host.beginUpdate(appmodule);\r\n magicImportChangesRecorder.insertLeft(magicLazyLoaderServiceImportChanges.pos, magicLazyLoaderServiceImportChanges.toAdd)\r\n host.commitUpdate(magicImportChangesRecorder);\r\n }\r\n}\r\n\r\n"]}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\r\n Rule,\r\n chain,\r\n Tree,\r\n SchematicContext\r\n} from \"@angular-devkit/schematics\";\r\nimport {NodePackageInstallTask} from \"@angular-devkit/schematics/tasks\";\r\n\r\nimport {addPackageToPackageJson} from './../utils/package';\r\nimport { dependencies, devDependencies, env} from \"../magic-utils/env\";\r\nimport { addImportTSModule, copyMagicFiles} from \"../magic-utils/utils\";\r\nimport { initMagicMetadata} from \"../magic-utils/rules/init-magic-metadata.rule\";\r\nimport { addModuleImportToRootModule } from \"../utils/ast\";\r\nimport { LogLn } from \"../magic-utils/Util\";\r\nimport { generate } from \"../magic-utils/rules/generate.rule\";\r\nimport { GeneratedFileTypes } from \"../../types/enums/generated-file-types.enum\";\r\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\r\nimport {addProviderToModule, getDecoratorMetadata, insertImport} from \"../utils/devkit-utils/ast-utils\";\r\nimport * as ts from 'typescript';\r\nimport {InsertChange} from \"../utils/devkit-utils/change\";\r\nexport function mgAdd(options:MagicOptionScheme): Rule {\r\n return chain([\r\n initMagicMetadata (options),\r\n copyMagicFiles (options),\r\n\r\n // handel app.modules.ts\r\n addMagicModuleToAppModule (options),\r\n\r\n // handel Angular.json\r\n updateAngularJsonWithMagicStyle (options),\r\n\r\n updateTsConfigAppJson (options),\r\n\r\n addLazyLoadProvider(),\r\n\r\n addZoneChangeDetectionProviderRule(),\r\n //handel app.html\r\n //updateAppComponentHtmlFiles (options),\r\n\r\n //handel package.Json\r\n //addMagicDependenciesToPackageJson (options),\r\n ]);\r\n}\r\n\r\nfunction updateAppComponentHtmlFiles(options:MagicOptionScheme): Rule {\r\n return generate({\r\n template : \"./templates/angular/src/app/app.html.ejs\",\r\n name : \"app.html\",\r\n destination : env.metadata.paths.rootMagicGenFolder,\r\n type :GeneratedFileTypes.HTML,\r\n data : {\r\n skipHelp : options.skipHelp\r\n }\r\n },options)\r\n}\r\nfunction updateAngularJsonWithMagicStyle(options:MagicOptionScheme): Rule {\r\n return (host: Tree, context: SchematicContext) => {\r\n const project = env.project;\r\n let isDirty = false;\r\n\r\n let fullPathmagicStylePath = env.metadata.paths.magicStylePath;\r\n // if (!project.architect.test.options.styles.includes(fullPathmagicStylePath)) {\r\n // context.logger.info(` [>]add file ${fullPathmagicStylePath} to test`);\r\n // project.architect.test.options.styles.push(fullPathmagicStylePath);\r\n // isDirty = true;\r\n // }\r\n\r\n if (!project.architect.build.options.styles.includes(fullPathmagicStylePath)) {\r\n context.logger.info(` [>]add file ${fullPathmagicStylePath} to build`);\r\n project.architect.build.options.styles.push(fullPathmagicStylePath);\r\n isDirty = true;\r\n }\r\n\r\n const buildOptions = project?.architect?.build?.options;\r\n const testOptions = project?.architect?.test?.options;\r\n\r\n if (buildOptions) {\r\n const changed = ensurePolyfills(buildOptions, ['zone.js']);\r\n if (changed) {\r\n context.logger.info(` [>]add polyfill zone.js to build`);\r\n isDirty = true;\r\n }\r\n }\r\n\r\n if (testOptions) {\r\n const changed = ensurePolyfills(testOptions, ['zone.js', 'zone.js/testing']);\r\n if (changed) {\r\n context.logger.info(` [>]add polyfills zone.js, zone.js/testing to test`);\r\n isDirty = true;\r\n }\r\n }\r\n\r\n if(isDirty){\r\n let fullPath = env.metadata.paths.angularJsonPath;\r\n host.overwrite(fullPath, JSON.stringify(env.workspace, null, 2));\r\n }\r\n\r\n return host;\r\n };\r\n}\r\n\r\nfunction ensurePolyfills(options: any, requiredPolyfills: string[]): boolean {\r\n let polyfills: any[] = [];\r\n\r\n if (Array.isArray(options.polyfills)) {\r\n polyfills = [...options.polyfills];\r\n } else if (typeof options.polyfills === 'string' && options.polyfills.trim()) {\r\n polyfills = [options.polyfills];\r\n }\r\n\r\n let changed = !Array.isArray(options.polyfills);\r\n for (const entry of requiredPolyfills) {\r\n if (!polyfills.includes(entry)) {\r\n polyfills.push(entry);\r\n changed = true;\r\n }\r\n }\r\n\r\n if (changed) {\r\n options.polyfills = polyfills;\r\n }\r\n\r\n return changed;\r\n}\r\n\r\n// Angular 10 , does not include .ts file for compilation\r\n// So to avoid compilation error , add .module.ts in includes section\r\nfunction updateTsConfigAppJson (option: MagicOptionScheme): Rule{\r\n return (host: Tree, context: SchematicContext) => {\r\n\r\n const tsConfigPath = env.metadata.paths.tsConfigAppJsonPath;\r\n const tsConfig = host.read(tsConfigPath).toString();\r\n\r\n // extract the comment\r\n let firstIndex = tsConfig.indexOf('/');\r\n let secondIndex = tsConfig.indexOf('/', firstIndex + 2);\r\n let comment = tsConfig.substring(0, secondIndex + 2);\r\n\r\n // replace the comment as parsing json with comment throws exception\r\n var config = JSON.parse(tsConfig.replace(comment, ''));\r\n\r\n //Add module files for compilation\r\n if(!config['include'].includes('src//module.ts'))\r\n config['include'].push('src/*/module.ts');\r\n\r\n if (!config['compilerOptions'])\r\n config['compilerOptions'] = {};\r\n\r\n // Ensures forceConsistentCasingInFileNames is set to false inorder to avoid path casing differences while compilation\r\n config['compilerOptions']['forceConsistentCasingInFileNames'] = false;\r\n\r\n // append the comment again and write the file\r\n host.overwrite(tsConfigPath, comment + \"\\n\" + JSON.stringify(config, null , 2));\r\n return host;\r\n }\r\n}\r\n\r\nfunction addMagicDependenciesToPackageJson(option:MagicOptionScheme): Rule {\r\n\treturn (host: Tree, context: SchematicContext) => {\r\n\t if(!option.skipPackageJson){\r\n for (let dep of dependencies){\r\n LogLn(`[>] Add dependencies ${dep.name}`);\r\n addPackageToPackageJson(host, 'dependencies', dep.name, dep.version);\r\n }\r\n /\r\n // done in pre-install step\r\n for (let dep of devDependencies){\r\n LogLn(`[>] Add devDependencies ${dep.name}`);\r\n addPackageToPackageJson(host, 'devDependencies', dep.name, dep.version);\r\n }\r\n /\r\n }\r\n\r\n\t\tif(!option.skipInstall){\r\n LogLn(`[>] Install dependencies.`);\r\n context.addTask(new NodePackageInstallTask());\r\n }else{\r\n LogLn(`skipIstalls ${dependencies.length} dependencies`);\r\n LogLn(`skipIstalls ${devDependencies.length} devDependencies`);\r\n }\r\n\r\n\t\treturn host;\r\n\t};\r\n}\r\nfunction addMagicModuleToAppModule(options: MagicOptionScheme) : Rule {\r\n return (host: Tree , context : SchematicContext)=>{\r\n const workspace = env.workspace;\r\n const project = env.project;\r\n\r\n addModuleImportToRootModule(\r\n host,\r\n 'BrowserAnimationsModule',\r\n '@angular/platform-browser/animations',\r\n project);\r\n\r\n addModuleImportToRootModule(\r\n host,\r\n 'ReactiveFormsModule',\r\n '@angular/forms',\r\n project);\r\n\r\n\r\n addModuleImportToRootModule(\r\n host,\r\n 'MagicModule',\r\n \"@magic-xpa/angular\",\r\n project);\r\n\r\n addModuleImportToRootModule(\r\n host,\r\n 'MagicAngularMaterialModule',\r\n \"@magic-xpa/angular-material-core\",\r\n project);\r\n\r\n addModuleImportToRootModule(\r\n host,\r\n 'MagicGenLibModule',\r\n \"./magic/magic.gen.lib.module\",\r\n project);\r\n\r\n addModuleImportToRootModule(\r\n host,\r\n 'MagicRoutingModule',\r\n \"./app.routes\",\r\n project);\r\n\r\n\r\n }\r\n}\r\n\r\nfunction addLazyLoadProvider(): Rule {\r\n return (host: Tree) => {\r\n const appmodule = env.metadata.paths.rootMagicGenFolder + '/app-module.ts';\r\n\r\n const lazyLoaderService = 'LazyLoaderService';\r\n const lazyLoaderServicePath = './magic/lazy-loader.service';\r\n\r\n let text = host.read(appmodule);\r\n let sourceText = text.toString('utf-8');\r\n let source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);\r\n let providerChanges = addProviderToModule(source, appmodule, '{ provide: MagicLazyLoaderService, useClass: LazyLoaderService }', lazyLoaderServicePath)\r\n\r\n const providerRecorder = host.beginUpdate(appmodule);\r\n for (const change of providerChanges) {\r\n if (change instanceof InsertChange) {\r\n if (!change.toAdd.includes('import')) // skip import change\r\n providerRecorder.insertLeft(change.pos, change.toAdd);\r\n }\r\n }\r\n host.commitUpdate(providerRecorder);\r\n\r\n sourceText = host.read(appmodule).toString('utf-8');\r\n source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);\r\n const lazyLoaderServiceImport = insertImport(source, appmodule, lazyLoaderService, lazyLoaderServicePath, false);\r\n const lazyLoaderServiceChangesRecorder = host.beginUpdate(appmodule);\r\n if (lazyLoaderServiceImport instanceof InsertChange)\r\n lazyLoaderServiceChangesRecorder.insertLeft(lazyLoaderServiceImport.pos, lazyLoaderServiceImport.toAdd);\r\n host.commitUpdate(lazyLoaderServiceChangesRecorder);\r\n\r\n // add import for MagicLazyLoaderService\r\n sourceText = host.read(appmodule).toString('utf-8');\r\n source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);\r\n const magicLazyLoaderServiceImportChanges: InsertChange = <InsertChange>insertImport(source, appmodule, 'MagicLazyLoaderService', '@magic-xpa/angular', false);\r\n const magicImportChangesRecorder = host.beginUpdate(appmodule);\r\n magicImportChangesRecorder.insertLeft(magicLazyLoaderServiceImportChanges.pos, magicLazyLoaderServiceImportChanges.toAdd)\r\n host.commitUpdate(magicImportChangesRecorder);\r\n }\r\n}\r\n\r\nfunction addZoneChangeDetectionProviderRule(): Rule {\r\n return (host: Tree) => {\r\n // Resolve the generated root module path (src/app/app-module.ts in this project layout).\r\n const appmodule = env.metadata.paths.rootMagicGenFolder + '/app-module.ts';\r\n\r\n // Append provideZoneChangeDetection() to NgModule.providers if it does not already exist.\r\n addZoneChangeDetectionProvider(host, appmodule);\r\n\r\n // Re-parse from disk after provider update so import insertion uses fresh AST positions.\r\n const sourceText = host.read(appmodule).toString('utf-8');\r\n const source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);\r\n\r\n // Ensure the symbol import exists; insertImport is idempotent and avoids duplicates.\r\n const zoneChangeDetectionImport = insertImport(source, appmodule, 'provideZoneChangeDetection', '@angular/core', false);\r\n const zoneChangeDetectionImportChangesRecorder = host.beginUpdate(appmodule);\r\n if (zoneChangeDetectionImport instanceof InsertChange)\r\n zoneChangeDetectionImportChangesRecorder.insertLeft(zoneChangeDetectionImport.pos, zoneChangeDetectionImport.toAdd);\r\n host.commitUpdate(zoneChangeDetectionImportChangesRecorder);\r\n };\r\n}\r\n\r\nfunction addZoneChangeDetectionProvider(host: Tree, appmodule: string): void {\r\n const zoneProvider = 'provideZoneChangeDetection()';\r\n const sourceText = host.read(appmodule).toString('utf-8');\r\n const source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);\r\n\r\n // Locate the first @NgModule({...}) metadata object in app-module.ts.\r\n const ngModules = getDecoratorMetadata(source, 'NgModule', '@angular/core');\r\n\r\n if (!ngModules.length) {\r\n return;\r\n }\r\n\r\n const ngModuleMetadata = ngModules[0] as ts.ObjectLiteralExpression;\r\n // Find the `providers` property assignment inside @NgModule metadata.\r\n const providersProperty = ngModuleMetadata.properties\r\n .filter(ts.isPropertyAssignment)\r\n .find((prop: ts.PropertyAssignment) => {\r\n if (ts.isIdentifier(prop.name)) {\r\n return prop.name.text === 'providers';\r\n }\r\n\r\n return ts.isStringLiteral(prop.name) && prop.name.text === 'providers';\r\n });\r\n\r\n if (!providersProperty \|\| !ts.isArrayLiteralExpression(providersProperty.initializer)) {\r\n return;\r\n }\r\n\r\n const providersArray = providersProperty.initializer;\r\n // Keep this operation idempotent: do nothing if provider already exists.\r\n const hasZoneProvider = providersArray.elements.some((el: ts.Expression) => {\r\n return el.getText(source).replace(/\\s+/g, '') === zoneProvider;\r\n });\r\n\r\n if (hasZoneProvider) {\r\n return;\r\n }\r\n\r\n let insertPos: number;\r\n let toAdd: string;\r\n if (providersArray.elements.length === 0) {\r\n // Empty providers: inject the item directly between [].\r\n insertPos = providersArray.getEnd() - 1;\r\n toAdd = zoneProvider;\r\n } else {\r\n // Non-empty providers: append after last provider, preserving line formatting when possible.\r\n const lastProvider = providersArray.elements[providersArray.elements.length - 1];\r\n insertPos = lastProvider.getEnd();\r\n const lastProviderText = lastProvider.getFullText(source);\r\n const newLineMatch = lastProviderText.match(/^\\r?\\n(\\r?)\\s+/);\r\n if (newLineMatch) {\r\n toAdd = `,${newLineMatch[0]}${zoneProvider}`;\r\n } else {\r\n toAdd = `, ${zoneProvider}`;\r\n }\r\n }\r\n\r\n // Apply the computed insertion at the exact Abstract Syntax Tree-derived position.\r\n const recorder = host.beginUpdate(appmodule);\r\n recorder.insertLeft(insertPos, toAdd);\r\n host.commitUpdate(recorder);\r\n}\r\n\r\n"]}

package/src/schematics/mg-add/index.ts CHANGED Viewed

@@ -15,7 +15,7 @@ import { LogLn } from "../magic-utils/Util";
 import { generate } from "../magic-utils/rules/generate.rule";
 import { GeneratedFileTypes } from "../../types/enums/generated-file-types.enum";
 import { MagicOptionScheme } from "../magic-utils/rules/magic-option.scheme";
-import {addProviderToModule, insertImport} from "../utils/devkit-utils/ast-utils";
+import {addProviderToModule, getDecoratorMetadata, insertImport} from "../utils/devkit-utils/ast-utils";
 import * as ts from 'typescript';
 import {InsertChange} from "../utils/devkit-utils/change";
 export function mgAdd(options:MagicOptionScheme): Rule {
@@ -32,7 +32,9 @@ export function mgAdd(options:MagicOptionScheme): Rule {
     updateTsConfigAppJson  (options),
     addLazyLoadProvider(),
-    // handel app.component.html
+    addZoneChangeDetectionProviderRule(),
+    //handel app.html
     //updateAppComponentHtmlFiles       (options),
     //handel package.Json
@@ -42,8 +44,8 @@ export function mgAdd(options:MagicOptionScheme): Rule {
 function updateAppComponentHtmlFiles(options:MagicOptionScheme): Rule {
   return generate({
-    template    : "./templates/angular/src/app/app.component.html.ejs",
-    name        : "app.component.html",
+    template    : "./templates/angular/src/app/app.html.ejs",
+    name        : "app.html",
     destination : env.metadata.paths.rootMagicGenFolder,
     type        :GeneratedFileTypes.HTML,
     data        : {
@@ -57,11 +59,11 @@ function updateAngularJsonWithMagicStyle(options:MagicOptionScheme): Rule {
     let   isDirty   = false;
     let fullPathmagicStylePath = env.metadata.paths.magicStylePath;
-    if (!project.architect.test.options.styles.includes(fullPathmagicStylePath)) {
-      context.logger.info(`  [>]add file ${fullPathmagicStylePath} to test`);
-      project.architect.test.options.styles.push(fullPathmagicStylePath);
-      isDirty = true;
-    }
+    // if (!project.architect.test.options.styles.includes(fullPathmagicStylePath)) {
+    //   context.logger.info(`  [>]add file ${fullPathmagicStylePath} to test`);
+    //   project.architect.test.options.styles.push(fullPathmagicStylePath);
+    //   isDirty = true;
+    // }
     if (!project.architect.build.options.styles.includes(fullPathmagicStylePath)) {
       context.logger.info(`  [>]add file ${fullPathmagicStylePath} to build`);
@@ -69,6 +71,25 @@ function updateAngularJsonWithMagicStyle(options:MagicOptionScheme): Rule {
       isDirty = true;
     }
+    const buildOptions = project?.architect?.build?.options;
+    const testOptions = project?.architect?.test?.options;
+    if (buildOptions) {
+      const changed = ensurePolyfills(buildOptions, ['zone.js']);
+      if (changed) {
+        context.logger.info(`  [>]add polyfill zone.js to build`);
+        isDirty = true;
+      }
+    }
+    if (testOptions) {
+      const changed = ensurePolyfills(testOptions, ['zone.js', 'zone.js/testing']);
+      if (changed) {
+        context.logger.info(`  [>]add polyfills zone.js, zone.js/testing to test`);
+        isDirty = true;
+      }
+    }
     if(isDirty){
       let fullPath = env.metadata.paths.angularJsonPath;
       host.overwrite(fullPath, JSON.stringify(env.workspace, null, 2));
@@ -78,6 +99,30 @@ function updateAngularJsonWithMagicStyle(options:MagicOptionScheme): Rule {
   };
 }
+function ensurePolyfills(options: any, requiredPolyfills: string[]): boolean {
+  let polyfills: any[] = [];
+  if (Array.isArray(options.polyfills)) {
+    polyfills = [...options.polyfills];
+  } else if (typeof options.polyfills === 'string' && options.polyfills.trim()) {
+    polyfills = [options.polyfills];
+  }
+  let changed = !Array.isArray(options.polyfills);
+  for (const entry of requiredPolyfills) {
+    if (!polyfills.includes(entry)) {
+      polyfills.push(entry);
+      changed = true;
+    }
+  }
+  if (changed) {
+    options.polyfills = polyfills;
+  }
+  return changed;
+}
 // Angular 10 , does not include .ts file for compilation
 // So to avoid compilation error , add *.module.ts in includes section
 function updateTsConfigAppJson (option: MagicOptionScheme): Rule{
@@ -98,6 +143,12 @@ function updateTsConfigAppJson (option: MagicOptionScheme): Rule{
     if(!config['include'].includes('src/**/*module.ts'))
       config['include'].push('src/**/*module.ts');
+    if (!config['compilerOptions'])
+      config['compilerOptions'] = {};
+    // Ensures forceConsistentCasingInFileNames is set to false inorder to avoid path casing differences while compilation
+    config['compilerOptions']['forceConsistentCasingInFileNames'] = false;
     // append the comment again and write the file
     host.overwrite(tsConfigPath, comment + "\n" + JSON.stringify(config, null , 2));
     return host;
@@ -179,7 +230,7 @@ function addMagicModuleToAppModule(options: MagicOptionScheme) : Rule {
 function addLazyLoadProvider(): Rule {
   return (host: Tree) => {
-    const appmodule = env.metadata.paths.rootMagicGenFolder + '/app.module.ts';
+    const appmodule = env.metadata.paths.rootMagicGenFolder + '/app-module.ts';
     const lazyLoaderService = 'LazyLoaderService';
     const lazyLoaderServicePath = './magic/lazy-loader.service';
@@ -198,6 +249,8 @@ function addLazyLoadProvider(): Rule {
     }
     host.commitUpdate(providerRecorder);
+    sourceText = host.read(appmodule).toString('utf-8');
+    source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);
     const lazyLoaderServiceImport = insertImport(source, appmodule, lazyLoaderService, lazyLoaderServicePath, false);
     const lazyLoaderServiceChangesRecorder = host.beginUpdate(appmodule);
     if (lazyLoaderServiceImport instanceof InsertChange)
@@ -205,6 +258,8 @@ function addLazyLoadProvider(): Rule {
     host.commitUpdate(lazyLoaderServiceChangesRecorder);
     // add import for MagicLazyLoaderService
+    sourceText = host.read(appmodule).toString('utf-8');
+    source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);
     const magicLazyLoaderServiceImportChanges: InsertChange = <InsertChange>insertImport(source, appmodule, 'MagicLazyLoaderService', '@magic-xpa/angular', false);
     const magicImportChangesRecorder = host.beginUpdate(appmodule);
     magicImportChangesRecorder.insertLeft(magicLazyLoaderServiceImportChanges.pos, magicLazyLoaderServiceImportChanges.toAdd)
@@ -212,3 +267,87 @@ function addLazyLoadProvider(): Rule {
   }
 }
+function addZoneChangeDetectionProviderRule(): Rule {
+  return (host: Tree) => {
+    // Resolve the generated root module path (src/app/app-module.ts in this project layout).
+    const appmodule = env.metadata.paths.rootMagicGenFolder + '/app-module.ts';
+    // Append provideZoneChangeDetection() to NgModule.providers if it does not already exist.
+    addZoneChangeDetectionProvider(host, appmodule);
+    // Re-parse from disk after provider update so import insertion uses fresh AST positions.
+    const sourceText = host.read(appmodule).toString('utf-8');
+    const source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);
+    // Ensure the symbol import exists; insertImport is idempotent and avoids duplicates.
+    const zoneChangeDetectionImport = insertImport(source, appmodule, 'provideZoneChangeDetection', '@angular/core', false);
+    const zoneChangeDetectionImportChangesRecorder = host.beginUpdate(appmodule);
+    if (zoneChangeDetectionImport instanceof InsertChange)
+      zoneChangeDetectionImportChangesRecorder.insertLeft(zoneChangeDetectionImport.pos, zoneChangeDetectionImport.toAdd);
+    host.commitUpdate(zoneChangeDetectionImportChangesRecorder);
+  };
+}
+function addZoneChangeDetectionProvider(host: Tree, appmodule: string): void {
+  const zoneProvider = 'provideZoneChangeDetection()';
+  const sourceText = host.read(appmodule).toString('utf-8');
+  const source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);
+  // Locate the first @NgModule({...}) metadata object in app-module.ts.
+  const ngModules = getDecoratorMetadata(source, 'NgModule', '@angular/core');
+  if (!ngModules.length) {
+    return;
+  }
+  const ngModuleMetadata = ngModules[0] as ts.ObjectLiteralExpression;
+  // Find the `providers` property assignment inside @NgModule metadata.
+  const providersProperty = ngModuleMetadata.properties
+    .filter(ts.isPropertyAssignment)
+    .find((prop: ts.PropertyAssignment) => {
+      if (ts.isIdentifier(prop.name)) {
+        return prop.name.text === 'providers';
+      }
+      return ts.isStringLiteral(prop.name) && prop.name.text === 'providers';
+    });
+  if (!providersProperty || !ts.isArrayLiteralExpression(providersProperty.initializer)) {
+    return;
+  }
+  const providersArray = providersProperty.initializer;
+  // Keep this operation idempotent: do nothing if provider already exists.
+  const hasZoneProvider = providersArray.elements.some((el: ts.Expression) => {
+    return el.getText(source).replace(/\s+/g, '') === zoneProvider;
+  });
+  if (hasZoneProvider) {
+    return;
+  }
+  let insertPos: number;
+  let toAdd: string;
+  if (providersArray.elements.length === 0) {
+    // Empty providers: inject the item directly between [].
+    insertPos = providersArray.getEnd() - 1;
+    toAdd = zoneProvider;
+  } else {
+    // Non-empty providers: append after last provider, preserving line formatting when possible.
+    const lastProvider = providersArray.elements[providersArray.elements.length - 1];
+    insertPos = lastProvider.getEnd();
+    const lastProviderText = lastProvider.getFullText(source);
+    const newLineMatch = lastProviderText.match(/^\r?\n(\r?)\s+/);
+    if (newLineMatch) {
+      toAdd = `,${newLineMatch[0]}${zoneProvider}`;
+    } else {
+      toAdd = `, ${zoneProvider}`;
+    }
+  }
+  // Apply the computed insertion at the exact Abstract Syntax Tree-derived position.
+  const recorder = host.beginUpdate(appmodule);
+  recorder.insertLeft(insertPos, toAdd);
+  host.commitUpdate(recorder);
+}

package/src/schematics/mg-add/webModule/app.routes.ts CHANGED Viewed

@@ -1,9 +1,10 @@
 import {Routes, RouterModule} from '@angular/router';
+import {customRoutes} from './custom.routes';
 import { NgModule } from "@angular/core";
 import { CommonModule } from "@angular/common";
 export const routes: Routes = [
+  ...customRoutes,
 ];

package/src/schematics/mg-add/webModule/custom.routes.ts ADDED Viewed

@@ -0,0 +1,23 @@
+import { Routes } from '@angular/router';
+import { RouterContainerMagicComponent } from "@magic-xpa/angular";
+/**
+ * Custom Routes
+ * =============
+ * Add your custom/manual routes in this file.
+ *
+ * IMPORTANT: This file is NOT affected by CLI route regeneration.
+ * The generated app.routes.ts automatically imports these routes.
+ *
+ * Custom routes are placed BEFORE generated routes in the final
+ * routes array, so they take PRIORITY when paths conflict.
+ *
+ * Example:
+ *   {
+ *       path: 'callPublic/:name',
+ *       component: RouterContainerMagicComponent,
+ *   },
+ */
+export const customRoutes: Routes = [
+];

package/src/schematics/mg-routes/index.js CHANGED Viewed

@@ -48,16 +48,25 @@ function genRouteFile(options, routeItem) {
             context.logger.info(`RouteTable is not defined !`);
         else
             context.logger.info(`generating ${data.routesArray.length} root routes`);
-        const componentFile = {
+        const routeFile = {
             type: types_1.GeneratedFileTypes.TS,
             template: template, // `./templates/angular/src/app.routes.ts`,
             destination: destinationPath, // metadata.paths.rootMagicGenFolder,
             name: 'app.routes.ts',
             data: data
         };
-        return (0, schematics_1.chain)([
-            (0, generate_rule_1.generate)(componentFile, options)
-        ])(host, context);
+        const customRouteFile = {
+            type: types_1.GeneratedFileTypes.TS,
+            template: `./templates/angular/src/custom.routes.ts`,
+            destination: destinationPath,
+            name: 'custom.routes.ts',
+            data: {}
+        };
+        let rules = [
+            (0, generate_rule_1.generate)(routeFile, options),
+            !host.exists(`${destinationPath}/custom.routes.ts`) ? (0, generate_rule_1.generate)(customRouteFile, options) : (0, schematics_1.noop)()
+        ];
+        return (0, schematics_1.chain)(rules)(host, context);
     };
 }
 //# sourceMappingURL=index.js.map

package/src/schematics/mg-routes/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AASA,4CAKC;AAKD,sCAeC;AAMD,~~oCAmCC~~;~~AA3ED~~,~~2DAA+F~~;~~AAC/F~~,4FAAkF;AAClF,uCAAiE;AACjE,sEAA8D;AAC9D,4CAAyC;AAGzC,8CAA4C;AAE5C,SAAgB,gBAAgB,CAAC,OAA0B;IACzD,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,4CAAiB,EAAE,OAAO,CAAC;QAC3B,aAAa,CAAM,OAAO,CAAC;KAC5B,CAAC,CAAC;AACL,CAAC;AAED,mGAAmG;AACnG,8CAA8C;AAC9C,mGAAmG;AACnG,SAAgB,aAAa,CAAC,OAA0B;IACtD,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAE/C,MAAM,QAAQ,GAAI,SAAG,CAAC,QAAQ,CAAC;QAC/B,IAAI,UAAU,GAAkB,QAAQ,CAAC,WAAW,CAAC;QACrD,IAAI,KAAK,GAAU,EAAE,CAAC;QAEtB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QAE3D,KAAK,IAAI,SAAS,IAAI,UAAU,EAAC,CAAC;YAChC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC,IAAI,EAAC,OAAO,CAAC,CAAC;IACpC,CAAC,CAAC;AACJ,CAAC;AAMD,SAAgB,YAAY,CAAC,OAA0B,EAAE,SAAsB;IAC7E,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,QAAQ,GAAI,SAAG,CAAC,QAAQ,CAAC;QAC/B,IAAI,eAAe,GAAW,SAAS,CAAC,WAAW,IAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA,CAAC,CAAC,KAAK,CAAC;QACvE,IAAA,YAAK,EAAC,mBAAmB,SAAS,CAAC,WAAW,wBAAwB,eAAe,EAAE,CAAC,CAAA;QAExF,MAAM,IAAI,GAAQ;YAChB,WAAW,EAAE,SAAS,CAAC,WAAW;YAClC,eAAe,EAAC,eAAe;SAChC,CAAC;QAEF,IAAI,QAAQ,GAAY,uCAAuC,CAAC;QAChE,IAAI,eAAe,GAAW,QAAQ,CAAC,KAAK,CAAC,kBAAkB,CAAC;QAChE,IAAI,SAAS,CAAC,WAAW,IAAI,EAAE,EAC/B,CAAC;YACC,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,kBAAkB,GAAG,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;QACpF,CAAC;QAED,IAAI,IAAI,CAAC,WAAW,IAAK,SAAS;YAChC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;;YAEnD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,WAAW,CAAC,MAAM,cAAc,CAAC,CAAC;QAE3E,MAAM,~~aAAa~~,GAAmB;~~YACpC~~,IAAI,EAAU,0BAAkB,CAAC,EAAE;YACnC,QAAQ,EAAM,QAAQ,EAAoC,2CAA2C;YACrG,WAAW,EAAG,eAAe,EAA6B,qCAAqC;YAC/F,IAAI,EAAU,eAAe;YAC7B,IAAI,EAAU,IAAI;SACnB,CAAC;QAEF,~~OAAO~~,IAAA,~~kBAAK~~,EAAC;~~YACX~~,IAAA,wBAAQ,EAAC,~~aAAa~~,~~EAAC~~,OAAO,CAAC;~~SAChC~~,CAAC,CAAC,IAAI,EAAC,OAAO,CAAC,CAAC;~~IACnB~~,CAAC,CAAA;AACH,CAAC","sourcesContent":["import { chain, forEach, Rule, SchematicContext, Tree, url } from \"@angular-devkit/schematics\";\r\nimport { initMagicMetadata } from \"../magic-utils/rules/init-magic-metadata.rule\";\r\nimport { GeneratedFileTypes, TemplateConfig } from \"../../types\";\r\nimport { generate } from \"../magic-utils/rules/generate.rule\";\r\nimport { env } from \"../magic-utils/env\";\r\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\r\nimport { RouteTable } from \"../../types/interfaces/app\";\r\nimport { LogLn } from \"../magic-utils/Util\";\r\n\r\nexport function mgGenerateRoutes(options: MagicOptionScheme): Rule {\r\n return chain([\r\n initMagicMetadata (options),\r\n genRoutesFile (options)\r\n ]);\r\n}\r\n\r\n//-------------------------------------------------------------------------------------------------\r\n// generate all the modules in env.modulesGen\r\n//-------------------------------------------------------------------------------------------------\r\nexport function genRoutesFile(options: MagicOptionScheme): Rule {\r\n return (tree: Tree, context: SchematicContext) => {\r\n\r\n const metadata = env.metadata;\r\n let routeTable: RouteTable[] = metadata.routesTable;\r\n let rules:Rule[] = [];\r\n\r\n context.logger.info(`routes length: ${routeTable.length}`);\r\n\r\n for (let routeItem of routeTable){\r\n rules.push(genRouteFile(options, routeItem));\r\n }\r\n\r\n return chain(rules)(tree,context);\r\n };\r\n}\r\n\r\n\r\n\r\n\r\n\r\nexport function genRouteFile(options: MagicOptionScheme, routeItem : RouteTable ) : Rule {\r\n return (host: Tree, context: SchematicContext) => {\r\n const metadata = env.metadata;\r\n let createRootRoute:boolean = routeItem.module_name =='' ? true: false;\r\n LogLn(`genRouteFile : [${routeItem.module_name}] createRootRoute = ${createRootRoute}`)\r\n\r\n const data: any = {\r\n routesArray: routeItem.routesArray,\r\n createRootRoute:createRootRoute\r\n };\r\n\r\n let template : string = `./templates/angular/src/app.routes.ts`;\r\n let destinationPath:string = metadata.paths.rootMagicGenFolder;\r\n if (routeItem.module_name != '')\r\n {\r\n destinationPath = metadata.paths.magicGenFolderPath + `/${routeItem.module_name}`;\r\n }\r\n\r\n if (data.routesArray == undefined)\r\n context.logger.info(`RouteTable is not defined !`);\r\n else\r\n context.logger.info(`generating ${data.routesArray.length} root routes`);\r\n\r\n const ~~componentFile~~: TemplateConfig = {\r\n type : GeneratedFileTypes.TS,\r\n template : template, // `./templates/angular/src/app.routes.ts`,\r\n destination : destinationPath, // metadata.paths.rootMagicGenFolder,\r\n name : 'app.routes.ts',\r\n data : data\r\n };\r\n\r\n ~~return~~ ~~chain(~~[\r\n generate(~~componentFile~~,options)\r\n ])(host,context);\r\n }\r\n}\r\n\r\n\r\n\r\n\r\n\r\n"]}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["import { chain, forEach, Rule, SchematicContext, Tree, url, noop } from \"@angular-devkit/schematics\";\r\nimport { initMagicMetadata } from \"../magic-utils/rules/init-magic-metadata.rule\";\r\nimport { GeneratedFileTypes, TemplateConfig } from \"../../types\";\r\nimport { generate } from \"../magic-utils/rules/generate.rule\";\r\nimport { env } from \"../magic-utils/env\";\r\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\r\nimport { RouteTable } from \"../../types/interfaces/app\";\r\nimport { LogLn } from \"../magic-utils/Util\";\r\n\r\nexport function mgGenerateRoutes(options: MagicOptionScheme): Rule {\r\n return chain([\r\n initMagicMetadata (options),\r\n genRoutesFile (options)\r\n ]);\r\n}\r\n\r\n//-------------------------------------------------------------------------------------------------\r\n// generate all the modules in env.modulesGen\r\n//-------------------------------------------------------------------------------------------------\r\nexport function genRoutesFile(options: MagicOptionScheme): Rule {\r\n return (tree: Tree, context: SchematicContext) => {\r\n\r\n const metadata = env.metadata;\r\n let routeTable: RouteTable[] = metadata.routesTable;\r\n let rules:Rule[] = [];\r\n\r\n context.logger.info(`routes length: ${routeTable.length}`);\r\n\r\n for (let routeItem of routeTable){\r\n rules.push(genRouteFile(options, routeItem));\r\n }\r\n\r\n return chain(rules)(tree,context);\r\n };\r\n}\r\n\r\n\r\n\r\n\r\n\r\nexport function genRouteFile(options: MagicOptionScheme, routeItem : RouteTable ) : Rule {\r\n return (host: Tree, context: SchematicContext) => {\r\n const metadata = env.metadata;\r\n let createRootRoute:boolean = routeItem.module_name =='' ? true: false;\r\n LogLn(`genRouteFile : [${routeItem.module_name}] createRootRoute = ${createRootRoute}`)\r\n\r\n const data: any = {\r\n routesArray: routeItem.routesArray,\r\n createRootRoute:createRootRoute\r\n };\r\n\r\n let template : string = `./templates/angular/src/app.routes.ts`;\r\n let destinationPath:string = metadata.paths.rootMagicGenFolder;\r\n if (routeItem.module_name != '')\r\n {\r\n destinationPath = metadata.paths.magicGenFolderPath + `/${routeItem.module_name}`;\r\n }\r\n\r\n if (data.routesArray == undefined)\r\n context.logger.info(`RouteTable is not defined !`);\r\n else\r\n context.logger.info(`generating ${data.routesArray.length} root routes`);\r\n\r\n const routeFile: TemplateConfig = {\r\n type : GeneratedFileTypes.TS,\r\n template : template, // `./templates/angular/src/app.routes.ts`,\r\n destination : destinationPath, // metadata.paths.rootMagicGenFolder,\r\n name : 'app.routes.ts',\r\n data : data\r\n };\r\n\r\n const customRouteFile: TemplateConfig = {\r\n type : GeneratedFileTypes.TS,\r\n template : `./templates/angular/src/custom.routes.ts`,\r\n destination : destinationPath,\r\n name : 'custom.routes.ts',\r\n data : {}\r\n };\r\n\r\n let rules: Rule[] = [\r\n generate(routeFile, options),\r\n !host.exists(`${destinationPath}/custom.routes.ts`) ? generate(customRouteFile, options) : noop()\r\n ];\r\n\r\n return chain(rules)(host,context);\r\n }\r\n}\r\n\r\n\r\n\r\n\r\n\r\n"]}