sofa-api 0.16.0 → 0.16.2

package/index.d.ts

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

package/index.js

@@ -330,11 +330,14 @@ function createRouter(sofa) {
     router$1.post('/webhook', (request, serverContext) => tslib.__awaiter(this, void 0, void 0, function* () {
         const { subscription, variables, url } = yield request.json();
         try {
+            const sofaContext = Object.assign(serverContext, {
+                request,
+            });
             const result = yield subscriptionManager.start({
                 subscription,
                 variables,
                 url,
-            }, Object.assign(Object.assign({}, serverContext), { request }));
+            }, sofaContext);
             return new router.Response(JSON.stringify(result), {
                 status: 200,
                 statusText: 'OK',
@@ -356,8 +359,10 @@ function createRouter(sofa) {
         const body = yield request.json();
         const variables = body.variables;
         try {
-            const sofaServerContext = Object.assign(Object.assign({}, serverContext), { request });
-            const contextValue = yield sofa.contextFactory(sofaServerContext);
+            const sofaContext = Object.assign(serverContext, {
+                request,
+            });
+            const contextValue = yield sofa.contextFactory(sofaContext);
             const result = yield subscriptionManager.update({
                 id,
                 variables,
@@ -530,8 +535,10 @@ function useHandler(config) {
                     }
                 });
             }
-            const sofaServerContext = Object.assign(Object.assign({}, serverContext), { request });
-            const contextValue = yield sofa.contextFactory(sofaServerContext);
+            const sofaContext = Object.assign(serverContext, {
+                request,
+            });
+            const contextValue = yield sofa.contextFactory(sofaContext);
             const result = yield sofa.execute({
                 schema: sofa.schema,
                 document: operation,
@@ -678,6 +685,16 @@ function mapToPrimitive(type) {
 }
 function mapToRef(type) {
     return `#/components/schemas/${type}`;
+}
+function normalizePathParamForOpenAPI(path) {
+    const pathParts = path.split('/');
+    const normalizedPathParts = pathParts.map((part) => {
+        if (part.startsWith(':')) {
+            return `{${part.slice(1)}}`;
+        }
+        return part;
+    });
+    return normalizedPathParts.join('/');
 }
 
 function buildSchemaObjectFromType(type, opts) {
@@ -912,7 +929,7 @@ function OpenAPI({ schema, info, servers, components, security, tags, customScal
         addRoute(info, config) {
             const basePath = (config === null || config === void 0 ? void 0 : config.basePath) || '';
             const path = basePath +
-                info.path.replace(/\:[a-z0-9]+\w/i, (param) => `{${param.replace(':', '')}}`);
+                normalizePathParamForOpenAPI(info.path);
             if (!swagger.paths[path]) {
                 swagger.paths[path] = {};
             }

package/index.mjs

@@ -324,11 +324,14 @@ function createRouter(sofa) {
     router.post('/webhook', (request, serverContext) => __awaiter(this, void 0, void 0, function* () {
         const { subscription, variables, url } = yield request.json();
         try {
+            const sofaContext = Object.assign(serverContext, {
+                request,
+            });
             const result = yield subscriptionManager.start({
                 subscription,
                 variables,
                 url,
-            }, Object.assign(Object.assign({}, serverContext), { request }));
+            }, sofaContext);
             return new Response(JSON.stringify(result), {
                 status: 200,
                 statusText: 'OK',
@@ -350,8 +353,10 @@ function createRouter(sofa) {
         const body = yield request.json();
         const variables = body.variables;
         try {
-            const sofaServerContext = Object.assign(Object.assign({}, serverContext), { request });
-            const contextValue = yield sofa.contextFactory(sofaServerContext);
+            const sofaContext = Object.assign(serverContext, {
+                request,
+            });
+            const contextValue = yield sofa.contextFactory(sofaContext);
             const result = yield subscriptionManager.update({
                 id,
                 variables,
@@ -524,8 +529,10 @@ function useHandler(config) {
                     }
                 });
             }
-            const sofaServerContext = Object.assign(Object.assign({}, serverContext), { request });
-            const contextValue = yield sofa.contextFactory(sofaServerContext);
+            const sofaContext = Object.assign(serverContext, {
+                request,
+            });
+            const contextValue = yield sofa.contextFactory(sofaContext);
             const result = yield sofa.execute({
                 schema: sofa.schema,
                 document: operation,
@@ -672,6 +679,16 @@ function mapToPrimitive(type) {
 }
 function mapToRef(type) {
     return `#/components/schemas/${type}`;
+}
+function normalizePathParamForOpenAPI(path) {
+    const pathParts = path.split('/');
+    const normalizedPathParts = pathParts.map((part) => {
+        if (part.startsWith(':')) {
+            return `{${part.slice(1)}}`;
+        }
+        return part;
+    });
+    return normalizedPathParts.join('/');
 }
 
 function buildSchemaObjectFromType(type, opts) {
@@ -906,7 +923,7 @@ function OpenAPI({ schema, info, servers, components, security, tags, customScal
         addRoute(info, config) {
             const basePath = (config === null || config === void 0 ? void 0 : config.basePath) || '';
             const path = basePath +
-                info.path.replace(/\:[a-z0-9]+\w/i, (param) => `{${param.replace(':', '')}}`);
+                normalizePathParamForOpenAPI(info.path);
             if (!swagger.paths[path]) {
                 swagger.paths[path] = {};
             }

package/open-api/utils.d.ts

@@ -1,2 +1,3 @@
 export declare function mapToPrimitive(type: string): any;
 export declare function mapToRef(type: string): string;
+export declare function normalizePathParamForOpenAPI(path: string): string;

package/package.json

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

package/router.d.ts

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

package/types.d.ts

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