@rxap/schematics-ts-morph 16.1.0-dev.20 → 16.1.0-dev.22
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 +13 -0
- package/README.md +1 -1
- package/package.json +6 -6
- package/src/index.d.ts +1 -0
- package/src/index.js +1 -0
- package/src/index.js.map +1 -1
- package/src/lib/angular/coerce-pipe.d.ts +10 -0
- package/src/lib/angular/coerce-pipe.js +63 -0
- package/src/lib/angular/coerce-pipe.js.map +1 -0
- package/src/lib/nest/coerce-get-by-id-operation.js +28 -10
- package/src/lib/nest/coerce-get-by-id-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-page-operation.js +32 -9
- package/src/lib/nest/coerce-get-page-operation.js.map +1 -1
- package/src/lib/nest/coerce-operation.d.ts +3 -3
- package/src/lib/nest/coerce-operation.js.map +1 -1
- package/src/lib/nest/coerce-options-operation.js +45 -1
- package/src/lib/nest/coerce-options-operation.js.map +1 -1
- package/src/lib/nest/coerce-table-select-value-resolve-operation.js +10 -2
- package/src/lib/nest/coerce-table-select-value-resolve-operation.js.map +1 -1
- package/src/lib/nest/dto-class-property.js +5 -2
- package/src/lib/nest/dto-class-property.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,19 @@
|
|
|
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.22](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.1.0-dev.21...@rxap/schematics-ts-morph@16.1.0-dev.22) (2024-03-09)
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
- add CoercePipe function ([5661286](https://gitlab.com/rxap/packages/commit/5661286d3a8bed5b3f504600f53de89f646cca2c))
|
|
11
|
+
|
|
12
|
+
# [16.1.0-dev.21](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.1.0-dev.20...@rxap/schematics-ts-morph@16.1.0-dev.21) (2024-03-09)
|
|
13
|
+
|
|
14
|
+
### Features
|
|
15
|
+
|
|
16
|
+
- support custom mappers ([3970d65](https://gitlab.com/rxap/packages/commit/3970d65e099d85b57a345017af625bbc2d3b3475))
|
|
17
|
+
- support to options mapper ([0672e06](https://gitlab.com/rxap/packages/commit/0672e06618f11e5af31daffc5ded8caac3ce7a16))
|
|
18
|
+
|
|
6
19
|
# [16.1.0-dev.20](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.1.0-dev.19...@rxap/schematics-ts-morph@16.1.0-dev.20) (2024-03-09)
|
|
7
20
|
|
|
8
21
|
### Bug Fixes
|
package/README.md
CHANGED
|
@@ -17,5 +17,5 @@ yarn add @rxap/schematics-ts-morph
|
|
|
17
17
|
```
|
|
18
18
|
**Install peer dependencies:**
|
|
19
19
|
```bash
|
|
20
|
-
yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-utilities@^16.0.1-dev.1 @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.1 @rxap/ts-morph@^1.1.0-dev.17 @rxap/utilities@^16.1.0-dev.7 @rxap/workspace-ts-morph@^16.0.2-dev.1 colors@^1.4.0 handlebars@^4.7.7 ts-morph@^18.0.0 tslib@2.6.2
|
|
21
21
|
```
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "16.1.0-dev.
|
|
2
|
+
"version": "16.1.0-dev.22",
|
|
3
3
|
"name": "@rxap/schematics-ts-morph",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
"@angular-devkit/core": "^16.1.4",
|
|
14
14
|
"@angular-devkit/schematics": "^16.1.4",
|
|
15
15
|
"@rxap/schematics-utilities": "^16.0.1-dev.1",
|
|
16
|
-
"@rxap/ts-morph": "^1.1.0-dev.
|
|
17
|
-
"@rxap/utilities": "^16.1.0-dev.
|
|
16
|
+
"@rxap/ts-morph": "^1.1.0-dev.17",
|
|
17
|
+
"@rxap/utilities": "^16.1.0-dev.7",
|
|
18
18
|
"@rxap/workspace-ts-morph": "^16.0.2-dev.1",
|
|
19
19
|
"colors": "^1.4.0",
|
|
20
20
|
"handlebars": "^4.7.7",
|
|
@@ -49,11 +49,11 @@
|
|
|
49
49
|
},
|
|
50
50
|
{
|
|
51
51
|
"package": "@rxap/ts-morph",
|
|
52
|
-
"version": "1.1.0-dev.
|
|
52
|
+
"version": "1.1.0-dev.17"
|
|
53
53
|
},
|
|
54
54
|
{
|
|
55
55
|
"package": "@rxap/utilities",
|
|
56
|
-
"version": "16.1.0-dev.
|
|
56
|
+
"version": "16.1.0-dev.7"
|
|
57
57
|
},
|
|
58
58
|
{
|
|
59
59
|
"package": "@rxap/workspace-ts-morph",
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"directory": "packages/schematic/ts-morph"
|
|
72
72
|
},
|
|
73
73
|
"type": "commonjs",
|
|
74
|
-
"gitHead": "
|
|
74
|
+
"gitHead": "21db2591d323c9badd6430369051e521be2215d8",
|
|
75
75
|
"main": "./src/index.js",
|
|
76
76
|
"types": "./src/index.d.ts"
|
|
77
77
|
}
|
package/src/index.d.ts
CHANGED
|
@@ -90,6 +90,7 @@ export * from './lib/angular/coerce-navigation-table-action';
|
|
|
90
90
|
export * from './lib/angular/coerce-open-api-table-action';
|
|
91
91
|
export * from './lib/angular/coerce-operation-table-action';
|
|
92
92
|
export * from './lib/angular/coerce-options-data-source';
|
|
93
|
+
export * from './lib/angular/coerce-pipe';
|
|
93
94
|
export * from './lib/angular/coerce-project-feature';
|
|
94
95
|
export * from './lib/angular/coerce-proxy-remote-method-class';
|
|
95
96
|
export * from './lib/angular/coerce-table-action-index-provider';
|
package/src/index.js
CHANGED
|
@@ -100,6 +100,7 @@ tslib_1.__exportStar(require("./lib/angular/coerce-navigation-table-action"), ex
|
|
|
100
100
|
tslib_1.__exportStar(require("./lib/angular/coerce-open-api-table-action"), exports);
|
|
101
101
|
tslib_1.__exportStar(require("./lib/angular/coerce-operation-table-action"), exports);
|
|
102
102
|
tslib_1.__exportStar(require("./lib/angular/coerce-options-data-source"), exports);
|
|
103
|
+
tslib_1.__exportStar(require("./lib/angular/coerce-pipe"), exports);
|
|
103
104
|
tslib_1.__exportStar(require("./lib/angular/coerce-project-feature"), exports);
|
|
104
105
|
tslib_1.__exportStar(require("./lib/angular/coerce-proxy-remote-method-class"), exports);
|
|
105
106
|
tslib_1.__exportStar(require("./lib/angular/coerce-table-action-index-provider"), exports);
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/schematic/ts-morph/src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/schematic/ts-morph/src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { TsMorphAngularProjectTransformOptions } from '@rxap/workspace-ts-morph';
|
|
2
|
+
import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
|
|
3
|
+
export interface CoercePipeOptions extends TsMorphAngularProjectTransformOptions {
|
|
4
|
+
name: string;
|
|
5
|
+
shared?: boolean;
|
|
6
|
+
valueType?: string;
|
|
7
|
+
pure?: boolean;
|
|
8
|
+
tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration) => void;
|
|
9
|
+
}
|
|
10
|
+
export declare function CoercePipe(options: CoercePipeOptions): import("@angular-devkit/schematics").Rule;
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CoercePipe = void 0;
|
|
4
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
5
|
+
const utilities_1 = require("@rxap/utilities");
|
|
6
|
+
const ts_morph_2 = require("ts-morph");
|
|
7
|
+
const ts_morph_transform_1 = require("../ts-morph-transform");
|
|
8
|
+
function CoercePipe(options) {
|
|
9
|
+
const { name,
|
|
10
|
+
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
|
11
|
+
tsMorphTransform = () => {
|
|
12
|
+
}, pure, valueType = 'any', } = options;
|
|
13
|
+
const className = (0, utilities_1.classify)((0, utilities_1.CoerceSuffix)(name, 'Pipe'));
|
|
14
|
+
const moduleClassName = (0, utilities_1.classify)((0, utilities_1.CoerceSuffix)(name, 'PipeModule'));
|
|
15
|
+
const fileName = (0, utilities_1.CoerceSuffix)(name, '.pipe.ts');
|
|
16
|
+
return (0, ts_morph_transform_1.TsMorphAngularProjectTransformRule)(options, (project) => {
|
|
17
|
+
const sourceFile = (0, ts_morph_1.CoerceSourceFile)(project, fileName);
|
|
18
|
+
const classDeclaration = (0, ts_morph_1.CoerceClass)(sourceFile, className, {
|
|
19
|
+
isExported: true,
|
|
20
|
+
decorators: [
|
|
21
|
+
{
|
|
22
|
+
name: 'Pipe',
|
|
23
|
+
arguments: [ts_morph_2.Writers.object({
|
|
24
|
+
name: w => w.quote((0, utilities_1.camelize)(name)),
|
|
25
|
+
pure: pure ? 'true' : 'false',
|
|
26
|
+
standalone: 'true',
|
|
27
|
+
})],
|
|
28
|
+
},
|
|
29
|
+
],
|
|
30
|
+
implements: ['PipeTransform'],
|
|
31
|
+
methods: [
|
|
32
|
+
{
|
|
33
|
+
name: 'transform',
|
|
34
|
+
parameters: [{ name: 'value', type: valueType }],
|
|
35
|
+
statements: [
|
|
36
|
+
'return value;',
|
|
37
|
+
],
|
|
38
|
+
},
|
|
39
|
+
],
|
|
40
|
+
});
|
|
41
|
+
(0, ts_morph_1.CoerceClass)(sourceFile, moduleClassName, {
|
|
42
|
+
isExported: true,
|
|
43
|
+
decorators: [
|
|
44
|
+
{
|
|
45
|
+
name: 'NgModule',
|
|
46
|
+
arguments: [
|
|
47
|
+
ts_morph_2.Writers.object({
|
|
48
|
+
imports: `[${className}]`,
|
|
49
|
+
exports: `[${className}]`,
|
|
50
|
+
}),
|
|
51
|
+
],
|
|
52
|
+
},
|
|
53
|
+
],
|
|
54
|
+
});
|
|
55
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
56
|
+
moduleSpecifier: '@angular/core',
|
|
57
|
+
namedImports: ['NgModule', 'Pipe', 'PipeTransform'],
|
|
58
|
+
});
|
|
59
|
+
tsMorphTransform(project, sourceFile, classDeclaration);
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
exports.CoercePipe = CoercePipe;
|
|
63
|
+
//# sourceMappingURL=coerce-pipe.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"coerce-pipe.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-pipe.ts"],"names":[],"mappings":";;;AAAA,6CAIwB;AACxB,+CAIyB;AAEzB,uCAKkB;AAClB,8DAA2E;AAU3E,SAAgB,UAAU,CAAC,OAA0B;IAEnD,MAAM,EACE,IAAI;IACJ,gEAAgE;IAChE,gBAAgB,GAAG,GAAG,EAAE;IACxB,CAAC,EACD,IAAI,EACJ,SAAS,GAAU,KAAK,GACzB,GAAiB,OAAO,CAAC;IAChC,MAAM,SAAS,GAAS,IAAA,oBAAQ,EAAC,IAAA,wBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7D,MAAM,eAAe,GAAG,IAAA,oBAAQ,EAAC,IAAA,wBAAY,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;IACnE,MAAM,QAAQ,GAAU,IAAA,wBAAY,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACvD,OAAO,IAAA,uDAAkC,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE;QAE7D,MAAM,UAAU,GAAG,IAAA,2BAAgB,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAEvD,MAAM,gBAAgB,GAAG,IAAA,sBAAW,EAAC,UAAU,EAAE,SAAS,EAAE;YAC1D,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,MAAM;oBACZ,SAAS,EAAE,CAAE,kBAAO,CAAC,MAAM,CAAC;4BAC1B,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAA,oBAAQ,EAAC,IAAI,CAAC,CAAC;4BAClC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;4BAC7B,UAAU,EAAE,MAAM;yBACnB,CAAC,CAAE;iBACL;aACF;YACD,UAAU,EAAE,CAAE,eAAe,CAAE;YAC/B,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,WAAW;oBACjB,UAAU,EAAE,CAAE,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAC,CAAE;oBAChD,UAAU,EAAE;wBACV,eAAe;qBAChB;iBACF;aACF;SACF,CAAC,CAAC;QAEH,IAAA,sBAAW,EAAC,UAAU,EAAE,eAAe,EAAE;YACvC,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,UAAU;oBAChB,SAAS,EAAE;wBACT,kBAAO,CAAC,MAAM,CAAC;4BACb,OAAO,EAAE,IAAK,SAAU,GAAG;4BAC3B,OAAO,EAAE,IAAK,SAAU,GAAG;yBAC5B,CAAC;qBACH;iBACF;aACF;SACF,CAAC,CAAC;QACH,IAAA,wBAAa,EAAC,UAAU,EAAE;YACxB,eAAe,EAAE,eAAe;YAChC,YAAY,EAAE,CAAE,UAAU,EAAE,MAAM,EAAE,eAAe,CAAE;SACtD,CAAC,CAAC;QACH,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAG1D,CAAC,CAAC,CAAC;AACL,CAAC;AA/DD,gCA+DC"}
|
|
@@ -4,6 +4,7 @@ exports.CoerceGetByIdOperation = exports.BuiltGetByIdDtoDataMapperImplementation
|
|
|
4
4
|
const utilities_1 = require("@rxap/utilities");
|
|
5
5
|
const ts_morph_1 = require("ts-morph");
|
|
6
6
|
const coerce_get_operation_1 = require("./coerce-get-operation");
|
|
7
|
+
const dto_class_property_1 = require("./dto-class-property");
|
|
7
8
|
function BuildUpstreamGetByIdParametersImplementation(classDeclaration, moduleSourceFile, dto, options) {
|
|
8
9
|
return () => {
|
|
9
10
|
const { idProperty } = options;
|
|
@@ -11,27 +12,44 @@ function BuildUpstreamGetByIdParametersImplementation(classDeclaration, moduleSo
|
|
|
11
12
|
};
|
|
12
13
|
}
|
|
13
14
|
exports.BuildUpstreamGetByIdParametersImplementation = BuildUpstreamGetByIdParametersImplementation;
|
|
15
|
+
function UpstreamMapper(sourceProperty, propertyList, idProperty) {
|
|
16
|
+
var _a;
|
|
17
|
+
const mapper = {};
|
|
18
|
+
if (idProperty) {
|
|
19
|
+
mapper[idProperty.name] = idProperty.name;
|
|
20
|
+
}
|
|
21
|
+
for (const property of propertyList.filter(p => !idProperty || p.name !== idProperty.name).map(p => (0, dto_class_property_1.NormalizeDataClassProperty)(p))) {
|
|
22
|
+
mapper[property.name] = `${sourceProperty}.${(_a = property.source) !== null && _a !== void 0 ? _a : property.name}`;
|
|
23
|
+
if (property.isType) {
|
|
24
|
+
// property is a complex object
|
|
25
|
+
if (property.isArray) {
|
|
26
|
+
mapper[property.name] = w => {
|
|
27
|
+
var _a;
|
|
28
|
+
w.write(`${sourceProperty}.${(_a = property.source) !== null && _a !== void 0 ? _a : property.name}.map(item => (`);
|
|
29
|
+
ts_morph_1.Writers.object(UpstreamMapper('item', property.memberList))(w);
|
|
30
|
+
w.write('))');
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
mapper[property.name] = ts_morph_1.Writers.object(UpstreamMapper(mapper[property.name], property.memberList));
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
return mapper;
|
|
39
|
+
}
|
|
14
40
|
function BuiltGetByIdDtoDataMapperImplementation(classDeclaration, moduleSourceFile, dto, options) {
|
|
15
41
|
const { propertyList = [], upstream, isArray, idProperty, } = options;
|
|
16
42
|
return () => {
|
|
17
|
-
var _a;
|
|
18
43
|
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
44
|
if (isArray) {
|
|
27
45
|
return w => {
|
|
28
46
|
w.write('data.map(item => (');
|
|
29
|
-
ts_morph_1.Writers.object(
|
|
47
|
+
ts_morph_1.Writers.object(UpstreamMapper('data', propertyList, idProperty))(w);
|
|
30
48
|
w.write('))');
|
|
31
49
|
};
|
|
32
50
|
}
|
|
33
51
|
else {
|
|
34
|
-
return ts_morph_1.Writers.object(
|
|
52
|
+
return ts_morph_1.Writers.object(UpstreamMapper('data', propertyList, idProperty));
|
|
35
53
|
}
|
|
36
54
|
}
|
|
37
55
|
else {
|
|
@@ -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":";;;AACA,+CAAmD;AACnD,uCAKkB;AAElB,iEAGgC;
|
|
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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"}
|
|
@@ -114,7 +114,7 @@ function CoerceToPageDtoMethod(sourceFile, classDeclaration, pageClassName, rowC
|
|
|
114
114
|
}
|
|
115
115
|
exports.CoerceToPageDtoMethod = CoerceToPageDtoMethod;
|
|
116
116
|
function CoerceGetPageDataMethod(sourceFile, classDeclaration, moduleSourceFile, options) {
|
|
117
|
-
var _a, _b, _c, _d, _e, _f, _g
|
|
117
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
118
118
|
const { upstream } = options;
|
|
119
119
|
const statements = [];
|
|
120
120
|
if (upstream && (0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
|
|
@@ -139,16 +139,34 @@ function CoerceGetPageDataMethod(sourceFile, classDeclaration, moduleSourceFile,
|
|
|
139
139
|
moduleSpecifier: '@nestjs/common',
|
|
140
140
|
},
|
|
141
141
|
]);
|
|
142
|
+
let pageIndex = 'pageIndex';
|
|
143
|
+
let pageSize = 'pageSize';
|
|
144
|
+
let sortBy = 'sortBy';
|
|
145
|
+
let sortDirection = 'sortDirection';
|
|
146
|
+
let filter = null;
|
|
147
|
+
let list = 'list';
|
|
148
|
+
let total = 'total';
|
|
149
|
+
const { mapper } = upstream;
|
|
150
|
+
if (mapper && (0, ts_morph_1.IsNormalizedPagedRequestMapper)(mapper)) {
|
|
151
|
+
pageIndex = (_a = mapper.pageIndex) !== null && _a !== void 0 ? _a : pageIndex;
|
|
152
|
+
pageSize = (_b = mapper.pageSize) !== null && _b !== void 0 ? _b : pageSize;
|
|
153
|
+
sortBy = (_c = mapper.sortBy) !== null && _c !== void 0 ? _c : sortBy;
|
|
154
|
+
sortDirection = (_d = mapper.sortDirection) !== null && _d !== void 0 ? _d : sortDirection;
|
|
155
|
+
filter = (_e = mapper.filter) !== null && _e !== void 0 ? _e : filter;
|
|
156
|
+
list = (_f = mapper.list) !== null && _f !== void 0 ? _f : list;
|
|
157
|
+
total = (_g = mapper.total) !== null && _g !== void 0 ? _g : total;
|
|
158
|
+
}
|
|
142
159
|
statements.push(`const response = await this.${memberName}.execute({
|
|
143
160
|
parameters: {
|
|
144
|
-
${
|
|
145
|
-
${
|
|
146
|
-
${
|
|
147
|
-
${
|
|
148
|
-
filter: ${
|
|
161
|
+
${pageIndex}: pageIndex,
|
|
162
|
+
${pageSize}: pageSize,
|
|
163
|
+
${sortBy}: sortBy,
|
|
164
|
+
${sortDirection}: sortDirection,
|
|
165
|
+
filter: ${filter ?
|
|
166
|
+
`filter.map((item) => \`\${ item.column }${filter.eq}\${ item.filter }\`).join('${filter.join}')` :
|
|
149
167
|
'filter'},
|
|
150
168
|
},
|
|
151
|
-
});`, 'return {', ` list: response.${
|
|
169
|
+
});`, 'return {', ` list: response.${list} ?? [],`, ` total: response.${total} ?? 0,`, '};');
|
|
152
170
|
}
|
|
153
171
|
else {
|
|
154
172
|
statements.push(`const response = await ((() => { throw new NotImplementedException(); })() as any).execute({
|
|
@@ -202,11 +220,16 @@ function CoerceGetPageDataMethod(sourceFile, classDeclaration, moduleSourceFile,
|
|
|
202
220
|
}
|
|
203
221
|
exports.CoerceGetPageDataMethod = CoerceGetPageDataMethod;
|
|
204
222
|
function GetResponseTypeFromUpstream(upstream) {
|
|
205
|
-
var _a
|
|
223
|
+
var _a;
|
|
206
224
|
if ((0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
|
|
225
|
+
const { mapper } = upstream;
|
|
226
|
+
let list = 'list';
|
|
227
|
+
if (mapper && (0, ts_morph_1.IsNormalizedPagedRequestMapper)(mapper)) {
|
|
228
|
+
list = (_a = mapper.list) !== null && _a !== void 0 ? _a : list;
|
|
229
|
+
}
|
|
207
230
|
const className = (0, ts_morph_1.OperationIdToResponseClassName)(upstream.operationId);
|
|
208
231
|
return {
|
|
209
|
-
name: `${className}['${
|
|
232
|
+
name: `${className}['${list}'][number]`,
|
|
210
233
|
namedImport: className,
|
|
211
234
|
moduleSpecifier: (0, ts_morph_1.OperationIdToResponseClassImportPath)(upstream.operationId, upstream.scope),
|
|
212
235
|
};
|
|
@@ -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,qEAAsD;AACtD,
|
|
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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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Rule } from '@angular-devkit/schematics';
|
|
2
|
-
import {
|
|
2
|
+
import { NormalizedUpstreamOptions } from '@rxap/ts-morph';
|
|
3
3
|
import { TsMorphNestProjectTransformOptions } from '@rxap/workspace-ts-morph';
|
|
4
4
|
import { ClassDeclaration, Project, SourceFile, WriterFunction } from 'ts-morph';
|
|
5
5
|
import { OperationOptions, OperationParameter } from './add-operation-to-controller';
|
|
@@ -28,14 +28,14 @@ export interface CoerceOperationOptions<Options = Record<string, any>> extends T
|
|
|
28
28
|
buildUpstreamGetDataImplementation?: (classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, dto: CoerceDtoClassOutput | null, options: Readonly<CoerceOperationOptions & Options>) => TransformOperation<void>;
|
|
29
29
|
coerceOperationDtoClass?: (classDeclaration: ClassDeclaration, controllerName: string, moduleSourceFile: SourceFile, options: Readonly<CoerceOperationOptions & Options>) => CoerceDtoClassOutput | null;
|
|
30
30
|
buildOperationDtoClassName?: (controllerName: string, options: Readonly<Pick<CoerceOperationOptions, 'dtoClassNameSuffix' | 'dtoClassName'>>) => string;
|
|
31
|
-
upstream?:
|
|
31
|
+
upstream?: NormalizedUpstreamOptions | null;
|
|
32
32
|
propertyList?: DtoClassProperty[];
|
|
33
33
|
isArray?: boolean;
|
|
34
34
|
isReturnVoid?: boolean;
|
|
35
35
|
dtoClassNameSuffix?: string;
|
|
36
36
|
dtoClassName?: string;
|
|
37
37
|
}
|
|
38
|
-
export declare function CoerceUpstreamBasicOperationImplementation(classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, upstream:
|
|
38
|
+
export declare function CoerceUpstreamBasicOperationImplementation(classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, upstream: NormalizedUpstreamOptions): {
|
|
39
39
|
className: string;
|
|
40
40
|
memberName: string;
|
|
41
41
|
};
|
|
@@ -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,6CAUwB;AACxB,+CAOyB;AAEzB,+BAA4B;AAC5B,uCAOkB;AAClB,8DAAwE;AACxE,+EAIuC;AACvC,6EAAuE;AACvE,yDAG4B;AAC5B,qEAAgE;AAuEhE,SAAgB,0CAA0C,CACxD,gBAAkC,EAClC,gBAA4B,EAC5B,
|
|
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,55 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CoerceOptionsOperationRule = exports.BuildOptionsDtoDataMapperImplementation = void 0;
|
|
4
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
4
5
|
const utilities_1 = require("@rxap/utilities");
|
|
5
6
|
const coerce_operation_1 = require("./coerce-operation");
|
|
6
7
|
function BuildOptionsDtoDataMapperImplementation(classDeclaration, moduleSourceFile, dto, options) {
|
|
7
|
-
const { isArray, } = options;
|
|
8
|
+
const { isArray, upstream, } = options;
|
|
8
9
|
return () => {
|
|
10
|
+
var _a, _b, _c;
|
|
11
|
+
if (upstream) {
|
|
12
|
+
if ((0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
|
|
13
|
+
const { mapper } = upstream;
|
|
14
|
+
let toFunction = 'ToOptions';
|
|
15
|
+
let toValue = null;
|
|
16
|
+
let toDisplay = null;
|
|
17
|
+
if (mapper && (0, ts_morph_1.IsNormalizedOptionsRequestMapper)(mapper)) {
|
|
18
|
+
toFunction = (_a = mapper.toFunction) !== null && _a !== void 0 ? _a : toFunction;
|
|
19
|
+
toValue = (_b = mapper.toValue) !== null && _b !== void 0 ? _b : toValue;
|
|
20
|
+
toDisplay = (_c = mapper.toDisplay) !== null && _c !== void 0 ? _c : toDisplay;
|
|
21
|
+
}
|
|
22
|
+
const sourceFile = classDeclaration.getSourceFile();
|
|
23
|
+
switch (toFunction) {
|
|
24
|
+
case ts_morph_1.ToOptionsFunction.TO_OPTIONS:
|
|
25
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
26
|
+
namedImports: [ts_morph_1.ToOptionsFunction.TO_OPTIONS],
|
|
27
|
+
moduleSpecifier: '@rxap/utilities',
|
|
28
|
+
});
|
|
29
|
+
break;
|
|
30
|
+
case ts_morph_1.ToOptionsFunction.TO_OPTIONS_FROM_OBJECT:
|
|
31
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
32
|
+
namedImports: [ts_morph_1.ToOptionsFunction.TO_OPTIONS_FROM_OBJECT],
|
|
33
|
+
moduleSpecifier: '@rxap/utilities',
|
|
34
|
+
});
|
|
35
|
+
break;
|
|
36
|
+
}
|
|
37
|
+
return w => {
|
|
38
|
+
w.write(toFunction);
|
|
39
|
+
w.write('(data');
|
|
40
|
+
if (toValue) {
|
|
41
|
+
w.write(`, ${toValue}`);
|
|
42
|
+
}
|
|
43
|
+
if (toDisplay) {
|
|
44
|
+
if (!toValue) {
|
|
45
|
+
w.write(', undefined');
|
|
46
|
+
}
|
|
47
|
+
w.write(`, ${toDisplay}`);
|
|
48
|
+
}
|
|
49
|
+
w.write(')');
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
}
|
|
9
53
|
// TODO : implement the data mapper
|
|
10
54
|
return isArray ? '[]' : '{}';
|
|
11
55
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-options-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-options-operation.ts"],"names":[],"mappings":";;;AACA,+CAGyB;AAQzB,yDAI4B;AAO5B,SAAgB,uCAAuC,CACrD,gBAAkC,EAClC,gBAA4B,EAC5B,GAAgC,EAChC,OAAyC;IAEzC,MAAM,EACJ,OAAO,
|
|
1
|
+
{"version":3,"file":"coerce-options-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-options-operation.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,8 +10,16 @@ function BuildTableSelectValueResolveUpstreamGetParametersImplementation(classDe
|
|
|
10
10
|
const { upstream } = options;
|
|
11
11
|
if (upstream) {
|
|
12
12
|
if ((0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
const { mapper } = upstream;
|
|
14
|
+
let value = null;
|
|
15
|
+
if (mapper && (0, ts_morph_1.IsNormalizedResolveRequestMapper)(mapper)) {
|
|
16
|
+
value = (_a = mapper.value) !== null && _a !== void 0 ? _a : value;
|
|
17
|
+
}
|
|
18
|
+
if (value) {
|
|
19
|
+
return `{ parameters: { ${value}: value } }`;
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
return '{ parameters: { value } }';
|
|
15
23
|
}
|
|
16
24
|
}
|
|
17
25
|
return '{ value }';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-table-select-value-resolve-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-table-select-value-resolve-operation.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"coerce-table-select-value-resolve-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-table-select-value-resolve-operation.ts"],"names":[],"mappings":";;;AAAA,6CAMwB;AACxB,+CAAmD;AAOnD,yDAI4B;AAS5B,SAAgB,+DAA+D,CAClB,gBAAkC,EAClC,gBAA4B,EAC5B,GAAgC,EAChC,OAAkF;IAE7I,OAAO,GAAG,EAAE;;QACV,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAC7B,IAAI,QAAQ,EAAE;YACZ,IAAI,IAAA,6CAAkC,EAAC,QAAQ,CAAC,EAAE;gBAChD,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;gBAC5B,IAAI,KAAK,GAAkB,IAAI,CAAC;gBAChC,IAAI,MAAM,IAAI,IAAA,2CAAgC,EAAC,MAAM,CAAC,EAAE;oBACtD,KAAK,GAAG,MAAA,MAAM,CAAC,KAAK,mCAAI,KAAK,CAAC;iBAC/B;gBACD,IAAI,KAAK,EAAE;oBACT,OAAO,mBAAoB,KAAM,aAAa,CAAC;iBAChD;qBAAM;oBACL,OAAO,2BAA2B,CAAC;iBACpC;aACF;YACD,OAAO,WAAW,CAAC;SACpB;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;AACJ,CAAC;AAzBD,0IAyBC;AAED,SAAgB,0CAA0C,CAAC,OAAsD;IAC/G,MAAM,EACJ,wCAAwC,GAAG,+DAA+D,EAC1G,YAAY,GAAG,EAAE,EACjB,aAAa,EACb,kBAAkB,EAClB,gBAAgB,GAAG,IAAA,gCAAqB,EAAC,aAAa,CAAC,GACxD,GAAG,OAAO,CAAC;IAEZ,IAAA,4BAAgB,EAAC,YAAY,EAAE;wCAExB,gBAAgB,KACnB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,gBAAgB,CAAC,IAAI;wCAG1B,kBAAkB,KACrB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,kBAAkB,CAAC,IAAI;QAEjC,IAAA,gCAAqB,kCAChB,aAAa,KAChB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,aAAa,CAAC,IAAI,KACzB,QAAQ,CAAC;KACb,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAE9D,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,wCAAwC,IACxC,CAAC;AACL,CAAC;AA/BD,gGA+BC"}
|
|
@@ -3,9 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.NormalizeDataClassProperty = void 0;
|
|
4
4
|
const ts_morph_1 = require("@rxap/ts-morph");
|
|
5
5
|
function NormalizeDataClassProperty(property) {
|
|
6
|
-
var _a
|
|
6
|
+
var _a;
|
|
7
7
|
const { name, type, isArray, memberList, source, isOptional, } = (0, ts_morph_1.NormalizeDataProperty)(property);
|
|
8
|
-
let isType = (
|
|
8
|
+
let isType = (_a = property.isType) !== null && _a !== void 0 ? _a : false;
|
|
9
|
+
if ([ts_morph_1.TypeNames.Self, ts_morph_1.TypeNames.Deferred].includes(type.name)) {
|
|
10
|
+
isType = true;
|
|
11
|
+
}
|
|
9
12
|
switch (type.name) {
|
|
10
13
|
case 'IconConfig':
|
|
11
14
|
type.name = 'IconDto';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dto-class-property.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/dto-class-property.ts"],"names":[],"mappings":";;;AAAA,6CAKwB;AAcxB,SAAgB,0BAA0B,CAAC,QAA0B;;IACnE,MAAM,EACJ,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,UAAU,EACV,MAAM,EACN,UAAU,GACX,GAAG,IAAA,gCAAqB,EAAC,QAAQ,CAAC,CAAC;IACpC,IAAI,MAAM,GAAG,MAAA,
|
|
1
|
+
{"version":3,"file":"dto-class-property.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/dto-class-property.ts"],"names":[],"mappings":";;;AAAA,6CAKwB;AAcxB,SAAgB,0BAA0B,CAAC,QAA0B;;IACnE,MAAM,EACJ,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,UAAU,EACV,MAAM,EACN,UAAU,GACX,GAAG,IAAA,gCAAqB,EAAC,QAAQ,CAAC,CAAC;IACpC,IAAI,MAAM,GAAG,MAAA,QAAQ,CAAC,MAAM,mCAAI,KAAK,CAAC;IACtC,IAAK,CAAE,oBAAS,CAAC,IAAI,EAAE,oBAAS,CAAC,QAAQ,CAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC5E,MAAM,GAAG,IAAI,CAAC;KACf;IACD,QAAQ,IAAI,CAAC,IAAI,EAAE;QACjB,KAAK,YAAY;YACf,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;YACtB,IAAI,CAAC,eAAe,GAAG,gBAAgB,CAAC;YACxC,MAAM,GAAG,IAAI,CAAC;YACd,MAAM;KACT;IACD,OAAO;QACL,MAAM;QACN,UAAU;QACV,IAAI;QACJ,IAAI;QACJ,OAAO;QACP,MAAM;QACN,UAAU;KACX,CAAC;AACJ,CAAC;AA7BD,gEA6BC"}
|