@rxap/schematic-angular 16.2.0-dev.2 → 16.2.0-dev.21

package/CHANGELOG.md

@@ -3,6 +3,165 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [16.2.0-dev.21](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.20...@rxap/schematic-angular@16.2.0-dev.21) (2024-03-04)
+
+### Bug Fixes
+
+- generate valid schema ([d285d6c](https://gitlab.com/rxap/packages/commit/d285d6c5998c18f24f5b6c59dd1d04b887552f8c))
+- resolve issues with form group/array generation ([ff2bc82](https://gitlab.com/rxap/packages/commit/ff2bc827646c48853444eebf82cfe9ac0e617b51))
+- use correct default column order ([2f8685a](https://gitlab.com/rxap/packages/commit/2f8685a54f6101fc1abd0a9e57fe139811406d45))
+
+### Features
+
+- support form group and form array ([512e2a3](https://gitlab.com/rxap/packages/commit/512e2a3953145cfad3426d38c48a18411a6ab80f))
+- support form group and form array ([8285ad8](https://gitlab.com/rxap/packages/commit/8285ad893ef07768ffd478a1612377bb449b1809))
+
+# [16.2.0-dev.20](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.19...@rxap/schematic-angular@16.2.0-dev.20) (2024-03-01)
+
+### Bug Fixes
+
+- add default filter control label ([65971f4](https://gitlab.com/rxap/packages/commit/65971f4f839d362d2145afa7ab988be782ef1bd6))
+
+# [16.2.0-dev.19](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.18...@rxap/schematic-angular@16.2.0-dev.19) (2024-03-01)
+
+### Bug Fixes
+
+- correctly pass tree table options ([f42d49c](https://gitlab.com/rxap/packages/commit/f42d49ce4b05c7772366c65a96c97e369cdb5799))
+
+# [16.2.0-dev.18](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.17...@rxap/schematic-angular@16.2.0-dev.18) (2024-03-01)
+
+**Note:** Version bump only for package @rxap/schematic-angular
+
+# [16.2.0-dev.17](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.16...@rxap/schematic-angular@16.2.0-dev.17) (2024-03-01)
+
+### Bug Fixes
+
+- add missing handlebars partial loaders ([4a38e18](https://gitlab.com/rxap/packages/commit/4a38e185a434b90e5589d9fe8e8d682a9c63a37e))
+- ensure all imports are added ([bbf00b4](https://gitlab.com/rxap/packages/commit/bbf00b46b2eb58e16d280ac09de05a1d12390bfd))
+
+# [16.2.0-dev.16](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.15...@rxap/schematic-angular@16.2.0-dev.16) (2024-02-29)
+
+### Bug Fixes
+
+- improve operation naming and return types ([16ea0b3](https://gitlab.com/rxap/packages/commit/16ea0b3eb2f7679c101d034e72f8013f5513ecb6))
+
+### Features
+
+- generate table select resolve method ([5db6649](https://gitlab.com/rxap/packages/commit/5db6649cac0ff8dd36170679fc726057fa5d57d1))
+
+# [16.2.0-dev.15](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.14...@rxap/schematic-angular@16.2.0-dev.15) (2024-02-28)
+
+### Bug Fixes
+
+- add missing filter column definition ([4b86212](https://gitlab.com/rxap/packages/commit/4b86212108489a3bb6cd73d422869a992a2286d8))
+- add missing module import ([b2614a2](https://gitlab.com/rxap/packages/commit/b2614a2e98b8809b3f054d975d673c0c251986a8))
+- correctly coerce the operation method parameters ([f68c03a](https://gitlab.com/rxap/packages/commit/f68c03a1d4d623db9c5523a180f7e3c421fb1998))
+- ensure nestModule is passed to the operation generators ([8bab63c](https://gitlab.com/rxap/packages/commit/8bab63ca21c50581f09566e65ee709d10a7f4bda))
+- generate index schema json file ([6c7522d](https://gitlab.com/rxap/packages/commit/6c7522df6d48ae3ac63b1c58afd1885669388625))
+- only add get by id operation if identifier is defined ([85cddd8](https://gitlab.com/rxap/packages/commit/85cddd827eacbc217ae4c4cae7539fa3a12d4c26))
+- respect the identifier option ([bd6c6b2](https://gitlab.com/rxap/packages/commit/bd6c6b2d6770534f7d2136ac489acae2de8f0d16))
+
+### Features
+
+- extend support for upstream options ([15057c5](https://gitlab.com/rxap/packages/commit/15057c5b8d4bf97ee0bf1aa3ff78825ac7bf7b73))
+- support custom properties for accordion controllers ([82da170](https://gitlab.com/rxap/packages/commit/82da170f9ff490ec2502e0b21283b100848e6108))
+
+# [16.2.0-dev.14](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.13...@rxap/schematic-angular@16.2.0-dev.14) (2024-02-26)
+
+### Bug Fixes
+
+- ensure data grid item form control imports are merged ([efab2fd](https://gitlab.com/rxap/packages/commit/efab2fd67eefa99229b797e4749e6f9129305ae9))
+
+# [16.2.0-dev.13](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.12...@rxap/schematic-angular@16.2.0-dev.13) (2024-02-26)
+
+### Bug Fixes
+
+- ensure non form control types are excluded ([4e1f905](https://gitlab.com/rxap/packages/commit/4e1f9056d5b7e575b634b4ef1b5705a41fc67286))
+
+# [16.2.0-dev.12](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.11...@rxap/schematic-angular@16.2.0-dev.12) (2024-02-26)
+
+### Bug Fixes
+
+- support non form control properties ([c4243b7](https://gitlab.com/rxap/packages/commit/c4243b747c9f880b07c53d1777275ac45135f3df))
+
+### Features
+
+- introduce complex pipe templates ([bbad21d](https://gitlab.com/rxap/packages/commit/bbad21dd3f53754c0a5137a4208b238d37c114a9))
+- support custom data grid item kinds ([d4f1e75](https://gitlab.com/rxap/packages/commit/d4f1e7563bac29f4fd8b6bbe4e03dd98bb44c4ac))
+
+# [16.2.0-dev.11](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.10...@rxap/schematic-angular@16.2.0-dev.11) (2024-02-26)
+
+### Bug Fixes
+
+- mat form field directive ([a22eb4f](https://gitlab.com/rxap/packages/commit/a22eb4f398402511b2941190845fa2f54c2bdc2e))
+
+# [16.2.0-dev.10](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.9...@rxap/schematic-angular@16.2.0-dev.10) (2024-02-26)
+
+### Bug Fixes
+
+- align the controller name processing ([e3c9c31](https://gitlab.com/rxap/packages/commit/e3c9c31afdd6813832177ec4c566d92e8a45201b))
+
+# [16.2.0-dev.9](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.8...@rxap/schematic-angular@16.2.0-dev.9) (2024-02-26)
+
+**Note:** Version bump only for package @rxap/schematic-angular
+
+# [16.2.0-dev.8](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.7...@rxap/schematic-angular@16.2.0-dev.8) (2024-02-26)
+
+**Note:** Version bump only for package @rxap/schematic-angular
+
+# [16.2.0-dev.7](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.6...@rxap/schematic-angular@16.2.0-dev.7) (2024-02-25)
+
+### Bug Fixes
+
+- ensure default export is added ([adc054e](https://gitlab.com/rxap/packages/commit/adc054e45a58e6373c45a1d244f7044f32816c8a))
+- rename itemName to name ([4387d22](https://gitlab.com/rxap/packages/commit/4387d2203e5ff41dde6a859869f6242bb43a3a1f))
+- use handlebars ([b7a9f19](https://gitlab.com/rxap/packages/commit/b7a9f196039d50a464c20b9d5baf8ced86cdec2a))
+- use handlebars ([1f8b14e](https://gitlab.com/rxap/packages/commit/1f8b14e8770e9562dde4ddf95b3fe91b12b43bea))
+- use narrow control schematics ([1dc8690](https://gitlab.com/rxap/packages/commit/1dc8690d8417aa32ee9f83987737ac65db69fd09))
+
+### Features
+
+- support dynamic mat form field ([71b2544](https://gitlab.com/rxap/packages/commit/71b25441bc3ea59e6e7ffb26a45b93a1ee74fbf0))
+- support handlebars for accordions ([411211b](https://gitlab.com/rxap/packages/commit/411211b624208a26aae0361efe908846ad5a74dd))
+- support handlebars for data grids ([0c94a88](https://gitlab.com/rxap/packages/commit/0c94a881d2f0061577f64fcdcdbfc4d41c351835))
+- support handlebars for table column ([bf4b105](https://gitlab.com/rxap/packages/commit/bf4b1053430d1dd1342b229df2d002696a2d16ee))
+- support handlebars for tables ([4b9e208](https://gitlab.com/rxap/packages/commit/4b9e20832d950c2be579ed9bf08e7eb1685e0891))
+- support input hbs templates ([312ebeb](https://gitlab.com/rxap/packages/commit/312ebeb82062b3b5d7b166e0650b113f67218899))
+- support label for each form control ([4af10c0](https://gitlab.com/rxap/packages/commit/4af10c05c72b7c7e5ff2ca202d5b87e3e5636227))
+- support slide toggle ([4bec803](https://gitlab.com/rxap/packages/commit/4bec80343c9654746c9ede1707aabc0bc994e04c))
+- support table parameters in tree tables ([bf8a676](https://gitlab.com/rxap/packages/commit/bf8a676790b9e9bf60ef290e1201a998fbdaffd0))
+- support table select ([f495bdd](https://gitlab.com/rxap/packages/commit/f495bdd635768e4db3ccb7c31992d140dd15ec64))
+- support toDisplay and toValue input options ([1d331c1](https://gitlab.com/rxap/packages/commit/1d331c1163f40d9061f422e18069d8a52e677c0c))
+- support upstream configurations ([3c972cf](https://gitlab.com/rxap/packages/commit/3c972cfc1aea45d9cabca07f24f4627f4aff03aa))
+
+# [16.2.0-dev.6](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.5...@rxap/schematic-angular@16.2.0-dev.6) (2024-02-22)
+
+### Bug Fixes
+
+- coerce table animations ([2ba23ee](https://gitlab.com/rxap/packages/commit/2ba23ee9a886b78e7f77df1fdf470840d2fb94eb))
+
+# [16.2.0-dev.5](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.4...@rxap/schematic-angular@16.2.0-dev.5) (2024-02-22)
+
+### Bug Fixes
+
+- generalize filterColumnRule function ([8e3fb50](https://gitlab.com/rxap/packages/commit/8e3fb506255dceaf5a3900669b9fdef3bdd1fd34))
+- generalize UsePickFromTableInterfaceAsFormTypeRule function ([5a80485](https://gitlab.com/rxap/packages/commit/5a80485a59348505d770c97d130b948ab0d24ddd))
+- generate tree table column dto types ([93e3675](https://gitlab.com/rxap/packages/commit/93e36759b298806217b9b602d36dd975d46a62a8))
+
+# [16.2.0-dev.4](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.3...@rxap/schematic-angular@16.2.0-dev.4) (2024-02-22)
+
+### Bug Fixes
+
+- add missing component imports ([1aa3b46](https://gitlab.com/rxap/packages/commit/1aa3b465398e62b201c936cd5938bb4eef3f4cfa))
+
+# [16.2.0-dev.3](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.2...@rxap/schematic-angular@16.2.0-dev.3) (2024-02-22)
+
+### Bug Fixes
+
+- only add default export to feature root components ([50f916e](https://gitlab.com/rxap/packages/commit/50f916e2168d8b18826629b6669c8976b7152b12))
+- support filter row in tree table components ([5652aad](https://gitlab.com/rxap/packages/commit/5652aada0e57c582a35200c4f97daa7283b87e35))
+- support filter row in tree table components ([1eb26ca](https://gitlab.com/rxap/packages/commit/1eb26ca0fa9334276bf4addb67a684046de7b9ad))
+
 # [16.2.0-dev.2](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.1...@rxap/schematic-angular@16.2.0-dev.2) (2024-02-22)
 
 ### Bug Fixes

package/README.md

@@ -17,5 +17,5 @@ yarn add @rxap/schematic-angular
 ```
 **Install peer dependencies:**
 ```bash
-yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-ts-morph@^16.1.0-dev.0 @rxap/schematics-utilities@^16.0.1-dev.0 @rxap/ts-morph@^1.1.0-dev.1 @rxap/utilities@^16.1.0-dev.0 ts-morph@^18.0.0 tslib@2.6.2 
+yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-ts-morph@^16.1.0-dev.9 @rxap/schematics-utilities@^16.0.1-dev.0 @rxap/ts-morph@^1.1.0-dev.9 @rxap/utilities@^16.1.0-dev.5 colors@^1.4.0 handlebars@^4.7.7 ts-morph@^18.0.0 tslib@2.6.2 
 ```

package/collection.json

@@ -90,6 +90,16 @@
       "factory": "./src/schematics/form/form-control/index",
       "description": "The form-control schematic"
     },
+    "form-group": {
+      "schema": "./src/schematics/form/form-group/schema.json",
+      "factory": "./src/schematics/form/form-group/index",
+      "description": "The form-group schematic"
+    },
+    "form-array": {
+      "schema": "./src/schematics/form/form-array/schema.json",
+      "factory": "./src/schematics/form/form-array/index",
+      "description": "The form-array schematic"
+    },
     "dialog-table-action": {
       "schema": "./src/schematics/table/action/dialog-table-action/schema.json",
       "factory": "./src/schematics/table/action/dialog-table-action/index",

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "16.2.0-dev.2",
+  "version": "16.2.0-dev.21",
   "name": "@rxap/schematic-angular",
   "license": "GPL-3.0-or-later",
   "dependencies": {
@@ -12,14 +12,16 @@
   "peerDependencies": {
     "@angular-devkit/core": "^16.1.4",
     "@angular-devkit/schematics": "^16.1.4",
-    "@rxap/schematics-ts-morph": "^16.1.0-dev.0",
+    "@rxap/schematics-ts-morph": "^16.1.0-dev.9",
     "@rxap/schematics-utilities": "^16.0.1-dev.0",
-    "@rxap/ts-morph": "^1.1.0-dev.1",
-    "@rxap/utilities": "^16.1.0-dev.0",
+    "@rxap/ts-morph": "^1.1.0-dev.9",
+    "@rxap/utilities": "^16.1.0-dev.5",
+    "colors": "^1.4.0",
+    "handlebars": "^4.7.7",
     "ts-morph": "^18.0.0",
     "tslib": "2.6.2",
     "@rxap/node-utilities": "1.1.0",
-    "@rxap/workspace-ts-morph": "16.0.1",
+    "@rxap/workspace-ts-morph": "16.0.2-dev.0",
     "@rxap/workspace-utilities": "16.0.1",
     "util": "0.12.5"
   },
@@ -43,7 +45,7 @@
     "packageGroup": [
       {
         "package": "@rxap/schematics-ts-morph",
-        "version": "16.1.0-dev.0"
+        "version": "16.1.0-dev.9"
       },
       {
         "package": "@rxap/schematics-utilities",
@@ -51,11 +53,11 @@
       },
       {
         "package": "@rxap/ts-morph",
-        "version": "1.1.0-dev.1"
+        "version": "1.1.0-dev.9"
       },
       {
         "package": "@rxap/utilities",
-        "version": "16.1.0-dev.0"
+        "version": "16.1.0-dev.5"
       },
       {
         "package": "@rxap/workspace-utilities",
@@ -74,7 +76,7 @@
   },
   "schematics": "./collection.json",
   "type": "commonjs",
-  "gitHead": "8e5bb99f31333b5b54ef7da00a86b0679611a394",
+  "gitHead": "1cbac86e12b74f4ffffb4b4b9b65f2bdfdb47384",
   "main": "./src/index.js",
   "types": "./src/index.d.ts"
 }

package/src/lib/accordion-header.d.ts

@@ -1,6 +1,7 @@
 import { DataProperty, NormalizedDataProperty, NormalizedTypeImport, TypeImport } from '@rxap/ts-morph';
 export interface BaseAccordionHeader {
     importList?: TypeImport[];
+    template?: string;
 }
 export interface StaticAccordionHeader extends BaseAccordionHeader {
     title: string;
@@ -11,6 +12,10 @@ export interface PropertyAccordionHeader extends BaseAccordionHeader {
 export type AccordionHeader = StaticAccordionHeader | PropertyAccordionHeader;
 export interface NormalizedBaseAccordionHeader {
     importList: NormalizedTypeImport[];
+    template: string;
+    handlebars?: Handlebars.TemplateDelegate<{
+        header: NormalizedBaseAccordionHeader;
+    }>;
 }
 export interface NormalizedStaticAccordionHeader extends NormalizedBaseAccordionHeader {
     title: string;

package/src/lib/accordion-header.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NormalizeAccordionHeader = exports.NormalizeBaseAccordionHeader = exports.IsNormalizedPropertyAccordionHeader = exports.IsNormalizedStaticAccordionHeader = exports.IsPropertyAccordionHeader = exports.IsStaticAccordionHeader = void 0;
 const ts_morph_1 = require("@rxap/ts-morph");
+const path_1 = require("path");
+const load_handlebars_template_1 = require("./load-handlebars-template");
 function IsStaticAccordionHeader(header) {
     return header.title !== undefined;
 }
@@ -22,14 +24,18 @@ function coerceBaseAccordionHeaderImportList(header) {
     var _a;
     const importList = (_a = header.importList) !== null && _a !== void 0 ? _a : [];
     importList.push({
-        name: 'AccordionHeaderComponent',
-        moduleSpecifier: './accordion-header/accordion-header.component'
+        name: 'NavigateBackButtonComponent',
+        moduleSpecifier: '@rxap/components'
     });
     return importList;
 }
 function NormalizeBaseAccordionHeader(header) {
+    var _a;
+    const template = (_a = header.template) !== null && _a !== void 0 ? _a : 'accordion-header.hbs';
     return Object.freeze({
-        importList: coerceBaseAccordionHeaderImportList(header).map(ts_morph_1.NormalizeTypeImport)
+        template,
+        handlebars: (0, load_handlebars_template_1.LoadHandlebarsTemplate)(template, (0, path_1.join)(__dirname, '..', 'schematics', 'accordion', 'templates')),
+        importList: (0, ts_morph_1.NormalizeTypeImportList)(coerceBaseAccordionHeaderImportList(header))
     });
 }
 exports.NormalizeBaseAccordionHeader = NormalizeBaseAccordionHeader;

package/src/lib/accordion-header.js.map

@@ -1 +1 @@
-{"version":3,"file":"accordion-header.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/accordion-header.ts"],"names":[],"mappings":";;;AAAA,6CAOwB;AA8BxB,SAAgB,uBAAuB,CAAC,MAAuB;IAC7D,OAAQ,MAAgC,CAAC,KAAK,KAAK,SAAS,CAAC;AAC/D,CAAC;AAFD,0DAEC;AAED,SAAgB,yBAAyB,CAAC,MAAuB;IAC/D,OAAQ,MAAkC,CAAC,QAAQ,KAAK,SAAS,CAAC;AACpE,CAAC;AAFD,8DAEC;AAED,SAAgB,iCAAiC,CAAC,MAAiC;IACjF,OAAQ,MAA0C,CAAC,KAAK,KAAK,SAAS,CAAC;AACzE,CAAC;AAFD,8EAEC;AAED,SAAgB,mCAAmC,CAAC,MAAiC;IACnF,OAAQ,MAA4C,CAAC,QAAQ,KAAK,SAAS,CAAC;AAC9E,CAAC;AAFD,kFAEC;AAED,SAAS,mCAAmC,CAAC,MAA2B;;IACtE,MAAM,UAAU,GAAiB,MAAA,MAAM,CAAC,UAAU,mCAAI,EAAE,CAAC;IACzD,UAAU,CAAC,IAAI,CAAC;QACd,IAAI,EAAE,0BAA0B;QAChC,eAAe,EAAE,+CAA+C;KACjE,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAgB,4BAA4B,CAAC,MAA2B;IACtE,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,UAAU,EAAE,mCAAmC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,8BAAmB,CAAC;KACjF,CAAC,CAAC;AACL,CAAC;AAJD,oEAIC;AAED,SAAgB,wBAAwB,CAAC,MAAwB;IAC/D,IAAI,MAAM,EAAE;QACV,IAAI,uBAAuB,CAAC,MAAM,CAAC,EAAE;YACnC,OAAO,MAAM,CAAC,MAAM,iCACf,4BAA4B,CAAC,MAAM,CAAC,KACvC,KAAK,EAAE,MAAM,CAAC,KAAK,IACnB,CAAC;SACJ;aAAM,IAAI,yBAAyB,CAAC,MAAM,CAAC,EAAE;YAC5C,OAAO,MAAM,CAAC,MAAM,iCACf,4BAA4B,CAAC,MAAM,CAAC,KACvC,QAAQ,EAAE,IAAA,gCAAqB,EAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAC1D,CAAC;SACJ;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAfD,4DAeC"}
+{"version":3,"file":"accordion-header.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/accordion-header.ts"],"names":[],"mappings":";;;AAAA,6CAQwB;AACxB,+BAA4B;AAC5B,yEAAoE;AAiCpE,SAAgB,uBAAuB,CAAC,MAAuB;IAC7D,OAAQ,MAAgC,CAAC,KAAK,KAAK,SAAS,CAAC;AAC/D,CAAC;AAFD,0DAEC;AAED,SAAgB,yBAAyB,CAAC,MAAuB;IAC/D,OAAQ,MAAkC,CAAC,QAAQ,KAAK,SAAS,CAAC;AACpE,CAAC;AAFD,8DAEC;AAED,SAAgB,iCAAiC,CAAC,MAAiC;IACjF,OAAQ,MAA0C,CAAC,KAAK,KAAK,SAAS,CAAC;AACzE,CAAC;AAFD,8EAEC;AAED,SAAgB,mCAAmC,CAAC,MAAiC;IACnF,OAAQ,MAA4C,CAAC,QAAQ,KAAK,SAAS,CAAC;AAC9E,CAAC;AAFD,kFAEC;AAED,SAAS,mCAAmC,CAAC,MAA2B;;IACtE,MAAM,UAAU,GAAiB,MAAA,MAAM,CAAC,UAAU,mCAAI,EAAE,CAAC;IACzD,UAAU,CAAC,IAAI,CAAC;QACd,IAAI,EAAE,6BAA6B;QACnC,eAAe,EAAE,kBAAkB;KACpC,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAgB,4BAA4B,CAAC,MAA2B;;IACtE,MAAM,QAAQ,GAAG,MAAA,MAAM,CAAC,QAAQ,mCAAI,sBAAsB,CAAC;IAC3D,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,QAAQ;QACR,UAAU,EAAE,IAAA,iDAAsB,EAAC,QAAQ,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAC3G,UAAU,EAAE,IAAA,kCAAuB,EAAC,mCAAmC,CAAC,MAAM,CAAC,CAAC;KACjF,CAAC,CAAC;AACL,CAAC;AAPD,oEAOC;AAED,SAAgB,wBAAwB,CAAC,MAAwB;IAC/D,IAAI,MAAM,EAAE;QACV,IAAI,uBAAuB,CAAC,MAAM,CAAC,EAAE;YACnC,OAAO,MAAM,CAAC,MAAM,iCACf,4BAA4B,CAAC,MAAM,CAAC,KACvC,KAAK,EAAE,MAAM,CAAC,KAAK,IACnB,CAAC;SACJ;aAAM,IAAI,yBAAyB,CAAC,MAAM,CAAC,EAAE;YAC5C,OAAO,MAAM,CAAC,MAAM,iCACf,4BAA4B,CAAC,MAAM,CAAC,KACvC,QAAQ,EAAE,IAAA,gCAAqB,EAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAC1D,CAAC;SACJ;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAfD,4DAeC"}

package/src/lib/accordion-identifier.d.ts

@@ -1,4 +1,8 @@
 import { DataProperty, NormalizedDataProperty } from '@rxap/ts-morph';
+/**
+ * TODO : rename to `IdentifierOptions`
+ * @deprecated rename to `IdentifierOptions`
+ */
 export interface AccordionIdentifier {
     property: DataProperty;
     source: string;

package/src/lib/accordion-identifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"accordion-identifier.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/accordion-identifier.ts"],"names":[],"mappings":";;;AAAA,6CAIwB;AAYxB,SAAgB,4BAA4B,CAAC,UAAgC;IAC3E,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE;QAClJ,OAAO,IAAI,CAAC;KACb;IACD,OAAO;QACL,QAAQ,EAAE,IAAA,gCAAqB,EAAC,UAAU,CAAC,QAAQ,CAAC;QACpD,MAAM,EAAE,UAAU,CAAC,MAAM;KAC1B,CAAC;AACJ,CAAC;AARD,oEAQC"}
+{"version":3,"file":"accordion-identifier.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/accordion-identifier.ts"],"names":[],"mappings":";;;AAAA,6CAIwB;AAgBxB,SAAgB,4BAA4B,CAAC,UAAgC;IAC3E,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE;QAClJ,OAAO,IAAI,CAAC;KACb;IACD,OAAO;QACL,QAAQ,EAAE,IAAA,gCAAqB,EAAC,UAAU,CAAC,QAAQ,CAAC;QACpD,MAAM,EAAE,UAAU,CAAC,MAAM;KAC1B,CAAC;AACJ,CAAC;AARD,oEAQC"}

package/src/lib/accordion-item.d.ts

@@ -1,38 +1,49 @@
-import { DataProperty, NormalizedDataProperty, NormalizedTypeImport, TypeImport } from '@rxap/ts-morph';
+import { DataProperty, NormalizedDataProperty, NormalizedTypeImport, NormalizedUpstreamOptions, TypeImport, UpstreamOptions } from '@rxap/ts-morph';
 import { NonNullableSelected, Normalized } from '@rxap/utilities';
-import { AccordionItemTypes } from './accordion-itme-types';
+import Handlebars from 'handlebars';
+import { AccordionIdentifier, NormalizedAccordionIdentifier } from './accordion-identifier';
+import { AccordionItemKinds } from './accordion-itme-kinds';
 import { DataGridOptions, NormalizedDataGridOptions } from './data-grid-options';
 import { NormalizedTableOptions, TableOptions } from './table-options';
 import { NormalizedTreeTableOptions, TreeTableOptions } from './tree-table-options';
 export interface BaseAccordionItem {
     name: string;
-    type: AccordionItemTypes;
+    kind: AccordionItemKinds;
     modifiers: string[];
     title: string;
     description?: string;
     permission?: string;
     importList?: TypeImport[];
+    template?: string;
+    identifier?: AccordionIdentifier;
+    upstream?: UpstreamOptions;
+    propertyList?: DataProperty[];
 }
-export interface NormalizedBaseAccordionItem extends Readonly<NonNullableSelected<Normalized<BaseAccordionItem>, 'type'>> {
+export interface NormalizedBaseAccordionItem extends Readonly<NonNullableSelected<Normalized<Omit<BaseAccordionItem, 'propertyList'>>, 'kind'>> {
     importList: NormalizedTypeImport[];
+    handlebars: Handlebars.TemplateDelegate<{
+        item: NormalizedBaseAccordionItem;
+    }>;
+    identifier: NormalizedAccordionIdentifier | null;
+    upstream: NormalizedUpstreamOptions | null;
+    propertyList: Array<NormalizedDataProperty>;
 }
 export declare function NormalizeBaseAccordionItem(item: BaseAccordionItem): NormalizedBaseAccordionItem;
 export interface DataGridAccordionItem extends BaseAccordionItem {
-    type: AccordionItemTypes.DataGrid;
+    type: AccordionItemKinds.DataGrid;
     dataGrid: DataGridOptions;
 }
 export declare function IsDataGridAccordionItem(item: BaseAccordionItem): item is DataGridAccordionItem;
-export interface NormalizedDataGridAccordionItem extends Readonly<Normalized<Omit<DataGridAccordionItem, 'dataGrid'>>> {
+export interface NormalizedDataGridAccordionItem extends Readonly<Normalized<Omit<DataGridAccordionItem, 'dataGrid' | 'propertyList'>> & NormalizedBaseAccordionItem> {
     dataGrid: NormalizedDataGridOptions;
-    importList: NormalizedTypeImport[];
 }
 export declare function IsNormalizedDataGridAccordionItem(item: NormalizedBaseAccordionItem): item is NormalizedDataGridAccordionItem;
 export declare function NormalizeDataGridAccordionItem(item: DataGridAccordionItem): NormalizedDataGridAccordionItem;
 export interface SwitchAccordionItem extends BaseAccordionItem {
-    type: AccordionItemTypes.Switch;
+    type: AccordionItemKinds.Switch;
     switch: {
         property: DataProperty;
-        case: Array<{
+        case?: Array<{
             test: string;
             itemList: Array<Omit<BaseAccordionItem, 'type'> & Partial<BaseAccordionItem>>;
         }>;
@@ -42,7 +53,7 @@ export interface SwitchAccordionItem extends BaseAccordionItem {
     };
 }
 export declare function IsSwitchAccordionItem(item: BaseAccordionItem): item is SwitchAccordionItem;
-export interface NormalizedSwitchAccordionItem extends Readonly<Normalized<Omit<SwitchAccordionItem, 'switch'>>> {
+export interface NormalizedSwitchAccordionItem extends Readonly<Normalized<Omit<SwitchAccordionItem, 'switch' | 'propertyList'>> & NormalizedBaseAccordionItem> {
     switch: Readonly<{
         property: NormalizedDataProperty;
         case: ReadonlyArray<{
@@ -53,29 +64,26 @@ export interface NormalizedSwitchAccordionItem extends Readonly<Normalized<Omit<
             itemList: ReadonlyArray<NormalizedBaseAccordionItem>;
         }> | null;
     }>;
-    importList: NormalizedTypeImport[];
 }
 export declare function IsNormalizedSwitchAccordionItem(item: NormalizedBaseAccordionItem): item is NormalizedSwitchAccordionItem;
 export declare function NormalizeSwitchAccordionItem(item: Readonly<SwitchAccordionItem>): NormalizedSwitchAccordionItem;
 export interface TableAccordionItem extends BaseAccordionItem {
-    type: AccordionItemTypes.Table;
+    type: AccordionItemKinds.Table;
     table: TableOptions;
 }
 export declare function IsTableAccordionItem(item: BaseAccordionItem): item is TableAccordionItem;
-export interface NormalizedTableAccordionItem extends Readonly<Normalized<Omit<TableAccordionItem, 'table'>>> {
+export interface NormalizedTableAccordionItem extends Readonly<Normalized<Omit<TableAccordionItem, 'table' | 'propertyList'>> & NormalizedBaseAccordionItem> {
     table: NormalizedTableOptions;
-    importList: NormalizedTypeImport[];
 }
 export declare function IsNormalizedTableAccordionItem(item: NormalizedBaseAccordionItem): item is NormalizedTableAccordionItem;
 export declare function NormalizeTableAccordionItem(item: TableAccordionItem): NormalizedTableAccordionItem;
 export interface TreeTableAccordionItem extends BaseAccordionItem {
-    type: AccordionItemTypes.TreeTable;
+    type: AccordionItemKinds.TreeTable;
     table: TreeTableOptions;
 }
 export declare function IsTreeTableAccordionItem(item: BaseAccordionItem): item is TreeTableAccordionItem;
-export interface NormalizedTreeTableAccordionItem extends Readonly<Normalized<Omit<TreeTableAccordionItem, 'table'>>> {
+export interface NormalizedTreeTableAccordionItem extends Readonly<Normalized<Omit<TreeTableAccordionItem, 'table' | 'propertyList'>> & NormalizedBaseAccordionItem> {
     table: NormalizedTreeTableOptions;
-    importList: NormalizedTypeImport[];
 }
 export declare function IsNormalizedTreeTableAccordionItem(item: NormalizedBaseAccordionItem): item is NormalizedTreeTableAccordionItem;
 export declare function NormalizeTreeTableAccordionItem(item: TreeTableAccordionItem): NormalizedTreeTableAccordionItem;

package/src/lib/accordion-item.js

@@ -4,61 +4,84 @@ exports.NormalizeAccordionItemList = exports.NormalizeAccordionItem = exports.No
 const schematics_1 = require("@angular-devkit/schematics");
 const ts_morph_1 = require("@rxap/ts-morph");
 const utilities_1 = require("@rxap/utilities");
-const accordion_itme_types_1 = require("./accordion-itme-types");
+const path_1 = require("path");
+const accordion_identifier_1 = require("./accordion-identifier");
+const accordion_itme_kinds_1 = require("./accordion-itme-kinds");
 const data_grid_options_1 = require("./data-grid-options");
+const load_handlebars_template_1 = require("./load-handlebars-template");
 const table_options_1 = require("./table-options");
 const tree_table_options_1 = require("./tree-table-options");
 function NormalizeBaseAccordionItem(item) {
-    var _a, _b, _c, _d, _e;
-    let type = accordion_itme_types_1.AccordionItemTypes.Panel;
+    var _a, _b, _c, _d, _e, _f, _g;
+    let kind = accordion_itme_kinds_1.AccordionItemKinds.Default;
     let modifiers = [];
     let title;
     let description = null;
     let permission = null;
     const name = item.name;
-    type = (_a = item.type) !== null && _a !== void 0 ? _a : type;
-    modifiers = (_b = item.modifiers) !== null && _b !== void 0 ? _b : modifiers;
+    kind = (_a = item.kind) !== null && _a !== void 0 ? _a : kind;
+    const template = (_b = item.template) !== null && _b !== void 0 ? _b : kind + '-accordion-item.hbs';
+    modifiers = (_c = item.modifiers) !== null && _c !== void 0 ? _c : modifiers;
     title = item.title;
-    description = (_c = item.description) !== null && _c !== void 0 ? _c : description;
-    permission = (_d = item.permission) !== null && _d !== void 0 ? _d : permission;
-    const importList = (_e = item.importList) !== null && _e !== void 0 ? _e : [];
+    description = (_d = item.description) !== null && _d !== void 0 ? _d : description;
+    permission = (_e = item.permission) !== null && _e !== void 0 ? _e : permission;
+    const importList = (_f = item.importList) !== null && _f !== void 0 ? _f : [];
     importList.push({
         name: `${(0, utilities_1.classify)(item.name)}PanelComponent`,
         moduleSpecifier: `./${(0, utilities_1.dasherize)(item.name)}-panel/${(0, utilities_1.dasherize)(item.name)}-panel.component`
     });
     title !== null && title !== void 0 ? title : (title = (0, utilities_1.dasherize)(name).split('-').map(fragment => (0, utilities_1.capitalize)(fragment)).join(' '));
-    if (!(0, accordion_itme_types_1.IsAccordionItemType)(type)) {
-        throw new schematics_1.SchematicsException(`The item type '${type}' for item '${name}' is not supported`);
+    if (!(0, accordion_itme_kinds_1.IsAccordionItemKind)(kind)) {
+        throw new schematics_1.SchematicsException(`The item type '${kind}' for item '${name}' is not supported`);
+    }
+    const propertyList = (_g = item.propertyList) !== null && _g !== void 0 ? _g : [];
+    const identifier = (0, accordion_identifier_1.NormalizeAccordionIdentifier)(item.identifier);
+    if (identifier) {
+        (0, utilities_1.CoerceArrayItems)(propertyList, [identifier.property], (a, b) => a.name === b.name, true);
     }
     return Object.freeze({
+        propertyList: (0, ts_morph_1.NormalizeDataPropertyList)(propertyList),
+        upstream: (0, ts_morph_1.NormalizeUpstreamOptions)(item.upstream),
+        identifier,
         title,
         description,
         name: (0, utilities_1.dasherize)(name),
-        type,
+        kind,
         modifiers,
         permission,
-        importList: importList.map(ts_morph_1.NormalizeTypeImport),
+        importList: (0, ts_morph_1.NormalizeTypeImportList)(importList),
+        template,
+        handlebars: (0, load_handlebars_template_1.LoadHandlebarsTemplate)(template, (0, path_1.join)(__dirname, '..', 'schematics', 'accordion', 'templates')),
     });
 }
 exports.NormalizeBaseAccordionItem = NormalizeBaseAccordionItem;
 function IsDataGridAccordionItem(item) {
-    return item.type === accordion_itme_types_1.AccordionItemTypes.DataGrid;
+    return item.kind === accordion_itme_kinds_1.AccordionItemKinds.DataGrid;
 }
 exports.IsDataGridAccordionItem = IsDataGridAccordionItem;
 function IsNormalizedDataGridAccordionItem(item) {
-    return item.type === accordion_itme_types_1.AccordionItemTypes.DataGrid;
+    return item.kind === accordion_itme_kinds_1.AccordionItemKinds.DataGrid;
 }
 exports.IsNormalizedDataGridAccordionItem = IsNormalizedDataGridAccordionItem;
 function NormalizeDataGridAccordionItem(item) {
-    return Object.freeze(Object.assign(Object.assign({}, NormalizeBaseAccordionItem(item)), { type: accordion_itme_types_1.AccordionItemTypes.DataGrid, dataGrid: (0, data_grid_options_1.NormalizeDataGridOptions)(item.dataGrid) }));
+    var _a, _b;
+    const dataGrid = item.dataGrid;
+    const base = NormalizeBaseAccordionItem(item);
+    (_a = dataGrid.propertyList) !== null && _a !== void 0 ? _a : (dataGrid.propertyList = []);
+    (0, utilities_1.CoerceArrayItems)(dataGrid.propertyList, base.propertyList, {
+        compareTo: (a, b) => a.name === b.name,
+        replace: true,
+    });
+    (_b = dataGrid.inCard) !== null && _b !== void 0 ? _b : (dataGrid.inCard = false);
+    return Object.freeze(Object.assign(Object.assign({}, base), { type: accordion_itme_kinds_1.AccordionItemKinds.DataGrid, dataGrid: (0, data_grid_options_1.NormalizeDataGridOptions)(dataGrid) }));
 }
 exports.NormalizeDataGridAccordionItem = NormalizeDataGridAccordionItem;
 function IsSwitchAccordionItem(item) {
-    return item.type === accordion_itme_types_1.AccordionItemTypes.Switch;
+    return item.kind === accordion_itme_kinds_1.AccordionItemKinds.Switch;
 }
 exports.IsSwitchAccordionItem = IsSwitchAccordionItem;
 function IsNormalizedSwitchAccordionItem(item) {
-    return item.type === accordion_itme_types_1.AccordionItemTypes.Switch;
+    return item.kind === accordion_itme_kinds_1.AccordionItemKinds.Switch;
 }
 exports.IsNormalizedSwitchAccordionItem = IsNormalizedSwitchAccordionItem;
 function flattenItemList(itemList) {
@@ -93,17 +116,21 @@ function NormalizeSwitchAccordionItem(item) {
     const base = NormalizeBaseAccordionItem(item);
     const { name } = base;
     const { switch: switchOptions } = item;
-    const { property, case: caseList, defaultCase } = switchOptions;
+    const { property, case: caseList = [], defaultCase } = switchOptions;
+    const normalizedProperty = (0, ts_morph_1.NormalizeDataProperty)(property, 'string');
     const normalizeSwitch = Object.freeze({
-        property: (0, ts_morph_1.NormalizeDataProperty)(property, 'string'),
+        property: normalizedProperty,
         case: Object.freeze(caseList.map((item) => ({
-            test: item.test,
+            test: normalizedProperty.name === 'string' ? `'${item.test}'` : item.test,
             itemList: NormalizeAccordionItemList(item.itemList.map((item) => (Object.assign(Object.assign({}, item), { name: (0, utilities_1.CoercePrefix)((0, utilities_1.dasherize)(item.name), (0, utilities_1.dasherize)(name) + '-') })))),
         }))),
-        defaultCase: defaultCase ? {
+        defaultCase: defaultCase && Object.keys(defaultCase).length ? {
             itemList: NormalizeAccordionItemList(defaultCase.itemList.map((item) => (Object.assign(Object.assign({}, item), { name: (0, utilities_1.CoercePrefix)((0, utilities_1.dasherize)(item.name), (0, utilities_1.dasherize)(name) + '-') })))),
         } : null,
     });
+    if (normalizeSwitch.case.length === 0 && !normalizeSwitch.defaultCase) {
+        throw new schematics_1.SchematicsException(`The switch '${name}' has no cases or default case. At least one case or default case is required.`);
+    }
     const importList = (_a = item.importList) !== null && _a !== void 0 ? _a : [];
     const itemList = flattenItemListFromSwitch(normalizeSwitch);
     for (const innerItem of itemList) {
@@ -113,47 +140,59 @@ function NormalizeSwitchAccordionItem(item) {
         name: 'NgSwitch',
         moduleSpecifier: '@angular/common',
     });
-    return Object.freeze(Object.assign(Object.assign({}, base), { importList: importList.map(ts_morph_1.NormalizeTypeImport), type: accordion_itme_types_1.AccordionItemTypes.Switch, switch: normalizeSwitch }));
+    if (normalizeSwitch.defaultCase) {
+        importList.push({
+            name: 'NgSwitchDefault',
+            moduleSpecifier: '@angular/common',
+        });
+    }
+    if (normalizeSwitch.case.length) {
+        importList.push({
+            name: 'NgSwitchCase',
+            moduleSpecifier: '@angular/common',
+        });
+    }
+    return Object.freeze(Object.assign(Object.assign({}, base), { importList: (0, ts_morph_1.NormalizeTypeImportList)(importList), type: accordion_itme_kinds_1.AccordionItemKinds.Switch, switch: normalizeSwitch }));
 }
 exports.NormalizeSwitchAccordionItem = NormalizeSwitchAccordionItem;
 function IsTableAccordionItem(item) {
-    return item.type === accordion_itme_types_1.AccordionItemTypes.Table;
+    return item.kind === accordion_itme_kinds_1.AccordionItemKinds.Table;
 }
 exports.IsTableAccordionItem = IsTableAccordionItem;
 function IsNormalizedTableAccordionItem(item) {
-    return item.type === accordion_itme_types_1.AccordionItemTypes.Table;
+    return item.kind === accordion_itme_kinds_1.AccordionItemKinds.Table;
 }
 exports.IsNormalizedTableAccordionItem = IsNormalizedTableAccordionItem;
 function NormalizeTableAccordionItem(item) {
     const base = NormalizeBaseAccordionItem(item);
     const { name } = base;
-    return Object.freeze(Object.assign(Object.assign({}, base), { type: accordion_itme_types_1.AccordionItemTypes.Table, table: (0, table_options_1.NormalizeTableOptions)(item.table, name) }));
+    return Object.freeze(Object.assign(Object.assign({}, base), { type: accordion_itme_kinds_1.AccordionItemKinds.Table, table: (0, table_options_1.NormalizeTableOptions)(item.table, name) }));
 }
 exports.NormalizeTableAccordionItem = NormalizeTableAccordionItem;
 function IsTreeTableAccordionItem(item) {
-    return item.type === accordion_itme_types_1.AccordionItemTypes.TreeTable;
+    return item.kind === accordion_itme_kinds_1.AccordionItemKinds.TreeTable;
 }
 exports.IsTreeTableAccordionItem = IsTreeTableAccordionItem;
 function IsNormalizedTreeTableAccordionItem(item) {
-    return item.type === accordion_itme_types_1.AccordionItemTypes.TreeTable;
+    return item.kind === accordion_itme_kinds_1.AccordionItemKinds.TreeTable;
 }
 exports.IsNormalizedTreeTableAccordionItem = IsNormalizedTreeTableAccordionItem;
 function NormalizeTreeTableAccordionItem(item) {
     const base = NormalizeBaseAccordionItem(item);
     const { name } = base;
-    return Object.freeze(Object.assign(Object.assign({}, base), { type: accordion_itme_types_1.AccordionItemTypes.TreeTable, table: (0, tree_table_options_1.NormalizeTreeTableOptions)(item.table, name) }));
+    return Object.freeze(Object.assign(Object.assign({}, base), { type: accordion_itme_kinds_1.AccordionItemKinds.TreeTable, table: (0, tree_table_options_1.NormalizeTreeTableOptions)(item.table, name) }));
 }
 exports.NormalizeTreeTableAccordionItem = NormalizeTreeTableAccordionItem;
 // endregion
 function NormalizeAccordionItem(item) {
-    switch (item.type) {
-        case accordion_itme_types_1.AccordionItemTypes.DataGrid:
+    switch (item.kind) {
+        case accordion_itme_kinds_1.AccordionItemKinds.DataGrid:
             return NormalizeDataGridAccordionItem(item);
-        case accordion_itme_types_1.AccordionItemTypes.Switch:
+        case accordion_itme_kinds_1.AccordionItemKinds.Switch:
             return NormalizeSwitchAccordionItem(item);
-        case accordion_itme_types_1.AccordionItemTypes.Table:
+        case accordion_itme_kinds_1.AccordionItemKinds.Table:
             return NormalizeTableAccordionItem(item);
-        case accordion_itme_types_1.AccordionItemTypes.TreeTable:
+        case accordion_itme_kinds_1.AccordionItemKinds.TreeTable:
             return NormalizeTreeTableAccordionItem(item);
         default:
             return NormalizeBaseAccordionItem(item);