ata-validator 0.17.5 → 0.18.0

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to ata-validator are documented here. The format follows [Keep a Changelog](https://keepachangelog.com/), and this project adheres to semantic versioning.
 
+## 0.18.0 - 2026-05-25
+
+### Added
+
+- `Infer<S>` resolves the shapes 0.17.0 left as `unknown`. `anyOf` and `oneOf` map to unions, `allOf` to an intersection, `prefixItems` to a tuple, and a `$ref` to a local `#/$defs/...` or `#/definitions/...` entry resolves to the referenced type, including recursive references. An external or otherwise unresolvable `$ref` still resolves to `unknown` rather than erroring. `new Validator(schema)` carries the wider inference, so handlers narrow `result.data` for these schemas with no manual annotation, and the same applies to the Fastify type provider that builds on `Infer`. Pure `.d.ts` change, no runtime impact.
+
 ## 0.17.5 - 2026-05-25
 
 ### Fixed

package/README.md

@@ -180,6 +180,36 @@ const v = new Validator(userSchema)
 
 The exported `JSONSchema` type is also available directly if you want to annotate a schema yourself. Custom and vendor keywords are allowed, so exotic schemas still type-check. Requires TypeScript >= 5.0.
 
+#### Extracting the type: `Infer`
+
+Because `defineSchema` leaves the schema as a plain object, you can pull a TypeScript type straight out of it with `Infer`, with no second type declaration to keep in sync.
+
+```ts
+import { defineSchema, type Infer } from 'ata-validator'
+
+const event = defineSchema({
+  $defs: {
+    Point: { type: 'object', properties: { x: { type: 'number' }, y: { type: 'number' } }, required: ['x', 'y'] },
+  },
+  type: 'object',
+  properties: {
+    kind: { enum: ['click', 'scroll'] },
+    at: { $ref: '#/$defs/Point' },
+    path: { type: 'array', prefixItems: [{ type: 'string' }, { type: 'integer' }] },
+  },
+  required: ['kind', 'at'],
+})
+
+type Event = Infer<typeof event>
+// {
+//   kind: 'click' | 'scroll'
+//   at: { x: number; y: number }
+//   path?: [string, number]
+// }
+```
+
+`Infer` resolves `const`/`enum` to literals, `anyOf`/`oneOf` to unions, `allOf` to intersections, `prefixItems` to tuples, and local `$ref` into `#/$defs` or `#/definitions`, including recursive references. `new Validator(schema)` carries the same type, so a successful `validate` narrows `result.data` without a manual annotation. An external or unresolvable `$ref` resolves to `unknown` rather than erroring.
+
 ### Cross-Schema `$ref`
 
 ```javascript

package/index.d.ts

@@ -177,26 +177,55 @@ type RequiredKeys<S> = S extends { required: infer R }
     : never
   : never;
 
+/** Collapse a union of types into their intersection (used for `allOf`). */
+type UnionToIntersection<U> =
+  (U extends unknown ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
+
+/** The root `$defs`/`definitions` map, threaded through inference for `$ref` resolution. */
+type RootDefs<S> = S extends { $defs: infer D }
+  ? D
+  : S extends { definitions: infer D }
+    ? D
+    : {};
+
+/** Extract the definition name from a local `#/$defs/...` or `#/definitions/...` pointer. */
+type RefName<R> = R extends `#/$defs/${infer N}`
+  ? N
+  : R extends `#/definitions/${infer N}`
+    ? N
+    : never;
+
+/** Resolve a `$ref` against the root defs map; external/unresolvable refs -> unknown. */
+type ResolveRef<R, D> = [RefName<R>] extends [never]
+  ? unknown
+  : RefName<R> extends keyof D
+    ? InferWith<D[RefName<R>], D>
+    : unknown;
+
 /** Object shape: required keys are required, all other declared keys optional. */
-type InferObject<S> = S extends { properties: infer P }
+type InferObject<S, D> = S extends { properties: infer P }
   ? Simplify<
-      { [K in keyof P as K extends RequiredKeys<S> ? K : never]: Infer<P[K]> } &
-      { [K in keyof P as K extends RequiredKeys<S> ? never : K]?: Infer<P[K]> }
+      { [K in keyof P as K extends RequiredKeys<S> ? K : never]: InferWith<P[K], D> } &
+      { [K in keyof P as K extends RequiredKeys<S> ? never : K]?: InferWith<P[K], D> }
     >
   : Record<string, unknown>;
 
-/** Array shape: `items` as a single schema maps to an element type; tuple/absent -> unknown[]. */
-type InferArray<S> = S extends { items: infer I }
-  ? I extends ReadonlyArray<unknown>
-    ? unknown[]
-    : Infer<I>[]
-  : unknown[];
+/** Array shape: `prefixItems` -> tuple; `items` (single schema) -> element type; otherwise unknown[]. */
+type InferArray<S, D> = S extends { prefixItems: infer P }
+  ? P extends ReadonlyArray<unknown>
+    ? { -readonly [K in keyof P]: InferWith<P[K], D> }
+    : unknown[]
+  : S extends { items: infer I }
+    ? I extends ReadonlyArray<unknown>
+      ? unknown[]
+      : InferWith<I, D>[]
+    : unknown[];
 
 /** Map a single JSON Schema type name (+ its schema) to a TS type. */
-type InferByTypeName<N, S> = N extends 'object'
-  ? InferObject<S>
+type InferByTypeName<N, S, D> = N extends 'object'
+  ? InferObject<S, D>
   : N extends 'array'
-    ? InferArray<S>
+    ? InferArray<S, D>
     : N extends 'string'
       ? string
       : N extends 'number'
@@ -209,28 +238,46 @@ type InferByTypeName<N, S> = N extends 'object'
               ? null
               : unknown;
 
+/** Core inference with the root defs map `D` threaded for `$ref` resolution. */
+type InferWith<S, D> = S extends { $ref: infer R }
+  ? ResolveRef<R, D>
+  : S extends { const: infer C }
+    ? C
+    : S extends { enum: infer E }
+      ? E extends ReadonlyArray<infer U>
+        ? U
+        : unknown
+      : S extends { allOf: infer A }
+        ? A extends ReadonlyArray<unknown>
+          ? Simplify<UnionToIntersection<{ [K in keyof A]: InferWith<A[K], D> }[number]>>
+          : unknown
+        : S extends { anyOf: infer A }
+          ? A extends ReadonlyArray<unknown>
+            ? { [K in keyof A]: InferWith<A[K], D> }[number]
+            : unknown
+          : S extends { oneOf: infer A }
+            ? A extends ReadonlyArray<unknown>
+              ? { [K in keyof A]: InferWith<A[K], D> }[number]
+              : unknown
+            : S extends { type: infer T }
+              ? T extends ReadonlyArray<infer N>
+                ? InferByTypeName<N, S, D>
+                : InferByTypeName<T, S, D>
+              : unknown;
+
 /**
- * Infer the TypeScript data type a JSON Schema literal describes (Core scope).
+ * Infer the TypeScript data type a JSON Schema literal describes.
  *
  * Handles: primitives, `type` arrays (union), `const`, `enum`, objects
- * (`properties` + `required` -> required/optional keys), and arrays
- * (`items` as a single schema). `$ref`/`$defs`, tuples, and `anyOf`/`oneOf`/
- * `allOf` are not yet inferred and resolve to `unknown` rather than erroring.
+ * (`properties` + `required` -> required/optional keys), arrays (`items`),
+ * tuples (`prefixItems`), `anyOf`/`oneOf` (union), `allOf` (intersection),
+ * and `$ref` to local `#/$defs/...` or `#/definitions/...`. External or
+ * unresolvable `$ref` resolves to `unknown` rather than erroring.
  *
  * Pair with {@link defineSchema}:
  * `const s = defineSchema({...}); type T = Infer<typeof s>;`
  */
-export type Infer<S> = S extends { const: infer C }
-  ? C
-  : S extends { enum: infer E }
-    ? E extends ReadonlyArray<infer U>
-      ? U
-      : unknown
-    : S extends { type: infer T }
-      ? T extends ReadonlyArray<infer N>
-        ? InferByTypeName<N, S>
-        : InferByTypeName<T, S>
-      : unknown;
+export type Infer<S> = InferWith<S, RootDefs<S>>;
 
 export type ValidationResult<T = unknown> =
   | { valid: true;  data: T;       errors: ValidationError[] }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ata-validator",
-  "version": "0.17.5",
+  "version": "0.18.0",
   "description": "JSON Schema validation with first-class TypeScript and zero runtime cost. AOT compile to per-schema ESM modules with zero validator dependency. Generic Validator<T> for TypeBox/Zod/Valibot composition. Optional runtime API. Standard Schema V1 compatible.",
   "main": "index.js",
   "module": "index.mjs",