@tsed/cli-plugin-typeorm 3.19.5 → 3.20.1

package/lib/CliPluginTypeORMModule.js

@@ -4,13 +4,11 @@ exports.CliPluginTypeORMModule = void 0;
 const tslib_1 = require("tslib");
 const cli_core_1 = require("@tsed/cli-core");
 const di_1 = require("@tsed/di");
-const TypeORMCmd_1 = require("./commands/TypeORMCmd");
 const TypeORMGenerateHook_1 = require("./hooks/TypeORMGenerateHook");
 const TypeORMInitHook_1 = require("./hooks/TypeORMInitHook");
 let CliPluginTypeORMModule = class CliPluginTypeORMModule {
     install() {
         this.packageJson.addDependencies({
-            "@tsed/typeorm": this.packageJson.dependencies["@tsed/common"],
             typeorm: "latest"
         });
     }
@@ -27,7 +25,7 @@ tslib_1.__decorate([
 ], CliPluginTypeORMModule.prototype, "install", null);
 CliPluginTypeORMModule = tslib_1.__decorate([
     cli_core_1.Module({
-        imports: [TypeORMInitHook_1.TypeORMInitHook, TypeORMGenerateHook_1.TypeORMGenerateHook, TypeORMCmd_1.TypeORMCmd]
+        imports: [TypeORMInitHook_1.TypeORMInitHook, TypeORMGenerateHook_1.TypeORMGenerateHook]
     })
 ], CliPluginTypeORMModule);
 exports.CliPluginTypeORMModule = CliPluginTypeORMModule;

package/lib/CliPluginTypeORMModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"CliPluginTypeORMModule.js","sourceRoot":"","sources":["../src/CliPluginTypeORMModule.ts"],"names":[],"mappings":";;;;AAAA,6CAAiE;AACjE,iCAAgC;AAChC,sDAAiD;AACjD,qEAAgE;AAChE,6DAAwD;AAKxD,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAKjC,OAAO;QACL,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC;YAC/B,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,cAAc,CAAC;YAC9D,OAAO,EAAE,QAAQ;SAClB,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AATC;IADC,WAAM,EAAE;sCACI,6BAAkB;2DAAC;AAGhC;IADC,gBAAK,CAAC,0BAA0B,CAAC;;;;qDAMjC;AAVU,sBAAsB;IAHlC,iBAAM,CAAC;QACN,OAAO,EAAE,CAAC,iCAAe,EAAE,yCAAmB,EAAE,uBAAU,CAAC;KAC5D,CAAC;GACW,sBAAsB,CAWlC;AAXY,wDAAsB","sourcesContent":["import {Module, OnAdd, ProjectPackageJson} from \"@tsed/cli-core\";\nimport {Inject} from \"@tsed/di\";\nimport {TypeORMCmd} from \"./commands/TypeORMCmd\";\nimport {TypeORMGenerateHook} from \"./hooks/TypeORMGenerateHook\";\nimport {TypeORMInitHook} from \"./hooks/TypeORMInitHook\";\n\n@Module({\n  imports: [TypeORMInitHook, TypeORMGenerateHook, TypeORMCmd]\n})\nexport class CliPluginTypeORMModule {\n  @Inject()\n  packageJson: ProjectPackageJson;\n\n  @OnAdd(\"@tsed/cli-plugin-typeorm\")\n  install() {\n    this.packageJson.addDependencies({\n      \"@tsed/typeorm\": this.packageJson.dependencies[\"@tsed/common\"],\n      typeorm: \"latest\"\n    });\n  }\n}\n"]}
+{"version":3,"file":"CliPluginTypeORMModule.js","sourceRoot":"","sources":["../src/CliPluginTypeORMModule.ts"],"names":[],"mappings":";;;;AAAA,6CAAiE;AACjE,iCAAgC;AAChC,qEAAgE;AAChE,6DAAwD;AAKxD,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAKjC,OAAO;QACL,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC;YAC/B,OAAO,EAAE,QAAQ;SAClB,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AARC;IADC,WAAM,EAAE;sCACI,6BAAkB;2DAAC;AAGhC;IADC,gBAAK,CAAC,0BAA0B,CAAC;;;;qDAKjC;AATU,sBAAsB;IAHlC,iBAAM,CAAC;QACN,OAAO,EAAE,CAAC,iCAAe,EAAE,yCAAmB,CAAC;KAChD,CAAC;GACW,sBAAsB,CAUlC;AAVY,wDAAsB","sourcesContent":["import {Module, OnAdd, ProjectPackageJson} from \"@tsed/cli-core\";\nimport {Inject} from \"@tsed/di\";\nimport {TypeORMGenerateHook} from \"./hooks/TypeORMGenerateHook\";\nimport {TypeORMInitHook} from \"./hooks/TypeORMInitHook\";\n\n@Module({\n  imports: [TypeORMInitHook, TypeORMGenerateHook]\n})\nexport class CliPluginTypeORMModule {\n  @Inject()\n  packageJson: ProjectPackageJson;\n\n  @OnAdd(\"@tsed/cli-plugin-typeorm\")\n  install() {\n    this.packageJson.addDependencies({\n      typeorm: \"latest\"\n    });\n  }\n}\n"]}

package/lib/hooks/TypeORMGenerateHook.d.ts

@@ -1,16 +1,13 @@
 import { GenerateCmdContext, ProvidersInfoService } from "@tsed/cli";
 import { CliDockerComposeYaml, ProjectPackageJson, SrcRendererService, Tasks } from "@tsed/cli-core";
-import { CliTypeORM } from "../services/CliTypeORM";
 export interface TypeORMGenerateOptions extends GenerateCmdContext {
-    typeormConnection: string;
-    connectionName: string;
+    typeormDataSource: string;
+    datasourceName: string;
 }
 export declare class TypeORMGenerateHook {
     private providersInfoService;
-    projectPackageJson: ProjectPackageJson;
-    srcRenderService: SrcRendererService;
-    cliTypeORM: CliTypeORM;
-    packages: any[];
+    protected projectPackageJson: ProjectPackageJson;
+    protected srcRenderService: SrcRendererService;
     protected cliDockerComposeYaml: CliDockerComposeYaml;
     constructor(providersInfoService: ProvidersInfoService);
     onGeneratePrompt(): Promise<{
@@ -24,5 +21,8 @@ export declare class TypeORMGenerateHook {
         }[]>;
     }[]>;
     onGenerateExec(ctx: TypeORMGenerateOptions): Tasks;
-    private mapOptions;
+    generateDataSourceTasks(ctx: TypeORMGenerateOptions): {
+        title: string;
+        task: () => Promise<void>;
+    }[];
 }

package/lib/hooks/TypeORMGenerateHook.js

@@ -6,15 +6,14 @@ const tslib_1 = require("tslib");
 const cli_1 = require("@tsed/cli");
 const cli_core_1 = require("@tsed/cli-core");
 const di_1 = require("@tsed/di");
-const change_case_1 = require("change-case");
-const CliTypeORM_1 = require("../services/CliTypeORM");
+const templateDir_1 = require("../utils/templateDir");
 let TypeORMGenerateHook = TypeORMGenerateHook_1 = class TypeORMGenerateHook {
     constructor(providersInfoService) {
         this.providersInfoService = providersInfoService;
         providersInfoService.add({
-            name: "TypeORM Connection",
-            value: "typeorm:connection",
-            model: "{{symbolName}}.connection"
+            name: "TypeORM Datasource",
+            value: "typeorm:datasource",
+            model: "{{symbolName}}.datasource"
         }, TypeORMGenerateHook_1);
     }
     async onGeneratePrompt() {
@@ -27,10 +26,10 @@ let TypeORMGenerateHook = TypeORMGenerateHook_1 = class TypeORMGenerateHook {
         return [
             {
                 type: "autocomplete",
-                name: "typeormConnection",
-                message: "Which passport package ?",
+                name: "typeormDataSource",
+                message: "Which database type?",
                 when(state) {
-                    return ["typeorm:connection"].includes(state.type);
+                    return state.type === "typeorm:datasource";
                 },
                 source: async (state, keyword) => {
                     if (keyword) {
@@ -42,37 +41,39 @@ let TypeORMGenerateHook = TypeORMGenerateHook_1 = class TypeORMGenerateHook {
         ];
     }
     onGenerateExec(ctx) {
-        var _a;
         if (this.providersInfoService.isMyProvider(ctx.type, TypeORMGenerateHook_1)) {
-            ctx = this.mapOptions(ctx);
-            const { typeormConnection, symbolPath } = ctx;
-            const connection = cli_1.FEATURES_TYPEORM_CONNECTION_TYPES.find((item) => item.value.type === typeormConnection);
-            if ((_a = connection === null || connection === void 0 ? void 0 : connection.value) === null || _a === void 0 ? void 0 : _a.dependencies) {
-                this.projectPackageJson.addDependencies((connection === null || connection === void 0 ? void 0 : connection.value.dependencies) || {});
-            }
-            const database = ctx.typeormConnection.split(":")[1];
-            return [
-                {
-                    title: `Generate TypeORM connection file to '${symbolPath}.ts'`,
-                    task: () => this.cliTypeORM.generateConnection(ctx.name, ctx)
-                },
-                {
-                    title: `Generate TypeORM configuration file to '${ctx.connectionName}.config.json'`,
-                    task: () => this.cliTypeORM.writeConfig(ctx.connectionName, database)
-                },
-                {
-                    title: "Generate docker-compose configuration",
-                    task: async () => this.cliDockerComposeYaml.addDatabaseService(ctx.name, database)
-                }
-            ];
+            return this.generateDataSourceTasks(ctx);
         }
         return [];
     }
-    mapOptions(options) {
-        return {
-            ...options,
-            connectionName: change_case_1.paramCase(options.name).replace("-connection", "")
-        };
+    generateDataSourceTasks(ctx) {
+        var _a;
+        const { typeormDataSource, symbolPath, name } = ctx;
+        const connection = cli_1.FEATURES_TYPEORM_CONNECTION_TYPES.find((item) => item.value.type === typeormDataSource);
+        if ((_a = connection === null || connection === void 0 ? void 0 : connection.value) === null || _a === void 0 ? void 0 : _a.dependencies) {
+            this.projectPackageJson.addDependencies((connection === null || connection === void 0 ? void 0 : connection.value.dependencies) || {});
+        }
+        const database = typeormDataSource.split(":").at(-1);
+        return [
+            {
+                title: `Generate TypeORM connection file to '${symbolPath}.ts'`,
+                task: () => {
+                    return this.srcRenderService.render("datasource.hbs", {
+                        name,
+                        database,
+                        symbolName: ctx.symbolName.replace("Datasource", "DataSource")
+                    }, {
+                        templateDir: templateDir_1.TEMPLATE_DIR,
+                        output: `${ctx.symbolPath}.ts`,
+                        rootDir: this.srcRenderService.rootDir
+                    });
+                }
+            },
+            {
+                title: "Generate docker-compose configuration",
+                task: async () => this.cliDockerComposeYaml.addDatabaseService(name, database)
+            }
+        ];
     }
 };
 tslib_1.__decorate([
@@ -83,10 +84,6 @@ tslib_1.__decorate([
     cli_core_1.Inject(),
     tslib_1.__metadata("design:type", cli_core_1.SrcRendererService)
 ], TypeORMGenerateHook.prototype, "srcRenderService", void 0);
-tslib_1.__decorate([
-    cli_core_1.Inject(),
-    tslib_1.__metadata("design:type", CliTypeORM_1.CliTypeORM)
-], TypeORMGenerateHook.prototype, "cliTypeORM", void 0);
 tslib_1.__decorate([
     cli_core_1.Inject(),
     tslib_1.__metadata("design:type", cli_core_1.CliDockerComposeYaml)

package/lib/hooks/TypeORMGenerateHook.js.map

@@ -1 +1 @@
-{"version":3,"file":"TypeORMGenerateHook.js","sourceRoot":"","sources":["../../src/hooks/TypeORMGenerateHook.ts"],"names":[],"mappings":"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","sourcesContent":["import {FEATURES_TYPEORM_CONNECTION_TYPES, GenerateCmdContext, ProvidersInfoService} from \"@tsed/cli\";\nimport {CliDockerComposeYaml, Inject, OnExec, OnPrompt, ProjectPackageJson, SrcRendererService, Tasks} from \"@tsed/cli-core\";\nimport {Injectable} from \"@tsed/di\";\nimport {paramCase} from \"change-case\";\nimport {CliTypeORM} from \"../services/CliTypeORM\";\n\nexport interface TypeORMGenerateOptions extends GenerateCmdContext {\n  typeormConnection: string;\n  connectionName: string;\n}\n\n@Injectable()\nexport class TypeORMGenerateHook {\n  @Inject()\n  projectPackageJson: ProjectPackageJson;\n\n  @Inject()\n  srcRenderService: SrcRendererService;\n\n  @Inject()\n  cliTypeORM: CliTypeORM;\n\n  packages: any[];\n\n  @Inject()\n  protected cliDockerComposeYaml: CliDockerComposeYaml;\n\n  constructor(private providersInfoService: ProvidersInfoService) {\n    providersInfoService.add(\n      {\n        name: \"TypeORM Connection\",\n        value: \"typeorm:connection\",\n        model: \"{{symbolName}}.connection\"\n      },\n      TypeORMGenerateHook\n    );\n  }\n\n  @OnPrompt(\"generate\")\n  async onGeneratePrompt() {\n    const list = FEATURES_TYPEORM_CONNECTION_TYPES.map((item) => {\n      return {\n        name: item.name,\n        value: item.value.type\n      };\n    });\n\n    return [\n      {\n        type: \"autocomplete\",\n        name: \"typeormConnection\",\n        message: \"Which passport package ?\",\n        when(state: any) {\n          return [\"typeorm:connection\"].includes(state.type);\n        },\n        source: async (state: any, keyword: string) => {\n          if (keyword) {\n            return list.filter((item) => item.name.toLowerCase().includes(keyword.toLowerCase()));\n          }\n\n          return list;\n        }\n      }\n    ];\n  }\n\n  @OnExec(\"generate\")\n  onGenerateExec(ctx: TypeORMGenerateOptions): Tasks {\n    if (this.providersInfoService.isMyProvider(ctx.type, TypeORMGenerateHook)) {\n      ctx = this.mapOptions(ctx);\n      const {typeormConnection, symbolPath} = ctx;\n      const connection = FEATURES_TYPEORM_CONNECTION_TYPES.find((item) => item.value.type === typeormConnection);\n\n      if (connection?.value?.dependencies) {\n        this.projectPackageJson.addDependencies(connection?.value.dependencies || {});\n      }\n\n      const database = ctx.typeormConnection.split(\":\")[1];\n\n      return [\n        {\n          title: `Generate TypeORM connection file to '${symbolPath}.ts'`,\n          task: () => this.cliTypeORM.generateConnection(ctx.name, ctx)\n        },\n        {\n          title: `Generate TypeORM configuration file to '${ctx.connectionName}.config.json'`,\n          task: () => this.cliTypeORM.writeConfig(ctx.connectionName, database)\n        },\n        {\n          title: \"Generate docker-compose configuration\",\n          task: async () => this.cliDockerComposeYaml.addDatabaseService(ctx.name, database)\n        }\n      ];\n    }\n\n    return [];\n  }\n\n  private mapOptions(options: TypeORMGenerateOptions) {\n    return {\n      ...options,\n      connectionName: paramCase(options.name).replace(\"-connection\", \"\")\n    };\n  }\n}\n"]}
+{"version":3,"file":"TypeORMGenerateHook.js","sourceRoot":"","sources":["../../src/hooks/TypeORMGenerateHook.ts"],"names":[],"mappings":"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","sourcesContent":["import {FEATURES_TYPEORM_CONNECTION_TYPES, GenerateCmdContext, ProvidersInfoService} from \"@tsed/cli\";\nimport {CliDockerComposeYaml, Inject, OnExec, OnPrompt, ProjectPackageJson, SrcRendererService, Tasks} from \"@tsed/cli-core\";\nimport {Injectable} from \"@tsed/di\";\nimport {TEMPLATE_DIR} from \"../utils/templateDir\";\n\nexport interface TypeORMGenerateOptions extends GenerateCmdContext {\n  typeormDataSource: string;\n  datasourceName: string;\n}\n\n@Injectable()\nexport class TypeORMGenerateHook {\n  @Inject()\n  protected projectPackageJson: ProjectPackageJson;\n\n  @Inject()\n  protected srcRenderService: SrcRendererService;\n\n  @Inject()\n  protected cliDockerComposeYaml: CliDockerComposeYaml;\n\n  constructor(private providersInfoService: ProvidersInfoService) {\n    providersInfoService.add(\n      {\n        name: \"TypeORM Datasource\",\n        value: \"typeorm:datasource\",\n        model: \"{{symbolName}}.datasource\"\n      },\n      TypeORMGenerateHook\n    );\n  }\n\n  @OnPrompt(\"generate\")\n  async onGeneratePrompt() {\n    const list = FEATURES_TYPEORM_CONNECTION_TYPES.map((item) => {\n      return {\n        name: item.name,\n        value: item.value.type\n      };\n    });\n\n    return [\n      {\n        type: \"autocomplete\",\n        name: \"typeormDataSource\",\n        message: \"Which database type?\",\n        when(state: any) {\n          return state.type === \"typeorm:datasource\";\n        },\n        source: async (state: any, keyword: string) => {\n          if (keyword) {\n            return list.filter((item) => item.name.toLowerCase().includes(keyword.toLowerCase()));\n          }\n\n          return list;\n        }\n      }\n    ];\n  }\n\n  @OnExec(\"generate\")\n  onGenerateExec(ctx: TypeORMGenerateOptions): Tasks {\n    if (this.providersInfoService.isMyProvider(ctx.type, TypeORMGenerateHook)) {\n      return this.generateDataSourceTasks(ctx);\n    }\n\n    return [];\n  }\n\n  generateDataSourceTasks(ctx: TypeORMGenerateOptions) {\n    const {typeormDataSource, symbolPath, name} = ctx;\n    const connection = FEATURES_TYPEORM_CONNECTION_TYPES.find((item) => item.value.type === typeormDataSource);\n\n    if (connection?.value?.dependencies) {\n      this.projectPackageJson.addDependencies(connection?.value.dependencies || {});\n    }\n\n    const database = typeormDataSource.split(\":\").at(-1)!;\n\n    return [\n      {\n        title: `Generate TypeORM connection file to '${symbolPath}.ts'`,\n        task: () => {\n          return this.srcRenderService.render(\n            \"datasource.hbs\",\n            {\n              name,\n              database,\n              symbolName: ctx.symbolName.replace(\"Datasource\", \"DataSource\")\n            },\n            {\n              templateDir: TEMPLATE_DIR,\n              output: `${ctx.symbolPath}.ts`,\n              rootDir: this.srcRenderService.rootDir\n            }\n          );\n        }\n      },\n      {\n        title: \"Generate docker-compose configuration\",\n        task: async () => this.cliDockerComposeYaml.addDatabaseService(name, database)\n      }\n    ];\n  }\n}\n"]}

package/lib/hooks/TypeORMInitHook.d.ts

@@ -1,16 +1,12 @@
 import { InitCmdContext } from "@tsed/cli";
-import { CliDockerComposeYaml, ProjectPackageJson, RootRendererService, SrcRendererService } from "@tsed/cli-core";
-import { CliTypeORM } from "../services/CliTypeORM";
+import { CliDockerComposeYaml, CliService, ProjectPackageJson, RootRendererService, SrcRendererService } from "@tsed/cli-core";
 export declare class TypeORMInitHook {
-    cliTypeORM: CliTypeORM;
+    protected cliService: CliService;
     protected packageJson: ProjectPackageJson;
     protected rootRenderer: RootRendererService;
     protected srcRenderer: SrcRendererService;
     protected cliDockerComposeYaml: CliDockerComposeYaml;
-    onExec(ctx: InitCmdContext): {
-        title: string;
-        task: () => Promise<void>;
-    }[];
+    onExec(ctx: InitCmdContext): Promise<any[]> | never[];
     addScripts(): void;
     addDependencies(ctx: InitCmdContext): void;
     addDevDependencies(ctx: InitCmdContext): void;

package/lib/hooks/TypeORMInitHook.js

@@ -4,7 +4,7 @@ exports.TypeORMInitHook = void 0;
 const tslib_1 = require("tslib");
 const cli_core_1 = require("@tsed/cli-core");
 const di_1 = require("@tsed/di");
-const CliTypeORM_1 = require("../services/CliTypeORM");
+const change_case_1 = require("change-case");
 function getDatabase(ctx) {
     var _a;
     return ((_a = ctx.features.find(({ type }) => type.includes("typeorm:"))) === null || _a === void 0 ? void 0 : _a.type.split(":")[1]) || "";
@@ -18,27 +18,15 @@ let TypeORMInitHook = class TypeORMInitHook {
         if (!database) {
             return [];
         }
-        return [
-            {
-                title: `Generate TypeORM connection file`,
-                task: async () => this.cliTypeORM.generateConnection("default", {
-                    symbolPath: "DefaultConnection",
-                    symbolName: "DefaultConnection"
-                })
-            },
-            {
-                title: "Generate TypeORM configuration",
-                task: async () => this.cliTypeORM.writeConfig("default", database)
-            },
-            {
-                title: "Generate docker-compose configuration",
-                task: async () => this.cliDockerComposeYaml.addDatabaseService(database, database)
-            }
-        ];
+        return this.cliService.getTasks("generate", {
+            ...ctx,
+            type: "typeorm:dataSource",
+            name: change_case_1.pascalCase(database)
+        });
     }
     addScripts() {
         this.packageJson.addScripts({
-            typeorm: "tsed typeorm"
+            typeorm: "typeorm-ts-node-commonjs"
         });
     }
     addDependencies(ctx) {
@@ -50,8 +38,8 @@ let TypeORMInitHook = class TypeORMInitHook {
 };
 tslib_1.__decorate([
     cli_core_1.Inject(),
-    tslib_1.__metadata("design:type", CliTypeORM_1.CliTypeORM)
-], TypeORMInitHook.prototype, "cliTypeORM", void 0);
+    tslib_1.__metadata("design:type", cli_core_1.CliService)
+], TypeORMInitHook.prototype, "cliService", void 0);
 tslib_1.__decorate([
     cli_core_1.Inject(),
     tslib_1.__metadata("design:type", cli_core_1.ProjectPackageJson)

package/lib/hooks/TypeORMInitHook.js.map

@@ -1 +1 @@
-{"version":3,"file":"TypeORMInitHook.js","sourceRoot":"","sources":["../../src/hooks/TypeORMInitHook.ts"],"names":[],"mappings":";;;;AACA,6CAAiI;AACjI,iCAAoC;AACpC,uDAAkD;AAElD,SAAS,WAAW,CAAC,GAAmB;;IACtC,OAAO,CAAA,MAAA,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,0CAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,KAAI,EAAE,CAAC;AAC5F,CAAC;AAGD,IAAa,eAAe,GAA5B,MAAa,eAAe;IAiB1B,MAAM,CAAC,GAAmB;QACxB,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAE7B,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;QAElC,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,EAAE,CAAC;SACX;QAED,OAAO;YACL;gBACE,KAAK,EAAE,kCAAkC;gBACzC,IAAI,EAAE,KAAK,IAAI,EAAE,CACf,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,SAAS,EAAE;oBAC5C,UAAU,EAAE,mBAAmB;oBAC/B,UAAU,EAAE,mBAAmB;iBAChC,CAAC;aACL;YACD;gBACE,KAAK,EAAE,gCAAgC;gBACvC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,SAAS,EAAE,QAAQ,CAAC;aACnE;YACD;gBACE,KAAK,EAAE,uCAAuC;gBAC9C,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,CAAC;aACnF;SACF,CAAC;IACJ,CAAC;IAED,UAAU;QACR,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC;YAC1B,OAAO,EAAE,cAAc;SACxB,CAAC,CAAC;IACL,CAAC;IAED,eAAe,CAAC,GAAmB;QACjC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC5C,CAAC;IAED,kBAAkB,CAAC,GAAmB;QACpC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC/C,CAAC;CACF,CAAA;AA3DC;IADC,iBAAM,EAAE;sCACG,uBAAU;mDAAC;AAGvB;IADC,iBAAM,EAAE;sCACc,6BAAkB;oDAAC;AAG1C;IADC,iBAAM,EAAE;sCACe,8BAAmB;qDAAC;AAG5C;IADC,iBAAM,EAAE;sCACc,6BAAkB;oDAAC;AAG1C;IADC,iBAAM,EAAE;sCACuB,+BAAoB;6DAAC;AAGrD;IADC,iBAAM,CAAC,MAAM,CAAC;;;;6CA8Bd;AA9CU,eAAe;IAD3B,eAAU,EAAE;GACA,eAAe,CA6D3B;AA7DY,0CAAe","sourcesContent":["import {InitCmdContext} from \"@tsed/cli\";\nimport {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from \"@tsed/cli-core\";\nimport {Injectable} from \"@tsed/di\";\nimport {CliTypeORM} from \"../services/CliTypeORM\";\n\nfunction getDatabase(ctx: InitCmdContext) {\n  return ctx.features.find(({type}) => type.includes(\"typeorm:\"))?.type.split(\":\")[1] || \"\";\n}\n\n@Injectable()\nexport class TypeORMInitHook {\n  @Inject()\n  cliTypeORM: CliTypeORM;\n\n  @Inject()\n  protected packageJson: ProjectPackageJson;\n\n  @Inject()\n  protected rootRenderer: RootRendererService;\n\n  @Inject()\n  protected srcRenderer: SrcRendererService;\n\n  @Inject()\n  protected cliDockerComposeYaml: CliDockerComposeYaml;\n\n  @OnExec(\"init\")\n  onExec(ctx: InitCmdContext) {\n    this.addScripts();\n    this.addDependencies(ctx);\n    this.addDevDependencies(ctx);\n\n    const database = getDatabase(ctx);\n\n    if (!database) {\n      return [];\n    }\n\n    return [\n      {\n        title: `Generate TypeORM connection file`,\n        task: async () =>\n          this.cliTypeORM.generateConnection(\"default\", {\n            symbolPath: \"DefaultConnection\",\n            symbolName: \"DefaultConnection\"\n          })\n      },\n      {\n        title: \"Generate TypeORM configuration\",\n        task: async () => this.cliTypeORM.writeConfig(\"default\", database)\n      },\n      {\n        title: \"Generate docker-compose configuration\",\n        task: async () => this.cliDockerComposeYaml.addDatabaseService(database, database)\n      }\n    ];\n  }\n\n  addScripts() {\n    this.packageJson.addScripts({\n      typeorm: \"tsed typeorm\"\n    });\n  }\n\n  addDependencies(ctx: InitCmdContext) {\n    this.packageJson.addDependencies({}, ctx);\n  }\n\n  addDevDependencies(ctx: InitCmdContext) {\n    this.packageJson.addDevDependencies({}, ctx);\n  }\n}\n"]}
+{"version":3,"file":"TypeORMInitHook.js","sourceRoot":"","sources":["../../src/hooks/TypeORMInitHook.ts"],"names":[],"mappings":";;;;AACA,6CAQwB;AACxB,iCAAoC;AACpC,6CAAuC;AAEvC,SAAS,WAAW,CAAC,GAAmB;;IACtC,OAAO,CAAA,MAAA,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,0CAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,KAAI,EAAE,CAAC;AAC5F,CAAC;AAGD,IAAa,eAAe,GAA5B,MAAa,eAAe;IAiB1B,MAAM,CAAC,GAAmB;QACxB,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAE7B,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;QAElC,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,EAAE,CAAC;SACX;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,EAAE;YAC1C,GAAG,GAAG;YACN,IAAI,EAAE,oBAAoB;YAC1B,IAAI,EAAE,wBAAU,CAAC,QAAQ,CAAC;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,UAAU;QACR,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC;YAC1B,OAAO,EAAE,0BAA0B;SACpC,CAAC,CAAC;IACL,CAAC;IAED,eAAe,CAAC,GAAmB;QACjC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC5C,CAAC;IAED,kBAAkB,CAAC,GAAmB;QACpC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC/C,CAAC;CACF,CAAA;AA9CC;IADC,iBAAM,EAAE;sCACa,qBAAU;mDAAC;AAGjC;IADC,iBAAM,EAAE;sCACc,6BAAkB;oDAAC;AAG1C;IADC,iBAAM,EAAE;sCACe,8BAAmB;qDAAC;AAG5C;IADC,iBAAM,EAAE;sCACc,6BAAkB;oDAAC;AAG1C;IADC,iBAAM,EAAE;sCACuB,+BAAoB;6DAAC;AAGrD;IADC,iBAAM,CAAC,MAAM,CAAC;;;;6CAiBd;AAjCU,eAAe;IAD3B,eAAU,EAAE;GACA,eAAe,CAgD3B;AAhDY,0CAAe","sourcesContent":["import {InitCmdContext} from \"@tsed/cli\";\nimport {\n  CliDockerComposeYaml,\n  CliService,\n  Inject,\n  OnExec,\n  ProjectPackageJson,\n  RootRendererService,\n  SrcRendererService\n} from \"@tsed/cli-core\";\nimport {Injectable} from \"@tsed/di\";\nimport {pascalCase} from \"change-case\";\n\nfunction getDatabase(ctx: InitCmdContext) {\n  return ctx.features.find(({type}) => type.includes(\"typeorm:\"))?.type.split(\":\")[1] || \"\";\n}\n\n@Injectable()\nexport class TypeORMInitHook {\n  @Inject()\n  protected cliService: CliService;\n\n  @Inject()\n  protected packageJson: ProjectPackageJson;\n\n  @Inject()\n  protected rootRenderer: RootRendererService;\n\n  @Inject()\n  protected srcRenderer: SrcRendererService;\n\n  @Inject()\n  protected cliDockerComposeYaml: CliDockerComposeYaml;\n\n  @OnExec(\"init\")\n  onExec(ctx: InitCmdContext) {\n    this.addScripts();\n    this.addDependencies(ctx);\n    this.addDevDependencies(ctx);\n\n    const database = getDatabase(ctx);\n\n    if (!database) {\n      return [];\n    }\n\n    return this.cliService.getTasks(\"generate\", {\n      ...ctx,\n      type: \"typeorm:dataSource\",\n      name: pascalCase(database)\n    });\n  }\n\n  addScripts() {\n    this.packageJson.addScripts({\n      typeorm: \"typeorm-ts-node-commonjs\"\n    });\n  }\n\n  addDependencies(ctx: InitCmdContext) {\n    this.packageJson.addDependencies({}, ctx);\n  }\n\n  addDevDependencies(ctx: InitCmdContext) {\n    this.packageJson.addDevDependencies({}, ctx);\n  }\n}\n"]}

package/lib/index.d.ts

@@ -1,5 +1,4 @@
 import { CliPluginTypeORMModule } from "./CliPluginTypeORMModule";
 export * from "./hooks/TypeORMInitHook";
 export * from "./hooks/TypeORMGenerateHook";
-export * from "./services/CliTypeORM";
 export default CliPluginTypeORMModule;

package/lib/index.js

@@ -4,6 +4,5 @@ const tslib_1 = require("tslib");
 const CliPluginTypeORMModule_1 = require("./CliPluginTypeORMModule");
 tslib_1.__exportStar(require("./hooks/TypeORMInitHook"), exports);
 tslib_1.__exportStar(require("./hooks/TypeORMGenerateHook"), exports);
-tslib_1.__exportStar(require("./services/CliTypeORM"), exports);
 exports.default = CliPluginTypeORMModule_1.CliPluginTypeORMModule;
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,qEAAgE;AAEhE,kEAAwC;AACxC,sEAA4C;AAC5C,gEAAsC;AAEtC,kBAAe,+CAAsB,CAAC","sourcesContent":["import {CliPluginTypeORMModule} from \"./CliPluginTypeORMModule\";\n\nexport * from \"./hooks/TypeORMInitHook\";\nexport * from \"./hooks/TypeORMGenerateHook\";\nexport * from \"./services/CliTypeORM\";\n\nexport default CliPluginTypeORMModule;\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,qEAAgE;AAEhE,kEAAwC;AACxC,sEAA4C;AAE5C,kBAAe,+CAAsB,CAAC","sourcesContent":["import {CliPluginTypeORMModule} from \"./CliPluginTypeORMModule\";\n\nexport * from \"./hooks/TypeORMInitHook\";\nexport * from \"./hooks/TypeORMGenerateHook\";\n\nexport default CliPluginTypeORMModule;\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/cli-plugin-typeorm",
-  "version": "3.19.5",
+  "version": "3.20.1",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
   "description": "Ts.ED CLI plugin. Add TypeORM support",
@@ -9,8 +9,8 @@
     "tslib": "2.3.1"
   },
   "devDependencies": {
-    "@tsed/cli": "3.19.5",
-    "@tsed/cli-core": "3.19.5"
+    "@tsed/cli": "3.20.1",
+    "@tsed/cli-core": "3.20.1"
   },
   "scripts": {
     "build": "tsc --build tsconfig.compile.json",

package/templates/datasource.hbs

@@ -0,0 +1,78 @@
+import {Configuration, registerProvider} from "@tsed/di";
+import {createConnection} from "@tsed/typeorm";
+import {DataSource} from "typeorm";
+import {Logger} from "@tsed/logger";
+
+export const {{symbolName}} = new DataSource({
+  type: "{{database}}",
+{{#switch database}}
+  {{#case 'mysql'}}
+  host: "localhost",
+  port: 3306,
+  username: "test",
+  password: "test",
+  database: "test"
+  {{/case}}
+  {{#case 'mariadb'}}
+  host: "localhost",
+  port: 3306,
+  username: "test",
+  password: "test",
+  database: "test"
+  {{/case}}
+  {{#case 'sqlite'}}
+  database: "database.sqlite"
+  {{/case}}
+  {{#case 'better-sqlite3'}}
+  database: "database.sqlite"
+  {{/case}}
+  {{#case 'postgres'}}
+  host: "localhost",
+  port: 5432,
+  username: "test",
+  password: "test",
+  database: "test"
+  {{/case}}
+  {{#case 'cockroachdb'}}
+  host: "localhost",
+  port: 26257,
+  username: "root",
+  password: "",
+  database: "defaultdb"
+  {{/case}}
+  {{#case 'mssql'}}
+  host: "localhost",
+  username: "sa",
+  password: "Admin12345",
+  database: "tempdb"
+  {{/case}}
+  {{#case 'oracle'}}
+  host: "localhost",
+  username: "system",
+  password: "oracle",
+  port: 1521,
+  sid: "xe.oracle.docker"
+  {{/case}}
+  {{#case 'mongodb'}}
+  database: "test"
+  {{/case}}
+{{/switch}}
+});
+
+registerProvider<DataSource>({
+  provide: {{symbolName}},
+  type: "typeorm:datasource",
+  deps: [Logger],
+  async useAsyncFactory(logger: Logger) {
+    await {{symbolName}}.initialize();
+
+    logger.info('Connected with typeorm to database: {{name}}');
+
+    return {{symbolName}};
+  },
+  hooks: {
+    $onDestroy(dataSource) {
+      return dataSource.isInitialized && dataSource.close();
+    }
+  }
+});

package/lib/commands/TypeORMCmd.d.ts

@@ -1,12 +0,0 @@
-import { CliDefaultOptions, CommandProvider } from "@tsed/cli-core";
-import { CliTypeORM } from "../services/CliTypeORM";
-export interface TypeORMContext extends CliDefaultOptions {
-    command: string;
-}
-export declare class TypeORMCmd implements CommandProvider {
-    cliTypeORM: CliTypeORM;
-    $exec(ctx: TypeORMContext): Promise<{
-        title: string;
-        task: () => any;
-    }[]>;
-}

package/lib/commands/TypeORMCmd.js

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeORMCmd = void 0;
-const tslib_1 = require("tslib");
-const cli_core_1 = require("@tsed/cli-core");
-const CliTypeORM_1 = require("../services/CliTypeORM");
-let TypeORMCmd = class TypeORMCmd {
-    async $exec(ctx) {
-        return [
-            {
-                title: `Run TypeORM CLI ${ctx.command}`,
-                task: () => this.cliTypeORM.run(ctx.command, ctx.rawArgs)
-            }
-        ];
-    }
-};
-tslib_1.__decorate([
-    cli_core_1.Inject(),
-    tslib_1.__metadata("design:type", CliTypeORM_1.CliTypeORM)
-], TypeORMCmd.prototype, "cliTypeORM", void 0);
-TypeORMCmd = tslib_1.__decorate([
-    cli_core_1.Command({
-        name: "typeorm",
-        description: "Run a typeorm command",
-        args: {
-            command: {
-                description: "The typeorm command",
-                type: String,
-                required: true
-            }
-        },
-        options: {},
-        allowUnknownOption: true
-    })
-], TypeORMCmd);
-exports.TypeORMCmd = TypeORMCmd;
-//# sourceMappingURL=TypeORMCmd.js.map

package/lib/commands/TypeORMCmd.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"TypeORMCmd.js","sourceRoot":"","sources":["../../src/commands/TypeORMCmd.ts"],"names":[],"mappings":";;;;AAAA,6CAAmF;AACnF,uDAAkD;AAmBlD,IAAa,UAAU,GAAvB,MAAa,UAAU;IAIrB,KAAK,CAAC,KAAK,CAAC,GAAmB;QAC7B,OAAO;YACL;gBACE,KAAK,EAAE,mBAAmB,GAAG,CAAC,OAAO,EAAE;gBACvC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC;aAC1D;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AAVC;IADC,iBAAM,EAAE;sCACG,uBAAU;8CAAC;AAFZ,UAAU;IAbtB,kBAAO,CAAC;QACP,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,uBAAuB;QACpC,IAAI,EAAE;YACJ,OAAO,EAAE;gBACP,WAAW,EAAE,qBAAqB;gBAClC,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,IAAI;aACf;SACF;QACD,OAAO,EAAE,EAAE;QACX,kBAAkB,EAAE,IAAI;KACzB,CAAC;GACW,UAAU,CAYtB;AAZY,gCAAU","sourcesContent":["import {Command, CliDefaultOptions, CommandProvider, Inject} from \"@tsed/cli-core\";\nimport {CliTypeORM} from \"../services/CliTypeORM\";\n\nexport interface TypeORMContext extends CliDefaultOptions {\n  command: string;\n}\n\n@Command({\n  name: \"typeorm\",\n  description: \"Run a typeorm command\",\n  args: {\n    command: {\n      description: \"The typeorm command\",\n      type: String,\n      required: true\n    }\n  },\n  options: {},\n  allowUnknownOption: true\n})\nexport class TypeORMCmd implements CommandProvider {\n  @Inject()\n  cliTypeORM: CliTypeORM;\n\n  async $exec(ctx: TypeORMContext) {\n    return [\n      {\n        title: `Run TypeORM CLI ${ctx.command}`,\n        task: () => this.cliTypeORM.run(ctx.command, ctx.rawArgs)\n      }\n    ];\n  }\n}\n"]}

package/lib/services/CliTypeORM.d.ts

@@ -1,10 +0,0 @@
-import { CliExeca, ProjectPackageJson, SrcRendererService } from "@tsed/cli-core";
-export declare class CliTypeORM {
-    cliExeca: CliExeca;
-    projectPackageJson: ProjectPackageJson;
-    protected srcRenderer: SrcRendererService;
-    run(command: string, args: string[], options?: any): any;
-    generateConnection(name: string, options?: any): Promise<void>;
-    writeConfig(name: string, database: string): Promise<void>;
-    regenerateIndexConfig(): Promise<void>;
-}

package/lib/services/CliTypeORM.js

@@ -1,83 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CliTypeORM = void 0;
-const tslib_1 = require("tslib");
-const cli_core_1 = require("@tsed/cli-core");
-const di_1 = require("@tsed/di");
-const change_case_1 = require("change-case");
-const path_1 = require("path");
-const templateDir_1 = require("../utils/templateDir");
-let CliTypeORM = class CliTypeORM {
-    run(command, args, options = {}) {
-        return this.cliExeca.run("npx", ["typeorm", command, ...args], {
-            ...options,
-            cwd: this.projectPackageJson.dir
-        });
-    }
-    async generateConnection(name, options = {}) {
-        return this.srcRenderer.render("connection.hbs", {
-            ...options,
-            symbolName: change_case_1.constantCase(options.symbolName),
-            connectionName: name
-        }, {
-            templateDir: templateDir_1.TEMPLATE_DIR,
-            output: `${options.symbolPath}.ts`,
-            rootDir: path_1.join(this.srcRenderer.rootDir, "services", "connections")
-        });
-    }
-    async writeConfig(name, database) {
-        var _a, _b, _c;
-        const { InitCommand } = await this.projectPackageJson.importModule("typeorm/commands/InitCommand.js");
-        const content = {
-            name,
-            ...JSON.parse(await InitCommand.getOrmConfigTemplate(database))
-        };
-        function replace(path) {
-            return path && path.replace("src/", "${rootDir}/").replace(/\.ts/, ".{js,ts}");
-        }
-        content.entities = (_a = content.entities) === null || _a === void 0 ? void 0 : _a.map(replace);
-        content.migrations = (_b = content.migrations) === null || _b === void 0 ? void 0 : _b.map(replace);
-        content.subscribers = (_c = content.subscribers) === null || _c === void 0 ? void 0 : _c.map(replace);
-        if (content.cli) {
-            content.cli.entitiesDir = replace(content.cli.entitiesDir);
-            content.cli.migrationsDir = replace(content.cli.migrationsDir);
-            content.cli.subscribersDir = replace(content.cli.subscribersDir);
-        }
-        await this.srcRenderer.write(JSON.stringify(content, null, 2), { output: `config/typeorm/${name}.config.json` });
-        return this.regenerateIndexConfig();
-    }
-    async regenerateIndexConfig() {
-        const list = await this.srcRenderer.scan(["config/typeorm/*.config.json"]);
-        const configs = list.map((file) => {
-            const name = path_1.basename(file).replace(/\.config\.json/gi, "");
-            return {
-                name,
-                symbolName: change_case_1.camelCase(name)
-            };
-        });
-        return this.srcRenderer.render("index.hbs", {
-            configs
-        }, {
-            templateDir: templateDir_1.TEMPLATE_DIR,
-            output: "index.ts",
-            rootDir: path_1.join(this.srcRenderer.rootDir, "config", "typeorm")
-        });
-    }
-};
-tslib_1.__decorate([
-    cli_core_1.Inject(),
-    tslib_1.__metadata("design:type", cli_core_1.CliExeca)
-], CliTypeORM.prototype, "cliExeca", void 0);
-tslib_1.__decorate([
-    cli_core_1.Inject(),
-    tslib_1.__metadata("design:type", cli_core_1.ProjectPackageJson)
-], CliTypeORM.prototype, "projectPackageJson", void 0);
-tslib_1.__decorate([
-    cli_core_1.Inject(),
-    tslib_1.__metadata("design:type", cli_core_1.SrcRendererService)
-], CliTypeORM.prototype, "srcRenderer", void 0);
-CliTypeORM = tslib_1.__decorate([
-    di_1.Injectable()
-], CliTypeORM);
-exports.CliTypeORM = CliTypeORM;
-//# sourceMappingURL=CliTypeORM.js.map

package/lib/services/CliTypeORM.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"CliTypeORM.js","sourceRoot":"","sources":["../../src/services/CliTypeORM.ts"],"names":[],"mappings":"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","sourcesContent":["import {CliExeca, Inject, ProjectPackageJson, SrcRendererService} from \"@tsed/cli-core\";\nimport {Injectable} from \"@tsed/di\";\nimport {camelCase, constantCase} from \"change-case\";\nimport {basename, join} from \"path\";\nimport {TEMPLATE_DIR} from \"../utils/templateDir\";\n\n@Injectable()\nexport class CliTypeORM {\n  @Inject()\n  cliExeca: CliExeca;\n\n  @Inject()\n  projectPackageJson: ProjectPackageJson;\n\n  @Inject()\n  protected srcRenderer: SrcRendererService;\n\n  run(command: string, args: string[], options: any = {}) {\n    return this.cliExeca.run(\"npx\", [\"typeorm\", command, ...args], {\n      ...options,\n      cwd: this.projectPackageJson.dir\n    });\n  }\n\n  async generateConnection(name: string, options: any = {}) {\n    return this.srcRenderer.render(\n      \"connection.hbs\",\n      {\n        ...options,\n        symbolName: constantCase(options.symbolName),\n        connectionName: name\n      },\n      {\n        templateDir: TEMPLATE_DIR,\n        output: `${options.symbolPath}.ts`,\n        rootDir: join(this.srcRenderer.rootDir, \"services\", \"connections\")\n      }\n    );\n  }\n\n  async writeConfig(name: string, database: string) {\n    const {InitCommand} = await this.projectPackageJson.importModule(\"typeorm/commands/InitCommand.js\");\n\n    const content = {\n      name,\n      ...JSON.parse(await InitCommand.getOrmConfigTemplate(database))\n    };\n\n    function replace(path: string | undefined) {\n      return path && path.replace(\"src/\", \"${rootDir}/\").replace(/\\.ts/, \".{js,ts}\");\n    }\n\n    content.entities = content.entities?.map(replace);\n    content.migrations = content.migrations?.map(replace);\n    content.subscribers = content.subscribers?.map(replace);\n\n    if (content.cli) {\n      content.cli.entitiesDir = replace(content.cli.entitiesDir);\n      content.cli.migrationsDir = replace(content.cli.migrationsDir);\n      content.cli.subscribersDir = replace(content.cli.subscribersDir);\n    }\n\n    await this.srcRenderer.write(JSON.stringify(content, null, 2), {output: `config/typeorm/${name}.config.json`});\n\n    return this.regenerateIndexConfig();\n  }\n\n  async regenerateIndexConfig() {\n    const list = await this.srcRenderer.scan([\"config/typeorm/*.config.json\"]);\n\n    const configs = list.map((file: string) => {\n      const name = basename(file).replace(/\\.config\\.json/gi, \"\");\n\n      return {\n        name,\n        symbolName: camelCase(name)\n      };\n    });\n\n    return this.srcRenderer.render(\n      \"index.hbs\",\n      {\n        configs\n      },\n      {\n        templateDir: TEMPLATE_DIR,\n        output: \"index.ts\",\n        rootDir: join(this.srcRenderer.rootDir, \"config\", \"typeorm\")\n      }\n    );\n  }\n}\n"]}

package/templates/connection.hbs

@@ -1,17 +0,0 @@
-import {Configuration, registerProvider} from "@tsed/di";
-import {createConnection} from "@tsed/typeorm";
-import {Connection, ConnectionOptions} from "typeorm";
-
-export const {{symbolName}} = Symbol.for("{{symbolName}}");
-export type {{symbolName}} = Connection;
-
-registerProvider({
-    provide: {{symbolName}},
-    deps: [Configuration],
-    async useAsyncFactory(configuration: Configuration) {
-       const settings = configuration.get<ConnectionOptions[]>("typeorm")!;
-       const connectionOptions = settings.find(o => o.name === "{{connectionName}}");
-
-       return createConnection(connectionOptions!);
-    }
-});

package/templates/index.hbs

@@ -1,10 +0,0 @@
-// @tsed/cli do not edit
-{{#forEach configs}}
-import * as {{symbolName}}Config from "./{{name}}.config.json";
-{{/forEach}}
-
-export default [
-{{#forEach configs}}
-  {{symbolName}}Config as any{{#unless isLast}}, {{/unless}}
-{{/forEach}}
-];