@rxap/schematics-ts-morph 16.0.0-dev.4 → 16.0.0-dev.40

package/src/lib/nest/build-nest-controller-name.js

@@ -4,19 +4,23 @@ exports.BuildNestControllerName = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
 function BuildNestControllerName(options) {
-    let { name, controllerName, controllerNameSuffix, nestController, module, nestModule, } = options;
-    nestModule !== null && nestModule !== void 0 ? nestModule : (nestModule = module);
-    controllerName !== null && controllerName !== void 0 ? controllerName : (controllerName = nestController);
-    controllerName !== null && controllerName !== void 0 ? controllerName : (controllerName = name);
-    if (!controllerName) {
-        throw new schematics_1.SchematicsException('Could not determine the controller name');
-    }
+    let { controllerName, controllerNameSuffix, nestModule, } = options;
     if (nestModule && nestModule !== controllerName) {
-        controllerName = [nestModule, controllerName].join('-');
+        if (controllerName) {
+            if (!controllerName.startsWith(nestModule)) {
+                controllerName = [nestModule, controllerName].join('-');
+            }
+        }
+        else {
+            controllerName = nestModule;
+        }
     }
     if (controllerNameSuffix) {
         controllerName = (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-' + controllerNameSuffix);
     }
+    if (!controllerName) {
+        throw new schematics_1.SchematicsException('Could not determine the controller name');
+    }
     return controllerName;
 }
 exports.BuildNestControllerName = BuildNestControllerName;

package/src/lib/nest/build-nest-controller-name.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-nest-controller-name.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/build-nest-controller-name.ts"],"names":[],"mappings":";;;AAAA,2DAAiE;AACjE,qEAA0D;AAW1D,SAAgB,uBAAuB,CAAC,OAAuC;IAC7E,IAAI,EACF,IAAI,EACJ,cAAc,EACd,oBAAoB,EACpB,cAAc,EACd,MAAM,EACN,UAAU,GACX,GAAG,OAAO,CAAC;IAEZ,UAAU,aAAV,UAAU,cAAV,UAAU,IAAV,UAAU,GAAK,MAAM,EAAC;IACtB,cAAc,aAAd,cAAc,cAAd,cAAc,IAAd,cAAc,GAAK,cAAc,EAAC;IAClC,cAAc,aAAd,cAAc,cAAd,cAAc,IAAd,cAAc,GAAK,IAAI,EAAC;IAExB,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,gCAAmB,CAAC,yCAAyC,CAAC,CAAC;KAC1E;IAED,IAAI,UAAU,IAAI,UAAU,KAAK,cAAc,EAAE;QAC/C,cAAc,GAAG,CAAE,UAAU,EAAE,cAAc,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KAC3D;IAED,IAAI,oBAAoB,EAAE;QACxB,cAAc,GAAG,IAAA,mCAAY,EAAC,cAAc,EAAE,GAAG,GAAG,oBAAoB,CAAC,CAAC;KAC3E;IAED,OAAO,cAAc,CAAC;AAExB,CAAC;AA5BD,0DA4BC"}
+{"version":3,"file":"build-nest-controller-name.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/build-nest-controller-name.ts"],"names":[],"mappings":";;;AAAA,2DAAiE;AACjE,qEAA0D;AAQ1D,SAAgB,uBAAuB,CAAC,OAAuC;IAC7E,IAAI,EACF,cAAc,EACd,oBAAoB,EACpB,UAAU,GACX,GAAG,OAAO,CAAC;IAEZ,IAAI,UAAU,IAAI,UAAU,KAAK,cAAc,EAAE;QAC/C,IAAI,cAAc,EAAE;YAClB,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBAC1C,cAAc,GAAG,CAAE,UAAU,EAAE,cAAc,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC3D;SACF;aAAM;YACL,cAAc,GAAG,UAAU,CAAC;SAC7B;KACF;IAED,IAAI,oBAAoB,EAAE;QACxB,cAAc,GAAG,IAAA,mCAAY,EAAC,cAAe,EAAE,GAAG,GAAG,oBAAoB,CAAC,CAAC;KAC5E;IAED,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,gCAAmB,CAAC,yCAAyC,CAAC,CAAC;KAC1E;IAED,OAAO,cAAc,CAAC;AAExB,CAAC;AA3BD,0DA2BC"}

package/src/lib/nest/coerce-dto-class.d.ts

@@ -1,9 +1,25 @@
-import { ClassDeclarationStructure, ClassLikeDeclarationBase, ImportDeclarationStructure, OptionalKind, Project, PropertyDeclaration, PropertyDeclarationStructure, PropertySignature, TypeElementMemberedNode } from 'ts-morph';
-import { DtoClassProperty } from '../create-dto-class';
+import { ClassDeclaration, ClassDeclarationStructure, ClassLikeDeclarationBase, ImportDeclarationStructure, OptionalKind, Project, PropertyDeclaration, PropertyDeclarationStructure, PropertySignature, SourceFile, TypeElementMemberedNode } from 'ts-morph';
+import { DtoClassProperty } from './create-dto-class';
 export interface CoerceDtoClassOutput {
     className: string;
     filePath: string;
+    sourceFile: SourceFile;
+    classDeclaration: ClassDeclaration;
 }
 export declare function CoercePropertyDeclaration(typeElementMemberedNode: TypeElementMemberedNode, name: string, structure?: Partial<PropertyDeclarationStructure>): PropertySignature;
 export declare function CoercePropertyDeclaration(classLikeDeclarationBase: ClassLikeDeclarationBase, name: string, structure?: Partial<PropertyDeclarationStructure>): PropertyDeclaration;
-export declare function CoerceDtoClass(project: Project, name: string, propertyList: DtoClassProperty[], classStructure?: Omit<OptionalKind<ClassDeclarationStructure>, 'name'>, importStructureList?: Array<OptionalKind<ImportDeclarationStructure>>): CoerceDtoClassOutput;
+export interface CoerceDtoClassOptions {
+    project: Project;
+    name: string;
+    propertyList?: DtoClassProperty[] | null;
+    /**
+     * @deprecated use the tsMorphTransform to adapt the class
+     */
+    classStructure?: Omit<OptionalKind<ClassDeclarationStructure>, 'name'>;
+    /**
+     * @deprecated use the tsMorphTransform to add imports
+     */
+    importStructureList?: Array<OptionalKind<ImportDeclarationStructure>>;
+    tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration) => void;
+}
+export declare function CoerceDtoClass(options: CoerceDtoClassOptions): CoerceDtoClassOutput;

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

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceDtoClass = exports.CoercePropertyDeclaration = void 0;
-const ts_morph_1 = require("ts-morph");
-const path_1 = require("path");
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
+const path_1 = require("path");
+const ts_morph_1 = require("ts-morph");
+const coerce_class_1 = require("../coerce-class");
+const coerce_source_file_1 = require("../coerce-source-file");
 const coerce_decorator_1 = require("../ts-morph/coerce-decorator");
 const coerce_imports_1 = require("../ts-morph/coerce-imports");
-const coerce_source_file_1 = require("../coerce-source-file");
-const coerce_class_1 = require("../coerce-class");
+const write_type_1 = require("../ts-morph/write-type");
 function CoercePropertyDeclaration(node, name, structure = {}) {
     let property = node.getProperty(name);
     if (!property) {
@@ -17,15 +18,21 @@ function CoercePropertyDeclaration(node, name, structure = {}) {
     return property;
 }
 exports.CoercePropertyDeclaration = CoercePropertyDeclaration;
-function CoerceDtoClass(project, name, propertyList, classStructure, importStructureList) {
+function CoerceDtoClass(options) {
+    const { project, } = options;
+    let { propertyList, tsMorphTransform, classStructure, importStructureList, name, } = options;
+    propertyList !== null && propertyList !== void 0 ? propertyList : (propertyList = []);
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => { });
+    classStructure !== null && classStructure !== void 0 ? classStructure : (classStructure = {});
+    importStructureList !== null && importStructureList !== void 0 ? importStructureList : (importStructureList = []);
     name = (0, schematics_utilities_1.dasherize)(name);
     const className = (0, schematics_utilities_1.CoerceSuffix)((0, schematics_utilities_1.classify)(name), 'Dto');
     const fileName = (0, schematics_utilities_1.CoerceSuffix)(name, '.dto');
     const sourceFile = (0, coerce_source_file_1.CoerceSourceFile)(project, (0, path_1.join)('dtos', fileName + '.ts'));
     const classDeclaration = (0, coerce_class_1.CoerceClass)(sourceFile, className);
     classDeclaration.setIsExported(true);
-    classDeclaration.set(classStructure !== null && classStructure !== void 0 ? classStructure : {});
-    importStructureList !== null && importStructureList !== void 0 ? importStructureList : (importStructureList = []);
+    classDeclaration.set(classStructure);
     for (const property of propertyList) {
         let propertyName = (0, schematics_utilities_1.camelize)(property.name);
         const prefixMatch = property.name.match(/^(_+)/);
@@ -33,27 +40,12 @@ function CoerceDtoClass(project, name, propertyList, classStructure, importStruc
             propertyName = (0, schematics_utilities_1.camelize)(property.name.replace(/^_+/, ''));
             propertyName = prefixMatch[0] + propertyName;
         }
-        const propertyDeclaration = CoercePropertyDeclaration(classDeclaration, propertyName, {
-            type: !property.isArray ? property.type : w => {
-                w.write('Array<');
-                if (typeof property.type === 'string') {
-                    if (property.type === 'date') {
-                        w.write('Date');
-                    }
-                    else {
-                        w.write(property.type);
-                    }
-                }
-                else {
-                    property.type(w);
-                }
-                w.write('>');
-            },
+        const propertyDeclaration = CoercePropertyDeclaration(classDeclaration, propertyName).set({
+            type: (0, write_type_1.WriteType)(property),
             hasQuestionToken: property.isOptional,
             hasExclamationToken: !property.isOptional,
         });
-        (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, {
-            name: 'Expose',
+        (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'Expose', {
             arguments: [],
         });
         importStructureList.push({
@@ -61,8 +53,7 @@ function CoerceDtoClass(project, name, propertyList, classStructure, importStruc
             moduleSpecifier: 'class-transformer',
         });
         if (property.isArray) {
-            (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, {
-                name: 'IsArray',
+            (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsArray', {
                 arguments: [],
             });
             importStructureList.push({
@@ -71,18 +62,12 @@ function CoerceDtoClass(project, name, propertyList, classStructure, importStruc
             });
         }
         if (property.isType) {
-            (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, {
-                name: 'Type',
+            (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'Type', {
                 arguments: [
                     w => {
                         w.write('() => ');
                         if (typeof property.type === 'string') {
-                            if (property.type === 'date') {
-                                w.write('Date');
-                            }
-                            else {
-                                w.write(property.type);
-                            }
+                            w.write(property.type);
                         }
                         else {
                             property.type(w);
@@ -94,17 +79,11 @@ function CoerceDtoClass(project, name, propertyList, classStructure, importStruc
                 namedImports: ['Type'],
                 moduleSpecifier: 'class-transformer',
             });
-            (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, {
-                name: 'IsInstance',
+            (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsInstance', {
                 arguments: [
                     w => {
                         if (typeof property.type === 'string') {
-                            if (property.type === 'date') {
-                                w.write('Date');
-                            }
-                            else {
-                                w.write(property.type);
-                            }
+                            w.write(property.type);
                         }
                         else {
                             property.type(w);
@@ -123,8 +102,7 @@ function CoerceDtoClass(project, name, propertyList, classStructure, importStruc
             });
         }
         if (property.isOptional) {
-            (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, {
-                name: 'IsOptional',
+            (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsOptional', {
                 arguments: [],
             });
             importStructureList.push({
@@ -132,53 +110,72 @@ function CoerceDtoClass(project, name, propertyList, classStructure, importStruc
                 moduleSpecifier: 'class-validator',
             });
         }
-        if (property.type === 'string') {
-            if (property.name === 'uuid') {
+        switch (property.type) {
+            case 'date':
+                (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsDate', {
+                    arguments: [],
+                });
                 importStructureList.push({
-                    namedImports: ['IsUUID'],
+                    namedImports: ['IsDate'],
                     moduleSpecifier: 'class-validator',
                 });
-                (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, {
-                    name: 'IsUUID',
+                break;
+            case 'number':
+                (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsNumber', {
                     arguments: [],
                 });
-            }
-            else {
                 importStructureList.push({
-                    namedImports: ['IsString'],
+                    namedImports: ['IsNumber'],
                     moduleSpecifier: 'class-validator',
                 });
-                (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, {
-                    name: 'IsString',
+                break;
+            case 'string':
+                if (property.name === 'uuid') {
+                    importStructureList.push({
+                        namedImports: ['IsUUID'],
+                        moduleSpecifier: 'class-validator',
+                    });
+                    (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsUUID', {
+                        arguments: [],
+                    });
+                }
+                else {
+                    importStructureList.push({
+                        namedImports: ['IsString'],
+                        moduleSpecifier: 'class-validator',
+                    });
+                    (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsString', {
+                        arguments: [],
+                    });
+                }
+                break;
+            case 'uuid':
+                (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsUUID', {
                     arguments: [],
                 });
-            }
-        }
-        if (property.type === 'boolean') {
-            importStructureList.push({
-                namedImports: ['IsBoolean'],
-                moduleSpecifier: 'class-validator',
-            });
-            (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, {
-                name: 'IsBoolean',
-                arguments: [],
-            });
-        }
-        if (property.type === 'number') {
-            importStructureList.push({
-                namedImports: ['IsBoolean'],
-                moduleSpecifier: 'class-validator',
-            });
-            (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, {
-                name: 'IsBoolean',
-                arguments: [],
-            });
+                importStructureList.push({
+                    namedImports: ['IsUUID'],
+                    moduleSpecifier: 'class-validator',
+                });
+                break;
+            case 'boolean':
+                (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsBoolean', {
+                    arguments: [],
+                });
+                importStructureList.push({
+                    namedImports: ['IsBoolean'],
+                    moduleSpecifier: 'class-validator',
+                });
+                break;
         }
     }
     (0, coerce_imports_1.CoerceImports)(sourceFile, importStructureList);
+    tsMorphTransform(project, sourceFile, classDeclaration);
     return {
         className,
-        filePath: (0, path_1.join)(sourceFile.getDirectoryPath(), sourceFile.getBaseNameWithoutExtension()),
+        filePath: '.' + (0, path_1.join)(sourceFile.getDirectoryPath(), sourceFile.getBaseNameWithoutExtension()),
+        sourceFile,
+        classDeclaration,
     };
 }
 exports.CoerceDtoClass = CoerceDtoClass;

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":";;;AAAA,qEAKoC;AACpC,+BAA4B;AAC5B,uCAckB;AAClB,kDAA8C;AAC9C,8DAAyD;AACzD,mEAA+D;AAC/D,+DAA2D;AAC3D,uDAAmD;AAoBnD,SAAgB,yBAAyB,CACvC,IAAwD,EACxD,IAAY,EACZ,YAA+H,EAAE;IAEjI,IAAI,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACtC,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QACtC,QAAQ,CAAC,GAAG,CAAC,SAAgB,CAAC,CAAC;KAChC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAXD,8DAWC;AAiBD,SAAgB,cAAc,CAAC,OAA8B;IAC3D,MAAM,EACJ,OAAO,GACR,GAAG,OAAO,CAAC;IACZ,IAAI,EACF,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,mBAAmB,EACnB,IAAI,GACL,GAAG,OAAO,CAAC;IAEZ,YAAY,aAAZ,YAAY,cAAZ,YAAY,IAAZ,YAAY,GAAK,EAAE,EAAC;IACpB,gEAAgE;IAChE,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE,GAAE,CAAC,EAAC;IAC9B,cAAc,aAAd,cAAc,cAAd,cAAc,IAAd,cAAc,GAAK,EAAE,EAAC;IACtB,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,IAAnB,mBAAmB,GAAK,EAAE,EAAC;IAC3B,IAAI,GAAG,IAAA,gCAAS,EAAC,IAAI,CAAC,CAAC;IAEvB,MAAM,SAAS,GAAG,IAAA,mCAAY,EAAC,IAAA,+BAAQ,EAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,IAAA,mCAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE5C,MAAM,UAAU,GAAG,IAAA,qCAAgB,EAAC,OAAO,EAAE,IAAA,WAAI,EAAC,MAAM,EAAE,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC;IAC7E,MAAM,gBAAgB,GAAG,IAAA,0BAAW,EAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAC5D,gBAAgB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACrC,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAErC,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE;QAEnC,IAAI,YAAY,GAAG,IAAA,+BAAQ,EAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEjD,IAAI,WAAW,EAAE;YACf,YAAY,GAAG,IAAA,+BAAQ,EAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;YAC1D,YAAY,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC;SAC9C;QAED,MAAM,mBAAmB,GAAwB,yBAAyB,CACxE,gBAAgB,EAChB,YAAY,CACb,CAAC,GAAG,CAAC;YACJ,IAAI,EAAE,IAAA,sBAAS,EAAC,QAAQ,CAAC;YACzB,gBAAgB,EAAE,QAAQ,CAAC,UAAU;YACrC,mBAAmB,EAAE,CAAC,QAAQ,CAAC,UAAU;SAC1C,CAAC,CAAC;QAEH,IAAA,kCAAe,EACb,mBAAmB,EACnB,QAAQ,EACR;YACE,SAAS,EAAE,EAAE;SACd,CACF,CAAC;QACF,mBAAmB,CAAC,IAAI,CAAC;YACvB,YAAY,EAAE,CAAE,QAAQ,CAAE;YAC1B,eAAe,EAAE,mBAAmB;SACrC,CAAC,CAAC;QAEH,IAAI,QAAQ,CAAC,OAAO,EAAE;YACpB,IAAA,kCAAe,EACb,mBAAmB,EACnB,SAAS,EACT;gBACE,SAAS,EAAE,EAAE;aACd,CACF,CAAC;YACF,mBAAmB,CAAC,IAAI,CAAC;gBACvB,YAAY,EAAE,CAAE,SAAS,CAAE;gBAC3B,eAAe,EAAE,iBAAiB;aACnC,CAAC,CAAC;SACJ;QACD,IAAI,QAAQ,CAAC,MAAM,EAAE;YACnB,IAAA,kCAAe,EAAC,mBAAmB,EAAE,MAAM,EAAE;gBAC3C,SAAS,EAAE;oBACT,CAAC,CAAC,EAAE;wBACF,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;wBAClB,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE;4BACrC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;yBACxB;6BAAM;4BACL,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;yBAClB;oBACH,CAAC;iBACF;aACF,CAAC,CAAC;YACH,mBAAmB,CAAC,IAAI,CAAC;gBACvB,YAAY,EAAE,CAAE,MAAM,CAAE;gBACxB,eAAe,EAAE,mBAAmB;aACrC,CAAC,CAAC;YACH,IAAA,kCAAe,EAAC,mBAAmB,EAAE,YAAY,EAAE;gBACjD,SAAS,EAAE;oBACT,CAAC,CAAC,EAAE;wBACF,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE;4BACrC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;yBACxB;6BAAM;4BACL,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;yBAClB;oBACH,CAAC;oBACD,CAAC,CAAC,EAAE;wBACF,IAAI,QAAQ,CAAC,OAAO,EAAE;4BACpB,kBAAO,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;yBACrC;oBACH,CAAC;iBACF;aACF,CAAC,CAAC;YACH,mBAAmB,CAAC,IAAI,CAAC;gBACvB,YAAY,EAAE,CAAE,YAAY,CAAE;gBAC9B,eAAe,EAAE,iBAAiB;aACnC,CAAC,CAAC;SACJ;QACD,IAAI,QAAQ,CAAC,UAAU,EAAE;YACvB,IAAA,kCAAe,EACb,mBAAmB,EACnB,YAAY,EACZ;gBACE,SAAS,EAAE,EAAE;aACd,CACF,CAAC;YACF,mBAAmB,CAAC,IAAI,CAAC;gBACvB,YAAY,EAAE,CAAE,YAAY,CAAE;gBAC9B,eAAe,EAAE,iBAAiB;aACnC,CAAC,CAAC;SACJ;QACD,QAAQ,QAAQ,CAAC,IAAI,EAAE;YACrB,KAAK,MAAM;gBACT,IAAA,kCAAe,EACb,mBAAmB,EACnB,QAAQ,EACR;oBACE,SAAS,EAAE,EAAE;iBACd,CACF,CAAC;gBACF,mBAAmB,CAAC,IAAI,CAAC;oBACvB,YAAY,EAAE,CAAE,QAAQ,CAAE;oBAC1B,eAAe,EAAE,iBAAiB;iBACnC,CAAC,CAAC;gBACH,MAAM;YACR,KAAK,QAAQ;gBACX,IAAA,kCAAe,EACb,mBAAmB,EACnB,UAAU,EACV;oBACE,SAAS,EAAE,EAAE;iBACd,CACF,CAAC;gBACF,mBAAmB,CAAC,IAAI,CAAC;oBACvB,YAAY,EAAE,CAAE,UAAU,CAAE;oBAC5B,eAAe,EAAE,iBAAiB;iBACnC,CAAC,CAAC;gBACH,MAAM;YACR,KAAK,QAAQ;gBACX,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,EAAE;oBAC5B,mBAAmB,CAAC,IAAI,CAAC;wBACvB,YAAY,EAAE,CAAE,QAAQ,CAAE;wBAC1B,eAAe,EAAE,iBAAiB;qBACnC,CAAC,CAAC;oBACH,IAAA,kCAAe,EACb,mBAAmB,EACnB,QAAQ,EACR;wBACE,SAAS,EAAE,EAAE;qBACd,CACF,CAAC;iBACH;qBAAM;oBACL,mBAAmB,CAAC,IAAI,CAAC;wBACvB,YAAY,EAAE,CAAE,UAAU,CAAE;wBAC5B,eAAe,EAAE,iBAAiB;qBACnC,CAAC,CAAC;oBACH,IAAA,kCAAe,EACb,mBAAmB,EACnB,UAAU,EACV;wBACE,SAAS,EAAE,EAAE;qBACd,CACF,CAAC;iBACH;gBACD,MAAM;YACR,KAAK,MAAM;gBACT,IAAA,kCAAe,EACb,mBAAmB,EACnB,QAAQ,EACR;oBACE,SAAS,EAAE,EAAE;iBACd,CACF,CAAC;gBACF,mBAAmB,CAAC,IAAI,CAAC;oBACvB,YAAY,EAAE,CAAE,QAAQ,CAAE;oBAC1B,eAAe,EAAE,iBAAiB;iBACnC,CAAC,CAAC;gBACH,MAAM;YACR,KAAK,SAAS;gBACZ,IAAA,kCAAe,EACb,mBAAmB,EACnB,WAAW,EACX;oBACE,SAAS,EAAE,EAAE;iBACd,CACF,CAAC;gBACF,mBAAmB,CAAC,IAAI,CAAC;oBACvB,YAAY,EAAE,CAAE,WAAW,CAAE;oBAC7B,eAAe,EAAE,iBAAiB;iBACnC,CAAC,CAAC;gBACH,MAAM;SACT;KAEF;IAED,IAAA,8BAAa,EAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;IAE/C,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAExD,OAAO;QACL,SAAS;QACT,QAAQ,EAAE,GAAG,GAAG,IAAA,WAAI,EAAC,UAAU,CAAC,gBAAgB,EAAE,EAAE,UAAU,CAAC,2BAA2B,EAAE,CAAC;QAC7F,UAAU;QACV,gBAAgB;KACjB,CAAC;AAEJ,CAAC;AAzND,wCAyNC"}

package/src/lib/nest/coerce-form-submit-operation.d.ts

@@ -1,6 +1,7 @@
 import { CoerceOperationOptions } from './coerce-operation';
-import { DtoClassProperty } from '../create-dto-class';
+import { DtoClassProperty } from './create-dto-class';
 export interface CoerceFormSubmitOperationOptions extends Omit<CoerceOperationOptions, 'operationName'> {
     propertyList?: DtoClassProperty[] | null;
+    bodyDtoName?: string;
 }
 export declare function CoerceFormSubmitOperation(options: CoerceFormSubmitOperationOptions): import("@angular-devkit/schematics").Rule;

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

@@ -1,21 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceFormSubmitOperation = void 0;
+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 coerce_imports_1 = require("../ts-morph/coerce-imports");
 function CoerceFormSubmitOperation(options) {
-    let { tsMorphTransform, paramList, propertyList, } = options;
+    let { tsMorphTransform, controllerName, propertyList, bodyDtoName, context, } = options;
     tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => ({}));
-    paramList !== null && paramList !== void 0 ? paramList : (paramList = []);
     propertyList !== null && propertyList !== void 0 ? propertyList : (propertyList = []);
+    bodyDtoName !== null && bodyDtoName !== void 0 ? bodyDtoName : (bodyDtoName = (0, utilities_1.joinWithDash)([context, controllerName]));
     return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { operationName: 'submit', tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
-            const { className: dtoClassName, filePath: dtoFilePath, } = (0, coerce_dto_class_1.CoerceDtoClass)(project, controllerName, propertyList);
+            const { className: dtoClassName, filePath: dtoFilePath, } = (0, coerce_dto_class_1.CoerceDtoClass)({
+                project,
+                name: bodyDtoName,
+                propertyList,
+            });
             (0, coerce_imports_1.CoerceImports)(sourceFile, {
                 namedImports: [dtoClassName],
-                moduleSpecifier: `..${dtoFilePath}`,
+                moduleSpecifier: dtoFilePath,
             });
-            return Object.assign({ body: dtoClassName, method: 'post', paramList }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
+            return Object.assign({ body: dtoClassName, method: 'post' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
         } }));
 }
 exports.CoerceFormSubmitOperation = CoerceFormSubmitOperation;

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,yDAAoD;AACpD,yDAG4B;AAC5B,+DAA2D;AAO3D,SAAgB,yBAAyB,CAAC,OAAyC;IACjF,IAAI,EACF,gBAAgB,EAChB,SAAS,EACT,YAAY,GACb,GAAG,OAAO,CAAC;IACZ,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAC;IAEhC,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,EAAE,EAAC;IACjB,YAAY,aAAZ,YAAY,cAAZ,YAAY,IAAZ,YAAY,GAAK,EAAE,EAAC;IAEpB,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,aAAa,EAAE,QAAQ,EACvB,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,EAChB,OAAO,EACP,cAAc,EACd,YAAa,CACd,CAAC;YAEF,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,YAAY,CAAE;gBAC9B,eAAe,EAAE,KAAM,WAAY,EAAE;aACtC,CAAC,CAAC;YAEH,uBACE,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EACd,SAAS,IACN,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,EAC3E;QAEJ,CAAC,IACD,CAAC;AAEL,CAAC;AA7CD,8DA6CC"}
+{"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,+CAA+C;AAC/C,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAQ5B,SAAgB,yBAAyB,CAAC,OAAyC;IACjF,IAAI,EACF,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,WAAW,EACX,OAAO,GACR,GAAG,OAAO,CAAC;IACZ,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAC;IAEhC,YAAY,aAAZ,YAAY,cAAZ,YAAY,IAAZ,YAAY,GAAK,EAAE,EAAC;IACpB,WAAW,aAAX,WAAW,cAAX,WAAW,IAAX,WAAW,GAAK,IAAA,wBAAY,EAAC,CAAE,OAAO,EAAE,cAAc,CAAE,CAAC,EAAC;IAE1D,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,aAAa,EAAE,QAAQ,EACvB,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,WAAY;gBAClB,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,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,IACX,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,EAC3E;QAEJ,CAAC,IACD,CAAC;AAEL,CAAC;AA9CD,8DA8CC"}

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

@@ -1,17 +1,7 @@
-import { OperationParameter } from '../add-operation-to-controller';
-import { DtoClassProperty } from '../create-dto-class';
-export interface CoerceGetByIdControllerOptions {
-    name?: string;
-    controllerName?: string;
-    nestController?: string;
-    project: string;
-    feature: string;
-    shared: boolean;
-    module?: string;
-    nestModule?: string;
-    paramList?: OperationParameter[];
+import { CoerceOperationOptions } from './coerce-operation';
+import { DtoClassProperty } from './create-dto-class';
+export interface CoerceGetByIdControllerOptions extends Omit<CoerceOperationOptions, 'operationName'> {
     propertyList?: DtoClassProperty[];
-    skipCoerce?: boolean;
     isArray?: boolean;
 }
 export declare function CoerceGetByIdOperation(options: CoerceGetByIdControllerOptions): import("@angular-devkit/schematics").Rule;

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

@@ -1,18 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceGetByIdOperation = void 0;
-const coerce_dto_class_1 = require("./coerce-dto-class");
-const coerce_operation_1 = require("./coerce-operation");
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
 const coerce_imports_1 = require("../ts-morph/coerce-imports");
-const schematics_1 = require("@angular-devkit/schematics");
+const coerce_dto_class_1 = require("./coerce-dto-class");
+const coerce_operation_1 = require("./coerce-operation");
 function CoerceGetByIdOperation(options) {
-    let { name, controllerName, nestController, isArray, module, nestModule, paramList, propertyList, } = options;
-    nestModule !== null && nestModule !== void 0 ? nestModule : (nestModule = module);
+    let { controllerName, isArray, nestModule, paramList, propertyList, } = options;
     propertyList !== null && propertyList !== void 0 ? propertyList : (propertyList = []);
     paramList !== null && paramList !== void 0 ? paramList : (paramList = []);
-    controllerName !== null && controllerName !== void 0 ? controllerName : (controllerName = name);
-    controllerName !== null && controllerName !== void 0 ? controllerName : (controllerName = nestController);
     /**
      * If the module is not specified. This controller has an own module. Else the
      * module is originated by another controller.
@@ -43,9 +39,6 @@ function CoerceGetByIdOperation(options) {
         nestModule = controllerName;
     }
     if (!paramList.some(param => param.name === 'uuid')) {
-        if (!nestModule) {
-            throw new schematics_1.SchematicsException('Could not determine the nest module name');
-        }
         paramList.push({
             name: 'uuid',
             type: 'string',
@@ -53,12 +46,15 @@ function CoerceGetByIdOperation(options) {
             fromParent: !isFirstBornSibling,
         });
     }
-    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { module: nestModule, nestModule, name: controllerName, nestController: controllerName, controllerName,
-        paramList, operationName: 'getById', tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
-            const { className: dtoClassName, filePath: dtoFilePath, } = (0, coerce_dto_class_1.CoerceDtoClass)(project, controllerName, propertyList);
+    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { nestModule, controllerName: controllerName, paramList, operationName: 'getById', 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}`,
+                moduleSpecifier: dtoFilePath,
             });
             return {
                 returnType: dtoClassName + (isArray ? '[]' : ''),

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,yDAAoD;AACpD,yDAAqD;AACrD,qEAA0D;AAC1D,+DAA2D;AAG3D,2DAAiE;AAiBjE,SAAgB,sBAAsB,CAAC,OAAuC;IAC5E,IAAI,EACF,IAAI,EACJ,cAAc,EACd,cAAc,EACd,OAAO,EACP,MAAM,EACN,UAAU,EACV,SAAS,EACT,YAAY,GACb,GAAG,OAAO,CAAC;IAEZ,UAAU,aAAV,UAAU,cAAV,UAAU,IAAV,UAAU,GAAK,MAAM,EAAC;IACtB,YAAY,aAAZ,YAAY,cAAZ,YAAY,IAAZ,YAAY,GAAK,EAAE,EAAC;IACpB,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,EAAE,EAAC;IACjB,cAAc,aAAd,cAAc,cAAd,cAAc,IAAd,cAAc,GAAK,IAAI,EAAC;IACxB,cAAc,aAAd,cAAc,cAAd,cAAc,IAAd,cAAc,GAAK,cAAc,EAAC;IAElC;;;;;;;;;;;;;;;;;;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,MAAM,CAAC,EAAE;QAC5E,YAAY,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;KACJ;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,MAAM,CAAC,EAAE;QACnD,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,gCAAmB,CAAC,0CAA0C,CAAC,CAAC;SAC3E;QACD,SAAS,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,mCAAY,EAAC,UAAU,EAAE,OAAO,CAAC;YACzE,UAAU,EAAE,CAAC,kBAAkB;SAChC,CAAC,CAAC;KACJ;IAED,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,MAAM,EAAE,UAAU,EAClB,UAAU,EACV,IAAI,EAAE,cAAc,EACpB,cAAc,EAAE,cAAc,EAC9B,cAAc;QACd,SAAS,EACT,aAAa,EAAE,SAAS,EACxB,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,EAChB,OAAO,EACP,cAAc,EACd,YAAa,CACd,CAAC;YAEF,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,YAAY,CAAE;gBAC9B,eAAe,EAAE,KAAM,WAAY,EAAE;aACtC,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;AAnGD,wDAmGC"}
+{"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,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAQ5B,SAAgB,sBAAsB,CAAC,OAAuC;IAC5E,IAAI,EACF,cAAc,EACd,OAAO,EACP,UAAU,EACV,SAAS,EACT,YAAY,GACb,GAAG,OAAO,CAAC;IAEZ,YAAY,aAAZ,YAAY,cAAZ,YAAY,IAAZ,YAAY,GAAK,EAAE,EAAC;IACpB,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,EAAE,EAAC;IAEjB;;;;;;;;;;;;;;;;;;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,MAAM,CAAC,EAAE;QAC5E,YAAY,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;KACJ;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,MAAM,CAAC,EAAE;QACnD,SAAS,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,mCAAY,EAAC,UAAW,EAAE,OAAO,CAAC;YAC1E,UAAU,EAAE,CAAC,kBAAkB;SAChC,CAAC,CAAC;KACJ;IAED,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,UAAU,EACV,cAAc,EAAE,cAAe,EAC/B,SAAS,EACT,aAAa,EAAE,SAAS,EACxB,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,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;AAvFD,wDAuFC"}

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

@@ -1,22 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceGetChildrenOperation = void 0;
-const coerce_operation_1 = require("./coerce-operation");
-const coerce_dto_class_1 = require("./coerce-dto-class");
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
 const coerce_imports_1 = require("../ts-morph/coerce-imports");
-const schematics_1 = require("@angular-devkit/schematics");
+const coerce_dto_class_1 = require("./coerce-dto-class");
+const coerce_operation_1 = require("./coerce-operation");
 function CoerceGetChildrenOperation(options) {
-    let { tsMorphTransform, name, controllerName, nestController, paramList, } = options;
+    let { tsMorphTransform, controllerName, paramList, } = options;
     tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => ({}));
-    controllerName !== null && controllerName !== void 0 ? controllerName : (controllerName = nestController);
-    controllerName !== null && controllerName !== void 0 ? controllerName : (controllerName = name);
-    if (!controllerName) {
-        throw new schematics_1.SchematicsException('No controller name provided!');
-    }
-    if (!name) {
-        throw new schematics_1.SchematicsException('No name provided!');
-    }
     controllerName = (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-tree-table');
     paramList !== null && paramList !== void 0 ? paramList : (paramList = []);
     paramList.push({
@@ -25,24 +16,28 @@ function CoerceGetChildrenOperation(options) {
     });
     return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { 
         // TODO : remove after migration to controllerName
-        name: controllerName, nestController: controllerName, controllerName, operationName: 'get-children', paramList, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
-            const { className, filePath, } = (0, coerce_dto_class_1.CoerceDtoClass)(project, (0, schematics_utilities_1.CoerceSuffix)(name, '-item'), [
-                {
-                    name: 'uuid',
-                    type: 'string',
-                },
-                {
-                    name: 'hasChildren',
-                    type: 'boolean',
-                },
-                {
-                    name: 'children',
-                    type: (0, schematics_utilities_1.classify)((0, schematics_utilities_1.CoerceSuffix)(name, '-item-dto')),
-                    isArray: true,
-                    isOptional: true,
-                    isType: true,
-                },
-            ]);
+        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'],
@@ -50,11 +45,11 @@ function CoerceGetChildrenOperation(options) {
                 },
                 {
                     namedImports: ['classTransformOptions'],
-                    moduleSpecifier: '@rxap/nest/class-transformer/options',
+                    moduleSpecifier: '@rxap/nest-utilities',
                 },
                 {
                     namedImports: [className],
-                    moduleSpecifier: `..${filePath}`,
+                    moduleSpecifier: filePath,
                 },
             ]);
             return Object.assign({ returnType: className + '[]' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));

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,yDAG4B;AAC5B,yDAAoD;AACpD,qEAGoC;AACpC,+DAA2D;AAC3D,2DAAiE;AAIjE,SAAgB,0BAA0B,CAAC,OAAoD;IAC7F,IAAI,EACF,gBAAgB,EAChB,IAAI,EACJ,cAAc,EACd,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,aAAd,cAAc,cAAd,cAAc,IAAd,cAAc,GAAK,cAAc,EAAC;IAClC,cAAc,aAAd,cAAc,cAAd,cAAc,IAAd,cAAc,GAAK,IAAI,EAAC;IACxB,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,gCAAmB,CAAC,8BAA8B,CAAC,CAAC;KAC/D;IACD,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,gCAAmB,CAAC,mBAAmB,CAAC,CAAC;KACpD;IACD,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,IAAI,EAAE,cAAc,EACpB,cAAc,EAAE,cAAc,EAC9B,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,EAChB,OAAO,EACP,IAAA,mCAAY,EAAC,IAAK,EAAE,OAAO,CAAC,EAC5B;gBACE;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,QAAQ;iBACf;gBACD;oBACE,IAAI,EAAE,aAAa;oBACnB,IAAI,EAAE,SAAS;iBAChB;gBACD;oBACE,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,IAAA,+BAAQ,EAAC,IAAA,mCAAY,EAAC,IAAK,EAAE,WAAW,CAAC,CAAC;oBAChD,OAAO,EAAE,IAAI;oBACb,UAAU,EAAE,IAAI;oBAChB,MAAM,EAAE,IAAI;iBACb;aACF,CACF,CAAC;YAEF,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,sCAAsC;iBACxD;gBACD;oBACE,YAAY,EAAE,CAAE,SAAS,CAAE;oBAC3B,eAAe,EAAE,KAAM,QAAS,EAAE;iBACnC;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;AApFD,gEAoFC"}
+{"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"}

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

@@ -1,5 +1,5 @@
 import { CoerceOperationOptions } from './coerce-operation';
-import { DtoClassProperty } from '../create-dto-class';
+import { DtoClassProperty } from './create-dto-class';
 export interface CoerceGetDataGridOperationOptions extends Omit<CoerceOperationOptions, 'operationName'> {
     collection?: boolean;
     propertyList?: DtoClassProperty[];