@orpc/server 0.0.0-next.07423e6 → 0.0.0-next.0c8e57d

package/dist/{chunk-6A7XHEBH.js → chunk-GK2Z6B6W.js}

@@ -32,6 +32,30 @@ function isProcedure(item) {
   return (typeof item === "object" || typeof item === "function") && item !== null && "~type" in item && item["~type"] === "Procedure" && "~orpc" in item && typeof item["~orpc"] === "object" && item["~orpc"] !== null && "contract" in item["~orpc"] && isContractProcedure(item["~orpc"].contract) && "handler" in item["~orpc"] && typeof item["~orpc"].handler === "function";
 }
 
+// src/error.ts
+import { ORPCError } from "@orpc/contract";
+function createORPCErrorConstructorMap(errors) {
+  const constructors = {};
+  for (const code in errors) {
+    const config = errors[code];
+    if (!config) {
+      continue;
+    }
+    const constructor = (...[options]) => {
+      return new ORPCError({
+        code,
+        defined: true,
+        status: config.status,
+        message: options?.message ?? config.message,
+        data: options?.data,
+        cause: options?.cause
+      });
+    };
+    constructors[code] = constructor;
+  }
+  return constructors;
+}
+
 // src/lazy.ts
 var LAZY_LOADER_SYMBOL = Symbol("ORPC_LAZY_LOADER");
 function lazy(loader) {
@@ -59,36 +83,44 @@ function flatLazy(lazied) {
   return lazy(flattenLoader);
 }
 
+// src/middleware.ts
+function middlewareOutputFn(output) {
+  return { output, context: void 0 };
+}
+
 // src/procedure-client.ts
-import { executeWithHooks, value } from "@orpc/shared";
-import { ORPCError } from "@orpc/shared/error";
-function createProcedureClient(options) {
+import { ORPCError as ORPCError2, validateORPCError, ValidationError } from "@orpc/contract";
+import { executeWithHooks, toError, value } from "@orpc/shared";
+function createProcedureClient(lazyableProcedure, ...[options]) {
   return async (...[input, callerOptions]) => {
-    const path = options.path ?? [];
-    const { default: procedure } = await unlazy(options.procedure);
-    const context = await value(options.context);
-    const meta = {
+    const path = options?.path ?? [];
+    const { default: procedure } = await unlazy(lazyableProcedure);
+    const context = await value(options?.context, callerOptions?.context);
+    const errors = createORPCErrorConstructorMap(procedure["~orpc"].contract["~orpc"].errorMap);
+    const executeOptions = {
+      input,
+      context,
+      errors,
       path,
       procedure,
       signal: callerOptions?.signal
     };
-    const executeWithValidation = async () => {
-      const validInput = await validateInput(procedure, input);
-      const output = await executeMiddlewareChain(
-        procedure,
-        validInput,
+    try {
+      const output = await executeWithHooks({
+        hooks: options,
+        input,
         context,
-        meta
-      );
-      return validateOutput(procedure, output);
-    };
-    return executeWithHooks({
-      hooks: options,
-      input,
-      context,
-      meta,
-      execute: executeWithValidation
-    });
+        meta: executeOptions,
+        execute: () => executeProcedureInternal(procedure, executeOptions)
+      });
+      return output;
+    } catch (e) {
+      if (!(e instanceof ORPCError2)) {
+        throw toError(e);
+      }
+      const validated = await validateORPCError(procedure["~orpc"].contract["~orpc"].errorMap, e);
+      throw validated;
+    }
   };
 }
 async function validateInput(procedure, input) {
@@ -97,10 +129,13 @@ async function validateInput(procedure, input) {
     return input;
   const result = await schema["~standard"].validate(input);
   if (result.issues) {
-    throw new ORPCError({
+    throw new ORPCError2({
       message: "Input validation failed",
       code: "BAD_REQUEST",
-      issues: result.issues
+      data: {
+        issues: result.issues
+      },
+      cause: new ValidationError({ message: "Input validation failed", issues: result.issues })
     });
   }
   return result.value;
@@ -111,33 +146,37 @@ async function validateOutput(procedure, output) {
     return output;
   const result = await schema["~standard"].validate(output);
   if (result.issues) {
-    throw new ORPCError({
+    throw new ORPCError2({
       message: "Output validation failed",
       code: "INTERNAL_SERVER_ERROR",
-      issues: result.issues
+      cause: new ValidationError({ message: "Output validation failed", issues: result.issues })
     });
   }
   return result.value;
 }
-async function executeMiddlewareChain(procedure, input, context, meta) {
-  const middlewares = procedure["~orpc"].middlewares ?? [];
-  let currentMidIndex = 0;
-  let currentContext = context;
+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);
+  let currentIndex = 0;
+  let currentContext = options.context;
+  let currentInput = options.input;
   const next = async (nextOptions) => {
-    const mid = middlewares[currentMidIndex];
-    currentMidIndex += 1;
+    const index = currentIndex;
+    currentIndex += 1;
     currentContext = mergeContext(currentContext, nextOptions.context);
-    if (mid) {
-      return await mid(input, currentContext, {
-        ...meta,
-        next,
-        output: (output) => ({ output, context: void 0 })
-      });
+    if (index === inputValidationIndex) {
+      currentInput = await validateInput(procedure, currentInput);
+    }
+    const mid = middlewares[index];
+    const result = mid ? await mid({ ...options, context: currentContext, next }, currentInput, middlewareOutputFn) : { output: await procedure["~orpc"].handler({ ...options, context: currentContext, input: currentInput }), context: currentContext };
+    if (index === outputValidationIndex) {
+      const validatedOutput = await validateOutput(procedure, result.output);
+      return {
+        ...result,
+        output: validatedOutput
+      };
     }
-    const result = {
-      output: await procedure["~orpc"].handler(input, currentContext, meta),
-      context: currentContext
-    };
     return result;
   };
   return (await next({})).output;
@@ -178,12 +217,14 @@ export {
   mergeContext,
   Procedure,
   isProcedure,
+  createORPCErrorConstructorMap,
   LAZY_LOADER_SYMBOL,
   lazy,
   isLazy,
   unlazy,
   flatLazy,
+  middlewareOutputFn,
   createProcedureClient,
   getRouterChild
 };
-//# sourceMappingURL=chunk-6A7XHEBH.js.map
+//# sourceMappingURL=chunk-GK2Z6B6W.js.map

package/dist/chunk-SXUFCJBY.js

@@ -0,0 +1,301 @@
+import {
+  __export,
+  createProcedureClient,
+  getRouterChild,
+  isProcedure,
+  unlazy
+} from "./chunk-GK2Z6B6W.js";
+
+// src/adapters/fetch/super-json.ts
+var super_json_exports = {};
+__export(super_json_exports, {
+  deserialize: () => deserialize,
+  serialize: () => serialize
+});
+
+// ../../node_modules/.pnpm/is-what@5.0.2/node_modules/is-what/dist/getType.js
+function getType(payload) {
+  return Object.prototype.toString.call(payload).slice(8, -1);
+}
+
+// ../../node_modules/.pnpm/is-what@5.0.2/node_modules/is-what/dist/isPlainObject.js
+function isPlainObject(payload) {
+  if (getType(payload) !== "Object")
+    return false;
+  const prototype = Object.getPrototypeOf(payload);
+  return !!prototype && prototype.constructor === Object && prototype === Object.prototype;
+}
+
+// src/adapters/fetch/super-json.ts
+function serialize(value, segments = [], meta = []) {
+  if (typeof value === "bigint") {
+    meta.push(["bigint", segments]);
+    return { data: value.toString(), meta };
+  }
+  if (value instanceof Date) {
+    meta.push(["date", segments]);
+    const data = Number.isNaN(value.getTime()) ? "Invalid Date" : value.toISOString();
+    return { data, meta };
+  }
+  if (Number.isNaN(value)) {
+    meta.push(["nan", segments]);
+    return { data: "NaN", meta };
+  }
+  if (value instanceof RegExp) {
+    meta.push(["regexp", segments]);
+    return { data: value.toString(), meta };
+  }
+  if (value instanceof URL) {
+    meta.push(["url", segments]);
+    return { data: value.toString(), meta };
+  }
+  if (isPlainObject(value)) {
+    const data = {};
+    for (const k in value) {
+      data[k] = serialize(value[k], [...segments, k], meta).data;
+    }
+    return { data, meta };
+  }
+  if (Array.isArray(value)) {
+    const data = value.map((v, i) => {
+      if (v === void 0) {
+        meta.push(["undefined", [...segments, i]]);
+        return null;
+      }
+      return serialize(v, [...segments, i], meta).data;
+    });
+    return { data, meta };
+  }
+  if (value instanceof Set) {
+    const result = serialize(Array.from(value), segments, meta);
+    meta.push(["set", segments]);
+    return result;
+  }
+  if (value instanceof Map) {
+    const result = serialize(Array.from(value.entries()), segments, meta);
+    meta.push(["map", segments]);
+    return result;
+  }
+  return { data: value, meta };
+}
+function deserialize({
+  data,
+  meta
+}) {
+  if (meta.length === 0) {
+    return data;
+  }
+  const ref = { data };
+  for (const [type, segments] of meta) {
+    let currentRef = ref;
+    let preSegment = "data";
+    for (let i = 0; i < segments.length; i++) {
+      currentRef = currentRef[preSegment];
+      preSegment = segments[i];
+    }
+    switch (type) {
+      case "nan":
+        currentRef[preSegment] = Number.NaN;
+        break;
+      case "bigint":
+        currentRef[preSegment] = BigInt(currentRef[preSegment]);
+        break;
+      case "date":
+        currentRef[preSegment] = new Date(currentRef[preSegment]);
+        break;
+      case "regexp": {
+        const [, pattern, flags] = currentRef[preSegment].match(/^\/(.*)\/([a-z]*)$/);
+        currentRef[preSegment] = new RegExp(pattern, flags);
+        break;
+      }
+      case "url":
+        currentRef[preSegment] = new URL(currentRef[preSegment]);
+        break;
+      case "undefined":
+        currentRef[preSegment] = void 0;
+        break;
+      case "map":
+        currentRef[preSegment] = new Map(currentRef[preSegment]);
+        break;
+      case "set":
+        currentRef[preSegment] = new Set(currentRef[preSegment]);
+        break;
+      /* v8 ignore next 3 */
+      default: {
+        const _expected = type;
+      }
+    }
+  }
+  return ref.data;
+}
+
+// src/adapters/fetch/orpc-payload-codec.ts
+import { ORPCError } from "@orpc/contract";
+import { findDeepMatches, set } from "@orpc/shared";
+var ORPCPayloadCodec = class {
+  /**
+   * If method is GET, the payload will be encoded as query string.
+   * If method is GET and payload contain file, the method will be fallback to fallbackMethod. (fallbackMethod = GET will force to use GET method)
+   */
+  encode(payload, method = "POST", fallbackMethod = "POST") {
+    const { data, meta } = serialize(payload);
+    const { maps, values } = findDeepMatches((v) => v instanceof Blob, data);
+    if (method === "GET" && (values.length === 0 || fallbackMethod === "GET")) {
+      const query = new URLSearchParams({
+        data: JSON.stringify(data),
+        meta: JSON.stringify(meta)
+      });
+      return {
+        query,
+        method: "GET"
+      };
+    }
+    const nonGETMethod = method === "GET" ? fallbackMethod : method;
+    if (values.length > 0) {
+      const form = new FormData();
+      if (data !== void 0) {
+        form.append("data", JSON.stringify(data));
+      }
+      form.append("meta", JSON.stringify(meta));
+      form.append("maps", JSON.stringify(maps));
+      for (const i in values) {
+        const value = values[i];
+        form.append(i, value);
+      }
+      return {
+        body: form,
+        method: nonGETMethod
+      };
+    }
+    return {
+      body: JSON.stringify({ data, meta }),
+      headers: new Headers({
+        "content-type": "application/json"
+      }),
+      method: nonGETMethod
+    };
+  }
+  async decode(re) {
+    try {
+      if ("method" in re && re.method === "GET") {
+        const url = new URL(re.url);
+        const query = url.searchParams;
+        const data = JSON.parse(query.getAll("data").at(-1));
+        const meta = JSON.parse(query.getAll("meta").at(-1));
+        return deserialize({
+          data,
+          meta
+        });
+      }
+      if (re.headers.get("content-type")?.startsWith("multipart/form-data")) {
+        const form = await re.formData();
+        const rawData = form.get("data");
+        const rawMeta = form.get("meta");
+        const rawMaps = form.get("maps");
+        let data = JSON.parse(rawData);
+        const meta = JSON.parse(rawMeta);
+        const maps = JSON.parse(rawMaps);
+        for (const i in maps) {
+          data = set(data, maps[i], form.get(i));
+        }
+        return deserialize({
+          data,
+          meta
+        });
+      }
+      const json = await re.json();
+      return deserialize(json);
+    } catch (e) {
+      throw new ORPCError({
+        code: "BAD_REQUEST",
+        message: "Cannot parse request/response. Please check the request/response body and Content-Type header.",
+        cause: e
+      });
+    }
+  }
+};
+
+// src/adapters/fetch/orpc-procedure-matcher.ts
+import { trim } from "@orpc/shared";
+var ORPCProcedureMatcher = class {
+  constructor(router) {
+    this.router = router;
+  }
+  async match(pathname) {
+    const path = trim(pathname, "/").split("/").map(decodeURIComponent);
+    const match = getRouterChild(this.router, ...path);
+    const { default: maybeProcedure } = await unlazy(match);
+    if (!isProcedure(maybeProcedure)) {
+      return void 0;
+    }
+    return {
+      procedure: maybeProcedure,
+      path
+    };
+  }
+};
+
+// src/adapters/fetch/orpc-handler.ts
+import { ORPCError as ORPCError2 } from "@orpc/contract";
+import { executeWithHooks, trim as trim2 } from "@orpc/shared";
+var RPCHandler = class {
+  constructor(router, options) {
+    this.options = options;
+    this.procedureMatcher = options?.procedureMatcher ?? new ORPCProcedureMatcher(router);
+    this.payloadCodec = options?.payloadCodec ?? new ORPCPayloadCodec();
+  }
+  procedureMatcher;
+  payloadCodec;
+  async handle(request, ...[options]) {
+    const context = options?.context;
+    const execute = async () => {
+      const url = new URL(request.url);
+      const pathname = `/${trim2(url.pathname.replace(options?.prefix ?? "", ""), "/")}`;
+      const match = await this.procedureMatcher.match(pathname);
+      if (!match) {
+        return { matched: false, response: void 0 };
+      }
+      const input = await this.payloadCodec.decode(request);
+      const client = createProcedureClient(match.procedure, {
+        context,
+        path: match.path
+      });
+      const output = await client(input, { signal: request.signal });
+      const { body, headers } = this.payloadCodec.encode(output);
+      const response = new Response(body, { headers });
+      return { matched: true, response };
+    };
+    try {
+      const result = await executeWithHooks({
+        context,
+        execute,
+        input: request,
+        hooks: this.options,
+        meta: {
+          signal: request.signal
+        }
+      });
+      return result;
+    } catch (e) {
+      const error = e instanceof ORPCError2 ? e : new ORPCError2({
+        code: "INTERNAL_SERVER_ERROR",
+        message: "Internal server error",
+        cause: e
+      });
+      const { body, headers } = this.payloadCodec.encode(error.toJSON());
+      const response = new Response(body, {
+        headers,
+        status: error.status
+      });
+      return { matched: true, response };
+    }
+  }
+};
+
+export {
+  super_json_exports,
+  ORPCPayloadCodec,
+  ORPCProcedureMatcher,
+  RPCHandler
+};
+//# sourceMappingURL=chunk-SXUFCJBY.js.map

package/dist/chunk-WUOGVGWG.js

@@ -0,0 +1 @@
+//# sourceMappingURL=chunk-WUOGVGWG.js.map