z-schema 12.2.0 → 12.3.1

package/src/json-schema-versions.ts

@@ -75,11 +75,65 @@ export interface JsonSchemaAll extends JsonSchemaCommon {
 // Internal types (schema + z-schema runtime properties)
 // ---------------------------------------------------------------------------
 
+/**
+ * Sub-schema-valued keywords. On the internal type these point at
+ * `JsonSchemaInternal` (rather than the public `JsonSchema`) so the validator
+ * can traverse nested schemas without asserting `as JsonSchemaInternal` at
+ * every step.
+ */
+type InternalSchemaKeys =
+  | 'items'
+  | 'additionalItems'
+  | 'properties'
+  | 'patternProperties'
+  | 'additionalProperties'
+  | 'dependencies'
+  | 'allOf'
+  | 'anyOf'
+  | 'oneOf'
+  | 'not'
+  | 'definitions'
+  | 'contains'
+  | 'propertyNames'
+  | 'if'
+  | 'then'
+  | 'else'
+  | '$defs'
+  | 'dependentSchemas'
+  | 'unevaluatedItems'
+  | 'unevaluatedProperties'
+  | 'prefixItems';
+
 /**
  * Internal schema type used throughout the validator. Based on `JsonSchemaAll`
- * so that validators can access any draft-specific property without narrowing.
+ * so that validators can access any draft-specific property without narrowing,
+ * but with every sub-schema keyword re-typed to `JsonSchemaInternal` so nested
+ * traversal needs no type assertions.
  */
-export type JsonSchemaInternal = JsonSchemaAll & ZSchemaInternalProperties;
+export type JsonSchemaInternal = Omit<JsonSchemaAll, InternalSchemaKeys> &
+  ZSchemaInternalProperties & {
+    items?: JsonSchemaInternal | boolean | Array<JsonSchemaInternal | boolean>;
+    additionalItems?: boolean | JsonSchemaInternal;
+    properties?: Record<string, JsonSchemaInternal | boolean>;
+    patternProperties?: Record<string, JsonSchemaInternal>;
+    additionalProperties?: boolean | JsonSchemaInternal;
+    dependencies?: Record<string, string[] | JsonSchemaInternal>;
+    allOf?: JsonSchemaInternal[];
+    anyOf?: JsonSchemaInternal[];
+    oneOf?: JsonSchemaInternal[];
+    not?: JsonSchemaInternal;
+    definitions?: Record<string, JsonSchemaInternal>;
+    contains?: JsonSchemaInternal;
+    propertyNames?: JsonSchemaInternal;
+    if?: JsonSchemaInternal | boolean;
+    then?: JsonSchemaInternal | boolean;
+    else?: JsonSchemaInternal | boolean;
+    $defs?: Record<string, JsonSchemaInternal>;
+    dependentSchemas?: Record<string, JsonSchemaInternal>;
+    unevaluatedItems?: JsonSchemaInternal | boolean;
+    unevaluatedProperties?: JsonSchemaInternal | boolean;
+    prefixItems?: Array<JsonSchemaInternal | boolean>;
+  };
 
 /** @deprecated Use `JsonSchemaInternal` — they are now equivalent. */
 export type JsonSchemaInternalAll = JsonSchemaAll & ZSchemaInternalProperties;

package/src/json-schema.ts

@@ -2,18 +2,19 @@ import type { JsonSchema, JsonSchemaInternal } from './json-schema-versions.js';
 import type { Reference } from './schema-compiler.js';
 import type { ZSchemaOptions } from './z-schema-options.js';
 
+import { DEFAULT_MAX_RECURSION_DEPTH } from './utils/constants.js';
 import { getRemotePath, isAbsoluteUri } from './utils/uri.js';
+import { isObject } from './utils/what-is.js';
 
 /**
  * Keywords whose values are not JSON Schema sub-schemas and must not be
  * traversed during schema walking (id collection, reference collection, etc.).
  */
 export const NON_SCHEMA_KEYWORDS = ['enum', 'const', 'default', 'examples'] as const;
+export const NON_SCHEMA_KEYWORDS_SET = new Set<string>(NON_SCHEMA_KEYWORDS);
 
 /** Returns true if the key is an internal z-schema property (prefixed with `__$`). */
 export const isInternalKey = (key: string): boolean => key.startsWith('__$');
-import { DEFAULT_MAX_RECURSION_DEPTH } from './utils/constants.js';
-import { isObject } from './utils/what-is.js';
 
 /**
  * Properties present in ALL JSON Schema drafts (04 through 2020-12) with
@@ -30,7 +31,7 @@ export interface JsonSchemaCommon {
 
   // ── Type / enum ─────────────────────────────────────────────────────────
   type?: string | string[];
-  enum?: Array<unknown>;
+  enum?: unknown[];
   format?: string;
 
   // ── Numeric ─────────────────────────────────────────────────────────────
@@ -78,9 +79,9 @@ export type JsonSchemaType = 'array' | 'boolean' | 'integer' | 'null' | 'number'
 export interface ZSchemaInternalProperties {
   __$compiled?: unknown;
   __$missingReferences?: Reference[];
-  __$refResolved?: JsonSchema;
-  __$dynamicRefResolved?: JsonSchema;
-  __$recursiveRefResolved?: JsonSchema;
+  __$refResolved?: JsonSchemaInternal;
+  __$dynamicRefResolved?: JsonSchemaInternal;
+  __$recursiveRefResolved?: JsonSchemaInternal;
   __$resourceRoot?: JsonSchemaInternal;
   __$schemaResolved?: unknown;
   __$validated?: boolean;
@@ -142,7 +143,7 @@ export const findId = (
   const inTargetBase = !targetBaseUri || nextBaseUri === targetBaseUri;
 
   if (inTargetBase) {
-    if (schemaId && (schemaId === id || (schemaId[0] === '#' && schemaId.substring(1) === id))) {
+    if (schemaId && (schemaId === id || (schemaId.startsWith('#') && schemaId.slice(1) === id))) {
       return schema;
     }
     if (schema.$anchor === id || schema.$dynamicAnchor === id) {
@@ -153,7 +154,7 @@ export const findId = (
   let result;
   if (Array.isArray(schema)) {
     for (let i = 0; i < schema.length; i++) {
-      result = findId(schema[i], id, targetBaseUri, nextBaseUri, maxDepth, _depth + 1);
+      result = findId(schema[i] as JsonSchemaInternal, id, targetBaseUri, nextBaseUri, maxDepth, _depth + 1);
       if (result) {
         return result;
       }
@@ -167,7 +168,7 @@ export const findId = (
     // intermediate resources - pointer reference across resource boundary".
     for (let i = keys.length - 1; i >= 0; i--) {
       const k = keys[i];
-      if (isInternalKey(k) || NON_SCHEMA_KEYWORDS.includes(k as any)) {
+      if (isInternalKey(k) || NON_SCHEMA_KEYWORDS_SET.has(k)) {
         continue;
       }
       result = findId(schema[k] as JsonSchemaInternal, id, targetBaseUri, nextBaseUri, maxDepth, _depth + 1);