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

package/src/lib/nest/coerce-nest-controller.d.ts

@@ -1,10 +1,13 @@
 import { Rule } from '@angular-devkit/schematics';
-export interface CoerceNestControllerOptions {
-    project: string;
-    feature?: string;
-    shared?: boolean;
+import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
+import { TsMorphNestProjectTransformOptions } from '../ts-morph-transform';
+export interface CoerceNestControllerOptions extends TsMorphNestProjectTransformOptions {
     name: string;
-    module?: string;
     nestModule?: string;
+    controllerPrefix?: string;
+    coerceModule?: boolean;
+    tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration, options: CoerceNestControllerOptions) => void;
+    skipModuleImport?: boolean;
+    overwrite?: boolean;
 }
 export declare function CoerceNestController(options: CoerceNestControllerOptions): Rule;

package/src/lib/nest/coerce-nest-controller.js

@@ -2,33 +2,74 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceNestController = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
+const utilities_1 = require("@rxap/utilities");
+const coerce_class_1 = require("../coerce-class");
+const ts_morph_transform_1 = require("../ts-morph-transform");
+const coerce_decorator_1 = require("../ts-morph/coerce-decorator");
+const coerce_imports_1 = require("../ts-morph/coerce-imports");
+const add_nest_module_controller_1 = require("./add-nest-module-controller");
+const assert_nest_project_1 = require("./assert-nest-project");
 const coerce_nest_module_1 = require("./coerce-nest-module");
-const coerce_nest_service_project_1 = require("./coerce-nest-service-project");
-const has_nest_controller_1 = require("./has-nest-controller");
-const project_utilities_1 = require("./project-utilities");
 function CoerceNestController(options) {
-    let { name, module, nestModule, } = options;
-    nestModule !== null && nestModule !== void 0 ? nestModule : (nestModule = module);
-    if (!nestModule) {
-        throw new schematics_1.SchematicsException('The property "nestModule" option is required for the CoerceNestController rule');
-    }
+    const { project, feature, shared, controllerPrefix, directory, coerceModule, skipModuleImport, overwrite, } = options;
+    let { name, tsMorphTransform, nestModule } = options;
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => { });
+    name = (0, utilities_1.dasherize)(name);
+    nestModule !== null && nestModule !== void 0 ? nestModule : (nestModule = name);
     return (0, schematics_1.chain)([
-        (0, coerce_nest_service_project_1.CoerceNestServiceProject)(options),
-        (0, coerce_nest_module_1.CoerceNestModule)(Object.assign(Object.assign({}, options), { name: nestModule })),
-        tree => {
-            if (!(0, has_nest_controller_1.HasNestController)(tree, options)) {
-                console.log(`The project ${(0, project_utilities_1.buildNestProjectName)(options)} has not the controller '${name}'. The controller will now be created ...`);
-                return (0, schematics_1.externalSchematic)('@nrwl/nest', 'controller', {
-                    name,
-                    project: (0, project_utilities_1.buildNestProjectName)(options),
-                    unitTestRunner: 'none',
-                    flat: true,
-                    directory: module,
-                    module,
+        (0, assert_nest_project_1.AssertNestProject)({ project, feature, shared }),
+        coerceModule ? (0, coerce_nest_module_1.CoerceNestModule)({
+            project,
+            feature,
+            shared,
+            name: nestModule,
+            directory,
+        }) : (0, schematics_1.noop)(),
+        (0, ts_morph_transform_1.TsMorphNestProjectTransformRule)({
+            project,
+            feature,
+            shared,
+            directory,
+        }, (project, [controllerSourceFile, moduleSourceFile]) => {
+            const controllerDecoratorArguments = controllerPrefix ?
+                [w => w.quote(controllerPrefix)] :
+                [];
+            const classDeclaration = (0, coerce_class_1.CoerceClass)(controllerSourceFile, (0, utilities_1.classify)(name) + 'Controller', {
+                isExported: true,
+                decorators: [
+                    {
+                        name: 'Controller',
+                        arguments: controllerDecoratorArguments,
+                    },
+                ],
+            });
+            if (overwrite) {
+                (0, coerce_decorator_1.CoerceDecorator)(classDeclaration, 'Controller').set({
+                    arguments: controllerDecoratorArguments,
                 });
             }
-            return (0, schematics_1.noop)();
-        },
+            (0, coerce_imports_1.CoerceImports)(controllerSourceFile, [
+                {
+                    namedImports: ['Controller'],
+                    moduleSpecifier: '@nestjs/common',
+                },
+            ]);
+            if (!skipModuleImport) {
+                if (moduleSourceFile.getClass((0, utilities_1.classify)(nestModule) + 'Module')) {
+                    (0, add_nest_module_controller_1.AddNestModuleController)(moduleSourceFile, (0, utilities_1.classify)(name) + 'Controller', [
+                        {
+                            namedImports: [(0, utilities_1.classify)(name) + 'Controller'],
+                            moduleSpecifier: './' + (0, utilities_1.dasherize)(name) + '.controller',
+                        },
+                    ]);
+                }
+            }
+            tsMorphTransform(project, controllerSourceFile, classDeclaration, options);
+        }, [
+            `${(0, utilities_1.dasherize)(name)}.controller.ts?`,
+            `${(0, utilities_1.dasherize)(nestModule)}.module.ts?`,
+        ]),
     ]);
 }
 exports.CoerceNestController = CoerceNestController;

package/src/lib/nest/coerce-nest-controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-nest-controller.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-nest-controller.ts"],"names":[],"mappings":";;;AAAA,2DAMoC;AACpC,6DAAwD;AACxD,+EAAyE;AACzE,+DAA0D;AAC1D,2DAA2D;AAY3D,SAAgB,oBAAoB,CAAC,OAAoC;IACvE,IAAI,EACF,IAAI,EACJ,MAAM,EACN,UAAU,GACX,GAAG,OAAO,CAAC;IACZ,UAAU,aAAV,UAAU,cAAV,UAAU,IAAV,UAAU,GAAK,MAAM,EAAC;IACtB,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,gCAAmB,CAAC,gFAAgF,CAAC,CAAC;KACjH;IACD,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,sDAAwB,EAAC,OAAO,CAAC;QACjC,IAAA,qCAAgB,kCACX,OAAO,KACV,IAAI,EAAE,UAAU,IAChB;QACF,IAAI,CAAC,EAAE;YACL,IAAI,CAAC,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE;gBACrC,OAAO,CAAC,GAAG,CAAC,eAAgB,IAAA,wCAAoB,EAAC,OAAO,CAAE,4BAA6B,IAAK,2CAA2C,CAAC,CAAC;gBACzI,OAAO,IAAA,8BAAiB,EACtB,YAAY,EACZ,YAAY,EACZ;oBACE,IAAI;oBACJ,OAAO,EAAE,IAAA,wCAAoB,EAAC,OAAO,CAAC;oBACtC,cAAc,EAAE,MAAM;oBACtB,IAAI,EAAE,IAAI;oBACV,SAAS,EAAE,MAAM;oBACjB,MAAM;iBACP,CACF,CAAC;aACH;YACD,OAAO,IAAA,iBAAI,GAAE,CAAC;QAChB,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAnCD,oDAmCC"}
+{"version":3,"file":"coerce-nest-controller.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-nest-controller.ts"],"names":[],"mappings":"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"}

package/src/lib/nest/coerce-nest-module.d.ts

@@ -1,8 +1,8 @@
 import { Rule } from '@angular-devkit/schematics';
-export interface CoerceNestModuleOptions {
-    project: string;
-    feature?: string;
-    shared?: boolean;
+import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
+import { TsMorphNestProjectTransformOptions } from '../ts-morph-transform';
+export interface CoerceNestModuleOptions extends TsMorphNestProjectTransformOptions {
     name: string;
+    tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration) => void;
 }
 export declare function CoerceNestModule(options: CoerceNestModuleOptions): Rule;

package/src/lib/nest/coerce-nest-module.js

@@ -2,27 +2,53 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceNestModule = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
-const coerce_nest_service_project_1 = require("./coerce-nest-service-project");
-const has_nest_module_1 = require("./has-nest-module");
+const utilities_1 = require("@rxap/utilities");
+const coerce_class_1 = require("../coerce-class");
+const ts_morph_transform_1 = require("../ts-morph-transform");
+const coerce_imports_1 = require("../ts-morph/coerce-imports");
 const add_nest_module_to_app_module_1 = require("./add-nest-module-to-app-module");
-const project_utilities_1 = require("./project-utilities");
+const assert_nest_project_1 = require("./assert-nest-project");
 function CoerceNestModule(options) {
-    const { name } = options;
+    const { name, project, feature, shared, directory, } = options;
+    let { tsMorphTransform } = options;
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => { });
     return (0, schematics_1.chain)([
-        (0, coerce_nest_service_project_1.CoerceNestServiceProject)(options),
-        tree => {
-            if (!(0, has_nest_module_1.HasNestModule)(tree, options)) {
-                console.log(`The project '${(0, project_utilities_1.buildNestProjectName)(options)}' has not the module '${name}'. The module will now be created ...`);
-                return (0, schematics_1.chain)([
-                    (0, schematics_1.externalSchematic)('@nrwl/nest', 'module', {
-                        name,
-                        project: (0, project_utilities_1.buildNestProjectName)(options),
-                    }),
-                    (0, add_nest_module_to_app_module_1.AddNestModuleToAppModule)(options),
-                ]);
-            }
-            return (0, schematics_1.noop)();
-        },
+        (0, assert_nest_project_1.AssertNestProject)({
+            project,
+            feature,
+            shared,
+        }),
+        (0, ts_morph_transform_1.TsMorphNestProjectTransformRule)({
+            project,
+            feature,
+            shared,
+            directory,
+        }, (project, [sourceFile]) => {
+            const classDeclaration = (0, coerce_class_1.CoerceClass)(sourceFile, (0, utilities_1.classify)(name) + 'Module', {
+                isExported: true,
+                decorators: [
+                    {
+                        name: 'Module',
+                        arguments: ['{}'],
+                    },
+                ],
+            });
+            (0, coerce_imports_1.CoerceImports)(sourceFile, [
+                {
+                    namedImports: ['Module'],
+                    moduleSpecifier: '@nestjs/common',
+                },
+            ]);
+            tsMorphTransform(project, sourceFile, classDeclaration);
+        }, [`${(0, utilities_1.dasherize)(name)}.module.ts?`]),
+        name !== 'app' ? (0, add_nest_module_to_app_module_1.AddNestModuleToAppModule)({
+            project,
+            feature,
+            shared,
+            name,
+            directory,
+        }) : (0, schematics_1.noop)(),
     ]);
 }
 exports.CoerceNestModule = CoerceNestModule;

package/src/lib/nest/coerce-nest-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-nest-module.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-nest-module.ts"],"names":[],"mappings":";;;AAAA,2DAKoC;AACpC,+EAAyE;AACzE,uDAAkD;AAClD,mFAA2E;AAC3E,2DAA2D;AAS3D,SAAgB,gBAAgB,CAAC,OAAgC;IAC/D,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACzB,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,sDAAwB,EAAC,OAAO,CAAC;QACjC,IAAI,CAAC,EAAE;YACL,IAAI,CAAC,IAAA,+BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE;gBACjC,OAAO,CAAC,GAAG,CAAC,gBAAiB,IAAA,wCAAoB,EAAC,OAAO,CAAE,yBAA0B,IAAK,uCAAuC,CAAC,CAAC;gBACnI,OAAO,IAAA,kBAAK,EAAC;oBACX,IAAA,8BAAiB,EACf,YAAY,EACZ,QAAQ,EACR;wBACE,IAAI;wBACJ,OAAO,EAAE,IAAA,wCAAoB,EAAC,OAAO,CAAC;qBACvC,CACF;oBACD,IAAA,wDAAwB,EAAC,OAAO,CAAC;iBAClC,CAAC,CAAC;aACJ;YACD,OAAO,IAAA,iBAAI,GAAE,CAAC;QAChB,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAtBD,4CAsBC"}
+{"version":3,"file":"coerce-nest-module.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-nest-module.ts"],"names":[],"mappings":";;;AAAA,2DAIoC;AACpC,+CAGyB;AAMzB,kDAA8C;AAC9C,8DAG+B;AAC/B,+DAA2D;AAC3D,mFAA2E;AAC3E,+DAA0D;AAO1D,SAAgB,gBAAgB,CAAC,OAAgC;IAC/D,MAAM,EACJ,IAAI,EACJ,OAAO,EACP,OAAO,EACP,MAAM,EACN,SAAS,GACV,GAAG,OAAO,CAAC;IACZ,IAAI,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;IACnC,gEAAgE;IAChE,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE,GAAE,CAAC,EAAC;IAC9B,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,uCAAiB,EAAC;YAChB,OAAO;YACP,OAAO;YACP,MAAM;SACP,CAAC;QACF,IAAA,oDAA+B,EAC7B;YACE,OAAO;YACP,OAAO;YACP,MAAM;YACN,SAAS;SACV,EACD,CAAC,OAAO,EAAE,CAAE,UAAU,CAAE,EAAE,EAAE;YAC1B,MAAM,gBAAgB,GAAG,IAAA,0BAAW,EAAC,UAAU,EAAE,IAAA,oBAAQ,EAAC,IAAI,CAAC,GAAG,QAAQ,EAAE;gBAC1E,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,QAAQ;wBACd,SAAS,EAAE,CAAE,IAAI,CAAE;qBACpB;iBACF;aACF,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB;oBACE,YAAY,EAAE,CAAE,QAAQ,CAAE;oBAC1B,eAAe,EAAE,gBAAgB;iBAClC;aACF,CAAC,CAAC;YAEH,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAC3D,CAAC,EACD,CAAE,GAAI,IAAA,qBAAS,EAAC,IAAI,CAAE,aAAa,CAAE,CACtC;QACD,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,IAAA,wDAAwB,EAAC;YACxC,OAAO;YACP,OAAO;YACP,MAAM;YACN,IAAI;YACJ,SAAS;SACV,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE;KACZ,CAAC,CAAC;AACL,CAAC;AArDD,4CAqDC"}

package/src/lib/nest/coerce-nest-service-project.d.ts

@@ -1,7 +1,10 @@
 import { Rule } from '@angular-devkit/schematics';
 export interface CoerceNestServiceProjectOptions {
     project: string;
-    feature?: string;
+    feature?: string | null;
     shared?: boolean;
 }
+/**
+ * @deprecated removed use the AssertNestProject function Rule
+ */
 export declare function CoerceNestServiceProject(options: CoerceNestServiceProjectOptions): Rule;

package/src/lib/nest/coerce-nest-service-project.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceNestServiceProject = void 0;
-const schematics_1 = require("@angular-devkit/schematics");
 const project_utilities_1 = require("./project-utilities");
+const schematics_utilities_1 = require("@rxap/schematics-utilities");
+/**
+ * @deprecated removed use the AssertNestProject function Rule
+ */
 function CoerceNestServiceProject(options) {
     const { project, feature, shared, } = options;
     return tree => {
@@ -10,24 +13,24 @@ function CoerceNestServiceProject(options) {
             console.log(`The nest service project '${(0, project_utilities_1.buildNestProjectName)(options)}' does not exists. Project will now be created ...`);
             if (feature) {
                 if (shared) {
-                    return (0, schematics_1.schematic)('feature-microservice', {
+                    return (0, schematics_utilities_1.ExecuteSchematic)('feature-microservice', {
                         feature,
                     });
                 }
                 else {
-                    return (0, schematics_1.schematic)('frontend-microservice', {
+                    return (0, schematics_utilities_1.ExecuteSchematic)('frontend-microservice', {
                         frontend: project,
                         feature,
                     });
                 }
             }
             else {
-                return (0, schematics_1.schematic)('microservice', {
+                return (0, schematics_utilities_1.ExecuteSchematic)('microservice', {
                     project,
                 });
             }
         }
-        return (0, schematics_1.noop)();
+        return undefined;
     };
 }
 exports.CoerceNestServiceProject = CoerceNestServiceProject;

package/src/lib/nest/coerce-nest-service-project.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-nest-service-project.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-nest-service-project.ts"],"names":[],"mappings":";;;AAAA,2DAIoC;AACpC,2DAG6B;AAQ7B,SAAgB,wBAAwB,CAAC,OAAwC;IAC/E,MAAM,EACJ,OAAO,EACP,OAAO,EACP,MAAM,GACP,GAAG,OAAO,CAAC;IACZ,OAAO,IAAI,CAAC,EAAE;QACZ,IAAI,CAAC,IAAA,yCAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE;YACzC,OAAO,CAAC,GAAG,CAAC,6BAA8B,IAAA,wCAAoB,EAAC,OAAO,CAAE,oDAAoD,CAAC,CAAC;YAC9H,IAAI,OAAO,EAAE;gBACX,IAAI,MAAM,EAAE;oBACV,OAAO,IAAA,sBAAS,EACd,sBAAsB,EACtB;wBACE,OAAO;qBACR,CACF,CAAC;iBACH;qBAAM;oBACL,OAAO,IAAA,sBAAS,EACd,uBAAuB,EACvB;wBACE,QAAQ,EAAE,OAAO;wBACjB,OAAO;qBACR,CACF,CAAC;iBACH;aACF;iBAAM;gBACL,OAAO,IAAA,sBAAS,EACd,cAAc,EACd;oBACE,OAAO;iBACR,CACF,CAAC;aACH;SACF;QACD,OAAO,IAAA,iBAAI,GAAE,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AArCD,4DAqCC"}
+{"version":3,"file":"coerce-nest-service-project.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-nest-service-project.ts"],"names":[],"mappings":";;;AACA,2DAG6B;AAC7B,qEAA8D;AAQ9D;;GAEG;AACH,SAAgB,wBAAwB,CAAC,OAAwC;IAC/E,MAAM,EACJ,OAAO,EACP,OAAO,EACP,MAAM,GACP,GAAG,OAAO,CAAC;IACZ,OAAO,IAAI,CAAC,EAAE;QACZ,IAAI,CAAC,IAAA,yCAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE;YACzC,OAAO,CAAC,GAAG,CAAC,6BAA8B,IAAA,wCAAoB,EAAC,OAAO,CAAE,oDAAoD,CAAC,CAAC;YAC9H,IAAI,OAAO,EAAE;gBACX,IAAI,MAAM,EAAE;oBACV,OAAO,IAAA,uCAAgB,EACrB,sBAAsB,EACtB;wBACE,OAAO;qBACR,CACF,CAAC;iBACH;qBAAM;oBACL,OAAO,IAAA,uCAAgB,EACrB,uBAAuB,EACvB;wBACE,QAAQ,EAAE,OAAO;wBACjB,OAAO;qBACR,CACF,CAAC;iBACH;aACF;iBAAM;gBACL,OAAO,IAAA,uCAAgB,EACrB,cAAc,EACd;oBACE,OAAO;iBACR,CACF,CAAC;aACH;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;AACJ,CAAC;AArCD,4DAqCC"}

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

@@ -1,21 +1,11 @@
 import { Rule } from '@angular-devkit/schematics';
 import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
-import { OperationOptions, OperationParameter } from '../add-operation-to-controller';
-export interface CoerceOperationOptions {
-    /**
-     * @deprecated use controllerName instead
-     */
-    name?: string;
-    controllerName?: string;
-    nestController?: string;
-    project: string;
-    feature?: string;
+import { TsMorphNestProjectTransformOptions } from '../ts-morph-transform';
+import { OperationOptions, OperationParameter } from './add-operation-to-controller';
+export interface CoerceOperationOptions extends TsMorphNestProjectTransformOptions {
+    controllerName: string;
     shared?: boolean;
-    /**
-     * @deprecated use nestModule instead
-     */
-    module?: string;
-    nestModule?: string;
+    nestModule?: string | null;
     skipCoerce?: boolean;
     paramList?: OperationParameter[];
     queryList?: OperationParameter[];
@@ -23,5 +13,11 @@ export interface CoerceOperationOptions {
     operationName: string;
     path?: string;
     controllerPath?: string;
+    /**
+     * true - the control path is overwritten with
+     */
+    overwriteControllerPath?: boolean;
+    context?: string | null;
 }
+export declare function CoerceOperationParamList(paramList: OperationParameter[], classDeclaration: ClassDeclaration): void;
 export declare function CoerceOperation(options: CoerceOperationOptions): Rule;

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

@@ -1,20 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CoerceOperation = void 0;
+exports.CoerceOperation = exports.CoerceOperationParamList = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
-const coerce_nest_module_1 = require("./coerce-nest-module");
-const coerce_nest_controller_1 = require("./coerce-nest-controller");
-const ts_morph_transform_1 = require("../ts-morph-transform");
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
+const path_1 = require("path");
+const ts_morph_transform_1 = require("../ts-morph-transform");
+const add_operation_to_controller_1 = require("./add-operation-to-controller");
 const build_nest_controller_name_1 = require("./build-nest-controller-name");
-const coerce_imports_1 = require("../ts-morph/coerce-imports");
-const add_operation_to_controller_1 = require("../add-operation-to-controller");
+const coerce_nest_controller_1 = require("./coerce-nest-controller");
+function CoerceOperationParamList(paramList, classDeclaration) {
+    var _a, _b;
+    const currentControllerPath = (_b = (_a = classDeclaration.getDecoratorOrThrow('Controller').getArguments()[0]) === null || _a === void 0 ? void 0 : _a.getText()) !== null && _b !== void 0 ? _b : '';
+    const fragments = currentControllerPath.split('/');
+    const parameters = fragments.filter(fragment => fragment.startsWith(':'));
+    for (const parameter of parameters) {
+        if (!paramList.some(param => param.name === parameter.substr(1))) {
+            paramList.push({ name: parameter.substr(1) });
+        }
+    }
+}
+exports.CoerceOperationParamList = CoerceOperationParamList;
 function CoerceOperation(options) {
-    let { nestModule, nestController, controllerName, name, project, module, paramList, feature, shared, tsMorphTransform, operationName, skipCoerce, controllerPath, queryList, path, } = options;
-    nestModule !== null && nestModule !== void 0 ? nestModule : (nestModule = module);
+    let { nestModule, controllerName, project, paramList, feature, shared, tsMorphTransform, operationName, skipCoerce, controllerPath, queryList, path, overwriteControllerPath, directory, } = options;
     tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => ({}));
-    controllerName !== null && controllerName !== void 0 ? controllerName : (controllerName = name);
-    controllerName !== null && controllerName !== void 0 ? controllerName : (controllerName = nestController);
     paramList !== null && paramList !== void 0 ? paramList : (paramList = []);
     queryList !== null && queryList !== void 0 ? queryList : (queryList = []);
     /**
@@ -37,31 +45,37 @@ function CoerceOperation(options) {
      * module = "report-details"
      */
     const isFirstBornSibling = !nestModule || nestModule === controllerName;
-    controllerName = (0, build_nest_controller_name_1.BuildNestControllerName)({
+    const nestController = (0, build_nest_controller_name_1.BuildNestControllerName)({
         controllerName,
         nestModule,
     });
-    if (isFirstBornSibling) {
-        nestModule = controllerName;
-    }
-    console.log(`Coerce Operation '${operationName}' with path '${path}' in the controller '${controllerName}' in the module '${nestModule}'`);
-    if (!nestModule) {
-        throw new schematics_1.SchematicsException('FATAL: the nestModule property is not defined');
+    if (!nestModule || isFirstBornSibling) {
+        nestModule = nestController;
     }
+    directory = (0, path_1.join)(directory !== null && directory !== void 0 ? directory : '', nestModule);
     return (0, schematics_1.chain)([
-        skipCoerce ? (0, schematics_1.noop)() : (0, schematics_1.chain)([
-            (0, coerce_nest_module_1.CoerceNestModule)({
-                project,
-                feature,
-                shared,
-                name: nestModule,
-            }),
-            (0, coerce_nest_controller_1.CoerceNestController)(Object.assign(Object.assign({}, options), { name: controllerName, module: nestModule })),
-        ]),
-        (0, ts_morph_transform_1.TsMorphNestProjectTransform)(options, project => {
-            const sourceFile = project.getSourceFileOrThrow(`/${nestModule}/${controllerName}.controller.ts`);
-            const classDeclaration = sourceFile.getClassOrThrow(`${(0, schematics_utilities_1.classify)(controllerName)}Controller`);
-            const operationOptions = tsMorphTransform(project, sourceFile, classDeclaration, controllerName);
+        () => console.log(`Coerce Operation '${operationName}' with path '${path}' in the controller '${nestController}' in the module '${nestModule}'`),
+        (0, coerce_nest_controller_1.CoerceNestController)({
+            project,
+            feature,
+            shared,
+            directory,
+            coerceModule: !skipCoerce,
+            name: nestController,
+            nestModule,
+        }),
+        // IMPORTANT: the use of the filePath parameter for the narrow loading of the source file CAN NOT BE USED here
+        //            because sub functions may need to load other source files that are then not loaded into the
+        //            project instance!
+        (0, ts_morph_transform_1.TsMorphNestProjectTransformRule)({
+            project,
+            feature,
+            shared,
+            directory,
+        }, project => {
+            const sourceFile = project.getSourceFileOrThrow(`${nestController}.controller.ts`);
+            const classDeclaration = sourceFile.getClassOrThrow(`${(0, schematics_utilities_1.classify)(nestController)}Controller`);
+            const operationOptions = tsMorphTransform(project, sourceFile, classDeclaration, nestController);
             if (controllerPath) {
                 classDeclaration.getDecoratorOrThrow('Controller').set({
                     arguments: [w => w.quote(`${nestModule}/${controllerPath}`)],
@@ -77,9 +91,10 @@ function CoerceOperation(options) {
                     ],
                 });
             }
-            (0, coerce_imports_1.CoerceImports)(sourceFile, (0, add_operation_to_controller_1.AddOperationToController)(classDeclaration, operationName, Object.assign({ isAsync: true, paramList,
+            CoerceOperationParamList(paramList, classDeclaration);
+            (0, add_operation_to_controller_1.AddOperationToController)(sourceFile, classDeclaration, operationName, Object.assign({ isAsync: true, paramList,
                 queryList,
-                path }, operationOptions)));
+                path }, operationOptions));
         }),
     ]);
 }

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

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

package/src/lib/nest/coerce-options-operation.d.ts

@@ -0,0 +1,8 @@
+import { Rule } from '@angular-devkit/schematics';
+import { FormDefinitionControl } from '../types/form-definition-control';
+import { CoerceOperationOptions } from './coerce-operation';
+export interface CoerceOptionsOperationRuleOptions extends CoerceOperationOptions {
+    control: Required<FormDefinitionControl>;
+    responseDtoName?: string;
+}
+export declare function CoerceOptionsOperationRule(options: Readonly<CoerceOptionsOperationRuleOptions>): Rule;

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

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CoerceOptionsOperationRule = void 0;
+const utilities_1 = require("@rxap/utilities");
+const coerce_imports_1 = require("../ts-morph/coerce-imports");
+const write_type_1 = require("../ts-morph/write-type");
+const coerce_dto_class_1 = require("./coerce-dto-class");
+const coerce_operation_1 = require("./coerce-operation");
+function CoerceOptionsOperationRule(options) {
+    let { responseDtoName, control, context, } = options;
+    responseDtoName !== null && responseDtoName !== void 0 ? responseDtoName : (responseDtoName = (0, utilities_1.joinWithDash)([context, control.name, 'options']));
+    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
+            const { className, filePath, } = (0, coerce_dto_class_1.CoerceDtoClass)({
+                project,
+                name: responseDtoName,
+                propertyList: [
+                    {
+                        name: 'display',
+                        type: 'string',
+                    },
+                    {
+                        name: 'value',
+                        type: (0, write_type_1.WriteType)(control),
+                    },
+                ],
+            });
+            (0, coerce_imports_1.CoerceImports)(sourceFile, {
+                namedImports: [className],
+                moduleSpecifier: filePath,
+            });
+            (0, coerce_imports_1.CoerceImports)(sourceFile, {
+                namedImports: ['plainToInstance'],
+                moduleSpecifier: 'class-transformer',
+            });
+            (0, coerce_imports_1.CoerceImports)(sourceFile, {
+                namedImports: ['classTransformOptions'],
+                moduleSpecifier: '@rxap/nest-utilities',
+            });
+            return {
+                returnType: `Array<${className}>`,
+                statements: [
+                    'return plainToInstance(',
+                    className + ',',
+                    '[],',
+                    'classTransformOptions',
+                    ');',
+                ],
+            };
+        } }));
+}
+exports.CoerceOptionsOperationRule = CoerceOptionsOperationRule;
+//# sourceMappingURL=coerce-options-operation.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"coerce-options-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-options-operation.ts"],"names":[],"mappings":";;;AACA,+CAA+C;AAC/C,+DAA2D;AAC3D,uDAAmD;AAEnD,yDAAoD;AACpD,yDAG4B;AAO5B,SAAgB,0BAA0B,CAAC,OAAoD;IAC7F,IAAI,EACF,eAAe,EACf,OAAO,EACP,OAAO,GACR,GAAG,OAAO,CAAC;IACZ,eAAe,aAAf,eAAe,cAAf,eAAe,IAAf,eAAe,GAAK,IAAA,wBAAY,EAAC,CAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAE,CAAC,EAAC;IACvE,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,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,eAAgB;gBACtB,YAAY,EAAE;oBACZ;wBACE,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,QAAQ;qBACf;oBACD;wBACE,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,IAAA,sBAAS,EAAC,OAAO,CAAC;qBACzB;iBACF;aACF,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,SAAS,CAAE;gBAC3B,eAAe,EAAE,QAAQ;aAC1B,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,iBAAiB,CAAE;gBACnC,eAAe,EAAE,mBAAmB;aACrC,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,uBAAuB,CAAE;gBACzC,eAAe,EAAE,sBAAsB;aACxC,CAAC,CAAC;YAEH,OAAO;gBACL,UAAU,EAAE,SAAU,SAAU,GAAG;gBACnC,UAAU,EAAE;oBACV,yBAAyB;oBACzB,SAAS,GAAG,GAAG;oBACf,KAAK;oBACL,uBAAuB;oBACvB,IAAI;iBACL;aACF,CAAC;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AAtDD,gEAsDC"}

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

@@ -1,5 +1,5 @@
 import { ClassDeclarationStructure, ImportDeclarationStructure, OptionalKind, Project } from 'ts-morph';
-import { DtoClassProperty } from '../create-dto-class';
+import { DtoClassProperty } from './create-dto-class';
 export interface CoercePageDtoClassOptions {
     project: Project;
     name: string;

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

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoercePageDtoClass = void 0;
-const coerce_dto_class_1 = require("./coerce-dto-class");
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
 const path_1 = require("path");
+const coerce_dto_class_1 = require("./coerce-dto-class");
 function CoercePageDtoClass(options) {
     let { project, name, propertyList, classStructure, importStructureList, rowClassName, rowFilePath, } = options;
     importStructureList !== null && importStructureList !== void 0 ? importStructureList : (importStructureList = []);
     importStructureList.push({
         namedImports: ['PageDto'],
-        moduleSpecifier: '@eurogard/service-nest-utilities',
+        moduleSpecifier: '@rxap/nest-utilities',
     }, {
         namedImports: [rowClassName],
         moduleSpecifier: `./${(0, path_1.basename)(rowFilePath)}`,
@@ -25,7 +25,13 @@ function CoercePageDtoClass(options) {
         },
     ]);
     propertyList.push();
-    return (0, coerce_dto_class_1.CoerceDtoClass)(project, (0, schematics_utilities_1.CoerceSuffix)(name, '-page'), propertyList, classStructure, importStructureList);
+    return (0, coerce_dto_class_1.CoerceDtoClass)({
+        project,
+        name: (0, schematics_utilities_1.CoerceSuffix)(name, '-page'),
+        propertyList,
+        classStructure,
+        importStructureList,
+    });
 }
 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,yDAAoD;AACpD,qEAA0D;AAC1D,+BAAgC;AAmBhC,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,kCAAkC;KACpD,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,EACnB,OAAO,EACP,IAAA,mCAAY,EAAC,IAAI,EAAE,OAAO,CAAC,EAC3B,YAAY,EACZ,cAAc,EACd,mBAAmB,CACpB,CAAC;AACJ,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,+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,sBAAsB;KACxC,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"}

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

@@ -1,10 +1,9 @@
-import { ClassDeclarationStructure, ImportDeclarationStructure, OptionalKind, Project } from 'ts-morph';
-import { DtoClassProperty } from '../create-dto-class';
-export interface CoerceRowDtoClassOptions {
-    project: Project;
-    name: string;
-    propertyList?: DtoClassProperty[];
-    classStructure?: Omit<OptionalKind<ClassDeclarationStructure>, 'name'>;
-    importStructureList?: Array<OptionalKind<ImportDeclarationStructure>>;
+import { CoerceDtoClassOptions } from './coerce-dto-class';
+export interface CoerceRowDtoClassOptions extends CoerceDtoClassOptions {
+    /**
+     * the type of the property used as row id type. defaults to the type 'string'. If null the type will be
+     * set to number
+     */
+    rowIdType?: string | null;
 }
 export declare function CoerceRowDtoClass(options: CoerceRowDtoClassOptions): import("./coerce-dto-class").CoerceDtoClassOutput;