@rxap/schematics-ts-morph 16.1.0-dev.5 → 16.1.0-dev.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +26 -0
- package/README.md +1 -1
- package/package.json +6 -6
- package/src/index.d.ts +2 -1
- package/src/index.js +2 -1
- package/src/index.js.map +1 -1
- package/src/lib/angular/coerce-dialog-table-action-component.js +2 -2
- package/src/lib/angular/coerce-dialog-table-action-component.js.map +1 -1
- package/src/lib/angular/coerce-form-definition-control.js +2 -3
- package/src/lib/angular/coerce-form-definition-control.js.map +1 -1
- package/src/lib/angular/coerce-form-definition.js +4 -4
- package/src/lib/angular/coerce-form-definition.js.map +1 -1
- package/src/lib/angular/coerce-proxy-remote-method-class.d.ts +1 -1
- package/src/lib/angular/coerce-proxy-remote-method-class.js +1 -1
- package/src/lib/angular/coerce-proxy-remote-method-class.js.map +1 -1
- package/src/lib/angular/coerce-table-parameters-from-route.js +4 -4
- package/src/lib/angular/coerce-table-parameters-from-route.js.map +1 -1
- package/src/lib/angular/coerce-table-select-resolve-value-method.js +2 -2
- package/src/lib/angular/coerce-table-select-resolve-value-method.js.map +1 -1
- package/src/lib/nest/add-operation-to-controller.d.ts +1 -1
- package/src/lib/nest/add-operation-to-controller.js +59 -55
- package/src/lib/nest/add-operation-to-controller.js.map +1 -1
- package/src/lib/nest/build-nest-controller-name.js +10 -0
- package/src/lib/nest/build-nest-controller-name.js.map +1 -1
- package/src/lib/nest/coerce-dto-class.d.ts +2 -7
- package/src/lib/nest/coerce-dto-class.js +44 -59
- package/src/lib/nest/coerce-dto-class.js.map +1 -1
- package/src/lib/nest/coerce-form-submit-operation.d.ts +2 -4
- package/src/lib/nest/coerce-form-submit-operation.js +13 -15
- package/src/lib/nest/coerce-form-submit-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-by-id-operation.d.ts +9 -7
- package/src/lib/nest/coerce-get-by-id-operation.js +85 -56
- package/src/lib/nest/coerce-get-by-id-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-children-operation.js +8 -40
- package/src/lib/nest/coerce-get-children-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-data-grid-operation.d.ts +5 -4
- package/src/lib/nest/coerce-get-data-grid-operation.js +7 -17
- package/src/lib/nest/coerce-get-data-grid-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-operation.d.ts +5 -0
- package/src/lib/nest/coerce-get-operation.js +11 -0
- package/src/lib/nest/coerce-get-operation.js.map +1 -0
- package/src/lib/nest/coerce-get-page-operation.d.ts +15 -22
- package/src/lib/nest/coerce-get-page-operation.js +106 -112
- package/src/lib/nest/coerce-get-page-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-root-operation.d.ts +2 -5
- package/src/lib/nest/coerce-get-root-operation.js +7 -22
- package/src/lib/nest/coerce-get-root-operation.js.map +1 -1
- package/src/lib/nest/coerce-operation.d.ts +32 -9
- package/src/lib/nest/coerce-operation.js +183 -24
- package/src/lib/nest/coerce-operation.js.map +1 -1
- package/src/lib/nest/coerce-options-operation.js +13 -42
- package/src/lib/nest/coerce-options-operation.js.map +1 -1
- package/src/lib/nest/coerce-page-dto-class.d.ts +1 -0
- package/src/lib/nest/coerce-page-dto-class.js +7 -3
- package/src/lib/nest/coerce-page-dto-class.js.map +1 -1
- package/src/lib/nest/coerce-row-dto-class.d.ts +1 -0
- package/src/lib/nest/coerce-row-dto-class.js +11 -6
- package/src/lib/nest/coerce-row-dto-class.js.map +1 -1
- package/src/lib/nest/coerce-table-select-operation.js +6 -6
- package/src/lib/nest/coerce-table-select-operation.js.map +1 -1
- package/src/lib/nest/coerce-table-select-value-resolve-operation.d.ts +7 -6
- package/src/lib/nest/coerce-table-select-value-resolve-operation.js +32 -33
- package/src/lib/nest/coerce-table-select-value-resolve-operation.js.map +1 -1
- package/src/lib/nest/coerce-tree-operation.js +35 -44
- package/src/lib/nest/coerce-tree-operation.js.map +1 -1
- package/src/lib/nest/dto-class-property.d.ts +19 -0
- package/src/lib/nest/dto-class-property.js +26 -0
- package/src/lib/nest/dto-class-property.js.map +1 -0
- package/src/lib/nest/table-query-list.js +10 -2
- package/src/lib/nest/table-query-list.js.map +1 -1
- package/src/lib/nest/create-dto-class.d.ts +0 -24
- package/src/lib/nest/create-dto-class.js +0 -169
- package/src/lib/nest/create-dto-class.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-operation-to-controller.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/add-operation-to-controller.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;
|
|
1
|
+
{"version":3,"file":"add-operation-to-controller.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/add-operation-to-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,15 +6,25 @@ const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
|
6
6
|
function BuildNestControllerName(options) {
|
|
7
7
|
let { controllerName, controllerNameSuffix, nestModule, } = options;
|
|
8
8
|
if (nestModule && nestModule !== controllerName) {
|
|
9
|
+
console.log('The nest module name is different from the controller name');
|
|
9
10
|
if (controllerName) {
|
|
11
|
+
console.log('controllerName', controllerName);
|
|
10
12
|
if (!controllerName.startsWith(nestModule)) {
|
|
13
|
+
console.log('The controller name is not prefixed with the nest module name');
|
|
11
14
|
controllerName = [nestModule, controllerName].join('-');
|
|
12
15
|
}
|
|
16
|
+
else {
|
|
17
|
+
console.warn('The controller name is already prefixed with the nest module name');
|
|
18
|
+
}
|
|
13
19
|
}
|
|
14
20
|
else {
|
|
21
|
+
console.warn('The controller name is not defined');
|
|
15
22
|
controllerName = nestModule;
|
|
16
23
|
}
|
|
17
24
|
}
|
|
25
|
+
else {
|
|
26
|
+
console.log('The nest module name is the same as the controller name');
|
|
27
|
+
}
|
|
18
28
|
if (controllerNameSuffix) {
|
|
19
29
|
controllerName = (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-' + controllerNameSuffix);
|
|
20
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-nest-controller-name.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/build-nest-controller-name.ts"],"names":[],"mappings":";;;AAAA,2DAAiE;AACjE,qEAA0D;AAQ1D,SAAgB,uBAAuB,CAAC,OAAuC;IAC7E,IAAI,EACF,cAAc,EACd,oBAAoB,EACpB,UAAU,GACX,GAAG,OAAO,CAAC;IAEZ,IAAI,UAAU,IAAI,UAAU,KAAK,cAAc,EAAE;QAC/C,IAAI,cAAc,EAAE;YAClB,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBAC1C,cAAc,GAAG,CAAE,UAAU,EAAE,cAAc,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC3D;SACF;aAAM;YACL,cAAc,GAAG,UAAU,CAAC;SAC7B;KACF;IAED,IAAI,oBAAoB,EAAE;QACxB,cAAc,GAAG,IAAA,mCAAY,EAAC,cAAe,EAAE,GAAG,GAAG,oBAAoB,CAAC,CAAC;KAC5E;IAED,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,gCAAmB,CAAC,yCAAyC,CAAC,CAAC;KAC1E;IAED,OAAO,cAAc,CAAC;AAExB,CAAC;
|
|
1
|
+
{"version":3,"file":"build-nest-controller-name.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/build-nest-controller-name.ts"],"names":[],"mappings":";;;AAAA,2DAAiE;AACjE,qEAA0D;AAQ1D,SAAgB,uBAAuB,CAAC,OAAuC;IAC7E,IAAI,EACF,cAAc,EACd,oBAAoB,EACpB,UAAU,GACX,GAAG,OAAO,CAAC;IAEZ,IAAI,UAAU,IAAI,UAAU,KAAK,cAAc,EAAE;QAC/C,OAAO,CAAC,GAAG,CAAC,4DAA4D,CAAC,CAAC;QAC1E,IAAI,cAAc,EAAE;YAClB,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;YAC9C,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBAC1C,OAAO,CAAC,GAAG,CAAC,+DAA+D,CAAC,CAAC;gBAC7E,cAAc,GAAG,CAAE,UAAU,EAAE,cAAc,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC3D;iBAAM;gBACL,OAAO,CAAC,IAAI,CAAC,mEAAmE,CAAC,CAAC;aACnF;SACF;aAAM;YACL,OAAO,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;YACnD,cAAc,GAAG,UAAU,CAAC;SAC7B;KACF;SAAM;QACL,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;KACxE;IAED,IAAI,oBAAoB,EAAE;QACxB,cAAc,GAAG,IAAA,mCAAY,EAAC,cAAe,EAAE,GAAG,GAAG,oBAAoB,CAAC,CAAC;KAC5E;IAED,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,gCAAmB,CAAC,yCAAyC,CAAC,CAAC;KAC1E;IAED,OAAO,cAAc,CAAC;AAExB,CAAC;AAnCD,0DAmCC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ClassDeclaration,
|
|
2
|
-
import { DtoClassProperty } from './
|
|
1
|
+
import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
|
|
2
|
+
import { DtoClassProperty } from './dto-class-property';
|
|
3
3
|
import 'colors';
|
|
4
4
|
export interface CoerceDtoClassOutput {
|
|
5
5
|
className: string;
|
|
@@ -7,11 +7,6 @@ export interface CoerceDtoClassOutput {
|
|
|
7
7
|
sourceFile: SourceFile;
|
|
8
8
|
classDeclaration: ClassDeclaration;
|
|
9
9
|
}
|
|
10
|
-
/**
|
|
11
|
-
* @deprecated import from @rxap/ts-morph
|
|
12
|
-
*/
|
|
13
|
-
export declare function CoercePropertyDeclaration(typeElementMemberedNode: TypeElementMemberedNode, name: string, structure?: Partial<PropertyDeclarationStructure>): PropertySignature;
|
|
14
|
-
export declare function CoercePropertyDeclaration(classLikeDeclarationBase: ClassLikeDeclarationBase, name: string, structure?: Partial<PropertyDeclarationStructure>): PropertyDeclaration;
|
|
15
10
|
export interface CoerceDtoClassOptions {
|
|
16
11
|
project: Project;
|
|
17
12
|
name: string;
|
|
@@ -1,22 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.CoerceDtoClass =
|
|
3
|
+
exports.CoerceDtoClass = 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
|
-
const
|
|
8
|
-
const
|
|
9
|
-
const ts_morph_2 = require("@rxap/ts-morph");
|
|
8
|
+
const ts_morph_2 = require("ts-morph");
|
|
9
|
+
const dto_class_property_1 = require("./dto-class-property");
|
|
10
10
|
require("colors");
|
|
11
|
-
function CoercePropertyDeclaration(node, name, structure = {}) {
|
|
12
|
-
let property = node.getProperty(name);
|
|
13
|
-
if (!property) {
|
|
14
|
-
property = node.addProperty({ name });
|
|
15
|
-
property.set(structure);
|
|
16
|
-
}
|
|
17
|
-
return property;
|
|
18
|
-
}
|
|
19
|
-
exports.CoercePropertyDeclaration = CoercePropertyDeclaration;
|
|
20
11
|
function CoerceDtoClass(options) {
|
|
21
12
|
var _a;
|
|
22
13
|
const { project, propertyList = [], tsMorphTransform = utilities_1.noop, } = options;
|
|
@@ -24,12 +15,13 @@ function CoerceDtoClass(options) {
|
|
|
24
15
|
name = (0, schematics_utilities_1.dasherize)(name);
|
|
25
16
|
const className = (0, schematics_utilities_1.CoerceSuffix)((0, schematics_utilities_1.classify)(name), 'Dto');
|
|
26
17
|
const fileName = (0, schematics_utilities_1.CoerceSuffix)(name, '.dto');
|
|
27
|
-
const sourceFile = (0,
|
|
28
|
-
const classDeclaration = (0,
|
|
18
|
+
const sourceFile = (0, ts_morph_1.CoerceSourceFile)(project, (0, path_1.join)('dtos', fileName + '.ts'));
|
|
19
|
+
const classDeclaration = (0, ts_morph_1.CoerceClass)(sourceFile, className);
|
|
29
20
|
classDeclaration.setIsExported(true);
|
|
30
|
-
for (const property of propertyList) {
|
|
31
|
-
if (property.type === '<self>') {
|
|
32
|
-
property.type = className;
|
|
21
|
+
for (const property of propertyList.map(dto_class_property_1.NormalizeDataClassProperty)) {
|
|
22
|
+
if (property.type.name === '<self>') {
|
|
23
|
+
property.type.name = className;
|
|
24
|
+
property.isType = true;
|
|
33
25
|
}
|
|
34
26
|
let propertyName = (0, schematics_utilities_1.camelize)(property.name);
|
|
35
27
|
const prefixMatch = property.name.match(/^(_+)/);
|
|
@@ -37,149 +29,142 @@ function CoerceDtoClass(options) {
|
|
|
37
29
|
propertyName = (0, schematics_utilities_1.camelize)(property.name.replace(/^_+/, ''));
|
|
38
30
|
propertyName = prefixMatch[0] + propertyName;
|
|
39
31
|
}
|
|
40
|
-
const propertyDeclaration = CoercePropertyDeclaration(classDeclaration, propertyName).set({
|
|
41
|
-
type: (0,
|
|
42
|
-
hasQuestionToken:
|
|
32
|
+
const propertyDeclaration = (0, ts_morph_1.CoercePropertyDeclaration)(classDeclaration, propertyName).set({
|
|
33
|
+
type: (0, ts_morph_1.WriteType)(property, sourceFile),
|
|
34
|
+
hasQuestionToken: property.isOptional,
|
|
43
35
|
hasExclamationToken: !property.isOptional,
|
|
44
36
|
});
|
|
45
|
-
(0,
|
|
37
|
+
(0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'Expose', {
|
|
46
38
|
arguments: [],
|
|
47
39
|
});
|
|
48
|
-
(0,
|
|
40
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
49
41
|
namedImports: ['Expose'],
|
|
50
42
|
moduleSpecifier: 'class-transformer',
|
|
51
43
|
});
|
|
52
44
|
if (property.isArray) {
|
|
53
|
-
(0,
|
|
45
|
+
(0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsArray', {
|
|
54
46
|
arguments: [],
|
|
55
47
|
});
|
|
56
|
-
(0,
|
|
48
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
57
49
|
namedImports: ['IsArray'],
|
|
58
50
|
moduleSpecifier: 'class-validator',
|
|
59
51
|
});
|
|
60
52
|
}
|
|
61
53
|
if (property.isType) {
|
|
62
|
-
(0,
|
|
54
|
+
(0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'Type', {
|
|
63
55
|
arguments: [
|
|
64
56
|
w => {
|
|
65
57
|
w.write('() => ');
|
|
66
|
-
(0,
|
|
58
|
+
(0, ts_morph_1.WriteType)({
|
|
67
59
|
type: property.type,
|
|
68
60
|
isArray: false
|
|
69
61
|
}, sourceFile)(w);
|
|
70
62
|
},
|
|
71
63
|
],
|
|
72
64
|
});
|
|
73
|
-
(0,
|
|
65
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
74
66
|
namedImports: ['Type'],
|
|
75
67
|
moduleSpecifier: 'class-transformer',
|
|
76
68
|
});
|
|
77
|
-
(0,
|
|
69
|
+
(0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsInstance', {
|
|
78
70
|
arguments: [
|
|
79
|
-
(0,
|
|
71
|
+
(0, ts_morph_1.WriteType)({
|
|
80
72
|
type: property.type,
|
|
81
73
|
isArray: false
|
|
82
74
|
}, sourceFile),
|
|
83
75
|
w => {
|
|
84
76
|
if (property.isArray) {
|
|
85
|
-
|
|
77
|
+
ts_morph_2.Writers.object({ each: 'true' })(w);
|
|
86
78
|
}
|
|
87
79
|
},
|
|
88
80
|
],
|
|
89
81
|
});
|
|
90
|
-
(0,
|
|
82
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
91
83
|
namedImports: ['IsInstance'],
|
|
92
84
|
moduleSpecifier: 'class-validator',
|
|
93
85
|
});
|
|
94
86
|
}
|
|
95
87
|
if (property.isOptional) {
|
|
96
|
-
(0,
|
|
88
|
+
(0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsOptional', {
|
|
97
89
|
arguments: [],
|
|
98
90
|
});
|
|
99
|
-
(0,
|
|
91
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
100
92
|
namedImports: ['IsOptional'],
|
|
101
93
|
moduleSpecifier: 'class-validator',
|
|
102
94
|
});
|
|
103
95
|
}
|
|
104
|
-
|
|
105
|
-
if (typeof property.type === 'string') {
|
|
106
|
-
autoType = property.type;
|
|
107
|
-
}
|
|
108
|
-
else if (typeof property.type === 'object') {
|
|
109
|
-
autoType = property.type.name;
|
|
110
|
-
}
|
|
111
|
-
switch (autoType) {
|
|
96
|
+
switch (property.type.name) {
|
|
112
97
|
case 'date':
|
|
113
|
-
(0,
|
|
98
|
+
(0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsDate', {
|
|
114
99
|
arguments: [],
|
|
115
100
|
});
|
|
116
|
-
(0,
|
|
101
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
117
102
|
namedImports: ['IsDate'],
|
|
118
103
|
moduleSpecifier: 'class-validator',
|
|
119
104
|
});
|
|
120
105
|
break;
|
|
121
106
|
case 'number':
|
|
122
|
-
(0,
|
|
107
|
+
(0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsNumber', {
|
|
123
108
|
arguments: [],
|
|
124
109
|
});
|
|
125
|
-
(0,
|
|
110
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
126
111
|
namedImports: ['IsNumber'],
|
|
127
112
|
moduleSpecifier: 'class-validator',
|
|
128
113
|
});
|
|
129
114
|
break;
|
|
130
115
|
case 'string':
|
|
131
116
|
if (property.name === 'uuid') {
|
|
132
|
-
(0,
|
|
117
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
133
118
|
namedImports: ['IsUUID'],
|
|
134
119
|
moduleSpecifier: 'class-validator',
|
|
135
120
|
});
|
|
136
|
-
(0,
|
|
121
|
+
(0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsUUID', {
|
|
137
122
|
arguments: [],
|
|
138
123
|
});
|
|
139
124
|
}
|
|
140
125
|
else {
|
|
141
|
-
(0,
|
|
126
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
142
127
|
namedImports: ['IsString'],
|
|
143
128
|
moduleSpecifier: 'class-validator',
|
|
144
129
|
});
|
|
145
|
-
(0,
|
|
130
|
+
(0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsString', {
|
|
146
131
|
arguments: [],
|
|
147
132
|
});
|
|
148
133
|
}
|
|
149
134
|
break;
|
|
150
135
|
case 'uuid':
|
|
151
|
-
(0,
|
|
136
|
+
(0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsUUID', {
|
|
152
137
|
arguments: [],
|
|
153
138
|
});
|
|
154
|
-
(0,
|
|
139
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
155
140
|
namedImports: ['IsUUID'],
|
|
156
141
|
moduleSpecifier: 'class-validator',
|
|
157
142
|
});
|
|
158
143
|
break;
|
|
159
144
|
case 'boolean':
|
|
160
|
-
(0,
|
|
145
|
+
(0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsBoolean', {
|
|
161
146
|
arguments: [],
|
|
162
147
|
});
|
|
163
|
-
(0,
|
|
148
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
164
149
|
namedImports: ['IsBoolean'],
|
|
165
150
|
moduleSpecifier: 'class-validator',
|
|
166
151
|
});
|
|
167
152
|
break;
|
|
168
153
|
case 'unknown':
|
|
169
|
-
(0,
|
|
170
|
-
arguments: [
|
|
154
|
+
(0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'ApiProperty', {
|
|
155
|
+
arguments: [ts_morph_2.Writers.object({ type: w => w.quote('unknown') })],
|
|
171
156
|
});
|
|
172
|
-
(0,
|
|
157
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
173
158
|
namedImports: ['ApiProperty'],
|
|
174
159
|
moduleSpecifier: '@nestjs/swagger',
|
|
175
160
|
});
|
|
176
161
|
break;
|
|
177
162
|
}
|
|
178
|
-
if (
|
|
163
|
+
if (property.type.name !== 'unknown') {
|
|
179
164
|
const apiProperty = propertyDeclaration.getDecorators().find(d => d.getName() === 'ApiProperty');
|
|
180
165
|
if (apiProperty) {
|
|
181
166
|
const args = apiProperty.getArguments()[0];
|
|
182
|
-
if (args instanceof
|
|
167
|
+
if (args instanceof ts_morph_2.ObjectLiteralExpression) {
|
|
183
168
|
if ((_a = args.getProperty('type')) === null || _a === void 0 ? void 0 : _a.getText().includes('unknown')) {
|
|
184
169
|
apiProperty.remove();
|
|
185
170
|
}
|
|
@@ -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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"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
export interface CoerceFormSubmitOperationOptions extends Omit<CoerceOperationOptions, 'operationName'> {
|
|
4
|
-
propertyList?: DtoClassProperty[];
|
|
1
|
+
import { CoerceGetByIdControllerOptions } from './coerce-get-by-id-operation';
|
|
2
|
+
export interface CoerceFormSubmitOperationOptions extends CoerceGetByIdControllerOptions {
|
|
5
3
|
bodyDtoName?: string;
|
|
6
4
|
}
|
|
7
5
|
export declare function CoerceFormSubmitOperation(options: CoerceFormSubmitOperationOptions): import("@angular-devkit/schematics").Rule;
|
|
@@ -2,22 +2,20 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CoerceFormSubmitOperation = void 0;
|
|
4
4
|
const utilities_1 = require("@rxap/utilities");
|
|
5
|
-
const
|
|
6
|
-
const coerce_dto_class_1 = require("./coerce-dto-class");
|
|
7
|
-
const coerce_operation_1 = require("./coerce-operation");
|
|
5
|
+
const coerce_get_by_id_operation_1 = require("./coerce-get-by-id-operation");
|
|
8
6
|
function CoerceFormSubmitOperation(options) {
|
|
9
|
-
const { tsMorphTransform = utilities_1.noop,
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
}
|
|
20
|
-
return Object.assign({ body:
|
|
7
|
+
const { tsMorphTransform = utilities_1.noop, bodyDtoName, isReturnVoid = true,
|
|
8
|
+
// if not explicitly defined the idProperty is set to null, as not each data grid operation has an id
|
|
9
|
+
idProperty = null, operationName = idProperty ? 'submitById' : 'submit', } = options;
|
|
10
|
+
return (0, coerce_get_by_id_operation_1.CoerceGetByIdOperation)(Object.assign(Object.assign({}, options), { operationName,
|
|
11
|
+
isReturnVoid,
|
|
12
|
+
idProperty, buildOperationDtoClassName: (controllerName, { dtoClassName, dtoClassNameSuffix }) => {
|
|
13
|
+
return dtoClassName !== null && dtoClassName !== void 0 ? dtoClassName : (dtoClassNameSuffix ? (0, utilities_1.CoerceSuffix)(bodyDtoName !== null && bodyDtoName !== void 0 ? bodyDtoName : controllerName, dtoClassNameSuffix) : bodyDtoName !== null && bodyDtoName !== void 0 ? bodyDtoName : controllerName);
|
|
14
|
+
}, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName, moduleSourceFile, dto) => {
|
|
15
|
+
if (!dto) {
|
|
16
|
+
throw new Error('The dto must be created for an submit operation');
|
|
17
|
+
}
|
|
18
|
+
return Object.assign({ body: dto.className, method: 'post' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName, moduleSourceFile, dto));
|
|
21
19
|
} }));
|
|
22
20
|
}
|
|
23
21
|
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
|
|
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,6EAGsC;AAMtC,SAAgB,yBAAyB,CAAC,OAAyC;IACjF,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,WAAW,EACX,YAAY,GAAG,IAAI;IACnB,qGAAqG;IACrG,UAAU,GAAG,IAAI,EACjB,aAAa,GAAG,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,GACrD,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,mDAAsB,kCACxB,OAAO,KACV,aAAa;QACb,YAAY;QACZ,UAAU,EACV,0BAA0B,EAAE,CAAC,cAAc,EAAE,EAAE,YAAY,EAAE,kBAAkB,EAAE,EAAE,EAAE;YACnF,OAAO,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,CACrB,kBAAkB,CAAC,CAAC,CAAC,IAAA,wBAAY,EAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,cAAc,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,cAAc,CACrH,CAAC;QACJ,CAAC,EACD,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,GAAG,EACH,EAAE;YAEF,IAAI,CAAC,GAAG,EAAE;gBACR,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;aACpE;YAED,uBACE,IAAI,EAAE,GAAG,CAAC,SAAS,EACnB,MAAM,EAAE,MAAM,IACX,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,EAAE,GAAG,CAAC,EAClG;QAEJ,CAAC,IACD,CAAC;AAEL,CAAC;AA1CD,8DA0CC"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
import { OperationParameter } from '@rxap/ts-morph';
|
|
2
|
+
import { ClassDeclaration, SourceFile, WriterFunction } from 'ts-morph';
|
|
3
|
+
import { CoerceDtoClassOutput } from './coerce-dto-class';
|
|
4
|
+
import { CoerceGetControllerOptions } from './coerce-get-operation';
|
|
5
|
+
import { TransformOperation } from './coerce-operation';
|
|
6
|
+
export interface CoerceGetByIdControllerOptions extends CoerceGetControllerOptions {
|
|
7
|
+
idProperty?: OperationParameter | null;
|
|
8
8
|
}
|
|
9
|
+
export declare function BuildUpstreamGetByIdParametersImplementation(classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, dto: CoerceDtoClassOutput | null, options: Readonly<CoerceGetByIdControllerOptions>): TransformOperation<string | WriterFunction>;
|
|
10
|
+
export declare function BuiltGetByIdDtoDataMapperImplementation(classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, dto: CoerceDtoClassOutput | null, options: Readonly<CoerceGetByIdControllerOptions>): TransformOperation<string | WriterFunction>;
|
|
9
11
|
export declare function CoerceGetByIdOperation(options: CoerceGetByIdControllerOptions): import("@angular-devkit/schematics").Rule;
|
|
@@ -1,64 +1,93 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.CoerceGetByIdOperation = void 0;
|
|
4
|
-
const
|
|
5
|
-
const ts_morph_1 = require("
|
|
6
|
-
const
|
|
7
|
-
|
|
3
|
+
exports.CoerceGetByIdOperation = exports.BuiltGetByIdDtoDataMapperImplementation = exports.BuildUpstreamGetByIdParametersImplementation = void 0;
|
|
4
|
+
const utilities_1 = require("@rxap/utilities");
|
|
5
|
+
const ts_morph_1 = require("ts-morph");
|
|
6
|
+
const coerce_get_operation_1 = require("./coerce-get-operation");
|
|
7
|
+
function BuildUpstreamGetByIdParametersImplementation(classDeclaration, moduleSourceFile, dto, options) {
|
|
8
|
+
return () => {
|
|
9
|
+
const { idProperty } = options;
|
|
10
|
+
return idProperty ? `{ parameters: { ${idProperty.name} } }` : '';
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
exports.BuildUpstreamGetByIdParametersImplementation = BuildUpstreamGetByIdParametersImplementation;
|
|
14
|
+
function BuiltGetByIdDtoDataMapperImplementation(classDeclaration, moduleSourceFile, dto, options) {
|
|
15
|
+
const { propertyList = [], upstream, isArray, idProperty, } = options;
|
|
16
|
+
return () => {
|
|
17
|
+
var _a;
|
|
18
|
+
if (upstream) {
|
|
19
|
+
const mapper = {};
|
|
20
|
+
if (idProperty) {
|
|
21
|
+
mapper[idProperty.name] = idProperty.name;
|
|
22
|
+
}
|
|
23
|
+
for (const property of propertyList.filter(p => !idProperty || p.name !== idProperty.name)) {
|
|
24
|
+
mapper[property.name] = `data.${(_a = property.source) !== null && _a !== void 0 ? _a : property.name}`;
|
|
25
|
+
}
|
|
26
|
+
if (isArray) {
|
|
27
|
+
return w => {
|
|
28
|
+
w.write('data.map(item => (');
|
|
29
|
+
ts_morph_1.Writers.object(mapper)(w);
|
|
30
|
+
w.write('))');
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
return ts_morph_1.Writers.object(mapper);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
if (isArray) {
|
|
39
|
+
return '[]';
|
|
40
|
+
}
|
|
41
|
+
if (idProperty) {
|
|
42
|
+
return `{ ${idProperty.name} }`;
|
|
43
|
+
}
|
|
44
|
+
return '{}';
|
|
45
|
+
}
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
exports.BuiltGetByIdDtoDataMapperImplementation = BuiltGetByIdDtoDataMapperImplementation;
|
|
8
49
|
function CoerceGetByIdOperation(options) {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
50
|
+
var _a, _b;
|
|
51
|
+
const { controllerName, paramList = [], propertyList = [], idProperty = { name: 'uuid', type: 'string' }, operationName = 'getById', nestModule, buildUpstreamGetParametersImplementation = BuildUpstreamGetByIdParametersImplementation, builtDtoDataMapperImplementation = BuiltGetByIdDtoDataMapperImplementation, } = options;
|
|
52
|
+
if (idProperty) {
|
|
53
|
+
/**
|
|
54
|
+
* If the module is not specified. This controller has an own module. Else the
|
|
55
|
+
* module is originated by another controller.
|
|
56
|
+
*
|
|
57
|
+
* **Example**
|
|
58
|
+
* true:
|
|
59
|
+
* The controller ReportDetailsController should be extended with getById Operation.
|
|
60
|
+
* And the controller is used in the module ReportDetailsModule
|
|
61
|
+
*
|
|
62
|
+
* name = "report-details"
|
|
63
|
+
* module = undefined
|
|
64
|
+
*
|
|
65
|
+
* false:
|
|
66
|
+
* The controller ReportDetailsNotificationController should be extend with getById Operation.
|
|
67
|
+
* And the controller ise used in the module ReportDetailsModule
|
|
68
|
+
*
|
|
69
|
+
* name = "notification"
|
|
70
|
+
* module = "report-details"
|
|
71
|
+
*/
|
|
72
|
+
const isFirstBornSibling = !nestModule || nestModule === controllerName;
|
|
73
|
+
if (isFirstBornSibling) {
|
|
74
|
+
(0, utilities_1.CoerceArrayItems)(propertyList, [{
|
|
75
|
+
name: idProperty.name,
|
|
76
|
+
type: (_a = idProperty.type) !== null && _a !== void 0 ? _a : 'string',
|
|
77
|
+
isArray: idProperty.isArray,
|
|
78
|
+
}], (a, b) => a.name === b.name, true);
|
|
79
|
+
}
|
|
80
|
+
(0, utilities_1.CoerceArrayItems)(paramList, [{
|
|
81
|
+
name: idProperty.name,
|
|
82
|
+
type: idProperty.type,
|
|
83
|
+
fromParent: (_b = idProperty.fromParent) !== null && _b !== void 0 ? _b : !isFirstBornSibling,
|
|
84
|
+
}], (a, b) => a.name === b.name, true);
|
|
44
85
|
}
|
|
45
|
-
return (0,
|
|
46
|
-
controllerName,
|
|
86
|
+
return (0, coerce_get_operation_1.CoerceGetOperation)(Object.assign(Object.assign({}, options), { operationName,
|
|
47
87
|
paramList,
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
name: controllerName,
|
|
52
|
-
propertyList,
|
|
53
|
-
});
|
|
54
|
-
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
55
|
-
namedImports: [dtoClassName],
|
|
56
|
-
moduleSpecifier: dtoFilePath,
|
|
57
|
-
});
|
|
58
|
-
return {
|
|
59
|
-
returnType: dtoClassName + (isArray ? '[]' : ''),
|
|
60
|
-
};
|
|
61
|
-
} }));
|
|
88
|
+
propertyList,
|
|
89
|
+
buildUpstreamGetParametersImplementation,
|
|
90
|
+
builtDtoDataMapperImplementation }));
|
|
62
91
|
}
|
|
63
92
|
exports.CoerceGetByIdOperation = CoerceGetByIdOperation;
|
|
64
93
|
//# sourceMappingURL=coerce-get-by-id-operation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-get-by-id-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-by-id-operation.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"coerce-get-by-id-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-by-id-operation.ts"],"names":[],"mappings":"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"}
|