@orpc/contract 0.0.0-next.cba521d → 0.0.0-next.cc8802c

package/dist/index.mjs

@@ -0,0 +1,252 @@
+import { mapEventIterator, ORPCError } from '@orpc/client';
+export { ORPCError } from '@orpc/client';
+import { isAsyncIteratorObject } from '@orpc/shared';
+
+class ValidationError extends Error {
+  issues;
+  constructor(options) {
+    super(options.message, options);
+    this.issues = options.issues;
+  }
+}
+function mergeErrorMap(errorMap1, errorMap2) {
+  return { ...errorMap1, ...errorMap2 };
+}
+
+function mergeMeta(meta1, meta2) {
+  return { ...meta1, ...meta2 };
+}
+
+class ContractProcedure {
+  "~orpc";
+  constructor(def) {
+    if (def.route?.successStatus && (def.route.successStatus < 200 || def.route?.successStatus > 299)) {
+      throw new Error("[ContractProcedure] The successStatus must be between 200 and 299");
+    }
+    if (Object.values(def.errorMap).some((val) => val && val.status && (val.status < 400 || val.status > 599))) {
+      throw new Error("[ContractProcedure] The error status code must be in the 400-599 range.");
+    }
+    this["~orpc"] = def;
+  }
+}
+function isContractProcedure(item) {
+  if (item instanceof ContractProcedure) {
+    return true;
+  }
+  return (typeof item === "object" || typeof item === "function") && item !== null && "~orpc" in item && typeof item["~orpc"] === "object" && item["~orpc"] !== null && "errorMap" in item["~orpc"] && "route" in item["~orpc"] && "meta" in item["~orpc"];
+}
+
+function mergeRoute(a, b) {
+  return { ...a, ...b };
+}
+function prefixRoute(route, prefix) {
+  if (!route.path) {
+    return route;
+  }
+  return {
+    ...route,
+    path: `${prefix}${route.path}`
+  };
+}
+function unshiftTagRoute(route, tags) {
+  return {
+    ...route,
+    tags: [...tags, ...route.tags ?? []]
+  };
+}
+function mergePrefix(a, b) {
+  return a ? `${a}${b}` : b;
+}
+function mergeTags(a, b) {
+  return a ? [...a, ...b] : b;
+}
+function enhanceRoute(route, options) {
+  let router = route;
+  if (options.prefix) {
+    router = prefixRoute(router, options.prefix);
+  }
+  if (options.tags?.length) {
+    router = unshiftTagRoute(router, options.tags);
+  }
+  return router;
+}
+
+function getContractRouter(router, path) {
+  let current = router;
+  for (let i = 0; i < path.length; i++) {
+    const segment = path[i];
+    if (!current) {
+      return void 0;
+    }
+    if (isContractProcedure(current)) {
+      return void 0;
+    }
+    current = current[segment];
+  }
+  return current;
+}
+function enhanceContractRouter(router, options) {
+  if (isContractProcedure(router)) {
+    const enhanced2 = new ContractProcedure({
+      ...router["~orpc"],
+      errorMap: mergeErrorMap(options.errorMap, router["~orpc"].errorMap),
+      route: enhanceRoute(router["~orpc"].route, options)
+    });
+    return enhanced2;
+  }
+  const enhanced = {};
+  for (const key in router) {
+    enhanced[key] = enhanceContractRouter(router[key], options);
+  }
+  return enhanced;
+}
+
+class ContractBuilder extends ContractProcedure {
+  constructor(def) {
+    super(def);
+    this["~orpc"].prefix = def.prefix;
+    this["~orpc"].tags = def.tags;
+  }
+  /**
+   * Reset initial meta
+   */
+  $meta(initialMeta) {
+    return new ContractBuilder({
+      ...this["~orpc"],
+      meta: initialMeta
+    });
+  }
+  /**
+   * Reset initial route
+   */
+  $route(initialRoute) {
+    return new ContractBuilder({
+      ...this["~orpc"],
+      route: initialRoute
+    });
+  }
+  errors(errors) {
+    return new ContractBuilder({
+      ...this["~orpc"],
+      errorMap: mergeErrorMap(this["~orpc"].errorMap, errors)
+    });
+  }
+  meta(meta) {
+    return new ContractBuilder({
+      ...this["~orpc"],
+      meta: mergeMeta(this["~orpc"].meta, meta)
+    });
+  }
+  route(route) {
+    return new ContractBuilder({
+      ...this["~orpc"],
+      route: mergeRoute(this["~orpc"].route, route)
+    });
+  }
+  input(schema) {
+    return new ContractBuilder({
+      ...this["~orpc"],
+      inputSchema: schema
+    });
+  }
+  output(schema) {
+    return new ContractBuilder({
+      ...this["~orpc"],
+      outputSchema: schema
+    });
+  }
+  prefix(prefix) {
+    return new ContractBuilder({
+      ...this["~orpc"],
+      prefix: mergePrefix(this["~orpc"].prefix, prefix)
+    });
+  }
+  tag(...tags) {
+    return new ContractBuilder({
+      ...this["~orpc"],
+      tags: mergeTags(this["~orpc"].tags, tags)
+    });
+  }
+  router(router) {
+    return enhanceContractRouter(router, this["~orpc"]);
+  }
+}
+const oc = new ContractBuilder({
+  errorMap: {},
+  route: {},
+  meta: {}
+});
+
+const DEFAULT_CONFIG = {
+  defaultMethod: "POST",
+  defaultSuccessStatus: 200,
+  defaultSuccessDescription: "OK",
+  defaultInputStructure: "compact",
+  defaultOutputStructure: "compact"
+};
+function fallbackContractConfig(key, value) {
+  if (value === void 0) {
+    return DEFAULT_CONFIG[key];
+  }
+  return value;
+}
+
+const EVENT_ITERATOR_DETAILS_SYMBOL = Symbol("ORPC_EVENT_ITERATOR_DETAILS");
+function eventIterator(yields, returns) {
+  return {
+    "~standard": {
+      [EVENT_ITERATOR_DETAILS_SYMBOL]: { yields, returns },
+      vendor: "orpc",
+      version: 1,
+      validate(iterator) {
+        if (!isAsyncIteratorObject(iterator)) {
+          return { issues: [{ message: "Expect event iterator", path: [] }] };
+        }
+        const mapped = mapEventIterator(iterator, {
+          async value(value, done) {
+            const schema = done ? returns : yields;
+            if (!schema) {
+              return value;
+            }
+            const result = await schema["~standard"].validate(value);
+            if (result.issues) {
+              throw new ORPCError("EVENT_ITERATOR_VALIDATION_FAILED", {
+                message: "Event iterator validation failed",
+                cause: new ValidationError({
+                  issues: result.issues,
+                  message: "Event iterator validation failed"
+                })
+              });
+            }
+            return result.value;
+          },
+          error: async (error) => error
+        });
+        return { value: mapped };
+      }
+    }
+  };
+}
+function getEventIteratorSchemaDetails(schema) {
+  if (schema === void 0) {
+    return void 0;
+  }
+  return schema["~standard"][EVENT_ITERATOR_DETAILS_SYMBOL];
+}
+
+function type(...[map]) {
+  return {
+    "~standard": {
+      vendor: "custom",
+      version: 1,
+      async validate(value) {
+        if (map) {
+          return { value: await map(value) };
+        }
+        return { value };
+      }
+    }
+  };
+}
+
+export { ContractBuilder, ContractProcedure, ValidationError, enhanceContractRouter, enhanceRoute, eventIterator, fallbackContractConfig, getContractRouter, getEventIteratorSchemaDetails, isContractProcedure, mergeErrorMap, mergeMeta, mergePrefix, mergeRoute, mergeTags, oc, prefixRoute, type, unshiftTagRoute };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/contract",
   "type": "module",
-  "version": "0.0.0-next.cba521d",
+  "version": "0.0.0-next.cc8802c",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -15,30 +15,27 @@
   ],
   "exports": {
     ".": {
-      "types": "./dist/src/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
-    },
-    "./🔒/*": {
-      "types": "./dist/src/*.d.ts"
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs",
+      "default": "./dist/index.mjs"
     }
   },
   "files": [
-    "!**/*.map",
-    "!**/*.tsbuildinfo",
     "dist"
   ],
   "dependencies": {
-    "@standard-schema/spec": "1.0.0-beta.4",
-    "@orpc/shared": "0.0.0-next.cba521d"
+    "@standard-schema/spec": "^1.0.0",
+    "@orpc/shared": "0.0.0-next.cc8802c",
+    "@orpc/standard-server": "0.0.0-next.cc8802c",
+    "@orpc/client": "0.0.0-next.cc8802c"
   },
   "devDependencies": {
     "arktype": "2.0.0-rc.26",
     "valibot": "1.0.0-beta.9",
-    "zod": "3.24.1"
+    "zod": "^3.24.2"
   },
   "scripts": {
-    "build": "tsup --clean --sourcemap --entry.index=src/index.ts --format=esm --onSuccess='tsc -b --noCheck'",
+    "build": "unbuild",
     "build:watch": "pnpm run build --watch",
     "type:check": "tsc -b"
   }

package/dist/index.js

@@ -1,380 +0,0 @@
-// src/procedure.ts
-var ContractProcedure = class {
-  "~type" = "ContractProcedure";
-  "~orpc";
-  constructor(def) {
-    if (def.route?.successStatus && (def.route.successStatus < 200 || def.route?.successStatus > 299)) {
-      throw new Error("[ContractProcedure] The successStatus must be between 200 and 299");
-    }
-    if (Object.values(def.errorMap ?? {}).some((val) => val && val.status && (val.status < 400 || val.status > 599))) {
-      throw new Error("[ContractProcedure] The error status code must be in the 400-599 range.");
-    }
-    this["~orpc"] = def;
-  }
-};
-function isContractProcedure(item) {
-  if (item instanceof ContractProcedure) {
-    return true;
-  }
-  return (typeof item === "object" || typeof item === "function") && item !== null && "~type" in item && item["~type"] === "ContractProcedure" && "~orpc" in item && typeof item["~orpc"] === "object" && item["~orpc"] !== null && "InputSchema" in item["~orpc"] && "OutputSchema" in item["~orpc"] && "errorMap" in item["~orpc"];
-}
-
-// src/procedure-decorated.ts
-var DecoratedContractProcedure = class _DecoratedContractProcedure extends ContractProcedure {
-  static decorate(procedure) {
-    if (procedure instanceof _DecoratedContractProcedure) {
-      return procedure;
-    }
-    return new _DecoratedContractProcedure(procedure["~orpc"]);
-  }
-  route(route) {
-    return new _DecoratedContractProcedure({
-      ...this["~orpc"],
-      route: {
-        ...this["~orpc"].route,
-        ...route
-      }
-    });
-  }
-  prefix(prefix) {
-    return new _DecoratedContractProcedure({
-      ...this["~orpc"],
-      ...this["~orpc"].route?.path ? {
-        route: {
-          ...this["~orpc"].route,
-          path: `${prefix}${this["~orpc"].route.path}`
-        }
-      } : void 0
-    });
-  }
-  unshiftTag(...tags) {
-    return new _DecoratedContractProcedure({
-      ...this["~orpc"],
-      route: {
-        ...this["~orpc"].route,
-        tags: [
-          ...tags,
-          ...this["~orpc"].route?.tags?.filter((tag) => !tags.includes(tag)) ?? []
-        ]
-      }
-    });
-  }
-  input(schema, example) {
-    return new _DecoratedContractProcedure({
-      ...this["~orpc"],
-      InputSchema: schema,
-      inputExample: example
-    });
-  }
-  output(schema, example) {
-    return new _DecoratedContractProcedure({
-      ...this["~orpc"],
-      OutputSchema: schema,
-      outputExample: example
-    });
-  }
-  errors(errorMap) {
-    return new _DecoratedContractProcedure({
-      ...this["~orpc"],
-      errorMap
-    });
-  }
-};
-
-// src/router-builder.ts
-var ContractRouterBuilder = class _ContractRouterBuilder {
-  "~type" = "ContractProcedure";
-  "~orpc";
-  constructor(def) {
-    this["~orpc"] = def;
-  }
-  prefix(prefix) {
-    return new _ContractRouterBuilder({
-      ...this["~orpc"],
-      prefix: `${this["~orpc"].prefix ?? ""}${prefix}`
-    });
-  }
-  tag(...tags) {
-    return new _ContractRouterBuilder({
-      ...this["~orpc"],
-      tags: [...this["~orpc"].tags ?? [], ...tags]
-    });
-  }
-  router(router) {
-    if (isContractProcedure(router)) {
-      let decorated = DecoratedContractProcedure.decorate(router);
-      if (this["~orpc"].tags) {
-        decorated = decorated.unshiftTag(...this["~orpc"].tags);
-      }
-      if (this["~orpc"].prefix) {
-        decorated = decorated.prefix(this["~orpc"].prefix);
-      }
-      return decorated;
-    }
-    const adapted = {};
-    for (const key in router) {
-      adapted[key] = this.router(router[key]);
-    }
-    return adapted;
-  }
-};
-
-// src/builder.ts
-var ContractBuilder = class {
-  prefix(prefix) {
-    return new ContractRouterBuilder({
-      prefix
-    });
-  }
-  tag(...tags) {
-    return new ContractRouterBuilder({
-      tags
-    });
-  }
-  route(route) {
-    return new DecoratedContractProcedure({
-      route,
-      InputSchema: void 0,
-      OutputSchema: void 0,
-      errorMap: void 0
-    });
-  }
-  input(schema, example) {
-    return new DecoratedContractProcedure({
-      InputSchema: schema,
-      inputExample: example,
-      OutputSchema: void 0,
-      errorMap: void 0
-    });
-  }
-  output(schema, example) {
-    return new DecoratedContractProcedure({
-      OutputSchema: schema,
-      outputExample: example,
-      InputSchema: void 0,
-      errorMap: void 0
-    });
-  }
-  errors(errorMap) {
-    return new DecoratedContractProcedure({
-      InputSchema: void 0,
-      OutputSchema: void 0,
-      errorMap
-    });
-  }
-  router(router) {
-    return router;
-  }
-};
-
-// src/error-orpc.ts
-import { isPlainObject } from "@orpc/shared";
-var COMMON_ORPC_ERROR_DEFS = {
-  BAD_REQUEST: {
-    status: 400,
-    message: "Bad Request"
-  },
-  UNAUTHORIZED: {
-    status: 401,
-    message: "Unauthorized"
-  },
-  FORBIDDEN: {
-    status: 403,
-    message: "Forbidden"
-  },
-  NOT_FOUND: {
-    status: 404,
-    message: "Not Found"
-  },
-  METHOD_NOT_SUPPORTED: {
-    status: 405,
-    message: "Method Not Supported"
-  },
-  NOT_ACCEPTABLE: {
-    status: 406,
-    message: "Not Acceptable"
-  },
-  TIMEOUT: {
-    status: 408,
-    message: "Request Timeout"
-  },
-  CONFLICT: {
-    status: 409,
-    message: "Conflict"
-  },
-  PRECONDITION_FAILED: {
-    status: 412,
-    message: "Precondition Failed"
-  },
-  PAYLOAD_TOO_LARGE: {
-    status: 413,
-    message: "Payload Too Large"
-  },
-  UNSUPPORTED_MEDIA_TYPE: {
-    status: 415,
-    message: "Unsupported Media Type"
-  },
-  UNPROCESSABLE_CONTENT: {
-    status: 422,
-    message: "Unprocessable Content"
-  },
-  TOO_MANY_REQUESTS: {
-    status: 429,
-    message: "Too Many Requests"
-  },
-  CLIENT_CLOSED_REQUEST: {
-    status: 499,
-    message: "Client Closed Request"
-  },
-  INTERNAL_SERVER_ERROR: {
-    status: 500,
-    message: "Internal Server Error"
-  },
-  NOT_IMPLEMENTED: {
-    status: 501,
-    message: "Not Implemented"
-  },
-  BAD_GATEWAY: {
-    status: 502,
-    message: "Bad Gateway"
-  },
-  SERVICE_UNAVAILABLE: {
-    status: 503,
-    message: "Service Unavailable"
-  },
-  GATEWAY_TIMEOUT: {
-    status: 504,
-    message: "Gateway Timeout"
-  }
-};
-function fallbackORPCErrorStatus(code, status) {
-  return status ?? COMMON_ORPC_ERROR_DEFS[code]?.status ?? 500;
-}
-function fallbackORPCErrorMessage(code, message) {
-  return message || COMMON_ORPC_ERROR_DEFS[code]?.message || code;
-}
-var ORPCError = class extends Error {
-  defined;
-  code;
-  status;
-  data;
-  constructor(options) {
-    if (options.status && (options.status < 400 || options.status >= 600)) {
-      throw new Error("[ORPCError] The error status code must be in the 400-599 range.");
-    }
-    const message = fallbackORPCErrorMessage(options.code, options.message);
-    super(message, options);
-    this.code = options.code;
-    this.status = fallbackORPCErrorStatus(options.code, options.status);
-    this.defined = options.defined ?? false;
-    this.data = options.data;
-  }
-  toJSON() {
-    return {
-      defined: this.defined,
-      code: this.code,
-      status: this.status,
-      message: this.message,
-      data: this.data
-    };
-  }
-  static isValidJSON(json) {
-    return isPlainObject(json) && "defined" in json && typeof json.defined === "boolean" && "code" in json && typeof json.code === "string" && "status" in json && typeof json.status === "number" && "message" in json && typeof json.message === "string";
-  }
-};
-function isDefinedError(error) {
-  return error instanceof ORPCError && error.defined;
-}
-async function validateORPCError(map, error) {
-  const { code, status, message, data, cause, defined } = error;
-  const config = map?.[error.code];
-  if (!config || fallbackORPCErrorStatus(error.code, config.status) !== error.status) {
-    return defined ? new ORPCError({ defined: false, code, status, message, data, cause }) : error;
-  }
-  if (!config.data) {
-    return defined ? error : new ORPCError({ defined: true, code, status, message, data, cause });
-  }
-  const validated = await config.data["~standard"].validate(error.data);
-  if (validated.issues) {
-    return defined ? new ORPCError({ defined: false, code, status, message, data, cause }) : error;
-  }
-  return new ORPCError({
-    defined: true,
-    code,
-    status,
-    message,
-    data: validated.value,
-    cause
-  });
-}
-
-// src/client-utils.ts
-async function safe(promise) {
-  try {
-    const output = await promise;
-    return [output, void 0, false];
-  } catch (e) {
-    const error = e;
-    if (isDefinedError(error)) {
-      return [void 0, error, true];
-    }
-    return [void 0, error, false];
-  }
-}
-
-// src/config.ts
-var DEFAULT_CONFIG = {
-  defaultMethod: "POST",
-  defaultSuccessStatus: 200,
-  defaultSuccessDescription: "OK",
-  defaultInputStructure: "compact",
-  defaultOutputStructure: "compact"
-};
-var GLOBAL_CONFIG_REF = { value: DEFAULT_CONFIG };
-function configGlobal(config) {
-  if (config.defaultSuccessStatus !== void 0 && (config.defaultSuccessStatus < 200 || config.defaultSuccessStatus > 299)) {
-    throw new Error("[configGlobal] The defaultSuccessStatus must be between 200 and 299");
-  }
-  GLOBAL_CONFIG_REF.value = config;
-}
-function fallbackToGlobalConfig(key, value) {
-  if (value === void 0) {
-    const fallback = GLOBAL_CONFIG_REF.value[key];
-    if (fallback === void 0) {
-      return DEFAULT_CONFIG[key];
-    }
-    return fallback;
-  }
-  return value;
-}
-
-// src/error.ts
-var ValidationError = class extends Error {
-  issues;
-  constructor(options) {
-    super(options.message, options);
-    this.issues = options.issues;
-  }
-};
-
-// src/index.ts
-var oc = new ContractBuilder();
-export {
-  COMMON_ORPC_ERROR_DEFS,
-  ContractBuilder,
-  ContractProcedure,
-  ContractRouterBuilder,
-  DecoratedContractProcedure,
-  ORPCError,
-  ValidationError,
-  configGlobal,
-  fallbackORPCErrorMessage,
-  fallbackORPCErrorStatus,
-  fallbackToGlobalConfig,
-  isContractProcedure,
-  isDefinedError,
-  oc,
-  safe,
-  validateORPCError
-};
-//# sourceMappingURL=index.js.map

package/dist/src/builder.d.ts

@@ -1,16 +0,0 @@
-import type { ErrorMap } from './error-map';
-import type { RouteOptions } from './procedure';
-import type { ContractRouter } from './router';
-import type { HTTPPath, Schema, SchemaInput, SchemaOutput } from './types';
-import { DecoratedContractProcedure } from './procedure-decorated';
-import { ContractRouterBuilder } from './router-builder';
-export declare class ContractBuilder {
-    prefix(prefix: HTTPPath): ContractRouterBuilder;
-    tag(...tags: string[]): ContractRouterBuilder;
-    route(route: RouteOptions): DecoratedContractProcedure<undefined, undefined, undefined>;
-    input<U extends Schema>(schema: U, example?: SchemaInput<U>): DecoratedContractProcedure<U, undefined, undefined>;
-    output<U extends Schema>(schema: U, example?: SchemaOutput<U>): DecoratedContractProcedure<undefined, U, undefined>;
-    errors<const U extends ErrorMap>(errorMap: U): DecoratedContractProcedure<undefined, undefined, U>;
-    router<T extends ContractRouter>(router: T): T;
-}
-//# sourceMappingURL=builder.d.ts.map

package/dist/src/client-utils.d.ts

@@ -1,5 +0,0 @@
-import type { ClientPromiseResult } from './client';
-import { type ORPCError } from './error-orpc';
-export type SafeResult<TOutput, TError extends Error> = [output: TOutput, error: undefined, isDefinedError: false] | [output: undefined, error: TError, isDefinedError: false] | [output: undefined, error: Extract<TError, ORPCError<any, any>>, isDefinedError: true];
-export declare function safe<TOutput, TError extends Error>(promise: ClientPromiseResult<TOutput, TError>): Promise<SafeResult<TOutput, TError>>;
-//# sourceMappingURL=client-utils.d.ts.map