fix(cli): fix template generation issue

Closes: #365
tsedio · Mar 2, 2024 · 3c1c1b2 · 3c1c1b2
1 parent 781e93a
commit 3c1c1b2
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 35 deletions.
diff --git a/packages/cli-plugin-jest/templates/generate/generic.integration.hbs b/packages/cli-plugin-jest/templates/generate/generic.integration.hbs
@@ -4,20 +4,15 @@ import { {{symbolName}} } from "./{{symbolPathBasename}}";
 import { Server } from "{{relativeSrcPath}}/Server";
 
 describe("{{symbolName}}", () => {
-  let request: SuperTest.Agent;
-
   beforeEach(PlatformTest.bootstrap(Server, {
     mount: {
       "/": [{{symbolName}}]
     }
   }));
-  beforeEach(() => {
-    request = SuperTest(PlatformTest.callback());
-  });
-
   afterEach(PlatformTest.reset);
 
   it("should call GET {{route}}", async () => {
+     const request = SuperTest(PlatformTest.callback());
      const response = await request.get("{{route}}").expect(200);
 
      expect(response.text).toEqual("hello");

diff --git a/packages/cli-plugin-jest/templates/generate/server.integration.hbs b/packages/cli-plugin-jest/templates/generate/server.integration.hbs
@@ -3,16 +3,11 @@ import SuperTest from "supertest";
 import { {{symbolName}} } from "./{{symbolPathBasename}}";
 
 describe("{{symbolName}}", () => {
-  let request: SuperTest.SuperTest<SuperTest.Test>;
-
   beforeEach(PlatformTest.bootstrap({{symbolName}}));
-  beforeEach(() => {
-    request = SuperTest(PlatformTest.callback());
-  });
-
   afterEach(PlatformTest.reset);
 
   it("should call GET {{route}}", async () => {
+     const request = SuperTest(PlatformTest.callback());
      const response = await request.get("{{route}}").expect(404);
 
      expect(response.body).toEqual({

diff --git a/packages/cli-plugin-mocha/templates/generate/generic.integration.hbs b/packages/cli-plugin-mocha/templates/generate/generic.integration.hbs
@@ -5,20 +5,15 @@ import { {{symbolName}} } from "./{{symbolPathBasename}}";
 import { Server } from "{{relativeSrcPath}}/Server";
 
 describe("{{symbolName}}", () => {
-  let request: SuperTest.Agent;
-
   beforeEach(PlatformTest.bootstrap(Server, {
     mount: {
       "/": {{symbolName}}
     }
   }));
-  beforeEach(() => {
-    request = SuperTest(PlatformTest.callback());
-  });
-
   afterEach(PlatformTest.reset);
 
   it("should call GET {{route}}", async () => {
+     const request = SuperTest(PlatformTest.callback());
      const response = await request.get("{{route}}").expect(200);
 
      expect(response.text).to.eq("hello");

diff --git a/packages/cli-plugin-mocha/templates/generate/server.integration.hbs b/packages/cli-plugin-mocha/templates/generate/server.integration.hbs
@@ -4,16 +4,11 @@ import {expect} from "chai";
 import { {{symbolName}} } from "./{{symbolPathBasename}}";
 
 describe("{{symbolName}}", () => {
-  let request: SuperTest.SuperTest<SuperTest.Test>;
-
   beforeEach(PlatformTest.bootstrap({{symbolName}}));
-  beforeEach(() => {
-    request = SuperTest(PlatformTest.callback());
-  });
-
   afterEach(PlatformTest.reset);
 
   it("should call GET {{route}}", async () => {
+     const request = SuperTest(PlatformTest.callback());
      const response = await request.get("{{route}}").expect(404);
 
      expect(response.body).to.deep.equal({

diff --git a/packages/cli-plugin-typeorm/templates/datasource.hbs b/packages/cli-plugin-typeorm/templates/datasource.hbs
@@ -59,6 +59,7 @@ export const {{symbolName}} = new DataSource({
   {{/case}}
 {{/switch}}
 });
+export type {{tokenName}} = DataSource;
 
 registerProvider<DataSource>({
   provide: {{tokenName}},

diff --git a/packages/cli/jest.config.js b/packages/cli/jest.config.js
@@ -7,10 +7,10 @@ module.exports = {
 
   coverageThreshold: {
     global: {
-      statements: 93.01,
+      statements: 92.99,
       branches: 80.73,
       functions: 83.47,
-      lines: 93.01
+      lines: 92.99
     }
   }
 };
diff --git a/packages/cli/src/runtimes/supports/BabelRuntime.ts b/packages/cli/src/runtimes/supports/BabelRuntime.ts
@@ -30,6 +30,7 @@ export class BabelRuntime extends NodeRuntime {
       "@babel/plugin-proposal-decorators": "latest",
       "@babel/preset-env": "latest",
       "@babel/preset-typescript": "latest",
+      "@babel/plugin-proposal-object-rest-spread": "latest",
       "babel-plugin-transform-typescript-metadata": "latest",
       "babel-watch": "latest"
     };

diff --git a/packages/cli/src/runtimes/supports/WebpackRuntime.ts b/packages/cli/src/runtimes/supports/WebpackRuntime.ts
@@ -23,15 +23,7 @@ export class WebpackRuntime extends BabelRuntime {
 
   devDependencies() {
     return {
-      "@babel/cli": "latest",
-      "@babel/core": "latest",
-      "@babel/node": "latest",
-      "@babel/plugin-proposal-class-properties": "latest",
-      "@babel/plugin-proposal-decorators": "latest",
-      "@babel/preset-env": "latest",
-      "@babel/preset-typescript": "latest",
-      "babel-plugin-transform-typescript-metadata": "latest",
-      "babel-watch": "latest",
+      ...super.devDependencies(),
       "babel-loader": "latest",
       webpack: "latest",
       "webpack-cli": "latest"

diff --git a/packages/cli/templates/init/src/config/envs/index.ts.hbs b/packages/cli/templates/init/src/config/envs/index.ts.hbs
@@ -4,3 +4,4 @@ process.env.NODE_ENV = process.env.NODE_ENV || "development";
 
 export const config = dotenv.config();
 export const isProduction = process.env.NODE_ENV === "production";
+export const envs = process.env