@temporary-name/server 1.9.3-alpha.9f176ca3f9388d51e8dffa98a15fcf9f14f6a75e → 1.9.3-alpha.a253b67a3639148c12f13a47295e1922182adecd

package/dist/shared/server.rZDPWnA8.mjs

@@ -0,0 +1,234 @@
+import { stringifyJSON, isObject, isORPCErrorStatus, tryDecodeURIComponent, toHttpPath, toArray, intercept, runWithSpan, ORPC_NAME, isAsyncIteratorObject, asyncIteratorWithSpan, setSpanError, ORPCError, toORPCError } from '@temporary-name/shared';
+import { c as createProcedureClient } from './server.D-DR5Z00.mjs';
+import { fallbackContractConfig, standardizeHTTPPath } from '@temporary-name/contract';
+import { d as deserialize, b as bracketNotationDeserialize, s as serialize } from './server.JtIZ8YG7.mjs';
+import { traverseContractProcedures, getLazyMeta, unlazy } from '@temporary-name/server';
+import { createRouter, addRoute, findRoute } from 'rou3';
+
+async function decode(request, pathParams) {
+  return {
+    path: pathParams ?? {},
+    query: bracketNotationDeserialize(Array.from(request.url.searchParams.entries())),
+    headers: request.headers,
+    body: deserialize(await request.body()) ?? {}
+  };
+}
+function encode(output, procedure) {
+  const successStatus = fallbackContractConfig(
+    "defaultSuccessStatus",
+    procedure["~orpc"].route.successStatus
+  );
+  const outputStructure = fallbackContractConfig(
+    "defaultOutputStructure",
+    procedure["~orpc"].route.outputStructure
+  );
+  if (outputStructure === "compact") {
+    return {
+      status: successStatus,
+      headers: new Headers(),
+      body: serialize(output)
+    };
+  }
+  if (!isDetailedOutput(output)) {
+    throw new Error(`
+        Invalid "detailed" output structure:
+        \u2022 Expected an object with optional properties:
+          - status (number 200-399)
+          - headers (Record<string, string | string[]>)
+          - body (any)
+        \u2022 No extra keys allowed.
+
+        Actual value:
+          ${stringifyJSON(output)}
+      `);
+  }
+  return {
+    status: output.status ?? successStatus,
+    headers: output.headers ?? new Headers(),
+    body: serialize(output.body)
+  };
+}
+function encodeError(error) {
+  return {
+    status: error.status,
+    headers: new Headers(),
+    body: serialize(error.toJSON(), { outputFormat: "plain" })
+  };
+}
+function isDetailedOutput(output) {
+  if (!isObject(output)) {
+    return false;
+  }
+  if (output.headers && !isObject(output.headers)) {
+    return false;
+  }
+  if (output.status !== void 0 && (typeof output.status !== "number" || !Number.isInteger(output.status) || isORPCErrorStatus(output.status))) {
+    return false;
+  }
+  return true;
+}
+
+function resolveFriendlyStandardHandleOptions(options) {
+  return {
+    ...options,
+    context: options.context ?? {}
+    // Context only optional if all fields are optional
+  };
+}
+function toRou3Pattern(path) {
+  return standardizeHTTPPath(path).replace(/\/\{\+([^}]+)\}/g, "/**:$1").replace(/\/\{([^}]+)\}/g, "/:$1");
+}
+function decodeParams(params) {
+  return Object.fromEntries(
+    Object.entries(params).map(([key, value]) => [key, tryDecodeURIComponent(value)])
+  );
+}
+
+class StandardOpenAPIMatcher {
+  tree = createRouter();
+  pendingRouters = [];
+  init(router, path = []) {
+    const laziedOptions = traverseContractProcedures({ router, path }, (traverseOptions) => {
+      const { path: path2, contract } = traverseOptions;
+      const method = fallbackContractConfig("defaultMethod", contract["~orpc"].route.method);
+      const httpPath = toRou3Pattern(contract["~orpc"].route.path ?? toHttpPath(path2));
+      addRoute(this.tree, method, httpPath, {
+        path: path2,
+        // cast is safe because router is typed as Router (not ContractRouter)
+        procedure: contract,
+        router
+      });
+    });
+    this.pendingRouters.push(
+      ...laziedOptions.map((option) => ({
+        ...option,
+        httpPathPrefix: toHttpPath(option.path),
+        laziedPrefix: getLazyMeta(option.router).prefix
+      }))
+    );
+  }
+  async match(method, pathname) {
+    if (this.pendingRouters.length) {
+      const newPendingRouters = [];
+      for (const pendingRouter of this.pendingRouters) {
+        if (!pendingRouter.laziedPrefix || pathname.startsWith(pendingRouter.laziedPrefix) || pathname.startsWith(pendingRouter.httpPathPrefix)) {
+          const { default: router } = await unlazy(pendingRouter.router);
+          this.init(router, pendingRouter.path);
+        } else {
+          newPendingRouters.push(pendingRouter);
+        }
+      }
+      this.pendingRouters = newPendingRouters;
+    }
+    const match = findRoute(this.tree, method, pathname);
+    if (!match) {
+      return void 0;
+    }
+    return {
+      path: match.data.path,
+      procedure: match.data.procedure,
+      params: match.params ? decodeParams(match.params) : void 0
+    };
+  }
+}
+
+class CompositeStandardHandlerPlugin {
+  plugins;
+  constructor(plugins = []) {
+    this.plugins = [...plugins].sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
+  }
+  init(options, router) {
+    for (const plugin of this.plugins) {
+      plugin.init?.(options, router);
+    }
+  }
+}
+
+class StandardHandler {
+  interceptors;
+  clientInterceptors;
+  rootInterceptors;
+  matcher;
+  constructor(router, options) {
+    this.matcher = new StandardOpenAPIMatcher();
+    const plugins = new CompositeStandardHandlerPlugin(options.plugins);
+    plugins.init(options, router);
+    this.interceptors = toArray(options.interceptors);
+    this.clientInterceptors = toArray(options.clientInterceptors);
+    this.rootInterceptors = toArray(options.rootInterceptors);
+    this.matcher.init(router);
+  }
+  async handle(request, options) {
+    const prefix = options.prefix?.replace(/\/$/, "") || void 0;
+    if (prefix && !request.url.pathname.startsWith(`${prefix}/`) && request.url.pathname !== prefix) {
+      return { matched: false, response: void 0 };
+    }
+    return intercept(this.rootInterceptors, { ...options, request, prefix }, async (interceptorOptions) => {
+      return runWithSpan({ name: `${request.method} ${request.url.pathname}` }, async (span) => {
+        let step;
+        try {
+          return await intercept(
+            this.interceptors,
+            interceptorOptions,
+            async ({ request: request2, context, prefix: prefix2 }) => {
+              const method = request2.method;
+              const url = request2.url;
+              const pathname = prefix2 ? url.pathname.replace(prefix2, "") : url.pathname;
+              const match = await runWithSpan(
+                { name: "find_procedure" },
+                () => this.matcher.match(method, `/${pathname.replace(/^\/|\/$/g, "")}`)
+              );
+              if (!match) {
+                return { matched: false, response: void 0 };
+              }
+              span?.updateName(`${ORPC_NAME}.${match.path.join("/")}`);
+              span?.setAttribute("rpc.system", ORPC_NAME);
+              span?.setAttribute("rpc.method", match.path.join("."));
+              step = "decode_input";
+              const input = await runWithSpan({ name: "decode_input" }, () => decode(request2, match.params));
+              step = void 0;
+              if (isAsyncIteratorObject(input.body)) {
+                input.body = asyncIteratorWithSpan(
+                  { name: "consume_event_iterator_input", signal: request2.signal },
+                  input.body
+                );
+              }
+              const client = createProcedureClient(match.procedure, {
+                context,
+                path: match.path,
+                interceptors: this.clientInterceptors
+              });
+              step = "call_procedure";
+              const output = await client(input, {
+                request: request2,
+                signal: request2.signal,
+                lastEventId: request2.headers.get("last-event-id") ?? void 0
+              });
+              step = void 0;
+              const response = encode(output, match.procedure);
+              return {
+                matched: true,
+                response
+              };
+            }
+          );
+        } catch (e) {
+          if (step !== "call_procedure") {
+            setSpanError(span, e);
+          }
+          const error = step === "decode_input" && !(e instanceof ORPCError) ? new ORPCError("BAD_REQUEST", {
+            message: `Malformed request. Ensure the request body is properly formatted and the 'Content-Type' header is set correctly.`,
+            cause: e
+          }) : toORPCError(e);
+          const response = encodeError(error);
+          return {
+            matched: true,
+            response
+          };
+        }
+      });
+    });
+  }
+}
+
+export { CompositeStandardHandlerPlugin as C, StandardHandler as S, encodeError as a, StandardOpenAPIMatcher as b, decodeParams as c, decode as d, encode as e, resolveFriendlyStandardHandleOptions as r, toRou3Pattern as t };

package/dist/shared/{server.Bo94xDTv.d.mts → server.y97Td78c.d.mts}

@@ -1,32 +1,15 @@
 import { Meta } from '@temporary-name/contract';
-import { HTTPPath, ORPCError, Interceptor } from '@temporary-name/shared';
-import { StandardResponse, StandardLazyRequest } from '@temporary-name/standard-server';
-import { C as Context, R as Router, A as AnyRouter, a as AnyProcedure, P as ProcedureClientInterceptorOptions } from './server.C1YnHvvf.mjs';
+import { HTTPPath, StandardLazyRequest, Interceptor, StandardResponse } from '@temporary-name/shared';
+import { C as Context, R as Router, N as ProcedureClientInterceptorOptions } from './server.oy0285uM.mjs';
 
 interface StandardHandlerPlugin<T extends Context> {
     order?: number;
-    init?(options: StandardHandlerOptions<T>, router: Router<any, T>): void;
+    init?(options: StandardHandlerOptions<T>, router: Router<T>): void;
 }
 declare class CompositeStandardHandlerPlugin<T extends Context, TPlugin extends StandardHandlerPlugin<T>> implements StandardHandlerPlugin<T> {
     protected readonly plugins: TPlugin[];
     constructor(plugins?: readonly TPlugin[]);
-    init(options: StandardHandlerOptions<T>, router: Router<any, T>): void;
-}
-
-type StandardParams = Record<string, string>;
-type StandardMatchResult = {
-    path: readonly string[];
-    procedure: AnyProcedure;
-    params?: StandardParams;
-} | undefined;
-interface StandardMatcher {
-    init(router: AnyRouter): void;
-    match(method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
-}
-interface StandardCodec {
-    encode(output: unknown, procedure: AnyProcedure): StandardResponse;
-    encodeError(error: ORPCError<any, any>): StandardResponse;
-    decode(request: StandardLazyRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
+    init(options: StandardHandlerOptions<T>, router: Router<T>): void;
 }
 
 interface StandardHandleOptions<T extends Context> {
@@ -57,17 +40,16 @@ interface StandardHandlerOptions<TContext extends Context> {
      *
      * Interceptors for procedure client.
      */
-    clientInterceptors?: Interceptor<ProcedureClientInterceptorOptions<TContext, Record<never, never>, Meta>, Promise<unknown>>[];
+    clientInterceptors?: Interceptor<ProcedureClientInterceptorOptions<TContext, Meta>, Promise<unknown>>[];
 }
 declare class StandardHandler<T extends Context> {
-    private readonly matcher;
-    private readonly codec;
     private readonly interceptors;
     private readonly clientInterceptors;
     private readonly rootInterceptors;
-    constructor(router: Router<any, T>, matcher: StandardMatcher, codec: StandardCodec, options: NoInfer<StandardHandlerOptions<T>>);
+    private readonly matcher;
+    constructor(router: Router<T>, options: NoInfer<StandardHandlerOptions<T>>);
     handle(request: StandardLazyRequest, options: StandardHandleOptions<T>): Promise<StandardHandleResult>;
 }
 
-export { CompositeStandardHandlerPlugin as C, StandardHandler as S };
-export type { StandardHandlerPlugin as a, StandardHandleOptions as b, StandardHandlerInterceptorOptions as c, StandardHandlerOptions as d, StandardHandleResult as e, StandardParams as f, StandardMatchResult as g, StandardMatcher as h, StandardCodec as i };
+export { CompositeStandardHandlerPlugin as C, StandardHandler as e };
+export type { StandardHandlerInterceptorOptions as S, StandardHandlerPlugin as a, StandardHandlerOptions as b, StandardHandleOptions as c, StandardHandleResult as d };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@temporary-name/server",
   "type": "module",
-  "version": "1.9.3-alpha.9f176ca3f9388d51e8dffa98a15fcf9f14f6a75e",
+  "version": "1.9.3-alpha.a253b67a3639148c12f13a47295e1922182adecd",
   "license": "MIT",
   "homepage": "https://www.stainless.com/",
   "repository": {
@@ -47,37 +47,32 @@
       "types": "./dist/adapters/aws-lambda/index.d.mts",
       "import": "./dist/adapters/aws-lambda/index.mjs",
       "default": "./dist/adapters/aws-lambda/index.mjs"
+    },
+    "./openapi": {
+      "types": "./dist/openapi/index.d.mts",
+      "import": "./dist/openapi/index.mjs",
+      "default": "./dist/openapi/index.mjs"
     }
   },
   "files": [
     "dist"
   ],
-  "peerDependencies": {
-    "drizzle-orm": "^0.44.5",
-    "drizzle-zod": "^0.8.3"
-  },
-  "peerDependenciesMeta": {
-    "drizzle-orm": {
-      "optional": true
-    },
-    "drizzle-zod": {
-      "optional": true
-    }
-  },
   "dependencies": {
     "cookie": "^1.0.2",
-    "@standard-schema/spec": "^1.0.0",
+    "rou3": "^0.7.7",
     "zod": "^4.1.12",
-    "@temporary-name/interop": "1.9.3-alpha.9f176ca3f9388d51e8dffa98a15fcf9f14f6a75e",
-    "@temporary-name/contract": "1.9.3-alpha.9f176ca3f9388d51e8dffa98a15fcf9f14f6a75e",
-    "@temporary-name/openapi": "1.9.3-alpha.9f176ca3f9388d51e8dffa98a15fcf9f14f6a75e",
-    "@temporary-name/shared": "1.9.3-alpha.9f176ca3f9388d51e8dffa98a15fcf9f14f6a75e",
-    "@temporary-name/standard-server-fetch": "1.9.3-alpha.9f176ca3f9388d51e8dffa98a15fcf9f14f6a75e",
-    "@temporary-name/standard-server-node": "1.9.3-alpha.9f176ca3f9388d51e8dffa98a15fcf9f14f6a75e",
-    "@temporary-name/standard-server": "1.9.3-alpha.9f176ca3f9388d51e8dffa98a15fcf9f14f6a75e",
-    "@temporary-name/standard-server-aws-lambda": "1.9.3-alpha.9f176ca3f9388d51e8dffa98a15fcf9f14f6a75e"
+    "@temporary-name/interop": "1.9.3-alpha.a253b67a3639148c12f13a47295e1922182adecd",
+    "@temporary-name/contract": "1.9.3-alpha.a253b67a3639148c12f13a47295e1922182adecd",
+    "@temporary-name/json-schema": "1.9.3-alpha.a253b67a3639148c12f13a47295e1922182adecd",
+    "@temporary-name/shared": "1.9.3-alpha.a253b67a3639148c12f13a47295e1922182adecd",
+    "@temporary-name/standard-server": "1.9.3-alpha.a253b67a3639148c12f13a47295e1922182adecd",
+    "@temporary-name/standard-server-aws-lambda": "1.9.3-alpha.a253b67a3639148c12f13a47295e1922182adecd",
+    "@temporary-name/standard-server-fetch": "1.9.3-alpha.a253b67a3639148c12f13a47295e1922182adecd",
+    "@temporary-name/standard-server-node": "1.9.3-alpha.a253b67a3639148c12f13a47295e1922182adecd",
+    "@temporary-name/zod": "1.9.3-alpha.a253b67a3639148c12f13a47295e1922182adecd"
   },
   "devDependencies": {
+    "@types/supertest": "^6.0.3",
     "@types/ws": "^8.18.1",
     "supertest": "^7.1.4"
   },

package/dist/shared/server.BEQrAa3A.mjs

@@ -1,207 +0,0 @@
-import { validateORPCError, ValidationError } from '@temporary-name/contract';
-import { resolveMaybeOptionalOptions, ORPCError, toArray, value, runWithSpan, intercept, isAsyncIteratorObject, overlayProxy, asyncIteratorWithSpan } from '@temporary-name/shared';
-import { HibernationEventIterator, mapEventIterator } from '@temporary-name/standard-server';
-import { g as gatingContext, w as withoutGatedFields } from './server.D6K9uoPI.mjs';
-
-const LAZY_SYMBOL = Symbol("ORPC_LAZY_SYMBOL");
-function lazy(loader, meta = {}) {
-  return {
-    [LAZY_SYMBOL]: {
-      loader,
-      meta
-    }
-  };
-}
-function isLazy(item) {
-  return (typeof item === "object" || typeof item === "function") && item !== null && LAZY_SYMBOL in item;
-}
-function getLazyMeta(lazied) {
-  return lazied[LAZY_SYMBOL].meta;
-}
-function unlazy(lazied) {
-  return isLazy(lazied) ? lazied[LAZY_SYMBOL].loader() : Promise.resolve({ default: lazied });
-}
-
-function mergeCurrentContext(context, other) {
-  return { ...context, ...other };
-}
-
-function createORPCErrorConstructorMap(errors) {
-  const proxy = new Proxy(errors, {
-    get(target, code) {
-      if (typeof code !== "string") {
-        return Reflect.get(target, code);
-      }
-      const item = (...rest) => {
-        const options = resolveMaybeOptionalOptions(rest);
-        const config = errors[code];
-        return new ORPCError(code, {
-          defined: Boolean(config),
-          status: config?.status,
-          message: options.message ?? config?.message,
-          data: options.data,
-          cause: options.cause
-        });
-      };
-      return item;
-    }
-  });
-  return proxy;
-}
-
-function middlewareOutputFn(output) {
-  return { output, context: {} };
-}
-
-function createProcedureClient(lazyableProcedure, ...rest) {
-  const options = resolveMaybeOptionalOptions(rest);
-  return async (...[input, callerOptions]) => {
-    const path = toArray(options.path);
-    const { default: procedure } = await unlazy(lazyableProcedure);
-    const clientContext = callerOptions?.context ?? {};
-    const context = await value(options.context ?? {}, clientContext);
-    const errors = createORPCErrorConstructorMap(procedure["~orpc"].errorMap);
-    const validateError = async (e) => {
-      if (e instanceof ORPCError) {
-        return await validateORPCError(procedure["~orpc"].errorMap, e);
-      }
-      return e;
-    };
-    try {
-      const output = await runWithSpan({ name: "call_procedure", signal: callerOptions?.signal }, (span) => {
-        span?.setAttribute("procedure.path", [...path]);
-        return intercept(
-          toArray(options.interceptors),
-          {
-            context,
-            input,
-            // input only optional when it undefinable so we can safely cast it
-            errors,
-            path,
-            procedure,
-            signal: callerOptions?.signal,
-            lastEventId: callerOptions?.lastEventId
-          },
-          (interceptorOptions) => executeProcedureInternal(interceptorOptions.procedure, interceptorOptions)
-        );
-      });
-      if (isAsyncIteratorObject(output)) {
-        if (output instanceof HibernationEventIterator) {
-          return output;
-        }
-        return overlayProxy(
-          output,
-          mapEventIterator(
-            asyncIteratorWithSpan(
-              { name: "consume_event_iterator_output", signal: callerOptions?.signal },
-              output
-            ),
-            {
-              value: (v) => v,
-              error: (e) => validateError(e)
-            }
-          )
-        );
-      }
-      return output;
-    } catch (e) {
-      throw await validateError(e);
-    }
-  };
-}
-async function validateInput(procedure, input) {
-  const schema = procedure["~orpc"].inputSchema;
-  if (!schema) {
-    return input;
-  }
-  return runWithSpan({ name: "validate_input" }, async () => {
-    const result = await schema["~standard"].validate(input);
-    if (result.issues) {
-      throw new ORPCError("BAD_REQUEST", {
-        message: "Input validation failed",
-        data: {
-          issues: result.issues
-        },
-        cause: new ValidationError({
-          message: "Input validation failed",
-          issues: result.issues,
-          data: input
-        })
-      });
-    }
-    return result.value;
-  });
-}
-async function validateOutput(schema, output) {
-  return runWithSpan({ name: "validate_output" }, async () => {
-    const result = await schema["~standard"].validate(output);
-    if (result.issues) {
-      throw new ORPCError("INTERNAL_SERVER_ERROR", {
-        message: "Output validation failed",
-        cause: new ValidationError({
-          message: "Output validation failed",
-          issues: result.issues,
-          data: output
-        })
-      });
-    }
-    return result.value;
-  });
-}
-async function executeProcedureInternal(procedure, options) {
-  const middlewares = procedure["~orpc"].middlewares;
-  const inputValidationIndex = Math.min(
-    Math.max(0, procedure["~orpc"].inputValidationIndex),
-    middlewares.length
-  );
-  const outputValidationIndex = Math.min(
-    Math.max(0, procedure["~orpc"].outputValidationIndex),
-    middlewares.length
-  );
-  const next = async (index, context, input) => {
-    let currentInput = input;
-    if (index === inputValidationIndex) {
-      currentInput = await validateInput(procedure, currentInput);
-    }
-    const mid = middlewares[index];
-    const output = mid ? await runWithSpan({ name: `middleware.${mid.name}`, signal: options.signal }, async (span) => {
-      span?.setAttribute("middleware.index", index);
-      span?.setAttribute("middleware.name", mid.name);
-      const result = await mid(
-        {
-          ...options,
-          context,
-          next: async (...[nextOptions]) => {
-            const nextContext = nextOptions?.context ?? {};
-            return {
-              output: await next(index + 1, mergeCurrentContext(context, nextContext), currentInput),
-              context: nextContext
-            };
-          }
-        },
-        currentInput,
-        middlewareOutputFn
-      );
-      return result.output;
-    }) : await runWithSpan(
-      { name: "handler", signal: options.signal },
-      () => procedure["~orpc"].handler({ ...options, context, input: currentInput })
-    );
-    if (index === outputValidationIndex) {
-      const schema = procedure["~orpc"].outputSchema;
-      if (!schema) {
-        return output;
-      }
-      const validated = await validateOutput(schema, output);
-      const isGateEnabled = gatingContext.getStore();
-      if (!validated || !isGateEnabled) {
-        return validated;
-      }
-      return withoutGatedFields(validated, schema, isGateEnabled);
-    }
-    return output;
-  };
-  return next(0, options.context, options.input);
-}
-
-export { LAZY_SYMBOL as L, createORPCErrorConstructorMap as a, middlewareOutputFn as b, createProcedureClient as c, getLazyMeta as g, isLazy as i, lazy as l, mergeCurrentContext as m, unlazy as u };