Merge pull request #422 from tsedio/feat-update-index-ts

Feat update index ts

packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap

@@ -62,8 +62,8 @@ exports[`Init OIDC Provider project > should generate a project with oidc 1`] =
 
 exports[`Init OIDC Provider project > should generate a project with oidc 2`] = `
 "import {join} from "path";
-import {Configuration, Inject} from "@tsed/di";
-import {PlatformApplication} from "@tsed/platform-http";
+import {Configuration} from "@tsed/di";
+import {application} from "@tsed/platform-http";
 import "@tsed/platform-log-request"; // remove this import if you don't want log request
 import "@tsed/platform-express"; // /!\\ keep this import
 import "@tsed/ajv";
@@ -109,11 +109,7 @@ import {InteractionsController} from "./controllers/oidc/InteractionsController.
   ]
 })
 export class Server {
-  @Inject()
-  protected app: PlatformApplication;
-
-  @Configuration()
-  protected settings: Configuration;
+  protected app = application();
 }
 "
 `;
@@ -178,8 +174,8 @@ exports[`Init OIDC Provider project > should generate a project with oidc and sw
 
 exports[`Init OIDC Provider project > should generate a project with oidc and swagger 2`] = `
 "import {join} from "path";
-import {Configuration, Inject} from "@tsed/di";
-import {PlatformApplication} from "@tsed/platform-http";
+import {Configuration} from "@tsed/di";
+import {application} from "@tsed/platform-http";
 import "@tsed/platform-log-request"; // remove this import if you don't want log request
 import "@tsed/platform-express"; // /!\\ keep this import
 import "@tsed/ajv";
@@ -233,11 +229,7 @@ import {InteractionsController} from "./controllers/oidc/InteractionsController.
   ]
 })
 export class Server {
-  @Inject()
-  protected app: PlatformApplication;
-
-  @Configuration()
-  protected settings: Configuration;
+  protected app = application();
 }
 "
 `;

packages/cli-plugin-typegraphql/test/init/__snapshots__/init.integration.spec.ts.snap

@@ -2,8 +2,8 @@
 
 exports[`Init TypeGraphQL project > should generate a project with typegraphql 2`] = `
 "import {join} from "path";
-import {Configuration, Inject} from "@tsed/di";
-import {PlatformApplication} from "@tsed/platform-http";
+import {Configuration} from "@tsed/di";
+import {application} from "@tsed/platform-http";
 import "@tsed/platform-log-request"; // remove this import if you don't want log request
 import "@tsed/platform-express"; // /!\\ keep this import
 import "@tsed/ajv";
@@ -46,11 +46,7 @@ import * as rest from "./controllers/rest/index.js";
   ]
 })
 export class Server {
-  @Inject()
-  protected app: PlatformApplication;
-
-  @Configuration()
-  protected settings: Configuration;
+  protected app = application();
 }
 "
 `;

packages/cli-plugin-typeorm/test/integrations/init/__snapshots__/init.integration.spec.ts.snap

@@ -2,8 +2,8 @@
 
 exports[`TypeORM: Init cmd > should generate a project with the right options 2`] = `
 "import {join} from "path";
-import {Configuration, Inject} from "@tsed/di";
-import {PlatformApplication} from "@tsed/platform-http";
+import {Configuration} from "@tsed/di";
+import {application} from "@tsed/platform-http";
 import "@tsed/platform-log-request"; // remove this import if you don't want log request
 import "@tsed/platform-express"; // /!\\ keep this import
 import "@tsed/ajv";
@@ -43,11 +43,7 @@ import * as rest from "./controllers/rest/index.js";
   ]
 })
 export class Server {
-  @Inject()
-  protected app: PlatformApplication;
-
-  @Configuration()
-  protected settings: Configuration;
+  protected app = application();
 }
 "
 `;

packages/cli/templates/generate/factory.hbs

@@ -1,35 +1,11 @@
-import {Configuration, Inject, registerProvider} from "@tsed/di";
-
-/**
- * Inject {{symbolName}} to the service, controller, etc...
- *
- * ## Usage
- *
- * ```typescript
- * import {Injectable} from "@tsed/di";
- * import {{{symbolName}}} from "./{{symbolName}}";
- *
- * @Injectable()
- * class MyService {
- *   @{{symbolName}}()
- *   private factory: {{symbolName}};
- *
- *   // or
- *   constructor(@{{symbolName}}() private factory: {{symbolName}}){}
- * }
- *
- * @decorator
- */
-export function {{symbolName}}() {
-  return Inject({{symbolName}});
-}
+import {constant, injectable} from "@tsed/di";
 
 export type {{symbolName}} = any; // implement type or interface for type checking
+export const {{symbolName}} = injectable(Symbol.for("{{symbolName}}")
+  .factory(() => {
+    // retrieve custom configuration from settings (e.g.: `@Configuration({hello: "value"})`)
+    const hello = constant("hello");
 
-registerProvider({
-  provide: {{symbolName}},
-  deps: [Configuration],
-  useFactory(settings: Configuration) {
-    return {};
-  }
-});
+    return {hello};
+  })
+  .token();

packages/cli/templates/generate/server.hbs

@@ -1,6 +1,6 @@
 import {join} from "path";
-import {Configuration, Inject} from "@tsed/di";
-import {PlatformApplication} from "@tsed/platform-http";
+import {Configuration} from "@tsed/di";
+import {application} from "@tsed/platform-http";
 {{#forEach imports}}{{#if tsIngore}}
 // @ts-ignore
 {{/if}}import {{symbols}}{{#if symbols}} from {{/if}}"{{from}}";{{comment}}
@@ -53,9 +53,5 @@ import {PlatformApplication} from "@tsed/platform-http";
   ]
 })
 export class {{symbolName}} {
-  @Inject()
-  protected app: PlatformApplication;
-
-  @Configuration()
-  protected settings: Configuration;
+  protected app = application();
 }

packages/cli/templates/generate/value.hbs

@@ -1,32 +1,3 @@
-import {Configuration, Inject, registerProvider} from "@tsed/di";
+import {injectable} from "@tsed/di";
 
-/**
- * Inject {{symbolName}} to the service, controller, etc...
- *
- * ## Usage
- *
- * ```typescript
- * import {Injectable} from "@tsed/di";
- * import {{{symbolName}}} from "./{{symbolName}}";
- *
- * @Injectable()
- * class MyService {
- *   @{{symbolName}}()
- *   private value: {{symbolName}};
- *
- *   // or
- *   constructor(@{{symbolName}}() private value: {{symbolName}}){}
- * }
- *
- * @decorator
- */
-export function {{symbolName}}() {
-  return Inject({{symbolName}});
-}
-
-export type {{symbolName}} = any; // implement type or interface for type checking
-
-registerProvider({
-  provide: {{symbolName}},
-  useValue: {}
-});
+export const {{symbolName}} = injectable(Symbol.for("{{symbolName}}")).value({}).token();

packages/cli/templates/init/src/index.ts.hbs

@@ -2,17 +2,35 @@ import {$log} from "@tsed/logger";
 import { {{platformSymbol}} } from "@tsed/platform-{{platform}}";
 import {Server} from "./{{entryServer}}.js";
 
-async function bootstrap() {
-  try {
-    const platform = await {{platformSymbol}}.bootstrap(Server);
-    await platform.listen();
+const SIG_EVENTS = [
+  "beforeExit",
+  "SIGHUP",
+  "SIGINT",
+  "SIGQUIT",
+  "SIGILL",
+  "SIGTRAP",
+  "SIGABRT",
+  "SIGBUS",
+  "SIGFPE",
+  "SIGUSR1",
+  "SIGSEGV",
+  "SIGUSR2",
+  "SIGTERM"
+];
 
-    process.on("SIGINT", () => {
-      platform.stop();
-    });
-  } catch (error) {
-    $log.error({event: "SERVER_BOOTSTRAP_ERROR", message: error.message, stack: error.stack});
-  }
+try {
+  const platform = await {{platformSymbol}}.bootstrap(Server);
+  await platform.listen();
+
+  SIG_EVENTS.forEach((evt) => process.on(evt, close));
+
+  ["uncaughtException", "unhandledRejection"].forEach((evt) =>
+    process.on(evt, async (error) => {
+      $log.error({event: "SERVER_" + evt.toUpperCase(), message: error.message, stack: error.stack});
+      await stop();
+    })
+  );
+} catch (error) {
+  $log.error({event: "SERVER_BOOTSTRAP_ERROR", message: error.message, stack: error.stack});
 }
 
-bootstrap();