@magic-xpa/cli 4.900.0-dev490.23 → 4.900.0-dev490.230

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magic-xpa/cli",
-  "version": "4.900.0-dev490.23",
+  "version": "4.900.0-dev490.230",
   "license": "SEE LICENSE IN EULA.pdf",
   "description": "Magic CLI for MagicWeb applications",
   "keywords": [

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

@@ -24,9 +24,10 @@ exports.dependencies = [
     { name: "font-awesome", version: '^4.7.0' },
     { name: "hammerjs", version: '^2.0.8' },
     { name: "ngx-infinite-scroll", version: '^10.0.0' },
-    { name: "ng-dynamic-component", version: '^10.0.0' },
+    { name: "ng-dynamic-component", version: '~10.1.0' },
     { name: "rxjs-compat", version: "^6.6.0" },
-    { name: "ngx-currency", version: "^2.5.2" }
+    { name: "ngx-currency", version: "^2.5.2" },
+    { name: "ngx-mask", version: "^13.1.15" }
 ];
 exports.devDependencies = [
     { name: "@types/stacktrace-js", version: '^0.0.32' }

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

@@ -1 +1 @@
-{"version":3,"file":"env.js","sourceRoot":"","sources":["env.ts"],"names":[],"mappings":";;;AAKa,QAAA,YAAY,GAAW,gBAAgB,CAAC;AACxC,QAAA,oBAAoB,GAAG,oBAAoB,CAAC;AAC5C,QAAA,mBAAmB,GAAI,kBAAkB,CAAC;AAC1C,QAAA,UAAU,GAAa,OAAO,CAAC;AAC/B,QAAA,gBAAgB,GAAO,+BAA+B,CAAC;AACvD,QAAA,2BAA2B,GAAI,oBAAoB,CAAC;AACpD,QAAA,aAAa,GAAI,KAAK,oBAAY,gBAAgB,CAAC;AACnD,QAAA,WAAW,GAAM,KAAK,oBAAY,cAAc,CAAC;AAE9D,MAAa,aAAa;IACxB,YAAY,OAAc,EAAE,UAAiB;QAC3C,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC;IAC5B,CAAC;CAGF;AAPD,sCAOC;AAEU,QAAA,YAAY,GAAG;IAExB,wBAAwB;IACxB,EAAC,IAAI,EAAE,mBAAmB,EAAI,OAAO,EAAE,SAAS,EAAC;IACjD,EAAC,IAAI,EAAE,cAAc,EAAS,OAAO,EAAE,SAAS,EAAC;IACjD,EAAC,IAAI,EAAE,qBAAqB,EAAE,OAAO,EAAE,SAAS,EAAC;IACjD,EAAC,IAAI,EAAE,cAAc,EAAS,OAAO,EAAE,QAAQ,EAAC;IAChD,EAAC,IAAI,EAAE,UAAU,EAAa,OAAO,EAAE,QAAQ,EAAC;IAEhD,EAAC,IAAI,EAAE,qBAAqB,EAAG,OAAO,EAAE,SAAS,EAAC;IAClD,EAAC,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,SAAS,EAAC;IAClD,EAAC,IAAI,EAAE,aAAa,EAAW,OAAO,EAAE,QAAQ,EAAC;IACjD,EAAC,IAAI,EAAE,cAAc,EAAU,OAAO,EAAE,QAAQ,EAAC;CAClD,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,EAAC,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,SAAS,EAAC;CACnD,CAAC;AACW,QAAA,GAAG,GAAU,EAAS,CAAC","sourcesContent":["// TODO(PK): hard-code for now, will query npm repo\n// to get this info in the future\nimport { MagicMetadata } from \"./metadata.class\";\nimport { IEnv } from \"../../types/interfaces/env.interface\";\n\nexport const METADATA_DIR         = `magic-metadata`;\nexport const GEN_COMPONENTS_ARRAY = 'magicGenComponents';\nexport const GEN_COMPONENTS_HASH  = 'magicGenCmpsHash';\nexport const GEN_FOLDER           = 'magic';\nexport const MAGIC_CLI_FOLDER     = './node_modules/@magic-xpa/cli';\nexport const GEN_LAZY_LOAD_MODULES_ARRAY  = 'LazyLoadModulesMap';\nexport const manifest_path  = `./${METADATA_DIR}/manifest.json`;\nexport const config_path    = `./${METADATA_DIR}/config.json`;\n\nexport class Idependencies {\n  constructor(setName:string, setVersion:string){\n    this.name = setName;\n    this.version = setVersion;\n  }\n  name:string;\n  version:string;\n}\n\nexport var dependencies = [\n\n  // material dependencies\n  {name: \"@angular/material\"  , version: '^13.0.0'},\n  {name: \"@angular/cdk\"       , version: '^13.0.0'},\n  {name: \"@angular/animations\", version: '^13.0.0'},\n  {name: \"font-awesome\"       , version: '^4.7.0'},\n  {name: \"hammerjs\"           , version: '^2.0.8'},\n\n  {name: \"ngx-infinite-scroll\" , version: '^10.0.0'},\n  {name: \"ng-dynamic-component\", version: '^10.0.0'},\n  {name: \"rxjs-compat\"         , version: \"^6.6.0\"},\n  {name: \"ngx-currency\"        , version: \"^2.5.2\"}\n];\n\nexport const devDependencies = [\n  {name: \"@types/stacktrace-js\", version: '^0.0.32'}\n];\nexport const env : IEnv = {} as any;\n\n"]}
+{"version":3,"file":"env.js","sourceRoot":"","sources":["env.ts"],"names":[],"mappings":";;;AAKa,QAAA,YAAY,GAAW,gBAAgB,CAAC;AACxC,QAAA,oBAAoB,GAAG,oBAAoB,CAAC;AAC5C,QAAA,mBAAmB,GAAI,kBAAkB,CAAC;AAC1C,QAAA,UAAU,GAAa,OAAO,CAAC;AAC/B,QAAA,gBAAgB,GAAO,+BAA+B,CAAC;AACvD,QAAA,2BAA2B,GAAI,oBAAoB,CAAC;AACpD,QAAA,aAAa,GAAI,KAAK,oBAAY,gBAAgB,CAAC;AACnD,QAAA,WAAW,GAAM,KAAK,oBAAY,cAAc,CAAC;AAE9D,MAAa,aAAa;IACxB,YAAY,OAAc,EAAE,UAAiB;QAC3C,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC;IAC5B,CAAC;CAGF;AAPD,sCAOC;AAEU,QAAA,YAAY,GAAG;IAExB,wBAAwB;IACxB,EAAC,IAAI,EAAE,mBAAmB,EAAI,OAAO,EAAE,SAAS,EAAC;IACjD,EAAC,IAAI,EAAE,cAAc,EAAS,OAAO,EAAE,SAAS,EAAC;IACjD,EAAC,IAAI,EAAE,qBAAqB,EAAE,OAAO,EAAE,SAAS,EAAC;IACjD,EAAC,IAAI,EAAE,cAAc,EAAS,OAAO,EAAE,QAAQ,EAAC;IAChD,EAAC,IAAI,EAAE,UAAU,EAAa,OAAO,EAAE,QAAQ,EAAC;IAEhD,EAAC,IAAI,EAAE,qBAAqB,EAAG,OAAO,EAAE,SAAS,EAAC;IAClD,EAAC,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,SAAS,EAAC;IAClD,EAAC,IAAI,EAAE,aAAa,EAAW,OAAO,EAAE,QAAQ,EAAC;IACjD,EAAC,IAAI,EAAE,cAAc,EAAU,OAAO,EAAE,QAAQ,EAAC;IACjD,EAAC,IAAI,EAAE,UAAU,EAAc,OAAO,EAAE,UAAU,EAAC;CACpD,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,EAAC,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,SAAS,EAAC;CACnD,CAAC;AACW,QAAA,GAAG,GAAU,EAAS,CAAC","sourcesContent":["// TODO(PK): hard-code for now, will query npm repo\n// to get this info in the future\nimport { MagicMetadata } from \"./metadata.class\";\nimport { IEnv } from \"../../types/interfaces/env.interface\";\n\nexport const METADATA_DIR         = `magic-metadata`;\nexport const GEN_COMPONENTS_ARRAY = 'magicGenComponents';\nexport const GEN_COMPONENTS_HASH  = 'magicGenCmpsHash';\nexport const GEN_FOLDER           = 'magic';\nexport const MAGIC_CLI_FOLDER     = './node_modules/@magic-xpa/cli';\nexport const GEN_LAZY_LOAD_MODULES_ARRAY  = 'LazyLoadModulesMap';\nexport const manifest_path  = `./${METADATA_DIR}/manifest.json`;\nexport const config_path    = `./${METADATA_DIR}/config.json`;\n\nexport class Idependencies {\n  constructor(setName:string, setVersion:string){\n    this.name = setName;\n    this.version = setVersion;\n  }\n  name:string;\n  version:string;\n}\n\nexport var dependencies = [\n\n  // material dependencies\n  {name: \"@angular/material\"  , version: '^13.0.0'},\n  {name: \"@angular/cdk\"       , version: '^13.0.0'},\n  {name: \"@angular/animations\", version: '^13.0.0'},\n  {name: \"font-awesome\"       , version: '^4.7.0'},\n  {name: \"hammerjs\"           , version: '^2.0.8'},\n\n  {name: \"ngx-infinite-scroll\" , version: '^10.0.0'},\n  {name: \"ng-dynamic-component\", version: '~10.1.0'},\n  {name: \"rxjs-compat\"         , version: \"^6.6.0\"},\n  {name: \"ngx-currency\"        , version: \"^2.5.2\"},\n  {name: \"ngx-mask\"            , version: \"^13.1.15\"}\n];\n\nexport const devDependencies = [\n  {name: \"@types/stacktrace-js\", version: '^0.0.32'}\n];\nexport const env : IEnv = {} as any;\n\n"]}

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

@@ -31,9 +31,10 @@ export var dependencies = [
   {name: "hammerjs"           , version: '^2.0.8'},
 
   {name: "ngx-infinite-scroll" , version: '^10.0.0'},
-  {name: "ng-dynamic-component", version: '^10.0.0'},
+  {name: "ng-dynamic-component", version: '~10.1.0'},
   {name: "rxjs-compat"         , version: "^6.6.0"},
-  {name: "ngx-currency"        , version: "^2.5.2"}
+  {name: "ngx-currency"        , version: "^2.5.2"},
+  {name: "ngx-mask"            , version: "^13.1.15"}
 ];
 
 export const devDependencies = [

package/src/schematics/magic-utils/rules/component-list.rule.js

@@ -284,10 +284,12 @@ function addComponentsToArray(source, info, cmpsToAdd) {
     const prefix = source.substring(0, info.endPos);
     const suffix = source.substring(info.endPos);
     let toAdd = `${cmpsToAdd}`;
-    toAdd = `${toAdd.replace(/,/g, ",\n")}`;
+    toAdd = `${toAdd.replace(/,/g, ",\n\t")}`;
     return info.isEmpty ?
-        `${prefix} ${toAdd} ${suffix}` :
-        `${prefix} ${toAdd} , ${suffix}`;
+        `${prefix}
+\t${toAdd} ${suffix}` :
+        `${prefix}
+\t${toAdd},${suffix}`;
 }
 function addComponentsToHash(source, info, cmpsToAdd) {
     const prefix = source.substring(0, info.endPos);

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

@@ -1 +1 @@
-{"version":3,"file":"component-list.rule.js","sourceRoot":"","sources":["component-list.rule.ts"],"names":[],"mappings":"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","sourcesContent":["import * as ts from 'typescript';\r\nimport * as EJS from \"ejs\";\r\nimport {chain, Rule, SchematicContext, SchematicsException, Tree} from \"@angular-devkit/schematics\";\r\nimport {env, GEN_COMPONENTS_ARRAY, GEN_COMPONENTS_HASH, GEN_LAZY_LOAD_MODULES_ARRAY} from \"../env\";\r\nimport {MagicOptionScheme} from \"./magic-option.scheme\";\r\nimport {GeneratedFileTypes, TemplateConfig, View, WindowType} from \"../../../types\";\r\nimport {generate} from \"./generate.rule\";\r\nimport {getSourceFile} from \"../../utils/ast\";\r\nimport {insertImport, insertImport2} from \"../../utils/devkit-utils/route-utils\";\r\nimport {InsertChange} from \"../../utils/devkit-utils/change\";\r\nimport {findNodes} from \"../../utils/devkit-utils/ast-utils\";\r\nimport {LogLn} from \"../Util\";\r\nimport {isNullOrUndefined} from \"util\";\r\n\r\n\r\nlet existCmpListSet: Set<string>;\r\nlet newCmpListSet = new Set();\r\nlet toAddImports: boolean = true;\r\nlet orgPreventLog = env.prevent_log;\r\n\r\n\r\nexport function componentlistGen(options: MagicOptionScheme, module_name: string, loadOnDemand: boolean): Rule {\r\n  return (host: Tree, context: SchematicContext) => {\r\n    LogLn(`[>] Step 4: components-list.`);\r\n    return chain([\r\n      addNewCmpsToCmpListOrGenAll(options, module_name),\r\n      addCmpsImportsToCmpList(options, module_name),\r\n      createLazyModuleMap(options, module_name),\r\n      addLazyLoadComponentList(options, module_name, loadOnDemand),\r\n      addLazyModuleToMagicGen(options),\r\n      addImportForLazyModule(options)\r\n    ])(host, context);\r\n  }\r\n}\r\n\r\n// create the lazy load map if it does not exist\r\nfunction createLazyModuleMap(options: MagicOptionScheme, module_name: string) {\r\n  return (host: Tree, context: SchematicContext) => {\r\n    const cmpListPath = env.metadata.paths.componentListPath(\"\");\r\n    env.prevent_log = false;\r\n    const source = host.read(cmpListPath).toString(\"utf-8\")\r\n\r\n      const LazyModuleArrayStart = 'export const ' + GEN_LAZY_LOAD_MODULES_ARRAY + ' = {';\r\n      const LazyMOduleArrayEnd = '};';\r\n      // create lazy load component array if it does not exist\r\n      if (source.indexOf(LazyModuleArrayStart) < 0) {\r\n        LogLn(`[>] Creating LazyLoadModulesMap `);\r\n        // add the code of creating map in file\r\n        host.overwrite(cmpListPath, source + \"\\r\\n\" + LazyModuleArrayStart + LazyMOduleArrayEnd);\r\n      }\r\n\r\n  }\r\n}\r\n\r\n// add the lazy load components\r\nfunction addLazyLoadComponentList(options: MagicOptionScheme, module_name: string, loadOnDemand: boolean): Rule {\r\n  return (host: Tree, context: SchematicContext) => {\r\n    if (loadOnDemand) {\r\n      let lazyLoadedComponents: Array<View> = new Array<View>();\r\n      const cmpListPath = env.metadata.paths.componentListPath(\"\");\r\n\r\n      const source = host.read(cmpListPath);\r\n      if (source) {\r\n        let cmpListSource = getSourceFile(host, cmpListPath);\r\n\r\n        let cmpListTs = getLazyLoadCompoenentsInfo(cmpListSource, GEN_LAZY_LOAD_MODULES_ARRAY);\r\n        let sourceStep1 = host.read(cmpListPath).toString(\"utf-8\");\r\n\r\n        env.app.views.forEach(view => {\r\n            if( isNullOrUndefined(cmpListTs.components) || !(cmpListTs.components.includes(view.props.component_uniquename))) {\r\n              lazyLoadedComponents.push(view); // if component does not exist add it to list\r\n              LogLn(`[>] Add  ${view.props.component_uniquename} component to LazyLoadModulesMap`, );\r\n            }\r\n        });\r\n\r\n        // add components to map\r\n        if (lazyLoadedComponents.length > 0) {\r\n          let sourceStep2 = addComponentsToLazyLoad(sourceStep1, cmpListTs, lazyLoadedComponents, module_name);\r\n          host.overwrite(cmpListPath, sourceStep2);\r\n        }\r\n      }\r\n      env.prevent_log = orgPreventLog;\r\n    }\r\n    return host;\r\n  }\r\n}\r\n\r\nfunction addImportForLazyModule(options) {\r\n  return (tree: Tree, context: SchematicContext) => {\r\n\r\n    let genLibPath=  env.metadata.paths.rootMagicGenFolder + '/magic/magic.gen.lib.module.ts';\r\n    const recorder = tree.beginUpdate(genLibPath);\r\n    let genLibSource = getSourceFile(tree, genLibPath);\r\n\r\n    const importChange = insertImport(genLibSource, genLibPath, GEN_LAZY_LOAD_MODULES_ARRAY, './component-list.g') as InsertChange;\r\n    if (importChange.toAdd) {\r\n      recorder.insertLeft(importChange.pos, importChange.toAdd);\r\n    }\r\n    tree.commitUpdate(recorder);\r\n  }\r\n}\r\n\r\n// add the lazy load module to magic.gen.lib\r\nfunction addLazyModuleToMagicGen(options) {\r\n  return (tree: Tree, context: SchematicContext) => {\r\n\r\n    let origModuleFileName=  env.metadata.paths.rootMagicGenFolder + '/magic/magic.gen.lib.module.ts';\r\n    if(!tree.exists(origModuleFileName)){\r\n      LogLn(`      [>Error] File cannot be overwrite, The file is not exist  !!! : ${origModuleFileName}`);\r\n    }\r\n    const text = tree.read(origModuleFileName);\r\n\r\n    if (text === null) {\r\n      throw new SchematicsException(`File ${origModuleFileName} does not exist.`);\r\n    }\r\n    let sourceText = text.toString('utf-8');\r\n    const lazyModuleStatement = '\\r\\n    componentList.lazyLoadModulesMap = '+ GEN_LAZY_LOAD_MODULES_ARRAY+';';\r\n    if (sourceText !== \"\" && sourceText.indexOf(lazyModuleStatement)== -1) {\r\n      let genLibSource = getSourceFile(tree, origModuleFileName);\r\n      let newLazyModuleText: string = sourceText.replace(lazyModuleStatement, '').trim();\r\n      const constNode: ts.FunctionLikeDeclarationBase = findNodes(genLibSource, ts.SyntaxKind.Constructor)[0] as ts.FunctionLikeDeclarationBase;\r\n\r\n      let lastStatementEnd = (<ts.Block>constNode.body).statements.end;\r\n\r\n      const prefix = sourceText.substring(0, lastStatementEnd);\r\n      const suffix = sourceText.substring(lastStatementEnd );\r\n      tree.overwrite(origModuleFileName,  `${prefix} ${lazyModuleStatement} ${suffix}` );\r\n\r\n    }\r\n    return tree;\r\n  }\r\n}\r\n\r\n/*\r\n* Add new component to component-list.g file (Array and Hash).\r\n* If the file not exist new file will create by componentListGenIfNotExist function.\r\n* */\r\nfunction addNewCmpsToCmpListOrGenAll(options: MagicOptionScheme, module_name: string): Rule {\r\n  return (host: Tree, context: SchematicContext) => {\r\n    const metadata = env.metadata;\r\n    const cmpsToGen = env.app.views;\r\n    const cmpListPath = env.metadata.paths.componentListPath(module_name);\r\n    const source = host.read(cmpListPath);\r\n    if (source) {\r\n      let cmpToGenNum = 0;\r\n      let sourceStep1 = source.toString(\"utf-8\");\r\n      let cmpListSource = getSourceFile(host, cmpListPath);\r\n\r\n      let cmpListTs = getComponentsArrayInfo(cmpListSource, GEN_COMPONENTS_ARRAY);\r\n      existCmpListSet = new Set(cmpListTs.components);\r\n      newCmpListSet = new Set<string>();\r\n\r\n      // merge between components in the file and new component to gen\r\n      cmpsToGen.forEach(newCmpGen => {\r\n        if (!existCmpListSet.has(newCmpGen.props.component_uniquename)) {\r\n          newCmpListSet.add(newCmpGen.props.component_uniquename);\r\n        }\r\n      });\r\n      const newCmpListArray: string[] = <string[]>Array.from(newCmpListSet);\r\n      if (newCmpListArray && newCmpListArray.length > 0) {\r\n        let sourceStep2 = addComponentsToArray(sourceStep1, cmpListTs, newCmpListArray);\r\n\r\n        let cmpListHashTs = getComponentsHashInfo(cmpListSource, GEN_COMPONENTS_HASH);\r\n        let sourceStep3 = addComponentsToHash(sourceStep2, cmpListHashTs, newCmpListArray);\r\n\r\n        LogLn(` Total old components: ${existCmpListSet.size}, added components: ${newCmpListSet.size}. `);\r\n\r\n        host.overwrite(cmpListPath, sourceStep3);\r\n      }\r\n    } else {\r\n      // If component-list.g.ts doesn't exist.\r\n      toAddImports = false; // We generate the entire file with imports.\r\n      return componentListGenIfNotExist(options)(host, context);\r\n    }\r\n\r\n    return host;\r\n  }\r\n}\r\n\r\n/*\r\n* Create new component-list.g file.\r\n* */\r\nfunction componentListGenIfNotExist(options: MagicOptionScheme): Rule {\r\n  return (host: Tree, context: SchematicContext) => {\r\n\r\n   console.log(\"creating component-list\");\r\n    const metadata = env.metadata;\r\n    const cmpList = new Set<string>();\r\n    const data: any = {\r\n      app: env.app,\r\n      cmpList: env.app.views\r\n    };\r\n\r\n    const componentFile: TemplateConfig = {\r\n      template: `./templates/angular/src/app/component-list.g.ts`,\r\n      name: 'component-list.g.ts',\r\n      destination: metadata.paths.magicGenFolderPath,\r\n      type: GeneratedFileTypes.TS,\r\n      data: data\r\n    };\r\n\r\n    return chain([\r\n      generate(componentFile, options)\r\n    ])(host, context);\r\n  }\r\n}\r\n\r\n/*\r\n* Add new imports to component-list.g file.\r\n* */\r\nfunction addCmpsImportsToCmpList(options: MagicOptionScheme, module_name: string): Rule {\r\n  return (host: Tree, context: SchematicContext) => {\r\n    if (toAddImports) {\r\n      const cmpsToGen = env.app.views;\r\n      let cmpListSource = getSourceFile(host, env.metadata.paths.componentListPath(module_name));\r\n\r\n      const recorder = host.beginUpdate(env.metadata.paths.componentListPath(module_name));\r\n\r\n      cmpsToGen.forEach(cmp => {\r\n        let name = cmp.props.id;\r\n        let uniqueName = cmp.props.component_uniquename;\r\n        let cmpPath = cmp.props.component_path;\r\n\r\n        if (newCmpListSet.has(uniqueName)) {\r\n          const importsChange =\r\n            insertImport2(\r\n              cmpListSource,\r\n              env.metadata.paths.componentListPath(module_name),\r\n              name,\r\n              uniqueName,\r\n              `./${cmpPath}${name}.component`\r\n            ) as InsertChange;\r\n\r\n          if (importsChange.toAdd) {\r\n            recorder.insertLeft(importsChange.pos, importsChange.toAdd);\r\n          }\r\n        }\r\n      });\r\n\r\n      host.commitUpdate(recorder);\r\n    }\r\n    return host;\r\n  }\r\n}\r\n\r\n\r\n// //-------------------------------------------------------------------------------------------------\r\n// //\r\n// //-------------------------------------------------------------------------------------------------\r\n// function checkIfTheComponentNeedToBeRemoveFromGeneralMagicModule\r\n//        (options: MagicOptionScheme, modulePath:string, moduleName:string, srcModuleName:string) : Rule {\r\n//   return (tree: Tree , context : SchematicContext)=>{\r\n//     const project   = env.project;\r\n//\r\n//     if (env.metadata.paths.generateCompForModuleName != \"\") {\r\n//       LogLn(`      [>] checking component name [${moduleName}]\r\n//                             from                      ${srcModuleName}]\r\n//                             To App Module           : [${modulePath}]`);\r\n//       const moduleSourceFile = getSourceFile(tree, modulePath);\r\n//       if (isImported(moduleSourceFile, moduleName, srcModuleName)) {\r\n//\r\n//       }\r\n//     }\r\n//\r\n//     return tree;\r\n//   }\r\n// }\r\n\r\n/**************************\r\n * Helper Functions\r\n ***************************/\r\n\r\ninterface IComponentListParser {\r\n  components: string[];\r\n  endPos: number;\r\n  isEmpty: boolean;\r\n}\r\n\r\nfunction getComponentsHashInfo(source: ts.SourceFile, variable: string): IComponentListParser {\r\n\r\n  const rootNode = source;\r\n  const cmpListVars: ts.Node[] = findNodes(rootNode, ts.SyntaxKind.VariableDeclaration);\r\n  let endPos = -1;\r\n  let isEmpty = true;\r\n\r\n  let magicGenCmpsInfo = cmpListVars.filter(\r\n    (node: any) => node.name.escapedText === variable);\r\n\r\n  if (magicGenCmpsInfo && magicGenCmpsInfo.length > 0) {\r\n    const firstPunctuation: ts.Node[] = findNodes(magicGenCmpsInfo[0], ts.SyntaxKind.FirstPunctuation);\r\n    if (!(firstPunctuation && firstPunctuation.length > 0)) {\r\n      throw new Error('magicGenCmpsHash variable has no open bracket ( { )');\r\n    }\r\n    endPos = firstPunctuation[0].end;\r\n    const propertyAssignment = findNodes(firstPunctuation[0].parent, ts.SyntaxKind.PropertyAssignment);\r\n    if (propertyAssignment && propertyAssignment.length > 0) {\r\n      isEmpty = false;\r\n    }\r\n  }\r\n  return {\r\n    components: null,\r\n    endPos,\r\n    isEmpty\r\n  };\r\n}\r\n\r\nfunction getComponentsArrayInfo(source: ts.SourceFile, variable: string): IComponentListParser {\r\n\r\n  const rootNode = source;\r\n  const cmpListVars: ts.Node[] = findNodes(rootNode, ts.SyntaxKind.VariableDeclaration);\r\n  let endPos = -1;\r\n  let cmpListArray;\r\n  let isEmpty = true;\r\n  let magicGenCmpsInfo = cmpListVars.filter(\r\n    (node: any) => node.name.escapedText === variable);\r\n\r\n  if (magicGenCmpsInfo && magicGenCmpsInfo.length > 0) {\r\n    const openBracketToken: ts.Node[] = findNodes(magicGenCmpsInfo[0], ts.SyntaxKind.OpenBracketToken);\r\n    if (!(openBracketToken && openBracketToken.length > 0)) {\r\n      throw new Error('magicGenComponents variable has no open bracket ([)');\r\n    }\r\n    endPos = openBracketToken[0].end;\r\n    const identifiers = findNodes(openBracketToken[0].parent, ts.SyntaxKind.Identifier);\r\n\r\n\r\n    // Array with items\r\n    if (identifiers && identifiers.length > 0) {\r\n      isEmpty = false;\r\n      //endPos = identifiers[identifiers.length - 1].end;\r\n      cmpListArray = identifiers.map((i: any) => i.escapedText) as string[];\r\n    }\r\n    // Array with no items\r\n    // else{\r\n    //   endPos = openBracketToken[0].end;\r\n    // }\r\n  }\r\n  return {\r\n    components: cmpListArray,\r\n    endPos,\r\n    isEmpty\r\n  };\r\n}\r\n\r\n\r\nfunction getLazyLoadCompoenentsInfo(source: ts.SourceFile, variable: string): IComponentListParser {\r\n\r\n  const cmpListVars: ts.Node[] = findNodes(source, ts.SyntaxKind.VariableDeclaration);\r\n  let endPos = -1;\r\n  let cmpListArray;\r\n  let isEmpty = true;\r\n  let magicGenCmpsInfo = cmpListVars.filter(\r\n    (node: any) => node.name.escapedText === variable);\r\n\r\n  if (magicGenCmpsInfo && magicGenCmpsInfo.length > 0) {\r\n    const openBracketToken: ts.Node[] = findNodes(magicGenCmpsInfo[0], ts.SyntaxKind.FirstPunctuation);\r\n    if (!(openBracketToken && openBracketToken.length > 0)) {\r\n      throw new Error('FirstPunctuation variable has no open bracket ([)');\r\n    }\r\n    endPos = openBracketToken[0].end;\r\n    const identifiers = findNodes(openBracketToken[0].parent, ts.SyntaxKind.PropertyAssignment);\r\n    const identifiers1 = findNodes(openBracketToken[0].parent, ts.SyntaxKind.Identifier);\r\n\r\n    // Array with items\r\n    if (identifiers && identifiers.length > 0) {\r\n      isEmpty = false;\r\n      cmpListArray = identifiers.map((i: any) => i.name.escapedText ).filter(id => id !== \"moduleName\" && id !== \"modulePath\");\r\n    }\r\n  }\r\n  return {\r\n    components: cmpListArray,\r\n    endPos,\r\n    isEmpty\r\n  };\r\n}\r\n\r\nfunction addComponentsToArray(source: string, info: IComponentListParser, cmpsToAdd: string[]): string {\r\n  const prefix = source.substring(0, info.endPos);\r\n  const suffix = source.substring(info.endPos);\r\n  let toAdd = `${cmpsToAdd}`;\r\n  toAdd = `${toAdd.replace(/,/g, \",\\n\")}`;\r\n\r\n  return info.isEmpty ?\r\n    `${prefix} ${toAdd} ${suffix}` :\r\n    `${prefix} ${toAdd} , ${suffix}`;\r\n}\r\n\r\nfunction addComponentsToHash(source: string, info: IComponentListParser, cmpsToAdd: string[]): string {\r\n  const prefix = source.substring(0, info.endPos);\r\n  const suffix = source.substring(info.endPos);\r\n  const cmpHashStr = EJS.render(`\r\n      <% components.forEach(componentUniqueName => { %>\r\n        <%= componentUniqueName %>:<%- componentUniqueName %>,\r\n      <%})%>`, {components: cmpsToAdd});\r\n  let toAdd = `${cmpHashStr.replace(/\\n/g, '').replace(/,/g, \",\\n\")}`;\r\n  // update source\r\n  return `${prefix} ${toAdd} ${suffix}`;\r\n  /*return info.isEmpty ?\r\n    `${prefix} ${delLastComma(cmpHashStr)} ${suffix}` :\r\n    `${prefix} ${delLastComma(cmpHashStr)}, ${suffix}` ;*/\r\n}\r\n\r\n// add the lazy loaded components to map\r\nfunction addComponentsToLazyLoad(source: string, info: IComponentListParser, cmpsToAdd: View[], module_name: string): string {\r\n  const prefix = source.substring(0, info.endPos);\r\n  const suffix = source.substring(info.endPos);\r\n\r\n  // get the module path\r\n  let currentModulePath = env.metadata.paths.magicGenLibModulePath(module_name);\r\n\r\n  const cmpHashStr = EJS.render(`\r\n<%{components.forEach(view =>{-%>\r\n<%=view.props.component_uniquename %> : { moduleName : 'Magic<%=moduleName%>Module'},\r\n<%})}-%>`, {components: cmpsToAdd, moduleName: module_name, modulePath: currentModulePath});\r\n\r\n  let toAdd = `${cmpHashStr.replace(/\\n/g, '').replace(/,/g, \",\\n\")}`;\r\n  // update source\r\n  return `${prefix} ${toAdd} ${suffix}`;\r\n}\r\n\r\nfunction delLastComma(source: string) {\r\n  let index = source.lastIndexOf(',');\r\n  return source.substring(0, index);\r\n}\r\n\r\n\r\n\r\n"]}
+{"version":3,"file":"component-list.rule.js","sourceRoot":"","sources":["component-list.rule.ts"],"names":[],"mappings":"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","sourcesContent":["import * as ts from 'typescript';\r\nimport * as EJS from \"ejs\";\r\nimport {chain, Rule, SchematicContext, SchematicsException, Tree} from \"@angular-devkit/schematics\";\r\nimport {env, GEN_COMPONENTS_ARRAY, GEN_COMPONENTS_HASH, GEN_LAZY_LOAD_MODULES_ARRAY} from \"../env\";\r\nimport {MagicOptionScheme} from \"./magic-option.scheme\";\r\nimport {GeneratedFileTypes, TemplateConfig, View, WindowType} from \"../../../types\";\r\nimport {generate} from \"./generate.rule\";\r\nimport {getSourceFile} from \"../../utils/ast\";\r\nimport {insertImport, insertImport2} from \"../../utils/devkit-utils/route-utils\";\r\nimport {InsertChange} from \"../../utils/devkit-utils/change\";\r\nimport {findNodes} from \"../../utils/devkit-utils/ast-utils\";\r\nimport {LogLn} from \"../Util\";\r\nimport {isNullOrUndefined} from \"util\";\r\n\r\n\r\nlet existCmpListSet: Set<string>;\r\nlet newCmpListSet = new Set();\r\nlet toAddImports: boolean = true;\r\nlet orgPreventLog = env.prevent_log;\r\n\r\n\r\nexport function componentlistGen(options: MagicOptionScheme, module_name: string, loadOnDemand: boolean): Rule {\r\n  return (host: Tree, context: SchematicContext) => {\r\n    LogLn(`[>] Step 4: components-list.`);\r\n    return chain([\r\n      addNewCmpsToCmpListOrGenAll(options, module_name),\r\n      addCmpsImportsToCmpList(options, module_name),\r\n      createLazyModuleMap(options, module_name),\r\n      addLazyLoadComponentList(options, module_name, loadOnDemand),\r\n      addLazyModuleToMagicGen(options),\r\n      addImportForLazyModule(options)\r\n    ])(host, context);\r\n  }\r\n}\r\n\r\n// create the lazy load map if it does not exist\r\nfunction createLazyModuleMap(options: MagicOptionScheme, module_name: string) {\r\n  return (host: Tree, context: SchematicContext) => {\r\n    const cmpListPath = env.metadata.paths.componentListPath(\"\");\r\n    env.prevent_log = false;\r\n    const source = host.read(cmpListPath).toString(\"utf-8\")\r\n\r\n      const LazyModuleArrayStart = 'export const ' + GEN_LAZY_LOAD_MODULES_ARRAY + ' = {';\r\n      const LazyMOduleArrayEnd = '};';\r\n      // create lazy load component array if it does not exist\r\n      if (source.indexOf(LazyModuleArrayStart) < 0) {\r\n        LogLn(`[>] Creating LazyLoadModulesMap `);\r\n        // add the code of creating map in file\r\n        host.overwrite(cmpListPath, source + \"\\r\\n\" + LazyModuleArrayStart + LazyMOduleArrayEnd);\r\n      }\r\n\r\n  }\r\n}\r\n\r\n// add the lazy load components\r\nfunction addLazyLoadComponentList(options: MagicOptionScheme, module_name: string, loadOnDemand: boolean): Rule {\r\n  return (host: Tree, context: SchematicContext) => {\r\n    if (loadOnDemand) {\r\n      let lazyLoadedComponents: Array<View> = new Array<View>();\r\n      const cmpListPath = env.metadata.paths.componentListPath(\"\");\r\n\r\n      const source = host.read(cmpListPath);\r\n      if (source) {\r\n        let cmpListSource = getSourceFile(host, cmpListPath);\r\n\r\n        let cmpListTs = getLazyLoadCompoenentsInfo(cmpListSource, GEN_LAZY_LOAD_MODULES_ARRAY);\r\n        let sourceStep1 = host.read(cmpListPath).toString(\"utf-8\");\r\n\r\n        env.app.views.forEach(view => {\r\n            if( isNullOrUndefined(cmpListTs.components) || !(cmpListTs.components.includes(view.props.component_uniquename))) {\r\n              lazyLoadedComponents.push(view); // if component does not exist add it to list\r\n              LogLn(`[>] Add  ${view.props.component_uniquename} component to LazyLoadModulesMap`, );\r\n            }\r\n        });\r\n\r\n        // add components to map\r\n        if (lazyLoadedComponents.length > 0) {\r\n          let sourceStep2 = addComponentsToLazyLoad(sourceStep1, cmpListTs, lazyLoadedComponents, module_name);\r\n          host.overwrite(cmpListPath, sourceStep2);\r\n        }\r\n      }\r\n      env.prevent_log = orgPreventLog;\r\n    }\r\n    return host;\r\n  }\r\n}\r\n\r\nfunction addImportForLazyModule(options) {\r\n  return (tree: Tree, context: SchematicContext) => {\r\n\r\n    let genLibPath=  env.metadata.paths.rootMagicGenFolder + '/magic/magic.gen.lib.module.ts';\r\n    const recorder = tree.beginUpdate(genLibPath);\r\n    let genLibSource = getSourceFile(tree, genLibPath);\r\n\r\n    const importChange = insertImport(genLibSource, genLibPath, GEN_LAZY_LOAD_MODULES_ARRAY, './component-list.g') as InsertChange;\r\n    if (importChange.toAdd) {\r\n      recorder.insertLeft(importChange.pos, importChange.toAdd);\r\n    }\r\n    tree.commitUpdate(recorder);\r\n  }\r\n}\r\n\r\n// add the lazy load module to magic.gen.lib\r\nfunction addLazyModuleToMagicGen(options) {\r\n  return (tree: Tree, context: SchematicContext) => {\r\n\r\n    let origModuleFileName=  env.metadata.paths.rootMagicGenFolder + '/magic/magic.gen.lib.module.ts';\r\n    if(!tree.exists(origModuleFileName)){\r\n      LogLn(`      [>Error] File cannot be overwrite, The file is not exist  !!! : ${origModuleFileName}`);\r\n    }\r\n    const text = tree.read(origModuleFileName);\r\n\r\n    if (text === null) {\r\n      throw new SchematicsException(`File ${origModuleFileName} does not exist.`);\r\n    }\r\n    let sourceText = text.toString('utf-8');\r\n    const lazyModuleStatement = '\\r\\n    componentList.lazyLoadModulesMap = '+ GEN_LAZY_LOAD_MODULES_ARRAY+';';\r\n    if (sourceText !== \"\" && sourceText.indexOf(lazyModuleStatement)== -1) {\r\n      let genLibSource = getSourceFile(tree, origModuleFileName);\r\n      let newLazyModuleText: string = sourceText.replace(lazyModuleStatement, '').trim();\r\n      const constNode: ts.FunctionLikeDeclarationBase = findNodes(genLibSource, ts.SyntaxKind.Constructor)[0] as ts.FunctionLikeDeclarationBase;\r\n\r\n      let lastStatementEnd = (<ts.Block>constNode.body).statements.end;\r\n\r\n      const prefix = sourceText.substring(0, lastStatementEnd);\r\n      const suffix = sourceText.substring(lastStatementEnd );\r\n      tree.overwrite(origModuleFileName,  `${prefix} ${lazyModuleStatement} ${suffix}` );\r\n\r\n    }\r\n    return tree;\r\n  }\r\n}\r\n\r\n/*\r\n* Add new component to component-list.g file (Array and Hash).\r\n* If the file not exist new file will create by componentListGenIfNotExist function.\r\n* */\r\nfunction addNewCmpsToCmpListOrGenAll(options: MagicOptionScheme, module_name: string): Rule {\r\n  return (host: Tree, context: SchematicContext) => {\r\n    const metadata = env.metadata;\r\n    const cmpsToGen = env.app.views;\r\n    const cmpListPath = env.metadata.paths.componentListPath(module_name);\r\n    const source = host.read(cmpListPath);\r\n    if (source) {\r\n      let cmpToGenNum = 0;\r\n      let sourceStep1 = source.toString(\"utf-8\");\r\n      let cmpListSource = getSourceFile(host, cmpListPath);\r\n\r\n      let cmpListTs = getComponentsArrayInfo(cmpListSource, GEN_COMPONENTS_ARRAY);\r\n      existCmpListSet = new Set(cmpListTs.components);\r\n      newCmpListSet = new Set<string>();\r\n\r\n      // merge between components in the file and new component to gen\r\n      cmpsToGen.forEach(newCmpGen => {\r\n        if (!existCmpListSet.has(newCmpGen.props.component_uniquename)) {\r\n          newCmpListSet.add(newCmpGen.props.component_uniquename);\r\n        }\r\n      });\r\n      const newCmpListArray: string[] = <string[]>Array.from(newCmpListSet);\r\n      if (newCmpListArray && newCmpListArray.length > 0) {\r\n        let sourceStep2 = addComponentsToArray(sourceStep1, cmpListTs, newCmpListArray);\r\n\r\n        let cmpListHashTs = getComponentsHashInfo(cmpListSource, GEN_COMPONENTS_HASH);\r\n        let sourceStep3 = addComponentsToHash(sourceStep2, cmpListHashTs, newCmpListArray);\r\n\r\n        LogLn(` Total old components: ${existCmpListSet.size}, added components: ${newCmpListSet.size}. `);\r\n\r\n        host.overwrite(cmpListPath, sourceStep3);\r\n      }\r\n    } else {\r\n      // If component-list.g.ts doesn't exist.\r\n      toAddImports = false; // We generate the entire file with imports.\r\n      return componentListGenIfNotExist(options)(host, context);\r\n    }\r\n\r\n    return host;\r\n  }\r\n}\r\n\r\n/*\r\n* Create new component-list.g file.\r\n* */\r\nfunction componentListGenIfNotExist(options: MagicOptionScheme): Rule {\r\n  return (host: Tree, context: SchematicContext) => {\r\n\r\n   console.log(\"creating component-list\");\r\n    const metadata = env.metadata;\r\n    const cmpList = new Set<string>();\r\n    const data: any = {\r\n      app: env.app,\r\n      cmpList: env.app.views\r\n    };\r\n\r\n    const componentFile: TemplateConfig = {\r\n      template: `./templates/angular/src/app/component-list.g.ts`,\r\n      name: 'component-list.g.ts',\r\n      destination: metadata.paths.magicGenFolderPath,\r\n      type: GeneratedFileTypes.TS,\r\n      data: data\r\n    };\r\n\r\n    return chain([\r\n      generate(componentFile, options)\r\n    ])(host, context);\r\n  }\r\n}\r\n\r\n/*\r\n* Add new imports to component-list.g file.\r\n* */\r\nfunction addCmpsImportsToCmpList(options: MagicOptionScheme, module_name: string): Rule {\r\n  return (host: Tree, context: SchematicContext) => {\r\n    if (toAddImports) {\r\n      const cmpsToGen = env.app.views;\r\n      let cmpListSource = getSourceFile(host, env.metadata.paths.componentListPath(module_name));\r\n\r\n      const recorder = host.beginUpdate(env.metadata.paths.componentListPath(module_name));\r\n\r\n      cmpsToGen.forEach(cmp => {\r\n        let name = cmp.props.id;\r\n        let uniqueName = cmp.props.component_uniquename;\r\n        let cmpPath = cmp.props.component_path;\r\n\r\n        if (newCmpListSet.has(uniqueName)) {\r\n          const importsChange =\r\n            insertImport2(\r\n              cmpListSource,\r\n              env.metadata.paths.componentListPath(module_name),\r\n              name,\r\n              uniqueName,\r\n              `./${cmpPath}${name}.component`\r\n            ) as InsertChange;\r\n\r\n          if (importsChange.toAdd) {\r\n            recorder.insertLeft(importsChange.pos, importsChange.toAdd);\r\n          }\r\n        }\r\n      });\r\n\r\n      host.commitUpdate(recorder);\r\n    }\r\n    return host;\r\n  }\r\n}\r\n\r\n\r\n// //-------------------------------------------------------------------------------------------------\r\n// //\r\n// //-------------------------------------------------------------------------------------------------\r\n// function checkIfTheComponentNeedToBeRemoveFromGeneralMagicModule\r\n//        (options: MagicOptionScheme, modulePath:string, moduleName:string, srcModuleName:string) : Rule {\r\n//   return (tree: Tree , context : SchematicContext)=>{\r\n//     const project   = env.project;\r\n//\r\n//     if (env.metadata.paths.generateCompForModuleName != \"\") {\r\n//       LogLn(`      [>] checking component name [${moduleName}]\r\n//                             from                      ${srcModuleName}]\r\n//                             To App Module           : [${modulePath}]`);\r\n//       const moduleSourceFile = getSourceFile(tree, modulePath);\r\n//       if (isImported(moduleSourceFile, moduleName, srcModuleName)) {\r\n//\r\n//       }\r\n//     }\r\n//\r\n//     return tree;\r\n//   }\r\n// }\r\n\r\n/**************************\r\n * Helper Functions\r\n ***************************/\r\n\r\ninterface IComponentListParser {\r\n  components: string[];\r\n  endPos: number;\r\n  isEmpty: boolean;\r\n}\r\n\r\nfunction getComponentsHashInfo(source: ts.SourceFile, variable: string): IComponentListParser {\r\n\r\n  const rootNode = source;\r\n  const cmpListVars: ts.Node[] = findNodes(rootNode, ts.SyntaxKind.VariableDeclaration);\r\n  let endPos = -1;\r\n  let isEmpty = true;\r\n\r\n  let magicGenCmpsInfo = cmpListVars.filter(\r\n    (node: any) => node.name.escapedText === variable);\r\n\r\n  if (magicGenCmpsInfo && magicGenCmpsInfo.length > 0) {\r\n    const firstPunctuation: ts.Node[] = findNodes(magicGenCmpsInfo[0], ts.SyntaxKind.FirstPunctuation);\r\n    if (!(firstPunctuation && firstPunctuation.length > 0)) {\r\n      throw new Error('magicGenCmpsHash variable has no open bracket ( { )');\r\n    }\r\n    endPos = firstPunctuation[0].end;\r\n    const propertyAssignment = findNodes(firstPunctuation[0].parent, ts.SyntaxKind.PropertyAssignment);\r\n    if (propertyAssignment && propertyAssignment.length > 0) {\r\n      isEmpty = false;\r\n    }\r\n  }\r\n  return {\r\n    components: null,\r\n    endPos,\r\n    isEmpty\r\n  };\r\n}\r\n\r\nfunction getComponentsArrayInfo(source: ts.SourceFile, variable: string): IComponentListParser {\r\n\r\n  const rootNode = source;\r\n  const cmpListVars: ts.Node[] = findNodes(rootNode, ts.SyntaxKind.VariableDeclaration);\r\n  let endPos = -1;\r\n  let cmpListArray;\r\n  let isEmpty = true;\r\n  let magicGenCmpsInfo = cmpListVars.filter(\r\n    (node: any) => node.name.escapedText === variable);\r\n\r\n  if (magicGenCmpsInfo && magicGenCmpsInfo.length > 0) {\r\n    const openBracketToken: ts.Node[] = findNodes(magicGenCmpsInfo[0], ts.SyntaxKind.OpenBracketToken);\r\n    if (!(openBracketToken && openBracketToken.length > 0)) {\r\n      throw new Error('magicGenComponents variable has no open bracket ([)');\r\n    }\r\n    endPos = openBracketToken[0].end;\r\n    const identifiers = findNodes(openBracketToken[0].parent, ts.SyntaxKind.Identifier);\r\n\r\n\r\n    // Array with items\r\n    if (identifiers && identifiers.length > 0) {\r\n      isEmpty = false;\r\n      //endPos = identifiers[identifiers.length - 1].end;\r\n      cmpListArray = identifiers.map((i: any) => i.escapedText) as string[];\r\n    }\r\n    // Array with no items\r\n    // else{\r\n    //   endPos = openBracketToken[0].end;\r\n    // }\r\n  }\r\n  return {\r\n    components: cmpListArray,\r\n    endPos,\r\n    isEmpty\r\n  };\r\n}\r\n\r\n\r\nfunction getLazyLoadCompoenentsInfo(source: ts.SourceFile, variable: string): IComponentListParser {\r\n\r\n  const cmpListVars: ts.Node[] = findNodes(source, ts.SyntaxKind.VariableDeclaration);\r\n  let endPos = -1;\r\n  let cmpListArray;\r\n  let isEmpty = true;\r\n  let magicGenCmpsInfo = cmpListVars.filter(\r\n    (node: any) => node.name.escapedText === variable);\r\n\r\n  if (magicGenCmpsInfo && magicGenCmpsInfo.length > 0) {\r\n    const openBracketToken: ts.Node[] = findNodes(magicGenCmpsInfo[0], ts.SyntaxKind.FirstPunctuation);\r\n    if (!(openBracketToken && openBracketToken.length > 0)) {\r\n      throw new Error('FirstPunctuation variable has no open bracket ([)');\r\n    }\r\n    endPos = openBracketToken[0].end;\r\n    const identifiers = findNodes(openBracketToken[0].parent, ts.SyntaxKind.PropertyAssignment);\r\n    const identifiers1 = findNodes(openBracketToken[0].parent, ts.SyntaxKind.Identifier);\r\n\r\n    // Array with items\r\n    if (identifiers && identifiers.length > 0) {\r\n      isEmpty = false;\r\n      cmpListArray = identifiers.map((i: any) => i.name.escapedText ).filter(id => id !== \"moduleName\" && id !== \"modulePath\");\r\n    }\r\n  }\r\n  return {\r\n    components: cmpListArray,\r\n    endPos,\r\n    isEmpty\r\n  };\r\n}\r\n\r\nfunction addComponentsToArray(source: string, info: IComponentListParser, cmpsToAdd: string[]): string {\r\n  const prefix = source.substring(0, info.endPos);\r\n  const suffix = source.substring(info.endPos);\r\n  let toAdd = `${cmpsToAdd}`;\r\n  toAdd = `${toAdd.replace(/,/g, \",\\n\\t\")}`;\r\n\r\n  return info.isEmpty ?\r\n`${prefix}\r\n\\t${toAdd} ${suffix}` :\r\n`${prefix}\r\n\\t${toAdd},${suffix}` ;\r\n}\r\n\r\nfunction addComponentsToHash(source: string, info: IComponentListParser, cmpsToAdd: string[]): string {\r\n  const prefix = source.substring(0, info.endPos);\r\n  const suffix = source.substring(info.endPos);\r\n  const cmpHashStr = EJS.render(`\r\n      <% components.forEach(componentUniqueName => { %>\r\n        <%= componentUniqueName %>:<%- componentUniqueName %>,\r\n      <%})%>`, {components: cmpsToAdd});\r\n  let toAdd = `${cmpHashStr.replace(/\\n/g, '').replace(/,/g, \",\\n\")}`;\r\n  // update source\r\n  return `${prefix} ${toAdd} ${suffix}`;\r\n  /*return info.isEmpty ?\r\n    `${prefix} ${delLastComma(cmpHashStr)} ${suffix}` :\r\n    `${prefix} ${delLastComma(cmpHashStr)}, ${suffix}` ;*/\r\n}\r\n\r\n// add the lazy loaded components to map\r\nfunction addComponentsToLazyLoad(source: string, info: IComponentListParser, cmpsToAdd: View[], module_name: string): string {\r\n  const prefix = source.substring(0, info.endPos);\r\n  const suffix = source.substring(info.endPos);\r\n\r\n  // get the module path\r\n  let currentModulePath = env.metadata.paths.magicGenLibModulePath(module_name);\r\n\r\n  const cmpHashStr = EJS.render(`\r\n<%{components.forEach(view =>{-%>\r\n<%=view.props.component_uniquename %> : { moduleName : 'Magic<%=moduleName%>Module'},\r\n<%})}-%>`, {components: cmpsToAdd, moduleName: module_name, modulePath: currentModulePath});\r\n\r\n  let toAdd = `${cmpHashStr.replace(/\\n/g, '').replace(/,/g, \",\\n\")}`;\r\n  // update source\r\n  return `${prefix} ${toAdd} ${suffix}`;\r\n}\r\n\r\nfunction delLastComma(source: string) {\r\n  let index = source.lastIndexOf(',');\r\n  return source.substring(0, index);\r\n}\r\n\r\n\r\n\r\n"]}

package/src/schematics/magic-utils/rules/component-list.rule.ts

@@ -377,11 +377,13 @@ function addComponentsToArray(source: string, info: IComponentListParser, cmpsTo
   const prefix = source.substring(0, info.endPos);
   const suffix = source.substring(info.endPos);
   let toAdd = `${cmpsToAdd}`;
-  toAdd = `${toAdd.replace(/,/g, ",\n")}`;
+  toAdd = `${toAdd.replace(/,/g, ",\n\t")}`;
 
   return info.isEmpty ?
-    `${prefix} ${toAdd} ${suffix}` :
-    `${prefix} ${toAdd} , ${suffix}`;
+`${prefix}
+\t${toAdd} ${suffix}` :
+`${prefix}
+\t${toAdd},${suffix}` ;
 }
 
 function addComponentsToHash(source: string, info: IComponentListParser, cmpsToAdd: string[]): string {

package/src/schematics/mg-add/files/src/app/magic/magic.gen.lib.module.ts

@@ -28,6 +28,9 @@ import {MatTooltipModule} from "@angular/material/tooltip";
 import {MatButtonModule} from "@angular/material/button";
 import {MatAutocompleteModule} from "@angular/material/autocomplete";
 import {CurrencyMaskConfig, CurrencyMaskInputMode, NgxCurrencyModule} from "ngx-currency";
+import { NgxMaskModule, IConfig } from "ngx-mask";
+
+export const options: Partial<IConfig> | (() => Partial<IConfig>) = {};
 
 export const customCurrencyMaskConfig: CurrencyMaskConfig = {
   align: "right",
@@ -63,6 +66,7 @@ export const customCurrencyMaskConfig: CurrencyMaskConfig = {
     DynamicModule,
     InfiniteScrollModule,
     NgxCurrencyModule.forRoot(customCurrencyMaskConfig),
+    NgxMaskModule.forRoot(),
 
     // Material Modules
     MatTableModule,

package/src/types/interfaces/control.d.ts

@@ -53,6 +53,7 @@ export interface Control {
         row_editing_type?: RowEditingTypes;
         mgformat?: string;
         currency?: string;
+        mask?: string;
         directive?: string;
         validator?: string;
         formatter?: string;

package/src/types/interfaces/control.js.map

@@ -1 +1 @@
-{"version":3,"file":"control.js","sourceRoot":"","sources":["control.ts"],"names":[],"mappings":"","sourcesContent":["import {HorizontalAlignments} from '../enums/horizontal-alignments.enum';\nimport {\n  CtrlImageStyle,\n  MgControlType,\n  SideType,\n  StorageAttributeType,\n  TableWebStyle,\n  RowEditingTypes,\n  WindowPosition,\n  WindowType\n} from \"../enums/Enums\";\nimport {CtrlButtonTypeGui} from '../enums/Enums';\n\nexport interface Exp\n{\n\thas_exp?: boolean\n}\n\nexport interface Boolean_Exp extends Exp\n{\n\tvalue?: boolean,\n}\n\nexport interface Number_Exp extends Exp\n{\n\tvalue?: number,\n}\n\nexport interface String_Exp extends Exp\n{\n\tvalue?: string,\n}\n\nexport interface Control {\n\tcontrolType: MgControlType\n\tclasses?: string\n\thasClassExpression?: boolean\n\tstyle: {\n\t\tfont?: Number_Exp,\n\t\tcolor?: Number_Exp,\n\t\tborder?: Boolean_Exp,\n\t\tborder_style?: Number_Exp,\n\t\tfocus_color?: Number_Exp,\n\t\talignment: {\n\t\t\thorizontal?: HorizontalAlignments,\n\t\t\tvertical?: number,\n\t\t},\n        line_divider?:Boolean_Exp;\n        multiline_edit?: boolean,\n\t},\n\tprops: {\n\t\tid: string,\n\t\tname?: string,\n    component_uniquename?: string;\n    component_path?:string;\n    visible?: Exp,\n\t\tenabled?: Exp,\n\t\ttab_order?: Number_Exp,\n\t\tpassword_edit?: Boolean_Exp,\n\t\tbutton_style?:CtrlButtonTypeGui,\n    is_table_child?: boolean,\n    table_row_height?: number,\n    table_title_height?: number,\n    scroll_bar?: boolean;\n    no_modifiable_descendants?: boolean;\n    modifiable?: Boolean_Exp,\n\t\tlayer?: number,\n    tab_control_side?: SideType;\n    attribute?: StorageAttributeType;\n    web_style?: TableWebStyle;\n    row_editing_type?: RowEditingTypes;\n    mgformat?: string;\n    currency?:string;\n    directive?: string;\n    validator?: string;\n    formatter?: string;\n    window_type?: WindowType;\n    is_router_outlet?: boolean;\n    default_outlet?: boolean;\n    wallpaper?: string;\n    wallpaper_style?: CtrlImageStyle;\n    sortable?: boolean;\n    common_line_id?: number;\n    dataexp?:boolean;\n    showsecs?:boolean;\n    enum_id:string; // simple enum name, for method calls\n    directive_id:string; // enum name as {{id}} for things such as directive name or formcontrol name\n\t}\n\n\thint: {\n\t\ttext?: String_Exp,\n\t}\n\tcoordinates:{\n        x?:\tnumber,\n        y?:\tnumber,\n        width:\tnumber,\n        height?:\tnumber\n\t}\n\tchildren: null | Control[],\n\n\n\t/// incode members:\n\t// class_name_in_css: string;\n\n}\n"]}
+{"version":3,"file":"control.js","sourceRoot":"","sources":["control.ts"],"names":[],"mappings":"","sourcesContent":["import {HorizontalAlignments} from '../enums/horizontal-alignments.enum';\nimport {\n  CtrlImageStyle,\n  MgControlType,\n  SideType,\n  StorageAttributeType,\n  TableWebStyle,\n  RowEditingTypes,\n  WindowPosition,\n  WindowType\n} from \"../enums/Enums\";\nimport {CtrlButtonTypeGui} from '../enums/Enums';\n\nexport interface Exp\n{\n\thas_exp?: boolean\n}\n\nexport interface Boolean_Exp extends Exp\n{\n\tvalue?: boolean,\n}\n\nexport interface Number_Exp extends Exp\n{\n\tvalue?: number,\n}\n\nexport interface String_Exp extends Exp\n{\n\tvalue?: string,\n}\n\nexport interface Control {\n\tcontrolType: MgControlType\n\tclasses?: string\n\thasClassExpression?: boolean\n\tstyle: {\n\t\tfont?: Number_Exp,\n\t\tcolor?: Number_Exp,\n\t\tborder?: Boolean_Exp,\n\t\tborder_style?: Number_Exp,\n\t\tfocus_color?: Number_Exp,\n\t\talignment: {\n\t\t\thorizontal?: HorizontalAlignments,\n\t\t\tvertical?: number,\n\t\t},\n        line_divider?:Boolean_Exp;\n        multiline_edit?: boolean,\n\t},\n\tprops: {\n\t\tid: string,\n\t\tname?: string,\n    component_uniquename?: string;\n    component_path?:string;\n    visible?: Exp,\n\t\tenabled?: Exp,\n\t\ttab_order?: Number_Exp,\n\t\tpassword_edit?: Boolean_Exp,\n\t\tbutton_style?:CtrlButtonTypeGui,\n    is_table_child?: boolean,\n    table_row_height?: number,\n    table_title_height?: number,\n    scroll_bar?: boolean;\n    no_modifiable_descendants?: boolean;\n    modifiable?: Boolean_Exp,\n\t\tlayer?: number,\n    tab_control_side?: SideType;\n    attribute?: StorageAttributeType;\n    web_style?: TableWebStyle;\n    row_editing_type?: RowEditingTypes;\n    mgformat?: string;\n    currency?: string;\n    mask?: string;\n    directive?: string;\n    validator?: string;\n    formatter?: string;\n    window_type?: WindowType;\n    is_router_outlet?: boolean;\n    default_outlet?: boolean;\n    wallpaper?: string;\n    wallpaper_style?: CtrlImageStyle;\n    sortable?: boolean;\n    common_line_id?: number;\n    dataexp?:boolean;\n    showsecs?:boolean;\n    enum_id:string; // simple enum name, for method calls\n    directive_id:string; // enum name as {{id}} for things such as directive name or formcontrol name\n\t}\n\n\thint: {\n\t\ttext?: String_Exp,\n\t}\n\tcoordinates:{\n        x?:\tnumber,\n        y?:\tnumber,\n        width:\tnumber,\n        height?:\tnumber\n\t}\n\tchildren: null | Control[],\n\n\n\t/// incode members:\n\t// class_name_in_css: string;\n\n}\n"]}

package/src/types/interfaces/control.ts

@@ -70,7 +70,8 @@ export interface Control {
     web_style?: TableWebStyle;
     row_editing_type?: RowEditingTypes;
     mgformat?: string;
-    currency?:string;
+    currency?: string;
+    mask?: string;
     directive?: string;
     validator?: string;
     formatter?: string;

package/templates/themes/basicHTML/edit.ejs

@@ -43,6 +43,9 @@
                         <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
                         <%- include('../../attributes/common/input_attributes', {ctrl : ctrl}) %>
                         <% if (ctrl.props.mgformat) { %><%- ctrl.props.mgformat %> <%}%>
+                        <% if (ctrl.props.mask) { %>
+                           [mask]="mg.getAlphaMask(<%- ctrl.props.enum_id %>) [showMaskTyped]='true'"
+                        <% } %>
                         <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %> required <%}%>
                         <% if (ctrl.props.directive) { %><%- ctrl.props.directive %><%}%>
                         <%- ' '%>

package/templates/themes/material/edit.ejs

@@ -70,6 +70,10 @@ default: %>
       [matAutocomplete]="<%= ctrl.props.id %>"
       <% } %>
       <% if (ctrl.props.mgformat) { %><%- ctrl.props.mgformat %> <%}%>
+      <% if (ctrl.props.mask) { %>
+          [mask]="mg.getAlphaMask(<%- ctrl.props.enum_id %>)"
+          [showMaskTyped]='true'
+      <% } %>
       <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %>
       required
       <% } %>
@@ -153,9 +157,9 @@ case StorageAttributeType.Date: %>
       <mat-datepicker-toggle matSuffix
                              [for]="<%- ctrl.props.id %>"
                              <% if ( child.props.is_table_child ) {%>
-                                 *ngIf="mg.checkIsReadOnly(<%- ctrl.props.enum_id %>) &&  mg.isRowInRowEditing(row)"
+                                 *ngIf="!mg.checkIsReadOnly(<%- ctrl.props.enum_id %>) &&  mg.isRowInRowEditing(row)"
                              <%} else { %>
-                                 *ngIf="mg.checkIsReadOnly(<%- ctrl.props.enum_id %>)"
+                                 *ngIf="!mg.checkIsReadOnly(<%- ctrl.props.enum_id %>)"
                              <%}%>
                               >