sofa-api 0.15.1 → 0.15.3

package/ast.d.ts

@@ -1,5 +1,5 @@
 import { DocumentNode, OperationDefinitionNode, VariableDefinitionNode } from 'graphql';
-export declare type OperationInfo = {
+export type OperationInfo = {
     operation: OperationDefinitionNode;
     variables: ReadonlyArray<VariableDefinitionNode>;
     name: string;

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/server").ServerAdapter<unknown, import("itty-router").Router<import("itty-router").Request & Request, {}>>;
+export declare function useSofa(config: SofaConfig): import("@whatwg-node/router").Router<import("./types").DefaultSofaServerContext>;

package/index.js

@@ -6,13 +6,13 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 const tslib = require('tslib');
 const graphql = require('graphql');
-const ittyRouter = require('itty-router');
 const utils = require('@graphql-tools/utils');
 const paramCase = require('param-case');
 const fetch = require('@whatwg-node/fetch');
 const colors = _interopDefault(require('ansi-colors'));
-const server = require('@whatwg-node/server');
+const router = require('@whatwg-node/router');
 const titleCase = require('title-case');
+const definition = require('graphql/type/definition');
 
 function getOperationInfo(doc) {
     const op = graphql.getOperationAST(doc, null);
@@ -192,20 +192,27 @@ class SubscriptionManager {
                 });
                 // success
                 (() => tslib.__awaiter(this, void 0, void 0, function* () {
-                    var e_1, _a;
+                    var _a, e_1, _b, _c;
                     try {
-                        for (var execution_1 = tslib.__asyncValues(execution), execution_1_1; execution_1_1 = yield execution_1.next(), !execution_1_1.done;) {
-                            const result = execution_1_1.value;
-                            yield this.sendData({
-                                id,
-                                result,
-                            });
+                        for (var _d = true, execution_1 = tslib.__asyncValues(execution), execution_1_1; execution_1_1 = yield execution_1.next(), _a = execution_1_1.done, !_a;) {
+                            _c = execution_1_1.value;
+                            _d = false;
+                            try {
+                                const result = _c;
+                                yield this.sendData({
+                                    id,
+                                    result,
+                                });
+                            }
+                            finally {
+                                _d = true;
+                            }
                         }
                     }
                     catch (e_1_1) { e_1 = { error: e_1_1 }; }
                     finally {
                         try {
-                            if (execution_1_1 && !execution_1_1.done && (_a = execution_1.return)) yield _a.call(execution_1);
+                            if (!_d && !_a && (_b = execution_1.return)) yield _b.call(execution_1);
                         }
                         finally { if (e_1) throw e_1.error; }
                     }
@@ -271,7 +278,7 @@ class SubscriptionManager {
 
 function createRouter(sofa) {
     logger.debug('[Sofa] Creating router');
-    const router = ittyRouter.Router({
+    const router$1 = router.createRouter({
         base: sofa.basePath,
     });
     const queryType = sofa.schema.getQueryType();
@@ -279,7 +286,7 @@ function createRouter(sofa) {
     const subscriptionManager = new SubscriptionManager(sofa);
     if (queryType) {
         Object.keys(queryType.getFields()).forEach((fieldName) => {
-            const route = createQueryRoute({ sofa, router, fieldName });
+            const route = createQueryRoute({ sofa, router: router$1, fieldName });
             if (sofa.onRoute) {
                 sofa.onRoute(route);
             }
@@ -287,13 +294,13 @@ function createRouter(sofa) {
     }
     if (mutationType) {
         Object.keys(mutationType.getFields()).forEach((fieldName) => {
-            const route = createMutationRoute({ sofa, router, fieldName });
+            const route = createMutationRoute({ sofa, router: router$1, fieldName });
             if (sofa.onRoute) {
                 sofa.onRoute(route);
             }
         });
     }
-    router.post('/webhook', (request, serverContext) => tslib.__awaiter(this, void 0, void 0, function* () {
+    router$1.post('/webhook', (request, serverContext) => tslib.__awaiter(this, void 0, void 0, function* () {
         const { subscription, variables, url } = yield request.json();
         try {
             const result = yield subscriptionManager.start({
@@ -301,7 +308,7 @@ function createRouter(sofa) {
                 variables,
                 url,
             }, Object.assign(Object.assign({}, serverContext), { request }));
-            return new fetch.Response(JSON.stringify(result), {
+            return new router.Response(JSON.stringify(result), {
                 status: 200,
                 statusText: 'OK',
                 headers: {
@@ -310,13 +317,13 @@ function createRouter(sofa) {
             });
         }
         catch (error) {
-            return new fetch.Response(JSON.stringify(error), {
+            return new router.Response(JSON.stringify(error), {
                 status: 500,
                 statusText: 'Subscription failed',
             });
         }
     }));
-    router.post('/webhook/:id', (request, serverContext) => tslib.__awaiter(this, void 0, void 0, function* () {
+    router$1.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();
@@ -328,7 +335,7 @@ function createRouter(sofa) {
                 id,
                 variables,
             }, contextValue);
-            return new fetch.Response(JSON.stringify(result), {
+            return new router.Response(JSON.stringify(result), {
                 status: 200,
                 statusText: 'OK',
                 headers: {
@@ -337,18 +344,18 @@ function createRouter(sofa) {
             });
         }
         catch (error) {
-            return new fetch.Response(JSON.stringify(error), {
+            return new router.Response(JSON.stringify(error), {
                 status: 500,
                 statusText: 'Subscription failed to update',
             });
         }
     }));
-    router.delete('/webhook/:id', (request) => tslib.__awaiter(this, void 0, void 0, function* () {
+    router$1.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 new fetch.Response(JSON.stringify(result), {
+            return new router.Response(JSON.stringify(result), {
                 status: 200,
                 statusText: 'OK',
                 headers: {
@@ -357,13 +364,13 @@ function createRouter(sofa) {
             });
         }
         catch (error) {
-            return new fetch.Response(JSON.stringify(error), {
+            return new router.Response(JSON.stringify(error), {
                 status: 500,
                 statusText: 'Subscription failed to stop',
             });
         }
     }));
-    return router;
+    return router$1;
 }
 function createQueryRoute({ sofa, router, fieldName, }) {
     var _a, _b, _c, _d, _e, _f, _g;
@@ -394,7 +401,8 @@ 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](route.path, useHandler({ info, route, fieldName, sofa, operation }));
+    const routerMethod = route.method.toLowerCase();
+    router[routerMethod](route.path, useHandler({ info, route, fieldName, sofa, operation }));
     logger.debug(`[Router] ${fieldName} query available at ${route.method} ${route.path}`);
     return {
         document: operation,
@@ -430,7 +438,8 @@ 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](path, useHandler({ info, route, fieldName, sofa, operation }));
+    const routerKey = method.toLowerCase();
+    router[routerKey](path, useHandler({ info, route, fieldName, sofa, operation }));
     logger.debug(`[Router] ${fieldName} mutation available at ${method} ${path}`);
     return {
         document: operation,
@@ -500,12 +509,12 @@ function useHandler(config) {
                     status = 500;
                 }
                 if (errors.length === 1) {
-                    return new fetch.Response(JSON.stringify(errors[0]), {
+                    return new router.Response(JSON.stringify(errors[0]), {
                         status,
                         headers,
                     });
                 }
-                return new fetch.Response(JSON.stringify({ errors }), {
+                return new router.Response(JSON.stringify({ errors }), {
                     status,
                     headers,
                 });
@@ -513,7 +522,7 @@ function useHandler(config) {
             const errorHandler = sofa.errorHandler || defaultErrorHandler;
             return errorHandler(result.errors);
         }
-        return new fetch.Response(JSON.stringify((_a = result.data) === null || _a === void 0 ? void 0 : _a[fieldName]), {
+        return new router.Response(JSON.stringify((_a = result.data) === null || _a === void 0 ? void 0 : _a[fieldName]), {
             status: config.route.responseStatus,
             headers: {
                 'Content-Type': 'application/json',
@@ -685,12 +694,12 @@ function resolveFieldType(type, opts) {
         };
     }
     if (graphql.isScalarType(type)) {
-        return (mapToPrimitive(type.name) ||
+        const resolved = mapToPrimitive(type.name) ||
             opts.customScalars[type.name] ||
-            ((_a = type.extensions) === null || _a === void 0 ? void 0 : _a.jsonSchema)
-            || {
-                type: 'object',
-            });
+            ((_a = type.extensions) === null || _a === void 0 ? void 0 : _a.jsonSchema) || {
+            type: 'object',
+        };
+        return Object.assign({}, resolved);
     }
     if (graphql.isEnumType(type)) {
         return {
@@ -705,6 +714,7 @@ function resolveFieldType(type, opts) {
 
 function buildPathFromOperation({ url, schema, operation, useRequestBody, tags, description, customScalars, }) {
     const info = getOperationInfo(operation);
+    const enumTypes = resolveEnumTypes(schema);
     const summary = resolveSummary(schema, info.operation);
     return Object.assign(Object.assign({ tags,
         description,
@@ -714,14 +724,14 @@ function buildPathFromOperation({ url, schema, operation, useRequestBody, tags,
                 content: {
                     'application/json': {
                         schema: resolveRequestBody(info.operation.variableDefinitions, {
-                            customScalars,
+                            customScalars, enumTypes
                         }),
                     },
                 },
             },
         }
         : {
-            parameters: resolveParameters(url, info.operation.variableDefinitions, { customScalars }),
+            parameters: resolveParameters(url, info.operation.variableDefinitions, { customScalars, enumTypes }),
         })), { responses: {
             200: {
                 description: summary,
@@ -730,13 +740,22 @@ function buildPathFromOperation({ url, schema, operation, useRequestBody, tags,
                         schema: resolveResponse({
                             schema,
                             operation: info.operation,
-                            customScalars,
+                            opts: { customScalars, enumTypes },
                         }),
                     },
                 },
             },
         } });
 }
+function resolveEnumTypes(schema) {
+    const enumTypes = Object.values(schema.getTypeMap()).filter(graphql.isEnumType).map(definition.assertEnumType);
+    return Object.fromEntries(enumTypes.map(type => ([type.name,
+        {
+            type: 'string',
+            enum: type.getValues().map(value => value.name),
+        },
+    ])));
+}
 function resolveParameters(url, variables, opts) {
     if (!variables) {
         return [];
@@ -779,23 +798,23 @@ function resolveParamSchema(type, opts) {
     }
     const primitive = mapToPrimitive(type.name.value);
     return (primitive ||
-        opts.customScalars[type.name.value] || {
-        $ref: mapToRef(type.name.value),
-    });
+        opts.customScalars[type.name.value] ||
+        opts.enumTypes[type.name.value] ||
+        { $ref: mapToRef(type.name.value) });
 }
-function resolveResponse({ schema, operation, customScalars, }) {
+function resolveResponse({ schema, operation, opts, }) {
     const operationType = operation.operation;
     const rootField = operation.selectionSet.selections[0];
     if (rootField.kind === graphql.Kind.FIELD) {
         if (operationType === 'query') {
             const queryType = schema.getQueryType();
             const field = queryType.getFields()[rootField.name.value];
-            return resolveFieldType(field.type, { customScalars });
+            return resolveFieldType(field.type, opts);
         }
         if (operationType === 'mutation') {
             const mutationType = schema.getMutationType();
             const field = mutationType.getFields()[rootField.name.value];
-            return resolveFieldType(field.type, { customScalars });
+            return resolveFieldType(field.type, opts);
         }
     }
 }
@@ -879,7 +898,7 @@ function OpenAPI({ schema, info, servers, components, security, tags, customScal
 }
 
 function useSofa(config) {
-    return server.createServerAdapter(createRouter(createSofa(config)));
+    return createRouter(createSofa(config));
 }
 
 exports.OpenAPI = OpenAPI;

package/index.mjs

@@ -1,12 +1,12 @@
 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 { crypto, fetch, Response } from '@whatwg-node/fetch';
+import { crypto, fetch } from '@whatwg-node/fetch';
 import colors from 'ansi-colors';
-import { createServerAdapter } from '@whatwg-node/server';
+import { createRouter as createRouter$1, Response } from '@whatwg-node/router';
 import { titleCase } from 'title-case';
+import { assertEnumType } from 'graphql/type/definition';
 
 function getOperationInfo(doc) {
     const op = getOperationAST(doc, null);
@@ -186,20 +186,27 @@ class SubscriptionManager {
                 });
                 // success
                 (() => __awaiter(this, void 0, void 0, function* () {
-                    var e_1, _a;
+                    var _a, e_1, _b, _c;
                     try {
-                        for (var execution_1 = __asyncValues(execution), execution_1_1; execution_1_1 = yield execution_1.next(), !execution_1_1.done;) {
-                            const result = execution_1_1.value;
-                            yield this.sendData({
-                                id,
-                                result,
-                            });
+                        for (var _d = true, execution_1 = __asyncValues(execution), execution_1_1; execution_1_1 = yield execution_1.next(), _a = execution_1_1.done, !_a;) {
+                            _c = execution_1_1.value;
+                            _d = false;
+                            try {
+                                const result = _c;
+                                yield this.sendData({
+                                    id,
+                                    result,
+                                });
+                            }
+                            finally {
+                                _d = true;
+                            }
                         }
                     }
                     catch (e_1_1) { e_1 = { error: e_1_1 }; }
                     finally {
                         try {
-                            if (execution_1_1 && !execution_1_1.done && (_a = execution_1.return)) yield _a.call(execution_1);
+                            if (!_d && !_a && (_b = execution_1.return)) yield _b.call(execution_1);
                         }
                         finally { if (e_1) throw e_1.error; }
                     }
@@ -265,7 +272,7 @@ class SubscriptionManager {
 
 function createRouter(sofa) {
     logger.debug('[Sofa] Creating router');
-    const router = Router({
+    const router = createRouter$1({
         base: sofa.basePath,
     });
     const queryType = sofa.schema.getQueryType();
@@ -388,7 +395,8 @@ 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](route.path, useHandler({ info, route, fieldName, sofa, operation }));
+    const routerMethod = route.method.toLowerCase();
+    router[routerMethod](route.path, useHandler({ info, route, fieldName, sofa, operation }));
     logger.debug(`[Router] ${fieldName} query available at ${route.method} ${route.path}`);
     return {
         document: operation,
@@ -424,7 +432,8 @@ 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](path, useHandler({ info, route, fieldName, sofa, operation }));
+    const routerKey = method.toLowerCase();
+    router[routerKey](path, useHandler({ info, route, fieldName, sofa, operation }));
     logger.debug(`[Router] ${fieldName} mutation available at ${method} ${path}`);
     return {
         document: operation,
@@ -679,12 +688,12 @@ function resolveFieldType(type, opts) {
         };
     }
     if (isScalarType(type)) {
-        return (mapToPrimitive(type.name) ||
+        const resolved = mapToPrimitive(type.name) ||
             opts.customScalars[type.name] ||
-            ((_a = type.extensions) === null || _a === void 0 ? void 0 : _a.jsonSchema)
-            || {
-                type: 'object',
-            });
+            ((_a = type.extensions) === null || _a === void 0 ? void 0 : _a.jsonSchema) || {
+            type: 'object',
+        };
+        return Object.assign({}, resolved);
     }
     if (isEnumType(type)) {
         return {
@@ -699,6 +708,7 @@ function resolveFieldType(type, opts) {
 
 function buildPathFromOperation({ url, schema, operation, useRequestBody, tags, description, customScalars, }) {
     const info = getOperationInfo(operation);
+    const enumTypes = resolveEnumTypes(schema);
     const summary = resolveSummary(schema, info.operation);
     return Object.assign(Object.assign({ tags,
         description,
@@ -708,14 +718,14 @@ function buildPathFromOperation({ url, schema, operation, useRequestBody, tags,
                 content: {
                     'application/json': {
                         schema: resolveRequestBody(info.operation.variableDefinitions, {
-                            customScalars,
+                            customScalars, enumTypes
                         }),
                     },
                 },
             },
         }
         : {
-            parameters: resolveParameters(url, info.operation.variableDefinitions, { customScalars }),
+            parameters: resolveParameters(url, info.operation.variableDefinitions, { customScalars, enumTypes }),
         })), { responses: {
             200: {
                 description: summary,
@@ -724,13 +734,22 @@ function buildPathFromOperation({ url, schema, operation, useRequestBody, tags,
                         schema: resolveResponse({
                             schema,
                             operation: info.operation,
-                            customScalars,
+                            opts: { customScalars, enumTypes },
                         }),
                     },
                 },
             },
         } });
 }
+function resolveEnumTypes(schema) {
+    const enumTypes = Object.values(schema.getTypeMap()).filter(isEnumType).map(assertEnumType);
+    return Object.fromEntries(enumTypes.map(type => ([type.name,
+        {
+            type: 'string',
+            enum: type.getValues().map(value => value.name),
+        },
+    ])));
+}
 function resolveParameters(url, variables, opts) {
     if (!variables) {
         return [];
@@ -773,23 +792,23 @@ function resolveParamSchema(type, opts) {
     }
     const primitive = mapToPrimitive(type.name.value);
     return (primitive ||
-        opts.customScalars[type.name.value] || {
-        $ref: mapToRef(type.name.value),
-    });
+        opts.customScalars[type.name.value] ||
+        opts.enumTypes[type.name.value] ||
+        { $ref: mapToRef(type.name.value) });
 }
-function resolveResponse({ schema, operation, customScalars, }) {
+function resolveResponse({ schema, operation, opts, }) {
     const operationType = operation.operation;
     const rootField = operation.selectionSet.selections[0];
     if (rootField.kind === Kind.FIELD) {
         if (operationType === 'query') {
             const queryType = schema.getQueryType();
             const field = queryType.getFields()[rootField.name.value];
-            return resolveFieldType(field.type, { customScalars });
+            return resolveFieldType(field.type, opts);
         }
         if (operationType === 'mutation') {
             const mutationType = schema.getMutationType();
             const field = mutationType.getFields()[rootField.name.value];
-            return resolveFieldType(field.type, { customScalars });
+            return resolveFieldType(field.type, opts);
         }
     }
 }
@@ -873,7 +892,7 @@ function OpenAPI({ schema, info, servers, components, security, tags, customScal
 }
 
 function useSofa(config) {
-    return createServerAdapter(createRouter(createSofa(config)));
+    return createRouter(createSofa(config));
 }
 
 export { OpenAPI, useSofa };

package/package.json

@@ -1,18 +1,17 @@
 {
   "name": "sofa-api",
-  "version": "0.15.1",
+  "version": "0.15.3",
   "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": "9.1.0",
-    "@whatwg-node/fetch": "^0.5.0",
-    "@whatwg-node/server": "^0.4.1",
+    "@graphql-tools/utils": "9.1.3",
+    "@whatwg-node/fetch": "^0.6.0",
+    "@whatwg-node/router": "^0.1.2",
     "ansi-colors": "4.1.3",
-    "itty-router": "^2.6.1",
-    "openapi-types": "12.0.2",
+    "openapi-types": "12.1.0",
     "param-case": "3.0.4",
     "title-case": "3.0.3",
     "tslib": "2.4.1"

package/router.d.ts

@@ -1,6 +1,7 @@
-import { Request as IttyRequest, Router } from 'itty-router';
 import type { Sofa } from './sofa';
-export declare type ErrorHandler = (errors: ReadonlyArray<any>) => Response;
+import type { DefaultSofaServerContext } from './types';
+import { Router } from '@whatwg-node/router';
+export type ErrorHandler = (errors: ReadonlyArray<any>) => Response;
 declare module 'graphql' {
     interface GraphQLHTTPErrorExtensions {
         status?: number;
@@ -10,6 +11,4 @@ declare module 'graphql' {
         http?: GraphQLHTTPErrorExtensions;
     }
 }
-declare type SofaRequest = IttyRequest & Request;
-export declare function createRouter(sofa: Sofa): Router<SofaRequest, {}>;
-export {};
+export declare function createRouter(sofa: Sofa): Router<DefaultSofaServerContext>;

package/subscriptions.d.ts

@@ -1,8 +1,8 @@
 import { ExecutionResult } from 'graphql';
 import type { ContextValue } from './types';
 import type { Sofa } from './sofa';
-export declare type ID = string;
-export declare type SubscriptionFieldName = string;
+export type ID = string;
+export type SubscriptionFieldName = string;
 export interface StartSubscriptionEvent {
     subscription: SubscriptionFieldName;
     variables: any;

package/types.d.ts

@@ -1,8 +1,8 @@
-import { DefaultServerAdapterContext } from '@whatwg-node/server';
+import { DefaultServerAdapterContext } from '@whatwg-node/router';
 import { DocumentNode } from 'graphql';
-export declare type ContextValue = Record<string, any>;
-export declare type Ignore = string[];
-export declare type Method = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
+export type ContextValue = Record<string, any>;
+export type Ignore = string[];
+export type Method = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
 export interface RouteInfo {
     document: DocumentNode;
     path: string;
@@ -10,8 +10,8 @@ export interface RouteInfo {
     tags?: string[];
     description?: string;
 }
-export declare type OnRoute = (info: RouteInfo) => void;
-export declare type ContextFn = (serverContext: DefaultSofaServerContext) => Promise<ContextValue> | ContextValue;
-export declare type DefaultSofaServerContext = DefaultServerAdapterContext & {
+export type OnRoute = (info: RouteInfo) => void;
+export type ContextFn = (serverContext: DefaultSofaServerContext) => Promise<ContextValue> | ContextValue;
+export type DefaultSofaServerContext = DefaultServerAdapterContext & {
     request: Request;
 };