@rxap/schematic-angular 16.2.0-dev.26 → 16.2.0-dev.27
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 +6 -0
- package/README.md +1 -1
- package/package.json +4 -4
- package/src/lib/coerce-minimum-table-component.js +1 -1
- package/src/lib/coerce-minimum-table-component.js.map +1 -1
- package/src/lib/form/control/table-select-form-control.d.ts +2 -2
- package/src/lib/form/control/table-select-form-control.js +5 -4
- package/src/lib/form/control/table-select-form-control.js.map +1 -1
- package/src/lib/table-column.d.ts +0 -6
- package/src/lib/table-column.js +11 -24
- package/src/lib/table-column.js.map +1 -1
- package/src/lib/merge-with-column-list.d.ts +0 -3
- package/src/lib/merge-with-column-list.js +0 -20
- package/src/lib/merge-with-column-list.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,12 @@
|
|
|
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
|
+
# [16.2.0-dev.27](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.26...@rxap/schematic-angular@16.2.0-dev.27) (2024-03-07)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- ensure the column name is camelized ([08edb88](https://gitlab.com/rxap/packages/commit/08edb88eb0b68309eceebc2b5b9bf7824b687eaf))
|
|
11
|
+
|
|
6
12
|
# [16.2.0-dev.26](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.25...@rxap/schematic-angular@16.2.0-dev.26) (2024-03-07)
|
|
7
13
|
|
|
8
14
|
### Bug Fixes
|
package/README.md
CHANGED
|
@@ -17,5 +17,5 @@ yarn add @rxap/schematic-angular
|
|
|
17
17
|
```
|
|
18
18
|
**Install peer dependencies:**
|
|
19
19
|
```bash
|
|
20
|
-
yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-ts-morph@^16.1.0-dev.
|
|
20
|
+
yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-ts-morph@^16.1.0-dev.14 @rxap/schematics-utilities@^16.0.1-dev.1 @rxap/ts-morph@^1.1.0-dev.13 @rxap/utilities@^16.1.0-dev.6 colors@^1.4.0 handlebars@^4.7.7 ts-morph@^18.0.0 tslib@2.6.2
|
|
21
21
|
```
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "16.2.0-dev.
|
|
2
|
+
"version": "16.2.0-dev.27",
|
|
3
3
|
"name": "@rxap/schematic-angular",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"peerDependencies": {
|
|
13
13
|
"@angular-devkit/core": "^16.1.4",
|
|
14
14
|
"@angular-devkit/schematics": "^16.1.4",
|
|
15
|
-
"@rxap/schematics-ts-morph": "^16.1.0-dev.
|
|
15
|
+
"@rxap/schematics-ts-morph": "^16.1.0-dev.14",
|
|
16
16
|
"@rxap/schematics-utilities": "^16.0.1-dev.1",
|
|
17
17
|
"@rxap/ts-morph": "^1.1.0-dev.13",
|
|
18
18
|
"@rxap/utilities": "^16.1.0-dev.6",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"packageGroup": [
|
|
46
46
|
{
|
|
47
47
|
"package": "@rxap/schematics-ts-morph",
|
|
48
|
-
"version": "16.1.0-dev.
|
|
48
|
+
"version": "16.1.0-dev.14"
|
|
49
49
|
},
|
|
50
50
|
{
|
|
51
51
|
"package": "@rxap/schematics-utilities",
|
|
@@ -76,7 +76,7 @@
|
|
|
76
76
|
},
|
|
77
77
|
"schematics": "./collection.json",
|
|
78
78
|
"type": "commonjs",
|
|
79
|
-
"gitHead": "
|
|
79
|
+
"gitHead": "f790a1aed907d6fc1c8f617aa8d507503cebc1c8",
|
|
80
80
|
"main": "./src/index.js",
|
|
81
81
|
"types": "./src/index.d.ts"
|
|
82
82
|
}
|
|
@@ -51,7 +51,7 @@ function CoerceMinimumTableComponentRule(options) {
|
|
|
51
51
|
if (columnList.some(column => column.hasFilter)) {
|
|
52
52
|
(0, ts_morph_1.CoerceComponentImport)(classDeclaration, { name: 'TableFilterModule', moduleSpecifier: '@rxap/material-table-system' });
|
|
53
53
|
}
|
|
54
|
-
if (columnList.some(column => column.
|
|
54
|
+
if (columnList.some(column => { var _a; return (_a = column.source) === null || _a === void 0 ? void 0 : _a.includes('.'); })) {
|
|
55
55
|
(0, ts_morph_1.CoerceComponentImport)(classDeclaration, { name: 'GetFromObjectPipe', moduleSpecifier: '@rxap/pipes' });
|
|
56
56
|
}
|
|
57
57
|
// endregion
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-minimum-table-component.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/coerce-minimum-table-component.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"coerce-minimum-table-component.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/coerce-minimum-table-component.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,8 @@ import { NormalizedTableColumn, TableColumn } from '../../table-column';
|
|
|
6
6
|
import { NormalizedBaseFormControl } from './base-form-control';
|
|
7
7
|
import { FormControlKinds } from './form-control-kind';
|
|
8
8
|
import { FormFieldFormControl, NormalizedFormFieldFormControl } from './form-field-form-control';
|
|
9
|
-
export type TableSelectColumn = Pick<TableColumn, 'name' | 'title' | 'hasFilter' | 'kind'
|
|
10
|
-
export type NormalizedTableSelectColumn = Pick<NormalizedTableColumn, 'name' | 'title' | 'hasFilter' | 'kind'
|
|
9
|
+
export type TableSelectColumn = Pick<TableColumn, 'name' | 'title' | 'hasFilter' | 'kind'> & DataProperty;
|
|
10
|
+
export type NormalizedTableSelectColumn = Pick<NormalizedTableColumn, 'name' | 'title' | 'hasFilter' | 'kind'> & NormalizedDataProperty;
|
|
11
11
|
export declare function NormalizeTableSelectColumn(column: TableSelectColumn): NormalizedTableSelectColumn;
|
|
12
12
|
export interface TableSelectToFunction {
|
|
13
13
|
property: DataProperty;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NormalizeTableSelectFormControl = exports.IsNormalizedTableSelectFormControl = exports.NormalizeTableSelectToFunction = exports.NormalizeTableSelectColumn = void 0;
|
|
4
|
+
const schematics_1 = require("@angular-devkit/schematics");
|
|
4
5
|
const ts_morph_1 = require("@rxap/ts-morph");
|
|
5
6
|
const utilities_1 = require("@rxap/utilities");
|
|
6
7
|
const accordion_identifier_1 = require("../../accordion-identifier");
|
|
@@ -10,12 +11,12 @@ const form_control_kind_1 = require("./form-control-kind");
|
|
|
10
11
|
const form_field_form_control_1 = require("./form-field-form-control");
|
|
11
12
|
function NormalizeTableSelectColumn(column) {
|
|
12
13
|
var _a, _b, _c, _d;
|
|
13
|
-
|
|
14
|
+
if (!column.name) {
|
|
15
|
+
throw new schematics_1.SchematicsException('The column name is required');
|
|
16
|
+
}
|
|
14
17
|
const kind = (_a = column.kind) !== null && _a !== void 0 ? _a : table_column_1.TableColumnKind.DEFAULT;
|
|
15
18
|
const type = (0, table_column_1.GuessColumnTypeType)(kind, (_b = column.type) !== null && _b !== void 0 ? _b : 'unknown');
|
|
16
|
-
return Object.freeze(Object.assign(Object.assign({}, (0, ts_morph_1.NormalizeDataProperty)(Object.assign(Object.assign({}, column), { name,
|
|
17
|
-
type }))), { title: (_c = column.title) !== null && _c !== void 0 ? _c : (0, utilities_1.dasherize)(name).split('-').map(part => (0, utilities_1.capitalize)(part)).join(' '), hasFilter: (_d = column.hasFilter) !== null && _d !== void 0 ? _d : false, kind,
|
|
18
|
-
propertyPath }));
|
|
19
|
+
return Object.freeze(Object.assign(Object.assign({}, (0, ts_morph_1.NormalizeDataProperty)(Object.assign(Object.assign({}, column), { type }))), { title: (_c = column.title) !== null && _c !== void 0 ? _c : (0, table_column_1.TableColumnNameToTitle)(column.name), hasFilter: (_d = column.hasFilter) !== null && _d !== void 0 ? _d : false, kind }));
|
|
19
20
|
}
|
|
20
21
|
exports.NormalizeTableSelectColumn = NormalizeTableSelectColumn;
|
|
21
22
|
function NormalizeTableSelectToFunction(toFunction, columnList, defaultType = 'unknown') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table-select-form-control.js","sourceRoot":"","sources":["../../../../../../../../packages/schematic/angular/src/lib/form/control/table-select-form-control.ts"],"names":[],"mappings":";;;AAAA,6CAQwB;AACxB,+
|
|
1
|
+
{"version":3,"file":"table-select-form-control.js","sourceRoot":"","sources":["../../../../../../../../packages/schematic/angular/src/lib/form/control/table-select-form-control.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,6 @@ export interface TableColumn extends DataProperty {
|
|
|
39
39
|
hasFilter?: boolean;
|
|
40
40
|
withoutTitle?: boolean;
|
|
41
41
|
title?: string;
|
|
42
|
-
propertyPath?: string;
|
|
43
42
|
hidden?: boolean;
|
|
44
43
|
active?: boolean;
|
|
45
44
|
inactive?: boolean;
|
|
@@ -57,7 +56,6 @@ export interface TableColumn extends DataProperty {
|
|
|
57
56
|
export type NormalizedTableColumnPipe = NormalizedTypeImport;
|
|
58
57
|
export interface NormalizedTableColumn extends Readonly<Normalized<Omit<TableColumn, 'pipeList' | 'importList' | 'filterControl'>> & NormalizedDataProperty> {
|
|
59
58
|
type: NormalizedTypeImport;
|
|
60
|
-
propertyPath: string;
|
|
61
59
|
pipeList: ReadonlyArray<NormalizedTableColumnPipe>;
|
|
62
60
|
modifiers: TableColumnModifier[];
|
|
63
61
|
importList: ReadonlyArray<NormalizedTypeImport>;
|
|
@@ -76,10 +74,6 @@ export interface NormalizedTableColumn extends Readonly<Normalized<Omit<TableCol
|
|
|
76
74
|
filterName: string;
|
|
77
75
|
}
|
|
78
76
|
export declare function GuessColumnTypeType(kind: TableColumnKind, type?: string | TypeImport): string | TypeImport;
|
|
79
|
-
export declare function TableColumnNameToPropertyPath(name: string, propertyPath?: string | null | undefined): {
|
|
80
|
-
name: string;
|
|
81
|
-
propertyPath: string;
|
|
82
|
-
};
|
|
83
77
|
export declare function TableColumnNameToTitle(name: string): string;
|
|
84
78
|
export declare function NormalizeTableColumn(column: Readonly<TableColumn>): NormalizedTableColumn;
|
|
85
79
|
export declare function NormalizeTableColumnList(columnList?: ReadonlyArray<Readonly<TableColumn>>): ReadonlyArray<NormalizedTableColumn>;
|
package/src/lib/table-column.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.NormalizeTableColumnList = exports.NormalizeTableColumn = exports.TableColumnNameToTitle = exports.
|
|
3
|
+
exports.NormalizeTableColumnList = exports.NormalizeTableColumn = exports.TableColumnNameToTitle = exports.GuessColumnTypeType = exports.IsTableColumnSticky = exports.TableColumnSticky = exports.IsTableColumnKind = exports.TableColumnKind = exports.IsTableColumnModifier = exports.TableColumnModifier = void 0;
|
|
4
|
+
const schematics_1 = require("@angular-devkit/schematics");
|
|
4
5
|
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
5
6
|
const ts_morph_1 = require("@rxap/ts-morph");
|
|
6
7
|
const utilities_1 = require("@rxap/utilities");
|
|
@@ -180,22 +181,6 @@ function GuessColumnTypeType(kind, type) {
|
|
|
180
181
|
return type;
|
|
181
182
|
}
|
|
182
183
|
exports.GuessColumnTypeType = GuessColumnTypeType;
|
|
183
|
-
function TableColumnNameToPropertyPath(name, propertyPath = null) {
|
|
184
|
-
var _a, _b;
|
|
185
|
-
const namePrefix = (_b = (_a = name.match(/^(_+)/)) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : '';
|
|
186
|
-
propertyPath !== null && propertyPath !== void 0 ? propertyPath : (propertyPath = name
|
|
187
|
-
.replace(/\?\./g, '.')
|
|
188
|
-
.split('.')
|
|
189
|
-
.map((part) => (0, schematics_utilities_1.camelize)(part))
|
|
190
|
-
.join('?.'));
|
|
191
|
-
name = (0, schematics_utilities_1.dasherize)(name.replace(/\??\./g, '_'));
|
|
192
|
-
if (namePrefix) {
|
|
193
|
-
name = namePrefix + name;
|
|
194
|
-
propertyPath = namePrefix + propertyPath;
|
|
195
|
-
}
|
|
196
|
-
return { name, propertyPath };
|
|
197
|
-
}
|
|
198
|
-
exports.TableColumnNameToPropertyPath = TableColumnNameToPropertyPath;
|
|
199
184
|
function TableColumnNameToTitle(name) {
|
|
200
185
|
return (0, schematics_utilities_1.dasherize)(name)
|
|
201
186
|
.replace(/_/g, '-')
|
|
@@ -206,10 +191,12 @@ function TableColumnNameToTitle(name) {
|
|
|
206
191
|
exports.TableColumnNameToTitle = TableColumnNameToTitle;
|
|
207
192
|
function NormalizeTableColumn(column) {
|
|
208
193
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
|
|
209
|
-
|
|
194
|
+
if (!column.name) {
|
|
195
|
+
throw new schematics_1.SchematicsException('The column name is required');
|
|
196
|
+
}
|
|
210
197
|
const modifiers = (_a = column.modifiers) !== null && _a !== void 0 ? _a : [];
|
|
211
198
|
let hasFilter = modifiers.includes(TableColumnModifier.FILTER) || ((_b = column.hasFilter) !== null && _b !== void 0 ? _b : false);
|
|
212
|
-
const title = (_c = column.title) !== null && _c !== void 0 ? _c : TableColumnNameToTitle(name);
|
|
199
|
+
const title = (_c = column.title) !== null && _c !== void 0 ? _c : TableColumnNameToTitle(column.name);
|
|
213
200
|
const hidden = modifiers.includes(TableColumnModifier.HIDDEN) || ((_d = column.hidden) !== null && _d !== void 0 ? _d : false);
|
|
214
201
|
const active = modifiers.includes(TableColumnModifier.ACTIVE) || ((_e = column.active) !== null && _e !== void 0 ? _e : false);
|
|
215
202
|
const inactive = modifiers.includes(TableColumnModifier.INACTIVE) || ((_f = column.inactive) !== null && _f !== void 0 ? _f : false);
|
|
@@ -222,10 +209,13 @@ function NormalizeTableColumn(column) {
|
|
|
222
209
|
const pipeList = (_o = column.pipeList) !== null && _o !== void 0 ? _o : [];
|
|
223
210
|
const importList = coerceTableColumnImportList(column);
|
|
224
211
|
const type = GuessColumnTypeType(kind, column.type);
|
|
225
|
-
const source = (_p = column.source) !== null && _p !== void 0 ? _p :
|
|
212
|
+
const source = (_p = column.source) !== null && _p !== void 0 ? _p : undefined;
|
|
226
213
|
let sticky = null;
|
|
227
214
|
let stickyStart = false;
|
|
228
215
|
let stickyEnd = false;
|
|
216
|
+
const dataProperty = (0, ts_morph_1.NormalizeDataProperty)(Object.assign(Object.assign({}, column), { type,
|
|
217
|
+
source }));
|
|
218
|
+
const { name } = dataProperty;
|
|
229
219
|
if (column.sticky) {
|
|
230
220
|
if (typeof column.sticky !== 'string' || !IsTableColumnSticky(column.sticky)) {
|
|
231
221
|
sticky = TableColumnSticky.START;
|
|
@@ -275,16 +265,13 @@ function NormalizeTableColumn(column) {
|
|
|
275
265
|
if (normalizedFilterControl) {
|
|
276
266
|
(0, utilities_1.CoerceArrayItems)(importList, normalizedFilterControl.importList, (a, b) => a.name === b.name);
|
|
277
267
|
}
|
|
278
|
-
return Object.freeze(Object.assign(Object.assign({},
|
|
279
|
-
type,
|
|
280
|
-
source }))), { synthetic: (_t = column.synthetic) !== null && _t !== void 0 ? _t : false, filterName: `filter_${name}`, sticky,
|
|
268
|
+
return Object.freeze(Object.assign(Object.assign({}, dataProperty), { synthetic: (_t = column.synthetic) !== null && _t !== void 0 ? _t : false, filterName: `filter_${name}`, sticky,
|
|
281
269
|
stickyStart,
|
|
282
270
|
stickyEnd,
|
|
283
271
|
kind,
|
|
284
272
|
modifiers,
|
|
285
273
|
hasFilter,
|
|
286
274
|
title,
|
|
287
|
-
propertyPath,
|
|
288
275
|
hidden,
|
|
289
276
|
active,
|
|
290
277
|
inactive,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table-column.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/table-column.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"table-column.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/table-column.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +0,0 @@
|
|
|
1
|
-
import { NormalizedDataProperty } from '@rxap/ts-morph';
|
|
2
|
-
import { NormalizedTableColumn } from './table-column';
|
|
3
|
-
export declare function MergeWithColumnList(propertyList: ReadonlyArray<NormalizedDataProperty>, columnList: ReadonlyArray<NormalizedTableColumn>): ReadonlyArray<NormalizedDataProperty>;
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.MergeWithColumnList = void 0;
|
|
4
|
-
function MergeWithColumnList(propertyList, columnList) {
|
|
5
|
-
const merged = [...propertyList];
|
|
6
|
-
for (const column of columnList) {
|
|
7
|
-
if (!merged.find((property) => property.name === column.propertyPath)) {
|
|
8
|
-
merged.push({
|
|
9
|
-
name: column.propertyPath,
|
|
10
|
-
type: column.type,
|
|
11
|
-
isArray: false,
|
|
12
|
-
source: column.source,
|
|
13
|
-
isOptional: column.isOptional,
|
|
14
|
-
});
|
|
15
|
-
}
|
|
16
|
-
}
|
|
17
|
-
return Object.freeze(merged);
|
|
18
|
-
}
|
|
19
|
-
exports.MergeWithColumnList = MergeWithColumnList;
|
|
20
|
-
//# sourceMappingURL=merge-with-column-list.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"merge-with-column-list.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/merge-with-column-list.ts"],"names":[],"mappings":";;;AAGA,SAAgB,mBAAmB,CACjC,YAAmD,EACnD,UAAgD;IAEhD,MAAM,MAAM,GAA6B,CAAE,GAAG,YAAY,CAAE,CAAC;IAC7D,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;QAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,MAAM,CAAC,YAAY,CAAC,EAAE;YACrE,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,MAAM,CAAC,YAAY;gBACzB,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,UAAU,EAAE,MAAM,CAAC,UAAU;aAC9B,CAAC,CAAC;SACJ;KACF;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;AAjBD,kDAiBC"}
|