@orpc/json-schema 2.0.0-beta.31 → 2.0.0-beta.32

package/README.md

@@ -4,7 +4,7 @@
   <a href="https://codecov.io/gh/middleapi/orpc">
     <img alt="codecov" src="https://codecov.io/gh/middleapi/orpc/branch/main/graph/badge.svg">
   </a>
-  <a href="https://npmx.dev/package/@orpc/json-schema">
+  <a href="https://www.npmjs.com/package/@orpc/json-schema">
     <img alt="weekly downloads" src="https://img.shields.io/npm/dw/%40orpc%2Fjson-schema?logo=npm" />
   </a>
   <a href="https://app.codspeed.io/middleapi/orpc?utm_source=badge">
@@ -29,44 +29,44 @@ You can read the documentation [here](https://orpc.dev).
 
 **Core**
 
-- [@orpc/contract](https://npmx.dev/package/@orpc/contract): Define API contract as the single source of truth.
-- [@orpc/server](https://npmx.dev/package/@orpc/server): Build APIs or implement contracts.
-- [@orpc/client](https://npmx.dev/package/@orpc/client): Consume APIs with end-to-end type safety.
-- [@orpc/openapi](https://npmx.dev/package/@orpc/openapi): Add OpenAPI compatibility to APIs.
+- [@orpc/contract](https://www.npmjs.com/package/@orpc/contract): Define API contract as the single source of truth.
+- [@orpc/server](https://www.npmjs.com/package/@orpc/server): Build APIs or implement contracts.
+- [@orpc/client](https://www.npmjs.com/package/@orpc/client): Consume APIs with end-to-end type safety.
+- [@orpc/openapi](https://www.npmjs.com/package/@orpc/openapi): Add OpenAPI compatibility to APIs.
 
 **Schema validation**
 
-- [@orpc/zod](https://npmx.dev/package/@orpc/zod): Integrate with [Zod](https://zod.dev/).
-- [@orpc/valibot](https://npmx.dev/package/@orpc/valibot): Integrate with [Valibot](https://valibot.dev/).
-- [@orpc/arktype](https://npmx.dev/package/@orpc/arktype): Integrate with [ArkType](https://arktype.io/).
+- [@orpc/zod](https://www.npmjs.com/package/@orpc/zod): Integrate with [Zod](https://zod.dev/).
+- [@orpc/valibot](https://www.npmjs.com/package/@orpc/valibot): Integrate with [Valibot](https://valibot.dev/).
+- [@orpc/arktype](https://www.npmjs.com/package/@orpc/arktype): Integrate with [ArkType](https://arktype.io/).
 
 **Built-in features**
 
-- [@orpc/publisher](https://npmx.dev/package/@orpc/publisher): Pub/Sub with memory, Redis, and Upstash adapters.
-- [@orpc/ratelimit](https://npmx.dev/package/@orpc/ratelimit): Rate limiting with memory, Redis, and Upstash adapters.
-- [@orpc/hibernation](https://npmx.dev/package/@orpc/hibernation): Leverage Hibernation APIs like [Cloudflare's Hibernation WebSocket](https://developers.cloudflare.com/durable-objects/best-practices/websockets/#durable-objects-hibernation-websocket-api).
-- [@orpc/json-schema](https://npmx.dev/package/@orpc/json-schema): Smart coercion for OpenAPI requests.
+- [@orpc/publisher](https://www.npmjs.com/package/@orpc/publisher): Pub/Sub with memory, Redis, and Upstash adapters.
+- [@orpc/ratelimit](https://www.npmjs.com/package/@orpc/ratelimit): Rate limiting with memory, Redis, and Upstash adapters.
+- [@orpc/hibernation](https://www.npmjs.com/package/@orpc/hibernation): Leverage Hibernation APIs like [Cloudflare's Hibernation WebSocket](https://developers.cloudflare.com/durable-objects/best-practices/websockets/#durable-objects-hibernation-websocket-api).
+- [@orpc/json-schema](https://www.npmjs.com/package/@orpc/json-schema): Smart coercion for OpenAPI requests.
 
 **Framework & ecosystem integrations**
 
-- [@orpc/next](https://npmx.dev/package/@orpc/next): Integrate with [Next.js Server Functions](https://nextjs.org/docs/app/getting-started/mutating-data).
-- [@orpc/ai-sdk](https://npmx.dev/package/@orpc/ai-sdk): Turn contracts and procedures into [AI SDK](https://ai-sdk.dev/) tools.
-- [@orpc/tanstack-query](https://npmx.dev/package/@orpc/tanstack-query): Integrate with [TanStack Query](https://tanstack.com/query/latest).
-- [@orpc/pinia-colada](https://npmx.dev/package/@orpc/pinia-colada): Integrate with [Pinia Colada](https://pinia-colada.esm.dev/).
-- [@orpc/swr](https://npmx.dev/package/@orpc/swr): Integrate with [SWR](https://swr.vercel.app/).
-- [@orpc/experimental-msw](https://npmx.dev/package/@orpc/experimental-msw): Mock procedures with [Mock Service Worker](https://mswjs.io/).
-- [@orpc/experimental-effect](https://npmx.dev/package/@orpc/experimental-effect): Integrate with [Effect](https://effect.website/).
-- [@orpc/nest](https://npmx.dev/package/@orpc/nest): Implement your contract with [NestJS](https://nestjs.com/).
-- [@orpc/node](https://npmx.dev/package/@orpc/node): [Node.js](https://nodejs.org/) plugins for static file serving and large uploads.
-- [@orpc/bun](https://npmx.dev/package/@orpc/bun): Adapters for [Bun's Redis](https://bun.sh/).
-- [@orpc/cloudflare](https://npmx.dev/package/@orpc/cloudflare): Adapters for [Cloudflare's RateLimit and Durable Objects](https://developers.cloudflare.com/workers/).
-- [@orpc/trpc](https://npmx.dev/package/@orpc/trpc): Reuse existing [tRPC](https://trpc.io/) routers within oRPC.
+- [@orpc/next](https://www.npmjs.com/package/@orpc/next): Integrate with [Next.js Server Functions](https://nextjs.org/docs/app/getting-started/mutating-data).
+- [@orpc/ai-sdk](https://www.npmjs.com/package/@orpc/ai-sdk): Turn contracts and procedures into [AI SDK](https://ai-sdk.dev/) tools.
+- [@orpc/tanstack-query](https://www.npmjs.com/package/@orpc/tanstack-query): Integrate with [TanStack Query](https://tanstack.com/query/latest).
+- [@orpc/pinia-colada](https://www.npmjs.com/package/@orpc/pinia-colada): Integrate with [Pinia Colada](https://pinia-colada.esm.dev/).
+- [@orpc/swr](https://www.npmjs.com/package/@orpc/swr): Integrate with [SWR](https://swr.vercel.app/).
+- [@orpc/experimental-msw](https://www.npmjs.com/package/@orpc/experimental-msw): Mock procedures with [Mock Service Worker](https://mswjs.io/).
+- [@orpc/experimental-effect](https://www.npmjs.com/package/@orpc/experimental-effect): Integrate with [Effect](https://effect.website/).
+- [@orpc/nest](https://www.npmjs.com/package/@orpc/nest): Implement your contract with [NestJS](https://nestjs.com/).
+- [@orpc/node](https://www.npmjs.com/package/@orpc/node): [Node.js](https://nodejs.org/) plugins for static file serving and large uploads.
+- [@orpc/bun](https://www.npmjs.com/package/@orpc/bun): Adapters for [Bun's Redis](https://bun.sh/).
+- [@orpc/cloudflare](https://www.npmjs.com/package/@orpc/cloudflare): Adapters for [Cloudflare's RateLimit and Durable Objects](https://developers.cloudflare.com/workers/).
+- [@orpc/trpc](https://www.npmjs.com/package/@orpc/trpc): Reuse existing [tRPC](https://trpc.io/) routers within oRPC.
 
 **Observability**
 
-- [@orpc/opentelemetry](https://npmx.dev/package/@orpc/opentelemetry): Integrate with [OpenTelemetry](https://opentelemetry.io/) for distributed tracing.
-- [@orpc/pino](https://npmx.dev/package/@orpc/pino): Integrate with [Pino](https://getpino.io/) for logging.
-- [@orpc/evlog](https://npmx.dev/package/@orpc/evlog): Integrate with [Evlog](https://evlog.dev/) for logging.
+- [@orpc/opentelemetry](https://www.npmjs.com/package/@orpc/opentelemetry): Integrate with [OpenTelemetry](https://opentelemetry.io/) for distributed tracing.
+- [@orpc/pino](https://www.npmjs.com/package/@orpc/pino): Integrate with [Pino](https://getpino.io/) for logging.
+- [@orpc/evlog](https://www.npmjs.com/package/@orpc/evlog): Integrate with [Evlog](https://evlog.dev/) for logging.
 
 ## Sponsors
 
@@ -113,6 +113,7 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
    <td align="center"><a href="https://github.com/itigoore01?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="shota"><img src="https://avatars.githubusercontent.com/u/11831107?u=c976a6dc7e055eb026304c46c99100ed22b0c8e0&amp;v=4" width="139" alt="shota"/><br />shota</a></td>
    <td align="center"><a href="https://github.com/ellis-driscoll?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ellis Driscoll"><img src="https://avatars.githubusercontent.com/u/70685966?u=c5f95bc33b5991d9744abe00052542e4a2ed3cb9&amp;v=4" width="139" alt="Ellis Driscoll"/><br />Ellis Driscoll</a></td>
    <td align="center"><a href="https://github.com/hoangbn?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Hoang Nguyen"><img src="https://avatars.githubusercontent.com/u/38968280?u=c90084c6de65c56facabab7ba13a72a49ddbc3e4&amp;v=4" width="139" alt="Hoang Nguyen"/><br />Hoang Nguyen</a></td>
+   <td align="center"><a href="https://opencollective.com/guest-ac41de3b?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Orestis Ioannou"><img src="https://images.opencollective.com/guest-ac41de3b/avatar/460.png" width="139" alt="Orestis Ioannou"/><br />Orestis Ioannou</a></td>
   </tr>
 </table>
 
@@ -135,7 +136,7 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
    <td align="center"><a href="https://rigtch.fm/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Igor Makowski"><img src="https://avatars.githubusercontent.com/u/56691628?u=ee8c879478f7c151b9156aef6c74243fa3e247a8&amp;v=4" width="119" alt="Igor Makowski"/><br />Igor Makowski</a></td>
    <td align="center"><a href="https://blog.cwang.io/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="hanayashiki"><img src="https://avatars.githubusercontent.com/u/26056783?u=06c3b9205a16fd41a871e82da1cc2a09306d53f5&amp;v=4" width="119" alt="hanayashiki"/><br />hanayashiki</a></td>
    <td align="center"><a href="https://dubinets.io/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Lev Dubinets"><img src="https://avatars.githubusercontent.com/u/3114081?u=f547f5d5012cab54851f1b1ad72d10e537f78fc2&amp;v=4" width="119" alt="Lev Dubinets"/><br />Lev Dubinets</a></td>
-   <td align="center"><a href="https://bika.ai/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Kelly Peilin Chan"><img src="https://avatars.githubusercontent.com/u/520852?u=6b0f7105f694e7b5cacf410a3f04c7044b469dc8&amp;v=4" width="119" alt="Kelly Peilin Chan"/><br />Kelly Peilin Chan</a></td>
+   <td align="center"><a href="https://kellychan.im/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Kelly Peilin Chan"><img src="https://avatars.githubusercontent.com/u/520852?u=6b0f7105f694e7b5cacf410a3f04c7044b469dc8&amp;v=4" width="119" alt="Kelly Peilin Chan"/><br />Kelly Peilin Chan</a></td>
   </tr>
   <tr>
    <td align="center"><a href="https://guyariely.com/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Guy Ariely"><img src="https://avatars.githubusercontent.com/u/42813496?u=edb6b7f563bf28e160a290832e7da57c0506f8ca&amp;v=4" width="119" alt="Guy Ariely"/><br />Guy Ariely</a></td>

package/dist/index.mjs

@@ -565,148 +565,85 @@ function ensureJsonSchemaObject(schema) {
   return schema;
 }
 
+function promoteJsonSchemaDefs(schema, mergedDefs, basePath) {
+  const { $defs, ...rootBody } = schema;
+  const renameMap = /* @__PURE__ */ new Map();
+  const mapRef = (ref) => {
+    if (ref === "#") {
+      return basePath;
+    }
+    if (ref.startsWith("#/$defs/")) {
+      const [encodedName, ...segments] = ref.slice("#/$defs/".length).split("/");
+      const newName = renameMap.get(decodeJsonPointerSegment(encodedName));
+      return newName === void 0 ? ref : ["#/$defs", encodeJsonPointerSegment(newName), ...segments].join("/");
+    }
+    if (ref.startsWith("#/") && get(rootBody, ref.slice(2).split("/").map(decodeJsonPointerSegment)) !== void 0) {
+      return `${basePath}/${ref.slice(2)}`;
+    }
+    return ref;
+  };
+  const defs = Object.entries($defs ?? {}).filter(([, def]) => def !== void 0);
+  if (defs.length > 0) {
+    const promoted = /* @__PURE__ */ new Map();
+    const reserved = /* @__PURE__ */ new Set([...mergedDefs.keys(), ...defs.map(([name]) => name)]);
+    for (let changed = true; changed; ) {
+      changed = false;
+      for (const [name, def] of defs) {
+        const body = mapJsonSchemaRefs(def, mapRef);
+        promoted.set(name, body);
+        if (renameMap.has(name) || !mergedDefs.has(name) || isDeepEqual(mergedDefs.get(name), body)) {
+          continue;
+        }
+        let counter = 2;
+        while (reserved.has(`${name}${counter}`)) {
+          counter++;
+        }
+        reserved.add(`${name}${counter}`);
+        renameMap.set(name, `${name}${counter}`);
+        changed = true;
+      }
+    }
+    for (const [name, body] of promoted) {
+      mergedDefs.set(renameMap.get(name) ?? name, body);
+    }
+  }
+  return mapJsonSchemaRefs(rootBody, mapRef);
+}
 function combineJsonSchemasWithComposition(keyword, schemas) {
   if (schemas.length <= 1) {
     return schemas[0] ?? true;
   }
-  const mergedDefs = {};
+  const mergedDefs = /* @__PURE__ */ new Map();
   const compositionBranches = [];
   for (let i = 0; i < schemas.length; i++) {
     const schema = schemas[i];
-    if (typeof schema === "boolean") {
-      compositionBranches.push(schema);
-      continue;
-    }
-    const { $defs, ...rest } = schema;
-    const renameMap = {};
-    const promotedNames = /* @__PURE__ */ new Set();
-    if ($defs) {
-      for (const [name, def] of Object.entries($defs)) {
-        if (def === void 0)
-          continue;
-        promotedNames.add(name);
-        if (name in mergedDefs) {
-          if (isDeepEqual(mergedDefs[name], def)) {
-            continue;
-          }
-          let counter = 2;
-          let newName = `${name}${counter}`;
-          while (newName in mergedDefs) {
-            counter++;
-            newName = `${name}${counter}`;
-          }
-          mergedDefs[newName] = def;
-          renameMap[name] = newName;
-        } else {
-          mergedDefs[name] = def;
-        }
-      }
-    }
-    compositionBranches.push(mapJsonSchemaRefs(
-      rest,
-      (ref) => {
-        if (ref === "#") {
-          return `#/${keyword}/${i}`;
-        }
-        if (ref.startsWith("#/$defs/")) {
-          const afterPrefix = ref.slice("#/$defs/".length);
-          const slashIdx = afterPrefix.indexOf("/");
-          const encodedSegment = slashIdx === -1 ? afterPrefix : afterPrefix.slice(0, slashIdx);
-          const rest2 = slashIdx === -1 ? "" : afterPrefix.slice(slashIdx);
-          const defName = decodeJsonPointerSegment(encodedSegment);
-          if (!promotedNames.has(defName)) {
-            return ref;
-          }
-          if (defName in renameMap) {
-            return `#/$defs/${encodeJsonPointerSegment(renameMap[defName])}${rest2}`;
-          }
-          return ref;
-        }
-        if (ref.startsWith("#/") && get(rest, ref.slice(2).split("/").map(decodeJsonPointerSegment)) !== void 0) {
-          return `#/${keyword}/${i}/${ref.slice(2)}`;
-        }
-        return ref;
-      }
-    ));
+    compositionBranches.push(typeof schema === "boolean" ? schema : promoteJsonSchemaDefs(schema, mergedDefs, `#/${keyword}/${i}`));
   }
   const result = { [keyword]: compositionBranches };
-  if (Object.keys(mergedDefs).length > 0) {
-    result.$defs = mergedDefs;
+  if (mergedDefs.size > 0) {
+    result.$defs = Object.fromEntries(mergedDefs);
   }
   return result;
 }
 function combineJsonObjectSchemaEntries(entries) {
-  const properties = {};
+  const properties = /* @__PURE__ */ new Map();
   const required = [];
-  const mergedDefs = {};
+  const mergedDefs = /* @__PURE__ */ new Map();
   for (const [name, propertySchema, optional] of entries) {
     if (!optional) {
       required.push(name);
     }
-    if (typeof propertySchema === "boolean") {
-      properties[name] = propertySchema;
-      continue;
-    }
-    const { $defs, ...rest } = propertySchema;
-    const renameMap = {};
-    const promotedNames = /* @__PURE__ */ new Set();
-    if ($defs) {
-      for (const [defName, def] of Object.entries($defs)) {
-        if (def === void 0) {
-          continue;
-        }
-        promotedNames.add(defName);
-        if (defName in mergedDefs) {
-          if (isDeepEqual(mergedDefs[defName], def)) {
-            continue;
-          }
-          let counter = 2;
-          let newName = `${defName}${counter}`;
-          while (newName in mergedDefs) {
-            counter++;
-            newName = `${defName}${counter}`;
-          }
-          mergedDefs[newName] = def;
-          renameMap[defName] = newName;
-        } else {
-          mergedDefs[defName] = def;
-        }
-      }
-    }
-    const propertyPathPrefix = `#/properties/${encodeJsonPointerSegment(name)}`;
-    properties[name] = mapJsonSchemaRefs(rest, (ref) => {
-      if (ref.startsWith("#/$defs/")) {
-        const afterPrefix = ref.slice("#/$defs/".length);
-        const slashIdx = afterPrefix.indexOf("/");
-        const encodedSegment = slashIdx === -1 ? afterPrefix : afterPrefix.slice(0, slashIdx);
-        const refRest = slashIdx === -1 ? "" : afterPrefix.slice(slashIdx);
-        const defName = decodeJsonPointerSegment(encodedSegment);
-        if (!promotedNames.has(defName)) {
-          return ref;
-        }
-        if (defName in renameMap) {
-          return `#/$defs/${encodeJsonPointerSegment(renameMap[defName])}${refRest}`;
-        }
-        return ref;
-      }
-      if (ref === "#") {
-        return propertyPathPrefix;
-      }
-      if (ref.startsWith("#/") && get(rest, ref.slice(2).split("/").map(decodeJsonPointerSegment)) !== void 0) {
-        return `${propertyPathPrefix}/${ref.slice(2)}`;
-      }
-      return ref;
-    });
+    properties.set(name, typeof propertySchema === "boolean" ? propertySchema : promoteJsonSchemaDefs(propertySchema, mergedDefs, `#/properties/${encodeJsonPointerSegment(name)}`));
   }
   const schema = {
     type: "object",
-    properties
+    properties: Object.fromEntries(properties)
   };
   if (required.length > 0) {
     schema.required = required;
   }
-  if (Object.keys(mergedDefs).length > 0) {
-    schema.$defs = mergedDefs;
+  if (mergedDefs.size > 0) {
+    schema.$defs = Object.fromEntries(mergedDefs);
   }
   return schema;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/json-schema",
   "type": "module",
-  "version": "2.0.0-beta.31",
+  "version": "2.0.0-beta.32",
   "description": "JSON Schema conversion and smart request coercion for oRPC and OpenAPI",
   "license": "MIT",
   "funding": [
@@ -35,12 +35,12 @@
     "dist"
   ],
   "dependencies": {
+    "@orpc/client": "2.0.0-beta.32",
+    "@orpc/contract": "2.0.0-beta.32",
+    "@orpc/server": "2.0.0-beta.32",
+    "@orpc/shared": "2.0.0-beta.32",
     "@standard-schema/spec": "^1.1.0",
-    "json-schema-typed": "^8.0.2",
-    "@orpc/contract": "2.0.0-beta.31",
-    "@orpc/client": "2.0.0-beta.31",
-    "@orpc/server": "2.0.0-beta.31",
-    "@orpc/shared": "2.0.0-beta.31"
+    "json-schema-typed": "^8.0.2"
   },
   "devDependencies": {
     "zod": "^4.4.3"