@rxap/schematic-angular 16.1.0-dev.25 → 16.1.0-dev.26
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,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.1.0-dev.26](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.1.0-dev.25...@rxap/schematic-angular@16.1.0-dev.26) (2023-11-16)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- support nested column properties ([8e98214](https://gitlab.com/rxap/packages/commit/8e9821427996fd8445f039a5683dc5ed910c056d))
|
|
11
|
+
|
|
6
12
|
# [16.1.0-dev.25](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.1.0-dev.24...@rxap/schematic-angular@16.1.0-dev.25) (2023-10-11)
|
|
7
13
|
|
|
8
14
|
**Note:** Version bump only for package @rxap/schematic-angular
|
package/package.json
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "16.1.0-dev.
|
|
2
|
+
"version": "16.1.0-dev.26",
|
|
3
3
|
"name": "@rxap/schematic-angular",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"ignore": "
|
|
6
|
+
"ignore": "5.2.4",
|
|
7
7
|
"process": "0.11.10",
|
|
8
|
-
"semver": "
|
|
9
|
-
"tslib": "2.6.2"
|
|
8
|
+
"semver": "7.5.3",
|
|
9
|
+
"tslib": "2.6.2",
|
|
10
|
+
"yaml": "2.3.1"
|
|
10
11
|
},
|
|
11
12
|
"peerDependencies": {
|
|
12
13
|
"@angular-devkit/core": "^16.1.4",
|
|
@@ -17,8 +18,9 @@
|
|
|
17
18
|
"ts-morph": "^18.0.0",
|
|
18
19
|
"tslib": "2.6.2",
|
|
19
20
|
"@rxap/node-utilities": "1.1.0-dev.15",
|
|
20
|
-
"@rxap/
|
|
21
|
-
"@rxap/workspace-
|
|
21
|
+
"@rxap/ts-morph": "0.1.0-dev.18",
|
|
22
|
+
"@rxap/workspace-ts-morph": "0.1.0-dev.12",
|
|
23
|
+
"@rxap/workspace-utilities": "0.1.0-dev.26"
|
|
22
24
|
},
|
|
23
25
|
"author": {
|
|
24
26
|
"name": "Merzough Münker",
|
|
@@ -67,7 +69,7 @@
|
|
|
67
69
|
},
|
|
68
70
|
"schematics": "./collection.json",
|
|
69
71
|
"type": "commonjs",
|
|
70
|
-
"gitHead": "
|
|
72
|
+
"gitHead": "e693226c20a89161107a08ef8e5da07abd0ebd7d",
|
|
71
73
|
"main": "./src/index.js",
|
|
72
74
|
"types": "./src/index.d.ts"
|
|
73
75
|
}
|
|
@@ -6,6 +6,7 @@ const schematics_ts_morph_1 = require("@rxap/schematics-ts-morph");
|
|
|
6
6
|
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
7
7
|
const utilities_1 = require("@rxap/utilities");
|
|
8
8
|
const path_1 = require("path");
|
|
9
|
+
const ts_morph_1 = require("ts-morph");
|
|
9
10
|
const angular_options_1 = require("./angular-options");
|
|
10
11
|
const backend_types_1 = require("./backend-types");
|
|
11
12
|
const minimum_table_options_1 = require("./minimum-table-options");
|
|
@@ -56,6 +57,39 @@ function tableInterfaceFromOpenApiRule(normalizedOptions) {
|
|
|
56
57
|
}, [`${(0, utilities_1.dasherize)(componentName)}.ts?`]),
|
|
57
58
|
]);
|
|
58
59
|
}
|
|
60
|
+
function processColumns(columnList) {
|
|
61
|
+
const result = {};
|
|
62
|
+
columnList.forEach((column) => {
|
|
63
|
+
var _a, _b;
|
|
64
|
+
const parts = column.propertyPath.split('.');
|
|
65
|
+
if (parts.length === 1) {
|
|
66
|
+
result[column.propertyPath] = column.type;
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
let current = result;
|
|
70
|
+
for (let i = 0; i < parts.length; i++) {
|
|
71
|
+
const isLast = i === parts.length - 1;
|
|
72
|
+
const part = parts[i];
|
|
73
|
+
if (isLast) {
|
|
74
|
+
current[part] = (_a = column.type) !== null && _a !== void 0 ? _a : 'unknown';
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
current[part] = (_b = current[part]) !== null && _b !== void 0 ? _b : {};
|
|
78
|
+
current = current[part];
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
});
|
|
83
|
+
// Convert the result object into the desired output format
|
|
84
|
+
return Object.entries(result).map(([name, type]) => {
|
|
85
|
+
if ((0, utilities_1.IsRecord)(type)) {
|
|
86
|
+
return { name, type: ts_morph_1.Writers.object(type) };
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
return { name, type: type };
|
|
90
|
+
}
|
|
91
|
+
});
|
|
92
|
+
}
|
|
59
93
|
function tableInterfaceFromColumnListRule(normalizedOptions) {
|
|
60
94
|
const { columnList, name, componentName, project, feature, directory, shared, } = normalizedOptions;
|
|
61
95
|
return (0, schematics_1.chain)([
|
|
@@ -68,13 +102,7 @@ function tableInterfaceFromColumnListRule(normalizedOptions) {
|
|
|
68
102
|
(0, schematics_ts_morph_1.CoerceInterface)(sourceFile, `I${(0, utilities_1.classify)(componentName)}`).set({
|
|
69
103
|
isExported: true,
|
|
70
104
|
extends: ['Record<string, unknown>', 'TableRowMetadata'],
|
|
71
|
-
properties: columnList
|
|
72
|
-
var _a;
|
|
73
|
-
return ({
|
|
74
|
-
name: column.name,
|
|
75
|
-
type: (_a = column.type) !== null && _a !== void 0 ? _a : 'unknown',
|
|
76
|
-
});
|
|
77
|
-
}),
|
|
105
|
+
properties: processColumns(columnList),
|
|
78
106
|
});
|
|
79
107
|
(0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
|
|
80
108
|
moduleSpecifier: '@rxap/material-table-system',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"minimum-table-component-options.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/minimum-table-component-options.ts"],"names":[],"mappings":";;;AAAA,2DAKoC;AACpC,mEAUmC;AACnC,qEAGoC;AACpC,+
|
|
1
|
+
{"version":3,"file":"minimum-table-component-options.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/minimum-table-component-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ export interface TableColumn {
|
|
|
13
13
|
}
|
|
14
14
|
export interface NormalizedTableColumn extends Readonly<Normalized<TableColumn>> {
|
|
15
15
|
type: string;
|
|
16
|
+
propertyPath: string;
|
|
16
17
|
}
|
|
17
18
|
export declare function NormalizeTableColumn(column: Readonly<TableColumn> | string): NormalizedTableColumn;
|
|
18
19
|
export declare function NormalizeTableColumnList(columnList?: ReadonlyArray<string | Readonly<TableColumn>>): Array<NormalizedTableColumn>;
|
package/src/lib/table-column.js
CHANGED
|
@@ -38,10 +38,13 @@ function NormalizeTableColumn(column) {
|
|
|
38
38
|
show = (_j = column.show) !== null && _j !== void 0 ? _j : false;
|
|
39
39
|
}
|
|
40
40
|
propertyPath !== null && propertyPath !== void 0 ? propertyPath : (propertyPath = name
|
|
41
|
+
.replace(/\?\./g, '.')
|
|
41
42
|
.split('.')
|
|
42
43
|
.map((part) => (0, schematics_utilities_1.camelize)(part))
|
|
43
|
-
.join('
|
|
44
|
+
.join('?.'));
|
|
45
|
+
name = (0, schematics_utilities_1.dasherize)(name.replace(/\??\./g, '_'));
|
|
44
46
|
title !== null && title !== void 0 ? title : (title = (0, schematics_utilities_1.dasherize)(name)
|
|
47
|
+
.replace(/_/g, '-')
|
|
45
48
|
.split('-')
|
|
46
49
|
.map((part) => (0, schematics_utilities_1.capitalize)(part))
|
|
47
50
|
.join(' '));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table-column.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/table-column.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"table-column.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/table-column.ts"],"names":[],"mappings":"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"}
|