sofa-api 0.11.2 → 0.12.0-alpha.0

package/README.md

@@ -20,47 +20,14 @@ Here's complete example with no dependency on frameworks, but also integratable
 ```js
 import http from 'http';
 import getStream from 'get-stream';
-import { createSofaRouter } from 'sofa-api';
-
-const invokeSofa = createSofaRouter({
-  basePath: '/api',
-  schema,
-});
+import { useSofa } from 'sofa-api';
 
-const server = http.createServer(async (req, res) => {
-  try {
-    const response = await invokeSofa({
-      method: req.method,
-      url: req.url,
-      body: JSON.parse(await getStream(req)),
-      contextValue: {
-        req,
-      },
-    });
-    if (response) {
-      const headers = {
-        'Content-Type': 'application/json',
-      };
-      if (response.statusMessage) {
-        res.writeHead(response.status, response.statusMessage, headers);
-      } else {
-        res.writeHead(response.status, headers);
-      }
-      if (response.type === 'result') {
-        res.end(JSON.stringify(response.body));
-      }
-      if (response.type === 'error') {
-        res.end(JSON.stringify(response.error));
-      }
-    } else {
-      res.writeHead(404);
-      res.end();
-    }
-  } catch (error) {
-    res.writeHead(500);
-    res.end(JSON.stringify(error));
-  }
-});
+const server = http.createServer(
+  useSofa({
+    basePath: '/api',
+    schema,
+  })
+);
 ```
 
 Another example with builtin express-like frameworks support
@@ -302,6 +269,7 @@ Thanks to GraphQL's Type System Sofa is able to generate OpenAPI (Swagger) defin
 
 ```ts
 import { useSofa, OpenAPI } from 'sofa-api';
+import { writeFileSync } from 'fs';
 
 const openApi = OpenAPI({
   schema,
@@ -325,13 +293,14 @@ app.use(
 );
 
 // writes every recorder route
-openApi.save('./swagger.yml');
+writeFileSync('./swagger.json', JSON.stringify(openApi.get(), null, 2));
 ```
 
 OpenAPI (Swagger) with Bearer Authentication
 
 ```ts
 import { useSofa, OpenAPI } from 'sofa-api';
+import { writeFileSync } from 'fs';
 
 const openApi = OpenAPI({
   schema,
@@ -369,7 +338,7 @@ app.use(
 );
 
 // writes every recorder route
-openApi.save('./swagger.yml');
+writeFileSync('./swagger.json', JSON.stringify(openApi.get(), null, 2));
 ```
 
 ## License

package/index.d.ts

@@ -1,38 +1,3 @@
-/// <reference types="node" />
-import * as http from 'http';
-import type { ContextValue } from './types';
 import type { SofaConfig } from './sofa';
 export { OpenAPI } from './open-api';
-declare type Request = http.IncomingMessage & {
-    method: string;
-    url: string;
-    originalUrl?: string;
-    body?: any;
-};
-declare type NextFunction = (err?: any) => void;
-declare type Middleware = (req: Request, res: http.ServerResponse, next: NextFunction) => unknown;
-export declare type ContextFn = (init: {
-    req: any;
-    res: any;
-}) => ContextValue;
-export declare function isContextFn(context: any): context is ContextFn;
-interface SofaMiddlewareConfig extends SofaConfig {
-    context?: ContextValue | ContextFn;
-}
-export declare function useSofa({ context, ...config }: SofaMiddlewareConfig): Middleware;
-export declare function createSofaRouter(config: SofaConfig): (request: {
-    method: string;
-    url: string;
-    body: any;
-    contextValue: ContextValue;
-}) => Promise<({
-    type: "result";
-    status: number;
-    statusMessage?: string | undefined;
-    body: any;
-} | {
-    type: "error";
-    status: number;
-    statusMessage?: string | undefined;
-    error: any;
-}) | null>;
+export declare function useSofa(config: SofaConfig): import("@whatwg-node/server").ServerAdapter<unknown, import("itty-router").Router<import("itty-router").Request & Request, {}>>;

package/index.js

@@ -6,14 +6,13 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 const tslib = require('tslib');
 const graphql = require('graphql');
-const Trouter = _interopDefault(require('trouter'));
+const ittyRouter = require('itty-router');
 const utils = require('@graphql-tools/utils');
 const paramCase = require('param-case');
 const uuid = require('uuid');
-const crossUndiciFetch = require('cross-undici-fetch');
+const fetch = require('@whatwg-node/fetch');
 const colors = _interopDefault(require('ansi-colors'));
-const jsYaml = require('js-yaml');
-const fs = require('fs');
+const server = require('@whatwg-node/server');
 const titleCase = require('title-case');
 
 function getOperationInfo(doc) {
@@ -62,7 +61,7 @@ function resolveVariable({ value, type, schema, }) {
         return value;
     }
     if (type.kind === graphql.Kind.LIST_TYPE) {
-        return (Array.isArray(value) ? value : [value]).map(val => resolveVariable({
+        return (Array.isArray(value) ? value : [value]).map((val) => resolveVariable({
             value: val,
             type: type.type,
             schema,
@@ -181,7 +180,7 @@ class SubscriptionManager {
                 }
                 return Object.assign(Object.assign({}, values), { [name]: value });
             }, {});
-            const execution = yield graphql.subscribe({
+            const execution = yield this.sofa.subscribe({
                 schema: this.sofa.schema,
                 document,
                 operationName,
@@ -236,12 +235,12 @@ class SubscriptionManager {
             }
             const { url } = this.clients.get(id);
             logger.info(`[Subscription] Trigger ${id}`);
-            const response = yield crossUndiciFetch.fetch(url, {
+            const response = yield fetch.fetch(url, {
                 method: 'POST',
                 body: JSON.stringify(result),
                 headers: {
                     'Content-Type': 'application/json',
-                }
+                },
             });
             yield response.text();
         });
@@ -277,7 +276,9 @@ class SubscriptionManager {
 
 function createRouter(sofa) {
     logger.debug('[Sofa] Creating router');
-    const router = new Trouter();
+    const router = ittyRouter.Router({
+        base: sofa.basePath,
+    });
     const queryType = sofa.schema.getQueryType();
     const mutationType = sofa.schema.getMutationType();
     const subscriptionManager = new SubscriptionManager(sofa);
@@ -297,92 +298,77 @@ function createRouter(sofa) {
             }
         });
     }
-    router.post('/webhook', ({ body, contextValue }) => tslib.__awaiter(this, void 0, void 0, function* () {
-        const { subscription, variables, url } = body;
+    router.post('/webhook', (request, serverContext) => tslib.__awaiter(this, void 0, void 0, function* () {
+        const { subscription, variables, url } = yield request.json();
         try {
+            const contextValue = yield sofa.contextFactory(serverContext);
             const result = yield subscriptionManager.start({
                 subscription,
                 variables,
                 url,
             }, contextValue);
-            return {
-                type: 'result',
+            return new fetch.Response(JSON.stringify(result), {
                 status: 200,
-                statusMessage: 'OK',
-                body: result,
-            };
+                statusText: 'OK',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            });
         }
         catch (error) {
-            return {
-                type: 'error',
+            return new fetch.Response(JSON.stringify(error), {
                 status: 500,
-                statusMessage: 'Subscription failed',
-                error,
-            };
+                statusText: 'Subscription failed',
+            });
         }
     }));
-    router.post('/webhook/:id', ({ body, params, contextValue }) => tslib.__awaiter(this, void 0, void 0, function* () {
-        const id = params.id;
+    router.post('/webhook/:id', (request, serverContext) => tslib.__awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const id = (_a = request.params) === null || _a === void 0 ? void 0 : _a.id;
+        const body = yield request.json();
         const variables = body.variables;
         try {
+            const contextValue = yield sofa.contextFactory(serverContext);
             const result = yield subscriptionManager.update({
                 id,
                 variables,
             }, contextValue);
-            return {
-                type: 'result',
+            return new fetch.Response(JSON.stringify(result), {
                 status: 200,
-                statusMessage: 'OK',
-                body: result,
-            };
+                statusText: 'OK',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            });
         }
         catch (error) {
-            return {
-                type: 'error',
+            return new fetch.Response(JSON.stringify(error), {
                 status: 500,
-                statusMessage: 'Subscription failed to update',
-                error,
-            };
+                statusText: 'Subscription failed to update',
+            });
         }
     }));
-    router.delete('/webhook/:id', ({ params }) => tslib.__awaiter(this, void 0, void 0, function* () {
-        const id = params.id;
+    router.delete('/webhook/:id', (request) => tslib.__awaiter(this, void 0, void 0, function* () {
+        var _b;
+        const id = (_b = request.params) === null || _b === void 0 ? void 0 : _b.id;
         try {
             const result = yield subscriptionManager.stop(id);
-            return {
-                type: 'result',
+            return new fetch.Response(JSON.stringify(result), {
                 status: 200,
-                statusMessage: 'OK',
-                body: result,
-            };
+                statusText: 'OK',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            });
         }
         catch (error) {
-            return {
-                type: 'error',
+            return new fetch.Response(JSON.stringify(error), {
                 status: 500,
-                statusMessage: 'Subscription failed to stop',
-                error,
-            };
-        }
-    }));
-    return ({ method, url, body, contextValue }) => tslib.__awaiter(this, void 0, void 0, function* () {
-        if (!url.startsWith(sofa.basePath)) {
-            return null;
-        }
-        // trim base path and search
-        const [slicedUrl] = url.slice(sofa.basePath.length).split('?');
-        const trouterMethod = method.toUpperCase();
-        const obj = router.find(trouterMethod, slicedUrl);
-        for (const handler of obj.handlers) {
-            return yield handler({
-                url,
-                body,
-                params: obj.params,
-                contextValue,
+                statusText: 'Subscription failed to stop',
             });
         }
-        return null;
-    });
+    }));
+    return router;
 }
 function createQueryRoute({ sofa, router, fieldName, }) {
     var _a, _b, _c, _d;
@@ -413,7 +399,7 @@ function createQueryRoute({ sofa, router, fieldName, }) {
         path: (_c = routeConfig === null || routeConfig === void 0 ? void 0 : routeConfig.path) !== null && _c !== void 0 ? _c : getPath(fieldName, isSingle && hasIdArgument),
         responseStatus: (_d = routeConfig === null || routeConfig === void 0 ? void 0 : routeConfig.responseStatus) !== null && _d !== void 0 ? _d : 200,
     };
-    router[route.method.toLocaleLowerCase()](route.path, useHandler({ info, route, fieldName, sofa, operation }));
+    router[route.method](route.path, useHandler({ info, route, fieldName, sofa, operation }));
     logger.debug(`[Router] ${fieldName} query available at ${route.method} ${route.path}`);
     return {
         document: operation,
@@ -446,7 +432,7 @@ function createMutationRoute({ sofa, router, fieldName, }) {
         responseStatus: (_d = routeConfig === null || routeConfig === void 0 ? void 0 : routeConfig.responseStatus) !== null && _d !== void 0 ? _d : 200,
     };
     const { method, path } = route;
-    router[method.toLowerCase()](path, useHandler({ info, route, fieldName, sofa, operation }));
+    router[method](path, useHandler({ info, route, fieldName, sofa, operation }));
     logger.debug(`[Router] ${fieldName} mutation available at ${method} ${path}`);
     return {
         document: operation,
@@ -457,11 +443,24 @@ function createMutationRoute({ sofa, router, fieldName, }) {
 function useHandler(config) {
     const { sofa, operation, fieldName } = config;
     const info = config.info;
-    return ({ url, body, params, contextValue }) => tslib.__awaiter(this, void 0, void 0, function* () {
+    return (request, serverContext) => tslib.__awaiter(this, void 0, void 0, function* () {
+        var _a;
+        let body = {};
+        if (request.body != null) {
+            const strBody = yield request.text();
+            if (strBody) {
+                body = JSON.parse(strBody);
+            }
+        }
         const variableValues = info.variables.reduce((variables, variable) => {
             const name = variable.variable.name.value;
             const value = parseVariable({
-                value: pickParam({ url, body, params, name }),
+                value: pickParam({
+                    url: request.url,
+                    body,
+                    params: request.params || {},
+                    name,
+                }),
                 variable,
                 schema: sofa.schema,
             });
@@ -470,36 +469,36 @@ function useHandler(config) {
             }
             return Object.assign(Object.assign({}, variables), { [name]: value });
         }, {});
+        const contextValue = yield sofa.contextFactory(serverContext);
         const result = yield sofa.execute({
             schema: sofa.schema,
-            source: graphql.print(operation),
+            document: operation,
             contextValue,
             variableValues,
             operationName: info.operation.name && info.operation.name.value,
         });
         if (result.errors) {
             const defaultErrorHandler = (errors) => {
-                return {
-                    type: 'error',
+                return new fetch.Response(errors[0], {
                     status: 500,
-                    error: errors[0],
-                };
+                });
             };
             const errorHandler = sofa.errorHandler || defaultErrorHandler;
             return errorHandler(result.errors);
         }
-        return {
-            type: 'result',
+        return new fetch.Response(JSON.stringify((_a = result.data) === null || _a === void 0 ? void 0 : _a[fieldName]), {
             status: config.route.responseStatus,
-            body: result.data && result.data[fieldName],
-        };
+            headers: {
+                'Content-Type': 'application/json',
+            },
+        });
     });
 }
 function getPath(fieldName, hasId = false) {
     return `/${convertName(fieldName)}${hasId ? '/:id' : ''}`;
 }
 function pickParam({ name, url, params, body, }) {
-    if (params && params.hasOwnProperty(name)) {
+    if (name in params) {
         return params[name];
     }
     const searchParams = new URLSearchParams(url.split('?')[1]);
@@ -519,9 +518,25 @@ function createSofa(config) {
     const depthLimit = config.depthLimit || 1;
     logger.debug(`[Sofa] models: ${models.join(', ')}`);
     logger.debug(`[Sofa] ignore: ${ignore.join(', ')}`);
-    return Object.assign({ execute: graphql.graphql, models,
+    return Object.assign({ execute: graphql.execute,
+        subscribe: graphql.subscribe,
+        models,
         ignore,
-        depthLimit }, config);
+        depthLimit,
+        contextFactory(serverContext) {
+            if (config.context != null) {
+                if (isContextFn(config.context)) {
+                    return config.context(serverContext);
+                }
+                else {
+                    return config.context;
+                }
+            }
+            return serverContext;
+        } }, config);
+}
+function isContextFn(context) {
+    return typeof context === 'function';
 }
 // Objects and Unions are the only things that are used to define return types
 // and both might contain an ID
@@ -706,7 +721,7 @@ function resolveRequestBody(variables) {
     }
     const properties = {};
     const required = [];
-    variables.forEach(variable => {
+    variables.forEach((variable) => {
         if (variable.type.kind === graphql.Kind.NON_NULL_TYPE) {
             required.push(variable.variable.name.value);
         }
@@ -762,7 +777,7 @@ function resolveDescription(schema, operation) {
     if (!isObjectTypeDefinitionNode(definitionNode)) {
         return '';
     }
-    const fieldNode = definitionNode.fields.find(field => field.name.value === fieldName);
+    const fieldNode = definitionNode.fields.find((field) => field.name.value === fieldName);
     const descriptionDefinition = fieldNode && fieldNode.description;
     return descriptionDefinition && descriptionDefinition.value
         ? descriptionDefinition.value
@@ -815,84 +830,12 @@ function OpenAPI({ schema, info, servers, components, security, tags, }) {
         get() {
             return swagger;
         },
-        save(filepath) {
-            const isJSON = /\.json$/i;
-            const isYAML = /.ya?ml$/i;
-            if (isJSON.test(filepath)) {
-                writeOutput(filepath, JSON.stringify(swagger, null, 2));
-            }
-            else if (isYAML.test(filepath)) {
-                writeOutput(filepath, jsYaml.dump(swagger));
-            }
-            else {
-                throw new Error('We only support JSON and YAML files');
-            }
-        },
     };
-}
-function writeOutput(filepath, contents) {
-    fs.writeFileSync(filepath, contents, {
-        encoding: 'utf-8',
-    });
 }
 
-function isContextFn(context) {
-    return typeof context === 'function';
-}
-function useSofa(_a) {
-    var { context } = _a, config = tslib.__rest(_a, ["context"]);
-    const invokeSofa = createSofaRouter(config);
-    return (req, res, next) => tslib.__awaiter(this, void 0, void 0, function* () {
-        var _b;
-        try {
-            let contextValue = { req };
-            if (context) {
-                if (typeof context === 'function') {
-                    contextValue = yield context({ req, res });
-                }
-                else {
-                    contextValue = context;
-                }
-            }
-            const response = yield invokeSofa({
-                method: req.method,
-                url: (_b = req.originalUrl) !== null && _b !== void 0 ? _b : req.url,
-                body: req.body,
-                contextValue,
-            });
-            if (response == null) {
-                next();
-            }
-            else {
-                const headers = {
-                    'Content-Type': 'application/json',
-                };
-                if (response.statusMessage) {
-                    res.writeHead(response.status, response.statusMessage, headers);
-                }
-                else {
-                    res.writeHead(response.status, headers);
-                }
-                if (response.type === 'result') {
-                    res.end(JSON.stringify(response.body));
-                }
-                if (response.type === 'error') {
-                    res.end(JSON.stringify(response.error));
-                }
-            }
-        }
-        catch (error) {
-            next(error);
-        }
-    });
-}
-function createSofaRouter(config) {
-    const sofa = createSofa(config);
-    const router = createRouter(sofa);
-    return router;
+function useSofa(config) {
+    return server.createServerAdapter(createRouter(createSofa(config)));
 }
 
 exports.OpenAPI = OpenAPI;
-exports.createSofaRouter = createSofaRouter;
-exports.isContextFn = isContextFn;
 exports.useSofa = useSofa;

package/index.mjs

@@ -1,13 +1,12 @@
-import { __awaiter, __asyncValues, __rest } from 'tslib';
-import { getOperationAST, Kind, isScalarType, isEqualType, GraphQLBoolean, isInputObjectType, subscribe, isObjectType, isNonNullType, print, graphql, getNamedType, isListType, isEnumType, parse, printType, isIntrospectionType } from 'graphql';
-import Trouter from 'trouter';
+import { __awaiter, __asyncValues } from 'tslib';
+import { getOperationAST, Kind, isScalarType, isEqualType, GraphQLBoolean, isInputObjectType, isObjectType, isNonNullType, execute, subscribe, getNamedType, isListType, isEnumType, parse, printType, isIntrospectionType } from 'graphql';
+import { Router } from 'itty-router';
 import { buildOperationNodeForField } from '@graphql-tools/utils';
 import { paramCase } from 'param-case';
 import { v4 } from 'uuid';
-import { fetch } from 'cross-undici-fetch';
+import { fetch, Response } from '@whatwg-node/fetch';
 import colors from 'ansi-colors';
-import { dump } from 'js-yaml';
-import { writeFileSync } from 'fs';
+import { createServerAdapter } from '@whatwg-node/server';
 import { titleCase } from 'title-case';
 
 function getOperationInfo(doc) {
@@ -56,7 +55,7 @@ function resolveVariable({ value, type, schema, }) {
         return value;
     }
     if (type.kind === Kind.LIST_TYPE) {
-        return (Array.isArray(value) ? value : [value]).map(val => resolveVariable({
+        return (Array.isArray(value) ? value : [value]).map((val) => resolveVariable({
             value: val,
             type: type.type,
             schema,
@@ -175,7 +174,7 @@ class SubscriptionManager {
                 }
                 return Object.assign(Object.assign({}, values), { [name]: value });
             }, {});
-            const execution = yield subscribe({
+            const execution = yield this.sofa.subscribe({
                 schema: this.sofa.schema,
                 document,
                 operationName,
@@ -235,7 +234,7 @@ class SubscriptionManager {
                 body: JSON.stringify(result),
                 headers: {
                     'Content-Type': 'application/json',
-                }
+                },
             });
             yield response.text();
         });
@@ -271,7 +270,9 @@ class SubscriptionManager {
 
 function createRouter(sofa) {
     logger.debug('[Sofa] Creating router');
-    const router = new Trouter();
+    const router = Router({
+        base: sofa.basePath,
+    });
     const queryType = sofa.schema.getQueryType();
     const mutationType = sofa.schema.getMutationType();
     const subscriptionManager = new SubscriptionManager(sofa);
@@ -291,92 +292,77 @@ function createRouter(sofa) {
             }
         });
     }
-    router.post('/webhook', ({ body, contextValue }) => __awaiter(this, void 0, void 0, function* () {
-        const { subscription, variables, url } = body;
+    router.post('/webhook', (request, serverContext) => __awaiter(this, void 0, void 0, function* () {
+        const { subscription, variables, url } = yield request.json();
         try {
+            const contextValue = yield sofa.contextFactory(serverContext);
             const result = yield subscriptionManager.start({
                 subscription,
                 variables,
                 url,
             }, contextValue);
-            return {
-                type: 'result',
+            return new Response(JSON.stringify(result), {
                 status: 200,
-                statusMessage: 'OK',
-                body: result,
-            };
+                statusText: 'OK',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            });
         }
         catch (error) {
-            return {
-                type: 'error',
+            return new Response(JSON.stringify(error), {
                 status: 500,
-                statusMessage: 'Subscription failed',
-                error,
-            };
+                statusText: 'Subscription failed',
+            });
         }
     }));
-    router.post('/webhook/:id', ({ body, params, contextValue }) => __awaiter(this, void 0, void 0, function* () {
-        const id = params.id;
+    router.post('/webhook/:id', (request, serverContext) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const id = (_a = request.params) === null || _a === void 0 ? void 0 : _a.id;
+        const body = yield request.json();
         const variables = body.variables;
         try {
+            const contextValue = yield sofa.contextFactory(serverContext);
             const result = yield subscriptionManager.update({
                 id,
                 variables,
             }, contextValue);
-            return {
-                type: 'result',
+            return new Response(JSON.stringify(result), {
                 status: 200,
-                statusMessage: 'OK',
-                body: result,
-            };
+                statusText: 'OK',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            });
         }
         catch (error) {
-            return {
-                type: 'error',
+            return new Response(JSON.stringify(error), {
                 status: 500,
-                statusMessage: 'Subscription failed to update',
-                error,
-            };
+                statusText: 'Subscription failed to update',
+            });
         }
     }));
-    router.delete('/webhook/:id', ({ params }) => __awaiter(this, void 0, void 0, function* () {
-        const id = params.id;
+    router.delete('/webhook/:id', (request) => __awaiter(this, void 0, void 0, function* () {
+        var _b;
+        const id = (_b = request.params) === null || _b === void 0 ? void 0 : _b.id;
         try {
             const result = yield subscriptionManager.stop(id);
-            return {
-                type: 'result',
+            return new Response(JSON.stringify(result), {
                 status: 200,
-                statusMessage: 'OK',
-                body: result,
-            };
+                statusText: 'OK',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            });
         }
         catch (error) {
-            return {
-                type: 'error',
+            return new Response(JSON.stringify(error), {
                 status: 500,
-                statusMessage: 'Subscription failed to stop',
-                error,
-            };
-        }
-    }));
-    return ({ method, url, body, contextValue }) => __awaiter(this, void 0, void 0, function* () {
-        if (!url.startsWith(sofa.basePath)) {
-            return null;
-        }
-        // trim base path and search
-        const [slicedUrl] = url.slice(sofa.basePath.length).split('?');
-        const trouterMethod = method.toUpperCase();
-        const obj = router.find(trouterMethod, slicedUrl);
-        for (const handler of obj.handlers) {
-            return yield handler({
-                url,
-                body,
-                params: obj.params,
-                contextValue,
+                statusText: 'Subscription failed to stop',
             });
         }
-        return null;
-    });
+    }));
+    return router;
 }
 function createQueryRoute({ sofa, router, fieldName, }) {
     var _a, _b, _c, _d;
@@ -407,7 +393,7 @@ function createQueryRoute({ sofa, router, fieldName, }) {
         path: (_c = routeConfig === null || routeConfig === void 0 ? void 0 : routeConfig.path) !== null && _c !== void 0 ? _c : getPath(fieldName, isSingle && hasIdArgument),
         responseStatus: (_d = routeConfig === null || routeConfig === void 0 ? void 0 : routeConfig.responseStatus) !== null && _d !== void 0 ? _d : 200,
     };
-    router[route.method.toLocaleLowerCase()](route.path, useHandler({ info, route, fieldName, sofa, operation }));
+    router[route.method](route.path, useHandler({ info, route, fieldName, sofa, operation }));
     logger.debug(`[Router] ${fieldName} query available at ${route.method} ${route.path}`);
     return {
         document: operation,
@@ -440,7 +426,7 @@ function createMutationRoute({ sofa, router, fieldName, }) {
         responseStatus: (_d = routeConfig === null || routeConfig === void 0 ? void 0 : routeConfig.responseStatus) !== null && _d !== void 0 ? _d : 200,
     };
     const { method, path } = route;
-    router[method.toLowerCase()](path, useHandler({ info, route, fieldName, sofa, operation }));
+    router[method](path, useHandler({ info, route, fieldName, sofa, operation }));
     logger.debug(`[Router] ${fieldName} mutation available at ${method} ${path}`);
     return {
         document: operation,
@@ -451,11 +437,24 @@ function createMutationRoute({ sofa, router, fieldName, }) {
 function useHandler(config) {
     const { sofa, operation, fieldName } = config;
     const info = config.info;
-    return ({ url, body, params, contextValue }) => __awaiter(this, void 0, void 0, function* () {
+    return (request, serverContext) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        let body = {};
+        if (request.body != null) {
+            const strBody = yield request.text();
+            if (strBody) {
+                body = JSON.parse(strBody);
+            }
+        }
         const variableValues = info.variables.reduce((variables, variable) => {
             const name = variable.variable.name.value;
             const value = parseVariable({
-                value: pickParam({ url, body, params, name }),
+                value: pickParam({
+                    url: request.url,
+                    body,
+                    params: request.params || {},
+                    name,
+                }),
                 variable,
                 schema: sofa.schema,
             });
@@ -464,36 +463,36 @@ function useHandler(config) {
             }
             return Object.assign(Object.assign({}, variables), { [name]: value });
         }, {});
+        const contextValue = yield sofa.contextFactory(serverContext);
         const result = yield sofa.execute({
             schema: sofa.schema,
-            source: print(operation),
+            document: operation,
             contextValue,
             variableValues,
             operationName: info.operation.name && info.operation.name.value,
         });
         if (result.errors) {
             const defaultErrorHandler = (errors) => {
-                return {
-                    type: 'error',
+                return new Response(errors[0], {
                     status: 500,
-                    error: errors[0],
-                };
+                });
             };
             const errorHandler = sofa.errorHandler || defaultErrorHandler;
             return errorHandler(result.errors);
         }
-        return {
-            type: 'result',
+        return new Response(JSON.stringify((_a = result.data) === null || _a === void 0 ? void 0 : _a[fieldName]), {
             status: config.route.responseStatus,
-            body: result.data && result.data[fieldName],
-        };
+            headers: {
+                'Content-Type': 'application/json',
+            },
+        });
     });
 }
 function getPath(fieldName, hasId = false) {
     return `/${convertName(fieldName)}${hasId ? '/:id' : ''}`;
 }
 function pickParam({ name, url, params, body, }) {
-    if (params && params.hasOwnProperty(name)) {
+    if (name in params) {
         return params[name];
     }
     const searchParams = new URLSearchParams(url.split('?')[1]);
@@ -513,9 +512,25 @@ function createSofa(config) {
     const depthLimit = config.depthLimit || 1;
     logger.debug(`[Sofa] models: ${models.join(', ')}`);
     logger.debug(`[Sofa] ignore: ${ignore.join(', ')}`);
-    return Object.assign({ execute: graphql, models,
+    return Object.assign({ execute,
+        subscribe,
+        models,
         ignore,
-        depthLimit }, config);
+        depthLimit,
+        contextFactory(serverContext) {
+            if (config.context != null) {
+                if (isContextFn(config.context)) {
+                    return config.context(serverContext);
+                }
+                else {
+                    return config.context;
+                }
+            }
+            return serverContext;
+        } }, config);
+}
+function isContextFn(context) {
+    return typeof context === 'function';
 }
 // Objects and Unions are the only things that are used to define return types
 // and both might contain an ID
@@ -700,7 +715,7 @@ function resolveRequestBody(variables) {
     }
     const properties = {};
     const required = [];
-    variables.forEach(variable => {
+    variables.forEach((variable) => {
         if (variable.type.kind === Kind.NON_NULL_TYPE) {
             required.push(variable.variable.name.value);
         }
@@ -756,7 +771,7 @@ function resolveDescription(schema, operation) {
     if (!isObjectTypeDefinitionNode(definitionNode)) {
         return '';
     }
-    const fieldNode = definitionNode.fields.find(field => field.name.value === fieldName);
+    const fieldNode = definitionNode.fields.find((field) => field.name.value === fieldName);
     const descriptionDefinition = fieldNode && fieldNode.description;
     return descriptionDefinition && descriptionDefinition.value
         ? descriptionDefinition.value
@@ -809,81 +824,11 @@ function OpenAPI({ schema, info, servers, components, security, tags, }) {
         get() {
             return swagger;
         },
-        save(filepath) {
-            const isJSON = /\.json$/i;
-            const isYAML = /.ya?ml$/i;
-            if (isJSON.test(filepath)) {
-                writeOutput(filepath, JSON.stringify(swagger, null, 2));
-            }
-            else if (isYAML.test(filepath)) {
-                writeOutput(filepath, dump(swagger));
-            }
-            else {
-                throw new Error('We only support JSON and YAML files');
-            }
-        },
     };
-}
-function writeOutput(filepath, contents) {
-    writeFileSync(filepath, contents, {
-        encoding: 'utf-8',
-    });
 }
 
-function isContextFn(context) {
-    return typeof context === 'function';
-}
-function useSofa(_a) {
-    var { context } = _a, config = __rest(_a, ["context"]);
-    const invokeSofa = createSofaRouter(config);
-    return (req, res, next) => __awaiter(this, void 0, void 0, function* () {
-        var _b;
-        try {
-            let contextValue = { req };
-            if (context) {
-                if (typeof context === 'function') {
-                    contextValue = yield context({ req, res });
-                }
-                else {
-                    contextValue = context;
-                }
-            }
-            const response = yield invokeSofa({
-                method: req.method,
-                url: (_b = req.originalUrl) !== null && _b !== void 0 ? _b : req.url,
-                body: req.body,
-                contextValue,
-            });
-            if (response == null) {
-                next();
-            }
-            else {
-                const headers = {
-                    'Content-Type': 'application/json',
-                };
-                if (response.statusMessage) {
-                    res.writeHead(response.status, response.statusMessage, headers);
-                }
-                else {
-                    res.writeHead(response.status, headers);
-                }
-                if (response.type === 'result') {
-                    res.end(JSON.stringify(response.body));
-                }
-                if (response.type === 'error') {
-                    res.end(JSON.stringify(response.error));
-                }
-            }
-        }
-        catch (error) {
-            next(error);
-        }
-    });
-}
-function createSofaRouter(config) {
-    const sofa = createSofa(config);
-    const router = createRouter(sofa);
-    return router;
+function useSofa(config) {
+    return createServerAdapter(createRouter(createSofa(config)));
 }
 
-export { OpenAPI, createSofaRouter, isContextFn, useSofa };
+export { OpenAPI, useSofa };

package/open-api/index.d.ts

@@ -9,8 +9,7 @@ export declare function OpenAPI({ schema, info, servers, components, security, t
     tags?: Record<string, any>[];
 }): {
     addRoute(info: RouteInfo, config?: {
-        basePath?: string | undefined;
-    } | undefined): void;
+        basePath?: string;
+    }): void;
     get(): any;
-    save(filepath: string): void;
 };

package/package.json

@@ -1,21 +1,20 @@
 {
   "name": "sofa-api",
-  "version": "0.11.2",
+  "version": "0.12.0-alpha.0",
   "description": "Create REST APIs with GraphQL",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^0.13.2 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "8.6.5",
-    "@types/js-yaml": "4.0.5",
-    "ansi-colors": "4.1.1",
-    "cross-undici-fetch": "0.1.28",
-    "js-yaml": "4.1.0",
+    "@graphql-tools/utils": "8.12.0",
+    "@whatwg-node/fetch": "^0.4.3",
+    "@whatwg-node/server": "^0.4.1",
+    "ansi-colors": "4.1.3",
+    "itty-router": "^2.6.1",
     "param-case": "3.0.4",
     "title-case": "3.0.3",
-    "trouter": "3.2.0",
-    "tslib": "2.3.1",
+    "tslib": "2.4.0",
     "uuid": "8.3.2"
   },
   "repository": {
@@ -51,4 +50,4 @@
     },
     "./package.json": "./package.json"
   }
-}
+}

package/router.d.ts

@@ -0,0 +1,6 @@
+import { Request as IttyRequest, Router } from 'itty-router';
+import type { Sofa } from './sofa';
+export declare type ErrorHandler = (errors: ReadonlyArray<any>) => Response;
+declare type SofaRequest = IttyRequest & Request;
+export declare function createRouter(sofa: Sofa): Router<SofaRequest, {}>;
+export {};

package/sofa.d.ts

@@ -1,6 +1,6 @@
-import { GraphQLSchema } from 'graphql';
-import { Ignore, ExecuteFn, OnRoute, Method } from './types';
-import { ErrorHandler } from './express';
+import { GraphQLSchema, subscribe, execute } from 'graphql';
+import { Ignore, OnRoute, Method, ContextFn, ContextValue } from './types';
+import { ErrorHandler } from './router';
 interface RouteConfig {
     method?: Method;
     path?: string;
@@ -14,7 +14,8 @@ export interface Route {
 export interface SofaConfig {
     basePath: string;
     schema: GraphQLSchema;
-    execute?: ExecuteFn;
+    execute?: typeof execute;
+    subscribe?: typeof subscribe;
     /**
      * Treats an Object with an ID as not a model.
      * @example ["User", "Message.author"]
@@ -27,6 +28,7 @@ export interface SofaConfig {
      * Overwrites the default HTTP route.
      */
     routes?: Record<string, RouteConfig>;
+    context?: ContextFn | ContextValue;
 }
 export interface Sofa {
     basePath: string;
@@ -35,9 +37,12 @@ export interface Sofa {
     ignore: Ignore;
     depthLimit: number;
     routes?: Record<string, RouteConfig>;
-    execute: ExecuteFn;
+    execute: typeof execute;
+    subscribe: typeof subscribe;
     onRoute?: OnRoute;
     errorHandler?: ErrorHandler;
+    contextFactory: ContextFn;
 }
 export declare function createSofa(config: SofaConfig): Sofa;
+export declare function isContextFn(context: any): context is ContextFn;
 export {};

package/types.d.ts

@@ -1,7 +1,6 @@
-import { GraphQLArgs, ExecutionResult, DocumentNode } from 'graphql';
+import { DocumentNode } from 'graphql';
 export declare type ContextValue = Record<string, any>;
 export declare type Ignore = string[];
-export declare type ExecuteFn = (args: GraphQLArgs) => Promise<ExecutionResult<any>>;
 export declare type Method = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
 export interface RouteInfo {
     document: DocumentNode;
@@ -9,3 +8,7 @@ export interface RouteInfo {
     method: Method;
 }
 export declare type OnRoute = (info: RouteInfo) => void;
+export declare type ContextFn = (init: {
+    req: any;
+    res: any;
+}) => Promise<ContextValue> | ContextValue;

package/express.d.ts

@@ -1,25 +0,0 @@
-import type { Sofa } from './sofa';
-import type { ContextValue } from './types';
-export declare type ErrorHandler = (errors: ReadonlyArray<any>) => RouterError;
-declare type RouterRequest = {
-    method: string;
-    url: string;
-    body: any;
-    contextValue: ContextValue;
-};
-declare type RouterResult = {
-    type: 'result';
-    status: number;
-    statusMessage?: string;
-    body: any;
-};
-declare type RouterError = {
-    type: 'error';
-    status: number;
-    statusMessage?: string;
-    error: any;
-};
-declare type RouterResponse = RouterResult | RouterError;
-declare type Router = (request: RouterRequest) => Promise<null | RouterResponse>;
-export declare function createRouter(sofa: Sofa): Router;
-export {};