@gialicus/smart-object 2.0.0 → 2.0.2

package/CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.1] - 2026-06-27
+
+### Added
+
+- Support for `z.date()` and `z.coerce.date()` with ISO 8601 operation values and `Date` getters
+- Support for `z.bigint()`, `z.map` (string keys), and `z.set` via explicit JSON-safe codecs
+- Per-entry API for `z.record` and string-key `z.map` fields: `get{Field}Entry`, `set{Field}Entry`, `delete{Field}Entry`
+- Union variant switching: `switchVariant` and generated `switchTo{Variant}` for discriminated unions
+- Root schema variants: `z.intersection` and `z.lazy`
+- Zod schema introspection module (`src/zod-introspect.ts`) and codec layer (`src/smart-object/codecs.ts`)
+
 ## [2.0.0] - 2026-06-27
 
 ### Breaking
@@ -39,5 +50,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `fromOperations(initial, operations)` static method for deterministic replay
 - Exported types: `Operation`, `SetMethods`, `SetMethodsUnion`, `AllKeys`, `UnionDataShape`, `OperationsAccessor`, `SmartObjectConstructor`, `SmartObjectInstance`
 
+[2.0.1]: https://github.com/gialicus/smart-object/compare/v2.0.0...v2.0.1
 [2.0.0]: https://github.com/gialicus/smart-object/compare/v1.0.0...v2.0.0
 [1.0.0]: https://github.com/gialicus/smart-object/releases/tag/v1.0.0

package/README.md

@@ -8,7 +8,7 @@ Typed TypeScript objects backed by Zod schemas, with an RFC 6902 operation log f
 npm install @gialicus/smart-object zod
 ```
 
-Dependencies: [Zod](https://zod.dev) (peer dependency — schema validation) and [fast-json-patch](https://github.com/Starcounter-Jack/JSON-Patch) (RFC 6902 patch application, bundled).
+Dependencies: [Zod](https://zod.dev) `^4.0.0` (peer dependency — schema validation) and [fast-json-patch](https://github.com/Starcounter-Jack/JSON-Patch) (RFC 6902 patch application, bundled).
 
 ## Usage
 
@@ -63,6 +63,10 @@ const Event = SmartObject(z.discriminatedUnion("type", [
 
 const event = new Event({ type: "click", x: 10, y: 20 });
 event.setX(15);
+
+// Switch the active union variant atomically
+event.switchToScroll({ delta: 5 });
+// or: event.switchVariant({ type: "scroll", delta: 5 });
 ```
 
 See [`examples/event.ts`](examples/event.ts) and [`examples/profile.ts`](examples/profile.ts) for full demos.
@@ -77,7 +81,7 @@ Factory that accepts a Zod schema and returns an instantiable class.
 
 | Parameter | Type | Description |
 |-----------|------|-------------|
-| `schema` | `z.ZodObject` \| `z.ZodUnion` \| `z.ZodDiscriminatedUnion` | Zod schema defining the object shape |
+| `schema` | `z.ZodObject` \| `z.ZodUnion` \| `z.ZodDiscriminatedUnion` \| `z.ZodIntersection` \| `z.ZodLazy` | Zod schema defining the object shape |
 
 **Members generated for each schema field `foo`:**
 
@@ -88,6 +92,21 @@ Factory that accepts a Zod schema and returns an instantiable class.
 
 `set*` method names follow camelCase with the field name capitalized (`name` → `setName`, `userId` → `setUserId`).
 
+**Union root extras** (discriminated and generic unions):
+
+| Member | Type | Description |
+|--------|------|-------------|
+| `switchVariant(value)` | `(variant) => void` | Replaces the entire active variant after full schema validation |
+| `switchTo{Variant}(fields)` | `(fields) => void` | Discriminated unions only — switches to a variant without repeating the discriminator (e.g. `switchToScroll({ delta: 5 })`) |
+
+**Record and Map field extras** (for each `z.record(...)` field or string-key `z.map(...)` field `tags`):
+
+| Member | Type | Description |
+|--------|------|-------------|
+| `getTagsEntry(key)` | `(key: string) => V \| undefined` | Reads a single entry |
+| `setTagsEntry(key, value)` | `(key: string, value: V) => void` | Validates and patches a single entry (`/tags/{key}`) |
+| `deleteTagsEntry(key)` | `(key: string) => void` | Removes an entry |
+
 **Instance members:**
 
 | Member | Type | Description |
@@ -124,10 +143,15 @@ RFC 6902 operation emitted by [fast-json-patch](https://github.com/Starcounter-J
 ### Exported types
 
 - `Operation` — JSON Patch operation (re-export from `fast-json-patch`)
+- `SmartObjectSchema` — union of Zod schema types accepted by `SmartObject()`
+- `SmartObjectErrorCode` — `"InvalidValue"` \| `"InvalidUnionField"` \| `"InvalidReplay"` \| `"UnsupportedSchema"`
 - `SetMethods<T>` — mapped type of inferred `set*` methods for shape `T`
 - `SetMethodsUnion<T>` — `set*` methods for union root schemas
 - `AllKeys<T>` — all keys across union members
 - `UnionDataShape<U>` — flattened data shape for union roots
+- `VariantSwitchMethods<T>` — `switchVariant` for union roots
+- `DiscriminatedVariantSwitchMethods<T, D>` — `switchVariant` plus generated `switchTo*` methods
+- `RecordFieldMethods<T>` — dynamic entry accessors for `z.record` and string-key `z.map` fields
 - `OperationsAccessor` — `operations` and `clearOperations()`
 - `SnapshotAccessor<T>` — `toJSON()`
 - `SmartObjectConstructor<T>` — constructor type including `fromOperations`
@@ -135,9 +159,11 @@ RFC 6902 operation emitted by [fast-json-patch](https://github.com/Starcounter-J
 
 ## Limitations
 
-- **Partial variant switch** — Changing a discriminated union discriminator alone (e.g. `setType("scroll")` without providing `delta`) is not supported and throws `SmartObjectError`.
+- **Partial discriminator write** — Changing a discriminated union discriminator alone via `setType(...)` without providing the new variant fields throws `SmartObjectError`. Use `switchVariant(...)` or `switchTo{Variant}(...)` instead.
 - **Union field on wrong variant** — Setting a field that does not exist on the active variant throws `SmartObjectError`.
-- **JSON-only values** — RFC 6902 patches work on JSON-serializable data. `Date`, `Map`, and other non-JSON types are not supported.
+- **Date fields** — `z.date()` and `z.coerce.date()` are supported; operations store ISO 8601 strings while getters return `Date` instances.
+- **Map, Set, and bigint** — `z.map` (string keys), `z.set`, and `z.bigint()` are supported with explicit codecs; operations use JSON-safe plain objects, arrays, and decimal strings respectively. String-key `z.map` fields also expose per-entry `get/set/delete*Entry` methods; whole-field `set*` is used for `z.set` and for map fields with non-string keys (not supported). Non-string map keys are not supported.
+- **Transforms** — `z.transform` / `z.pipe` with preprocessing work at runtime; operations store the **output** value after validation. TypeScript setter input types may not reflect transforms.
 
 ## Design rationale
 
@@ -153,6 +179,7 @@ RFC 6902 operation emitted by [fast-json-patch](https://github.com/Starcounter-J
 - [`examples/person.ts`](examples/person.ts) — primitives, nested objects, and arrays
 - [`examples/event.ts`](examples/event.ts) — discriminated union root
 - [`examples/profile.ts`](examples/profile.ts) — generic union root
+- [`examples/record.ts`](examples/record.ts) — `z.record` and string-key `z.map` entry API
 
 ## Project structure
 
@@ -169,17 +196,21 @@ smart-object/
 │       ├── build-class.ts    # Class generation orchestration
 │       ├── instance-state.ts # WeakMap-backed instance storage
 │       ├── read-field.ts     # Defensive getter reads
-│       ├── json-patch.ts     # fast-json-patch wrapper
+│       ├── json-patch.ts     # fast-json-patch wrapper + Date-safe deepClone
+│       ├── codecs.ts         # JSON-safe codecs for Date, Map, Set, and bigint
 │       ├── apply-operations.ts # Replay and rollback
 │       ├── union-variant.ts  # Union variant matching
 │       ├── define-prototype.ts # Getter/setter prototype setup
 │       └── setters/
 │           ├── object-field.ts
-│           └── union-field.ts
+│           ├── union-field.ts
+│           ├── variant-switch.ts
+│           └── record-field.ts
 ├── examples/
 │   ├── person.ts
 │   ├── event.ts
-│   └── profile.ts
+│   ├── profile.ts
+│   └── record.ts
 ├── tests/
 │   ├── fixtures/
 │   │   ├── person.ts
@@ -199,6 +230,10 @@ smart-object/
 │   │   ├── setter-naming.test.ts
 │   │   ├── to-json.test.ts
 │   │   ├── schema-variants.test.ts
+│   │   ├── record-fields.test.ts
+│   │   ├── date-codec.test.ts
+│   │   ├── complex-schema-types.test.ts
+│   │   ├── intersection-lazy.test.ts
 │   │   └── types.test.ts
 │   └── zod-introspect.test.ts
 └── dist/                     # Build output (generated)

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export type { SmartObjectErrorCode } from "./errors.js";
 export { SmartObjectError } from "./errors.js";
 export { SmartObject } from "./smart-object/index.js";
-export type { AllKeys, Operation, OperationsAccessor, SetMethods, SetMethodsUnion, SmartObjectConstructor, SmartObjectInstance, SmartObjectSchema, SnapshotAccessor, UnionDataShape, } from "./types.js";
+export type { AllKeys, DiscriminatedVariantSwitchMethods, Operation, OperationsAccessor, RecordFieldMethods, SetMethods, SetMethodsUnion, SmartObjectConstructor, SmartObjectInstance, SmartObjectSchema, SnapshotAccessor, UnionDataShape, VariantSwitchMethods, } from "./types.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,YAAY,EACV,OAAO,EACP,SAAS,EACT,kBAAkB,EAClB,UAAU,EACV,eAAe,EACf,sBAAsB,EACtB,mBAAmB,EACnB,iBAAiB,EACjB,gBAAgB,EAChB,cAAc,GACf,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,YAAY,EACV,OAAO,EACP,iCAAiC,EACjC,SAAS,EACT,kBAAkB,EAClB,kBAAkB,EAClB,UAAU,EACV,eAAe,EACf,sBAAsB,EACtB,mBAAmB,EACnB,iBAAiB,EACjB,gBAAgB,EAChB,cAAc,EACd,oBAAoB,GACrB,MAAM,YAAY,CAAC"}

package/dist/smart-object/apply-operations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apply-operations.d.ts","sourceRoot":"","sources":["../../src/smart-object/apply-operations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGzD,wBAAgB,eAAe,CAAC,CAAC,EAC/B,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,EACvB,SAAS,EAAE,iBAAiB,EAC5B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,SAAS,EAAE,GACtB,IAAI,CAiBN"}
+{"version":3,"file":"apply-operations.d.ts","sourceRoot":"","sources":["../../src/smart-object/apply-operations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGzD,wBAAgB,eAAe,CAAC,CAAC,EAC/B,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,EACvB,SAAS,EAAE,iBAAiB,EAC5B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,SAAS,EAAE,GACtB,IAAI,CAkBN"}

package/dist/smart-object/apply-operations.js

@@ -1,4 +1,5 @@
 import { SmartObjectError } from "../errors.js";
+import { deserializeDataFromPatch } from "./codecs.js";
 import { applyPatch, deepClone } from "./json-patch.js";
 export function applyOperations(state, zodSchema, instance, operations) {
     if (operations.length === 0) {
@@ -8,7 +9,8 @@ export function applyOperations(state, zodSchema, instance, operations) {
     const snapshot = deepClone(data);
     try {
         applyPatch(data, operations, false, true);
-        const validated = zodSchema.parse(data);
+        const deserialized = deserializeDataFromPatch(data, zodSchema);
+        const validated = zodSchema.parse(deserialized);
         state.setData(instance, validated);
         state.getOperations(instance).push(...operations);
     }

package/dist/smart-object/build-class.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-class.d.ts","sourceRoot":"","sources":["../../src/smart-object/build-class.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,sBAAsB,EAAuB,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAOlG,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,iBAAiB,EAC/D,SAAS,EAAE,CAAC,GACX,sBAAsB,CAAC,CAAC,CAAC,CAuC3B"}
+{"version":3,"file":"build-class.d.ts","sourceRoot":"","sources":["../../src/smart-object/build-class.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,sBAAsB,EAAuB,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAOlG,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,iBAAiB,EAC/D,SAAS,EAAE,CAAC,GACX,sBAAsB,CAAC,CAAC,CAAC,CAqC3B"}

package/dist/smart-object/build-class.js

@@ -1,12 +1,10 @@
-import { getObjectShapeKeys, getUnionObjectKeys, isZodObject } from "../zod-introspect.js";
+import { getSchemaShapeKeys } from "../zod-introspect.js";
 import { applyOperations } from "./apply-operations.js";
 import { definePrototype } from "./define-prototype.js";
 import { createInstanceState } from "./instance-state.js";
 import { deepClone } from "./json-patch.js";
 export function buildSmartObjectClass(zodSchema) {
-    const keys = isZodObject(zodSchema)
-        ? getObjectShapeKeys(zodSchema)
-        : getUnionObjectKeys(zodSchema);
+    const keys = getSchemaShapeKeys(zodSchema);
     const state = createInstanceState();
     class SmartObjectClass {
         static fromOperations(initial, operations) {

package/dist/smart-object/codecs.d.ts

@@ -0,0 +1,15 @@
+import type { z } from "zod";
+import type { SmartObjectSchema } from "../types.js";
+export declare function serializeValue(schema: z.ZodType, value: unknown): unknown;
+export declare function deserializeValue(schema: z.ZodType, value: unknown): unknown;
+export declare function serializeDataForPatch<T extends Record<string, unknown>>(data: T, rootSchema: SmartObjectSchema): T;
+export declare function deserializeDataFromPatch<T extends Record<string, unknown>>(data: T, rootSchema: SmartObjectSchema): T;
+export declare function serializePatchValue(rootSchema: SmartObjectSchema, key: string, value: unknown): unknown;
+export declare function serializeEntryPatchValue(fieldSchema: z.ZodType, valueSchema: z.ZodType, value: unknown): unknown;
+/** Serialize a single entry container for RFC 6902 compare (record or map field). */
+export declare function serializeEntryContainer(fieldSchema: z.ZodType, container: unknown): Record<string, unknown>;
+/** @deprecated Use serializeValue */
+export declare function serializeFieldValue(fieldSchema: z.ZodType, value: unknown): unknown;
+/** @deprecated Use deserializeValue */
+export declare function deserializeFieldValue(fieldSchema: z.ZodType, value: unknown): unknown;
+//# sourceMappingURL=codecs.d.ts.map

package/dist/smart-object/codecs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"codecs.d.ts","sourceRoot":"","sources":["../../src/smart-object/codecs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAwBrD,wBAAgB,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CA6DzE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAmE3E;AAED,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrE,IAAI,EAAE,CAAC,EACP,UAAU,EAAE,iBAAiB,GAC5B,CAAC,CAeH;AAED,wBAAgB,wBAAwB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxE,IAAI,EAAE,CAAC,EACP,UAAU,EAAE,iBAAiB,GAC5B,CAAC,CAeH;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,iBAAiB,EAC7B,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,OAAO,GACb,OAAO,CAQT;AAED,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,CAAC,CAAC,OAAO,EACtB,WAAW,EAAE,CAAC,CAAC,OAAO,EACtB,KAAK,EAAE,OAAO,GACb,OAAO,CAYT;AAED,qFAAqF;AACrF,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,CAAC,CAAC,OAAO,EACtB,SAAS,EAAE,OAAO,GACjB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAGzB;AAED,qCAAqC;AACrC,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAEnF;AAED,uCAAuC;AACvC,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAErF"}

package/dist/smart-object/codecs.js

@@ -0,0 +1,163 @@
+import { getFieldSchema, getMergedObjectShape, isZodRecord, unwrapFieldSchema, } from "../zod-introspect.js";
+function getSchemaDef(schema) {
+    return schema._zod.def;
+}
+function isPlainObject(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+export function serializeValue(schema, value) {
+    const inner = unwrapFieldSchema(schema);
+    const def = getSchemaDef(inner);
+    if (value instanceof Date && def.type === "date") {
+        return value.toISOString();
+    }
+    if (typeof value === "bigint" && def.type === "bigint") {
+        return value.toString();
+    }
+    if (value instanceof Map && def.type === "map") {
+        const keySchema = def.keyType;
+        const valueSchema = def.valueType;
+        const result = {};
+        for (const [key, entryValue] of value.entries()) {
+            const serializedKey = serializeValue(keySchema, key);
+            if (typeof serializedKey === "string") {
+                result[serializedKey] = serializeValue(valueSchema, entryValue);
+            }
+        }
+        return result;
+    }
+    if (value instanceof Set && def.type === "set") {
+        const valueSchema = def.valueType;
+        return [...value].map((item) => serializeValue(valueSchema, item));
+    }
+    if (def.type === "object" && isPlainObject(value)) {
+        const shape = def.shape ?? {};
+        const result = {};
+        for (const [key, fieldValue] of Object.entries(value)) {
+            const fieldSchema = shape[key];
+            result[key] = fieldSchema ? serializeValue(fieldSchema, fieldValue) : fieldValue;
+        }
+        return result;
+    }
+    if (def.type === "array" && Array.isArray(value)) {
+        const elementSchema = def.element;
+        return value.map((item) => serializeValue(elementSchema, item));
+    }
+    if (def.type === "record" && isPlainObject(value)) {
+        const valueSchema = def.valueType;
+        const result = {};
+        for (const [key, fieldValue] of Object.entries(value)) {
+            result[key] = serializeValue(valueSchema, fieldValue);
+        }
+        return result;
+    }
+    return value;
+}
+export function deserializeValue(schema, value) {
+    const inner = unwrapFieldSchema(schema);
+    const def = getSchemaDef(inner);
+    if (def.type === "date" && typeof value === "string") {
+        const parsed = new Date(value);
+        if (!Number.isNaN(parsed.getTime())) {
+            return parsed;
+        }
+        return value;
+    }
+    if (def.type === "bigint" && typeof value === "string") {
+        try {
+            return BigInt(value);
+        }
+        catch {
+            return value;
+        }
+    }
+    if (def.type === "map" && isPlainObject(value)) {
+        const keySchema = def.keyType;
+        const valueSchema = def.valueType;
+        const map = new Map();
+        for (const [key, entryValue] of Object.entries(value)) {
+            map.set(deserializeValue(keySchema, key), deserializeValue(valueSchema, entryValue));
+        }
+        return map;
+    }
+    if (def.type === "set" && Array.isArray(value)) {
+        const valueSchema = def.valueType;
+        return new Set(value.map((item) => deserializeValue(valueSchema, item)));
+    }
+    if (def.type === "object" && isPlainObject(value)) {
+        const shape = def.shape ?? {};
+        const result = {};
+        for (const [key, fieldValue] of Object.entries(value)) {
+            const fieldSchema = shape[key];
+            result[key] = fieldSchema ? deserializeValue(fieldSchema, fieldValue) : fieldValue;
+        }
+        return result;
+    }
+    if (def.type === "array" && Array.isArray(value)) {
+        const elementSchema = def.element;
+        return value.map((item) => deserializeValue(elementSchema, item));
+    }
+    if (def.type === "record" && isPlainObject(value)) {
+        const valueSchema = def.valueType;
+        const result = {};
+        for (const [key, fieldValue] of Object.entries(value)) {
+            result[key] = deserializeValue(valueSchema, fieldValue);
+        }
+        return result;
+    }
+    return value;
+}
+export function serializeDataForPatch(data, rootSchema) {
+    const shape = getMergedObjectShape(rootSchema);
+    if (Object.keys(shape).length === 0) {
+        return data;
+    }
+    const result = {};
+    for (const [key, fieldValue] of Object.entries(data)) {
+        const fieldSchema = shape[key];
+        result[key] = fieldSchema ? serializeValue(fieldSchema, fieldValue) : fieldValue;
+    }
+    return result;
+}
+export function deserializeDataFromPatch(data, rootSchema) {
+    const shape = getMergedObjectShape(rootSchema);
+    if (Object.keys(shape).length === 0) {
+        return data;
+    }
+    const result = {};
+    for (const [key, fieldValue] of Object.entries(data)) {
+        const fieldSchema = shape[key];
+        result[key] = fieldSchema ? deserializeValue(fieldSchema, fieldValue) : fieldValue;
+    }
+    return result;
+}
+export function serializePatchValue(rootSchema, key, value) {
+    const fieldSchema = getFieldSchema(rootSchema, key);
+    if (!fieldSchema) {
+        return value;
+    }
+    return serializeValue(fieldSchema, value);
+}
+export function serializeEntryPatchValue(fieldSchema, valueSchema, value) {
+    const inner = unwrapFieldSchema(fieldSchema);
+    if (isZodRecord(inner)) {
+        return serializeValue(valueSchema, value);
+    }
+    if (isPlainObject(value)) {
+        return serializeValue(fieldSchema, value);
+    }
+    return serializeValue(valueSchema, value);
+}
+/** Serialize a single entry container for RFC 6902 compare (record or map field). */
+export function serializeEntryContainer(fieldSchema, container) {
+    const serialized = serializeValue(fieldSchema, container);
+    return isPlainObject(serialized) ? serialized : {};
+}
+/** @deprecated Use serializeValue */
+export function serializeFieldValue(fieldSchema, value) {
+    return serializeValue(fieldSchema, value);
+}
+/** @deprecated Use deserializeValue */
+export function deserializeFieldValue(fieldSchema, value) {
+    return deserializeValue(fieldSchema, value);
+}

package/dist/smart-object/define-prototype.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"define-prototype.d.ts","sourceRoot":"","sources":["../../src/smart-object/define-prototype.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAOrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAKzD,wBAAgB,eAAe,CAAC,CAAC,EAC/B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,EACvB,SAAS,EAAE,iBAAiB,EAC5B,IAAI,EAAE,MAAM,EAAE,GACb,IAAI,CAqBN"}
+{"version":3,"file":"define-prototype.d.ts","sourceRoot":"","sources":["../../src/smart-object/define-prototype.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAarD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAoEzD,wBAAgB,eAAe,CAAC,CAAC,EAC/B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,EACvB,SAAS,EAAE,iBAAiB,EAC5B,IAAI,EAAE,MAAM,EAAE,GACb,IAAI,CAiCN"}

package/dist/smart-object/define-prototype.js

@@ -1,10 +1,56 @@
-import { isZodObject, toSetterMethodName, } from "../zod-introspect.js";
+import { getDiscriminatedVariants, getDiscriminator, getFieldSchema, getRecordFieldsFromSchema, isObjectLikeRoot, isZodDiscriminatedUnion, isZodUnionRoot, toRecordEntryMethodPrefix, toSetterMethodName, } from "../zod-introspect.js";
 import { readFieldValue } from "./read-field.js";
 import { createObjectFieldSetter } from "./setters/object-field.js";
+import { createRecordEntryDeleter, createRecordEntryGetter, createRecordEntrySetter, } from "./setters/record-field.js";
 import { createUnionFieldSetter } from "./setters/union-field.js";
+import { createSwitchToVariant, createSwitchVariant } from "./setters/variant-switch.js";
+function defineRecordFieldMethods(prototype, state, zodSchema) {
+    for (const field of getRecordFieldsFromSchema(zodSchema)) {
+        const prefix = toRecordEntryMethodPrefix(field.fieldName);
+        Object.defineProperty(prototype, `get${prefix}Entry`, {
+            value: createRecordEntryGetter(state, field),
+            enumerable: false,
+            configurable: true,
+            writable: true,
+        });
+        Object.defineProperty(prototype, `set${prefix}Entry`, {
+            value: createRecordEntrySetter(state, zodSchema, field),
+            enumerable: false,
+            configurable: true,
+            writable: true,
+        });
+        Object.defineProperty(prototype, `delete${prefix}Entry`, {
+            value: createRecordEntryDeleter(state, zodSchema, field),
+            enumerable: false,
+            configurable: true,
+            writable: true,
+        });
+    }
+}
+function defineUnionRootMethods(prototype, state, zodSchema) {
+    Object.defineProperty(prototype, "switchVariant", {
+        value: createSwitchVariant(state, zodSchema),
+        enumerable: false,
+        configurable: true,
+        writable: true,
+    });
+    if (isZodDiscriminatedUnion(zodSchema)) {
+        const discriminator = getDiscriminator(zodSchema);
+        for (const variant of getDiscriminatedVariants(zodSchema)) {
+            Object.defineProperty(prototype, variant.methodName, {
+                value: createSwitchToVariant(state, zodSchema, variant.schema, variant.tag, discriminator),
+                enumerable: false,
+                configurable: true,
+                writable: true,
+            });
+        }
+    }
+}
 export function definePrototype(prototype, state, zodSchema, keys) {
+    const objectSchema = isObjectLikeRoot(zodSchema) ? zodSchema : undefined;
     for (const key of keys) {
         const setMethodName = toSetterMethodName(key);
+        const fieldSchema = getFieldSchema(zodSchema, key);
         Object.defineProperty(prototype, key, {
             get() {
                 return readFieldValue(state.getData(this)[key]);
@@ -13,12 +59,18 @@ export function definePrototype(prototype, state, zodSchema, keys) {
             configurable: true,
         });
         Object.defineProperty(prototype, setMethodName, {
-            value: isZodObject(zodSchema)
-                ? createObjectFieldSetter(state, zodSchema, key)
+            value: fieldSchema && isObjectLikeRoot(zodSchema)
+                ? createObjectFieldSetter(state, key, fieldSchema, zodSchema)
                 : createUnionFieldSetter(state, zodSchema, key),
             enumerable: false,
             configurable: true,
             writable: true,
         });
     }
+    if (objectSchema) {
+        defineRecordFieldMethods(prototype, state, zodSchema);
+    }
+    if (isZodUnionRoot(zodSchema)) {
+        defineUnionRootMethods(prototype, state, zodSchema);
+    }
 }

package/dist/smart-object/factory.d.ts

@@ -13,8 +13,8 @@ import type { SmartObjectConstructor } from "../types.js";
  * Initial construction does not emit operations because that state is the baseline
  * every subsequent patch is measured against.
  *
- * @typeParam T - Zod object or union-of-objects schema that defines the instance shape
- * @param zodSchema - A `z.object({ ... })`, `z.union([...])`, or `z.discriminatedUnion(...)` schema
+ * @typeParam T - Zod schema that defines the instance shape (object, union, intersection, or lazy root)
+ * @param zodSchema - A `z.object({ ... })`, `z.union([...])`, `z.discriminatedUnion(...)`, `z.intersection(...)`, or `z.lazy(...)` schema
  * @returns An instantiable class with types inferred from the schema
  *
  * @example
@@ -33,4 +33,6 @@ import type { SmartObjectConstructor } from "../types.js";
 export declare function SmartObject<T extends z.ZodObject>(zodSchema: T): SmartObjectConstructor<T>;
 export declare function SmartObject<T extends z.ZodDiscriminatedUnion>(zodSchema: T): SmartObjectConstructor<T>;
 export declare function SmartObject<T extends z.ZodUnion>(zodSchema: T): SmartObjectConstructor<T>;
+export declare function SmartObject<T extends z.ZodIntersection>(zodSchema: T): SmartObjectConstructor<T>;
+export declare function SmartObject<T extends z.ZodLazy>(zodSchema: T): SmartObjectConstructor<T>;
 //# sourceMappingURL=factory.d.ts.map

package/dist/smart-object/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/smart-object/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B,OAAO,KAAK,EAAE,sBAAsB,EAAqB,MAAM,aAAa,CAAC;AAI7E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;AAC5F,wBAAgB,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,qBAAqB,EAC3D,SAAS,EAAE,CAAC,GACX,sBAAsB,CAAC,CAAC,CAAC,CAAC;AAC7B,wBAAgB,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/smart-object/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B,OAAO,KAAK,EAAE,sBAAsB,EAAqB,MAAM,aAAa,CAAC;AAwC7E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;AAC5F,wBAAgB,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,qBAAqB,EAC3D,SAAS,EAAE,CAAC,GACX,sBAAsB,CAAC,CAAC,CAAC,CAAC;AAC7B,wBAAgB,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;AAC3F,wBAAgB,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,eAAe,EAAE,SAAS,EAAE,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;AAClG,wBAAgB,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC"}

package/dist/smart-object/factory.js

@@ -1,15 +1,27 @@
 import { SmartObjectError } from "../errors.js";
-import { isZodObject, isZodUnionOfObjects, isZodUnionRoot } from "../zod-introspect.js";
+import { isZodIntersection, isZodObject, isZodUnionOfObjects, isZodUnionRoot, resolveLazySchema, } from "../zod-introspect.js";
 import { buildSmartObjectClass } from "./build-class.js";
-export function SmartObject(zodSchema) {
-    if (isZodObject(zodSchema)) {
-        return buildSmartObjectClass(zodSchema);
+function assertBuildableSchema(schema) {
+    const resolved = resolveLazySchema(schema);
+    if (isZodObject(resolved)) {
+        return;
     }
-    if (isZodUnionRoot(zodSchema)) {
-        if (!isZodUnionOfObjects(zodSchema)) {
+    if (isZodUnionRoot(resolved)) {
+        if (!isZodUnionOfObjects(resolved)) {
             throw SmartObjectError.unsupportedSchema("SmartObject union root requires all options to be z.object(...)");
         }
-        return buildSmartObjectClass(zodSchema);
+        return;
+    }
+    if (isZodIntersection(resolved)) {
+        const left = resolved._zod.def.left;
+        const right = resolved._zod.def.right;
+        assertBuildableSchema(left);
+        assertBuildableSchema(right);
+        return;
     }
-    throw SmartObjectError.unsupportedSchema("SmartObject requires a z.object(...), z.union([...]), or z.discriminatedUnion(...) schema");
+    throw SmartObjectError.unsupportedSchema("SmartObject requires a buildable z.object(...), z.union([...]), z.discriminatedUnion(...), z.intersection(...), or z.lazy(...) schema");
+}
+export function SmartObject(zodSchema) {
+    assertBuildableSchema(zodSchema);
+    return buildSmartObjectClass(zodSchema);
 }

package/dist/smart-object/json-patch.d.ts

@@ -1,3 +1,4 @@
 import jsonPatch from "fast-json-patch";
-export declare const applyPatch: typeof jsonPatch.applyPatch, compare: typeof jsonPatch.compare, deepClone: typeof jsonPatch.deepClone;
+export declare const applyPatch: typeof jsonPatch.applyPatch, compare: typeof jsonPatch.compare;
+export declare function deepClone<T>(value: T): T;
 //# sourceMappingURL=json-patch.d.ts.map

package/dist/smart-object/json-patch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json-patch.d.ts","sourceRoot":"","sources":["../../src/smart-object/json-patch.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,iBAAiB,CAAC;AAExC,eAAO,MAAQ,UAAU,+BAAE,OAAO,4BAAE,SAAS,4BAAc,CAAC"}
+{"version":3,"file":"json-patch.d.ts","sourceRoot":"","sources":["../../src/smart-object/json-patch.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,iBAAiB,CAAC;AAExC,eAAO,MAAQ,UAAU,+BAAE,OAAO,0BAAc,CAAC;AAEjD,wBAAgB,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAkCxC"}

package/dist/smart-object/json-patch.js

@@ -1,2 +1,27 @@
 import jsonPatch from "fast-json-patch";
-export const { applyPatch, compare, deepClone } = jsonPatch;
+export const { applyPatch, compare } = jsonPatch;
+export function deepClone(value) {
+    if (value instanceof Date) {
+        return new Date(value.getTime());
+    }
+    if (typeof value === "bigint") {
+        return value;
+    }
+    if (value instanceof Map) {
+        return new Map([...value.entries()].map(([key, nestedValue]) => [key, deepClone(nestedValue)]));
+    }
+    if (value instanceof Set) {
+        return new Set([...value].map((item) => deepClone(item)));
+    }
+    if (Array.isArray(value)) {
+        return value.map((item) => deepClone(item));
+    }
+    if (typeof value === "object" && value !== null) {
+        const result = {};
+        for (const [key, nestedValue] of Object.entries(value)) {
+            result[key] = deepClone(nestedValue);
+        }
+        return result;
+    }
+    return value;
+}

package/dist/smart-object/read-field.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read-field.d.ts","sourceRoot":"","sources":["../../src/smart-object/read-field.ts"],"names":[],"mappings":"AAEA,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAMtD"}
+{"version":3,"file":"read-field.d.ts","sourceRoot":"","sources":["../../src/smart-object/read-field.ts"],"names":[],"mappings":"AAEA,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAetD"}

package/dist/smart-object/read-field.js

@@ -1,5 +1,11 @@
 import { deepClone } from "./json-patch.js";
 export function readFieldValue(value) {
+    if (value instanceof Date ||
+        value instanceof Map ||
+        value instanceof Set ||
+        typeof value === "bigint") {
+        return deepClone(value);
+    }
     if (typeof value === "object" && value !== null) {
         return deepClone(value);
     }

package/dist/smart-object/setters/object-field.d.ts

@@ -1,4 +1,5 @@
-import type { ZodObjectLike } from "../../zod-introspect.js";
+import type { z } from "zod";
+import type { SmartObjectSchema } from "../../types.js";
 import type { InstanceState } from "../instance-state.js";
-export declare function createObjectFieldSetter<T>(state: InstanceState<T>, schema: ZodObjectLike, key: string): (this: object, value: unknown) => void;
+export declare function createObjectFieldSetter<T>(state: InstanceState<T>, key: string, fieldSchema: z.ZodType, rootSchema: SmartObjectSchema): (this: object, value: unknown) => void;
 //# sourceMappingURL=object-field.d.ts.map

package/dist/smart-object/setters/object-field.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"object-field.d.ts","sourceRoot":"","sources":["../../../src/smart-object/setters/object-field.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAG1D,wBAAgB,uBAAuB,CAAC,CAAC,EACvC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,EACvB,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,MAAM,IAIM,MAAM,MAAM,EAAE,OAAO,OAAO,UAsB9C"}
+{"version":3,"file":"object-field.d.ts","sourceRoot":"","sources":["../../../src/smart-object/setters/object-field.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAGxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AA8C1D,wBAAgB,uBAAuB,CAAC,CAAC,EACvC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,EACvB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,CAAC,CAAC,OAAO,EACtB,UAAU,EAAE,iBAAiB,IAEZ,MAAM,MAAM,EAAE,OAAO,OAAO,UAoC9C"}

package/dist/smart-object/setters/object-field.js

@@ -1,7 +1,36 @@
 import { SmartObjectError } from "../../errors.js";
-import { applyPatch, compare, deepClone } from "../json-patch.js";
-export function createObjectFieldSetter(state, schema, key) {
-    const fieldSchema = schema.shape[key];
+import { unwrapFieldSchema } from "../../zod-introspect.js";
+import { serializeDataForPatch, serializeValue } from "../codecs.js";
+import { compare, deepClone } from "../json-patch.js";
+function normalizeFieldPatch(patch, key, fieldSchema, parsed, beforeSerialized) {
+    const inner = unwrapFieldSchema(fieldSchema);
+    const defType = inner._zod.def.type;
+    if (defType !== "set" && defType !== "map") {
+        return patch.map((operation) => {
+            if ("value" in operation && operation.path === `/${key}`) {
+                return {
+                    ...operation,
+                    value: serializeValue(fieldSchema, parsed),
+                };
+            }
+            return operation;
+        });
+    }
+    const prefix = `/${key}`;
+    const touchesField = patch.some((operation) => operation.path === prefix || operation.path.startsWith(`${prefix}/`));
+    if (!touchesField) {
+        return patch;
+    }
+    const hadField = Object.hasOwn(beforeSerialized, key) && beforeSerialized[key] !== undefined;
+    return [
+        {
+            op: hadField ? "replace" : "add",
+            path: prefix,
+            value: serializeValue(fieldSchema, parsed),
+        },
+    ];
+}
+export function createObjectFieldSetter(state, key, fieldSchema, rootSchema) {
     return function (value) {
         let parsed;
         try {
@@ -14,11 +43,14 @@ export function createObjectFieldSetter(state, schema, key) {
         const beforeData = deepClone(data);
         const afterData = deepClone(data);
         afterData[key] = parsed;
-        const patch = compare(beforeData, afterData);
+        const beforeSerialized = serializeDataForPatch(beforeData, rootSchema);
+        const afterSerialized = serializeDataForPatch(afterData, rootSchema);
+        const patch = normalizeFieldPatch(compare(beforeSerialized, afterSerialized), key, fieldSchema, parsed, beforeSerialized);
         if (patch.length === 0) {
             return;
         }
-        applyPatch(data, patch, false, true);
+        afterData[key] = parsed;
+        state.setData(this, afterData);
         state.getOperations(this).push(...patch);
     };
 }

package/dist/smart-object/setters/record-field.d.ts

@@ -0,0 +1,7 @@
+import type { SmartObjectSchema } from "../../types.js";
+import type { RecordFieldInfo } from "../../zod-introspect.js";
+import type { InstanceState } from "../instance-state.js";
+export declare function createRecordEntryGetter<T>(state: InstanceState<T>, field: RecordFieldInfo): (this: object, key: string) => unknown;
+export declare function createRecordEntrySetter<T>(state: InstanceState<T>, rootSchema: SmartObjectSchema, field: RecordFieldInfo): (this: object, key: string, value: unknown) => void;
+export declare function createRecordEntryDeleter<T>(state: InstanceState<T>, rootSchema: SmartObjectSchema, field: RecordFieldInfo): (this: object, key: string) => void;
+//# sourceMappingURL=record-field.d.ts.map

package/dist/smart-object/setters/record-field.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"record-field.d.ts","sourceRoot":"","sources":["../../../src/smart-object/setters/record-field.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAuH1D,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,eAAe,IACvE,MAAM,MAAM,EAAE,KAAK,MAAM,aAU3C;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EACvC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,EACvB,UAAU,EAAE,iBAAiB,EAC7B,KAAK,EAAE,eAAe,IAIL,MAAM,MAAM,EAAE,KAAK,MAAM,EAAE,OAAO,OAAO,UA0C3D;AAED,wBAAgB,wBAAwB,CAAC,CAAC,EACxC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,EACvB,UAAU,EAAE,iBAAiB,EAC7B,KAAK,EAAE,eAAe,IAIL,MAAM,MAAM,EAAE,KAAK,MAAM,UA0B3C"}

package/dist/smart-object/setters/record-field.js

@@ -0,0 +1,133 @@
+import { SmartObjectError } from "../../errors.js";
+import { serializeDataForPatch, serializeEntryPatchValue } from "../codecs.js";
+import { compare, deepClone } from "../json-patch.js";
+import { readFieldValue } from "../read-field.js";
+function getEntryContainer(data, fieldName, storage) {
+    const container = data[fieldName];
+    if (storage === "map") {
+        return container instanceof Map
+            ? container
+            : new Map();
+    }
+    if (typeof container === "object" && container !== null && !Array.isArray(container)) {
+        return container;
+    }
+    return {};
+}
+function hasEntry(container, key, storage) {
+    if (storage === "map") {
+        return container instanceof Map && container.has(key);
+    }
+    return typeof container === "object" && container !== null && Object.hasOwn(container, key);
+}
+function getEntry(container, key, storage) {
+    if (storage === "map" && container instanceof Map) {
+        return container.get(key);
+    }
+    if (typeof container === "object" && container !== null) {
+        return container[key];
+    }
+    return undefined;
+}
+function cloneContainer(container, storage) {
+    if (storage === "map") {
+        return deepClone(container instanceof Map ? container : new Map());
+    }
+    return deepClone(typeof container === "object" && container !== null
+        ? container
+        : {});
+}
+function setEntry(container, key, value, storage) {
+    if (storage === "map" && container instanceof Map) {
+        container.set(key, value);
+        return;
+    }
+    container[key] = value;
+}
+function deleteEntry(container, key, storage) {
+    if (storage === "map" && container instanceof Map) {
+        container.delete(key);
+        return;
+    }
+    delete container[key];
+}
+function normalizeEntryPatches(patch, fieldName, fieldSchema, valueSchema, nextContainer, storage) {
+    const prefix = `/${fieldName}/`;
+    return patch.map((operation) => {
+        if (!("value" in operation) || !operation.path.startsWith(prefix)) {
+            return operation;
+        }
+        const remainder = operation.path.slice(prefix.length);
+        if (remainder.includes("/")) {
+            return operation;
+        }
+        const entryKey = remainder.replace(/~1/g, "/").replace(/~0/g, "~");
+        const entryValue = storage === "map" && nextContainer instanceof Map
+            ? nextContainer.get(entryKey)
+            : nextContainer[entryKey];
+        return {
+            ...operation,
+            value: serializeEntryPatchValue(fieldSchema, valueSchema, entryValue),
+        };
+    });
+}
+export function createRecordEntryGetter(state, field) {
+    return function (key) {
+        const data = state.getData(this);
+        const value = getEntry(data[field.fieldName], key, field.storage);
+        if (value === undefined) {
+            return undefined;
+        }
+        return readFieldValue(value);
+    };
+}
+export function createRecordEntrySetter(state, rootSchema, field) {
+    const { fieldName, fieldSchema, valueSchema, storage } = field;
+    return function (key, value) {
+        let parsed;
+        try {
+            parsed = valueSchema.parse(value);
+        }
+        catch (cause) {
+            throw SmartObjectError.invalidValue(`${fieldName}.${key}`, cause);
+        }
+        const data = state.getData(this);
+        const container = getEntryContainer(data, fieldName, storage);
+        const previousValue = getEntry(container, key, storage);
+        if (hasEntry(container, key, storage) && Object.is(previousValue, parsed)) {
+            return;
+        }
+        const beforeData = deepClone(data);
+        const afterData = deepClone(data);
+        const nextContainer = cloneContainer(container, storage);
+        setEntry(nextContainer, key, parsed, storage);
+        afterData[fieldName] = nextContainer;
+        const patch = normalizeEntryPatches(compare(serializeDataForPatch(beforeData, rootSchema), serializeDataForPatch(afterData, rootSchema)), fieldName, fieldSchema, valueSchema, nextContainer, storage);
+        if (patch.length === 0) {
+            return;
+        }
+        data[fieldName] = nextContainer;
+        state.getOperations(this).push(...patch);
+    };
+}
+export function createRecordEntryDeleter(state, rootSchema, field) {
+    const { fieldName, storage } = field;
+    return function (key) {
+        const data = state.getData(this);
+        const container = data[fieldName];
+        if (!hasEntry(container, key, storage)) {
+            return;
+        }
+        const beforeData = deepClone(data);
+        const afterData = deepClone(data);
+        const nextContainer = cloneContainer(getEntryContainer(afterData, fieldName, storage), storage);
+        deleteEntry(nextContainer, key, storage);
+        afterData[fieldName] = nextContainer;
+        const patch = compare(serializeDataForPatch(beforeData, rootSchema), serializeDataForPatch(afterData, rootSchema));
+        if (patch.length === 0) {
+            return;
+        }
+        data[fieldName] = nextContainer;
+        state.getOperations(this).push(...patch);
+    };
+}

package/dist/smart-object/setters/variant-switch.d.ts

@@ -0,0 +1,5 @@
+import type { ZodDiscriminatedUnionLike, ZodObjectLike, ZodUnionRootLike } from "../../zod-introspect.js";
+import type { InstanceState } from "../instance-state.js";
+export declare function createSwitchVariant<T>(state: InstanceState<T>, schema: ZodUnionRootLike): (this: object, value: unknown) => void;
+export declare function createSwitchToVariant<T>(state: InstanceState<T>, schema: ZodDiscriminatedUnionLike, variantSchema: ZodObjectLike, tagValue: string | number | boolean, discriminator: string): (this: object, partial: Record<string, unknown>) => void;
+//# sourceMappingURL=variant-switch.d.ts.map

package/dist/smart-object/setters/variant-switch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"variant-switch.d.ts","sourceRoot":"","sources":["../../../src/smart-object/setters/variant-switch.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,yBAAyB,EACzB,aAAa,EACb,gBAAgB,EACjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AA8B1D,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,gBAAgB,IACrE,MAAM,MAAM,EAAE,OAAO,OAAO,UAG9C;AAED,wBAAgB,qBAAqB,CAAC,CAAC,EACrC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,EACvB,MAAM,EAAE,yBAAyB,EACjC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EACnC,aAAa,EAAE,MAAM,IAEJ,MAAM,MAAM,EAAE,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,UAahE"}

package/dist/smart-object/setters/variant-switch.js

@@ -0,0 +1,37 @@
+import { SmartObjectError } from "../../errors.js";
+import { compare, deepClone } from "../json-patch.js";
+function applyVariantSwitch(state, instance, schema, value) {
+    const data = state.getData(instance);
+    const beforeData = deepClone(data);
+    let parsed;
+    try {
+        parsed = schema.parse(value);
+    }
+    catch (cause) {
+        throw SmartObjectError.invalidValue("variant", cause);
+    }
+    const patch = compare(beforeData, parsed);
+    if (patch.length === 0) {
+        return;
+    }
+    state.setData(instance, parsed);
+    state.getOperations(instance).push(...patch);
+}
+export function createSwitchVariant(state, schema) {
+    return function (value) {
+        applyVariantSwitch(state, this, schema, value);
+    };
+}
+export function createSwitchToVariant(state, schema, variantSchema, tagValue, discriminator) {
+    return function (partial) {
+        const candidate = { ...partial, [discriminator]: tagValue };
+        let parsed;
+        try {
+            parsed = variantSchema.parse(candidate);
+        }
+        catch (cause) {
+            throw SmartObjectError.invalidValue("variant", cause);
+        }
+        applyVariantSwitch(state, this, schema, parsed);
+    };
+}

package/dist/types.d.ts

@@ -2,9 +2,9 @@ import type { Operation } from "fast-json-patch";
 import type { z } from "zod";
 export type { Operation };
 /**
- * Schemas accepted by SmartObject: plain objects or unions of objects at root.
+ * Schemas accepted by SmartObject: plain objects, unions of objects, intersections, or lazy wrappers at root.
  */
-export type SmartObjectSchema = z.ZodObject | z.ZodDiscriminatedUnion | z.ZodUnion;
+export type SmartObjectSchema = z.ZodObject | z.ZodDiscriminatedUnion | z.ZodUnion | z.ZodIntersection | z.ZodLazy;
 /**
  * Compile-time map of `set*` methods for each schema key.
  *
@@ -26,6 +26,30 @@ export type AllKeys<T> = T extends unknown ? keyof T : never;
 export type SetMethodsUnion<T> = {
     [K in AllKeys<T> as `set${Capitalize<string & K>}`]: (value: T extends unknown ? (K extends keyof T ? T[K] : never) : never) => void;
 };
+type UnionToIntersection<U> = (U extends unknown ? (value: U) => void : never) extends (value: infer I) => void ? I : never;
+type OmitDiscriminator<T, D extends PropertyKey> = Omit<T, D & keyof T>;
+type PerVariantSwitchMethod<T, D extends PropertyKey> = T extends Record<D, infer Tag extends string> ? Tag extends string ? {
+    [K in `switchTo${Capitalize<Tag>}`]: (value: OmitDiscriminator<T, D>) => void;
+} : never : never;
+/**
+ * Variant switching for union root schemas.
+ */
+export type VariantSwitchMethods<T> = {
+    switchVariant(value: T): void;
+};
+export type DiscriminatedVariantSwitchMethods<T, D extends PropertyKey> = VariantSwitchMethods<T> & UnionToIntersection<PerVariantSwitchMethod<T, D>>;
+type EntryValue<T> = T extends Record<string, infer V> ? V : T extends Map<string, infer V> ? V : never;
+type IsEntryField<T> = NonNullable<T> extends Record<string, unknown> ? true : NonNullable<T> extends Map<string, infer _V> ? true : false;
+/**
+ * Dynamic entry accessors for `z.record` and string-key `z.map` fields.
+ */
+export type RecordFieldMethods<T> = {
+    [K in keyof T as IsEntryField<T[K]> extends true ? `get${Capitalize<string & K>}Entry` : never]: (key: string) => EntryValue<NonNullable<T[K]>> | undefined;
+} & {
+    [K in keyof T as IsEntryField<T[K]> extends true ? `set${Capitalize<string & K>}Entry` : never]: (key: string, value: EntryValue<NonNullable<T[K]>>) => void;
+} & {
+    [K in keyof T as IsEntryField<T[K]> extends true ? `delete${Capitalize<string & K>}Entry` : never]: (key: string) => void;
+};
 /**
  * Read/write surface and audit trail are separate concerns in the public API.
  *
@@ -50,12 +74,15 @@ export type SnapshotAccessor<T extends SmartObjectSchema> = {
 export type UnionDataShape<U> = {
     [K in AllKeys<U>]: U extends unknown ? (K extends keyof U ? U[K] : never) : never;
 };
+type ObjectLikeSchema<T extends SmartObjectSchema> = T extends z.ZodObject | z.ZodIntersection | z.ZodLazy ? z.infer<T> : never;
+type UnionRootExtras<T extends SmartObjectSchema> = T extends z.ZodDiscriminatedUnion<infer _Options, infer Discriminator extends string> ? DiscriminatedVariantSwitchMethods<z.infer<T>, Discriminator> : T extends z.ZodUnion ? VariantSwitchMethods<z.infer<T>> : Record<string, never>;
+type ObjectRootExtras<T extends SmartObjectSchema> = T extends z.ZodObject ? RecordFieldMethods<z.infer<T>> : T extends z.ZodIntersection | z.ZodLazy ? RecordFieldMethods<ObjectLikeSchema<T>> : Record<string, never>;
 /**
  * Full instance contract: validated data shape, typed mutators, and patch log.
  *
  * Intersection types merge these concerns into one consumable surface for callers.
  */
-export type SmartObjectInstance<T extends SmartObjectSchema> = (T extends z.ZodObject ? z.infer<T> : UnionDataShape<z.infer<T>>) & (T extends z.ZodObject ? SetMethods<z.infer<T>> : SetMethodsUnion<z.infer<T>>) & OperationsAccessor & SnapshotAccessor<T>;
+export type SmartObjectInstance<T extends SmartObjectSchema> = (T extends z.ZodObject ? z.infer<T> : T extends z.ZodIntersection | z.ZodLazy ? z.infer<T> : UnionDataShape<z.infer<T>>) & (T extends z.ZodObject | z.ZodIntersection | z.ZodLazy ? SetMethods<z.infer<T>> : SetMethodsUnion<z.infer<T>>) & ObjectRootExtras<T> & UnionRootExtras<T> & OperationsAccessor & SnapshotAccessor<T>;
 /**
  * Constructor type for a SmartObject class, including replay as a first-class capability.
  *

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B,YAAY,EAAE,SAAS,EAAE,CAAC;AAE1B;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,qBAAqB,GAAG,CAAC,CAAC,QAAQ,CAAC;AAEnF;;;;;GAKG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI;KACzB,CAAC,IAAI,MAAM,CAAC,IAAI,MAAM,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI;CACxE,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,GAAG,MAAM,CAAC,GAAG,KAAK,CAAC;AAE7D;;;;GAIG;AACH,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;KAC9B,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,MAAM,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,GAAG,CACnD,KAAK,EAAE,CAAC,SAAS,OAAO,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,GAAG,KAAK,KAClE,IAAI;CACV,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,qEAAqE;IACrE,QAAQ,CAAC,UAAU,EAAE,SAAS,SAAS,EAAE,CAAC;IAC1C,8EAA8E;IAC9E,eAAe,IAAI,IAAI,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,iBAAiB,IAAI;IAC1D,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;CACtB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;KAC7B,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,OAAO,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,GAAG,KAAK;CAClF,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,SAAS,GACjF,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GACV,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAC7B,CAAC,CAAC,SAAS,CAAC,CAAC,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAC9E,kBAAkB,GAClB,gBAAgB,CAAC,CAAC,CAAC,CAAC;AAEtB;;;;;GAKG;AACH,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,iBAAiB,IAAI;IAChE,KAAK,OAAO,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;IACnD,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;CAClG,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B,YAAY,EAAE,SAAS,EAAE,CAAC;AAE1B;;GAEG;AACH,MAAM,MAAM,iBAAiB,GACzB,CAAC,CAAC,SAAS,GACX,CAAC,CAAC,qBAAqB,GACvB,CAAC,CAAC,QAAQ,GACV,CAAC,CAAC,eAAe,GACjB,CAAC,CAAC,OAAO,CAAC;AAEd;;;;;GAKG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI;KACzB,CAAC,IAAI,MAAM,CAAC,IAAI,MAAM,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI;CACxE,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,GAAG,MAAM,CAAC,GAAG,KAAK,CAAC;AAE7D;;;;GAIG;AACH,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;KAC9B,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,MAAM,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,GAAG,CACnD,KAAK,EAAE,CAAC,SAAS,OAAO,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,GAAG,KAAK,KAClE,IAAI;CACV,CAAC;AAEF,KAAK,mBAAmB,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,OAAO,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,GAAG,KAAK,CAAC,SAAS,CACrF,KAAK,EAAE,MAAM,CAAC,KACX,IAAI,GACL,CAAC,GACD,KAAK,CAAC;AAEV,KAAK,iBAAiB,CAAC,CAAC,EAAE,CAAC,SAAS,WAAW,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;AAExE,KAAK,sBAAsB,CAAC,CAAC,EAAE,CAAC,SAAS,WAAW,IAClD,CAAC,SAAS,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,MAAM,CAAC,GACzC,GAAG,SAAS,MAAM,GAChB;KACG,CAAC,IAAI,WAAW,UAAU,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI;CAC9E,GACD,KAAK,GACP,KAAK,CAAC;AAEZ;;GAEG;AACH,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI;IACpC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,iCAAiC,CAAC,CAAC,EAAE,CAAC,SAAS,WAAW,IAAI,oBAAoB,CAAC,CAAC,CAAC,GAC/F,mBAAmB,CAAC,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAEpD,KAAK,UAAU,CAAC,CAAC,IACf,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAErF,KAAK,YAAY,CAAC,CAAC,IACjB,WAAW,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC1C,IAAI,GACJ,WAAW,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAC1C,IAAI,GACJ,KAAK,CAAC;AAEd;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI;KACjC,CAAC,IAAI,MAAM,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG,MAAM,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,OAAO,GAAG,KAAK,GAAG,CAC/F,GAAG,EAAE,MAAM,KACR,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS;CAC/C,GAAG;KACD,CAAC,IAAI,MAAM,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG,MAAM,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,OAAO,GAAG,KAAK,GAAG,CAC/F,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KACjC,IAAI;CACV,GAAG;KACD,CAAC,IAAI,MAAM,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,GAC5C,SAAS,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,OAAO,GACtC,KAAK,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI;CAClC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,qEAAqE;IACrE,QAAQ,CAAC,UAAU,EAAE,SAAS,SAAS,EAAE,CAAC;IAC1C,8EAA8E;IAC9E,eAAe,IAAI,IAAI,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,iBAAiB,IAAI;IAC1D,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;CACtB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;KAC7B,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,OAAO,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,GAAG,KAAK;CAClF,CAAC;AAEF,KAAK,gBAAgB,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,SAClD,CAAC,CAAC,SAAS,GACX,CAAC,CAAC,eAAe,GACjB,CAAC,CAAC,OAAO,GACT,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GACV,KAAK,CAAC;AAEV,KAAK,eAAe,CAAC,CAAC,SAAS,iBAAiB,IAC9C,CAAC,SAAS,CAAC,CAAC,qBAAqB,CAAC,MAAM,QAAQ,EAAE,MAAM,aAAa,SAAS,MAAM,CAAC,GACjF,iCAAiC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,GAC5D,CAAC,SAAS,CAAC,CAAC,QAAQ,GAClB,oBAAoB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAChC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAE9B,KAAK,gBAAgB,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,SAAS,CAAC,CAAC,SAAS,GACtE,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAC9B,CAAC,SAAS,CAAC,CAAC,eAAe,GAAG,CAAC,CAAC,OAAO,GACrC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAE5B;;;;GAIG;AACH,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,SAAS,GACjF,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GACV,CAAC,SAAS,CAAC,CAAC,eAAe,GAAG,CAAC,CAAC,OAAO,GACrC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GACV,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAC/B,CAAC,CAAC,SAAS,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,eAAe,GAAG,CAAC,CAAC,OAAO,GAClD,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GACtB,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAChC,gBAAgB,CAAC,CAAC,CAAC,GACnB,eAAe,CAAC,CAAC,CAAC,GAClB,kBAAkB,GAClB,gBAAgB,CAAC,CAAC,CAAC,CAAC;AAEtB;;;;;GAKG;AACH,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,iBAAiB,IAAI;IAChE,KAAK,OAAO,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;IACnD,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;CAClG,CAAC"}

package/dist/zod-introspect.d.ts

@@ -3,6 +3,19 @@ import type { SmartObjectSchema } from "./types.js";
 export type ZodObjectLike = z.ZodObject;
 export type ZodUnionRootLike = z.ZodUnion;
 export type ZodDiscriminatedUnionLike = z.ZodDiscriminatedUnion;
+export type ZodIntersectionLike = z.ZodIntersection;
+export type ZodLazyLike = z.ZodLazy;
+export type DiscriminatedVariantInfo = {
+    tag: string | number | boolean;
+    schema: ZodObjectLike;
+    methodName: string;
+};
+export type RecordFieldInfo = {
+    fieldName: string;
+    fieldSchema: z.ZodType;
+    valueSchema: z.ZodType;
+    storage: "record" | "map";
+};
 export declare function isZodObject(schema: unknown): schema is ZodObjectLike;
 export declare function isZodUnionRoot(schema: SmartObjectSchema): schema is ZodUnionRootLike;
 export declare function isZodDiscriminatedUnion(schema: ZodUnionRootLike): schema is ZodDiscriminatedUnionLike;
@@ -11,4 +24,27 @@ export declare function getObjectShapeKeys(schema: ZodObjectLike): string[];
 export declare function getUnionObjectKeys(schema: ZodUnionRootLike): string[];
 export declare function getDiscriminator(schema: ZodDiscriminatedUnionLike): string;
 export declare function toSetterMethodName(key: string): string;
+export declare function toVariantSwitchMethodName(tag: string | number | boolean): string;
+export declare function toRecordEntryMethodPrefix(fieldName: string): string;
+export declare function getLiteralValue(schema: unknown): string | number | boolean | undefined;
+export declare function getDiscriminatedVariants(schema: ZodDiscriminatedUnionLike): DiscriminatedVariantInfo[];
+export declare function isZodRecord(schema: unknown): schema is z.ZodRecord;
+export declare function isZodDate(schema: unknown): boolean;
+export declare function isZodMap(schema: unknown): schema is z.ZodMap;
+export declare function isZodSet(schema: unknown): schema is z.ZodSet;
+export declare function isZodBigInt(schema: unknown): boolean;
+export declare function isStringKeyMap(schema: unknown): schema is z.ZodMap;
+export declare function unwrapFieldSchema(schema: z.ZodType): z.ZodType;
+/** @deprecated Use unwrapFieldSchema */
+export declare function unwrapOptionalNullable(schema: z.ZodType): z.ZodType;
+export declare function isZodIntersection(schema: SmartObjectSchema): schema is ZodIntersectionLike;
+export declare function isZodLazy(schema: SmartObjectSchema): schema is ZodLazyLike;
+export declare function resolveLazySchema(schema: SmartObjectSchema): SmartObjectSchema;
+export declare function getRecordFields(schema: ZodObjectLike): RecordFieldInfo[];
+export declare function getRecordFieldsFromSchema(schema: SmartObjectSchema): RecordFieldInfo[];
+export declare function getMergedObjectShape(schema: SmartObjectSchema): Record<string, z.ZodType>;
+export declare function getSchemaShapeKeys(schema: SmartObjectSchema): string[];
+export declare function getFieldSchema(schema: SmartObjectSchema, key: string): z.ZodType | undefined;
+export declare function getObjectSchemaForFields(schema: SmartObjectSchema): ZodObjectLike | undefined;
+export declare function isObjectLikeRoot(schema: SmartObjectSchema): boolean;
 //# sourceMappingURL=zod-introspect.d.ts.map

package/dist/zod-introspect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zod-introspect.d.ts","sourceRoot":"","sources":["../src/zod-introspect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEpD,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,SAAS,CAAC;AACxC,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,QAAQ,CAAC;AAC1C,MAAM,MAAM,yBAAyB,GAAG,CAAC,CAAC,qBAAqB,CAAC;AAEhE,wBAAgB,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,aAAa,CAOpE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,IAAI,gBAAgB,CAEpF;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,gBAAgB,GACvB,MAAM,IAAI,yBAAyB,CAErC;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAErE;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,EAAE,CAElE;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,EAAE,CAcrE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,yBAAyB,GAAG,MAAM,CAE1E;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEtD"}
+{"version":3,"file":"zod-introspect.d.ts","sourceRoot":"","sources":["../src/zod-introspect.ts"],"names":[],"mappings":"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"}

package/dist/zod-introspect.js

@@ -34,3 +34,219 @@ export function getDiscriminator(schema) {
 export function toSetterMethodName(key) {
     return `set${key.charAt(0).toUpperCase()}${key.slice(1)}`;
 }
+export function toVariantSwitchMethodName(tag) {
+    const label = typeof tag === "string" ? tag : String(tag);
+    return `switchTo${label.charAt(0).toUpperCase()}${label.slice(1)}`;
+}
+export function toRecordEntryMethodPrefix(fieldName) {
+    return fieldName.charAt(0).toUpperCase() + fieldName.slice(1);
+}
+export function getLiteralValue(schema) {
+    if (typeof schema !== "object" || schema === null || !("_zod" in schema)) {
+        return undefined;
+    }
+    const def = schema._zod.def;
+    if (def.type === "literal" && Array.isArray(def.values) && def.values.length === 1) {
+        const value = def.values[0];
+        if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+            return value;
+        }
+    }
+    return undefined;
+}
+export function getDiscriminatedVariants(schema) {
+    const discriminator = getDiscriminator(schema);
+    const variants = [];
+    for (const option of schema.options) {
+        if (!isZodObject(option)) {
+            continue;
+        }
+        const tagSchema = option.shape[discriminator];
+        const tag = getLiteralValue(tagSchema);
+        if (tag === undefined) {
+            continue;
+        }
+        variants.push({
+            tag,
+            schema: option,
+            methodName: toVariantSwitchMethodName(tag),
+        });
+    }
+    return variants;
+}
+export function isZodRecord(schema) {
+    return (typeof schema === "object" &&
+        schema !== null &&
+        "_zod" in schema &&
+        schema._zod.def.type === "record");
+}
+export function isZodDate(schema) {
+    if (typeof schema !== "object" || schema === null || !("_zod" in schema)) {
+        return false;
+    }
+    const def = schema._zod.def;
+    return def.type === "date";
+}
+export function isZodMap(schema) {
+    return (typeof schema === "object" &&
+        schema !== null &&
+        "_zod" in schema &&
+        schema._zod.def.type === "map");
+}
+export function isZodSet(schema) {
+    return (typeof schema === "object" &&
+        schema !== null &&
+        "_zod" in schema &&
+        schema._zod.def.type === "set");
+}
+export function isZodBigInt(schema) {
+    if (typeof schema !== "object" || schema === null || !("_zod" in schema)) {
+        return false;
+    }
+    return schema._zod.def.type === "bigint";
+}
+export function isStringKeyMap(schema) {
+    if (!isZodMap(schema)) {
+        return false;
+    }
+    const keyType = unwrapFieldSchema(schema._zod.def.keyType);
+    return keyType._zod.def.type === "string";
+}
+export function unwrapFieldSchema(schema) {
+    const def = schema._zod.def;
+    if (def.type === "optional" || def.type === "nullable" || def.type === "default") {
+        return unwrapFieldSchema(def.innerType);
+    }
+    if (def.type === "lazy") {
+        return unwrapFieldSchema(def.getter?.());
+    }
+    if (def.type === "pipe") {
+        const outType = def.out?._zod.def.type;
+        if (outType === "transform") {
+            return unwrapFieldSchema(def.in);
+        }
+        return unwrapFieldSchema(def.out);
+    }
+    return schema;
+}
+/** @deprecated Use unwrapFieldSchema */
+export function unwrapOptionalNullable(schema) {
+    return unwrapFieldSchema(schema);
+}
+export function isZodIntersection(schema) {
+    return schema._zod.def.type === "intersection";
+}
+export function isZodLazy(schema) {
+    return schema._zod.def.type === "lazy";
+}
+export function resolveLazySchema(schema) {
+    if (isZodLazy(schema)) {
+        return resolveLazySchema(schema._zod.def.getter());
+    }
+    return schema;
+}
+function collectEntryField(fieldName, fieldSchema, unwrapped) {
+    if (isZodRecord(unwrapped)) {
+        return {
+            fieldName,
+            fieldSchema,
+            valueSchema: unwrapped._zod.def.valueType,
+            storage: "record",
+        };
+    }
+    if (isStringKeyMap(unwrapped)) {
+        return {
+            fieldName,
+            fieldSchema,
+            valueSchema: unwrapped._zod.def.valueType,
+            storage: "map",
+        };
+    }
+    return undefined;
+}
+export function getRecordFields(schema) {
+    const fields = [];
+    for (const [fieldName, fieldSchema] of Object.entries(schema.shape)) {
+        const unwrapped = unwrapFieldSchema(fieldSchema);
+        const entryField = collectEntryField(fieldName, fieldSchema, unwrapped);
+        if (entryField) {
+            fields.push(entryField);
+        }
+    }
+    return fields;
+}
+export function getRecordFieldsFromSchema(schema) {
+    const resolved = resolveLazySchema(schema);
+    if (isZodObject(resolved)) {
+        return getRecordFields(resolved);
+    }
+    if (isZodIntersection(resolved)) {
+        const left = resolved._zod.def.left;
+        const right = resolved._zod.def.right;
+        return [...getRecordFieldsFromSchema(left), ...getRecordFieldsFromSchema(right)];
+    }
+    return [];
+}
+export function getMergedObjectShape(schema) {
+    const resolved = resolveLazySchema(schema);
+    if (isZodObject(resolved)) {
+        return resolved.shape;
+    }
+    if (isZodIntersection(resolved)) {
+        const left = resolved._zod.def.left;
+        const right = resolved._zod.def.right;
+        return {
+            ...getMergedObjectShape(left),
+            ...getMergedObjectShape(right),
+        };
+    }
+    return {};
+}
+export function getSchemaShapeKeys(schema) {
+    const resolved = resolveLazySchema(schema);
+    if (isZodObject(resolved)) {
+        return getObjectShapeKeys(resolved);
+    }
+    if (isZodUnionRoot(resolved)) {
+        return getUnionObjectKeys(resolved);
+    }
+    if (isZodIntersection(resolved)) {
+        const left = resolved._zod.def.left;
+        const right = resolved._zod.def.right;
+        return [...new Set([...getSchemaShapeKeys(left), ...getSchemaShapeKeys(right)])];
+    }
+    return [];
+}
+export function getFieldSchema(schema, key) {
+    const resolved = resolveLazySchema(schema);
+    if (isZodObject(resolved)) {
+        return resolved.shape[key];
+    }
+    if (isZodIntersection(resolved)) {
+        const left = resolved._zod.def.left;
+        const right = resolved._zod.def.right;
+        return getFieldSchema(left, key) ?? getFieldSchema(right, key);
+    }
+    return undefined;
+}
+export function getObjectSchemaForFields(schema) {
+    const resolved = resolveLazySchema(schema);
+    if (isZodObject(resolved)) {
+        return resolved;
+    }
+    if (isZodIntersection(resolved)) {
+        const left = resolved._zod.def.left;
+        const right = resolved._zod.def.right;
+        const leftObject = getObjectSchemaForFields(left);
+        const rightObject = getObjectSchemaForFields(right);
+        if (leftObject && rightObject) {
+            return leftObject;
+        }
+        return leftObject ?? rightObject;
+    }
+    return undefined;
+}
+export function isObjectLikeRoot(schema) {
+    const resolved = resolveLazySchema(schema);
+    return isZodObject(resolved) || isZodIntersection(resolved);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gialicus/smart-object",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Oggetti TypeScript generati da schemi Zod con getter, set* tipizzati e operazioni JSON Patch",
   "type": "module",
   "main": "./dist/index.js",