@rxap/schematics-ts-morph 16.0.0-dev.36 → 16.0.0-dev.38
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 +12 -0
- package/README.md +1 -1
- package/package.json +4 -3
- package/src/lib/nest/coerce-dto-class.d.ts +2 -0
- package/src/lib/nest/coerce-dto-class.js +2 -0
- package/src/lib/nest/coerce-dto-class.js.map +1 -1
- package/src/lib/nest/coerce-get-page-operation.d.ts +2 -1
- package/src/lib/nest/coerce-get-page-operation.js +28 -8
- package/src/lib/nest/coerce-get-page-operation.js.map +1 -1
- package/src/lib/nest/coerce-table-select-operation.js +2 -2
- package/src/lib/nest/coerce-table-select-operation.js.map +1 -1
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
|
+
# [16.0.0-dev.38](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.0.0-dev.37...@rxap/schematics-ts-morph@16.0.0-dev.38) (2023-11-19)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- add custom dto property types ([af53629](https://gitlab.com/rxap/packages/commit/af53629544cf7c70347f83bfac05fba08ed341e9))
|
|
11
|
+
|
|
12
|
+
# [16.0.0-dev.37](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.0.0-dev.36...@rxap/schematics-ts-morph@16.0.0-dev.37) (2023-11-19)
|
|
13
|
+
|
|
14
|
+
### Features
|
|
15
|
+
|
|
16
|
+
- support complex and importable types ([1636580](https://gitlab.com/rxap/packages/commit/1636580713961324683ea0246e109e35e7efc6c1))
|
|
17
|
+
|
|
6
18
|
# [16.0.0-dev.36](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.0.0-dev.35...@rxap/schematics-ts-morph@16.0.0-dev.36) (2023-11-19)
|
|
7
19
|
|
|
8
20
|
### Bug Fixes
|
package/README.md
CHANGED
|
@@ -17,5 +17,5 @@ yarn add @rxap/schematics-ts-morph
|
|
|
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-utilities@^16.0.0-dev.21 @rxap/ts-morph@^0.1.0-dev.
|
|
20
|
+
yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-utilities@^16.0.0-dev.21 @rxap/ts-morph@^0.1.0-dev.21 @rxap/utilities@^16.0.0-dev.23 @rxap/workspace-ts-morph@^0.1.0-dev.12 ts-morph@^18.0.0 tslib@2.6.2
|
|
21
21
|
```
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "16.0.0-dev.
|
|
2
|
+
"version": "16.0.0-dev.38",
|
|
3
3
|
"name": "@rxap/schematics-ts-morph",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"@angular-devkit/core": "^16.1.4",
|
|
14
14
|
"@angular-devkit/schematics": "^16.1.4",
|
|
15
15
|
"@rxap/schematics-utilities": "^16.0.0-dev.21",
|
|
16
|
-
"@rxap/ts-morph": "^0.1.0-dev.
|
|
16
|
+
"@rxap/ts-morph": "^0.1.0-dev.21",
|
|
17
17
|
"@rxap/utilities": "^16.0.0-dev.23",
|
|
18
18
|
"@rxap/workspace-ts-morph": "^0.1.0-dev.12",
|
|
19
19
|
"ts-morph": "^18.0.0",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
},
|
|
46
46
|
{
|
|
47
47
|
"package": "@rxap/ts-morph",
|
|
48
|
-
"version": "0.1.0-dev.
|
|
48
|
+
"version": "0.1.0-dev.21"
|
|
49
49
|
},
|
|
50
50
|
{
|
|
51
51
|
"package": "@rxap/utilities",
|
|
@@ -67,6 +67,7 @@
|
|
|
67
67
|
"directory": "packages/schematic/ts-morph"
|
|
68
68
|
},
|
|
69
69
|
"type": "commonjs",
|
|
70
|
+
"gitHead": "9a50fbc59c5829769333e9467b2606d9eac368e8",
|
|
70
71
|
"main": "./src/index.js",
|
|
71
72
|
"types": "./src/index.d.ts"
|
|
72
73
|
}
|
|
@@ -3,6 +3,8 @@ import { DtoClassProperty } from './create-dto-class';
|
|
|
3
3
|
export interface CoerceDtoClassOutput {
|
|
4
4
|
className: string;
|
|
5
5
|
filePath: string;
|
|
6
|
+
sourceFile: SourceFile;
|
|
7
|
+
classDeclaration: ClassDeclaration;
|
|
6
8
|
}
|
|
7
9
|
export declare function CoercePropertyDeclaration(typeElementMemberedNode: TypeElementMemberedNode, name: string, structure?: Partial<PropertyDeclarationStructure>): PropertySignature;
|
|
8
10
|
export declare function CoercePropertyDeclaration(classLikeDeclarationBase: ClassLikeDeclarationBase, name: string, structure?: Partial<PropertyDeclarationStructure>): PropertyDeclaration;
|
|
@@ -174,6 +174,8 @@ function CoerceDtoClass(options) {
|
|
|
174
174
|
return {
|
|
175
175
|
className,
|
|
176
176
|
filePath: '.' + (0, path_1.join)(sourceFile.getDirectoryPath(), sourceFile.getBaseNameWithoutExtension()),
|
|
177
|
+
sourceFile,
|
|
178
|
+
classDeclaration,
|
|
177
179
|
};
|
|
178
180
|
}
|
|
179
181
|
exports.CoerceDtoClass = CoerceDtoClass;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-dto-class.ts"],"names":[],"mappings":";;;AAAA,qEAKoC;AACpC,+BAA4B;AAC5B,uCAckB;AAClB,kDAA8C;AAC9C,8DAAyD;AACzD,mEAA+D;AAC/D,+DAA2D;AAC3D,uDAAmD;
|
|
1
|
+
{"version":3,"file":"coerce-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-dto-class.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
+
import { TypeImport } from '@rxap/ts-morph';
|
|
1
2
|
import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
|
|
2
3
|
import { OperationOptions } from './add-operation-to-controller';
|
|
3
4
|
import { CoerceOperationOptions } from './coerce-operation';
|
|
4
5
|
import { DtoClassProperty } from './create-dto-class';
|
|
5
6
|
export interface GetPageOperationColumn {
|
|
6
7
|
name: string;
|
|
7
|
-
type?:
|
|
8
|
+
type?: TypeImport;
|
|
8
9
|
/**
|
|
9
10
|
* the property name of the source object. if not defined the name will be used
|
|
10
11
|
*/
|
|
@@ -2,20 +2,36 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CoerceGetPageOperation = exports.CoerceGetPageDataMethod = exports.CoerceToPageDtoMethod = exports.CoerceToRowDtoMethod = exports.GetPageOperationColumnToCodeText = exports.GetPageOperationColumnToDtoClassProperty = void 0;
|
|
4
4
|
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
5
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
5
6
|
const utilities_1 = require("@rxap/utilities");
|
|
6
|
-
const
|
|
7
|
+
const ts_morph_2 = require("ts-morph");
|
|
7
8
|
const coerce_class_method_1 = require("../coerce-class-method");
|
|
8
9
|
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
9
10
|
const coerce_type_alias_1 = require("../ts-morph/coerce-type-alias");
|
|
10
11
|
const coerce_operation_1 = require("./coerce-operation");
|
|
11
12
|
const coerce_page_dto_class_1 = require("./coerce-page-dto-class");
|
|
12
13
|
const coerce_row_dto_class_1 = require("./coerce-row-dto-class");
|
|
14
|
+
function GetPageOperationColumnTypeToTypeImport(column) {
|
|
15
|
+
var _a, _b;
|
|
16
|
+
if (!column.type) {
|
|
17
|
+
return { name: 'unknown' };
|
|
18
|
+
}
|
|
19
|
+
switch ((_a = column.type) === null || _a === void 0 ? void 0 : _a.name) {
|
|
20
|
+
case 'IconConfig':
|
|
21
|
+
return {
|
|
22
|
+
name: 'IconDto',
|
|
23
|
+
moduleSpecifier: '@rxap/nest-dto',
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
return (_b = column.type) !== null && _b !== void 0 ? _b : { name: 'unknown' };
|
|
27
|
+
}
|
|
13
28
|
function GetPageOperationColumnToDtoClassProperty(column) {
|
|
14
|
-
var _a
|
|
29
|
+
var _a;
|
|
30
|
+
const type = GetPageOperationColumnTypeToTypeImport(column);
|
|
15
31
|
return {
|
|
16
32
|
name: column.name,
|
|
17
|
-
type: (
|
|
18
|
-
isArray:
|
|
33
|
+
type: (_a = type.name.replace(/\[]$/, '').replace(/^Array<(.+)>/, '$1')) !== null && _a !== void 0 ? _a : 'unknown',
|
|
34
|
+
isArray: type.name.endsWith('[]') || type.name.startsWith('Array<'),
|
|
19
35
|
isOptional: false,
|
|
20
36
|
isType: false,
|
|
21
37
|
};
|
|
@@ -35,7 +51,7 @@ exports.GetPageOperationColumnToCodeText = GetPageOperationColumnToCodeText;
|
|
|
35
51
|
function CoerceToRowDtoMethod(sourceFile, classDeclaration, rowClassName, options) {
|
|
36
52
|
var _a;
|
|
37
53
|
(0, coerce_class_method_1.CoerceClassMethod)(classDeclaration, 'toRowDto', {
|
|
38
|
-
scope:
|
|
54
|
+
scope: ts_morph_2.Scope.Private,
|
|
39
55
|
returnType: rowClassName,
|
|
40
56
|
parameters: [
|
|
41
57
|
{
|
|
@@ -73,7 +89,7 @@ function CoerceToRowDtoMethod(sourceFile, classDeclaration, rowClassName, option
|
|
|
73
89
|
exports.CoerceToRowDtoMethod = CoerceToRowDtoMethod;
|
|
74
90
|
function CoerceToPageDtoMethod(sourceFile, classDeclaration, pageClassName, rowClassName, options) {
|
|
75
91
|
(0, coerce_class_method_1.CoerceClassMethod)(classDeclaration, 'toPageDto', {
|
|
76
|
-
scope:
|
|
92
|
+
scope: ts_morph_2.Scope.Private,
|
|
77
93
|
returnType: pageClassName,
|
|
78
94
|
parameters: [
|
|
79
95
|
{
|
|
@@ -116,7 +132,7 @@ function CoerceToPageDtoMethod(sourceFile, classDeclaration, pageClassName, rowC
|
|
|
116
132
|
exports.CoerceToPageDtoMethod = CoerceToPageDtoMethod;
|
|
117
133
|
function CoerceGetPageDataMethod(sourceFile, classDeclaration, options) {
|
|
118
134
|
(0, coerce_class_method_1.CoerceClassMethod)(classDeclaration, 'getPageData', {
|
|
119
|
-
scope:
|
|
135
|
+
scope: ts_morph_2.Scope.Public,
|
|
120
136
|
returnType: 'Promise<{ list: RawRowData[], total: number }>',
|
|
121
137
|
isAsync: true,
|
|
122
138
|
parameters: [
|
|
@@ -170,12 +186,16 @@ function CoerceGetPageOperation(options) {
|
|
|
170
186
|
coerceGetPageDataMethod !== null && coerceGetPageDataMethod !== void 0 ? coerceGetPageDataMethod : (coerceGetPageDataMethod = CoerceGetPageDataMethod);
|
|
171
187
|
return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { controllerName,
|
|
172
188
|
operationName, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
|
|
173
|
-
const { className: rowClassName, filePath: rowFilePath, } = (0, coerce_row_dto_class_1.CoerceRowDtoClass)({
|
|
189
|
+
const { className: rowClassName, filePath: rowFilePath, sourceFile: rowSourceFile, } = (0, coerce_row_dto_class_1.CoerceRowDtoClass)({
|
|
174
190
|
project,
|
|
175
191
|
name: responseDtoName,
|
|
176
192
|
propertyList: columnList.map(GetPageOperationColumnToDtoClassProperty),
|
|
177
193
|
rowIdType: rowIdProperty === null ? null : undefined,
|
|
178
194
|
});
|
|
195
|
+
(0, coerce_imports_1.CoerceImports)(rowSourceFile, options.columnList
|
|
196
|
+
.map(c => GetPageOperationColumnTypeToTypeImport(c))
|
|
197
|
+
.filter(type => (0, ts_morph_1.RequiresTypeImport)(type))
|
|
198
|
+
.map(type => (0, ts_morph_1.TypeImportToImportStructure)(type)));
|
|
179
199
|
const { className: pageClassName, filePath: pageFilePath, } = (0, coerce_page_dto_class_1.CoercePageDtoClass)({
|
|
180
200
|
project,
|
|
181
201
|
name: responseDtoName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-get-page-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-page-operation.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;AACpC,+CAA+C;AAC/C,uCAKkB;AAClB,gEAA2D;AAC3D,+DAA2D;AAC3D,qEAAgE;AAEhE,yDAG4B;AAC5B,mEAA6D;AAC7D,iEAA2D;AAyD3D,SAAgB,wCAAwC,CAAC,MAA8B;;IACrF,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI,EAAE,MAAA,
|
|
1
|
+
{"version":3,"file":"coerce-get-page-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-page-operation.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,12 +9,12 @@ function CoerceTableSelectOperationRule(options) {
|
|
|
9
9
|
rowValueProperty !== null && rowValueProperty !== void 0 ? rowValueProperty : (rowValueProperty = rowIdProperty);
|
|
10
10
|
columnList.unshift({
|
|
11
11
|
name: '__display',
|
|
12
|
-
type: 'string',
|
|
12
|
+
type: { name: 'string' },
|
|
13
13
|
source: rowDisplayProperty,
|
|
14
14
|
});
|
|
15
15
|
columnList.unshift({
|
|
16
16
|
name: '__value',
|
|
17
|
-
type: 'string',
|
|
17
|
+
type: { name: 'string' },
|
|
18
18
|
source: rowValueProperty,
|
|
19
19
|
});
|
|
20
20
|
return (0, coerce_get_page_operation_1.CoerceGetPageOperation)(Object.assign(Object.assign({}, options), { columnList,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-table-select-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-table-select-operation.ts"],"names":[],"mappings":";;;AAAA,2EAGqC;AAOrC,SAAgB,8BAA8B,CAAC,OAA0C;IACvF,IAAI,EACF,UAAU,EACV,aAAa,EACb,kBAAkB,EAClB,gBAAgB,GACjB,GAAG,OAAO,CAAC;IAEZ,aAAa,aAAb,aAAa,cAAb,aAAa,IAAb,aAAa,GAAK,MAAM,EAAC;IACzB,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,IAAlB,kBAAkB,GAAK,MAAM,EAAC;IAC9B,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,aAAa,EAAC;IAEnC,UAAU,CAAC,OAAO,CAAC;QACjB,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,QAAQ;
|
|
1
|
+
{"version":3,"file":"coerce-table-select-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-table-select-operation.ts"],"names":[],"mappings":";;;AAAA,2EAGqC;AAOrC,SAAgB,8BAA8B,CAAC,OAA0C;IACvF,IAAI,EACF,UAAU,EACV,aAAa,EACb,kBAAkB,EAClB,gBAAgB,GACjB,GAAG,OAAO,CAAC;IAEZ,aAAa,aAAb,aAAa,cAAb,aAAa,IAAb,aAAa,GAAK,MAAM,EAAC;IACzB,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,IAAlB,kBAAkB,GAAK,MAAM,EAAC;IAC9B,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,aAAa,EAAC;IAEnC,UAAU,CAAC,OAAO,CAAC;QACjB,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACxB,MAAM,EAAE,kBAAkB;KAC3B,CAAC,CAAC;IACH,UAAU,CAAC,OAAO,CAAC;QACjB,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACxB,MAAM,EAAE,gBAAgB;KACzB,CAAC,CAAC;IAEH,OAAO,IAAA,kDAAsB,kCACxB,OAAO,KACV,UAAU;QACV,aAAa,IACb,CAAC;AAEL,CAAC;AA7BD,wEA6BC"}
|