@rxap/schematics-ts-morph 16.1.0-dev.0 → 16.1.0-dev.10

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

@@ -1,59 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceGetChildrenOperation = 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 utilities_1 = require("@rxap/utilities");
+const coerce_get_root_operation_1 = require("./coerce-get-root-operation");
 function CoerceGetChildrenOperation(options) {
-    let { tsMorphTransform, controllerName, paramList, } = options;
-    tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => ({}));
-    controllerName = (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-tree-table');
-    paramList !== null && paramList !== void 0 ? paramList : (paramList = []);
-    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: [
-                    {
-                        name: 'uuid',
-                        type: 'string',
-                    },
-                    {
-                        name: 'hasChildren',
-                        type: 'boolean',
-                    },
-                    {
-                        name: 'children',
-                        type: (0, schematics_utilities_1.classify)((0, schematics_utilities_1.CoerceSuffix)(controllerName, '-item-dto')),
-                        isArray: true,
-                        isOptional: true,
-                        isType: true,
-                    },
-                ],
-            });
-            (0, coerce_imports_1.CoerceImports)(sourceFile, [
-                {
-                    namedImports: ['plainToInstance'],
-                    moduleSpecifier: 'class-transformer',
-                },
-                {
-                    namedImports: ['classTransformOptions'],
-                    moduleSpecifier: '@rxap/nest-utilities',
-                },
-                {
-                    namedImports: [className],
-                    moduleSpecifier: filePath,
-                },
-            ]);
-            return Object.assign({ returnType: className + '[]' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
-        } }));
+    const { paramList = [], operationName = 'get-children', } = options;
+    (0, utilities_1.CoerceArrayItems)(paramList, [
+        {
+            name: 'parentUuid',
+            type: 'string',
+        }
+    ], (a, b) => a.name === b.name);
+    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,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAI5B,SAAgB,0BAA0B,CAAC,OAAoD;IAC7F,IAAI,EACF,gBAAgB,EAChB,cAAc,EACd,SAAS,GACV,GAAG,OAAO,CAAC;IACZ,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAC;IAChC,cAAc,GAAG,IAAA,mCAAY,EAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IAC7D,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,EAAE,EAAC;IACjB,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,EAAE;oBACZ;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,QAAQ;qBACf;oBACD;wBACE,IAAI,EAAE,aAAa;wBACnB,IAAI,EAAE,SAAS;qBAChB;oBACD;wBACE,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,IAAA,+BAAQ,EAAC,IAAA,mCAAY,EAAC,cAAc,EAAE,WAAW,CAAC,CAAC;wBACzD,OAAO,EAAE,IAAI;wBACb,UAAU,EAAE,IAAI;wBAChB,MAAM,EAAE,IAAI;qBACb;iBACF;aACF,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB;oBACE,YAAY,EAAE,CAAE,iBAAiB,CAAE;oBACnC,eAAe,EAAE,mBAAmB;iBACrC;gBACD;oBACE,YAAY,EAAE,CAAE,uBAAuB,CAAE;oBACzC,eAAe,EAAE,sBAAsB;iBACxC;gBACD;oBACE,YAAY,EAAE,CAAE,SAAS,CAAE;oBAC3B,eAAe,EAAE,QAAQ;iBAC1B;aACF,CAAC,CAAC;YAEH,uBACE,UAAU,EAAE,SAAS,GAAG,IAAI,IACzB,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,EAC3E;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AAxED,gEAwEC"}
+{"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,40 +1,30 @@
-import { TypeImport } from '@rxap/ts-morph';
-import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
+import { 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;
     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, options: 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;

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

@@ -1,42 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CoerceGetPageOperation = exports.CoerceGetPageDataMethod = exports.CoerceToPageDtoMethod = exports.CoerceToRowDtoMethod = exports.GetPageOperationColumnToCodeText = exports.GetPageOperationColumnToDtoClassProperty = void 0;
+exports.CoerceGetPageOperation = exports.BuiltGetPageDtoDataMapperImplementation = exports.CoerceGetPageOperationDtoClass = exports.BuildGetPageUpstreamGetDataImplementation = exports.GetRawRowDataType = exports.GetResponseTypeFromUpstream = exports.CoerceGetPageDataMethod = exports.CoerceToPageDtoMethod = exports.CoerceToRowDtoMethod = exports.GetPageOperationColumnToCodeText = void 0;
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
 const ts_morph_1 = require("@rxap/ts-morph");
 const utilities_1 = require("@rxap/utilities");
 const ts_morph_2 = require("ts-morph");
-const coerce_class_method_1 = require("../coerce-class-method");
-const coerce_imports_1 = require("../ts-morph/coerce-imports");
 const coerce_type_alias_1 = require("../ts-morph/coerce-type-alias");
+const write_type_1 = require("../ts-morph/write-type");
 const coerce_operation_1 = require("./coerce-operation");
 const coerce_page_dto_class_1 = require("./coerce-page-dto-class");
 const coerce_row_dto_class_1 = require("./coerce-row-dto-class");
-function GetPageOperationColumnTypeToTypeImport(property) {
-    var _a, _b;
-    if (!property.type) {
-        return { name: 'unknown' };
-    }
-    switch ((_a = property.type) === null || _a === void 0 ? void 0 : _a.name) {
-        case 'IconConfig':
-            return {
-                name: 'IconDto',
-                moduleSpecifier: '@rxap/nest-dto',
-            };
-    }
-    return (_b = property.type) !== null && _b !== void 0 ? _b : { name: 'unknown' };
-}
-function GetPageOperationColumnToDtoClassProperty(property) {
-    var _a;
-    const type = GetPageOperationColumnTypeToTypeImport(property);
-    return {
-        name: property.name,
-        type: (_a = type.name.replace(/\[]$/, '').replace(/^Array<(.+)>/, '$1')) !== null && _a !== void 0 ? _a : 'unknown',
-        isArray: type.name.endsWith('[]') || type.name.startsWith('Array<'),
-        isOptional: false,
-        isType: false,
-    };
-}
-exports.GetPageOperationColumnToDtoClassProperty = GetPageOperationColumnToDtoClassProperty;
+const table_query_list_1 = require("./table-query-list");
 function GetPageOperationColumnToCodeText(property) {
     var _a;
     let propertyName = (0, schematics_utilities_1.camelize)(property.name);
@@ -49,14 +23,17 @@ function GetPageOperationColumnToCodeText(property) {
 }
 exports.GetPageOperationColumnToCodeText = GetPageOperationColumnToCodeText;
 function CoerceToRowDtoMethod(sourceFile, classDeclaration, rowClassName, options) {
-    var _a;
-    (0, coerce_class_method_1.CoerceClassMethod)(classDeclaration, 'toRowDto', {
+    var _a, _b, _c;
+    (0, ts_morph_1.CoerceClassMethod)(classDeclaration, 'toRowDto', {
         scope: ts_morph_2.Scope.Private,
         returnType: rowClassName,
         parameters: [
             {
                 name: 'item',
-                type: 'RawRowData',
+                type: (0, write_type_1.WriteType)({
+                    isArray: false,
+                    type: GetRawRowDataType(options),
+                }, sourceFile),
             },
             {
                 name: 'index',
@@ -72,7 +49,10 @@ function CoerceToRowDtoMethod(sourceFile, classDeclaration, rowClassName, option
             },
             {
                 name: 'list',
-                type: 'RawRowData[]',
+                type: (0, write_type_1.WriteType)({
+                    isArray: true,
+                    type: GetRawRowDataType(options),
+                }, sourceFile),
             },
         ],
         statements: [
@@ -81,20 +61,23 @@ function CoerceToRowDtoMethod(sourceFile, classDeclaration, rowClassName, option
                 (options.rowIdProperty === null ?
                     '(pageIndex * pageSize + index).toFixed(0)' :
                     `item.${(_a = options.rowIdProperty) !== null && _a !== void 0 ? _a : 'uuid'}`) + ',\n  ',
-            options.propertyList.map(GetPageOperationColumnToCodeText).join(',\n  '),
+            (_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 : '',
             '};',
         ],
     });
 }
 exports.CoerceToRowDtoMethod = CoerceToRowDtoMethod;
 function CoerceToPageDtoMethod(sourceFile, classDeclaration, pageClassName, rowClassName, options) {
-    (0, coerce_class_method_1.CoerceClassMethod)(classDeclaration, 'toPageDto', {
+    (0, ts_morph_1.CoerceClassMethod)(classDeclaration, 'toPageDto', {
         scope: ts_morph_2.Scope.Private,
         returnType: pageClassName,
         parameters: [
             {
                 name: 'list',
-                type: 'RawRowData[]',
+                type: (0, write_type_1.WriteType)({
+                    isArray: true,
+                    type: GetRawRowDataType(options),
+                }, sourceFile),
             },
             {
                 name: 'total',
@@ -130,10 +113,67 @@ function CoerceToPageDtoMethod(sourceFile, classDeclaration, pageClassName, rowC
     });
 }
 exports.CoerceToPageDtoMethod = CoerceToPageDtoMethod;
-function CoerceGetPageDataMethod(sourceFile, classDeclaration, options) {
-    (0, coerce_class_method_1.CoerceClassMethod)(classDeclaration, 'getPageData', {
+function CoerceGetPageDataMethod(sourceFile, classDeclaration, moduleSourceFile, options) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    const { upstream } = options;
+    const statements = [];
+    if (upstream && (0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
+        const { memberName, className: commandClassName } = (0, coerce_operation_1.CoerceUpstreamBasicOperationImplementation)(classDeclaration, moduleSourceFile, upstream);
+        (0, ts_morph_1.CoercePropertyDeclaration)(classDeclaration, memberName, {
+            type: commandClassName,
+            scope: ts_morph_2.Scope.Private,
+            hasExclamationToken: true,
+            decorators: [
+                {
+                    name: 'Inject',
+                    arguments: [commandClassName],
+                },
+            ],
+        });
+        (0, ts_morph_1.CoerceImports)(sourceFile, [
+            {
+                namedImports: [commandClassName],
+                moduleSpecifier: (0, ts_morph_1.OperationIdToCommandClassImportPath)(upstream.operationId, upstream.scope, upstream.isService),
+            }, {
+                namedImports: ['Inject'],
+                moduleSpecifier: '@nestjs/common',
+            },
+        ]);
+        statements.push(`const response = await this.${memberName}.execute({
+      parameters: {
+        ${(_b = (_a = upstream.mapper) === null || _a === void 0 ? void 0 : _a.pageIndex) !== null && _b !== void 0 ? _b : 'pageIndex'}: pageIndex,
+        ${(_d = (_c = upstream.mapper) === null || _c === void 0 ? void 0 : _c.pageSize) !== null && _d !== void 0 ? _d : 'pageSize'}: pageSize,
+        ${(_f = (_e = upstream.mapper) === null || _e === void 0 ? void 0 : _e.sortBy) !== null && _f !== void 0 ? _f : 'sortBy'}: sortBy,
+        ${(_h = (_g = upstream.mapper) === null || _g === void 0 ? void 0 : _g.sortDirection) !== null && _h !== void 0 ? _h : 'sortDirection'}: sortDirection,
+        filter: ${((_j = upstream.mapper) === null || _j === void 0 ? void 0 : _j.filter) ? `filter.map((item) => \`\${ item.column }:\${ item.filter }\`).join(';')` :
+            'filter'},
+      },
+    });`, '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,`, '};');
+    }
+    else {
+        statements.push(`const response = await ((() => { throw new NotImplementedException(); })() as any).execute({
+      parameters: {
+        page: pageIndex,
+        size: pageSize,
+        sort: sortBy,
+        order: sortDirection,
+        filter: filter.map((item) => \`\${ item.column }:\${ item.filter }\`).join(';'),
+      },
+    });`, 'return {', '  list: response.entities ?? [],', '  total: response.maxCount ?? 0,', '};');
+    }
+    (0, ts_morph_1.CoerceClassMethod)(classDeclaration, 'getPageData', {
         scope: ts_morph_2.Scope.Public,
-        returnType: 'Promise<{ list: RawRowData[], total: number }>',
+        returnType: w => {
+            w.write('Promise<');
+            ts_morph_2.Writers.object({
+                list: (0, write_type_1.WriteType)({
+                    isArray: true,
+                    type: GetRawRowDataType(options),
+                }, sourceFile),
+                total: 'number',
+            })(w);
+            w.write('>');
+        },
         isAsync: true,
         parameters: [
             {
@@ -157,116 +197,88 @@ function CoerceGetPageDataMethod(sourceFile, classDeclaration, options) {
                 type: 'FilterQuery[]',
             },
         ],
-        statements: [
-            `const response = await ((() => { throw new NotImplementedException() })() as any).execute({
-      parameters: {
-        page: pageIndex,
-        size: pageSize,
-        sort: sortBy,
-        order: sortDirection,
-        filter: filter.map((item) => \`\${ item.column }:\${ item.filter }\`).join(';'),
-      },
-    });`,
-            'return {',
-            '  list: response.entities ?? [],',
-            '  total: response.maxCount ?? 0,',
-            '};',
-        ],
+        statements: statements,
     });
 }
 exports.CoerceGetPageDataMethod = CoerceGetPageDataMethod;
+function GetResponseTypeFromUpstream(upstream) {
+    var _a, _b;
+    if ((0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
+        const className = (0, ts_morph_1.OperationIdToResponseClassName)(upstream.operationId);
+        return {
+            name: `${className}['${(_b = (_a = upstream.mapper) === null || _a === void 0 ? void 0 : _a.list) !== null && _b !== void 0 ? _b : 'list'}'][number]`,
+            namedImport: className,
+            moduleSpecifier: (0, ts_morph_1.OperationIdToCommandClassImportPath)(upstream.operationId, upstream.scope, upstream.isService),
+        };
+    }
+    throw new Error(`Upstream kind '${upstream.kind}' not supported`);
+}
+exports.GetResponseTypeFromUpstream = GetResponseTypeFromUpstream;
+function GetRawRowDataType(options) {
+    const { upstream } = options;
+    if (upstream && (0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
+        return GetResponseTypeFromUpstream(upstream);
+    }
+    return {
+        name: 'RawRowData',
+    };
+}
+exports.GetRawRowDataType = GetRawRowDataType;
+function BuildGetPageUpstreamGetDataImplementation(classDeclaration, moduleSourceFile, dto, options) {
+    return (operationOptions) => {
+        var _a;
+        (_a = operationOptions.statements) !== null && _a !== void 0 ? _a : (operationOptions.statements = []);
+        operationOptions.statements = (0, utilities_1.coerceArray)(operationOptions.statements);
+        operationOptions.statements.push('const data = await this.getPageData(sortBy, sortDirection, pageSize, pageIndex, filter);');
+    };
+}
+exports.BuildGetPageUpstreamGetDataImplementation = BuildGetPageUpstreamGetDataImplementation;
+function CoerceGetPageOperationDtoClass(classDeclaration, controllerName, moduleSourceFile, options) {
+    const sourceFile = classDeclaration.getSourceFile();
+    const project = sourceFile.getProject();
+    const { rowIdProperty, propertyList, coerceToRowDtoMethod = CoerceToRowDtoMethod, coerceToPageDtoMethod = CoerceToPageDtoMethod, coerceGetPageDataMethod = CoerceGetPageDataMethod, buildOperationDtoClassName = coerce_operation_1.BuildOperationDtoClassName, dtoClassName = buildOperationDtoClassName(controllerName, options) } = options;
+    const { className: rowClassName, filePath: rowFilePath, } = (0, coerce_row_dto_class_1.CoerceRowDtoClass)({
+        project,
+        name: dtoClassName,
+        propertyList,
+        rowIdType: rowIdProperty === null ? null : undefined,
+    });
+    (0, ts_morph_1.CoerceImports)(sourceFile, {
+        namedImports: [rowClassName],
+        moduleSpecifier: rowFilePath,
+    });
+    const dto = (0, coerce_page_dto_class_1.CoercePageDtoClass)({
+        project,
+        name: dtoClassName,
+        rowClassName,
+        rowFilePath,
+    });
+    const { className: pageClassName } = dto;
+    coerceGetPageDataMethod(sourceFile, classDeclaration, moduleSourceFile, options);
+    coerceToRowDtoMethod(sourceFile, classDeclaration, rowClassName, options);
+    coerceToPageDtoMethod(sourceFile, classDeclaration, pageClassName, rowClassName, options);
+    return dto;
+}
+exports.CoerceGetPageOperationDtoClass = CoerceGetPageOperationDtoClass;
+function BuiltGetPageDtoDataMapperImplementation(classDeclaration, moduleSourceFile, dto, options) {
+    return () => {
+        return 'this.toPageDto(data.list, data.total, pageIndex, pageSize, sortBy, sortDirection, filter)';
+    };
+}
+exports.BuiltGetPageDtoDataMapperImplementation = BuiltGetPageDtoDataMapperImplementation;
 function CoerceGetPageOperation(options) {
-    let { skipCoerceTableSuffix, operationName, rowIdProperty, tsMorphTransform, propertyList, controllerName, responseDtoName, context, coerceToRowDtoMethod, coerceToPageDtoMethod, coerceGetPageDataMethod, } = options;
-    tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => ({}));
-    controllerName = skipCoerceTableSuffix ? controllerName : (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-table');
-    operationName !== null && operationName !== void 0 ? operationName : (operationName = 'get-page');
-    responseDtoName !== null && responseDtoName !== void 0 ? responseDtoName : (responseDtoName = (0, utilities_1.joinWithDash)([context, controllerName]));
-    coerceToRowDtoMethod !== null && coerceToRowDtoMethod !== void 0 ? coerceToRowDtoMethod : (coerceToRowDtoMethod = CoerceToRowDtoMethod);
-    coerceToPageDtoMethod !== null && coerceToPageDtoMethod !== void 0 ? coerceToPageDtoMethod : (coerceToPageDtoMethod = CoerceToPageDtoMethod);
-    coerceGetPageDataMethod !== null && coerceGetPageDataMethod !== void 0 ? coerceGetPageDataMethod : (coerceGetPageDataMethod = CoerceGetPageDataMethod);
-    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { controllerName,
-        operationName, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
-            const { className: rowClassName, filePath: rowFilePath, sourceFile: rowSourceFile, } = (0, coerce_row_dto_class_1.CoerceRowDtoClass)({
-                project,
-                name: responseDtoName,
-                propertyList: propertyList.map(GetPageOperationColumnToDtoClassProperty),
-                rowIdType: rowIdProperty === null ? null : undefined,
-            });
-            (0, coerce_imports_1.CoerceImports)(rowSourceFile, propertyList
-                .map(c => GetPageOperationColumnTypeToTypeImport(c))
-                .filter(type => (0, ts_morph_1.RequiresTypeImport)(type))
-                .map(type => (0, ts_morph_1.TypeImportToImportStructure)(type)));
-            const { className: pageClassName, filePath: pageFilePath, } = (0, coerce_page_dto_class_1.CoercePageDtoClass)({
-                project,
-                name: responseDtoName,
-                rowClassName,
-                rowFilePath,
-            });
-            coerceGetPageDataMethod(sourceFile, classDeclaration, options);
-            coerceToRowDtoMethod(sourceFile, classDeclaration, rowClassName, options);
-            coerceToPageDtoMethod(sourceFile, classDeclaration, pageClassName, rowClassName, options);
-            (0, coerce_imports_1.CoerceImports)(sourceFile, [
-                {
-                    namedImports: ['FilterQuery', 'FilterQueryPipe'],
-                    moduleSpecifier: '@rxap/nest-utilities',
-                },
-                {
-                    namedImports: ['plainToInstance'],
-                    moduleSpecifier: 'class-transformer',
-                },
-                {
-                    namedImports: ['classTransformOptions'],
-                    moduleSpecifier: '@rxap/nest-utilities',
-                },
-                {
-                    namedImports: [pageClassName],
-                    moduleSpecifier: pageFilePath,
-                },
-                {
-                    namedImports: [rowClassName],
-                    moduleSpecifier: rowFilePath,
-                },
-            ]);
-            (0, coerce_type_alias_1.CoerceTypeAlias)(sourceFile, 'RawRowData', {
-                isExported: false,
-                type: 'any',
-            });
-            return Object.assign({ queryList: [
-                    {
-                        name: 'pageIndex',
-                        type: 'number',
-                        defaultValue: '0',
-                    },
-                    {
-                        name: 'pageSize',
-                        type: 'number',
-                        defaultValue: '5',
-                    },
-                    {
-                        name: 'sortDirection',
-                        type: 'string',
-                        defaultValue: w => w.quote('desc'),
-                    },
-                    {
-                        name: 'sortBy',
-                        type: 'string',
-                        defaultValue: w => w.quote('__updatedAt'),
-                    },
-                    {
-                        name: 'filter',
-                        type: 'FilterQuery[]',
-                        pipeList: ['new FilterQueryPipe()'],
-                        // the FilterQueryPipe will set the default value to an empty array
-                        hasQuestionToken: false,
-                    },
-                ], returnType: pageClassName, statements: [
-                    'const data = await this.getPageData(sortBy, sortDirection, pageSize, pageIndex, filter);',
-                    'return plainToInstance(',
-                    '  ' + pageClassName + ',',
-                    `  this.toPageDto(data.list, data.total, pageIndex, pageSize, sortBy, sortDirection, filter),`,
-                    '  classTransformOptions',
-                    ');',
-                ] }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName, pageClassName, rowClassName));
+    const { operationName = 'get-page', tsMorphTransform = utilities_1.noop, upstream, builtDtoDataMapperImplementation = BuiltGetPageDtoDataMapperImplementation, coerceOperationDtoClass = CoerceGetPageOperationDtoClass, buildUpstreamGetDataImplementation = BuildGetPageUpstreamGetDataImplementation, } = options;
+    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { operationName,
+        builtDtoDataMapperImplementation,
+        coerceOperationDtoClass,
+        buildUpstreamGetDataImplementation, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName, moduleSourceFile) => {
+            if (!upstream || !(0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
+                (0, coerce_type_alias_1.CoerceTypeAlias)(sourceFile, 'RawRowData', {
+                    isExported: false,
+                    type: 'any',
+                });
+            }
+            return Object.assign({ queryList: table_query_list_1.TABLE_QUERY_LIST }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName, moduleSourceFile, (0, coerce_page_dto_class_1.BuildPageDtoClassName)((0, coerce_operation_1.BuildOperationDtoClassName)(controllerName, options)), (0, coerce_row_dto_class_1.BuildRowDtoClassName)((0, coerce_operation_1.BuildOperationDtoClassName)(controllerName, options))));
         } }));
 }
 exports.CoerceGetPageOperation = CoerceGetPageOperation;