@magic-xpa/cli 4.801.0-dev481.243 → 4.801.0-dev481.249

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

package/src/schematics/utils/ast.js.map

@@ -1 +1 @@
-{"version":3,"file":"ast.js","sourceRoot":"","sources":["ast.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,2DAAqE;AACrE,iCAAiC;AACjC,wDAA2D;AAC3D,kDAAmD;AACnD,kDAA4D;AAC5D,8DAAsF;AACtF,4DAAsG;AAGtG,gEAAgE;AAChE,SAAgB,aAAa,CAAC,IAAU,EAAE,IAAY;IACpD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,gCAAmB,CAAC,iCAAiC,IAAI,EAAE,CAAC,CAAC;KACxE;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IAClC,OAAO,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AAC1E,CAAC;AAPD,sCAOC;AAED,gDAAgD;AAChD,SAAgB,2BAA2B,CAAC,IAAU,EAAE,UAAkB,EAAE,GAAW,EAAE,OAAgB;IACvG,MAAM,UAAU,GAAG,+BAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAChF,uBAAuB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;AAC7D,CAAC;AAHD,kEAGC;AAED;;;;;;GAMG;AACH,SAAgB,uBAAuB,CACnC,IAAU,EAAE,UAAkB,EAAE,UAAkB,EAAE,GAAW;IACjE,MAAM,YAAY,GAAG,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAErD,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,gCAAmB,CAAC,qBAAqB,UAAU,EAAE,CAAC,CAAC;KAClE;IAED,MAAM,OAAO,GAAG,6BAAiB,CAAC,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;IAC7E,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAE9C,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QACzB,IAAI,MAAM,YAAY,qBAAY,EAAE;YAClC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;SAC/C;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;AAC9B,CAAC;AAlBD,0DAkBC;AAED,mCAAmC;AACnC,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAgB;IAC3D,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC;IAEpD,IAAI,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;QACjE,OAAO,WAAW,CAAC,KAAK,CAAC;KAC1B;IAED,MAAM,IAAI,gCAAmB,CAAC,+BAA+B,CAAC,CAAC;AACjE,CAAC;AARD,4CAQC;AAED,oCAAoC;AACpC,SAAgB,aAAa,CAAC,IAAU,EAAE,OAAgB;IACxD,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAE/C,IAAI,WAAW,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,MAAM,IAAI,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;QAC1F,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAE5D,uFAAuF;QACvF,sBAAsB;QACtB,MAAM,oBAAoB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7E,IAAI,oBAAoB,EAAE;YACxB,OAAO,gBAAS,CAAC,oBAAoB,CAAC,CAAC;SACxC;QAED,mEAAmE;QACnE,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,IAAI,iBAAiB,EAAE;YACrB,OAAO,gBAAS,CAAC,iBAAiB,CAAC,CAAC;SACrC;KACF;IAED,MAAM,IAAI,gCAAmB,CAAC,iEAAiE,CAAC,CAAC;AACnG,CAAC;AArBD,sCAqBC;AAED,gFAAgF;AAChF,SAAgB,qBAAqB,CAAC,IAAU,EAAE,OAAY;IAC5D,MAAM,SAAS,GAAG,qBAAY,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;KACtD;IAED,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpD,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE;QAC9B,OAAO,CAAC,IAAI,GAAG,IAAI,OAAO,CAAC,IAAI,UAAU,CAAC;KAC3C;IAED,OAAO,mCAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC3C,CAAC;AAbD,sDAaC","sourcesContent":["import {normalize} from '@angular-devkit/core';\nimport {SchematicsException, Tree} from '@angular-devkit/schematics';\nimport * as ts from 'typescript';\nimport {addImportToModule} from './devkit-utils/ast-utils';\nimport {InsertChange} from './devkit-utils/change';\nimport {Project, getWorkspace} from './devkit-utils/config';\nimport {findBootstrapModulePath, getAppModulePath} from './devkit-utils/ng-ast-utils';\nimport {ModuleOptions, findModuleFromOptions as internalFindModule} from './devkit-utils/find-module';\n\n\n/** Reads file given path and returns TypeScript source file. */\nexport function getSourceFile(host: Tree, path: string): ts.SourceFile {\n  const buffer = host.read(path);\n  if (!buffer) {\n    throw new SchematicsException(`Could not find file for path: ${path}`);\n  }\n  const content = buffer.toString();\n  return ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);\n}\n\n/** Import and add module to root app module. */\nexport function addModuleImportToRootModule(host: Tree, moduleName: string, src: string, project: Project) {\n  const modulePath = getAppModulePath(host, project.architect.build.options.main);\n  addModuleImportToModule(host, modulePath, moduleName, src);\n}\n\n/**\n * Import and add module to specific module path.\n * @param host the tree we are updating\n * @param modulePath src location of the module to import\n * @param moduleName name of module to import\n * @param src src location to import\n */\nexport function addModuleImportToModule(\n    host: Tree, modulePath: string, moduleName: string, src: string) {\n  const moduleSource = getSourceFile(host, modulePath);\n\n  if (!moduleSource) {\n    throw new SchematicsException(`Module not found: ${modulePath}`);\n  }\n\n  const changes = addImportToModule(moduleSource, modulePath, moduleName, src);\n  const recorder = host.beginUpdate(modulePath);\n\n  changes.forEach((change) => {\n    if (change instanceof InsertChange) {\n      recorder.insertLeft(change.pos, change.toAdd);\n    }\n  });\n\n  host.commitUpdate(recorder);\n}\n\n/** Gets the app index.html file */\nexport function getIndexHtmlPath(host: Tree, project: Project): string {\n  const buildTarget = project.architect.build.options;\n\n  if (buildTarget.index && buildTarget.index.endsWith('index.html')) {\n    return buildTarget.index;\n  }\n\n  throw new SchematicsException('No index.html file was found.');\n}\n\n/** Get the root stylesheet file. */\nexport function getStylesPath(host: Tree, project: Project): string {\n  const buildTarget = project.architect['build'];\n\n  if (buildTarget.options && buildTarget.options.styles && buildTarget.options.styles.length) {\n    const styles = buildTarget.options.styles.map(s => s.input);\n\n    // First, see if any of the assets is called \"styles.(le|sc|c)ss\", which is the default\n    // \"main\" style sheet.\n    const defaultMainStylePath = styles.find(a => /styles\\.(c|le|sc)ss/.test(a));\n    if (defaultMainStylePath) {\n      return normalize(defaultMainStylePath);\n    }\n\n    // If there was no obvious default file, use the first style asset.\n    const fallbackStylePath = styles.find(a => /\\.(c|le|sc)ss/.test(a));\n    if (fallbackStylePath) {\n      return normalize(fallbackStylePath);\n    }\n  }\n\n  throw new SchematicsException('No style files could be found into which a theme could be added');\n}\n\n/** Wraps the internal find module from options with undefined path handling  */\nexport function findModuleFromOptions(host: Tree, options: any) {\n  const workspace = getWorkspace(host);\n  if (!options.project) {\n    options.project = Object.keys(workspace.projects)[0];\n  }\n\n  const project = workspace.projects[options.project];\n\n  if (options.path === undefined) {\n    options.path = `/${project.root}/src/app`;\n  }\n\n  return internalFindModule(host, options);\n}\n"]}
+{"version":3,"file":"ast.js","sourceRoot":"","sources":["ast.ts"],"names":[],"mappings":"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","sourcesContent":["import {normalize} from '@angular-devkit/core';\nimport {SchematicsException, Tree} from '@angular-devkit/schematics';\nimport * as ts from 'typescript';\nimport {addImportToModule} from './devkit-utils/ast-utils';\nimport {InsertChange} from './devkit-utils/change';\nimport {Project, getWorkspace} from './devkit-utils/config';\nimport {findBootstrapModulePath, getAppModulePath} from './devkit-utils/ng-ast-utils';\nimport {ModuleOptions, findModuleFromOptions as internalFindModule} from './devkit-utils/find-module';\n\n\n/** Reads file given path and returns TypeScript source file. */\nexport function getSourceFile(host: Tree, path: string): ts.SourceFile {\n  const buffer = host.read(path);\n  if (!buffer) {\n    throw new SchematicsException(`Could not find file for path: ${path}`);\n  }\n  const content = buffer.toString();\n  return ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);\n}\n\n/** Import and add module to root app module. */\nexport function addModuleImportToRootModule(host: Tree, moduleName: string, src: string, project: Project) {\n  const modulePath = getAppModulePath(host, project.architect.build.options.main);\n  addModuleImportToModule(host, modulePath, moduleName, src);\n}\n\n/**\n * Import and add module to specific module path.\n * @param host the tree we are updating\n * @param modulePath src location of the module to import\n * @param moduleName name of module to import\n * @param src src location to import\n */\nexport function addModuleImportToModule(\n    host: Tree, modulePath: string, moduleName: string, src: string) {\n  const moduleSource = getSourceFile(host, modulePath);\n\n  if (!moduleSource) {\n    throw new SchematicsException(`Module not found: ${modulePath}`);\n  }\n\n  const changes = addImportToModule(moduleSource, modulePath, moduleName, src);\n  const recorder = host.beginUpdate(modulePath);\n\n  changes.forEach((change) => {\n    if (change instanceof InsertChange) {\n      recorder.insertLeft(change.pos, change.toAdd);\n    }\n  });\n\n  host.commitUpdate(recorder);\n}\n\n/** Gets the app index.html file */\nexport function getIndexHtmlPath(host: Tree, project: Project): string {\n  const buildTarget = project.architect.build.options;\n\n  if (buildTarget.index && buildTarget.index.endsWith('index.html')) {\n    return buildTarget.index;\n  }\n\n  throw new SchematicsException('No index.html file was found.');\n}\n\n/** Get the root stylesheet file. */\nexport function getStylesPath(host: Tree, project: Project): string {\n  const buildTarget = project.architect['build'];\n\n  if (buildTarget.options && buildTarget.options.styles && buildTarget.options.styles.length) {\n    const styles = buildTarget.options.styles.map(s => s.input);\n\n    // First, see if any of the assets is called \"styles.(le|sc|c)ss\", which is the default\n    // \"main\" style sheet.\n    const defaultMainStylePath = styles.find(a => /styles\\.(c|le|sc)ss/.test(a));\n    if (defaultMainStylePath) {\n      return normalize(defaultMainStylePath);\n    }\n\n    // If there was no obvious default file, use the first style asset.\n    const fallbackStylePath = styles.find(a => /\\.(c|le|sc)ss/.test(a));\n    if (fallbackStylePath) {\n      return normalize(fallbackStylePath);\n    }\n  }\n\n  throw new SchematicsException('No style files could be found into which a theme could be added');\n}\n\n/** Wraps the internal find module from options with undefined path handling  */\nexport function findModuleFromOptions(host: Tree, options: any) {\n  const workspace = getWorkspace(host);\n  if (!options.project) {\n    options.project = Object.keys(workspace.projects)[0];\n  }\n\n  const project = workspace.projects[options.project];\n\n  if (options.path === undefined) {\n    options.path = `/${project.root}/src/app`;\n  }\n\n  return internalFindModule(host, options);\n}\n"]}

package/src/schematics/utils/devkit-utils/ast-utils_old.js

@@ -281,7 +281,7 @@ function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, symbol
         if (importPath !== null) {
             return [
                 new change_1.InsertChange(ngModulePath, position, toInsert),
-                route_utils_1.insertImport(source, ngModulePath, symbolName.replace(/\..*$/, ''), importPath),
+                (0, route_utils_1.insertImport)(source, ngModulePath, symbolName.replace(/\..*$/, ''), importPath),
             ];
         }
         else {
@@ -354,7 +354,7 @@ function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, symbol
     if (importPath !== null) {
         return [
             new change_1.InsertChange(ngModulePath, position, toInsert),
-            route_utils_1.insertImport(source, ngModulePath, symbolName.replace(/\..*$/, ''), importPath),
+            (0, route_utils_1.insertImport)(source, ngModulePath, symbolName.replace(/\..*$/, ''), importPath),
         ];
     }
     return [new change_1.InsertChange(ngModulePath, position, toInsert)];

package/src/schematics/utils/devkit-utils/ast-utils_old.js.map

@@ -1 +1 @@
-{"version":3,"file":"ast-utils_old.js","sourceRoot":"","sources":["ast-utils_old.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google Inc. All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\nimport * as ts from 'typescript';\nimport { Change, InsertChange } from './change';\nimport { insertImport } from './route-utils';\n\n\n/**\n * Find all nodes from the AST in the subtree of node of SyntaxKind kind.\n * @param node\n * @param kind\n * @param max The maximum number of items to return.\n * @return all nodes of kind, or [] if none is found\n */\nexport function findNodes(node: ts.Node, kind: ts.SyntaxKind, max = Infinity): ts.Node[] {\n  if (!node || max == 0) {\n    return [];\n  }\n\n  const arr: ts.Node[] = [];\n  if (node.kind === kind) {\n    arr.push(node);\n    max--;\n  }\n  if (max > 0) {\n    for (const child of node.getChildren()) {\n      findNodes(child, kind, max).forEach(node => {\n        if (max > 0) {\n          arr.push(node);\n        }\n        max--;\n      });\n\n      if (max <= 0) {\n        break;\n      }\n    }\n  }\n\n  return arr;\n}\n\n\n\nexport function getSourceNodes(sourceFile: ts.SourceFile): ts.Node[] {\n  const nodes: ts.Node[] = [sourceFile];\n  const result = [];\n\n  while (nodes.length > 0) {\n    const node = nodes.shift();\n\n    if (node) {\n      result.push(node);\n      if (node.getChildCount(sourceFile) >= 0) {\n        nodes.unshift(...node.getChildren());\n      }\n    }\n  }\n\n  return result;\n}\n\nexport function findNode(node: ts.Node, kind: ts.SyntaxKind, text: string): ts.Node | null {\n  if (node.kind === kind && node.getText() === text) {\n    // throw new Error(node.getText());\n    return node;\n  }\n\n  let foundNode: ts.Node | null = null;\n  ts.forEachChild(node, childNode => {\n    foundNode = foundNode || findNode(childNode, kind, text);\n  });\n\n  return foundNode;\n}\n\n\n/**\n * Helper for sorting nodes.\n * @return function to sort nodes in increasing order of position in sourceFile\n */\nfunction nodesByPosition(first: ts.Node, second: ts.Node): number {\n  return first.getStart() - second.getStart();\n}\n\n\n/**\n * Insert `toInsert` after the last occurence of `ts.SyntaxKind[nodes[i].kind]`\n * or after the last of occurence of `syntaxKind` if the last occurence is a sub child\n * of ts.SyntaxKind[nodes[i].kind] and save the changes in file.\n *\n * @param nodes insert after the last occurence of nodes\n * @param toInsert string to insert\n * @param file file to insert changes into\n * @param fallbackPos position to insert if toInsert happens to be the first occurence\n * @param syntaxKind the ts.SyntaxKind of the subchildren to insert after\n * @return Change instance\n * @throw Error if toInsert is first occurence but fall back is not set\n */\nexport function insertAfterLastOccurrence(nodes: ts.Node[],\n                                          toInsert: string,\n                                          file: string,\n                                          fallbackPos: number,\n                                          syntaxKind?: ts.SyntaxKind): Change {\n  let lastItem = nodes.sort(nodesByPosition).pop();\n  if (!lastItem) {\n    //throw new Error();\n    // No imports exist....\n    new InsertChange(file, 0, toInsert);\n  }\n  if (syntaxKind) {\n    lastItem = findNodes(lastItem, syntaxKind).sort(nodesByPosition).pop();\n  }\n  if (!lastItem && fallbackPos == undefined) {\n    throw new Error(`tried to insert ${toInsert} as first occurence with no fallback position`);\n  }\n  const lastItemPosition: number = lastItem ? lastItem.getEnd() : fallbackPos;\n\n  return new InsertChange(file, lastItemPosition, toInsert);\n}\n\n\nexport function getContentOfKeyLiteral(_source: ts.SourceFile, node: ts.Node): string | null {\n  if (node.kind == ts.SyntaxKind.Identifier) {\n    return (node as ts.Identifier).text;\n  } else if (node.kind == ts.SyntaxKind.StringLiteral) {\n    return (node as ts.StringLiteral).text;\n  } else {\n    return null;\n  }\n}\n\n\nfunction _angularImportsFromNode(node: ts.ImportDeclaration,\n                                 _sourceFile: ts.SourceFile): {[name: string]: string} {\n  const ms = node.moduleSpecifier;\n  let modulePath: string;\n  switch (ms.kind) {\n    case ts.SyntaxKind.StringLiteral:\n      modulePath = (ms as ts.StringLiteral).text;\n      break;\n    default:\n      return {};\n  }\n\n  if (!modulePath.startsWith('@angular/')) {\n    return {};\n  }\n\n  if (node.importClause) {\n    if (node.importClause.name) {\n      // This is of the form `import Name from 'path'`. Ignore.\n      return {};\n    } else if (node.importClause.namedBindings) {\n      const nb = node.importClause.namedBindings;\n      if (nb.kind == ts.SyntaxKind.NamespaceImport) {\n        // This is of the form `import * as name from 'path'`. Return `name.`.\n        return {\n          [(nb as ts.NamespaceImport).name.text + '.']: modulePath,\n        };\n      } else {\n        // This is of the form `import {a,b,c} from 'path'`\n        const namedImports = nb as ts.NamedImports;\n\n        return namedImports.elements\n          .map((is: ts.ImportSpecifier) => is.propertyName ? is.propertyName.text : is.name.text)\n          .reduce((acc: {[name: string]: string}, curr: string) => {\n            acc[curr] = modulePath;\n\n            return acc;\n          }, {});\n      }\n    }\n\n    return {};\n  } else {\n    // This is of the form `import 'path';`. Nothing to do.\n    return {};\n  }\n}\n\n\nexport function getDecoratorMetadata(source: ts.SourceFile, identifier: string,\n                                     module: string): ts.Node[] {\n  const angularImports: {[name: string]: string}\n    = findNodes(source, ts.SyntaxKind.ImportDeclaration)\n    .map((node: ts.ImportDeclaration) => _angularImportsFromNode(node, source))\n    .reduce((acc: {[name: string]: string}, current: {[name: string]: string}) => {\n      for (const key of Object.keys(current)) {\n        acc[key] = current[key];\n      }\n\n      return acc;\n    }, {});\n\n  return getSourceNodes(source)\n    .filter(node => {\n      return node.kind == ts.SyntaxKind.Decorator\n        && (node as ts.Decorator).expression.kind == ts.SyntaxKind.CallExpression;\n    })\n    .map(node => (node as ts.Decorator).expression as ts.CallExpression)\n    .filter(expr => {\n      if (expr.expression.kind == ts.SyntaxKind.Identifier) {\n        const id = expr.expression as ts.Identifier;\n\n        return id.getFullText(source) == identifier\n          && angularImports[id.getFullText(source)] === module;\n      } else if (expr.expression.kind == ts.SyntaxKind.PropertyAccessExpression) {\n        // This covers foo.NgModule when importing * as foo.\n        const paExpr = expr.expression as ts.PropertyAccessExpression;\n        // If the left expression is not an identifier, just give up at that point.\n        if (paExpr.expression.kind !== ts.SyntaxKind.Identifier) {\n          return false;\n        }\n\n        const id = paExpr.name.text;\n        const moduleId = (paExpr.expression as ts.Identifier).getText(source);\n\n        return id === identifier && (angularImports[moduleId + '.'] === module);\n      }\n\n      return false;\n    })\n    .filter(expr => expr.arguments[0]\n                 && expr.arguments[0].kind == ts.SyntaxKind.ObjectLiteralExpression)\n    .map(expr => expr.arguments[0] as ts.ObjectLiteralExpression);\n}\n\nfunction findClassDeclarationParent(node: ts.Node): ts.ClassDeclaration|undefined {\n  if (ts.isClassDeclaration(node)) {\n    return node;\n  }\n\n  return node.parent && findClassDeclarationParent(node.parent);\n}\n\n/**\n * Given a source file with @NgModule class(es), find the name of the first @NgModule class.\n *\n * @param source source file containing one or more @NgModule\n * @returns the name of the first @NgModule, or `undefined` if none is found\n */\nexport function getFirstNgModuleName(source: ts.SourceFile): string|undefined {\n  // First, find the @NgModule decorators.\n  const ngModulesMetadata = getDecoratorMetadata(source, 'NgModule', '@angular/core');\n  if (ngModulesMetadata.length === 0) {\n    return undefined;\n  }\n\n  // Then walk parent pointers up the AST, looking for the ClassDeclaration parent of the NgModule\n  // metadata.\n  const moduleClass = findClassDeclarationParent(ngModulesMetadata[0]);\n  if (!moduleClass || !moduleClass.name) {\n    return undefined;\n  }\n\n  // Get the class name of the module ClassDeclaration.\n  return moduleClass.name.text;\n}\n\nexport function addSymbolToNgModuleMetadata(\n  source: ts.SourceFile,\n  ngModulePath: string,\n  metadataField: string,\n  symbolName: string,\n  importPath: string | null = null,\n): Change[] {\n  const nodes = getDecoratorMetadata(source, 'NgModule', '@angular/core');\n  let node: any = nodes[0];  // tslint:disable-line:no-any\n\n  // Find the decorator declaration.\n  if (!node) {\n    return [];\n  }\n\n  // Get all the children property assignment of object literals.\n  const matchingProperties: ts.ObjectLiteralElement[] =\n    (node as ts.ObjectLiteralExpression).properties\n    .filter(prop => prop.kind == ts.SyntaxKind.PropertyAssignment)\n    // Filter out every fields that's not \"metadataField\". Also handles string literals\n    // (but not expressions).\n    .filter((prop: ts.PropertyAssignment) => {\n      const name = prop.name;\n      switch (name.kind) {\n        case ts.SyntaxKind.Identifier:\n          return (name as ts.Identifier).getText(source) == metadataField;\n        case ts.SyntaxKind.StringLiteral:\n          return (name as ts.StringLiteral).text == metadataField;\n      }\n\n      return false;\n    });\n\n  // Get the last node of the array literal.\n  if (!matchingProperties) {\n    return [];\n  }\n  if (matchingProperties.length == 0) {\n    // We haven't found the field in the metadata declaration. Insert a new field.\n    const expr = node as ts.ObjectLiteralExpression;\n    let position: number;\n    let toInsert: string;\n    if (expr.properties.length == 0) {\n      position = expr.getEnd() - 1;\n      toInsert = `  ${metadataField}: [${symbolName}]\\n`;\n    } else {\n      node = expr.properties[expr.properties.length - 1];\n      position = node.getEnd();\n      // Get the indentation of the last element, if any.\n      const text = node.getFullText(source);\n      const matches = text.match(/^\\r?\\n\\s*/);\n      if (matches.length > 0) {\n        toInsert = `,${matches[0]}${metadataField}: [${symbolName}]`;\n      } else {\n        toInsert = `, ${metadataField}: [${symbolName}]`;\n      }\n    }\n    if (importPath !== null) {\n      return [\n        new InsertChange(ngModulePath, position, toInsert),\n        insertImport(source, ngModulePath, symbolName.replace(/\\..*$/, ''), importPath),\n      ];\n    } else {\n      return [new InsertChange(ngModulePath, position, toInsert)];\n    }\n  }\n  const assignment = matchingProperties[0] as ts.PropertyAssignment;\n\n  // If it's not an array, nothing we can do really.\n  if (assignment.initializer.kind !== ts.SyntaxKind.ArrayLiteralExpression) {\n    return [];\n  }\n\n  const arrLiteral = assignment.initializer as ts.ArrayLiteralExpression;\n  if (arrLiteral.elements.length == 0) {\n    // Forward the property.\n    node = arrLiteral;\n  } else {\n    node = arrLiteral.elements;\n  }\n\n  if (!node) {\n    console.log('No app module found. Please add your new class to your component.');\n\n    return [];\n  }\n\n  if (Array.isArray(node)) {\n    const nodeArray = node as {} as Array<ts.Node>;\n    const symbolsArray = nodeArray.map(node => node.getText());\n    if (symbolsArray.includes(symbolName)) {\n      return [];\n    }\n\n    node = node[node.length - 1];\n  }\n\n  let toInsert: string;\n  let position = node.getEnd();\n  if (node.kind == ts.SyntaxKind.ObjectLiteralExpression) {\n    // We haven't found the field in the metadata declaration. Insert a new\n    // field.\n    const expr = node as ts.ObjectLiteralExpression;\n    if (expr.properties.length == 0) {\n      position = expr.getEnd() - 1;\n      toInsert = `  ${metadataField}: [${symbolName}]\\n`;\n    } else {\n      node = expr.properties[expr.properties.length - 1];\n      position = node.getEnd();\n      // Get the indentation of the last element, if any.\n      const text = node.getFullText(source);\n      if (text.match('^\\r?\\r?\\n')) {\n        toInsert = `,${text.match(/^\\r?\\n\\s+/)[0]}${metadataField}: [${symbolName}]`;\n      } else {\n        toInsert = `, ${metadataField}: [${symbolName}]`;\n      }\n    }\n  } else if (node.kind == ts.SyntaxKind.ArrayLiteralExpression) {\n    // We found the field but it's empty. Insert it just before the `]`.\n    position--;\n    toInsert = `${symbolName}`;\n  } else {\n    // Get the indentation of the last element, if any.\n    const text = node.getFullText(source);\n    if (text.match(/^\\r?\\n/)) {\n      toInsert = `,${text.match(/^\\r?\\n(\\r?)\\s+/)[0]}${symbolName}`;\n    } else {\n      toInsert = `, ${symbolName}`;\n    }\n  }\n  if (importPath !== null) {\n    return [\n      new InsertChange(ngModulePath, position, toInsert),\n      insertImport(source, ngModulePath, symbolName.replace(/\\..*$/, ''), importPath),\n    ];\n  }\n\n  return [new InsertChange(ngModulePath, position, toInsert)];\n}\n\n/**\n * Custom function to insert a declaration (component, pipe, directive)\n * into NgModule declarations. It also imports the component.\n */\nexport function addDeclarationToModule(source: ts.SourceFile,\n                                       modulePath: string, classifiedName: string,\n                                       importPath: string): Change[] {\n  return addSymbolToNgModuleMetadata(\n    source, modulePath, 'declarations', classifiedName, importPath);\n}\n\n/**\n * Custom function to insert an NgModule into NgModule imports. It also imports the module.\n */\nexport function addImportToModule(source: ts.SourceFile,\n                                  modulePath: string, classifiedName: string,\n                                  importPath: string): Change[] {\n\n  return addSymbolToNgModuleMetadata(source, modulePath, 'imports', classifiedName, importPath);\n}\n\n/**\n * Custom function to insert a provider into NgModule. It also imports it.\n */\nexport function addProviderToModule(source: ts.SourceFile,\n                                    modulePath: string, classifiedName: string,\n                                    importPath: string): Change[] {\n  return addSymbolToNgModuleMetadata(source, modulePath, 'providers', classifiedName, importPath);\n}\n\n/**\n * Custom function to insert an export into NgModule. It also imports it.\n */\nexport function addExportToModule(source: ts.SourceFile,\n                                  modulePath: string, classifiedName: string,\n                                  importPath: string): Change[] {\n  return addSymbolToNgModuleMetadata(source, modulePath, 'exports', classifiedName, importPath);\n}\n\n/**\n * Custom function to insert an export into NgModule. It also imports it.\n */\nexport function addBootstrapToModule(source: ts.SourceFile,\n                                     modulePath: string, classifiedName: string,\n                                     importPath: string): Change[] {\n  return addSymbolToNgModuleMetadata(source, modulePath, 'bootstrap', classifiedName, importPath);\n}\n\n/**\n * Determine if an import already exists.\n */\nexport function isImported(source: ts.SourceFile,\n                           classifiedName: string,\n                           importPath: string): boolean {\n  const allNodes = getSourceNodes(source);\n  const matchingNodes = allNodes\n    .filter(node => node.kind === ts.SyntaxKind.ImportDeclaration)\n    .filter((imp: ts.ImportDeclaration) => imp.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral)\n    .filter((imp: ts.ImportDeclaration) => {\n      return (<ts.StringLiteral> imp.moduleSpecifier).text === importPath;\n    })\n    .filter((imp: ts.ImportDeclaration) => {\n      if (!imp.importClause) {\n        return false;\n      }\n      const nodes = findNodes(imp.importClause, ts.SyntaxKind.ImportSpecifier)\n        .filter(n => n.getText() === classifiedName);\n\n      return nodes.length > 0;\n    });\n\n  return matchingNodes.length > 0;\n}\n"]}
+{"version":3,"file":"ast-utils_old.js","sourceRoot":"","sources":["ast-utils_old.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google Inc. All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\nimport * as ts from 'typescript';\nimport { Change, InsertChange } from './change';\nimport { insertImport } from './route-utils';\n\n\n/**\n * Find all nodes from the AST in the subtree of node of SyntaxKind kind.\n * @param node\n * @param kind\n * @param max The maximum number of items to return.\n * @return all nodes of kind, or [] if none is found\n */\nexport function findNodes(node: ts.Node, kind: ts.SyntaxKind, max = Infinity): ts.Node[] {\n  if (!node || max == 0) {\n    return [];\n  }\n\n  const arr: ts.Node[] = [];\n  if (node.kind === kind) {\n    arr.push(node);\n    max--;\n  }\n  if (max > 0) {\n    for (const child of node.getChildren()) {\n      findNodes(child, kind, max).forEach(node => {\n        if (max > 0) {\n          arr.push(node);\n        }\n        max--;\n      });\n\n      if (max <= 0) {\n        break;\n      }\n    }\n  }\n\n  return arr;\n}\n\n\n\nexport function getSourceNodes(sourceFile: ts.SourceFile): ts.Node[] {\n  const nodes: ts.Node[] = [sourceFile];\n  const result = [];\n\n  while (nodes.length > 0) {\n    const node = nodes.shift();\n\n    if (node) {\n      result.push(node);\n      if (node.getChildCount(sourceFile) >= 0) {\n        nodes.unshift(...node.getChildren());\n      }\n    }\n  }\n\n  return result;\n}\n\nexport function findNode(node: ts.Node, kind: ts.SyntaxKind, text: string): ts.Node | null {\n  if (node.kind === kind && node.getText() === text) {\n    // throw new Error(node.getText());\n    return node;\n  }\n\n  let foundNode: ts.Node | null = null;\n  ts.forEachChild(node, childNode => {\n    foundNode = foundNode || findNode(childNode, kind, text);\n  });\n\n  return foundNode;\n}\n\n\n/**\n * Helper for sorting nodes.\n * @return function to sort nodes in increasing order of position in sourceFile\n */\nfunction nodesByPosition(first: ts.Node, second: ts.Node): number {\n  return first.getStart() - second.getStart();\n}\n\n\n/**\n * Insert `toInsert` after the last occurence of `ts.SyntaxKind[nodes[i].kind]`\n * or after the last of occurence of `syntaxKind` if the last occurence is a sub child\n * of ts.SyntaxKind[nodes[i].kind] and save the changes in file.\n *\n * @param nodes insert after the last occurence of nodes\n * @param toInsert string to insert\n * @param file file to insert changes into\n * @param fallbackPos position to insert if toInsert happens to be the first occurence\n * @param syntaxKind the ts.SyntaxKind of the subchildren to insert after\n * @return Change instance\n * @throw Error if toInsert is first occurence but fall back is not set\n */\nexport function insertAfterLastOccurrence(nodes: ts.Node[],\n                                          toInsert: string,\n                                          file: string,\n                                          fallbackPos: number,\n                                          syntaxKind?: ts.SyntaxKind): Change {\n  let lastItem = nodes.sort(nodesByPosition).pop();\n  if (!lastItem) {\n    //throw new Error();\n    // No imports exist....\n    new InsertChange(file, 0, toInsert);\n  }\n  if (syntaxKind) {\n    lastItem = findNodes(lastItem, syntaxKind).sort(nodesByPosition).pop();\n  }\n  if (!lastItem && fallbackPos == undefined) {\n    throw new Error(`tried to insert ${toInsert} as first occurence with no fallback position`);\n  }\n  const lastItemPosition: number = lastItem ? lastItem.getEnd() : fallbackPos;\n\n  return new InsertChange(file, lastItemPosition, toInsert);\n}\n\n\nexport function getContentOfKeyLiteral(_source: ts.SourceFile, node: ts.Node): string | null {\n  if (node.kind == ts.SyntaxKind.Identifier) {\n    return (node as ts.Identifier).text;\n  } else if (node.kind == ts.SyntaxKind.StringLiteral) {\n    return (node as ts.StringLiteral).text;\n  } else {\n    return null;\n  }\n}\n\n\nfunction _angularImportsFromNode(node: ts.ImportDeclaration,\n                                 _sourceFile: ts.SourceFile): {[name: string]: string} {\n  const ms = node.moduleSpecifier;\n  let modulePath: string;\n  switch (ms.kind) {\n    case ts.SyntaxKind.StringLiteral:\n      modulePath = (ms as ts.StringLiteral).text;\n      break;\n    default:\n      return {};\n  }\n\n  if (!modulePath.startsWith('@angular/')) {\n    return {};\n  }\n\n  if (node.importClause) {\n    if (node.importClause.name) {\n      // This is of the form `import Name from 'path'`. Ignore.\n      return {};\n    } else if (node.importClause.namedBindings) {\n      const nb = node.importClause.namedBindings;\n      if (nb.kind == ts.SyntaxKind.NamespaceImport) {\n        // This is of the form `import * as name from 'path'`. Return `name.`.\n        return {\n          [(nb as ts.NamespaceImport).name.text + '.']: modulePath,\n        };\n      } else {\n        // This is of the form `import {a,b,c} from 'path'`\n        const namedImports = nb as ts.NamedImports;\n\n        return namedImports.elements\n          .map((is: ts.ImportSpecifier) => is.propertyName ? is.propertyName.text : is.name.text)\n          .reduce((acc: {[name: string]: string}, curr: string) => {\n            acc[curr] = modulePath;\n\n            return acc;\n          }, {});\n      }\n    }\n\n    return {};\n  } else {\n    // This is of the form `import 'path';`. Nothing to do.\n    return {};\n  }\n}\n\n\nexport function getDecoratorMetadata(source: ts.SourceFile, identifier: string,\n                                     module: string): ts.Node[] {\n  const angularImports: {[name: string]: string}\n    = findNodes(source, ts.SyntaxKind.ImportDeclaration)\n    .map((node: ts.ImportDeclaration) => _angularImportsFromNode(node, source))\n    .reduce((acc: {[name: string]: string}, current: {[name: string]: string}) => {\n      for (const key of Object.keys(current)) {\n        acc[key] = current[key];\n      }\n\n      return acc;\n    }, {});\n\n  return getSourceNodes(source)\n    .filter(node => {\n      return node.kind == ts.SyntaxKind.Decorator\n        && (node as ts.Decorator).expression.kind == ts.SyntaxKind.CallExpression;\n    })\n    .map(node => (node as ts.Decorator).expression as ts.CallExpression)\n    .filter(expr => {\n      if (expr.expression.kind == ts.SyntaxKind.Identifier) {\n        const id = expr.expression as ts.Identifier;\n\n        return id.getFullText(source) == identifier\n          && angularImports[id.getFullText(source)] === module;\n      } else if (expr.expression.kind == ts.SyntaxKind.PropertyAccessExpression) {\n        // This covers foo.NgModule when importing * as foo.\n        const paExpr = expr.expression as ts.PropertyAccessExpression;\n        // If the left expression is not an identifier, just give up at that point.\n        if (paExpr.expression.kind !== ts.SyntaxKind.Identifier) {\n          return false;\n        }\n\n        const id = paExpr.name.text;\n        const moduleId = (paExpr.expression as ts.Identifier).getText(source);\n\n        return id === identifier && (angularImports[moduleId + '.'] === module);\n      }\n\n      return false;\n    })\n    .filter(expr => expr.arguments[0]\n                 && expr.arguments[0].kind == ts.SyntaxKind.ObjectLiteralExpression)\n    .map(expr => expr.arguments[0] as ts.ObjectLiteralExpression);\n}\n\nfunction findClassDeclarationParent(node: ts.Node): ts.ClassDeclaration|undefined {\n  if (ts.isClassDeclaration(node)) {\n    return node;\n  }\n\n  return node.parent && findClassDeclarationParent(node.parent);\n}\n\n/**\n * Given a source file with @NgModule class(es), find the name of the first @NgModule class.\n *\n * @param source source file containing one or more @NgModule\n * @returns the name of the first @NgModule, or `undefined` if none is found\n */\nexport function getFirstNgModuleName(source: ts.SourceFile): string|undefined {\n  // First, find the @NgModule decorators.\n  const ngModulesMetadata = getDecoratorMetadata(source, 'NgModule', '@angular/core');\n  if (ngModulesMetadata.length === 0) {\n    return undefined;\n  }\n\n  // Then walk parent pointers up the AST, looking for the ClassDeclaration parent of the NgModule\n  // metadata.\n  const moduleClass = findClassDeclarationParent(ngModulesMetadata[0]);\n  if (!moduleClass || !moduleClass.name) {\n    return undefined;\n  }\n\n  // Get the class name of the module ClassDeclaration.\n  return moduleClass.name.text;\n}\n\nexport function addSymbolToNgModuleMetadata(\n  source: ts.SourceFile,\n  ngModulePath: string,\n  metadataField: string,\n  symbolName: string,\n  importPath: string | null = null,\n): Change[] {\n  const nodes = getDecoratorMetadata(source, 'NgModule', '@angular/core');\n  let node: any = nodes[0];  // tslint:disable-line:no-any\n\n  // Find the decorator declaration.\n  if (!node) {\n    return [];\n  }\n\n  // Get all the children property assignment of object literals.\n  const matchingProperties: ts.ObjectLiteralElement[] =\n    (node as ts.ObjectLiteralExpression).properties\n    .filter(prop => prop.kind == ts.SyntaxKind.PropertyAssignment)\n    // Filter out every fields that's not \"metadataField\". Also handles string literals\n    // (but not expressions).\n    .filter((prop: ts.PropertyAssignment) => {\n      const name = prop.name;\n      switch (name.kind) {\n        case ts.SyntaxKind.Identifier:\n          return (name as ts.Identifier).getText(source) == metadataField;\n        case ts.SyntaxKind.StringLiteral:\n          return (name as ts.StringLiteral).text == metadataField;\n      }\n\n      return false;\n    });\n\n  // Get the last node of the array literal.\n  if (!matchingProperties) {\n    return [];\n  }\n  if (matchingProperties.length == 0) {\n    // We haven't found the field in the metadata declaration. Insert a new field.\n    const expr = node as ts.ObjectLiteralExpression;\n    let position: number;\n    let toInsert: string;\n    if (expr.properties.length == 0) {\n      position = expr.getEnd() - 1;\n      toInsert = `  ${metadataField}: [${symbolName}]\\n`;\n    } else {\n      node = expr.properties[expr.properties.length - 1];\n      position = node.getEnd();\n      // Get the indentation of the last element, if any.\n      const text = node.getFullText(source);\n      const matches = text.match(/^\\r?\\n\\s*/);\n      if (matches.length > 0) {\n        toInsert = `,${matches[0]}${metadataField}: [${symbolName}]`;\n      } else {\n        toInsert = `, ${metadataField}: [${symbolName}]`;\n      }\n    }\n    if (importPath !== null) {\n      return [\n        new InsertChange(ngModulePath, position, toInsert),\n        insertImport(source, ngModulePath, symbolName.replace(/\\..*$/, ''), importPath),\n      ];\n    } else {\n      return [new InsertChange(ngModulePath, position, toInsert)];\n    }\n  }\n  const assignment = matchingProperties[0] as ts.PropertyAssignment;\n\n  // If it's not an array, nothing we can do really.\n  if (assignment.initializer.kind !== ts.SyntaxKind.ArrayLiteralExpression) {\n    return [];\n  }\n\n  const arrLiteral = assignment.initializer as ts.ArrayLiteralExpression;\n  if (arrLiteral.elements.length == 0) {\n    // Forward the property.\n    node = arrLiteral;\n  } else {\n    node = arrLiteral.elements;\n  }\n\n  if (!node) {\n    console.log('No app module found. Please add your new class to your component.');\n\n    return [];\n  }\n\n  if (Array.isArray(node)) {\n    const nodeArray = node as {} as Array<ts.Node>;\n    const symbolsArray = nodeArray.map(node => node.getText());\n    if (symbolsArray.includes(symbolName)) {\n      return [];\n    }\n\n    node = node[node.length - 1];\n  }\n\n  let toInsert: string;\n  let position = node.getEnd();\n  if (node.kind == ts.SyntaxKind.ObjectLiteralExpression) {\n    // We haven't found the field in the metadata declaration. Insert a new\n    // field.\n    const expr = node as ts.ObjectLiteralExpression;\n    if (expr.properties.length == 0) {\n      position = expr.getEnd() - 1;\n      toInsert = `  ${metadataField}: [${symbolName}]\\n`;\n    } else {\n      node = expr.properties[expr.properties.length - 1];\n      position = node.getEnd();\n      // Get the indentation of the last element, if any.\n      const text = node.getFullText(source);\n      if (text.match('^\\r?\\r?\\n')) {\n        toInsert = `,${text.match(/^\\r?\\n\\s+/)[0]}${metadataField}: [${symbolName}]`;\n      } else {\n        toInsert = `, ${metadataField}: [${symbolName}]`;\n      }\n    }\n  } else if (node.kind == ts.SyntaxKind.ArrayLiteralExpression) {\n    // We found the field but it's empty. Insert it just before the `]`.\n    position--;\n    toInsert = `${symbolName}`;\n  } else {\n    // Get the indentation of the last element, if any.\n    const text = node.getFullText(source);\n    if (text.match(/^\\r?\\n/)) {\n      toInsert = `,${text.match(/^\\r?\\n(\\r?)\\s+/)[0]}${symbolName}`;\n    } else {\n      toInsert = `, ${symbolName}`;\n    }\n  }\n  if (importPath !== null) {\n    return [\n      new InsertChange(ngModulePath, position, toInsert),\n      insertImport(source, ngModulePath, symbolName.replace(/\\..*$/, ''), importPath),\n    ];\n  }\n\n  return [new InsertChange(ngModulePath, position, toInsert)];\n}\n\n/**\n * Custom function to insert a declaration (component, pipe, directive)\n * into NgModule declarations. It also imports the component.\n */\nexport function addDeclarationToModule(source: ts.SourceFile,\n                                       modulePath: string, classifiedName: string,\n                                       importPath: string): Change[] {\n  return addSymbolToNgModuleMetadata(\n    source, modulePath, 'declarations', classifiedName, importPath);\n}\n\n/**\n * Custom function to insert an NgModule into NgModule imports. It also imports the module.\n */\nexport function addImportToModule(source: ts.SourceFile,\n                                  modulePath: string, classifiedName: string,\n                                  importPath: string): Change[] {\n\n  return addSymbolToNgModuleMetadata(source, modulePath, 'imports', classifiedName, importPath);\n}\n\n/**\n * Custom function to insert a provider into NgModule. It also imports it.\n */\nexport function addProviderToModule(source: ts.SourceFile,\n                                    modulePath: string, classifiedName: string,\n                                    importPath: string): Change[] {\n  return addSymbolToNgModuleMetadata(source, modulePath, 'providers', classifiedName, importPath);\n}\n\n/**\n * Custom function to insert an export into NgModule. It also imports it.\n */\nexport function addExportToModule(source: ts.SourceFile,\n                                  modulePath: string, classifiedName: string,\n                                  importPath: string): Change[] {\n  return addSymbolToNgModuleMetadata(source, modulePath, 'exports', classifiedName, importPath);\n}\n\n/**\n * Custom function to insert an export into NgModule. It also imports it.\n */\nexport function addBootstrapToModule(source: ts.SourceFile,\n                                     modulePath: string, classifiedName: string,\n                                     importPath: string): Change[] {\n  return addSymbolToNgModuleMetadata(source, modulePath, 'bootstrap', classifiedName, importPath);\n}\n\n/**\n * Determine if an import already exists.\n */\nexport function isImported(source: ts.SourceFile,\n                           classifiedName: string,\n                           importPath: string): boolean {\n  const allNodes = getSourceNodes(source);\n  const matchingNodes = allNodes\n    .filter(node => node.kind === ts.SyntaxKind.ImportDeclaration)\n    .filter((imp: ts.ImportDeclaration) => imp.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral)\n    .filter((imp: ts.ImportDeclaration) => {\n      return (<ts.StringLiteral> imp.moduleSpecifier).text === importPath;\n    })\n    .filter((imp: ts.ImportDeclaration) => {\n      if (!imp.importClause) {\n        return false;\n      }\n      const nodes = findNodes(imp.importClause, ts.SyntaxKind.ImportSpecifier)\n        .filter(n => n.getText() === classifiedName);\n\n      return nodes.length > 0;\n    });\n\n  return matchingNodes.length > 0;\n}\n"]}