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

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

@@ -1,12 +1,7 @@
-import { ClassDeclarationStructure, ImportDeclarationStructure, OptionalKind, Project } from 'ts-morph';
-import { DtoClassProperty } from './create-dto-class';
-export interface CoercePageDtoClassOptions {
-    project: Project;
-    name: string;
-    propertyList?: DtoClassProperty[];
-    classStructure?: Omit<OptionalKind<ClassDeclarationStructure>, 'name'>;
-    importStructureList?: Array<OptionalKind<ImportDeclarationStructure>>;
+import { CoerceDtoClassOptions } from './coerce-dto-class';
+export interface CoercePageDtoClassOptions extends CoerceDtoClassOptions {
     rowClassName: string;
     rowFilePath: string;
 }
+export declare function BuildPageDtoClassName(name: string): string;
 export declare function CoercePageDtoClass(options: CoercePageDtoClassOptions): import("./coerce-dto-class").CoerceDtoClassOutput;

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

@@ -1,37 +1,67 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CoercePageDtoClass = void 0;
+exports.CoercePageDtoClass = exports.BuildPageDtoClassName = void 0;
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
+const ts_morph_1 = require("@rxap/ts-morph");
+const utilities_1 = require("@rxap/utilities");
 const path_1 = require("path");
 const coerce_dto_class_1 = require("./coerce-dto-class");
+function BuildPageDtoClassName(name) {
+    return (0, schematics_utilities_1.CoerceSuffix)(name, '-page');
+}
+exports.BuildPageDtoClassName = BuildPageDtoClassName;
 function CoercePageDtoClass(options) {
-    let { project, name, propertyList, classStructure, importStructureList, rowClassName, rowFilePath, } = options;
-    importStructureList !== null && importStructureList !== void 0 ? importStructureList : (importStructureList = []);
-    importStructureList.push({
-        namedImports: ['PageDto'],
-        moduleSpecifier: '@rxap/nest-dto',
-    }, {
-        namedImports: [rowClassName],
-        moduleSpecifier: `./${(0, path_1.basename)(rowFilePath)}`,
-    });
-    classStructure !== null && classStructure !== void 0 ? classStructure : (classStructure = {});
-    classStructure.extends = `PageDto<${rowClassName}>`;
-    propertyList !== null && propertyList !== void 0 ? propertyList : (propertyList = [
+    const { project, name, propertyList = [], rowClassName, rowFilePath, tsMorphTransform = utilities_1.noop, } = options;
+    (0, utilities_1.CoerceArrayItems)(propertyList, [
         {
             name: 'rows',
             type: rowClassName,
             isArray: true,
             isType: true,
         },
-    ]);
-    propertyList.push();
-    return (0, coerce_dto_class_1.CoerceDtoClass)({
-        project,
-        name: (0, schematics_utilities_1.CoerceSuffix)(name, '-page'),
-        propertyList,
-        classStructure,
-        importStructureList,
-    });
+        {
+            name: 'pageSize',
+            type: 'number',
+        },
+        {
+            name: 'pageIndex',
+            type: 'number',
+        },
+        {
+            name: 'total',
+            type: 'number',
+        },
+        {
+            name: 'sortDirection',
+            type: 'string',
+            isOptional: true,
+        },
+        {
+            name: 'sortBy',
+            type: 'string',
+            isOptional: true,
+        },
+        {
+            name: 'filter',
+            type: 'FilterQueryDto',
+            isArray: true,
+            isType: true,
+            isOptional: true,
+        }
+    ], (a, b) => a.name === b.name);
+    return (0, coerce_dto_class_1.CoerceDtoClass)(Object.assign(Object.assign({}, options), { project, name: BuildPageDtoClassName(name), propertyList, tsMorphTransform: (p, sourceFile, classDeclaration) => {
+            (0, ts_morph_1.CoerceImports)(sourceFile, [
+                {
+                    namedImports: [rowClassName],
+                    moduleSpecifier: `./${(0, path_1.basename)(rowFilePath)}`,
+                },
+                {
+                    namedImports: ['FilterQueryDto'],
+                    moduleSpecifier: '@rxap/nest-dto',
+                }
+            ]);
+            tsMorphTransform(p, sourceFile, classDeclaration);
+        } }));
 }
 exports.CoercePageDtoClass = CoercePageDtoClass;
 //# sourceMappingURL=coerce-page-dto-class.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"coerce-page-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-page-dto-class.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAC1D,+BAAgC;AAOhC,yDAAoD;AAapD,SAAgB,kBAAkB,CAAC,OAAkC;IACnE,IAAI,EACF,OAAO,EACP,IAAI,EACJ,YAAY,EACZ,cAAc,EACd,mBAAmB,EACnB,YAAY,EACZ,WAAW,GACZ,GAAG,OAAO,CAAC;IACZ,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,IAAnB,mBAAmB,GAAK,EAAE,EAAC;IAC3B,mBAAmB,CAAC,IAAI,CACtB;QACE,YAAY,EAAE,CAAE,SAAS,CAAE;QAC3B,eAAe,EAAE,gBAAgB;KAClC,EACD;QACE,YAAY,EAAE,CAAE,YAAY,CAAE;QAC9B,eAAe,EAAE,KAAM,IAAA,eAAQ,EAAC,WAAW,CAAE,EAAE;KAChD,CACF,CAAC;IACF,cAAc,aAAd,cAAc,cAAd,cAAc,IAAd,cAAc,GAAK,EAAE,EAAC;IACtB,cAAc,CAAC,OAAO,GAAG,WAAY,YAAa,GAAG,CAAC;IACtD,YAAY,aAAZ,YAAY,cAAZ,YAAY,IAAZ,YAAY,GAAK;QACf;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,IAAI;SACb;KACF,EAAC;IACF,YAAY,CAAC,IAAI,EAAE,CAAC;IACpB,OAAO,IAAA,iCAAc,EAAC;QACpB,OAAO;QACP,IAAI,EAAE,IAAA,mCAAY,EAAC,IAAI,EAAE,OAAO,CAAC;QACjC,YAAY;QACZ,cAAc;QACd,mBAAmB;KACpB,CAAC,CAAC;AACL,CAAC;AAvCD,gDAuCC"}
+{"version":3,"file":"coerce-page-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-page-dto-class.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAC1D,6CAA+C;AAC/C,+CAGyB;AACzB,+BAAgC;AAChC,yDAG4B;AAO5B,SAAgB,qBAAqB,CAAC,IAAY;IAChD,OAAO,IAAA,mCAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACrC,CAAC;AAFD,sDAEC;AAED,SAAgB,kBAAkB,CAAC,OAAkC;IACnE,MAAM,EACJ,OAAO,EACP,IAAI,EACJ,YAAY,GAAE,EAAE,EAChB,YAAY,EACZ,WAAW,EACX,gBAAgB,GAAG,gBAAI,GACxB,GAAG,OAAO,CAAC;IACZ,IAAA,4BAAgB,EAAC,YAAY,EAAE;QAC7B;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,IAAI;SACb;QACD;YACE,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,QAAQ;SACf;QACD;YACE,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,QAAQ;SACf;QACD;YACE,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,QAAQ;SACf;QACD;YACE,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,IAAI;SACjB;QACD;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,IAAI;SACjB;QACD;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,IAAI;YACZ,UAAU,EAAE,IAAI;SACjB;KACF,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,IAAA,iCAAc,kCAChB,OAAO,KACV,OAAO,EACP,IAAI,EAAE,qBAAqB,CAAC,IAAI,CAAC,EACjC,YAAY,EACZ,gBAAgB,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE;YACpD,IAAA,wBAAa,EAAC,UAAU,EAAE;gBACxB;oBACE,YAAY,EAAE,CAAE,YAAY,CAAE;oBAC9B,eAAe,EAAE,KAAM,IAAA,eAAQ,EAAC,WAAW,CAAE,EAAE;iBAChD;gBACD;oBACE,YAAY,EAAE,CAAE,gBAAgB,CAAE;oBAClC,eAAe,EAAE,gBAAgB;iBAClC;aACF,CAAC,CAAC;YACH,gBAAgB,CAAC,CAAC,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;QACpD,CAAC,IACD,CAAC;AACL,CAAC;AAjED,gDAiEC"}

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

@@ -6,4 +6,5 @@ export interface CoerceRowDtoClassOptions extends CoerceDtoClassOptions {
      */
     rowIdType?: string | null;
 }
+export declare function BuildRowDtoClassName(name: string): string;
 export declare function CoerceRowDtoClass(options: CoerceRowDtoClassOptions): import("./coerce-dto-class").CoerceDtoClassOutput;

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

@@ -1,21 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CoerceRowDtoClass = void 0;
+exports.CoerceRowDtoClass = exports.BuildRowDtoClassName = void 0;
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
+const utilities_1 = require("@rxap/utilities");
 const coerce_dto_class_1 = require("./coerce-dto-class");
+function BuildRowDtoClassName(name) {
+    return (0, schematics_utilities_1.CoerceSuffix)(name, '-row');
+}
+exports.BuildRowDtoClassName = BuildRowDtoClassName;
 function CoerceRowDtoClass(options) {
-    let { rowIdType, project, name, propertyList, classStructure, importStructureList, } = options;
-    propertyList !== null && propertyList !== void 0 ? propertyList : (propertyList = []);
-    propertyList.unshift({
-        name: '__rowId',
-        type: rowIdType === null ? 'number' : rowIdType !== null && rowIdType !== void 0 ? rowIdType : 'string',
-    });
+    const { rowIdType, project, name, propertyList = [], } = options;
+    (0, utilities_1.CoerceArrayItems)(propertyList, [{
+            name: '__rowId',
+            type: rowIdType === null ? 'number' : rowIdType !== null && rowIdType !== void 0 ? rowIdType : 'string',
+        }], (a, b) => a.name === b.name);
     return (0, coerce_dto_class_1.CoerceDtoClass)({
         project,
-        name: (0, schematics_utilities_1.CoerceSuffix)(name, '-row'),
+        name: BuildRowDtoClassName(name),
         propertyList,
-        classStructure,
-        importStructureList,
     });
 }
 exports.CoerceRowDtoClass = CoerceRowDtoClass;

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

@@ -1 +1 @@
-{"version":3,"file":"coerce-row-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-row-dto-class.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAC1D,yDAG4B;AAU5B,SAAgB,iBAAiB,CAAC,OAAiC;IACjE,IAAI,EACF,SAAS,EACT,OAAO,EACP,IAAI,EACJ,YAAY,EACZ,cAAc,EACd,mBAAmB,GACpB,GAAG,OAAO,CAAC;IACZ,YAAY,aAAZ,YAAY,cAAZ,YAAY,IAAZ,YAAY,GAAK,EAAE,EAAC;IACpB,YAAY,CAAC,OAAO,CAClB;QACE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,QAAQ;KAC5D,CACF,CAAC;IACF,OAAO,IAAA,iCAAc,EAAC;QACpB,OAAO;QACP,IAAI,EAAE,IAAA,mCAAY,EAAC,IAAI,EAAE,MAAM,CAAC;QAChC,YAAY;QACZ,cAAc;QACd,mBAAmB;KACpB,CAAC,CAAC;AACL,CAAC;AAvBD,8CAuBC"}
+{"version":3,"file":"coerce-row-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-row-dto-class.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAC1D,+CAAmD;AACnD,yDAG4B;AAU5B,SAAgB,oBAAoB,CAAC,IAAY;IAC/C,OAAO,IAAA,mCAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC;AAFD,oDAEC;AAED,SAAgB,iBAAiB,CAAC,OAAiC;IACjE,MAAM,EACJ,SAAS,EACT,OAAO,EACP,IAAI,EACJ,YAAY,GAAG,EAAE,GAClB,GAAG,OAAO,CAAC;IACZ,IAAA,4BAAgB,EAAC,YAAY,EAAE,CAAC;YAC9B,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,QAAQ;SAC5D,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IACjC,OAAO,IAAA,iCAAc,EAAC;QACpB,OAAO;QACP,IAAI,EAAE,oBAAoB,CAAC,IAAI,CAAC;QAChC,YAAY;KACb,CAAC,CAAC;AACL,CAAC;AAhBD,8CAgBC"}

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

@@ -1,15 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceSubmitDataGridOperation = void 0;
-const schematics_utilities_1 = require("@rxap/schematics-utilities");
 const coerce_form_submit_operation_1 = require("./coerce-form-submit-operation");
 function CoerceSubmitDataGridOperation(options) {
-    let { paramList, collection, controllerName, } = options;
-    collection !== null && collection !== void 0 ? collection : (collection = false);
-    paramList !== null && paramList !== void 0 ? paramList : (paramList = []);
-    controllerName = (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-data-grid');
-    return (0, coerce_form_submit_operation_1.CoerceFormSubmitOperation)(Object.assign(Object.assign({}, options), { controllerName,
-        paramList }));
+    const { collection = false, } = options;
+    console.log(`collection: ${collection}`);
+    return (0, coerce_form_submit_operation_1.CoerceFormSubmitOperation)(Object.assign({}, options));
 }
 exports.CoerceSubmitDataGridOperation = CoerceSubmitDataGridOperation;
 //# sourceMappingURL=coerce-submit-data-grid-operation.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"coerce-submit-data-grid-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-submit-data-grid-operation.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAC1D,iFAGwC;AAMxC,SAAgB,6BAA6B,CAAC,OAAuD;IACnG,IAAI,EACF,SAAS,EACT,UAAU,EACV,cAAc,GACf,GAAG,OAAO,CAAC;IACZ,UAAU,aAAV,UAAU,cAAV,UAAU,IAAV,UAAU,GAAK,KAAK,EAAC;IACrB,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,EAAE,EAAC;IACjB,cAAc,GAAG,IAAA,mCAAY,EAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IAE5D,OAAO,IAAA,wDAAyB,kCAC3B,OAAO,KACV,cAAc;QACd,SAAS,IACT,CAAC;AACL,CAAC;AAfD,sEAeC"}
+{"version":3,"file":"coerce-submit-data-grid-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-submit-data-grid-operation.ts"],"names":[],"mappings":";;;AACA,iFAGwC;AAMxC,SAAgB,6BAA6B,CAAC,OAAuD;IACnG,MAAM,EACJ,UAAU,GAAG,KAAK,GACnB,GAAG,OAAO,CAAC;IAEZ,OAAO,CAAC,GAAG,CAAC,eAAgB,UAAW,EAAE,CAAC,CAAC;IAE3C,OAAO,IAAA,wDAAyB,oBAC3B,OAAO,EACV,CAAC;AACL,CAAC;AAVD,sEAUC"}

package/src/lib/nest/coerce-table-select-operation.js

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceTableSelectOperationRule = void 0;
+const ts_morph_1 = require("@rxap/ts-morph");
 const coerce_get_page_operation_1 = require("./coerce-get-page-operation");
 function CoerceTableSelectOperationRule(options) {
-    let { propertyList, rowIdProperty, rowDisplayProperty, rowValueProperty, } = options;
-    rowIdProperty !== null && rowIdProperty !== void 0 ? rowIdProperty : (rowIdProperty = 'uuid');
-    rowDisplayProperty !== null && rowDisplayProperty !== void 0 ? rowDisplayProperty : (rowDisplayProperty = 'name');
-    rowValueProperty !== null && rowValueProperty !== void 0 ? rowValueProperty : (rowValueProperty = rowIdProperty);
+    const { propertyList = [], rowIdProperty = 'uuid', rowDisplayProperty = 'name', rowValueProperty = rowIdProperty !== null && rowIdProperty !== void 0 ? rowIdProperty : 'uuid', } = options;
     propertyList.unshift({
         name: '__display',
-        type: { name: 'string' },
+        type: (0, ts_morph_1.NormalizeTypeImport)('string'),
+        isArray: false,
         source: rowDisplayProperty,
     });
     propertyList.unshift({
         name: '__value',
-        type: { name: 'string' },
+        type: (0, ts_morph_1.NormalizeTypeImport)('string'),
+        isArray: false,
         source: rowValueProperty,
     });
     return (0, coerce_get_page_operation_1.CoerceGetPageOperation)(Object.assign(Object.assign({}, options), { propertyList: propertyList, rowIdProperty }));

package/src/lib/nest/coerce-table-select-operation.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-table-select-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-table-select-operation.ts"],"names":[],"mappings":";;;AAAA,2EAGqC;AAOrC,SAAgB,8BAA8B,CAAC,OAA0C;IACvF,IAAI,EACF,YAAY,EACZ,aAAa,EACb,kBAAkB,EAClB,gBAAgB,GACjB,GAAG,OAAO,CAAC;IAEZ,aAAa,aAAb,aAAa,cAAb,aAAa,IAAb,aAAa,GAAK,MAAM,EAAC;IACzB,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,IAAlB,kBAAkB,GAAK,MAAM,EAAC;IAC9B,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,aAAa,EAAC;IAEnC,YAAY,CAAC,OAAO,CAAC;QACnB,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACxB,MAAM,EAAE,kBAAkB;KAC3B,CAAC,CAAC;IACH,YAAY,CAAC,OAAO,CAAC;QACnB,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACxB,MAAM,EAAE,gBAAgB;KACzB,CAAC,CAAC;IAEH,OAAO,IAAA,kDAAsB,kCACxB,OAAO,KACV,YAAY,EAAE,YAAY,EAC1B,aAAa,IACb,CAAC;AAEL,CAAC;AA7BD,wEA6BC"}
+{"version":3,"file":"coerce-table-select-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-table-select-operation.ts"],"names":[],"mappings":";;;AAAA,6CAAqD;AACrD,2EAGqC;AAOrC,SAAgB,8BAA8B,CAAC,OAA0C;IACvF,MAAM,EACJ,YAAY,GAAG,EAAE,EACjB,aAAa,GAAE,MAAM,EACrB,kBAAkB,GAAG,MAAM,EAC3B,gBAAgB,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,MAAM,GAC3C,GAAG,OAAO,CAAC;IAEZ,YAAY,CAAC,OAAO,CAAC;QACnB,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,IAAA,8BAAmB,EAAC,QAAQ,CAAC;QACnC,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,kBAAkB;KAC3B,CAAC,CAAC;IACH,YAAY,CAAC,OAAO,CAAC;QACnB,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,IAAA,8BAAmB,EAAC,QAAQ,CAAC;QACnC,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,gBAAgB;KACzB,CAAC,CAAC;IAEH,OAAO,IAAA,kDAAsB,kCACxB,OAAO,KACV,YAAY,EAAE,YAAY,EAC1B,aAAa,IACb,CAAC;AAEL,CAAC;AA3BD,wEA2BC"}

package/src/lib/nest/coerce-table-select-value-resolve-operation.d.ts

@@ -1,8 +1,9 @@
-import { CoerceOperationOptions } from './coerce-operation';
-export interface CoerceTableSelectValueResolveOperationOptions extends Omit<CoerceOperationOptions, 'tsMorphTransform'> {
-    /**
-     * The base name of the page and row DTO class name. Defaults to the controller name
-     */
-    responseDtoName?: string;
+import { ClassDeclaration, SourceFile, WriterFunction } from 'ts-morph';
+import { CoerceDtoClassOutput } from './coerce-dto-class';
+import { CoerceOperationOptions, TransformOperation } from './coerce-operation';
+export interface CoerceTableSelectValueResolveOperationOptions extends CoerceOperationOptions {
+    rowDisplayProperty?: string;
+    rowValueProperty?: string;
 }
+export declare function BuildTableSelectValueResolveUpstreamGetParametersImplementation(classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, dto: CoerceDtoClassOutput | null, options: Readonly<CoerceTableSelectValueResolveOperationOptions>): TransformOperation<string | WriterFunction>;
 export declare function CoerceTableSelectValueResolveOperationRule(options: CoerceTableSelectValueResolveOperationOptions): import("@angular-devkit/schematics").Rule;

package/src/lib/nest/coerce-table-select-value-resolve-operation.js

@@ -1,40 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CoerceTableSelectValueResolveOperationRule = void 0;
-const coerce_imports_1 = require("../ts-morph/coerce-imports");
+exports.CoerceTableSelectValueResolveOperationRule = exports.BuildTableSelectValueResolveUpstreamGetParametersImplementation = void 0;
+const ts_morph_1 = require("@rxap/ts-morph");
 const coerce_operation_1 = require("./coerce-operation");
-const coerce_page_dto_class_1 = require("./coerce-page-dto-class");
-const coerce_row_dto_class_1 = require("./coerce-row-dto-class");
+function BuildTableSelectValueResolveUpstreamGetParametersImplementation(classDeclaration, moduleSourceFile, dto, options) {
+    return () => {
+        var _a;
+        const { upstream } = options;
+        if (upstream) {
+            if ((0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
+                if ((_a = upstream.mapper) === null || _a === void 0 ? void 0 : _a.value) {
+                    return `{ parameters: { ${upstream.mapper.value}: value } }`;
+                }
+            }
+            return '{ value }';
+        }
+        return '';
+    };
+}
+exports.BuildTableSelectValueResolveUpstreamGetParametersImplementation = BuildTableSelectValueResolveUpstreamGetParametersImplementation;
 function CoerceTableSelectValueResolveOperationRule(options) {
-    let { responseDtoName, controllerName, } = options;
-    responseDtoName !== null && responseDtoName !== void 0 ? responseDtoName : (responseDtoName = controllerName);
-    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
-            const { className: rowClassName, filePath: rowFilePath, } = (0, coerce_row_dto_class_1.CoerceRowDtoClass)({
-                project,
-                name: responseDtoName,
-            });
-            const { className: pageClassName, filePath: pageFilePath, } = (0, coerce_page_dto_class_1.CoercePageDtoClass)({
-                project,
-                name: responseDtoName,
-                rowClassName,
-                rowFilePath,
-            });
-            (0, coerce_imports_1.CoerceImports)(sourceFile, {
-                moduleSpecifier: rowFilePath,
-                namedImports: [rowClassName],
-            });
-            return {
-                returnType: rowClassName,
-                statements: [
-                    'const item = {} as any',
-                    'return plainToInstance(',
-                    rowClassName + ',',
-                    `this.to${rowClassName}(item),`,
-                    'classTransformOptions',
-                    ')',
-                ],
-            };
-        } }));
+    const { buildUpstreamGetParametersImplementation = BuildTableSelectValueResolveUpstreamGetParametersImplementation, propertyList = [], rowDisplayProperty = 'name', rowValueProperty = 'uuid', } = options;
+    propertyList.unshift({
+        name: '__display',
+        type: (0, ts_morph_1.NormalizeTypeImport)('string'),
+        isArray: false,
+        source: rowDisplayProperty,
+    });
+    propertyList.unshift({
+        name: '__value',
+        type: (0, ts_morph_1.NormalizeTypeImport)('string'),
+        isArray: false,
+        source: rowValueProperty,
+    });
+    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { buildUpstreamGetParametersImplementation }));
 }
 exports.CoerceTableSelectValueResolveOperationRule = CoerceTableSelectValueResolveOperationRule;
 //# sourceMappingURL=coerce-table-select-value-resolve-operation.js.map

package/src/lib/nest/coerce-table-select-value-resolve-operation.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-table-select-value-resolve-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-table-select-value-resolve-operation.ts"],"names":[],"mappings":";;;AAAA,+DAA2D;AAC3D,yDAG4B;AAC5B,mEAA6D;AAC7D,iEAA2D;AAU3D,SAAgB,0CAA0C,CAAC,OAAsD;IAC/G,IAAI,EACF,eAAe,EACf,cAAc,GACf,GAAG,OAAO,CAAC;IACZ,eAAe,aAAf,eAAe,cAAf,eAAe,IAAf,eAAe,GAAK,cAAc,EAAC;IAEnC,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,gBAAgB,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,EAAE;YAE1E,MAAM,EACJ,SAAS,EAAE,YAAY,EACvB,QAAQ,EAAE,WAAW,GACtB,GAAG,IAAA,wCAAiB,EAAC;gBACpB,OAAO;gBACP,IAAI,EAAE,eAAgB;aACvB,CAAC,CAAC;YAEH,MAAM,EACJ,SAAS,EAAE,aAAa,EACxB,QAAQ,EAAE,YAAY,GACvB,GAAG,IAAA,0CAAkB,EAAC;gBACrB,OAAO;gBACP,IAAI,EAAE,eAAgB;gBACtB,YAAY;gBACZ,WAAW;aACZ,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,eAAe,EAAE,WAAW;gBAC5B,YAAY,EAAE,CAAE,YAAY,CAAE;aAC/B,CAAC,CAAC;YAEH,OAAO;gBACL,UAAU,EAAE,YAAY;gBACxB,UAAU,EAAE;oBACV,wBAAwB;oBACxB,yBAAyB;oBACzB,YAAY,GAAG,GAAG;oBAClB,UAAW,YAAa,SAAS;oBACjC,uBAAuB;oBACvB,GAAG;iBACJ;aACF,CAAC;QAEJ,CAAC,IACD,CAAC;AACL,CAAC;AAhDD,gGAgDC"}
+{"version":3,"file":"coerce-table-select-value-resolve-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-table-select-value-resolve-operation.ts"],"names":[],"mappings":";;;AAAA,6CAGwB;AAOxB,yDAI4B;AAQ5B,SAAgB,+DAA+D,CAClB,gBAAkC,EAClC,gBAA4B,EAC5B,GAAgC,EAChC,OAAgE;IAE3H,OAAO,GAAG,EAAE;;QACV,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAC7B,IAAI,QAAQ,EAAE;YACZ,IAAI,IAAA,6CAAkC,EAAC,QAAQ,CAAC,EAAE;gBAChD,IAAI,MAAA,QAAQ,CAAC,MAAM,0CAAE,KAAK,EAAE;oBAC1B,OAAO,mBAAoB,QAAQ,CAAC,MAAM,CAAC,KAAM,aAAa,CAAC;iBAChE;aACF;YACD,OAAO,WAAW,CAAC;SACpB;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;AACJ,CAAC;AAlBD,0IAkBC;AAED,SAAgB,0CAA0C,CAAC,OAAsD;IAC/G,MAAM,EACJ,wCAAwC,GAAG,+DAA+D,EAC1G,YAAY,GAAG,EAAE,EACjB,kBAAkB,GAAG,MAAM,EAC3B,gBAAgB,GAAG,MAAM,GAC1B,GAAG,OAAO,CAAC;IAEZ,YAAY,CAAC,OAAO,CAAC;QACnB,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,IAAA,8BAAmB,EAAC,QAAQ,CAAC;QACnC,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,kBAAkB;KAC3B,CAAC,CAAC;IACH,YAAY,CAAC,OAAO,CAAC;QACnB,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,IAAA,8BAAmB,EAAC,QAAQ,CAAC;QACnC,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,gBAAgB;KACzB,CAAC,CAAC;IAEH,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,wCAAwC,IACxC,CAAC;AACL,CAAC;AAzBD,gGAyBC"}

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

@@ -1,56 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceTreeOperationRule = void 0;
-const coerce_imports_1 = require("../ts-morph/coerce-imports");
-const coerce_dto_class_1 = require("./coerce-dto-class");
+const utilities_1 = require("@rxap/utilities");
 const coerce_operation_1 = require("./coerce-operation");
 function CoerceTreeOperationRule(options) {
-    let { tsMorphTransform, operationName, fullTree, path, } = options;
-    operationName !== null && operationName !== void 0 ? operationName : (operationName = 'tree');
-    fullTree !== null && fullTree !== void 0 ? fullTree : (fullTree = false);
-    path !== null && path !== void 0 ? path : (path = 'tree');
-    tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => ({}));
+    const { operationName = 'tree', fullTree = false, path = 'true', propertyList = [], dtoClassNameSuffix = '-tree-node', isArray = true, } = options;
+    (0, utilities_1.CoerceArrayItems)(propertyList, [
+        {
+            name: 'id',
+            type: 'string',
+        },
+        {
+            name: 'name',
+            type: 'string',
+        },
+        {
+            name: 'type',
+            type: 'string',
+        },
+        {
+            name: 'icon',
+            type: {
+                name: 'IconDto',
+                moduleSpecifier: '@rxap/nest-dto'
+            },
+            isType: true,
+        },
+        {
+            name: 'children',
+            isOptional: true,
+            isArray: true,
+            isType: true,
+            type: '<self>',
+        },
+    ], (a, b) => a.name === b.name);
     if (!fullTree) {
         throw new Error('non full tree not implemented yet');
     }
     return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { path,
-        operationName, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
-            const { className, filePath, } = (0, coerce_dto_class_1.CoerceDtoClass)({
-                project,
-                name: 'TreeNode',
-                propertyList: [
-                    {
-                        name: 'id',
-                        type: 'string',
-                    },
-                    {
-                        name: 'name',
-                        type: 'string',
-                    },
-                    {
-                        name: 'type',
-                        type: 'string',
-                    },
-                    {
-                        name: 'icon',
-                        type: 'IconConfigDto',
-                        isType: true,
-                    },
-                    {
-                        name: 'children',
-                        isOptional: true,
-                        isArray: true,
-                        isType: true,
-                        type: '<self>',
-                    },
-                ]
-            });
-            (0, coerce_imports_1.CoerceImports)(sourceFile, {
-                namedImports: [className],
-                moduleSpecifier: filePath,
-            });
-            return Object.assign({ returnType: className + '[]' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
-        } }));
+        operationName,
+        dtoClassNameSuffix,
+        propertyList,
+        isArray }));
 }
 exports.CoerceTreeOperationRule = CoerceTreeOperationRule;
 //# sourceMappingURL=coerce-tree-operation.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"coerce-tree-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-tree-operation.ts"],"names":[],"mappings":";;;AAAA,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAO5B,SAAgB,uBAAuB,CAAC,OAAmC;IACzE,IAAI,EACF,gBAAgB,EAChB,aAAa,EACb,QAAQ,EACR,IAAI,GACL,GAAG,OAAO,CAAC;IACZ,aAAa,aAAb,aAAa,cAAb,aAAa,IAAb,aAAa,GAAK,MAAM,EAAC;IACzB,QAAQ,aAAR,QAAQ,cAAR,QAAQ,IAAR,QAAQ,GAAK,KAAK,EAAC;IACnB,IAAI,aAAJ,IAAI,cAAJ,IAAI,IAAJ,IAAI,GAAK,MAAM,EAAC;IAChB,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAC;IAEhC,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;KACtD;IAED,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,IAAI;QACJ,aAAa,EACb,gBAAgB,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,EAAE;YAE1E,MAAM,EACJ,SAAS,EACT,QAAQ,GACT,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,UAAU;gBAChB,YAAY,EAAE;oBACd;wBACE,IAAI,EAAE,IAAI;wBACV,IAAI,EAAE,QAAQ;qBACf;oBACD;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,QAAQ;qBACf;oBACD;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,QAAQ;qBACf;oBACD;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,eAAe;wBACrB,MAAM,EAAE,IAAI;qBACb;oBACD;wBACE,IAAI,EAAE,UAAU;wBAChB,UAAU,EAAE,IAAI;wBAChB,OAAO,EAAE,IAAI;wBACb,MAAM,EAAE,IAAI;wBACZ,IAAI,EAAE,QAAQ;qBACf;iBACA;aACF,CAAC,CAAC;YAEH,IAAA,8BAAa,EACX,UAAU,EACV;gBACE,YAAY,EAAE,CAAE,SAAS,CAAE;gBAC3B,eAAe,EAAE,QAAQ;aAC1B,CACF,CAAC;YAEF,uBACE,UAAU,EAAE,SAAS,GAAG,IAAI,IACzB,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,EAC3E;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AAtED,0DAsEC"}
+{"version":3,"file":"coerce-tree-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-tree-operation.ts"],"names":[],"mappings":";;;AAAA,+CAAmD;AACnD,yDAG4B;AAO5B,SAAgB,uBAAuB,CAAC,OAAmC;IACzE,MAAM,EACJ,aAAa,GAAG,MAAM,EACtB,QAAQ,GAAE,KAAK,EACf,IAAI,GAAE,MAAM,EACZ,YAAY,GAAG,EAAE,EACjB,kBAAkB,GAAG,YAAY,EACjC,OAAO,GAAG,IAAI,GACf,GAAG,OAAO,CAAC;IAEZ,IAAA,4BAAgB,EAAC,YAAY,EAAE;QAC7B;YACE,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,QAAQ;SACf;QACD;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;SACf;QACD;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;SACf;QACD;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE;gBACJ,IAAI,EAAE,SAAS;gBACf,eAAe,EAAE,gBAAgB;aAClC;YACD,MAAM,EAAE,IAAI;SACb;QACD;YACE,IAAI,EAAE,UAAU;YAChB,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,QAAQ;SACf;KACF,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IAEhC,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;KACtD;IAED,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,IAAI;QACJ,aAAa;QACb,kBAAkB;QAClB,YAAY;QACZ,OAAO,IACP,CAAC;AACL,CAAC;AApDD,0DAoDC"}

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

@@ -0,0 +1,18 @@
+import { DataProperty, NormalizedTypeImport, TypeImport } from '@rxap/ts-morph';
+import { Normalized } from '@rxap/utilities';
+export interface DtoClassProperty extends DataProperty {
+    /**
+     * The type of the property
+     *
+     * if type = '<self>' the type will be the name of the class
+     */
+    type: string | TypeImport | '<self>';
+    /**
+     * indicates that the @Type decorator should be used as the type of the property is another dto class
+     */
+    isType?: boolean;
+}
+export interface NormalizedDtoClassProperty extends Normalized<Omit<DtoClassProperty, 'type'>> {
+    type: NormalizedTypeImport;
+}
+export declare function NormalizeDataClassProperty(property: DtoClassProperty): NormalizedDtoClassProperty;

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

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NormalizeDataClassProperty = void 0;
+const ts_morph_1 = require("@rxap/ts-morph");
+function NormalizeDataClassProperty(property) {
+    var _a, _b, _c;
+    const { name, type, isArray } = (0, ts_morph_1.NormalizeDataProperty)(property);
+    let isType = (_b = (_a = property.isType) !== null && _a !== void 0 ? _a : type.name === '<self>') !== null && _b !== void 0 ? _b : false;
+    const isOptional = (_c = property.isOptional) !== null && _c !== void 0 ? _c : false;
+    switch (type.name) {
+        case 'IconConfig':
+            type.name = 'IconDto';
+            type.moduleSpecifier = '@rxap/nest-dto';
+            isType = true;
+            break;
+    }
+    return {
+        name,
+        type,
+        isArray,
+        isType,
+        isOptional,
+    };
+}
+exports.NormalizeDataClassProperty = NormalizeDataClassProperty;
+//# sourceMappingURL=dto-class-property.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"dto-class-property.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/dto-class-property.ts"],"names":[],"mappings":";;;AAAA,6CAKwB;AAoBxB,SAAgB,0BAA0B,CAAC,QAA0B;;IACnE,MAAM,EAAE,IAAI,EAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAA,gCAAqB,EAAC,QAAQ,CAAC,CAAC;IACjE,IAAI,MAAM,GAAG,MAAA,MAAA,QAAQ,CAAC,MAAM,mCAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,mCAAI,KAAK,CAAC;IAChE,MAAM,UAAU,GAAG,MAAA,QAAQ,CAAC,UAAU,mCAAI,KAAK,CAAC;IAChD,QAAQ,IAAI,CAAC,IAAI,EAAE;QACjB,KAAK,YAAY;YACf,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;YACtB,IAAI,CAAC,eAAe,GAAG,gBAAgB,CAAC;YACxC,MAAM,GAAG,IAAI,CAAC;YACd,MAAM;KACT;IACD,OAAO;QACL,IAAI;QACJ,IAAI;QACJ,OAAO;QACP,MAAM;QACN,UAAU;KACX,CAAC;AACJ,CAAC;AAlBD,gEAkBC"}

package/src/lib/nest/table-query-list.d.ts

@@ -0,0 +1,2 @@
+import { OperationParameter } from './add-operation-to-controller';
+export declare const TABLE_QUERY_LIST: OperationParameter[];

package/src/lib/nest/table-query-list.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TABLE_QUERY_LIST = void 0;
+exports.TABLE_QUERY_LIST = [
+    {
+        name: 'pageIndex',
+        type: 'number',
+        defaultValue: '0',
+    },
+    {
+        name: 'pageSize',
+        type: 'number',
+        defaultValue: '5',
+    },
+    {
+        name: 'sortDirection',
+        type: 'string',
+        defaultValue: w => w.quote('desc'),
+    },
+    {
+        name: 'sortBy',
+        type: 'string',
+        defaultValue: w => w.quote('__updatedAt'),
+    },
+    {
+        name: 'filter',
+        type: {
+            name: 'FilterQuery',
+            moduleSpecifier: '@rxap/nest-utilities',
+        },
+        isArray: true,
+        pipeList: [{
+                name: 'new FilterQueryPipe()',
+                namedImport: 'FilterQueryPipe',
+                moduleSpecifier: '@rxap/nest-utilities',
+            }],
+        // the FilterQueryPipe will set the default value to an empty array
+        hasQuestionToken: false,
+    },
+];
+//# sourceMappingURL=table-query-list.js.map

package/src/lib/nest/table-query-list.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"table-query-list.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/table-query-list.ts"],"names":[],"mappings":";;;AAEa,QAAA,gBAAgB,GAAyB;IACpD;QACE,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,GAAG;KAClB;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,GAAG;KAClB;IACD;QACE,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;KACnC;IACD;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC;KAC1C;IACD;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE;YACJ,IAAI,EAAE,aAAa;YACnB,eAAe,EAAE,sBAAsB;SACxC;QACD,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,CAAE;gBACV,IAAI,EAAE,uBAAuB;gBAC7B,WAAW,EAAE,iBAAiB;gBAC9B,eAAe,EAAE,sBAAsB;aACxC,CAAE;QACH,mEAAmE;QACnE,gBAAgB,EAAE,KAAK;KACxB;CACF,CAAC"}

package/src/lib/ts-morph/coerce-imports.js

@@ -6,7 +6,7 @@ exports.CoerceImports = void 0;
  */
 function CoerceImports(sourceFile, structures) {
     for (const structure of Array.isArray(structures) ? structures : [structures]) {
-        const moduleSpecifier = structure.moduleSpecifier;
+        const moduleSpecifier = structure.moduleSpecifier.endsWith('.ts') ? structure.moduleSpecifier.replace(/\.ts$/, '') : structure.moduleSpecifier;
         const namedImports = structure.namedImports;
         if (!moduleSpecifier ||
             !(Array.isArray(namedImports) && namedImports.every((named) => typeof named === 'string')) ||

package/src/lib/ts-morph/coerce-imports.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-imports.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/ts-morph/coerce-imports.ts"],"names":[],"mappings":";;;AAMA;;GAEG;AACH,SAAgB,aAAa,CAC3B,UAAsB,EACtB,UAA8G;IAG9G,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAE,UAAU,CAAE,EAAE;QAE/E,MAAM,eAAe,GAAG,SAAS,CAAC,eAAe,CAAC;QAClD,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;QAE5C,IAAI,CAAC,eAAe;YAClB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC;YAC1F,CAAC,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAC,EAAE;YACnD,UAAU,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;SAC5C;aAAM;YACL,MAAM,iBAAiB,GAAG,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAE,CAAC;YAC5E,MAAM,eAAe,GAAG,iBAAiB,CAAC,eAAe,EAAE,CAAC;YAC5D,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE;gBAChC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,KAAK,CAAC,EAAE;oBACrE,iBAAiB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;iBACzC;aACF;SACF;KAEF;AAEH,CAAC;AA1BD,sCA0BC"}
+{"version":3,"file":"coerce-imports.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/ts-morph/coerce-imports.ts"],"names":[],"mappings":";;;AAMA;;GAEG;AACH,SAAgB,aAAa,CAC3B,UAAsB,EACtB,UAA8G;IAG9G,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAE,UAAU,CAAE,EAAE;QAE/E,MAAM,eAAe,GAAG,SAAS,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC;QAC/I,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;QAE5C,IAAI,CAAC,eAAe;YAClB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC;YAC1F,CAAC,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAC,EAAE;YACnD,UAAU,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;SAC5C;aAAM;YACL,MAAM,iBAAiB,GAAG,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAE,CAAC;YAC5E,MAAM,eAAe,GAAG,iBAAiB,CAAC,eAAe,EAAE,CAAC;YAC5D,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE;gBAChC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,KAAK,CAAC,EAAE;oBACrE,iBAAiB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;iBACzC;aACF;SACF;KAEF;AAEH,CAAC;AA1BD,sCA0BC"}

package/src/lib/types/abstract-control.d.ts

@@ -0,0 +1,8 @@
+import { DataProperty } from '@rxap/ts-morph';
+import { WriterFunction } from 'ts-morph';
+export interface AbstractControl extends DataProperty {
+    state?: string | WriterFunction | null;
+    isRequired?: boolean;
+    validatorList?: string[];
+    role?: 'control' | 'group' | 'array';
+}

package/src/lib/types/{form-definition-control.js → abstract-control.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=form-definition-control.js.map
+//# sourceMappingURL=abstract-control.js.map

package/src/lib/types/abstract-control.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"abstract-control.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/types/abstract-control.ts"],"names":[],"mappings":""}

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

@@ -1,24 +0,0 @@
-import { TypeImport } from '@rxap/ts-morph';
-import { ClassDeclaration, ClassDeclarationStructure, ImportDeclarationStructure, OptionalKind, SourceFile, WriterFunction } from 'ts-morph';
-export interface DtoClassProperty {
-    name: string;
-    /**
-     * The type of the property
-     *
-     * if type = '<self>' the type will be the name of the class
-     */
-    type: string | WriterFunction | TypeImport | '<self>';
-    isArray?: boolean | null;
-    /**
-     * indicates that the @Type decorator should be used as the type of the property is another dto class
-     */
-    isType?: boolean | null;
-    isOptional?: boolean | null;
-    /**
-     * Use to import the type
-     * @deprecated use the type property with a TypeImport object
-     */
-    moduleSpecifier?: string | null;
-}
-export declare function CreateDtoClass(sourceFile: SourceFile, className: string, propertyList: DtoClassProperty[], classStructure?: Omit<OptionalKind<ClassDeclarationStructure>, 'name'>, structures?: Array<OptionalKind<ImportDeclarationStructure>>): ClassDeclaration;
-export declare function CreatePageDtoClass(sourceFile: SourceFile, className: string, rowType: string | WriterFunction, classStructure?: Omit<OptionalKind<ClassDeclarationStructure>, 'name'>, structures?: Array<OptionalKind<ImportDeclarationStructure>>): ClassDeclaration;