doxum 0.1.4 → 0.1.5

package/dist/{contract-BsY1XLiG.d.ts → contract-4E3moCbY.d.ts}

@@ -14,12 +14,17 @@ type DocumentTreeValue<TValue> = {
 };
 type BaseNode<K extends string> = {
   readonly kind: K;
+  readonly optional?: boolean;
 };
 type FieldNode<T, Optional extends boolean = false> = BaseNode<'field'> & {
   readonly __value?: T;
-  readonly optional?: Optional;
-};
-type OptionalNode<TNode extends DocumentNode> = TNode & {
+} & (Optional extends true ? {
+  readonly optional: true;
+} : {
+  readonly optional?: false;
+});
+/** A node with optional presence. The marker replaces, rather than intersects, a field marker. */
+type OptionalNode<TNode extends DocumentNode> = TNode extends FieldNode<infer TValue, boolean> ? FieldNode<TValue, true> : TNode & {
   readonly optional: true;
 };
 interface ObjectShape {
@@ -59,7 +64,7 @@ type ListNode<TItem> = BaseNode<'list'> & {
 type TreeNode<TValue> = BaseNode<'tree'> & {
   readonly __value?: TValue;
 };
-type DocumentNode = FieldNode<unknown, boolean> | ObjectNode<ObjectShape> | VariantNode<string, VariantShape> | SingleNode<ObjectNode<ObjectShape> | VariantNode<string, VariantShape>> | TableNode<ObjectNode<ObjectShape> | VariantNode<string, VariantShape>> | MapNode<ObjectNode<ObjectShape> | VariantNode<string, VariantShape>> | RecordNode<string, unknown> | DictNode<string, unknown> | ListNode<unknown> | TreeNode<unknown>;
+type DocumentNode = FieldNode<unknown, false> | FieldNode<unknown, true> | ObjectNode<ObjectShape> | VariantNode<string, VariantShape> | SingleNode<ObjectNode<ObjectShape> | VariantNode<string, VariantShape>> | TableNode<ObjectNode<ObjectShape> | VariantNode<string, VariantShape>> | MapNode<ObjectNode<ObjectShape> | VariantNode<string, VariantShape>> | RecordNode<string, unknown> | DictNode<string, unknown> | ListNode<unknown> | TreeNode<unknown>;
 type EntityValue<N extends ObjectNode<ObjectShape> | VariantNode<string, VariantShape>> = N extends ObjectNode<infer S> ? DocumentValueOfShape<S> : N extends VariantNode<infer T, infer V> ? { [K in keyof V & string]: { [P in T]: K } & DocumentValueOfShape<V[K] extends ObjectNode<infer S> ? S : never> }[keyof V & string] : never;
 type DocumentValueOfNode<N> = N extends FieldNode<infer T, infer O> ? O extends true ? T | undefined : T : N extends ObjectNode<infer S> ? DocumentValueOfShape<S> : N extends VariantNode<infer T, infer V> ? EntityValue<VariantNode<T, V>> : N extends SingleNode<infer V> ? EntityValue<V> : N extends TableNode<infer V> ? {
   readonly ids: readonly string[];
@@ -71,12 +76,13 @@ type OptionalKeys<S extends ObjectShape> = { [K in keyof S]: S[K] extends {
 type RequiredKeys<S extends ObjectShape> = Exclude<keyof S, OptionalKeys<S>>;
 type DocumentValueOfShape<S extends ObjectShape> = { readonly [K in RequiredKeys<S>]: DocumentValueOfNode<S[K]> } & { readonly [K in OptionalKeys<S>]?: DocumentValueOfNode<S[K]> };
 type ReadonlyDocument<S extends DocumentSchema> = DocumentValueOfShape<S['shape']>;
-type CollectionSelector<TId extends string = string, TEntry = unknown> = {
+type EntitySchemaNode = ObjectNode<ObjectShape> | VariantNode<string, VariantShape>;
+type CollectionSelector<TId extends string = string, TNode extends EntitySchemaNode = EntitySchemaNode> = {
   readonly kind: 'collection';
   readonly schema: DocumentSchema;
   readonly address: DocumentAddress;
-  readonly __id?: TId;
-  readonly __entry?: TEntry;
+  readonly __id?: TId; /** Compile-time entry schema carried by schema selectors. */
+  readonly __node?: TNode;
 };
 type ValueSelector<TResult = unknown> = {
   readonly kind: 'value';
@@ -91,7 +97,7 @@ type ImpactTarget<T = unknown> = {
   readonly kind: 'collection';
   readonly at: DocumentAddress;
   readonly id?: string;
-} | CollectionSelector<string, T>;
+} | CollectionSelector<string>;
 type PathMarker<TValue> = {
   readonly __value?: TValue;
 };
@@ -101,7 +107,7 @@ type SchemaPathFor<S extends ObjectShape = ObjectShape, TValue = unknown> = { re
 type DocumentSchema<TShape extends ObjectShape = {}> = {
   readonly kind: 'schema';
   readonly shape: TShape;
-  collection<TPath extends PathMarker<unknown>>(pick: (path: SchemaPath<TShape>) => TPath): CollectionSelector<CollectionId<TPath>, CollectionEntry<TPath>>;
+  collection<TPath extends PathMarker<unknown>>(pick: (path: SchemaPath<TShape>) => TPath): CollectionSelector<CollectionId<TPath>, CollectionNode<TPath>>;
   value<TPath extends PathMarker<unknown>>(pick: (path: SchemaPath<TShape>) => TPath): ValueSelector<PathValueResult<TPath>>;
 };
 type SchemaPath<S extends ObjectShape = {}> = SchemaPathFor<S, DocumentValueOfShape<S>>;
@@ -118,25 +124,25 @@ type CollectionPath<N extends ObjectNode<ObjectShape> | VariantNode<string, Vari
   readonly item: (id: string) => EntityPath<N>;
   readonly __collection?: {
     readonly id: string;
-    readonly entry: DocumentValueOfNode<N>;
+    readonly node: N;
   };
 };
 type PathValue<N extends DocumentNode> = N extends ObjectNode<infer S> ? SchemaPathFor<S, PathNodeValue<N>> : N extends VariantNode<infer _TTag, infer V> ? VariantPath<V> : N extends TableNode<infer V> | MapNode<infer V> ? CollectionPath<V> : N extends SingleNode<infer V> ? EntityPath<V> : SchemaPathFor<{}, PathNodeValue<N>>;
 type CollectionInfo<T> = T extends {
   readonly __collection?: {
     readonly id: infer TId;
-    readonly entry: infer TEntry;
+    readonly node: infer TNode extends EntitySchemaNode;
   };
 } ? {
   readonly id: TId;
-  readonly entry: TEntry;
+  readonly node: TNode;
 } : never;
 type CollectionId<T> = CollectionInfo<T> extends {
   readonly id: infer TId extends string;
 } ? TId : string;
-type CollectionEntry<T> = CollectionInfo<T> extends {
-  readonly entry: infer TEntry;
-} ? TEntry : never;
+type CollectionNode<T> = CollectionInfo<T> extends {
+  readonly node: infer TNode extends EntitySchemaNode;
+} ? TNode : EntitySchemaNode;
 type PathValueResult<T> = T extends PathMarker<infer TValue> ? TValue : unknown;
 declare const field: <T>() => FieldNode<T>;
 declare const optional: <T extends DocumentNode>(value: T) => OptionalNode<T>;
@@ -169,6 +175,9 @@ type FieldSetOperation<TSchema extends DocumentSchema = DocumentSchema> = Operat
 type FieldClearOperation<TSchema extends DocumentSchema = DocumentSchema> = OperationBase & {
   readonly type: 'field.clear';
 };
+type ValueClearOperation<TSchema extends DocumentSchema = DocumentSchema> = OperationBase & {
+  readonly type: 'value.clear';
+};
 type VariantReplaceOperation<TSchema extends DocumentSchema = DocumentSchema> = OperationBase & {
   readonly type: 'variant.replace';
   readonly value: unknown;
@@ -251,17 +260,17 @@ type TreeReplaceOperation<TSchema extends DocumentSchema = DocumentSchema> = Ope
   readonly type: 'tree.replace';
   readonly value: unknown;
 };
-type DocumentOperationUnion<TSchema extends DocumentSchema = DocumentSchema> = FieldSetOperation<TSchema> | FieldClearOperation<TSchema> | VariantReplaceOperation<TSchema> | DictSetOperation<TSchema> | DictDeleteOperation<TSchema> | DictReplaceOperation<TSchema> | EntityCreateOperation<TSchema> | EntityRemoveOperation<TSchema> | EntityMoveOperation<TSchema> | ListInsertOperation<TSchema> | ListMoveOperation<TSchema> | ListRemoveOperation<TSchema> | ListReplaceOperation<TSchema> | TreeInsertOperation<TSchema> | TreeMoveOperation<TSchema> | TreeRemoveOperation<TSchema> | TreeSetOperation<TSchema> | TreeReplaceOperation<TSchema>;
+type DocumentOperationUnion<TSchema extends DocumentSchema = DocumentSchema> = FieldSetOperation<TSchema> | FieldClearOperation<TSchema> | ValueClearOperation<TSchema> | VariantReplaceOperation<TSchema> | DictSetOperation<TSchema> | DictDeleteOperation<TSchema> | DictReplaceOperation<TSchema> | EntityCreateOperation<TSchema> | EntityRemoveOperation<TSchema> | EntityMoveOperation<TSchema> | ListInsertOperation<TSchema> | ListMoveOperation<TSchema> | ListRemoveOperation<TSchema> | ListReplaceOperation<TSchema> | TreeInsertOperation<TSchema> | TreeMoveOperation<TSchema> | TreeRemoveOperation<TSchema> | TreeSetOperation<TSchema> | TreeReplaceOperation<TSchema>;
 type DocumentOperation<TSchema extends DocumentSchema = DocumentSchema> = DocumentOperationUnion<TSchema>;
 //#endregion
 //#region core/src/access/reader.d.ts
 type FieldReader<T> = {
   readonly get: () => T;
 };
-type CollectionReader<TId, TEntry> = {
+type CollectionReader<TId, TNode extends EntitySchemaNode> = {
   readonly ids: () => readonly TId[];
   readonly has: (id: TId) => boolean;
-  readonly get: (id: TId) => EntityReader<TEntry> | undefined;
+  readonly get: (id: TId) => ReaderOfNode<TNode> | undefined;
 };
 type ListReader<T> = {
   readonly values: () => readonly T[];
@@ -275,44 +284,43 @@ type TreeReader<T> = {
   readonly parent: (id: string) => string | undefined;
   readonly children: (id: string) => readonly string[];
 };
-type EntityReader<T> = T extends object ? { readonly [K in keyof T]: ReaderValue<T[K]> } : FieldReader<T>;
-type ReaderValue<T> = T extends readonly (infer TItem)[] ? ListReader<TItem> : T extends object ? EntityReader<T> : FieldReader<T>;
 type ReaderOfNode<TNode extends DocumentNode> = TNode extends {
   kind: 'field';
-} ? FieldReader<DocumentValueOfNode<TNode>> : TNode extends ObjectNode<infer TShape> ? { readonly [K in keyof TShape]: ReaderOfNode<TShape[K]> } : TNode extends VariantNode<string, infer TVariants> ? { readonly [K in keyof TVariants]: ReaderOfNode<TVariants[K]> } : TNode extends SingleNode<infer TValue> ? ReaderOfNode<TValue> : TNode extends TableNode<infer TValue> ? CollectionReader<string, DocumentValueOfNode<TValue>> : TNode extends MapNode<infer TValue> ? CollectionReader<string, DocumentValueOfNode<TValue>> : TNode extends DictNode<infer TKey, infer TValue> ? FieldReader<Readonly<Partial<Record<TKey, TValue>>>> : TNode extends ListNode<infer TItem> ? ListReader<TItem> : TNode extends TreeNode<infer TValue> ? TreeReader<TValue> : FieldReader<DocumentValueOfNode<TNode>>;
+} ? FieldReader<DocumentValueOfNode<TNode>> : TNode extends ObjectNode<infer TShape> ? { readonly [K in keyof TShape]: ReaderOfNode<TShape[K]> } : TNode extends VariantNode<string, infer TVariants> ? { readonly [K in keyof TVariants]: ReaderOfNode<TVariants[K]> } : TNode extends SingleNode<infer TValue> ? ReaderOfNode<TValue> : TNode extends TableNode<infer TValue> ? CollectionReader<string, TValue> : TNode extends MapNode<infer TValue> ? CollectionReader<string, TValue> : TNode extends DictNode<infer TKey, infer TValue> ? FieldReader<Readonly<Partial<Record<TKey, TValue>>>> : TNode extends ListNode<infer TItem> ? ListReader<TItem> : TNode extends TreeNode<infer TValue> ? TreeReader<TValue> : FieldReader<DocumentValueOfNode<TNode>>;
 type DocumentReader<TSchema extends DocumentSchema> = ReaderOfNode<ObjectNode<TSchema['shape']>>;
 //#endregion
 //#region core/src/access/writer.d.ts
-type FieldWriter<T> = {
+type FieldWriter<T, Optional extends boolean = false> = {
   readonly set: (value: T) => void;
-  readonly clear?: () => void;
-};
+} & (Optional extends true ? {
+  readonly clear: () => void;
+} : {});
 type DictionaryWriter<TKey extends string, TValue> = {
   readonly set: (key: TKey, value: TValue) => void;
   readonly delete: (key: TKey) => void;
   readonly replace: (value: Readonly<Partial<Record<TKey, TValue>>>) => void;
 };
-type CollectionWriter<TId, TEntry> = {
+type CollectionWriter<TId, TNode extends EntitySchemaNode> = {
   readonly create: (entry: {
     readonly id: TId;
-    readonly value: TEntry;
+    readonly value: DocumentValueOfNode<TNode>;
   } | readonly {
     readonly id: TId;
-    readonly value: TEntry;
+    readonly value: DocumentValueOfNode<TNode>;
   }[], anchor?: DocumentAnchor) => void;
-  readonly item: (id: TId) => EntityWriter<TEntry>;
+  readonly item: (id: TId) => WriterOfNode<TNode>;
   readonly remove: (id: TId | readonly TId[]) => void;
   readonly move: (id: TId, anchor?: DocumentAnchor) => void;
 };
-type MapWriter<TId, TEntry> = {
+type MapWriter<TId, TNode extends EntitySchemaNode> = {
   readonly create: (entry: {
     readonly id: TId;
-    readonly value: TEntry;
+    readonly value: DocumentValueOfNode<TNode>;
   } | readonly {
     readonly id: TId;
-    readonly value: TEntry;
+    readonly value: DocumentValueOfNode<TNode>;
   }[]) => void;
-  readonly item: (id: TId) => EntityWriter<TEntry>;
+  readonly item: (id: TId) => WriterOfNode<TNode>;
   readonly remove: (id: TId | readonly TId[]) => void;
 };
 type ListWriter<T> = {
@@ -326,15 +334,20 @@ type TreeWriter<T> = {
   readonly move: (id: string, parentId?: string, index?: number) => void;
   readonly remove: (id: string) => void;
   readonly set: (id: string, value: T) => void;
-  readonly replace: (value: unknown) => void;
+  readonly replace: (value: DocumentTreeValue<T>) => void;
 };
-type EntityWriter<T> = T extends object ? { readonly [K in keyof T]: WriterValue<T[K]> } : FieldWriter<T>;
-type WriterValue<T> = T extends readonly (infer TItem)[] ? ListWriter<TItem> : T extends object ? EntityWriter<T> : FieldWriter<T>;
+type OptionalClear<TNode extends DocumentNode, TWriter> = TNode extends {
+  readonly optional: true;
+} ? TWriter & {
+  readonly clear: () => void;
+} : TWriter;
 type WriterOfNode<TNode extends DocumentNode> = TNode extends {
   kind: 'field';
-} ? FieldWriter<DocumentValueOfNode<TNode>> : TNode extends ObjectNode<infer TShape> ? { readonly [K in keyof TShape]: WriterOfNode<TShape[K]> } : TNode extends VariantNode<string, infer _TVariants> ? {
+} ? TNode extends {
+  readonly optional: true;
+} ? FieldWriter<DocumentValueOfNode<TNode>, true> : FieldWriter<DocumentValueOfNode<TNode>> : TNode extends ObjectNode<infer TShape> ? { readonly [K in keyof TShape]: WriterOfNode<TShape[K]> } : TNode extends VariantNode<string, infer _TVariants> ? OptionalClear<TNode, {
   readonly replace: (value: DocumentValueOfNode<TNode>) => void;
-} : TNode extends SingleNode<infer TValue> ? WriterOfNode<TValue> : TNode extends TableNode<infer TValue> ? CollectionWriter<string, DocumentValueOfNode<TValue>> : TNode extends MapNode<infer TValue> ? MapWriter<string, DocumentValueOfNode<TValue>> : TNode extends DictNode<infer TKey, infer TValue> ? DictionaryWriter<TKey, TValue> : TNode extends ListNode<infer TItem> ? ListWriter<TItem> : TNode extends TreeNode<infer TValue> ? TreeWriter<TValue> : FieldWriter<DocumentValueOfNode<TNode>>;
+}> : TNode extends SingleNode<infer TValue> ? WriterOfNode<TValue> : TNode extends TableNode<infer TValue> ? CollectionWriter<string, TValue> : TNode extends MapNode<infer TValue> ? MapWriter<string, TValue> : TNode extends DictNode<infer TKey, infer TValue> ? OptionalClear<TNode, DictionaryWriter<TKey, TValue>> : TNode extends ListNode<infer TItem> ? OptionalClear<TNode, ListWriter<TItem>> : TNode extends TreeNode<infer TValue> ? OptionalClear<TNode, TreeWriter<TValue>> : FieldWriter<DocumentValueOfNode<TNode>>;
 type DocumentWriter<TSchema extends DocumentSchema> = WriterOfNode<ObjectNode<TSchema['shape']>>;
 //#endregion
 //#region core/src/mutation/issue.d.ts
@@ -360,7 +373,7 @@ type CollectionImpact<TId> = {
 type DocumentImpact<TSchema extends DocumentSchema> = {
   readonly kind: 'incremental' | 'reset';
   readonly affects: (target: ImpactTarget<unknown>) => boolean;
-  readonly collection: <TId extends string, TEntry>(selector: CollectionSelector<TId, TEntry>) => CollectionImpact<TId>;
+  readonly collection: <TId extends string>(selector: CollectionSelector<TId>) => CollectionImpact<TId>;
   readonly operations: readonly DocumentOperationUnion<TSchema>[];
 };
 //#endregion
@@ -535,5 +548,5 @@ type DocumentRuntime<TSchema extends DocumentSchema> = DocumentReadable<TSchema>
   dispose(): void;
 };
 //#endregion
-export { DocumentOperationUnion as $, variant as $t, MutationIssue as A, ObjectNode as At, WriterOfNode as B, VariantNode as Bt, contains as C, DocumentTreeValue as Ct, resolveAddress as D, ImpactTarget as Dt, read as E, FieldNode as Et, EntityWriter as F, SchemaPath as Ft, ListReader as G, map as Gt, DocumentReader as H, dict as Ht, FieldWriter as I, SingleNode as It, DictDeleteOperation as J, record as Jt, ReaderOfNode as K, object as Kt, ListWriter as L, TableNode as Lt, CollectionWriter as M, OptionalNode as Mt, DictionaryWriter as N, ReadonlyDocument as Nt, CollectionImpact as O, ListNode as Ot, DocumentWriter as P, RecordNode as Pt, DocumentOperation as Q, tree as Qt, MapWriter as R, TreeNode as Rt, AddressRef as S, DocumentTreeNode as St, overlaps as T, DocumentValueOfShape as Tt, EntityReader as U, field as Ut, CollectionReader as V, VariantShape as Vt, FieldReader as W, list as Wt, DictSetOperation as X, single as Xt, DictReplaceOperation as Y, schema as Yt, DocumentAnchor as Z, table as Zt, CommandFootprint as _, DictNode as _t, DocumentProblem as a, FieldSetOperation as at, decodeCommandFootprint as b, DocumentNode as bt, DocumentRuntime as c, ListRemoveOperation as ct, LocalHistory as d, TreeMoveOperation as dt, EntityCreateOperation as et, ObserverError as f, TreeRemoveOperation as ft, Unsubscribe as g, CollectionSelector as gt, TransactionResult as h, VariantReplaceOperation as ht, DocumentDisposedError as i, FieldClearOperation as it, MutationIssueCode as j, ObjectShape as jt, DocumentImpact as k, MapNode as kt, DocumentTransaction as l, ListReplaceOperation as lt, PreparedUpdateResult as m, TreeSetOperation as mt, DocumentCommit as n, EntityMoveOperation as nt, DocumentReadable as o, ListInsertOperation as ot, OperationResult as p, TreeReplaceOperation as pt, TreeReader as q, optional as qt, DocumentDiagnostic as r, EntityRemoveOperation as rt, DocumentReentrancyError as s, ListMoveOperation as st, CommitSource as t, EntityEntry as tt, HistoryState as u, TreeInsertOperation as ut, CommandFootprintTarget as v, DocumentAddress as vt, debugKey as w, DocumentValueOfNode as wt, footprintsOverlap as x, DocumentSchema as xt, commandFootprint as y, DocumentListConfig as yt, TreeWriter as z, ValueSelector as zt };
-//# sourceMappingURL=contract-BsY1XLiG.d.ts.map
+export { EntityEntry as $, tree as $t, MutationIssue as A, MapNode as At, CollectionReader as B, ValueSelector as Bt, contains as C, DocumentTreeValue as Ct, resolveAddress as D, FieldNode as Dt, read as E, EntitySchemaNode as Et, FieldWriter as F, RecordNode as Ft, TreeReader as G, list as Gt, FieldReader as H, VariantShape as Ht, ListWriter as I, SchemaPath as It, DictSetOperation as J, optional as Jt, DictDeleteOperation as K, map as Kt, MapWriter as L, SingleNode as Lt, CollectionWriter as M, ObjectShape as Mt, DictionaryWriter as N, OptionalNode as Nt, CollectionImpact as O, ImpactTarget as Ot, DocumentWriter as P, ReadonlyDocument as Pt, EntityCreateOperation as Q, table as Qt, TreeWriter as R, TableNode as Rt, AddressRef as S, DocumentTreeNode as St, overlaps as T, DocumentValueOfShape as Tt, ListReader as U, dict as Ut, DocumentReader as V, VariantNode as Vt, ReaderOfNode as W, field as Wt, DocumentOperation as X, schema as Xt, DocumentAnchor as Y, record as Yt, DocumentOperationUnion as Z, single as Zt, CommandFootprint as _, DictNode as _t, DocumentProblem as a, ListMoveOperation as at, decodeCommandFootprint as b, DocumentNode as bt, DocumentRuntime as c, TreeInsertOperation as ct, LocalHistory as d, TreeReplaceOperation as dt, variant as en, EntityMoveOperation as et, ObserverError as f, TreeSetOperation as ft, Unsubscribe as g, CollectionSelector as gt, TransactionResult as h, CollectionNode as ht, DocumentDisposedError as i, ListInsertOperation as it, MutationIssueCode as j, ObjectNode as jt, DocumentImpact as k, ListNode as kt, DocumentTransaction as l, TreeMoveOperation as lt, PreparedUpdateResult as m, VariantReplaceOperation as mt, DocumentCommit as n, FieldClearOperation as nt, DocumentReadable as o, ListRemoveOperation as ot, OperationResult as p, ValueClearOperation as pt, DictReplaceOperation as q, object as qt, DocumentDiagnostic as r, FieldSetOperation as rt, DocumentReentrancyError as s, ListReplaceOperation as st, CommitSource as t, EntityRemoveOperation as tt, HistoryState as u, TreeRemoveOperation as ut, CommandFootprintTarget as v, DocumentAddress as vt, debugKey as w, DocumentValueOfNode as wt, footprintsOverlap as x, DocumentSchema as xt, commandFootprint as y, DocumentListConfig as yt, WriterOfNode as z, TreeNode as zt };
+//# sourceMappingURL=contract-4E3moCbY.d.ts.map

package/dist/{contract-D8kjdfqT.d.cts → contract-uYJTmT8o.d.cts}

@@ -14,12 +14,17 @@ type DocumentTreeValue<TValue> = {
 };
 type BaseNode<K extends string> = {
   readonly kind: K;
+  readonly optional?: boolean;
 };
 type FieldNode<T, Optional extends boolean = false> = BaseNode<'field'> & {
   readonly __value?: T;
-  readonly optional?: Optional;
-};
-type OptionalNode<TNode extends DocumentNode> = TNode & {
+} & (Optional extends true ? {
+  readonly optional: true;
+} : {
+  readonly optional?: false;
+});
+/** A node with optional presence. The marker replaces, rather than intersects, a field marker. */
+type OptionalNode<TNode extends DocumentNode> = TNode extends FieldNode<infer TValue, boolean> ? FieldNode<TValue, true> : TNode & {
   readonly optional: true;
 };
 interface ObjectShape {
@@ -59,7 +64,7 @@ type ListNode<TItem> = BaseNode<'list'> & {
 type TreeNode<TValue> = BaseNode<'tree'> & {
   readonly __value?: TValue;
 };
-type DocumentNode = FieldNode<unknown, boolean> | ObjectNode<ObjectShape> | VariantNode<string, VariantShape> | SingleNode<ObjectNode<ObjectShape> | VariantNode<string, VariantShape>> | TableNode<ObjectNode<ObjectShape> | VariantNode<string, VariantShape>> | MapNode<ObjectNode<ObjectShape> | VariantNode<string, VariantShape>> | RecordNode<string, unknown> | DictNode<string, unknown> | ListNode<unknown> | TreeNode<unknown>;
+type DocumentNode = FieldNode<unknown, false> | FieldNode<unknown, true> | ObjectNode<ObjectShape> | VariantNode<string, VariantShape> | SingleNode<ObjectNode<ObjectShape> | VariantNode<string, VariantShape>> | TableNode<ObjectNode<ObjectShape> | VariantNode<string, VariantShape>> | MapNode<ObjectNode<ObjectShape> | VariantNode<string, VariantShape>> | RecordNode<string, unknown> | DictNode<string, unknown> | ListNode<unknown> | TreeNode<unknown>;
 type EntityValue<N extends ObjectNode<ObjectShape> | VariantNode<string, VariantShape>> = N extends ObjectNode<infer S> ? DocumentValueOfShape<S> : N extends VariantNode<infer T, infer V> ? { [K in keyof V & string]: { [P in T]: K } & DocumentValueOfShape<V[K] extends ObjectNode<infer S> ? S : never> }[keyof V & string] : never;
 type DocumentValueOfNode<N> = N extends FieldNode<infer T, infer O> ? O extends true ? T | undefined : T : N extends ObjectNode<infer S> ? DocumentValueOfShape<S> : N extends VariantNode<infer T, infer V> ? EntityValue<VariantNode<T, V>> : N extends SingleNode<infer V> ? EntityValue<V> : N extends TableNode<infer V> ? {
   readonly ids: readonly string[];
@@ -71,12 +76,13 @@ type OptionalKeys<S extends ObjectShape> = { [K in keyof S]: S[K] extends {
 type RequiredKeys<S extends ObjectShape> = Exclude<keyof S, OptionalKeys<S>>;
 type DocumentValueOfShape<S extends ObjectShape> = { readonly [K in RequiredKeys<S>]: DocumentValueOfNode<S[K]> } & { readonly [K in OptionalKeys<S>]?: DocumentValueOfNode<S[K]> };
 type ReadonlyDocument<S extends DocumentSchema> = DocumentValueOfShape<S['shape']>;
-type CollectionSelector<TId extends string = string, TEntry = unknown> = {
+type EntitySchemaNode = ObjectNode<ObjectShape> | VariantNode<string, VariantShape>;
+type CollectionSelector<TId extends string = string, TNode extends EntitySchemaNode = EntitySchemaNode> = {
   readonly kind: 'collection';
   readonly schema: DocumentSchema;
   readonly address: DocumentAddress;
-  readonly __id?: TId;
-  readonly __entry?: TEntry;
+  readonly __id?: TId; /** Compile-time entry schema carried by schema selectors. */
+  readonly __node?: TNode;
 };
 type ValueSelector<TResult = unknown> = {
   readonly kind: 'value';
@@ -91,7 +97,7 @@ type ImpactTarget<T = unknown> = {
   readonly kind: 'collection';
   readonly at: DocumentAddress;
   readonly id?: string;
-} | CollectionSelector<string, T>;
+} | CollectionSelector<string>;
 type PathMarker<TValue> = {
   readonly __value?: TValue;
 };
@@ -101,7 +107,7 @@ type SchemaPathFor<S extends ObjectShape = ObjectShape, TValue = unknown> = { re
 type DocumentSchema<TShape extends ObjectShape = {}> = {
   readonly kind: 'schema';
   readonly shape: TShape;
-  collection<TPath extends PathMarker<unknown>>(pick: (path: SchemaPath<TShape>) => TPath): CollectionSelector<CollectionId<TPath>, CollectionEntry<TPath>>;
+  collection<TPath extends PathMarker<unknown>>(pick: (path: SchemaPath<TShape>) => TPath): CollectionSelector<CollectionId<TPath>, CollectionNode<TPath>>;
   value<TPath extends PathMarker<unknown>>(pick: (path: SchemaPath<TShape>) => TPath): ValueSelector<PathValueResult<TPath>>;
 };
 type SchemaPath<S extends ObjectShape = {}> = SchemaPathFor<S, DocumentValueOfShape<S>>;
@@ -118,25 +124,25 @@ type CollectionPath<N extends ObjectNode<ObjectShape> | VariantNode<string, Vari
   readonly item: (id: string) => EntityPath<N>;
   readonly __collection?: {
     readonly id: string;
-    readonly entry: DocumentValueOfNode<N>;
+    readonly node: N;
   };
 };
 type PathValue<N extends DocumentNode> = N extends ObjectNode<infer S> ? SchemaPathFor<S, PathNodeValue<N>> : N extends VariantNode<infer _TTag, infer V> ? VariantPath<V> : N extends TableNode<infer V> | MapNode<infer V> ? CollectionPath<V> : N extends SingleNode<infer V> ? EntityPath<V> : SchemaPathFor<{}, PathNodeValue<N>>;
 type CollectionInfo<T> = T extends {
   readonly __collection?: {
     readonly id: infer TId;
-    readonly entry: infer TEntry;
+    readonly node: infer TNode extends EntitySchemaNode;
   };
 } ? {
   readonly id: TId;
-  readonly entry: TEntry;
+  readonly node: TNode;
 } : never;
 type CollectionId<T> = CollectionInfo<T> extends {
   readonly id: infer TId extends string;
 } ? TId : string;
-type CollectionEntry<T> = CollectionInfo<T> extends {
-  readonly entry: infer TEntry;
-} ? TEntry : never;
+type CollectionNode<T> = CollectionInfo<T> extends {
+  readonly node: infer TNode extends EntitySchemaNode;
+} ? TNode : EntitySchemaNode;
 type PathValueResult<T> = T extends PathMarker<infer TValue> ? TValue : unknown;
 declare const field: <T>() => FieldNode<T>;
 declare const optional: <T extends DocumentNode>(value: T) => OptionalNode<T>;
@@ -169,6 +175,9 @@ type FieldSetOperation<TSchema extends DocumentSchema = DocumentSchema> = Operat
 type FieldClearOperation<TSchema extends DocumentSchema = DocumentSchema> = OperationBase & {
   readonly type: 'field.clear';
 };
+type ValueClearOperation<TSchema extends DocumentSchema = DocumentSchema> = OperationBase & {
+  readonly type: 'value.clear';
+};
 type VariantReplaceOperation<TSchema extends DocumentSchema = DocumentSchema> = OperationBase & {
   readonly type: 'variant.replace';
   readonly value: unknown;
@@ -251,17 +260,17 @@ type TreeReplaceOperation<TSchema extends DocumentSchema = DocumentSchema> = Ope
   readonly type: 'tree.replace';
   readonly value: unknown;
 };
-type DocumentOperationUnion<TSchema extends DocumentSchema = DocumentSchema> = FieldSetOperation<TSchema> | FieldClearOperation<TSchema> | VariantReplaceOperation<TSchema> | DictSetOperation<TSchema> | DictDeleteOperation<TSchema> | DictReplaceOperation<TSchema> | EntityCreateOperation<TSchema> | EntityRemoveOperation<TSchema> | EntityMoveOperation<TSchema> | ListInsertOperation<TSchema> | ListMoveOperation<TSchema> | ListRemoveOperation<TSchema> | ListReplaceOperation<TSchema> | TreeInsertOperation<TSchema> | TreeMoveOperation<TSchema> | TreeRemoveOperation<TSchema> | TreeSetOperation<TSchema> | TreeReplaceOperation<TSchema>;
+type DocumentOperationUnion<TSchema extends DocumentSchema = DocumentSchema> = FieldSetOperation<TSchema> | FieldClearOperation<TSchema> | ValueClearOperation<TSchema> | VariantReplaceOperation<TSchema> | DictSetOperation<TSchema> | DictDeleteOperation<TSchema> | DictReplaceOperation<TSchema> | EntityCreateOperation<TSchema> | EntityRemoveOperation<TSchema> | EntityMoveOperation<TSchema> | ListInsertOperation<TSchema> | ListMoveOperation<TSchema> | ListRemoveOperation<TSchema> | ListReplaceOperation<TSchema> | TreeInsertOperation<TSchema> | TreeMoveOperation<TSchema> | TreeRemoveOperation<TSchema> | TreeSetOperation<TSchema> | TreeReplaceOperation<TSchema>;
 type DocumentOperation<TSchema extends DocumentSchema = DocumentSchema> = DocumentOperationUnion<TSchema>;
 //#endregion
 //#region core/src/access/reader.d.ts
 type FieldReader<T> = {
   readonly get: () => T;
 };
-type CollectionReader<TId, TEntry> = {
+type CollectionReader<TId, TNode extends EntitySchemaNode> = {
   readonly ids: () => readonly TId[];
   readonly has: (id: TId) => boolean;
-  readonly get: (id: TId) => EntityReader<TEntry> | undefined;
+  readonly get: (id: TId) => ReaderOfNode<TNode> | undefined;
 };
 type ListReader<T> = {
   readonly values: () => readonly T[];
@@ -275,44 +284,43 @@ type TreeReader<T> = {
   readonly parent: (id: string) => string | undefined;
   readonly children: (id: string) => readonly string[];
 };
-type EntityReader<T> = T extends object ? { readonly [K in keyof T]: ReaderValue<T[K]> } : FieldReader<T>;
-type ReaderValue<T> = T extends readonly (infer TItem)[] ? ListReader<TItem> : T extends object ? EntityReader<T> : FieldReader<T>;
 type ReaderOfNode<TNode extends DocumentNode> = TNode extends {
   kind: 'field';
-} ? FieldReader<DocumentValueOfNode<TNode>> : TNode extends ObjectNode<infer TShape> ? { readonly [K in keyof TShape]: ReaderOfNode<TShape[K]> } : TNode extends VariantNode<string, infer TVariants> ? { readonly [K in keyof TVariants]: ReaderOfNode<TVariants[K]> } : TNode extends SingleNode<infer TValue> ? ReaderOfNode<TValue> : TNode extends TableNode<infer TValue> ? CollectionReader<string, DocumentValueOfNode<TValue>> : TNode extends MapNode<infer TValue> ? CollectionReader<string, DocumentValueOfNode<TValue>> : TNode extends DictNode<infer TKey, infer TValue> ? FieldReader<Readonly<Partial<Record<TKey, TValue>>>> : TNode extends ListNode<infer TItem> ? ListReader<TItem> : TNode extends TreeNode<infer TValue> ? TreeReader<TValue> : FieldReader<DocumentValueOfNode<TNode>>;
+} ? FieldReader<DocumentValueOfNode<TNode>> : TNode extends ObjectNode<infer TShape> ? { readonly [K in keyof TShape]: ReaderOfNode<TShape[K]> } : TNode extends VariantNode<string, infer TVariants> ? { readonly [K in keyof TVariants]: ReaderOfNode<TVariants[K]> } : TNode extends SingleNode<infer TValue> ? ReaderOfNode<TValue> : TNode extends TableNode<infer TValue> ? CollectionReader<string, TValue> : TNode extends MapNode<infer TValue> ? CollectionReader<string, TValue> : TNode extends DictNode<infer TKey, infer TValue> ? FieldReader<Readonly<Partial<Record<TKey, TValue>>>> : TNode extends ListNode<infer TItem> ? ListReader<TItem> : TNode extends TreeNode<infer TValue> ? TreeReader<TValue> : FieldReader<DocumentValueOfNode<TNode>>;
 type DocumentReader<TSchema extends DocumentSchema> = ReaderOfNode<ObjectNode<TSchema['shape']>>;
 //#endregion
 //#region core/src/access/writer.d.ts
-type FieldWriter<T> = {
+type FieldWriter<T, Optional extends boolean = false> = {
   readonly set: (value: T) => void;
-  readonly clear?: () => void;
-};
+} & (Optional extends true ? {
+  readonly clear: () => void;
+} : {});
 type DictionaryWriter<TKey extends string, TValue> = {
   readonly set: (key: TKey, value: TValue) => void;
   readonly delete: (key: TKey) => void;
   readonly replace: (value: Readonly<Partial<Record<TKey, TValue>>>) => void;
 };
-type CollectionWriter<TId, TEntry> = {
+type CollectionWriter<TId, TNode extends EntitySchemaNode> = {
   readonly create: (entry: {
     readonly id: TId;
-    readonly value: TEntry;
+    readonly value: DocumentValueOfNode<TNode>;
   } | readonly {
     readonly id: TId;
-    readonly value: TEntry;
+    readonly value: DocumentValueOfNode<TNode>;
   }[], anchor?: DocumentAnchor) => void;
-  readonly item: (id: TId) => EntityWriter<TEntry>;
+  readonly item: (id: TId) => WriterOfNode<TNode>;
   readonly remove: (id: TId | readonly TId[]) => void;
   readonly move: (id: TId, anchor?: DocumentAnchor) => void;
 };
-type MapWriter<TId, TEntry> = {
+type MapWriter<TId, TNode extends EntitySchemaNode> = {
   readonly create: (entry: {
     readonly id: TId;
-    readonly value: TEntry;
+    readonly value: DocumentValueOfNode<TNode>;
   } | readonly {
     readonly id: TId;
-    readonly value: TEntry;
+    readonly value: DocumentValueOfNode<TNode>;
   }[]) => void;
-  readonly item: (id: TId) => EntityWriter<TEntry>;
+  readonly item: (id: TId) => WriterOfNode<TNode>;
   readonly remove: (id: TId | readonly TId[]) => void;
 };
 type ListWriter<T> = {
@@ -326,15 +334,20 @@ type TreeWriter<T> = {
   readonly move: (id: string, parentId?: string, index?: number) => void;
   readonly remove: (id: string) => void;
   readonly set: (id: string, value: T) => void;
-  readonly replace: (value: unknown) => void;
+  readonly replace: (value: DocumentTreeValue<T>) => void;
 };
-type EntityWriter<T> = T extends object ? { readonly [K in keyof T]: WriterValue<T[K]> } : FieldWriter<T>;
-type WriterValue<T> = T extends readonly (infer TItem)[] ? ListWriter<TItem> : T extends object ? EntityWriter<T> : FieldWriter<T>;
+type OptionalClear<TNode extends DocumentNode, TWriter> = TNode extends {
+  readonly optional: true;
+} ? TWriter & {
+  readonly clear: () => void;
+} : TWriter;
 type WriterOfNode<TNode extends DocumentNode> = TNode extends {
   kind: 'field';
-} ? FieldWriter<DocumentValueOfNode<TNode>> : TNode extends ObjectNode<infer TShape> ? { readonly [K in keyof TShape]: WriterOfNode<TShape[K]> } : TNode extends VariantNode<string, infer _TVariants> ? {
+} ? TNode extends {
+  readonly optional: true;
+} ? FieldWriter<DocumentValueOfNode<TNode>, true> : FieldWriter<DocumentValueOfNode<TNode>> : TNode extends ObjectNode<infer TShape> ? { readonly [K in keyof TShape]: WriterOfNode<TShape[K]> } : TNode extends VariantNode<string, infer _TVariants> ? OptionalClear<TNode, {
   readonly replace: (value: DocumentValueOfNode<TNode>) => void;
-} : TNode extends SingleNode<infer TValue> ? WriterOfNode<TValue> : TNode extends TableNode<infer TValue> ? CollectionWriter<string, DocumentValueOfNode<TValue>> : TNode extends MapNode<infer TValue> ? MapWriter<string, DocumentValueOfNode<TValue>> : TNode extends DictNode<infer TKey, infer TValue> ? DictionaryWriter<TKey, TValue> : TNode extends ListNode<infer TItem> ? ListWriter<TItem> : TNode extends TreeNode<infer TValue> ? TreeWriter<TValue> : FieldWriter<DocumentValueOfNode<TNode>>;
+}> : TNode extends SingleNode<infer TValue> ? WriterOfNode<TValue> : TNode extends TableNode<infer TValue> ? CollectionWriter<string, TValue> : TNode extends MapNode<infer TValue> ? MapWriter<string, TValue> : TNode extends DictNode<infer TKey, infer TValue> ? OptionalClear<TNode, DictionaryWriter<TKey, TValue>> : TNode extends ListNode<infer TItem> ? OptionalClear<TNode, ListWriter<TItem>> : TNode extends TreeNode<infer TValue> ? OptionalClear<TNode, TreeWriter<TValue>> : FieldWriter<DocumentValueOfNode<TNode>>;
 type DocumentWriter<TSchema extends DocumentSchema> = WriterOfNode<ObjectNode<TSchema['shape']>>;
 //#endregion
 //#region core/src/mutation/issue.d.ts
@@ -360,7 +373,7 @@ type CollectionImpact<TId> = {
 type DocumentImpact<TSchema extends DocumentSchema> = {
   readonly kind: 'incremental' | 'reset';
   readonly affects: (target: ImpactTarget<unknown>) => boolean;
-  readonly collection: <TId extends string, TEntry>(selector: CollectionSelector<TId, TEntry>) => CollectionImpact<TId>;
+  readonly collection: <TId extends string>(selector: CollectionSelector<TId>) => CollectionImpact<TId>;
   readonly operations: readonly DocumentOperationUnion<TSchema>[];
 };
 //#endregion
@@ -535,5 +548,5 @@ type DocumentRuntime<TSchema extends DocumentSchema> = DocumentReadable<TSchema>
   dispose(): void;
 };
 //#endregion
-export { DocumentOperationUnion as $, variant as $t, MutationIssue as A, ObjectNode as At, WriterOfNode as B, VariantNode as Bt, contains as C, DocumentTreeValue as Ct, resolveAddress as D, ImpactTarget as Dt, read as E, FieldNode as Et, EntityWriter as F, SchemaPath as Ft, ListReader as G, map as Gt, DocumentReader as H, dict as Ht, FieldWriter as I, SingleNode as It, DictDeleteOperation as J, record as Jt, ReaderOfNode as K, object as Kt, ListWriter as L, TableNode as Lt, CollectionWriter as M, OptionalNode as Mt, DictionaryWriter as N, ReadonlyDocument as Nt, CollectionImpact as O, ListNode as Ot, DocumentWriter as P, RecordNode as Pt, DocumentOperation as Q, tree as Qt, MapWriter as R, TreeNode as Rt, AddressRef as S, DocumentTreeNode as St, overlaps as T, DocumentValueOfShape as Tt, EntityReader as U, field as Ut, CollectionReader as V, VariantShape as Vt, FieldReader as W, list as Wt, DictSetOperation as X, single as Xt, DictReplaceOperation as Y, schema as Yt, DocumentAnchor as Z, table as Zt, CommandFootprint as _, DictNode as _t, DocumentProblem as a, FieldSetOperation as at, decodeCommandFootprint as b, DocumentNode as bt, DocumentRuntime as c, ListRemoveOperation as ct, LocalHistory as d, TreeMoveOperation as dt, EntityCreateOperation as et, ObserverError as f, TreeRemoveOperation as ft, Unsubscribe as g, CollectionSelector as gt, TransactionResult as h, VariantReplaceOperation as ht, DocumentDisposedError as i, FieldClearOperation as it, MutationIssueCode as j, ObjectShape as jt, DocumentImpact as k, MapNode as kt, DocumentTransaction as l, ListReplaceOperation as lt, PreparedUpdateResult as m, TreeSetOperation as mt, DocumentCommit as n, EntityMoveOperation as nt, DocumentReadable as o, ListInsertOperation as ot, OperationResult as p, TreeReplaceOperation as pt, TreeReader as q, optional as qt, DocumentDiagnostic as r, EntityRemoveOperation as rt, DocumentReentrancyError as s, ListMoveOperation as st, CommitSource as t, EntityEntry as tt, HistoryState as u, TreeInsertOperation as ut, CommandFootprintTarget as v, DocumentAddress as vt, debugKey as w, DocumentValueOfNode as wt, footprintsOverlap as x, DocumentSchema as xt, commandFootprint as y, DocumentListConfig as yt, TreeWriter as z, ValueSelector as zt };
-//# sourceMappingURL=contract-D8kjdfqT.d.cts.map
+export { EntityEntry as $, tree as $t, MutationIssue as A, MapNode as At, CollectionReader as B, ValueSelector as Bt, contains as C, DocumentTreeValue as Ct, resolveAddress as D, FieldNode as Dt, read as E, EntitySchemaNode as Et, FieldWriter as F, RecordNode as Ft, TreeReader as G, list as Gt, FieldReader as H, VariantShape as Ht, ListWriter as I, SchemaPath as It, DictSetOperation as J, optional as Jt, DictDeleteOperation as K, map as Kt, MapWriter as L, SingleNode as Lt, CollectionWriter as M, ObjectShape as Mt, DictionaryWriter as N, OptionalNode as Nt, CollectionImpact as O, ImpactTarget as Ot, DocumentWriter as P, ReadonlyDocument as Pt, EntityCreateOperation as Q, table as Qt, TreeWriter as R, TableNode as Rt, AddressRef as S, DocumentTreeNode as St, overlaps as T, DocumentValueOfShape as Tt, ListReader as U, dict as Ut, DocumentReader as V, VariantNode as Vt, ReaderOfNode as W, field as Wt, DocumentOperation as X, schema as Xt, DocumentAnchor as Y, record as Yt, DocumentOperationUnion as Z, single as Zt, CommandFootprint as _, DictNode as _t, DocumentProblem as a, ListMoveOperation as at, decodeCommandFootprint as b, DocumentNode as bt, DocumentRuntime as c, TreeInsertOperation as ct, LocalHistory as d, TreeReplaceOperation as dt, variant as en, EntityMoveOperation as et, ObserverError as f, TreeSetOperation as ft, Unsubscribe as g, CollectionSelector as gt, TransactionResult as h, CollectionNode as ht, DocumentDisposedError as i, ListInsertOperation as it, MutationIssueCode as j, ObjectNode as jt, DocumentImpact as k, ListNode as kt, DocumentTransaction as l, TreeMoveOperation as lt, PreparedUpdateResult as m, VariantReplaceOperation as mt, DocumentCommit as n, FieldClearOperation as nt, DocumentReadable as o, ListRemoveOperation as ot, OperationResult as p, ValueClearOperation as pt, DictReplaceOperation as q, object as qt, DocumentDiagnostic as r, FieldSetOperation as rt, DocumentReentrancyError as s, ListReplaceOperation as st, CommitSource as t, EntityRemoveOperation as tt, HistoryState as u, TreeRemoveOperation as ut, CommandFootprintTarget as v, DocumentAddress as vt, debugKey as w, DocumentValueOfNode as wt, footprintsOverlap as x, DocumentSchema as xt, commandFootprint as y, DocumentListConfig as yt, WriterOfNode as z, TreeNode as zt };
+//# sourceMappingURL=contract-uYJTmT8o.d.cts.map