@rxap/schematics-ts-morph 16.1.0-dev.1 → 16.1.0-dev.3
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 +17 -0
- package/README.md +1 -1
- package/package.json +8 -6
- package/src/index.d.ts +1 -0
- package/src/index.js +1 -0
- package/src/index.js.map +1 -1
- package/src/lib/angular/coerce-component.d.ts +6 -0
- package/src/lib/angular/coerce-component.js +57 -2
- package/src/lib/angular/coerce-component.js.map +1 -1
- package/src/lib/angular/coerce-proxy-remote-method-class.d.ts +2 -2
- package/src/lib/angular/coerce-proxy-remote-method-class.js +15 -18
- package/src/lib/angular/coerce-proxy-remote-method-class.js.map +1 -1
- package/src/lib/angular/coerce-table-data-source.js +1 -1
- package/src/lib/angular/coerce-table-data-source.js.map +1 -1
- package/src/lib/angular/coerce-tree-table-children-proxy-remote-method-class.js +2 -2
- package/src/lib/angular/coerce-tree-table-children-proxy-remote-method-class.js.map +1 -1
- package/src/lib/nest/coerce-dto-class.d.ts +2 -9
- package/src/lib/nest/coerce-dto-class.js +28 -20
- package/src/lib/nest/coerce-dto-class.js.map +1 -1
- package/src/lib/nest/coerce-form-submit-operation.js +2 -2
- package/src/lib/nest/coerce-form-submit-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-children-operation.js +6 -12
- package/src/lib/nest/coerce-get-children-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-data-grid-operation.js +4 -9
- package/src/lib/nest/coerce-get-data-grid-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-page-operation.d.ts +3 -6
- package/src/lib/nest/coerce-get-page-operation.js +73 -62
- package/src/lib/nest/coerce-get-page-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-root-operation.d.ts +1 -0
- package/src/lib/nest/coerce-get-root-operation.js +5 -10
- package/src/lib/nest/coerce-get-root-operation.js.map +1 -1
- package/src/lib/nest/coerce-operation.d.ts +1 -1
- package/src/lib/nest/coerce-operation.js +10 -7
- package/src/lib/nest/coerce-operation.js.map +1 -1
- package/src/lib/nest/coerce-page-dto-class.d.ts +2 -8
- package/src/lib/nest/coerce-page-dto-class.js +46 -20
- package/src/lib/nest/coerce-page-dto-class.js.map +1 -1
- package/src/lib/nest/coerce-row-dto-class.js +1 -4
- package/src/lib/nest/coerce-row-dto-class.js.map +1 -1
- package/src/lib/nest/coerce-submit-data-grid-operation.js +3 -7
- package/src/lib/nest/coerce-submit-data-grid-operation.js.map +1 -1
- package/src/lib/nest/coerce-tree-operation.js +2 -2
- package/src/lib/nest/coerce-tree-operation.js.map +1 -1
- package/src/lib/nest/table-query-list.d.ts +2 -0
- package/src/lib/nest/table-query-list.js +33 -0
- package/src/lib/nest/table-query-list.js.map +1 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,23 @@
|
|
|
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.3](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.1.0-dev.2...@rxap/schematics-ts-morph@16.1.0-dev.3) (2024-02-26)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- add the open api upstream command to the module providers ([4b71f61](https://gitlab.com/rxap/packages/commit/4b71f61ef5801aae286afe757881a855f56b4bdc))
|
|
11
|
+
- align the controller name processing ([e3c9c31](https://gitlab.com/rxap/packages/commit/e3c9c31afdd6813832177ec4c566d92e8a45201b))
|
|
12
|
+
- use the command class name as member name ([7a13825](https://gitlab.com/rxap/packages/commit/7a13825c4b8db05b16ea8dc075e373071dd65f27))
|
|
13
|
+
|
|
14
|
+
# [16.1.0-dev.2](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.1.0-dev.1...@rxap/schematics-ts-morph@16.1.0-dev.2) (2024-02-25)
|
|
15
|
+
|
|
16
|
+
### Features
|
|
17
|
+
|
|
18
|
+
- support custom handlebars partials and helpers ([c1aa756](https://gitlab.com/rxap/packages/commit/c1aa756389f84acbaaa7b5b9718d7e168aef8c7f))
|
|
19
|
+
- support handlebars for component generator ([5f1ef58](https://gitlab.com/rxap/packages/commit/5f1ef58f094282a7f67fcbaca65cbc847361c00a))
|
|
20
|
+
- support table parameters in tree tables ([bf8a676](https://gitlab.com/rxap/packages/commit/bf8a676790b9e9bf60ef290e1201a998fbdaffd0))
|
|
21
|
+
- support upstream configurations ([3c972cf](https://gitlab.com/rxap/packages/commit/3c972cfc1aea45d9cabca07f24f4627f4aff03aa))
|
|
22
|
+
|
|
6
23
|
# [16.1.0-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.1.0-dev.0...@rxap/schematics-ts-morph@16.1.0-dev.1) (2024-02-22)
|
|
7
24
|
|
|
8
25
|
### 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.2 @rxap/utilities@^16.1.0-dev.1 @rxap/workspace-ts-morph@^16.0.1 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.3",
|
|
3
3
|
"name": "@rxap/schematics-ts-morph",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -13,9 +13,11 @@
|
|
|
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.2",
|
|
17
|
+
"@rxap/utilities": "^16.1.0-dev.1",
|
|
18
18
|
"@rxap/workspace-ts-morph": "^16.0.1",
|
|
19
|
+
"colors": "^1.4.0",
|
|
20
|
+
"handlebars": "^4.7.7",
|
|
19
21
|
"ts-morph": "^18.0.0",
|
|
20
22
|
"tslib": "2.6.2",
|
|
21
23
|
"@rxap/node-utilities": "1.1.0",
|
|
@@ -46,11 +48,11 @@
|
|
|
46
48
|
},
|
|
47
49
|
{
|
|
48
50
|
"package": "@rxap/ts-morph",
|
|
49
|
-
"version": "1.1.0-dev.
|
|
51
|
+
"version": "1.1.0-dev.2"
|
|
50
52
|
},
|
|
51
53
|
{
|
|
52
54
|
"package": "@rxap/utilities",
|
|
53
|
-
"version": "16.1.0-dev.
|
|
55
|
+
"version": "16.1.0-dev.1"
|
|
54
56
|
},
|
|
55
57
|
{
|
|
56
58
|
"package": "@rxap/workspace-ts-morph",
|
|
@@ -68,7 +70,7 @@
|
|
|
68
70
|
"directory": "packages/schematic/ts-morph"
|
|
69
71
|
},
|
|
70
72
|
"type": "commonjs",
|
|
71
|
-
"gitHead": "
|
|
73
|
+
"gitHead": "c3d9e0e2a0cb35d82a96ca4e7a249ce0f06a3ee1",
|
|
72
74
|
"main": "./src/index.js",
|
|
73
75
|
"types": "./src/index.d.ts"
|
|
74
76
|
}
|
package/src/index.d.ts
CHANGED
|
@@ -52,6 +52,7 @@ export * from './lib/nest/operation-id-utilities';
|
|
|
52
52
|
export * from './lib/nest/project-utilities';
|
|
53
53
|
export * from './lib/nest/remove-nest-module-provider';
|
|
54
54
|
export * from './lib/nest/remove-nest-provider-to-array';
|
|
55
|
+
export * from './lib/nest/table-query-list';
|
|
55
56
|
export * from './lib/angular/add-component-animations';
|
|
56
57
|
export * from './lib/angular/add-component-fake-provider';
|
|
57
58
|
export * from './lib/angular/add-component-import';
|
package/src/index.js
CHANGED
|
@@ -60,6 +60,7 @@ tslib_1.__exportStar(require("./lib/nest/operation-id-utilities"), exports);
|
|
|
60
60
|
tslib_1.__exportStar(require("./lib/nest/project-utilities"), exports);
|
|
61
61
|
tslib_1.__exportStar(require("./lib/nest/remove-nest-module-provider"), exports);
|
|
62
62
|
tslib_1.__exportStar(require("./lib/nest/remove-nest-provider-to-array"), exports);
|
|
63
|
+
tslib_1.__exportStar(require("./lib/nest/table-query-list"), exports);
|
|
63
64
|
// endregion
|
|
64
65
|
// region angular
|
|
65
66
|
tslib_1.__exportStar(require("./lib/angular/add-component-animations"), 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,sEAA4C;AAC5C,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,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"}
|
|
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,sEAA4C;AAC5C,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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { Rule } from '@angular-devkit/schematics';
|
|
2
2
|
import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
|
|
3
3
|
import { TsMorphAngularProjectTransformOptions } from '../ts-morph-transform';
|
|
4
|
+
import Handlebars from 'handlebars';
|
|
5
|
+
import 'colors';
|
|
4
6
|
export interface TemplateOptions {
|
|
5
7
|
url?: string;
|
|
6
8
|
options?: Record<string, unknown> | object;
|
|
@@ -11,5 +13,9 @@ export interface CoerceComponentOptions extends TsMorphAngularProjectTransformOp
|
|
|
11
13
|
template?: TemplateOptions;
|
|
12
14
|
overwrite?: boolean | string[];
|
|
13
15
|
tsMorphTransform?: (project: Project, [componentSourceFile]: [SourceFile], [componentClass]: [ClassDeclaration], options: CoerceComponentOptions) => void;
|
|
16
|
+
handlebars?: {
|
|
17
|
+
helpers?: Record<string, Handlebars.HelperDelegate>;
|
|
18
|
+
partials?: Record<string, Handlebars.TemplateDelegate>;
|
|
19
|
+
};
|
|
14
20
|
}
|
|
15
21
|
export declare function CoerceComponentRule(options: Readonly<CoerceComponentOptions>): Rule;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CoerceComponentRule = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
4
5
|
const core_1 = require("@angular-devkit/core");
|
|
5
6
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
6
7
|
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
@@ -9,8 +10,53 @@ const path_1 = require("path");
|
|
|
9
10
|
const ts_morph_transform_1 = require("../ts-morph-transform");
|
|
10
11
|
const build_angular_base_path_1 = require("./build-angular-base-path");
|
|
11
12
|
const has_component_1 = require("./has-component");
|
|
13
|
+
const handlebars_1 = tslib_1.__importDefault(require("handlebars"));
|
|
14
|
+
require("colors");
|
|
15
|
+
function applyContentHandlebars(options) {
|
|
16
|
+
return (entry) => {
|
|
17
|
+
const { path, content } = entry;
|
|
18
|
+
handlebars_1.default.registerHelper('compile', (context, input) => {
|
|
19
|
+
return new handlebars_1.default.SafeString(context(input.hash));
|
|
20
|
+
});
|
|
21
|
+
handlebars_1.default.registerHelper('indent', (text, spaces) => {
|
|
22
|
+
const indent = new Array(spaces + 1).join(' ');
|
|
23
|
+
if (text instanceof handlebars_1.default.SafeString) {
|
|
24
|
+
text = text.toString();
|
|
25
|
+
}
|
|
26
|
+
return new handlebars_1.default.SafeString(text.split('\n').map((line, index) => {
|
|
27
|
+
return index === 0 ? line : indent + line;
|
|
28
|
+
}).join('\n'));
|
|
29
|
+
});
|
|
30
|
+
try {
|
|
31
|
+
const template = handlebars_1.default.compile(content.toString());
|
|
32
|
+
return {
|
|
33
|
+
path,
|
|
34
|
+
content: Buffer.from(template(options)),
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
catch (e) {
|
|
38
|
+
if (e.code === 'ERR_ENCODING_INVALID_ENCODED_DATA') {
|
|
39
|
+
return entry;
|
|
40
|
+
}
|
|
41
|
+
throw e;
|
|
42
|
+
}
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
function applyHandlebars(options) {
|
|
46
|
+
return (0, schematics_1.forEach)((0, schematics_1.when)((path) => path.endsWith('.hbs'), (0, schematics_1.composeFileOperators)([
|
|
47
|
+
applyContentHandlebars(options),
|
|
48
|
+
// See above for this weird cast.
|
|
49
|
+
(0, schematics_1.applyPathTemplate)(options),
|
|
50
|
+
(entry) => {
|
|
51
|
+
return {
|
|
52
|
+
content: entry.content,
|
|
53
|
+
path: entry.path.replace(/\.hbs$/, ''),
|
|
54
|
+
};
|
|
55
|
+
},
|
|
56
|
+
])));
|
|
57
|
+
}
|
|
12
58
|
function CoerceComponentRule(options) {
|
|
13
|
-
let { tsMorphTransform, template, project, feature, directory, name, flat, overwrite, } = options;
|
|
59
|
+
let { tsMorphTransform, template, project, feature, directory, name, flat, overwrite, handlebars } = options;
|
|
14
60
|
overwrite !== null && overwrite !== void 0 ? overwrite : (overwrite = false);
|
|
15
61
|
directory !== null && directory !== void 0 ? directory : (directory = '');
|
|
16
62
|
flat !== null && flat !== void 0 ? flat : (flat = directory.endsWith(name));
|
|
@@ -37,11 +83,20 @@ function CoerceComponentRule(options) {
|
|
|
37
83
|
});
|
|
38
84
|
}
|
|
39
85
|
if (template && (overwrite === true || (Array.isArray(overwrite) && (overwrite === null || overwrite === void 0 ? void 0 : overwrite.includes('template'))) || !hasComponent)) {
|
|
86
|
+
if (handlebars) {
|
|
87
|
+
if (handlebars.helpers) {
|
|
88
|
+
handlebars_1.default.registerHelper(handlebars.helpers);
|
|
89
|
+
}
|
|
90
|
+
if (handlebars.partials) {
|
|
91
|
+
handlebars_1.default.registerPartial(handlebars.partials);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
40
94
|
(_a = template.url) !== null && _a !== void 0 ? _a : (template.url = './files/component');
|
|
41
95
|
const templateOptions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, core_1.strings), { prefix, scope: `${prefix}` }), options), ((_b = template === null || template === void 0 ? void 0 : template.options) !== null && _b !== void 0 ? _b : {})), { componentName: name });
|
|
42
96
|
(_c = templateOptions['prefix']) !== null && _c !== void 0 ? _c : (templateOptions['prefix'] = (0, schematics_utilities_1.GetProjectPrefix)(tree, options.project));
|
|
43
|
-
rules.push(() => console.log(`Template '${template.url}' will be used to modify the component.`), () => console.log(`Template options: ${JSON.stringify(templateOptions)}
|
|
97
|
+
rules.push(() => console.log(`Template '${template.url}' will be used to modify the component.`), () => console.log(`Template options: ${JSON.stringify(templateOptions)}`.grey), (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)(template.url), [
|
|
44
98
|
(0, schematics_1.applyTemplates)(templateOptions),
|
|
99
|
+
applyHandlebars(templateOptions),
|
|
45
100
|
(0, schematics_1.move)(flat ? basePath : (0, path_1.join)(basePath, name)),
|
|
46
101
|
]), schematics_1.MergeStrategy.Overwrite));
|
|
47
102
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-component.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-component.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"coerce-component.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-component.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { ClassDeclaration, MethodDeclarationStructure, Project, SourceFile, WriterFunction } from 'ts-morph';
|
|
2
|
-
import { TsMorphAngularProjectTransformOptions } from '
|
|
2
|
+
import { TsMorphAngularProjectTransformOptions } from '@rxap/workspace-ts-morph';
|
|
3
3
|
export interface CoerceProxyRemoteMethodClassOptions extends TsMorphAngularProjectTransformOptions {
|
|
4
4
|
name: string;
|
|
5
5
|
override?: boolean;
|
|
6
|
-
tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration) => Partial<MethodDeclarationStructure
|
|
6
|
+
tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration) => Partial<MethodDeclarationStructure> | void;
|
|
7
7
|
sourceType: string | WriterFunction;
|
|
8
8
|
targetType: string | WriterFunction;
|
|
9
9
|
proxyMethod: string | WriterFunction;
|
|
@@ -2,20 +2,17 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CoerceProxyRemoteMethodClass = void 0;
|
|
4
4
|
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
const coerce_source_file_1 = require("../coerce-source-file");
|
|
5
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
6
|
+
const utilities_1 = require("@rxap/utilities");
|
|
8
7
|
const ts_morph_transform_1 = require("../ts-morph-transform");
|
|
9
|
-
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
10
8
|
function CoerceProxyRemoteMethodClass(options) {
|
|
11
|
-
|
|
12
|
-
tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => ({}));
|
|
9
|
+
const { override, name, tsMorphTransform = utilities_1.noop, sourceType, targetType, proxyMethod, } = options;
|
|
13
10
|
const className = (0, schematics_utilities_1.classify)((0, schematics_utilities_1.CoerceSuffix)(name, 'ProxyMethod'));
|
|
14
11
|
const fileName = (0, schematics_utilities_1.CoerceSuffix)(name, '-proxy.method.ts');
|
|
15
12
|
return (0, ts_morph_transform_1.TsMorphAngularProjectTransformRule)(options, (project) => {
|
|
16
|
-
var _a, _b, _c, _d;
|
|
17
|
-
const sourceFile = (0,
|
|
18
|
-
const classDeclaration = (0,
|
|
13
|
+
var _a, _b, _c, _d, _e;
|
|
14
|
+
const sourceFile = (0, ts_morph_1.CoerceSourceFile)(project, fileName);
|
|
15
|
+
const classDeclaration = (0, ts_morph_1.CoerceClass)(sourceFile, className, {
|
|
19
16
|
isExported: true,
|
|
20
17
|
decorators: [
|
|
21
18
|
{
|
|
@@ -62,27 +59,27 @@ function CoerceProxyRemoteMethodClass(options) {
|
|
|
62
59
|
w.write('>');
|
|
63
60
|
},
|
|
64
61
|
});
|
|
65
|
-
(0,
|
|
62
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
66
63
|
moduleSpecifier: '@rxap/pattern',
|
|
67
64
|
namedImports: ['Method'],
|
|
68
65
|
});
|
|
69
|
-
(0,
|
|
66
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
70
67
|
moduleSpecifier: '@angular/core',
|
|
71
68
|
namedImports: ['Injectable', 'Inject'],
|
|
72
69
|
});
|
|
73
|
-
(0,
|
|
70
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
74
71
|
moduleSpecifier: '@rxap/remote-method',
|
|
75
72
|
namedImports: ['RxapRemoteMethod', 'ProxyRemoteMethod'],
|
|
76
73
|
});
|
|
77
|
-
const methodStructure = tsMorphTransform(project, sourceFile, classDeclaration);
|
|
78
|
-
(
|
|
74
|
+
const methodStructure = (_a = tsMorphTransform(project, sourceFile, classDeclaration)) !== null && _a !== void 0 ? _a : {};
|
|
75
|
+
(_b = methodStructure.parameters) !== null && _b !== void 0 ? _b : (methodStructure.parameters = [
|
|
79
76
|
{
|
|
80
77
|
name: 'source',
|
|
81
78
|
type: sourceType,
|
|
82
79
|
},
|
|
83
80
|
]);
|
|
84
|
-
(
|
|
85
|
-
(
|
|
81
|
+
(_c = methodStructure.statements) !== null && _c !== void 0 ? _c : (methodStructure.statements = ['return source as any']);
|
|
82
|
+
(_d = methodStructure.returnType) !== null && _d !== void 0 ? _d : (methodStructure.returnType = w => {
|
|
86
83
|
w.write('Promise<');
|
|
87
84
|
if (typeof targetType ===
|
|
88
85
|
'string') {
|
|
@@ -93,8 +90,8 @@ function CoerceProxyRemoteMethodClass(options) {
|
|
|
93
90
|
}
|
|
94
91
|
w.write('>');
|
|
95
92
|
});
|
|
96
|
-
(
|
|
97
|
-
const methodDeclaration = (0,
|
|
93
|
+
(_e = methodStructure.isAsync) !== null && _e !== void 0 ? _e : (methodStructure.isAsync = true);
|
|
94
|
+
const methodDeclaration = (0, ts_morph_1.CoerceClassMethod)(classDeclaration, 'transformParameters', methodStructure);
|
|
98
95
|
if (override) {
|
|
99
96
|
methodDeclaration.set(methodStructure);
|
|
100
97
|
}
|
|
@@ -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;
|
|
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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"}
|
|
@@ -21,7 +21,7 @@ function CoerceTableDataSourceRule(options) {
|
|
|
21
21
|
const [constructorDeclaration] = (0, coerce_class_constructor_1.CoerceClassConstructor)(classDeclaration);
|
|
22
22
|
constructorDeclaration.set({
|
|
23
23
|
statements: [
|
|
24
|
-
'super(new GetPageAdapterRemoteMethod(getByFilter));',
|
|
24
|
+
'super(new GetPageAdapterRemoteMethod(getByFilter as any));',
|
|
25
25
|
],
|
|
26
26
|
});
|
|
27
27
|
const propertyDeclaration = (0, coerce_parameter_declaration_1.CoerceParameterDeclaration)(constructorDeclaration, 'getByFilter').set({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-table-data-source.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-table-data-source.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAM1D,0EAAqE;AACrE,2EAGwC;AACxC,mEAA+D;AAC/D,+DAA2D;AAC3D,2FAAsF;AACtF,yEAGoC;AAUpC,SAAgB,yBAAyB,CAAC,OAA+C;IACvF,IAAI,EACF,IAAI,EACJ,WAAW,EACX,KAAK,GACN,GAAG,OAAO,CAAC;IACZ,IAAI,GAAG,IAAA,mCAAY,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEpC,OAAO,IAAA,gDAAqB,kCACvB,OAAO,KACV,aAAa,EAAE,CACb,UAAsB,EACtB,gBAAkC,EAClC,OAAqC,EACrC,EAAE;YACF,gBAAgB,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC;YACtD,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,eAAe,EAAE,yBAAyB;gBAC1C,YAAY,EAAE,CAAE,wBAAwB,CAAE;aAC3C,CAAC,CAAC;QACL,CAAC,EACD,gBAAgB,EAAE,CAAC,OAAgB,EAAE,UAAsB,EAAE,gBAAkC,EAAE,EAAE;YACjG,MAAM,CAAE,sBAAsB,CAAE,GAAG,IAAA,iDAAsB,EAAC,gBAAgB,CAAC,CAAC;YAE5E,sBAAsB,CAAC,GAAG,CAAC;gBACzB,UAAU,EAAE;oBACV,
|
|
1
|
+
{"version":3,"file":"coerce-table-data-source.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-table-data-source.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAM1D,0EAAqE;AACrE,2EAGwC;AACxC,mEAA+D;AAC/D,+DAA2D;AAC3D,2FAAsF;AACtF,yEAGoC;AAUpC,SAAgB,yBAAyB,CAAC,OAA+C;IACvF,IAAI,EACF,IAAI,EACJ,WAAW,EACX,KAAK,GACN,GAAG,OAAO,CAAC;IACZ,IAAI,GAAG,IAAA,mCAAY,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEpC,OAAO,IAAA,gDAAqB,kCACvB,OAAO,KACV,aAAa,EAAE,CACb,UAAsB,EACtB,gBAAkC,EAClC,OAAqC,EACrC,EAAE;YACF,gBAAgB,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC;YACtD,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,eAAe,EAAE,yBAAyB;gBAC1C,YAAY,EAAE,CAAE,wBAAwB,CAAE;aAC3C,CAAC,CAAC;QACL,CAAC,EACD,gBAAgB,EAAE,CAAC,OAAgB,EAAE,UAAsB,EAAE,gBAAkC,EAAE,EAAE;YACjG,MAAM,CAAE,sBAAsB,CAAE,GAAG,IAAA,iDAAsB,EAAC,gBAAgB,CAAC,CAAC;YAE5E,sBAAsB,CAAC,GAAG,CAAC;gBACzB,UAAU,EAAE;oBACV,4DAA4D;iBAC7D;aACF,CAAC,CAAC;YAEH,MAAM,mBAAmB,GAAG,IAAA,yDAA0B,EAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC;gBAChG,IAAI,EAAE,IAAA,+CAAsB,EAAC,WAAW,CAAC;aAC1C,CAAC,CAAC;YAEH,IAAA,kCAAe,EAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC;gBACjD,SAAS,EAAE,CAAE,IAAA,+CAAsB,EAAC,WAAW,CAAC,CAAE;aACnD,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB;oBACE,eAAe,EAAE,eAAe;oBAChC,YAAY,EAAE,CAAE,QAAQ,CAAE;iBAC3B;gBACD;oBACE,eAAe,EAAE,IAAA,qDAA4B,EAAC,WAAW,EAAE,KAAK,CAAC;oBACjE,YAAY,EAAE,CAAE,IAAA,+CAAsB,EAAC,WAAW,CAAC,CAAE;iBACtD;gBACD;oBACE,eAAe,EAAE,8BAA8B;oBAC/C,YAAY,EAAE,CAAE,4BAA4B,CAAE;iBAC/C;aACF,CAAC,CAAC;QAEL,CAAC,EACD,IAAI,IACJ,CAAC;AAEL,CAAC;AAzDD,8DAyDC"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CoerceTreeTableChildrenProxyRemoteMethodClass = void 0;
|
|
4
|
+
const utilities_1 = require("@rxap/utilities");
|
|
4
5
|
const operation_id_utilities_1 = require("../nest/operation-id-utilities");
|
|
5
6
|
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
6
7
|
const coerce_proxy_remote_method_class_1 = require("./coerce-proxy-remote-method-class");
|
|
7
8
|
function CoerceTreeTableChildrenProxyRemoteMethodClass(options) {
|
|
8
|
-
|
|
9
|
-
tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => ({}));
|
|
9
|
+
const { tsMorphTransform = utilities_1.noop, getChildrenOperationId, scope, } = options;
|
|
10
10
|
return (0, coerce_proxy_remote_method_class_1.CoerceProxyRemoteMethodClass)(Object.assign(Object.assign({}, options), { name: 'tree-table-children', sourceType: 'Node<unknown>', targetType: `OpenApiRemoteMethodParameter<${(0, operation_id_utilities_1.OperationIdToParameterClassName)(getChildrenOperationId)}>`, proxyMethod: (0, operation_id_utilities_1.OperationIdToClassName)(getChildrenOperationId), tsMorphTransform: (project, sourceFile, classDeclaration) => {
|
|
11
11
|
(0, coerce_imports_1.CoerceImports)(sourceFile, {
|
|
12
12
|
namedImports: [(0, operation_id_utilities_1.OperationIdToClassName)(getChildrenOperationId)],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-tree-table-children-proxy-remote-method-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-tree-table-children-proxy-remote-method-class.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"coerce-tree-table-children-proxy-remote-method-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-tree-table-children-proxy-remote-method-class.ts"],"names":[],"mappings":";;;AAAA,+CAAuC;AAMvC,2EAKwC;AACxC,+DAA2D;AAC3D,yFAG4C;AAQ5C,SAAgB,6CAA6C,CAAC,OAA6D;IACzH,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,sBAAsB,EACtB,KAAK,GACN,GAAG,OAAO,CAAC;IACZ,OAAO,IAAA,+DAA4B,kCAC9B,OAAO,KACV,IAAI,EAAE,qBAAqB,EAC3B,UAAU,EAAE,eAAe,EAC3B,UAAU,EAAE,gCAAiC,IAAA,wDAA+B,EAAC,sBAAsB,CAAE,GAAG,EACxG,WAAW,EAAE,IAAA,+CAAsB,EAAC,sBAAsB,CAAC,EAC3D,gBAAgB,EAAE,CAAC,OAAgB,EAAE,UAAsB,EAAE,gBAAkC,EAAE,EAAE;YACjG,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,IAAA,+CAAsB,EAAC,sBAAsB,CAAC,CAAE;gBAChE,eAAe,EAAE,IAAA,qDAA4B,EAAC,sBAAsB,EAAE,KAAK,CAAC;aAC7E,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,MAAM,CAAE;gBACxB,eAAe,EAAE,2BAA2B;aAC7C,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,8BAA8B,CAAE;gBAChD,eAAe,EAAE,8BAA8B;aAChD,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,IAAA,wDAA+B,EAAC,sBAAsB,CAAC,CAAE;gBACzE,eAAe,EAAE,IAAA,8DAAqC,EAAC,sBAAsB,EAAE,KAAK,CAAC;aACtF,CAAC,CAAC;YACH,OAAO,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;QACjE,CAAC,IACD,CAAC;AACL,CAAC;AAhCD,sGAgCC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { ClassDeclaration,
|
|
1
|
+
import { ClassDeclaration, ClassLikeDeclarationBase, Project, PropertyDeclaration, PropertyDeclarationStructure, PropertySignature, SourceFile, TypeElementMemberedNode } from 'ts-morph';
|
|
2
2
|
import { DtoClassProperty } from './create-dto-class';
|
|
3
|
+
import 'colors';
|
|
3
4
|
export interface CoerceDtoClassOutput {
|
|
4
5
|
className: string;
|
|
5
6
|
filePath: string;
|
|
@@ -15,14 +16,6 @@ export interface CoerceDtoClassOptions {
|
|
|
15
16
|
project: Project;
|
|
16
17
|
name: string;
|
|
17
18
|
propertyList?: DtoClassProperty[];
|
|
18
|
-
/**
|
|
19
|
-
* @deprecated use the tsMorphTransform to adapt the class
|
|
20
|
-
*/
|
|
21
|
-
classStructure?: Omit<OptionalKind<ClassDeclarationStructure>, 'name'>;
|
|
22
|
-
/**
|
|
23
|
-
* @deprecated use the tsMorphTransform to add imports
|
|
24
|
-
*/
|
|
25
|
-
importStructureList?: Array<OptionalKind<ImportDeclarationStructure>>;
|
|
26
19
|
tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration) => void;
|
|
27
20
|
}
|
|
28
21
|
export declare function CoerceDtoClass(options: CoerceDtoClassOptions): CoerceDtoClassOutput;
|
|
@@ -5,11 +5,9 @@ const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
|
5
5
|
const utilities_1 = require("@rxap/utilities");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const ts_morph_1 = require("ts-morph");
|
|
8
|
-
const coerce_class_1 = require("../coerce-class");
|
|
9
|
-
const coerce_source_file_1 = require("../coerce-source-file");
|
|
10
8
|
const coerce_decorator_1 = require("../ts-morph/coerce-decorator");
|
|
11
|
-
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
12
9
|
const ts_morph_2 = require("@rxap/ts-morph");
|
|
10
|
+
require("colors");
|
|
13
11
|
function CoercePropertyDeclaration(node, name, structure = {}) {
|
|
14
12
|
let property = node.getProperty(name);
|
|
15
13
|
if (!property) {
|
|
@@ -20,15 +18,15 @@ function CoercePropertyDeclaration(node, name, structure = {}) {
|
|
|
20
18
|
}
|
|
21
19
|
exports.CoercePropertyDeclaration = CoercePropertyDeclaration;
|
|
22
20
|
function CoerceDtoClass(options) {
|
|
23
|
-
|
|
21
|
+
var _a;
|
|
22
|
+
const { project, propertyList = [], tsMorphTransform = utilities_1.noop, } = options;
|
|
24
23
|
let { name, } = options;
|
|
25
24
|
name = (0, schematics_utilities_1.dasherize)(name);
|
|
26
25
|
const className = (0, schematics_utilities_1.CoerceSuffix)((0, schematics_utilities_1.classify)(name), 'Dto');
|
|
27
26
|
const fileName = (0, schematics_utilities_1.CoerceSuffix)(name, '.dto');
|
|
28
|
-
const sourceFile = (0,
|
|
29
|
-
const classDeclaration = (0,
|
|
27
|
+
const sourceFile = (0, ts_morph_2.CoerceSourceFile)(project, (0, path_1.join)('dtos', fileName + '.ts'));
|
|
28
|
+
const classDeclaration = (0, ts_morph_2.CoerceClass)(sourceFile, className);
|
|
30
29
|
classDeclaration.setIsExported(true);
|
|
31
|
-
classDeclaration.set(classStructure);
|
|
32
30
|
for (const property of propertyList) {
|
|
33
31
|
if (property.type === '<self>') {
|
|
34
32
|
property.type = className;
|
|
@@ -47,7 +45,7 @@ function CoerceDtoClass(options) {
|
|
|
47
45
|
(0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'Expose', {
|
|
48
46
|
arguments: [],
|
|
49
47
|
});
|
|
50
|
-
|
|
48
|
+
(0, ts_morph_2.CoerceImports)(sourceFile, {
|
|
51
49
|
namedImports: ['Expose'],
|
|
52
50
|
moduleSpecifier: 'class-transformer',
|
|
53
51
|
});
|
|
@@ -55,7 +53,7 @@ function CoerceDtoClass(options) {
|
|
|
55
53
|
(0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsArray', {
|
|
56
54
|
arguments: [],
|
|
57
55
|
});
|
|
58
|
-
|
|
56
|
+
(0, ts_morph_2.CoerceImports)(sourceFile, {
|
|
59
57
|
namedImports: ['IsArray'],
|
|
60
58
|
moduleSpecifier: 'class-validator',
|
|
61
59
|
});
|
|
@@ -72,7 +70,7 @@ function CoerceDtoClass(options) {
|
|
|
72
70
|
},
|
|
73
71
|
],
|
|
74
72
|
});
|
|
75
|
-
|
|
73
|
+
(0, ts_morph_2.CoerceImports)(sourceFile, {
|
|
76
74
|
namedImports: ['Type'],
|
|
77
75
|
moduleSpecifier: 'class-transformer',
|
|
78
76
|
});
|
|
@@ -89,7 +87,7 @@ function CoerceDtoClass(options) {
|
|
|
89
87
|
},
|
|
90
88
|
],
|
|
91
89
|
});
|
|
92
|
-
|
|
90
|
+
(0, ts_morph_2.CoerceImports)(sourceFile, {
|
|
93
91
|
namedImports: ['IsInstance'],
|
|
94
92
|
moduleSpecifier: 'class-validator',
|
|
95
93
|
});
|
|
@@ -98,7 +96,7 @@ function CoerceDtoClass(options) {
|
|
|
98
96
|
(0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsOptional', {
|
|
99
97
|
arguments: [],
|
|
100
98
|
});
|
|
101
|
-
|
|
99
|
+
(0, ts_morph_2.CoerceImports)(sourceFile, {
|
|
102
100
|
namedImports: ['IsOptional'],
|
|
103
101
|
moduleSpecifier: 'class-validator',
|
|
104
102
|
});
|
|
@@ -115,7 +113,7 @@ function CoerceDtoClass(options) {
|
|
|
115
113
|
(0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsDate', {
|
|
116
114
|
arguments: [],
|
|
117
115
|
});
|
|
118
|
-
|
|
116
|
+
(0, ts_morph_2.CoerceImports)(sourceFile, {
|
|
119
117
|
namedImports: ['IsDate'],
|
|
120
118
|
moduleSpecifier: 'class-validator',
|
|
121
119
|
});
|
|
@@ -124,14 +122,14 @@ function CoerceDtoClass(options) {
|
|
|
124
122
|
(0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsNumber', {
|
|
125
123
|
arguments: [],
|
|
126
124
|
});
|
|
127
|
-
|
|
125
|
+
(0, ts_morph_2.CoerceImports)(sourceFile, {
|
|
128
126
|
namedImports: ['IsNumber'],
|
|
129
127
|
moduleSpecifier: 'class-validator',
|
|
130
128
|
});
|
|
131
129
|
break;
|
|
132
130
|
case 'string':
|
|
133
131
|
if (property.name === 'uuid') {
|
|
134
|
-
|
|
132
|
+
(0, ts_morph_2.CoerceImports)(sourceFile, {
|
|
135
133
|
namedImports: ['IsUUID'],
|
|
136
134
|
moduleSpecifier: 'class-validator',
|
|
137
135
|
});
|
|
@@ -140,7 +138,7 @@ function CoerceDtoClass(options) {
|
|
|
140
138
|
});
|
|
141
139
|
}
|
|
142
140
|
else {
|
|
143
|
-
|
|
141
|
+
(0, ts_morph_2.CoerceImports)(sourceFile, {
|
|
144
142
|
namedImports: ['IsString'],
|
|
145
143
|
moduleSpecifier: 'class-validator',
|
|
146
144
|
});
|
|
@@ -153,7 +151,7 @@ function CoerceDtoClass(options) {
|
|
|
153
151
|
(0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsUUID', {
|
|
154
152
|
arguments: [],
|
|
155
153
|
});
|
|
156
|
-
|
|
154
|
+
(0, ts_morph_2.CoerceImports)(sourceFile, {
|
|
157
155
|
namedImports: ['IsUUID'],
|
|
158
156
|
moduleSpecifier: 'class-validator',
|
|
159
157
|
});
|
|
@@ -162,7 +160,7 @@ function CoerceDtoClass(options) {
|
|
|
162
160
|
(0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsBoolean', {
|
|
163
161
|
arguments: [],
|
|
164
162
|
});
|
|
165
|
-
|
|
163
|
+
(0, ts_morph_2.CoerceImports)(sourceFile, {
|
|
166
164
|
namedImports: ['IsBoolean'],
|
|
167
165
|
moduleSpecifier: 'class-validator',
|
|
168
166
|
});
|
|
@@ -171,14 +169,24 @@ function CoerceDtoClass(options) {
|
|
|
171
169
|
(0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'ApiProperty', {
|
|
172
170
|
arguments: [ts_morph_1.Writers.object({ type: w => w.quote('unknown') })],
|
|
173
171
|
});
|
|
174
|
-
|
|
172
|
+
(0, ts_morph_2.CoerceImports)(sourceFile, {
|
|
175
173
|
namedImports: ['ApiProperty'],
|
|
176
174
|
moduleSpecifier: '@nestjs/swagger',
|
|
177
175
|
});
|
|
178
176
|
break;
|
|
179
177
|
}
|
|
178
|
+
if (autoType !== 'unknown') {
|
|
179
|
+
const apiProperty = propertyDeclaration.getDecorators().find(d => d.getName() === 'ApiProperty');
|
|
180
|
+
if (apiProperty) {
|
|
181
|
+
const args = apiProperty.getArguments()[0];
|
|
182
|
+
if (args instanceof ts_morph_1.ObjectLiteralExpression) {
|
|
183
|
+
if ((_a = args.getProperty('type')) === null || _a === void 0 ? void 0 : _a.getText().includes('unknown')) {
|
|
184
|
+
apiProperty.remove();
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
}
|
|
180
189
|
}
|
|
181
|
-
(0, coerce_imports_1.CoerceImports)(sourceFile, importStructureList);
|
|
182
190
|
tsMorphTransform(project, sourceFile, classDeclaration);
|
|
183
191
|
return {
|
|
184
192
|
className,
|
|
@@ -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,+CAAuC;AACvC,+BAA4B;AAC5B,
|
|
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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"}
|
|
@@ -7,7 +7,7 @@ const coerce_dto_class_1 = require("./coerce-dto-class");
|
|
|
7
7
|
const coerce_operation_1 = require("./coerce-operation");
|
|
8
8
|
function CoerceFormSubmitOperation(options) {
|
|
9
9
|
const { tsMorphTransform = utilities_1.noop, controllerName, propertyList = [], context, bodyDtoName = (0, utilities_1.joinWithDash)([context, controllerName]), } = options;
|
|
10
|
-
return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { operationName: 'submit', tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
|
|
10
|
+
return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { operationName: 'submit', tsMorphTransform: (project, sourceFile, classDeclaration, controllerName, moduleSourceFile) => {
|
|
11
11
|
const { className: dtoClassName, filePath: dtoFilePath, } = (0, coerce_dto_class_1.CoerceDtoClass)({
|
|
12
12
|
project,
|
|
13
13
|
name: bodyDtoName,
|
|
@@ -17,7 +17,7 @@ function CoerceFormSubmitOperation(options) {
|
|
|
17
17
|
namedImports: [dtoClassName],
|
|
18
18
|
moduleSpecifier: dtoFilePath,
|
|
19
19
|
});
|
|
20
|
-
return Object.assign({ body: dtoClassName, method: 'post' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
|
|
20
|
+
return Object.assign({ body: dtoClassName, method: 'post' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName, moduleSourceFile));
|
|
21
21
|
} }));
|
|
22
22
|
}
|
|
23
23
|
exports.CoerceFormSubmitOperation = CoerceFormSubmitOperation;
|