@rxap/schematics-ts-morph 16.1.0-dev.8 → 16.1.0

package/src/lib/nest/coerce-dto-class.js

@@ -9,7 +9,6 @@ const ts_morph_2 = require("ts-morph");
 const dto_class_property_1 = require("./dto-class-property");
 require("colors");
 function CoerceDtoClass(options) {
-    var _a;
     const { project, propertyList = [], tsMorphTransform = utilities_1.noop, } = options;
     let { name, } = options;
     name = (0, schematics_utilities_1.dasherize)(name);
@@ -19,9 +18,35 @@ function CoerceDtoClass(options) {
     const classDeclaration = (0, ts_morph_1.CoerceClass)(sourceFile, className);
     classDeclaration.setIsExported(true);
     for (const property of propertyList.map(dto_class_property_1.NormalizeDataClassProperty)) {
-        if (property.type.name === '<self>') {
-            property.type.name = className;
-            property.isType = true;
+        // create a clone of the property type to avoid modifying the original type
+        // if the property type is a self reference we need to replace the self reference with the class name
+        // if the property type is a deferred reference we need to replace the deferred reference with the class name
+        const propertyType = Object.assign({}, property.type);
+        let subTypeOutput;
+        switch (propertyType.name) {
+            case ts_morph_1.TypeNames.Self:
+                propertyType.name = className;
+                propertyType.isTypeOnly = false;
+                propertyType.moduleSpecifier = null;
+                propertyType.namedImport = null;
+                propertyType.namespaceImport = null;
+                propertyType.defaultImport = null;
+                property.isType = true;
+                break;
+            case ts_morph_1.TypeNames.Deferred:
+                subTypeOutput = CoerceDtoClass({
+                    project,
+                    name: [name, (0, schematics_utilities_1.dasherize)(property.name)].join('-'),
+                    propertyList: property.memberList,
+                });
+                propertyType.name = subTypeOutput.className;
+                propertyType.moduleSpecifier = './' + (0, schematics_utilities_1.dasherize)(subTypeOutput.className.replace(/Dto$/, '')) + '.dto';
+                propertyType.isTypeOnly = false;
+                propertyType.namedImport = null;
+                propertyType.namespaceImport = null;
+                propertyType.defaultImport = null;
+                property.isType = true;
+                break;
         }
         let propertyName = (0, schematics_utilities_1.camelize)(property.name);
         const prefixMatch = property.name.match(/^(_+)/);
@@ -30,155 +55,174 @@ function CoerceDtoClass(options) {
             propertyName = prefixMatch[0] + propertyName;
         }
         const propertyDeclaration = (0, ts_morph_1.CoercePropertyDeclaration)(classDeclaration, propertyName).set({
-            type: (0, ts_morph_1.WriteType)(property, sourceFile),
+            type: (0, ts_morph_1.WriteType)({
+                isArray: property.isArray,
+                type: propertyType,
+            }, sourceFile),
             hasQuestionToken: property.isOptional,
             hasExclamationToken: !property.isOptional,
         });
-        (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'Expose', {
-            arguments: [],
-        });
-        (0, ts_morph_1.CoerceImports)(sourceFile, {
-            namedImports: ['Expose'],
-            moduleSpecifier: 'class-transformer',
-        });
+        addExposeDecorator(propertyDeclaration);
         if (property.isArray) {
-            (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsArray', {
-                arguments: [],
-            });
-            (0, ts_morph_1.CoerceImports)(sourceFile, {
-                namedImports: ['IsArray'],
-                moduleSpecifier: 'class-validator',
-            });
+            addClassValidatorDecoratorForIsArray(propertyDeclaration);
         }
         if (property.isType) {
-            (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'Type', {
-                arguments: [
-                    w => {
-                        w.write('() => ');
-                        (0, ts_morph_1.WriteType)({
-                            type: property.type,
-                            isArray: false
-                        }, sourceFile)(w);
-                    },
-                ],
-            });
-            (0, ts_morph_1.CoerceImports)(sourceFile, {
-                namedImports: ['Type'],
-                moduleSpecifier: 'class-transformer',
-            });
-            (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsInstance', {
-                arguments: [
-                    (0, ts_morph_1.WriteType)({
-                        type: property.type,
-                        isArray: false
-                    }, sourceFile),
-                    w => {
-                        if (property.isArray) {
-                            ts_morph_2.Writers.object({ each: 'true' })(w);
-                        }
-                    },
-                ],
+            addClassValidatorDecoratorForNestedDto(propertyDeclaration, propertyType, property.isArray);
+        }
+        if (property.isOptional) {
+            addIsOptionalDecorator(propertyDeclaration);
+        }
+        addClassValidatorDecoratorForType(propertyDeclaration, propertyType);
+        if (propertyType.name !== 'unknown') {
+            cleanupUnknownApiPropertyDecorator(propertyDeclaration);
+        }
+    }
+    tsMorphTransform(project, sourceFile, classDeclaration);
+    return {
+        className,
+        filePath: '.' + (0, path_1.join)(sourceFile.getDirectoryPath(), sourceFile.getBaseNameWithoutExtension()),
+        sourceFile,
+        classDeclaration,
+    };
+}
+exports.CoerceDtoClass = CoerceDtoClass;
+function addIsOptionalDecorator(propertyDeclaration) {
+    const sourceFile = propertyDeclaration.getSourceFile();
+    (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsOptional', {
+        arguments: [],
+    });
+    (0, ts_morph_1.CoerceImports)(sourceFile, {
+        namedImports: ['IsOptional'],
+        moduleSpecifier: 'class-validator',
+    });
+}
+function addExposeDecorator(propertyDeclaration) {
+    const sourceFile = propertyDeclaration.getSourceFile();
+    (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'Expose', {
+        arguments: [],
+    });
+    (0, ts_morph_1.CoerceImports)(sourceFile, {
+        namedImports: ['Expose'],
+        moduleSpecifier: 'class-transformer',
+    });
+}
+function addClassValidatorDecoratorForIsArray(propertyDeclaration) {
+    const sourceFile = propertyDeclaration.getSourceFile();
+    (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsArray', {
+        arguments: [],
+    });
+    (0, ts_morph_1.CoerceImports)(sourceFile, {
+        namedImports: ['IsArray'],
+        moduleSpecifier: 'class-validator',
+    });
+}
+function addClassValidatorDecoratorForNestedDto(propertyDeclaration, propertyType, isArray) {
+    const sourceFile = propertyDeclaration.getSourceFile();
+    (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'Type', {
+        arguments: [
+            w => {
+                w.write('() => ');
+                (0, ts_morph_1.WriteType)({
+                    type: propertyType,
+                    isArray: false,
+                }, sourceFile)(w);
+            },
+        ],
+    });
+    (0, ts_morph_1.CoerceImports)(sourceFile, {
+        namedImports: ['Type'],
+        moduleSpecifier: 'class-transformer',
+    });
+    (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsInstance', {
+        arguments: [
+            (0, ts_morph_1.WriteType)({
+                type: propertyType,
+                isArray: false,
+            }, sourceFile),
+            w => {
+                if (isArray) {
+                    ts_morph_2.Writers.object({ each: 'true' })(w);
+                }
+            },
+        ],
+    });
+    (0, ts_morph_1.CoerceImports)(sourceFile, {
+        namedImports: ['IsInstance'],
+        moduleSpecifier: 'class-validator',
+    });
+}
+function addClassValidatorDecoratorForType(propertyDeclaration, propertyType) {
+    var _a;
+    const sourceFile = propertyDeclaration.getSourceFile();
+    switch (propertyType.name) {
+        case 'date':
+            (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsDate', {
+                arguments: [],
             });
             (0, ts_morph_1.CoerceImports)(sourceFile, {
-                namedImports: ['IsInstance'],
+                namedImports: ['IsDate'],
                 moduleSpecifier: 'class-validator',
             });
-        }
-        if (property.isOptional) {
-            (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsOptional', {
+            break;
+        case 'number':
+            (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsNumber', {
                 arguments: [],
             });
             (0, ts_morph_1.CoerceImports)(sourceFile, {
-                namedImports: ['IsOptional'],
+                namedImports: ['IsNumber'],
                 moduleSpecifier: 'class-validator',
             });
-        }
-        switch (property.type.name) {
-            case 'date':
-                (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsDate', {
-                    arguments: [],
-                });
-                (0, ts_morph_1.CoerceImports)(sourceFile, {
-                    namedImports: ['IsDate'],
-                    moduleSpecifier: 'class-validator',
-                });
-                break;
-            case 'number':
-                (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsNumber', {
-                    arguments: [],
-                });
+            break;
+        case 'string':
+            if ((_a = propertyDeclaration.getName()) === null || _a === void 0 ? void 0 : _a.match(/^uuid|Uuid$/)) {
                 (0, ts_morph_1.CoerceImports)(sourceFile, {
-                    namedImports: ['IsNumber'],
+                    namedImports: ['IsUUID'],
                     moduleSpecifier: 'class-validator',
                 });
-                break;
-            case 'string':
-                if (property.name === 'uuid') {
-                    (0, ts_morph_1.CoerceImports)(sourceFile, {
-                        namedImports: ['IsUUID'],
-                        moduleSpecifier: 'class-validator',
-                    });
-                    (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsUUID', {
-                        arguments: [],
-                    });
-                }
-                else {
-                    (0, ts_morph_1.CoerceImports)(sourceFile, {
-                        namedImports: ['IsString'],
-                        moduleSpecifier: 'class-validator',
-                    });
-                    (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsString', {
-                        arguments: [],
-                    });
-                }
-                break;
-            case 'uuid':
                 (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsUUID', {
                     arguments: [],
                 });
+            }
+            else {
                 (0, ts_morph_1.CoerceImports)(sourceFile, {
-                    namedImports: ['IsUUID'],
+                    namedImports: ['IsString'],
                     moduleSpecifier: 'class-validator',
                 });
-                break;
-            case 'boolean':
-                (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsBoolean', {
+                (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsString', {
                     arguments: [],
                 });
-                (0, ts_morph_1.CoerceImports)(sourceFile, {
-                    namedImports: ['IsBoolean'],
-                    moduleSpecifier: 'class-validator',
-                });
-                break;
-            case 'unknown':
-                (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'ApiProperty', {
-                    arguments: [ts_morph_2.Writers.object({ type: w => w.quote('unknown') })],
-                });
-                (0, ts_morph_1.CoerceImports)(sourceFile, {
-                    namedImports: ['ApiProperty'],
-                    moduleSpecifier: '@nestjs/swagger',
-                });
-                break;
-        }
-        if (property.type.name !== 'unknown') {
-            const apiProperty = propertyDeclaration.getDecorators().find(d => d.getName() === 'ApiProperty');
-            if (apiProperty) {
-                const args = apiProperty.getArguments()[0];
-                if (args instanceof ts_morph_2.ObjectLiteralExpression) {
-                    if ((_a = args.getProperty('type')) === null || _a === void 0 ? void 0 : _a.getText().includes('unknown')) {
-                        apiProperty.remove();
-                    }
-                }
+            }
+            break;
+        case 'boolean':
+            (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsBoolean', {
+                arguments: [],
+            });
+            (0, ts_morph_1.CoerceImports)(sourceFile, {
+                namedImports: ['IsBoolean'],
+                moduleSpecifier: 'class-validator',
+            });
+            break;
+        case 'unknown':
+            (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'ApiProperty', {
+                arguments: [ts_morph_2.Writers.object({ type: w => w.quote('unknown') })],
+            });
+            (0, ts_morph_1.CoerceImports)(sourceFile, {
+                namedImports: ['ApiProperty'],
+                moduleSpecifier: '@nestjs/swagger',
+            });
+            break;
+    }
+}
+function cleanupUnknownApiPropertyDecorator(propertyDeclaration) {
+    var _a;
+    const apiProperty = propertyDeclaration.getDecorators().find(d => d.getName() === 'ApiProperty');
+    if (apiProperty) {
+        const args = apiProperty.getArguments()[0];
+        if (args instanceof ts_morph_2.ObjectLiteralExpression) {
+            if ((_a = args.getProperty('type')) === null || _a === void 0 ? void 0 : _a.getText().includes('unknown')) {
+                apiProperty.remove();
             }
         }
     }
-    tsMorphTransform(project, sourceFile, classDeclaration);
-    return {
-        className,
-        filePath: '.' + (0, path_1.join)(sourceFile.getDirectoryPath(), sourceFile.getBaseNameWithoutExtension()),
-        sourceFile,
-        classDeclaration,
-    };
 }
-exports.CoerceDtoClass = CoerceDtoClass;
 //# sourceMappingURL=coerce-dto-class.js.map

package/src/lib/nest/coerce-dto-class.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-dto-class.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"coerce-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-dto-class.ts"],"names":[],"mappings":"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"}

package/src/lib/nest/coerce-form-submit-operation.js

@@ -6,11 +6,12 @@ const coerce_get_by_id_operation_1 = require("./coerce-get-by-id-operation");
 function CoerceFormSubmitOperation(options) {
     const { tsMorphTransform = utilities_1.noop, bodyDtoName, isReturnVoid = true, 
     // if not explicitly defined the idProperty is set to null, as not each data grid operation has an id
-    idProperty = null, operationName = idProperty ? 'submitById' : 'submit', } = options;
+    idProperty = null, operationName = idProperty ? 'submitById' : 'submit', dtoClassNameSuffix = '-submit', } = options;
     return (0, coerce_get_by_id_operation_1.CoerceGetByIdOperation)(Object.assign(Object.assign({}, options), { operationName,
         isReturnVoid,
-        idProperty, buildOperationDtoClassName: (controllerName, { dtoClassName, dtoClassNameSuffix }) => {
-            return dtoClassName !== null && dtoClassName !== void 0 ? dtoClassName : (dtoClassNameSuffix ? (0, utilities_1.CoerceSuffix)(bodyDtoName !== null && bodyDtoName !== void 0 ? bodyDtoName : controllerName, dtoClassNameSuffix) : bodyDtoName !== null && bodyDtoName !== void 0 ? bodyDtoName : controllerName);
+        idProperty,
+        dtoClassNameSuffix, buildOperationDtoClassName: (controllerName, { dtoClassName, dtoClassNameSuffix = '-submit' }) => {
+            return dtoClassName !== null && dtoClassName !== void 0 ? dtoClassName : (0, utilities_1.CoerceSuffix)(bodyDtoName !== null && bodyDtoName !== void 0 ? bodyDtoName : controllerName, dtoClassNameSuffix);
         }, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName, moduleSourceFile, dto) => {
             if (!dto) {
                 throw new Error('The dto must be created for an submit operation');

package/src/lib/nest/coerce-form-submit-operation.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-form-submit-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-form-submit-operation.ts"],"names":[],"mappings":";;;AAAA,+CAGyB;AACzB,6EAGsC;AAMtC,SAAgB,yBAAyB,CAAC,OAAyC;IACjF,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,WAAW,EACX,YAAY,GAAG,IAAI;IACnB,qGAAqG;IACrG,UAAU,GAAG,IAAI,EACjB,aAAa,GAAG,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,GACrD,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,mDAAsB,kCACxB,OAAO,KACV,aAAa;QACb,YAAY;QACZ,UAAU,EACV,0BAA0B,EAAE,CAAC,cAAc,EAAE,EAAE,YAAY,EAAE,kBAAkB,EAAE,EAAE,EAAE;YACnF,OAAO,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,CACrB,kBAAkB,CAAC,CAAC,CAAC,IAAA,wBAAY,EAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,cAAc,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,cAAc,CACrH,CAAC;QACJ,CAAC,EACD,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,GAAG,EACH,EAAE;YAEF,IAAI,CAAC,GAAG,EAAE;gBACR,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;aACpE;YAED,uBACE,IAAI,EAAE,GAAG,CAAC,SAAS,EACnB,MAAM,EAAE,MAAM,IACX,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,EAAE,GAAG,CAAC,EAClG;QAEJ,CAAC,IACD,CAAC;AAEL,CAAC;AA1CD,8DA0CC"}
+{"version":3,"file":"coerce-form-submit-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-form-submit-operation.ts"],"names":[],"mappings":";;;AAAA,+CAGyB;AACzB,6EAGsC;AAMtC,SAAgB,yBAAyB,CAAC,OAAyC;IACjF,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,WAAW,EACX,YAAY,GAAG,IAAI;IACnB,qGAAqG;IACrG,UAAU,GAAG,IAAI,EACjB,aAAa,GAAG,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,EACpD,kBAAkB,GAAG,SAAS,GAC/B,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,mDAAsB,kCACxB,OAAO,KACV,aAAa;QACb,YAAY;QACZ,UAAU;QACV,kBAAkB,EAClB,0BAA0B,EAAE,CAAC,cAAc,EAAE,EAAE,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAAE,EAAE,EAAE;YAC/F,OAAO,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,IAAA,wBAAY,EAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,cAAc,EAAE,kBAAkB,CAAC,CAAC;QACzF,CAAC,EACD,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,GAAG,EACH,EAAE;YAEF,IAAI,CAAC,GAAG,EAAE;gBACR,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;aACpE;YAED,uBACE,IAAI,EAAE,GAAG,CAAC,SAAS,EACnB,MAAM,EAAE,MAAM,IACX,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,EAAE,GAAG,CAAC,EAClG;QAEJ,CAAC,IACD,CAAC;AAEL,CAAC;AA1CD,8DA0CC"}

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

@@ -4,6 +4,7 @@ exports.CoerceGetByIdOperation = exports.BuiltGetByIdDtoDataMapperImplementation
 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;
@@ -11,27 +12,44 @@ function BuildUpstreamGetByIdParametersImplementation(classDeclaration, moduleSo
     };
 }
 exports.BuildUpstreamGetByIdParametersImplementation = BuildUpstreamGetByIdParametersImplementation;
+function UpstreamMapper(sourceProperty, propertyList, idProperty) {
+    var _a;
+    const mapper = {};
+    if (idProperty) {
+        mapper[idProperty.name] = idProperty.name;
+    }
+    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));
+            }
+        }
+    }
+    return mapper;
+}
 function BuiltGetByIdDtoDataMapperImplementation(classDeclaration, moduleSourceFile, dto, options) {
     const { propertyList = [], upstream, isArray, idProperty, } = options;
     return () => {
-        var _a;
         if (upstream) {
-            const mapper = {};
-            if (idProperty) {
-                mapper[idProperty.name] = idProperty.name;
-            }
-            for (const property of propertyList.filter(p => !idProperty || p.name !== idProperty.name)) {
-                mapper[property.name] = `data.${(_a = property.source) !== null && _a !== void 0 ? _a : property.name}`;
-            }
             if (isArray) {
                 return w => {
                     w.write('data.map(item => (');
-                    ts_morph_1.Writers.object(mapper)(w);
+                    ts_morph_1.Writers.object(UpstreamMapper('data', propertyList, idProperty))(w);
                     w.write('))');
                 };
             }
             else {
-                return ts_morph_1.Writers.object(mapper);
+                return ts_morph_1.Writers.object(UpstreamMapper('data', propertyList, idProperty));
             }
         }
         else {

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":"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"}
+{"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-page-operation.d.ts

@@ -1,4 +1,4 @@
-import { NormalizedUpstreamOptions, TypeImport } from '@rxap/ts-morph';
+import { NormalizedUpstreamOptions, OperationParameter, TypeImport } from '@rxap/ts-morph';
 import { ClassDeclaration, Project, SourceFile, WriterFunction } from 'ts-morph';
 import { OperationOptions } from './add-operation-to-controller';
 import { CoerceDtoClassOutput } from './coerce-dto-class';
@@ -10,13 +10,14 @@ export interface CoerceGetPageOperationOptions extends Omit<CoerceOperationOptio
      * 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;
     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, moduleSourceFile: SourceFile, options: CoerceGetPageOperationOptions) => void;
     coerceOperationDtoClass?: (classDeclaration: ClassDeclaration, controllerName: string, moduleSourceFile: SourceFile, options: Readonly<CoerceGetPageOperationOptions>) => CoerceDtoClassOutput | null;
     upstream?: NormalizedUpstreamOptions | null;
+    idProperty?: OperationParameter;
+    rowId: DtoClassProperty | null;
 }
 export declare function GetPageOperationColumnToCodeText(property: DtoClassProperty): string;
 export declare function CoerceToRowDtoMethod(sourceFile: SourceFile, classDeclaration: ClassDeclaration, rowClassName: string, options: CoerceGetPageOperationOptions): void;
@@ -24,7 +25,7 @@ export declare function CoerceToPageDtoMethod(sourceFile: SourceFile, classDecla
 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 BuildGetPageGetDataImplementation(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;