@magic-xpa/cli 4.1100.0-dev4110.13 → 4.1100.0-dev4110.139

package/src/schematics/magic-utils/rules/init-magic-metadata.rule.js.map

@@ -1 +1 @@
-{"version":3,"file":"init-magic-metadata.rule.js","sourceRoot":"","sources":["init-magic-metadata.rule.ts"],"names":[],"mappings":";;;AACA,sDAAkD;AAClD,gCAA6B;AAC7B,4DAAwF;AAIxF,SAAgB,iBAAiB,CAAC,OAAyB;IACzD,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAC,EAAE;QAC9C,IAAI,CAAC,SAAG,CAAC,QAAQ,EAAG;YAClB,SAAG,CAAC,SAAS,GAAG,IAAA,qBAAY,EAAC,IAAI,CAAC,CAAC;YACnC,SAAG,CAAC,OAAO,GAAK,IAAA,gCAAuB,EAAC,SAAG,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YACxE,SAAG,CAAC,QAAQ,GAAI,IAAI,8BAAa,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAC1D,SAAG,CAAC,WAAW,GAAG,IAAI,8BAAa,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;SAC7D;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAA;AACH,CAAC;AAVD,8CAUC","sourcesContent":["import { Rule, SchematicContext, Tree } from \"@angular-devkit/schematics\";\nimport { MagicMetadata } from \"../metadata.class\";\nimport { env } from \"../env\";\nimport { getProjectFromWorkspace, getWorkspace } from \"../../utils/devkit-utils/config\";\nimport { MagicOptionScheme } from \"./magic-option.scheme\";\n\n\nexport function initMagicMetadata(options:MagicOptionScheme) : Rule {\n  return (host: Tree, context: SchematicContext)=>{\n    if( !env.metadata ) {\n      env.workspace = getWorkspace(host);\n      env.project   = getProjectFromWorkspace(env.workspace, options.project);\n      env.metadata  = new MagicMetadata(host, context, options);\n      env.programList = new MagicMetadata(host, context, options);\n    }\n    return host;\n  }\n}\n\n"]}
+{"version":3,"file":"init-magic-metadata.rule.js","sourceRoot":"","sources":["init-magic-metadata.rule.ts"],"names":[],"mappings":";;;AACA,sDAAkD;AAClD,gCAA6B;AAC7B,4DAAwF;AAIxF,SAAgB,iBAAiB,CAAC,OAAyB;IACzD,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAC,EAAE;QAC9C,IAAI,CAAC,SAAG,CAAC,QAAQ,EAAG;YAClB,SAAG,CAAC,SAAS,GAAG,IAAA,qBAAY,EAAC,IAAI,CAAC,CAAC;YACnC,SAAG,CAAC,OAAO,GAAK,IAAA,gCAAuB,EAAC,SAAG,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YACxE,SAAG,CAAC,QAAQ,GAAI,IAAI,8BAAa,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAC1D,SAAG,CAAC,WAAW,GAAG,IAAI,8BAAa,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;SAC7D;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAA;AACH,CAAC;AAVD,8CAUC","sourcesContent":["import { Rule, SchematicContext, Tree } from \"@angular-devkit/schematics\";\r\nimport { MagicMetadata } from \"../metadata.class\";\r\nimport { env } from \"../env\";\r\nimport { getProjectFromWorkspace, getWorkspace } from \"../../utils/devkit-utils/config\";\r\nimport { MagicOptionScheme } from \"./magic-option.scheme\";\r\n\r\n\r\nexport function initMagicMetadata(options:MagicOptionScheme) : Rule {\r\n  return (host: Tree, context: SchematicContext)=>{\r\n    if( !env.metadata ) {\r\n      env.workspace = getWorkspace(host);\r\n      env.project   = getProjectFromWorkspace(env.workspace, options.project);\r\n      env.metadata  = new MagicMetadata(host, context, options);\r\n      env.programList = new MagicMetadata(host, context, options);\r\n    }\r\n    return host;\r\n  }\r\n}\r\n\r\n"]}

package/src/schematics/magic-utils/rules/init-magic-metadata.rule.ts

@@ -1,19 +1,19 @@
-import { Rule, SchematicContext, Tree } from "@angular-devkit/schematics";
-import { MagicMetadata } from "../metadata.class";
-import { env } from "../env";
-import { getProjectFromWorkspace, getWorkspace } from "../../utils/devkit-utils/config";
-import { MagicOptionScheme } from "./magic-option.scheme";
-
-
-export function initMagicMetadata(options:MagicOptionScheme) : Rule {
-  return (host: Tree, context: SchematicContext)=>{
-    if( !env.metadata ) {
-      env.workspace = getWorkspace(host);
-      env.project   = getProjectFromWorkspace(env.workspace, options.project);
-      env.metadata  = new MagicMetadata(host, context, options);
-      env.programList = new MagicMetadata(host, context, options);
-    }
-    return host;
-  }
-}
-
+import { Rule, SchematicContext, Tree } from "@angular-devkit/schematics";
+import { MagicMetadata } from "../metadata.class";
+import { env } from "../env";
+import { getProjectFromWorkspace, getWorkspace } from "../../utils/devkit-utils/config";
+import { MagicOptionScheme } from "./magic-option.scheme";
+
+
+export function initMagicMetadata(options:MagicOptionScheme) : Rule {
+  return (host: Tree, context: SchematicContext)=>{
+    if( !env.metadata ) {
+      env.workspace = getWorkspace(host);
+      env.project   = getProjectFromWorkspace(env.workspace, options.project);
+      env.metadata  = new MagicMetadata(host, context, options);
+      env.programList = new MagicMetadata(host, context, options);
+    }
+    return host;
+  }
+}
+

package/src/schematics/magic-utils/rules/magic-option.scheme.d.ts

@@ -10,6 +10,7 @@ export interface MagicOptionScheme {
     module?: string;
     loadOnDemand?: boolean;
     containertype?: string;
+    controlsaccessoronly?: boolean;
     skipHelp?: boolean;
     project?: string;
     dependencies?: dependency[];

package/src/schematics/magic-utils/rules/magic-option.scheme.js.map

@@ -1 +1 @@
-{"version":3,"file":"magic-option.scheme.js","sourceRoot":"","sources":["magic-option.scheme.ts"],"names":[],"mappings":"","sourcesContent":["export interface dependency{\n  name    : string;\n  version : string;\n}\nexport interface MagicOptionScheme {\n  // Magic properties\n  path?                 : string;\n  allowTesting?         : boolean;\n  theme?                : string;\n  component?            : string;\n  module?               : string;\n  loadOnDemand?         : boolean;\n  containertype?        : string;\n  skipHelp?             : boolean;\n  // Angular Properties\n  project?              : string;\n  dependencies?         : dependency[];\n  devDependencies?      : dependency[];\n  skipInstall?          : boolean;\n  skipPackageJson?      : boolean;\n  cliVersion?           : string;\n  angularVersion?       : string;\n}\n"]}
+{"version":3,"file":"magic-option.scheme.js","sourceRoot":"","sources":["magic-option.scheme.ts"],"names":[],"mappings":"","sourcesContent":["export interface dependency{\r\n  name    : string;\r\n  version : string;\r\n}\r\nexport interface MagicOptionScheme {\r\n  // Magic properties\r\n  path?                 : string;\r\n  allowTesting?         : boolean;\r\n  theme?                : string;\r\n  component?            : string;\r\n  module?               : string;\r\n  loadOnDemand?         : boolean;\r\n  containertype?        : string;\r\n  controlsaccessoronly? : boolean;\r\n  skipHelp?             : boolean;\r\n  // Angular Properties\r\n  project?              : string;\r\n  dependencies?         : dependency[];\r\n  devDependencies?      : dependency[];\r\n  skipInstall?          : boolean;\r\n  skipPackageJson?      : boolean;\r\n  cliVersion?           : string;\r\n  angularVersion?       : string;\r\n}\r\n"]}

package/src/schematics/magic-utils/rules/magic-option.scheme.ts

@@ -1,23 +1,24 @@
-export interface dependency{
-  name    : string;
-  version : string;
-}
-export interface MagicOptionScheme {
-  // Magic properties
-  path?                 : string;
-  allowTesting?         : boolean;
-  theme?                : string;
-  component?            : string;
-  module?               : string;
-  loadOnDemand?         : boolean;
-  containertype?        : string;
-  skipHelp?             : boolean;
-  // Angular Properties
-  project?              : string;
-  dependencies?         : dependency[];
-  devDependencies?      : dependency[];
-  skipInstall?          : boolean;
-  skipPackageJson?      : boolean;
-  cliVersion?           : string;
-  angularVersion?       : string;
-}
+export interface dependency{
+  name    : string;
+  version : string;
+}
+export interface MagicOptionScheme {
+  // Magic properties
+  path?                 : string;
+  allowTesting?         : boolean;
+  theme?                : string;
+  component?            : string;
+  module?               : string;
+  loadOnDemand?         : boolean;
+  containertype?        : string;
+  controlsaccessoronly? : boolean;
+  skipHelp?             : boolean;
+  // Angular Properties
+  project?              : string;
+  dependencies?         : dependency[];
+  devDependencies?      : dependency[];
+  skipInstall?          : boolean;
+  skipPackageJson?      : boolean;
+  cliVersion?           : string;
+  angularVersion?       : string;
+}

package/src/schematics/magic-utils/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { getProjectFromWorkspace, getWorkspace, Project } from \"../utils/devkit-utils/config\";\nimport {\n  apply,\n  branchAndMerge,\n  chain,\n  MergeStrategy,\n  mergeWith,\n  move,\n  Rule,\n  SchematicContext, template,\n  Tree,\n  url\n} from \"@angular-devkit/schematics\";\nimport { env, METADATA_DIR } from \"./env\";\nimport { MagicOptionScheme } from \"./rules/magic-option.scheme\";\nimport { insertImport } from \"../utils/devkit-utils/route-utils\";\nimport { getSourceFile } from \"../utils/ast\";\nimport { InsertChange } from \"../utils/devkit-utils/change\";\nimport { MagicMetadata } from \"./metadata.class\";\nimport { LogLn } from \"./Util\";\n\nexport function displayMessge(options:MagicOptionScheme, message:string) : Rule {\n  return (host: Tree, context: SchematicContext)=>{\n\n    LogLn(`[>] ${message}`);\n    return host;\n  }\n}\n\n\nexport function copyMagicFiles(options:MagicOptionScheme): Rule {\n  return (host: Tree,context:SchematicContext) => {\n    const project   = getProject(host, options.project);\n    return chain([\n      branchAndMerge(chain([\n        mergeWith(\n          apply(url('./files'), [\n            template({\n              skipHelp: options.skipHelp,\n            }),\n            move(project.root)\n          ]), MergeStrategy.AllowCreationConflict)\n      ]))\n    ])(host,context);\n  }\n}\nexport function deleteMagicFiles(option:MagicOptionScheme): Rule {\n  return (host: Tree) => {\n    const metadta   = env.metadata;\n    let files = [\n      metadta.paths.appComponentPath,\n      metadta.paths.appRoutesPath,\n      metadta.paths.executionPath,\n      metadta.paths.magicStylePath,\n\n      // Magic Generate folder\n      metadta.paths.rootMagicComponentListPath,\n      metadta.paths.magicGenLibModule,\n      metadta.paths.favIconPath\n    ];\n    for (let file of files)\t{\n      if (host.exists(file)) {\n        host.delete(file);\n      }\n    }\n    return host;\n  };\n\n}\nexport function deleteMagicFolder(option:MagicOptionScheme): Rule {\n  return (host: Tree) => {\n    const metadta   = env.metadata;\n    const path = metadta.paths.magicGenFolderPath;\n    //rimraf(path);\n    host.getDir(path).visit( filePath => {\n      host.delete(filePath);\n    });\n    return host;\n  };\n\n}\nexport function deleteMagicMetadataFolder(option:MagicOptionScheme): Rule {\n  return (host: Tree) => {\n    const metadta   = env.metadata;\n    const path = metadta.paths.metadataFolderPath;\n\n    //rimraf(path);\n    host.getDir(path).visit( filePath => {\n      host.delete(filePath);\n    });\n    return host;\n  };\n\n}\n\nexport function getProject(host: Tree, projectName: string): Project {\n  const workspace = getWorkspace(host);\n  const project   = getProjectFromWorkspace(workspace, projectName);\n  return project;\n}\nexport function readJson(host:Tree,path:string) {\n  const source = host.read(path);\n  let   file   = null;\n  if (source) {\n    const sourceText = source.toString(\"utf-8\");\n    file = JSON.parse(sourceText);\n  }\n  return file;\n}\nexport function getMagicConfig(host: Tree, project: Project) {\n  let path = `${project.root}/${METADATA_DIR}/config.json`;\n  const source = host.read(path);\n  if (!source) { return; }\n\n  const sourceText = source.toString(\"utf-8\");\n  const config = JSON.parse(sourceText);\n\n  return config;\n}\n\nexport function addImportTSModule(path:string,name:string,from:string) : Rule {\n  return (host: Tree, context:SchematicContext) => {\n\n    let moduleSource = getSourceFile(host, path);\n\n    const recorder = host.beginUpdate(path);\n\n    const routesChange =insertImport(moduleSource, path, name,from) as InsertChange;\n    if (routesChange.toAdd) {\n      recorder.insertLeft(routesChange.pos, routesChange.toAdd);\n    }\n    host.commitUpdate(recorder);\n  }\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { getProjectFromWorkspace, getWorkspace, Project } from \"../utils/devkit-utils/config\";\r\nimport {\r\n  apply,\r\n  branchAndMerge,\r\n  chain,\r\n  MergeStrategy,\r\n  mergeWith,\r\n  move,\r\n  Rule,\r\n  SchematicContext, template,\r\n  Tree,\r\n  url\r\n} from \"@angular-devkit/schematics\";\r\nimport { env, METADATA_DIR } from \"./env\";\r\nimport { MagicOptionScheme } from \"./rules/magic-option.scheme\";\r\nimport { insertImport } from \"../utils/devkit-utils/route-utils\";\r\nimport { getSourceFile } from \"../utils/ast\";\r\nimport { InsertChange } from \"../utils/devkit-utils/change\";\r\nimport { MagicMetadata } from \"./metadata.class\";\r\nimport { LogLn } from \"./Util\";\r\n\r\nexport function displayMessge(options:MagicOptionScheme, message:string) : Rule {\r\n  return (host: Tree, context: SchematicContext)=>{\r\n\r\n    LogLn(`[>] ${message}`);\r\n    return host;\r\n  }\r\n}\r\n\r\n\r\nexport function copyMagicFiles(options:MagicOptionScheme): Rule {\r\n  return (host: Tree,context:SchematicContext) => {\r\n    const project   = getProject(host, options.project);\r\n    return chain([\r\n      branchAndMerge(chain([\r\n        mergeWith(\r\n          apply(url('./files'), [\r\n            template({\r\n              skipHelp: options.skipHelp,\r\n            }),\r\n            move(project.root)\r\n          ]), MergeStrategy.AllowCreationConflict)\r\n      ]))\r\n    ])(host,context);\r\n  }\r\n}\r\nexport function deleteMagicFiles(option:MagicOptionScheme): Rule {\r\n  return (host: Tree) => {\r\n    const metadta   = env.metadata;\r\n    let files = [\r\n      metadta.paths.appComponentPath,\r\n      metadta.paths.appRoutesPath,\r\n      metadta.paths.executionPath,\r\n      metadta.paths.magicStylePath,\r\n\r\n      // Magic Generate folder\r\n      metadta.paths.rootMagicComponentListPath,\r\n      metadta.paths.magicGenLibModule,\r\n      metadta.paths.favIconPath\r\n    ];\r\n    for (let file of files)\t{\r\n      if (host.exists(file)) {\r\n        host.delete(file);\r\n      }\r\n    }\r\n    return host;\r\n  };\r\n\r\n}\r\nexport function deleteMagicFolder(option:MagicOptionScheme): Rule {\r\n  return (host: Tree) => {\r\n    const metadta   = env.metadata;\r\n    const path = metadta.paths.magicGenFolderPath;\r\n    //rimraf(path);\r\n    host.getDir(path).visit( filePath => {\r\n      host.delete(filePath);\r\n    });\r\n    return host;\r\n  };\r\n\r\n}\r\nexport function deleteMagicMetadataFolder(option:MagicOptionScheme): Rule {\r\n  return (host: Tree) => {\r\n    const metadta   = env.metadata;\r\n    const path = metadta.paths.metadataFolderPath;\r\n\r\n    //rimraf(path);\r\n    host.getDir(path).visit( filePath => {\r\n      host.delete(filePath);\r\n    });\r\n    return host;\r\n  };\r\n\r\n}\r\n\r\nexport function getProject(host: Tree, projectName: string): Project {\r\n  const workspace = getWorkspace(host);\r\n  const project   = getProjectFromWorkspace(workspace, projectName);\r\n  return project;\r\n}\r\nexport function readJson(host:Tree,path:string) {\r\n  const source = host.read(path);\r\n  let   file   = null;\r\n  if (source) {\r\n    const sourceText = source.toString(\"utf-8\");\r\n    file = JSON.parse(sourceText);\r\n  }\r\n  return file;\r\n}\r\nexport function getMagicConfig(host: Tree, project: Project) {\r\n  let path = `${project.root}/${METADATA_DIR}/config.json`;\r\n  const source = host.read(path);\r\n  if (!source) { return; }\r\n\r\n  const sourceText = source.toString(\"utf-8\");\r\n  const config = JSON.parse(sourceText);\r\n\r\n  return config;\r\n}\r\n\r\nexport function addImportTSModule(path:string,name:string,from:string) : Rule {\r\n  return (host: Tree, context:SchematicContext) => {\r\n\r\n    let moduleSource = getSourceFile(host, path);\r\n\r\n    const recorder = host.beginUpdate(path);\r\n\r\n    const routesChange =insertImport(moduleSource, path, name,from) as InsertChange;\r\n    if (routesChange.toAdd) {\r\n      recorder.insertLeft(routesChange.pos, routesChange.toAdd);\r\n    }\r\n    host.commitUpdate(recorder);\r\n  }\r\n}\r\n"]}

package/src/schematics/magic-utils/utils.ts

@@ -1,134 +1,134 @@
-import { getProjectFromWorkspace, getWorkspace, Project } from "../utils/devkit-utils/config";
-import {
-  apply,
-  branchAndMerge,
-  chain,
-  MergeStrategy,
-  mergeWith,
-  move,
-  Rule,
-  SchematicContext, template,
-  Tree,
-  url
-} from "@angular-devkit/schematics";
-import { env, METADATA_DIR } from "./env";
-import { MagicOptionScheme } from "./rules/magic-option.scheme";
-import { insertImport } from "../utils/devkit-utils/route-utils";
-import { getSourceFile } from "../utils/ast";
-import { InsertChange } from "../utils/devkit-utils/change";
-import { MagicMetadata } from "./metadata.class";
-import { LogLn } from "./Util";
-
-export function displayMessge(options:MagicOptionScheme, message:string) : Rule {
-  return (host: Tree, context: SchematicContext)=>{
-
-    LogLn(`[>] ${message}`);
-    return host;
-  }
-}
-
-
-export function copyMagicFiles(options:MagicOptionScheme): Rule {
-  return (host: Tree,context:SchematicContext) => {
-    const project   = getProject(host, options.project);
-    return chain([
-      branchAndMerge(chain([
-        mergeWith(
-          apply(url('./files'), [
-            template({
-              skipHelp: options.skipHelp,
-            }),
-            move(project.root)
-          ]), MergeStrategy.AllowCreationConflict)
-      ]))
-    ])(host,context);
-  }
-}
-export function deleteMagicFiles(option:MagicOptionScheme): Rule {
-  return (host: Tree) => {
-    const metadta   = env.metadata;
-    let files = [
-      metadta.paths.appComponentPath,
-      metadta.paths.appRoutesPath,
-      metadta.paths.executionPath,
-      metadta.paths.magicStylePath,
-
-      // Magic Generate folder
-      metadta.paths.rootMagicComponentListPath,
-      metadta.paths.magicGenLibModule,
-      metadta.paths.favIconPath
-    ];
-    for (let file of files)	{
-      if (host.exists(file)) {
-        host.delete(file);
-      }
-    }
-    return host;
-  };
-
-}
-export function deleteMagicFolder(option:MagicOptionScheme): Rule {
-  return (host: Tree) => {
-    const metadta   = env.metadata;
-    const path = metadta.paths.magicGenFolderPath;
-    //rimraf(path);
-    host.getDir(path).visit( filePath => {
-      host.delete(filePath);
-    });
-    return host;
-  };
-
-}
-export function deleteMagicMetadataFolder(option:MagicOptionScheme): Rule {
-  return (host: Tree) => {
-    const metadta   = env.metadata;
-    const path = metadta.paths.metadataFolderPath;
-
-    //rimraf(path);
-    host.getDir(path).visit( filePath => {
-      host.delete(filePath);
-    });
-    return host;
-  };
-
-}
-
-export function getProject(host: Tree, projectName: string): Project {
-  const workspace = getWorkspace(host);
-  const project   = getProjectFromWorkspace(workspace, projectName);
-  return project;
-}
-export function readJson(host:Tree,path:string) {
-  const source = host.read(path);
-  let   file   = null;
-  if (source) {
-    const sourceText = source.toString("utf-8");
-    file = JSON.parse(sourceText);
-  }
-  return file;
-}
-export function getMagicConfig(host: Tree, project: Project) {
-  let path = `${project.root}/${METADATA_DIR}/config.json`;
-  const source = host.read(path);
-  if (!source) { return; }
-
-  const sourceText = source.toString("utf-8");
-  const config = JSON.parse(sourceText);
-
-  return config;
-}
-
-export function addImportTSModule(path:string,name:string,from:string) : Rule {
-  return (host: Tree, context:SchematicContext) => {
-
-    let moduleSource = getSourceFile(host, path);
-
-    const recorder = host.beginUpdate(path);
-
-    const routesChange =insertImport(moduleSource, path, name,from) as InsertChange;
-    if (routesChange.toAdd) {
-      recorder.insertLeft(routesChange.pos, routesChange.toAdd);
-    }
-    host.commitUpdate(recorder);
-  }
-}
+import { getProjectFromWorkspace, getWorkspace, Project } from "../utils/devkit-utils/config";
+import {
+  apply,
+  branchAndMerge,
+  chain,
+  MergeStrategy,
+  mergeWith,
+  move,
+  Rule,
+  SchematicContext, template,
+  Tree,
+  url
+} from "@angular-devkit/schematics";
+import { env, METADATA_DIR } from "./env";
+import { MagicOptionScheme } from "./rules/magic-option.scheme";
+import { insertImport } from "../utils/devkit-utils/route-utils";
+import { getSourceFile } from "../utils/ast";
+import { InsertChange } from "../utils/devkit-utils/change";
+import { MagicMetadata } from "./metadata.class";
+import { LogLn } from "./Util";
+
+export function displayMessge(options:MagicOptionScheme, message:string) : Rule {
+  return (host: Tree, context: SchematicContext)=>{
+
+    LogLn(`[>] ${message}`);
+    return host;
+  }
+}
+
+
+export function copyMagicFiles(options:MagicOptionScheme): Rule {
+  return (host: Tree,context:SchematicContext) => {
+    const project   = getProject(host, options.project);
+    return chain([
+      branchAndMerge(chain([
+        mergeWith(
+          apply(url('./files'), [
+            template({
+              skipHelp: options.skipHelp,
+            }),
+            move(project.root)
+          ]), MergeStrategy.AllowCreationConflict)
+      ]))
+    ])(host,context);
+  }
+}
+export function deleteMagicFiles(option:MagicOptionScheme): Rule {
+  return (host: Tree) => {
+    const metadta   = env.metadata;
+    let files = [
+      metadta.paths.appComponentPath,
+      metadta.paths.appRoutesPath,
+      metadta.paths.executionPath,
+      metadta.paths.magicStylePath,
+
+      // Magic Generate folder
+      metadta.paths.rootMagicComponentListPath,
+      metadta.paths.magicGenLibModule,
+      metadta.paths.favIconPath
+    ];
+    for (let file of files)	{
+      if (host.exists(file)) {
+        host.delete(file);
+      }
+    }
+    return host;
+  };
+
+}
+export function deleteMagicFolder(option:MagicOptionScheme): Rule {
+  return (host: Tree) => {
+    const metadta   = env.metadata;
+    const path = metadta.paths.magicGenFolderPath;
+    //rimraf(path);
+    host.getDir(path).visit( filePath => {
+      host.delete(filePath);
+    });
+    return host;
+  };
+
+}
+export function deleteMagicMetadataFolder(option:MagicOptionScheme): Rule {
+  return (host: Tree) => {
+    const metadta   = env.metadata;
+    const path = metadta.paths.metadataFolderPath;
+
+    //rimraf(path);
+    host.getDir(path).visit( filePath => {
+      host.delete(filePath);
+    });
+    return host;
+  };
+
+}
+
+export function getProject(host: Tree, projectName: string): Project {
+  const workspace = getWorkspace(host);
+  const project   = getProjectFromWorkspace(workspace, projectName);
+  return project;
+}
+export function readJson(host:Tree,path:string) {
+  const source = host.read(path);
+  let   file   = null;
+  if (source) {
+    const sourceText = source.toString("utf-8");
+    file = JSON.parse(sourceText);
+  }
+  return file;
+}
+export function getMagicConfig(host: Tree, project: Project) {
+  let path = `${project.root}/${METADATA_DIR}/config.json`;
+  const source = host.read(path);
+  if (!source) { return; }
+
+  const sourceText = source.toString("utf-8");
+  const config = JSON.parse(sourceText);
+
+  return config;
+}
+
+export function addImportTSModule(path:string,name:string,from:string) : Rule {
+  return (host: Tree, context:SchematicContext) => {
+
+    let moduleSource = getSourceFile(host, path);
+
+    const recorder = host.beginUpdate(path);
+
+    const routesChange =insertImport(moduleSource, path, name,from) as InsertChange;
+    if (routesChange.toAdd) {
+      recorder.insertLeft(routesChange.pos, routesChange.toAdd);
+    }
+    host.commitUpdate(recorder);
+  }
+}

package/src/schematics/mg-Install-prerequisites/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,2DAAiF;AACjF,4FAAmF;AACnF,4DAA0E;AAC1E,4CAAmE;AACnE,8CAA2D;AAG3D,SAAgB,sBAAsB,CAAC,OAAyB;IAC9D,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,4CAAiB,EAAa,OAAO,CAAC;QACtC,2BAA2B,CAAG,OAAO,CAAC;KACvC,CAAC,CAAC;AACL,CAAC;AALD,wDAKC;AAGD,SAAS,2BAA2B,CAAC,MAAwB;IAC3D,OAAO,CAAC,IAAU,EAAE,OAAwB,EAAE,EAAE;QAC5C,KAAK,IAAI,GAAG,IAAI,qBAAe,EAAC;YAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YAC3D,IAAA,iCAAuB,EAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;SACzE;QAED,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;QAEhD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import { chain, Rule, SchematicContext, Tree } from \"@angular-devkit/schematics\";\nimport { initMagicMetadata}   from \"../magic-utils/rules/init-magic-metadata.rule\";\nimport { NodePackageInstallTask } from \"@angular-devkit/schematics/tasks\";\nimport { dependencies, devDependencies } from \"../magic-utils/env\";\nimport { addPackageToPackageJson } from \"../utils/package\";\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\n\nexport function mgInstallPrerequisites(options:MagicOptionScheme): Rule {\n  return chain([\n    initMagicMetadata            (options),\n    installPrerequisitesSaveDev  (options)\n  ]);\n}\n\n\nfunction installPrerequisitesSaveDev(option:MagicOptionScheme): Rule {\n  return (host: Tree, context:SchematicContext) => {\n      for (let dep of devDependencies){\n        context.logger.info(`[>] Add devDependencies ${dep.name}`);\n        addPackageToPackageJson(host, 'devDependencies', dep.name, dep.version);\n      }\n\n      context.addTask(new NodePackageInstallTask());\n\n    return host;\n  };\n}\n\n\n\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,2DAAiF;AACjF,4FAAmF;AACnF,4DAA0E;AAC1E,4CAAmE;AACnE,8CAA2D;AAG3D,SAAgB,sBAAsB,CAAC,OAAyB;IAC9D,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,4CAAiB,EAAa,OAAO,CAAC;QACtC,2BAA2B,CAAG,OAAO,CAAC;KACvC,CAAC,CAAC;AACL,CAAC;AALD,wDAKC;AAGD,SAAS,2BAA2B,CAAC,MAAwB;IAC3D,OAAO,CAAC,IAAU,EAAE,OAAwB,EAAE,EAAE;QAC5C,KAAK,IAAI,GAAG,IAAI,qBAAe,EAAC;YAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YAC3D,IAAA,iCAAuB,EAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;SACzE;QAED,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;QAEhD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import { chain, Rule, SchematicContext, Tree } from \"@angular-devkit/schematics\";\r\nimport { initMagicMetadata}   from \"../magic-utils/rules/init-magic-metadata.rule\";\r\nimport { NodePackageInstallTask } from \"@angular-devkit/schematics/tasks\";\r\nimport { dependencies, devDependencies } from \"../magic-utils/env\";\r\nimport { addPackageToPackageJson } from \"../utils/package\";\r\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\r\n\r\nexport function mgInstallPrerequisites(options:MagicOptionScheme): Rule {\r\n  return chain([\r\n    initMagicMetadata            (options),\r\n    installPrerequisitesSaveDev  (options)\r\n  ]);\r\n}\r\n\r\n\r\nfunction installPrerequisitesSaveDev(option:MagicOptionScheme): Rule {\r\n  return (host: Tree, context:SchematicContext) => {\r\n      for (let dep of devDependencies){\r\n        context.logger.info(`[>] Add devDependencies ${dep.name}`);\r\n        addPackageToPackageJson(host, 'devDependencies', dep.name, dep.version);\r\n      }\r\n\r\n      context.addTask(new NodePackageInstallTask());\r\n\r\n    return host;\r\n  };\r\n}\r\n\r\n\r\n\r\n"]}

package/src/schematics/mg-Install-prerequisites/index.ts

@@ -1,30 +1,30 @@
-import { chain, Rule, SchematicContext, Tree } from "@angular-devkit/schematics";
-import { initMagicMetadata}   from "../magic-utils/rules/init-magic-metadata.rule";
-import { NodePackageInstallTask } from "@angular-devkit/schematics/tasks";
-import { dependencies, devDependencies } from "../magic-utils/env";
-import { addPackageToPackageJson } from "../utils/package";
-import { MagicOptionScheme } from "../magic-utils/rules/magic-option.scheme";
-
-export function mgInstallPrerequisites(options:MagicOptionScheme): Rule {
-  return chain([
-    initMagicMetadata            (options),
-    installPrerequisitesSaveDev  (options)
-  ]);
-}
-
-
-function installPrerequisitesSaveDev(option:MagicOptionScheme): Rule {
-  return (host: Tree, context:SchematicContext) => {
-      for (let dep of devDependencies){
-        context.logger.info(`[>] Add devDependencies ${dep.name}`);
-        addPackageToPackageJson(host, 'devDependencies', dep.name, dep.version);
-      }
-
-      context.addTask(new NodePackageInstallTask());
-
-    return host;
-  };
-}
-
-
-
+import { chain, Rule, SchematicContext, Tree } from "@angular-devkit/schematics";
+import { initMagicMetadata}   from "../magic-utils/rules/init-magic-metadata.rule";
+import { NodePackageInstallTask } from "@angular-devkit/schematics/tasks";
+import { dependencies, devDependencies } from "../magic-utils/env";
+import { addPackageToPackageJson } from "../utils/package";
+import { MagicOptionScheme } from "../magic-utils/rules/magic-option.scheme";
+
+export function mgInstallPrerequisites(options:MagicOptionScheme): Rule {
+  return chain([
+    initMagicMetadata            (options),
+    installPrerequisitesSaveDev  (options)
+  ]);
+}
+
+
+function installPrerequisitesSaveDev(option:MagicOptionScheme): Rule {
+  return (host: Tree, context:SchematicContext) => {
+      for (let dep of devDependencies){
+        context.logger.info(`[>] Add devDependencies ${dep.name}`);
+        addPackageToPackageJson(host, 'devDependencies', dep.name, dep.version);
+      }
+
+      context.addTask(new NodePackageInstallTask());
+
+    return host;
+  };
+}
+
+
+

package/src/schematics/mg-Install-prerequisites/schema.json

@@ -1,14 +1,14 @@
-{
-  "$schema": "http://json-schema.org/schema",
-  "$id": "SchematicsMagicMgInstallPre",
-  "title": "Magic Options Schema",
-  "type": "object",
-  "properties": {
-    "project":{
-      "type": "string",
-      "description": "The name of the project",
-      "aliases" : ["p"]
-    }
-  },
-  "required": []
-}
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "SchematicsMagicMgInstallPre",
+  "title": "Magic Options Schema",
+  "type": "object",
+  "properties": {
+    "project":{
+      "type": "string",
+      "description": "The name of the project",
+      "aliases" : ["p"]
+    }
+  },
+  "required": []
+}

package/src/schematics/mg-add/files/src/app/app.component.html

@@ -1,17 +1,17 @@
-<div>
-  <% if(!skipHelp){  %>
-  <H2>Hello Magic Web Client</H2>
-  <pre>
-  Steps for Generate Component
-  =========================================
-  1.1 copy json to magic-metadata
-
-  1.2 ng g @magic-xpa/cli:magic
-  --project       = xxx
-  --component     = yyy
-  --theme          = material or basicHTML
-  -–allow-testing
-  </pre>
-  <% } %>
-  <magic-root></magic-root>
-</div>
+<div>
+  <% if(!skipHelp){  %>
+  <H2>Hello Magic Web Client</H2>
+  <pre>
+  Steps for Generate Component
+  =========================================
+  1.1 copy json to magic-metadata
+
+  1.2 ng g @magic-xpa/cli:magic
+  --project       = xxx
+  --component     = yyy
+  --theme          = material or basicHTML
+  -–allow-testing
+  </pre>
+  <% } %>
+  <magic-root></magic-root>
+</div>

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

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

package/src/schematics/mg-add/files/src/app/magic/component-list.g.ts

@@ -1,9 +1,9 @@
-
-export const title = "";
-
-export const magicGenCmpsHash = {
-};
-
-export const magicGenComponents = [
-];
-
+
+export const title = "";
+
+export const magicGenCmpsHash = {
+};
+
+export const magicGenComponents = [
+];
+