edinburgh 0.4.6 → 0.5.0

package/build/src/migrate.js

@@ -1,7 +1,7 @@
 import * as lowlevel from "olmdb/lowlevel";
 import DataPack from "./datapack.js";
 import { modelRegistry, currentTxn } from "./models.js";
-import { dbDel, toBuffer, bytesEqual } from "./utils.js";
+import { dbDel, toBuffer } from "./utils.js";
 import { deserializeType } from "./types.js";
 import { transact } from "./edinburgh.js";
 const INDEX_ID_PREFIX = -2;
@@ -73,13 +73,12 @@ export async function runMigration(options = {}) {
     };
     // Build maps of known index IDs
     const knownIndexIds = new Set();
-    const primaryByIndexId = new Map();
+    const modelByPkIndexId = new Map();
     for (const model of Object.values(modelRegistry)) {
         if (options.tables && !options.tables.includes(model.tableName))
             continue;
-        const primary = model._primary;
-        knownIndexIds.add(primary._indexId);
-        primaryByIndexId.set(primary._indexId, { model, primary });
+        knownIndexIds.add(model._indexId);
+        modelByPkIndexId.set(model._indexId, model);
         for (const sec of model._secondaries || []) {
             knownIndexIds.add(sec._indexId);
         }
@@ -110,7 +109,7 @@ export async function runMigration(options = {}) {
     });
     // Phase 1: Populate secondary indexes and/or rewrite row data
     if (populateSecondaries || rewriteData) {
-        for (const [indexId, { model, primary }] of primaryByIndexId) {
+        for (const [indexId, model] of modelByPkIndexId) {
             let secondaryCount = 0;
             let rewrittenCount = 0;
             const migrateFn = model.migrate;
@@ -118,14 +117,14 @@ export async function runMigration(options = {}) {
             await forEachRow(indexId, (txn, keyBuf, valueBuf) => {
                 const valuePack = new DataPack(valueBuf);
                 const version = valuePack.readNumber();
-                if (version === primary._currentVersion)
+                if (version === model._currentVersion)
                     return; // Already current
-                const versionInfo = primary._loadVersionInfo(txn.id, version);
+                const versionInfo = model._loadVersionInfo(txn.id, version);
                 // Deserialize pre-migrate values from key + old-format value
                 const record = {};
                 const keyPack = new DataPack(keyBuf);
                 keyPack.readNumber(); // skip indexId
-                for (const [name, type] of primary._fieldTypes.entries()) {
+                for (const [name, type] of model._pkFieldTypes.entries()) {
                     record[name] = type.deserialize(keyPack);
                 }
                 for (const [name, type] of versionInfo.nonKeyFields.entries()) {
@@ -144,33 +143,14 @@ export async function runMigration(options = {}) {
                             secondaryCount++;
                         }
                         else if (preMigrate) {
-                            if (sec._computeFn) {
-                                // Computed indexes: compare serialized keys to avoid unnecessary re-indexing
-                                const oldKeyBytes = sec._serializeKeyFields(preMigrate).toUint8Array();
-                                const newKeyBytes = sec._serializeKeyFields(record).toUint8Array();
-                                if (!bytesEqual(oldKeyBytes, newKeyBytes)) {
-                                    sec._delete(txn, keyBuf, preMigrate);
-                                    sec._write(txn, keyBuf, record);
-                                    secondaryCount++;
-                                }
-                            }
-                            else {
-                                // Existing secondary, update if migrate changed any of its fields
-                                for (const [field, type] of sec._fieldTypes.entries()) {
-                                    if (!type.equals(preMigrate[field], record[field])) {
-                                        sec._delete(txn, keyBuf, preMigrate);
-                                        sec._write(txn, keyBuf, record);
-                                        secondaryCount++;
-                                        break;
-                                    }
-                                }
-                            }
+                            if (sec._update(txn, keyBuf, record, preMigrate))
+                                secondaryCount++;
                         }
                     }
                 }
                 // Rewrite primary row data to current version
                 if (rewriteData) {
-                    primary._write(txn, keyBuf, record);
+                    model._writePrimary(txn, keyBuf, record);
                     rewrittenCount++;
                 }
             });

package/build/src/migrate.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../src/migrate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../src/migrate.ts"],"names":[],"mappings":"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"}

package/build/src/models.d.ts

@@ -12,7 +12,7 @@ export interface Transaction {
     instances: Set<Model<unknown>>;
     instancesByPk: Map<number, Model<unknown>>;
 }
-import { BaseIndex as BaseIndex, PrimaryIndex, IndexRangeIterator } from "./indexes.js";
+import { NonPrimaryIndex, PrimaryIndex, IndexRangeIterator, UniqueIndex, SecondaryIndex, FindOptions } from "./indexes.js";
 /**
  * Configuration interface for model fields.
  * @template T - The field type.
@@ -39,34 +39,63 @@ export interface FieldConfig<T> {
  *
  * @example
  * ```typescript
- * class User extends E.Model<User> {
+ * const User = E.defineModel(class {
  *   name = E.field(E.string, {description: "User's full name"});
  *   age = E.field(E.opt(E.number), {description: "User's age", default: 25});
- * }
+ * });
  * ```
  */
 export declare function field<T>(type: TypeWrapper<T>, options?: Partial<FieldConfig<T>>): T;
 export declare const modelRegistry: Record<string, typeof Model>;
 export type Change = Record<any, any> | "created" | "deleted";
+type FieldsOf<T> = T extends new () => infer I ? I : never;
+type ModelInstance<FIELDS> = FIELDS & Model<FIELDS>;
+type PKArgs<FIELDS, PK> = PK extends readonly (keyof FIELDS & string)[] ? {
+    [I in keyof PK]: PK[I] extends keyof FIELDS ? FIELDS[PK[I]] : never;
+} : PK extends keyof FIELDS & string ? [FIELDS[PK]] : [string];
+type UniqueFor<SPEC> = SPEC extends readonly string[] ? UniqueIndex<any, SPEC> : SPEC extends string ? UniqueIndex<any, [SPEC]> : SPEC extends (instance: any) => infer R ? R extends (infer V)[] ? UniqueIndex<any, [], [V]> : UniqueIndex<any, [], [R]> : never;
+type SecondaryFor<SPEC> = SPEC extends readonly string[] ? SecondaryIndex<any, SPEC> : SPEC extends string ? SecondaryIndex<any, [SPEC]> : SPEC extends (instance: any) => infer R ? R extends (infer V)[] ? SecondaryIndex<any, [], [V]> : SecondaryIndex<any, [], [R]> : never;
+type RegisteredModel<FIELDS, PKA extends readonly any[], UNIQUE, INDEX> = {
+    new (initial?: Partial<FIELDS>): ModelInstance<FIELDS>;
+    tableName: string;
+    fields: Record<string | symbol | number, FieldConfig<unknown>>;
+    get(...args: PKA): ModelInstance<FIELDS> | undefined;
+    getLazy(...args: PKA): ModelInstance<FIELDS>;
+    find(opts: FindOptions<PKA, 'first'>): ModelInstance<FIELDS> | undefined;
+    find(opts: FindOptions<PKA, 'single'>): ModelInstance<FIELDS>;
+    find(opts?: FindOptions<PKA>): IndexRangeIterator<any>;
+    batchProcess(opts?: FindOptions<PKA> & {
+        limitSeconds?: number;
+        limitRows?: number;
+    }, callback?: (row: ModelInstance<FIELDS>) => any): Promise<void>;
+    replaceInto(obj: Partial<FIELDS>): ModelInstance<FIELDS>;
+} & {
+    [K in keyof UNIQUE]: UniqueFor<UNIQUE[K]>;
+} & {
+    [K in keyof INDEX]: SecondaryFor<INDEX[K]>;
+};
 /**
  * Register a model class with the Edinburgh ORM system.
  *
- * @template T - The model class type.
- * @param MyModel - The model class to register.
- * @returns The enhanced model class with ORM capabilities.
+ * Converts a plain class into a fully-featured model with database persistence,
+ * typed fields, primary key access, and optional secondary and unique indexes.
  *
- * @example
- * ```typescript
- * ⁣@E.registerModel
- * class User extends E.Model<User> {
- *   static pk = E.index(User, ["id"], "primary");
- *   id = E.field(E.identifier);
- *   name = E.field(E.string);
- * }
- * ```
+ * @param cls - A plain class whose properties use E.field().
+ * @param opts - Registration options.
+ * @param opts.pk - Primary key field name or array of field names.
+ * @param opts.unique - Named unique index specifications (field name, field array, or compute function).
+ * @param opts.index - Named secondary index specifications (field name, field array, or compute function).
+ * @param opts.tableName - Explicit database table name.
+ * @param opts.override - Replace a previous model with the same table name.
+ * @returns The enhanced model constructor.
  */
-export declare function registerModel<T extends typeof Model<unknown>>(MyModel: T): T;
-export declare function getMockModel<T extends typeof Model<unknown>>(OrgModel: T): T;
+export declare function defineModel<T extends new () => any, const PK extends (keyof FieldsOf<T> & string) | readonly (keyof FieldsOf<T> & string)[], const UNIQUE extends Record<string, (keyof FieldsOf<T> & string) | readonly (keyof FieldsOf<T> & string)[] | ((instance: any) => any)>, const INDEX extends Record<string, (keyof FieldsOf<T> & string) | readonly (keyof FieldsOf<T> & string)[] | ((instance: any) => any)>>(cls: T, opts?: {
+    pk?: PK;
+    unique?: UNIQUE;
+    index?: INDEX;
+    tableName?: string;
+    override?: boolean;
+}): RegisteredModel<FieldsOf<T>, PKArgs<FieldsOf<T>, PK>, UNIQUE, INDEX>;
 /**
  * Model interface that ensures proper typing for the constructor property.
  * @template SUB - The concrete model subclass.
@@ -78,8 +107,8 @@ export interface Model<SUB> {
  * Base class for all database models in the Edinburgh ORM.
  *
  * Models represent database entities with typed fields, automatic serialization,
- * change tracking, and relationship management. All model classes should extend
- * this base class and be decorated with `@E.registerModel`.
+ * change tracking, and relationship management. Model classes are created using
+ * `E.defineModel()`.
  *
  * ### Schema Evolution
  *
@@ -115,28 +144,31 @@ export interface Model<SUB> {
  *
  * @example
  * ```typescript
- * ⁣@E.registerModel
- * class User extends E.Model<User> {
- *   static pk = E.primary(User, "id");
- *
+ * const User = E.defineModel(class {
  *   id = E.field(E.identifier);
  *   name = E.field(E.string);
  *   email = E.field(E.string);
- *
- *   static byEmail = E.unique(User, "email");
- * }
+ * }, {
+ *   pk: "id",
+ *   unique: { byEmail: "email" },
+ * });
  * ```
  */
 export declare abstract class Model<SUB> {
     static _primary: PrimaryIndex<any, any>;
     /** @internal All non-primary indexes for this model. */
-    static _secondaries?: BaseIndex<any, readonly (keyof any & string)[]>[];
+    static _secondaries?: NonPrimaryIndex<any, readonly (keyof any & string)[]>[];
     /** The database table name (defaults to class name). */
     static tableName: string;
-    /** When true, registerModel replaces an existing model with the same tableName. */
+    /** When true, defineModel replaces an existing model with the same tableName. */
     static override?: boolean;
     /** Field configuration metadata. */
     static fields: Record<string | symbol | number, FieldConfig<unknown>>;
+    static get _indexId(): number | undefined;
+    static get _currentVersion(): number;
+    static get _pkFieldTypes(): Map<string, TypeWrapper<any>>;
+    static _loadVersionInfo(txnId: number, version: number): import("./indexes.js").VersionInfo;
+    static _writePrimary(txn: Transaction, pk: Uint8Array, data: Record<string, any>): void;
     /**
      * Optional migration function called when deserializing rows written with an older schema version.
      * Receives a plain record with all fields (primary key fields + value fields) and should mutate it
@@ -153,9 +185,7 @@ export declare abstract class Model<SUB> {
      *
      * @example
      * ```typescript
-     * ⁣@E.registerModel
-     * class User extends E.Model<User> {
-     *   static pk = E.primary(User, "id");
+     * const User = E.defineModel(class {
      *   id = E.field(E.identifier);
      *   name = E.field(E.string);
      *   role = E.field(E.string);  // new field
@@ -163,7 +193,7 @@ export declare abstract class Model<SUB> {
      *   static migrate(record: Record<string, any>) {
      *     record.role ??= "user";  // default for rows that predate the 'role' field
      *   }
-     * }
+     * }, { pk: "id" });
      * ```
      */
     static migrate?(record: Record<string, any>): void;
@@ -190,9 +220,7 @@ export declare abstract class Model<SUB> {
      *
      * @example
      * ```typescript
-     * ⁣@E.registerModel
-     * class Post extends E.Model<Post> {
-     *   static pk = E.primary(Post, "id");
+     * const Post = E.defineModel(class {
      *   id = E.field(E.identifier);
      *   title = E.field(E.string);
      *   slug = E.field(E.string);
@@ -200,16 +228,11 @@ export declare abstract class Model<SUB> {
      *   preCommit() {
      *     this.slug = this.title.toLowerCase().replace(/\s+/g, "-");
      *   }
-     * }
+     * }, { pk: "id" });
      * ```
      */
     preCommit?(): void;
-    /**
-     * Transform the model's `E.field` properties into the appropriate JavaScript properties. Normally this is done
-     * automatically when using `transact()`, but in case you need to access `Model.fields` directly before the first
-     * transaction, you can call this method manually.
-     */
-    static initFields(reset?: boolean): void;
+    static _resetIndexes(): void;
     static _loadCreateIndexes(): Promise<void>;
     _setLoadedField(fieldName: string, value: any): void;
     /**
@@ -230,21 +253,16 @@ export declare abstract class Model<SUB> {
      *
      * @example
      * ```typescript
-     * const user = User.load("user123");
+     * const user = User.get("user123");
      * user.name = "New Name";
      * user.preventPersist(); // Changes won't be saved
      * ```
      */
     preventPersist(): this;
-    /**
-     * Find all instances of this model in the database, ordered by primary key.
-     * @param opts - Optional parameters.
-     * @param opts.reverse - If true, iterate in reverse order.
-     * @returns An iterator.
-     */
-    static findAll<T extends typeof Model<unknown>>(this: T, opts?: {
-        reverse?: boolean;
-    }): IndexRangeIterator<T>;
+    static get(...args: any[]): any;
+    static getLazy(...args: any[]): any;
+    static find(opts?: any): any;
+    static batchProcess(opts: any, callback?: any): any;
     /**
      * Load an existing instance by primary key and update it, or create a new one.
      *
@@ -255,7 +273,7 @@ export declare abstract class Model<SUB> {
      * @param obj - Partial model data that **must** include every primary key field.
      * @returns The loaded-and-updated or newly created instance.
      */
-    static replaceInto<T extends typeof Model<any>>(this: T, obj: Partial<Omit<InstanceType<T>, "constructor">>): InstanceType<T>;
+    static replaceInto<T extends typeof Model<any>>(this: T, obj: Partial<Record<string, any>>): InstanceType<T>;
     /**
      * Delete this model instance from the database.
      *
@@ -263,7 +281,7 @@ export declare abstract class Model<SUB> {
      *
      * @example
      * ```typescript
-     * const user = User.load("user123");
+     * const user = User.get("user123");
      * user.delete(); // Removes from database
      * ```
      */
@@ -297,3 +315,4 @@ export declare abstract class Model<SUB> {
     getState(): "deleted" | "created" | "loaded" | "lazy";
     toString(): string;
 }
+export {};