@magic-xpa/cli 4.1100.0-dev4110.24 → 4.1100.0-dev4110.240

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

@@ -1,118 +1,118 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addImportTSModule = exports.getMagicConfig = exports.readJson = exports.getProject = exports.deleteMagicMetadataFolder = exports.deleteMagicFolder = exports.deleteMagicFiles = exports.copyMagicFiles = exports.displayMessge = void 0;
-const config_1 = require("../utils/devkit-utils/config");
-const schematics_1 = require("@angular-devkit/schematics");
-const env_1 = require("./env");
-const route_utils_1 = require("../utils/devkit-utils/route-utils");
-const ast_1 = require("../utils/ast");
-const Util_1 = require("./Util");
-function displayMessge(options, message) {
-    return (host, context) => {
-        (0, Util_1.LogLn)(`[>] ${message}`);
-        return host;
-    };
-}
-exports.displayMessge = displayMessge;
-function copyMagicFiles(options) {
-    return (host, context) => {
-        const project = getProject(host, options.project);
-        return (0, schematics_1.chain)([
-            (0, schematics_1.branchAndMerge)((0, schematics_1.chain)([
-                (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files'), [
-                    (0, schematics_1.template)({
-                        skipHelp: options.skipHelp,
-                    }),
-                    (0, schematics_1.move)(project.root)
-                ]), schematics_1.MergeStrategy.AllowCreationConflict)
-            ]))
-        ])(host, context);
-    };
-}
-exports.copyMagicFiles = copyMagicFiles;
-function deleteMagicFiles(option) {
-    return (host) => {
-        const metadta = env_1.env.metadata;
-        let files = [
-            metadta.paths.appComponentPath,
-            metadta.paths.appRoutesPath,
-            metadta.paths.executionPath,
-            metadta.paths.magicStylePath,
-            // Magic Generate folder
-            metadta.paths.rootMagicComponentListPath,
-            metadta.paths.magicGenLibModule,
-            metadta.paths.favIconPath
-        ];
-        for (let file of files) {
-            if (host.exists(file)) {
-                host.delete(file);
-            }
-        }
-        return host;
-    };
-}
-exports.deleteMagicFiles = deleteMagicFiles;
-function deleteMagicFolder(option) {
-    return (host) => {
-        const metadta = env_1.env.metadata;
-        const path = metadta.paths.magicGenFolderPath;
-        //rimraf(path);
-        host.getDir(path).visit(filePath => {
-            host.delete(filePath);
-        });
-        return host;
-    };
-}
-exports.deleteMagicFolder = deleteMagicFolder;
-function deleteMagicMetadataFolder(option) {
-    return (host) => {
-        const metadta = env_1.env.metadata;
-        const path = metadta.paths.metadataFolderPath;
-        //rimraf(path);
-        host.getDir(path).visit(filePath => {
-            host.delete(filePath);
-        });
-        return host;
-    };
-}
-exports.deleteMagicMetadataFolder = deleteMagicMetadataFolder;
-function getProject(host, projectName) {
-    const workspace = (0, config_1.getWorkspace)(host);
-    const project = (0, config_1.getProjectFromWorkspace)(workspace, projectName);
-    return project;
-}
-exports.getProject = getProject;
-function readJson(host, path) {
-    const source = host.read(path);
-    let file = null;
-    if (source) {
-        const sourceText = source.toString("utf-8");
-        file = JSON.parse(sourceText);
-    }
-    return file;
-}
-exports.readJson = readJson;
-function getMagicConfig(host, project) {
-    let path = `${project.root}/${env_1.METADATA_DIR}/config.json`;
-    const source = host.read(path);
-    if (!source) {
-        return;
-    }
-    const sourceText = source.toString("utf-8");
-    const config = JSON.parse(sourceText);
-    return config;
-}
-exports.getMagicConfig = getMagicConfig;
-function addImportTSModule(path, name, from) {
-    return (host, context) => {
-        let moduleSource = (0, ast_1.getSourceFile)(host, path);
-        const recorder = host.beginUpdate(path);
-        const routesChange = (0, route_utils_1.insertImport)(moduleSource, path, name, from);
-        if (routesChange.toAdd) {
-            recorder.insertLeft(routesChange.pos, routesChange.toAdd);
-        }
-        host.commitUpdate(recorder);
-    };
-}
-exports.addImportTSModule = addImportTSModule;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addImportTSModule = exports.getMagicConfig = exports.readJson = exports.getProject = exports.deleteMagicMetadataFolder = exports.deleteMagicFolder = exports.deleteMagicFiles = exports.copyMagicFiles = exports.displayMessge = void 0;
+const config_1 = require("../utils/devkit-utils/config");
+const schematics_1 = require("@angular-devkit/schematics");
+const env_1 = require("./env");
+const route_utils_1 = require("../utils/devkit-utils/route-utils");
+const ast_1 = require("../utils/ast");
+const Util_1 = require("./Util");
+function displayMessge(options, message) {
+    return (host, context) => {
+        (0, Util_1.LogLn)(`[>] ${message}`);
+        return host;
+    };
+}
+exports.displayMessge = displayMessge;
+function copyMagicFiles(options) {
+    return (host, context) => {
+        const project = getProject(host, options.project);
+        return (0, schematics_1.chain)([
+            (0, schematics_1.branchAndMerge)((0, schematics_1.chain)([
+                (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files'), [
+                    (0, schematics_1.template)({
+                        skipHelp: options.skipHelp,
+                    }),
+                    (0, schematics_1.move)(project.root)
+                ]), schematics_1.MergeStrategy.AllowCreationConflict)
+            ]))
+        ])(host, context);
+    };
+}
+exports.copyMagicFiles = copyMagicFiles;
+function deleteMagicFiles(option) {
+    return (host) => {
+        const metadta = env_1.env.metadata;
+        let files = [
+            metadta.paths.appComponentPath,
+            metadta.paths.appRoutesPath,
+            metadta.paths.executionPath,
+            metadta.paths.magicStylePath,
+            // Magic Generate folder
+            metadta.paths.rootMagicComponentListPath,
+            metadta.paths.magicGenLibModule,
+            metadta.paths.favIconPath
+        ];
+        for (let file of files) {
+            if (host.exists(file)) {
+                host.delete(file);
+            }
+        }
+        return host;
+    };
+}
+exports.deleteMagicFiles = deleteMagicFiles;
+function deleteMagicFolder(option) {
+    return (host) => {
+        const metadta = env_1.env.metadata;
+        const path = metadta.paths.magicGenFolderPath;
+        //rimraf(path);
+        host.getDir(path).visit(filePath => {
+            host.delete(filePath);
+        });
+        return host;
+    };
+}
+exports.deleteMagicFolder = deleteMagicFolder;
+function deleteMagicMetadataFolder(option) {
+    return (host) => {
+        const metadta = env_1.env.metadata;
+        const path = metadta.paths.metadataFolderPath;
+        //rimraf(path);
+        host.getDir(path).visit(filePath => {
+            host.delete(filePath);
+        });
+        return host;
+    };
+}
+exports.deleteMagicMetadataFolder = deleteMagicMetadataFolder;
+function getProject(host, projectName) {
+    const workspace = (0, config_1.getWorkspace)(host);
+    const project = (0, config_1.getProjectFromWorkspace)(workspace, projectName);
+    return project;
+}
+exports.getProject = getProject;
+function readJson(host, path) {
+    const source = host.read(path);
+    let file = null;
+    if (source) {
+        const sourceText = source.toString("utf-8");
+        file = JSON.parse(sourceText);
+    }
+    return file;
+}
+exports.readJson = readJson;
+function getMagicConfig(host, project) {
+    let path = `${project.root}/${env_1.METADATA_DIR}/config.json`;
+    const source = host.read(path);
+    if (!source) {
+        return;
+    }
+    const sourceText = source.toString("utf-8");
+    const config = JSON.parse(sourceText);
+    return config;
+}
+exports.getMagicConfig = getMagicConfig;
+function addImportTSModule(path, name, from) {
+    return (host, context) => {
+        let moduleSource = (0, ast_1.getSourceFile)(host, path);
+        const recorder = host.beginUpdate(path);
+        const routesChange = (0, route_utils_1.insertImport)(moduleSource, path, name, from);
+        if (routesChange.toAdd) {
+            recorder.insertLeft(routesChange.pos, routesChange.toAdd);
+        }
+        host.commitUpdate(recorder);
+    };
+}
+exports.addImportTSModule = addImportTSModule;
 //# sourceMappingURL=utils.js.map

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

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

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

@@ -1,3 +1,3 @@
-import { Rule } from "@angular-devkit/schematics";
-import { MagicOptionScheme } from "../magic-utils/rules/magic-option.scheme";
-export declare function mgInstallPrerequisites(options: MagicOptionScheme): Rule;
+import { Rule } from "@angular-devkit/schematics";
+import { MagicOptionScheme } from "../magic-utils/rules/magic-option.scheme";
+export declare function mgInstallPrerequisites(options: MagicOptionScheme): Rule;

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

@@ -1,26 +1,26 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mgInstallPrerequisites = void 0;
-const schematics_1 = require("@angular-devkit/schematics");
-const init_magic_metadata_rule_1 = require("../magic-utils/rules/init-magic-metadata.rule");
-const tasks_1 = require("@angular-devkit/schematics/tasks");
-const env_1 = require("../magic-utils/env");
-const package_1 = require("../utils/package");
-function mgInstallPrerequisites(options) {
-    return (0, schematics_1.chain)([
-        (0, init_magic_metadata_rule_1.initMagicMetadata)(options),
-        installPrerequisitesSaveDev(options)
-    ]);
-}
-exports.mgInstallPrerequisites = mgInstallPrerequisites;
-function installPrerequisitesSaveDev(option) {
-    return (host, context) => {
-        for (let dep of env_1.devDependencies) {
-            context.logger.info(`[>] Add devDependencies ${dep.name}`);
-            (0, package_1.addPackageToPackageJson)(host, 'devDependencies', dep.name, dep.version);
-        }
-        context.addTask(new tasks_1.NodePackageInstallTask());
-        return host;
-    };
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mgInstallPrerequisites = void 0;
+const schematics_1 = require("@angular-devkit/schematics");
+const init_magic_metadata_rule_1 = require("../magic-utils/rules/init-magic-metadata.rule");
+const tasks_1 = require("@angular-devkit/schematics/tasks");
+const env_1 = require("../magic-utils/env");
+const package_1 = require("../utils/package");
+function mgInstallPrerequisites(options) {
+    return (0, schematics_1.chain)([
+        (0, init_magic_metadata_rule_1.initMagicMetadata)(options),
+        installPrerequisitesSaveDev(options)
+    ]);
+}
+exports.mgInstallPrerequisites = mgInstallPrerequisites;
+function installPrerequisitesSaveDev(option) {
+    return (host, context) => {
+        for (let dep of env_1.devDependencies) {
+            context.logger.info(`[>] Add devDependencies ${dep.name}`);
+            (0, package_1.addPackageToPackageJson)(host, 'devDependencies', dep.name, dep.version);
+        }
+        context.addTask(new tasks_1.NodePackageInstallTask());
+        return host;
+    };
+}
 //# sourceMappingURL=index.js.map

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

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

package/src/schematics/mg-add/files/src/app/magic/lazy-loader.service.ts

@@ -5,6 +5,6 @@ import { MagicLazyLoaderService } from '@magic-xpa/angular';
 
 export class LazyLoaderService extends MagicLazyLoaderService {
   override Load(path: string): Promise<any> {
-    return import( './' + path + '/magic.gen.lib.module');
+    return import(`./${path}/magic.gen.lib.module.ts`);
   }
 }

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

@@ -26,26 +26,11 @@ import {MatTabsModule} from "@angular/material/tabs";
 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";
+import {NgxCurrencyDirective, NgxCurrencyInputMode, provideEnvironmentNgxCurrency} from "ngx-currency";
+import {NgxMaskModule, IConfig} from "ngx-mask";
 
 export const options: Partial<IConfig> | (() => Partial<IConfig>) = {};
 
-export const customCurrencyMaskConfig: CurrencyMaskConfig = {
-  align: "right",
-  allowNegative: true,
-  allowZero: true,
-  decimal: ".",
-  precision: 2,
-  prefix: "",
-  suffix: "",
-  thousands: ",",
-  nullable: true,
-  min: undefined,
-  max: undefined,
-  inputMode: CurrencyMaskInputMode.FINANCIAL
-};
-
 @NgModule({
   declarations: [
     ...magicGenComponents
@@ -64,7 +49,7 @@ export const customCurrencyMaskConfig: CurrencyMaskConfig = {
     MagicModule,
     DynamicModule,
     InfiniteScrollModule,
-    NgxCurrencyModule.forRoot(customCurrencyMaskConfig),
+    NgxCurrencyDirective,
     NgxMaskModule.forRoot(),
 
     // Material Modules
@@ -86,7 +71,22 @@ export const customCurrencyMaskConfig: CurrencyMaskConfig = {
     MagicAngularMaterialModule,
     MatAutocompleteModule
   ],
-  providers: [ExitMagicService],
+  providers: [ExitMagicService,
+    provideEnvironmentNgxCurrency({
+      align: "right",
+      allowNegative: true,
+      allowZero: true,
+      decimal: ".",
+      precision: 2,
+      prefix: "",
+      suffix: "",
+      thousands: ",",
+      nullable: true,
+      min: undefined,
+      max: undefined,
+      inputMode: NgxCurrencyInputMode.Financial
+    }),
+  ],
 })
 export class MagicGenLibModule {
   constructor(componentList: ComponentListMagicService, private moduleRef: NgModuleRef<any>) {

package/src/schematics/mg-add/files/src/magic-styles.css

@@ -1,4 +1,4 @@
-@import "~@angular/material/prebuilt-themes/indigo-pink.css";
+@import "@angular/material/prebuilt-themes/indigo-pink.css";
 
 .align_center {
     text-align: center;
@@ -111,7 +111,7 @@
 }
 
 .selected {
-  background: #F5F5F5;
+  background: #F5F5F5 !important;
 }
 
 .table_row:hover {

package/src/schematics/mg-add/index.d.ts

@@ -1,3 +1,3 @@
-import { Rule } from "@angular-devkit/schematics";
-import { MagicOptionScheme } from "../magic-utils/rules/magic-option.scheme";
-export declare function mgAdd(options: MagicOptionScheme): Rule;
+import { Rule } from "@angular-devkit/schematics";
+import { MagicOptionScheme } from "../magic-utils/rules/magic-option.scheme";
+export declare function mgAdd(options: MagicOptionScheme): Rule;