sofa-api 0.16.1 → 0.16.3

package/index.d.ts

@@ -1,3 +1,3 @@
 import type { SofaConfig } from './sofa';
 export { OpenAPI } from './open-api';
-export declare function useSofa(config: SofaConfig): import("@whatwg-node/router").Router<import("./types").DefaultSofaServerContext>;
+export declare function useSofa(config: SofaConfig): import("@whatwg-node/router").Router<{}>;

package/index.js

@@ -73,12 +73,12 @@ function resolveVariable({ value, type, schema, }) {
     }
 }
 
-var _a, _b;
+var _a, _b, _c, _d, _e;
 const levels = ['error', 'warn', 'info', 'debug'];
 const toLevel = (string) => levels.includes(string) ? string : null;
-const currentLevel = ((_a = globalThis.process) === null || _a === void 0 ? void 0 : _a.env.SOFA_DEBUG)
+const currentLevel = ((_b = (_a = globalThis.process) === null || _a === void 0 ? void 0 : _a.env) === null || _b === void 0 ? void 0 : _b.SOFA_DEBUG)
     ? 'debug'
-    : (_b = toLevel(process.env.SOFA_LOGGER_LEVEL)) !== null && _b !== void 0 ? _b : 'info';
+    : (_e = toLevel((_d = (_c = globalThis.process) === null || _c === void 0 ? void 0 : _c.env) === null || _d === void 0 ? void 0 : _d.SOFA_LOGGER_LEVEL)) !== null && _e !== void 0 ? _e : 'info';
 const log = (level, color, args) => {
     if (levels.indexOf(level) <= levels.indexOf(currentLevel)) {
         console.log(`${color(level)}:`, ...args);
@@ -330,11 +330,14 @@ function createRouter(sofa) {
     router$1.post('/webhook', (request, serverContext) => tslib.__awaiter(this, void 0, void 0, function* () {
         const { subscription, variables, url } = yield request.json();
         try {
+            const sofaContext = Object.assign(serverContext, {
+                request,
+            });
             const result = yield subscriptionManager.start({
                 subscription,
                 variables,
                 url,
-            }, Object.assign(Object.assign({}, serverContext), { request }));
+            }, sofaContext);
             return new router.Response(JSON.stringify(result), {
                 status: 200,
                 statusText: 'OK',
@@ -356,8 +359,10 @@ function createRouter(sofa) {
         const body = yield request.json();
         const variables = body.variables;
         try {
-            const sofaServerContext = Object.assign(Object.assign({}, serverContext), { request });
-            const contextValue = yield sofa.contextFactory(sofaServerContext);
+            const sofaContext = Object.assign(serverContext, {
+                request,
+            });
+            const contextValue = yield sofa.contextFactory(sofaContext);
             const result = yield subscriptionManager.update({
                 id,
                 variables,
@@ -530,8 +535,10 @@ function useHandler(config) {
                     }
                 });
             }
-            const sofaServerContext = Object.assign(Object.assign({}, serverContext), { request });
-            const contextValue = yield sofa.contextFactory(sofaServerContext);
+            const sofaContext = Object.assign(serverContext, {
+                request,
+            });
+            const contextValue = yield sofa.contextFactory(sofaContext);
             const result = yield sofa.execute({
                 schema: sofa.schema,
                 document: operation,

package/index.mjs

@@ -67,12 +67,12 @@ function resolveVariable({ value, type, schema, }) {
     }
 }
 
-var _a, _b;
+var _a, _b, _c, _d, _e;
 const levels = ['error', 'warn', 'info', 'debug'];
 const toLevel = (string) => levels.includes(string) ? string : null;
-const currentLevel = ((_a = globalThis.process) === null || _a === void 0 ? void 0 : _a.env.SOFA_DEBUG)
+const currentLevel = ((_b = (_a = globalThis.process) === null || _a === void 0 ? void 0 : _a.env) === null || _b === void 0 ? void 0 : _b.SOFA_DEBUG)
     ? 'debug'
-    : (_b = toLevel(process.env.SOFA_LOGGER_LEVEL)) !== null && _b !== void 0 ? _b : 'info';
+    : (_e = toLevel((_d = (_c = globalThis.process) === null || _c === void 0 ? void 0 : _c.env) === null || _d === void 0 ? void 0 : _d.SOFA_LOGGER_LEVEL)) !== null && _e !== void 0 ? _e : 'info';
 const log = (level, color, args) => {
     if (levels.indexOf(level) <= levels.indexOf(currentLevel)) {
         console.log(`${color(level)}:`, ...args);
@@ -324,11 +324,14 @@ function createRouter(sofa) {
     router.post('/webhook', (request, serverContext) => __awaiter(this, void 0, void 0, function* () {
         const { subscription, variables, url } = yield request.json();
         try {
+            const sofaContext = Object.assign(serverContext, {
+                request,
+            });
             const result = yield subscriptionManager.start({
                 subscription,
                 variables,
                 url,
-            }, Object.assign(Object.assign({}, serverContext), { request }));
+            }, sofaContext);
             return new Response(JSON.stringify(result), {
                 status: 200,
                 statusText: 'OK',
@@ -350,8 +353,10 @@ function createRouter(sofa) {
         const body = yield request.json();
         const variables = body.variables;
         try {
-            const sofaServerContext = Object.assign(Object.assign({}, serverContext), { request });
-            const contextValue = yield sofa.contextFactory(sofaServerContext);
+            const sofaContext = Object.assign(serverContext, {
+                request,
+            });
+            const contextValue = yield sofa.contextFactory(sofaContext);
             const result = yield subscriptionManager.update({
                 id,
                 variables,
@@ -524,8 +529,10 @@ function useHandler(config) {
                     }
                 });
             }
-            const sofaServerContext = Object.assign(Object.assign({}, serverContext), { request });
-            const contextValue = yield sofa.contextFactory(sofaServerContext);
+            const sofaContext = Object.assign(serverContext, {
+                request,
+            });
+            const contextValue = yield sofa.contextFactory(sofaContext);
             const result = yield sofa.execute({
                 schema: sofa.schema,
                 document: operation,

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "sofa-api",
-  "version": "0.16.1",
+  "version": "0.16.3",
   "description": "Create REST APIs with GraphQL",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "9.1.4",
-    "@whatwg-node/fetch": "^0.6.0",
-    "@whatwg-node/router": "^0.1.2",
-    "ansi-colors": "4.1.3",
-    "openapi-types": "12.1.0",
-    "param-case": "3.0.4",
-    "title-case": "3.0.3",
-    "tslib": "2.5.0"
+    "@graphql-tools/utils": "^9.2.0",
+    "@whatwg-node/fetch": "^0.6.6",
+    "@whatwg-node/router": "^0.2.0",
+    "ansi-colors": "^4.1.3",
+    "openapi-types": "^12.1.0",
+    "param-case": "^3.0.4",
+    "title-case": "^3.0.3",
+    "tslib": "^2.5.0"
   },
   "repository": {
     "type": "git",

package/router.d.ts

@@ -1,5 +1,4 @@
 import type { Sofa } from './sofa';
-import type { DefaultSofaServerContext } from './types';
 import { Router } from '@whatwg-node/router';
 export type ErrorHandler = (errors: ReadonlyArray<any>) => Response;
 declare module 'graphql' {
@@ -11,4 +10,4 @@ declare module 'graphql' {
         http?: GraphQLHTTPErrorExtensions;
     }
 }
-export declare function createRouter(sofa: Sofa): Router<DefaultSofaServerContext>;
+export declare function createRouter(sofa: Sofa): Router<{}>;

package/types.d.ts

@@ -1,4 +1,3 @@
-import { DefaultServerAdapterContext } from '@whatwg-node/router';
 import { DocumentNode } from 'graphql';
 export type ContextValue = Record<string, any>;
 export type Ignore = string[];
@@ -12,6 +11,6 @@ export interface RouteInfo {
 }
 export type OnRoute = (info: RouteInfo) => void;
 export type ContextFn = (serverContext: DefaultSofaServerContext) => Promise<ContextValue> | ContextValue;
-export type DefaultSofaServerContext = DefaultServerAdapterContext & {
+export type DefaultSofaServerContext = {
     request: Request;
 };