abxbus 2.5.14 → 2.5.16

package/dist/esm/jsonschema.js

@@ -120,8 +120,8 @@ const normalizeJsonSchemaValue = (schema) => {
   }
   return normalized;
 };
-const toJsonSchema = (schema) => {
-  return normalizeJsonSchema(z.toJSONSchema(schema));
+const toJsonSchema = (schema, params) => {
+  return normalizeJsonSchema(z.toJSONSchema(schema, params));
 };
 const fromJsonSchema = (schema) => {
   return z.fromJSONSchema(schema);

package/dist/esm/jsonschema.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/jsonschema.ts"],
-  "sourcesContent": ["import { z } from 'zod'\n\nexport type JsonSchema = boolean | z.core.JSONSchema.JSONSchema\ntype JsonSchemaObject = z.core.JSONSchema.JSONSchema\n\nconst isJsonSchemaObject = (value: unknown): value is JsonSchemaObject => {\n  return typeof value === 'object' && value !== null && !Array.isArray(value)\n}\n\nexport const isJsonSchema = (value: unknown): value is JsonSchema => {\n  if (typeof value === 'boolean') {\n    return true\n  }\n  if (!isJsonSchemaObject(value)) {\n    return false\n  }\n  if ('_zod' in value || '_def' in value || '~standard' in value) {\n    return false\n  }\n  return true\n}\n\nconst nullUnionCandidates = (schema: Record<string, unknown>): Record<string, unknown>[] | null => {\n  if (Array.isArray(schema.type) && schema.type.includes('null')) {\n    const non_null_types = schema.type.filter((item): item is string => typeof item === 'string' && item !== 'null')\n    if (non_null_types.length > 0) {\n      return [{ type: non_null_types.length === 1 ? non_null_types[0] : non_null_types }, { type: 'null' }]\n    }\n  }\n\n  return null\n}\n\nexport const normalizeJsonSchema = (schema: JsonSchema): JsonSchema => {\n  const normalized = normalizeJsonSchemaValue(schema)\n  if (!isJsonSchemaObject(normalized)) {\n    return normalized as JsonSchema\n  }\n  const schema_record = { ...normalized } as JsonSchemaObject\n  const definitions = schema_record.$defs\n  const root_ref = rootRefForSchema(schema_record, definitions)\n  if (!root_ref || !definitions) {\n    schema_record.$schema ??= 'https://json-schema.org/draft/2020-12/schema'\n    return schema_record\n  }\n  const root_name = root_ref.slice('#/$defs/'.length)\n  const root_schema = definitions[root_name]\n  if (!isJsonSchemaObject(root_schema)) {\n    schema_record.$schema ??= 'https://json-schema.org/draft/2020-12/schema'\n    return schema_record\n  }\n  const rewritten_root = rewriteJsonSchemaRefs(root_schema, { [root_ref]: '#' }) as JsonSchemaObject\n  const remaining_defs = Object.fromEntries(Object.entries(definitions).filter(([name]) => name !== root_name))\n  if (Object.keys(remaining_defs).length > 0) {\n    rewritten_root.$defs = rewriteJsonSchemaRefs(remaining_defs, { [root_ref]: '#' }) as Record<string, JsonSchemaObject>\n  }\n  rewritten_root.$schema ??= schema_record.$schema ?? 'https://json-schema.org/draft/2020-12/schema'\n  setTitleFromInlinedRootDefinition(rewritten_root, root_name)\n  return rewritten_root\n}\n\nconst rootRefForSchema = (schema: JsonSchemaObject, definitions: Record<string, JsonSchemaObject> | undefined): string | null => {\n  if (typeof schema.$ref === 'string' && schema.$ref.startsWith('#/$defs/')) {\n    return schema.$ref\n  }\n  if (!definitions) {\n    return null\n  }\n  const root = schemaWithoutSchemaAndDefinitions(schema)\n  for (const [name, definition] of Object.entries(definitions)) {\n    if (JSON.stringify(definition) === JSON.stringify(root)) {\n      return `#/$defs/${name}`\n    }\n  }\n  return null\n}\n\nconst schemaWithoutSchemaAndDefinitions = (schema: JsonSchemaObject): Record<string, unknown> => {\n  const root: Record<string, unknown> = {}\n  for (const [key, value] of Object.entries(schema)) {\n    if (key !== '$schema' && key !== '$defs') {\n      root[key] = value\n    }\n  }\n  return root\n}\n\nconst setTitleFromInlinedRootDefinition = (schema: JsonSchemaObject, root_name: string): void => {\n  if (root_name.startsWith('__schema')) return\n  schema.title ??= root_name\n}\n\nconst rewriteJsonSchemaRefs = (schema: unknown, refs: Record<string, string>): unknown => {\n  if (Array.isArray(schema)) {\n    return schema.map((item) => rewriteJsonSchemaRefs(item, refs))\n  }\n  if (!isJsonSchemaObject(schema)) {\n    return schema\n  }\n  const rewritten: Record<string, unknown> = {}\n  for (const [key, value] of Object.entries(schema)) {\n    rewritten[key] = rewriteJsonSchemaRefs(value, refs)\n  }\n  if (typeof rewritten.$ref === 'string' && rewritten.$ref in refs) {\n    rewritten.$ref = refs[rewritten.$ref]\n  }\n  return rewritten\n}\n\nconst normalizeJsonSchemaValue = (schema: unknown): unknown => {\n  if (Array.isArray(schema)) {\n    return schema.map((item) => normalizeJsonSchemaValue(item))\n  }\n  if (!isJsonSchemaObject(schema)) {\n    return schema\n  }\n\n  const normalized: Record<string, unknown> = {}\n  for (const [key, value] of Object.entries(schema)) {\n    normalized[key] = normalizeJsonSchemaValue(value)\n  }\n  if (Array.isArray(normalized.required) && normalized.required.every((item) => typeof item === 'string')) {\n    normalized.required = [...normalized.required].sort()\n  }\n\n  const null_union_candidates = nullUnionCandidates(normalized)\n  if (null_union_candidates !== null) {\n    const merged: Record<string, unknown> = { anyOf: normalizeJsonSchemaValue(null_union_candidates) }\n    for (const [key, value] of Object.entries(normalized)) {\n      if (key !== 'type') {\n        merged[key] = value\n      }\n    }\n    return merged\n  }\n\n  return normalized\n}\n\nexport const toJsonSchema = (schema: z.core.$ZodType): JsonSchema => {\n  return normalizeJsonSchema(z.toJSONSchema(schema) as JsonSchema)\n}\n\nexport const fromJsonSchema = (schema: JsonSchema): z.ZodTypeAny => {\n  return z.fromJSONSchema(schema)\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { z } from 'zod'\n\nexport type JsonSchema = boolean | z.core.JSONSchema.JSONSchema\ntype JsonSchemaObject = z.core.JSONSchema.JSONSchema\n\nconst isJsonSchemaObject = (value: unknown): value is JsonSchemaObject => {\n  return typeof value === 'object' && value !== null && !Array.isArray(value)\n}\n\nexport const isJsonSchema = (value: unknown): value is JsonSchema => {\n  if (typeof value === 'boolean') {\n    return true\n  }\n  if (!isJsonSchemaObject(value)) {\n    return false\n  }\n  if ('_zod' in value || '_def' in value || '~standard' in value) {\n    return false\n  }\n  return true\n}\n\nconst nullUnionCandidates = (schema: Record<string, unknown>): Record<string, unknown>[] | null => {\n  if (Array.isArray(schema.type) && schema.type.includes('null')) {\n    const non_null_types = schema.type.filter((item): item is string => typeof item === 'string' && item !== 'null')\n    if (non_null_types.length > 0) {\n      return [{ type: non_null_types.length === 1 ? non_null_types[0] : non_null_types }, { type: 'null' }]\n    }\n  }\n\n  return null\n}\n\nexport const normalizeJsonSchema = (schema: JsonSchema): JsonSchema => {\n  const normalized = normalizeJsonSchemaValue(schema)\n  if (!isJsonSchemaObject(normalized)) {\n    return normalized as JsonSchema\n  }\n  const schema_record = { ...normalized } as JsonSchemaObject\n  const definitions = schema_record.$defs\n  const root_ref = rootRefForSchema(schema_record, definitions)\n  if (!root_ref || !definitions) {\n    schema_record.$schema ??= 'https://json-schema.org/draft/2020-12/schema'\n    return schema_record\n  }\n  const root_name = root_ref.slice('#/$defs/'.length)\n  const root_schema = definitions[root_name]\n  if (!isJsonSchemaObject(root_schema)) {\n    schema_record.$schema ??= 'https://json-schema.org/draft/2020-12/schema'\n    return schema_record\n  }\n  const rewritten_root = rewriteJsonSchemaRefs(root_schema, { [root_ref]: '#' }) as JsonSchemaObject\n  const remaining_defs = Object.fromEntries(Object.entries(definitions).filter(([name]) => name !== root_name))\n  if (Object.keys(remaining_defs).length > 0) {\n    rewritten_root.$defs = rewriteJsonSchemaRefs(remaining_defs, { [root_ref]: '#' }) as Record<string, JsonSchemaObject>\n  }\n  rewritten_root.$schema ??= schema_record.$schema ?? 'https://json-schema.org/draft/2020-12/schema'\n  setTitleFromInlinedRootDefinition(rewritten_root, root_name)\n  return rewritten_root\n}\n\nconst rootRefForSchema = (schema: JsonSchemaObject, definitions: Record<string, JsonSchemaObject> | undefined): string | null => {\n  if (typeof schema.$ref === 'string' && schema.$ref.startsWith('#/$defs/')) {\n    return schema.$ref\n  }\n  if (!definitions) {\n    return null\n  }\n  const root = schemaWithoutSchemaAndDefinitions(schema)\n  for (const [name, definition] of Object.entries(definitions)) {\n    if (JSON.stringify(definition) === JSON.stringify(root)) {\n      return `#/$defs/${name}`\n    }\n  }\n  return null\n}\n\nconst schemaWithoutSchemaAndDefinitions = (schema: JsonSchemaObject): Record<string, unknown> => {\n  const root: Record<string, unknown> = {}\n  for (const [key, value] of Object.entries(schema)) {\n    if (key !== '$schema' && key !== '$defs') {\n      root[key] = value\n    }\n  }\n  return root\n}\n\nconst setTitleFromInlinedRootDefinition = (schema: JsonSchemaObject, root_name: string): void => {\n  if (root_name.startsWith('__schema')) return\n  schema.title ??= root_name\n}\n\nconst rewriteJsonSchemaRefs = (schema: unknown, refs: Record<string, string>): unknown => {\n  if (Array.isArray(schema)) {\n    return schema.map((item) => rewriteJsonSchemaRefs(item, refs))\n  }\n  if (!isJsonSchemaObject(schema)) {\n    return schema\n  }\n  const rewritten: Record<string, unknown> = {}\n  for (const [key, value] of Object.entries(schema)) {\n    rewritten[key] = rewriteJsonSchemaRefs(value, refs)\n  }\n  if (typeof rewritten.$ref === 'string' && rewritten.$ref in refs) {\n    rewritten.$ref = refs[rewritten.$ref]\n  }\n  return rewritten\n}\n\nconst normalizeJsonSchemaValue = (schema: unknown): unknown => {\n  if (Array.isArray(schema)) {\n    return schema.map((item) => normalizeJsonSchemaValue(item))\n  }\n  if (!isJsonSchemaObject(schema)) {\n    return schema\n  }\n\n  const normalized: Record<string, unknown> = {}\n  for (const [key, value] of Object.entries(schema)) {\n    normalized[key] = normalizeJsonSchemaValue(value)\n  }\n  if (Array.isArray(normalized.required) && normalized.required.every((item) => typeof item === 'string')) {\n    normalized.required = [...normalized.required].sort()\n  }\n\n  const null_union_candidates = nullUnionCandidates(normalized)\n  if (null_union_candidates !== null) {\n    const merged: Record<string, unknown> = { anyOf: normalizeJsonSchemaValue(null_union_candidates) }\n    for (const [key, value] of Object.entries(normalized)) {\n      if (key !== 'type') {\n        merged[key] = value\n      }\n    }\n    return merged\n  }\n\n  return normalized\n}\n\nexport const toJsonSchema = (schema: z.core.$ZodType, params?: z.core.ToJSONSchemaParams): JsonSchema => {\n  return normalizeJsonSchema(z.toJSONSchema(schema, params) as JsonSchema)\n}\n\nexport const fromJsonSchema = (schema: JsonSchema): z.ZodTypeAny => {\n  return z.fromJSONSchema(schema)\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/types/jsonschema.d.ts

@@ -2,5 +2,5 @@ import { z } from 'zod';
 export type JsonSchema = boolean | z.core.JSONSchema.JSONSchema;
 export declare const isJsonSchema: (value: unknown) => value is JsonSchema;
 export declare const normalizeJsonSchema: (schema: JsonSchema) => JsonSchema;
-export declare const toJsonSchema: (schema: z.core.$ZodType) => JsonSchema;
+export declare const toJsonSchema: (schema: z.core.$ZodType, params?: z.core.ToJSONSchemaParams) => JsonSchema;
 export declare const fromJsonSchema: (schema: JsonSchema) => z.ZodTypeAny;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abxbus",
-  "version": "2.5.14",
+  "version": "2.5.16",
   "description": "Event bus library for browsers and ESM Node.js",
   "type": "module",
   "sideEffects": false,

package/src/BaseEvent.ts

@@ -518,6 +518,29 @@ function encodeEventSchema(schema: AnyEventSchema, input: Record<string, unknown
   return encoded
 }
 
+function encodeEventSchemaForJSON(schema: AnyEventSchema, input: Record<string, unknown>): Record<string, unknown> {
+  try {
+    return encodeEventSchema(schema, input)
+  } catch {
+    return { ...input }
+  }
+}
+
+function eventResultTypeToJSON(schema: z.ZodTypeAny | undefined): JsonSchema | undefined {
+  if (!schema) {
+    return undefined
+  }
+  try {
+    return toJsonSchema(schema)
+  } catch {
+    try {
+      return toJsonSchema(schema, { io: 'input' })
+    } catch {
+      return undefined
+    }
+  }
+}
+
 export class BaseEvent {
   // event metadata fields
   event_id!: string // unique uuidv7 identifier for the event
@@ -809,7 +832,7 @@ export class BaseEvent {
       (this.constructor as typeof BaseEvent).event_schema ??
       this.event_schema ??
       BaseEventSchema) as AnyEventSchema
-    const encoded = encodeEventSchema(event_parse_schema, {
+    const encoded = encodeEventSchemaForJSON(event_parse_schema, {
       ...record,
       event_id: this.event_id,
       event_type: this.event_type,
@@ -847,7 +870,7 @@ export class BaseEvent {
       event_id: this.event_id,
       event_type: this.event_type,
       event_version: this.event_version,
-      event_result_type: this.event_result_type ? toJsonSchema(this.event_result_type) : this.event_result_type,
+      event_result_type: eventResultTypeToJSON(this.event_result_type),
 
       // static configuration options
       event_timeout: this.event_timeout,

package/src/jsonschema.ts

@@ -137,8 +137,8 @@ const normalizeJsonSchemaValue = (schema: unknown): unknown => {
   return normalized
 }
 
-export const toJsonSchema = (schema: z.core.$ZodType): JsonSchema => {
-  return normalizeJsonSchema(z.toJSONSchema(schema) as JsonSchema)
+export const toJsonSchema = (schema: z.core.$ZodType, params?: z.core.ToJSONSchemaParams): JsonSchema => {
+  return normalizeJsonSchema(z.toJSONSchema(schema, params) as JsonSchema)
 }
 
 export const fromJsonSchema = (schema: JsonSchema): z.ZodTypeAny => {