@magic-xpa/cli 4.1000.0 → 4.1100.0-dev000.0

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

@@ -1,152 +1,151 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mgAdd = void 0;
-const schematics_1 = require("@angular-devkit/schematics");
-const tasks_1 = require("@angular-devkit/schematics/tasks");
-const package_1 = require("./../utils/package");
-const env_1 = require("../magic-utils/env");
-const utils_1 = require("../magic-utils/utils");
-const init_magic_metadata_rule_1 = require("../magic-utils/rules/init-magic-metadata.rule");
-const ast_1 = require("../utils/ast");
-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 change_1 = require("../utils/devkit-utils/change");
-function mgAdd(options) {
-    return (0, schematics_1.chain)([
-        (0, init_magic_metadata_rule_1.initMagicMetadata)(options),
-        (0, utils_1.copyMagicFiles)(options),
-        // handel app.modules.ts
-        addMagicModuleToAppModule(options),
-        // handel Angular.json
-        updateAngularJsonWithMagicStyle(options),
-        updateTsConfigAppJson(options),
-        addLazyLoadProvider(),
-        // handel app.component.html
-        //updateAppComponentHtmlFiles       (options),
-        //handel package.Json
-        //addMagicDependenciesToPackageJson (options),
-    ]);
-}
-exports.mgAdd = mgAdd;
-function updateAppComponentHtmlFiles(options) {
-    return (0, generate_rule_1.generate)({
-        template: "./templates/angular/src/app/app.component.html.ejs",
-        name: "app.component.html",
-        destination: env_1.env.metadata.paths.rootMagicGenFolder,
-        type: generated_file_types_enum_1.GeneratedFileTypes.HTML,
-        data: {
-            skipHelp: options.skipHelp
-        }
-    }, options);
-}
-function updateAngularJsonWithMagicStyle(options) {
-    return (host, context) => {
-        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.build.options.styles.includes(fullPathmagicStylePath)) {
-            context.logger.info(`  [>]add file ${fullPathmagicStylePath} to build`);
-            project.architect.build.options.styles.push(fullPathmagicStylePath);
-            isDirty = true;
-        }
-        if (isDirty) {
-            let fullPath = env_1.env.metadata.paths.angularJsonPath;
-            host.overwrite(fullPath, JSON.stringify(env_1.env.workspace, null, 2));
-        }
-        return host;
-    };
-}
-// Angular 10 , does not include .ts file for compilation
-// So to avoid compilation error , add *.module.ts in includes section
-function updateTsConfigAppJson(option) {
-    return (host, context) => {
-        const tsConfigPath = env_1.env.metadata.paths.tsConfigAppJsonPath;
-        const tsConfig = host.read(tsConfigPath).toString("utf-8");
-        // extract the comment
-        let comment = tsConfig.substring(tsConfig.indexOf('/*'), tsConfig.indexOf('*/') + 2);
-        // replace the comment as parsing json with comment throws exception
-        var config = JSON.parse(tsConfig.replace(comment, ''));
-        //Add module files for compilation
-        if (!config['include'].includes('src/**/*module.ts'))
-            config['include'].push('src/**/*module.ts');
-        // append the comment again and write the file
-        host.overwrite(tsConfigPath, comment + "\n" + JSON.stringify(config, null, 2));
-        return host;
-    };
-}
-function addMagicDependenciesToPackageJson(option) {
-    return (host, context) => {
-        if (!option.skipPackageJson) {
-            for (let dep of env_1.dependencies) {
-                (0, Util_1.LogLn)(`[>] Add dependencies ${dep.name}`);
-                (0, package_1.addPackageToPackageJson)(host, 'dependencies', dep.name, dep.version);
-            }
-            /*
-            // done in pre-install step
-            for (let dep of devDependencies){
-               LogLn(`[>] Add devDependencies ${dep.name}`);
-               addPackageToPackageJson(host, 'devDependencies', dep.name, dep.version);
-             }
-             */
-        }
-        if (!option.skipInstall) {
-            (0, Util_1.LogLn)(`[>] Install dependencies.`);
-            context.addTask(new tasks_1.NodePackageInstallTask());
-        }
-        else {
-            (0, Util_1.LogLn)(`skipIstalls ${env_1.dependencies.length} dependencies`);
-            (0, Util_1.LogLn)(`skipIstalls ${env_1.devDependencies.length} devDependencies`);
-        }
-        return host;
-    };
-}
-function addMagicModuleToAppModule(options) {
-    return (host, context) => {
-        const workspace = env_1.env.workspace;
-        const project = env_1.env.project;
-        (0, ast_1.addModuleImportToRootModule)(host, 'BrowserAnimationsModule', '@angular/platform-browser/animations', project);
-        (0, ast_1.addModuleImportToRootModule)(host, 'ReactiveFormsModule', '@angular/forms', project);
-        (0, ast_1.addModuleImportToRootModule)(host, 'MagicModule', "@magic-xpa/angular", project);
-        (0, ast_1.addModuleImportToRootModule)(host, 'MagicAngularMaterialModule', "@magic-xpa/angular-material-core", project);
-        (0, ast_1.addModuleImportToRootModule)(host, 'MagicGenLibModule', "./magic/magic.gen.lib.module", project);
-        (0, ast_1.addModuleImportToRootModule)(host, 'MagicRoutingModule', "./app.routes", project);
-    };
-}
-function addLazyLoadProvider() {
-    return (host) => {
-        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);
-        let sourceText = text.toString('utf-8');
-        let source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);
-        let providerChanges = (0, ast_utils_1.addProviderToModule)(source, appmodule, '{ provide: MagicLazyLoaderService, useClass: LazyLoaderService }', lazyLoaderServicePath);
-        const providerRecorder = host.beginUpdate(appmodule);
-        for (const change of providerChanges) {
-            if (change instanceof change_1.InsertChange) {
-                if (!change.toAdd.includes('import')) // skip import change
-                    providerRecorder.insertLeft(change.pos, change.toAdd);
-            }
-        }
-        host.commitUpdate(providerRecorder);
-        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
-        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);
-    };
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mgAdd = mgAdd;
+const schematics_1 = require("@angular-devkit/schematics");
+const tasks_1 = require("@angular-devkit/schematics/tasks");
+const package_1 = require("./../utils/package");
+const env_1 = require("../magic-utils/env");
+const utils_1 = require("../magic-utils/utils");
+const init_magic_metadata_rule_1 = require("../magic-utils/rules/init-magic-metadata.rule");
+const ast_1 = require("../utils/ast");
+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 change_1 = require("../utils/devkit-utils/change");
+function mgAdd(options) {
+    return (0, schematics_1.chain)([
+        (0, init_magic_metadata_rule_1.initMagicMetadata)(options),
+        (0, utils_1.copyMagicFiles)(options),
+        // handel app.modules.ts
+        addMagicModuleToAppModule(options),
+        // handel Angular.json
+        updateAngularJsonWithMagicStyle(options),
+        updateTsConfigAppJson(options),
+        addLazyLoadProvider(),
+        // handel app.component.html
+        //updateAppComponentHtmlFiles       (options),
+        //handel package.Json
+        //addMagicDependenciesToPackageJson (options),
+    ]);
+}
+function updateAppComponentHtmlFiles(options) {
+    return (0, generate_rule_1.generate)({
+        template: "./templates/angular/src/app/app.component.html.ejs",
+        name: "app.component.html",
+        destination: env_1.env.metadata.paths.rootMagicGenFolder,
+        type: generated_file_types_enum_1.GeneratedFileTypes.HTML,
+        data: {
+            skipHelp: options.skipHelp
+        }
+    }, options);
+}
+function updateAngularJsonWithMagicStyle(options) {
+    return (host, context) => {
+        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.build.options.styles.includes(fullPathmagicStylePath)) {
+            context.logger.info(`  [>]add file ${fullPathmagicStylePath} to build`);
+            project.architect.build.options.styles.push(fullPathmagicStylePath);
+            isDirty = true;
+        }
+        if (isDirty) {
+            let fullPath = env_1.env.metadata.paths.angularJsonPath;
+            host.overwrite(fullPath, JSON.stringify(env_1.env.workspace, null, 2));
+        }
+        return host;
+    };
+}
+// Angular 10 , does not include .ts file for compilation
+// So to avoid compilation error , add *.module.ts in includes section
+function updateTsConfigAppJson(option) {
+    return (host, context) => {
+        const tsConfigPath = env_1.env.metadata.paths.tsConfigAppJsonPath;
+        const tsConfig = host.read(tsConfigPath).toString("utf-8");
+        // extract the comment
+        let comment = tsConfig.substring(tsConfig.indexOf('/*'), tsConfig.indexOf('*/') + 2);
+        // replace the comment as parsing json with comment throws exception
+        var config = JSON.parse(tsConfig.replace(comment, ''));
+        //Add module files for compilation
+        if (!config['include'].includes('src/**/*module.ts'))
+            config['include'].push('src/**/*module.ts');
+        // append the comment again and write the file
+        host.overwrite(tsConfigPath, comment + "\n" + JSON.stringify(config, null, 2));
+        return host;
+    };
+}
+function addMagicDependenciesToPackageJson(option) {
+    return (host, context) => {
+        if (!option.skipPackageJson) {
+            for (let dep of env_1.dependencies) {
+                (0, Util_1.LogLn)(`[>] Add dependencies ${dep.name}`);
+                (0, package_1.addPackageToPackageJson)(host, 'dependencies', dep.name, dep.version);
+            }
+            /*
+            // done in pre-install step
+            for (let dep of devDependencies){
+               LogLn(`[>] Add devDependencies ${dep.name}`);
+               addPackageToPackageJson(host, 'devDependencies', dep.name, dep.version);
+             }
+             */
+        }
+        if (!option.skipInstall) {
+            (0, Util_1.LogLn)(`[>] Install dependencies.`);
+            context.addTask(new tasks_1.NodePackageInstallTask());
+        }
+        else {
+            (0, Util_1.LogLn)(`skipIstalls ${env_1.dependencies.length} dependencies`);
+            (0, Util_1.LogLn)(`skipIstalls ${env_1.devDependencies.length} devDependencies`);
+        }
+        return host;
+    };
+}
+function addMagicModuleToAppModule(options) {
+    return (host, context) => {
+        const workspace = env_1.env.workspace;
+        const project = env_1.env.project;
+        (0, ast_1.addModuleImportToRootModule)(host, 'BrowserAnimationsModule', '@angular/platform-browser/animations', project);
+        (0, ast_1.addModuleImportToRootModule)(host, 'ReactiveFormsModule', '@angular/forms', project);
+        (0, ast_1.addModuleImportToRootModule)(host, 'MagicModule', "@magic-xpa/angular", project);
+        (0, ast_1.addModuleImportToRootModule)(host, 'MagicAngularMaterialModule', "@magic-xpa/angular-material-core", project);
+        (0, ast_1.addModuleImportToRootModule)(host, 'MagicGenLibModule', "./magic/magic.gen.lib.module", project);
+        (0, ast_1.addModuleImportToRootModule)(host, 'MagicRoutingModule', "./app.routes", project);
+    };
+}
+function addLazyLoadProvider() {
+    return (host) => {
+        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);
+        let sourceText = text.toString('utf-8');
+        let source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);
+        let providerChanges = (0, ast_utils_1.addProviderToModule)(source, appmodule, '{ provide: MagicLazyLoaderService, useClass: LazyLoaderService }', lazyLoaderServicePath);
+        const providerRecorder = host.beginUpdate(appmodule);
+        for (const change of providerChanges) {
+            if (change instanceof change_1.InsertChange) {
+                if (!change.toAdd.includes('import')) // skip import change
+                    providerRecorder.insertLeft(change.pos, change.toAdd);
+            }
+        }
+        host.commitUpdate(providerRecorder);
+        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
+        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);
+    };
+}
 //# sourceMappingURL=index.js.map

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

@@ -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(\"utf-8\");\r\n\r\n    // extract the comment\r\n    let comment = tsConfig.substring(tsConfig.indexOf('/*'), tsConfig.indexOf('*/') + 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"]}
+{"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(\"utf-8\");\r\n\r\n    // extract the comment\r\n    let comment = tsConfig.substring(tsConfig.indexOf('/*'), tsConfig.indexOf('*/') + 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"]}

package/src/schematics/mg-add/schema.json

@@ -1,29 +1,29 @@
-{
-  "$schema": "http://json-schema.org/schema",
-  "$id": "SchematicsMagicAdd",
-  "title": "Magic Options Schema",
-  "type": "object",
-  "properties": {
-    "skipInstall": {
-      "type": "boolean",
-      "default": false,
-      "description": "Do not install the new packages (e.g., --skipInstall)"
-    },
-    "skipPackageJson": {
-      "type": "boolean",
-      "default": false,
-      "description": "Do not add magic dependencies to package.json (e.g., --skipPackageJson)"
-    },
-    "skipHelp": {
-      "type": "boolean",
-      "default": false,
-      "description": "Whether to create Startup Welcome Pag (e.g., --skipHelp)"
-    },
-    "project":{
-      "type": "string",
-      "description": "The name of the project",
-      "aliases" : ["p"]
-    }
-  },
-  "required": []
-}
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "SchematicsMagicAdd",
+  "title": "Magic Options Schema",
+  "type": "object",
+  "properties": {
+    "skipInstall": {
+      "type": "boolean",
+      "default": false,
+      "description": "Do not install the new packages (e.g., --skipInstall)"
+    },
+    "skipPackageJson": {
+      "type": "boolean",
+      "default": false,
+      "description": "Do not add magic dependencies to package.json (e.g., --skipPackageJson)"
+    },
+    "skipHelp": {
+      "type": "boolean",
+      "default": false,
+      "description": "Whether to create Startup Welcome Pag (e.g., --skipHelp)"
+    },
+    "project":{
+      "type": "string",
+      "description": "The name of the project",
+      "aliases" : ["p"]
+    }
+  },
+  "required": []
+}

package/src/schematics/mg-add/utils/add-declaration-to-root-module.d.ts

@@ -1,2 +1,2 @@
-import { Tree } from '@angular-devkit/schematics';
-export declare function addDeclarationToRootModule(host: Tree, moduleName: string, importSrc: string): void;
+import { Tree } from '@angular-devkit/schematics';
+export declare function addDeclarationToRootModule(host: Tree, moduleName: string, importSrc: string): void;

package/src/schematics/mg-add/utils/add-declaration-to-root-module.js

@@ -1,12 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addDeclarationToRootModule = void 0;
-const ast_1 = require("../../utils/ast");
-const ast_utils_1 = require("../../utils/devkit-utils/ast-utils");
-const core_1 = require("@angular-devkit/core");
-function addDeclarationToRootModule(host, moduleName, importSrc) {
-    let path = `src/app/app.module.ts`, source = (0, ast_1.getSourceFile)(host, path);
-    (0, ast_utils_1.addDeclarationToModule)(source, (0, core_1.normalize)(path), moduleName, importSrc);
-}
-exports.addDeclarationToRootModule = addDeclarationToRootModule;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addDeclarationToRootModule = addDeclarationToRootModule;
+const ast_1 = require("../../utils/ast");
+const ast_utils_1 = require("../../utils/devkit-utils/ast-utils");
+const core_1 = require("@angular-devkit/core");
+function addDeclarationToRootModule(host, moduleName, importSrc) {
+    let path = `src/app/app.module.ts`, source = (0, ast_1.getSourceFile)(host, path);
+    (0, ast_utils_1.addDeclarationToModule)(source, (0, core_1.normalize)(path), moduleName, importSrc);
+}
 //# sourceMappingURL=add-declaration-to-root-module.js.map

package/src/schematics/mg-add/utils/add-declaration-to-root-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-declaration-to-root-module.js","sourceRoot":"","sources":["add-declaration-to-root-module.ts"],"names":[],"mappings":";;;AAAA,yCAA8C;AAC9C,kEAA0E;AAE1E,+CAA+C;AAE/C,SAAgB,0BAA0B,CAAC,IAAU,EAAE,UAAkB,EAAE,SAAiB;IAC3F,IACC,IAAI,GAAK,uBAAuB,EAChC,MAAM,GAAG,IAAA,mBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEpC,IAAA,kCAAsB,EAAC,MAAM,EAAE,IAAA,gBAAS,EAAC,IAAI,CAAC,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;AACxE,CAAC;AAND,gEAMC","sourcesContent":["import {getSourceFile} from '../../utils/ast';\nimport {addDeclarationToModule} from '../../utils/devkit-utils/ast-utils';\nimport {Tree} from '@angular-devkit/schematics';\nimport {normalize} from '@angular-devkit/core';\n\nexport function addDeclarationToRootModule(host: Tree, moduleName: string, importSrc: string) {\n\tlet\n\t\tpath   = `src/app/app.module.ts`,\n\t\tsource = getSourceFile(host, path);\n\t\n\taddDeclarationToModule(source, normalize(path), moduleName, importSrc);\n}\n"]}
+{"version":3,"file":"add-declaration-to-root-module.js","sourceRoot":"","sources":["add-declaration-to-root-module.ts"],"names":[],"mappings":";;AAKA,gEAMC;AAXD,yCAA8C;AAC9C,kEAA0E;AAE1E,+CAA+C;AAE/C,SAAgB,0BAA0B,CAAC,IAAU,EAAE,UAAkB,EAAE,SAAiB;IAC3F,IACC,IAAI,GAAK,uBAAuB,EAChC,MAAM,GAAG,IAAA,mBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEpC,IAAA,kCAAsB,EAAC,MAAM,EAAE,IAAA,gBAAS,EAAC,IAAI,CAAC,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;AACxE,CAAC","sourcesContent":["import {getSourceFile} from '../../utils/ast';\r\nimport {addDeclarationToModule} from '../../utils/devkit-utils/ast-utils';\r\nimport {Tree} from '@angular-devkit/schematics';\r\nimport {normalize} from '@angular-devkit/core';\r\n\r\nexport function addDeclarationToRootModule(host: Tree, moduleName: string, importSrc: string) {\r\n\tlet\r\n\t\tpath   = `src/app/app.module.ts`,\r\n\t\tsource = getSourceFile(host, path);\r\n\t\r\n\taddDeclarationToModule(source, normalize(path), moduleName, importSrc);\r\n}\r\n"]}

package/src/schematics/mg-add/utils/add-declaration-to-root-module.ts

@@ -1,12 +1,12 @@
-import {getSourceFile} from '../../utils/ast';
-import {addDeclarationToModule} from '../../utils/devkit-utils/ast-utils';
-import {Tree} from '@angular-devkit/schematics';
-import {normalize} from '@angular-devkit/core';
-
-export function addDeclarationToRootModule(host: Tree, moduleName: string, importSrc: string) {
-	let
-		path   = `src/app/app.module.ts`,
-		source = getSourceFile(host, path);
-	
-	addDeclarationToModule(source, normalize(path), moduleName, importSrc);
-}
+import {getSourceFile} from '../../utils/ast';
+import {addDeclarationToModule} from '../../utils/devkit-utils/ast-utils';
+import {Tree} from '@angular-devkit/schematics';
+import {normalize} from '@angular-devkit/core';
+
+export function addDeclarationToRootModule(host: Tree, moduleName: string, importSrc: string) {
+	let
+		path   = `src/app/app.module.ts`,
+		source = getSourceFile(host, path);
+	
+	addDeclarationToModule(source, normalize(path), moduleName, importSrc);
+}

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

@@ -1,14 +1,14 @@
-import {Routes, RouterModule} from '@angular/router';
-import { NgModule } from "@angular/core";
-import { CommonModule } from "@angular/common";
-
-export const routes: Routes = [
-
-];
-
-
-@NgModule({
-  imports: [CommonModule,RouterModule.forChild(routes)],
-  exports: [RouterModule]
-})
-export class MagicRoutingModule { }
+import {Routes, RouterModule} from '@angular/router';
+import { NgModule } from "@angular/core";
+import { CommonModule } from "@angular/common";
+
+export const routes: Routes = [
+
+];
+
+
+@NgModule({
+  imports: [CommonModule,RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class MagicRoutingModule { }

package/src/schematics/mg-add-tasks/index.d.ts

@@ -1,3 +1,3 @@
-import { Rule } from "@angular-devkit/schematics";
-import { MagicOptionScheme } from "../magic-utils/rules/magic-option.scheme";
-export declare function mgAddTasks(options: MagicOptionScheme): Rule;
+import { Rule } from "@angular-devkit/schematics";
+import { MagicOptionScheme } from "../magic-utils/rules/magic-option.scheme";
+export declare function mgAddTasks(options: MagicOptionScheme): Rule;

package/src/schematics/mg-add-tasks/index.js

@@ -1,31 +1,30 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mgAddTasks = void 0;
-const tasks_1 = require("@angular-devkit/schematics/tasks");
-const env_1 = require("../magic-utils/env");
-function mgAddTasks(options) {
-    return (host, context) => {
-        console.log("   [V - add install dependencies !] options.cliVersion=" + options.cliVersion);
-        env_1.devDependencies.push(new env_1.Idependencies("@magic-xpa/cli", options.cliVersion));
-        // install the devDependencies
-        const devInstallTask = context.addTask(new tasks_1.RunSchematicTask('mg-install', {
-            skipInstall: false,
-            skipPackageJson: false,
-            dependencies: [],
-            devDependencies: env_1.devDependencies
-        }));
-        console.log("   [V - add install dependencies !] options.angularVersion=" + options.angularVersion);
-        env_1.dependencies.push(new env_1.Idependencies("@magic-xpa/angular", options.angularVersion));
-        // install the dependencies
-        const packagesInstallTask = context.addTask(new tasks_1.RunSchematicTask('mg-install', {
-            skipInstall: options.skipInstall,
-            skipPackageJson: options.skipPackageJson,
-            dependencies: env_1.dependencies,
-            devDependencies: []
-        }), [devInstallTask]);
-        const deleteFilesTask = context.addTask(new tasks_1.RunSchematicTask('delete-files', options), [devInstallTask, packagesInstallTask]);
-        const ngAddTask = context.addTask(new tasks_1.RunSchematicTask('mg-add', options), [devInstallTask, packagesInstallTask, deleteFilesTask]);
-    };
-}
-exports.mgAddTasks = mgAddTasks;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mgAddTasks = mgAddTasks;
+const tasks_1 = require("@angular-devkit/schematics/tasks");
+const env_1 = require("../magic-utils/env");
+function mgAddTasks(options) {
+    return (host, context) => {
+        console.log("   [V - add install dependencies !] options.cliVersion=" + options.cliVersion);
+        env_1.devDependencies.push(new env_1.Idependencies("@magic-xpa/cli", options.cliVersion));
+        // install the devDependencies
+        const devInstallTask = context.addTask(new tasks_1.RunSchematicTask('mg-install', {
+            skipInstall: false,
+            skipPackageJson: false,
+            dependencies: [],
+            devDependencies: env_1.devDependencies
+        }));
+        console.log("   [V - add install dependencies !] options.angularVersion=" + options.angularVersion);
+        env_1.dependencies.push(new env_1.Idependencies("@magic-xpa/angular", options.angularVersion));
+        // install the dependencies
+        const packagesInstallTask = context.addTask(new tasks_1.RunSchematicTask('mg-install', {
+            skipInstall: options.skipInstall,
+            skipPackageJson: options.skipPackageJson,
+            dependencies: env_1.dependencies,
+            devDependencies: []
+        }), [devInstallTask]);
+        const deleteFilesTask = context.addTask(new tasks_1.RunSchematicTask('delete-files', options), [devInstallTask, packagesInstallTask]);
+        const ngAddTask = context.addTask(new tasks_1.RunSchematicTask('mg-add', options), [devInstallTask, packagesInstallTask, deleteFilesTask]);
+    };
+}
 //# sourceMappingURL=index.js.map