@rxap/schematics-ts-morph 16.1.0-dev.2 → 16.1.0-dev.21

package/src/lib/nest/coerce-get-by-id-operation.js

@@ -1,64 +1,111 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CoerceGetByIdOperation = void 0;
-const schematics_utilities_1 = require("@rxap/schematics-utilities");
-const ts_morph_1 = require("@rxap/ts-morph");
-const coerce_dto_class_1 = require("./coerce-dto-class");
-const coerce_operation_1 = require("./coerce-operation");
-function CoerceGetByIdOperation(options) {
-    const { controllerName, isArray, paramList = [], propertyList = [], idProperty = { name: 'uuid', type: 'string' }, operationName = 'getById', } = options;
-    let { nestModule } = options;
-    /**
-     * If the module is not specified. This controller has an own module. Else the
-     * module is originated by another controller.
-     *
-     * **Example**
-     * true:
-     * The controller ReportDetailsController should be extended with getById Operation.
-     * And the controller is used in the module ReportDetailsModule
-     *
-     * name = "report-details"
-     * module = undefined
-     *
-     * false:
-     * The controller ReportDetailsNotificationController should be extend with getById Operation.
-     * And the controller ise used in the module ReportDetailsModule
-     *
-     * name = "notification"
-     * module = "report-details"
-     */
-    const isFirstBornSibling = !nestModule || nestModule === controllerName;
-    if (isFirstBornSibling && !propertyList.some(param => param.name === idProperty.name)) {
-        propertyList.unshift(idProperty);
+exports.CoerceGetByIdOperation = exports.BuiltGetByIdDtoDataMapperImplementation = exports.BuildUpstreamGetByIdParametersImplementation = void 0;
+const utilities_1 = require("@rxap/utilities");
+const ts_morph_1 = require("ts-morph");
+const coerce_get_operation_1 = require("./coerce-get-operation");
+const dto_class_property_1 = require("./dto-class-property");
+function BuildUpstreamGetByIdParametersImplementation(classDeclaration, moduleSourceFile, dto, options) {
+    return () => {
+        const { idProperty } = options;
+        return idProperty ? `{ parameters: { ${idProperty.name} } }` : '';
+    };
+}
+exports.BuildUpstreamGetByIdParametersImplementation = BuildUpstreamGetByIdParametersImplementation;
+function UpstreamMapper(sourceProperty, propertyList, idProperty) {
+    var _a;
+    const mapper = {};
+    if (idProperty) {
+        mapper[idProperty.name] = idProperty.name;
     }
-    if (isFirstBornSibling) {
-        nestModule = controllerName;
+    for (const property of propertyList.filter(p => !idProperty || p.name !== idProperty.name).map(p => (0, dto_class_property_1.NormalizeDataClassProperty)(p))) {
+        mapper[property.name] = `${sourceProperty}.${(_a = property.source) !== null && _a !== void 0 ? _a : property.name}`;
+        if (property.isType) {
+            // property is a complex object
+            if (property.isArray) {
+                mapper[property.name] = w => {
+                    var _a;
+                    w.write(`${sourceProperty}.${(_a = property.source) !== null && _a !== void 0 ? _a : property.name}.map(item => (`);
+                    ts_morph_1.Writers.object(UpstreamMapper('item', property.memberList))(w);
+                    w.write('))');
+                };
+            }
+            else {
+                mapper[property.name] = ts_morph_1.Writers.object(UpstreamMapper(mapper[property.name], property.memberList));
+            }
+        }
     }
-    if (!paramList.some(param => param.name === idProperty.name)) {
-        paramList.push({
-            name: idProperty.name,
-            type: idProperty.type,
-            alias: isFirstBornSibling ? undefined : (0, schematics_utilities_1.CoerceSuffix)(nestModule, '-' + idProperty.name),
-            fromParent: !isFirstBornSibling,
-        });
+    return mapper;
+}
+function BuiltGetByIdDtoDataMapperImplementation(classDeclaration, moduleSourceFile, dto, options) {
+    const { propertyList = [], upstream, isArray, idProperty, } = options;
+    return () => {
+        if (upstream) {
+            if (isArray) {
+                return w => {
+                    w.write('data.map(item => (');
+                    ts_morph_1.Writers.object(UpstreamMapper('data', propertyList, idProperty))(w);
+                    w.write('))');
+                };
+            }
+            else {
+                return ts_morph_1.Writers.object(UpstreamMapper('data', propertyList, idProperty));
+            }
+        }
+        else {
+            if (isArray) {
+                return '[]';
+            }
+            if (idProperty) {
+                return `{ ${idProperty.name} }`;
+            }
+            return '{}';
+        }
+    };
+}
+exports.BuiltGetByIdDtoDataMapperImplementation = BuiltGetByIdDtoDataMapperImplementation;
+function CoerceGetByIdOperation(options) {
+    var _a, _b;
+    const { controllerName, paramList = [], propertyList = [], idProperty = { name: 'uuid', type: 'string' }, operationName = 'getById', nestModule, buildUpstreamGetParametersImplementation = BuildUpstreamGetByIdParametersImplementation, builtDtoDataMapperImplementation = BuiltGetByIdDtoDataMapperImplementation, } = options;
+    if (idProperty) {
+        /**
+         * If the module is not specified. This controller has an own module. Else the
+         * module is originated by another controller.
+         *
+         * **Example**
+         * true:
+         * The controller ReportDetailsController should be extended with getById Operation.
+         * And the controller is used in the module ReportDetailsModule
+         *
+         * name = "report-details"
+         * module = undefined
+         *
+         * false:
+         * The controller ReportDetailsNotificationController should be extend with getById Operation.
+         * And the controller ise used in the module ReportDetailsModule
+         *
+         * name = "notification"
+         * module = "report-details"
+         */
+        const isFirstBornSibling = !nestModule || nestModule === controllerName;
+        if (isFirstBornSibling) {
+            (0, utilities_1.CoerceArrayItems)(propertyList, [{
+                    name: idProperty.name,
+                    type: (_a = idProperty.type) !== null && _a !== void 0 ? _a : 'string',
+                    isArray: idProperty.isArray,
+                }], (a, b) => a.name === b.name, true);
+        }
+        (0, utilities_1.CoerceArrayItems)(paramList, [{
+                name: idProperty.name,
+                type: idProperty.type,
+                fromParent: (_b = idProperty.fromParent) !== null && _b !== void 0 ? _b : !isFirstBornSibling,
+            }], (a, b) => a.name === b.name, true);
     }
-    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { nestModule,
-        controllerName,
+    return (0, coerce_get_operation_1.CoerceGetOperation)(Object.assign(Object.assign({}, options), { operationName,
         paramList,
-        operationName, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
-            const { className: dtoClassName, filePath: dtoFilePath, } = (0, coerce_dto_class_1.CoerceDtoClass)({
-                project,
-                name: controllerName,
-                propertyList,
-            });
-            (0, ts_morph_1.CoerceImports)(sourceFile, {
-                namedImports: [dtoClassName],
-                moduleSpecifier: dtoFilePath,
-            });
-            return {
-                returnType: dtoClassName + (isArray ? '[]' : ''),
-            };
-        } }));
+        propertyList,
+        buildUpstreamGetParametersImplementation,
+        builtDtoDataMapperImplementation }));
 }
 exports.CoerceGetByIdOperation = CoerceGetByIdOperation;
 //# sourceMappingURL=coerce-get-by-id-operation.js.map

package/src/lib/nest/coerce-get-by-id-operation.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-get-by-id-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-by-id-operation.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAC1D,6CAA+C;AAC/C,yDAAoD;AACpD,yDAG4B;AAU5B,SAAgB,sBAAsB,CAAC,OAAuC;IAC5E,MAAM,EACJ,cAAc,EACd,OAAO,EACP,SAAS,GAAE,EAAE,EACb,YAAY,GAAG,EAAE,EACjB,UAAU,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,EAC7C,aAAa,GAAG,SAAS,GAC1B,GAAG,OAAO,CAAC;IACZ,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAE7B;;;;;;;;;;;;;;;;;;OAkBG;IACH,MAAM,kBAAkB,GAAG,CAAC,UAAU,IAAI,UAAU,KAAK,cAAc,CAAC;IAExE,IAAI,kBAAkB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,EAAE;QACrF,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;KAClC;IAED,IAAI,kBAAkB,EAAE;QACtB,UAAU,GAAG,cAAc,CAAC;KAC7B;IAED,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,EAAE;QAC5D,SAAS,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,mCAAY,EAAC,UAAW,EAAE,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC;YACxF,UAAU,EAAE,CAAC,kBAAkB;SAChC,CAAC,CAAC;KACJ;IAED,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,UAAU;QACV,cAAc;QACd,SAAS;QACT,aAAa,EACb,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,EAAE;YAEF,MAAM,EACJ,SAAS,EAAE,YAAY,EACvB,QAAQ,EAAE,WAAW,GACtB,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,cAAc;gBACpB,YAAY;aACb,CAAC,CAAC;YAEH,IAAA,wBAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,YAAY,CAAE;gBAC9B,eAAe,EAAE,WAAW;aAC7B,CAAC,CAAC;YAEH,OAAO;gBACL,UAAU,EAAE,YAAY,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;aACjD,CAAC;QAEJ,CAAC,IACD,CAAC;AAEL,CAAC;AAnFD,wDAmFC"}
+{"version":3,"file":"coerce-get-by-id-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-by-id-operation.ts"],"names":[],"mappings":"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"}

package/src/lib/nest/coerce-get-children-operation.js

@@ -1,53 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceGetChildrenOperation = void 0;
-const schematics_utilities_1 = require("@rxap/schematics-utilities");
 const utilities_1 = require("@rxap/utilities");
-const coerce_imports_1 = require("../ts-morph/coerce-imports");
-const coerce_dto_class_1 = require("./coerce-dto-class");
-const coerce_operation_1 = require("./coerce-operation");
-const table_query_list_1 = require("./table-query-list");
+const coerce_get_root_operation_1 = require("./coerce-get-root-operation");
 function CoerceGetChildrenOperation(options) {
-    const { tsMorphTransform = utilities_1.noop, paramList = [], propertyList = [], } = options;
-    let { controllerName } = options;
-    (0, utilities_1.CoerceArrayItems)(propertyList, [
+    const { paramList = [], operationName = 'get-children', } = options;
+    (0, utilities_1.CoerceArrayItems)(paramList, [
         {
-            name: 'hasChildren',
-            type: 'boolean',
-        },
-        {
-            name: 'children',
-            type: '<self>',
-            isArray: true,
-            isOptional: true,
-            isType: true,
-        },
+            name: 'parentUuid',
+            type: 'string',
+        }
     ], (a, b) => a.name === b.name);
-    controllerName = (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-tree-table');
-    paramList.push({
-        name: 'parentUuid',
-        type: 'string',
-    });
-    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { 
-        // TODO : remove after migration to controllerName
-        controllerName, operationName: 'get-children', paramList, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
-            const { className, filePath, } = (0, coerce_dto_class_1.CoerceDtoClass)({
-                project,
-                name: (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-item'),
-                propertyList,
-            });
-            (0, coerce_imports_1.CoerceImports)(sourceFile, [
-                {
-                    namedImports: ['FilterQuery', 'FilterQueryPipe'],
-                    moduleSpecifier: '@rxap/nest-utilities',
-                },
-                {
-                    namedImports: [className],
-                    moduleSpecifier: filePath,
-                },
-            ]);
-            return Object.assign({ queryList: table_query_list_1.TABLE_QUERY_LIST, returnType: className + '[]' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
-        } }));
+    return (0, coerce_get_root_operation_1.CoerceGetRootOperation)(Object.assign(Object.assign({}, options), { operationName,
+        paramList }));
 }
 exports.CoerceGetChildrenOperation = CoerceGetChildrenOperation;
 //# sourceMappingURL=coerce-get-children-operation.js.map

package/src/lib/nest/coerce-get-children-operation.js.map

@@ -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;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"}
+{"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,+CAAmD;AACnD,2EAGqC;AAIrC,SAAgB,0BAA0B,CAAC,OAAoD;IAC7F,MAAM,EACJ,SAAS,GAAG,EAAE,EACd,aAAa,GAAG,cAAc,GAC/B,GAAG,OAAO,CAAC;IACZ,IAAA,4BAAgB,EAAC,SAAS,EAAE;QAC1B;YACA,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,QAAQ;SACb;KACF,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,IAAA,kDAAsB,kCACxB,OAAO,KACV,aAAa;QACb,SAAS,IACT,CAAC;AACL,CAAC;AAhBD,gEAgBC"}

package/src/lib/nest/coerce-get-data-grid-operation.d.ts

@@ -1,7 +1,8 @@
-import { CoerceOperationOptions } from './coerce-operation';
-import { DtoClassProperty } from './create-dto-class';
-export interface CoerceGetDataGridOperationOptions extends Omit<CoerceOperationOptions, 'operationName'> {
+import { CoerceGetByIdControllerOptions } from './coerce-get-by-id-operation';
+export interface CoerceGetDataGridOperationOptions extends CoerceGetByIdControllerOptions {
+    /**
+     * @deprecated use isArray instead
+     */
     collection?: boolean;
-    propertyList?: DtoClassProperty[];
 }
 export declare function CoerceGetDataGridOperation(options: Readonly<CoerceGetDataGridOperationOptions>): import("@angular-devkit/schematics").Rule;

package/src/lib/nest/coerce-get-data-grid-operation.js

@@ -1,29 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceGetDataGridOperation = void 0;
-const schematics_utilities_1 = require("@rxap/schematics-utilities");
-const coerce_imports_1 = require("../ts-morph/coerce-imports");
-const coerce_dto_class_1 = require("./coerce-dto-class");
-const coerce_operation_1 = require("./coerce-operation");
+const coerce_get_by_id_operation_1 = require("./coerce-get-by-id-operation");
 function CoerceGetDataGridOperation(options) {
-    let { tsMorphTransform, collection, propertyList, controllerName, } = options;
-    collection !== null && collection !== void 0 ? collection : (collection = false);
-    tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => ({}));
-    propertyList !== null && propertyList !== void 0 ? propertyList : (propertyList = []);
-    controllerName =
-        (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-data-grid');
-    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { controllerName, operationName: 'get', tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
-            const { className: dtoClassName, filePath: dtoFilePath, } = (0, coerce_dto_class_1.CoerceDtoClass)({
-                project,
-                name: controllerName,
-                propertyList,
-            });
-            (0, coerce_imports_1.CoerceImports)(sourceFile, {
-                namedImports: [dtoClassName],
-                moduleSpecifier: dtoFilePath,
-            });
-            return Object.assign({ returnType: dtoClassName + (collection ? '[]' : '') }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
-        } }));
+    const { collection = false, isArray = collection !== null && collection !== void 0 ? collection : false, 
+    // if not explicitly defined the idProperty is set to null, as not each data grid operation has an id
+    idProperty = null, operationName = idProperty ? 'getById' : 'get', } = options;
+    return (0, coerce_get_by_id_operation_1.CoerceGetByIdOperation)(Object.assign(Object.assign({}, options), { operationName,
+        idProperty,
+        isArray }));
 }
 exports.CoerceGetDataGridOperation = CoerceGetDataGridOperation;
 //# sourceMappingURL=coerce-get-data-grid-operation.js.map

package/src/lib/nest/coerce-get-data-grid-operation.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-get-data-grid-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-data-grid-operation.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAC1D,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAQ5B,SAAgB,0BAA0B,CAAC,OAAoD;IAC7F,IAAI,EACF,gBAAgB,EAChB,UAAU,EACV,YAAY,EACZ,cAAc,GACf,GAAG,OAAO,CAAC;IACZ,UAAU,aAAV,UAAU,cAAV,UAAU,IAAV,UAAU,GAAK,KAAK,EAAC;IACrB,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAC;IAChC,YAAY,aAAZ,YAAY,cAAZ,YAAY,IAAZ,YAAY,GAAK,EAAE,EAAC;IACpB,cAAc;QACZ,IAAA,mCAAY,EAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IAE7C,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,cAAc,EACd,aAAa,EAAE,KAAK,EACpB,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,EAAE;YAEF,MAAM,EACJ,SAAS,EAAE,YAAY,EACvB,QAAQ,EAAE,WAAW,GACtB,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,cAAc;gBACpB,YAAY;aACb,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,YAAY,CAAE;gBAC9B,eAAe,EAAE,WAAW;aAC7B,CAAC,CAAC;YAEH,uBACE,UAAU,EAAE,YAAY,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAChD,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,EAC3E;QAEJ,CAAC,IACD,CAAC;AAEL,CAAC;AA9CD,gEA8CC"}
+{"version":3,"file":"coerce-get-data-grid-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-data-grid-operation.ts"],"names":[],"mappings":";;;AAAA,6EAGsC;AAStC,SAAgB,0BAA0B,CAAC,OAAoD;IAC7F,MAAM,EACJ,UAAU,GAAE,KAAK,EACjB,OAAO,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,KAAK;IAC7B,qGAAqG;IACrG,UAAU,GAAG,IAAI,EACjB,aAAa,GAAG,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,GAC/C,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,mDAAsB,kCACxB,OAAO,KACV,aAAa;QACb,UAAU;QACV,OAAO,IACP,CAAC;AAEL,CAAC;AAhBD,gEAgBC"}

package/src/lib/nest/coerce-get-operation.d.ts

@@ -0,0 +1,5 @@
+import { CoerceOperationOptions } from './coerce-operation';
+export interface CoerceGetControllerOptions extends Omit<CoerceOperationOptions, 'operationName'> {
+    operationName?: string;
+}
+export declare function CoerceGetOperation<Options = Record<string, any>>(options: CoerceGetControllerOptions): import("@angular-devkit/schematics").Rule;

package/src/lib/nest/coerce-get-operation.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CoerceGetOperation = void 0;
+const coerce_operation_1 = require("./coerce-operation");
+function CoerceGetOperation(options) {
+    const { operationName = 'get', isReturnVoid = false } = options;
+    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { operationName,
+        isReturnVoid }));
+}
+exports.CoerceGetOperation = CoerceGetOperation;
+//# sourceMappingURL=coerce-get-operation.js.map

package/src/lib/nest/coerce-get-operation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"coerce-get-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-operation.ts"],"names":[],"mappings":";;;AAAA,yDAG4B;AAM5B,SAAgB,kBAAkB,CAAgC,OAAmC;IACnG,MAAM,EACJ,aAAa,GAAG,KAAK,EACrB,YAAY,GAAG,KAAK,EACrB,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,aAAa;QACb,YAAY,IACZ,CAAC;AAEL,CAAC;AAZD,gDAYC"}

package/src/lib/nest/coerce-get-page-operation.d.ts

@@ -1,41 +1,30 @@
-import { NormalizedUpstreamOptions, TypeImport } from '@rxap/ts-morph';
-import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
+import { DataProperty, NormalizedUpstreamOptions, TypeImport } from '@rxap/ts-morph';
+import { ClassDeclaration, Project, SourceFile, WriterFunction } from 'ts-morph';
 import { OperationOptions } from './add-operation-to-controller';
-import { CoerceOperationOptions } from './coerce-operation';
-import { DtoClassProperty } from './create-dto-class';
-export interface GetPageOperationProperty {
-    name: string;
-    type: TypeImport;
-    /**
-     * the property name of the source object. if not defined the name will be used
-     */
-    source?: string;
-}
-export interface CoerceGetPageOperationOptions extends Omit<Omit<CoerceOperationOptions, 'operationName'>, 'tsMorphTransform'> {
-    propertyList: GetPageOperationProperty[];
-    tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration, controllerName: string, pageClassName: string, rowClassName: string) => Partial<OperationOptions>;
+import { CoerceDtoClassOutput } from './coerce-dto-class';
+import { CoerceOperationOptions, TransformOperation } from './coerce-operation';
+import { DtoClassProperty } from './dto-class-property';
+export interface CoerceGetPageOperationOptions extends Omit<CoerceOperationOptions, 'operationName' | 'tsMorphTransform' | 'coerceOperationDtoClass'> {
+    tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration, controllerName: string, moduleSourceFile: SourceFile, pageClassName: string, rowClassName: string) => Partial<OperationOptions>;
     /**
      * the name of the property used as row id value. defaults to the value 'uuid'. If null the __rowId property will be
      * set to the absolute row index absolute row index = page * pageSize + rowIndex
      */
-    rowIdProperty?: string | null;
+    rowIdProperty?: DataProperty;
     operationName?: string;
-    /**
-     * true - the suffix '-table' will not be enforced for the controller name
-     */
-    skipCoerceTableSuffix?: boolean;
-    /**
-     * The base name of the page and row DTO class name. Defaults to the controller name
-     */
-    responseDtoName?: string;
     coerceToRowDtoMethod?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, rowClassName: string, options: CoerceGetPageOperationOptions) => void;
     coerceToPageDtoMethod?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, pageClassName: string, rowClassName: string, options: CoerceGetPageOperationOptions) => void;
-    coerceGetPageDataMethod?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, options: CoerceGetPageOperationOptions) => void;
+    coerceGetPageDataMethod?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, options: CoerceGetPageOperationOptions) => void;
+    coerceOperationDtoClass?: (classDeclaration: ClassDeclaration, controllerName: string, moduleSourceFile: SourceFile, options: Readonly<CoerceGetPageOperationOptions>) => CoerceDtoClassOutput | null;
     upstream?: NormalizedUpstreamOptions | null;
 }
-export declare function GetPageOperationColumnToDtoClassProperty(property: GetPageOperationProperty): DtoClassProperty;
-export declare function GetPageOperationColumnToCodeText(property: GetPageOperationProperty): string;
+export declare function GetPageOperationColumnToCodeText(property: DtoClassProperty): string;
 export declare function CoerceToRowDtoMethod(sourceFile: SourceFile, classDeclaration: ClassDeclaration, rowClassName: string, options: CoerceGetPageOperationOptions): void;
 export declare function CoerceToPageDtoMethod(sourceFile: SourceFile, classDeclaration: ClassDeclaration, pageClassName: string, rowClassName: string, options: CoerceGetPageOperationOptions): void;
-export declare function CoerceGetPageDataMethod(sourceFile: SourceFile, classDeclaration: ClassDeclaration, { upstream }: CoerceGetPageOperationOptions): void;
+export declare function CoerceGetPageDataMethod(sourceFile: SourceFile, classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, options: CoerceGetPageOperationOptions): void;
+export declare function GetResponseTypeFromUpstream(upstream: NormalizedUpstreamOptions): TypeImport;
+export declare function GetRawRowDataType(options: Readonly<CoerceGetPageOperationOptions>): TypeImport;
+export declare function BuildGetPageUpstreamGetDataImplementation(classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, dto: CoerceDtoClassOutput | null, options: Readonly<CoerceOperationOptions>): TransformOperation;
+export declare function CoerceGetPageOperationDtoClass(classDeclaration: ClassDeclaration, controllerName: string, moduleSourceFile: SourceFile, options: Readonly<CoerceGetPageOperationOptions>): CoerceDtoClassOutput | null;
+export declare function BuiltGetPageDtoDataMapperImplementation(classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, dto: CoerceDtoClassOutput | null, options: Readonly<CoerceOperationOptions>): TransformOperation<string | WriterFunction>;
 export declare function CoerceGetPageOperation(options: Readonly<CoerceGetPageOperationOptions>): import("@angular-devkit/schematics").Rule;