edinburgh 0.1.3 → 0.3.0

package/build/src/edinburgh.d.ts

@@ -1,6 +1,8 @@
-export { Model, registerModel, field, setOnSaveCallback } from "./models.js";
-export { string, number, boolean, identifier, undef, opt, or, array, literal, link, } from "./types.js";
+export { Model, registerModel, field, } from "./models.js";
+import type { ChangedModel } from "./models.js";
+export { string, orderedString, number, dateTime, boolean, identifier, undef, opt, or, array, literal, link, } from "./types.js";
 export { index, primary, unique, dump, } from "./indexes.js";
+export { setLogLevel } from "./utils.js";
 export { BaseIndex, UniqueIndex, PrimaryIndex } from './indexes.js';
 export { init, onCommit, onRevert, getTransactionData, setTransactionData, DatabaseError } from "olmdb";
 /**
@@ -26,7 +28,7 @@ export { init, onCommit, onRevert, getTransactionData, setTransactionData, Datab
 * @example
 * ```typescript
 * const paid = await E.transact(() => {
-*   const user = User.load("john_doe");
+*   const user = User.pk.get("john_doe");
 *   // This is concurrency-safe - the function will rerun if it is raced by another transaction
 *   if (user.credits > 0) {
 *     user.credits--;
@@ -44,4 +46,14 @@ export { init, onCommit, onRevert, getTransactionData, setTransactionData, Datab
 * ```
 */
 export declare function transact<T>(fn: () => T): Promise<T>;
+/**
+ * Set a callback function to be called after a model is saved and committed.
+ *
+ * @param callback The callback function to set. It gets called after each successful
+ * `transact()` commit that has changes, with the following arguments:
+ *   - A sequential number. Higher numbers have been committed after lower numbers.
+ *   - An array of model instances that have been modified, created, or deleted.
+ *     You can used its {@link Model.changed} property to figure out what changed.
+ */
+export declare function setOnSaveCallback(callback: ((commitId: number, items: ChangedModel[]) => void) | undefined): void;
 export declare function deleteEverything(): Promise<void>;

package/build/src/edinburgh.js

@@ -1,15 +1,17 @@
 import * as olmdb from "olmdb";
-import { MODIFIED_INSTANCES_SYMBOL, resetModelCaches } from "./models.js";
+import { INSTANCES_SYMBOL, resetModelCaches } from "./models.js";
+import { INSTANCES_BY_PK_SYMBOL } from "./indexes.js";
 // Re-export public API from models
-export { Model, registerModel, field, setOnSaveCallback } from "./models.js";
+export { Model, registerModel, field, } from "./models.js";
 // Re-export public API from types (only factory functions and instances)
 export { 
 // Pre-defined type instances
-string, number, boolean, identifier, undef, 
+string, orderedString, number, dateTime, boolean, identifier, undef, 
 // Type factory functions
 opt, or, array, literal, link, } from "./types.js";
 // Re-export public API from indexes
 export { index, primary, unique, dump, } from "./indexes.js";
+export { setLogLevel } from "./utils.js";
 export { BaseIndex, UniqueIndex, PrimaryIndex } from './indexes.js';
 // Re-export from OLMDB
 export { init, onCommit, onRevert, getTransactionData, setTransactionData, DatabaseError } from "olmdb";
@@ -36,7 +38,7 @@ export { init, onCommit, onRevert, getTransactionData, setTransactionData, Datab
 * @example
 * ```typescript
 * const paid = await E.transact(() => {
-*   const user = User.load("john_doe");
+*   const user = User.pk.get("john_doe");
 *   // This is concurrency-safe - the function will rerun if it is raced by another transaction
 *   if (user.credits > 0) {
 *     user.credits--;
@@ -53,34 +55,66 @@ export { init, onCommit, onRevert, getTransactionData, setTransactionData, Datab
 * });
 * ```
 */
-export function transact(fn) {
-    return olmdb.transact(() => {
-        const modifiedInstances = new Set();
-        olmdb.setTransactionData(MODIFIED_INSTANCES_SYMBOL, modifiedInstances);
-        const savedInstances = new Set();
-        try {
-            const result = fn();
-            // Save all modified instances before committing.
-            while (modifiedInstances.size > 0) {
-                // Back referencing can cause models to be scheduled for save() a second time,
-                // which is why we require the outer loop.
-                for (const instance of modifiedInstances) {
-                    instance._save();
-                    savedInstances.add(instance);
-                    modifiedInstances.delete(instance);
+export async function transact(fn) {
+    try {
+        const onSaveQueue = onSaveCallback ? [] : undefined;
+        return await olmdb.transact(async () => {
+            const instances = new Set();
+            olmdb.setTransactionData(INSTANCES_SYMBOL, instances);
+            olmdb.setTransactionData(INSTANCES_BY_PK_SYMBOL, new Map());
+            const savedInstances = new Set();
+            try {
+                const result = await fn();
+                // Save all modified instances before committing.
+                while (instances.size > 0) {
+                    // Back referencing can cause models to be scheduled for save() a second time,
+                    // which is why we require the outer loop.
+                    for (const instance of instances) {
+                        instance._onCommit(onSaveQueue);
+                        savedInstances.add(instance);
+                        instances.delete(instance);
+                    }
                 }
+                if (onSaveQueue?.length) {
+                    olmdb.onCommit((commitId) => {
+                        if (onSaveCallback)
+                            onSaveCallback(commitId, onSaveQueue);
+                    });
+                }
+                return result;
             }
-            return result;
-        }
-        catch (error) {
-            // Discard changes on all saved and still unsaved instances
-            for (const instance of savedInstances)
-                instance.preventPersist();
-            for (const instance of modifiedInstances)
-                instance.preventPersist();
-            throw error;
-        }
-    });
+            catch (error) {
+                // Discard changes on all saved and still unsaved instances
+                for (const instance of savedInstances)
+                    instance.preventPersist();
+                for (const instance of instances)
+                    instance.preventPersist();
+                throw error;
+            }
+        });
+    }
+    catch (e) {
+        // This hackery is required to provide useful stack traces. Without this,
+        // both Bun and Node (even with --async-stack-traces) don't show which
+        // line called the transact(), which is pretty important info when validation
+        // fails, for instance. Though the line numbers in Bun still don't really
+        // make sense. Probably this bug: https://github.com/oven-sh/bun/issues/15859
+        e.stack += "\nat async:\n" + new Error().stack?.replace(/^.*?\n/, '');
+        throw e;
+    }
+}
+let onSaveCallback;
+/**
+ * Set a callback function to be called after a model is saved and committed.
+ *
+ * @param callback The callback function to set. It gets called after each successful
+ * `transact()` commit that has changes, with the following arguments:
+ *   - A sequential number. Higher numbers have been committed after lower numbers.
+ *   - An array of model instances that have been modified, created, or deleted.
+ *     You can used its {@link Model.changed} property to figure out what changed.
+ */
+export function setOnSaveCallback(callback) {
+    onSaveCallback = callback;
 }
 export async function deleteEverything() {
     await olmdb.transact(() => {

package/build/src/edinburgh.js.map

@@ -1 +1 @@
-{"version":3,"file":"edinburgh.js","sourceRoot":"","sources":["../../src/edinburgh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAS,yBAAyB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEjF,mCAAmC;AACnC,OAAO,EACH,KAAK,EACL,aAAa,EACb,KAAK,EACL,iBAAiB,EACpB,MAAM,aAAa,CAAC;AAGrB,yEAAyE;AACzE,OAAO;AACH,6BAA6B;AAC7B,MAAM,EACN,MAAM,EACN,OAAO,EACP,UAAU,EACV,KAAK;AACL,yBAAyB;AACzB,GAAG,EACH,EAAE,EACF,KAAK,EACL,OAAO,EACP,IAAI,GACP,MAAM,YAAY,CAAC;AAEpB,oCAAoC;AACpC,OAAO,EACH,KAAK,EACL,OAAO,EACP,MAAM,EACN,IAAI,GACP,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEpE,uBAAuB;AACvB,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAGxG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuCE;AACF,MAAM,UAAU,QAAQ,CAAI,EAAW;IACnC,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;QACvB,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAc,CAAC;QAChD,KAAK,CAAC,kBAAkB,CAAC,yBAAyB,EAAE,iBAAiB,CAAC,CAAC;QAEvE,MAAM,cAAc,GAAoB,IAAI,GAAG,EAAE,CAAC;QAClD,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,EAAE,EAAE,CAAC;YACpB,iDAAiD;YACjD,OAAM,iBAAiB,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;gBAC/B,8EAA8E;gBAC9E,0CAA0C;gBAC1C,KAAK,MAAM,QAAQ,IAAI,iBAAiB,EAAE,CAAC;oBACvC,QAAQ,CAAC,KAAK,EAAE,CAAC;oBACjB,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;oBAC7B,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACvC,CAAC;YACL,CAAC;YAED,OAAO,MAAM,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,2DAA2D;YAC3D,KAAK,MAAM,QAAQ,IAAI,cAAc;gBAAE,QAAQ,CAAC,cAAc,EAAE,CAAC;YACjE,KAAK,MAAM,QAAQ,IAAI,iBAAiB;gBAAE,QAAQ,CAAC,cAAc,EAAE,CAAC;YACpE,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB;IAClC,MAAM,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;QACtB,KAAK,MAAM,EAAC,GAAG,EAAC,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YAC/B,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC;IACL,CAAC,CAAC,CAAC;IACH,MAAM,gBAAgB,EAAE,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"edinburgh.js","sourceRoot":"","sources":["../../src/edinburgh.ts"],"names":[],"mappings":"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"}

package/build/src/indexes.d.ts

@@ -1,8 +1,7 @@
 import * as olmdb from "olmdb";
-import { Bytes } from "./bytes.js";
+import { DataPack } from "./datapack.js";
 import { Model } from "./models.js";
-/** @internal Symbol used to access the underlying model from a proxy */
-export declare const TARGET_SYMBOL: unique symbol;
+import { TypeWrapper } from "./types.js";
 type IndexArgTypes<M extends typeof Model<any>, F extends readonly (keyof InstanceType<M> & string)[]> = {
     [I in keyof F]: InstanceType<M>[F[I]];
 };
@@ -11,11 +10,11 @@ type IndexArgTypes<M extends typeof Model<any>, F extends readonly (keyof Instan
  * Handles common iteration logic for both primary and unique indexes.
  * Implements both Iterator and Iterable interfaces for efficiency.
  */
-declare class IndexRangeIterator<M extends typeof Model, F extends readonly (keyof InstanceType<M> & string)[]> implements Iterator<InstanceType<M>>, Iterable<InstanceType<M>> {
+export declare class IndexRangeIterator<M extends typeof Model> implements Iterator<InstanceType<M>>, Iterable<InstanceType<M>> {
     private iterator;
     private indexId;
     private parentIndex;
-    constructor(iterator: olmdb.DbIterator<any, any> | undefined, indexId: number, parentIndex: BaseIndex<M, F>);
+    constructor(iterator: olmdb.DbIterator<any, any> | undefined, indexId: number, parentIndex: BaseIndex<M, any>);
     [Symbol.iterator](): Iterator<InstanceType<M>>;
     next(): IteratorResult<InstanceType<M>>;
     count(): number;
@@ -35,6 +34,7 @@ type FindOptions<ARG_TYPES extends readonly any[]> = (({
 } | {}))) & {
     reverse?: boolean;
 });
+export declare function testArraysEqual(array1: Uint8Array, array2: Uint8Array): boolean;
 /**
  * Base class for database indexes for efficient lookups on model fields.
  *
@@ -46,72 +46,42 @@ type FindOptions<ARG_TYPES extends readonly any[]> = (({
 export declare abstract class BaseIndex<M extends typeof Model, const F extends readonly (keyof InstanceType<M> & string)[]> {
     _fieldNames: F;
     _MyModel: M;
+    _fieldTypes: Map<keyof InstanceType<M> & string, TypeWrapper<any>>;
+    _fieldCount: number;
     /**
      * Create a new index.
      * @param MyModel - The model class this index belongs to.
      * @param _fieldNames - Array of field names that make up this index.
      */
-    constructor(MyModel: M, _fieldNames: F, isPrimary?: boolean);
+    constructor(MyModel: M, _fieldNames: F);
+    _delayedInit(): boolean;
     _cachedIndexId?: number;
     /**
-     * Deserialize index key bytes back to field values.
-     * @param bytes - Bytes to read from.
-     * @returns Array of field values.
+     * Serialize array of key values to a (index-id prefixed) Bytes instance that can be used as a key.
+     * @param args - Field values to serialize (can be partial for range queries).
+     * @returns A Bytes instance containing the index id and serialized key parts.
+     * @internal
      */
-    _deserializeKey(bytes: Bytes): IndexArgTypes<M, F>;
+    _argsToKeyBytes(args: [], allowPartial: boolean): DataPack;
+    _argsToKeyBytes(args: Partial<IndexArgTypes<M, F>>, allowPartial: boolean): DataPack;
+    _argsToKeySingleton(args: IndexArgTypes<M, F>): Uint8Array;
     /**
      * Extract model from iterator entry - implemented differently by each index type.
      * @param keyBytes - Key bytes with index ID already read.
-     * @param valueBytes - Value bytes from the entry.
+     * @param valueBuffer - Value Uint8Array from the entry.
      * @returns Model instance or undefined.
      * @internal
      */
-    abstract _getModelFromEntry(keyBytes: Bytes, valueBytes: Bytes): InstanceType<M> | undefined;
-    /**
-     * Serialize field values to bytes for index key.
-     * @param args - Field values to serialize (can be partial for range queries).
-     * @param bytes - Bytes to write to.
-     * @internal
-     */
-    _serializeArgs(args: Partial<IndexArgTypes<M, F>> | readonly any[], bytes: Bytes): void;
-    /**
-     * Create database key from field values.
-     * @param args - Field values.
-     * @returns Database key bytes.
-     */
-    _getKeyFromArgs(args: IndexArgTypes<M, F>): Uint8Array;
-    /**
-     * Serialize model fields to bytes for index key.
-     * @param model - Model instance.
-     * @param bytes - Bytes to write to.
-     */
-    _serializeModel(model: InstanceType<M>, bytes: Bytes): void;
-    /**
-     * Create database key from model instance.
-     * @param model - Model instance.
-     * @param includeIndexId - Whether to include index ID in key.
-     * @returns Database key bytes or undefined if skipped.
-     * @internal
-     */
-    _getKeyFromModel(model: InstanceType<M>, includeIndexId: boolean): Uint8Array;
-    /**
-     * Extract field values from model for this index.
-     * @param model - Model instance.
-     * @returns Field values or undefined if should be skipped.
-     * @internal
-     */
-    _modelToArgs(model: InstanceType<M>): IndexArgTypes<M, F> | undefined;
+    abstract _pairToInstance(keyBytes: DataPack, valueBuffer: Uint8Array): InstanceType<M> | undefined;
+    _hasNullIndexValues(model: InstanceType<M>): boolean;
+    _instanceToKeyBytes(model: InstanceType<M>): DataPack;
     /**
      * Get or create unique index ID for this index.
      * @returns Numeric index ID.
      */
     _getIndexId(): number;
-    /**
-     * Check if indexing should be skipped for a model instance.
-     * @param model - Model instance.
-     * @returns true if indexing should be skipped.
-     */
-    _checkSkip(model: InstanceType<M>): boolean;
+    abstract _delete(model: InstanceType<M>): void;
+    abstract _write(model: InstanceType<M>): void;
     /**
      * Find model instances using flexible range query options.
      *
@@ -170,15 +140,12 @@ export declare abstract class BaseIndex<M extends typeof Model, const F extends
      * }
      * ```
      */
-    find(opts?: FindOptions<IndexArgTypes<M, F>>): IndexRangeIterator<M, F>;
-    /**
-     * Save index entry for a model instance.
-     * @param model - Model instance to save.
-     * @param originalKey - Original key if updating.
-     */
-    abstract _save(model: InstanceType<M>, originalKey?: Uint8Array): Uint8Array | undefined;
+    find(opts?: FindOptions<IndexArgTypes<M, F>>): IndexRangeIterator<M>;
     abstract _getTypeName(): string;
+    toString(): string;
 }
+/** @internal Symbol used to attach modified instances, keyed by singleton primary key, to a transaction */
+export declare const INSTANCES_BY_PK_SYMBOL: unique symbol;
 /**
  * Primary index that stores the actual model data.
  *
@@ -186,7 +153,11 @@ export declare abstract class BaseIndex<M extends typeof Model, const F extends
  * @template F - The field names that make up this index.
  */
 export declare class PrimaryIndex<M extends typeof Model, const F extends readonly (keyof InstanceType<M> & string)[]> extends BaseIndex<M, F> {
+    _nonKeyFields: (keyof InstanceType<M> & string)[];
+    _lazyDescriptors: Record<string | symbol | number, PropertyDescriptor>;
+    _resetDescriptors: Record<string | symbol | number, PropertyDescriptor>;
     constructor(MyModel: M, fieldNames: F);
+    _delayedInit(): boolean;
     /**
      * Get a model instance by primary key values.
      * @param args - The primary key values.
@@ -197,22 +168,29 @@ export declare class PrimaryIndex<M extends typeof Model, const F extends readon
      * const user = User.pk.get("john_doe");
      * ```
      */
-    get(...args: IndexArgTypes<M, F>): InstanceType<M> | undefined;
+    get(...args: IndexArgTypes<M, F> | [Uint8Array]): InstanceType<M> | undefined;
     /**
-     * Extract model from iterator entry for primary index.
-     * @param keyBytes - Key bytes with index ID already read.
-     * @param valueBytes - Value bytes from the entry.
-     * @returns Model instance or undefined.
-     * @internal
+     * Does the same as as `get()`, but will delay loading the instance from disk until the first
+     * property access. In case it turns out the instance doesn't exist, an error will be thrown
+     * at that time.
+     * @param args Primary key field values. (Or a single Uint8Array containing the key.)
+     * @returns The (lazily loaded) model instance.
      */
-    _getModelFromEntry(keyBytes: Bytes, valueBytes: Bytes): InstanceType<M> | undefined;
+    getLazy(...args: IndexArgTypes<M, F> | [Uint8Array]): InstanceType<M>;
+    _get(args: IndexArgTypes<M, F> | [Uint8Array], lazy: true): InstanceType<M>;
+    _get(args: IndexArgTypes<M, F> | [Uint8Array], lazy: false): InstanceType<M> | undefined;
     /**
-     * Save primary index entry.
-     * @param model - Model instance.
-     * @param originalKey - Original key if updating.
+     * Create a canonical primary key buffer for the given model instance.
+     * Returns a singleton Uint8Array for stable Map/Set identity usage.
      */
-    _save(model: InstanceType<M>, originalKey?: Uint8Array): Uint8Array;
+    _instanceToKeySingleton(model: InstanceType<M>): Uint8Array;
+    _lazyNow(model: InstanceType<M>): void;
+    _setNonKeyValues(model: InstanceType<M>, valueBytes: DataPack): void;
+    _keyToArray(key: Uint8Array): IndexArgTypes<M, F>;
+    _pairToInstance(keyBytes: DataPack, valueBuffer: Uint8Array): InstanceType<M> | undefined;
     _getTypeName(): string;
+    _write(model: InstanceType<M>): void;
+    _delete(model: InstanceType<M>): void;
 }
 /**
  * Unique index that stores references to the primary key.
@@ -221,6 +199,7 @@ export declare class PrimaryIndex<M extends typeof Model, const F extends readon
  * @template F - The field names that make up this index.
  */
 export declare class UniqueIndex<M extends typeof Model, const F extends readonly (keyof InstanceType<M> & string)[]> extends BaseIndex<M, F> {
+    constructor(MyModel: M, fieldNames: F);
     /**
      * Get a model instance by unique index key values.
      * @param args - The unique index key values.
@@ -232,6 +211,8 @@ export declare class UniqueIndex<M extends typeof Model, const F extends readonl
      * ```
      */
     get(...args: IndexArgTypes<M, F>): InstanceType<M> | undefined;
+    _delete(model: InstanceType<M>): void;
+    _write(model: InstanceType<M>): void;
     /**
      * Extract model from iterator entry for unique index.
      * @param keyBytes - Key bytes with index ID already read.
@@ -239,13 +220,7 @@ export declare class UniqueIndex<M extends typeof Model, const F extends readonl
      * @returns Model instance or undefined.
      * @internal
      */
-    _getModelFromEntry(keyBytes: Bytes, valueBytes: Bytes): InstanceType<M> | undefined;
-    /**
-     * Save unique index entry.
-     * @param model - Model instance.
-     * @param originalKey - Original key if updating.
-     */
-    _save(model: InstanceType<M>, originalKey?: Uint8Array): Uint8Array | undefined;
+    _pairToInstance(keyBytes: DataPack, valueBuffer: Uint8Array): InstanceType<M> | undefined;
     _getTypeName(): string;
 }
 /**
@@ -255,26 +230,18 @@ export declare class UniqueIndex<M extends typeof Model, const F extends readonl
  * @template F - The field names that make up this index.
  */
 export declare class SecondaryIndex<M extends typeof Model, const F extends readonly (keyof InstanceType<M> & string)[]> extends BaseIndex<M, F> {
-    /**
-     * Save secondary index entry.
-     * @param model - Model instance.
-     * @param originalKey - Original key if updating.
-     */
-    _save(model: InstanceType<M>, originalKey?: Uint8Array): Uint8Array | undefined;
+    constructor(MyModel: M, fieldNames: F);
     /**
      * Extract model from iterator entry for secondary index.
      * @param keyBytes - Key bytes with index ID already read.
-     * @param valueBytes - Value bytes from the entry.
+     * @param valueBuffer - Value Uint8Array from the entry.
      * @returns Model instance or undefined.
      * @internal
      */
-    _getModelFromEntry(keyBytes: Bytes, valueBytes: Bytes): InstanceType<M> | undefined;
-    /**
-     * Create secondary index key that includes both index fields and primary key.
-     * @param model - Model instance.
-     * @returns Database key bytes or undefined if skipped.
-     */
-    _getKeyFromModel(model: InstanceType<M>, includeIndexId: boolean): Uint8Array;
+    _pairToInstance(keyBytes: DataPack, valueBuffer: Uint8Array): InstanceType<M> | undefined;
+    _instanceToKeyBytes(model: InstanceType<M>): DataPack;
+    _write(model: InstanceType<M>): void;
+    _delete(model: InstanceType<M>): void;
     _getTypeName(): string;
 }
 export type Index<M extends typeof Model, F extends readonly (keyof InstanceType<M> & string)[]> = PrimaryIndex<M, F> | UniqueIndex<M, F> | SecondaryIndex<M, F>;