npm - @magic-xpa/cli - Versions diffs - 4.1000.0-dev4100.387 → 4.1000.0-dev4100.389 - Mend

@magic-xpa/cli 4.1000.0-dev4100.387 → 4.1000.0-dev4100.389

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (24) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@magic-xpa/cli",
-  "version": "4.1000.0-dev4100.387",
+  "version": "4.1000.0-dev4100.389",
   "license": "SEE LICENSE IN EULA.pdf",
   "description": "Magic CLI for MagicWeb applications",
   "keywords": [

package/src/schematics/magic-utils/metadata.class.d.ts CHANGED Viewed

@@ -27,6 +27,7 @@ export declare class MagicPaths {
     get metadataFolderPath(): string;
     get manifestPath(): string;
     get configPath(): string;
+    get programListPath(): string;
     get routesPath(): string;
     constructor(project: Project);
 }
@@ -36,12 +37,15 @@ export declare class MagicMetadata {
     options: MagicOptionScheme;
     private _config;
     private _routesTable;
+    private _programListContents;
     paths: MagicPaths;
     get theme(): string;
     get allow_testing(): boolean;
     get config(): AppConfig;
+    get programListContents(): any;
     get routesTable(): RouteTable[];
     constructor(host: Tree, context: SchematicContext, options: MagicOptionScheme);
     loadConfig(): AppConfig;
+    loadProgramList(): any;
     loadRoutes(): RouteTable[];
 }

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

@@ -67,6 +67,7 @@ class MagicPaths {
     get metadataFolderPath() { return `./${this.project.root}/${env_1.METADATA_DIR}`; }
     get manifestPath() { return `./${this.project.root}/${env_1.METADATA_DIR}/manifest.json`; }
     get configPath() { return `./${this.project.root}/${env_1.METADATA_DIR}/config.json`; }
+    get programListPath() { return `./${this.project.root}/${env_1.METADATA_DIR}/ProgramsList.json`; }
     get routesPath() { return `./${this.project.root}/${env_1.METADATA_DIR}/routes.json`; }
     constructor(project) {
         this.project = project;
@@ -91,6 +92,11 @@ class MagicMetadata {
             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;
@@ -106,6 +112,10 @@ class MagicMetadata {
         this._config = (0, utils_1.readJson)(this.host, this.paths.configPath);
         return this._config;
     }
+    loadProgramList() {
+        this._programListContents = (0, utils_1.readJson)(this.host, this.paths.programListPath);
+        return this._programListContents;
+    }
     loadRoutes() {
         this._routesTable = (0, utils_1.readJson)(this.host, this.paths.routesPath);
         return this._routesTable;

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

	@@ -1 +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\";\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.component.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}/src/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 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\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 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 loadRoutes() {\n this._routesTable = readJson(this.host, this.paths.routesPath);\n return this._routesTable;\n }\n}\n\n\n"]}
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\";\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.component.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}/src/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 CHANGED Viewed

@@ -92,6 +92,7 @@ export class MagicPaths {
   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){
@@ -103,6 +104,7 @@ export class MagicMetadata {
   private _config:  AppConfig;
   private _routesTable:  RouteTable[];
+  private _programListContents: any;
   paths: MagicPaths;
@@ -123,6 +125,12 @@ export class MagicMetadata {
     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();
@@ -136,6 +144,12 @@ export class MagicMetadata {
     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/init-add-modules.rule.js CHANGED Viewed

@@ -12,14 +12,18 @@ const env_interface_1 = require("../../../types/interfaces/env.interface");
 function initGenModules(options, generateViaCLI = false) {
     return (tree, context) => {
         let metadata = env_1.env.metadata;
+        let programList = env_1.env.programList;
         env_1.env.modulesGen = [];
         let web_modules = metadata.config.web_modules;
         if (generateViaCLI) {
-            for (let moduleJsonPath of metadata.config.web_modules) {
-                if (moduleJsonPath.module_name === options.module) {
-                    let moduleInfo = new env_interface_1.ModuleInfo(options.module, moduleJsonPath.load_on_demand);
-                    env_1.env.modulesGen.push(moduleInfo);
-                }
+            let programListString = JSON.stringify(programList.programListContents);
+            // Validate whether the component is valid
+            if (programListString.includes(options.component)) {
+                let moduleInfo = new env_interface_1.ModuleInfo(options.module, options.loadOnDemand);
+                env_1.env.modulesGen.push(moduleInfo);
+            }
+            else {
+                (0, Util_1.LogLn)(`Invalid component ${options.component} to generate.`);
             }
         }
         else {
@@ -37,7 +41,8 @@ function initGenModules(options, generateViaCLI = false) {
                 }
             }
         }
-        (0, Util_1.LogLn)(`   Number of modules to be check for generate: ${web_modules.length}`);
+        if (!generateViaCLI)
+            (0, Util_1.LogLn)(`   Number of modules to be check for generate: ${web_modules.length}`);
         return tree;
     };
 }

package/src/schematics/magic-utils/rules/init-add-modules.rule.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"init-add-modules.rule.js","sourceRoot":"","sources":["init-add-modules.rule.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n apply, branchAndMerge,\n chain,\n MergeStrategy, mergeWith,\n move,\n Rule,\n SchematicContext, SchematicsException,\n Tree,\n url\n} from \"@angular-devkit/schematics\";\nimport { MagicOptionScheme } from \"./magic-option.scheme\";\nimport {env, GEN_FOLDER, GEN_LAZY_LOAD_MODULES_ARRAY} from \"../env\";\nimport { LogLn } from \"../Util\";\nimport { Route, RouteTable, webModuleItem } from \"../../../types/interfaces/app\";\nimport {addModuleImportToModule, getSourceFile} from \"../../utils/ast\";\nimport { ModuleInfo } from \"../../../types/interfaces/env.interface\";\n\nimport {findNodes} from \"../../utils/devkit-utils/ast-utils\";\nimport * as ts from \"typescript\";\n//-------------------------------------------------------------------------------------------------\n// init generate module into env.modulesGen\n//-------------------------------------------------------------------------------------------------\nexport function initGenModules(options: MagicOptionScheme, generateViaCLI:boolean = false): Rule {\n return (tree: Tree, context: SchematicContext) => {\n let metadata = env.metadata;\n env.modulesGen = [];\n let web_modules:webModuleItem [] = metadata.config.web_modules;\n\n if(generateViaCLI){\n for (let moduleJsonPath of metadata.config.web_modules) {\n if (moduleJsonPath.module_name === options.module) {\n let moduleInfo: ModuleInfo = new ModuleInfo(options.module, moduleJsonPath.load_on_demand);\n env.modulesGen.push(moduleInfo)\n }\n }\n }else{\n // Generate only one module from --module=xxxx\n if (options.module) {\n let moduleInfo : ModuleInfo = new ModuleInfo(options.module, options.loadOnDemand);\n env.modulesGen.push(moduleInfo)\n } else {\n\n // Generate list of components from config.json, properties web_modules.module_name\n for (let modulePath of web_modules) {\n //LogLn(` Web Module name: [${modulePath.module_name}] IsLoadOnDemand? [${modulePath.load_on_demand}]`);\n let moduleInfo : ModuleInfo = new ModuleInfo(modulePath.module_name, modulePath.load_on_demand);\n env.modulesGen.push(moduleInfo);\n }\n }\n }\n LogLn(` Number of modules to be check for generate: ${web_modules.length}`);\n return tree;\n };\n}\n\n//-------------------------------------------------------------------------------------------------\n// overwrite the web module file name with the new content\n//-------------------------------------------------------------------------------------------------\nexport function overwriteWebModuleFileName(options: any, moduleNameFileName:string, content:string): Rule {\n return (tree: Tree, _context: SchematicContext) => {\n\n if(!tree.exists(moduleNameFileName)){\n LogLn(` [>Error] File cannot be overwrite, The file is not exist !!! : ${moduleNameFileName}`);\n }\n\n tree.overwrite(moduleNameFileName, content);\n return tree;\n };\n}\n\n//-------------------------------------------------------------------------------------------------\n// update the the web module file name with the new class name\n//-------------------------------------------------------------------------------------------------\nexport function updateWebModuleFileWithNewClassName(options: any, webModuleName:string): Rule {\n return (tree: Tree, context: SchematicContext) => {\n let rules:Rule[] = [];\n\n const origModuleFileName = getWebModuleFullFileName(webModuleName)\n\n // create new class name for \"web Module Name\"\n let newClassModuleName = getWebModuleClass(webModuleName );\n\n //read the exist module file name\n const text = tree.read(origModuleFileName);\n\n if (text === null) {\n throw new SchematicsException(`File ${origModuleFileName} does not exist.`);\n }\n let sourceText = text.toString('utf-8');\n\n if (sourceText !== \"\") {\n let newsourceText: string = sourceText.replace(`MagicGenLibModule`, newClassModuleName);\n rules.push(overwriteWebModuleFileName(options, origModuleFileName, newsourceText));\n\n }\n return chain(rules)(tree, context);\n };\n}\n\n//-------------------------------------------------------------------------------------------------\n// copy the two default files into the web module path\n//-------------------------------------------------------------------------------------------------\nfunction copyDefaultMagicFilesToWebModule(options:MagicOptionScheme, webModuleName:string): Rule {\n return (tree: Tree,context:SchematicContext) => {\n const webModulePath = getDestinationModulePathByWebModuleName(webModuleName);\n\n return chain([\n branchAndMerge(chain([\n mergeWith(\n apply(url(`./../mg-add/files/src/app/magic/`), [\n\n move(webModulePath)\n ]), MergeStrategy.AllowCreationConflict)\n ]))\n ])(tree,context);\n }\n}\n\n\n//-------------------------------------------------------------------------------------------------\n// delete LazyLoadService for non root modules\n//-------------------------------------------------------------------------------------------------\nfunction deleteLazyLoadService( webModuleName:string): Rule {\n return (tree: Tree) => {\n const lazyLoaderServicePath = getDestinationModulePathByWebModuleName(webModuleName) + '/lazy-loader.service.ts';\n\n if(webModuleName != '') {\n if (!tree.exists(lazyLoaderServicePath)) {\n LogLn(` [>Error] File cannot be overwrite, The file is not exist !!! :lazyLoaderServicePath`);\n }\n\n tree.delete(lazyLoaderServicePath);\n return tree;\n }\n }\n}\n\n\n//-------------------------------------------------------------------------------------------------\n// get destination path according to the send webModuleName\n//-------------------------------------------------------------------------------------------------\nexport function getDestinationModulePathByWebModuleName(webModuleName:string):string {\n const newDestModulePath = `${env.metadata.paths.rootMagicGenFolder}/${GEN_FOLDER}/${webModuleName}`;\n return newDestModulePath;\n}\n\n//-------------------------------------------------------------------------------------------------\n// get web module full file name according to the send webModuleName\n//-------------------------------------------------------------------------------------------------\nfunction getWebModuleFullFileName(webModuleName:string):string {\n// calc the path of new the module\n const newDestModulePath = getDestinationModulePathByWebModuleName(webModuleName);\n return `${newDestModulePath}/magic.gen.lib.module.ts`;\n}\n\n//-------------------------------------------------------------------------------------------------\n// get web module class according to the send webModuleName\n//-------------------------------------------------------------------------------------------------\nfunction getWebModuleClass(webModuleName:string):string {\n return `Magic` + webModuleName + `Module`;\n}\n\n\n//-------------------------------------------------------------------------------------------------\n// add magic module to app module\n//-------------------------------------------------------------------------------------------------\nfunction addMagicModuleToAppModule(options: MagicOptionScheme, modulePath:string, moduleName:string, srcModuleName:string) : Rule {\n return (tree: Tree , context : SchematicContext)=>{\n const project = env.project;\n\n LogLn(` [>] add New Web Module :[${moduleName}] `);\n LogLn(` [>] from :[${srcModuleName}]`);\n LogLn(` [>] To App Module :[${modulePath}]`);\n addModuleImportToModule(\n tree,\n modulePath, // for now we will update env.metadata.paths.magicGenLibModule\n moduleName, // 'MagicXXXModule',\n srcModuleName, // `./XXX/magic.gen.lib.module`\n );\n return tree;\n }\n}\n\n//-------------------------------------------------------------------------------------------------\n// create module\n//-------------------------------------------------------------------------------------------------\nexport function checkAndCreateModule(options: MagicOptionScheme, webModuleName:string, loadOnDemand: boolean ): Rule {\n return (tree: Tree, context: SchematicContext) => {\n\n let rules: Rule[] = [];\n const webModuleFullFileName = getWebModuleFullFileName(webModuleName);\n // only if not exist create the new 2 files magic.gen.lib.module.ts & component-list.g.ts\n if (!tree.exists(webModuleFullFileName)) {\n rules.push(copyDefaultMagicFilesToWebModule(options, webModuleName));\n rules.push(updateWebModuleFileWithNewClassName(tree, webModuleName));\n rules.push(deleteLazyLoadService(webModuleName));\n // for NON load on demand we need to update magic root module\n if (!loadOnDemand) {\n const newDestModulePath = `./${webModuleName}/magic.gen.lib.module`;\n const webModuleClass = getWebModuleClass(webModuleName);\n rules.push(addMagicModuleToAppModule(options, env.metadata.paths.magicGenLibModule, webModuleClass, newDestModulePath));\n }\n return chain(rules)(tree, context);\n }\n ;\n }\n}\n\n//-------------------------------------------------------------------------------------------------\n// check if module is exist, only if not exist create the web module\n//-------------------------------------------------------------------------------------------------\nexport function generateWebModule(options: MagicOptionScheme, webModuleName:string, loadOnDemand:boolean ): Rule {\n return (tree: Tree, context: SchematicContext) => {\n\n let rules:Rule[] = [];\n\n LogLn(` [>]Handling Web Module named: [${webModuleName}] isLoadOnDemand: [${loadOnDemand}]`);\n rules.push(checkAndCreateModule(options, webModuleName, loadOnDemand));\n rules.push(checkAndCreateRouteForModule(options, webModuleName, loadOnDemand));\n\n return chain(rules)(tree,context);\n };\n}\n\n\n//-------------------------------------------------------------------------------------------------\n// generate all the modules in env.modulesGen\n//-------------------------------------------------------------------------------------------------\nexport function generateWebModules(options: MagicOptionScheme, generateViaCLI:boolean = false): Rule {\n return (tree: Tree, context: SchematicContext) => {\n\n let rules:Rule[] = [];\n\n for (let webModuleInfo of env.modulesGen){\n if (webModuleInfo.moduleName !== undefined && webModuleInfo.moduleName !== \"\") {\n if (generateViaCLI) {\n if (webModuleInfo.moduleName === options.module) {\n rules.push(generateWebModule(options, webModuleInfo.moduleName, webModuleInfo.loadOnDemand));\n }\n }else{\n rules.push(generateWebModule(options, webModuleInfo.moduleName, webModuleInfo.loadOnDemand));\n }\n }\n }\n\n return chain(rules)(tree,context);\n };\n}\n\n\n\n//-------------------------------------------------------------------------------------------------\n// check if module is exist, only if not exist create the web module\n//-------------------------------------------------------------------------------------------------\nexport function checkAndCreateRouteForModule(options: MagicOptionScheme, webModuleName:string, loadOnDemand :boolean): Rule {\n return (tree: Tree, context: SchematicContext) => {\n\n let rules:Rule[] = [];\n\n if (loadOnDemand) {\n const newDestRoutePathForModule = env.metadata.paths.getRoutePathForWebModule(webModuleName);\n\n // only if file not exist then copy the default route\n if (!tree.exists(newDestRoutePathForModule)) {\n rules.push(createRoute(options, webModuleName));\n }\n else{\n // if file exist then only update the magic.gen.lib.module.ts\n rules.push(addRouteFileToModuleFile(options, webModuleName));\n }\n }\n return chain(rules)(tree,context);\n };\n}\n\n\n\n//-------------------------------------------------------------------------------------------------\n// create route for module\n//-------------------------------------------------------------------------------------------------\nexport function createRoute(options: MagicOptionScheme, webModuleName:string): Rule {\n return (tree: Tree, context: SchematicContext) => {\n\n let rules:Rule[] = [];\n\n rules.push(copyDefaultRouteMagicFilesToWebModule(options, webModuleName));\n // --------------------------------------------------------\n // // generate the route for module /////\n // let routeItem : RouteTable = new RouteTable();\n // routeItem.module_name = webModuleName;\n //\n // let route:Route = new Route();\n // route.ModuleName = webModuleName;\n // route.OutletName=\"\";\n // route.RouteName=\"\";\n // route.children=null;\n //\n // routeItem.routesArray = [route];\n // rules.push(genRouteFile(options, routeItem ));\n // --------------------------------------------------------\n // update the new MagicRoutingModule in file magic.gen.lib.module.ts of the module\n\n\n rules.push(addRouteFileToModuleFile(options, webModuleName));\n\n return chain(rules)(tree,context);\n };\n}\n\n//-------------------------------------------------------------------------------------------------\n// create route for module\n//-------------------------------------------------------------------------------------------------\nexport function addRouteFileToModuleFile(options: MagicOptionScheme, webModuleName:string): Rule {\n return (tree: Tree, context: SchematicContext) => {\n\n let rules:Rule[] = [];\n\n const modulePath = getWebModuleFullFileName(webModuleName); // get the magic.gen.lib.module.ts according to the module name\n const moduleName = `MagicRoutingModule`;//for now it will be the same for all modules ... getWebModuleClass(webModuleName);\n const srcModuleName = `./app.routes`;\n\n rules.push(addMagicModuleToAppModule(options, modulePath, moduleName, srcModuleName));\n\n return chain(rules)(tree,context);\n };\n}\n//-------------------------------------------------------------------------------------------------\n// copy the two default files into the web module path\n//-------------------------------------------------------------------------------------------------\nfunction copyDefaultRouteMagicFilesToWebModule(options:MagicOptionScheme, webModuleName:string): Rule {\n return (tree: Tree,context:SchematicContext) => {\n const routeFileForWebModulePath = env.metadata.paths.getRoutePathForWebModule(webModuleName);\n\n\n if(tree.exists(routeFileForWebModulePath))\n {\n let rules:Rule[] = [];\n return chain(rules)(tree,context);\n }\n else\n {\n const webModulePath = getDestinationModulePathByWebModuleName(webModuleName);\n LogLn(`[ >] copy default Route file to webModule [${webModuleName}]`)\n return chain([\n branchAndMerge(chain([\n mergeWith(\n apply(url(`./../mg-add/webModule/`), [\n\n move(webModulePath)\n ]), MergeStrategy.AllowCreationConflict)\n ]))\n ])(tree,context);\n }\n }\n}\n"]}
1	+ {"version":3,"file":"init-add-modules.rule.js","sourceRoot":"","sources":["init-add-modules.rule.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n apply, branchAndMerge,\n chain,\n MergeStrategy, mergeWith,\n move,\n Rule,\n SchematicContext, SchematicsException,\n Tree,\n url\n} from \"@angular-devkit/schematics\";\nimport { MagicOptionScheme } from \"./magic-option.scheme\";\nimport {env, GEN_FOLDER, GEN_LAZY_LOAD_MODULES_ARRAY} from \"../env\";\nimport { LogLn } from \"../Util\";\nimport { Route, RouteTable, webModuleItem } from \"../../../types/interfaces/app\";\nimport {addModuleImportToModule, getSourceFile} from \"../../utils/ast\";\nimport { ModuleInfo } from \"../../../types/interfaces/env.interface\";\n\nimport {findNodes} from \"../../utils/devkit-utils/ast-utils\";\nimport * as ts from \"typescript\";\n//-------------------------------------------------------------------------------------------------\n// init generate module into env.modulesGen\n//-------------------------------------------------------------------------------------------------\nexport function initGenModules(options: MagicOptionScheme, generateViaCLI:boolean = false): Rule {\n return (tree: Tree, context: SchematicContext) => {\n let metadata = env.metadata;\n let programList = env.programList;\n env.modulesGen = [];\n let web_modules:webModuleItem [] = metadata.config.web_modules;\n\n if(generateViaCLI){\n let programListString = JSON.stringify(programList.programListContents);\n\n // Validate whether the component is valid\n if(programListString.includes(options.component)){\n let moduleInfo: ModuleInfo = new ModuleInfo(options.module, options.loadOnDemand);\n env.modulesGen.push(moduleInfo)\n }else{\n LogLn(`Invalid component ${options.component} to generate.`);\n }\n }else{\n // Generate only one module from --module=xxxx\n if (options.module) {\n let moduleInfo : ModuleInfo = new ModuleInfo(options.module, options.loadOnDemand);\n env.modulesGen.push(moduleInfo)\n } else {\n\n // Generate list of components from config.json, properties web_modules.module_name\n for (let modulePath of web_modules) {\n //LogLn(` Web Module name: [${modulePath.module_name}] IsLoadOnDemand? [${modulePath.load_on_demand}]`);\n let moduleInfo : ModuleInfo = new ModuleInfo(modulePath.module_name, modulePath.load_on_demand);\n env.modulesGen.push(moduleInfo);\n }\n }\n }\n if(!generateViaCLI)\n LogLn(` Number of modules to be check for generate: ${web_modules.length}`);\n return tree;\n };\n}\n\n//-------------------------------------------------------------------------------------------------\n// overwrite the web module file name with the new content\n//-------------------------------------------------------------------------------------------------\nexport function overwriteWebModuleFileName(options: any, moduleNameFileName:string, content:string): Rule {\n return (tree: Tree, _context: SchematicContext) => {\n\n if(!tree.exists(moduleNameFileName)){\n LogLn(` [>Error] File cannot be overwrite, The file is not exist !!! : ${moduleNameFileName}`);\n }\n\n tree.overwrite(moduleNameFileName, content);\n return tree;\n };\n}\n\n//-------------------------------------------------------------------------------------------------\n// update the the web module file name with the new class name\n//-------------------------------------------------------------------------------------------------\nexport function updateWebModuleFileWithNewClassName(options: any, webModuleName:string): Rule {\n return (tree: Tree, context: SchematicContext) => {\n let rules:Rule[] = [];\n\n const origModuleFileName = getWebModuleFullFileName(webModuleName)\n\n // create new class name for \"web Module Name\"\n let newClassModuleName = getWebModuleClass(webModuleName );\n\n //read the exist module file name\n const text = tree.read(origModuleFileName);\n\n if (text === null) {\n throw new SchematicsException(`File ${origModuleFileName} does not exist.`);\n }\n let sourceText = text.toString('utf-8');\n\n if (sourceText !== \"\") {\n let newsourceText: string = sourceText.replace(`MagicGenLibModule`, newClassModuleName);\n rules.push(overwriteWebModuleFileName(options, origModuleFileName, newsourceText));\n\n }\n return chain(rules)(tree, context);\n };\n}\n\n//-------------------------------------------------------------------------------------------------\n// copy the two default files into the web module path\n//-------------------------------------------------------------------------------------------------\nfunction copyDefaultMagicFilesToWebModule(options:MagicOptionScheme, webModuleName:string): Rule {\n return (tree: Tree,context:SchematicContext) => {\n const webModulePath = getDestinationModulePathByWebModuleName(webModuleName);\n\n return chain([\n branchAndMerge(chain([\n mergeWith(\n apply(url(`./../mg-add/files/src/app/magic/`), [\n\n move(webModulePath)\n ]), MergeStrategy.AllowCreationConflict)\n ]))\n ])(tree,context);\n }\n}\n\n\n//-------------------------------------------------------------------------------------------------\n// delete LazyLoadService for non root modules\n//-------------------------------------------------------------------------------------------------\nfunction deleteLazyLoadService( webModuleName:string): Rule {\n return (tree: Tree) => {\n const lazyLoaderServicePath = getDestinationModulePathByWebModuleName(webModuleName) + '/lazy-loader.service.ts';\n\n if(webModuleName != '') {\n if (!tree.exists(lazyLoaderServicePath)) {\n LogLn(` [>Error] File cannot be overwrite, The file is not exist !!! :lazyLoaderServicePath`);\n }\n\n tree.delete(lazyLoaderServicePath);\n return tree;\n }\n }\n}\n\n\n//-------------------------------------------------------------------------------------------------\n// get destination path according to the send webModuleName\n//-------------------------------------------------------------------------------------------------\nexport function getDestinationModulePathByWebModuleName(webModuleName:string):string {\n const newDestModulePath = `${env.metadata.paths.rootMagicGenFolder}/${GEN_FOLDER}/${webModuleName}`;\n return newDestModulePath;\n}\n\n//-------------------------------------------------------------------------------------------------\n// get web module full file name according to the send webModuleName\n//-------------------------------------------------------------------------------------------------\nfunction getWebModuleFullFileName(webModuleName:string):string {\n// calc the path of new the module\n const newDestModulePath = getDestinationModulePathByWebModuleName(webModuleName);\n return `${newDestModulePath}/magic.gen.lib.module.ts`;\n}\n\n//-------------------------------------------------------------------------------------------------\n// get web module class according to the send webModuleName\n//-------------------------------------------------------------------------------------------------\nfunction getWebModuleClass(webModuleName:string):string {\n return `Magic` + webModuleName + `Module`;\n}\n\n\n//-------------------------------------------------------------------------------------------------\n// add magic module to app module\n//-------------------------------------------------------------------------------------------------\nfunction addMagicModuleToAppModule(options: MagicOptionScheme, modulePath:string, moduleName:string, srcModuleName:string) : Rule {\n return (tree: Tree , context : SchematicContext)=>{\n const project = env.project;\n\n LogLn(` [>] add New Web Module :[${moduleName}] `);\n LogLn(` [>] from :[${srcModuleName}]`);\n LogLn(` [>] To App Module :[${modulePath}]`);\n addModuleImportToModule(\n tree,\n modulePath, // for now we will update env.metadata.paths.magicGenLibModule\n moduleName, // 'MagicXXXModule',\n srcModuleName, // `./XXX/magic.gen.lib.module`\n );\n return tree;\n }\n}\n\n//-------------------------------------------------------------------------------------------------\n// create module\n//-------------------------------------------------------------------------------------------------\nexport function checkAndCreateModule(options: MagicOptionScheme, webModuleName:string, loadOnDemand: boolean ): Rule {\n return (tree: Tree, context: SchematicContext) => {\n\n let rules: Rule[] = [];\n const webModuleFullFileName = getWebModuleFullFileName(webModuleName);\n // only if not exist create the new 2 files magic.gen.lib.module.ts & component-list.g.ts\n if (!tree.exists(webModuleFullFileName)) {\n rules.push(copyDefaultMagicFilesToWebModule(options, webModuleName));\n rules.push(updateWebModuleFileWithNewClassName(tree, webModuleName));\n rules.push(deleteLazyLoadService(webModuleName));\n // for NON load on demand we need to update magic root module\n if (!loadOnDemand) {\n const newDestModulePath = `./${webModuleName}/magic.gen.lib.module`;\n const webModuleClass = getWebModuleClass(webModuleName);\n rules.push(addMagicModuleToAppModule(options, env.metadata.paths.magicGenLibModule, webModuleClass, newDestModulePath));\n }\n return chain(rules)(tree, context);\n }\n ;\n }\n}\n\n//-------------------------------------------------------------------------------------------------\n// check if module is exist, only if not exist create the web module\n//-------------------------------------------------------------------------------------------------\nexport function generateWebModule(options: MagicOptionScheme, webModuleName:string, loadOnDemand:boolean ): Rule {\n return (tree: Tree, context: SchematicContext) => {\n\n let rules:Rule[] = [];\n\n LogLn(` [>]Handling Web Module named: [${webModuleName}] isLoadOnDemand: [${loadOnDemand}]`);\n rules.push(checkAndCreateModule(options, webModuleName, loadOnDemand));\n rules.push(checkAndCreateRouteForModule(options, webModuleName, loadOnDemand));\n\n return chain(rules)(tree,context);\n };\n}\n\n\n//-------------------------------------------------------------------------------------------------\n// generate all the modules in env.modulesGen\n//-------------------------------------------------------------------------------------------------\nexport function generateWebModules(options: MagicOptionScheme, generateViaCLI:boolean = false): Rule {\n return (tree: Tree, context: SchematicContext) => {\n\n let rules:Rule[] = [];\n\n for (let webModuleInfo of env.modulesGen){\n if (webModuleInfo.moduleName !== undefined && webModuleInfo.moduleName !== \"\") {\n if (generateViaCLI) {\n if (webModuleInfo.moduleName === options.module) {\n rules.push(generateWebModule(options, webModuleInfo.moduleName, webModuleInfo.loadOnDemand));\n }\n }else{\n rules.push(generateWebModule(options, webModuleInfo.moduleName, webModuleInfo.loadOnDemand));\n }\n }\n }\n\n return chain(rules)(tree,context);\n };\n}\n\n\n\n//-------------------------------------------------------------------------------------------------\n// check if module is exist, only if not exist create the web module\n//-------------------------------------------------------------------------------------------------\nexport function checkAndCreateRouteForModule(options: MagicOptionScheme, webModuleName:string, loadOnDemand :boolean): Rule {\n return (tree: Tree, context: SchematicContext) => {\n\n let rules:Rule[] = [];\n\n if (loadOnDemand) {\n const newDestRoutePathForModule = env.metadata.paths.getRoutePathForWebModule(webModuleName);\n\n // only if file not exist then copy the default route\n if (!tree.exists(newDestRoutePathForModule)) {\n rules.push(createRoute(options, webModuleName));\n }\n else{\n // if file exist then only update the magic.gen.lib.module.ts\n rules.push(addRouteFileToModuleFile(options, webModuleName));\n }\n }\n return chain(rules)(tree,context);\n };\n}\n\n\n\n//-------------------------------------------------------------------------------------------------\n// create route for module\n//-------------------------------------------------------------------------------------------------\nexport function createRoute(options: MagicOptionScheme, webModuleName:string): Rule {\n return (tree: Tree, context: SchematicContext) => {\n\n let rules:Rule[] = [];\n\n rules.push(copyDefaultRouteMagicFilesToWebModule(options, webModuleName));\n // --------------------------------------------------------\n // // generate the route for module /////\n // let routeItem : RouteTable = new RouteTable();\n // routeItem.module_name = webModuleName;\n //\n // let route:Route = new Route();\n // route.ModuleName = webModuleName;\n // route.OutletName=\"\";\n // route.RouteName=\"\";\n // route.children=null;\n //\n // routeItem.routesArray = [route];\n // rules.push(genRouteFile(options, routeItem ));\n // --------------------------------------------------------\n // update the new MagicRoutingModule in file magic.gen.lib.module.ts of the module\n\n\n rules.push(addRouteFileToModuleFile(options, webModuleName));\n\n return chain(rules)(tree,context);\n };\n}\n\n//-------------------------------------------------------------------------------------------------\n// create route for module\n//-------------------------------------------------------------------------------------------------\nexport function addRouteFileToModuleFile(options: MagicOptionScheme, webModuleName:string): Rule {\n return (tree: Tree, context: SchematicContext) => {\n\n let rules:Rule[] = [];\n\n const modulePath = getWebModuleFullFileName(webModuleName); // get the magic.gen.lib.module.ts according to the module name\n const moduleName = `MagicRoutingModule`;//for now it will be the same for all modules ... getWebModuleClass(webModuleName);\n const srcModuleName = `./app.routes`;\n\n rules.push(addMagicModuleToAppModule(options, modulePath, moduleName, srcModuleName));\n\n return chain(rules)(tree,context);\n };\n}\n//-------------------------------------------------------------------------------------------------\n// copy the two default files into the web module path\n//-------------------------------------------------------------------------------------------------\nfunction copyDefaultRouteMagicFilesToWebModule(options:MagicOptionScheme, webModuleName:string): Rule {\n return (tree: Tree,context:SchematicContext) => {\n const routeFileForWebModulePath = env.metadata.paths.getRoutePathForWebModule(webModuleName);\n\n\n if(tree.exists(routeFileForWebModulePath))\n {\n let rules:Rule[] = [];\n return chain(rules)(tree,context);\n }\n else\n {\n const webModulePath = getDestinationModulePathByWebModuleName(webModuleName);\n LogLn(`[ >] copy default Route file to webModule [${webModuleName}]`)\n return chain([\n branchAndMerge(chain([\n mergeWith(\n apply(url(`./../mg-add/webModule/`), [\n\n move(webModulePath)\n ]), MergeStrategy.AllowCreationConflict)\n ]))\n ])(tree,context);\n }\n }\n}\n"]}

package/src/schematics/magic-utils/rules/init-add-modules.rule.ts CHANGED Viewed

@@ -23,15 +23,19 @@ import * as ts from "typescript";
 export function initGenModules(options: MagicOptionScheme, generateViaCLI:boolean = false): Rule {
   return (tree: Tree, context: SchematicContext) => {
     let metadata = env.metadata;
+    let programList = env.programList;
     env.modulesGen = [];
     let web_modules:webModuleItem [] = metadata.config.web_modules;
     if(generateViaCLI){
-      for (let moduleJsonPath of metadata.config.web_modules) {
-        if (moduleJsonPath.module_name === options.module) {
-          let moduleInfo: ModuleInfo = new ModuleInfo(options.module, moduleJsonPath.load_on_demand);
-          env.modulesGen.push(moduleInfo)
-        }
+      let programListString = JSON.stringify(programList.programListContents);
+      // Validate whether the component is valid
+      if(programListString.includes(options.component)){
+        let moduleInfo: ModuleInfo = new ModuleInfo(options.module, options.loadOnDemand);
+        env.modulesGen.push(moduleInfo)
+      }else{
+        LogLn(`Invalid component ${options.component} to generate.`);
       }
     }else{
       // Generate only one module from --module=xxxx
@@ -48,7 +52,8 @@ export function initGenModules(options: MagicOptionScheme, generateViaCLI:boolea
         }
       }
     }
-    LogLn(`   Number of modules to be check for generate: ${web_modules.length}`);
+    if(!generateViaCLI)
+      LogLn(`   Number of modules to be check for generate: ${web_modules.length}`);
     return tree;
   };
 }

package/src/schematics/magic-utils/rules/init-gen-components.rule.js CHANGED Viewed

@@ -8,7 +8,6 @@ const build_view_rule_1 = require("./build-view.rule");
 const component_list_rule_1 = require("./component-list.rule");
 const init_add_modules_rule_1 = require("./init-add-modules.rule");
 const utils_1 = require("../utils");
-const Util_1 = require("../Util");
 function initAndGenComponentsForModule(options, shouldBuildAndUpdateModule, generateViaCLI = false) {
     return (tree, context) => {
         let metadata = env_1.env.metadata;
@@ -20,12 +19,18 @@ function initAndGenComponentsForModule(options, shouldBuildAndUpdateModule, gene
             rules.push((0, init_add_modules_rule_1.initGenModules)(options, generateViaCLI));
             rules.push((0, init_add_modules_rule_1.generateWebModules)(options, generateViaCLI));
         }
-        let generatedModules = metadata.config.web_modules.filter(moduleJsonPath => !generateViaCLI || moduleJsonPath.module_name === options.module);
-        if (generatedModules.length === 0) {
-            (0, Util_1.LogLn)(`Metadata for module '${options.module}' doesn't exist.`);
+        // TO DO: Following code can be simplified.
+        if (generateViaCLI) {
+            const componentsArray = [options.component];
+            rules.push(initGenComponentsFromList(options, options.module, options.component, componentsArray));
+            rules.push((0, load_views_gen_rule_1.loadViewsToGen)(options));
+            if (shouldBuildAndUpdateModule) {
+                rules.push((0, build_view_rule_1.buildViews)(options, options.module));
+                rules.push((0, component_list_rule_1.componentlistGen)(options, options.module, options.loadOnDemand));
+            }
         }
         else {
-            for (let moduleJsonPath of generatedModules) {
+            for (let moduleJsonPath of metadata.config.web_modules) {
                 rules.push((0, utils_1.displayMessge)(options, `          ******    Start Web Module name : [${moduleJsonPath.module_name}]    *******`));
                 rules.push(initGenComponentsFromList(options, moduleJsonPath.module_name, options.component, moduleJsonPath.form_files));
                 rules.push((0, load_views_gen_rule_1.loadViewsToGen)(options));

package/src/schematics/magic-utils/rules/init-gen-components.rule.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"init-gen-components.rule.js","sourceRoot":"","sources":["init-gen-components.rule.ts"],"names":[],"mappings":";;;AAAA,2DAAiF;AAEjF,gCAA6B;AAC7B,+DAAuD;AACvD,uDAA+C;AAC/C,+DAAyD;AACzD,mEAA6E;AAC7E,oCAAyC;~~AACzC~~,~~kCAA8B;AAE9B,~~SAAgB,6BAA6B,CAAC,OAA0B,EAAE,0BAAmC,EAAE,iBAA0B,KAAK;IAC5I,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,IAAI,QAAQ,GAAG,SAAG,CAAC,QAAQ,CAAC;QAC5B,SAAG,CAAC,aAAa,GAAG,EAAE,CAAC;QACvB,IAAI,KAAK,GAAU,EAAE,CAAC;QAEtB,KAAK,CAAC,IAAI,CAAC,IAAA,qBAAa,EAAC,OAAO,EAAE,wFAAwF,CAAC,CAAC,CAAA;QAC5H,gFAAgF;QAChF,IAAI,0BAA0B,EAAE;YAC9B,KAAK,CAAC,IAAI,CAAC,IAAA,sCAAc,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;YACrD,KAAK,CAAC,IAAI,CAAC,IAAA,0CAAkB,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;SACzD;QAED,~~IAAI~~,~~gBAAgB~~,GAAG,~~QAAQ~~,CAAC,~~MAAM~~,CAAC,~~WAAW~~,CAAC,~~MAAM~~,~~CACvD~~,~~cAAc~~,CAAC,EAAE,CAAC,CAAC,~~cAAc~~,~~IAAI~~,~~cAAc~~,CAAC,~~WAAW~~,KAAK,~~OAAO~~,CAAC,~~MAAM~~,~~CACnF~~,CAAC;~~QACF~~,IAAI,~~gBAAgB~~,CAAC,MAAM,~~KAAK~~,CAAC,~~EAAE~~;~~YACjC~~,IAAA,~~YAAK~~,EAAC,~~wBAAwB~~,OAAO,CAAC,MAAM,~~kBAAkB~~,CAAC,CAAC;~~SACjE~~;~~aAAM~~;~~YACL~~,KAAK,IAAI,cAAc,IAAI,~~gBAAgB~~,EAAE;~~gBAC3C~~,KAAK,CAAC,IAAI,CAAC,IAAA,qBAAa,EAAC,OAAO,EAAE,gDAAgD,cAAc,CAAC,WAAW,cAAc,CAAC,CAAC,CAAA;gBAE5H,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;gBACzH,KAAK,CAAC,IAAI,CAAC,IAAA,oCAAc,EAAC,OAAO,CAAC,CAAC,CAAC;gBAEpC,IAAI,0BAA0B,EAAE;oBAC9B,KAAK,CAAC,IAAI,CAAC,IAAA,4BAAU,EAAC,OAAO,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;oBAC5D,KAAK,CAAC,IAAI,CAAC,IAAA,sCAAgB,EAAC,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;iBAClG;aACF;SACF;~~QAED~~,KAAK,CAAC,IAAI,CAAC,IAAA,qBAAa,EAAC,OAAO,EAAE,wFAAwF,CAAC,CAAC,CAAA;~~QAC5H~~,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,CAAC,CAAC;AACJ,CAAC;~~AAnCD~~,~~sEAmCC~~;AAGD,SAAgB,yBAAyB,CAAC,OAA0B,EAAE,WAAkB,EAAE,SAAiB,EAAE,UAAoB;IAC/H,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,IAAI,QAAQ,GAAG,SAAG,CAAC,QAAQ,CAAC;QAC5B,SAAG,CAAC,aAAa,GAAG,EAAE,CAAC;QAEvB,oDAAoD;QACpD,IAAI,SAAS,EAAE;YACb,SAAG,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;SAClC;aAAM;YAEL,uEAAuE;YACvE,KAAK,IAAI,WAAW,IAAI,UAAU,EAAE;gBAElC,IAAI,gBAAgB,GAAG,SAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,mCAAmC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;gBAExG,SAAG,CAAC,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;aAC1C;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AApBD,8DAoBC","sourcesContent":["import { chain, Rule, SchematicContext, Tree } from \"@angular-devkit/schematics\";\r\nimport { MagicOptionScheme } from \"./magic-option.scheme\";\r\nimport { env } from \"../env\";\r\nimport { loadViewsToGen } from \"./load-views-gen.rule\";\r\nimport { buildViews } from \"./build-view.rule\";\r\nimport { componentlistGen } from \"./component-list.rule\";\r\nimport { generateWebModules, initGenModules } from \"./init-add-modules.rule\";\r\nimport { displayMessge } from \"../utils\";\r\nimport {LogLn} from \"../Util\";\r\n\r\nexport function initAndGenComponentsForModule(options: MagicOptionScheme, shouldBuildAndUpdateModule: boolean, generateViaCLI: boolean = false): Rule {\r\n return (tree: Tree, context: SchematicContext) => {\r\n let metadata = env.metadata;\r\n env.componentsGen = [];\r\n let rules:Rule[] = [];\r\n\r\n rules.push(displayMessge(options, \" ******************************* START GENERATE *****************************\"))\r\n // if we need to build and update module , first generate(if needed) the modules\r\n if (shouldBuildAndUpdateModule) {\r\n rules.push(initGenModules (options, generateViaCLI));\r\n rules.push(generateWebModules(options, generateViaCLI));\r\n }\r\n\r\n ~~let~~ ~~generatedModules~~ = ~~metadata.config.web_modules.filter~~(\r\n ~~moduleJsonPath~~ => ~~!generateViaCLI~~ \|\| ~~moduleJsonPath~~.~~module_name~~ ~~===~~ options.~~module\~~r\n );\r\n if (~~generatedModules.length === 0~~) {\r\n ~~LogLn~~(~~`Metadata~~ ~~for~~ module ~~'${~~options.module}' ~~doesn't exist.`~~);\r\n } else {\r\n for (let moduleJsonPath of ~~generatedModules~~) {\r\n rules.push(displayMessge(options, ` ** Start Web Module name : [${moduleJsonPath.module_name}] ***`))\r\n\r\n rules.push(initGenComponentsFromList(options, moduleJsonPath.module_name, options.component, moduleJsonPath.form_files));\r\n rules.push(loadViewsToGen(options));\r\n\r\n if (shouldBuildAndUpdateModule) {\r\n rules.push(buildViews(options, moduleJsonPath.module_name));\r\n rules.push(componentlistGen(options, moduleJsonPath.module_name, moduleJsonPath.load_on_demand));\r\n }\r\n }\r\n }\r\n\r\n rules.push(displayMessge(options, \" ***************************** E N D GENERATE *******************************\"))\r\n return chain(rules)(tree, context);\r\n };\r\n}\r\n\r\n\r\nexport function initGenComponentsFromList(options: MagicOptionScheme, module_name:string, component: string, form_files: string[]): Rule {\r\n return (host: Tree, context: SchematicContext) => {\r\n let metadata = env.metadata;\r\n env.componentsGen = [];\r\n\r\n // Generate only one component from --component=xxxx\r\n if (component) {\r\n env.componentsGen.push(component)\r\n } else {\r\n\r\n // Generate list of components from config.json, properties form_views.\r\n for (let cmpJsonPath of form_files) {\r\n\r\n let JsonRelativePath = env.metadata.paths.getRelativePathForComponentInModule(module_name, cmpJsonPath);\r\n\r\n env.componentsGen.push(JsonRelativePath);\r\n }\r\n }\r\n return host;\r\n };\r\n}\r\n"]}
1	+ {"version":3,"file":"init-gen-components.rule.js","sourceRoot":"","sources":["init-gen-components.rule.ts"],"names":[],"mappings":"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","sourcesContent":["import { chain, Rule, SchematicContext, Tree } from \"@angular-devkit/schematics\";\r\nimport { MagicOptionScheme } from \"./magic-option.scheme\";\r\nimport { env } from \"../env\";\r\nimport { loadViewsToGen } from \"./load-views-gen.rule\";\r\nimport { buildViews } from \"./build-view.rule\";\r\nimport { componentlistGen } from \"./component-list.rule\";\r\nimport { generateWebModules, initGenModules } from \"./init-add-modules.rule\";\r\nimport { displayMessge } from \"../utils\";\r\nimport {LogLn} from \"../Util\";\r\n\r\nexport function initAndGenComponentsForModule(options: MagicOptionScheme, shouldBuildAndUpdateModule: boolean, generateViaCLI: boolean = false): Rule {\r\n return (tree: Tree, context: SchematicContext) => {\r\n let metadata = env.metadata;\r\n env.componentsGen = [];\r\n let rules:Rule[] = [];\r\n\r\n rules.push(displayMessge(options, \" ******************************* START GENERATE *****************************\"))\r\n // if we need to build and update module , first generate(if needed) the modules\r\n if (shouldBuildAndUpdateModule) {\r\n rules.push(initGenModules (options, generateViaCLI));\r\n rules.push(generateWebModules(options, generateViaCLI));\r\n }\r\n\r\n // TO DO: Following code can be simplified.\r\n if(generateViaCLI){\r\n const componentsArray = [options.component];\r\n rules.push(initGenComponentsFromList(options, options.module, options.component, componentsArray));\r\n rules.push(loadViewsToGen(options));\r\n\r\n if (shouldBuildAndUpdateModule) {\r\n rules.push(buildViews(options, options.module));\r\n rules.push(componentlistGen(options, options.module, options.loadOnDemand));\r\n }\r\n }else{\r\n for (let moduleJsonPath of metadata.config.web_modules) {\r\n rules.push(displayMessge(options, ` ** Start Web Module name : [${moduleJsonPath.module_name}] ***`))\r\n\r\n rules.push(initGenComponentsFromList(options, moduleJsonPath.module_name, options.component, moduleJsonPath.form_files));\r\n rules.push(loadViewsToGen(options));\r\n\r\n if (shouldBuildAndUpdateModule) {\r\n rules.push(buildViews(options, moduleJsonPath.module_name));\r\n rules.push(componentlistGen(options, moduleJsonPath.module_name, moduleJsonPath.load_on_demand));\r\n }\r\n }\r\n }\r\n\r\n rules.push(displayMessge(options, \" ***************************** E N D GENERATE *******************************\"))\r\n return chain(rules)(tree, context);\r\n };\r\n}\r\n\r\n\r\nexport function initGenComponentsFromList(options: MagicOptionScheme, module_name:string, component: string, form_files: string[]): Rule {\r\n return (host: Tree, context: SchematicContext) => {\r\n let metadata = env.metadata;\r\n env.componentsGen = [];\r\n\r\n // Generate only one component from --component=xxxx\r\n if (component) {\r\n env.componentsGen.push(component)\r\n } else {\r\n\r\n // Generate list of components from config.json, properties form_views.\r\n for (let cmpJsonPath of form_files) {\r\n\r\n let JsonRelativePath = env.metadata.paths.getRelativePathForComponentInModule(module_name, cmpJsonPath);\r\n\r\n env.componentsGen.push(JsonRelativePath);\r\n }\r\n }\r\n return host;\r\n };\r\n}\r\n"]}

package/src/schematics/magic-utils/rules/init-gen-components.rule.ts CHANGED Viewed

@@ -21,13 +21,18 @@ export function initAndGenComponentsForModule(options: MagicOptionScheme, should
       rules.push(generateWebModules(options, generateViaCLI));
     }
-    let generatedModules = metadata.config.web_modules.filter(
-      moduleJsonPath => !generateViaCLI || moduleJsonPath.module_name === options.module
-    );
-    if (generatedModules.length === 0) {
-      LogLn(`Metadata for module '${options.module}' doesn't exist.`);
-    } else {
-      for (let moduleJsonPath of generatedModules) {
+    // TO DO: Following code can be simplified.
+    if(generateViaCLI){
+      const componentsArray = [options.component];
+      rules.push(initGenComponentsFromList(options, options.module, options.component, componentsArray));
+      rules.push(loadViewsToGen(options));
+      if (shouldBuildAndUpdateModule) {
+        rules.push(buildViews(options, options.module));
+        rules.push(componentlistGen(options, options.module, options.loadOnDemand));
+      }
+    }else{
+      for (let moduleJsonPath of metadata.config.web_modules) {
         rules.push(displayMessge(options, `          ******    Start Web Module name : [${moduleJsonPath.module_name}]    *******`))
         rules.push(initGenComponentsFromList(options, moduleJsonPath.module_name, options.component, moduleJsonPath.form_files));
@@ -40,7 +45,7 @@ export function initAndGenComponentsForModule(options: MagicOptionScheme, should
       }
     }
-    rules.push(displayMessge(options, " ********************************* E N D    GENERATE *********************************"))
+      rules.push(displayMessge(options, " ********************************* E N D    GENERATE *********************************"))
     return chain(rules)(tree, context);
   };
 }

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

@@ -10,6 +10,7 @@ function initMagicMetadata(options) {
             env_1.env.workspace = (0, config_1.getWorkspace)(host);
             env_1.env.project = (0, config_1.getProjectFromWorkspace)(env_1.env.workspace, options.project);
             env_1.env.metadata = new metadata_class_1.MagicMetadata(host, context, options);
+            env_1.env.programList = new metadata_class_1.MagicMetadata(host, context, options);
         }
         return host;
     };

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

	@@ -1 +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;~~SAC3D~~;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAA;AACH,CAAC;~~AATD~~,~~8CASC~~","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 }\n return host;\n }\n}\n\n"]}
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"]}

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

@@ -11,6 +11,7 @@ export function initMagicMetadata(options:MagicOptionScheme) : Rule {
       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 CHANGED Viewed

@@ -9,6 +9,7 @@ export interface MagicOptionScheme {
     component?: string;
     module?: string;
     loadOnDemand?: boolean;
+    containerType?: string;
     skipHelp?: boolean;
     project?: string;
     dependencies?: dependency[];

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

	@@ -1 +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 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"]}
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"]}

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

@@ -4,19 +4,20 @@ export interface dependency{
 }
 export interface MagicOptionScheme {
   // Magic properties
-  path?           : string;
-  allowTesting?   : boolean;
-  theme?          : string;
-  component?      : string;
-  module?         : string;
-  loadOnDemand?   : boolean;
-  skipHelp?       : boolean;
+  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;
+  project?              : string;
+  dependencies?         : dependency[];
+  devDependencies?      : dependency[];
+  skipInstall?          : boolean;
+  skipPackageJson?      : boolean;
+  cliVersion?           : string;
+  angularVersion?       : string;
 }

package/src/schematics/mg-generate-component/index.js CHANGED Viewed

@@ -6,17 +6,31 @@ const init_magic_metadata_rule_1 = require("../magic-utils/rules/init-magic-meta
 const Util_1 = require("../magic-utils/Util");
 const init_gen_components_rule_1 = require("../magic-utils/rules/init-gen-components.rule");
 function mgGenerateComponent(options) {
-    let module;
     if (options.component == '') {
         (0, Util_1.LogLn)('Component name should not be empty.');
         return (0, schematics_1.chain)([]);
     }
-    module = options.component.split('/');
-    options.module = module[0];
+    options.module = getModuleName(options);
+    options.loadOnDemand = getLoadOnDemandFlagForModule(options);
     return (0, schematics_1.chain)([
         (0, init_magic_metadata_rule_1.initMagicMetadata)(options),
         (0, init_gen_components_rule_1.initAndGenComponentsForModule)(options, true, true)
     ]);
 }
 exports.mgGenerateComponent = mgGenerateComponent;
+// To get the module name from the FormId
+// In the case of containerType="Directory", consider root module.
+// In all other cases gets the first string value till separator(/) from the formId.
+function getModuleName(options) {
+    let moduleName = "";
+    if (options.containerType && options.containerType !== "Directory")
+        moduleName = options.component.split('/')[0];
+    return moduleName;
+}
+// To get loadOnDemand flag for the module
+// In the case of containerType == "LoadOnDemandModule", consider it as true
+// In all other cases, consider it as false
+function getLoadOnDemandFlagForModule(options) {
+    return options.containerType === "LoadOnDemandModule";
+}
 //# sourceMappingURL=index.js.map

package/src/schematics/mg-generate-component/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,2DAAiF;AACjF,4FAAmF;AAEnF,8CAA0C;AAC1C,4FAA4F;AAE5F,SAAgB,mBAAmB,CAAC,OAAyB;~~IAC3D~~,~~IAAI,MAAe,CAAC;IAEpB,~~IAAG,OAAO,CAAC,SAAS,IAAI,EAAE,EAAC;QACzB,IAAA,YAAK,EAAC,qCAAqC,CAAC,CAAC;QAC7C,OAAO,IAAA,kBAAK,EAAC,EAAE,CAAC,CAAC;KAClB;IAED,~~MAAM,GAAG,~~OAAO,CAAC,~~SAAS~~,~~CAAC~~,~~KAAK~~,CAAC,~~GAAG~~,CAAC,CAAC;~~IACtC~~,OAAO,CAAC,~~MAAM~~,GAAG,~~MAAM~~,CAAC,~~CAAC~~,CAAC,CAAC;~~IAE3B~~,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,4CAAiB,EAAE,OAAO,CAAC;QAC3B,IAAA,wDAA6B,EAAC,OAAO,EAAE,IAAI,EAAC,IAAI,CAAC;KAClD,CAAC,CAAC;AACL,CAAC;~~AAfD~~,~~kDAeC~~","sourcesContent":["import { chain, Rule, SchematicContext, Tree } from \"@angular-devkit/schematics\";\r\nimport { initMagicMetadata} from \"../magic-utils/rules/init-magic-metadata.rule\";\r\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\r\nimport {LogLn} from \"../magic-utils/Util\";\r\nimport {initAndGenComponentsForModule} from \"../magic-utils/rules/init-gen-components.rule\";\r\n\r\nexport function mgGenerateComponent(options:MagicOptionScheme): Rule {\r\n ~~let module:string[];\r~~\n\r\n if(options.component == ''){\r\n LogLn('Component name should not be empty.');\r\n return chain([]);\r\n }\r\n\r\n module = options~~.component.split('/'~~);\r\n options.~~module~~ = ~~module[0]~~;\r\n\r\n return chain([\r\n initMagicMetadata (options),\r\n initAndGenComponentsForModule(options, true,true)\r\n ]);\r\n}\r\n"]}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,2DAAiF;AACjF,4FAAmF;AAEnF,8CAA0C;AAC1C,4FAA4F;AAE5F,SAAgB,mBAAmB,CAAC,OAAyB;IAE3D,IAAG,OAAO,CAAC,SAAS,IAAI,EAAE,EAAC;QACzB,IAAA,YAAK,EAAC,qCAAqC,CAAC,CAAC;QAC7C,OAAO,IAAA,kBAAK,EAAC,EAAE,CAAC,CAAC;KAClB;IAED,OAAO,CAAC,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IACxC,OAAO,CAAC,YAAY,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;IAE7D,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,4CAAiB,EAAE,OAAO,CAAC;QAC3B,IAAA,wDAA6B,EAAC,OAAO,EAAE,IAAI,EAAC,IAAI,CAAC;KAClD,CAAC,CAAC;AACL,CAAC;AAdD,kDAcC;AAED,yCAAyC;AACzC,kEAAkE;AAClE,oFAAoF;AACpF,SAAS,aAAa,CAAC,OAA0B;IAC/C,IAAI,UAAU,GAAU,EAAE,CAAC;IAC3B,IAAG,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,KAAK,WAAW;QAC/D,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/C,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,0CAA0C;AAC1C,4EAA4E;AAC5E,2CAA2C;AAC3C,SAAS,4BAA4B,CAAC,OAA0B;IAC7D,OAAO,OAAO,CAAC,aAAa,KAAK,oBAAoB,CAAC;AACzD,CAAC","sourcesContent":["import { chain, Rule, SchematicContext, Tree } from \"@angular-devkit/schematics\";\r\nimport { initMagicMetadata} from \"../magic-utils/rules/init-magic-metadata.rule\";\r\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\r\nimport {LogLn} from \"../magic-utils/Util\";\r\nimport {initAndGenComponentsForModule} from \"../magic-utils/rules/init-gen-components.rule\";\r\n\r\nexport function mgGenerateComponent(options:MagicOptionScheme): Rule {\r\n\r\n if(options.component == ''){\r\n LogLn('Component name should not be empty.');\r\n return chain([]);\r\n }\r\n\r\n options.module = getModuleName(options);\r\n options.loadOnDemand = getLoadOnDemandFlagForModule(options);\r\n\r\n return chain([\r\n initMagicMetadata (options),\r\n initAndGenComponentsForModule(options, true,true)\r\n ]);\r\n}\r\n\r\n// To get the module name from the FormId\r\n// In the case of containerType=\"Directory\", consider root module.\r\n// In all other cases gets the first string value till separator(/) from the formId.\r\nfunction getModuleName(options: MagicOptionScheme){\r\n let moduleName:string = \"\";\r\n if(options.containerType && options.containerType !== \"Directory\")\r\n moduleName = options.component.split('/')[0];\r\n return moduleName;\r\n}\r\n\r\n// To get loadOnDemand flag for the module\r\n// In the case of containerType == \"LoadOnDemandModule\", consider it as true\r\n// In all other cases, consider it as false\r\nfunction getLoadOnDemandFlagForModule(options: MagicOptionScheme){\r\n return options.containerType === \"LoadOnDemandModule\";\r\n}\r\n"]}

package/src/schematics/mg-generate-component/index.ts CHANGED Viewed

@@ -5,18 +5,34 @@ import {LogLn} from "../magic-utils/Util";
 import {initAndGenComponentsForModule} from "../magic-utils/rules/init-gen-components.rule";
 export function mgGenerateComponent(options:MagicOptionScheme): Rule {
-  let module:string[];
   if(options.component == ''){
     LogLn('Component name should not be empty.');
     return chain([]);
   }
-  module = options.component.split('/');
-  options.module = module[0];
+  options.module = getModuleName(options);
+  options.loadOnDemand = getLoadOnDemandFlagForModule(options);
   return chain([
     initMagicMetadata (options),
     initAndGenComponentsForModule(options, true,true)
   ]);
 }
+// To get the module name from the FormId
+// In the case of containerType="Directory", consider root module.
+// In all other cases gets the first string value till separator(/) from the formId.
+function getModuleName(options: MagicOptionScheme){
+  let moduleName:string = "";
+  if(options.containerType && options.containerType !== "Directory")
+    moduleName = options.component.split('/')[0];
+  return moduleName;
+}
+// To get loadOnDemand flag for the module
+// In the case of containerType == "LoadOnDemandModule", consider it as true
+// In all other cases, consider it as false
+function getLoadOnDemandFlagForModule(options: MagicOptionScheme){
+   return options.containerType === "LoadOnDemandModule";
+}

package/src/schematics/mg-generate-component/schema.json CHANGED Viewed

@@ -23,6 +23,10 @@
       "type": "boolean",
       "description": "is allow testing ",
       "aliases" : ["a"]
+    },
+    "containerType": {
+      "type": "string",
+      "description": "The value of container type (EagerModule, Directory, LoadOnDemandModule, '')"
     }
   },
   "required": []

package/src/types/interfaces/env.interface.d.ts CHANGED Viewed

@@ -10,6 +10,7 @@ export interface IEnv {
     workspace: Workspace;
     project: Project;
     metadata: MagicMetadata;
+    programList: MagicMetadata;
     componentsGen: string[];
     modulesGen: ModuleInfo[];
     app: AppJson;

package/src/types/interfaces/env.interface.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"env.interface.js","sourceRoot":"","sources":["env.interface.ts"],"names":[],"mappings":";;;AAMA,MAAa,UAAU;IAIrB,YAAY,UAAiB,EAAE,YAAoB;QACjD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;CACF;AARD,gCAQC","sourcesContent":["import { MagicMetadata, MagicPaths } from \"../../schematics/magic-utils/metadata.class\";\r\nimport { AppJson } from \"../index\";\r\nimport { Project, Workspace } from \"../../schematics/utils/devkit-utils/config\";\r\n\r\n\r\n\r\nexport class ModuleInfo {\r\n moduleName: string;\r\n loadOnDemand: boolean;\r\n\r\n constructor(moduleName:string, loadOnDemand:boolean){\r\n this.moduleName = moduleName;\r\n this.loadOnDemand = loadOnDemand;\r\n }\r\n}\r\n\r\n\r\nexport interface IEnv{\r\n workspace : Workspace,\r\n project : Project,\r\n metadata : MagicMetadata;\r\n componentsGen: string[];\r\n modulesGen : ModuleInfo[];\r\n app : AppJson;\r\n paths? : MagicPaths;\r\n prevent_log : boolean;\r\n}\r\n"]}
1	+ {"version":3,"file":"env.interface.js","sourceRoot":"","sources":["env.interface.ts"],"names":[],"mappings":";;;AAMA,MAAa,UAAU;IAIrB,YAAY,UAAiB,EAAE,YAAoB;QACjD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;CACF;AARD,gCAQC","sourcesContent":["import { MagicMetadata, MagicPaths } from \"../../schematics/magic-utils/metadata.class\";\r\nimport { AppJson } from \"../index\";\r\nimport { Project, Workspace } from \"../../schematics/utils/devkit-utils/config\";\r\n\r\n\r\n\r\nexport class ModuleInfo {\r\n moduleName: string;\r\n loadOnDemand: boolean;\r\n\r\n constructor(moduleName:string, loadOnDemand:boolean){\r\n this.moduleName = moduleName;\r\n this.loadOnDemand = loadOnDemand;\r\n }\r\n}\r\n\r\n\r\nexport interface IEnv{\r\n workspace : Workspace,\r\n project : Project,\r\n metadata : MagicMetadata;\r\n programList : MagicMetadata;\r\n componentsGen: string[];\r\n modulesGen : ModuleInfo[];\r\n app : AppJson;\r\n paths? : MagicPaths;\r\n prevent_log : boolean;\r\n}\r\n"]}

package/src/types/interfaces/env.interface.ts CHANGED Viewed

@@ -19,6 +19,7 @@ export interface IEnv{
   workspace    : Workspace,
   project      : Project,
   metadata     : MagicMetadata;
+  programList  : MagicMetadata;
   componentsGen: string[];
   modulesGen   : ModuleInfo[];
   app          : AppJson;