@rxap/schematics-ts-morph 16.1.0-dev.8 → 16.1.0
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 +124 -0
- package/README.md +1 -1
- package/package.json +22 -18
- package/src/index.d.ts +7 -1
- package/src/index.js +7 -1
- package/src/index.js.map +1 -1
- package/src/lib/angular/coerce-component.d.ts +3 -1
- package/src/lib/angular/coerce-component.js +13 -6
- package/src/lib/angular/coerce-component.js.map +1 -1
- package/src/lib/angular/coerce-form-definition-array.d.ts +14 -0
- package/src/lib/angular/coerce-form-definition-array.js +87 -0
- package/src/lib/angular/coerce-form-definition-array.js.map +1 -0
- package/src/lib/angular/coerce-form-definition-control.d.ts +9 -12
- package/src/lib/angular/coerce-form-definition-control.js +68 -124
- package/src/lib/angular/coerce-form-definition-control.js.map +1 -1
- package/src/lib/angular/coerce-form-definition-form-control.d.ts +11 -0
- package/src/lib/angular/coerce-form-definition-form-control.js +66 -0
- package/src/lib/angular/coerce-form-definition-form-control.js.map +1 -0
- package/src/lib/angular/coerce-form-definition-group.d.ts +14 -0
- package/src/lib/angular/coerce-form-definition-group.js +80 -0
- package/src/lib/angular/coerce-form-definition-group.js.map +1 -0
- package/src/lib/angular/coerce-form-definition-type.d.ts +2 -2
- package/src/lib/angular/coerce-form-definition-type.js +16 -2
- package/src/lib/angular/coerce-form-definition-type.js.map +1 -1
- package/src/lib/angular/coerce-form-definition.d.ts +4 -4
- package/src/lib/angular/coerce-form-definition.js +20 -9
- package/src/lib/angular/coerce-form-definition.js.map +1 -1
- package/src/lib/angular/coerce-options-data-source.d.ts +3 -1
- package/src/lib/angular/coerce-options-data-source.js +35 -6
- package/src/lib/angular/coerce-options-data-source.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/angular/coerce-proxy-remote-method-class.d.ts +2 -0
- package/src/lib/angular/coerce-proxy-remote-method-class.js +41 -19
- package/src/lib/angular/coerce-proxy-remote-method-class.js.map +1 -1
- package/src/lib/angular/coerce-tree-table-root-proxy-remote-method-class.d.ts +1 -0
- package/src/lib/angular/coerce-tree-table-root-proxy-remote-method-class.js +10 -3
- package/src/lib/angular/coerce-tree-table-root-proxy-remote-method-class.js.map +1 -1
- package/src/lib/angular/form-definition-utilities.d.ts +1 -0
- package/src/lib/angular/form-definition-utilities.js +7 -3
- package/src/lib/angular/form-definition-utilities.js.map +1 -1
- package/src/lib/nest/add-operation-to-controller.d.ts +2 -0
- package/src/lib/nest/add-operation-to-controller.js +9 -2
- package/src/lib/nest/add-operation-to-controller.js.map +1 -1
- package/src/lib/nest/assert-nest-project.d.ts +1 -0
- package/src/lib/nest/assert-nest-project.js +7 -3
- package/src/lib/nest/assert-nest-project.js.map +1 -1
- package/src/lib/nest/coerce-autocomplete-options-operation.d.ts +12 -0
- package/src/lib/nest/coerce-autocomplete-options-operation.js +65 -0
- package/src/lib/nest/coerce-autocomplete-options-operation.js.map +1 -0
- package/src/lib/nest/coerce-autocomplete-table-select-value-resolve-operation.d.ts +7 -0
- package/src/lib/nest/coerce-autocomplete-table-select-value-resolve-operation.js +16 -0
- package/src/lib/nest/coerce-autocomplete-table-select-value-resolve-operation.js.map +1 -0
- package/src/lib/nest/coerce-dto-class.js +169 -125
- package/src/lib/nest/coerce-dto-class.js.map +1 -1
- 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-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.d.ts +4 -3
- package/src/lib/nest/coerce-get-page-operation.js +90 -33
- package/src/lib/nest/coerce-get-page-operation.js.map +1 -1
- package/src/lib/nest/coerce-get-root-operation.d.ts +4 -0
- package/src/lib/nest/coerce-get-root-operation.js +14 -4
- package/src/lib/nest/coerce-get-root-operation.js.map +1 -1
- package/src/lib/nest/coerce-operation.d.ts +6 -3
- package/src/lib/nest/coerce-operation.js +14 -5
- package/src/lib/nest/coerce-operation.js.map +1 -1
- package/src/lib/nest/coerce-options-operation.d.ts +6 -3
- package/src/lib/nest/coerce-options-operation.js +59 -5
- package/src/lib/nest/coerce-options-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 +3 -2
- package/src/lib/nest/coerce-table-select-operation.js +10 -15
- package/src/lib/nest/coerce-table-select-operation.js.map +1 -1
- package/src/lib/nest/coerce-table-select-value-resolve-operation.d.ts +5 -3
- package/src/lib/nest/coerce-table-select-value-resolve-operation.js +17 -15
- package/src/lib/nest/coerce-table-select-value-resolve-operation.js.map +1 -1
- package/src/lib/nest/coerce-tree-operation.js +2 -1
- package/src/lib/nest/coerce-tree-operation.js.map +1 -1
- package/src/lib/nest/dto-class-property.d.ts +2 -10
- package/src/lib/nest/dto-class-property.js +8 -4
- package/src/lib/nest/dto-class-property.js.map +1 -1
- package/src/lib/ts-morph/coerce-imports.js +1 -1
- package/src/lib/ts-morph/coerce-imports.js.map +1 -1
- package/src/lib/ts-morph/write-type.js +1 -1
- package/src/lib/ts-morph/write-type.js.map +1 -1
- package/src/lib/types/abstract-control.d.ts +8 -0
- package/src/lib/types/{form-definition-control.js → abstract-control.js} +1 -1
- package/src/lib/types/abstract-control.js.map +1 -0
- package/src/lib/types/form-definition-control.d.ts +0 -10
- package/src/lib/types/form-definition-control.js.map +0 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.CoerceGetPageOperation = exports.BuiltGetPageDtoDataMapperImplementation = exports.CoerceGetPageOperationDtoClass = exports.
|
|
3
|
+
exports.CoerceGetPageOperation = exports.BuiltGetPageDtoDataMapperImplementation = exports.CoerceGetPageOperationDtoClass = exports.BuildGetPageGetDataImplementation = exports.GetRawRowDataType = exports.GetResponseTypeFromUpstream = exports.CoerceGetPageDataMethod = exports.CoerceToPageDtoMethod = exports.CoerceToRowDtoMethod = exports.GetPageOperationColumnToCodeText = void 0;
|
|
4
4
|
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
5
5
|
const ts_morph_1 = require("@rxap/ts-morph");
|
|
6
6
|
const utilities_1 = require("@rxap/utilities");
|
|
@@ -23,7 +23,15 @@ 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
|
+
const { rowId } = options;
|
|
28
|
+
let rowIdSource;
|
|
29
|
+
if (rowId === null || rowId === void 0 ? void 0 : rowId.name) {
|
|
30
|
+
rowIdSource = `item.${rowId.name}`;
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
rowIdSource = '(pageIndex * pageSize + index).toFixed(0)';
|
|
34
|
+
}
|
|
27
35
|
(0, ts_morph_1.CoerceClassMethod)(classDeclaration, 'toRowDto', {
|
|
28
36
|
scope: ts_morph_2.Scope.Private,
|
|
29
37
|
returnType: rowClassName,
|
|
@@ -57,11 +65,8 @@ function CoerceToRowDtoMethod(sourceFile, classDeclaration, rowClassName, option
|
|
|
57
65
|
],
|
|
58
66
|
statements: [
|
|
59
67
|
'return {',
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
'(pageIndex * pageSize + index).toFixed(0)' :
|
|
63
|
-
`item.${(_a = options.rowIdProperty) !== null && _a !== void 0 ? _a : 'uuid'}`) + ',\n ',
|
|
64
|
-
(_c = (_b = options.propertyList) === null || _b === void 0 ? void 0 : _b.filter(p => p.name !== '__rowId').map(GetPageOperationColumnToCodeText).join(',\n ')) !== null && _c !== void 0 ? _c : '',
|
|
68
|
+
` __rowId: ${rowIdSource},\n `,
|
|
69
|
+
(_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
70
|
'};',
|
|
66
71
|
],
|
|
67
72
|
});
|
|
@@ -114,7 +119,7 @@ function CoerceToPageDtoMethod(sourceFile, classDeclaration, pageClassName, rowC
|
|
|
114
119
|
}
|
|
115
120
|
exports.CoerceToPageDtoMethod = CoerceToPageDtoMethod;
|
|
116
121
|
function CoerceGetPageDataMethod(sourceFile, classDeclaration, moduleSourceFile, options) {
|
|
117
|
-
var _a, _b, _c, _d, _e, _f, _g
|
|
122
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
118
123
|
const { upstream } = options;
|
|
119
124
|
const statements = [];
|
|
120
125
|
if (upstream && (0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
|
|
@@ -139,27 +144,37 @@ function CoerceGetPageDataMethod(sourceFile, classDeclaration, moduleSourceFile,
|
|
|
139
144
|
moduleSpecifier: '@nestjs/common',
|
|
140
145
|
},
|
|
141
146
|
]);
|
|
147
|
+
let pageIndex = 'pageIndex';
|
|
148
|
+
let pageSize = 'pageSize';
|
|
149
|
+
let sortBy = 'sortBy';
|
|
150
|
+
let sortDirection = 'sortDirection';
|
|
151
|
+
let filter = null;
|
|
152
|
+
let list = 'list';
|
|
153
|
+
let total = 'total';
|
|
154
|
+
const { mapper } = upstream;
|
|
155
|
+
if (mapper && (0, ts_morph_1.IsNormalizedPagedRequestMapper)(mapper)) {
|
|
156
|
+
pageIndex = (_a = mapper.pageIndex) !== null && _a !== void 0 ? _a : pageIndex;
|
|
157
|
+
pageSize = (_b = mapper.pageSize) !== null && _b !== void 0 ? _b : pageSize;
|
|
158
|
+
sortBy = (_c = mapper.sortBy) !== null && _c !== void 0 ? _c : sortBy;
|
|
159
|
+
sortDirection = (_d = mapper.sortDirection) !== null && _d !== void 0 ? _d : sortDirection;
|
|
160
|
+
filter = (_e = mapper.filter) !== null && _e !== void 0 ? _e : filter;
|
|
161
|
+
list = (_f = mapper.list) !== null && _f !== void 0 ? _f : list;
|
|
162
|
+
total = (_g = mapper.total) !== null && _g !== void 0 ? _g : total;
|
|
163
|
+
}
|
|
142
164
|
statements.push(`const response = await this.${memberName}.execute({
|
|
143
165
|
parameters: {
|
|
144
|
-
${
|
|
145
|
-
${
|
|
146
|
-
${
|
|
147
|
-
${
|
|
148
|
-
filter: ${
|
|
166
|
+
${pageIndex}: pageIndex,
|
|
167
|
+
${pageSize}: pageSize,
|
|
168
|
+
${sortBy}: sortBy,
|
|
169
|
+
${sortDirection}: sortDirection,
|
|
170
|
+
filter: ${filter ?
|
|
171
|
+
`filter.map((item) => \`\${ item.column }${filter.eq}\${ item.filter }\`).join('${filter.join}')` :
|
|
149
172
|
'filter'},
|
|
150
173
|
},
|
|
151
|
-
});`, 'return {', ` list: response.${
|
|
174
|
+
});`, 'return {', ` list: response.${list} ?? [],`, ` total: response.${total} ?? 0,`, '};');
|
|
152
175
|
}
|
|
153
176
|
else {
|
|
154
|
-
statements.push(
|
|
155
|
-
parameters: {
|
|
156
|
-
page: pageIndex,
|
|
157
|
-
size: pageSize,
|
|
158
|
-
sort: sortBy,
|
|
159
|
-
order: sortDirection,
|
|
160
|
-
filter: filter.map((item) => \`\${ item.column }:\${ item.filter }\`).join(';'),
|
|
161
|
-
},
|
|
162
|
-
});`, 'return {', ' list: response.entities ?? [],', ' total: response.maxCount ?? 0,', '};');
|
|
177
|
+
statements.push('return {', ' list: [],', ' total: 0,', '};');
|
|
163
178
|
}
|
|
164
179
|
(0, ts_morph_1.CoerceClassMethod)(classDeclaration, 'getPageData', {
|
|
165
180
|
scope: ts_morph_2.Scope.Public,
|
|
@@ -202,13 +217,18 @@ function CoerceGetPageDataMethod(sourceFile, classDeclaration, moduleSourceFile,
|
|
|
202
217
|
}
|
|
203
218
|
exports.CoerceGetPageDataMethod = CoerceGetPageDataMethod;
|
|
204
219
|
function GetResponseTypeFromUpstream(upstream) {
|
|
205
|
-
var _a
|
|
220
|
+
var _a;
|
|
206
221
|
if ((0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
|
|
222
|
+
const { mapper } = upstream;
|
|
223
|
+
let list = 'list';
|
|
224
|
+
if (mapper && (0, ts_morph_1.IsNormalizedPagedRequestMapper)(mapper)) {
|
|
225
|
+
list = (_a = mapper.list) !== null && _a !== void 0 ? _a : list;
|
|
226
|
+
}
|
|
207
227
|
const className = (0, ts_morph_1.OperationIdToResponseClassName)(upstream.operationId);
|
|
208
228
|
return {
|
|
209
|
-
name: `${className}['${
|
|
229
|
+
name: `${className}['${list}'][number]`,
|
|
210
230
|
namedImport: className,
|
|
211
|
-
moduleSpecifier: (0, ts_morph_1.
|
|
231
|
+
moduleSpecifier: (0, ts_morph_1.OperationIdToResponseClassImportPath)(upstream.operationId, upstream.scope),
|
|
212
232
|
};
|
|
213
233
|
}
|
|
214
234
|
throw new Error(`Upstream kind '${upstream.kind}' not supported`);
|
|
@@ -224,7 +244,7 @@ function GetRawRowDataType(options) {
|
|
|
224
244
|
};
|
|
225
245
|
}
|
|
226
246
|
exports.GetRawRowDataType = GetRawRowDataType;
|
|
227
|
-
function
|
|
247
|
+
function BuildGetPageGetDataImplementation(classDeclaration, moduleSourceFile, dto, options) {
|
|
228
248
|
return (operationOptions) => {
|
|
229
249
|
var _a;
|
|
230
250
|
(_a = operationOptions.statements) !== null && _a !== void 0 ? _a : (operationOptions.statements = []);
|
|
@@ -232,16 +252,16 @@ function BuildGetPageUpstreamGetDataImplementation(classDeclaration, moduleSourc
|
|
|
232
252
|
operationOptions.statements.push('const data = await this.getPageData(sortBy, sortDirection, pageSize, pageIndex, filter);');
|
|
233
253
|
};
|
|
234
254
|
}
|
|
235
|
-
exports.
|
|
255
|
+
exports.BuildGetPageGetDataImplementation = BuildGetPageGetDataImplementation;
|
|
236
256
|
function CoerceGetPageOperationDtoClass(classDeclaration, controllerName, moduleSourceFile, options) {
|
|
237
257
|
const sourceFile = classDeclaration.getSourceFile();
|
|
238
258
|
const project = sourceFile.getProject();
|
|
239
|
-
const {
|
|
259
|
+
const { propertyList, coerceToRowDtoMethod = CoerceToRowDtoMethod, coerceToPageDtoMethod = CoerceToPageDtoMethod, coerceGetPageDataMethod = CoerceGetPageDataMethod, buildOperationDtoClassName = coerce_operation_1.BuildOperationDtoClassName, dtoClassName = buildOperationDtoClassName(controllerName, options), rowId, } = options;
|
|
240
260
|
const { className: rowClassName, filePath: rowFilePath, } = (0, coerce_row_dto_class_1.CoerceRowDtoClass)({
|
|
241
261
|
project,
|
|
242
262
|
name: dtoClassName,
|
|
243
263
|
propertyList,
|
|
244
|
-
rowIdType:
|
|
264
|
+
rowIdType: rowId === null || rowId === void 0 ? void 0 : rowId.type,
|
|
245
265
|
});
|
|
246
266
|
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
247
267
|
namedImports: [rowClassName],
|
|
@@ -267,11 +287,48 @@ function BuiltGetPageDtoDataMapperImplementation(classDeclaration, moduleSourceF
|
|
|
267
287
|
}
|
|
268
288
|
exports.BuiltGetPageDtoDataMapperImplementation = BuiltGetPageDtoDataMapperImplementation;
|
|
269
289
|
function CoerceGetPageOperation(options) {
|
|
270
|
-
|
|
271
|
-
|
|
290
|
+
var _a;
|
|
291
|
+
const { operationName = 'get-page', tsMorphTransform = utilities_1.noop, upstream, builtDtoDataMapperImplementation = BuiltGetPageDtoDataMapperImplementation, coerceOperationDtoClass = CoerceGetPageOperationDtoClass, buildGetDataImplementation = BuildGetPageGetDataImplementation, idProperty, nestModule, controllerName, propertyList = [], paramList: paramList = [], } = options;
|
|
292
|
+
if (idProperty) {
|
|
293
|
+
/**
|
|
294
|
+
* If the module is not specified. This controller has an own module. Else the
|
|
295
|
+
* module is originated by another controller.
|
|
296
|
+
*
|
|
297
|
+
* **Example**
|
|
298
|
+
* true:
|
|
299
|
+
* The controller ReportDetailsController should be extended with getById Operation.
|
|
300
|
+
* And the controller is used in the module ReportDetailsModule
|
|
301
|
+
*
|
|
302
|
+
* name = "report-details"
|
|
303
|
+
* module = undefined
|
|
304
|
+
*
|
|
305
|
+
* false:
|
|
306
|
+
* The controller ReportDetailsNotificationController should be extend with getById Operation.
|
|
307
|
+
* And the controller ise used in the module ReportDetailsModule
|
|
308
|
+
*
|
|
309
|
+
* name = "notification"
|
|
310
|
+
* module = "report-details"
|
|
311
|
+
*/
|
|
312
|
+
const isFirstBornSibling = !nestModule || nestModule === controllerName;
|
|
313
|
+
// if (isFirstBornSibling) {
|
|
314
|
+
// CoerceArrayItems(propertyList, [{
|
|
315
|
+
// name: idProperty.name,
|
|
316
|
+
// type: idProperty.type ?? 'string',
|
|
317
|
+
// isArray: idProperty.isArray,
|
|
318
|
+
// }], (a, b) => a.name === b.name, true);
|
|
319
|
+
// }
|
|
320
|
+
(0, utilities_1.CoerceArrayItems)(paramList, [{
|
|
321
|
+
name: idProperty.name,
|
|
322
|
+
type: idProperty.type,
|
|
323
|
+
fromParent: (_a = idProperty.fromParent) !== null && _a !== void 0 ? _a : !isFirstBornSibling,
|
|
324
|
+
}], (a, b) => a.name === b.name, true);
|
|
325
|
+
}
|
|
326
|
+
return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { propertyList,
|
|
327
|
+
paramList,
|
|
328
|
+
operationName,
|
|
272
329
|
builtDtoDataMapperImplementation,
|
|
273
330
|
coerceOperationDtoClass,
|
|
274
|
-
|
|
331
|
+
buildGetDataImplementation, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName, moduleSourceFile) => {
|
|
275
332
|
if (!upstream || !(0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
|
|
276
333
|
(0, coerce_type_alias_1.CoerceTypeAlias)(sourceFile, 'RawRowData', {
|
|
277
334
|
isExported: false,
|
|
@@ -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,4 +1,8 @@
|
|
|
1
|
+
import { ClassDeclaration, SourceFile, WriterFunction } from 'ts-morph';
|
|
2
|
+
import { CoerceDtoClassOutput } from './coerce-dto-class';
|
|
1
3
|
import { CoerceGetByIdControllerOptions } from './coerce-get-by-id-operation';
|
|
4
|
+
import { CoerceOperationOptions, TransformOperation } from './coerce-operation';
|
|
2
5
|
export interface CoerceGetRootOperationOptions extends CoerceGetByIdControllerOptions {
|
|
3
6
|
}
|
|
7
|
+
export declare function BuildGetRootDtoDataMapperImplementation(classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, dto: CoerceDtoClassOutput | null, options: Readonly<CoerceOperationOptions>): TransformOperation<string | WriterFunction>;
|
|
4
8
|
export declare function CoerceGetRootOperation(options: Readonly<CoerceGetRootOperationOptions>): import("@angular-devkit/schematics").Rule;
|
|
@@ -1,11 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.CoerceGetRootOperation = void 0;
|
|
3
|
+
exports.CoerceGetRootOperation = exports.BuildGetRootDtoDataMapperImplementation = void 0;
|
|
4
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
4
5
|
const utilities_1 = require("@rxap/utilities");
|
|
5
6
|
const coerce_get_by_id_operation_1 = require("./coerce-get-by-id-operation");
|
|
6
7
|
const table_query_list_1 = require("./table-query-list");
|
|
8
|
+
function BuildGetRootDtoDataMapperImplementation(classDeclaration, moduleSourceFile, dto, options) {
|
|
9
|
+
const { isArray, } = options;
|
|
10
|
+
return () => {
|
|
11
|
+
// TODO : implement the data mapper
|
|
12
|
+
return isArray ? '[]' : '{}';
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
exports.BuildGetRootDtoDataMapperImplementation = BuildGetRootDtoDataMapperImplementation;
|
|
7
16
|
function CoerceGetRootOperation(options) {
|
|
8
|
-
const { tsMorphTransform = utilities_1.noop, propertyList = [], operationName = 'get-root', idProperty = null, dtoClassNameSuffix = '-item', isArray = true, } = options;
|
|
17
|
+
const { tsMorphTransform = utilities_1.noop, propertyList = [], operationName = 'get-root', builtDtoDataMapperImplementation = BuildGetRootDtoDataMapperImplementation, idProperty = null, dtoClassNameSuffix = '-item', isArray = true, } = options;
|
|
9
18
|
(0, utilities_1.CoerceArrayItems)(propertyList, [
|
|
10
19
|
{
|
|
11
20
|
name: 'hasChildren',
|
|
@@ -13,7 +22,7 @@ function CoerceGetRootOperation(options) {
|
|
|
13
22
|
},
|
|
14
23
|
{
|
|
15
24
|
name: 'children',
|
|
16
|
-
type:
|
|
25
|
+
type: ts_morph_1.TypeNames.Self,
|
|
17
26
|
isArray: true,
|
|
18
27
|
isOptional: true,
|
|
19
28
|
isType: true,
|
|
@@ -22,7 +31,8 @@ function CoerceGetRootOperation(options) {
|
|
|
22
31
|
return (0, coerce_get_by_id_operation_1.CoerceGetByIdOperation)(Object.assign(Object.assign({}, options), { operationName,
|
|
23
32
|
idProperty,
|
|
24
33
|
dtoClassNameSuffix,
|
|
25
|
-
isArray,
|
|
34
|
+
isArray,
|
|
35
|
+
builtDtoDataMapperImplementation, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName, moduleSourceFile, dto) => {
|
|
26
36
|
return Object.assign({ queryList: table_query_list_1.TABLE_QUERY_LIST }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName, moduleSourceFile, dto));
|
|
27
37
|
} }));
|
|
28
38
|
}
|
|
@@ -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,+CAGyB;
|
|
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,6CAA2C;AAC3C,+CAGyB;AAOzB,6EAGsC;AAKtC,yDAAsD;AAMtD,SAAgB,uCAAuC,CACrD,gBAAkC,EAClC,gBAA4B,EAC5B,GAAgC,EAChC,OAAyC;IAEzC,MAAM,EACJ,OAAO,GACR,GAAG,OAAO,CAAC;IACZ,OAAO,GAAG,EAAE;QACV,mCAAmC;QACnC,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/B,CAAC,CAAC;AACJ,CAAC;AAbD,0FAaC;AAED,SAAgB,sBAAsB,CAAC,OAAgD;IACrF,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,YAAY,GAAG,EAAE,EACjB,aAAa,GAAG,UAAU,EAC1B,gCAAgC,GAAG,uCAAuC,EAC1E,UAAU,GAAG,IAAI,EACjB,kBAAkB,GAAG,OAAO,EAC5B,OAAO,GAAG,IAAI,GACf,GAAG,OAAO,CAAC;IACZ,IAAA,4BAAgB,EAAC,YAAY,EAAE;QAC7B;YACE,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,SAAS;SAChB;QACD;YACE,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,oBAAS,CAAC,IAAI;YACpB,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,IAAI;SACb;KACF,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,IAAA,mDAAsB,kCACxB,OAAO,KACV,aAAa;QACb,UAAU;QACV,kBAAkB;QAClB,OAAO;QACP,gCAAgC,EAChC,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,GAAG,EACH,EAAE;YAEF,uBACE,SAAS,EAAE,mCAAgB,IACxB,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,EAAE,GAAG,CAAC,EAClG;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AA7CD,wDA6CC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Rule } from '@angular-devkit/schematics';
|
|
2
|
-
import {
|
|
2
|
+
import { OverwriteOptions } from '@rxap/schematics-utilities';
|
|
3
|
+
import { NormalizedUpstreamOptions } from '@rxap/ts-morph';
|
|
3
4
|
import { TsMorphNestProjectTransformOptions } from '@rxap/workspace-ts-morph';
|
|
4
5
|
import { ClassDeclaration, Project, SourceFile, WriterFunction } from 'ts-morph';
|
|
5
6
|
import { OperationOptions, OperationParameter } from './add-operation-to-controller';
|
|
@@ -26,16 +27,18 @@ export interface CoerceOperationOptions<Options = Record<string, any>> extends T
|
|
|
26
27
|
buildDtoReturnImplementation?: (classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, dto: CoerceDtoClassOutput | null, options: Readonly<CoerceOperationOptions & Options>) => TransformOperation;
|
|
27
28
|
builtDtoDataMapperImplementation?: (classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, dto: CoerceDtoClassOutput | null, options: Readonly<CoerceOperationOptions & Options>) => TransformOperation<string | WriterFunction>;
|
|
28
29
|
buildUpstreamGetDataImplementation?: (classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, dto: CoerceDtoClassOutput | null, options: Readonly<CoerceOperationOptions & Options>) => TransformOperation<void>;
|
|
30
|
+
buildGetDataImplementation?: (classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, dto: CoerceDtoClassOutput | null, options: Readonly<CoerceOperationOptions & Options>) => TransformOperation<void>;
|
|
29
31
|
coerceOperationDtoClass?: (classDeclaration: ClassDeclaration, controllerName: string, moduleSourceFile: SourceFile, options: Readonly<CoerceOperationOptions & Options>) => CoerceDtoClassOutput | null;
|
|
30
32
|
buildOperationDtoClassName?: (controllerName: string, options: Readonly<Pick<CoerceOperationOptions, 'dtoClassNameSuffix' | 'dtoClassName'>>) => string;
|
|
31
|
-
upstream?:
|
|
33
|
+
upstream?: NormalizedUpstreamOptions | null;
|
|
32
34
|
propertyList?: DtoClassProperty[];
|
|
33
35
|
isArray?: boolean;
|
|
34
36
|
isReturnVoid?: boolean;
|
|
35
37
|
dtoClassNameSuffix?: string;
|
|
36
38
|
dtoClassName?: string;
|
|
39
|
+
overwrite: OverwriteOptions;
|
|
37
40
|
}
|
|
38
|
-
export declare function CoerceUpstreamBasicOperationImplementation(classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, upstream:
|
|
41
|
+
export declare function CoerceUpstreamBasicOperationImplementation(classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, upstream: NormalizedUpstreamOptions): {
|
|
39
42
|
className: string;
|
|
40
43
|
memberName: string;
|
|
41
44
|
};
|
|
@@ -110,14 +110,20 @@ function BuildDtoReturnImplementation(classDeclaration, moduleSourceFile, dto, o
|
|
|
110
110
|
if (!isReturnVoid && dto) {
|
|
111
111
|
const sourceFile = classDeclaration.getSourceFile();
|
|
112
112
|
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
113
|
-
namedImports: ['ToDtoInstance'],
|
|
113
|
+
namedImports: [isArray ? 'ToDtoInstanceList' : 'ToDtoInstance'],
|
|
114
114
|
moduleSpecifier: '@rxap/nest-dto',
|
|
115
115
|
});
|
|
116
116
|
const mapper = builtDtoDataMapperImplementation(classDeclaration, moduleSourceFile, dto, options)(operationOptions);
|
|
117
117
|
operationOptions.returnType = dto.className + (isArray ? '[]' : '');
|
|
118
118
|
(_a = operationOptions.statements) !== null && _a !== void 0 ? _a : (operationOptions.statements = []);
|
|
119
119
|
operationOptions.statements = (0, utilities_1.coerceArray)(operationOptions.statements);
|
|
120
|
-
|
|
120
|
+
if (isArray) {
|
|
121
|
+
operationOptions.statements.push('return ToDtoInstanceList(');
|
|
122
|
+
}
|
|
123
|
+
else {
|
|
124
|
+
operationOptions.statements.push('return ToDtoInstance(');
|
|
125
|
+
}
|
|
126
|
+
operationOptions.statements.push(dto.className + ',', w => {
|
|
121
127
|
if (typeof mapper === 'string') {
|
|
122
128
|
w.write(mapper);
|
|
123
129
|
}
|
|
@@ -157,7 +163,9 @@ function BuildUpstreamGetDataImplementation(classDeclaration, moduleSourceFile,
|
|
|
157
163
|
exports.BuildUpstreamGetDataImplementation = BuildUpstreamGetDataImplementation;
|
|
158
164
|
function CoerceUpstreamDefaultOperationImplementation(classDeclaration, moduleSourceFile, dto, options) {
|
|
159
165
|
return (operationOptions) => {
|
|
160
|
-
|
|
166
|
+
var _a;
|
|
167
|
+
const { upstream, buildDtoReturnImplementation = BuildDtoReturnImplementation, buildUpstreamGetDataImplementation = BuildUpstreamGetDataImplementation, buildGetDataImplementation = utilities_1.noop, } = options;
|
|
168
|
+
(_a = buildGetDataImplementation(classDeclaration, moduleSourceFile, dto, options)) === null || _a === void 0 ? void 0 : _a(operationOptions);
|
|
161
169
|
if (upstream) {
|
|
162
170
|
operationOptions.isAsync = true;
|
|
163
171
|
buildUpstreamGetDataImplementation(classDeclaration, moduleSourceFile, dto, options)(operationOptions);
|
|
@@ -167,7 +175,7 @@ function CoerceUpstreamDefaultOperationImplementation(classDeclaration, moduleSo
|
|
|
167
175
|
}
|
|
168
176
|
exports.CoerceUpstreamDefaultOperationImplementation = CoerceUpstreamDefaultOperationImplementation;
|
|
169
177
|
function CoerceOperation(options) {
|
|
170
|
-
const { controllerName, project, paramList = [], feature, shared, tsMorphTransform = utilities_1.noop, operationName, skipCoerce, controllerPath, queryList = [], coerceUpstreamOperationImplementation = CoerceUpstreamDefaultOperationImplementation, coerceOperationDtoClass = CoerceOperationDtoClass, } = options;
|
|
178
|
+
const { controllerName, project, paramList = [], feature, shared, tsMorphTransform = utilities_1.noop, operationName, skipCoerce, controllerPath, queryList = [], coerceUpstreamOperationImplementation = CoerceUpstreamDefaultOperationImplementation, coerceOperationDtoClass = CoerceOperationDtoClass, overwrite, } = options;
|
|
171
179
|
let { nestModule, directory, path } = options;
|
|
172
180
|
/**
|
|
173
181
|
* If the module is not specified. This controller has an own module. Else the
|
|
@@ -259,7 +267,8 @@ function CoerceOperation(options) {
|
|
|
259
267
|
(0, ts_morph_1.CoerceOperationParamList)(paramList, classDeclaration);
|
|
260
268
|
(0, add_operation_to_controller_1.AddOperationToController)(controllerSourceFile, classDeclaration, operationName, Object.assign({ isAsync: true, paramList,
|
|
261
269
|
queryList,
|
|
262
|
-
path
|
|
270
|
+
path,
|
|
271
|
+
overwrite }, operationOptions));
|
|
263
272
|
}, [`${nestController}.controller.ts?`, `${(0, utilities_1.dasherize)(nestModule)}.module.ts?`]),
|
|
264
273
|
]);
|
|
265
274
|
}
|
|
@@ -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,
|
|
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,8 +1,11 @@
|
|
|
1
1
|
import { Rule } from '@angular-devkit/schematics';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { ClassDeclaration, SourceFile, WriterFunction } from 'ts-morph';
|
|
3
|
+
import { AbstractControl } from '../types/abstract-control';
|
|
4
|
+
import { CoerceDtoClassOutput } from './coerce-dto-class';
|
|
5
|
+
import { CoerceOperationOptions, TransformOperation } from './coerce-operation';
|
|
4
6
|
export interface CoerceOptionsOperationRuleOptions extends CoerceOperationOptions {
|
|
5
|
-
control:
|
|
7
|
+
control: AbstractControl;
|
|
6
8
|
responseDtoName?: string;
|
|
7
9
|
}
|
|
10
|
+
export declare function BuildOptionsDtoDataMapperImplementation(classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, dto: CoerceDtoClassOutput | null, options: Readonly<CoerceOperationOptions>): TransformOperation<string | WriterFunction>;
|
|
8
11
|
export declare function CoerceOptionsOperationRule(options: Readonly<CoerceOptionsOperationRuleOptions>): Rule;
|
|
@@ -1,22 +1,76 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.CoerceOptionsOperationRule = void 0;
|
|
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");
|
|
7
|
+
function BuildOptionsDtoDataMapperImplementation(classDeclaration, moduleSourceFile, dto, options) {
|
|
8
|
+
const { isArray, upstream, } = options;
|
|
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
|
+
}
|
|
53
|
+
// TODO : implement the data mapper
|
|
54
|
+
return isArray ? '[]' : '{}';
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
exports.BuildOptionsDtoDataMapperImplementation = BuildOptionsDtoDataMapperImplementation;
|
|
6
58
|
function CoerceOptionsOperationRule(options) {
|
|
7
|
-
const { control, isArray = true, responseDtoName, propertyList = [
|
|
59
|
+
const { control, builtDtoDataMapperImplementation = BuildOptionsDtoDataMapperImplementation, isArray = true, responseDtoName, propertyList = [
|
|
8
60
|
{
|
|
9
61
|
name: 'display',
|
|
10
62
|
type: 'string',
|
|
11
63
|
},
|
|
12
64
|
{
|
|
13
65
|
name: 'value',
|
|
14
|
-
type: control,
|
|
66
|
+
type: control.type,
|
|
15
67
|
},
|
|
16
68
|
], } = options;
|
|
17
69
|
return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { propertyList,
|
|
18
|
-
isArray,
|
|
19
|
-
|
|
70
|
+
isArray,
|
|
71
|
+
builtDtoDataMapperImplementation, buildOperationDtoClassName: (controllerName, { dtoClassName, dtoClassNameSuffix }) => {
|
|
72
|
+
const className = responseDtoName !== null && responseDtoName !== void 0 ? responseDtoName : (0, utilities_1.joinWithDash)([dtoClassName !== null && dtoClassName !== void 0 ? dtoClassName : controllerName, control.name, 'control', 'options']);
|
|
73
|
+
return dtoClassName !== null && dtoClassName !== void 0 ? dtoClassName : (dtoClassNameSuffix ? (0, utilities_1.CoerceSuffix)(className, dtoClassNameSuffix) : className);
|
|
20
74
|
} }));
|
|
21
75
|
}
|
|
22
76
|
exports.CoerceOptionsOperationRule = CoerceOptionsOperationRule;
|
|
@@ -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;
|
|
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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"}
|
|
@@ -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,7 @@
|
|
|
1
|
+
import { NormalizedDataProperty } from '@rxap/ts-morph';
|
|
1
2
|
import { CoerceGetPageOperationOptions } from './coerce-get-page-operation';
|
|
2
3
|
export interface CoerceTableSelectOperationOptions extends CoerceGetPageOperationOptions {
|
|
3
|
-
rowDisplayProperty
|
|
4
|
-
rowValueProperty?:
|
|
4
|
+
rowDisplayProperty: NormalizedDataProperty;
|
|
5
|
+
rowValueProperty?: NormalizedDataProperty;
|
|
5
6
|
}
|
|
6
7
|
export declare function CoerceTableSelectOperationRule(options: CoerceTableSelectOperationOptions): import("@angular-devkit/schematics").Rule;
|