@rxap/schematics-ts-morph 16.1.0-dev.2 → 16.1.0-dev.4
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 +14 -0
- package/README.md +1 -1
- package/package.json +9 -8
- package/src/lib/angular/coerce-component.d.ts +1 -0
- package/src/lib/angular/coerce-component.js +2 -1
- 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-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 +4 -7
- 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 +0 -4
- package/src/lib/nest/coerce-get-page-operation.js +28 -23
- 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 +3 -5
- 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 +15 -18
- 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/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,20 @@
|
|
|
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.4](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.1.0-dev.3...@rxap/schematics-ts-morph@16.1.0-dev.4) (2024-02-26)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- support non service commands ([7346933](https://gitlab.com/rxap/packages/commit/73469338e563e4c2d589f8059959380acc6d61fb))
|
|
11
|
+
|
|
12
|
+
# [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)
|
|
13
|
+
|
|
14
|
+
### Bug Fixes
|
|
15
|
+
|
|
16
|
+
- add the open api upstream command to the module providers ([4b71f61](https://gitlab.com/rxap/packages/commit/4b71f61ef5801aae286afe757881a855f56b4bdc))
|
|
17
|
+
- align the controller name processing ([e3c9c31](https://gitlab.com/rxap/packages/commit/e3c9c31afdd6813832177ec4c566d92e8a45201b))
|
|
18
|
+
- use the command class name as member name ([7a13825](https://gitlab.com/rxap/packages/commit/7a13825c4b8db05b16ea8dc075e373071dd65f27))
|
|
19
|
+
|
|
6
20
|
# [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)
|
|
7
21
|
|
|
8
22
|
### Features
|
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.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.4",
|
|
3
3
|
"name": "@rxap/schematics-ts-morph",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -13,9 +13,10 @@
|
|
|
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.
|
|
18
|
-
"@rxap/workspace-ts-morph": "^16.0.
|
|
16
|
+
"@rxap/ts-morph": "^1.1.0-dev.2",
|
|
17
|
+
"@rxap/utilities": "^16.1.0-dev.1",
|
|
18
|
+
"@rxap/workspace-ts-morph": "^16.0.2-dev.0",
|
|
19
|
+
"colors": "^1.4.0",
|
|
19
20
|
"handlebars": "^4.7.7",
|
|
20
21
|
"ts-morph": "^18.0.0",
|
|
21
22
|
"tslib": "2.6.2",
|
|
@@ -47,15 +48,15 @@
|
|
|
47
48
|
},
|
|
48
49
|
{
|
|
49
50
|
"package": "@rxap/ts-morph",
|
|
50
|
-
"version": "1.1.0-dev.
|
|
51
|
+
"version": "1.1.0-dev.2"
|
|
51
52
|
},
|
|
52
53
|
{
|
|
53
54
|
"package": "@rxap/utilities",
|
|
54
|
-
"version": "16.1.0-dev.
|
|
55
|
+
"version": "16.1.0-dev.1"
|
|
55
56
|
},
|
|
56
57
|
{
|
|
57
58
|
"package": "@rxap/workspace-ts-morph",
|
|
58
|
-
"version": "16.0.
|
|
59
|
+
"version": "16.0.2-dev.0"
|
|
59
60
|
}
|
|
60
61
|
]
|
|
61
62
|
},
|
|
@@ -69,7 +70,7 @@
|
|
|
69
70
|
"directory": "packages/schematic/ts-morph"
|
|
70
71
|
},
|
|
71
72
|
"type": "commonjs",
|
|
72
|
-
"gitHead": "
|
|
73
|
+
"gitHead": "b93e227c37e2283897be81d53041a4388a991531",
|
|
73
74
|
"main": "./src/index.js",
|
|
74
75
|
"types": "./src/index.d.ts"
|
|
75
76
|
}
|
|
@@ -2,6 +2,7 @@ import { Rule } from '@angular-devkit/schematics';
|
|
|
2
2
|
import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
|
|
3
3
|
import { TsMorphAngularProjectTransformOptions } from '../ts-morph-transform';
|
|
4
4
|
import Handlebars from 'handlebars';
|
|
5
|
+
import 'colors';
|
|
5
6
|
export interface TemplateOptions {
|
|
6
7
|
url?: string;
|
|
7
8
|
options?: Record<string, unknown> | object;
|
|
@@ -11,6 +11,7 @@ const ts_morph_transform_1 = require("../ts-morph-transform");
|
|
|
11
11
|
const build_angular_base_path_1 = require("./build-angular-base-path");
|
|
12
12
|
const has_component_1 = require("./has-component");
|
|
13
13
|
const handlebars_1 = tslib_1.__importDefault(require("handlebars"));
|
|
14
|
+
require("colors");
|
|
14
15
|
function applyContentHandlebars(options) {
|
|
15
16
|
return (entry) => {
|
|
16
17
|
const { path, content } = entry;
|
|
@@ -93,7 +94,7 @@ function CoerceComponentRule(options) {
|
|
|
93
94
|
(_a = template.url) !== null && _a !== void 0 ? _a : (template.url = './files/component');
|
|
94
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 });
|
|
95
96
|
(_c = templateOptions['prefix']) !== null && _c !== void 0 ? _c : (templateOptions['prefix'] = (0, schematics_utilities_1.GetProjectPrefix)(tree, options.project));
|
|
96
|
-
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), [
|
|
97
98
|
(0, schematics_1.applyTemplates)(templateOptions),
|
|
98
99
|
applyHandlebars(templateOptions),
|
|
99
100
|
(0, schematics_1.move)(flat ? basePath : (0, path_1.join)(basePath, name)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-component.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-component.ts"],"names":[],"mappings":";;;;AAAA,+CAA+C;AAC/C,2DAgBoC;AACpC,qEAIoC;AACpC,6CAAiD;AACjD,+BAA4B;AAM5B,8DAG+B;AAC/B,uEAAiE;AACjE,mDAA+C;AAC/C,oEAAoC;
|
|
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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"}
|
|
@@ -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;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-form-submit-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-form-submit-operation.ts"],"names":[],"mappings":";;;AAAA,+CAGyB;AACzB,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAQ5B,SAAgB,yBAAyB,CAAC,OAAyC;IACjF,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,cAAc,EACd,YAAY,GAAE,EAAE,EAChB,OAAO,EACP,WAAW,GAAE,IAAA,wBAAY,EAAC,CAAE,OAAO,EAAE,cAAc,CAAE,CAAC,GACvD,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,aAAa,EAAE,QAAQ,EACvB,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,EAAE;YAEF,MAAM,EACJ,SAAS,EAAE,YAAY,EACvB,QAAQ,EAAE,WAAW,GACtB,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,WAAY;gBAClB,YAAY;aACb,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,YAAY,CAAE;gBAC9B,eAAe,EAAE,WAAW;aAC7B,CAAC,CAAC;YAEH,uBACE,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,IACX,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"coerce-form-submit-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-form-submit-operation.ts"],"names":[],"mappings":";;;AAAA,+CAGyB;AACzB,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAQ5B,SAAgB,yBAAyB,CAAC,OAAyC;IACjF,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,cAAc,EACd,YAAY,GAAE,EAAE,EAChB,OAAO,EACP,WAAW,GAAE,IAAA,wBAAY,EAAC,CAAE,OAAO,EAAE,cAAc,CAAE,CAAC,GACvD,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,aAAa,EAAE,QAAQ,EACvB,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,EAAE;YAEF,MAAM,EACJ,SAAS,EAAE,YAAY,EACvB,QAAQ,EAAE,WAAW,GACtB,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,WAAY;gBAClB,YAAY;aACb,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,YAAY,CAAE;gBAC9B,eAAe,EAAE,WAAW;aAC7B,CAAC,CAAC;YAEH,uBACE,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,IACX,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,CAAC,EAC7F;QAEJ,CAAC,IACD,CAAC;AAEL,CAAC;AA3CD,8DA2CC"}
|
|
@@ -8,8 +8,7 @@ const coerce_dto_class_1 = require("./coerce-dto-class");
|
|
|
8
8
|
const coerce_operation_1 = require("./coerce-operation");
|
|
9
9
|
const table_query_list_1 = require("./table-query-list");
|
|
10
10
|
function CoerceGetChildrenOperation(options) {
|
|
11
|
-
const { tsMorphTransform = utilities_1.noop, paramList = [], propertyList = [], } = options;
|
|
12
|
-
let { controllerName } = options;
|
|
11
|
+
const { tsMorphTransform = utilities_1.noop, paramList = [], propertyList = [], operationName = 'get-children', } = options;
|
|
13
12
|
(0, utilities_1.CoerceArrayItems)(propertyList, [
|
|
14
13
|
{
|
|
15
14
|
name: 'hasChildren',
|
|
@@ -23,14 +22,12 @@ function CoerceGetChildrenOperation(options) {
|
|
|
23
22
|
isType: true,
|
|
24
23
|
},
|
|
25
24
|
], (a, b) => a.name === b.name);
|
|
26
|
-
controllerName = (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-tree-table');
|
|
27
25
|
paramList.push({
|
|
28
26
|
name: 'parentUuid',
|
|
29
27
|
type: 'string',
|
|
30
28
|
});
|
|
31
|
-
return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), {
|
|
32
|
-
|
|
33
|
-
controllerName, operationName: 'get-children', paramList, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
|
|
29
|
+
return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { operationName,
|
|
30
|
+
paramList, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName, moduleSourceFile) => {
|
|
34
31
|
const { className, filePath, } = (0, coerce_dto_class_1.CoerceDtoClass)({
|
|
35
32
|
project,
|
|
36
33
|
name: (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-item'),
|
|
@@ -46,7 +43,7 @@ function CoerceGetChildrenOperation(options) {
|
|
|
46
43
|
moduleSpecifier: filePath,
|
|
47
44
|
},
|
|
48
45
|
]);
|
|
49
|
-
return Object.assign({ queryList: table_query_list_1.TABLE_QUERY_LIST, returnType: className + '[]' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
|
|
46
|
+
return Object.assign({ queryList: table_query_list_1.TABLE_QUERY_LIST, returnType: className + '[]' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName, moduleSourceFile));
|
|
50
47
|
} }));
|
|
51
48
|
}
|
|
52
49
|
exports.CoerceGetChildrenOperation = CoerceGetChildrenOperation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-get-children-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-children-operation.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;AACpC,+CAGyB;AACzB,+DAA2D;AAC3D,yDAAoD;AAEpD,yDAG4B;AAC5B,yDAAsD;AAItD,SAAgB,0BAA0B,CAAC,OAAoD;IAC7F,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,SAAS,GAAG,EAAE,EACd,YAAY,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"coerce-get-children-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-children-operation.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;AACpC,+CAGyB;AACzB,+DAA2D;AAC3D,yDAAoD;AAEpD,yDAG4B;AAC5B,yDAAsD;AAItD,SAAgB,0BAA0B,CAAC,OAAoD;IAC7F,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,SAAS,GAAG,EAAE,EACd,YAAY,GAAG,EAAE,EACjB,aAAa,GAAG,cAAc,GAC/B,GAAG,OAAO,CAAC;IACZ,IAAA,4BAAgB,EAAC,YAAY,EAAE;QAC7B;YACE,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,SAAS;SAChB;QACD;YACE,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,IAAI;SACb;KACF,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IAChC,SAAS,CAAC,IAAI,CAAC;QACb,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,QAAQ;KACf,CAAC,CAAC;IACH,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,aAAa;QACb,SAAS,EACT,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,EAAE;YAEF,MAAM,EACJ,SAAS,EACT,QAAQ,GACT,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,IAAA,mCAAY,EAAC,cAAc,EAAE,OAAO,CAAC;gBAC3C,YAAY;aACb,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB;oBACE,YAAY,EAAE,CAAE,aAAa,EAAE,iBAAiB,CAAE;oBAClD,eAAe,EAAE,sBAAsB;iBACxC;gBACD;oBACE,YAAY,EAAE,CAAE,SAAS,CAAE;oBAC3B,eAAe,EAAE,QAAQ;iBAC1B;aACF,CAAC,CAAC;YAEH,uBACE,SAAS,EAAE,mCAAgB,EAC3B,UAAU,EAAE,SAAS,GAAG,IAAI,IACzB,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,CAAC,EAC7F;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AA/DD,gEA+DC"}
|
|
@@ -1,18 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CoerceGetDataGridOperation = void 0;
|
|
4
|
-
const
|
|
4
|
+
const utilities_1 = require("@rxap/utilities");
|
|
5
5
|
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
6
6
|
const coerce_dto_class_1 = require("./coerce-dto-class");
|
|
7
7
|
const coerce_operation_1 = require("./coerce-operation");
|
|
8
8
|
function CoerceGetDataGridOperation(options) {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => ({}));
|
|
12
|
-
propertyList !== null && propertyList !== void 0 ? propertyList : (propertyList = []);
|
|
13
|
-
controllerName =
|
|
14
|
-
(0, schematics_utilities_1.CoerceSuffix)(controllerName, '-data-grid');
|
|
15
|
-
return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { controllerName, operationName: 'get', tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
|
|
9
|
+
const { tsMorphTransform = utilities_1.noop, collection = false, propertyList = [], controllerName, } = options;
|
|
10
|
+
return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { controllerName, operationName: 'get', tsMorphTransform: (project, sourceFile, classDeclaration, controllerName, moduleSourceFile) => {
|
|
16
11
|
const { className: dtoClassName, filePath: dtoFilePath, } = (0, coerce_dto_class_1.CoerceDtoClass)({
|
|
17
12
|
project,
|
|
18
13
|
name: controllerName,
|
|
@@ -22,7 +17,7 @@ function CoerceGetDataGridOperation(options) {
|
|
|
22
17
|
namedImports: [dtoClassName],
|
|
23
18
|
moduleSpecifier: dtoFilePath,
|
|
24
19
|
});
|
|
25
|
-
return Object.assign({ returnType: dtoClassName + (collection ? '[]' : '') }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
|
|
20
|
+
return Object.assign({ returnType: dtoClassName + (collection ? '[]' : '') }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName, moduleSourceFile));
|
|
26
21
|
} }));
|
|
27
22
|
}
|
|
28
23
|
exports.CoerceGetDataGridOperation = CoerceGetDataGridOperation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-get-data-grid-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-data-grid-operation.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"coerce-get-data-grid-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-data-grid-operation.ts"],"names":[],"mappings":";;;AACA,+CAAuC;AACvC,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAQ5B,SAAgB,0BAA0B,CAAC,OAAoD;IAC7F,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,UAAU,GAAE,KAAK,EACjB,YAAY,GAAG,EAAE,EACjB,cAAc,GACf,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,cAAc,EACd,aAAa,EAAE,KAAK,EACpB,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,EAAE;YAEF,MAAM,EACJ,SAAS,EAAE,YAAY,EACvB,QAAQ,EAAE,WAAW,GACtB,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,cAAc;gBACpB,YAAY;aACb,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,YAAY,CAAE;gBAC9B,eAAe,EAAE,WAAW;aAC7B,CAAC,CAAC;YAEH,uBACE,UAAU,EAAE,YAAY,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAChD,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,CAAC,EAC7F;QAEJ,CAAC,IACD,CAAC;AAEL,CAAC;AA1CD,gEA0CC"}
|
|
@@ -20,10 +20,6 @@ export interface CoerceGetPageOperationOptions extends Omit<Omit<CoerceOperation
|
|
|
20
20
|
*/
|
|
21
21
|
rowIdProperty?: string | null;
|
|
22
22
|
operationName?: string;
|
|
23
|
-
/**
|
|
24
|
-
* true - the suffix '-table' will not be enforced for the controller name
|
|
25
|
-
*/
|
|
26
|
-
skipCoerceTableSuffix?: boolean;
|
|
27
23
|
/**
|
|
28
24
|
* The base name of the page and row DTO class name. Defaults to the controller name
|
|
29
25
|
*/
|
|
@@ -5,8 +5,6 @@ const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
|
5
5
|
const ts_morph_1 = require("@rxap/ts-morph");
|
|
6
6
|
const utilities_1 = require("@rxap/utilities");
|
|
7
7
|
const ts_morph_2 = require("ts-morph");
|
|
8
|
-
const coerce_class_method_1 = require("../coerce-class-method");
|
|
9
|
-
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
10
8
|
const coerce_type_alias_1 = require("../ts-morph/coerce-type-alias");
|
|
11
9
|
const coerce_dto_class_1 = require("./coerce-dto-class");
|
|
12
10
|
const coerce_operation_1 = require("./coerce-operation");
|
|
@@ -52,7 +50,7 @@ function GetPageOperationColumnToCodeText(property) {
|
|
|
52
50
|
exports.GetPageOperationColumnToCodeText = GetPageOperationColumnToCodeText;
|
|
53
51
|
function CoerceToRowDtoMethod(sourceFile, classDeclaration, rowClassName, options) {
|
|
54
52
|
var _a;
|
|
55
|
-
(0,
|
|
53
|
+
(0, ts_morph_1.CoerceClassMethod)(classDeclaration, 'toRowDto', {
|
|
56
54
|
scope: ts_morph_2.Scope.Private,
|
|
57
55
|
returnType: rowClassName,
|
|
58
56
|
parameters: [
|
|
@@ -90,7 +88,7 @@ function CoerceToRowDtoMethod(sourceFile, classDeclaration, rowClassName, option
|
|
|
90
88
|
}
|
|
91
89
|
exports.CoerceToRowDtoMethod = CoerceToRowDtoMethod;
|
|
92
90
|
function CoerceToPageDtoMethod(sourceFile, classDeclaration, pageClassName, rowClassName, options) {
|
|
93
|
-
(0,
|
|
91
|
+
(0, ts_morph_1.CoerceClassMethod)(classDeclaration, 'toPageDto', {
|
|
94
92
|
scope: ts_morph_2.Scope.Private,
|
|
95
93
|
returnType: pageClassName,
|
|
96
94
|
parameters: [
|
|
@@ -136,22 +134,23 @@ function CoerceGetPageDataMethod(sourceFile, classDeclaration, { upstream }) {
|
|
|
136
134
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
137
135
|
const statements = [];
|
|
138
136
|
if (upstream && (0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
|
|
139
|
-
const
|
|
137
|
+
const commandClassName = (0, ts_morph_1.OperationIdToCommandClassName)(upstream.operationId);
|
|
138
|
+
const memberName = (0, schematics_utilities_1.camelize)(commandClassName);
|
|
140
139
|
(0, coerce_dto_class_1.CoercePropertyDeclaration)(classDeclaration, memberName, {
|
|
141
|
-
type:
|
|
140
|
+
type: commandClassName,
|
|
142
141
|
scope: ts_morph_2.Scope.Private,
|
|
143
142
|
hasExclamationToken: true,
|
|
144
143
|
decorators: [
|
|
145
144
|
{
|
|
146
145
|
name: 'Inject',
|
|
147
|
-
arguments: [
|
|
146
|
+
arguments: [commandClassName],
|
|
148
147
|
},
|
|
149
148
|
],
|
|
150
149
|
});
|
|
151
|
-
(0,
|
|
150
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, [
|
|
152
151
|
{
|
|
153
|
-
namedImports: [
|
|
154
|
-
moduleSpecifier: (0, ts_morph_1.OperationIdToCommandClassImportPath)(upstream.operationId, upstream.scope),
|
|
152
|
+
namedImports: [commandClassName],
|
|
153
|
+
moduleSpecifier: (0, ts_morph_1.OperationIdToCommandClassImportPath)(upstream.operationId, upstream.scope, upstream.isService),
|
|
155
154
|
}, {
|
|
156
155
|
namedImports: ['Inject'],
|
|
157
156
|
moduleSpecifier: '@nestjs/common',
|
|
@@ -179,7 +178,7 @@ function CoerceGetPageDataMethod(sourceFile, classDeclaration, { upstream }) {
|
|
|
179
178
|
},
|
|
180
179
|
});`, 'return {', ' list: response.entities ?? [],', ' total: response.maxCount ?? 0,', '};');
|
|
181
180
|
}
|
|
182
|
-
(0,
|
|
181
|
+
(0, ts_morph_1.CoerceClassMethod)(classDeclaration, 'getPageData', {
|
|
183
182
|
scope: ts_morph_2.Scope.Public,
|
|
184
183
|
returnType: 'Promise<{ list: RawRowData[], total: number }>',
|
|
185
184
|
isAsync: true,
|
|
@@ -210,23 +209,23 @@ function CoerceGetPageDataMethod(sourceFile, classDeclaration, { upstream }) {
|
|
|
210
209
|
}
|
|
211
210
|
exports.CoerceGetPageDataMethod = CoerceGetPageDataMethod;
|
|
212
211
|
function CoerceGetPageOperation(options) {
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
212
|
+
const { operationName = 'get-page', rowIdProperty, tsMorphTransform = utilities_1.noop, propertyList, context, coerceToRowDtoMethod = CoerceToRowDtoMethod, coerceToPageDtoMethod = CoerceToPageDtoMethod, coerceGetPageDataMethod = CoerceGetPageDataMethod, upstream, } = options;
|
|
213
|
+
let { responseDtoName } = options;
|
|
214
|
+
return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { operationName, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName, moduleSourceFile) => {
|
|
215
|
+
if (!responseDtoName) {
|
|
216
|
+
responseDtoName = controllerName;
|
|
217
|
+
}
|
|
218
|
+
else {
|
|
219
|
+
responseDtoName = (0, utilities_1.CoercePrefix)(responseDtoName, controllerName + '-');
|
|
220
|
+
}
|
|
221
|
+
console.log(`[TEST]`, { responseDtoName, context, controllerName, operationName });
|
|
223
222
|
const { className: rowClassName, filePath: rowFilePath, sourceFile: rowSourceFile, } = (0, coerce_row_dto_class_1.CoerceRowDtoClass)({
|
|
224
223
|
project,
|
|
225
224
|
name: responseDtoName,
|
|
226
225
|
propertyList: propertyList.map(GetPageOperationColumnToDtoClassProperty),
|
|
227
226
|
rowIdType: rowIdProperty === null ? null : undefined,
|
|
228
227
|
});
|
|
229
|
-
(0,
|
|
228
|
+
(0, ts_morph_1.CoerceImports)(rowSourceFile, propertyList
|
|
230
229
|
.map(c => GetPageOperationColumnTypeToTypeImport(c))
|
|
231
230
|
.filter(type => (0, ts_morph_1.RequiresTypeImport)(type))
|
|
232
231
|
.map(type => (0, ts_morph_1.TypeImportToImportStructure)(type)));
|
|
@@ -239,7 +238,13 @@ function CoerceGetPageOperation(options) {
|
|
|
239
238
|
coerceGetPageDataMethod(sourceFile, classDeclaration, options);
|
|
240
239
|
coerceToRowDtoMethod(sourceFile, classDeclaration, rowClassName, options);
|
|
241
240
|
coerceToPageDtoMethod(sourceFile, classDeclaration, pageClassName, rowClassName, options);
|
|
242
|
-
(0,
|
|
241
|
+
if (upstream && (0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
|
|
242
|
+
(0, ts_morph_1.CoerceNestModuleProvider)(moduleSourceFile, {
|
|
243
|
+
providerObject: (0, ts_morph_1.OperationIdToCommandClassName)(upstream.operationId),
|
|
244
|
+
moduleSpecifier: (0, ts_morph_1.OperationIdToCommandClassImportPath)(upstream.operationId, upstream.scope, upstream.isService),
|
|
245
|
+
});
|
|
246
|
+
}
|
|
247
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, [
|
|
243
248
|
{
|
|
244
249
|
namedImports: ['FilterQuery', 'FilterQueryPipe'],
|
|
245
250
|
moduleSpecifier: '@rxap/nest-utilities',
|
|
@@ -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,
|
|
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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"}
|
|
@@ -2,5 +2,6 @@ import { CoerceOperationOptions } from './coerce-operation';
|
|
|
2
2
|
import { DtoClassProperty } from './create-dto-class';
|
|
3
3
|
export interface CoerceGetRootOperationOptions extends Omit<CoerceOperationOptions, 'operationName'> {
|
|
4
4
|
propertyList?: DtoClassProperty[];
|
|
5
|
+
operationName?: string;
|
|
5
6
|
}
|
|
6
7
|
export declare function CoerceGetRootOperation(options: Readonly<CoerceGetRootOperationOptions>): import("@angular-devkit/schematics").Rule;
|
|
@@ -8,8 +8,7 @@ const coerce_dto_class_1 = require("./coerce-dto-class");
|
|
|
8
8
|
const coerce_operation_1 = require("./coerce-operation");
|
|
9
9
|
const table_query_list_1 = require("./table-query-list");
|
|
10
10
|
function CoerceGetRootOperation(options) {
|
|
11
|
-
const { tsMorphTransform = utilities_1.noop, propertyList = [], } = options;
|
|
12
|
-
let { controllerName } = options;
|
|
11
|
+
const { tsMorphTransform = utilities_1.noop, propertyList = [], operationName = 'get-root', } = options;
|
|
13
12
|
(0, utilities_1.CoerceArrayItems)(propertyList, [
|
|
14
13
|
{
|
|
15
14
|
name: 'hasChildren',
|
|
@@ -23,8 +22,7 @@ function CoerceGetRootOperation(options) {
|
|
|
23
22
|
isType: true,
|
|
24
23
|
},
|
|
25
24
|
], (a, b) => a.name === b.name);
|
|
26
|
-
|
|
27
|
-
return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { controllerName, operationName: 'get-root', tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
|
|
25
|
+
return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { operationName, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName, moduleSourceFile) => {
|
|
28
26
|
const { className, filePath, } = (0, coerce_dto_class_1.CoerceDtoClass)({
|
|
29
27
|
project,
|
|
30
28
|
name: (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-item'),
|
|
@@ -40,7 +38,7 @@ function CoerceGetRootOperation(options) {
|
|
|
40
38
|
moduleSpecifier: filePath,
|
|
41
39
|
},
|
|
42
40
|
]);
|
|
43
|
-
return Object.assign({ queryList: table_query_list_1.TABLE_QUERY_LIST, returnType: className + '[]' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
|
|
41
|
+
return Object.assign({ queryList: table_query_list_1.TABLE_QUERY_LIST, returnType: className + '[]' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName, moduleSourceFile));
|
|
44
42
|
} }));
|
|
45
43
|
}
|
|
46
44
|
exports.CoerceGetRootOperation = CoerceGetRootOperation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-get-root-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-root-operation.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;AACpC,+CAGyB;AACzB,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAE5B,yDAAsD;
|
|
1
|
+
{"version":3,"file":"coerce-get-root-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-root-operation.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;AACpC,+CAGyB;AACzB,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAE5B,yDAAsD;AAOtD,SAAgB,sBAAsB,CAAC,OAAgD;IACrF,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,YAAY,GAAG,EAAE,EACjB,aAAa,GAAG,UAAU,GAC3B,GAAG,OAAO,CAAC;IACZ,IAAA,4BAAgB,EAAC,YAAY,EAAE;QAC7B;YACE,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,SAAS;SAChB;QACD;YACE,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,IAAI;SACb;KACF,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,aAAa,EACb,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,EAAE;YAEF,MAAM,EACJ,SAAS,EACT,QAAQ,GACT,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,IAAA,mCAAY,EAAC,cAAc,EAAE,OAAO,CAAC;gBAC3C,YAAY;aACb,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB;oBACE,YAAY,EAAE,CAAE,aAAa,EAAE,iBAAiB,CAAE;oBAClD,eAAe,EAAE,sBAAsB;iBACxC;gBACD;oBACE,YAAY,EAAE,CAAE,SAAS,CAAE;oBAC3B,eAAe,EAAE,QAAQ;iBAC1B;aACF,CAAC,CAAC;YAEH,uBACE,SAAS,EAAE,mCAAgB,EAC3B,UAAU,EAAE,SAAS,GAAG,IAAI,IACzB,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,CAAC,EAC7F;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AAzDD,wDAyDC"}
|
|
@@ -9,7 +9,7 @@ export interface CoerceOperationOptions extends TsMorphNestProjectTransformOptio
|
|
|
9
9
|
skipCoerce?: boolean;
|
|
10
10
|
paramList?: OperationParameter[];
|
|
11
11
|
queryList?: OperationParameter[];
|
|
12
|
-
tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration, controllerName: string) => Partial<OperationOptions>;
|
|
12
|
+
tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration, controllerName: string, moduleSourceFile: SourceFile) => Partial<OperationOptions>;
|
|
13
13
|
operationName: string;
|
|
14
14
|
path?: string;
|
|
15
15
|
controllerPath?: string;
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.CoerceOperation = exports.CoerceOperationParamList = void 0;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
6
|
+
const utilities_1 = require("@rxap/utilities");
|
|
6
7
|
const path_1 = require("path");
|
|
7
8
|
const ts_morph_transform_1 = require("../ts-morph-transform");
|
|
8
9
|
const add_operation_to_controller_1 = require("./add-operation-to-controller");
|
|
@@ -57,7 +58,7 @@ function CoerceOperation(options) {
|
|
|
57
58
|
}
|
|
58
59
|
directory = (0, path_1.join)(directory !== null && directory !== void 0 ? directory : '', nestModule);
|
|
59
60
|
return (0, schematics_1.chain)([
|
|
60
|
-
() => console.log(`Coerce Operation '${operationName}' with path '${path}' in the controller '${nestController}' in the module '${nestModule}'`),
|
|
61
|
+
() => console.log(`Coerce Operation '${operationName}' with path '${path !== null && path !== void 0 ? path : '<empty>'}' in the controller '${nestController}' in the module '${nestModule}'`),
|
|
61
62
|
(0, coerce_nest_controller_1.CoerceNestController)({
|
|
62
63
|
project,
|
|
63
64
|
feature,
|
|
@@ -75,10 +76,12 @@ function CoerceOperation(options) {
|
|
|
75
76
|
feature,
|
|
76
77
|
shared,
|
|
77
78
|
directory,
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
79
|
+
// must be set to false are some specializations of this function need to access more files then only the
|
|
80
|
+
// controller and module source file
|
|
81
|
+
filter: false,
|
|
82
|
+
}, (project, [controllerSourceFile, moduleSourceFile]) => {
|
|
83
|
+
const classDeclaration = controllerSourceFile.getClassOrThrow(`${(0, schematics_utilities_1.classify)(nestController)}Controller`);
|
|
84
|
+
const operationOptions = tsMorphTransform(project, controllerSourceFile, classDeclaration, nestController, moduleSourceFile);
|
|
82
85
|
if (controllerPath) {
|
|
83
86
|
classDeclaration.getDecoratorOrThrow('Controller').set({
|
|
84
87
|
arguments: [w => w.quote(controllerPath)],
|
|
@@ -95,10 +98,10 @@ function CoerceOperation(options) {
|
|
|
95
98
|
});
|
|
96
99
|
}
|
|
97
100
|
CoerceOperationParamList(paramList, classDeclaration);
|
|
98
|
-
(0, add_operation_to_controller_1.AddOperationToController)(
|
|
101
|
+
(0, add_operation_to_controller_1.AddOperationToController)(controllerSourceFile, classDeclaration, operationName, Object.assign({ isAsync: true, paramList,
|
|
99
102
|
queryList,
|
|
100
103
|
path }, operationOptions));
|
|
101
|
-
}),
|
|
104
|
+
}, [`${nestController}.controller.ts?`, `${(0, utilities_1.dasherize)(nestModule)}.module.ts?`]),
|
|
102
105
|
]);
|
|
103
106
|
}
|
|
104
107
|
exports.CoerceOperation = CoerceOperation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-operation.ts"],"names":[],"mappings":";;;AAAA,2DAGoC;AACpC,qEAAsD;AACtD,+BAA4B;AAM5B,8DAG+B;AAC/B,+EAIuC;AACvC,6EAAuE;AACvE,qEAAgE;
|
|
1
|
+
{"version":3,"file":"coerce-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-operation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
export interface CoercePageDtoClassOptions {
|
|
4
|
-
project: Project;
|
|
5
|
-
name: string;
|
|
6
|
-
propertyList?: DtoClassProperty[];
|
|
7
|
-
classStructure?: Omit<OptionalKind<ClassDeclarationStructure>, 'name'>;
|
|
8
|
-
importStructureList?: Array<OptionalKind<ImportDeclarationStructure>>;
|
|
1
|
+
import { CoerceDtoClassOptions } from './coerce-dto-class';
|
|
2
|
+
export interface CoercePageDtoClassOptions extends CoerceDtoClassOptions {
|
|
9
3
|
rowClassName: string;
|
|
10
4
|
rowFilePath: string;
|
|
11
5
|
}
|
|
@@ -2,21 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CoercePageDtoClass = 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
7
|
const path_1 = require("path");
|
|
7
8
|
const coerce_dto_class_1 = require("./coerce-dto-class");
|
|
8
9
|
function CoercePageDtoClass(options) {
|
|
9
|
-
|
|
10
|
-
importStructureList !== null && importStructureList !== void 0 ? importStructureList : (importStructureList = []);
|
|
11
|
-
importStructureList.push({
|
|
12
|
-
namedImports: [rowClassName],
|
|
13
|
-
moduleSpecifier: `./${(0, path_1.basename)(rowFilePath)}`,
|
|
14
|
-
}, {
|
|
15
|
-
namedImports: ['FilterQueryDto'],
|
|
16
|
-
moduleSpecifier: '@rxap/nest-dto',
|
|
17
|
-
});
|
|
18
|
-
classStructure !== null && classStructure !== void 0 ? classStructure : (classStructure = {});
|
|
19
|
-
propertyList !== null && propertyList !== void 0 ? propertyList : (propertyList = []);
|
|
10
|
+
const { project, name, propertyList = [], rowClassName, rowFilePath, tsMorphTransform = utilities_1.noop, } = options;
|
|
20
11
|
(0, utilities_1.CoerceArrayItems)(propertyList, [
|
|
21
12
|
{
|
|
22
13
|
name: 'rows',
|
|
@@ -54,13 +45,19 @@ function CoercePageDtoClass(options) {
|
|
|
54
45
|
isOptional: true,
|
|
55
46
|
}
|
|
56
47
|
]);
|
|
57
|
-
return (0, coerce_dto_class_1.CoerceDtoClass)({
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
48
|
+
return (0, coerce_dto_class_1.CoerceDtoClass)(Object.assign(Object.assign({}, options), { project, name: (0, schematics_utilities_1.CoerceSuffix)(name, '-page'), propertyList, tsMorphTransform: (p, sourceFile, classDeclaration) => {
|
|
49
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, [
|
|
50
|
+
{
|
|
51
|
+
namedImports: [rowClassName],
|
|
52
|
+
moduleSpecifier: `./${(0, path_1.basename)(rowFilePath)}`,
|
|
53
|
+
},
|
|
54
|
+
{
|
|
55
|
+
namedImports: ['FilterQueryDto'],
|
|
56
|
+
moduleSpecifier: '@rxap/nest-dto',
|
|
57
|
+
}
|
|
58
|
+
]);
|
|
59
|
+
tsMorphTransform(p, sourceFile, classDeclaration);
|
|
60
|
+
} }));
|
|
64
61
|
}
|
|
65
62
|
exports.CoercePageDtoClass = CoercePageDtoClass;
|
|
66
63
|
//# sourceMappingURL=coerce-page-dto-class.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-page-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-page-dto-class.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAC1D,+
|
|
1
|
+
{"version":3,"file":"coerce-page-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-page-dto-class.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAC1D,6CAA+C;AAC/C,+CAGyB;AACzB,+BAAgC;AAOhC,yDAG4B;AAQ5B,SAAgB,kBAAkB,CAAC,OAAkC;IACnE,MAAM,EACJ,OAAO,EACP,IAAI,EACJ,YAAY,GAAE,EAAE,EAChB,YAAY,EACZ,WAAW,EACX,gBAAgB,GAAG,gBAAI,GACxB,GAAG,OAAO,CAAC;IACZ,IAAA,4BAAgB,EAAC,YAAY,EAAE;QAC7B;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,IAAI;SACb;QACD;YACE,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,QAAQ;SACf;QACD;YACE,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,QAAQ;SACf;QACD;YACE,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,QAAQ;SACf;QACD;YACE,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,IAAI;SACjB;QACD;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,IAAI;SACjB;QACD;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,IAAI;YACZ,UAAU,EAAE,IAAI;SACjB;KACF,CAAC,CAAC;IACH,OAAO,IAAA,iCAAc,kCAChB,OAAO,KACV,OAAO,EACP,IAAI,EAAE,IAAA,mCAAY,EAAC,IAAI,EAAE,OAAO,CAAC,EACjC,YAAY,EACZ,gBAAgB,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE;YACpD,IAAA,wBAAa,EAAC,UAAU,EAAE;gBACxB;oBACE,YAAY,EAAE,CAAE,YAAY,CAAE;oBAC9B,eAAe,EAAE,KAAM,IAAA,eAAQ,EAAC,WAAW,CAAE,EAAE;iBAChD;gBACD;oBACE,YAAY,EAAE,CAAE,gBAAgB,CAAE;oBAClC,eAAe,EAAE,gBAAgB;iBAClC;aACF,CAAC,CAAC;YACH,gBAAgB,CAAC,CAAC,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;QACpD,CAAC,IACD,CAAC;AACL,CAAC;AAjED,gDAiEC"}
|
|
@@ -4,8 +4,7 @@ exports.CoerceRowDtoClass = void 0;
|
|
|
4
4
|
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
5
5
|
const coerce_dto_class_1 = require("./coerce-dto-class");
|
|
6
6
|
function CoerceRowDtoClass(options) {
|
|
7
|
-
|
|
8
|
-
propertyList !== null && propertyList !== void 0 ? propertyList : (propertyList = []);
|
|
7
|
+
const { rowIdType, project, name, propertyList = [], } = options;
|
|
9
8
|
propertyList.unshift({
|
|
10
9
|
name: '__rowId',
|
|
11
10
|
type: rowIdType === null ? 'number' : rowIdType !== null && rowIdType !== void 0 ? rowIdType : 'string',
|
|
@@ -14,8 +13,6 @@ function CoerceRowDtoClass(options) {
|
|
|
14
13
|
project,
|
|
15
14
|
name: (0, schematics_utilities_1.CoerceSuffix)(name, '-row'),
|
|
16
15
|
propertyList,
|
|
17
|
-
classStructure,
|
|
18
|
-
importStructureList,
|
|
19
16
|
});
|
|
20
17
|
}
|
|
21
18
|
exports.CoerceRowDtoClass = CoerceRowDtoClass;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-row-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-row-dto-class.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAC1D,yDAG4B;AAU5B,SAAgB,iBAAiB,CAAC,OAAiC;IACjE,
|
|
1
|
+
{"version":3,"file":"coerce-row-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-row-dto-class.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAC1D,yDAG4B;AAU5B,SAAgB,iBAAiB,CAAC,OAAiC;IACjE,MAAM,EACJ,SAAS,EACT,OAAO,EACP,IAAI,EACJ,YAAY,GAAG,EAAE,GAClB,GAAG,OAAO,CAAC;IACZ,YAAY,CAAC,OAAO,CAClB;QACE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,QAAQ;KAC5D,CACF,CAAC;IACF,OAAO,IAAA,iCAAc,EAAC;QACpB,OAAO;QACP,IAAI,EAAE,IAAA,mCAAY,EAAC,IAAI,EAAE,MAAM,CAAC;QAChC,YAAY;KACb,CAAC,CAAC;AACL,CAAC;AAlBD,8CAkBC"}
|
|
@@ -1,15 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CoerceSubmitDataGridOperation = void 0;
|
|
4
|
-
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
5
4
|
const coerce_form_submit_operation_1 = require("./coerce-form-submit-operation");
|
|
6
5
|
function CoerceSubmitDataGridOperation(options) {
|
|
7
|
-
|
|
8
|
-
collection
|
|
9
|
-
|
|
10
|
-
controllerName = (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-data-grid');
|
|
11
|
-
return (0, coerce_form_submit_operation_1.CoerceFormSubmitOperation)(Object.assign(Object.assign({}, options), { controllerName,
|
|
12
|
-
paramList }));
|
|
6
|
+
const { collection = false, } = options;
|
|
7
|
+
console.log(`collection: ${collection}`);
|
|
8
|
+
return (0, coerce_form_submit_operation_1.CoerceFormSubmitOperation)(Object.assign({}, options));
|
|
13
9
|
}
|
|
14
10
|
exports.CoerceSubmitDataGridOperation = CoerceSubmitDataGridOperation;
|
|
15
11
|
//# sourceMappingURL=coerce-submit-data-grid-operation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-submit-data-grid-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-submit-data-grid-operation.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"coerce-submit-data-grid-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-submit-data-grid-operation.ts"],"names":[],"mappings":";;;AACA,iFAGwC;AAMxC,SAAgB,6BAA6B,CAAC,OAAuD;IACnG,MAAM,EACJ,UAAU,GAAG,KAAK,GACnB,GAAG,OAAO,CAAC;IAEZ,OAAO,CAAC,GAAG,CAAC,eAAgB,UAAW,EAAE,CAAC,CAAC;IAE3C,OAAO,IAAA,wDAAyB,oBAC3B,OAAO,EACV,CAAC;AACL,CAAC;AAVD,sEAUC"}
|
|
@@ -14,7 +14,7 @@ function CoerceTreeOperationRule(options) {
|
|
|
14
14
|
throw new Error('non full tree not implemented yet');
|
|
15
15
|
}
|
|
16
16
|
return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { path,
|
|
17
|
-
operationName, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
|
|
17
|
+
operationName, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName, moduleSourceFile) => {
|
|
18
18
|
const { className, filePath, } = (0, coerce_dto_class_1.CoerceDtoClass)({
|
|
19
19
|
project,
|
|
20
20
|
name: 'TreeNode',
|
|
@@ -49,7 +49,7 @@ function CoerceTreeOperationRule(options) {
|
|
|
49
49
|
namedImports: [className],
|
|
50
50
|
moduleSpecifier: filePath,
|
|
51
51
|
});
|
|
52
|
-
return Object.assign({ returnType: className + '[]' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
|
|
52
|
+
return Object.assign({ returnType: className + '[]' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName, moduleSourceFile));
|
|
53
53
|
} }));
|
|
54
54
|
}
|
|
55
55
|
exports.CoerceTreeOperationRule = CoerceTreeOperationRule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-tree-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-tree-operation.ts"],"names":[],"mappings":";;;AAAA,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAO5B,SAAgB,uBAAuB,CAAC,OAAmC;IACzE,IAAI,EACF,gBAAgB,EAChB,aAAa,EACb,QAAQ,EACR,IAAI,GACL,GAAG,OAAO,CAAC;IACZ,aAAa,aAAb,aAAa,cAAb,aAAa,IAAb,aAAa,GAAK,MAAM,EAAC;IACzB,QAAQ,aAAR,QAAQ,cAAR,QAAQ,IAAR,QAAQ,GAAK,KAAK,EAAC;IACnB,IAAI,aAAJ,IAAI,cAAJ,IAAI,IAAJ,IAAI,GAAK,MAAM,EAAC;IAChB,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAC;IAEhC,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;KACtD;IAED,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,IAAI;QACJ,aAAa,EACb,gBAAgB,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"coerce-tree-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-tree-operation.ts"],"names":[],"mappings":";;;AAAA,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAO5B,SAAgB,uBAAuB,CAAC,OAAmC;IACzE,IAAI,EACF,gBAAgB,EAChB,aAAa,EACb,QAAQ,EACR,IAAI,GACL,GAAG,OAAO,CAAC;IACZ,aAAa,aAAb,aAAa,cAAb,aAAa,IAAb,aAAa,GAAK,MAAM,EAAC;IACzB,QAAQ,aAAR,QAAQ,cAAR,QAAQ,IAAR,QAAQ,GAAK,KAAK,EAAC;IACnB,IAAI,aAAJ,IAAI,cAAJ,IAAI,IAAJ,IAAI,GAAK,MAAM,EAAC;IAChB,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAC;IAEhC,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;KACtD;IAED,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,IAAI;QACJ,aAAa,EACb,gBAAgB,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,EAAE,EAAE;YAE5F,MAAM,EACJ,SAAS,EACT,QAAQ,GACT,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,UAAU;gBAChB,YAAY,EAAE;oBACd;wBACE,IAAI,EAAE,IAAI;wBACV,IAAI,EAAE,QAAQ;qBACf;oBACD;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,QAAQ;qBACf;oBACD;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,QAAQ;qBACf;oBACD;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,eAAe;wBACrB,MAAM,EAAE,IAAI;qBACb;oBACD;wBACE,IAAI,EAAE,UAAU;wBAChB,UAAU,EAAE,IAAI;wBAChB,OAAO,EAAE,IAAI;wBACb,MAAM,EAAE,IAAI;wBACZ,IAAI,EAAE,QAAQ;qBACf;iBACA;aACF,CAAC,CAAC;YAEH,IAAA,8BAAa,EACX,UAAU,EACV;gBACE,YAAY,EAAE,CAAE,SAAS,CAAE;gBAC3B,eAAe,EAAE,QAAQ;aAC1B,CACF,CAAC;YAEF,uBACE,UAAU,EAAE,SAAS,GAAG,IAAI,IACzB,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,CAAC,EAC7F;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AAtED,0DAsEC"}
|