@rxap/schematics-ts-morph 16.1.0-dev.11 → 16.1.0-dev.12
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 +7 -0
- package/README.md +1 -1
- package/package.json +10 -10
- package/src/lib/nest/coerce-form-submit-operation.js +4 -3
- package/src/lib/nest/coerce-form-submit-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-page-operation.d.ts +2 -2
- package/src/lib/nest/coerce-get-page-operation.js +6 -6
- package/src/lib/nest/coerce-get-page-operation.js.map +1 -1
- package/src/lib/nest/coerce-row-dto-class.d.ts +2 -1
- package/src/lib/nest/coerce-row-dto-class.js +2 -2
- package/src/lib/nest/coerce-row-dto-class.js.map +1 -1
- package/src/lib/nest/coerce-table-select-operation.d.ts +4 -2
- package/src/lib/nest/coerce-table-select-operation.js +3 -13
- package/src/lib/nest/coerce-table-select-operation.js.map +1 -1
- package/src/lib/nest/coerce-table-select-value-resolve-operation.d.ts +4 -2
- package/src/lib/nest/coerce-table-select-value-resolve-operation.js +4 -13
- package/src/lib/nest/coerce-table-select-value-resolve-operation.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,13 @@
|
|
|
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.12](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.1.0-dev.11...@rxap/schematics-ts-morph@16.1.0-dev.12) (2024-03-07)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- ensure all properties are set correctly ([e2aa58e](https://gitlab.com/rxap/packages/commit/e2aa58e6418a53ddd1100790b82cae8495a02894))
|
|
11
|
+
- ensure submit and load can have different interfaces ([401972b](https://gitlab.com/rxap/packages/commit/401972bd1c78db4def6192e3277a91ef0c6521a9))
|
|
12
|
+
|
|
6
13
|
# [16.1.0-dev.11](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.1.0-dev.10...@rxap/schematics-ts-morph@16.1.0-dev.11) (2024-03-05)
|
|
7
14
|
|
|
8
15
|
**Note:** Version bump only for package @rxap/schematics-ts-morph
|
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.
|
|
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.11 @rxap/utilities@^16.1.0-dev.6 @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.12",
|
|
3
3
|
"name": "@rxap/schematics-ts-morph",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -12,10 +12,10 @@
|
|
|
12
12
|
"peerDependencies": {
|
|
13
13
|
"@angular-devkit/core": "^16.1.4",
|
|
14
14
|
"@angular-devkit/schematics": "^16.1.4",
|
|
15
|
-
"@rxap/schematics-utilities": "^16.0.1-dev.
|
|
16
|
-
"@rxap/ts-morph": "^1.1.0-dev.
|
|
17
|
-
"@rxap/utilities": "^16.1.0-dev.
|
|
18
|
-
"@rxap/workspace-ts-morph": "^16.0.2-dev.
|
|
15
|
+
"@rxap/schematics-utilities": "^16.0.1-dev.1",
|
|
16
|
+
"@rxap/ts-morph": "^1.1.0-dev.11",
|
|
17
|
+
"@rxap/utilities": "^16.1.0-dev.6",
|
|
18
|
+
"@rxap/workspace-ts-morph": "^16.0.2-dev.1",
|
|
19
19
|
"colors": "^1.4.0",
|
|
20
20
|
"handlebars": "^4.7.7",
|
|
21
21
|
"ts-morph": "^18.0.0",
|
|
@@ -45,19 +45,19 @@
|
|
|
45
45
|
"packageGroup": [
|
|
46
46
|
{
|
|
47
47
|
"package": "@rxap/schematics-utilities",
|
|
48
|
-
"version": "16.0.1-dev.
|
|
48
|
+
"version": "16.0.1-dev.1"
|
|
49
49
|
},
|
|
50
50
|
{
|
|
51
51
|
"package": "@rxap/ts-morph",
|
|
52
|
-
"version": "1.1.0-dev.
|
|
52
|
+
"version": "1.1.0-dev.11"
|
|
53
53
|
},
|
|
54
54
|
{
|
|
55
55
|
"package": "@rxap/utilities",
|
|
56
|
-
"version": "16.1.0-dev.
|
|
56
|
+
"version": "16.1.0-dev.6"
|
|
57
57
|
},
|
|
58
58
|
{
|
|
59
59
|
"package": "@rxap/workspace-ts-morph",
|
|
60
|
-
"version": "16.0.2-dev.
|
|
60
|
+
"version": "16.0.2-dev.1"
|
|
61
61
|
}
|
|
62
62
|
]
|
|
63
63
|
},
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"directory": "packages/schematic/ts-morph"
|
|
72
72
|
},
|
|
73
73
|
"type": "commonjs",
|
|
74
|
-
"gitHead": "
|
|
74
|
+
"gitHead": "30d6c9b9048ba01d9bfec51036a1a5e155204496",
|
|
75
75
|
"main": "./src/index.js",
|
|
76
76
|
"types": "./src/index.d.ts"
|
|
77
77
|
}
|
|
@@ -6,11 +6,12 @@ const coerce_get_by_id_operation_1 = require("./coerce-get-by-id-operation");
|
|
|
6
6
|
function CoerceFormSubmitOperation(options) {
|
|
7
7
|
const { tsMorphTransform = utilities_1.noop, bodyDtoName, isReturnVoid = true,
|
|
8
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;
|
|
9
|
+
idProperty = null, operationName = idProperty ? 'submitById' : 'submit', dtoClassNameSuffix = '-submit', } = options;
|
|
10
10
|
return (0, coerce_get_by_id_operation_1.CoerceGetByIdOperation)(Object.assign(Object.assign({}, options), { operationName,
|
|
11
11
|
isReturnVoid,
|
|
12
|
-
idProperty,
|
|
13
|
-
|
|
12
|
+
idProperty,
|
|
13
|
+
dtoClassNameSuffix, buildOperationDtoClassName: (controllerName, { dtoClassName, dtoClassNameSuffix = '-submit' }) => {
|
|
14
|
+
return dtoClassName !== null && dtoClassName !== void 0 ? dtoClassName : (0, utilities_1.CoerceSuffix)(bodyDtoName !== null && bodyDtoName !== void 0 ? bodyDtoName : controllerName, dtoClassNameSuffix);
|
|
14
15
|
}, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName, moduleSourceFile, dto) => {
|
|
15
16
|
if (!dto) {
|
|
16
17
|
throw new Error('The dto must be created for an submit operation');
|
|
@@ -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,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,
|
|
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,EACpD,kBAAkB,GAAG,SAAS,GAC/B,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,mDAAsB,kCACxB,OAAO,KACV,aAAa;QACb,YAAY;QACZ,UAAU;QACV,kBAAkB,EAClB,0BAA0B,EAAE,CAAC,cAAc,EAAE,EAAE,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAAE,EAAE,EAAE;YAC/F,OAAO,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,IAAA,wBAAY,EAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,cAAc,EAAE,kBAAkB,CAAC,CAAC;QACzF,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,4 +1,4 @@
|
|
|
1
|
-
import { NormalizedUpstreamOptions, TypeImport } from '@rxap/ts-morph';
|
|
1
|
+
import { DataProperty, NormalizedUpstreamOptions, TypeImport } from '@rxap/ts-morph';
|
|
2
2
|
import { ClassDeclaration, Project, SourceFile, WriterFunction } from 'ts-morph';
|
|
3
3
|
import { OperationOptions } from './add-operation-to-controller';
|
|
4
4
|
import { CoerceDtoClassOutput } from './coerce-dto-class';
|
|
@@ -10,7 +10,7 @@ export interface CoerceGetPageOperationOptions extends Omit<CoerceOperationOptio
|
|
|
10
10
|
* the name of the property used as row id value. defaults to the value 'uuid'. If null the __rowId property will be
|
|
11
11
|
* set to the absolute row index absolute row index = page * pageSize + rowIndex
|
|
12
12
|
*/
|
|
13
|
-
rowIdProperty?:
|
|
13
|
+
rowIdProperty?: DataProperty;
|
|
14
14
|
operationName?: string;
|
|
15
15
|
coerceToRowDtoMethod?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, rowClassName: string, options: CoerceGetPageOperationOptions) => void;
|
|
16
16
|
coerceToPageDtoMethod?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, pageClassName: string, rowClassName: string, options: CoerceGetPageOperationOptions) => void;
|
|
@@ -23,7 +23,7 @@ function GetPageOperationColumnToCodeText(property) {
|
|
|
23
23
|
}
|
|
24
24
|
exports.GetPageOperationColumnToCodeText = GetPageOperationColumnToCodeText;
|
|
25
25
|
function CoerceToRowDtoMethod(sourceFile, classDeclaration, rowClassName, options) {
|
|
26
|
-
var _a, _b
|
|
26
|
+
var _a, _b;
|
|
27
27
|
(0, ts_morph_1.CoerceClassMethod)(classDeclaration, 'toRowDto', {
|
|
28
28
|
scope: ts_morph_2.Scope.Private,
|
|
29
29
|
returnType: rowClassName,
|
|
@@ -58,10 +58,10 @@ function CoerceToRowDtoMethod(sourceFile, classDeclaration, rowClassName, option
|
|
|
58
58
|
statements: [
|
|
59
59
|
'return {',
|
|
60
60
|
' __rowId: ' +
|
|
61
|
-
(options.rowIdProperty
|
|
61
|
+
(!options.rowIdProperty ?
|
|
62
62
|
'(pageIndex * pageSize + index).toFixed(0)' :
|
|
63
|
-
`item.${
|
|
64
|
-
(
|
|
63
|
+
`item.${options.rowIdProperty.name}`) + ',\n ',
|
|
64
|
+
(_b = (_a = options.propertyList) === null || _a === void 0 ? void 0 : _a.filter(p => p.name !== '__rowId').map(GetPageOperationColumnToCodeText).join(',\n ')) !== null && _b !== void 0 ? _b : '',
|
|
65
65
|
'};',
|
|
66
66
|
],
|
|
67
67
|
});
|
|
@@ -208,7 +208,7 @@ function GetResponseTypeFromUpstream(upstream) {
|
|
|
208
208
|
return {
|
|
209
209
|
name: `${className}['${(_b = (_a = upstream.mapper) === null || _a === void 0 ? void 0 : _a.list) !== null && _b !== void 0 ? _b : 'list'}'][number]`,
|
|
210
210
|
namedImport: className,
|
|
211
|
-
moduleSpecifier: (0, ts_morph_1.
|
|
211
|
+
moduleSpecifier: (0, ts_morph_1.OperationIdToResponseClassImportPath)(upstream.operationId, upstream.scope),
|
|
212
212
|
};
|
|
213
213
|
}
|
|
214
214
|
throw new Error(`Upstream kind '${upstream.kind}' not supported`);
|
|
@@ -241,7 +241,7 @@ function CoerceGetPageOperationDtoClass(classDeclaration, controllerName, module
|
|
|
241
241
|
project,
|
|
242
242
|
name: dtoClassName,
|
|
243
243
|
propertyList,
|
|
244
|
-
rowIdType: rowIdProperty === null ?
|
|
244
|
+
rowIdType: rowIdProperty === null || rowIdProperty === void 0 ? void 0 : rowIdProperty.type,
|
|
245
245
|
});
|
|
246
246
|
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
247
247
|
namedImports: [rowClassName],
|
|
@@ -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,10 +1,11 @@
|
|
|
1
|
+
import { TypeImport, TypeName } from '@rxap/ts-morph';
|
|
1
2
|
import { CoerceDtoClassOptions } from './coerce-dto-class';
|
|
2
3
|
export interface CoerceRowDtoClassOptions extends CoerceDtoClassOptions {
|
|
3
4
|
/**
|
|
4
5
|
* the type of the property used as row id type. defaults to the type 'string'. If null the type will be
|
|
5
6
|
* set to number
|
|
6
7
|
*/
|
|
7
|
-
rowIdType?:
|
|
8
|
+
rowIdType?: TypeImport | TypeName;
|
|
8
9
|
}
|
|
9
10
|
export declare function BuildRowDtoClassName(name: string): string;
|
|
10
11
|
export declare function CoerceRowDtoClass(options: CoerceRowDtoClassOptions): import("./coerce-dto-class").CoerceDtoClassOutput;
|
|
@@ -9,10 +9,10 @@ function BuildRowDtoClassName(name) {
|
|
|
9
9
|
}
|
|
10
10
|
exports.BuildRowDtoClassName = BuildRowDtoClassName;
|
|
11
11
|
function CoerceRowDtoClass(options) {
|
|
12
|
-
const { rowIdType, project, name, propertyList = [], } = options;
|
|
12
|
+
const { rowIdType = 'number', project, name, propertyList = [], } = options;
|
|
13
13
|
(0, utilities_1.CoerceArrayItems)(propertyList, [{
|
|
14
14
|
name: '__rowId',
|
|
15
|
-
type: rowIdType
|
|
15
|
+
type: rowIdType,
|
|
16
16
|
}], (a, b) => a.name === b.name);
|
|
17
17
|
return (0, coerce_dto_class_1.CoerceDtoClass)({
|
|
18
18
|
project,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-row-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-row-dto-class.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;
|
|
1
|
+
{"version":3,"file":"coerce-row-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-row-dto-class.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAK1D,+CAAmD;AACnD,yDAG4B;AAU5B,SAAgB,oBAAoB,CAAC,IAAY;IAC/C,OAAO,IAAA,mCAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC;AAFD,oDAEC;AAED,SAAgB,iBAAiB,CAAC,OAAiC;IACjE,MAAM,EACJ,SAAS,GAAG,QAAQ,EACpB,OAAO,EACP,IAAI,EACJ,YAAY,GAAG,EAAE,GAClB,GAAG,OAAO,CAAC;IACZ,IAAA,4BAAgB,EAAC,YAAY,EAAE,CAAC;YAC9B,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,SAAS;SAChB,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IACjC,OAAO,IAAA,iCAAc,EAAC;QACpB,OAAO;QACP,IAAI,EAAE,oBAAoB,CAAC,IAAI,CAAC;QAChC,YAAY;KACb,CAAC,CAAC;AACL,CAAC;AAhBD,8CAgBC"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { DataProperty, NormalizedDataProperty } from '@rxap/ts-morph';
|
|
1
2
|
import { CoerceGetPageOperationOptions } from './coerce-get-page-operation';
|
|
2
3
|
export interface CoerceTableSelectOperationOptions extends CoerceGetPageOperationOptions {
|
|
3
|
-
|
|
4
|
-
|
|
4
|
+
rowIdProperty: DataProperty;
|
|
5
|
+
rowDisplayProperty: NormalizedDataProperty;
|
|
6
|
+
rowValueProperty?: NormalizedDataProperty;
|
|
5
7
|
}
|
|
6
8
|
export declare function CoerceTableSelectOperationRule(options: CoerceTableSelectOperationOptions): import("@angular-devkit/schematics").Rule;
|
|
@@ -4,19 +4,9 @@ exports.CoerceTableSelectOperationRule = void 0;
|
|
|
4
4
|
const ts_morph_1 = require("@rxap/ts-morph");
|
|
5
5
|
const coerce_get_page_operation_1 = require("./coerce-get-page-operation");
|
|
6
6
|
function CoerceTableSelectOperationRule(options) {
|
|
7
|
-
const { propertyList = [], rowIdProperty
|
|
8
|
-
propertyList.unshift({
|
|
9
|
-
|
|
10
|
-
type: (0, ts_morph_1.NormalizeTypeImport)('string'),
|
|
11
|
-
isArray: false,
|
|
12
|
-
source: rowDisplayProperty,
|
|
13
|
-
});
|
|
14
|
-
propertyList.unshift({
|
|
15
|
-
name: '__value',
|
|
16
|
-
type: (0, ts_morph_1.NormalizeTypeImport)('string'),
|
|
17
|
-
isArray: false,
|
|
18
|
-
source: rowValueProperty,
|
|
19
|
-
});
|
|
7
|
+
const { propertyList = [], rowIdProperty, rowDisplayProperty, rowValueProperty = (0, ts_morph_1.NormalizeDataProperty)(rowIdProperty), } = options;
|
|
8
|
+
propertyList.unshift(Object.assign(Object.assign({}, rowDisplayProperty), { name: '__display', source: rowDisplayProperty.name }));
|
|
9
|
+
propertyList.unshift(Object.assign(Object.assign({}, rowValueProperty), { name: '__value', source: rowValueProperty.name }));
|
|
20
10
|
return (0, coerce_get_page_operation_1.CoerceGetPageOperation)(Object.assign(Object.assign({}, options), { propertyList: propertyList, rowIdProperty }));
|
|
21
11
|
}
|
|
22
12
|
exports.CoerceTableSelectOperationRule = CoerceTableSelectOperationRule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-table-select-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-table-select-operation.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"coerce-table-select-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-table-select-operation.ts"],"names":[],"mappings":";;;AAAA,6CAIwB;AACxB,2EAGqC;AAQrC,SAAgB,8BAA8B,CAAC,OAA0C;IACvF,MAAM,EACJ,YAAY,GAAG,EAAE,EACjB,aAAa,EACb,kBAAkB,EAClB,gBAAgB,GAAG,IAAA,gCAAqB,EAAC,aAAa,CAAC,GACxD,GAAG,OAAO,CAAC;IAEZ,YAAY,CAAC,OAAO,iCACf,kBAAkB,KACrB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,kBAAkB,CAAC,IAAI,IAC/B,CAAC;IACH,YAAY,CAAC,OAAO,iCACf,gBAAgB,KACnB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,gBAAgB,CAAC,IAAI,IAC7B,CAAC;IAEH,OAAO,IAAA,kDAAsB,kCACxB,OAAO,KACV,YAAY,EAAE,YAAY,EAC1B,aAAa,IACb,CAAC;AAEL,CAAC;AAzBD,wEAyBC"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import { DataProperty, NormalizedDataProperty } from '@rxap/ts-morph';
|
|
1
2
|
import { ClassDeclaration, SourceFile, WriterFunction } from 'ts-morph';
|
|
2
3
|
import { CoerceDtoClassOutput } from './coerce-dto-class';
|
|
3
4
|
import { CoerceOperationOptions, TransformOperation } from './coerce-operation';
|
|
4
5
|
export interface CoerceTableSelectValueResolveOperationOptions extends CoerceOperationOptions {
|
|
5
|
-
|
|
6
|
-
|
|
6
|
+
rowIdProperty: DataProperty;
|
|
7
|
+
rowDisplayProperty: NormalizedDataProperty;
|
|
8
|
+
rowValueProperty?: NormalizedDataProperty;
|
|
7
9
|
}
|
|
8
10
|
export declare function BuildTableSelectValueResolveUpstreamGetParametersImplementation(classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, dto: CoerceDtoClassOutput | null, options: Readonly<CoerceTableSelectValueResolveOperationOptions>): TransformOperation<string | WriterFunction>;
|
|
9
11
|
export declare function CoerceTableSelectValueResolveOperationRule(options: CoerceTableSelectValueResolveOperationOptions): import("@angular-devkit/schematics").Rule;
|
|
@@ -20,19 +20,10 @@ function BuildTableSelectValueResolveUpstreamGetParametersImplementation(classDe
|
|
|
20
20
|
}
|
|
21
21
|
exports.BuildTableSelectValueResolveUpstreamGetParametersImplementation = BuildTableSelectValueResolveUpstreamGetParametersImplementation;
|
|
22
22
|
function CoerceTableSelectValueResolveOperationRule(options) {
|
|
23
|
-
const { buildUpstreamGetParametersImplementation = BuildTableSelectValueResolveUpstreamGetParametersImplementation, propertyList = [], rowDisplayProperty
|
|
24
|
-
propertyList.unshift({
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
isArray: false,
|
|
28
|
-
source: rowDisplayProperty,
|
|
29
|
-
});
|
|
30
|
-
propertyList.unshift({
|
|
31
|
-
name: '__value',
|
|
32
|
-
type: (0, ts_morph_1.NormalizeTypeImport)('string'),
|
|
33
|
-
isArray: false,
|
|
34
|
-
source: rowValueProperty,
|
|
35
|
-
});
|
|
23
|
+
const { buildUpstreamGetParametersImplementation = BuildTableSelectValueResolveUpstreamGetParametersImplementation, propertyList = [], rowIdProperty, rowDisplayProperty, rowValueProperty = (0, ts_morph_1.NormalizeDataProperty)(rowIdProperty), } = options;
|
|
24
|
+
propertyList.unshift(Object.assign(Object.assign({}, rowDisplayProperty), { name: '__display', source: rowDisplayProperty.name }));
|
|
25
|
+
propertyList.unshift(Object.assign(Object.assign({}, rowValueProperty), { name: '__value', source: rowValueProperty.name }));
|
|
26
|
+
propertyList.unshift((0, ts_morph_1.NormalizeDataProperty)(Object.assign(Object.assign({}, rowIdProperty), { name: '__rowId', source: rowIdProperty.name }), 'number'));
|
|
36
27
|
return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { buildUpstreamGetParametersImplementation }));
|
|
37
28
|
}
|
|
38
29
|
exports.CoerceTableSelectValueResolveOperationRule = CoerceTableSelectValueResolveOperationRule;
|
|
@@ -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,6CAKwB;AAOxB,yDAI4B;AAS5B,SAAgB,+DAA+D,CAClB,gBAAkC,EAClC,gBAA4B,EAC5B,GAAgC,EAChC,OAAgE;IAE3H,OAAO,GAAG,EAAE;;QACV,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAC7B,IAAI,QAAQ,EAAE;YACZ,IAAI,IAAA,6CAAkC,EAAC,QAAQ,CAAC,EAAE;gBAChD,IAAI,MAAA,QAAQ,CAAC,MAAM,0CAAE,KAAK,EAAE;oBAC1B,OAAO,mBAAoB,QAAQ,CAAC,MAAM,CAAC,KAAM,aAAa,CAAC;iBAChE;aACF;YACD,OAAO,WAAW,CAAC;SACpB;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;AACJ,CAAC;AAlBD,0IAkBC;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,YAAY,CAAC,OAAO,iCACf,kBAAkB,KACrB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,kBAAkB,CAAC,IAAI,IAC/B,CAAC;IACH,YAAY,CAAC,OAAO,iCACf,gBAAgB,KACnB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,gBAAgB,CAAC,IAAI,IAC7B,CAAC;IACH,YAAY,CAAC,OAAO,CAAC,IAAA,gCAAqB,kCACrC,aAAa,KAChB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,aAAa,CAAC,IAAI,KACzB,QAAQ,CAAC,CAAC,CAAC;IAEd,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,wCAAwC,IACxC,CAAC;AACL,CAAC;AA7BD,gGA6BC"}
|