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

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

@@ -15,7 +15,7 @@ import { LogLn } from "../magic-utils/Util";
 import { generate } from "../magic-utils/rules/generate.rule";
 import { GeneratedFileTypes } from "../../types/enums/generated-file-types.enum";
 import { MagicOptionScheme } from "../magic-utils/rules/magic-option.scheme";
-import {addProviderToModule, insertImport} from "../utils/devkit-utils/ast-utils";
+import {addProviderToModule, getDecoratorMetadata, insertImport} from "../utils/devkit-utils/ast-utils";
 import * as ts from 'typescript';
 import {InsertChange} from "../utils/devkit-utils/change";
 export function mgAdd(options:MagicOptionScheme): Rule {
@@ -32,7 +32,9 @@ export function mgAdd(options:MagicOptionScheme): Rule {
     updateTsConfigAppJson  (options),
 
     addLazyLoadProvider(),
-    // handel app.component.html
+
+    addZoneChangeDetectionProviderRule(),
+    //handel app.html
     //updateAppComponentHtmlFiles       (options),
 
     //handel package.Json
@@ -42,8 +44,8 @@ export function mgAdd(options:MagicOptionScheme): Rule {
 
 function updateAppComponentHtmlFiles(options:MagicOptionScheme): Rule {
   return generate({
-    template    : "./templates/angular/src/app/app.component.html.ejs",
-    name        : "app.component.html",
+    template    : "./templates/angular/src/app/app.html.ejs",
+    name        : "app.html",
     destination : env.metadata.paths.rootMagicGenFolder,
     type        :GeneratedFileTypes.HTML,
     data        : {
@@ -51,32 +53,75 @@ function updateAppComponentHtmlFiles(options:MagicOptionScheme): Rule {
     }
   },options)
 }
-function updateAngularJsonWithMagicStyle(options:MagicOptionScheme): Rule {
-  return (host: Tree, context: SchematicContext) => {
-    const project   = env.project;
-    let   isDirty   = false;
+function updateAngularJsonWithMagicStyle(options:MagicOptionScheme): Rule {
+  return (host: Tree, context: SchematicContext) => {
+    const project   = env.project;
+    let   isDirty   = false;
 
     let fullPathmagicStylePath = env.metadata.paths.magicStylePath;
-    if (!project.architect.test.options.styles.includes(fullPathmagicStylePath)) {
-      context.logger.info(`  [>]add file ${fullPathmagicStylePath} to test`);
-      project.architect.test.options.styles.push(fullPathmagicStylePath);
-      isDirty = true;
-    }
-
-    if (!project.architect.build.options.styles.includes(fullPathmagicStylePath)) {
-      context.logger.info(`  [>]add file ${fullPathmagicStylePath} to build`);
-      project.architect.build.options.styles.push(fullPathmagicStylePath);
-      isDirty = true;
-    }
-
-    if(isDirty){
-      let fullPath = env.metadata.paths.angularJsonPath;
-      host.overwrite(fullPath, JSON.stringify(env.workspace, null, 2));
-    }
+    // if (!project.architect.test.options.styles.includes(fullPathmagicStylePath)) {
+    //   context.logger.info(`  [>]add file ${fullPathmagicStylePath} to test`);
+    //   project.architect.test.options.styles.push(fullPathmagicStylePath);
+    //   isDirty = true;
+    // }
+
+    if (!project.architect.build.options.styles.includes(fullPathmagicStylePath)) {
+      context.logger.info(`  [>]add file ${fullPathmagicStylePath} to build`);
+      project.architect.build.options.styles.push(fullPathmagicStylePath);
+      isDirty = true;
+    }
+
+    const buildOptions = project?.architect?.build?.options;
+    const testOptions = project?.architect?.test?.options;
+
+    if (buildOptions) {
+      const changed = ensurePolyfills(buildOptions, ['zone.js']);
+      if (changed) {
+        context.logger.info(`  [>]add polyfill zone.js to build`);
+        isDirty = true;
+      }
+    }
+
+    if (testOptions) {
+      const changed = ensurePolyfills(testOptions, ['zone.js', 'zone.js/testing']);
+      if (changed) {
+        context.logger.info(`  [>]add polyfills zone.js, zone.js/testing to test`);
+        isDirty = true;
+      }
+    }
+
+    if(isDirty){
+      let fullPath = env.metadata.paths.angularJsonPath;
+      host.overwrite(fullPath, JSON.stringify(env.workspace, null, 2));
+    }
 
     return host;
-  };
-}
+  };
+}
+
+function ensurePolyfills(options: any, requiredPolyfills: string[]): boolean {
+  let polyfills: any[] = [];
+
+  if (Array.isArray(options.polyfills)) {
+    polyfills = [...options.polyfills];
+  } else if (typeof options.polyfills === 'string' && options.polyfills.trim()) {
+    polyfills = [options.polyfills];
+  }
+
+  let changed = !Array.isArray(options.polyfills);
+  for (const entry of requiredPolyfills) {
+    if (!polyfills.includes(entry)) {
+      polyfills.push(entry);
+      changed = true;
+    }
+  }
+
+  if (changed) {
+    options.polyfills = polyfills;
+  }
+
+  return changed;
+}
 
 // Angular 10 , does not include .ts file for compilation
 // So to avoid compilation error , add *.module.ts in includes section
@@ -179,7 +224,7 @@ function addMagicModuleToAppModule(options: MagicOptionScheme) : Rule {
 
 function addLazyLoadProvider(): Rule {
   return (host: Tree) => {
-    const appmodule = env.metadata.paths.rootMagicGenFolder + '/app.module.ts';
+    const appmodule = env.metadata.paths.rootMagicGenFolder + '/app-module.ts';
 
     const lazyLoaderService = 'LazyLoaderService';
     const lazyLoaderServicePath = './magic/lazy-loader.service';
@@ -198,6 +243,8 @@ function addLazyLoadProvider(): Rule {
     }
     host.commitUpdate(providerRecorder);
 
+    sourceText = host.read(appmodule).toString('utf-8');
+    source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);
     const lazyLoaderServiceImport = insertImport(source, appmodule, lazyLoaderService, lazyLoaderServicePath, false);
     const lazyLoaderServiceChangesRecorder = host.beginUpdate(appmodule);
     if (lazyLoaderServiceImport instanceof InsertChange)
@@ -205,6 +252,8 @@ function addLazyLoadProvider(): Rule {
     host.commitUpdate(lazyLoaderServiceChangesRecorder);
 
     // add import for MagicLazyLoaderService
+    sourceText = host.read(appmodule).toString('utf-8');
+    source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);
     const magicLazyLoaderServiceImportChanges: InsertChange = <InsertChange>insertImport(source, appmodule, 'MagicLazyLoaderService', '@magic-xpa/angular', false);
     const magicImportChangesRecorder = host.beginUpdate(appmodule);
     magicImportChangesRecorder.insertLeft(magicLazyLoaderServiceImportChanges.pos, magicLazyLoaderServiceImportChanges.toAdd)
@@ -212,3 +261,87 @@ function addLazyLoadProvider(): Rule {
   }
 }
 
+function addZoneChangeDetectionProviderRule(): Rule {
+  return (host: Tree) => {
+    // Resolve the generated root module path (src/app/app-module.ts in this project layout).
+    const appmodule = env.metadata.paths.rootMagicGenFolder + '/app-module.ts';
+
+    // Append provideZoneChangeDetection() to NgModule.providers if it does not already exist.
+    addZoneChangeDetectionProvider(host, appmodule);
+
+    // Re-parse from disk after provider update so import insertion uses fresh AST positions.
+    const sourceText = host.read(appmodule).toString('utf-8');
+    const source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);
+
+    // Ensure the symbol import exists; insertImport is idempotent and avoids duplicates.
+    const zoneChangeDetectionImport = insertImport(source, appmodule, 'provideZoneChangeDetection', '@angular/core', false);
+    const zoneChangeDetectionImportChangesRecorder = host.beginUpdate(appmodule);
+    if (zoneChangeDetectionImport instanceof InsertChange)
+      zoneChangeDetectionImportChangesRecorder.insertLeft(zoneChangeDetectionImport.pos, zoneChangeDetectionImport.toAdd);
+    host.commitUpdate(zoneChangeDetectionImportChangesRecorder);
+  };
+}
+
+function addZoneChangeDetectionProvider(host: Tree, appmodule: string): void {
+  const zoneProvider = 'provideZoneChangeDetection()';
+  const sourceText = host.read(appmodule).toString('utf-8');
+  const source = ts.createSourceFile(appmodule, sourceText, ts.ScriptTarget.Latest, true);
+
+  // Locate the first @NgModule({...}) metadata object in app-module.ts.
+  const ngModules = getDecoratorMetadata(source, 'NgModule', '@angular/core');
+
+  if (!ngModules.length) {
+    return;
+  }
+
+  const ngModuleMetadata = ngModules[0] as ts.ObjectLiteralExpression;
+  // Find the `providers` property assignment inside @NgModule metadata.
+  const providersProperty = ngModuleMetadata.properties
+    .filter(ts.isPropertyAssignment)
+    .find((prop: ts.PropertyAssignment) => {
+      if (ts.isIdentifier(prop.name)) {
+        return prop.name.text === 'providers';
+      }
+
+      return ts.isStringLiteral(prop.name) && prop.name.text === 'providers';
+    });
+
+  if (!providersProperty || !ts.isArrayLiteralExpression(providersProperty.initializer)) {
+    return;
+  }
+
+  const providersArray = providersProperty.initializer;
+  // Keep this operation idempotent: do nothing if provider already exists.
+  const hasZoneProvider = providersArray.elements.some((el: ts.Expression) => {
+    return el.getText(source).replace(/\s+/g, '') === zoneProvider;
+  });
+
+  if (hasZoneProvider) {
+    return;
+  }
+
+  let insertPos: number;
+  let toAdd: string;
+  if (providersArray.elements.length === 0) {
+    // Empty providers: inject the item directly between [].
+    insertPos = providersArray.getEnd() - 1;
+    toAdd = zoneProvider;
+  } else {
+    // Non-empty providers: append after last provider, preserving line formatting when possible.
+    const lastProvider = providersArray.elements[providersArray.elements.length - 1];
+    insertPos = lastProvider.getEnd();
+    const lastProviderText = lastProvider.getFullText(source);
+    const newLineMatch = lastProviderText.match(/^\r?\n(\r?)\s+/);
+    if (newLineMatch) {
+      toAdd = `,${newLineMatch[0]}${zoneProvider}`;
+    } else {
+      toAdd = `, ${zoneProvider}`;
+    }
+  }
+
+  // Apply the computed insertion at the exact Abstract Syntax Tree-derived position.
+  const recorder = host.beginUpdate(appmodule);
+  recorder.insertLeft(insertPos, toAdd);
+  host.commitUpdate(recorder);
+}
+

package/src/schematics/mg-add/schema.json

@@ -1,29 +1,29 @@
-{
-  "$schema": "http://json-schema.org/schema",
-  "$id": "SchematicsMagicAdd",
-  "title": "Magic Options Schema",
-  "type": "object",
-  "properties": {
-    "skipInstall": {
-      "type": "boolean",
-      "default": false,
-      "description": "Do not install the new packages (e.g., --skipInstall)"
-    },
-    "skipPackageJson": {
-      "type": "boolean",
-      "default": false,
-      "description": "Do not add magic dependencies to package.json (e.g., --skipPackageJson)"
-    },
-    "skipHelp": {
-      "type": "boolean",
-      "default": false,
-      "description": "Whether to create Startup Welcome Pag (e.g., --skipHelp)"
-    },
-    "project":{
-      "type": "string",
-      "description": "The name of the project",
-      "aliases" : ["p"]
-    }
-  },
-  "required": []
-}
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "SchematicsMagicAdd",
+  "title": "Magic Options Schema",
+  "type": "object",
+  "properties": {
+    "skipInstall": {
+      "type": "boolean",
+      "default": false,
+      "description": "Do not install the new packages (e.g., --skipInstall)"
+    },
+    "skipPackageJson": {
+      "type": "boolean",
+      "default": false,
+      "description": "Do not add magic dependencies to package.json (e.g., --skipPackageJson)"
+    },
+    "skipHelp": {
+      "type": "boolean",
+      "default": false,
+      "description": "Whether to create Startup Welcome Pag (e.g., --skipHelp)"
+    },
+    "project":{
+      "type": "string",
+      "description": "The name of the project",
+      "aliases" : ["p"]
+    }
+  },
+  "required": []
+}

package/src/schematics/mg-add/utils/add-declaration-to-root-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-declaration-to-root-module.js","sourceRoot":"","sources":["add-declaration-to-root-module.ts"],"names":[],"mappings":";;AAKA,gEAMC;AAXD,yCAA8C;AAC9C,kEAA0E;AAE1E,+CAA+C;AAE/C,SAAgB,0BAA0B,CAAC,IAAU,EAAE,UAAkB,EAAE,SAAiB;IAC3F,IACC,IAAI,GAAK,uBAAuB,EAChC,MAAM,GAAG,IAAA,mBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEpC,IAAA,kCAAsB,EAAC,MAAM,EAAE,IAAA,gBAAS,EAAC,IAAI,CAAC,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;AACxE,CAAC","sourcesContent":["import {getSourceFile} from '../../utils/ast';\r\nimport {addDeclarationToModule} from '../../utils/devkit-utils/ast-utils';\r\nimport {Tree} from '@angular-devkit/schematics';\r\nimport {normalize} from '@angular-devkit/core';\r\n\r\nexport function addDeclarationToRootModule(host: Tree, moduleName: string, importSrc: string) {\r\n\tlet\r\n\t\tpath   = `src/app/app.module.ts`,\r\n\t\tsource = getSourceFile(host, path);\r\n\t\r\n\taddDeclarationToModule(source, normalize(path), moduleName, importSrc);\r\n}\r\n"]}
+{"version":3,"file":"add-declaration-to-root-module.js","sourceRoot":"","sources":["add-declaration-to-root-module.ts"],"names":[],"mappings":";;AAKA,gEAMC;AAXD,yCAA8C;AAC9C,kEAA0E;AAE1E,+CAA+C;AAE/C,SAAgB,0BAA0B,CAAC,IAAU,EAAE,UAAkB,EAAE,SAAiB;IAC3F,IACC,IAAI,GAAK,uBAAuB,EAChC,MAAM,GAAG,IAAA,mBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEpC,IAAA,kCAAsB,EAAC,MAAM,EAAE,IAAA,gBAAS,EAAC,IAAI,CAAC,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;AACxE,CAAC","sourcesContent":["import {getSourceFile} from '../../utils/ast';\nimport {addDeclarationToModule} from '../../utils/devkit-utils/ast-utils';\nimport {Tree} from '@angular-devkit/schematics';\nimport {normalize} from '@angular-devkit/core';\n\nexport function addDeclarationToRootModule(host: Tree, moduleName: string, importSrc: string) {\n\tlet\n\t\tpath   = `src/app/app.module.ts`,\n\t\tsource = getSourceFile(host, path);\n\t\n\taddDeclarationToModule(source, normalize(path), moduleName, importSrc);\n}\n"]}

package/src/schematics/mg-add/utils/add-declaration-to-root-module.ts

@@ -1,12 +1,12 @@
-import {getSourceFile} from '../../utils/ast';
-import {addDeclarationToModule} from '../../utils/devkit-utils/ast-utils';
-import {Tree} from '@angular-devkit/schematics';
-import {normalize} from '@angular-devkit/core';
-
-export function addDeclarationToRootModule(host: Tree, moduleName: string, importSrc: string) {
-	let
-		path   = `src/app/app.module.ts`,
-		source = getSourceFile(host, path);
-	
-	addDeclarationToModule(source, normalize(path), moduleName, importSrc);
-}
+import {getSourceFile} from '../../utils/ast';
+import {addDeclarationToModule} from '../../utils/devkit-utils/ast-utils';
+import {Tree} from '@angular-devkit/schematics';
+import {normalize} from '@angular-devkit/core';
+
+export function addDeclarationToRootModule(host: Tree, moduleName: string, importSrc: string) {
+	let
+		path   = `src/app/app.module.ts`,
+		source = getSourceFile(host, path);
+	
+	addDeclarationToModule(source, normalize(path), moduleName, importSrc);
+}

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

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

package/src/schematics/mg-add-tasks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAMA,gCA4CC;AAjDD,4DAA4F;AAE5F,4CAAkF;AAGlF,SAAgB,UAAU,CAAC,OAAyB;IAClD,OAAO,CAAC,IAAS,EAAE,OAAwB,EAAC,EAAE;QAE5C,OAAO,CAAC,GAAG,CAAC,yDAAyD,GAAG,OAAO,CAAC,UAAU,CAAE,CAAC;QAC7F,qBAAe,CAAC,IAAI,CAAC,IAAI,mBAAa,CAAC,gBAAgB,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;QAE9E,8BAA8B;QAC9B,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CACpC,IAAI,wBAAgB,CAAC,YAAY,EAAE;YACjC,WAAW,EAAO,KAAK;YACvB,eAAe,EAAG,KAAK;YACvB,YAAY,EAAM,EAAE;YACpB,eAAe,EAAG,qBAAe;SAClC,CAAC,CACH,CAAC;QAIF,OAAO,CAAC,GAAG,CAAC,6DAA6D,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;QACpG,kBAAY,CAAC,IAAI,CAAC,IAAI,mBAAa,CAAC,oBAAoB,EAAE,OAAO,CAAC,cAAc,CAAE,CAAC,CAAC;QAEpF,2BAA2B;QAC3B,MAAM,mBAAmB,GAAG,OAAO,CAAC,OAAO,CACzC,IAAI,wBAAgB,CAAC,YAAY,EAAE;YACjC,WAAW,EAAO,OAAO,CAAC,WAAW;YACrC,eAAe,EAAG,OAAO,CAAC,eAAe;YACzC,YAAY,EAAM,kBAAY;YAC9B,eAAe,EAAG,EAAE;SACrB,CAAC,EACF,CAAC,cAAc,CAAC,CACjB,CAAC;QAGF,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CACrC,IAAI,wBAAgB,CAAC,cAAc,EAAE,OAAO,CAAC,EAC7C,CAAC,cAAc,EAAC,mBAAmB,CAAC,CACrC,CAAC;QAEF,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAC/B,IAAI,wBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,EACvC,CAAC,cAAc,EAAE,mBAAmB,EAAE,eAAe,CAAC,CACvD,CAAC;IAEJ,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import { Rule,Tree,SchematicContext } from \"@angular-devkit/schematics\";\r\nimport { NodePackageInstallTask, RunSchematicTask } from \"@angular-devkit/schematics/tasks\";\r\nimport { addPackageToPackageJson } from \"../utils/package\";\r\nimport { dependencies, devDependencies, Idependencies } from \"../magic-utils/env\";\r\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\r\n\r\nexport function mgAddTasks(options:MagicOptionScheme): Rule {\r\n  return (host:Tree, context:SchematicContext)=>{\r\n\r\n    console.log(\"   [V - add install dependencies !] options.cliVersion=\" + options.cliVersion );\r\n    devDependencies.push(new Idependencies(\"@magic-xpa/cli\", options.cliVersion));\r\n\r\n    // install the devDependencies\r\n    const devInstallTask = context.addTask(\r\n      new RunSchematicTask('mg-install', {\r\n        skipInstall     : false,\r\n        skipPackageJson : false,\r\n        dependencies    : [],\r\n        devDependencies : devDependencies\r\n      })\r\n    );\r\n\r\n\r\n\r\n    console.log(\"   [V - add install dependencies !] options.angularVersion=\" + options.angularVersion);\r\n    dependencies.push(new Idependencies(\"@magic-xpa/angular\", options.angularVersion ));\r\n\r\n    // install the dependencies\r\n    const packagesInstallTask = context.addTask(\r\n      new RunSchematicTask('mg-install', {\r\n        skipInstall     : options.skipInstall,\r\n        skipPackageJson : options.skipPackageJson,\r\n        dependencies    : dependencies,\r\n        devDependencies : []\r\n      }),\r\n      [devInstallTask]\r\n    );\r\n\r\n\r\n    const deleteFilesTask = context.addTask(\r\n      new RunSchematicTask('delete-files', options),\r\n      [devInstallTask,packagesInstallTask]\r\n    );\r\n\r\n    const ngAddTask = context.addTask(\r\n      new RunSchematicTask('mg-add', options),\r\n      [devInstallTask, packagesInstallTask, deleteFilesTask]\r\n    );\r\n\r\n  };\r\n}\r\n\r\n\r\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAMA,gCA4CC;AAjDD,4DAA4F;AAE5F,4CAAkF;AAGlF,SAAgB,UAAU,CAAC,OAAyB;IAClD,OAAO,CAAC,IAAS,EAAE,OAAwB,EAAC,EAAE;QAE5C,OAAO,CAAC,GAAG,CAAC,yDAAyD,GAAG,OAAO,CAAC,UAAU,CAAE,CAAC;QAC7F,qBAAe,CAAC,IAAI,CAAC,IAAI,mBAAa,CAAC,gBAAgB,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;QAE9E,8BAA8B;QAC9B,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CACpC,IAAI,wBAAgB,CAAC,YAAY,EAAE;YACjC,WAAW,EAAO,KAAK;YACvB,eAAe,EAAG,KAAK;YACvB,YAAY,EAAM,EAAE;YACpB,eAAe,EAAG,qBAAe;SAClC,CAAC,CACH,CAAC;QAIF,OAAO,CAAC,GAAG,CAAC,6DAA6D,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;QACpG,kBAAY,CAAC,IAAI,CAAC,IAAI,mBAAa,CAAC,oBAAoB,EAAE,OAAO,CAAC,cAAc,CAAE,CAAC,CAAC;QAEpF,2BAA2B;QAC3B,MAAM,mBAAmB,GAAG,OAAO,CAAC,OAAO,CACzC,IAAI,wBAAgB,CAAC,YAAY,EAAE;YACjC,WAAW,EAAO,OAAO,CAAC,WAAW;YACrC,eAAe,EAAG,OAAO,CAAC,eAAe;YACzC,YAAY,EAAM,kBAAY;YAC9B,eAAe,EAAG,EAAE;SACrB,CAAC,EACF,CAAC,cAAc,CAAC,CACjB,CAAC;QAGF,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CACrC,IAAI,wBAAgB,CAAC,cAAc,EAAE,OAAO,CAAC,EAC7C,CAAC,cAAc,EAAC,mBAAmB,CAAC,CACrC,CAAC;QAEF,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAC/B,IAAI,wBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,EACvC,CAAC,cAAc,EAAE,mBAAmB,EAAE,eAAe,CAAC,CACvD,CAAC;IAEJ,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import { Rule,Tree,SchematicContext } from \"@angular-devkit/schematics\";\nimport { NodePackageInstallTask, RunSchematicTask } from \"@angular-devkit/schematics/tasks\";\nimport { addPackageToPackageJson } from \"../utils/package\";\nimport { dependencies, devDependencies, Idependencies } from \"../magic-utils/env\";\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\n\nexport function mgAddTasks(options:MagicOptionScheme): Rule {\n  return (host:Tree, context:SchematicContext)=>{\n\n    console.log(\"   [V - add install dependencies !] options.cliVersion=\" + options.cliVersion );\n    devDependencies.push(new Idependencies(\"@magic-xpa/cli\", options.cliVersion));\n\n    // install the devDependencies\n    const devInstallTask = context.addTask(\n      new RunSchematicTask('mg-install', {\n        skipInstall     : false,\n        skipPackageJson : false,\n        dependencies    : [],\n        devDependencies : devDependencies\n      })\n    );\n\n\n\n    console.log(\"   [V - add install dependencies !] options.angularVersion=\" + options.angularVersion);\n    dependencies.push(new Idependencies(\"@magic-xpa/angular\", options.angularVersion ));\n\n    // install the dependencies\n    const packagesInstallTask = context.addTask(\n      new RunSchematicTask('mg-install', {\n        skipInstall     : options.skipInstall,\n        skipPackageJson : options.skipPackageJson,\n        dependencies    : dependencies,\n        devDependencies : []\n      }),\n      [devInstallTask]\n    );\n\n\n    const deleteFilesTask = context.addTask(\n      new RunSchematicTask('delete-files', options),\n      [devInstallTask,packagesInstallTask]\n    );\n\n    const ngAddTask = context.addTask(\n      new RunSchematicTask('mg-add', options),\n      [devInstallTask, packagesInstallTask, deleteFilesTask]\n    );\n\n  };\n}\n\n\n"]}

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

@@ -1,53 +1,53 @@
-import { Rule,Tree,SchematicContext } from "@angular-devkit/schematics";
-import { NodePackageInstallTask, RunSchematicTask } from "@angular-devkit/schematics/tasks";
-import { addPackageToPackageJson } from "../utils/package";
-import { dependencies, devDependencies, Idependencies } from "../magic-utils/env";
-import { MagicOptionScheme } from "../magic-utils/rules/magic-option.scheme";
-
-export function mgAddTasks(options:MagicOptionScheme): Rule {
-  return (host:Tree, context:SchematicContext)=>{
-
-    console.log("   [V - add install dependencies !] options.cliVersion=" + options.cliVersion );
-    devDependencies.push(new Idependencies("@magic-xpa/cli", options.cliVersion));
-
-    // install the devDependencies
-    const devInstallTask = context.addTask(
-      new RunSchematicTask('mg-install', {
-        skipInstall     : false,
-        skipPackageJson : false,
-        dependencies    : [],
-        devDependencies : devDependencies
-      })
-    );
-
-
-
-    console.log("   [V - add install dependencies !] options.angularVersion=" + options.angularVersion);
-    dependencies.push(new Idependencies("@magic-xpa/angular", options.angularVersion ));
-
-    // install the dependencies
-    const packagesInstallTask = context.addTask(
-      new RunSchematicTask('mg-install', {
-        skipInstall     : options.skipInstall,
-        skipPackageJson : options.skipPackageJson,
-        dependencies    : dependencies,
-        devDependencies : []
-      }),
-      [devInstallTask]
-    );
-
-
-    const deleteFilesTask = context.addTask(
-      new RunSchematicTask('delete-files', options),
-      [devInstallTask,packagesInstallTask]
-    );
-
-    const ngAddTask = context.addTask(
-      new RunSchematicTask('mg-add', options),
-      [devInstallTask, packagesInstallTask, deleteFilesTask]
-    );
-
-  };
-}
-
-
+import { Rule,Tree,SchematicContext } from "@angular-devkit/schematics";
+import { NodePackageInstallTask, RunSchematicTask } from "@angular-devkit/schematics/tasks";
+import { addPackageToPackageJson } from "../utils/package";
+import { dependencies, devDependencies, Idependencies } from "../magic-utils/env";
+import { MagicOptionScheme } from "../magic-utils/rules/magic-option.scheme";
+
+export function mgAddTasks(options:MagicOptionScheme): Rule {
+  return (host:Tree, context:SchematicContext)=>{
+
+    console.log("   [V - add install dependencies !] options.cliVersion=" + options.cliVersion );
+    devDependencies.push(new Idependencies("@magic-xpa/cli", options.cliVersion));
+
+    // install the devDependencies
+    const devInstallTask = context.addTask(
+      new RunSchematicTask('mg-install', {
+        skipInstall     : false,
+        skipPackageJson : false,
+        dependencies    : [],
+        devDependencies : devDependencies
+      })
+    );
+
+
+
+    console.log("   [V - add install dependencies !] options.angularVersion=" + options.angularVersion);
+    dependencies.push(new Idependencies("@magic-xpa/angular", options.angularVersion ));
+
+    // install the dependencies
+    const packagesInstallTask = context.addTask(
+      new RunSchematicTask('mg-install', {
+        skipInstall     : options.skipInstall,
+        skipPackageJson : options.skipPackageJson,
+        dependencies    : dependencies,
+        devDependencies : []
+      }),
+      [devInstallTask]
+    );
+
+
+    const deleteFilesTask = context.addTask(
+      new RunSchematicTask('delete-files', options),
+      [devInstallTask,packagesInstallTask]
+    );
+
+    const ngAddTask = context.addTask(
+      new RunSchematicTask('mg-add', options),
+      [devInstallTask, packagesInstallTask, deleteFilesTask]
+    );
+
+  };
+}
+
+

package/src/schematics/mg-add-tasks/schema.json

@@ -1,41 +1,41 @@
-{
-  "$schema": "http://json-schema.org/schema",
-  "$id": "SchematicsMagicAddTasks",
-  "title": "Magic Options Schema",
-  "type": "object",
-  "properties": {
-    "skipInstall": {
-      "type": "boolean",
-      "default": false,
-      "description": "Do not install the new packages (e.g., --skipInstall)"
-    },
-    "skipPackageJson": {
-      "type": "boolean",
-      "default": false,
-      "description": "Do not add magic dependencies to package.json (e.g., --skipPackageJson)"
-    },
-    "skipHelp": {
-      "type": "boolean",
-      "default": false,
-      "description": "Whether to create Startup Welcome Pag (e.g., --skipHelp)"
-    },
-    "project":{
-      "type": "string",
-      "description": "The name of the project",
-      "aliases" : ["p"]
-    },
-    "cliVersion":{
-      "type": "string",
-      "default": "*",
-      "description": "The cli version ",
-      "aliases" : ["c"]
-    },
-    "angularVersion":{
-      "type": "string",
-      "default": "*",
-      "description": "The angular version ",
-      "aliases" : ["a"]
-    }
-  },
-  "required": []
-}
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "SchematicsMagicAddTasks",
+  "title": "Magic Options Schema",
+  "type": "object",
+  "properties": {
+    "skipInstall": {
+      "type": "boolean",
+      "default": false,
+      "description": "Do not install the new packages (e.g., --skipInstall)"
+    },
+    "skipPackageJson": {
+      "type": "boolean",
+      "default": false,
+      "description": "Do not add magic dependencies to package.json (e.g., --skipPackageJson)"
+    },
+    "skipHelp": {
+      "type": "boolean",
+      "default": false,
+      "description": "Whether to create Startup Welcome Pag (e.g., --skipHelp)"
+    },
+    "project":{
+      "type": "string",
+      "description": "The name of the project",
+      "aliases" : ["p"]
+    },
+    "cliVersion":{
+      "type": "string",
+      "default": "*",
+      "description": "The cli version ",
+      "aliases" : ["c"]
+    },
+    "angularVersion":{
+      "type": "string",
+      "default": "*",
+      "description": "The angular version ",
+      "aliases" : ["a"]
+    }
+  },
+  "required": []
+}

package/src/schematics/mg-delete-files/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAKA,sCAKC;AAVD,2DAAsD;AACtD,4FAAmF;AACnF,gDAAuD;AAGvD,SAAgB,aAAa,CAAC,OAAyB;IACrD,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,4CAAiB,EAAE,OAAO,CAAC;QAC3B,IAAA,wBAAgB,EAAG,OAAO,CAAC;KAC5B,CAAC,CAAC;AACL,CAAC","sourcesContent":["import {chain,Rule} from \"@angular-devkit/schematics\";\r\nimport { initMagicMetadata}   from \"../magic-utils/rules/init-magic-metadata.rule\";\r\nimport { deleteMagicFiles} from \"../magic-utils/utils\";\r\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\r\n\r\nexport function mgDeleteFiles(options:MagicOptionScheme): Rule {\r\n  return chain([\r\n    initMagicMetadata (options),\r\n    deleteMagicFiles  (options),\r\n  ]);\r\n}\r\n\r\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAKA,sCAKC;AAVD,2DAAsD;AACtD,4FAAmF;AACnF,gDAAuD;AAGvD,SAAgB,aAAa,CAAC,OAAyB;IACrD,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,4CAAiB,EAAE,OAAO,CAAC;QAC3B,IAAA,wBAAgB,EAAG,OAAO,CAAC;KAC5B,CAAC,CAAC;AACL,CAAC","sourcesContent":["import {chain,Rule} from \"@angular-devkit/schematics\";\nimport { initMagicMetadata}   from \"../magic-utils/rules/init-magic-metadata.rule\";\nimport { deleteMagicFiles} from \"../magic-utils/utils\";\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\n\nexport function mgDeleteFiles(options:MagicOptionScheme): Rule {\n  return chain([\n    initMagicMetadata (options),\n    deleteMagicFiles  (options),\n  ]);\n}\n\n"]}

package/src/schematics/mg-delete-files/index.ts

@@ -1,12 +1,12 @@
-import {chain,Rule} from "@angular-devkit/schematics";
-import { initMagicMetadata}   from "../magic-utils/rules/init-magic-metadata.rule";
-import { deleteMagicFiles} from "../magic-utils/utils";
-import { MagicOptionScheme } from "../magic-utils/rules/magic-option.scheme";
-
-export function mgDeleteFiles(options:MagicOptionScheme): Rule {
-  return chain([
-    initMagicMetadata (options),
-    deleteMagicFiles  (options),
-  ]);
-}
-
+import {chain,Rule} from "@angular-devkit/schematics";
+import { initMagicMetadata}   from "../magic-utils/rules/init-magic-metadata.rule";
+import { deleteMagicFiles} from "../magic-utils/utils";
+import { MagicOptionScheme } from "../magic-utils/rules/magic-option.scheme";
+
+export function mgDeleteFiles(options:MagicOptionScheme): Rule {
+  return chain([
+    initMagicMetadata (options),
+    deleteMagicFiles  (options),
+  ]);
+}
+

package/src/schematics/mg-delete-files/schema.json

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

package/src/schematics/mg-gen-module/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAKA,kCAQC;AAbD,2DAAyD;AACzD,4FAAmF;AAEnF,sFAAgG;AAEhG,SAAgB,WAAW,CAAC,OAAyB;IACnD,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,4CAAiB,EAAE,OAAO,CAAC;QAE3B,4CAA4C;QAC5C,IAAA,sCAAc,EAAE,OAAO,CAAC;QACxB,IAAA,0CAAkB,EAAC,OAAO,CAAC;KAC5B,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { chain, Rule } 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 { generateWebModules, initGenModules } from \"../magic-utils/rules/init-add-modules.rule\";\r\n\r\nexport function mgGenModule(options:MagicOptionScheme): Rule {\r\n  return chain([\r\n    initMagicMetadata (options),\r\n\r\n    // ** generate the modules in the project **\r\n    initGenModules (options),\r\n    generateWebModules(options)\r\n  ]);\r\n}\r\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAKA,kCAQC;AAbD,2DAAyD;AACzD,4FAAmF;AAEnF,sFAAgG;AAEhG,SAAgB,WAAW,CAAC,OAAyB;IACnD,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,4CAAiB,EAAE,OAAO,CAAC;QAE3B,4CAA4C;QAC5C,IAAA,sCAAc,EAAE,OAAO,CAAC;QACxB,IAAA,0CAAkB,EAAC,OAAO,CAAC;KAC5B,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { chain, Rule } from \"@angular-devkit/schematics\";\nimport { initMagicMetadata}   from \"../magic-utils/rules/init-magic-metadata.rule\";\nimport { MagicOptionScheme } from \"../magic-utils/rules/magic-option.scheme\";\nimport { generateWebModules, initGenModules } from \"../magic-utils/rules/init-add-modules.rule\";\n\nexport function mgGenModule(options:MagicOptionScheme): Rule {\n  return chain([\n    initMagicMetadata (options),\n\n    // ** generate the modules in the project **\n    initGenModules (options),\n    generateWebModules(options)\n  ]);\n}\n"]}