@rxap/schematic-angular 18.2.1-dev.1 → 18.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,18 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [18.2.2](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@18.2.1...@rxap/schematic-angular@18.2.2) (2024-06-30)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- support custom table filter types ([5b7c14a](https://gitlab.com/rxap/packages/commit/5b7c14af7da3790b92aa25c0bfe2f4e59f5819bb))
|
|
11
|
+
|
|
12
|
+
## [18.2.1](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@18.2.1-dev.1...@rxap/schematic-angular@18.2.1) (2024-06-30)
|
|
13
|
+
|
|
14
|
+
### Bug Fixes
|
|
15
|
+
|
|
16
|
+
- support custom table filter types ([84a88cb](https://gitlab.com/rxap/packages/commit/84a88cb88348210bf90ec67651ddeeeaaa3bcd2f))
|
|
17
|
+
|
|
6
18
|
## [18.2.1-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@18.2.1-dev.0...@rxap/schematic-angular@18.2.1-dev.1) (2024-06-30)
|
|
7
19
|
|
|
8
20
|
### Bug Fixes
|
package/package.json
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "18.2.
|
|
2
|
+
"version": "18.2.2",
|
|
3
3
|
"name": "@rxap/schematic-angular",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@angular-devkit/core": "18.0.2",
|
|
7
7
|
"@angular-devkit/schematics": "18.0.2",
|
|
8
8
|
"@nx/devkit": "19.3.2",
|
|
9
|
-
"@rxap/schematics-ts-morph": "^18.1.2
|
|
10
|
-
"@rxap/schematics-utilities": "^18.0.4
|
|
11
|
-
"@rxap/ts-morph": "^1.4.2
|
|
12
|
-
"@rxap/utilities": "^16.2.5
|
|
13
|
-
"@rxap/workspace-ts-morph": "^19.1.2
|
|
14
|
-
"@rxap/workspace-utilities": "^19.3.1
|
|
9
|
+
"@rxap/schematics-ts-morph": "^18.1.2",
|
|
10
|
+
"@rxap/schematics-utilities": "^18.0.4",
|
|
11
|
+
"@rxap/ts-morph": "^1.4.2",
|
|
12
|
+
"@rxap/utilities": "^16.2.5",
|
|
13
|
+
"@rxap/workspace-ts-morph": "^19.1.2",
|
|
14
|
+
"@rxap/workspace-utilities": "^19.3.1",
|
|
15
15
|
"colors": "1.4.0",
|
|
16
16
|
"handlebars": "4.7.8",
|
|
17
17
|
"ts-morph": "18.0.0",
|
|
@@ -44,6 +44,6 @@
|
|
|
44
44
|
},
|
|
45
45
|
"schematics": "./collection.json",
|
|
46
46
|
"type": "commonjs",
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "cda2641edb2013901605be2468b63bb3d8830d32",
|
|
48
48
|
"main": "./src/index.js"
|
|
49
49
|
}
|
|
@@ -18,11 +18,20 @@ function UsePickFromTableInterfaceAsFormTypeRule(options) {
|
|
|
18
18
|
interfaceDeclaration.remove();
|
|
19
19
|
}
|
|
20
20
|
const type = w => {
|
|
21
|
-
|
|
22
|
-
|
|
21
|
+
const hasFilterWithAlternativeColumnType = (c) => { var _a, _b; return c.hasFilter && ((_a = c.filterControl) === null || _a === void 0 ? void 0 : _a.type.name) && ((_b = c.filterControl) === null || _b === void 0 ? void 0 : _b.type.name) !== c.type.name; };
|
|
22
|
+
if (columnList.some(c => c.hasFilter && !hasFilterWithAlternativeColumnType(c))) {
|
|
23
|
+
w.write(`Pick<${tableInterfaceName}, ${columnList.filter(c => c.hasFilter && !hasFilterWithAlternativeColumnType(c))
|
|
23
24
|
.map(c => `'${(0, utilities_1.camelize)(c.name)}'`)
|
|
24
25
|
.join(' | ')}>`);
|
|
25
26
|
}
|
|
27
|
+
if (columnList.some(c => c.hasFilter && !hasFilterWithAlternativeColumnType(c))) {
|
|
28
|
+
w.write(' & ');
|
|
29
|
+
}
|
|
30
|
+
if (columnList.some(hasFilterWithAlternativeColumnType)) {
|
|
31
|
+
ts_morph_2.Writers.objectType({
|
|
32
|
+
properties: columnList.filter(hasFilterWithAlternativeColumnType).map(c => { var _a; return ({ name: (0, utilities_1.camelize)(c.name), type: (_a = c.filterControl) === null || _a === void 0 ? void 0 : _a.type.name }); }),
|
|
33
|
+
})(w);
|
|
34
|
+
}
|
|
26
35
|
if (filterList.length && columnList.some(c => c.hasFilter)) {
|
|
27
36
|
w.write(' & ');
|
|
28
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-pick-from-table-interface-as-form-type.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/use-pick-from-table-interface-as-form-type.ts"],"names":[],"mappings":";;;AACA,mEAEmC;AACnC,qEAA0D;AAC1D,6CAA+C;AAC/C,+CAIyB;AAEzB,uCAGkB;AAClB,oFAA+E;AAa/E,SAAgB,uCAAuC,CACrD,OAAuD;IAEvD,MAAM,EACJ,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,MAAM,GAAG,OAAO,EAChB,UAAU,GACX,GAAG,OAAO,CAAC;IAEZ,MAAM,SAAS,GAAG,IAAA,mCAAY,EAAC,IAAA,oBAAQ,EAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IAC3D,MAAM,aAAa,GAAG,IAAK,SAAU,EAAE,CAAC;IACxC,MAAM,kBAAkB,GAAG,IAAK,IAAA,oBAAQ,EAAC,IAAI,CAAE,GAAG,IAAA,oBAAQ,EAAC,MAAM,CAAC,EAAE,CAAC;IAErE,OAAO,IAAA,wDAAkC,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,CAAE,UAAU,CAAE,EAAE,EAAE;QAE7E,MAAM,oBAAoB,GAAG,UAAU,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QACpE,IAAI,oBAAoB,EAAE,CAAC;YACzB,oBAAoB,CAAC,MAAM,EAAE,CAAC;QAChC,CAAC;QAED,MAAM,IAAI,GAAmB,CAAC,CAAC,EAAE;YAC/B,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"use-pick-from-table-interface-as-form-type.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/use-pick-from-table-interface-as-form-type.ts"],"names":[],"mappings":"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"}
|