@magic-xpa/cli 4.900.0-dev490.16 → 4.900.0-dev490.160

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magic-xpa/cli",
-  "version": "4.900.0-dev490.16",
+  "version": "4.900.0-dev490.160",
   "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/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 %>)"
                              <%}%>
                               >