@magic-xpa/cli 4.1201.0-dev4121.306 → 4.1201.0-dev4121.308

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

@@ -1,46 +1,46 @@
-import { ComponentId } from "../../types/interfaces/app";
-
-
-export class Manifest {
-
-  items = new Map<string,ComponentId>();
-
-  constructor(entries : ComponentId[]){
-    if(entries){
-      this.convertArrayToMap(entries);
-    }
-  }
-
-  add(entry: ComponentId) {
-    this.items.set( entry.jsonPath , entry );
-  }
-  get(jsonPath:string){
-    let compId:ComponentId =  this.items.get(jsonPath);
-    /*if(!compId){
-      console.log(`manifest dosen't contain key: ${uniqueName}`);
-    }*/
-    return compId;
-  }
-
-  convertArrayToMap(entries : ComponentId[]){
-    this.items.clear();
-    entries.forEach(entry=>{
-      this.items.set(entry.uniqueName,entry);
-    });
-  }
-  convertMapToArray() : any[] {
-    return [ ...this.items.values() ];
-  }
-
-  toString(){
-    return JSON.stringify([ ...this.items.values() ]);
-  }
-  dump(){
-    for( let [key,value] of this.items){
-      console.dir(value);
-    }
-  }
-
-}
-
-//export const manifest = new Manifest();
+import { ComponentId } from "../../types/interfaces/app";
+
+
+export class Manifest {
+
+  items = new Map<string,ComponentId>();
+
+  constructor(entries : ComponentId[]){
+    if(entries){
+      this.convertArrayToMap(entries);
+    }
+  }
+
+  add(entry: ComponentId) {
+    this.items.set( entry.jsonPath , entry );
+  }
+  get(jsonPath:string){
+    let compId:ComponentId =  this.items.get(jsonPath);
+    /*if(!compId){
+      console.log(`manifest dosen't contain key: ${uniqueName}`);
+    }*/
+    return compId;
+  }
+
+  convertArrayToMap(entries : ComponentId[]){
+    this.items.clear();
+    entries.forEach(entry=>{
+      this.items.set(entry.uniqueName,entry);
+    });
+  }
+  convertMapToArray() : any[] {
+    return [ ...this.items.values() ];
+  }
+
+  toString(){
+    return JSON.stringify([ ...this.items.values() ]);
+  }
+  dump(){
+    for( let [key,value] of this.items){
+      console.dir(value);
+    }
+  }
+
+}
+
+//export const manifest = new Manifest();

package/src/schematics/magic-utils/metadata.class.js

@@ -32,7 +32,7 @@ class MagicPaths {
         return `${this.rootMagicGenFolder}/${env_1.GEN_FOLDER}/${module_name}/app.routes.ts`;
     }
     get rootMagicGenFolder() { return `./${this.project.root}/src/app`; }
-    get appComponentPath() { return `./${this.project.root}/src/app/app.component.html`; }
+    get appComponentPath() { return `./${this.project.root}/src/app/app.html`; }
     get appRoutesPath() { return `./${this.project.root}/src/app/app.routes.ts`; }
     get appModulePath() { return `./${this.project.root}/src/app/app.module.ts`; }
     get executionPath() { return `./${this.project.root}/src/assets/execution.properties`; }

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

@@ -1 +1 @@
-{"version":3,"file":"metadata.class.js","sourceRoot":"","sources":["metadata.class.ts"],"names":[],"mappings":"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","sourcesContent":["import { SchematicContext, Tree } from \"@angular-devkit/schematics\";\r\nimport { AppConfig, ComponentId, Route, RouteTable } from \"../../types/interfaces/app\";\r\nimport { MagicOptionScheme } from \"./rules/magic-option.scheme\";\r\nimport { Project } from \"../utils/devkit-utils/config\";\r\nimport { env, GEN_FOLDER, METADATA_DIR } from \"./env\";\r\nimport { Manifest } from \"./manifest\";\r\nimport { getProject, readJson } from \"./utils\";\r\n\r\n\r\nexport class MagicPaths {\r\n\r\n  // return the current module path\r\n  // for example : for module \"WebModule1\" it returns 'src/app/magic/WebModule1'\r\n currentModulePath(module_name:string) {\r\n    if (module_name !== \"\") {\r\n      return `${this.rootMagicGenFolder}/${GEN_FOLDER}/${module_name}`;\r\n    }\r\n\r\n    return `${this.rootMagicGenFolder}/${GEN_FOLDER}`;\r\n\r\n\r\n  }\r\n\r\n  // return the destanation path for create the component\r\n  // for example : for module \"WebModule1\" component \"WebModule1/folder1/bb/cc/it returns 'src/app/magic/WebModule1'\r\n  getDestPathForComponent(module_name:string, componentPath:string) {\r\n      return `${this.currentModulePath(module_name)}/${componentPath}`;\r\n  }\r\n\r\n  getJsonPathForComponent(cmpJsonPath:string) {\r\n    return `${this.metadataFolderPath}/${cmpJsonPath}.json`;\r\n  }\r\n\r\n  getRelativePathForComponentInModule(module_name:string, cmpJsonPath:string) {\r\n    let relativePathForComponentInModule = `${cmpJsonPath}`;\r\n    if (module_name !== \"\")\r\n      relativePathForComponentInModule = `${module_name}/${cmpJsonPath}`;\r\n\r\n    return relativePathForComponentInModule;\r\n  }\r\n\r\n  getRoutePathForWebModule(module_name:string) {\r\n\r\n    if (module_name == \"\")\r\n      return this.appRoutesPath;\r\n\r\n    return `${this.rootMagicGenFolder}/${GEN_FOLDER}/${module_name}/app.routes.ts`;\r\n  }\r\n  get rootMagicGenFolder(){ return `./${this.project.root}/src/app`; }\r\n  get appComponentPath(){   return `./${this.project.root}/src/app/app.component.html`}\r\n  get appRoutesPath(){      return `./${this.project.root}/src/app/app.routes.ts`}\r\n  get appModulePath(){      return `./${this.project.root}/src/app/app.module.ts`}\r\n  get executionPath(){      return `./${this.project.root}/src/assets/execution.properties`}\r\n  get magicStylePath(){     return `./${this.project.root}/src/magic-styles.css`}\r\n  get angularJsonPath(){    return `./angular.json`}\r\n  get tsConfigAppJsonPath(){      return `./${this.project.root}/tsconfig.app.json`}\r\n\r\n  // get the relative path of module to be used in LazyLoadMap\r\n  magicGenLibModulePath (moduleName){\r\n\r\n   let rootPath = this.project.root == '' ? this.project.root: this.project.root + '/';\r\n    let modulepath = rootPath+`src/app/${GEN_FOLDER}`;\r\n    if (moduleName !== \"\") {\r\n      return `${modulepath}/${moduleName}/magic.gen.lib.module`;\r\n    }\r\n    return `${modulepath}/magic.gen.lib.module`;\r\n  }\r\n\r\n  // Files under gen folder\r\n  get magicGenFolderPath (){ return `./${this.project.root}/src/app/${GEN_FOLDER}`}\r\n\r\n  componentListPathForCurrentModuleName (module_name:string):string{\r\n    return `./${this.project.root}/src/app/${GEN_FOLDER}/${module_name}/component-list.g.ts`\r\n  }\r\n  componentListPath (module_name:string):string{\r\n\r\n    if (module_name !== \"\"){\r\n      return this.componentListPathForCurrentModuleName(module_name);\r\n    }\r\n      return this.rootMagicComponentListPath;\r\n  }\r\n\r\n  get rootMagicComponentListPath (){\r\n\r\n    return `./${this.project.root}/src/app/${GEN_FOLDER}/component-list.g.ts`\r\n  }\r\n\r\n  get magicGenLibModule (){ return `./${this.project.root}/src/app/${GEN_FOLDER}/magic.gen.lib.module.ts`}\r\n\r\n  get favIconPath(){ return `./${this.project.root}/public/favicon.ico`; }\r\n\r\n  get metadataFolderPath(){ return `./${this.project.root}/${METADATA_DIR}`; }\r\n  get manifestPath      (){ return `./${this.project.root}/${METADATA_DIR}/manifest.json`; }\r\n  get configPath        (){ return `./${this.project.root}/${METADATA_DIR}/config.json`; }\r\n  get programListPath   (){return `./${this.project.root}/${METADATA_DIR}/ProgramsList.json`; }\r\n  get routesPath        (){ return `./${this.project.root}/${METADATA_DIR}/routes.json`; }\r\n\r\n  constructor(protected project:Project){\r\n  }\r\n}\r\n\r\n\r\nexport class MagicMetadata {\r\n\r\n  private _config:  AppConfig;\r\n  private _routesTable:  RouteTable[];\r\n  private _programListContents: any;\r\n\r\n  paths: MagicPaths;\r\n\r\n  get theme() {\r\n    if (!this.options.theme) {\r\n      this.options.theme = env.metadata.config ?env.metadata.config.theme  : 'basicHTML';\r\n    }\r\n    return this.options.theme;\r\n  }\r\n\r\n  get allow_testing() {\r\n    if (!this.options.allowTesting) {\r\n      this.options.allowTesting = env.metadata.config ?env.metadata.config.allow_testing: false;\r\n    }\r\n    return this.options.allowTesting;\r\n  }\r\n  get config() {\r\n    if (this._config) return this._config;\r\n    return this.loadConfig();\r\n  }\r\n\r\n  get programListContents(){\r\n      if(this._programListContents) return this._programListContents;\r\n      return this.loadProgramList();\r\n  }\r\n\r\n  get routesTable(){\r\n    if (this._routesTable) return this._routesTable;\r\n    return this.loadRoutes();\r\n  }\r\n\r\n  constructor(public host: Tree, public context: SchematicContext, public options: MagicOptionScheme) {\r\n    this.paths = new MagicPaths(getProject(host, options.project));\r\n  }\r\n\r\n  loadConfig() {\r\n    this._config = readJson(this.host, this.paths.configPath);\r\n    return this._config;\r\n  }\r\n\r\n  loadProgramList(){\r\n      this._programListContents = readJson(this.host, this.paths.programListPath);\r\n      return this._programListContents;\r\n  }\r\n\r\n  loadRoutes() {\r\n    this._routesTable = readJson(this.host, this.paths.routesPath);\r\n    return this._routesTable;\r\n  }\r\n}\r\n\r\n\r\n"]}
+{"version":3,"file":"metadata.class.js","sourceRoot":"","sources":["metadata.class.ts"],"names":[],"mappings":"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","sourcesContent":["import { SchematicContext, Tree } from \"@angular-devkit/schematics\";\nimport { AppConfig, ComponentId, Route, RouteTable } from \"../../types/interfaces/app\";\nimport { MagicOptionScheme } from \"./rules/magic-option.scheme\";\nimport { Project } from \"../utils/devkit-utils/config\";\nimport { env, GEN_FOLDER, METADATA_DIR } from \"./env\";\nimport { Manifest } from \"./manifest\";\nimport { getProject, readJson } from \"./utils\";\n\n\nexport class MagicPaths {\n\n  // return the current module path\n  // for example : for module \"WebModule1\" it returns 'src/app/magic/WebModule1'\n currentModulePath(module_name:string) {\n    if (module_name !== \"\") {\n      return `${this.rootMagicGenFolder}/${GEN_FOLDER}/${module_name}`;\n    }\n\n    return `${this.rootMagicGenFolder}/${GEN_FOLDER}`;\n\n\n  }\n\n  // return the destanation path for create the component\n  // for example : for module \"WebModule1\" component \"WebModule1/folder1/bb/cc/it returns 'src/app/magic/WebModule1'\n  getDestPathForComponent(module_name:string, componentPath:string) {\n      return `${this.currentModulePath(module_name)}/${componentPath}`;\n  }\n\n  getJsonPathForComponent(cmpJsonPath:string) {\n    return `${this.metadataFolderPath}/${cmpJsonPath}.json`;\n  }\n\n  getRelativePathForComponentInModule(module_name:string, cmpJsonPath:string) {\n    let relativePathForComponentInModule = `${cmpJsonPath}`;\n    if (module_name !== \"\")\n      relativePathForComponentInModule = `${module_name}/${cmpJsonPath}`;\n\n    return relativePathForComponentInModule;\n  }\n\n  getRoutePathForWebModule(module_name:string) {\n\n    if (module_name == \"\")\n      return this.appRoutesPath;\n\n    return `${this.rootMagicGenFolder}/${GEN_FOLDER}/${module_name}/app.routes.ts`;\n  }\n  get rootMagicGenFolder(){ return `./${this.project.root}/src/app`; }\n  get appComponentPath(){   return `./${this.project.root}/src/app/app.html`}\n  get appRoutesPath(){      return `./${this.project.root}/src/app/app.routes.ts`}\n  get appModulePath(){      return `./${this.project.root}/src/app/app.module.ts`}\n  get executionPath(){      return `./${this.project.root}/src/assets/execution.properties`}\n  get magicStylePath(){     return `./${this.project.root}/src/magic-styles.css`}\n  get angularJsonPath(){    return `./angular.json`}\n  get tsConfigAppJsonPath(){      return `./${this.project.root}/tsconfig.app.json`}\n\n  // get the relative path of module to be used in LazyLoadMap\n  magicGenLibModulePath (moduleName){\n\n   let rootPath = this.project.root == '' ? this.project.root: this.project.root + '/';\n    let modulepath = rootPath+`src/app/${GEN_FOLDER}`;\n    if (moduleName !== \"\") {\n      return `${modulepath}/${moduleName}/magic.gen.lib.module`;\n    }\n    return `${modulepath}/magic.gen.lib.module`;\n  }\n\n  // Files under gen folder\n  get magicGenFolderPath (){ return `./${this.project.root}/src/app/${GEN_FOLDER}`}\n\n  componentListPathForCurrentModuleName (module_name:string):string{\n    return `./${this.project.root}/src/app/${GEN_FOLDER}/${module_name}/component-list.g.ts`\n  }\n  componentListPath (module_name:string):string{\n\n    if (module_name !== \"\"){\n      return this.componentListPathForCurrentModuleName(module_name);\n    }\n      return this.rootMagicComponentListPath;\n  }\n\n  get rootMagicComponentListPath (){\n\n    return `./${this.project.root}/src/app/${GEN_FOLDER}/component-list.g.ts`\n  }\n\n  get magicGenLibModule (){ return `./${this.project.root}/src/app/${GEN_FOLDER}/magic.gen.lib.module.ts`}\n\n  get favIconPath(){ return `./${this.project.root}/public/favicon.ico`; }\n\n  get metadataFolderPath(){ return `./${this.project.root}/${METADATA_DIR}`; }\n  get manifestPath      (){ return `./${this.project.root}/${METADATA_DIR}/manifest.json`; }\n  get configPath        (){ return `./${this.project.root}/${METADATA_DIR}/config.json`; }\n  get programListPath   (){return `./${this.project.root}/${METADATA_DIR}/ProgramsList.json`; }\n  get routesPath        (){ return `./${this.project.root}/${METADATA_DIR}/routes.json`; }\n\n  constructor(protected project:Project){\n  }\n}\n\n\nexport class MagicMetadata {\n\n  private _config:  AppConfig;\n  private _routesTable:  RouteTable[];\n  private _programListContents: any;\n\n  paths: MagicPaths;\n\n  get theme() {\n    if (!this.options.theme) {\n      this.options.theme = env.metadata.config ?env.metadata.config.theme  : 'basicHTML';\n    }\n    return this.options.theme;\n  }\n\n  get allow_testing() {\n    if (!this.options.allowTesting) {\n      this.options.allowTesting = env.metadata.config ?env.metadata.config.allow_testing: false;\n    }\n    return this.options.allowTesting;\n  }\n  get config() {\n    if (this._config) return this._config;\n    return this.loadConfig();\n  }\n\n  get programListContents(){\n      if(this._programListContents) return this._programListContents;\n      return this.loadProgramList();\n  }\n\n  get routesTable(){\n    if (this._routesTable) return this._routesTable;\n    return this.loadRoutes();\n  }\n\n  constructor(public host: Tree, public context: SchematicContext, public options: MagicOptionScheme) {\n    this.paths = new MagicPaths(getProject(host, options.project));\n  }\n\n  loadConfig() {\n    this._config = readJson(this.host, this.paths.configPath);\n    return this._config;\n  }\n\n  loadProgramList(){\n      this._programListContents = readJson(this.host, this.paths.programListPath);\n      return this._programListContents;\n  }\n\n  loadRoutes() {\n    this._routesTable = readJson(this.host, this.paths.routesPath);\n    return this._routesTable;\n  }\n}\n\n\n"]}

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

@@ -1,159 +1,159 @@
-import { SchematicContext, Tree } from "@angular-devkit/schematics";
-import { AppConfig, ComponentId, Route, RouteTable } from "../../types/interfaces/app";
-import { MagicOptionScheme } from "./rules/magic-option.scheme";
-import { Project } from "../utils/devkit-utils/config";
-import { env, GEN_FOLDER, METADATA_DIR } from "./env";
-import { Manifest } from "./manifest";
-import { getProject, readJson } from "./utils";
-
-
-export class MagicPaths {
-
-  // return the current module path
-  // for example : for module "WebModule1" it returns 'src/app/magic/WebModule1'
- currentModulePath(module_name:string) {
-    if (module_name !== "") {
-      return `${this.rootMagicGenFolder}/${GEN_FOLDER}/${module_name}`;
-    }
-
-    return `${this.rootMagicGenFolder}/${GEN_FOLDER}`;
-
-
-  }
-
-  // return the destanation path for create the component
-  // for example : for module "WebModule1" component "WebModule1/folder1/bb/cc/it returns 'src/app/magic/WebModule1'
-  getDestPathForComponent(module_name:string, componentPath:string) {
-      return `${this.currentModulePath(module_name)}/${componentPath}`;
-  }
-
-  getJsonPathForComponent(cmpJsonPath:string) {
-    return `${this.metadataFolderPath}/${cmpJsonPath}.json`;
-  }
-
-  getRelativePathForComponentInModule(module_name:string, cmpJsonPath:string) {
-    let relativePathForComponentInModule = `${cmpJsonPath}`;
-    if (module_name !== "")
-      relativePathForComponentInModule = `${module_name}/${cmpJsonPath}`;
-
-    return relativePathForComponentInModule;
-  }
-
-  getRoutePathForWebModule(module_name:string) {
-
-    if (module_name == "")
-      return this.appRoutesPath;
-
-    return `${this.rootMagicGenFolder}/${GEN_FOLDER}/${module_name}/app.routes.ts`;
-  }
-  get rootMagicGenFolder(){ return `./${this.project.root}/src/app`; }
-  get appComponentPath(){   return `./${this.project.root}/src/app/app.component.html`}
-  get appRoutesPath(){      return `./${this.project.root}/src/app/app.routes.ts`}
-  get appModulePath(){      return `./${this.project.root}/src/app/app.module.ts`}
-  get executionPath(){      return `./${this.project.root}/src/assets/execution.properties`}
-  get magicStylePath(){     return `./${this.project.root}/src/magic-styles.css`}
-  get angularJsonPath(){    return `./angular.json`}
-  get tsConfigAppJsonPath(){      return `./${this.project.root}/tsconfig.app.json`}
-
-  // get the relative path of module to be used in LazyLoadMap
-  magicGenLibModulePath (moduleName){
-
-   let rootPath = this.project.root == '' ? this.project.root: this.project.root + '/';
-    let modulepath = rootPath+`src/app/${GEN_FOLDER}`;
-    if (moduleName !== "") {
-      return `${modulepath}/${moduleName}/magic.gen.lib.module`;
-    }
-    return `${modulepath}/magic.gen.lib.module`;
-  }
-
-  // Files under gen folder
-  get magicGenFolderPath (){ return `./${this.project.root}/src/app/${GEN_FOLDER}`}
-
-  componentListPathForCurrentModuleName (module_name:string):string{
-    return `./${this.project.root}/src/app/${GEN_FOLDER}/${module_name}/component-list.g.ts`
-  }
-  componentListPath (module_name:string):string{
-
-    if (module_name !== ""){
-      return this.componentListPathForCurrentModuleName(module_name);
-    }
-      return this.rootMagicComponentListPath;
-  }
-
-  get rootMagicComponentListPath (){
-
-    return `./${this.project.root}/src/app/${GEN_FOLDER}/component-list.g.ts`
-  }
-
-  get magicGenLibModule (){ return `./${this.project.root}/src/app/${GEN_FOLDER}/magic.gen.lib.module.ts`}
-
-  get favIconPath(){ return `./${this.project.root}/public/favicon.ico`; }
-
-  get metadataFolderPath(){ return `./${this.project.root}/${METADATA_DIR}`; }
-  get manifestPath      (){ return `./${this.project.root}/${METADATA_DIR}/manifest.json`; }
-  get configPath        (){ return `./${this.project.root}/${METADATA_DIR}/config.json`; }
-  get programListPath   (){return `./${this.project.root}/${METADATA_DIR}/ProgramsList.json`; }
-  get routesPath        (){ return `./${this.project.root}/${METADATA_DIR}/routes.json`; }
-
-  constructor(protected project:Project){
-  }
-}
-
-
-export class MagicMetadata {
-
-  private _config:  AppConfig;
-  private _routesTable:  RouteTable[];
-  private _programListContents: any;
-
-  paths: MagicPaths;
-
-  get theme() {
-    if (!this.options.theme) {
-      this.options.theme = env.metadata.config ?env.metadata.config.theme  : 'basicHTML';
-    }
-    return this.options.theme;
-  }
-
-  get allow_testing() {
-    if (!this.options.allowTesting) {
-      this.options.allowTesting = env.metadata.config ?env.metadata.config.allow_testing: false;
-    }
-    return this.options.allowTesting;
-  }
-  get config() {
-    if (this._config) return this._config;
-    return this.loadConfig();
-  }
-
-  get programListContents(){
-      if(this._programListContents) return this._programListContents;
-      return this.loadProgramList();
-  }
-
-  get routesTable(){
-    if (this._routesTable) return this._routesTable;
-    return this.loadRoutes();
-  }
-
-  constructor(public host: Tree, public context: SchematicContext, public options: MagicOptionScheme) {
-    this.paths = new MagicPaths(getProject(host, options.project));
-  }
-
-  loadConfig() {
-    this._config = readJson(this.host, this.paths.configPath);
-    return this._config;
-  }
-
-  loadProgramList(){
-      this._programListContents = readJson(this.host, this.paths.programListPath);
-      return this._programListContents;
-  }
-
-  loadRoutes() {
-    this._routesTable = readJson(this.host, this.paths.routesPath);
-    return this._routesTable;
-  }
-}
-
-
+import { SchematicContext, Tree } from "@angular-devkit/schematics";
+import { AppConfig, ComponentId, Route, RouteTable } from "../../types/interfaces/app";
+import { MagicOptionScheme } from "./rules/magic-option.scheme";
+import { Project } from "../utils/devkit-utils/config";
+import { env, GEN_FOLDER, METADATA_DIR } from "./env";
+import { Manifest } from "./manifest";
+import { getProject, readJson } from "./utils";
+
+
+export class MagicPaths {
+
+  // return the current module path
+  // for example : for module "WebModule1" it returns 'src/app/magic/WebModule1'
+ currentModulePath(module_name:string) {
+    if (module_name !== "") {
+      return `${this.rootMagicGenFolder}/${GEN_FOLDER}/${module_name}`;
+    }
+
+    return `${this.rootMagicGenFolder}/${GEN_FOLDER}`;
+
+
+  }
+
+  // return the destanation path for create the component
+  // for example : for module "WebModule1" component "WebModule1/folder1/bb/cc/it returns 'src/app/magic/WebModule1'
+  getDestPathForComponent(module_name:string, componentPath:string) {
+      return `${this.currentModulePath(module_name)}/${componentPath}`;
+  }
+
+  getJsonPathForComponent(cmpJsonPath:string) {
+    return `${this.metadataFolderPath}/${cmpJsonPath}.json`;
+  }
+
+  getRelativePathForComponentInModule(module_name:string, cmpJsonPath:string) {
+    let relativePathForComponentInModule = `${cmpJsonPath}`;
+    if (module_name !== "")
+      relativePathForComponentInModule = `${module_name}/${cmpJsonPath}`;
+
+    return relativePathForComponentInModule;
+  }
+
+  getRoutePathForWebModule(module_name:string) {
+
+    if (module_name == "")
+      return this.appRoutesPath;
+
+    return `${this.rootMagicGenFolder}/${GEN_FOLDER}/${module_name}/app.routes.ts`;
+  }
+  get rootMagicGenFolder(){ return `./${this.project.root}/src/app`; }
+  get appComponentPath(){   return `./${this.project.root}/src/app/app.html`}
+  get appRoutesPath(){      return `./${this.project.root}/src/app/app.routes.ts`}
+  get appModulePath(){      return `./${this.project.root}/src/app/app.module.ts`}
+  get executionPath(){      return `./${this.project.root}/src/assets/execution.properties`}
+  get magicStylePath(){     return `./${this.project.root}/src/magic-styles.css`}
+  get angularJsonPath(){    return `./angular.json`}
+  get tsConfigAppJsonPath(){      return `./${this.project.root}/tsconfig.app.json`}
+
+  // get the relative path of module to be used in LazyLoadMap
+  magicGenLibModulePath (moduleName){
+
+   let rootPath = this.project.root == '' ? this.project.root: this.project.root + '/';
+    let modulepath = rootPath+`src/app/${GEN_FOLDER}`;
+    if (moduleName !== "") {
+      return `${modulepath}/${moduleName}/magic.gen.lib.module`;
+    }
+    return `${modulepath}/magic.gen.lib.module`;
+  }
+
+  // Files under gen folder
+  get magicGenFolderPath (){ return `./${this.project.root}/src/app/${GEN_FOLDER}`}
+
+  componentListPathForCurrentModuleName (module_name:string):string{
+    return `./${this.project.root}/src/app/${GEN_FOLDER}/${module_name}/component-list.g.ts`
+  }
+  componentListPath (module_name:string):string{
+
+    if (module_name !== ""){
+      return this.componentListPathForCurrentModuleName(module_name);
+    }
+      return this.rootMagicComponentListPath;
+  }
+
+  get rootMagicComponentListPath (){
+
+    return `./${this.project.root}/src/app/${GEN_FOLDER}/component-list.g.ts`
+  }
+
+  get magicGenLibModule (){ return `./${this.project.root}/src/app/${GEN_FOLDER}/magic.gen.lib.module.ts`}
+
+  get favIconPath(){ return `./${this.project.root}/public/favicon.ico`; }
+
+  get metadataFolderPath(){ return `./${this.project.root}/${METADATA_DIR}`; }
+  get manifestPath      (){ return `./${this.project.root}/${METADATA_DIR}/manifest.json`; }
+  get configPath        (){ return `./${this.project.root}/${METADATA_DIR}/config.json`; }
+  get programListPath   (){return `./${this.project.root}/${METADATA_DIR}/ProgramsList.json`; }
+  get routesPath        (){ return `./${this.project.root}/${METADATA_DIR}/routes.json`; }
+
+  constructor(protected project:Project){
+  }
+}
+
+
+export class MagicMetadata {
+
+  private _config:  AppConfig;
+  private _routesTable:  RouteTable[];
+  private _programListContents: any;
+
+  paths: MagicPaths;
+
+  get theme() {
+    if (!this.options.theme) {
+      this.options.theme = env.metadata.config ?env.metadata.config.theme  : 'basicHTML';
+    }
+    return this.options.theme;
+  }
+
+  get allow_testing() {
+    if (!this.options.allowTesting) {
+      this.options.allowTesting = env.metadata.config ?env.metadata.config.allow_testing: false;
+    }
+    return this.options.allowTesting;
+  }
+  get config() {
+    if (this._config) return this._config;
+    return this.loadConfig();
+  }
+
+  get programListContents(){
+      if(this._programListContents) return this._programListContents;
+      return this.loadProgramList();
+  }
+
+  get routesTable(){
+    if (this._routesTable) return this._routesTable;
+    return this.loadRoutes();
+  }
+
+  constructor(public host: Tree, public context: SchematicContext, public options: MagicOptionScheme) {
+    this.paths = new MagicPaths(getProject(host, options.project));
+  }
+
+  loadConfig() {
+    this._config = readJson(this.host, this.paths.configPath);
+    return this._config;
+  }
+
+  loadProgramList(){
+      this._programListContents = readJson(this.host, this.paths.programListPath);
+      return this._programListContents;
+  }
+
+  loadRoutes() {
+    this._routesTable = readJson(this.host, this.paths.routesPath);
+    return this._routesTable;
+  }
+}
+
+

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

@@ -1 +1 @@
-{"version":3,"file":"generate.rule.js","sourceRoot":"","sources":["generate.rule.ts"],"names":[],"mappings":";;AAYA,wCAiBC;AAED,4BA6BC;AA5DD,2BAAmC;AACnC,0CAA0C;AAC1C,0CAA2C;AAI3C,kCAAiC;AACjC,gCAA0C;AAC1C,0CAAoE;AAIpE,SAAgB,cAAc,CAAC,MAAe,EAAC,IAAwB;IACrE,MAAM,MAAM,GAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE;QACjD,uBAAuB,EAAE,CAAC;QAC1B,kBAAkB,EAAO,CAAC;QAC1B,iBAAiB,EAAQ,wBAAwB;QAChD,aAAa,EAAG,0BAA0B;KAC5C,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG;QACZ,CAAC,0BAAkB,CAAC,IAAI,CAAC,EAAE,MAAM;QACjC,gFAAgF;QAChF,CAAC,0BAAkB,CAAC,EAAE,CAAC,EAAI,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,EAAC,aAAa,EAAG,0BAA0B,EAAC,CAAC;QACzG,CAAC,0BAAkB,CAAC,MAAM,CAAC,EAAI,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC;QACnE,CAAC,0BAAkB,CAAC,GAAG,CAAC,EAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,EAAG,CAAC;KAClE,CAAC;IAEF,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;AACvB,CAAC;AAED,SAAgB,QAAQ,CAAC,IAAoB,EAAC,OAAyB;IACrE,OAAO,CAAC,IAAS,EAAE,OAAyB,EAAE,EAAE;QAC9C,GAAG,CAAC,UAAU,CACZ,GAAG,sBAAgB,IAAI,IAAI,CAAC,QAAQ,EAAE,EACtC,IAAI,CAAC,IAAI,EACT,EAAC,cAAc,EAAG,IAAI,EAAC,EACxB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YACb,IAAI,GAAG,EAAE,CAAC;gBAAC,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC;gBAAC,OAAM;YAAC,CAAC;YAEhC,IAAI,CAAC;gBACH,0CAA0C;gBACxC,MAAM,GAAG,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC7C,GAAG;gBAEH,IAAI,IAAI,GAAG,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBAE9C,IAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAC,CAAC;oBACpB,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,CAAA;gBAC5D,CAAC;qBAAK,CAAC;oBACL,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;gBAC1D,CAAC;YACH,CAAC;YACD,OAAO,GAAG,EAAE,CAAC;gBACX,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC;gBACf,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC;YACd,CAAC;QACH,CAAC,CAAC,CAAC;QACL,OAAO,IAAI,CAAC;IACd,CAAC,CAAA;AACH,CAAC","sourcesContent":["import * as EJS         from \"ejs\";\r\n//import * as prettier    from \"prettier\";\r\nimport * as jsbeautify  from \"js-beautify\";\r\n\r\nimport { Rule, SchematicContext, Tree } from \"@angular-devkit/schematics\";\r\n\r\nimport { logErr } from \"../Util\";\r\nimport { MAGIC_CLI_FOLDER } from \"../env\";\r\nimport { GeneratedFileTypes, TemplateConfig } from \"../../../types\";\r\nimport { MagicOptionScheme } from \"./magic-option.scheme\";\r\nimport { prettierConfig } from \"../config\";\r\n\r\nexport function createGenFuncs(output : string,type: GeneratedFileTypes ) {\r\n  const htmlFn =  jsbeautify.html.bind(this, output, {\r\n    \"max_preserve_newlines\": 0,\r\n    \"wrap_line_length\"     : 0,\r\n    \"wrap_attributes\"      : \"force-expand-multiline\",\r\n     \"brace_style\" : 'collapse,preserve-inline'\r\n  });\r\n\r\n  const fnMap = {\r\n    [GeneratedFileTypes.HTML]: htmlFn,\r\n    //[GeneratedFileTypes.TS]  : prettier.format.bind(this, output, prettierConfig),\r\n    [GeneratedFileTypes.TS]  : jsbeautify.js.bind(this, output, {\"brace_style\" : 'collapse,preserve-inline'}),\r\n    [GeneratedFileTypes.HELPER]  : jsbeautify.js.bind(this, output, {}),\r\n    [GeneratedFileTypes.CSS] : jsbeautify.css.bind(this, output, { })\r\n  };\r\n\r\n  return fnMap[type]();\r\n}\r\n\r\nexport function generate(file: TemplateConfig,options:MagicOptionScheme) :Rule{\r\n  return (host:Tree, context: SchematicContext) => {\r\n    EJS.renderFile(\r\n      `${MAGIC_CLI_FOLDER}/${file.template}`,\r\n      file.data,\r\n      {\"rmWhitespace\" : true},\r\n     (err, output) => {\r\n        if (err) { logErr(err); return }\r\n\r\n        try {\r\n          //if(file.type != GeneratedFileTypes.TS) {\r\n            output = createGenFuncs(output, file.type);\r\n          //}\r\n\r\n          let path = `${file.destination}/${file.name}`;\r\n\r\n          if(host.exists(path)){\r\n            host.overwrite(`${file.destination}/${file.name}`, output)\r\n          } else{\r\n            host.create(`${file.destination}/${file.name}`, output);\r\n          }\r\n        }\r\n        catch (err) {\r\n          logErr(output);\r\n          logErr(err);\r\n        }\r\n      });\r\n    return host;\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"generate.rule.js","sourceRoot":"","sources":["generate.rule.ts"],"names":[],"mappings":";;AAYA,wCAiBC;AAED,4BA6BC;AA5DD,2BAAmC;AACnC,0CAA0C;AAC1C,0CAA2C;AAI3C,kCAAiC;AACjC,gCAA0C;AAC1C,0CAAoE;AAIpE,SAAgB,cAAc,CAAC,MAAe,EAAC,IAAwB;IACrE,MAAM,MAAM,GAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE;QACjD,uBAAuB,EAAE,CAAC;QAC1B,kBAAkB,EAAO,CAAC;QAC1B,iBAAiB,EAAQ,wBAAwB;QAChD,aAAa,EAAG,0BAA0B;KAC5C,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG;QACZ,CAAC,0BAAkB,CAAC,IAAI,CAAC,EAAE,MAAM;QACjC,gFAAgF;QAChF,CAAC,0BAAkB,CAAC,EAAE,CAAC,EAAI,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,EAAC,aAAa,EAAG,0BAA0B,EAAC,CAAC;QACzG,CAAC,0BAAkB,CAAC,MAAM,CAAC,EAAI,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC;QACnE,CAAC,0BAAkB,CAAC,GAAG,CAAC,EAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,EAAG,CAAC;KAClE,CAAC;IAEF,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;AACvB,CAAC;AAED,SAAgB,QAAQ,CAAC,IAAoB,EAAC,OAAyB;IACrE,OAAO,CAAC,IAAS,EAAE,OAAyB,EAAE,EAAE;QAC9C,GAAG,CAAC,UAAU,CACZ,GAAG,sBAAgB,IAAI,IAAI,CAAC,QAAQ,EAAE,EACtC,IAAI,CAAC,IAAI,EACT,EAAC,cAAc,EAAG,IAAI,EAAC,EACxB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YACb,IAAI,GAAG,EAAE,CAAC;gBAAC,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC;gBAAC,OAAM;YAAC,CAAC;YAEhC,IAAI,CAAC;gBACH,0CAA0C;gBACxC,MAAM,GAAG,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC7C,GAAG;gBAEH,IAAI,IAAI,GAAG,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBAE9C,IAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAC,CAAC;oBACpB,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,CAAA;gBAC5D,CAAC;qBAAK,CAAC;oBACL,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;gBAC1D,CAAC;YACH,CAAC;YACD,OAAO,GAAG,EAAE,CAAC;gBACX,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC;gBACf,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC;YACd,CAAC;QACH,CAAC,CAAC,CAAC;QACL,OAAO,IAAI,CAAC;IACd,CAAC,CAAA;AACH,CAAC","sourcesContent":["import * as EJS         from \"ejs\";\n//import * as prettier    from \"prettier\";\nimport * as jsbeautify  from \"js-beautify\";\n\nimport { Rule, SchematicContext, Tree } from \"@angular-devkit/schematics\";\n\nimport { logErr } from \"../Util\";\nimport { MAGIC_CLI_FOLDER } from \"../env\";\nimport { GeneratedFileTypes, TemplateConfig } from \"../../../types\";\nimport { MagicOptionScheme } from \"./magic-option.scheme\";\nimport { prettierConfig } from \"../config\";\n\nexport function createGenFuncs(output : string,type: GeneratedFileTypes ) {\n  const htmlFn =  jsbeautify.html.bind(this, output, {\n    \"max_preserve_newlines\": 0,\n    \"wrap_line_length\"     : 0,\n    \"wrap_attributes\"      : \"force-expand-multiline\",\n     \"brace_style\" : 'collapse,preserve-inline'\n  });\n\n  const fnMap = {\n    [GeneratedFileTypes.HTML]: htmlFn,\n    //[GeneratedFileTypes.TS]  : prettier.format.bind(this, output, prettierConfig),\n    [GeneratedFileTypes.TS]  : jsbeautify.js.bind(this, output, {\"brace_style\" : 'collapse,preserve-inline'}),\n    [GeneratedFileTypes.HELPER]  : jsbeautify.js.bind(this, output, {}),\n    [GeneratedFileTypes.CSS] : jsbeautify.css.bind(this, output, { })\n  };\n\n  return fnMap[type]();\n}\n\nexport function generate(file: TemplateConfig,options:MagicOptionScheme) :Rule{\n  return (host:Tree, context: SchematicContext) => {\n    EJS.renderFile(\n      `${MAGIC_CLI_FOLDER}/${file.template}`,\n      file.data,\n      {\"rmWhitespace\" : true},\n     (err, output) => {\n        if (err) { logErr(err); return }\n\n        try {\n          //if(file.type != GeneratedFileTypes.TS) {\n            output = createGenFuncs(output, file.type);\n          //}\n\n          let path = `${file.destination}/${file.name}`;\n\n          if(host.exists(path)){\n            host.overwrite(`${file.destination}/${file.name}`, output)\n          } else{\n            host.create(`${file.destination}/${file.name}`, output);\n          }\n        }\n        catch (err) {\n          logErr(output);\n          logErr(err);\n        }\n      });\n    return host;\n  }\n}\n"]}

package/src/schematics/magic-utils/rules/generate.rule.ts

@@ -1,61 +1,61 @@
-import * as EJS         from "ejs";
-//import * as prettier    from "prettier";
-import * as jsbeautify  from "js-beautify";
-
-import { Rule, SchematicContext, Tree } from "@angular-devkit/schematics";
-
-import { logErr } from "../Util";
-import { MAGIC_CLI_FOLDER } from "../env";
-import { GeneratedFileTypes, TemplateConfig } from "../../../types";
-import { MagicOptionScheme } from "./magic-option.scheme";
-import { prettierConfig } from "../config";
-
-export function createGenFuncs(output : string,type: GeneratedFileTypes ) {
-  const htmlFn =  jsbeautify.html.bind(this, output, {
-    "max_preserve_newlines": 0,
-    "wrap_line_length"     : 0,
-    "wrap_attributes"      : "force-expand-multiline",
-     "brace_style" : 'collapse,preserve-inline'
-  });
-
-  const fnMap = {
-    [GeneratedFileTypes.HTML]: htmlFn,
-    //[GeneratedFileTypes.TS]  : prettier.format.bind(this, output, prettierConfig),
-    [GeneratedFileTypes.TS]  : jsbeautify.js.bind(this, output, {"brace_style" : 'collapse,preserve-inline'}),
-    [GeneratedFileTypes.HELPER]  : jsbeautify.js.bind(this, output, {}),
-    [GeneratedFileTypes.CSS] : jsbeautify.css.bind(this, output, { })
-  };
-
-  return fnMap[type]();
-}
-
-export function generate(file: TemplateConfig,options:MagicOptionScheme) :Rule{
-  return (host:Tree, context: SchematicContext) => {
-    EJS.renderFile(
-      `${MAGIC_CLI_FOLDER}/${file.template}`,
-      file.data,
-      {"rmWhitespace" : true},
-     (err, output) => {
-        if (err) { logErr(err); return }
-
-        try {
-          //if(file.type != GeneratedFileTypes.TS) {
-            output = createGenFuncs(output, file.type);
-          //}
-
-          let path = `${file.destination}/${file.name}`;
-
-          if(host.exists(path)){
-            host.overwrite(`${file.destination}/${file.name}`, output)
-          } else{
-            host.create(`${file.destination}/${file.name}`, output);
-          }
-        }
-        catch (err) {
-          logErr(output);
-          logErr(err);
-        }
-      });
-    return host;
-  }
-}
+import * as EJS         from "ejs";
+//import * as prettier    from "prettier";
+import * as jsbeautify  from "js-beautify";
+
+import { Rule, SchematicContext, Tree } from "@angular-devkit/schematics";
+
+import { logErr } from "../Util";
+import { MAGIC_CLI_FOLDER } from "../env";
+import { GeneratedFileTypes, TemplateConfig } from "../../../types";
+import { MagicOptionScheme } from "./magic-option.scheme";
+import { prettierConfig } from "../config";
+
+export function createGenFuncs(output : string,type: GeneratedFileTypes ) {
+  const htmlFn =  jsbeautify.html.bind(this, output, {
+    "max_preserve_newlines": 0,
+    "wrap_line_length"     : 0,
+    "wrap_attributes"      : "force-expand-multiline",
+     "brace_style" : 'collapse,preserve-inline'
+  });
+
+  const fnMap = {
+    [GeneratedFileTypes.HTML]: htmlFn,
+    //[GeneratedFileTypes.TS]  : prettier.format.bind(this, output, prettierConfig),
+    [GeneratedFileTypes.TS]  : jsbeautify.js.bind(this, output, {"brace_style" : 'collapse,preserve-inline'}),
+    [GeneratedFileTypes.HELPER]  : jsbeautify.js.bind(this, output, {}),
+    [GeneratedFileTypes.CSS] : jsbeautify.css.bind(this, output, { })
+  };
+
+  return fnMap[type]();
+}
+
+export function generate(file: TemplateConfig,options:MagicOptionScheme) :Rule{
+  return (host:Tree, context: SchematicContext) => {
+    EJS.renderFile(
+      `${MAGIC_CLI_FOLDER}/${file.template}`,
+      file.data,
+      {"rmWhitespace" : true},
+     (err, output) => {
+        if (err) { logErr(err); return }
+
+        try {
+          //if(file.type != GeneratedFileTypes.TS) {
+            output = createGenFuncs(output, file.type);
+          //}
+
+          let path = `${file.destination}/${file.name}`;
+
+          if(host.exists(path)){
+            host.overwrite(`${file.destination}/${file.name}`, output)
+          } else{
+            host.create(`${file.destination}/${file.name}`, output);
+          }
+        }
+        catch (err) {
+          logErr(output);
+          logErr(err);
+        }
+      });
+    return host;
+  }
+}