@rxap/schematics-ts-morph 16.1.0-dev.5 → 16.1.0-dev.7
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 +26 -0
- package/README.md +1 -1
- package/package.json +6 -6
- package/src/index.d.ts +2 -1
- package/src/index.js +2 -1
- package/src/index.js.map +1 -1
- package/src/lib/angular/coerce-dialog-table-action-component.js +2 -2
- package/src/lib/angular/coerce-dialog-table-action-component.js.map +1 -1
- package/src/lib/angular/coerce-form-definition-control.js +2 -3
- package/src/lib/angular/coerce-form-definition-control.js.map +1 -1
- package/src/lib/angular/coerce-form-definition.js +4 -4
- package/src/lib/angular/coerce-form-definition.js.map +1 -1
- package/src/lib/angular/coerce-proxy-remote-method-class.d.ts +1 -1
- package/src/lib/angular/coerce-proxy-remote-method-class.js +1 -1
- package/src/lib/angular/coerce-proxy-remote-method-class.js.map +1 -1
- package/src/lib/angular/coerce-table-parameters-from-route.js +4 -4
- package/src/lib/angular/coerce-table-parameters-from-route.js.map +1 -1
- package/src/lib/angular/coerce-table-select-resolve-value-method.js +2 -2
- package/src/lib/angular/coerce-table-select-resolve-value-method.js.map +1 -1
- package/src/lib/nest/add-operation-to-controller.d.ts +1 -1
- package/src/lib/nest/add-operation-to-controller.js +59 -55
- package/src/lib/nest/add-operation-to-controller.js.map +1 -1
- package/src/lib/nest/build-nest-controller-name.js +10 -0
- package/src/lib/nest/build-nest-controller-name.js.map +1 -1
- package/src/lib/nest/coerce-dto-class.d.ts +2 -7
- package/src/lib/nest/coerce-dto-class.js +44 -59
- package/src/lib/nest/coerce-dto-class.js.map +1 -1
- package/src/lib/nest/coerce-form-submit-operation.d.ts +2 -4
- package/src/lib/nest/coerce-form-submit-operation.js +13 -15
- package/src/lib/nest/coerce-form-submit-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-by-id-operation.d.ts +9 -7
- package/src/lib/nest/coerce-get-by-id-operation.js +85 -56
- package/src/lib/nest/coerce-get-by-id-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-children-operation.js +8 -40
- package/src/lib/nest/coerce-get-children-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-data-grid-operation.d.ts +5 -4
- package/src/lib/nest/coerce-get-data-grid-operation.js +7 -17
- package/src/lib/nest/coerce-get-data-grid-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-operation.d.ts +5 -0
- package/src/lib/nest/coerce-get-operation.js +11 -0
- package/src/lib/nest/coerce-get-operation.js.map +1 -0
- package/src/lib/nest/coerce-get-page-operation.d.ts +15 -22
- package/src/lib/nest/coerce-get-page-operation.js +106 -112
- package/src/lib/nest/coerce-get-page-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-root-operation.d.ts +2 -5
- package/src/lib/nest/coerce-get-root-operation.js +7 -22
- package/src/lib/nest/coerce-get-root-operation.js.map +1 -1
- package/src/lib/nest/coerce-operation.d.ts +32 -9
- package/src/lib/nest/coerce-operation.js +183 -24
- package/src/lib/nest/coerce-operation.js.map +1 -1
- package/src/lib/nest/coerce-options-operation.js +13 -42
- package/src/lib/nest/coerce-options-operation.js.map +1 -1
- package/src/lib/nest/coerce-page-dto-class.d.ts +1 -0
- package/src/lib/nest/coerce-page-dto-class.js +7 -3
- package/src/lib/nest/coerce-page-dto-class.js.map +1 -1
- package/src/lib/nest/coerce-row-dto-class.d.ts +1 -0
- package/src/lib/nest/coerce-row-dto-class.js +11 -6
- package/src/lib/nest/coerce-row-dto-class.js.map +1 -1
- package/src/lib/nest/coerce-table-select-operation.js +6 -6
- package/src/lib/nest/coerce-table-select-operation.js.map +1 -1
- package/src/lib/nest/coerce-table-select-value-resolve-operation.d.ts +7 -6
- package/src/lib/nest/coerce-table-select-value-resolve-operation.js +32 -33
- package/src/lib/nest/coerce-table-select-value-resolve-operation.js.map +1 -1
- package/src/lib/nest/coerce-tree-operation.js +35 -44
- package/src/lib/nest/coerce-tree-operation.js.map +1 -1
- package/src/lib/nest/dto-class-property.d.ts +19 -0
- package/src/lib/nest/dto-class-property.js +26 -0
- package/src/lib/nest/dto-class-property.js.map +1 -0
- package/src/lib/nest/table-query-list.js +10 -2
- package/src/lib/nest/table-query-list.js.map +1 -1
- package/src/lib/nest/create-dto-class.d.ts +0 -24
- package/src/lib/nest/create-dto-class.js +0 -169
- package/src/lib/nest/create-dto-class.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,32 @@
|
|
|
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.7](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.1.0-dev.6...@rxap/schematics-ts-morph@16.1.0-dev.7) (2024-02-29)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- improve operation naming and return types ([16ea0b3](https://gitlab.com/rxap/packages/commit/16ea0b3eb2f7679c101d034e72f8013f5513ecb6))
|
|
11
|
+
|
|
12
|
+
### Features
|
|
13
|
+
|
|
14
|
+
- generate table select resolve method ([5db6649](https://gitlab.com/rxap/packages/commit/5db6649cac0ff8dd36170679fc726057fa5d57d1))
|
|
15
|
+
|
|
16
|
+
# [16.1.0-dev.6](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.1.0-dev.5...@rxap/schematics-ts-morph@16.1.0-dev.6) (2024-02-28)
|
|
17
|
+
|
|
18
|
+
### Bug Fixes
|
|
19
|
+
|
|
20
|
+
- correctly coerce the operation method parameters ([f68c03a](https://gitlab.com/rxap/packages/commit/f68c03a1d4d623db9c5523a180f7e3c421fb1998))
|
|
21
|
+
- ensure nestModule is passed to the operation generators ([8bab63c](https://gitlab.com/rxap/packages/commit/8bab63ca21c50581f09566e65ee709d10a7f4bda))
|
|
22
|
+
- import missing type ([98af15b](https://gitlab.com/rxap/packages/commit/98af15b4b1c3da52819df4a8ca6106472106fc77))
|
|
23
|
+
- respect the identifier option ([bd6c6b2](https://gitlab.com/rxap/packages/commit/bd6c6b2d6770534f7d2136ac489acae2de8f0d16))
|
|
24
|
+
- return type generation ([e97c0be](https://gitlab.com/rxap/packages/commit/e97c0be137dde5ca6a0af7df852e916f6ee7d481))
|
|
25
|
+
|
|
26
|
+
### Features
|
|
27
|
+
|
|
28
|
+
- add CoerceGetOperation function ([191d7fc](https://gitlab.com/rxap/packages/commit/191d7fcf8159646a990e3f8df7149c074f5872b7))
|
|
29
|
+
- extend support for upstream options ([15057c5](https://gitlab.com/rxap/packages/commit/15057c5b8d4bf97ee0bf1aa3ff78825ac7bf7b73))
|
|
30
|
+
- support custom properties for accordion controllers ([82da170](https://gitlab.com/rxap/packages/commit/82da170f9ff490ec2502e0b21283b100848e6108))
|
|
31
|
+
|
|
6
32
|
# [16.1.0-dev.5](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.1.0-dev.4...@rxap/schematics-ts-morph@16.1.0-dev.5) (2024-02-26)
|
|
7
33
|
|
|
8
34
|
### 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.1-dev.0 @rxap/ts-morph@^1.1.0-dev.
|
|
20
|
+
yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-utilities@^16.0.1-dev.0 @rxap/ts-morph@^1.1.0-dev.5 @rxap/utilities@^16.1.0-dev.3 @rxap/workspace-ts-morph@^16.0.2-dev.0 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.1.0-dev.
|
|
2
|
+
"version": "16.1.0-dev.7",
|
|
3
3
|
"name": "@rxap/schematics-ts-morph",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
"@angular-devkit/core": "^16.1.4",
|
|
14
14
|
"@angular-devkit/schematics": "^16.1.4",
|
|
15
15
|
"@rxap/schematics-utilities": "^16.0.1-dev.0",
|
|
16
|
-
"@rxap/ts-morph": "^1.1.0-dev.
|
|
17
|
-
"@rxap/utilities": "^16.1.0-dev.
|
|
16
|
+
"@rxap/ts-morph": "^1.1.0-dev.5",
|
|
17
|
+
"@rxap/utilities": "^16.1.0-dev.3",
|
|
18
18
|
"@rxap/workspace-ts-morph": "^16.0.2-dev.0",
|
|
19
19
|
"colors": "^1.4.0",
|
|
20
20
|
"handlebars": "^4.7.7",
|
|
@@ -48,11 +48,11 @@
|
|
|
48
48
|
},
|
|
49
49
|
{
|
|
50
50
|
"package": "@rxap/ts-morph",
|
|
51
|
-
"version": "1.1.0-dev.
|
|
51
|
+
"version": "1.1.0-dev.5"
|
|
52
52
|
},
|
|
53
53
|
{
|
|
54
54
|
"package": "@rxap/utilities",
|
|
55
|
-
"version": "16.1.0-dev.
|
|
55
|
+
"version": "16.1.0-dev.3"
|
|
56
56
|
},
|
|
57
57
|
{
|
|
58
58
|
"package": "@rxap/workspace-ts-morph",
|
|
@@ -70,7 +70,7 @@
|
|
|
70
70
|
"directory": "packages/schematic/ts-morph"
|
|
71
71
|
},
|
|
72
72
|
"type": "commonjs",
|
|
73
|
-
"gitHead": "
|
|
73
|
+
"gitHead": "0d3940b8abf393b323e584a418c6fe19ec214da5",
|
|
74
74
|
"main": "./src/index.js",
|
|
75
75
|
"types": "./src/index.d.ts"
|
|
76
76
|
}
|
package/src/index.d.ts
CHANGED
|
@@ -26,6 +26,7 @@ export * from './lib/nest/coerce-form-submit-operation';
|
|
|
26
26
|
export * from './lib/nest/coerce-get-by-id-operation';
|
|
27
27
|
export * from './lib/nest/coerce-get-children-operation';
|
|
28
28
|
export * from './lib/nest/coerce-get-data-grid-operation';
|
|
29
|
+
export * from './lib/nest/coerce-get-operation';
|
|
29
30
|
export * from './lib/nest/coerce-get-page-operation';
|
|
30
31
|
export * from './lib/nest/coerce-get-root-operation';
|
|
31
32
|
export * from './lib/nest/coerce-nest-controller';
|
|
@@ -39,7 +40,7 @@ export * from './lib/nest/coerce-submit-data-grid-operation';
|
|
|
39
40
|
export * from './lib/nest/coerce-table-select-operation';
|
|
40
41
|
export * from './lib/nest/coerce-table-select-value-resolve-operation';
|
|
41
42
|
export * from './lib/nest/coerce-tree-operation';
|
|
42
|
-
export * from './lib/nest/
|
|
43
|
+
export * from './lib/nest/dto-class-property';
|
|
43
44
|
export * from './lib/nest/find-nest-module-declaration';
|
|
44
45
|
export * from './lib/nest/find-nest-module-source-file';
|
|
45
46
|
export * from './lib/nest/get-nest-module-metadata';
|
package/src/index.js
CHANGED
|
@@ -34,6 +34,7 @@ tslib_1.__exportStar(require("./lib/nest/coerce-form-submit-operation"), exports
|
|
|
34
34
|
tslib_1.__exportStar(require("./lib/nest/coerce-get-by-id-operation"), exports);
|
|
35
35
|
tslib_1.__exportStar(require("./lib/nest/coerce-get-children-operation"), exports);
|
|
36
36
|
tslib_1.__exportStar(require("./lib/nest/coerce-get-data-grid-operation"), exports);
|
|
37
|
+
tslib_1.__exportStar(require("./lib/nest/coerce-get-operation"), exports);
|
|
37
38
|
tslib_1.__exportStar(require("./lib/nest/coerce-get-page-operation"), exports);
|
|
38
39
|
tslib_1.__exportStar(require("./lib/nest/coerce-get-root-operation"), exports);
|
|
39
40
|
tslib_1.__exportStar(require("./lib/nest/coerce-nest-controller"), exports);
|
|
@@ -47,7 +48,7 @@ tslib_1.__exportStar(require("./lib/nest/coerce-submit-data-grid-operation"), ex
|
|
|
47
48
|
tslib_1.__exportStar(require("./lib/nest/coerce-table-select-operation"), exports);
|
|
48
49
|
tslib_1.__exportStar(require("./lib/nest/coerce-table-select-value-resolve-operation"), exports);
|
|
49
50
|
tslib_1.__exportStar(require("./lib/nest/coerce-tree-operation"), exports);
|
|
50
|
-
tslib_1.__exportStar(require("./lib/nest/
|
|
51
|
+
tslib_1.__exportStar(require("./lib/nest/dto-class-property"), exports);
|
|
51
52
|
tslib_1.__exportStar(require("./lib/nest/find-nest-module-declaration"), exports);
|
|
52
53
|
tslib_1.__exportStar(require("./lib/nest/find-nest-module-source-file"), exports);
|
|
53
54
|
tslib_1.__exportStar(require("./lib/nest/get-nest-module-metadata"), exports);
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/schematic/ts-morph/src/index.ts"],"names":[],"mappings":";;;AAAA,eAAe;AACf,8EAAoD;AACpD,YAAY;AAEZ,kBAAkB;AAClB,gFAAsD;AACtD,qFAA2D;AAC3D,+EAAqD;AACrD,0EAAgD;AAChD,yEAA+C;AAC/C,wEAA8C;AAC9C,0EAAgD;AAChD,sFAA4D;AAC5D,2EAAiD;AACjD,2EAAiD;AACjD,uEAA6C;AAC7C,oEAA0C;AAC1C,YAAY;AAEZ,cAAc;AACd,yEAA+C;AAC/C,gFAAsD;AACtD,4EAAkD;AAClD,8EAAoD;AACpD,mFAAyD;AACzD,gFAAsD;AACtD,iFAAuD;AACvD,yEAA+C;AAC/C,0EAAgD;AAChD,gFAAsD;AACtD,sEAA4C;AAC5C,kFAAwD;AACxD,gFAAsD;AACtD,mFAAyD;AACzD,oFAA0D;AAC1D,+EAAqD;AACrD,+EAAqD;AACrD,4EAAkD;AAClD,wEAA8C;AAC9C,iFAAuD;AACvD,sEAA4C;AAC5C,8EAAoD;AACpD,2EAAiD;AACjD,0EAAgD;AAChD,uFAA6D;AAC7D,mFAAyD;AACzD,iGAAuE;AACvE,2EAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/schematic/ts-morph/src/index.ts"],"names":[],"mappings":";;;AAAA,eAAe;AACf,8EAAoD;AACpD,YAAY;AAEZ,kBAAkB;AAClB,gFAAsD;AACtD,qFAA2D;AAC3D,+EAAqD;AACrD,0EAAgD;AAChD,yEAA+C;AAC/C,wEAA8C;AAC9C,0EAAgD;AAChD,sFAA4D;AAC5D,2EAAiD;AACjD,2EAAiD;AACjD,uEAA6C;AAC7C,oEAA0C;AAC1C,YAAY;AAEZ,cAAc;AACd,yEAA+C;AAC/C,gFAAsD;AACtD,4EAAkD;AAClD,8EAAoD;AACpD,mFAAyD;AACzD,gFAAsD;AACtD,iFAAuD;AACvD,yEAA+C;AAC/C,0EAAgD;AAChD,gFAAsD;AACtD,sEAA4C;AAC5C,kFAAwD;AACxD,gFAAsD;AACtD,mFAAyD;AACzD,oFAA0D;AAC1D,0EAAgD;AAChD,+EAAqD;AACrD,+EAAqD;AACrD,4EAAkD;AAClD,wEAA8C;AAC9C,iFAAuD;AACvD,sEAA4C;AAC5C,8EAAoD;AACpD,2EAAiD;AACjD,0EAAgD;AAChD,uFAA6D;AAC7D,mFAAyD;AACzD,iGAAuE;AACvE,2EAAiD;AACjD,wEAA8C;AAC9C,kFAAwD;AACxD,kFAAwD;AACxD,8EAAoD;AACpD,yEAA+C;AAC/C,2EAAiD;AACjD,qEAA2C;AAC3C,0EAAgD;AAChD,0EAAgD;AAChD,4EAAkD;AAClD,uEAA6C;AAC7C,iFAAuD;AACvD,mFAAyD;AACzD,sEAA4C;AAC5C,YAAY;AAEZ,iBAAiB;AACjB,iFAAuD;AACvD,oFAA0D;AAC1D,6EAAmD;AACnD,4EAAkD;AAClD,+EAAqD;AACrD,8EAAoD;AACpD,iFAAuD;AACvD,6EAAmD;AACnD,6EAAmD;AACnD,+EAAqD;AACrD,gFAAsD;AACtD,mFAAyD;AACzD,+EAAqD;AACrD,yEAA+C;AAC/C,iFAAuD;AACvD,gFAAsD;AACtD,6FAAmE;AACnE,mFAAyD;AACzD,qFAA2D;AAC3D,uFAA6D;AAC7D,uFAA6D;AAC7D,oFAA0D;AAC1D,+EAAqD;AACrD,6EAAmD;AACnD,mFAAyD;AACzD,iFAAuD;AACvD,4EAAkD;AAClD,uFAA6D;AAC7D,qFAA2D;AAC3D,sFAA4D;AAC5D,mFAAyD;AACzD,+EAAqD;AACrD,yFAA+D;AAC/D,2FAAiE;AACjE,kFAAwD;AACxD,qFAA2D;AAC3D,4EAAkD;AAClD,iFAAuD;AACvD,0FAAgE;AAChE,2FAAiE;AACjE,iGAAuE;AACvE,6GAAmF;AACnF,yGAA+E;AAC/E,uFAA6D;AAC7D,0FAAgE;AAChE,mFAAyD;AACzD,4EAAkD;AAClD,kFAAwD;AACxD,4EAAkD;AAClD,qFAA2D;AAC3D,qFAA2D;AAC3D,gFAAsD;AACtD,yEAA+C;AAC/C,gFAAsD;AACtD,sEAA4C;AAC5C,6EAAmD;AACnD,4EAAkD;AAClD,4EAAkD;AAClD,8DAAoC;AACpC,YAAY;AAEZ,UAAU;AACV,iEAAuC;AACvC,wDAA8B;AAC9B,kEAAwC;AACxC,iEAAuC;AACvC,sEAA4C;AAC5C,6DAAmC;AACnC,2EAAiD;AACjD,sEAA4C;AAC5C,4DAAkC;AAClC,yEAA+C;AAC/C,oEAA0C;AAC1C,6DAAmC;AACnC,oEAA0C;AAC1C,mEAAyC;AACzC,4EAAkD;AAClD,oEAA0C;AAC1C,sEAA4C;AAC5C,8EAAoD;AACpD,6FAAmE;AACnE,+EAAqD;AACrD,yEAA+C;AAC/C,4EAAkD;AAClD,uEAA6C;AAC7C,iEAAuC;AACvC,oEAA0C;AAC1C,mEAAyC;AACzC,gEAAsC;AACtC,iEAAuC;AACvC,mEAAyC;AACzC,YAAY"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CoerceDialogTableActionComponentRule = void 0;
|
|
4
4
|
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
5
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
5
6
|
const coerce_class_constructor_1 = require("../coerce-class-constructor");
|
|
6
7
|
const coerce_class_method_1 = require("../coerce-class-method");
|
|
7
|
-
const coerce_dto_class_1 = require("../nest/coerce-dto-class");
|
|
8
8
|
const operation_id_utilities_1 = require("../nest/operation-id-utilities");
|
|
9
9
|
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
10
10
|
const coerce_parameter_declaration_1 = require("../ts-morph/coerce-parameter-declaration");
|
|
@@ -85,7 +85,7 @@ function CoerceDialogTableActionComponentRule(options) {
|
|
|
85
85
|
namedImports: ['MatDialogRef'],
|
|
86
86
|
},
|
|
87
87
|
]);
|
|
88
|
-
(0,
|
|
88
|
+
(0, ts_morph_1.CoercePropertyDeclaration)(componentClass, 'state', {
|
|
89
89
|
initializer: '{} as any',
|
|
90
90
|
type: (0, operation_id_utilities_1.OperationIdToRequestBodyClassName)(operationId),
|
|
91
91
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-dialog-table-action-component.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-dialog-table-action-component.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;AACpC,0EAAqE;AACrE,gEAA2D;AAC3D
|
|
1
|
+
{"version":3,"file":"coerce-dialog-table-action-component.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-dialog-table-action-component.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
|
5
5
|
const ts_morph_1 = require("ts-morph");
|
|
6
6
|
const coerce_class_1 = require("../coerce-class");
|
|
7
7
|
const coerce_source_file_1 = require("../coerce-source-file");
|
|
8
|
-
const coerce_dto_class_1 = require("../nest/coerce-dto-class");
|
|
9
8
|
const ts_morph_transform_1 = require("../ts-morph-transform");
|
|
10
9
|
const coerce_decorator_1 = require("../ts-morph/coerce-decorator");
|
|
11
10
|
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
@@ -18,7 +17,7 @@ function CoerceInterfaceFormTypeControl(sourceFile, classDeclaration, formTypeNa
|
|
|
18
17
|
}
|
|
19
18
|
const interfaceDeclaration = (0, coerce_interface_1.CoerceInterface)(sourceFile, formTypeName);
|
|
20
19
|
interfaceDeclaration.setIsExported(true);
|
|
21
|
-
(0,
|
|
20
|
+
(0, ts_morph_2.CoercePropertyDeclaration)(interfaceDeclaration, (0, schematics_utilities_1.camelize)(control.name)).set({ type: (0, ts_morph_2.WriteType)(control, sourceFile) });
|
|
22
21
|
}
|
|
23
22
|
exports.CoerceInterfaceFormTypeControl = CoerceInterfaceFormTypeControl;
|
|
24
23
|
function isAngularValidator(validator) {
|
|
@@ -40,7 +39,7 @@ function CoerceFormControl(sourceFile, classDeclaration, control) {
|
|
|
40
39
|
namedImports: ['RxapFormControl', 'UseFormControl'],
|
|
41
40
|
moduleSpecifier: '@rxap/forms',
|
|
42
41
|
});
|
|
43
|
-
const propertyDeclaration = (0,
|
|
42
|
+
const propertyDeclaration = (0, ts_morph_2.CoercePropertyDeclaration)(classDeclaration, (0, schematics_utilities_1.camelize)(control.name)).set({
|
|
44
43
|
type: w => {
|
|
45
44
|
w.write('RxapFormControl<');
|
|
46
45
|
(0, ts_morph_2.WriteType)(control, sourceFile)(w);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-form-definition-control.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition-control.ts"],"names":[],"mappings":";;;AACA,qEAIoC;AACpC,uCAQkB;AAClB,kDAA8C;AAC9C,8DAAyD;AACzD
|
|
1
|
+
{"version":3,"file":"coerce-form-definition-control.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition-control.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CoerceFormDefinition = exports.CoerceFormControls = void 0;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
|
-
const ts_morph_1 = require("ts-morph");
|
|
6
|
-
const
|
|
5
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
6
|
+
const ts_morph_2 = require("ts-morph");
|
|
7
7
|
const ts_morph_transform_1 = require("../ts-morph-transform");
|
|
8
8
|
const coerce_decorator_1 = require("../ts-morph/coerce-decorator");
|
|
9
9
|
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
@@ -35,11 +35,11 @@ function CoerceFormDefinition(options) {
|
|
|
35
35
|
moduleSpecifier: '@rxap/forms',
|
|
36
36
|
});
|
|
37
37
|
// endregion
|
|
38
|
-
(0,
|
|
38
|
+
(0, ts_morph_1.CoercePropertyDeclaration)(classDeclaration, 'rxapFormGroup').set({
|
|
39
39
|
type: `RxapFormGroup<${interfaceName}>`,
|
|
40
40
|
hasExclamationToken: true,
|
|
41
41
|
isReadonly: true,
|
|
42
|
-
scope:
|
|
42
|
+
scope: ts_morph_2.Scope.Public,
|
|
43
43
|
});
|
|
44
44
|
(0, coerce_imports_1.CoerceImports)(sourceFile, {
|
|
45
45
|
namedImports: ['RxapFormGroup'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-form-definition.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition.ts"],"names":[],"mappings":";;;AAAA,2DAGoC;AACpC,uCAIkB;AAClB
|
|
1
|
+
{"version":3,"file":"coerce-form-definition.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ClassDeclaration, MethodDeclarationStructure, Project, SourceFile, WriterFunction } from 'ts-morph';
|
|
2
1
|
import { TsMorphAngularProjectTransformOptions } from '@rxap/workspace-ts-morph';
|
|
2
|
+
import { ClassDeclaration, MethodDeclarationStructure, Project, SourceFile, WriterFunction } from 'ts-morph';
|
|
3
3
|
export interface CoerceProxyRemoteMethodClassOptions extends TsMorphAngularProjectTransformOptions {
|
|
4
4
|
name: string;
|
|
5
5
|
override?: boolean;
|
|
@@ -78,7 +78,7 @@ function CoerceProxyRemoteMethodClass(options) {
|
|
|
78
78
|
type: sourceType,
|
|
79
79
|
},
|
|
80
80
|
]);
|
|
81
|
-
(_c = methodStructure.statements) !== null && _c !== void 0 ? _c : (methodStructure.statements = ['return source as any']);
|
|
81
|
+
(_c = methodStructure.statements) !== null && _c !== void 0 ? _c : (methodStructure.statements = ['return source as any;']);
|
|
82
82
|
(_d = methodStructure.returnType) !== null && _d !== void 0 ? _d : (methodStructure.returnType = w => {
|
|
83
83
|
w.write('Promise<');
|
|
84
84
|
if (typeof targetType ===
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-proxy-remote-method-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-proxy-remote-method-class.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;AACpC,6CAKwB;AACxB,+CAAuC;
|
|
1
|
+
{"version":3,"file":"coerce-proxy-remote-method-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-proxy-remote-method-class.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CoerceTableParametersFromRouteRule = void 0;
|
|
4
4
|
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
5
|
-
const ts_morph_1 = require("ts-morph");
|
|
5
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
6
|
+
const ts_morph_2 = require("ts-morph");
|
|
6
7
|
const coerce_class_constructor_1 = require("../coerce-class-constructor");
|
|
7
|
-
const coerce_dto_class_1 = require("../nest/coerce-dto-class");
|
|
8
8
|
const ts_morph_transform_1 = require("../ts-morph-transform");
|
|
9
9
|
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
10
10
|
const coerce_parameter_declaration_1 = require("../ts-morph/coerce-parameter-declaration");
|
|
@@ -17,13 +17,13 @@ function CoerceTableParametersFromRouteRule(options) {
|
|
|
17
17
|
(0, coerce_parameter_declaration_1.CoerceParameterDeclaration)(constructorDeclaration, 'route', {
|
|
18
18
|
type: 'ActivatedRoute',
|
|
19
19
|
isReadonly: true,
|
|
20
|
-
scope:
|
|
20
|
+
scope: ts_morph_2.Scope.Private,
|
|
21
21
|
});
|
|
22
22
|
(0, coerce_imports_1.CoerceImports)(sourceFile, {
|
|
23
23
|
namedImports: ['ActivatedRoute'],
|
|
24
24
|
moduleSpecifier: '@angular/router',
|
|
25
25
|
});
|
|
26
|
-
(0,
|
|
26
|
+
(0, ts_morph_1.CoercePropertyDeclaration)(classDeclaration, 'parameters').set({
|
|
27
27
|
type: 'Observable<Record<string, string>>',
|
|
28
28
|
initializer: `this.route.params.map(params => ({${parameterList.map(parameter => `${parameter}: params.${parameter}`)
|
|
29
29
|
.join(', ')}}))`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-table-parameters-from-route.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-table-parameters-from-route.ts"],"names":[],"mappings":";;;AAAA,qEAAsD;AACtD,uCAAiC;AACjC,0EAAqE;AACrE
|
|
1
|
+
{"version":3,"file":"coerce-table-parameters-from-route.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-table-parameters-from-route.ts"],"names":[],"mappings":";;;AAAA,qEAAsD;AACtD,6CAA2D;AAC3D,uCAAiC;AACjC,0EAAqE;AACrE,8DAG+B;AAC/B,+DAA2D;AAC3D,2FAAsF;AAOtF,SAAgB,kCAAkC,CAAC,OAAkD;IACnG,MAAM,EACJ,aAAa,EACb,SAAS,GACV,GAAG,OAAO,CAAC;IACZ,OAAO,IAAA,uDAAkC,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE;QAE7D,MAAM,UAAU,GAAG,OAAO,CAAC,oBAAoB,CAAC,GAAI,SAAU,eAAe,CAAC,CAAC;QAC/E,MAAM,gBAAgB,GAAG,UAAU,CAAC,eAAe,CAAC,GAAI,IAAA,+BAAQ,EAAC,SAAS,CAAE,WAAW,CAAC,CAAC;QAEzF,MAAM,CAAE,sBAAsB,CAAE,GAAG,IAAA,iDAAsB,EAAC,gBAAgB,CAAC,CAAC;QAC5E,IAAA,yDAA0B,EACxB,sBAAsB,EACtB,OAAO,EACP;YACE,IAAI,EAAE,gBAAgB;YACtB,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,gBAAK,CAAC,OAAO;SACrB,CACF,CAAC;QACF,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,gBAAgB,CAAE;YAClC,eAAe,EAAE,iBAAiB;SACnC,CAAC,CAAC;QACH,IAAA,oCAAyB,EAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC;YAC5D,IAAI,EAAE,oCAAoC;YAC1C,WAAW,EAAE,qCAAsC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,GAAI,SAAU,YAAa,SAAU,EAAE,CAAC;iBACzD,IAAI,CAAC,IAAI,CAAE,KAAK;YACjF,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,OAAO;oBACb,SAAS,EAAE,EAAE;iBACd;aACF;SACF,CAAC,CAAC;QACH,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,YAAY,CAAE;YAC9B,eAAe,EAAE,MAAM;SACxB,CAAC,CAAC;QACH,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,KAAK,CAAE;YACvB,eAAe,EAAE,gBAAgB;SAClC,CAAC,CAAC;QACH,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,OAAO,CAAE;YACzB,eAAe,EAAE,eAAe;SACjC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAhDD,gFAgDC"}
|
|
@@ -11,7 +11,7 @@ function CoerceTableSelectResolveValueMethodRule(options) {
|
|
|
11
11
|
const { operationId, scope } = options;
|
|
12
12
|
return (0, coerce_method_class_1.CoerceMethodClass)(Object.assign(Object.assign({}, options), { tsMorphTransform: (project, sourceFile, classDeclaration) => {
|
|
13
13
|
const [constructorDeclaration] = (0, coerce_class_constructor_1.CoerceClassConstructor)(classDeclaration);
|
|
14
|
-
(0, coerce_parameter_declaration_1.CoerceParameterDeclaration)(constructorDeclaration, '
|
|
14
|
+
(0, coerce_parameter_declaration_1.CoerceParameterDeclaration)(constructorDeclaration, 'method').set({
|
|
15
15
|
type: (0, operation_id_utilities_1.OperationIdToClassName)(operationId),
|
|
16
16
|
isReadonly: true,
|
|
17
17
|
scope: ts_morph_1.Scope.Private,
|
|
@@ -22,7 +22,7 @@ function CoerceTableSelectResolveValueMethodRule(options) {
|
|
|
22
22
|
});
|
|
23
23
|
return {
|
|
24
24
|
statements: [
|
|
25
|
-
'return this.
|
|
25
|
+
'return this.method.call({ parameters: { ...(parameters.context ?? {}), value: parameters.value } });',
|
|
26
26
|
],
|
|
27
27
|
};
|
|
28
28
|
} }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-table-select-resolve-value-method.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-table-select-resolve-value-method.ts"],"names":[],"mappings":";;;AAAA,uCAAiC;AACjC,0EAAqE;AACrE,2EAGwC;AACxC,+DAA2D;AAC3D,2FAAsF;AACtF,+DAG+B;AAO/B,SAAgB,uCAAuC,CAAC,OAAmD;IACzG,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAEvC,OAAO,IAAA,uCAAiB,kCACnB,OAAO,KACV,gBAAgB,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE;YAC1D,MAAM,CAAE,sBAAsB,CAAE,GAAG,IAAA,iDAAsB,EAAC,gBAAgB,CAAC,CAAC;YAE5E,IAAA,yDAA0B,EAAC,sBAAsB,EAAE,
|
|
1
|
+
{"version":3,"file":"coerce-table-select-resolve-value-method.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-table-select-resolve-value-method.ts"],"names":[],"mappings":";;;AAAA,uCAAiC;AACjC,0EAAqE;AACrE,2EAGwC;AACxC,+DAA2D;AAC3D,2FAAsF;AACtF,+DAG+B;AAO/B,SAAgB,uCAAuC,CAAC,OAAmD;IACzG,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAEvC,OAAO,IAAA,uCAAiB,kCACnB,OAAO,KACV,gBAAgB,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE;YAC1D,MAAM,CAAE,sBAAsB,CAAE,GAAG,IAAA,iDAAsB,EAAC,gBAAgB,CAAC,CAAC;YAE5E,IAAA,yDAA0B,EAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC;gBAC/D,IAAI,EAAE,IAAA,+CAAsB,EAAC,WAAW,CAAC;gBACzC,UAAU,EAAE,IAAI;gBAChB,KAAK,EAAE,gBAAK,CAAC,OAAO;aACrB,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,IAAA,+CAAsB,EAAC,WAAW,CAAC,CAAE;gBACrD,eAAe,EAAE,IAAA,qDAA4B,EAAC,WAAW,EAAE,KAAK,CAAC;aAClE,CAAC,CAAC;YAEH,OAAO;gBACL,UAAU,EAAE;oBACV,sGAAsG;iBACvG;aACF,CAAC;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AAzBD,0FAyBC"}
|
|
@@ -3,7 +3,7 @@ import { ClassDeclaration, DecoratorStructure, MethodDeclaration, OptionalKind,
|
|
|
3
3
|
export interface OperationParameter {
|
|
4
4
|
name: string;
|
|
5
5
|
type?: string | WriterFunction | TypeImport;
|
|
6
|
-
pipeList?: Array<string | WriterFunction>;
|
|
6
|
+
pipeList?: Array<string | WriterFunction | TypeImport>;
|
|
7
7
|
defaultValue?: string | WriterFunction;
|
|
8
8
|
hasQuestionToken?: boolean;
|
|
9
9
|
required?: boolean;
|
|
@@ -2,12 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AddOperationToController = void 0;
|
|
4
4
|
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
5
|
-
const ts_morph_1 = require("ts-morph");
|
|
6
|
-
const
|
|
7
|
-
const
|
|
8
|
-
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
9
|
-
const coerce_statements_1 = require("../ts-morph/coerce-statements");
|
|
10
|
-
const ts_morph_2 = require("@rxap/ts-morph");
|
|
5
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
6
|
+
const utilities_1 = require("@rxap/utilities");
|
|
7
|
+
const ts_morph_2 = require("ts-morph");
|
|
11
8
|
function buildMethodQueryParameters(queryList, sourceFile) {
|
|
12
9
|
if (queryList.length) {
|
|
13
10
|
return queryList.map(query => {
|
|
@@ -16,7 +13,7 @@ function buildMethodQueryParameters(queryList, sourceFile) {
|
|
|
16
13
|
undefined) {
|
|
17
14
|
return query;
|
|
18
15
|
}
|
|
19
|
-
(0,
|
|
16
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
20
17
|
namedImports: ['DefaultValuePipe'],
|
|
21
18
|
moduleSpecifier: '@nestjs/common',
|
|
22
19
|
});
|
|
@@ -35,23 +32,28 @@ function buildMethodQueryParameters(queryList, sourceFile) {
|
|
|
35
32
|
w.write(')');
|
|
36
33
|
});
|
|
37
34
|
return Object.assign(Object.assign({}, query), { pipeList });
|
|
38
|
-
}).map(
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
name
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
35
|
+
}).map(({ alias, name, type, hasQuestionToken, required, defaultValue, pipeList = [], isArray }) => ({
|
|
36
|
+
name: alias !== null && alias !== void 0 ? alias : name,
|
|
37
|
+
type: (0, ts_morph_1.WriteType)({ type: type !== null && type !== void 0 ? type : 'unknown', isArray: isArray }, sourceFile),
|
|
38
|
+
hasQuestionToken: hasQuestionToken !== null && hasQuestionToken !== void 0 ? hasQuestionToken : (!required && defaultValue === undefined),
|
|
39
|
+
decorators: [
|
|
40
|
+
{
|
|
41
|
+
name: 'Query',
|
|
42
|
+
arguments: [
|
|
43
|
+
w => w.quote(name),
|
|
44
|
+
...pipeList.map(pipe => {
|
|
45
|
+
if (typeof pipe === 'string') {
|
|
46
|
+
return pipe;
|
|
47
|
+
}
|
|
48
|
+
if (typeof pipe === 'function') {
|
|
49
|
+
return pipe;
|
|
50
|
+
}
|
|
51
|
+
return (0, ts_morph_1.WriteType)(pipe, sourceFile);
|
|
52
|
+
}),
|
|
53
|
+
],
|
|
54
|
+
},
|
|
55
|
+
],
|
|
56
|
+
}));
|
|
55
57
|
}
|
|
56
58
|
return [];
|
|
57
59
|
}
|
|
@@ -59,7 +61,7 @@ function buildMethodParamParameters(paramList, sourceFile) {
|
|
|
59
61
|
if (paramList.length) {
|
|
60
62
|
return paramList.map(({ alias, name, type }) => ({
|
|
61
63
|
name: alias !== null && alias !== void 0 ? alias : name,
|
|
62
|
-
type: type ? (0,
|
|
64
|
+
type: type ? (0, ts_morph_1.WriteType)({
|
|
63
65
|
type: type,
|
|
64
66
|
isArray: false
|
|
65
67
|
}, sourceFile) : undefined,
|
|
@@ -115,30 +117,28 @@ function AddOperationToController(sourceFile, classDeclaration, name, options) {
|
|
|
115
117
|
}
|
|
116
118
|
(_a = param.type) !== null && _a !== void 0 ? _a : (param.type = 'string');
|
|
117
119
|
});
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
},
|
|
123
|
-
];
|
|
120
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
121
|
+
namedImports: [method, 'NotImplementedException'],
|
|
122
|
+
moduleSpecifier: '@nestjs/common',
|
|
123
|
+
});
|
|
124
124
|
if (queryList.length) {
|
|
125
|
-
|
|
125
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
126
126
|
namedImports: ['Query'],
|
|
127
127
|
moduleSpecifier: '@nestjs/common',
|
|
128
128
|
});
|
|
129
|
-
|
|
129
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
130
130
|
namedImports: ['ApiQuery'],
|
|
131
131
|
moduleSpecifier: '@nestjs/swagger',
|
|
132
132
|
});
|
|
133
133
|
}
|
|
134
134
|
if (paramList.length) {
|
|
135
|
-
|
|
135
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
136
136
|
namedImports: ['Param'],
|
|
137
137
|
moduleSpecifier: '@nestjs/common',
|
|
138
138
|
});
|
|
139
139
|
}
|
|
140
140
|
if (body) {
|
|
141
|
-
|
|
141
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
142
142
|
namedImports: ['Body'],
|
|
143
143
|
moduleSpecifier: '@nestjs/common',
|
|
144
144
|
});
|
|
@@ -161,19 +161,9 @@ function AddOperationToController(sourceFile, classDeclaration, name, options) {
|
|
|
161
161
|
}
|
|
162
162
|
// TODO : check that all defined param in the paramList are present in the path
|
|
163
163
|
returnType !== null && returnType !== void 0 ? returnType : (returnType = 'void');
|
|
164
|
-
const methodDeclaration = (0,
|
|
165
|
-
scope:
|
|
164
|
+
const methodDeclaration = (0, ts_morph_1.CoerceClassMethod)(classDeclaration, (0, schematics_utilities_1.camelize)(name), {
|
|
165
|
+
scope: ts_morph_2.Scope.Public,
|
|
166
166
|
isAsync,
|
|
167
|
-
parameters: [
|
|
168
|
-
...buildMethodQueryParameters(queryList, sourceFile),
|
|
169
|
-
...buildMethodParamParameters(paramList, sourceFile),
|
|
170
|
-
...buildMethodBodyParameters(body),
|
|
171
|
-
].sort((a, b) => {
|
|
172
|
-
if (a.hasQuestionToken && b.hasQuestionToken) {
|
|
173
|
-
return 0;
|
|
174
|
-
}
|
|
175
|
-
return a.hasQuestionToken ? 1 : -1;
|
|
176
|
-
}),
|
|
177
167
|
returnType: !isAsync ? returnType : returnType ? (w) => {
|
|
178
168
|
w.write('Promise<');
|
|
179
169
|
if (typeof returnType === 'string') {
|
|
@@ -188,21 +178,35 @@ function AddOperationToController(sourceFile, classDeclaration, name, options) {
|
|
|
188
178
|
w.write('>');
|
|
189
179
|
} : undefined,
|
|
190
180
|
});
|
|
181
|
+
const existingParameters = methodDeclaration.getParameters().map(p => p.getStructure());
|
|
182
|
+
(0, utilities_1.CoerceArrayItems)(existingParameters, [
|
|
183
|
+
...buildMethodQueryParameters(queryList, sourceFile),
|
|
184
|
+
...buildMethodParamParameters(paramList, sourceFile),
|
|
185
|
+
...buildMethodBodyParameters(body),
|
|
186
|
+
], (a, b) => a.name === b.name);
|
|
187
|
+
methodDeclaration.getParameters().forEach(p => p.remove());
|
|
188
|
+
for (const parameter of existingParameters.sort((a, b) => {
|
|
189
|
+
if (a.hasQuestionToken && b.hasQuestionToken) {
|
|
190
|
+
return 0;
|
|
191
|
+
}
|
|
192
|
+
return a.hasQuestionToken ? 1 : -1;
|
|
193
|
+
})) {
|
|
194
|
+
methodDeclaration.addParameter(parameter);
|
|
195
|
+
}
|
|
191
196
|
decorators.forEach(decorator => {
|
|
192
|
-
(0,
|
|
197
|
+
(0, ts_morph_1.CoerceDecorator)(methodDeclaration, decorator.name, decorator);
|
|
193
198
|
});
|
|
194
|
-
(0,
|
|
199
|
+
(0, ts_morph_1.CoerceDecorator)(methodDeclaration, method, { arguments: path ? [w => w.quote(path)] : [] });
|
|
195
200
|
coerceApiQueryDecorators(queryList, methodDeclaration);
|
|
196
|
-
(0,
|
|
197
|
-
(0, coerce_imports_1.CoerceImports)(sourceFile, importStructures);
|
|
201
|
+
(0, ts_morph_1.CoerceStatements)(methodDeclaration, statements !== null && statements !== void 0 ? statements : ['throw new NotImplementedException();']);
|
|
198
202
|
tsMorphTransform(sourceFile, classDeclaration, methodDeclaration, options);
|
|
199
203
|
}
|
|
200
204
|
exports.AddOperationToController = AddOperationToController;
|
|
201
205
|
function coerceApiQueryDecorators(queryList, methodDeclaration) {
|
|
202
206
|
for (const query of queryList) {
|
|
203
|
-
(0,
|
|
207
|
+
(0, ts_morph_1.CoerceDecorator)(methodDeclaration, 'ApiQuery', {
|
|
204
208
|
arguments: [
|
|
205
|
-
|
|
209
|
+
ts_morph_2.Writers.object({
|
|
206
210
|
name: w => w.quote(query.name),
|
|
207
211
|
required: query.required ? 'true' : 'false',
|
|
208
212
|
isArray: query.isArray ? 'true' : 'false',
|
|
@@ -212,9 +216,9 @@ function coerceApiQueryDecorators(queryList, methodDeclaration) {
|
|
|
212
216
|
var _a;
|
|
213
217
|
if (decorator.getArguments().length) {
|
|
214
218
|
const [objectLiteralExpression] = decorator.getArguments();
|
|
215
|
-
if (objectLiteralExpression instanceof
|
|
219
|
+
if (objectLiteralExpression instanceof ts_morph_2.ObjectLiteralExpression) {
|
|
216
220
|
const namePropertyElement = objectLiteralExpression.getProperty('name');
|
|
217
|
-
if (namePropertyElement instanceof
|
|
221
|
+
if (namePropertyElement instanceof ts_morph_2.PropertyAssignment) {
|
|
218
222
|
const name = (_a = namePropertyElement.getInitializer()) === null || _a === void 0 ? void 0 : _a.getText().trim().replace(/^'/, '').replace(/'$/, '');
|
|
219
223
|
return name === query.name;
|
|
220
224
|
}
|