@magic-xpa/cli 4.1000.0 → 4.1100.0-dev000.0

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

@@ -1,30 +1,30 @@
-import { chain, Rule, SchematicContext, Tree } from "@angular-devkit/schematics";
-import { initMagicMetadata}   from "../magic-utils/rules/init-magic-metadata.rule";
-import { NodePackageInstallTask } from "@angular-devkit/schematics/tasks";
-import { dependencies, devDependencies } from "../magic-utils/env";
-import { addPackageToPackageJson } from "../utils/package";
-import { MagicOptionScheme } from "../magic-utils/rules/magic-option.scheme";
-
-export function mgInstallPrerequisites(options:MagicOptionScheme): Rule {
-  return chain([
-    initMagicMetadata            (options),
-    installPrerequisitesSaveDev  (options)
-  ]);
-}
-
-
-function installPrerequisitesSaveDev(option:MagicOptionScheme): Rule {
-  return (host: Tree, context:SchematicContext) => {
-      for (let dep of devDependencies){
-        context.logger.info(`[>] Add devDependencies ${dep.name}`);
-        addPackageToPackageJson(host, 'devDependencies', dep.name, dep.version);
-      }
-
-      context.addTask(new NodePackageInstallTask());
-
-    return host;
-  };
-}
-
-
-
+import { chain, Rule, SchematicContext, Tree } from "@angular-devkit/schematics";
+import { initMagicMetadata}   from "../magic-utils/rules/init-magic-metadata.rule";
+import { NodePackageInstallTask } from "@angular-devkit/schematics/tasks";
+import { dependencies, devDependencies } from "../magic-utils/env";
+import { addPackageToPackageJson } from "../utils/package";
+import { MagicOptionScheme } from "../magic-utils/rules/magic-option.scheme";
+
+export function mgInstallPrerequisites(options:MagicOptionScheme): Rule {
+  return chain([
+    initMagicMetadata            (options),
+    installPrerequisitesSaveDev  (options)
+  ]);
+}
+
+
+function installPrerequisitesSaveDev(option:MagicOptionScheme): Rule {
+  return (host: Tree, context:SchematicContext) => {
+      for (let dep of devDependencies){
+        context.logger.info(`[>] Add devDependencies ${dep.name}`);
+        addPackageToPackageJson(host, 'devDependencies', dep.name, dep.version);
+      }
+
+      context.addTask(new NodePackageInstallTask());
+
+    return host;
+  };
+}
+
+
+

package/src/schematics/mg-Install-prerequisites/schema.json

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

package/src/schematics/mg-add/files/src/app/app.component.html

@@ -1,17 +1,17 @@
-<div>
-  <% if(!skipHelp){  %>
-  <H2>Hello Magic Web Client</H2>
-  <pre>
-  Steps for Generate Component
-  =========================================
-  1.1 copy json to magic-metadata
-
-  1.2 ng g @magic-xpa/cli:magic
-  --project       = xxx
-  --component     = yyy
-  --theme          = material or basicHTML
-  -–allow-testing
-  </pre>
-  <% } %>
-  <magic-root></magic-root>
-</div>
+<div>
+  <% if(!skipHelp){  %>
+  <H2>Hello Magic Web Client</H2>
+  <pre>
+  Steps for Generate Component
+  =========================================
+  1.1 copy json to magic-metadata
+
+  1.2 ng g @magic-xpa/cli:magic
+  --project       = xxx
+  --component     = yyy
+  --theme          = material or basicHTML
+  -–allow-testing
+  </pre>
+  <% } %>
+  <magic-root></magic-root>
+</div>

package/src/schematics/mg-add/files/src/app/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.forRoot(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.forRoot(routes)],
+  exports: [RouterModule]
+})
+export class MagicRoutingModule { }

package/src/schematics/mg-add/files/src/app/magic/component-list.g.ts

@@ -1,9 +1,9 @@
-
-export const title = "";
-
-export const magicGenCmpsHash = {
-};
-
-export const magicGenComponents = [
-];
-
+
+export const title = "";
+
+export const magicGenCmpsHash = {
+};
+
+export const magicGenComponents = [
+];
+

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

@@ -5,6 +5,7 @@ import { MagicLazyLoaderService } from '@magic-xpa/angular';
 
 export class LazyLoaderService extends MagicLazyLoaderService {
   override Load(path: string): Promise<any> {
-    return import( './' + path + '/magic.gen.lib.module');
+    path = path+'/';
+    return import(/* @vite-ignore */`./${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,131 +1,131 @@
-@import "~@angular/material/prebuilt-themes/indigo-pink.css";
-
-.align_center {
-    text-align: center;
-}
-
-.align_right {
-    text-align: right;
-}
-
-.multiline {
-  word-break: break-all;
-  white-space: pre-line;
-}
-
-.edit_multiline {
-    overflow: scroll;
-    overflow-y: scroll;
-    overflow-x: hidden;
-}
-
-.thin_border {
-    border: 1px solid #F00;
-}
-
-.thick_border {
-    border: 2px solid #F00;
-}
-
-.hidden_border {
-    border-style: hidden;
-}
-
-.emboss_border {
-    border: 1px solid;
-}
-
-.threed_border {
-    border-style: outset;
-}
-
-.threedsunken_border {
-    border-style: inset;
-}
-
-.twod_border {
-    border: 2px solid;
-}
-
-.windows_border {
-    border: 2px solid;
-}
-
-.tab_control {
-  overflow: hidden;
-  border: 1px solid #ccc;
-  background-color: #f1f1f1;
-}
-
-.tab_button {
-  background-color: inherit;
-  float: left;
-  border: none;
-  outline: none;
-  cursor: pointer;
-  padding: 14px 16px;
-}
-
-.tab_button_active {
-  background-color: #ccc;
-  float: left;
-  border: none;
-  outline: none;
-  cursor: pointer;
-  padding: 14px 16px;
-}
-
-.tab_button:hover {
-  background-color: #ddd;
-}
-
-.tab_content {
-  padding: 6px 12px;
-  border: 1px solid #ccc;
-  border-bottom: none;
-  border-left: none;
-  border-right: none;
-  clear:both;
-}
-
-/* style for input on table*/
-.InputPropsForRowEditing {
-  text-decoration: underline;
-}
-
-.button_image_background_size{
-  background-size: 100% 100%;
-}
-
-.lable_overflow{
-  overflow: hidden;
-}
-
-.table_scrollBar{
-  height: 600px;
-  overflow-y: scroll;
-}
-
-.container_border{
-  border: lightskyblue solid 1px;
-}
-
-.selected {
-  background: #F5F5F5;
-}
-
-.table_row:hover {
-  background-color: #EEEEEE;
-}
-/* remark : we decided to give the end user the normal list box without you update the behavior*/
-/*for material list box control*/
-/*hide the check box*/
-/*mat-list-option mat-pseudo-checkbox.mat-pseudo-checkbox{*/
-/*display: none;*/
-/*}*/
-/*!*for material list box control*!*/
-/*!* for selected item that is true the style will be by following *!*/
-/*mat-list-option[aria-selected = "true"]*/
-/*{*/
-  /*background-color: blue;*/
-/*}*/
+@import "@angular/material/prebuilt-themes/indigo-pink.css";
+
+.align_center {
+    text-align: center;
+}
+
+.align_right {
+    text-align: right;
+}
+
+.multiline {
+  word-break: break-all;
+  white-space: pre-line;
+}
+
+.edit_multiline {
+    overflow: scroll;
+    overflow-y: scroll;
+    overflow-x: hidden;
+}
+
+.thin_border {
+    border: 1px solid #F00;
+}
+
+.thick_border {
+    border: 2px solid #F00;
+}
+
+.hidden_border {
+    border-style: hidden;
+}
+
+.emboss_border {
+    border: 1px solid;
+}
+
+.threed_border {
+    border-style: outset;
+}
+
+.threedsunken_border {
+    border-style: inset;
+}
+
+.twod_border {
+    border: 2px solid;
+}
+
+.windows_border {
+    border: 2px solid;
+}
+
+.tab_control {
+  overflow: hidden;
+  border: 1px solid #ccc;
+  background-color: #f1f1f1;
+}
+
+.tab_button {
+  background-color: inherit;
+  float: left;
+  border: none;
+  outline: none;
+  cursor: pointer;
+  padding: 14px 16px;
+}
+
+.tab_button_active {
+  background-color: #ccc;
+  float: left;
+  border: none;
+  outline: none;
+  cursor: pointer;
+  padding: 14px 16px;
+}
+
+.tab_button:hover {
+  background-color: #ddd;
+}
+
+.tab_content {
+  padding: 6px 12px;
+  border: 1px solid #ccc;
+  border-bottom: none;
+  border-left: none;
+  border-right: none;
+  clear:both;
+}
+
+/* style for input on table*/
+.InputPropsForRowEditing {
+  text-decoration: underline;
+}
+
+.button_image_background_size{
+  background-size: 100% 100%;
+}
+
+.lable_overflow{
+  overflow: hidden;
+}
+
+.table_scrollBar{
+  height: 600px;
+  overflow-y: scroll;
+}
+
+.container_border{
+  border: lightskyblue solid 1px;
+}
+
+.selected {
+  background: #F5F5F5 !important;
+}
+
+.table_row:hover {
+  background-color: #EEEEEE;
+}
+/* remark : we decided to give the end user the normal list box without you update the behavior*/
+/*for material list box control*/
+/*hide the check box*/
+/*mat-list-option mat-pseudo-checkbox.mat-pseudo-checkbox{*/
+/*display: none;*/
+/*}*/
+/*!*for material list box control*!*/
+/*!* for selected item that is true the style will be by following *!*/
+/*mat-list-option[aria-selected = "true"]*/
+/*{*/
+  /*background-color: blue;*/
+/*}*/

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;