edinburgh 0.6.3 → 0.6.4

package/README.md

@@ -494,14 +494,14 @@ ln -s ../../node_modules/edinburgh/skill .claude/skills/edinburgh
 
 The following is auto-generated from `src/edinburgh.ts`:
 
-### currentTxn · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L66)
+### currentTxn · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L67)
 
 Returns the current transaction from AsyncLocalStorage.
 Throws if called outside a transact() callback.
 
 **Signature:** `() => Transaction`
 
-### init · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L85)
+### init · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L86)
 
 Initialize the database with the specified directory path.
 This function may be called multiple times with the same parameters. If it is not called before the first transact(),
@@ -519,7 +519,7 @@ the database will be automatically initialized with the default directory.
 init("./my-database");
 ```
 
-### transact · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L136)
+### transact · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L137)
 
 Executes a function within a database transaction context.
 
@@ -569,7 +569,7 @@ await E.transact(() => {
 });
 ```
 
-### setMaxRetryCount · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L232)
+### setMaxRetryCount · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L244)
 
 Set the maximum number of retries for a transaction in case of conflicts.
 The default value is 6. Setting it to 0 will disable retries and cause transactions to fail immediately on conflict.
@@ -580,11 +580,11 @@ The default value is 6. Setting it to 0 will disable retries and cause transacti
 
 - `count: number` - The maximum number of retries for a transaction.
 
-### setOnSaveCallback · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L249)
+### setOnSaveCallback · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L261)
 
 Set a callback function to be called after a model is saved and committed.
 
-**Signature:** `(callback: (commitId: number, items: Map<ModelBase, Change>) => void) => void`
+**Signature:** `(callback: (commitId: number, items: Map<ModelBase<ModelLookup<readonly any[]>>, Change>) => void) => void`
 
 **Parameters:**
 
@@ -593,14 +593,14 @@ Set a callback function to be called after a model is saved and committed.
 - A sequential number. Higher numbers have been committed after lower numbers.
 - A map of model instances to their changes. The change can be "created", "deleted", or an object containing the old values.
 
-The callback is called within a new transaction context, allowing lazy-loads to happen. However, any
-changes made to Edinburgh models will not be saved.
+The callback is called within a new transaction context at or after the committed state, so lazy-loads
+and additional writes are allowed.
 
-### Model · [class](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### Model · [class](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 **Type:** `typeof ModelBase`
 
-### ModelClass · [class](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### ModelClass · [class](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Runtime base constructor for model classes returned by `defineModel()`.
 
@@ -609,15 +609,15 @@ Prefer the `ModelClass` type alias for annotations and the result of
 
 **Type:** `typeof ModelClassRuntime`
 
-### AnyModelClass · [type](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L132)
+### AnyModelClass · [type](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L137)
 
 A model constructor with its generic information erased.
 
 Useful when accepting or storing arbitrary registered model classes.
 
-**Type:** `ModelClass<object, any, any, readonly any[], any, any>`
+**Type:** `ModelClass<object, any, readonly any[], any, any>`
 
-### ModelBase · [abstract class](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### ModelBase · [abstract class](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Base class for all database models in the Edinburgh ORM.
 
@@ -670,7 +670,7 @@ const User = E.defineModel("User", class {
 type User = InstanceType<typeof User>;
 ```
 
-#### ModelBase.migrate · [static method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+#### ModelBase.migrate · [static method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Optional migration function called when deserializing rows written with an older schema version.
 Receives a plain record with all fields and should mutate it in-place to match the current schema.
@@ -697,7 +697,7 @@ const User = E.defineModel("User", class {
 }, { pk: "id" });
 ```
 
-#### modelBase.preCommit · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+#### modelBase.preCommit · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Optional hook called on each modified instance right before the transaction commits.
 Runs before data is written to disk, so changes made here are included in the commit.
@@ -724,19 +724,19 @@ const Post = E.defineModel("Post", class {
 }, { pk: "id" });
 ```
 
-#### modelBase.getPrimaryKey · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+#### modelBase.getPrimaryKey · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 **Signature:** `() => Uint8Array<ArrayBufferLike>`
 
 **Returns:** The primary key for this instance.
 
-#### modelBase.getPrimaryKeyHash · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+#### modelBase.getPrimaryKeyHash · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 **Signature:** `() => number`
 
 **Returns:** A 53-bit positive integer non-cryptographic hash of the primary key, or undefined if not yet saved.
 
-#### modelBase.isLazyField · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+#### modelBase.isLazyField · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 **Signature:** `(field: keyof this) => boolean`
 
@@ -744,7 +744,7 @@ const Post = E.defineModel("Post", class {
 
 - `field: keyof this`
 
-#### modelBase.preventPersist · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+#### modelBase.preventPersist · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Prevent this instance from being persisted to the database.
 
@@ -760,7 +760,7 @@ user.name = "New Name";
 user.preventPersist(); // Changes won't be saved
 ```
 
-#### modelBase.delete · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+#### modelBase.delete · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Delete this model instance from the database.
 
@@ -775,7 +775,7 @@ const user = User.get("user123");
 user.delete(); // Removes from database
 ```
 
-#### modelBase.validate · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+#### modelBase.validate · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Validate all fields in this model instance.
 
@@ -797,7 +797,7 @@ if (errors.length > 0) {
 }
 ```
 
-#### modelBase.isValid · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+#### modelBase.isValid · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Check if this model instance is valid.
 
@@ -812,31 +812,41 @@ const user = new User({name: "John"});
 if (!user.isValid()) shoutAtTheUser();
 ```
 
-#### modelBase.getState · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+#### modelBase.getState · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 **Signature:** `() => "created" | "deleted" | "loaded" | "lazy"`
 
-#### modelBase.toString · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+#### modelBase.toString · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 **Signature:** `() => string`
 
-#### modelBase.[Symbol.for('nodejs.util.inspect.custom')] · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+#### modelBase.[Symbol.for('nodejs.util.inspect.custom')] · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 **Signature:** `() => string`
 
-### defineModel · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### ModelLookup · [interface](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L96)
+
+**Type Parameters:**
+
+- `PKA extends readonly any[] = readonly any[]`
+
+#### modelLookup.get · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L101)
+
+**Type:** `(...args: PKA) => any`
+
+### defineModel · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Register a model class with the Edinburgh ORM system.
 
 Converts a plain class into a fully-featured model with database persistence,
 typed fields, primary key access, and optional secondary and unique indexes.
 
-**Signature:** `<T extends new () => any, const PK extends (keyof FieldsOf<T> & string) | readonly (keyof FieldsOf<T> & string)[], const UNIQUE extends Record<string, IndexSpec<T>>, const INDEX extends Record<string, IndexSpec<T>>>(tableName: string, cls: T, opts?: { ...; }) => ModelClass<...>`
+**Signature:** `<T extends new () => any, const PK extends (keyof ModelFields<T> & string) | readonly (keyof ModelFields<T> & string)[], const UNIQUE extends Record<string, IndexSpec<T>>, const INDEX extends Record<string, IndexSpec<T>>>(tableName: string, cls: T, opts?: { ...; }) => ModelClass<...>`
 
 **Type Parameters:**
 
 - `T extends new () => any`
-- `PK extends (keyof FieldsOf<T> & string) | readonly (keyof FieldsOf<T> & string)[]`
+- `PK extends (keyof ModelFields<T> & string) | readonly (keyof ModelFields<T> & string)[]`
 - `UNIQUE extends Record<string, IndexSpec<T>>`
 - `INDEX extends Record<string, IndexSpec<T>>`
 
@@ -848,7 +858,7 @@ typed fields, primary key access, and optional secondary and unique indexes.
 
 **Returns:** The enhanced model constructor.
 
-### deleteEverything · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### deleteEverything · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Delete every key/value entry in the database and reinitialize all registered models.
 
@@ -887,13 +897,13 @@ const User = E.defineModel("User", class {
 });
 ```
 
-### string · [constant](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### string · [constant](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Type wrapper instance for the string type.
 
 **Value:** `TypeWrapper<string>`
 
-### orderedString · [constant](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### orderedString · [constant](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Type wrapper instance for the ordered string type, which is just like a string
 except that it sorts lexicographically in the database (instead of by incrementing
@@ -903,37 +913,37 @@ may not contain null characters.
 
 **Value:** `TypeWrapper<string>`
 
-### number · [constant](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### number · [constant](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Type wrapper instance for the number type.
 
 **Value:** `TypeWrapper<number>`
 
-### dateTime · [constant](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### dateTime · [constant](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Type wrapper instance for the date/time type. Stored without timezone info, rounded to whole seconds.
 
 **Value:** `TypeWrapper<Date>`
 
-### boolean · [constant](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### boolean · [constant](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Type wrapper instance for the boolean type.
 
 **Value:** `TypeWrapper<boolean>`
 
-### identifier · [constant](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### identifier · [constant](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Type wrapper instance for the identifier type.
 
 **Value:** `TypeWrapper<string>`
 
-### undef · [constant](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### undef · [constant](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Type wrapper instance for the 'undefined' type.
 
 **Value:** `TypeWrapper<undefined>`
 
-### opt · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### opt · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Create an optional type wrapper (allows undefined).
 
@@ -956,7 +966,7 @@ const optionalString = E.opt(E.string);
 const optionalNumber = E.opt(E.number);
 ```
 
-### or · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### or · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Create a union type wrapper from multiple type choices.
 
@@ -979,7 +989,7 @@ const stringOrNumber = E.or(E.string, E.number);
 const status = E.or("active", "inactive", "pending");
 ```
 
-### array · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### array · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Create an array type wrapper with optional length constraints.
 
@@ -1003,7 +1013,7 @@ const stringArray = E.array(E.string);
 const boundedArray = E.array(E.number, {min: 1, max: 10});
 ```
 
-### set · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### set · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Create a Set type wrapper with optional length constraints.
 
@@ -1027,7 +1037,7 @@ const stringSet = E.set(E.string);
 const boundedSet = E.set(E.number, {min: 1, max: 10});
 ```
 
-### record · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### record · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Create a Record type wrapper for key-value objects with string or number keys.
 
@@ -1049,7 +1059,7 @@ Create a Record type wrapper for key-value objects with string or number keys.
 const scores = E.record(E.number);  // Record<string | number, number>
 ```
 
-### literal · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### literal · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Create a literal type wrapper for a constant value.
 
@@ -1072,11 +1082,11 @@ const statusType = E.literal("active");
 const countType = E.literal(42);
 ```
 
-### link · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### link · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 Create a link type wrapper for model relationships.
 
-**Signature:** `{ <const T extends new (...args: any[]) => Model<any>>(TargetModel: T): TypeWrapper<InstanceType<T>> & QueryArgCarrier<InstanceType<T> | LinkPrimaryKeyInput<LinkTargetPKArgs<T>>>; <const T extends new (...args: any[]) => Model<any>>(TargetModel: () => T): TypeWrapper<...>; }`
+**Signature:** `{ <const T extends new (...args: any[]) => Model<any>>(TargetModel: T): TypeWrapper<InstanceType<T>>; <const T extends new (...args: any[]) => Model<any>>(TargetModel: () => T): TypeWrapper<...>; }`
 
 **Type Parameters:**
 
@@ -1102,7 +1112,7 @@ const Book = E.defineModel("Book", class {
 }, { pk: "id" });
 ```
 
-### dump · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L252)
+### dump · [function](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L264)
 
 **Signature:** `() => void`
 
@@ -1147,7 +1157,7 @@ that slot.
     & (FETCH extends undefined ? { fetch?: undefined } : { fetch: FETCH })
 )`
 
-### IndexRangeIterator · [class](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L90)
+### IndexRangeIterator · [class](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L88)
 
 Iterator for range queries on indexes.
 Handles common iteration logic for both primary and unique indexes.
@@ -1157,15 +1167,15 @@ Extends built-in Iterator to provide map/filter/reduce/toArray/etc.
 
 - `ITEM`
 
-#### indexRangeIterator.[Symbol.iterator] · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L100)
+#### indexRangeIterator.[Symbol.iterator] · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L101)
 
 **Signature:** `() => this`
 
-#### indexRangeIterator.next · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L102)
+#### indexRangeIterator.next · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L101)
 
 **Signature:** `() => IteratorResult<ITEM, any>`
 
-#### indexRangeIterator.count · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L110)
+#### indexRangeIterator.count · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L111)
 
 **Signature:** `() => number`
 
@@ -1173,11 +1183,11 @@ Extends built-in Iterator to provide map/filter/reduce/toArray/etc.
 
 **Signature:** `() => ITEM`
 
-### Change · [type](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L93)
+### Change · [type](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L91)
 
 **Type:** `Record<any, any> | "created" | "deleted"`
 
-### FieldConfig · [interface](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L40)
+### FieldConfig · [interface](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L39)
 
 Configuration interface for model fields.
 
@@ -1185,7 +1195,7 @@ Configuration interface for model fields.
 
 - `T` - The field type.
 
-#### fieldConfig.type · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L45)
+#### fieldConfig.type · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L46)
 
 The type wrapper that defines how this field is serialized/validated.
 
@@ -1203,7 +1213,7 @@ Optional default value or function that generates default values.
 
 **Type:** `T | ((model: Record<string, any>) => T)`
 
-### TypeWrapper · [abstract class](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L36)
+### TypeWrapper · [abstract class](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L35)
 
 **Type Parameters:**
 
@@ -1215,7 +1225,7 @@ A string identifier for this type, used during serialization
 
 **Type:** `string`
 
-#### typeWrapper.serialize · [abstract method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L52)
+#### typeWrapper.serialize · [abstract method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L53)
 
 Serialize a value from an object property to a Pack.
 
@@ -1226,7 +1236,7 @@ Serialize a value from an object property to a Pack.
 - `value: T` - The value to serialize.
 - `pack: DataPack` - The Pack instance to write to.
 
-#### typeWrapper.deserialize · [abstract method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L59)
+#### typeWrapper.deserialize · [abstract method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L60)
 
 Deserialize a value from a Pack into an object property.
 
@@ -1236,7 +1246,7 @@ Deserialize a value from a Pack into an object property.
 
 - `pack: DataPack` - The Pack instance to read from.
 
-#### typeWrapper.getError · [abstract method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L66)
+#### typeWrapper.getError · [abstract method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L67)
 
 Validate a value.
 
@@ -1248,7 +1258,7 @@ Validate a value.
 
 **Returns:** - A DatabaseError if validation fails.
 
-#### typeWrapper.serializeType · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L68)
+#### typeWrapper.serializeType · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L69)
 
 Serialize type metadata to a Pack (for schema serialization).
 
@@ -1291,11 +1301,11 @@ Check if indexing should be skipped for this field value.
 - `value1: T`
 - `value2: T`
 
-#### typeWrapper.getLinkedModel · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L90)
+#### typeWrapper.getLinkedModel · [method](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L91)
 
 **Signature:** `() => AnyModelClass`
 
-### DatabaseError · [constant](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L182)
+### DatabaseError · [constant](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L181)
 
 The DatabaseError class is used to represent errors that occur during database operations.
 It extends the built-in Error class and has a machine readable error code string property.
@@ -1318,13 +1328,13 @@ convert old primary indices, rewrite row data, and clean up orphaned indices.
 
 ### MigrationOptions · [interface](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L13)
 
-#### migrationOptions.tables · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L18)
+#### migrationOptions.tables · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L19)
 
 Limit migration to specific table names.
 
 **Type:** `string[]`
 
-#### migrationOptions.populateSecondaries · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L22)
+#### migrationOptions.populateSecondaries · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L21)
 
 Populate secondary indexes for rows at old schema versions (default: true).
 
@@ -1336,27 +1346,27 @@ Convert old primary indices when primary key fields changed (default: true).
 
 **Type:** `boolean`
 
-#### migrationOptions.rewriteData · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L38)
+#### migrationOptions.rewriteData · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L37)
 
 Rewrite all row data to the latest schema version (default: false).
 
 **Type:** `boolean`
 
-#### migrationOptions.removeOrphans · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L45)
+#### migrationOptions.removeOrphans · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L44)
 
 Delete orphaned secondary/unique index entries (default: true).
 
 **Type:** `boolean`
 
-#### migrationOptions.onProgress · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L45)
+#### migrationOptions.onProgress · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L46)
 
 Progress callback.
 
 **Type:** `(info: ProgressInfo) => void`
 
-### MigrationResult · [interface](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L50)
+### MigrationResult · [interface](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L51)
 
-#### migrationResult.secondaries · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L52)
+#### migrationResult.secondaries · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L53)
 
 Per-table counts of secondary index entries populated.
 
@@ -1368,35 +1378,35 @@ Per-table counts of old primary rows migrated.
 
 **Type:** `Record<string, number>`
 
-#### migrationResult.conversionFailures · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L59)
+#### migrationResult.conversionFailures · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L60)
 
 Per-table conversion failure counts by reason.
 
 **Type:** `Record<string, Record<string, number>>`
 
-#### migrationResult.rewritten · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L63)
+#### migrationResult.rewritten · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L64)
 
 Per-table counts of rows rewritten to latest version.
 
 **Type:** `Record<string, number>`
 
-#### migrationResult.orphans · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L67)
+#### migrationResult.orphans · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L68)
 
 Number of orphaned index entries deleted.
 
 **Type:** `number`
 
-### Transaction · [interface](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L54)
+### Transaction · [interface](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L55)
 
-#### transaction.id · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L55)
+#### transaction.id · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L56)
 
 **Type:** `number`
 
-#### transaction.instances · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L56)
+#### transaction.instances · [member](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L57)
 
-**Type:** `Map<number, ModelBase>`
+**Type:** `Map<number, ModelBase<ModelLookup<readonly any[]>>>`
 
-### txnStorage · [constant](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L59)
+### txnStorage · [constant](https://github.com/vanviegen/edinburgh/blob/main/src/edinburgh.ts#L60)
 
 **Value:** `AsyncLocalStorage<Transaction>`
 

package/build/src/edinburgh.d.ts

@@ -1,5 +1,5 @@
 import { AsyncLocalStorage } from "node:async_hooks";
-export { Model, type ModelClass, type AnyModelClass, type ModelBase, defineModel, deleteEverything, field, } from "./models.js";
+export { Model, type ModelClass, type AnyModelClass, type ModelBase, type ModelLookup, defineModel, deleteEverything, field, } from "./models.js";
 import type { Change, Model } from "./models.js";
 export { string, orderedString, number, dateTime, boolean, identifier, undef, opt, or, array, set, record, literal, link, } from "./types.js";
 export { dump, } from "./indexes.js";
@@ -85,7 +85,7 @@ export declare function setMaxRetryCount(count: number): void;
  *   - A sequential number. Higher numbers have been committed after lower numbers.
  *   - A map of model instances to their changes. The change can be "created", "deleted", or an object containing the old values.
  *
- * The callback is called within a new transaction context, allowing lazy-loads to happen. However, any
- * changes made to Edinburgh models will not be saved.
+ * The callback is called within a new transaction context at or after the committed state, so lazy-loads
+ * and additional writes are allowed.
  */
 export declare function setOnSaveCallback(callback: ((commitId: number, items: Map<Model<unknown>, Change>) => void) | undefined): void;

package/build/src/edinburgh.js

@@ -111,6 +111,7 @@ export async function transact(fn) {
         const txnId = lowlevel.startTransaction();
         const txn = { id: txnId, instances: new Map() };
         const onSaveItems = onSaveCallback ? new Map() : undefined;
+        let retry = false;
         let result;
         try {
             await txnStorage.run(txn, async function () {
@@ -131,6 +132,29 @@ export async function transact(fn) {
                         onSaveItems.set(instance, change);
                     }
                 }
+                if (onSaveItems?.size) {
+                    // Perform writes, and start a new transaction at or past the point-in-time of our commit
+                    const commitResult = lowlevel.commitTransaction(txnId, true);
+                    if (typeof commitResult === 'object') {
+                        const commitSeq = await commitResult;
+                        if (commitSeq <= 0) {
+                            try {
+                                lowlevel.abortTransaction(txnId);
+                            }
+                            catch { }
+                            retry = true;
+                            return;
+                        }
+                        // Run the callback within our renewed transaction context, so it can fetch linked lazy fields if needed
+                        try {
+                            onSaveCallback(commitSeq, onSaveItems);
+                        }
+                        catch (e) {
+                            throw e;
+                        }
+                    }
+                    // else: only reads
+                }
             });
         }
         catch (e) {
@@ -140,18 +164,8 @@ export async function transact(fn) {
             catch { }
             throw e;
         }
-        if (onSaveItems?.size) {
-            // Perform writes, and start a new transaction at or past the point-in-time of our commit
-            const commitResult = lowlevel.commitTransaction(txnId, true);
-            if (typeof commitResult === 'object') {
-                const commitSeq = await commitResult;
-                if (commitSeq <= 0)
-                    continue; // Race condition - retry
-                // Run the callback within our new transaction context, so it can fetch linked lazy fields if needed
-                onSaveCallback(commitSeq, onSaveItems);
-            }
-            // else: only reads
-        }
+        if (retry)
+            continue;
         // Make the instances read-only to make it clear that their transaction has ended.
         for (const instance of txn.instances.values()) {
             delete instance._oldValues;
@@ -192,8 +206,8 @@ let onSaveCallback;
  *   - A sequential number. Higher numbers have been committed after lower numbers.
  *   - A map of model instances to their changes. The change can be "created", "deleted", or an object containing the old values.
  *
- * The callback is called within a new transaction context, allowing lazy-loads to happen. However, any
- * changes made to Edinburgh models will not be saved.
+ * The callback is called within a new transaction context at or after the committed state, so lazy-loads
+ * and additional writes are allowed.
  */
 export function setOnSaveCallback(callback) {
     onSaveCallback = callback;