@magic-xpa/cli 4.800.0-dev480.94 → 4.801.0-dev000.0

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

@@ -11,20 +11,28 @@ 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 schematics_1.chain([
-        init_magic_metadata_rule_1.initMagicMetadata(options),
-        utils_1.copyMagicFiles(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 generate_rule_1.generate({
+    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,
@@ -78,8 +86,8 @@ function addMagicDependenciesToPackageJson(option) {
     return (host, context) => {
         if (!option.skipPackageJson) {
             for (let dep of env_1.dependencies) {
-                Util_1.LogLn(`[>] Add dependencies ${dep.name}`);
-                package_1.addPackageToPackageJson(host, 'dependencies', dep.name, dep.version);
+                (0, Util_1.LogLn)(`[>] Add dependencies ${dep.name}`);
+                (0, package_1.addPackageToPackageJson)(host, 'dependencies', dep.name, dep.version);
             }
             /*
             // done in pre-install step
@@ -90,12 +98,12 @@ function addMagicDependenciesToPackageJson(option) {
              */
         }
         if (!option.skipInstall) {
-            Util_1.LogLn(`[>] Install dependencies.`);
+            (0, Util_1.LogLn)(`[>] Install dependencies.`);
             context.addTask(new tasks_1.NodePackageInstallTask());
         }
         else {
-            Util_1.LogLn(`skipIstalls ${env_1.dependencies.length} dependencies`);
-            Util_1.LogLn(`skipIstalls ${env_1.devDependencies.length} devDependencies`);
+            (0, Util_1.LogLn)(`skipIstalls ${env_1.dependencies.length} dependencies`);
+            (0, Util_1.LogLn)(`skipIstalls ${env_1.devDependencies.length} devDependencies`);
         }
         return host;
     };
@@ -104,13 +112,41 @@ function addMagicModuleToAppModule(options) {
     return (host, context) => {
         const workspace = env_1.env.workspace;
         const project = env_1.env.project;
-        ast_1.addModuleImportToRootModule(host, 'BrowserAnimationsModule', '@angular/platform-browser/animations', project);
-        ast_1.addModuleImportToRootModule(host, 'ReactiveFormsModule', '@angular/forms', project);
-        ast_1.addModuleImportToRootModule(host, 'MagicModule.forRoot()', "@magic-xpa/angular", project);
-        ast_1.addModuleImportToRootModule(host, 'MagicAngularMaterialModule', "@magic-xpa/angular-material-core", project);
-        ast_1.addModuleImportToRootModule(host, 'MagicGenLibModule', "./magic/magic.gen.lib.module", project);
-        ast_1.addModuleImportToRootModule(host, 'MagicRoutingModule', "./app.routes", project);
-        return host;
+        (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":";;;AAAA,2DAKoC;AACpC,4DAAwE;AAExE,gDAA2D;AAC3D,4CAAuE;AACvE,gDAAwE;AACxE,4FAAiF;AACjF,sCAA2D;AAC3D,8CAA4C;AAC5C,sEAA8D;AAC9D,2FAAiF;AAGjF,SAAgB,KAAK,CAAC,OAAyB;IAC7C,OAAO,kBAAK,CAAC;QACX,4CAAiB,CAAkB,OAAO,CAAC;QAC3C,sBAAc,CAAqB,OAAO,CAAC;QAE3C,wBAAwB;QACxB,yBAAyB,CAAU,OAAO,CAAC;QAE3C,sBAAsB;QACtB,+BAA+B,CAAI,OAAO,CAAC;QAE3C,qBAAqB,CAAG,OAAO,CAAC;KAOjC,CAAC,CAAC;AACL,CAAC;AAnBD,sBAmBC;AAED,SAAS,2BAA2B,CAAC,OAAyB;IAC5D,OAAO,wBAAQ,CAAC;QACd,QAAQ,EAAM,oDAAoD;QAClE,IAAI,EAAU,oBAAoB;QAClC,WAAW,EAAG,SAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,kBAAkB;QACnD,IAAI,EAAS,8CAAkB,CAAC,IAAI;QACpC,IAAI,EAAU;YACZ,QAAQ,EAAG,OAAO,CAAC,QAAQ;SAC5B;KACF,EAAC,OAAO,CAAC,CAAA;AACZ,CAAC;AACD,SAAS,+BAA+B,CAAC,OAAyB;IAChE,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,OAAO,GAAK,SAAG,CAAC,OAAO,CAAC;QAC9B,IAAM,OAAO,GAAK,KAAK,CAAC;QAExB,IAAI,sBAAsB,GAAG,SAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC;QAC/D,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE;YAC3E,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,sBAAsB,UAAU,CAAC,CAAC;YACvE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YACnE,OAAO,GAAG,IAAI,CAAC;SAChB;QAED,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE;YAC5E,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,sBAAsB,WAAW,CAAC,CAAC;YACxE,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YACpE,OAAO,GAAG,IAAI,CAAC;SAChB;QAED,IAAG,OAAO,EAAC;YACT,IAAI,QAAQ,GAAG,SAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC;YAClD,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,SAAG,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;SAClE;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED,yDAAyD;AACzD,sEAAsE;AACtE,SAAS,qBAAqB,CAAE,MAAyB;IACvD,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAE/C,MAAM,YAAY,GAAG,SAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC;QAC5D,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE5D,sBAAsB;QACtB,IAAI,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAErF,oEAAoE;QACpE,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;QAEvD,kCAAkC;QAClC,IAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,mBAAmB,CAAC;YACjD,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAE9C,8CAA8C;QAC9C,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAG,CAAC,CAAC,CAAC,CAAC;QAChF,OAAO,IAAI,CAAC;IACd,CAAC,CAAA;AACH,CAAC;AAED,SAAS,iCAAiC,CAAC,MAAwB;IAClE,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,IAAG,CAAC,MAAM,CAAC,eAAe,EAAC;YACxB,KAAK,IAAI,GAAG,IAAI,kBAAY,EAAC;gBAC3B,YAAK,CAAC,wBAAwB,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC1C,iCAAuB,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;aACtE;YACF;;;;;;eAMG;SACH;QAEH,IAAG,CAAC,MAAM,CAAC,WAAW,EAAC;YACnB,YAAK,CAAC,2BAA2B,CAAC,CAAC;YACnC,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;SAC/C;aAAI;YACH,YAAK,CAAC,eAAe,kBAAY,CAAC,MAAM,eAAe,CAAC,CAAC;YACzD,YAAK,CAAC,eAAe,qBAAe,CAAC,MAAM,kBAAkB,CAAC,CAAC;SAChE;QAEH,OAAO,IAAI,CAAC;IACb,CAAC,CAAC;AACH,CAAC;AACD,SAAS,yBAAyB,CAAC,OAA0B;IAC3D,OAAO,CAAC,IAAU,EAAG,OAA0B,EAAC,EAAE;QAChD,MAAM,SAAS,GAAG,SAAG,CAAC,SAAS,CAAC;QAChC,MAAM,OAAO,GAAK,SAAG,CAAC,OAAO,CAAC;QAE9B,iCAA2B,CACzB,IAAI,EACJ,yBAAyB,EACzB,sCAAsC,EACtC,OAAO,CAAC,CAAC;QAEX,iCAA2B,CACzB,IAAI,EACJ,qBAAqB,EACrB,gBAAgB,EAChB,OAAO,CAAC,CAAC;QAGX,iCAA2B,CACzB,IAAI,EACJ,uBAAuB,EACvB,oBAAoB,EACpB,OAAO,CAAC,CAAC;QAEX,iCAA2B,CACzB,IAAI,EACJ,4BAA4B,EAC5B,kCAAkC,EAClC,OAAO,CAAC,CAAC;QAEX,iCAA2B,CACzB,IAAI,EACJ,mBAAmB,EACnB,8BAA8B,EAC9B,OAAO,CAAC,CAAC;QAEX,iCAA2B,CACzB,IAAI,EACJ,oBAAoB,EACpB,cAAc,EACd,OAAO,CAAC,CAAC;QAEX,OAAO,IAAI,CAAC;IACd,CAAC,CAAA;AACH,CAAC","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\n\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    // 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.forRoot()',\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    return host;\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/index.ts

@@ -15,7 +15,9 @@ 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 * as ts from 'typescript';
+import {InsertChange} from "../utils/devkit-utils/change";
 export function mgAdd(options:MagicOptionScheme): Rule {
   return chain([
     initMagicMetadata                 (options),
@@ -29,6 +31,7 @@ export function mgAdd(options:MagicOptionScheme): Rule {
 
     updateTsConfigAppJson  (options),
 
+    addLazyLoadProvider(),
     // handel app.component.html
     //updateAppComponentHtmlFiles       (options),
 
@@ -146,7 +149,7 @@ function addMagicModuleToAppModule(options: MagicOptionScheme) : Rule {
 
     addModuleImportToRootModule(
       host,
-      'MagicModule.forRoot()',
+      'MagicModule',
       "@magic-xpa/angular",
       project);
 
@@ -168,6 +171,42 @@ function addMagicModuleToAppModule(options: MagicOptionScheme) : Rule {
       "./app.routes",
       project);
 
-    return host;
+
+  }
+}
+
+function addLazyLoadProvider(): Rule {
+  return (host: Tree) => {
+    const appmodule = 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 = addProviderToModule(source, appmodule, '{ provide: MagicLazyLoaderService, useClass: LazyLoaderService }', lazyLoaderServicePath)
+
+    const providerRecorder = host.beginUpdate(appmodule);
+    for (const change of providerChanges) {
+      if (change instanceof InsertChange) {
+        if (!change.toAdd.includes('import'))  // skip import change
+        providerRecorder.insertLeft(change.pos, change.toAdd);
+      }
+    }
+    host.commitUpdate(providerRecorder);
+
+    const lazyLoaderServiceImport = insertImport(source, appmodule, lazyLoaderService, lazyLoaderServicePath, false);
+    const lazyLoaderServiceChangesRecorder = host.beginUpdate(appmodule);
+    if (lazyLoaderServiceImport instanceof InsertChange)
+      lazyLoaderServiceChangesRecorder.insertLeft(lazyLoaderServiceImport.pos, lazyLoaderServiceImport.toAdd);
+    host.commitUpdate(lazyLoaderServiceChangesRecorder);
+
+    // add import for MagicLazyLoaderService
+    const magicLazyLoaderServiceImportChanges: InsertChange = <InsertChange>insertImport(source, appmodule, 'MagicLazyLoaderService', '@magic-xpa/angular', false);
+    const magicImportChangesRecorder = host.beginUpdate(appmodule);
+    magicImportChangesRecorder.insertLeft(magicLazyLoaderServiceImportChanges.pos, magicLazyLoaderServiceImportChanges.toAdd)
+    host.commitUpdate(magicImportChangesRecorder);
   }
 }
+

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

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsMagicAdd",
+  "$id": "SchematicsMagicAdd",
   "title": "Magic Options Schema",
   "type": "object",
   "properties": {

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

@@ -5,8 +5,8 @@ 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 = ast_1.getSourceFile(host, path);
-    ast_utils_1.addDeclarationToModule(source, core_1.normalize(path), 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;
 //# 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,mBAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEpC,kCAAsB,CAAC,MAAM,EAAE,gBAAS,CAAC,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":";;;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"]}

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

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsMagicAddTasks",
+  "$id": "SchematicsMagicAddTasks",
   "title": "Magic Options Schema",
   "type": "object",
   "properties": {

package/src/schematics/mg-delete-files/index.js

@@ -5,9 +5,9 @@ const schematics_1 = require("@angular-devkit/schematics");
 const init_magic_metadata_rule_1 = require("../magic-utils/rules/init-magic-metadata.rule");
 const utils_1 = require("../magic-utils/utils");
 function mgDeleteFiles(options) {
-    return schematics_1.chain([
-        init_magic_metadata_rule_1.initMagicMetadata(options),
-        utils_1.deleteMagicFiles(options),
+    return (0, schematics_1.chain)([
+        (0, init_magic_metadata_rule_1.initMagicMetadata)(options),
+        (0, utils_1.deleteMagicFiles)(options),
     ]);
 }
 exports.mgDeleteFiles = mgDeleteFiles;

package/src/schematics/mg-delete-files/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,2DAAsD;AACtD,4FAAmF;AACnF,gDAAuD;AAGvD,SAAgB,aAAa,CAAC,OAAyB;IACrD,OAAO,kBAAK,CAAC;QACX,4CAAiB,CAAE,OAAO,CAAC;QAC3B,wBAAgB,CAAG,OAAO,CAAC;KAC5B,CAAC,CAAC;AACL,CAAC;AALD,sCAKC","sourcesContent":["import {chain,Rule} from \"@angular-devkit/schematics\";\nimport { initMagicMetadata}   from \"../magic-utils/rules/init-magic-metadata.rule\";\nimport { deleteMagicFiles} from \"../magic-utils/utils\";\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\n\nexport function mgDeleteFiles(options:MagicOptionScheme): Rule {\n  return chain([\n    initMagicMetadata (options),\n    deleteMagicFiles  (options),\n  ]);\n}\n\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,2DAAsD;AACtD,4FAAmF;AACnF,gDAAuD;AAGvD,SAAgB,aAAa,CAAC,OAAyB;IACrD,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,4CAAiB,EAAE,OAAO,CAAC;QAC3B,IAAA,wBAAgB,EAAG,OAAO,CAAC;KAC5B,CAAC,CAAC;AACL,CAAC;AALD,sCAKC","sourcesContent":["import {chain,Rule} from \"@angular-devkit/schematics\";\nimport { initMagicMetadata}   from \"../magic-utils/rules/init-magic-metadata.rule\";\nimport { deleteMagicFiles} from \"../magic-utils/utils\";\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\n\nexport function mgDeleteFiles(options:MagicOptionScheme): Rule {\n  return chain([\n    initMagicMetadata (options),\n    deleteMagicFiles  (options),\n  ]);\n}\n\n"]}

package/src/schematics/mg-delete-files/schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsMagicDeleteFiles",
+  "$id": "SchematicsMagicDeleteFiles",
   "title": "Magic Options Schema",
   "type": "object",
   "properties": {

package/src/schematics/mg-gen-module/index.js

@@ -5,11 +5,11 @@ const schematics_1 = require("@angular-devkit/schematics");
 const init_magic_metadata_rule_1 = require("../magic-utils/rules/init-magic-metadata.rule");
 const init_add_modules_rule_1 = require("../magic-utils/rules/init-add-modules.rule");
 function mgGenModule(options) {
-    return schematics_1.chain([
-        init_magic_metadata_rule_1.initMagicMetadata(options),
+    return (0, schematics_1.chain)([
+        (0, init_magic_metadata_rule_1.initMagicMetadata)(options),
         // ** generate the modules in the project **
-        init_add_modules_rule_1.initGenModules(options),
-        init_add_modules_rule_1.generateWebModules(options)
+        (0, init_add_modules_rule_1.initGenModules)(options),
+        (0, init_add_modules_rule_1.generateWebModules)(options)
     ]);
 }
 exports.mgGenModule = mgGenModule;

package/src/schematics/mg-gen-module/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,2DAAyD;AACzD,4FAAmF;AAEnF,sFAAgG;AAEhG,SAAgB,WAAW,CAAC,OAAyB;IACnD,OAAO,kBAAK,CAAC;QACX,4CAAiB,CAAE,OAAO,CAAC;QAE3B,4CAA4C;QAC5C,sCAAc,CAAE,OAAO,CAAC;QACxB,0CAAkB,CAAC,OAAO,CAAC;KAC5B,CAAC,CAAC;AACL,CAAC;AARD,kCAQC","sourcesContent":["import { chain, Rule } from \"@angular-devkit/schematics\";\nimport { initMagicMetadata}   from \"../magic-utils/rules/init-magic-metadata.rule\";\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\nimport { generateWebModules, initGenModules } from \"../magic-utils/rules/init-add-modules.rule\";\n\nexport function mgGenModule(options:MagicOptionScheme): Rule {\n  return chain([\n    initMagicMetadata (options),\n\n    // ** generate the modules in the project **\n    initGenModules (options),\n    generateWebModules(options)\n  ]);\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,2DAAyD;AACzD,4FAAmF;AAEnF,sFAAgG;AAEhG,SAAgB,WAAW,CAAC,OAAyB;IACnD,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,4CAAiB,EAAE,OAAO,CAAC;QAE3B,4CAA4C;QAC5C,IAAA,sCAAc,EAAE,OAAO,CAAC;QACxB,IAAA,0CAAkB,EAAC,OAAO,CAAC;KAC5B,CAAC,CAAC;AACL,CAAC;AARD,kCAQC","sourcesContent":["import { chain, Rule } from \"@angular-devkit/schematics\";\nimport { initMagicMetadata}   from \"../magic-utils/rules/init-magic-metadata.rule\";\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\nimport { generateWebModules, initGenModules } from \"../magic-utils/rules/init-add-modules.rule\";\n\nexport function mgGenModule(options:MagicOptionScheme): Rule {\n  return chain([\n    initMagicMetadata (options),\n\n    // ** generate the modules in the project **\n    initGenModules (options),\n    generateWebModules(options)\n  ]);\n}\n"]}

package/src/schematics/mg-gen-module/schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsMagicGenerate",
+  "$id": "SchematicsMagicGenerate",
   "title": "Magic Options Schema",
   "type": "object",
   "properties": {

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

@@ -5,9 +5,9 @@ const schematics_1 = require("@angular-devkit/schematics");
 const init_magic_metadata_rule_1 = require("../magic-utils/rules/init-magic-metadata.rule");
 const init_gen_components_rule_1 = require("../magic-utils/rules/init-gen-components.rule");
 function mgGenerate(options) {
-    return schematics_1.chain([
-        init_magic_metadata_rule_1.initMagicMetadata(options),
-        init_gen_components_rule_1.initAndGenComponentsForModule(options, true)
+    return (0, schematics_1.chain)([
+        (0, init_magic_metadata_rule_1.initMagicMetadata)(options),
+        (0, init_gen_components_rule_1.initAndGenComponentsForModule)(options, true)
     ]);
 }
 exports.mgGenerate = mgGenerate;

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,2DAAiF;AAEjF,4FAAmF;AACnF,4FAA6F;AAG7F,SAAgB,UAAU,CAAC,OAAyB;IAClD,OAAO,kBAAK,CAAC;QACX,4CAAiB,CAAE,OAAO,CAAC;QAC3B,wDAA6B,CAAE,OAAO,EAAE,IAAI,CAAC;KAC9C,CAAC,CAAC;AACL,CAAC;AALD,gCAKC","sourcesContent":["import { chain, Rule, SchematicContext, Tree } from \"@angular-devkit/schematics\";\n\nimport { initMagicMetadata}   from \"../magic-utils/rules/init-magic-metadata.rule\";\nimport { initAndGenComponentsForModule} from \"../magic-utils/rules/init-gen-components.rule\";\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\n\nexport function mgGenerate(options:MagicOptionScheme): Rule {\n  return chain([\n    initMagicMetadata (options),\n    initAndGenComponentsForModule (options, true)\n  ]);\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,2DAAiF;AAEjF,4FAAmF;AACnF,4FAA6F;AAG7F,SAAgB,UAAU,CAAC,OAAyB;IAClD,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,4CAAiB,EAAE,OAAO,CAAC;QAC3B,IAAA,wDAA6B,EAAE,OAAO,EAAE,IAAI,CAAC;KAC9C,CAAC,CAAC;AACL,CAAC;AALD,gCAKC","sourcesContent":["import { chain, Rule, SchematicContext, Tree } from \"@angular-devkit/schematics\";\n\nimport { initMagicMetadata}   from \"../magic-utils/rules/init-magic-metadata.rule\";\nimport { initAndGenComponentsForModule} from \"../magic-utils/rules/init-gen-components.rule\";\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\n\nexport function mgGenerate(options:MagicOptionScheme): Rule {\n  return chain([\n    initMagicMetadata (options),\n    initAndGenComponentsForModule (options, true)\n  ]);\n}\n"]}

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

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsMagicGenerate",
+  "$id": "SchematicsMagicGenerate",
   "title": "Magic Options Schema",
   "type": "object",
   "properties": {

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

@@ -13,11 +13,11 @@ function mgInstall(options) {
         if (!options.skipPackageJson) {
             for (let dep of options.dependencies) {
                 context.logger.info(`[>] Add dependencies ${dep.name} ${dep.version}`);
-                package_1.addPackageToPackageJson(host, 'dependencies', dep.name, dep.version);
+                (0, package_1.addPackageToPackageJson)(host, 'dependencies', dep.name, dep.version);
             }
             for (let dep of options.devDependencies) {
                 context.logger.info(`[>] Add devDependencies ${dep.name} ${dep.version}`);
-                package_1.addPackageToPackageJson(host, 'devDependencies', dep.name, dep.version);
+                (0, package_1.addPackageToPackageJson)(host, 'devDependencies', dep.name, dep.version);
             }
         }
         if (!options.skipInstall) {

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,4DAA4F;AAC5F,8CAA2D;AAI3D,SAAgB,SAAS,CAAC,OAAyB;IACjD,OAAO,CAAC,IAAS,EAAE,OAAwB,EAAC,EAAE;QAE5C,iBAAiB;QACjB,sCAAsC;QACtC,+BAA+B;QAC/B,mFAAmF;QACnF,IAAI;QAEJ,IAAG,CAAC,OAAO,CAAC,eAAe,EAAC;YAC1B,KAAK,IAAI,GAAG,IAAI,OAAO,CAAC,YAAY,EAAC;gBACnC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBACvE,iCAAuB,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;aACtE;YACD,KAAK,IAAI,GAAG,IAAI,OAAO,CAAC,eAAe,EAAC;gBACtC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC1E,iCAAuB,CAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;aACzE;SACF;QAED,IAAG,CAAC,OAAO,CAAC,WAAW,EAAC;YACtB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;YACjD,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;SAC/C;QAED,OAAO,IAAI,CAAC;IAEd,CAAC,CAAC;AACJ,CAAC;AA5BD,8BA4BC","sourcesContent":["import { Rule,Tree,SchematicContext } from \"@angular-devkit/schematics\";\nimport { NodePackageInstallTask, RunSchematicTask } from \"@angular-devkit/schematics/tasks\";\nimport { addPackageToPackageJson } from \"../utils/package\";\nimport { dependencies, devDependencies, Idependencies } from \"../magic-utils/env\";\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\n\nexport function mgInstall(options:MagicOptionScheme): Rule {\n  return (host:Tree, context:SchematicContext)=>{\n\n    // for debug only\n    // if (options.dependencies == null) {\n    //   options.dependencies = [];\n    //   options.dependencies.push(new Idependencies(\"@magic-xpa/angular\", \"0.0.177\"));\n    // }\n\n    if(!options.skipPackageJson){\n      for (let dep of options.dependencies){\n        context.logger.info(`[>] Add dependencies ${dep.name} ${dep.version}`);\n        addPackageToPackageJson(host, 'dependencies', dep.name, dep.version);\n      }\n      for (let dep of options.devDependencies){\n        context.logger.info(`[>] Add devDependencies ${dep.name} ${dep.version}`);\n        addPackageToPackageJson(host, 'devDependencies', dep.name, dep.version);\n      }\n    }\n\n    if(!options.skipInstall){\n      context.logger.info(`[>] Install dependencies.`);\n      context.addTask(new NodePackageInstallTask());\n    }\n\n    return host;\n\n  };\n}\n\n\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AACA,4DAA4F;AAC5F,8CAA2D;AAI3D,SAAgB,SAAS,CAAC,OAAyB;IACjD,OAAO,CAAC,IAAS,EAAE,OAAwB,EAAC,EAAE;QAE5C,iBAAiB;QACjB,sCAAsC;QACtC,+BAA+B;QAC/B,mFAAmF;QACnF,IAAI;QAEJ,IAAG,CAAC,OAAO,CAAC,eAAe,EAAC;YAC1B,KAAK,IAAI,GAAG,IAAI,OAAO,CAAC,YAAY,EAAC;gBACnC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBACvE,IAAA,iCAAuB,EAAC,IAAI,EAAE,cAAc,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;aACtE;YACD,KAAK,IAAI,GAAG,IAAI,OAAO,CAAC,eAAe,EAAC;gBACtC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC1E,IAAA,iCAAuB,EAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;aACzE;SACF;QAED,IAAG,CAAC,OAAO,CAAC,WAAW,EAAC;YACtB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;YACjD,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;SAC/C;QAED,OAAO,IAAI,CAAC;IAEd,CAAC,CAAC;AACJ,CAAC;AA5BD,8BA4BC","sourcesContent":["import { Rule,Tree,SchematicContext } from \"@angular-devkit/schematics\";\nimport { NodePackageInstallTask, RunSchematicTask } from \"@angular-devkit/schematics/tasks\";\nimport { addPackageToPackageJson } from \"../utils/package\";\nimport { dependencies, devDependencies, Idependencies } from \"../magic-utils/env\";\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\n\nexport function mgInstall(options:MagicOptionScheme): Rule {\n  return (host:Tree, context:SchematicContext)=>{\n\n    // for debug only\n    // if (options.dependencies == null) {\n    //   options.dependencies = [];\n    //   options.dependencies.push(new Idependencies(\"@magic-xpa/angular\", \"0.0.177\"));\n    // }\n\n    if(!options.skipPackageJson){\n      for (let dep of options.dependencies){\n        context.logger.info(`[>] Add dependencies ${dep.name} ${dep.version}`);\n        addPackageToPackageJson(host, 'dependencies', dep.name, dep.version);\n      }\n      for (let dep of options.devDependencies){\n        context.logger.info(`[>] Add devDependencies ${dep.name} ${dep.version}`);\n        addPackageToPackageJson(host, 'devDependencies', dep.name, dep.version);\n      }\n    }\n\n    if(!options.skipInstall){\n      context.logger.info(`[>] Install dependencies.`);\n      context.addTask(new NodePackageInstallTask());\n    }\n\n    return host;\n\n  };\n}\n\n\n"]}

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

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsMagicInstallTasks",
+  "$id": "SchematicsMagicInstallTasks",
   "title": "Magic Options Schema",
   "type": "object",
   "properties": {

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

@@ -8,8 +8,8 @@ const generate_rule_1 = require("../magic-utils/rules/generate.rule");
 const env_1 = require("../magic-utils/env");
 const Util_1 = require("../magic-utils/Util");
 function mgGenerateRoutes(options) {
-    return schematics_1.chain([
-        init_magic_metadata_rule_1.initMagicMetadata(options),
+    return (0, schematics_1.chain)([
+        (0, init_magic_metadata_rule_1.initMagicMetadata)(options),
         genRoutesFile(options)
     ]);
 }
@@ -26,7 +26,7 @@ function genRoutesFile(options) {
         for (let routeItem of routeTable) {
             rules.push(genRouteFile(options, routeItem));
         }
-        return schematics_1.chain(rules)(tree, context);
+        return (0, schematics_1.chain)(rules)(tree, context);
     };
 }
 exports.genRoutesFile = genRoutesFile;
@@ -34,7 +34,7 @@ function genRouteFile(options, routeItem) {
     return (host, context) => {
         const metadata = env_1.env.metadata;
         let createRootRoute = routeItem.module_name == '' ? true : false;
-        Util_1.LogLn(`genRouteFile : [${routeItem.module_name}]  createRootRoute = ${createRootRoute}`);
+        (0, Util_1.LogLn)(`genRouteFile : [${routeItem.module_name}]  createRootRoute = ${createRootRoute}`);
         const data = {
             routesArray: routeItem.routesArray,
             createRootRoute: createRootRoute
@@ -55,8 +55,8 @@ function genRouteFile(options, routeItem) {
             name: 'app.routes.ts',
             data: data
         };
-        return schematics_1.chain([
-            generate_rule_1.generate(componentFile, options)
+        return (0, schematics_1.chain)([
+            (0, generate_rule_1.generate)(componentFile, options)
         ])(host, context);
     };
 }

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,2DAA+F;AAC/F,4FAAkF;AAClF,uCAAiE;AACjE,sEAA8D;AAC9D,4CAAyC;AAGzC,8CAA4C;AAE5C,SAAgB,gBAAgB,CAAC,OAA0B;IACzD,OAAO,kBAAK,CAAC;QACX,4CAAiB,CAAE,OAAO,CAAC;QAC3B,aAAa,CAAM,OAAO,CAAC;KAC5B,CAAC,CAAC;AACL,CAAC;AALD,4CAKC;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;YAC/B,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;SAC9C;QAED,OAAO,kBAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAC,OAAO,CAAC,CAAC;IACpC,CAAC,CAAC;AACJ,CAAC;AAfD,sCAeC;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,YAAK,CAAC,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;YACE,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,kBAAkB,GAAG,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;SACnF;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;YACtB,WAAW,EAAG,eAAe;YAC7B,IAAI,EAAU,eAAe;YAC7B,IAAI,EAAU,IAAI;SACnB,CAAC;QAEF,OAAO,kBAAK,CAAC;YACX,wBAAQ,CAAC,aAAa,EAAC,OAAO,CAAC;SAChC,CAAC,CAAC,IAAI,EAAC,OAAO,CAAC,CAAC;IACnB,CAAC,CAAA;AACH,CAAC;AAnCD,oCAmCC","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"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,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;AALD,4CAKC;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;YAC/B,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;SAC9C;QAED,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC,IAAI,EAAC,OAAO,CAAC,CAAC;IACpC,CAAC,CAAC;AACJ,CAAC;AAfD,sCAeC;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;YACE,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,kBAAkB,GAAG,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;SACnF;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;YACtB,WAAW,EAAG,eAAe;YAC7B,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;AAnCD,oCAmCC","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"]}

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

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsMagicRoute",
+  "$id": "SchematicsMagicRoute",
   "title": "Magic Options Schema",
   "type": "object",
   "properties": {

package/src/schematics/mg-single-control/index.js

@@ -10,11 +10,11 @@ const env_1 = require("../magic-utils/env");
 // entry point for generation of single control HTML
 //
 function mgSingleControl(options) {
-    return schematics_1.chain([
-        init_magic_metadata_rule_1.initMagicMetadata(options),
+    return (0, schematics_1.chain)([
+        (0, init_magic_metadata_rule_1.initMagicMetadata)(options),
         initSingleControl(options),
-        init_gen_components_rule_1.initAndGenComponentsForModule(options, false),
-        build_control_rule_1.buildControl(options, "")
+        (0, init_gen_components_rule_1.initAndGenComponentsForModule)(options, false),
+        (0, build_control_rule_1.buildControl)(options, "")
     ]);
 }
 exports.mgSingleControl = mgSingleControl;

package/src/schematics/mg-single-control/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,2DAAsF;AACtF,4FAAiF;AACjF,4FAEuD;AACvD,gFAAuE;AACvE,4CAAyC;AAGzC,EAAE;AACF,oDAAoD;AACpD,EAAE;AACF,SAAgB,eAAe,CAAC,OAA0B;IACxD,OAAO,kBAAK,CAAC;QACX,4CAAiB,CAAC,OAAO,CAAC;QAC1B,iBAAiB,CAAC,OAAO,CAAC;QAC1B,wDAA6B,CAAE,OAAO,EAAE,KAAK,CAAC;QAC9C,iCAAY,CAAC,OAAO,EAAE,EAAE,CAAC;KAC1B,CAAC,CAAC;AACL,CAAC;AAPD,0CAOC;AAED,EAAE;AACF,6DAA6D;AAC7D,EAAE;AACF,SAAS,iBAAiB,CAAC,OAA0B;IACnD,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,SAAG,CAAC,WAAW,GAAG,IAAI,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import { chain, Rule, SchematicContext, Tree, url } from \"@angular-devkit/schematics\";\r\nimport { initMagicMetadata} from \"../magic-utils/rules/init-magic-metadata.rule\";\r\nimport {\r\n  initAndGenComponentsForModule\r\n} from \"../magic-utils/rules/init-gen-components.rule\";\r\nimport { buildControl } from \"../magic-utils/rules/build-control.rule\";\r\nimport { env } from \"../magic-utils/env\";\r\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\r\n\r\n//\r\n// entry point for generation of single control HTML\r\n//\r\nexport function mgSingleControl(options: MagicOptionScheme): Rule {\r\n  return chain([\r\n    initMagicMetadata(options),\r\n    initSingleControl(options),\r\n    initAndGenComponentsForModule (options, false),\r\n    buildControl(options, \"\")\r\n  ]);\r\n}\r\n\r\n//\r\n// single control generation helper - turn on the no-log flag\r\n//\r\nfunction initSingleControl(options: MagicOptionScheme): Rule {\r\n  return (host: Tree, context: SchematicContext) => {\r\n    env.prevent_log = true;\r\n    return host;\r\n  };\r\n}\r\n\r\n\r\n\r\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,2DAAsF;AACtF,4FAAiF;AACjF,4FAEuD;AACvD,gFAAuE;AACvE,4CAAyC;AAGzC,EAAE;AACF,oDAAoD;AACpD,EAAE;AACF,SAAgB,eAAe,CAAC,OAA0B;IACxD,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,4CAAiB,EAAC,OAAO,CAAC;QAC1B,iBAAiB,CAAC,OAAO,CAAC;QAC1B,IAAA,wDAA6B,EAAE,OAAO,EAAE,KAAK,CAAC;QAC9C,IAAA,iCAAY,EAAC,OAAO,EAAE,EAAE,CAAC;KAC1B,CAAC,CAAC;AACL,CAAC;AAPD,0CAOC;AAED,EAAE;AACF,6DAA6D;AAC7D,EAAE;AACF,SAAS,iBAAiB,CAAC,OAA0B;IACnD,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,SAAG,CAAC,WAAW,GAAG,IAAI,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import { chain, Rule, SchematicContext, Tree, url } from \"@angular-devkit/schematics\";\r\nimport { initMagicMetadata} from \"../magic-utils/rules/init-magic-metadata.rule\";\r\nimport {\r\n  initAndGenComponentsForModule\r\n} from \"../magic-utils/rules/init-gen-components.rule\";\r\nimport { buildControl } from \"../magic-utils/rules/build-control.rule\";\r\nimport { env } from \"../magic-utils/env\";\r\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\r\n\r\n//\r\n// entry point for generation of single control HTML\r\n//\r\nexport function mgSingleControl(options: MagicOptionScheme): Rule {\r\n  return chain([\r\n    initMagicMetadata(options),\r\n    initSingleControl(options),\r\n    initAndGenComponentsForModule (options, false),\r\n    buildControl(options, \"\")\r\n  ]);\r\n}\r\n\r\n//\r\n// single control generation helper - turn on the no-log flag\r\n//\r\nfunction initSingleControl(options: MagicOptionScheme): Rule {\r\n  return (host: Tree, context: SchematicContext) => {\r\n    env.prevent_log = true;\r\n    return host;\r\n  };\r\n}\r\n\r\n\r\n\r\n"]}

package/src/schematics/mg-single-control/schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsMagicRoute",
+  "$id": "SchematicsMagicRoute",
   "title": "Magic Options Schema",
   "type": "object",
   "properties": {

package/src/schematics/utils/ast.js

@@ -21,7 +21,7 @@ function getSourceFile(host, path) {
 exports.getSourceFile = getSourceFile;
 /** Import and add module to root app module. */
 function addModuleImportToRootModule(host, moduleName, src, project) {
-    const modulePath = ng_ast_utils_1.getAppModulePath(host, project.architect.build.options.main);
+    const modulePath = (0, ng_ast_utils_1.getAppModulePath)(host, project.architect.build.options.main);
     addModuleImportToModule(host, modulePath, moduleName, src);
 }
 exports.addModuleImportToRootModule = addModuleImportToRootModule;
@@ -37,7 +37,7 @@ function addModuleImportToModule(host, modulePath, moduleName, src) {
     if (!moduleSource) {
         throw new schematics_1.SchematicsException(`Module not found: ${modulePath}`);
     }
-    const changes = ast_utils_1.addImportToModule(moduleSource, modulePath, moduleName, src);
+    const changes = (0, ast_utils_1.addImportToModule)(moduleSource, modulePath, moduleName, src);
     const recorder = host.beginUpdate(modulePath);
     changes.forEach((change) => {
         if (change instanceof change_1.InsertChange) {
@@ -65,12 +65,12 @@ function getStylesPath(host, project) {
         // "main" style sheet.
         const defaultMainStylePath = styles.find(a => /styles\.(c|le|sc)ss/.test(a));
         if (defaultMainStylePath) {
-            return core_1.normalize(defaultMainStylePath);
+            return (0, core_1.normalize)(defaultMainStylePath);
         }
         // If there was no obvious default file, use the first style asset.
         const fallbackStylePath = styles.find(a => /\.(c|le|sc)ss/.test(a));
         if (fallbackStylePath) {
-            return core_1.normalize(fallbackStylePath);
+            return (0, core_1.normalize)(fallbackStylePath);
         }
     }
     throw new schematics_1.SchematicsException('No style files could be found into which a theme could be added');
@@ -78,7 +78,7 @@ function getStylesPath(host, project) {
 exports.getStylesPath = getStylesPath;
 /** Wraps the internal find module from options with undefined path handling  */
 function findModuleFromOptions(host, options) {
-    const workspace = config_1.getWorkspace(host);
+    const workspace = (0, config_1.getWorkspace)(host);
     if (!options.project) {
         options.project = Object.keys(workspace.projects)[0];
     }
@@ -86,7 +86,7 @@ function findModuleFromOptions(host, options) {
     if (options.path === undefined) {
         options.path = `/${project.root}/src/app`;
     }
-    return find_module_1.findModuleFromOptions(host, options);
+    return (0, find_module_1.findModuleFromOptions)(host, options);
 }
 exports.findModuleFromOptions = findModuleFromOptions;
 //# sourceMappingURL=ast.js.map