@orpc/zod 0.0.0-next.d7b5662 → 0.0.0-next.da8ae32

package/dist/index.js

@@ -1,44 +1,19 @@
-// ../../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;
-}
-
-// ../../node_modules/.pnpm/radash@12.1.0/node_modules/radash/dist/esm/async.mjs
-var guard = (func, shouldGuard) => {
-  const _guard = (err) => {
-    if (shouldGuard && !shouldGuard(err))
-      throw err;
-    return void 0;
-  };
-  const isPromise2 = (result) => result instanceof Promise;
-  try {
-    const result = func();
-    return isPromise2(result) ? result.catch(_guard) : result;
-  } catch (err) {
-    return _guard(err);
-  }
-};
-
 // src/coercer.ts
+import { guard, isObject } from "@orpc/shared";
 import {
   ZodFirstPartyTypeKind
 } from "zod";
-var ZodCoercer = class {
-  coerce(schema, value) {
-    if (!schema || schema["~standard"].vendor !== "zod") {
-      return value;
-    }
-    const zodSchema = schema;
-    const coerced = zodCoerceInternal(zodSchema, value, { bracketNotation: true });
-    return coerced;
+var ZodAutoCoercePlugin = class {
+  beforeCreateProcedureClient(clientOptions) {
+    clientOptions.interceptors ??= [];
+    clientOptions.interceptors.unshift((options) => {
+      const inputSchema = options.procedure["~orpc"].inputSchema;
+      if (!inputSchema || inputSchema["~standard"].vendor !== "zod") {
+        return options.next();
+      }
+      const coercedInput = zodCoerceInternal(inputSchema, options.input, { bracketNotation: true });
+      return options.next({ ...options, input: coercedInput });
+    });
   }
 };
 function zodCoerceInternal(schema, value, options) {
@@ -125,7 +100,7 @@ function zodCoerceInternal(schema, value, options) {
       if (value === void 0) {
         return [];
       }
-      if (isPlainObject(value) && Object.keys(value).every((k) => /^[1-9]\d*$/.test(k) || k === "0")) {
+      if (isObject(value) && Object.keys(value).every((k) => /^[1-9]\d*$/.test(k) || k === "0")) {
         const indexes = Object.keys(value).map((k) => Number(k)).sort((a, b) => a - b);
         const arr = Array.from({ length: (indexes.at(-1) ?? -1) + 1 });
         for (const i of indexes) {
@@ -136,7 +111,7 @@ function zodCoerceInternal(schema, value, options) {
     }
   } else if (typeName === ZodFirstPartyTypeKind.ZodObject) {
     const schema_ = schema;
-    if (isPlainObject(value)) {
+    if (isObject(value)) {
       const newObj = {};
       const keys = /* @__PURE__ */ new Set([
         ...Object.keys(value),
@@ -174,7 +149,7 @@ function zodCoerceInternal(schema, value, options) {
       if (value === void 0) {
         return /* @__PURE__ */ new Set();
       }
-      if (isPlainObject(value) && Object.keys(value).every((k) => /^[1-9]\d*$/.test(k) || k === "0")) {
+      if (isObject(value) && Object.keys(value).every((k) => /^[1-9]\d*$/.test(k) || k === "0")) {
         const indexes = Object.keys(value).map((k) => Number(k)).sort((a, b) => a - b);
         const arr = Array.from({ length: (indexes.at(-1) ?? -1) + 1 });
         for (const i of indexes) {
@@ -197,9 +172,9 @@ function zodCoerceInternal(schema, value, options) {
       if (value === void 0) {
         return /* @__PURE__ */ new Map();
       }
-      if (isPlainObject(value)) {
+      if (isObject(value)) {
         const arr = Array.from({ length: Object.keys(value).length }).fill(void 0).map(
-          (_, i) => isPlainObject(value[i]) && Object.keys(value[i]).length === 2 && "0" in value[i] && "1" in value[i] ? [value[i]["0"], value[i]["1"]] : void 0
+          (_, i) => isObject(value[i]) && Object.keys(value[i]).length === 2 && "0" in value[i] && "1" in value[i] ? [value[i]["0"], value[i]["1"]] : void 0
         );
         if (arr.every((v) => !!v)) {
           return new Map(
@@ -213,7 +188,7 @@ function zodCoerceInternal(schema, value, options) {
     }
   } else if (typeName === ZodFirstPartyTypeKind.ZodRecord) {
     const schema_ = schema;
-    if (isPlainObject(value)) {
+    if (isObject(value)) {
       const newObj = {};
       for (const [k, v] of Object.entries(value)) {
         const key = zodCoerceInternal(schema_._def.keyType, k, options_);
@@ -528,6 +503,16 @@ function zodToJsonSchema(schema, options) {
     return {};
   }
   const schema__ = schema;
+  if (!options?.isHandledZodDescription && "description" in schema__._def) {
+    const json = zodToJsonSchema(schema__, {
+      ...options,
+      isHandledZodDescription: true
+    });
+    return {
+      description: schema__._def.description,
+      ...json
+    };
+  }
   if (!options?.isHandledCustomJSONSchema) {
     const customJSONSchema = getCustomJSONSchema(schema__._def, options);
     if (customJSONSchema) {
@@ -541,7 +526,7 @@ function zodToJsonSchema(schema, options) {
       };
     }
   }
-  const childOptions = { ...options, isHandledCustomJSONSchema: false };
+  const childOptions = { ...options, isHandledCustomJSONSchema: false, isHandledZodDescription: false };
   const customType = getCustomZodType(schema__._def);
   switch (customType) {
     case "Blob": {
@@ -714,6 +699,7 @@ function zodToJsonSchema(schema, options) {
       const schema_ = schema__;
       const def = schema_._def;
       const json = { type: "array" };
+      json.items = zodToJsonSchema(def.type, childOptions);
       if (def.exactLength) {
         json.maxItems = def.exactLength.value;
         json.minItems = def.exactLength.value;
@@ -946,7 +932,7 @@ export {
   NON_LOGIC_KEYWORDS,
   UNDEFINED_JSON_SCHEMA,
   UNSUPPORTED_JSON_SCHEMA,
-  ZodCoercer,
+  ZodAutoCoercePlugin,
   ZodToJsonSchemaConverter,
   blob,
   file,

package/dist/src/coercer.d.ts

@@ -1,6 +1,7 @@
-import type { Schema } from '@orpc/contract';
-import type { SchemaCoercer } from '@orpc/openapi/fetch';
-export declare class ZodCoercer implements SchemaCoercer {
-    coerce(schema: Schema, value: unknown): unknown;
+import type { Context } from '@orpc/server';
+import type { Plugin } from '@orpc/server/plugins';
+import type { WellCreateProcedureClientOptions } from '@orpc/server/standard';
+export declare class ZodAutoCoercePlugin<TContext extends Context> implements Plugin<TContext> {
+    beforeCreateProcedureClient(clientOptions: WellCreateProcedureClientOptions<TContext>): void;
 }
 //# sourceMappingURL=coercer.d.ts.map

package/dist/src/converter.d.ts

@@ -35,6 +35,12 @@ export interface ZodToJsonSchemaOptions {
      * @internal
      */
     isHandledCustomJSONSchema?: boolean;
+    /**
+     * Track if current level schema is handled zod description to prevent recursive
+     *
+     * @internal
+     */
+    isHandledZodDescription?: boolean;
 }
 export declare function zodToJsonSchema(schema: StandardSchemaV1, options?: ZodToJsonSchemaOptions): Exclude<JSONSchema.JSONSchema, boolean>;
 export declare class ZodToJsonSchemaConverter implements SchemaConverter {

package/dist/src/schemas.d.ts

@@ -10,7 +10,7 @@ export declare function getCustomJSONSchema(def: ZodTypeDef, options?: {
     mode?: 'input' | 'output';
 }): Exclude<JSONSchema, boolean> | undefined;
 export declare function file(params?: string | CustomParams | ((input: unknown) => CustomParams)): ZodType<InstanceType<typeof File>, ZodTypeDef, InstanceType<typeof File>> & {
-    type: (mimeType: string, params?: string | CustomParams | ((input: unknown) => CustomParams)) => ZodEffects<ZodType<InstanceType<typeof File>, ZodTypeDef, InstanceType<typeof File>>, InstanceType<typeof File>, InstanceType<typeof File>>;
+    type(mimeType: string, params?: string | CustomParams | ((input: unknown) => CustomParams)): ZodEffects<ZodType<InstanceType<typeof File>, ZodTypeDef, InstanceType<typeof File>>, InstanceType<typeof File>, InstanceType<typeof File>>;
 };
 export declare function blob(params?: string | CustomParams | ((input: unknown) => CustomParams)): ZodType<InstanceType<typeof Blob>, ZodTypeDef, InstanceType<typeof Blob>>;
 export declare function invalidDate(params?: string | CustomParams | ((input: unknown) => CustomParams)): ZodType<Date, ZodTypeDef, Date>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/zod",
   "type": "module",
-  "version": "0.0.0-next.d7b5662",
+  "version": "0.0.0-next.da8ae32",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -29,12 +29,15 @@
     "dist"
   ],
   "peerDependencies": {
-    "@orpc/openapi": "0.0.0-next.d7b5662"
+    "@orpc/openapi": "0.0.0-next.da8ae32",
+    "@orpc/server": "0.0.0-next.da8ae32"
   },
   "dependencies": {
+    "@standard-schema/spec": "^1.0.0",
     "json-schema-typed": "^8.0.1",
     "wildcard-match": "^5.1.3",
-    "zod": "^3.24.1"
+    "zod": "^3.24.1",
+    "@orpc/shared": "0.0.0-next.da8ae32"
   },
   "scripts": {
     "build": "tsup --clean --sourcemap --entry.index=src/index.ts --format=esm --onSuccess='tsc -b --noCheck'",