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

package/src/lib/angular/coerce-options-data-source.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceOptionsDataSourceRule = void 0;
-const coerce_data_source_class_1 = require("./coerce-data-source-class");
-const coerce_imports_1 = require("../ts-morph/coerce-imports");
-const coerce_decorator_1 = require("../ts-morph/coerce-decorator");
-const ts_morph_1 = require("ts-morph");
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
+const ts_morph_1 = require("ts-morph");
+const coerce_decorator_1 = require("../ts-morph/coerce-decorator");
+const coerce_imports_1 = require("../ts-morph/coerce-imports");
+const coerce_data_source_class_1 = require("./coerce-data-source-class");
 function CoerceOptionsDataSourceRule(options) {
-    const { name, project, feature, directory, shared, } = options;
+    const { name, project, feature, directory, shared, optionList, } = options;
     return (0, coerce_data_source_class_1.CoerceDataSourceClass)({
         project,
         feature,
@@ -32,7 +32,36 @@ function CoerceOptionsDataSourceRule(options) {
                 arguments: [
                     ts_morph_1.Writers.object({
                         id: w => w.quote((0, schematics_utilities_1.dasherize)(name)),
-                        data: '[]',
+                        data: w => {
+                            w.write('[');
+                            for (const option of optionList) {
+                                const obj = {};
+                                obj['value'] = option.value;
+                                obj['display'] = w => w.quote(option.display);
+                                if (typeof option.disabled === 'boolean') {
+                                    obj['disabled'] = option.disabled ? 'true' : 'false';
+                                }
+                                if (option.color) {
+                                    obj['color'] = w => w.quote(option.color);
+                                }
+                                if (typeof option.default === 'boolean') {
+                                    obj['default'] = option.default ? 'true' : 'false';
+                                }
+                                if (option.i18n) {
+                                    obj['i18n'] = w => w.quote(option.i18n);
+                                }
+                                ts_morph_1.Writers.object(obj)(w);
+                                w.write(',');
+                            }
+                            w.write(']');
+                            if (!optionList.length) {
+                                w.write(' as ControlOptions');
+                                (0, coerce_imports_1.CoerceImports)(sourceFile, {
+                                    namedImports: ['ControlOptions'],
+                                    moduleSpecifier: '@rxap/utilities',
+                                });
+                            }
+                        },
                     }),
                 ],
             });

package/src/lib/angular/coerce-options-data-source.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-options-data-source.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-options-data-source.ts"],"names":[],"mappings":";;;AAEA,yEAAmE;AACnE,+DAA2D;AAC3D,mEAA+D;AAC/D,uCAAmC;AACnC,qEAAuD;AAMvD,SAAgB,2BAA2B,CAAC,OAAqD;IAC/F,MAAM,EACJ,IAAI,EACJ,OAAO,EACP,OAAO,EACP,SAAS,EACT,MAAM,GACP,GAAG,OAAO,CAAC;IACZ,OAAO,IAAA,gDAAqB,EAAC;QAC3B,OAAO;QACP,OAAO;QACP,SAAS;QACT,MAAM;QACN,IAAI;QACJ,aAAa,EAAE,CAAC,UAAU,EAAE,gBAAgB,EAAE,OAAO,EAAE,EAAE;YACvD,gBAAgB,CAAC,UAAU,CAAC,kCAAkC,CAAC,CAAC;YAChE,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB;oBACE,eAAe,EAAE,mBAAmB;oBACpC,YAAY,EAAE,CAAE,kBAAkB,CAAE;iBACrC;gBACD;oBACE,eAAe,EAAE,iBAAiB;oBAClC,YAAY,EAAE,CAAE,gBAAgB,CAAE;iBACnC;aACF,CAAC,CAAC;QACL,CAAC;QACD,eAAe,EAAE,CAAC,UAAU,EAAE,gBAAgB,EAAE,OAAO,EAAE,EAAE;YACzD,IAAA,kCAAe,EAAC,gBAAgB,EAAE,sBAAsB,EAAE;gBACxD,SAAS,EAAE;oBACT,kBAAO,CAAC,MAAM,CAAC;wBACb,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAA,gCAAS,EAAC,IAAI,CAAC,CAAC;wBACjC,IAAI,EAAE,IAAI;qBACX,CAAC;iBACH;aACF,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,eAAe,EAAE,mBAAmB;gBACpC,YAAY,EAAE,CAAE,sBAAsB,CAAE;aACzC,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AA1CD,kEA0CC"}
+{"version":3,"file":"coerce-options-data-source.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-options-data-source.ts"],"names":[],"mappings":"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"}

package/src/lib/angular/coerce-proxy-remote-method-class.d.ts

@@ -1,9 +1,9 @@
+import { TsMorphAngularProjectTransformOptions } from '@rxap/workspace-ts-morph';
 import { ClassDeclaration, MethodDeclarationStructure, Project, SourceFile, WriterFunction } from 'ts-morph';
-import { TsMorphAngularProjectTransformOptions } from '../ts-morph-transform';
 export interface CoerceProxyRemoteMethodClassOptions extends TsMorphAngularProjectTransformOptions {
     name: string;
     override?: boolean;
-    tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration) => Partial<MethodDeclarationStructure>;
+    tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration) => Partial<MethodDeclarationStructure> | void;
     sourceType: string | WriterFunction;
     targetType: string | WriterFunction;
     proxyMethod: string | WriterFunction;

package/src/lib/angular/coerce-proxy-remote-method-class.js

@@ -2,20 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceProxyRemoteMethodClass = void 0;
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
-const coerce_class_1 = require("../coerce-class");
-const coerce_class_method_1 = require("../coerce-class-method");
-const coerce_source_file_1 = require("../coerce-source-file");
+const ts_morph_1 = require("@rxap/ts-morph");
+const utilities_1 = require("@rxap/utilities");
 const ts_morph_transform_1 = require("../ts-morph-transform");
-const coerce_imports_1 = require("../ts-morph/coerce-imports");
 function CoerceProxyRemoteMethodClass(options) {
-    let { override, name, tsMorphTransform, sourceType, targetType, proxyMethod, } = options;
-    tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => ({}));
+    const { override, name, tsMorphTransform = utilities_1.noop, sourceType, targetType, proxyMethod, } = options;
     const className = (0, schematics_utilities_1.classify)((0, schematics_utilities_1.CoerceSuffix)(name, 'ProxyMethod'));
     const fileName = (0, schematics_utilities_1.CoerceSuffix)(name, '-proxy.method.ts');
     return (0, ts_morph_transform_1.TsMorphAngularProjectTransformRule)(options, (project) => {
-        var _a, _b, _c, _d;
-        const sourceFile = (0, coerce_source_file_1.CoerceSourceFile)(project, fileName);
-        const classDeclaration = (0, coerce_class_1.CoerceClass)(sourceFile, className, {
+        var _a, _b, _c, _d, _e;
+        const sourceFile = (0, ts_morph_1.CoerceSourceFile)(project, fileName);
+        const classDeclaration = (0, ts_morph_1.CoerceClass)(sourceFile, className, {
             isExported: true,
             decorators: [
                 {
@@ -62,27 +59,27 @@ function CoerceProxyRemoteMethodClass(options) {
                 w.write('>');
             },
         });
-        (0, coerce_imports_1.CoerceImports)(sourceFile, {
+        (0, ts_morph_1.CoerceImports)(sourceFile, {
             moduleSpecifier: '@rxap/pattern',
             namedImports: ['Method'],
         });
-        (0, coerce_imports_1.CoerceImports)(sourceFile, {
+        (0, ts_morph_1.CoerceImports)(sourceFile, {
             moduleSpecifier: '@angular/core',
             namedImports: ['Injectable', 'Inject'],
         });
-        (0, coerce_imports_1.CoerceImports)(sourceFile, {
+        (0, ts_morph_1.CoerceImports)(sourceFile, {
             moduleSpecifier: '@rxap/remote-method',
             namedImports: ['RxapRemoteMethod', 'ProxyRemoteMethod'],
         });
-        const methodStructure = tsMorphTransform(project, sourceFile, classDeclaration);
-        (_a = methodStructure.parameters) !== null && _a !== void 0 ? _a : (methodStructure.parameters = [
+        const methodStructure = (_a = tsMorphTransform(project, sourceFile, classDeclaration)) !== null && _a !== void 0 ? _a : {};
+        (_b = methodStructure.parameters) !== null && _b !== void 0 ? _b : (methodStructure.parameters = [
             {
                 name: 'source',
                 type: sourceType,
             },
         ]);
-        (_b = methodStructure.statements) !== null && _b !== void 0 ? _b : (methodStructure.statements = ['return source as any']);
-        (_c = methodStructure.returnType) !== null && _c !== void 0 ? _c : (methodStructure.returnType = w => {
+        (_c = methodStructure.statements) !== null && _c !== void 0 ? _c : (methodStructure.statements = ['return source as any;']);
+        (_d = methodStructure.returnType) !== null && _d !== void 0 ? _d : (methodStructure.returnType = w => {
             w.write('Promise<');
             if (typeof targetType ===
                 'string') {
@@ -93,8 +90,8 @@ function CoerceProxyRemoteMethodClass(options) {
             }
             w.write('>');
         });
-        (_d = methodStructure.isAsync) !== null && _d !== void 0 ? _d : (methodStructure.isAsync = true);
-        const methodDeclaration = (0, coerce_class_method_1.CoerceClassMethod)(classDeclaration, 'transformParameters', methodStructure);
+        (_e = methodStructure.isAsync) !== null && _e !== void 0 ? _e : (methodStructure.isAsync = true);
+        const methodDeclaration = (0, ts_morph_1.CoerceClassMethod)(classDeclaration, 'transformParameters', methodStructure);
         if (override) {
             methodDeclaration.set(methodStructure);
         }

package/src/lib/angular/coerce-proxy-remote-method-class.js.map

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

package/src/lib/angular/coerce-table-data-source.js

@@ -21,7 +21,7 @@ function CoerceTableDataSourceRule(options) {
             const [constructorDeclaration] = (0, coerce_class_constructor_1.CoerceClassConstructor)(classDeclaration);
             constructorDeclaration.set({
                 statements: [
-                    'super(new GetPageAdapterRemoteMethod(getByFilter));',
+                    'super(new GetPageAdapterRemoteMethod(getByFilter as any));',
                 ],
             });
             const propertyDeclaration = (0, coerce_parameter_declaration_1.CoerceParameterDeclaration)(constructorDeclaration, 'getByFilter').set({

package/src/lib/angular/coerce-table-data-source.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-table-data-source.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-table-data-source.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAM1D,0EAAqE;AACrE,2EAGwC;AACxC,mEAA+D;AAC/D,+DAA2D;AAC3D,2FAAsF;AACtF,yEAGoC;AAUpC,SAAgB,yBAAyB,CAAC,OAA+C;IACvF,IAAI,EACF,IAAI,EACJ,WAAW,EACX,KAAK,GACN,GAAG,OAAO,CAAC;IACZ,IAAI,GAAG,IAAA,mCAAY,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEpC,OAAO,IAAA,gDAAqB,kCACvB,OAAO,KACV,aAAa,EAAE,CACb,UAAsB,EACtB,gBAAkC,EAClC,OAAqC,EACrC,EAAE;YACF,gBAAgB,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC;YACtD,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,eAAe,EAAE,yBAAyB;gBAC1C,YAAY,EAAE,CAAE,wBAAwB,CAAE;aAC3C,CAAC,CAAC;QACL,CAAC,EACD,gBAAgB,EAAE,CAAC,OAAgB,EAAE,UAAsB,EAAE,gBAAkC,EAAE,EAAE;YACjG,MAAM,CAAE,sBAAsB,CAAE,GAAG,IAAA,iDAAsB,EAAC,gBAAgB,CAAC,CAAC;YAE5E,sBAAsB,CAAC,GAAG,CAAC;gBACzB,UAAU,EAAE;oBACV,qDAAqD;iBACtD;aACF,CAAC,CAAC;YAEH,MAAM,mBAAmB,GAAG,IAAA,yDAA0B,EAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC;gBAChG,IAAI,EAAE,IAAA,+CAAsB,EAAC,WAAW,CAAC;aAC1C,CAAC,CAAC;YAEH,IAAA,kCAAe,EAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC;gBACjD,SAAS,EAAE,CAAE,IAAA,+CAAsB,EAAC,WAAW,CAAC,CAAE;aACnD,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB;oBACE,eAAe,EAAE,eAAe;oBAChC,YAAY,EAAE,CAAE,QAAQ,CAAE;iBAC3B;gBACD;oBACE,eAAe,EAAE,IAAA,qDAA4B,EAAC,WAAW,EAAE,KAAK,CAAC;oBACjE,YAAY,EAAE,CAAE,IAAA,+CAAsB,EAAC,WAAW,CAAC,CAAE;iBACtD;gBACD;oBACE,eAAe,EAAE,8BAA8B;oBAC/C,YAAY,EAAE,CAAE,4BAA4B,CAAE;iBAC/C;aACF,CAAC,CAAC;QAEL,CAAC,EACD,IAAI,IACJ,CAAC;AAEL,CAAC;AAzDD,8DAyDC"}
+{"version":3,"file":"coerce-table-data-source.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-table-data-source.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAM1D,0EAAqE;AACrE,2EAGwC;AACxC,mEAA+D;AAC/D,+DAA2D;AAC3D,2FAAsF;AACtF,yEAGoC;AAUpC,SAAgB,yBAAyB,CAAC,OAA+C;IACvF,IAAI,EACF,IAAI,EACJ,WAAW,EACX,KAAK,GACN,GAAG,OAAO,CAAC;IACZ,IAAI,GAAG,IAAA,mCAAY,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEpC,OAAO,IAAA,gDAAqB,kCACvB,OAAO,KACV,aAAa,EAAE,CACb,UAAsB,EACtB,gBAAkC,EAClC,OAAqC,EACrC,EAAE;YACF,gBAAgB,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC;YACtD,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,eAAe,EAAE,yBAAyB;gBAC1C,YAAY,EAAE,CAAE,wBAAwB,CAAE;aAC3C,CAAC,CAAC;QACL,CAAC,EACD,gBAAgB,EAAE,CAAC,OAAgB,EAAE,UAAsB,EAAE,gBAAkC,EAAE,EAAE;YACjG,MAAM,CAAE,sBAAsB,CAAE,GAAG,IAAA,iDAAsB,EAAC,gBAAgB,CAAC,CAAC;YAE5E,sBAAsB,CAAC,GAAG,CAAC;gBACzB,UAAU,EAAE;oBACV,4DAA4D;iBAC7D;aACF,CAAC,CAAC;YAEH,MAAM,mBAAmB,GAAG,IAAA,yDAA0B,EAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC;gBAChG,IAAI,EAAE,IAAA,+CAAsB,EAAC,WAAW,CAAC;aAC1C,CAAC,CAAC;YAEH,IAAA,kCAAe,EAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC;gBACjD,SAAS,EAAE,CAAE,IAAA,+CAAsB,EAAC,WAAW,CAAC,CAAE;aACnD,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB;oBACE,eAAe,EAAE,eAAe;oBAChC,YAAY,EAAE,CAAE,QAAQ,CAAE;iBAC3B;gBACD;oBACE,eAAe,EAAE,IAAA,qDAA4B,EAAC,WAAW,EAAE,KAAK,CAAC;oBACjE,YAAY,EAAE,CAAE,IAAA,+CAAsB,EAAC,WAAW,CAAC,CAAE;iBACtD;gBACD;oBACE,eAAe,EAAE,8BAA8B;oBAC/C,YAAY,EAAE,CAAE,4BAA4B,CAAE;iBAC/C;aACF,CAAC,CAAC;QAEL,CAAC,EACD,IAAI,IACJ,CAAC;AAEL,CAAC;AAzDD,8DAyDC"}

package/src/lib/angular/coerce-table-parameters-from-route.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceTableParametersFromRouteRule = void 0;
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
-const ts_morph_1 = require("ts-morph");
+const ts_morph_1 = require("@rxap/ts-morph");
+const ts_morph_2 = require("ts-morph");
 const coerce_class_constructor_1 = require("../coerce-class-constructor");
-const coerce_dto_class_1 = require("../nest/coerce-dto-class");
 const ts_morph_transform_1 = require("../ts-morph-transform");
 const coerce_imports_1 = require("../ts-morph/coerce-imports");
 const coerce_parameter_declaration_1 = require("../ts-morph/coerce-parameter-declaration");
@@ -17,13 +17,13 @@ function CoerceTableParametersFromRouteRule(options) {
         (0, coerce_parameter_declaration_1.CoerceParameterDeclaration)(constructorDeclaration, 'route', {
             type: 'ActivatedRoute',
             isReadonly: true,
-            scope: ts_morph_1.Scope.Private,
+            scope: ts_morph_2.Scope.Private,
         });
         (0, coerce_imports_1.CoerceImports)(sourceFile, {
             namedImports: ['ActivatedRoute'],
             moduleSpecifier: '@angular/router',
         });
-        (0, coerce_dto_class_1.CoercePropertyDeclaration)(classDeclaration, 'parameters').set({
+        (0, ts_morph_1.CoercePropertyDeclaration)(classDeclaration, 'parameters').set({
             type: 'Observable<Record<string, string>>',
             initializer: `this.route.params.map(params => ({${parameterList.map(parameter => `${parameter}: params.${parameter}`)
                 .join(', ')}}))`,

package/src/lib/angular/coerce-table-parameters-from-route.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-table-parameters-from-route.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-table-parameters-from-route.ts"],"names":[],"mappings":";;;AAAA,qEAAsD;AACtD,uCAAiC;AACjC,0EAAqE;AACrE,+DAAqE;AACrE,8DAG+B;AAC/B,+DAA2D;AAC3D,2FAAsF;AAOtF,SAAgB,kCAAkC,CAAC,OAAkD;IACnG,MAAM,EACJ,aAAa,EACb,SAAS,GACV,GAAG,OAAO,CAAC;IACZ,OAAO,IAAA,uDAAkC,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE;QAE7D,MAAM,UAAU,GAAG,OAAO,CAAC,oBAAoB,CAAC,GAAI,SAAU,eAAe,CAAC,CAAC;QAC/E,MAAM,gBAAgB,GAAG,UAAU,CAAC,eAAe,CAAC,GAAI,IAAA,+BAAQ,EAAC,SAAS,CAAE,WAAW,CAAC,CAAC;QAEzF,MAAM,CAAE,sBAAsB,CAAE,GAAG,IAAA,iDAAsB,EAAC,gBAAgB,CAAC,CAAC;QAC5E,IAAA,yDAA0B,EACxB,sBAAsB,EACtB,OAAO,EACP;YACE,IAAI,EAAE,gBAAgB;YACtB,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,gBAAK,CAAC,OAAO;SACrB,CACF,CAAC;QACF,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,gBAAgB,CAAE;YAClC,eAAe,EAAE,iBAAiB;SACnC,CAAC,CAAC;QACH,IAAA,4CAAyB,EAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC;YAC5D,IAAI,EAAE,oCAAoC;YAC1C,WAAW,EAAE,qCAAsC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,GAAI,SAAU,YAAa,SAAU,EAAE,CAAC;iBACzD,IAAI,CAAC,IAAI,CAAE,KAAK;YACjF,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,OAAO;oBACb,SAAS,EAAE,EAAE;iBACd;aACF;SACF,CAAC,CAAC;QACH,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,YAAY,CAAE;YAC9B,eAAe,EAAE,MAAM;SACxB,CAAC,CAAC;QACH,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,KAAK,CAAE;YACvB,eAAe,EAAE,gBAAgB;SAClC,CAAC,CAAC;QACH,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,OAAO,CAAE;YACzB,eAAe,EAAE,eAAe;SACjC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAhDD,gFAgDC"}
+{"version":3,"file":"coerce-table-parameters-from-route.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-table-parameters-from-route.ts"],"names":[],"mappings":";;;AAAA,qEAAsD;AACtD,6CAA2D;AAC3D,uCAAiC;AACjC,0EAAqE;AACrE,8DAG+B;AAC/B,+DAA2D;AAC3D,2FAAsF;AAOtF,SAAgB,kCAAkC,CAAC,OAAkD;IACnG,MAAM,EACJ,aAAa,EACb,SAAS,GACV,GAAG,OAAO,CAAC;IACZ,OAAO,IAAA,uDAAkC,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE;QAE7D,MAAM,UAAU,GAAG,OAAO,CAAC,oBAAoB,CAAC,GAAI,SAAU,eAAe,CAAC,CAAC;QAC/E,MAAM,gBAAgB,GAAG,UAAU,CAAC,eAAe,CAAC,GAAI,IAAA,+BAAQ,EAAC,SAAS,CAAE,WAAW,CAAC,CAAC;QAEzF,MAAM,CAAE,sBAAsB,CAAE,GAAG,IAAA,iDAAsB,EAAC,gBAAgB,CAAC,CAAC;QAC5E,IAAA,yDAA0B,EACxB,sBAAsB,EACtB,OAAO,EACP;YACE,IAAI,EAAE,gBAAgB;YACtB,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,gBAAK,CAAC,OAAO;SACrB,CACF,CAAC;QACF,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,gBAAgB,CAAE;YAClC,eAAe,EAAE,iBAAiB;SACnC,CAAC,CAAC;QACH,IAAA,oCAAyB,EAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC;YAC5D,IAAI,EAAE,oCAAoC;YAC1C,WAAW,EAAE,qCAAsC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,GAAI,SAAU,YAAa,SAAU,EAAE,CAAC;iBACzD,IAAI,CAAC,IAAI,CAAE,KAAK;YACjF,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,OAAO;oBACb,SAAS,EAAE,EAAE;iBACd;aACF;SACF,CAAC,CAAC;QACH,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,YAAY,CAAE;YAC9B,eAAe,EAAE,MAAM;SACxB,CAAC,CAAC;QACH,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,KAAK,CAAE;YACvB,eAAe,EAAE,gBAAgB;SAClC,CAAC,CAAC;QACH,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,OAAO,CAAE;YACzB,eAAe,EAAE,eAAe;SACjC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAhDD,gFAgDC"}

package/src/lib/angular/coerce-table-select-resolve-value-method.js

@@ -11,7 +11,7 @@ function CoerceTableSelectResolveValueMethodRule(options) {
     const { operationId, scope } = options;
     return (0, coerce_method_class_1.CoerceMethodClass)(Object.assign(Object.assign({}, options), { tsMorphTransform: (project, sourceFile, classDeclaration) => {
             const [constructorDeclaration] = (0, coerce_class_constructor_1.CoerceClassConstructor)(classDeclaration);
-            (0, coerce_parameter_declaration_1.CoerceParameterDeclaration)(constructorDeclaration, 'remoteMethod').set({
+            (0, coerce_parameter_declaration_1.CoerceParameterDeclaration)(constructorDeclaration, 'method').set({
                 type: (0, operation_id_utilities_1.OperationIdToClassName)(operationId),
                 isReadonly: true,
                 scope: ts_morph_1.Scope.Private,
@@ -22,7 +22,7 @@ function CoerceTableSelectResolveValueMethodRule(options) {
             });
             return {
                 statements: [
-                    'return this.remoteMethod.call({ parameters: { ...(parameters.context ?? {}), value: parameters.value } });',
+                    'return this.method.call({ parameters: { ...(parameters.context ?? {}), value: parameters.value } });',
                 ],
             };
         } }));

package/src/lib/angular/coerce-table-select-resolve-value-method.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-table-select-resolve-value-method.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-table-select-resolve-value-method.ts"],"names":[],"mappings":";;;AAAA,uCAAiC;AACjC,0EAAqE;AACrE,2EAGwC;AACxC,+DAA2D;AAC3D,2FAAsF;AACtF,+DAG+B;AAO/B,SAAgB,uCAAuC,CAAC,OAAmD;IACzG,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAEvC,OAAO,IAAA,uCAAiB,kCACnB,OAAO,KACV,gBAAgB,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE;YAC1D,MAAM,CAAE,sBAAsB,CAAE,GAAG,IAAA,iDAAsB,EAAC,gBAAgB,CAAC,CAAC;YAE5E,IAAA,yDAA0B,EAAC,sBAAsB,EAAE,cAAc,CAAC,CAAC,GAAG,CAAC;gBACrE,IAAI,EAAE,IAAA,+CAAsB,EAAC,WAAW,CAAC;gBACzC,UAAU,EAAE,IAAI;gBAChB,KAAK,EAAE,gBAAK,CAAC,OAAO;aACrB,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,IAAA,+CAAsB,EAAC,WAAW,CAAC,CAAE;gBACrD,eAAe,EAAE,IAAA,qDAA4B,EAAC,WAAW,EAAE,KAAK,CAAC;aAClE,CAAC,CAAC;YAEH,OAAO;gBACL,UAAU,EAAE;oBACV,4GAA4G;iBAC7G;aACF,CAAC;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AAzBD,0FAyBC"}
+{"version":3,"file":"coerce-table-select-resolve-value-method.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-table-select-resolve-value-method.ts"],"names":[],"mappings":";;;AAAA,uCAAiC;AACjC,0EAAqE;AACrE,2EAGwC;AACxC,+DAA2D;AAC3D,2FAAsF;AACtF,+DAG+B;AAO/B,SAAgB,uCAAuC,CAAC,OAAmD;IACzG,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAEvC,OAAO,IAAA,uCAAiB,kCACnB,OAAO,KACV,gBAAgB,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE;YAC1D,MAAM,CAAE,sBAAsB,CAAE,GAAG,IAAA,iDAAsB,EAAC,gBAAgB,CAAC,CAAC;YAE5E,IAAA,yDAA0B,EAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC;gBAC/D,IAAI,EAAE,IAAA,+CAAsB,EAAC,WAAW,CAAC;gBACzC,UAAU,EAAE,IAAI;gBAChB,KAAK,EAAE,gBAAK,CAAC,OAAO;aACrB,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,IAAA,+CAAsB,EAAC,WAAW,CAAC,CAAE;gBACrD,eAAe,EAAE,IAAA,qDAA4B,EAAC,WAAW,EAAE,KAAK,CAAC;aAClE,CAAC,CAAC;YAEH,OAAO;gBACL,UAAU,EAAE;oBACV,sGAAsG;iBACvG;aACF,CAAC;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AAzBD,0FAyBC"}

package/src/lib/angular/coerce-tree-table-children-proxy-remote-method-class.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceTreeTableChildrenProxyRemoteMethodClass = void 0;
+const utilities_1 = require("@rxap/utilities");
 const operation_id_utilities_1 = require("../nest/operation-id-utilities");
 const coerce_imports_1 = require("../ts-morph/coerce-imports");
 const coerce_proxy_remote_method_class_1 = require("./coerce-proxy-remote-method-class");
 function CoerceTreeTableChildrenProxyRemoteMethodClass(options) {
-    let { tsMorphTransform, getChildrenOperationId, scope, } = options;
-    tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => ({}));
+    const { tsMorphTransform = utilities_1.noop, getChildrenOperationId, scope, } = options;
     return (0, coerce_proxy_remote_method_class_1.CoerceProxyRemoteMethodClass)(Object.assign(Object.assign({}, options), { name: 'tree-table-children', sourceType: 'Node<unknown>', targetType: `OpenApiRemoteMethodParameter<${(0, operation_id_utilities_1.OperationIdToParameterClassName)(getChildrenOperationId)}>`, proxyMethod: (0, operation_id_utilities_1.OperationIdToClassName)(getChildrenOperationId), tsMorphTransform: (project, sourceFile, classDeclaration) => {
             (0, coerce_imports_1.CoerceImports)(sourceFile, {
                 namedImports: [(0, operation_id_utilities_1.OperationIdToClassName)(getChildrenOperationId)],

package/src/lib/angular/coerce-tree-table-children-proxy-remote-method-class.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-tree-table-children-proxy-remote-method-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-tree-table-children-proxy-remote-method-class.ts"],"names":[],"mappings":";;;AAKA,2EAKwC;AACxC,+DAA2D;AAC3D,yFAG4C;AAQ5C,SAAgB,6CAA6C,CAAC,OAA6D;IACzH,IAAI,EACF,gBAAgB,EAChB,sBAAsB,EACtB,KAAK,GACN,GAAG,OAAO,CAAC;IACZ,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAC;IAChC,OAAO,IAAA,+DAA4B,kCAC9B,OAAO,KACV,IAAI,EAAE,qBAAqB,EAC3B,UAAU,EAAE,eAAe,EAC3B,UAAU,EAAE,gCAAiC,IAAA,wDAA+B,EAAC,sBAAsB,CAAE,GAAG,EACxG,WAAW,EAAE,IAAA,+CAAsB,EAAC,sBAAsB,CAAC,EAC3D,gBAAgB,EAAE,CAAC,OAAgB,EAAE,UAAsB,EAAE,gBAAkC,EAAE,EAAE;YACjG,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,IAAA,+CAAsB,EAAC,sBAAsB,CAAC,CAAE;gBAChE,eAAe,EAAE,IAAA,qDAA4B,EAAC,sBAAsB,EAAE,KAAK,CAAC;aAC7E,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,MAAM,CAAE;gBACxB,eAAe,EAAE,2BAA2B;aAC7C,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,8BAA8B,CAAE;gBAChD,eAAe,EAAE,8BAA8B;aAChD,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,IAAA,wDAA+B,EAAC,sBAAsB,CAAC,CAAE;gBACzE,eAAe,EAAE,IAAA,8DAAqC,EAAC,sBAAsB,EAAE,KAAK,CAAC;aACtF,CAAC,CAAC;YACH,OAAO,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAClE,CAAC,IACD,CAAC;AACL,CAAC;AAjCD,sGAiCC"}
+{"version":3,"file":"coerce-tree-table-children-proxy-remote-method-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-tree-table-children-proxy-remote-method-class.ts"],"names":[],"mappings":";;;AAAA,+CAAuC;AAMvC,2EAKwC;AACxC,+DAA2D;AAC3D,yFAG4C;AAQ5C,SAAgB,6CAA6C,CAAC,OAA6D;IACzH,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,sBAAsB,EACtB,KAAK,GACN,GAAG,OAAO,CAAC;IACZ,OAAO,IAAA,+DAA4B,kCAC9B,OAAO,KACV,IAAI,EAAE,qBAAqB,EAC3B,UAAU,EAAE,eAAe,EAC3B,UAAU,EAAE,gCAAiC,IAAA,wDAA+B,EAAC,sBAAsB,CAAE,GAAG,EACxG,WAAW,EAAE,IAAA,+CAAsB,EAAC,sBAAsB,CAAC,EAC3D,gBAAgB,EAAE,CAAC,OAAgB,EAAE,UAAsB,EAAE,gBAAkC,EAAE,EAAE;YACjG,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,IAAA,+CAAsB,EAAC,sBAAsB,CAAC,CAAE;gBAChE,eAAe,EAAE,IAAA,qDAA4B,EAAC,sBAAsB,EAAE,KAAK,CAAC;aAC7E,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,MAAM,CAAE;gBACxB,eAAe,EAAE,2BAA2B;aAC7C,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,8BAA8B,CAAE;gBAChD,eAAe,EAAE,8BAA8B;aAChD,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,IAAA,wDAA+B,EAAC,sBAAsB,CAAC,CAAE;gBACzE,eAAe,EAAE,IAAA,8DAAqC,EAAC,sBAAsB,EAAE,KAAK,CAAC;aACtF,CAAC,CAAC;YACH,OAAO,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;QACjE,CAAC,IACD,CAAC;AACL,CAAC;AAhCD,sGAgCC"}

package/src/lib/angular/form-definition-utilities.d.ts

@@ -9,5 +9,6 @@ export type CoerceFormDefinitionClassOptions = GetFormDefinitionClassNameOptions
 export declare function CoerceFormDefinitionClass(sourceFile: SourceFile, options: CoerceFormDefinitionClassOptions): import("ts-morph").ClassDeclaration;
 export type GetFormDefinitionFileNameOptions = GetFormDefinitionClassNameOptions;
 export declare function GetFormDefinitionFileName({ name }: GetFormDefinitionFileNameOptions): string;
+export declare function GetFormDefinitionFileImportPath(options: GetFormDefinitionFileNameOptions): string;
 export type GetFormDefinitionFilePathOptions = GetFormDefinitionFileNameOptions;
 export declare function GetFormDefinitionFilePath(options: GetFormDefinitionFileNameOptions): string;

package/src/lib/angular/form-definition-utilities.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetFormDefinitionFilePath = exports.GetFormDefinitionFileName = exports.CoerceFormDefinitionClass = exports.GetFormDefinitionInterfaceName = exports.GetFormDefinitionClassName = void 0;
+exports.GetFormDefinitionFilePath = exports.GetFormDefinitionFileImportPath = exports.GetFormDefinitionFileName = exports.CoerceFormDefinitionClass = exports.GetFormDefinitionInterfaceName = exports.GetFormDefinitionClassName = void 0;
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
-const coerce_class_1 = require("../coerce-class");
+const ts_morph_1 = require("@rxap/ts-morph");
 const utilities_1 = require("@rxap/utilities");
 function GetFormDefinitionClassName({ name }) {
     return (0, schematics_utilities_1.CoerceSuffix)((0, schematics_utilities_1.classify)(name), 'Form');
@@ -15,13 +15,17 @@ function GetFormDefinitionInterfaceName(options) {
 exports.GetFormDefinitionInterfaceName = GetFormDefinitionInterfaceName;
 function CoerceFormDefinitionClass(sourceFile, options) {
     const className = GetFormDefinitionClassName(options);
-    return (0, coerce_class_1.CoerceClass)(sourceFile, className, { isExported: true });
+    return (0, ts_morph_1.CoerceClass)(sourceFile, className, { isExported: true });
 }
 exports.CoerceFormDefinitionClass = CoerceFormDefinitionClass;
 function GetFormDefinitionFileName({ name }) {
     return (0, schematics_utilities_1.CoerceSuffix)((0, utilities_1.dasherize)(name), '.form.ts');
 }
 exports.GetFormDefinitionFileName = GetFormDefinitionFileName;
+function GetFormDefinitionFileImportPath(options) {
+    return './' + GetFormDefinitionFileName(options).replace(/\.ts$/, '');
+}
+exports.GetFormDefinitionFileImportPath = GetFormDefinitionFileImportPath;
 function GetFormDefinitionFilePath(options) {
     return '/' + GetFormDefinitionFileName(options) + '?';
 }

package/src/lib/angular/form-definition-utilities.js.map

@@ -1 +1 @@
-{"version":3,"file":"form-definition-utilities.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/form-definition-utilities.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;AAEpC,kDAA8C;AAC9C,+CAA4C;AAM5C,SAAgB,0BAA0B,CAAC,EAAE,IAAI,EAAqC;IACpF,OAAO,IAAA,mCAAY,EAAC,IAAA,+BAAQ,EAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;AAC9C,CAAC;AAFD,gEAEC;AAID,SAAgB,8BAA8B,CAAC,OAA8C;IAC3F,MAAM,SAAS,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;IACtD,OAAO,IAAK,SAAU,EAAE,CAAC;AAC3B,CAAC;AAHD,wEAGC;AAID,SAAgB,yBAAyB,CAAC,UAAsB,EAAE,OAAyC;IACzG,MAAM,SAAS,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;IACtD,OAAO,IAAA,0BAAW,EAAC,UAAU,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;AAClE,CAAC;AAHD,8DAGC;AAID,SAAgB,yBAAyB,CAAC,EAAE,IAAI,EAAoC;IAClF,OAAO,IAAA,mCAAY,EAAC,IAAA,qBAAS,EAAC,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC;AACnD,CAAC;AAFD,8DAEC;AAID,SAAgB,yBAAyB,CAAC,OAAyC;IACjF,OAAO,GAAG,GAAG,yBAAyB,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC;AACxD,CAAC;AAFD,8DAEC"}
+{"version":3,"file":"form-definition-utilities.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/form-definition-utilities.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;AACpC,6CAA6C;AAC7C,+CAA4C;AAO5C,SAAgB,0BAA0B,CAAC,EAAE,IAAI,EAAqC;IACpF,OAAO,IAAA,mCAAY,EAAC,IAAA,+BAAQ,EAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;AAC9C,CAAC;AAFD,gEAEC;AAID,SAAgB,8BAA8B,CAAC,OAA8C;IAC3F,MAAM,SAAS,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;IACtD,OAAO,IAAK,SAAU,EAAE,CAAC;AAC3B,CAAC;AAHD,wEAGC;AAID,SAAgB,yBAAyB,CAAC,UAAsB,EAAE,OAAyC;IACzG,MAAM,SAAS,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;IACtD,OAAO,IAAA,sBAAW,EAAC,UAAU,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;AAClE,CAAC;AAHD,8DAGC;AAID,SAAgB,yBAAyB,CAAC,EAAE,IAAI,EAAoC;IAClF,OAAO,IAAA,mCAAY,EAAC,IAAA,qBAAS,EAAC,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC;AACnD,CAAC;AAFD,8DAEC;AAED,SAAgB,+BAA+B,CAAC,OAAyC;IACvF,OAAO,IAAI,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AACxE,CAAC;AAFD,0EAEC;AAID,SAAgB,yBAAyB,CAAC,OAAyC;IACjF,OAAO,GAAG,GAAG,yBAAyB,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC;AACxD,CAAC;AAFD,8DAEC"}

package/src/lib/nest/add-operation-to-controller.d.ts

@@ -3,7 +3,7 @@ import { ClassDeclaration, DecoratorStructure, MethodDeclaration, OptionalKind,
 export interface OperationParameter {
     name: string;
     type?: string | WriterFunction | TypeImport;
-    pipeList?: Array<string | WriterFunction>;
+    pipeList?: Array<string | WriterFunction | TypeImport>;
     defaultValue?: string | WriterFunction;
     hasQuestionToken?: boolean;
     required?: boolean;

package/src/lib/nest/add-operation-to-controller.js

@@ -2,12 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AddOperationToController = void 0;
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
-const ts_morph_1 = require("ts-morph");
-const coerce_class_method_1 = require("../coerce-class-method");
-const coerce_decorator_1 = require("../ts-morph/coerce-decorator");
-const coerce_imports_1 = require("../ts-morph/coerce-imports");
-const coerce_statements_1 = require("../ts-morph/coerce-statements");
-const ts_morph_2 = require("@rxap/ts-morph");
+const ts_morph_1 = require("@rxap/ts-morph");
+const utilities_1 = require("@rxap/utilities");
+const ts_morph_2 = require("ts-morph");
 function buildMethodQueryParameters(queryList, sourceFile) {
     if (queryList.length) {
         return queryList.map(query => {
@@ -16,7 +13,7 @@ function buildMethodQueryParameters(queryList, sourceFile) {
                 undefined) {
                 return query;
             }
-            (0, coerce_imports_1.CoerceImports)(sourceFile, {
+            (0, ts_morph_1.CoerceImports)(sourceFile, {
                 namedImports: ['DefaultValuePipe'],
                 moduleSpecifier: '@nestjs/common',
             });
@@ -35,23 +32,28 @@ function buildMethodQueryParameters(queryList, sourceFile) {
                 w.write(')');
             });
             return Object.assign(Object.assign({}, query), { pipeList });
-        }).map(query => {
-            var _a, _b, _c;
-            return ({
-                name: (_a = query.alias) !== null && _a !== void 0 ? _a : query.name,
-                type: query.type ? (0, ts_morph_2.WriteType)({ type: query.type, isArray: false }, sourceFile) : undefined,
-                hasQuestionToken: (_b = query.hasQuestionToken) !== null && _b !== void 0 ? _b : (!query.required && query.defaultValue === undefined),
-                decorators: [
-                    {
-                        name: 'Query',
-                        arguments: [
-                            w => w.quote(query.name),
-                            ...((_c = query.pipeList) !== null && _c !== void 0 ? _c : []),
-                        ],
-                    },
-                ],
-            });
-        });
+        }).map(({ alias, name, type, hasQuestionToken, required, defaultValue, pipeList = [], isArray }) => ({
+            name: alias !== null && alias !== void 0 ? alias : name,
+            type: (0, ts_morph_1.WriteType)({ type: type !== null && type !== void 0 ? type : 'unknown', isArray: isArray }, sourceFile),
+            hasQuestionToken: hasQuestionToken !== null && hasQuestionToken !== void 0 ? hasQuestionToken : (!required && defaultValue === undefined),
+            decorators: [
+                {
+                    name: 'Query',
+                    arguments: [
+                        w => w.quote(name),
+                        ...pipeList.map(pipe => {
+                            if (typeof pipe === 'string') {
+                                return pipe;
+                            }
+                            if (typeof pipe === 'function') {
+                                return pipe;
+                            }
+                            return (0, ts_morph_1.WriteType)(pipe, sourceFile);
+                        }),
+                    ],
+                },
+            ],
+        }));
     }
     return [];
 }
@@ -59,7 +61,7 @@ function buildMethodParamParameters(paramList, sourceFile) {
     if (paramList.length) {
         return paramList.map(({ alias, name, type }) => ({
             name: alias !== null && alias !== void 0 ? alias : name,
-            type: type ? (0, ts_morph_2.WriteType)({
+            type: type ? (0, ts_morph_1.WriteType)({
                 type: type,
                 isArray: false
             }, sourceFile) : undefined,
@@ -115,30 +117,28 @@ function AddOperationToController(sourceFile, classDeclaration, name, options) {
         }
         (_a = param.type) !== null && _a !== void 0 ? _a : (param.type = 'string');
     });
-    const importStructures = [
-        {
-            namedImports: [method, 'NotImplementedException'],
-            moduleSpecifier: '@nestjs/common',
-        },
-    ];
+    (0, ts_morph_1.CoerceImports)(sourceFile, {
+        namedImports: [method, 'NotImplementedException'],
+        moduleSpecifier: '@nestjs/common',
+    });
     if (queryList.length) {
-        importStructures.push({
+        (0, ts_morph_1.CoerceImports)(sourceFile, {
             namedImports: ['Query'],
             moduleSpecifier: '@nestjs/common',
         });
-        importStructures.push({
+        (0, ts_morph_1.CoerceImports)(sourceFile, {
             namedImports: ['ApiQuery'],
             moduleSpecifier: '@nestjs/swagger',
         });
     }
     if (paramList.length) {
-        importStructures.push({
+        (0, ts_morph_1.CoerceImports)(sourceFile, {
             namedImports: ['Param'],
             moduleSpecifier: '@nestjs/common',
         });
     }
     if (body) {
-        importStructures.push({
+        (0, ts_morph_1.CoerceImports)(sourceFile, {
             namedImports: ['Body'],
             moduleSpecifier: '@nestjs/common',
         });
@@ -161,19 +161,9 @@ function AddOperationToController(sourceFile, classDeclaration, name, options) {
     }
     // TODO : check that all defined param in the paramList are present in the path
     returnType !== null && returnType !== void 0 ? returnType : (returnType = 'void');
-    const methodDeclaration = (0, coerce_class_method_1.CoerceClassMethod)(classDeclaration, (0, schematics_utilities_1.camelize)(name), {
-        scope: ts_morph_1.Scope.Public,
+    const methodDeclaration = (0, ts_morph_1.CoerceClassMethod)(classDeclaration, (0, schematics_utilities_1.camelize)(name), {
+        scope: ts_morph_2.Scope.Public,
         isAsync,
-        parameters: [
-            ...buildMethodQueryParameters(queryList, sourceFile),
-            ...buildMethodParamParameters(paramList, sourceFile),
-            ...buildMethodBodyParameters(body),
-        ].sort((a, b) => {
-            if (a.hasQuestionToken && b.hasQuestionToken) {
-                return 0;
-            }
-            return a.hasQuestionToken ? 1 : -1;
-        }),
         returnType: !isAsync ? returnType : returnType ? (w) => {
             w.write('Promise<');
             if (typeof returnType === 'string') {
@@ -188,21 +178,35 @@ function AddOperationToController(sourceFile, classDeclaration, name, options) {
             w.write('>');
         } : undefined,
     });
+    const existingParameters = methodDeclaration.getParameters().map(p => p.getStructure());
+    (0, utilities_1.CoerceArrayItems)(existingParameters, [
+        ...buildMethodQueryParameters(queryList, sourceFile),
+        ...buildMethodParamParameters(paramList, sourceFile),
+        ...buildMethodBodyParameters(body),
+    ], (a, b) => a.name === b.name);
+    methodDeclaration.getParameters().forEach(p => p.remove());
+    for (const parameter of existingParameters.sort((a, b) => {
+        if (a.hasQuestionToken && b.hasQuestionToken) {
+            return 0;
+        }
+        return a.hasQuestionToken ? 1 : -1;
+    })) {
+        methodDeclaration.addParameter(parameter);
+    }
     decorators.forEach(decorator => {
-        (0, coerce_decorator_1.CoerceDecorator)(methodDeclaration, decorator.name, decorator);
+        (0, ts_morph_1.CoerceDecorator)(methodDeclaration, decorator.name, decorator);
     });
-    (0, coerce_decorator_1.CoerceDecorator)(methodDeclaration, method, { arguments: path ? [w => w.quote(path)] : [] });
+    (0, ts_morph_1.CoerceDecorator)(methodDeclaration, method, { arguments: path ? [w => w.quote(path)] : [] });
     coerceApiQueryDecorators(queryList, methodDeclaration);
-    (0, coerce_statements_1.CoerceStatements)(methodDeclaration, statements !== null && statements !== void 0 ? statements : ['throw new NotImplementedException();']);
-    (0, coerce_imports_1.CoerceImports)(sourceFile, importStructures);
+    (0, ts_morph_1.CoerceStatements)(methodDeclaration, statements !== null && statements !== void 0 ? statements : ['throw new NotImplementedException();']);
     tsMorphTransform(sourceFile, classDeclaration, methodDeclaration, options);
 }
 exports.AddOperationToController = AddOperationToController;
 function coerceApiQueryDecorators(queryList, methodDeclaration) {
     for (const query of queryList) {
-        (0, coerce_decorator_1.CoerceDecorator)(methodDeclaration, 'ApiQuery', {
+        (0, ts_morph_1.CoerceDecorator)(methodDeclaration, 'ApiQuery', {
             arguments: [
-                ts_morph_1.Writers.object({
+                ts_morph_2.Writers.object({
                     name: w => w.quote(query.name),
                     required: query.required ? 'true' : 'false',
                     isArray: query.isArray ? 'true' : 'false',
@@ -212,9 +216,9 @@ function coerceApiQueryDecorators(queryList, methodDeclaration) {
             var _a;
             if (decorator.getArguments().length) {
                 const [objectLiteralExpression] = decorator.getArguments();
-                if (objectLiteralExpression instanceof ts_morph_1.ObjectLiteralExpression) {
+                if (objectLiteralExpression instanceof ts_morph_2.ObjectLiteralExpression) {
                     const namePropertyElement = objectLiteralExpression.getProperty('name');
-                    if (namePropertyElement instanceof ts_morph_1.PropertyAssignment) {
+                    if (namePropertyElement instanceof ts_morph_2.PropertyAssignment) {
                         const name = (_a = namePropertyElement.getInitializer()) === null || _a === void 0 ? void 0 : _a.getText().trim().replace(/^'/, '').replace(/'$/, '');
                         return name === query.name;
                     }

package/src/lib/nest/add-operation-to-controller.js.map

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

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

@@ -6,15 +6,25 @@ const schematics_utilities_1 = require("@rxap/schematics-utilities");
 function BuildNestControllerName(options) {
     let { controllerName, controllerNameSuffix, nestModule, } = options;
     if (nestModule && nestModule !== controllerName) {
+        console.log('The nest module name is different from the controller name');
         if (controllerName) {
+            console.log('controllerName', controllerName);
             if (!controllerName.startsWith(nestModule)) {
+                console.log('The controller name is not prefixed with the nest module name');
                 controllerName = [nestModule, controllerName].join('-');
             }
+            else {
+                console.warn('The controller name is already prefixed with the nest module name');
+            }
         }
         else {
+            console.warn('The controller name is not defined');
             controllerName = nestModule;
         }
     }
+    else {
+        console.log('The nest module name is the same as the controller name');
+    }
     if (controllerNameSuffix) {
         controllerName = (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-' + controllerNameSuffix);
     }