@orpc/json-schema 2.0.0-beta.33 → 2.0.0-beta.34

package/dist/index.d.mts

@@ -1,5 +1,4 @@
-import * as Draft2020 from 'json-schema-typed/draft-2020-12';
-export { Format as JsonSchemaFormat, TypeName as JsonSchemaType } from 'json-schema-typed/draft-2020-12';
+import { OpenAPIV3_2 } from '@openapi-spec/types';
 import { AnySchema, RouterContract } from '@orpc/contract';
 export { AnySchema, Schema } from '@orpc/contract';
 import { Context } from '@orpc/server';
@@ -11,10 +10,48 @@ import { StandardJSONSchemaV1 } from '@standard-schema/spec';
 /**
  * A JSON Schema (draft 2020-12) representation used across oRPC's JSON schema tooling.
  *
+ * @remarks
+ * It is also the OpenAPI 3.2 Schema Object, so converted schemas embed into OpenAPI documents as-is.
+ *
  * @see {@link https://orpc.dev/docs/integrations/standard-schema | Standard Schema Integration}
  */
-type JsonSchema<Value = any> = Draft2020.JSONSchema<Value>;
-type JsonSchemaKeywords = typeof Draft2020.keywords[number];
+type JsonSchema<Value = any> = OpenAPIV3_2.SchemaObject<Value>;
+/**
+ * The declared JSON Schema keywords, the index signature is filtered out.
+ */
+type JsonSchemaKeywords = keyof {
+    [K in keyof OpenAPIV3_2.SchemaObjectFields as string extends K ? never : K]: unknown;
+};
+declare enum JsonSchemaType {
+    Array = "array",
+    Boolean = "boolean",
+    Integer = "integer",
+    Null = "null",
+    Number = "number",
+    Object = "object",
+    String = "string"
+}
+declare enum JsonSchemaFormat {
+    Date = "date",
+    DateTime = "date-time",
+    Duration = "duration",
+    Email = "email",
+    Hostname = "hostname",
+    IDNEmail = "idn-email",
+    IDNHostname = "idn-hostname",
+    IPv4 = "ipv4",
+    IPv6 = "ipv6",
+    IRI = "iri",
+    IRIReference = "iri-reference",
+    JSONPointer = "json-pointer",
+    RegEx = "regex",
+    RelativeJSONPointer = "relative-json-pointer",
+    Time = "time",
+    URI = "uri",
+    URIReference = "uri-reference",
+    URITemplate = "uri-template",
+    UUID = "uuid"
+}
 declare enum JsonSchemaXNativeType {
     BigInt = "bigint",
     RegExp = "regexp",
@@ -215,5 +252,5 @@ declare class StandardJsonSchemaConverter implements JsonSchemaConverter {
     convertInternal(schema: StandardJSONSchemaV1 & AnySchema, direction: JsonSchemaConverterDirection): [jsonSchema: JsonSchema, optional: boolean];
 }
 
-export { DelegatingJsonSchemaConverter, JsonSchemaCoercer, JsonSchemaXNativeType, SmartCoercionHandlerPlugin, SmartCoercionLinkPlugin, StandardJsonSchemaConverter, combineJsonObjectSchemaEntries, combineJsonSchemasWithComposition, decodeJsonPointerSegment, deduplicateJsonSchemas, encodeJsonPointerSegment, ensureJsonSchemaObject, extractJsonObjectSchemaEntries, flattenJsonUnionSchema, hoistRecursiveRefToDef, isJsonArraySchema, isJsonFileSchema, isJsonObjectSchema, isJsonPrimitiveSchema, isUnconstrainedSchema, mapJsonSchemaRefs, matchArrayableJsonSchema, resolveJsonSchemaRootLocalRef, visitJsonSchemaRefs };
+export { DelegatingJsonSchemaConverter, JsonSchemaCoercer, JsonSchemaFormat, JsonSchemaType, JsonSchemaXNativeType, SmartCoercionHandlerPlugin, SmartCoercionLinkPlugin, StandardJsonSchemaConverter, combineJsonObjectSchemaEntries, combineJsonSchemasWithComposition, decodeJsonPointerSegment, deduplicateJsonSchemas, encodeJsonPointerSegment, ensureJsonSchemaObject, extractJsonObjectSchemaEntries, flattenJsonUnionSchema, hoistRecursiveRefToDef, isJsonArraySchema, isJsonFileSchema, isJsonObjectSchema, isJsonPrimitiveSchema, isUnconstrainedSchema, mapJsonSchemaRefs, matchArrayableJsonSchema, resolveJsonSchemaRootLocalRef, visitJsonSchemaRefs };
 export type { JsonArraySchema, JsonFileSchema, JsonObjectSchema, JsonObjectSchemaEntry, JsonSchema, JsonSchemaConverter, JsonSchemaConverterDirection, JsonSchemaKeywords, SmartCoercionHandlerPluginOptions, SmartCoercionLinkPluginOptions };

package/dist/index.d.ts

@@ -1,5 +1,4 @@
-import * as Draft2020 from 'json-schema-typed/draft-2020-12';
-export { Format as JsonSchemaFormat, TypeName as JsonSchemaType } from 'json-schema-typed/draft-2020-12';
+import { OpenAPIV3_2 } from '@openapi-spec/types';
 import { AnySchema, RouterContract } from '@orpc/contract';
 export { AnySchema, Schema } from '@orpc/contract';
 import { Context } from '@orpc/server';
@@ -11,10 +10,48 @@ import { StandardJSONSchemaV1 } from '@standard-schema/spec';
 /**
  * A JSON Schema (draft 2020-12) representation used across oRPC's JSON schema tooling.
  *
+ * @remarks
+ * It is also the OpenAPI 3.2 Schema Object, so converted schemas embed into OpenAPI documents as-is.
+ *
  * @see {@link https://orpc.dev/docs/integrations/standard-schema | Standard Schema Integration}
  */
-type JsonSchema<Value = any> = Draft2020.JSONSchema<Value>;
-type JsonSchemaKeywords = typeof Draft2020.keywords[number];
+type JsonSchema<Value = any> = OpenAPIV3_2.SchemaObject<Value>;
+/**
+ * The declared JSON Schema keywords, the index signature is filtered out.
+ */
+type JsonSchemaKeywords = keyof {
+    [K in keyof OpenAPIV3_2.SchemaObjectFields as string extends K ? never : K]: unknown;
+};
+declare enum JsonSchemaType {
+    Array = "array",
+    Boolean = "boolean",
+    Integer = "integer",
+    Null = "null",
+    Number = "number",
+    Object = "object",
+    String = "string"
+}
+declare enum JsonSchemaFormat {
+    Date = "date",
+    DateTime = "date-time",
+    Duration = "duration",
+    Email = "email",
+    Hostname = "hostname",
+    IDNEmail = "idn-email",
+    IDNHostname = "idn-hostname",
+    IPv4 = "ipv4",
+    IPv6 = "ipv6",
+    IRI = "iri",
+    IRIReference = "iri-reference",
+    JSONPointer = "json-pointer",
+    RegEx = "regex",
+    RelativeJSONPointer = "relative-json-pointer",
+    Time = "time",
+    URI = "uri",
+    URIReference = "uri-reference",
+    URITemplate = "uri-template",
+    UUID = "uuid"
+}
 declare enum JsonSchemaXNativeType {
     BigInt = "bigint",
     RegExp = "regexp",
@@ -215,5 +252,5 @@ declare class StandardJsonSchemaConverter implements JsonSchemaConverter {
     convertInternal(schema: StandardJSONSchemaV1 & AnySchema, direction: JsonSchemaConverterDirection): [jsonSchema: JsonSchema, optional: boolean];
 }
 
-export { DelegatingJsonSchemaConverter, JsonSchemaCoercer, JsonSchemaXNativeType, SmartCoercionHandlerPlugin, SmartCoercionLinkPlugin, StandardJsonSchemaConverter, combineJsonObjectSchemaEntries, combineJsonSchemasWithComposition, decodeJsonPointerSegment, deduplicateJsonSchemas, encodeJsonPointerSegment, ensureJsonSchemaObject, extractJsonObjectSchemaEntries, flattenJsonUnionSchema, hoistRecursiveRefToDef, isJsonArraySchema, isJsonFileSchema, isJsonObjectSchema, isJsonPrimitiveSchema, isUnconstrainedSchema, mapJsonSchemaRefs, matchArrayableJsonSchema, resolveJsonSchemaRootLocalRef, visitJsonSchemaRefs };
+export { DelegatingJsonSchemaConverter, JsonSchemaCoercer, JsonSchemaFormat, JsonSchemaType, JsonSchemaXNativeType, SmartCoercionHandlerPlugin, SmartCoercionLinkPlugin, StandardJsonSchemaConverter, combineJsonObjectSchemaEntries, combineJsonSchemasWithComposition, decodeJsonPointerSegment, deduplicateJsonSchemas, encodeJsonPointerSegment, ensureJsonSchemaObject, extractJsonObjectSchemaEntries, flattenJsonUnionSchema, hoistRecursiveRefToDef, isJsonArraySchema, isJsonFileSchema, isJsonObjectSchema, isJsonPrimitiveSchema, isUnconstrainedSchema, mapJsonSchemaRefs, matchArrayableJsonSchema, resolveJsonSchemaRootLocalRef, visitJsonSchemaRefs };
 export type { JsonArraySchema, JsonFileSchema, JsonObjectSchema, JsonObjectSchemaEntry, JsonSchema, JsonSchemaConverter, JsonSchemaConverterDirection, JsonSchemaKeywords, SmartCoercionHandlerPluginOptions, SmartCoercionLinkPluginOptions };

package/dist/index.mjs

@@ -1,5 +1,4 @@
 import { get, isPlainObject, tryOrUndefined, toArray, isDeepEqual, omit, isTypescriptObject, getOwn } from '@orpc/shared';
-export { Format as JsonSchemaFormat, TypeName as JsonSchemaType } from 'json-schema-typed/draft-2020-12';
 import { ORPCError, cloneORPCError } from '@orpc/client';
 import { getProcedureContractOrThrow } from '@orpc/contract';
 
@@ -159,6 +158,38 @@ function findRecursiveJsonSchemaDefName(defs) {
   return `__schema${index}`;
 }
 
+var JsonSchemaType = /* @__PURE__ */ ((JsonSchemaType2) => {
+  JsonSchemaType2["Array"] = "array";
+  JsonSchemaType2["Boolean"] = "boolean";
+  JsonSchemaType2["Integer"] = "integer";
+  JsonSchemaType2["Null"] = "null";
+  JsonSchemaType2["Number"] = "number";
+  JsonSchemaType2["Object"] = "object";
+  JsonSchemaType2["String"] = "string";
+  return JsonSchemaType2;
+})(JsonSchemaType || {});
+var JsonSchemaFormat = /* @__PURE__ */ ((JsonSchemaFormat2) => {
+  JsonSchemaFormat2["Date"] = "date";
+  JsonSchemaFormat2["DateTime"] = "date-time";
+  JsonSchemaFormat2["Duration"] = "duration";
+  JsonSchemaFormat2["Email"] = "email";
+  JsonSchemaFormat2["Hostname"] = "hostname";
+  JsonSchemaFormat2["IDNEmail"] = "idn-email";
+  JsonSchemaFormat2["IDNHostname"] = "idn-hostname";
+  JsonSchemaFormat2["IPv4"] = "ipv4";
+  JsonSchemaFormat2["IPv6"] = "ipv6";
+  JsonSchemaFormat2["IRI"] = "iri";
+  JsonSchemaFormat2["IRIReference"] = "iri-reference";
+  JsonSchemaFormat2["JSONPointer"] = "json-pointer";
+  JsonSchemaFormat2["RegEx"] = "regex";
+  JsonSchemaFormat2["RelativeJSONPointer"] = "relative-json-pointer";
+  JsonSchemaFormat2["Time"] = "time";
+  JsonSchemaFormat2["URI"] = "uri";
+  JsonSchemaFormat2["URIReference"] = "uri-reference";
+  JsonSchemaFormat2["URITemplate"] = "uri-template";
+  JsonSchemaFormat2["UUID"] = "uuid";
+  return JsonSchemaFormat2;
+})(JsonSchemaFormat || {});
 var JsonSchemaXNativeType = /* @__PURE__ */ ((JsonSchemaXNativeType2) => {
   JsonSchemaXNativeType2["BigInt"] = "bigint";
   JsonSchemaXNativeType2["RegExp"] = "regexp";
@@ -984,4 +1015,4 @@ class SmartCoercionLinkPlugin {
   }
 }
 
-export { DelegatingJsonSchemaConverter, JsonSchemaCoercer, JsonSchemaXNativeType, SmartCoercionHandlerPlugin, SmartCoercionLinkPlugin, StandardJsonSchemaConverter, combineJsonObjectSchemaEntries, combineJsonSchemasWithComposition, decodeJsonPointerSegment, deduplicateJsonSchemas, encodeJsonPointerSegment, ensureJsonSchemaObject, extractJsonObjectSchemaEntries, flattenJsonUnionSchema, hoistRecursiveRefToDef, isJsonArraySchema, isJsonFileSchema, isJsonObjectSchema, isJsonPrimitiveSchema, isUnconstrainedSchema, mapJsonSchemaRefs, matchArrayableJsonSchema, resolveJsonSchemaRootLocalRef, visitJsonSchemaRefs };
+export { DelegatingJsonSchemaConverter, JsonSchemaCoercer, JsonSchemaFormat, JsonSchemaType, JsonSchemaXNativeType, SmartCoercionHandlerPlugin, SmartCoercionLinkPlugin, StandardJsonSchemaConverter, combineJsonObjectSchemaEntries, combineJsonSchemasWithComposition, decodeJsonPointerSegment, deduplicateJsonSchemas, encodeJsonPointerSegment, ensureJsonSchemaObject, extractJsonObjectSchemaEntries, flattenJsonUnionSchema, hoistRecursiveRefToDef, isJsonArraySchema, isJsonFileSchema, isJsonObjectSchema, isJsonPrimitiveSchema, isUnconstrainedSchema, mapJsonSchemaRefs, matchArrayableJsonSchema, resolveJsonSchemaRootLocalRef, visitJsonSchemaRefs };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/json-schema",
   "type": "module",
-  "version": "2.0.0-beta.33",
+  "version": "2.0.0-beta.34",
   "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.33",
-    "@orpc/contract": "2.0.0-beta.33",
-    "@orpc/server": "2.0.0-beta.33",
-    "@orpc/shared": "2.0.0-beta.33",
-    "@standard-schema/spec": "^1.1.0",
-    "json-schema-typed": "^8.0.2"
+    "@openapi-spec/types": "~0.1.0",
+    "@orpc/client": "2.0.0-beta.34",
+    "@orpc/contract": "2.0.0-beta.34",
+    "@orpc/server": "2.0.0-beta.34",
+    "@orpc/shared": "2.0.0-beta.34",
+    "@standard-schema/spec": "^1.1.0"
   },
   "devDependencies": {
     "zod": "^4.5.4"