sofa-api 0.11.0 → 0.11.2-alpha.0

package/CHANGELOG.md

@@ -0,0 +1,50 @@
+# Change log
+
+### vNEXT
+
+### v0.7.0
+
+- feat(swagger): custom components and security for OpenAPI [PR #296](https://github.com/Urigo/SOFA/pull/296)
+
+### v0.6.1
+
+- fix(swagger): broken type of ID scalar in generated swagger document [PR #280](https://github.com/Urigo/SOFA/pull/280)
+- fix: do not resolve nil variables [PR #193](https://github.com/Urigo/SOFA/pull/193)
+- fix: use Kind from graphql instead of strings [PR #192](https://github.com/Urigo/SOFA/pull/192)
+- fix: replace request package with Axios [PR #194](https://github.com/Urigo/SOFA/pull/194)
+
+### v0.6.0
+
+- fix(swagger): fix descriptions [PR #178](https://github.com/Urigo/SOFA/pull/178)
+- feat: support GraphQL Interfaces [PR #167](https://github.com/Urigo/SOFA/pull/167)
+
+### v0.5.1
+
+- fix: do not skip falsy values (only null and undefined) [PR #134](https://github.com/Urigo/SOFA/pull/134)
+
+### v0.5.0
+
+- feat(swagger): add description [PR #107](https://github.com/Urigo/SOFA/pull/107)
+- feat(swagger): add `ID` scalar definition [PR #107](https://github.com/Urigo/SOFA/pull/107)
+- fix(swagger): use `requestBody` or `parameters` not both [PR #107](https://github.com/Urigo/SOFA/pull/107)
+- fix(swagger): generate valid YAML structure for nested objects [PR #107](https://github.com/Urigo/SOFA/pull/107)
+- fix(swagger): avoid empty `required` array [PR #107](https://github.com/Urigo/SOFA/pull/107)
+
+### v0.4.0
+
+- feat: add error handler [PR #44](https://github.com/Urigo/SOFA/pull/44) [PR #45](https://github.com/Urigo/SOFA/pull/45)
+- feat: allow to customize endpoint's HTTP Method [PR #46](https://github.com/Urigo/SOFA/pull/46)
+- feat: add InputTypeObjects to OpenAPI generation [PR #34](https://github.com/Urigo/SOFA/pull/34) - [@hajnalben](https://github.com/hajnalben)
+
+### v0.3.0
+
+- fix: parse InputTypeObject with JSON.parse [PR #30](https://github.com/Urigo/SOFA/pull/30)
+- feat: custom `depthLimit` (circular references) [PR #29](https://github.com/Urigo/SOFA/pull/29)
+
+### v0.2.3
+
+- fix: prevent circular references [PR #23](https://github.com/Urigo/SOFA/pull/23)
+
+### v0.2.2
+
+We didn't track changes before this version.

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/bob.config.js

@@ -0,0 +1 @@
+module.exports = {};

package/bump.js

@@ -0,0 +1,18 @@
+const semver = require('semver');
+const packageJson = require('./package.json');
+const fs = require('fs');
+const cp = require('child_process');
+
+const gitHash = cp
+  .spawnSync('git', ['rev-parse', '--short', 'HEAD'])
+  .stdout.toString()
+  .trim();
+const alphaVersion = semver.inc(
+  packageJson.version,
+  'prerelease',
+  true,
+  gitHash
+);
+packageJson.version = alphaVersion;
+
+fs.writeFileSync('./package.json', JSON.stringify(packageJson, null, 2));

package/dist/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Uri Goldshtein
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/index.d.ts

@@ -0,0 +1,16 @@
+/// <reference types="node" />
+import * as http from 'http';
+import type { ContextValue } from './types';
+import type { SofaConfig } from './sofa';
+import { ServerAdapter } from '@whatwg-node/server';
+export { OpenAPI } from './open-api';
+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): ServerAdapter<http.IncomingMessage, http.ServerResponse>;
+export declare function createSofaRouter(config: SofaConfig): import("itty-router").Router<import("itty-router").Request, {}>;

package/{index.js → dist/index.js}

@@ -6,12 +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 axios = _interopDefault(require('axios'));
-const colors = require('ansi-colors');
+const fetch = require('@whatwg-node/fetch');
+const colors = _interopDefault(require('ansi-colors'));
+const server = require('@whatwg-node/server');
 const jsYaml = require('js-yaml');
 const fs = require('fs');
 const titleCase = require('title-case');
@@ -236,7 +237,14 @@ class SubscriptionManager {
             }
             const { url } = this.clients.get(id);
             logger.info(`[Subscription] Trigger ${id}`);
-            yield axios.post(url, result);
+            const response = yield fetch.fetch(url, {
+                method: 'POST',
+                body: JSON.stringify(result),
+                headers: {
+                    'Content-Type': 'application/json',
+                }
+            });
+            yield response.text();
         });
     }
     buildOperations() {
@@ -270,7 +278,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);
@@ -290,92 +300,75 @@ 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, contextValue) => tslib.__awaiter(this, void 0, void 0, function* () {
+        const { subscription, variables, url } = yield request.json();
         try {
             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, contextValue) => 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 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;
@@ -406,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,
@@ -439,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,
@@ -450,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, contextValue) => 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,
             });
@@ -472,27 +478,26 @@ function useHandler(config) {
         });
         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]);
@@ -559,24 +564,8 @@ function extractsModels(schema) {
 }
 // it's dumb but let's leave it for now
 function isArrayOf(type, expected) {
-    if (isOptionalList(type)) {
-        return true;
-    }
-    if (graphql.isNonNullType(type) && isOptionalList(type.ofType)) {
-        return true;
-    }
-    function isOptionalList(list) {
-        if (graphql.isListType(list)) {
-            if (list.ofType.name === expected.name) {
-                return true;
-            }
-            if (graphql.isNonNullType(list.ofType) &&
-                list.ofType.ofType.name === expected.name) {
-                return true;
-            }
-        }
-    }
-    return false;
+    const typeNameInSdl = type.toString();
+    return (typeNameInSdl.includes('[') && typeNameInSdl.includes(expected.toString()));
 }
 function hasID(type) {
     return graphql.isObjectType(type) && !!type.getFields().id;
@@ -849,50 +838,10 @@ 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);
-        }
+    var config = tslib.__rest(_a, ["context"]);
+    const sofaRouter = createSofaRouter(config);
+    return server.createServerAdapter({
+        handleRequest: sofaRouter.handle,
     });
 }
 function createSofaRouter(config) {

package/{index.mjs → dist/index.mjs}

@@ -1,11 +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 { Router } from 'itty-router';
 import { buildOperationNodeForField } from '@graphql-tools/utils';
 import { paramCase } from 'param-case';
 import { v4 } from 'uuid';
-import axios from 'axios';
-import { red, yellow, green, blue } from 'ansi-colors';
+import { fetch, Response } from '@whatwg-node/fetch';
+import colors from 'ansi-colors';
+import { createServerAdapter } from '@whatwg-node/server';
 import { dump } from 'js-yaml';
 import { writeFileSync } from 'fs';
 import { titleCase } from 'title-case';
@@ -84,16 +85,16 @@ const log = (level, color, args) => {
 };
 const logger = {
     error: (...args) => {
-        log('error', red, args);
+        log('error', colors.red, args);
     },
     warn: (...args) => {
-        log('warn', yellow, args);
+        log('warn', colors.yellow, args);
     },
     info: (...args) => {
-        log('info', green, args);
+        log('info', colors.green, args);
     },
     debug: (...args) => {
-        log('debug', blue, args);
+        log('debug', colors.blue, args);
     },
 };
 
@@ -230,7 +231,14 @@ class SubscriptionManager {
             }
             const { url } = this.clients.get(id);
             logger.info(`[Subscription] Trigger ${id}`);
-            yield axios.post(url, result);
+            const response = yield fetch(url, {
+                method: 'POST',
+                body: JSON.stringify(result),
+                headers: {
+                    'Content-Type': 'application/json',
+                }
+            });
+            yield response.text();
         });
     }
     buildOperations() {
@@ -264,7 +272,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);
@@ -284,92 +294,75 @@ function createRouter(sofa) {
             }
         });
     }
-    router.post('/webhook', ({ body, contextValue }) => __awaiter(this, void 0, void 0, function* () {
-        const { subscription, variables, url } = body;
+    router.post('/webhook', (request, contextValue) => __awaiter(this, void 0, void 0, function* () {
+        const { subscription, variables, url } = yield request.json();
         try {
             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, contextValue) => __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 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;
@@ -400,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,
@@ -433,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,
@@ -444,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, contextValue) => __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,
             });
@@ -466,27 +472,26 @@ function useHandler(config) {
         });
         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]);
@@ -553,24 +558,8 @@ function extractsModels(schema) {
 }
 // it's dumb but let's leave it for now
 function isArrayOf(type, expected) {
-    if (isOptionalList(type)) {
-        return true;
-    }
-    if (isNonNullType(type) && isOptionalList(type.ofType)) {
-        return true;
-    }
-    function isOptionalList(list) {
-        if (isListType(list)) {
-            if (list.ofType.name === expected.name) {
-                return true;
-            }
-            if (isNonNullType(list.ofType) &&
-                list.ofType.ofType.name === expected.name) {
-                return true;
-            }
-        }
-    }
-    return false;
+    const typeNameInSdl = type.toString();
+    return (typeNameInSdl.includes('[') && typeNameInSdl.includes(expected.toString()));
 }
 function hasID(type) {
     return isObjectType(type) && !!type.getFields().id;
@@ -843,50 +832,10 @@ 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);
-        }
+    var config = __rest(_a, ["context"]);
+    const sofaRouter = createSofaRouter(config);
+    return createServerAdapter({
+        handleRequest: sofaRouter.handle,
     });
 }
 function createSofaRouter(config) {

package/{open-api → dist/open-api}/index.d.ts

@@ -9,8 +9,8 @@ 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/dist/open-api/types.d.ts

@@ -0,0 +1,3 @@
+import { GraphQLObjectType, GraphQLInputObjectType, GraphQLType } from 'graphql';
+export declare function buildSchemaObjectFromType(type: GraphQLObjectType | GraphQLInputObjectType): any;
+export declare function resolveFieldType(type: GraphQLType): any;

package/dist/package.json

@@ -0,0 +1,56 @@
+{
+  "name": "sofa-api",
+  "version": "0.11.1",
+  "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.8.0",
+    "@types/js-yaml": "4.0.5",
+    "@whatwg-node/fetch": "^0.0.2",
+    "@whatwg-node/server": "^0.0.2",
+    "ansi-colors": "4.1.3",
+    "itty-router": "^2.6.1",
+    "js-yaml": "4.1.0",
+    "param-case": "3.0.4",
+    "title-case": "3.0.3",
+    "trouter": "3.2.0",
+    "tslib": "2.4.0",
+    "uuid": "8.3.2"
+  },
+  "repository": {
+    "type": "git",
+    "url": "Urigo/sofa"
+  },
+  "keywords": [
+    "api",
+    "rest",
+    "graphql",
+    "sofa"
+  ],
+  "author": {
+    "name": "Uri Goldshtein",
+    "email": "uri.goldshtein@gmail.com",
+    "url": "https://github.com/Urigo"
+  },
+  "license": "MIT",
+  "main": "index.js",
+  "module": "index.mjs",
+  "typings": "index.d.ts",
+  "typescript": {
+    "definition": "index.d.ts"
+  },
+  "exports": {
+    ".": {
+      "require": "./index.js",
+      "import": "./index.mjs"
+    },
+    "./*": {
+      "require": "./*.js",
+      "import": "./*.mjs"
+    },
+    "./package.json": "./package.json"
+  }
+}

package/dist/router.d.ts

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

package/{sofa.d.ts → dist/sofa.d.ts}

@@ -1,6 +1,6 @@
 import { GraphQLSchema } from 'graphql';
 import { Ignore, ExecuteFn, OnRoute, Method } from './types';
-import { ErrorHandler } from './express';
+import { ErrorHandler } from './router';
 interface RouteConfig {
     method?: Method;
     path?: string;

package/{subscriptions.d.ts → dist/subscriptions.d.ts}

@@ -20,19 +20,11 @@ export declare class SubscriptionManager {
     private operations;
     private clients;
     constructor(sofa: Sofa);
-    start(event: StartSubscriptionEvent, contextValue: ContextValue): Promise<ExecutionResult<{
-        [key: string]: any;
-    }, {
-        [key: string]: any;
-    }> | {
+    start(event: StartSubscriptionEvent, contextValue: ContextValue): Promise<ExecutionResult<import("graphql/jsutils/ObjMap").ObjMap<unknown>, import("graphql/jsutils/ObjMap").ObjMap<unknown>> | {
         id: string;
     }>;
     stop(id: ID): Promise<StopSubscriptionResponse>;
-    update(event: UpdateSubscriptionEvent, contextValue: ContextValue): Promise<ExecutionResult<{
-        [key: string]: any;
-    }, {
-        [key: string]: any;
-    }> | {
+    update(event: UpdateSubscriptionEvent, contextValue: ContextValue): Promise<ExecutionResult<import("graphql/jsutils/ObjMap").ObjMap<unknown>, import("graphql/jsutils/ObjMap").ObjMap<unknown>> | {
         id: string;
     }>;
     private execute;

package/package.json

@@ -1,53 +1,108 @@
 {
   "name": "sofa-api",
-  "version": "0.11.0",
   "description": "Create REST APIs with GraphQL",
-  "sideEffects": false,
-  "peerDependencies": {
-    "graphql": "^0.13.2 || ^14.0.0 || ^15.0.0"
+  "version": "0.11.2-alpha.0",
+  "buildOptions": {
+    "input": "./src/index.ts"
   },
-  "dependencies": {
-    "@graphql-tools/utils": "8.1.1",
-    "@types/js-yaml": "4.0.2",
-    "ansi-colors": "4.1.1",
-    "axios": "0.21.1",
-    "js-yaml": "4.1.0",
-    "param-case": "3.0.4",
-    "title-case": "3.0.3",
-    "trouter": "3.2.0",
-    "tslib": "2.3.1",
-    "uuid": "8.3.2"
+  "sideEffects": false,
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "exports": {
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs"
+    },
+    "./*": {
+      "require": "./dist/*.js",
+      "import": "./dist/*.mjs"
+    }
   },
-  "repository": {
-    "type": "git",
-    "url": "Urigo/sofa"
+  "typings": "dist/index.d.ts",
+  "typescript": {
+    "definition": "dist/index.d.ts"
   },
+  "license": "MIT",
   "keywords": [
     "api",
     "rest",
     "graphql",
     "sofa"
   ],
+  "repository": {
+    "type": "git",
+    "url": "Urigo/sofa"
+  },
   "author": {
     "name": "Uri Goldshtein",
     "email": "uri.goldshtein@gmail.com",
     "url": "https://github.com/Urigo"
   },
-  "license": "MIT",
-  "main": "index.js",
-  "module": "index.mjs",
-  "typings": "index.d.ts",
-  "typescript": {
-    "definition": "index.d.ts"
+  "peerDependencies": {
+    "graphql": "^0.13.2 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
-  "exports": {
-    ".": {
-      "require": "./index.js",
-      "import": "./index.mjs"
-    },
-    "./*": {
-      "require": "./*.js",
-      "import": "./*.mjs"
+  "dependencies": {
+    "@graphql-tools/utils": "8.12.0",
+    "ansi-colors": "4.1.3",
+    "@whatwg-node/fetch": "^0.4.3",
+    "@whatwg-node/server": "^0.4.1",
+    "itty-router": "^2.6.1",
+    "param-case": "3.0.4",
+    "title-case": "3.0.3",
+    "tslib": "2.4.0",
+    "uuid": "8.3.2"
+  },
+  "scripts": {
+    "start": "ts-node --project tsconfig.example.json example/index.ts",
+    "clean": "rm -rf dist",
+    "prebuild": "yarn clean",
+    "build": "bob build --single",
+    "test": "jest --no-watchman",
+    "prepare-release": "yarn build && yarn test",
+    "release": "yarn prepare-release && bob prepack && npm publish dist",
+    "ci:release:canary": "node bump.js && bob prepack && npm publish dist --tag alpha --access public",
+    "postinstall": "husky install"
+  },
+  "devDependencies": {
+    "@graphql-tools/schema": "9.0.4",
+    "@graphql-yoga/node": "2.13.13",
+    "@types/jest": "28.1.8",
+    "@types/node": "14.18.29",
+    "@types/swagger-ui-dist": "3.30.1",
+    "@types/uuid": "8.3.4",
+    "@types/yamljs": "0.2.31",
+    "bob-the-bundler": "1.7.3",
+    "bundlesize": "0.18.1",
+    "chalk": "^4",
+    "express": "4.18.1",
+    "express-graphql": "0.12.0",
+    "graphql": "16.6.0",
+    "graphql-subscriptions": "2.0.0",
+    "husky": "8.0.1",
+    "jest": "28.1.3",
+    "lint-staged": "13.0.3",
+    "prettier": "2.7.1",
+    "supertest": "6.2.4",
+    "swagger-ui-dist": "4.14.0",
+    "ts-jest": "28.0.8",
+    "ts-node": "10.9.1",
+    "typescript": "4.7.4"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "*.{ts,js,md,json}": [
+      "prettier --write"
+    ]
+  },
+  "bundlesize": [
+    {
+      "path": "./dist/index.mjs",
+      "maxSize": "36 kB",
+      "compression": "none"
     }
-  }
-}
+  ]
+}

package/tsconfig.example.json

@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "CommonJS"
+  },
+  "include": ["example"]
+}

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 {};

package/index.d.ts

@@ -1,38 +0,0 @@
-/// <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>;

package/open-api/types.d.ts

@@ -1,3 +0,0 @@
-import { GraphQLObjectType, GraphQLInputObjectType, GraphQLOutputType, GraphQLNamedType } from 'graphql';
-export declare function buildSchemaObjectFromType(type: GraphQLObjectType | GraphQLInputObjectType): any;
-export declare function resolveFieldType(type: GraphQLOutputType | GraphQLNamedType): any;