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

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[];

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

@@ -1,30 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceGetDataGridOperation = 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 CoerceGetDataGridOperation(options) {
-    let { tsMorphTransform, collection, propertyList, controllerName, nestController, name, } = 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 !== 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!');
-    }
     controllerName =
         (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-data-grid');
-    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { 
-        // TODO : remove after migration to controllerName
-        name: controllerName, nestController: controllerName, controllerName, operationName: 'get', 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), { 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}`,
+                moduleSpecifier: dtoFilePath,
             });
             return Object.assign({ returnType: dtoClassName + (collection ? '[]' : '') }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
         } }));

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,yDAG4B;AAC5B,yDAAoD;AACpD,qEAA0D;AAC1D,+DAA2D;AAE3D,2DAAiE;AAOjE,SAAgB,0BAA0B,CAAC,OAAoD;IAC7F,IAAI,EACF,gBAAgB,EAChB,UAAU,EACV,YAAY,EACZ,cAAc,EACd,cAAc,EACd,IAAI,GACL,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,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,cAAc;QACZ,IAAA,mCAAY,EAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IAE7C,OAAO,IAAA,kCAAe,kCACjB,OAAO;QACV,kDAAkD;QAClD,IAAI,EAAE,cAAc,EACpB,cAAc,EAAE,cAAc,EAC9B,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,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,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;AAxDD,gEAwDC"}
+{"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"}

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

@@ -1,8 +1,37 @@
+import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
+import { OperationOptions } from './add-operation-to-controller';
 import { CoerceOperationOptions } from './coerce-operation';
-export interface CoerceGetPageOperationOptions extends Omit<CoerceOperationOptions, 'operationName'> {
-    columnList: Array<{
-        name: string;
-        type?: string;
-    }>;
+import { DtoClassProperty } from './create-dto-class';
+export interface GetPageOperationColumn {
+    name: string;
+    type?: string;
+    /**
+     * 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'> {
+    columnList: GetPageOperationColumn[];
+    tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration, controllerName: string, 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;
+}
+export declare function GetPageOperationColumnToDtoClassProperty(column: GetPageOperationColumn): DtoClassProperty;
+export declare function GetPageOperationColumnToCodeText(column: GetPageOperationColumn): 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 CoerceGetPageOperation(options: Readonly<CoerceGetPageOperationOptions>): import("@angular-devkit/schematics").Rule;

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

@@ -1,45 +1,149 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CoerceGetPageOperation = void 0;
-const coerce_operation_1 = require("./coerce-operation");
+exports.CoerceGetPageOperation = exports.CoerceToPageDtoMethod = exports.CoerceToRowDtoMethod = exports.GetPageOperationColumnToCodeText = exports.GetPageOperationColumnToDtoClassProperty = void 0;
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
+const utilities_1 = require("@rxap/utilities");
+const ts_morph_1 = require("ts-morph");
+const coerce_class_method_1 = require("../coerce-class-method");
+const coerce_imports_1 = require("../ts-morph/coerce-imports");
+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");
-const coerce_imports_1 = require("../ts-morph/coerce-imports");
-const schematics_1 = require("@angular-devkit/schematics");
+function GetPageOperationColumnToDtoClassProperty(column) {
+    var _a, _b, _c, _d;
+    return {
+        name: column.name,
+        type: (_b = (_a = column.type) === null || _a === void 0 ? void 0 : _a.replace(/\[]$/, '').replace(/^Array<(.+)>/, '$1')) !== null && _b !== void 0 ? _b : 'unknown',
+        isArray: ((_c = column.type) === null || _c === void 0 ? void 0 : _c.endsWith('[]')) || ((_d = column.type) === null || _d === void 0 ? void 0 : _d.startsWith('Array<')),
+        isOptional: false,
+        isType: false,
+    };
+}
+exports.GetPageOperationColumnToDtoClassProperty = GetPageOperationColumnToDtoClassProperty;
+function GetPageOperationColumnToCodeText(column) {
+    var _a;
+    let propertyName = (0, schematics_utilities_1.camelize)(column.name);
+    const prefixMatch = column.name.match(/^(_+)/);
+    if (prefixMatch) {
+        propertyName = (0, schematics_utilities_1.camelize)(column.name.replace(/^_+/, ''));
+        propertyName = prefixMatch[0] + propertyName;
+    }
+    return `${propertyName}: item.${(_a = column.source) !== null && _a !== void 0 ? _a : (0, schematics_utilities_1.camelize)(column.name)}`;
+}
+exports.GetPageOperationColumnToCodeText = GetPageOperationColumnToCodeText;
+function CoerceToRowDtoMethod(sourceFile, classDeclaration, rowClassName, options) {
+    var _a;
+    (0, coerce_class_method_1.CoerceClassMethod)(classDeclaration, 'to' + rowClassName, {
+        scope: ts_morph_1.Scope.Private,
+        returnType: rowClassName,
+        parameters: [
+            {
+                name: 'item',
+                type: 'any',
+            },
+            {
+                name: 'index',
+                initializer: '0',
+            },
+            {
+                name: 'pageIndex',
+                initializer: '0',
+            },
+            {
+                name: 'pageSize',
+                initializer: '1',
+            },
+            {
+                name: 'list',
+                initializer: '[item]',
+            },
+        ],
+        statements: [
+            'return {',
+            '__rowId: ' +
+                (options.rowIdProperty === null ?
+                    '(pageIndex * pageSize + index).toFixed(0)' :
+                    `item.${(_a = options.rowIdProperty) !== null && _a !== void 0 ? _a : 'uuid'}`) + ',\n',
+            options.columnList.map(GetPageOperationColumnToCodeText).join(',\n'),
+            '}',
+        ],
+    });
+}
+exports.CoerceToRowDtoMethod = CoerceToRowDtoMethod;
+function CoerceToPageDtoMethod(sourceFile, classDeclaration, pageClassName, rowClassName, options) {
+    (0, coerce_class_method_1.CoerceClassMethod)(classDeclaration, 'to' + pageClassName, {
+        scope: ts_morph_1.Scope.Private,
+        returnType: pageClassName,
+        parameters: [
+            {
+                name: 'list',
+                type: 'any[]',
+            },
+            {
+                name: 'total',
+                type: 'number',
+                initializer: 'list.length',
+            },
+            {
+                name: 'pageIndex',
+                initializer: '0',
+            },
+            {
+                name: 'pageSize',
+                type: 'number',
+                initializer: 'list.length',
+            },
+            {
+                name: 'sortBy',
+                initializer: `''`,
+            },
+            {
+                name: 'sortDirection',
+                initializer: `''`,
+            },
+            {
+                name: 'filter',
+                type: 'FilterQuery[]',
+                initializer: '[]',
+            },
+        ],
+        statements: [
+            'return {',
+            'total, pageIndex, pageSize, sortBy, sortDirection, filter,',
+            `rows: list.map((item, index) => this.to${rowClassName}(item, index, pageIndex, pageSize, list))`,
+            '}',
+        ],
+    });
+}
+exports.CoerceToPageDtoMethod = CoerceToPageDtoMethod;
 function CoerceGetPageOperation(options) {
-    let { tsMorphTransform, name, columnList, controllerName, nestController, } = options;
+    let { skipCoerceTableSuffix, operationName, rowIdProperty, tsMorphTransform, columnList, controllerName, responseDtoName, context, coerceToRowDtoMethod, coerceToPageDtoMethod, } = 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!');
-    }
-    controllerName = (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-table');
-    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { 
-        // TODO : remove after migration to controllerName
-        name: controllerName, nestController: controllerName, controllerName, operationName: 'get-page', tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
+    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);
+    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { controllerName,
+        operationName, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
             const { className: rowClassName, filePath: rowFilePath, } = (0, coerce_row_dto_class_1.CoerceRowDtoClass)({
                 project,
-                name: controllerName,
-                propertyList: columnList.map(column => {
-                    var _a;
-                    return ({
-                        name: column.name,
-                        type: (_a = column.type) !== null && _a !== void 0 ? _a : 'unknown',
-                    });
-                }),
+                name: responseDtoName,
+                propertyList: columnList.map(GetPageOperationColumnToDtoClassProperty),
+                rowIdType: rowIdProperty === null ? null : undefined,
             });
             const { className: pageClassName, filePath: pageFilePath, } = (0, coerce_page_dto_class_1.CoercePageDtoClass)({
                 project,
-                name: controllerName,
+                name: responseDtoName,
                 rowClassName,
                 rowFilePath,
             });
+            coerceToRowDtoMethod(sourceFile, classDeclaration, rowClassName, options);
+            coerceToPageDtoMethod(sourceFile, classDeclaration, pageClassName, rowClassName, options);
             (0, coerce_imports_1.CoerceImports)(sourceFile, [
                 {
                     namedImports: ['FilterQuery', 'FilterQueryPipe'],
-                    moduleSpecifier: '@eurogard/service-nest-utilities',
+                    moduleSpecifier: '@rxap/nest-utilities',
                 },
                 {
                     namedImports: ['plainToInstance'],
@@ -47,11 +151,15 @@ function CoerceGetPageOperation(options) {
                 },
                 {
                     namedImports: ['classTransformOptions'],
-                    moduleSpecifier: '@rxap/nest/class-transformer/options',
+                    moduleSpecifier: '@rxap/nest-utilities',
                 },
                 {
                     namedImports: [pageClassName],
-                    moduleSpecifier: `..${pageFilePath}`,
+                    moduleSpecifier: pageFilePath,
+                },
+                {
+                    namedImports: [rowClassName],
+                    moduleSpecifier: rowFilePath,
                 },
             ]);
             return Object.assign({ queryList: [
@@ -90,27 +198,12 @@ function CoerceGetPageOperation(options) {
         filter: filter.map((item) => \`\${ item.column }:\${ item.filter }\`).join(';'),
       },
     });`,
-                    `return plainToInstance(
-      ${pageClassName},
-      {
-        total: response.maxCount ?? 0,
-        pageIndex,
-        pageSize,
-        sortBy,
-        sortDirection,
-        filter,
-        rows:
-          response.entities?.map((item) => ({
-            __rowId: item.uuid,
-            __archived: item.__archived,
-            __removedAt: item.__removedAt,
-            ${columnList.map(column => `${(0, schematics_utilities_1.camelize)(column.name)}: item.${(0, schematics_utilities_1.camelize)(column.name)}`)
-                        .join(',\n            ')}
-          })) ?? [],
-      },
-      classTransformOptions,
-    );`,
-                ] }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
+                    'return plainToInstance(',
+                    pageClassName + ',',
+                    `this.to${pageClassName}(response.entities ?? [], response.maxCount ?? 0, pageIndex, pageSize, sortBy, sortDirection, filter),`,
+                    'classTransformOptions',
+                    ');',
+                ] }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName, pageClassName, rowClassName));
         } }));
 }
 exports.CoerceGetPageOperation = CoerceGetPageOperation;

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

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

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

@@ -1,40 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceGetRootOperation = 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 CoerceGetRootOperation(options) {
-    let { tsMorphTransform, name, controllerName, nestController, } = options;
+    let { tsMorphTransform, controllerName, } = 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!');
-    }
     controllerName = (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-tree-table');
-    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { 
-        // TODO : remove after migration to controllerName
-        name: controllerName, nestController: controllerName, controllerName, operationName: 'get-root', tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
-            const { className, filePath, } = (0, coerce_dto_class_1.CoerceDtoClass)(project, (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-item'), [
-                {
-                    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,
-                },
-            ]);
+    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { controllerName, operationName: 'get-root', 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'],
@@ -42,11 +38,11 @@ function CoerceGetRootOperation(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-root-operation.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-get-root-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-root-operation.ts"],"names":[],"mappings":";;;AAAA,yDAG4B;AAC5B,yDAAoD;AACpD,qEAGoC;AACpC,+DAA2D;AAC3D,2DAAiE;AAIjE,SAAgB,sBAAsB,CAAC,OAAgD;IACrF,IAAI,EACF,gBAAgB,EAChB,IAAI,EACJ,cAAc,EACd,cAAc,GACf,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,cAAc,GAAG,IAAA,mCAAY,EAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IAC7D,OAAO,IAAA,kCAAe,kCACjB,OAAO;QACV,kDAAkD;QAClD,IAAI,EAAE,cAAc,EACpB,cAAc,EAAE,cAAc,EAC9B,cAAc,EACd,aAAa,EAAE,UAAU,EACzB,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,cAAc,EAAE,OAAO,CAAC,EACrC;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,cAAc,EAAE,WAAW,CAAC,CAAC;oBACzD,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;AA1ED,wDA0EC"}
+{"version":3,"file":"coerce-get-root-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-root-operation.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;AACpC,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAI5B,SAAgB,sBAAsB,CAAC,OAAgD;IACrF,IAAI,EACF,gBAAgB,EAChB,cAAc,GACf,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,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,cAAc,EACd,aAAa,EAAE,UAAU,EACzB,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;AAhED,wDAgEC"}