@rxap/schematics-ts-morph 16.1.0-dev.1 → 16.1.0-dev.2
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 +9 -0
- package/README.md +1 -1
- package/package.json +3 -2
- package/src/index.d.ts +1 -0
- package/src/index.js +1 -0
- package/src/index.js.map +1 -1
- package/src/lib/angular/coerce-component.d.ts +5 -0
- package/src/lib/angular/coerce-component.js +55 -1
- package/src/lib/angular/coerce-component.js.map +1 -1
- package/src/lib/angular/coerce-table-data-source.js +1 -1
- package/src/lib/angular/coerce-table-data-source.js.map +1 -1
- package/src/lib/nest/coerce-get-children-operation.js +3 -6
- package/src/lib/nest/coerce-get-children-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-page-operation.d.ts +3 -2
- package/src/lib/nest/coerce-get-page-operation.js +51 -45
- package/src/lib/nest/coerce-get-page-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-root-operation.js +3 -6
- package/src/lib/nest/coerce-get-root-operation.js.map +1 -1
- package/src/lib/nest/coerce-page-dto-class.js +35 -6
- package/src/lib/nest/coerce-page-dto-class.js.map +1 -1
- package/src/lib/nest/table-query-list.d.ts +2 -0
- package/src/lib/nest/table-query-list.js +33 -0
- package/src/lib/nest/table-query-list.js.map +1 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,15 @@
|
|
|
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.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
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
- support custom handlebars partials and helpers ([c1aa756](https://gitlab.com/rxap/packages/commit/c1aa756389f84acbaaa7b5b9718d7e168aef8c7f))
|
|
11
|
+
- support handlebars for component generator ([5f1ef58](https://gitlab.com/rxap/packages/commit/5f1ef58f094282a7f67fcbaca65cbc847361c00a))
|
|
12
|
+
- support table parameters in tree tables ([bf8a676](https://gitlab.com/rxap/packages/commit/bf8a676790b9e9bf60ef290e1201a998fbdaffd0))
|
|
13
|
+
- support upstream configurations ([3c972cf](https://gitlab.com/rxap/packages/commit/3c972cfc1aea45d9cabca07f24f4627f4aff03aa))
|
|
14
|
+
|
|
6
15
|
# [16.1.0-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.1.0-dev.0...@rxap/schematics-ts-morph@16.1.0-dev.1) (2024-02-22)
|
|
7
16
|
|
|
8
17
|
### Bug Fixes
|
package/README.md
CHANGED
|
@@ -17,5 +17,5 @@ yarn add @rxap/schematics-ts-morph
|
|
|
17
17
|
```
|
|
18
18
|
**Install peer dependencies:**
|
|
19
19
|
```bash
|
|
20
|
-
yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-utilities@^16.0.1-dev.0 @rxap/ts-morph@^1.1.0-dev.1 @rxap/utilities@^16.1.0-dev.0 @rxap/workspace-ts-morph@^16.0.1 ts-morph@^18.0.0 tslib@2.6.2
|
|
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.1 @rxap/utilities@^16.1.0-dev.0 @rxap/workspace-ts-morph@^16.0.1 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.2",
|
|
3
3
|
"name": "@rxap/schematics-ts-morph",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
"@rxap/ts-morph": "^1.1.0-dev.1",
|
|
17
17
|
"@rxap/utilities": "^16.1.0-dev.0",
|
|
18
18
|
"@rxap/workspace-ts-morph": "^16.0.1",
|
|
19
|
+
"handlebars": "^4.7.7",
|
|
19
20
|
"ts-morph": "^18.0.0",
|
|
20
21
|
"tslib": "2.6.2",
|
|
21
22
|
"@rxap/node-utilities": "1.1.0",
|
|
@@ -68,7 +69,7 @@
|
|
|
68
69
|
"directory": "packages/schematic/ts-morph"
|
|
69
70
|
},
|
|
70
71
|
"type": "commonjs",
|
|
71
|
-
"gitHead": "
|
|
72
|
+
"gitHead": "58070f2586b30e6bb1a13247cef1330da97279a1",
|
|
72
73
|
"main": "./src/index.js",
|
|
73
74
|
"types": "./src/index.d.ts"
|
|
74
75
|
}
|
package/src/index.d.ts
CHANGED
|
@@ -52,6 +52,7 @@ export * from './lib/nest/operation-id-utilities';
|
|
|
52
52
|
export * from './lib/nest/project-utilities';
|
|
53
53
|
export * from './lib/nest/remove-nest-module-provider';
|
|
54
54
|
export * from './lib/nest/remove-nest-provider-to-array';
|
|
55
|
+
export * from './lib/nest/table-query-list';
|
|
55
56
|
export * from './lib/angular/add-component-animations';
|
|
56
57
|
export * from './lib/angular/add-component-fake-provider';
|
|
57
58
|
export * from './lib/angular/add-component-import';
|
package/src/index.js
CHANGED
|
@@ -60,6 +60,7 @@ tslib_1.__exportStar(require("./lib/nest/operation-id-utilities"), exports);
|
|
|
60
60
|
tslib_1.__exportStar(require("./lib/nest/project-utilities"), exports);
|
|
61
61
|
tslib_1.__exportStar(require("./lib/nest/remove-nest-module-provider"), exports);
|
|
62
62
|
tslib_1.__exportStar(require("./lib/nest/remove-nest-provider-to-array"), exports);
|
|
63
|
+
tslib_1.__exportStar(require("./lib/nest/table-query-list"), exports);
|
|
63
64
|
// endregion
|
|
64
65
|
// region angular
|
|
65
66
|
tslib_1.__exportStar(require("./lib/angular/add-component-animations"), exports);
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/schematic/ts-morph/src/index.ts"],"names":[],"mappings":";;;AAAA,eAAe;AACf,8EAAoD;AACpD,YAAY;AAEZ,kBAAkB;AAClB,gFAAsD;AACtD,qFAA2D;AAC3D,+EAAqD;AACrD,0EAAgD;AAChD,yEAA+C;AAC/C,wEAA8C;AAC9C,0EAAgD;AAChD,sFAA4D;AAC5D,2EAAiD;AACjD,2EAAiD;AACjD,uEAA6C;AAC7C,oEAA0C;AAC1C,YAAY;AAEZ,cAAc;AACd,yEAA+C;AAC/C,gFAAsD;AACtD,4EAAkD;AAClD,8EAAoD;AACpD,mFAAyD;AACzD,gFAAsD;AACtD,iFAAuD;AACvD,yEAA+C;AAC/C,0EAAgD;AAChD,gFAAsD;AACtD,sEAA4C;AAC5C,kFAAwD;AACxD,gFAAsD;AACtD,mFAAyD;AACzD,oFAA0D;AAC1D,+EAAqD;AACrD,+EAAqD;AACrD,4EAAkD;AAClD,wEAA8C;AAC9C,iFAAuD;AACvD,sEAA4C;AAC5C,8EAAoD;AACpD,2EAAiD;AACjD,0EAAgD;AAChD,uFAA6D;AAC7D,mFAAyD;AACzD,iGAAuE;AACvE,2EAAiD;AACjD,sEAA4C;AAC5C,kFAAwD;AACxD,kFAAwD;AACxD,8EAAoD;AACpD,yEAA+C;AAC/C,2EAAiD;AACjD,qEAA2C;AAC3C,0EAAgD;AAChD,0EAAgD;AAChD,4EAAkD;AAClD,uEAA6C;AAC7C,iFAAuD;AACvD,mFAAyD;AACzD,YAAY;AAEZ,iBAAiB;AACjB,iFAAuD;AACvD,oFAA0D;AAC1D,6EAAmD;AACnD,4EAAkD;AAClD,+EAAqD;AACrD,8EAAoD;AACpD,iFAAuD;AACvD,6EAAmD;AACnD,6EAAmD;AACnD,+EAAqD;AACrD,gFAAsD;AACtD,mFAAyD;AACzD,+EAAqD;AACrD,yEAA+C;AAC/C,iFAAuD;AACvD,gFAAsD;AACtD,6FAAmE;AACnE,mFAAyD;AACzD,qFAA2D;AAC3D,uFAA6D;AAC7D,uFAA6D;AAC7D,oFAA0D;AAC1D,+EAAqD;AACrD,6EAAmD;AACnD,mFAAyD;AACzD,iFAAuD;AACvD,4EAAkD;AAClD,uFAA6D;AAC7D,qFAA2D;AAC3D,sFAA4D;AAC5D,mFAAyD;AACzD,+EAAqD;AACrD,yFAA+D;AAC/D,2FAAiE;AACjE,kFAAwD;AACxD,qFAA2D;AAC3D,4EAAkD;AAClD,iFAAuD;AACvD,0FAAgE;AAChE,2FAAiE;AACjE,iGAAuE;AACvE,6GAAmF;AACnF,yGAA+E;AAC/E,uFAA6D;AAC7D,0FAAgE;AAChE,mFAAyD;AACzD,4EAAkD;AAClD,kFAAwD;AACxD,4EAAkD;AAClD,qFAA2D;AAC3D,qFAA2D;AAC3D,gFAAsD;AACtD,yEAA+C;AAC/C,gFAAsD;AACtD,sEAA4C;AAC5C,6EAAmD;AACnD,4EAAkD;AAClD,4EAAkD;AAClD,8DAAoC;AACpC,YAAY;AAEZ,UAAU;AACV,iEAAuC;AACvC,wDAA8B;AAC9B,kEAAwC;AACxC,iEAAuC;AACvC,sEAA4C;AAC5C,6DAAmC;AACnC,2EAAiD;AACjD,sEAA4C;AAC5C,4DAAkC;AAClC,yEAA+C;AAC/C,oEAA0C;AAC1C,6DAAmC;AACnC,oEAA0C;AAC1C,mEAAyC;AACzC,4EAAkD;AAClD,oEAA0C;AAC1C,sEAA4C;AAC5C,8EAAoD;AACpD,6FAAmE;AACnE,+EAAqD;AACrD,yEAA+C;AAC/C,4EAAkD;AAClD,uEAA6C;AAC7C,iEAAuC;AACvC,oEAA0C;AAC1C,mEAAyC;AACzC,gEAAsC;AACtC,iEAAuC;AACvC,mEAAyC;AACzC,YAAY"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/schematic/ts-morph/src/index.ts"],"names":[],"mappings":";;;AAAA,eAAe;AACf,8EAAoD;AACpD,YAAY;AAEZ,kBAAkB;AAClB,gFAAsD;AACtD,qFAA2D;AAC3D,+EAAqD;AACrD,0EAAgD;AAChD,yEAA+C;AAC/C,wEAA8C;AAC9C,0EAAgD;AAChD,sFAA4D;AAC5D,2EAAiD;AACjD,2EAAiD;AACjD,uEAA6C;AAC7C,oEAA0C;AAC1C,YAAY;AAEZ,cAAc;AACd,yEAA+C;AAC/C,gFAAsD;AACtD,4EAAkD;AAClD,8EAAoD;AACpD,mFAAyD;AACzD,gFAAsD;AACtD,iFAAuD;AACvD,yEAA+C;AAC/C,0EAAgD;AAChD,gFAAsD;AACtD,sEAA4C;AAC5C,kFAAwD;AACxD,gFAAsD;AACtD,mFAAyD;AACzD,oFAA0D;AAC1D,+EAAqD;AACrD,+EAAqD;AACrD,4EAAkD;AAClD,wEAA8C;AAC9C,iFAAuD;AACvD,sEAA4C;AAC5C,8EAAoD;AACpD,2EAAiD;AACjD,0EAAgD;AAChD,uFAA6D;AAC7D,mFAAyD;AACzD,iGAAuE;AACvE,2EAAiD;AACjD,sEAA4C;AAC5C,kFAAwD;AACxD,kFAAwD;AACxD,8EAAoD;AACpD,yEAA+C;AAC/C,2EAAiD;AACjD,qEAA2C;AAC3C,0EAAgD;AAChD,0EAAgD;AAChD,4EAAkD;AAClD,uEAA6C;AAC7C,iFAAuD;AACvD,mFAAyD;AACzD,sEAA4C;AAC5C,YAAY;AAEZ,iBAAiB;AACjB,iFAAuD;AACvD,oFAA0D;AAC1D,6EAAmD;AACnD,4EAAkD;AAClD,+EAAqD;AACrD,8EAAoD;AACpD,iFAAuD;AACvD,6EAAmD;AACnD,6EAAmD;AACnD,+EAAqD;AACrD,gFAAsD;AACtD,mFAAyD;AACzD,+EAAqD;AACrD,yEAA+C;AAC/C,iFAAuD;AACvD,gFAAsD;AACtD,6FAAmE;AACnE,mFAAyD;AACzD,qFAA2D;AAC3D,uFAA6D;AAC7D,uFAA6D;AAC7D,oFAA0D;AAC1D,+EAAqD;AACrD,6EAAmD;AACnD,mFAAyD;AACzD,iFAAuD;AACvD,4EAAkD;AAClD,uFAA6D;AAC7D,qFAA2D;AAC3D,sFAA4D;AAC5D,mFAAyD;AACzD,+EAAqD;AACrD,yFAA+D;AAC/D,2FAAiE;AACjE,kFAAwD;AACxD,qFAA2D;AAC3D,4EAAkD;AAClD,iFAAuD;AACvD,0FAAgE;AAChE,2FAAiE;AACjE,iGAAuE;AACvE,6GAAmF;AACnF,yGAA+E;AAC/E,uFAA6D;AAC7D,0FAAgE;AAChE,mFAAyD;AACzD,4EAAkD;AAClD,kFAAwD;AACxD,4EAAkD;AAClD,qFAA2D;AAC3D,qFAA2D;AAC3D,gFAAsD;AACtD,yEAA+C;AAC/C,gFAAsD;AACtD,sEAA4C;AAC5C,6EAAmD;AACnD,4EAAkD;AAClD,4EAAkD;AAClD,8DAAoC;AACpC,YAAY;AAEZ,UAAU;AACV,iEAAuC;AACvC,wDAA8B;AAC9B,kEAAwC;AACxC,iEAAuC;AACvC,sEAA4C;AAC5C,6DAAmC;AACnC,2EAAiD;AACjD,sEAA4C;AAC5C,4DAAkC;AAClC,yEAA+C;AAC/C,oEAA0C;AAC1C,6DAAmC;AACnC,oEAA0C;AAC1C,mEAAyC;AACzC,4EAAkD;AAClD,oEAA0C;AAC1C,sEAA4C;AAC5C,8EAAoD;AACpD,6FAAmE;AACnE,+EAAqD;AACrD,yEAA+C;AAC/C,4EAAkD;AAClD,uEAA6C;AAC7C,iEAAuC;AACvC,oEAA0C;AAC1C,mEAAyC;AACzC,gEAAsC;AACtC,iEAAuC;AACvC,mEAAyC;AACzC,YAAY"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Rule } from '@angular-devkit/schematics';
|
|
2
2
|
import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
|
|
3
3
|
import { TsMorphAngularProjectTransformOptions } from '../ts-morph-transform';
|
|
4
|
+
import Handlebars from 'handlebars';
|
|
4
5
|
export interface TemplateOptions {
|
|
5
6
|
url?: string;
|
|
6
7
|
options?: Record<string, unknown> | object;
|
|
@@ -11,5 +12,9 @@ export interface CoerceComponentOptions extends TsMorphAngularProjectTransformOp
|
|
|
11
12
|
template?: TemplateOptions;
|
|
12
13
|
overwrite?: boolean | string[];
|
|
13
14
|
tsMorphTransform?: (project: Project, [componentSourceFile]: [SourceFile], [componentClass]: [ClassDeclaration], options: CoerceComponentOptions) => void;
|
|
15
|
+
handlebars?: {
|
|
16
|
+
helpers?: Record<string, Handlebars.HelperDelegate>;
|
|
17
|
+
partials?: Record<string, Handlebars.TemplateDelegate>;
|
|
18
|
+
};
|
|
14
19
|
}
|
|
15
20
|
export declare function CoerceComponentRule(options: Readonly<CoerceComponentOptions>): Rule;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CoerceComponentRule = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
4
5
|
const core_1 = require("@angular-devkit/core");
|
|
5
6
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
6
7
|
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
@@ -9,8 +10,52 @@ const path_1 = require("path");
|
|
|
9
10
|
const ts_morph_transform_1 = require("../ts-morph-transform");
|
|
10
11
|
const build_angular_base_path_1 = require("./build-angular-base-path");
|
|
11
12
|
const has_component_1 = require("./has-component");
|
|
13
|
+
const handlebars_1 = tslib_1.__importDefault(require("handlebars"));
|
|
14
|
+
function applyContentHandlebars(options) {
|
|
15
|
+
return (entry) => {
|
|
16
|
+
const { path, content } = entry;
|
|
17
|
+
handlebars_1.default.registerHelper('compile', (context, input) => {
|
|
18
|
+
return new handlebars_1.default.SafeString(context(input.hash));
|
|
19
|
+
});
|
|
20
|
+
handlebars_1.default.registerHelper('indent', (text, spaces) => {
|
|
21
|
+
const indent = new Array(spaces + 1).join(' ');
|
|
22
|
+
if (text instanceof handlebars_1.default.SafeString) {
|
|
23
|
+
text = text.toString();
|
|
24
|
+
}
|
|
25
|
+
return new handlebars_1.default.SafeString(text.split('\n').map((line, index) => {
|
|
26
|
+
return index === 0 ? line : indent + line;
|
|
27
|
+
}).join('\n'));
|
|
28
|
+
});
|
|
29
|
+
try {
|
|
30
|
+
const template = handlebars_1.default.compile(content.toString());
|
|
31
|
+
return {
|
|
32
|
+
path,
|
|
33
|
+
content: Buffer.from(template(options)),
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
catch (e) {
|
|
37
|
+
if (e.code === 'ERR_ENCODING_INVALID_ENCODED_DATA') {
|
|
38
|
+
return entry;
|
|
39
|
+
}
|
|
40
|
+
throw e;
|
|
41
|
+
}
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
function applyHandlebars(options) {
|
|
45
|
+
return (0, schematics_1.forEach)((0, schematics_1.when)((path) => path.endsWith('.hbs'), (0, schematics_1.composeFileOperators)([
|
|
46
|
+
applyContentHandlebars(options),
|
|
47
|
+
// See above for this weird cast.
|
|
48
|
+
(0, schematics_1.applyPathTemplate)(options),
|
|
49
|
+
(entry) => {
|
|
50
|
+
return {
|
|
51
|
+
content: entry.content,
|
|
52
|
+
path: entry.path.replace(/\.hbs$/, ''),
|
|
53
|
+
};
|
|
54
|
+
},
|
|
55
|
+
])));
|
|
56
|
+
}
|
|
12
57
|
function CoerceComponentRule(options) {
|
|
13
|
-
let { tsMorphTransform, template, project, feature, directory, name, flat, overwrite, } = options;
|
|
58
|
+
let { tsMorphTransform, template, project, feature, directory, name, flat, overwrite, handlebars } = options;
|
|
14
59
|
overwrite !== null && overwrite !== void 0 ? overwrite : (overwrite = false);
|
|
15
60
|
directory !== null && directory !== void 0 ? directory : (directory = '');
|
|
16
61
|
flat !== null && flat !== void 0 ? flat : (flat = directory.endsWith(name));
|
|
@@ -37,11 +82,20 @@ function CoerceComponentRule(options) {
|
|
|
37
82
|
});
|
|
38
83
|
}
|
|
39
84
|
if (template && (overwrite === true || (Array.isArray(overwrite) && (overwrite === null || overwrite === void 0 ? void 0 : overwrite.includes('template'))) || !hasComponent)) {
|
|
85
|
+
if (handlebars) {
|
|
86
|
+
if (handlebars.helpers) {
|
|
87
|
+
handlebars_1.default.registerHelper(handlebars.helpers);
|
|
88
|
+
}
|
|
89
|
+
if (handlebars.partials) {
|
|
90
|
+
handlebars_1.default.registerPartial(handlebars.partials);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
40
93
|
(_a = template.url) !== null && _a !== void 0 ? _a : (template.url = './files/component');
|
|
41
94
|
const templateOptions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, core_1.strings), { prefix, scope: `${prefix}` }), options), ((_b = template === null || template === void 0 ? void 0 : template.options) !== null && _b !== void 0 ? _b : {})), { componentName: name });
|
|
42
95
|
(_c = templateOptions['prefix']) !== null && _c !== void 0 ? _c : (templateOptions['prefix'] = (0, schematics_utilities_1.GetProjectPrefix)(tree, options.project));
|
|
43
96
|
rules.push(() => console.log(`Template '${template.url}' will be used to modify the component.`), () => console.log(`Template options: ${JSON.stringify(templateOptions)}`), (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)(template.url), [
|
|
44
97
|
(0, schematics_1.applyTemplates)(templateOptions),
|
|
98
|
+
applyHandlebars(templateOptions),
|
|
45
99
|
(0, schematics_1.move)(flat ? basePath : (0, path_1.join)(basePath, name)),
|
|
46
100
|
]), schematics_1.MergeStrategy.Overwrite));
|
|
47
101
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-component.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-component.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"coerce-component.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-component.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ function CoerceTableDataSourceRule(options) {
|
|
|
21
21
|
const [constructorDeclaration] = (0, coerce_class_constructor_1.CoerceClassConstructor)(classDeclaration);
|
|
22
22
|
constructorDeclaration.set({
|
|
23
23
|
statements: [
|
|
24
|
-
'super(new GetPageAdapterRemoteMethod(getByFilter));',
|
|
24
|
+
'super(new GetPageAdapterRemoteMethod(getByFilter as any));',
|
|
25
25
|
],
|
|
26
26
|
});
|
|
27
27
|
const propertyDeclaration = (0, coerce_parameter_declaration_1.CoerceParameterDeclaration)(constructorDeclaration, 'getByFilter').set({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-table-data-source.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-table-data-source.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAM1D,0EAAqE;AACrE,2EAGwC;AACxC,mEAA+D;AAC/D,+DAA2D;AAC3D,2FAAsF;AACtF,yEAGoC;AAUpC,SAAgB,yBAAyB,CAAC,OAA+C;IACvF,IAAI,EACF,IAAI,EACJ,WAAW,EACX,KAAK,GACN,GAAG,OAAO,CAAC;IACZ,IAAI,GAAG,IAAA,mCAAY,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEpC,OAAO,IAAA,gDAAqB,kCACvB,OAAO,KACV,aAAa,EAAE,CACb,UAAsB,EACtB,gBAAkC,EAClC,OAAqC,EACrC,EAAE;YACF,gBAAgB,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC;YACtD,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,eAAe,EAAE,yBAAyB;gBAC1C,YAAY,EAAE,CAAE,wBAAwB,CAAE;aAC3C,CAAC,CAAC;QACL,CAAC,EACD,gBAAgB,EAAE,CAAC,OAAgB,EAAE,UAAsB,EAAE,gBAAkC,EAAE,EAAE;YACjG,MAAM,CAAE,sBAAsB,CAAE,GAAG,IAAA,iDAAsB,EAAC,gBAAgB,CAAC,CAAC;YAE5E,sBAAsB,CAAC,GAAG,CAAC;gBACzB,UAAU,EAAE;oBACV,
|
|
1
|
+
{"version":3,"file":"coerce-table-data-source.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-table-data-source.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAM1D,0EAAqE;AACrE,2EAGwC;AACxC,mEAA+D;AAC/D,+DAA2D;AAC3D,2FAAsF;AACtF,yEAGoC;AAUpC,SAAgB,yBAAyB,CAAC,OAA+C;IACvF,IAAI,EACF,IAAI,EACJ,WAAW,EACX,KAAK,GACN,GAAG,OAAO,CAAC;IACZ,IAAI,GAAG,IAAA,mCAAY,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEpC,OAAO,IAAA,gDAAqB,kCACvB,OAAO,KACV,aAAa,EAAE,CACb,UAAsB,EACtB,gBAAkC,EAClC,OAAqC,EACrC,EAAE;YACF,gBAAgB,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC;YACtD,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,eAAe,EAAE,yBAAyB;gBAC1C,YAAY,EAAE,CAAE,wBAAwB,CAAE;aAC3C,CAAC,CAAC;QACL,CAAC,EACD,gBAAgB,EAAE,CAAC,OAAgB,EAAE,UAAsB,EAAE,gBAAkC,EAAE,EAAE;YACjG,MAAM,CAAE,sBAAsB,CAAE,GAAG,IAAA,iDAAsB,EAAC,gBAAgB,CAAC,CAAC;YAE5E,sBAAsB,CAAC,GAAG,CAAC;gBACzB,UAAU,EAAE;oBACV,4DAA4D;iBAC7D;aACF,CAAC,CAAC;YAEH,MAAM,mBAAmB,GAAG,IAAA,yDAA0B,EAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC;gBAChG,IAAI,EAAE,IAAA,+CAAsB,EAAC,WAAW,CAAC;aAC1C,CAAC,CAAC;YAEH,IAAA,kCAAe,EAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC;gBACjD,SAAS,EAAE,CAAE,IAAA,+CAAsB,EAAC,WAAW,CAAC,CAAE;aACnD,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB;oBACE,eAAe,EAAE,eAAe;oBAChC,YAAY,EAAE,CAAE,QAAQ,CAAE;iBAC3B;gBACD;oBACE,eAAe,EAAE,IAAA,qDAA4B,EAAC,WAAW,EAAE,KAAK,CAAC;oBACjE,YAAY,EAAE,CAAE,IAAA,+CAAsB,EAAC,WAAW,CAAC,CAAE;iBACtD;gBACD;oBACE,eAAe,EAAE,8BAA8B;oBAC/C,YAAY,EAAE,CAAE,4BAA4B,CAAE;iBAC/C;aACF,CAAC,CAAC;QAEL,CAAC,EACD,IAAI,IACJ,CAAC;AAEL,CAAC;AAzDD,8DAyDC"}
|
|
@@ -6,6 +6,7 @@ const utilities_1 = require("@rxap/utilities");
|
|
|
6
6
|
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
7
7
|
const coerce_dto_class_1 = require("./coerce-dto-class");
|
|
8
8
|
const coerce_operation_1 = require("./coerce-operation");
|
|
9
|
+
const table_query_list_1 = require("./table-query-list");
|
|
9
10
|
function CoerceGetChildrenOperation(options) {
|
|
10
11
|
const { tsMorphTransform = utilities_1.noop, paramList = [], propertyList = [], } = options;
|
|
11
12
|
let { controllerName } = options;
|
|
@@ -37,11 +38,7 @@ function CoerceGetChildrenOperation(options) {
|
|
|
37
38
|
});
|
|
38
39
|
(0, coerce_imports_1.CoerceImports)(sourceFile, [
|
|
39
40
|
{
|
|
40
|
-
namedImports: ['
|
|
41
|
-
moduleSpecifier: 'class-transformer',
|
|
42
|
-
},
|
|
43
|
-
{
|
|
44
|
-
namedImports: ['classTransformOptions'],
|
|
41
|
+
namedImports: ['FilterQuery', 'FilterQueryPipe'],
|
|
45
42
|
moduleSpecifier: '@rxap/nest-utilities',
|
|
46
43
|
},
|
|
47
44
|
{
|
|
@@ -49,7 +46,7 @@ function CoerceGetChildrenOperation(options) {
|
|
|
49
46
|
moduleSpecifier: filePath,
|
|
50
47
|
},
|
|
51
48
|
]);
|
|
52
|
-
return Object.assign({ returnType: className + '[]' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
|
|
49
|
+
return Object.assign({ queryList: table_query_list_1.TABLE_QUERY_LIST, returnType: className + '[]' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
|
|
53
50
|
} }));
|
|
54
51
|
}
|
|
55
52
|
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;
|
|
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,GAClB,GAAG,OAAO,CAAC;IACZ,IAAI,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IACjC,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,cAAc,GAAG,IAAA,mCAAY,EAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IAC7D,SAAS,CAAC,IAAI,CAAC;QACb,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,QAAQ;KACf,CAAC,CAAC;IACH,OAAO,IAAA,kCAAe,kCACjB,OAAO;QACV,kDAAkD;QAClD,cAAc,EACd,aAAa,EAAE,cAAc,EAC7B,SAAS,EACT,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,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,CAAC,EAC3E;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AAjED,gEAiEC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TypeImport } from '@rxap/ts-morph';
|
|
1
|
+
import { NormalizedUpstreamOptions, TypeImport } from '@rxap/ts-morph';
|
|
2
2
|
import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
|
|
3
3
|
import { OperationOptions } from './add-operation-to-controller';
|
|
4
4
|
import { CoerceOperationOptions } from './coerce-operation';
|
|
@@ -31,10 +31,11 @@ export interface CoerceGetPageOperationOptions extends Omit<Omit<CoerceOperation
|
|
|
31
31
|
coerceToRowDtoMethod?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, rowClassName: string, options: CoerceGetPageOperationOptions) => void;
|
|
32
32
|
coerceToPageDtoMethod?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, pageClassName: string, rowClassName: string, options: CoerceGetPageOperationOptions) => void;
|
|
33
33
|
coerceGetPageDataMethod?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, options: CoerceGetPageOperationOptions) => void;
|
|
34
|
+
upstream?: NormalizedUpstreamOptions | null;
|
|
34
35
|
}
|
|
35
36
|
export declare function GetPageOperationColumnToDtoClassProperty(property: GetPageOperationProperty): DtoClassProperty;
|
|
36
37
|
export declare function GetPageOperationColumnToCodeText(property: GetPageOperationProperty): string;
|
|
37
38
|
export declare function CoerceToRowDtoMethod(sourceFile: SourceFile, classDeclaration: ClassDeclaration, rowClassName: string, options: CoerceGetPageOperationOptions): void;
|
|
38
39
|
export declare function CoerceToPageDtoMethod(sourceFile: SourceFile, classDeclaration: ClassDeclaration, pageClassName: string, rowClassName: string, options: CoerceGetPageOperationOptions): void;
|
|
39
|
-
export declare function CoerceGetPageDataMethod(sourceFile: SourceFile, classDeclaration: ClassDeclaration,
|
|
40
|
+
export declare function CoerceGetPageDataMethod(sourceFile: SourceFile, classDeclaration: ClassDeclaration, { upstream }: CoerceGetPageOperationOptions): void;
|
|
40
41
|
export declare function CoerceGetPageOperation(options: Readonly<CoerceGetPageOperationOptions>): import("@angular-devkit/schematics").Rule;
|
|
@@ -8,9 +8,11 @@ const ts_morph_2 = require("ts-morph");
|
|
|
8
8
|
const coerce_class_method_1 = require("../coerce-class-method");
|
|
9
9
|
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
10
10
|
const coerce_type_alias_1 = require("../ts-morph/coerce-type-alias");
|
|
11
|
+
const coerce_dto_class_1 = require("./coerce-dto-class");
|
|
11
12
|
const coerce_operation_1 = require("./coerce-operation");
|
|
12
13
|
const coerce_page_dto_class_1 = require("./coerce-page-dto-class");
|
|
13
14
|
const coerce_row_dto_class_1 = require("./coerce-row-dto-class");
|
|
15
|
+
const table_query_list_1 = require("./table-query-list");
|
|
14
16
|
function GetPageOperationColumnTypeToTypeImport(property) {
|
|
15
17
|
var _a, _b;
|
|
16
18
|
if (!property.type) {
|
|
@@ -130,7 +132,53 @@ function CoerceToPageDtoMethod(sourceFile, classDeclaration, pageClassName, rowC
|
|
|
130
132
|
});
|
|
131
133
|
}
|
|
132
134
|
exports.CoerceToPageDtoMethod = CoerceToPageDtoMethod;
|
|
133
|
-
function CoerceGetPageDataMethod(sourceFile, classDeclaration,
|
|
135
|
+
function CoerceGetPageDataMethod(sourceFile, classDeclaration, { upstream }) {
|
|
136
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
137
|
+
const statements = [];
|
|
138
|
+
if (upstream && (0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
|
|
139
|
+
const memberName = `${(0, schematics_utilities_1.camelize)(upstream.operationId)}Command`;
|
|
140
|
+
(0, coerce_dto_class_1.CoercePropertyDeclaration)(classDeclaration, memberName, {
|
|
141
|
+
type: (0, ts_morph_1.OperationIdToCommandClassName)(upstream.operationId),
|
|
142
|
+
scope: ts_morph_2.Scope.Private,
|
|
143
|
+
hasExclamationToken: true,
|
|
144
|
+
decorators: [
|
|
145
|
+
{
|
|
146
|
+
name: 'Inject',
|
|
147
|
+
arguments: [(0, ts_morph_1.OperationIdToCommandClassName)(upstream.operationId)],
|
|
148
|
+
},
|
|
149
|
+
],
|
|
150
|
+
});
|
|
151
|
+
(0, coerce_imports_1.CoerceImports)(sourceFile, [
|
|
152
|
+
{
|
|
153
|
+
namedImports: [(0, ts_morph_1.OperationIdToCommandClassName)(upstream.operationId)],
|
|
154
|
+
moduleSpecifier: (0, ts_morph_1.OperationIdToCommandClassImportPath)(upstream.operationId, upstream.scope),
|
|
155
|
+
}, {
|
|
156
|
+
namedImports: ['Inject'],
|
|
157
|
+
moduleSpecifier: '@nestjs/common',
|
|
158
|
+
},
|
|
159
|
+
]);
|
|
160
|
+
statements.push(`const response = await this.${memberName}.execute({
|
|
161
|
+
parameters: {
|
|
162
|
+
${(_b = (_a = upstream.mapper) === null || _a === void 0 ? void 0 : _a.pageIndex) !== null && _b !== void 0 ? _b : 'pageIndex'}: pageIndex,
|
|
163
|
+
${(_d = (_c = upstream.mapper) === null || _c === void 0 ? void 0 : _c.pageSize) !== null && _d !== void 0 ? _d : 'pageSize'}: pageSize,
|
|
164
|
+
${(_f = (_e = upstream.mapper) === null || _e === void 0 ? void 0 : _e.sortBy) !== null && _f !== void 0 ? _f : 'sortBy'}: sortBy,
|
|
165
|
+
${(_h = (_g = upstream.mapper) === null || _g === void 0 ? void 0 : _g.sortDirection) !== null && _h !== void 0 ? _h : 'sortDirection'}: sortDirection,
|
|
166
|
+
filter: ${((_j = upstream.mapper) === null || _j === void 0 ? void 0 : _j.filter) ? `filter.map((item) => \`\${ item.column }:\${ item.filter }\`).join(';')` :
|
|
167
|
+
'filter'},
|
|
168
|
+
},
|
|
169
|
+
});`, 'return {', ` list: response.${(_l = (_k = upstream.mapper) === null || _k === void 0 ? void 0 : _k.list) !== null && _l !== void 0 ? _l : 'list'} ?? [],`, ` total: response.${(_o = (_m = upstream.mapper) === null || _m === void 0 ? void 0 : _m.total) !== null && _o !== void 0 ? _o : 'total'} ?? 0,`, '};');
|
|
170
|
+
}
|
|
171
|
+
else {
|
|
172
|
+
statements.push(`const response = await ((() => { throw new NotImplementedException(); })() as any).execute({
|
|
173
|
+
parameters: {
|
|
174
|
+
page: pageIndex,
|
|
175
|
+
size: pageSize,
|
|
176
|
+
sort: sortBy,
|
|
177
|
+
order: sortDirection,
|
|
178
|
+
filter: filter.map((item) => \`\${ item.column }:\${ item.filter }\`).join(';'),
|
|
179
|
+
},
|
|
180
|
+
});`, 'return {', ' list: response.entities ?? [],', ' total: response.maxCount ?? 0,', '};');
|
|
181
|
+
}
|
|
134
182
|
(0, coerce_class_method_1.CoerceClassMethod)(classDeclaration, 'getPageData', {
|
|
135
183
|
scope: ts_morph_2.Scope.Public,
|
|
136
184
|
returnType: 'Promise<{ list: RawRowData[], total: number }>',
|
|
@@ -157,21 +205,7 @@ function CoerceGetPageDataMethod(sourceFile, classDeclaration, options) {
|
|
|
157
205
|
type: 'FilterQuery[]',
|
|
158
206
|
},
|
|
159
207
|
],
|
|
160
|
-
statements:
|
|
161
|
-
`const response = await ((() => { throw new NotImplementedException() })() as any).execute({
|
|
162
|
-
parameters: {
|
|
163
|
-
page: pageIndex,
|
|
164
|
-
size: pageSize,
|
|
165
|
-
sort: sortBy,
|
|
166
|
-
order: sortDirection,
|
|
167
|
-
filter: filter.map((item) => \`\${ item.column }:\${ item.filter }\`).join(';'),
|
|
168
|
-
},
|
|
169
|
-
});`,
|
|
170
|
-
'return {',
|
|
171
|
-
' list: response.entities ?? [],',
|
|
172
|
-
' total: response.maxCount ?? 0,',
|
|
173
|
-
'};',
|
|
174
|
-
],
|
|
208
|
+
statements: statements,
|
|
175
209
|
});
|
|
176
210
|
}
|
|
177
211
|
exports.CoerceGetPageDataMethod = CoerceGetPageDataMethod;
|
|
@@ -231,35 +265,7 @@ function CoerceGetPageOperation(options) {
|
|
|
231
265
|
isExported: false,
|
|
232
266
|
type: 'any',
|
|
233
267
|
});
|
|
234
|
-
return Object.assign({ queryList: [
|
|
235
|
-
{
|
|
236
|
-
name: 'pageIndex',
|
|
237
|
-
type: 'number',
|
|
238
|
-
defaultValue: '0',
|
|
239
|
-
},
|
|
240
|
-
{
|
|
241
|
-
name: 'pageSize',
|
|
242
|
-
type: 'number',
|
|
243
|
-
defaultValue: '5',
|
|
244
|
-
},
|
|
245
|
-
{
|
|
246
|
-
name: 'sortDirection',
|
|
247
|
-
type: 'string',
|
|
248
|
-
defaultValue: w => w.quote('desc'),
|
|
249
|
-
},
|
|
250
|
-
{
|
|
251
|
-
name: 'sortBy',
|
|
252
|
-
type: 'string',
|
|
253
|
-
defaultValue: w => w.quote('__updatedAt'),
|
|
254
|
-
},
|
|
255
|
-
{
|
|
256
|
-
name: 'filter',
|
|
257
|
-
type: 'FilterQuery[]',
|
|
258
|
-
pipeList: ['new FilterQueryPipe()'],
|
|
259
|
-
// the FilterQueryPipe will set the default value to an empty array
|
|
260
|
-
hasQuestionToken: false,
|
|
261
|
-
},
|
|
262
|
-
], returnType: pageClassName, statements: [
|
|
268
|
+
return Object.assign({ queryList: table_query_list_1.TABLE_QUERY_LIST, returnType: pageClassName, statements: [
|
|
263
269
|
'const data = await this.getPageData(sortBy, sortDirection, pageSize, pageIndex, filter);',
|
|
264
270
|
'return plainToInstance(',
|
|
265
271
|
' ' + pageClassName + ',',
|
|
@@ -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,qEAGoC;AACpC,
|
|
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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"}
|
|
@@ -6,6 +6,7 @@ const utilities_1 = require("@rxap/utilities");
|
|
|
6
6
|
const coerce_imports_1 = require("../ts-morph/coerce-imports");
|
|
7
7
|
const coerce_dto_class_1 = require("./coerce-dto-class");
|
|
8
8
|
const coerce_operation_1 = require("./coerce-operation");
|
|
9
|
+
const table_query_list_1 = require("./table-query-list");
|
|
9
10
|
function CoerceGetRootOperation(options) {
|
|
10
11
|
const { tsMorphTransform = utilities_1.noop, propertyList = [], } = options;
|
|
11
12
|
let { controllerName } = options;
|
|
@@ -31,11 +32,7 @@ function CoerceGetRootOperation(options) {
|
|
|
31
32
|
});
|
|
32
33
|
(0, coerce_imports_1.CoerceImports)(sourceFile, [
|
|
33
34
|
{
|
|
34
|
-
namedImports: ['
|
|
35
|
-
moduleSpecifier: 'class-transformer',
|
|
36
|
-
},
|
|
37
|
-
{
|
|
38
|
-
namedImports: ['classTransformOptions'],
|
|
35
|
+
namedImports: ['FilterQuery', 'FilterQueryPipe'],
|
|
39
36
|
moduleSpecifier: '@rxap/nest-utilities',
|
|
40
37
|
},
|
|
41
38
|
{
|
|
@@ -43,7 +40,7 @@ function CoerceGetRootOperation(options) {
|
|
|
43
40
|
moduleSpecifier: filePath,
|
|
44
41
|
},
|
|
45
42
|
]);
|
|
46
|
-
return Object.assign({ returnType: className + '[]' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
|
|
43
|
+
return Object.assign({ queryList: table_query_list_1.TABLE_QUERY_LIST, returnType: className + '[]' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
|
|
47
44
|
} }));
|
|
48
45
|
}
|
|
49
46
|
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;
|
|
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;AAMtD,SAAgB,sBAAsB,CAAC,OAAgD;IACrF,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,YAAY,GAAG,EAAE,GAClB,GAAG,OAAO,CAAC;IACZ,IAAI,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IACjC,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,cAAc,GAAG,IAAA,mCAAY,EAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IAC7D,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,cAAc,EACd,aAAa,EAAE,UAAU,EACzB,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,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,CAAC,EAC3E;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AA1DD,wDA0DC"}
|
|
@@ -2,29 +2,58 @@
|
|
|
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 utilities_1 = require("@rxap/utilities");
|
|
5
6
|
const path_1 = require("path");
|
|
6
7
|
const coerce_dto_class_1 = require("./coerce-dto-class");
|
|
7
8
|
function CoercePageDtoClass(options) {
|
|
8
9
|
let { project, name, propertyList, classStructure, importStructureList, rowClassName, rowFilePath, } = options;
|
|
9
10
|
importStructureList !== null && importStructureList !== void 0 ? importStructureList : (importStructureList = []);
|
|
10
11
|
importStructureList.push({
|
|
11
|
-
namedImports: ['PageDto'],
|
|
12
|
-
moduleSpecifier: '@rxap/nest-dto',
|
|
13
|
-
}, {
|
|
14
12
|
namedImports: [rowClassName],
|
|
15
13
|
moduleSpecifier: `./${(0, path_1.basename)(rowFilePath)}`,
|
|
14
|
+
}, {
|
|
15
|
+
namedImports: ['FilterQueryDto'],
|
|
16
|
+
moduleSpecifier: '@rxap/nest-dto',
|
|
16
17
|
});
|
|
17
18
|
classStructure !== null && classStructure !== void 0 ? classStructure : (classStructure = {});
|
|
18
|
-
|
|
19
|
-
|
|
19
|
+
propertyList !== null && propertyList !== void 0 ? propertyList : (propertyList = []);
|
|
20
|
+
(0, utilities_1.CoerceArrayItems)(propertyList, [
|
|
20
21
|
{
|
|
21
22
|
name: 'rows',
|
|
22
23
|
type: rowClassName,
|
|
23
24
|
isArray: true,
|
|
24
25
|
isType: true,
|
|
25
26
|
},
|
|
27
|
+
{
|
|
28
|
+
name: 'pageSize',
|
|
29
|
+
type: 'number',
|
|
30
|
+
},
|
|
31
|
+
{
|
|
32
|
+
name: 'pageIndex',
|
|
33
|
+
type: 'number',
|
|
34
|
+
},
|
|
35
|
+
{
|
|
36
|
+
name: 'total',
|
|
37
|
+
type: 'number',
|
|
38
|
+
},
|
|
39
|
+
{
|
|
40
|
+
name: 'sortDirection',
|
|
41
|
+
type: 'string',
|
|
42
|
+
isOptional: true,
|
|
43
|
+
},
|
|
44
|
+
{
|
|
45
|
+
name: 'sortBy',
|
|
46
|
+
type: 'string',
|
|
47
|
+
isOptional: true,
|
|
48
|
+
},
|
|
49
|
+
{
|
|
50
|
+
name: 'filter',
|
|
51
|
+
type: 'FilterQueryDto',
|
|
52
|
+
isArray: true,
|
|
53
|
+
isType: true,
|
|
54
|
+
isOptional: true,
|
|
55
|
+
}
|
|
26
56
|
]);
|
|
27
|
-
propertyList.push();
|
|
28
57
|
return (0, coerce_dto_class_1.CoerceDtoClass)({
|
|
29
58
|
project,
|
|
30
59
|
name: (0, schematics_utilities_1.CoerceSuffix)(name, '-page'),
|
|
@@ -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,+BAAgC;AAOhC,yDAAoD;AAapD,SAAgB,kBAAkB,CAAC,OAAkC;IACnE,IAAI,EACF,OAAO,EACP,IAAI,EACJ,YAAY,EACZ,cAAc,EACd,mBAAmB,EACnB,YAAY,EACZ,WAAW,GACZ,GAAG,OAAO,CAAC;IACZ,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,IAAnB,mBAAmB,GAAK,EAAE,EAAC;IAC3B,mBAAmB,CAAC,IAAI,CACtB;QACE,YAAY,EAAE,CAAE,
|
|
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,+CAAmD;AACnD,+BAAgC;AAOhC,yDAAoD;AAapD,SAAgB,kBAAkB,CAAC,OAAkC;IACnE,IAAI,EACF,OAAO,EACP,IAAI,EACJ,YAAY,EACZ,cAAc,EACd,mBAAmB,EACnB,YAAY,EACZ,WAAW,GACZ,GAAG,OAAO,CAAC;IACZ,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,IAAnB,mBAAmB,GAAK,EAAE,EAAC;IAC3B,mBAAmB,CAAC,IAAI,CACtB;QACE,YAAY,EAAE,CAAE,YAAY,CAAE;QAC9B,eAAe,EAAE,KAAM,IAAA,eAAQ,EAAC,WAAW,CAAE,EAAE;KAChD,EACD;QACE,YAAY,EAAE,CAAE,gBAAgB,CAAE;QAClC,eAAe,EAAE,gBAAgB;KAClC,CACF,CAAC;IACF,cAAc,aAAd,cAAc,cAAd,cAAc,IAAd,cAAc,GAAK,EAAE,EAAC;IACtB,YAAY,aAAZ,YAAY,cAAZ,YAAY,IAAZ,YAAY,GAAK,EAAE,EAAC;IACpB,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,EAAC;QACpB,OAAO;QACP,IAAI,EAAE,IAAA,mCAAY,EAAC,IAAI,EAAE,OAAO,CAAC;QACjC,YAAY;QACZ,cAAc;QACd,mBAAmB;KACpB,CAAC,CAAC;AACL,CAAC;AAnED,gDAmEC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TABLE_QUERY_LIST = void 0;
|
|
4
|
+
exports.TABLE_QUERY_LIST = [
|
|
5
|
+
{
|
|
6
|
+
name: 'pageIndex',
|
|
7
|
+
type: 'number',
|
|
8
|
+
defaultValue: '0',
|
|
9
|
+
},
|
|
10
|
+
{
|
|
11
|
+
name: 'pageSize',
|
|
12
|
+
type: 'number',
|
|
13
|
+
defaultValue: '5',
|
|
14
|
+
},
|
|
15
|
+
{
|
|
16
|
+
name: 'sortDirection',
|
|
17
|
+
type: 'string',
|
|
18
|
+
defaultValue: w => w.quote('desc'),
|
|
19
|
+
},
|
|
20
|
+
{
|
|
21
|
+
name: 'sortBy',
|
|
22
|
+
type: 'string',
|
|
23
|
+
defaultValue: w => w.quote('__updatedAt'),
|
|
24
|
+
},
|
|
25
|
+
{
|
|
26
|
+
name: 'filter',
|
|
27
|
+
type: 'FilterQuery[]',
|
|
28
|
+
pipeList: ['new FilterQueryPipe()'],
|
|
29
|
+
// the FilterQueryPipe will set the default value to an empty array
|
|
30
|
+
hasQuestionToken: false,
|
|
31
|
+
},
|
|
32
|
+
];
|
|
33
|
+
//# sourceMappingURL=table-query-list.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"table-query-list.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/table-query-list.ts"],"names":[],"mappings":";;;AAEa,QAAA,gBAAgB,GAAyB;IACpD;QACE,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,GAAG;KAClB;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,GAAG;KAClB;IACD;QACE,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;KACnC;IACD;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC;KAC1C;IACD;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,eAAe;QACrB,QAAQ,EAAE,CAAE,uBAAuB,CAAE;QACrC,mEAAmE;QACnE,gBAAgB,EAAE,KAAK;KACxB;CACF,CAAC"}
|