@tsed/apollo 8.16.0-rc.3 → 8.16.0-rc.5

package/lib/esm/services/ApolloService.js

@@ -1,29 +1,32 @@
-import { __decorate, __metadata } from "tslib";
 import Http from "node:http";
 import Https from "node:https";
 import { ApolloServer } from "@apollo/server";
 import { ApolloServerPluginLandingPageDisabled } from "@apollo/server/plugin/disabled";
 import { ApolloServerPluginDrainHttpServer } from "@apollo/server/plugin/drainHttpServer";
 import { ApolloServerPluginLandingPageLocalDefault } from "@apollo/server/plugin/landingPage/default";
-import { Constant, context, Inject, InjectorService, LocalsContainer, Service } from "@tsed/di";
-import { Logger } from "@tsed/logger";
+import { constant, context, inject, injectable, injector, LocalsContainer, logger } from "@tsed/di";
+import { $asyncAlter } from "@tsed/hooks";
 import { PlatformApplication } from "@tsed/platform-http";
 import { APOLLO_CONTEXT, DATASOURCES_PROVIDERS } from "../constants/constants.js";
-let ApolloService = class ApolloService {
+export class ApolloService {
     constructor() {
+        this.platformName = constant("PLATFORM_NAME");
         /**
          *
          * @type {Map<any, any>}
          * @private
          */
         this.servers = new Map();
+        this.app = inject(PlatformApplication);
+        this.httpServer = inject(Http.Server);
+        this.httpsServer = inject(Https.Server);
     }
     async createServer(id, settings) {
         if (!this.has(id)) {
             try {
                 const { dataSources, path, middlewareOptions = {}, server: customServer, ...config } = settings;
-                this.logger.info(`Create server with Apollo for: ${id}`);
-                this.logger.debug(`options: ${JSON.stringify({ path })}`);
+                logger().info(`Create server with Apollo for: ${id}`);
+                logger().debug(`options: ${JSON.stringify({ path })}`);
                 const plugins = await this.getPlugins(settings);
                 const server = this.createInstance({
                     ...config,
@@ -54,7 +57,7 @@ let ApolloService = class ApolloService {
                             }));
                             break;
                         default:
-                            this.logger.warn({
+                            logger().warn({
                                 event: "APOLLO_UNKNOWN_PLATFORM",
                                 message: "Platform not supported. Please use Ts.ED platform (express, koa)"
                             });
@@ -62,7 +65,7 @@ let ApolloService = class ApolloService {
                 }
             }
             catch (er) {
-                this.logger.error({
+                logger().error({
                     event: "APOLLO_BOOTSTRAP_ERROR",
                     error_name: er.name,
                     message: er.message,
@@ -108,8 +111,9 @@ let ApolloService = class ApolloService {
      * create a new dataSources function to use with apollo server config
      */
     createContextHandler(server, settings) {
-        const { injector } = this;
-        const dataSourcesContainer = injector.getProviders(DATASOURCES_PROVIDERS).reduce((map, provider) => {
+        const dataSourcesContainer = injector()
+            .getProviders(DATASOURCES_PROVIDERS)
+            .reduce((map, provider) => {
             let { name } = provider.store.get(DATASOURCES_PROVIDERS);
             name = name || provider.className;
             const sourceName = `${name[0].toLowerCase()}${name.slice(1)}`;
@@ -123,13 +127,13 @@ let ApolloService = class ApolloService {
                     ...(settings.dataSources?.() || {})
                 }
             };
-            const alteredContext = await this.injector.alterAsync("$alterApolloContext", apolloContext, $ctx);
+            const alteredContext = await $asyncAlter("$alterApolloContext", apolloContext, [$ctx]);
             $ctx.set(APOLLO_CONTEXT, alteredContext);
             const locals = new LocalsContainer();
             locals.set(APOLLO_CONTEXT, alteredContext);
             locals.set(ApolloServer, server);
             dataSourcesContainer.forEach((provider, key) => {
-                alteredContext.dataSources[key] = injector.invoke(provider.token, { locals });
+                alteredContext.dataSources[key] = inject(provider.token, { locals });
             });
             return alteredContext;
         };
@@ -139,7 +143,7 @@ let ApolloService = class ApolloService {
     }
     async getPlugins(serverSettings) {
         const playground = serverSettings.playground || (serverSettings.playground === undefined && process.env.NODE_ENV !== "production");
-        const result = await this.injector.alterAsync("$alterApolloServerPlugins", [
+        const result = await $asyncAlter("$alterApolloServerPlugins", [
             this.httpServer &&
                 ApolloServerPluginDrainHttpServer({
                     httpServer: this.httpServer
@@ -149,37 +153,10 @@ let ApolloService = class ApolloService {
                     httpServer: this.httpsServer
                 }),
             ...(serverSettings.plugins || [])
-        ].filter(Boolean), serverSettings);
+        ].filter(Boolean), [serverSettings]);
         return result
             .concat([playground ? ApolloServerPluginLandingPageLocalDefault({ embed: true }) : ApolloServerPluginLandingPageDisabled()])
             .filter(Boolean);
     }
-};
-__decorate([
-    Constant("PLATFORM_NAME"),
-    __metadata("design:type", String)
-], ApolloService.prototype, "platformName", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", Logger)
-], ApolloService.prototype, "logger", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", PlatformApplication)
-], ApolloService.prototype, "app", void 0);
-__decorate([
-    Inject(Http.Server),
-    __metadata("design:type", Object)
-], ApolloService.prototype, "httpServer", void 0);
-__decorate([
-    Inject(Https.Server),
-    __metadata("design:type", Object)
-], ApolloService.prototype, "httpsServer", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", InjectorService)
-], ApolloService.prototype, "injector", void 0);
-ApolloService = __decorate([
-    Service()
-], ApolloService);
-export { ApolloService };
+}
+injectable(ApolloService);

package/lib/types/services/ApolloService.d.ts

@@ -1,12 +1,15 @@
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+import Http from "node:http";
+import Https from "node:https";
 import { ApolloServer, ApolloServerOptions } from "@apollo/server";
 import type { IExecutableSchemaDefinition } from "@graphql-tools/schema";
-import { Logger } from "@tsed/logger";
+import { PlatformApplication } from "@tsed/platform-http";
 import type { GraphQLSchema } from "graphql";
 import { ApolloContext } from "../interfaces/ApolloContext.js";
 import type { ApolloCustomServerCB, ApolloSettings } from "../interfaces/ApolloSettings.js";
 export declare class ApolloService {
-    platformName: string;
-    protected logger: Logger;
+    platformName: string | undefined;
     /**
      *
      * @type {Map<any, any>}
@@ -18,10 +21,9 @@ export declare class ApolloService {
         typeDefs?: IExecutableSchemaDefinition<ApolloContext>["typeDefs"];
         resolvers?: IExecutableSchemaDefinition<ApolloContext>["resolvers"];
     }>;
-    private app;
-    private httpServer;
-    private httpsServer;
-    private injector;
+    protected app: PlatformApplication<any>;
+    protected httpServer: Http.Server<typeof Http.IncomingMessage, typeof Http.ServerResponse> | null;
+    protected httpsServer: Https.Server<typeof Http.IncomingMessage, typeof Http.ServerResponse> | null;
     createServer(id: string, settings: ApolloSettings): Promise<ApolloServer<ApolloContext>>;
     /**
      * Get an instance of ApolloServer from his id
@@ -47,7 +49,7 @@ export declare class ApolloService {
     /**
      * create a new dataSources function to use with apollo server config
      */
-    createContextHandler(server: ApolloServer<ApolloContext>, settings: ApolloSettings): () => Promise<any>;
+    createContextHandler(server: ApolloServer<ApolloContext>, settings: ApolloSettings): () => Promise<ApolloContext>;
     protected createInstance(options: ApolloServerOptions<ApolloContext>, server?: ApolloCustomServerCB<ApolloContext>): ApolloServer<ApolloContext>;
     private getPlugins;
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/apollo",
   "description": "Apollo package for Ts.ED framework",
   "type": "module",
-  "version": "8.16.0-rc.3",
+  "version": "8.16.0-rc.5",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
@@ -29,12 +29,12 @@
     "@apollo/datasource-rest": "6.3.0",
     "@apollo/server": "^4.11.0",
     "@as-integrations/koa": "1.1.1",
-    "@tsed/barrels": "8.16.0-rc.3",
-    "@tsed/core": "8.16.0-rc.3",
-    "@tsed/di": "8.16.0-rc.3",
+    "@tsed/barrels": "8.16.0-rc.5",
+    "@tsed/core": "8.16.0-rc.5",
+    "@tsed/di": "8.16.0-rc.5",
     "@tsed/logger": "^8.0.0",
-    "@tsed/platform-http": "8.16.0-rc.3",
-    "@tsed/typescript": "8.16.0-rc.3",
+    "@tsed/platform-http": "8.16.0-rc.5",
+    "@tsed/typescript": "8.16.0-rc.5",
     "apollo-datasource-http": "0.21.0",
     "apollo-server-testing": "2.26.2",
     "eslint": "9.12.0",