@getstrata/core 0.5.0 → 0.5.3

package/dist/core/database/model.d.ts

@@ -28,10 +28,10 @@ declare class Model<TEntity extends object, PrimaryKey extends keyof TEntity & s
     get id(): TEntity[PrimaryKey];
     toObject(): TEntity;
     protected primaryKey(): PrimaryKey;
-    protected static primaryKeyField(this: typeof Model): string;
-    protected static hydrateAttributes<TEntity extends object>(this: typeof Model, attributes: TEntity): TEntity;
-    protected static dehydrateAttributes(this: typeof Model, attributes: LoadedAttributes): LoadedAttributes;
-    protected static fromRecord<TEntity extends object, PrimaryKey extends keyof TEntity & string>(this: typeof Model, record: TEntity, repository: BaseRepository<TEntity, PrimaryKey>, exists?: boolean): Model<TEntity, PrimaryKey>;
+    protected static primaryKeyField(this: object): string;
+    protected static hydrateAttributes<TEntity extends object>(this: object, attributes: TEntity): TEntity;
+    protected static dehydrateAttributes(this: object, attributes: LoadedAttributes): LoadedAttributes;
+    protected static fromRecord<TEntity extends object, PrimaryKey extends keyof TEntity & string>(this: object, record: TEntity, repository: BaseRepository<TEntity, PrimaryKey>, exists?: boolean): Model<TEntity, PrimaryKey>;
     static boot(): void;
     static addGlobalScope<TEntity extends object, PrimaryKey extends keyof TEntity & string>(this: object, _name: string, scope: GlobalScopeFn<TEntity, PrimaryKey>): void;
     static repository<TEntity extends object, PrimaryKey extends keyof TEntity & string>(this: object): BaseRepository<TEntity, PrimaryKey>;

package/dist/entries/auth/guard.js

@@ -1557,25 +1557,26 @@ class Model {
     throw new Error(`${this.constructor.name}.primaryKey() is not implemented.`);
   }
   static primaryKeyField() {
-    return resolveModelRepository(Model).getTable().primaryKey;
+    return resolveModelRepository(this).getTable().primaryKey;
   }
   static hydrateAttributes(attributes) {
-    const casts = Model.$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "hydrate");
   }
   static dehydrateAttributes(attributes) {
-    const casts = Model.$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "dehydrate");
   }
   static fromRecord(record, repository, exists = true) {
-    const hydrated = Model.hydrateAttributes(record);
-    return new Model(hydrated, repository, exists);
+    const statics = modelStatics(this);
+    const hydrated = statics.hydrateAttributes(record);
+    return new statics(hydrated, repository, exists);
   }
   static boot() {}
   static addGlobalScope(_name, scope) {
-    ensureBooted(Model);
-    const existing = modelGlobalScopes.get(Model) ?? [];
-    modelGlobalScopes.set(Model, [
+    ensureBooted(this);
+    const existing = modelGlobalScopes.get(this) ?? [];
+    modelGlobalScopes.set(this, [
       ...existing,
       scope
     ]);
@@ -1585,17 +1586,17 @@ class Model {
   }
   static query() {
     ensureBooted(this);
-    const repository = resolveModelRepository(Model);
+    const repository = resolveModelRepository(this);
     let query = repository.query();
-    for (const scope of getGlobalScopes(Model)) {
+    for (const scope of getGlobalScopes(this)) {
       query = scope(query);
     }
     return query;
   }
   static async create(attributes) {
     const statics = modelStatics(this);
-    ensureBooted(Model);
-    const repository = resolveModelRepository(Model);
+    ensureBooted(this);
+    const repository = resolveModelRepository(this);
     const table = repository.getTable();
     const timestamps = statics.$timestamps ?? true;
     const assignable = filterMassAssignable(statics.$fillable, statics.$guarded, attributes);
@@ -1606,22 +1607,22 @@ class Model {
   }
   static async find(id) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    const primaryKey = statics.primaryKeyField();
-    const record = await Model.query.call(Model).where({ [primaryKey]: id }).first();
+    const repository = resolveModelRepository(this);
+    const primaryKey = repository.getTable().primaryKey;
+    const record = await Model.query.call(this).where({ [primaryKey]: id }).first();
     return record ? statics.fromRecord(record, repository, true) : null;
   }
   static async findOrFail(id, errorFactory) {
-    const model = await Model.find.call(Model, id);
+    const model = await Model.find.call(this, id);
     if (model) {
       return model;
     }
-    throw errorFactory?.(id) ?? new NotFoundError(`${Model.name} ${String(id)} not found.`);
+    throw errorFactory?.(id) ?? new NotFoundError(`${this.name} ${String(id)} not found.`);
   }
   static async all(options = {}) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    let query = Model.query.call(Model);
+    const repository = resolveModelRepository(this);
+    let query = Model.query.call(this);
     if (options.orderBy) {
       query = query.orderBy(options.orderBy);
     }
@@ -1633,8 +1634,8 @@ class Model {
   }
   static async firstWhere(where, options = {}) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    let query = Model.query.call(Model).where(where);
+    const repository = resolveModelRepository(this);
+    let query = Model.query.call(this).where(where);
     if (options.orderBy) {
       query = query.orderBy(options.orderBy);
     }

package/dist/entries/database.js

@@ -1355,25 +1355,26 @@ class Model {
     throw new Error(`${this.constructor.name}.primaryKey() is not implemented.`);
   }
   static primaryKeyField() {
-    return resolveModelRepository(Model).getTable().primaryKey;
+    return resolveModelRepository(this).getTable().primaryKey;
   }
   static hydrateAttributes(attributes) {
-    const casts = Model.$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "hydrate");
   }
   static dehydrateAttributes(attributes) {
-    const casts = Model.$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "dehydrate");
   }
   static fromRecord(record, repository, exists = true) {
-    const hydrated = Model.hydrateAttributes(record);
-    return new Model(hydrated, repository, exists);
+    const statics = modelStatics(this);
+    const hydrated = statics.hydrateAttributes(record);
+    return new statics(hydrated, repository, exists);
   }
   static boot() {}
   static addGlobalScope(_name, scope) {
-    ensureBooted(Model);
-    const existing = modelGlobalScopes.get(Model) ?? [];
-    modelGlobalScopes.set(Model, [
+    ensureBooted(this);
+    const existing = modelGlobalScopes.get(this) ?? [];
+    modelGlobalScopes.set(this, [
       ...existing,
       scope
     ]);
@@ -1383,17 +1384,17 @@ class Model {
   }
   static query() {
     ensureBooted(this);
-    const repository = resolveModelRepository(Model);
+    const repository = resolveModelRepository(this);
     let query = repository.query();
-    for (const scope of getGlobalScopes(Model)) {
+    for (const scope of getGlobalScopes(this)) {
       query = scope(query);
     }
     return query;
   }
   static async create(attributes) {
     const statics = modelStatics(this);
-    ensureBooted(Model);
-    const repository = resolveModelRepository(Model);
+    ensureBooted(this);
+    const repository = resolveModelRepository(this);
     const table = repository.getTable();
     const timestamps = statics.$timestamps ?? true;
     const assignable = filterMassAssignable(statics.$fillable, statics.$guarded, attributes);
@@ -1404,22 +1405,22 @@ class Model {
   }
   static async find(id) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    const primaryKey = statics.primaryKeyField();
-    const record = await Model.query.call(Model).where({ [primaryKey]: id }).first();
+    const repository = resolveModelRepository(this);
+    const primaryKey = repository.getTable().primaryKey;
+    const record = await Model.query.call(this).where({ [primaryKey]: id }).first();
     return record ? statics.fromRecord(record, repository, true) : null;
   }
   static async findOrFail(id, errorFactory) {
-    const model = await Model.find.call(Model, id);
+    const model = await Model.find.call(this, id);
     if (model) {
       return model;
     }
-    throw errorFactory?.(id) ?? new NotFoundError(`${Model.name} ${String(id)} not found.`);
+    throw errorFactory?.(id) ?? new NotFoundError(`${this.name} ${String(id)} not found.`);
   }
   static async all(options = {}) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    let query = Model.query.call(Model);
+    const repository = resolveModelRepository(this);
+    let query = Model.query.call(this);
     if (options.orderBy) {
       query = query.orderBy(options.orderBy);
     }
@@ -1431,8 +1432,8 @@ class Model {
   }
   static async firstWhere(where, options = {}) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    let query = Model.query.call(Model).where(where);
+    const repository = resolveModelRepository(this);
+    let query = Model.query.call(this).where(where);
     if (options.orderBy) {
       query = query.orderBy(options.orderBy);
     }

package/dist/entries/http/webErrorResponse.js

@@ -1579,25 +1579,26 @@ class Model {
     throw new Error(`${this.constructor.name}.primaryKey() is not implemented.`);
   }
   static primaryKeyField() {
-    return resolveModelRepository(Model).getTable().primaryKey;
+    return resolveModelRepository(this).getTable().primaryKey;
   }
   static hydrateAttributes(attributes) {
-    const casts = Model.$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "hydrate");
   }
   static dehydrateAttributes(attributes) {
-    const casts = Model.$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "dehydrate");
   }
   static fromRecord(record, repository, exists = true) {
-    const hydrated = Model.hydrateAttributes(record);
-    return new Model(hydrated, repository, exists);
+    const statics = modelStatics(this);
+    const hydrated = statics.hydrateAttributes(record);
+    return new statics(hydrated, repository, exists);
   }
   static boot() {}
   static addGlobalScope(_name, scope) {
-    ensureBooted(Model);
-    const existing = modelGlobalScopes.get(Model) ?? [];
-    modelGlobalScopes.set(Model, [
+    ensureBooted(this);
+    const existing = modelGlobalScopes.get(this) ?? [];
+    modelGlobalScopes.set(this, [
       ...existing,
       scope
     ]);
@@ -1607,17 +1608,17 @@ class Model {
   }
   static query() {
     ensureBooted(this);
-    const repository = resolveModelRepository(Model);
+    const repository = resolveModelRepository(this);
     let query = repository.query();
-    for (const scope of getGlobalScopes(Model)) {
+    for (const scope of getGlobalScopes(this)) {
       query = scope(query);
     }
     return query;
   }
   static async create(attributes) {
     const statics = modelStatics(this);
-    ensureBooted(Model);
-    const repository = resolveModelRepository(Model);
+    ensureBooted(this);
+    const repository = resolveModelRepository(this);
     const table = repository.getTable();
     const timestamps = statics.$timestamps ?? true;
     const assignable = filterMassAssignable(statics.$fillable, statics.$guarded, attributes);
@@ -1628,22 +1629,22 @@ class Model {
   }
   static async find(id) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    const primaryKey = statics.primaryKeyField();
-    const record = await Model.query.call(Model).where({ [primaryKey]: id }).first();
+    const repository = resolveModelRepository(this);
+    const primaryKey = repository.getTable().primaryKey;
+    const record = await Model.query.call(this).where({ [primaryKey]: id }).first();
     return record ? statics.fromRecord(record, repository, true) : null;
   }
   static async findOrFail(id, errorFactory) {
-    const model = await Model.find.call(Model, id);
+    const model = await Model.find.call(this, id);
     if (model) {
       return model;
     }
-    throw errorFactory?.(id) ?? new NotFoundError(`${Model.name} ${String(id)} not found.`);
+    throw errorFactory?.(id) ?? new NotFoundError(`${this.name} ${String(id)} not found.`);
   }
   static async all(options = {}) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    let query = Model.query.call(Model);
+    const repository = resolveModelRepository(this);
+    let query = Model.query.call(this);
     if (options.orderBy) {
       query = query.orderBy(options.orderBy);
     }
@@ -1655,8 +1656,8 @@ class Model {
   }
   static async firstWhere(where, options = {}) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    let query = Model.query.call(Model).where(where);
+    const repository = resolveModelRepository(this);
+    let query = Model.query.call(this).where(where);
     if (options.orderBy) {
       query = query.orderBy(options.orderBy);
     }

package/dist/entries/http.js

@@ -1579,25 +1579,26 @@ class Model {
     throw new Error(`${this.constructor.name}.primaryKey() is not implemented.`);
   }
   static primaryKeyField() {
-    return resolveModelRepository(Model).getTable().primaryKey;
+    return resolveModelRepository(this).getTable().primaryKey;
   }
   static hydrateAttributes(attributes) {
-    const casts = Model.$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "hydrate");
   }
   static dehydrateAttributes(attributes) {
-    const casts = Model.$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "dehydrate");
   }
   static fromRecord(record, repository, exists = true) {
-    const hydrated = Model.hydrateAttributes(record);
-    return new Model(hydrated, repository, exists);
+    const statics = modelStatics(this);
+    const hydrated = statics.hydrateAttributes(record);
+    return new statics(hydrated, repository, exists);
   }
   static boot() {}
   static addGlobalScope(_name, scope) {
-    ensureBooted(Model);
-    const existing = modelGlobalScopes.get(Model) ?? [];
-    modelGlobalScopes.set(Model, [
+    ensureBooted(this);
+    const existing = modelGlobalScopes.get(this) ?? [];
+    modelGlobalScopes.set(this, [
       ...existing,
       scope
     ]);
@@ -1607,17 +1608,17 @@ class Model {
   }
   static query() {
     ensureBooted(this);
-    const repository = resolveModelRepository(Model);
+    const repository = resolveModelRepository(this);
     let query = repository.query();
-    for (const scope of getGlobalScopes(Model)) {
+    for (const scope of getGlobalScopes(this)) {
       query = scope(query);
     }
     return query;
   }
   static async create(attributes) {
     const statics = modelStatics(this);
-    ensureBooted(Model);
-    const repository = resolveModelRepository(Model);
+    ensureBooted(this);
+    const repository = resolveModelRepository(this);
     const table = repository.getTable();
     const timestamps = statics.$timestamps ?? true;
     const assignable = filterMassAssignable(statics.$fillable, statics.$guarded, attributes);
@@ -1628,22 +1629,22 @@ class Model {
   }
   static async find(id) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    const primaryKey = statics.primaryKeyField();
-    const record = await Model.query.call(Model).where({ [primaryKey]: id }).first();
+    const repository = resolveModelRepository(this);
+    const primaryKey = repository.getTable().primaryKey;
+    const record = await Model.query.call(this).where({ [primaryKey]: id }).first();
     return record ? statics.fromRecord(record, repository, true) : null;
   }
   static async findOrFail(id, errorFactory) {
-    const model = await Model.find.call(Model, id);
+    const model = await Model.find.call(this, id);
     if (model) {
       return model;
     }
-    throw errorFactory?.(id) ?? new NotFoundError(`${Model.name} ${String(id)} not found.`);
+    throw errorFactory?.(id) ?? new NotFoundError(`${this.name} ${String(id)} not found.`);
   }
   static async all(options = {}) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    let query = Model.query.call(Model);
+    const repository = resolveModelRepository(this);
+    let query = Model.query.call(this);
     if (options.orderBy) {
       query = query.orderBy(options.orderBy);
     }
@@ -1655,8 +1656,8 @@ class Model {
   }
   static async firstWhere(where, options = {}) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    let query = Model.query.call(Model).where(where);
+    const repository = resolveModelRepository(this);
+    let query = Model.query.call(this).where(where);
     if (options.orderBy) {
       query = query.orderBy(options.orderBy);
     }

package/dist/entries/queue/createAppQueue.js

@@ -1750,25 +1750,26 @@ class Model {
     throw new Error(`${this.constructor.name}.primaryKey() is not implemented.`);
   }
   static primaryKeyField() {
-    return resolveModelRepository(Model).getTable().primaryKey;
+    return resolveModelRepository(this).getTable().primaryKey;
   }
   static hydrateAttributes(attributes) {
-    const casts = Model.$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "hydrate");
   }
   static dehydrateAttributes(attributes) {
-    const casts = Model.$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "dehydrate");
   }
   static fromRecord(record, repository, exists = true) {
-    const hydrated = Model.hydrateAttributes(record);
-    return new Model(hydrated, repository, exists);
+    const statics = modelStatics(this);
+    const hydrated = statics.hydrateAttributes(record);
+    return new statics(hydrated, repository, exists);
   }
   static boot() {}
   static addGlobalScope(_name, scope) {
-    ensureBooted(Model);
-    const existing = modelGlobalScopes.get(Model) ?? [];
-    modelGlobalScopes.set(Model, [
+    ensureBooted(this);
+    const existing = modelGlobalScopes.get(this) ?? [];
+    modelGlobalScopes.set(this, [
       ...existing,
       scope
     ]);
@@ -1778,17 +1779,17 @@ class Model {
   }
   static query() {
     ensureBooted(this);
-    const repository = resolveModelRepository(Model);
+    const repository = resolveModelRepository(this);
     let query = repository.query();
-    for (const scope of getGlobalScopes(Model)) {
+    for (const scope of getGlobalScopes(this)) {
       query = scope(query);
     }
     return query;
   }
   static async create(attributes) {
     const statics = modelStatics(this);
-    ensureBooted(Model);
-    const repository = resolveModelRepository(Model);
+    ensureBooted(this);
+    const repository = resolveModelRepository(this);
     const table = repository.getTable();
     const timestamps = statics.$timestamps ?? true;
     const assignable = filterMassAssignable(statics.$fillable, statics.$guarded, attributes);
@@ -1799,22 +1800,22 @@ class Model {
   }
   static async find(id) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    const primaryKey = statics.primaryKeyField();
-    const record = await Model.query.call(Model).where({ [primaryKey]: id }).first();
+    const repository = resolveModelRepository(this);
+    const primaryKey = repository.getTable().primaryKey;
+    const record = await Model.query.call(this).where({ [primaryKey]: id }).first();
     return record ? statics.fromRecord(record, repository, true) : null;
   }
   static async findOrFail(id, errorFactory) {
-    const model = await Model.find.call(Model, id);
+    const model = await Model.find.call(this, id);
     if (model) {
       return model;
     }
-    throw errorFactory?.(id) ?? new NotFoundError(`${Model.name} ${String(id)} not found.`);
+    throw errorFactory?.(id) ?? new NotFoundError(`${this.name} ${String(id)} not found.`);
   }
   static async all(options = {}) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    let query = Model.query.call(Model);
+    const repository = resolveModelRepository(this);
+    let query = Model.query.call(this);
     if (options.orderBy) {
       query = query.orderBy(options.orderBy);
     }
@@ -1826,8 +1827,8 @@ class Model {
   }
   static async firstWhere(where, options = {}) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    let query = Model.query.call(Model).where(where);
+    const repository = resolveModelRepository(this);
+    let query = Model.query.call(this).where(where);
     if (options.orderBy) {
       query = query.orderBy(options.orderBy);
     }

package/dist/entries/queue/publicQueue.js

@@ -1355,25 +1355,26 @@ class Model {
     throw new Error(`${this.constructor.name}.primaryKey() is not implemented.`);
   }
   static primaryKeyField() {
-    return resolveModelRepository(Model).getTable().primaryKey;
+    return resolveModelRepository(this).getTable().primaryKey;
   }
   static hydrateAttributes(attributes) {
-    const casts = Model.$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "hydrate");
   }
   static dehydrateAttributes(attributes) {
-    const casts = Model.$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "dehydrate");
   }
   static fromRecord(record, repository, exists = true) {
-    const hydrated = Model.hydrateAttributes(record);
-    return new Model(hydrated, repository, exists);
+    const statics = modelStatics(this);
+    const hydrated = statics.hydrateAttributes(record);
+    return new statics(hydrated, repository, exists);
   }
   static boot() {}
   static addGlobalScope(_name, scope) {
-    ensureBooted(Model);
-    const existing = modelGlobalScopes.get(Model) ?? [];
-    modelGlobalScopes.set(Model, [
+    ensureBooted(this);
+    const existing = modelGlobalScopes.get(this) ?? [];
+    modelGlobalScopes.set(this, [
       ...existing,
       scope
     ]);
@@ -1383,17 +1384,17 @@ class Model {
   }
   static query() {
     ensureBooted(this);
-    const repository = resolveModelRepository(Model);
+    const repository = resolveModelRepository(this);
     let query = repository.query();
-    for (const scope of getGlobalScopes(Model)) {
+    for (const scope of getGlobalScopes(this)) {
       query = scope(query);
     }
     return query;
   }
   static async create(attributes) {
     const statics = modelStatics(this);
-    ensureBooted(Model);
-    const repository = resolveModelRepository(Model);
+    ensureBooted(this);
+    const repository = resolveModelRepository(this);
     const table = repository.getTable();
     const timestamps = statics.$timestamps ?? true;
     const assignable = filterMassAssignable(statics.$fillable, statics.$guarded, attributes);
@@ -1404,22 +1405,22 @@ class Model {
   }
   static async find(id) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    const primaryKey = statics.primaryKeyField();
-    const record = await Model.query.call(Model).where({ [primaryKey]: id }).first();
+    const repository = resolveModelRepository(this);
+    const primaryKey = repository.getTable().primaryKey;
+    const record = await Model.query.call(this).where({ [primaryKey]: id }).first();
     return record ? statics.fromRecord(record, repository, true) : null;
   }
   static async findOrFail(id, errorFactory) {
-    const model = await Model.find.call(Model, id);
+    const model = await Model.find.call(this, id);
     if (model) {
       return model;
     }
-    throw errorFactory?.(id) ?? new NotFoundError(`${Model.name} ${String(id)} not found.`);
+    throw errorFactory?.(id) ?? new NotFoundError(`${this.name} ${String(id)} not found.`);
   }
   static async all(options = {}) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    let query = Model.query.call(Model);
+    const repository = resolveModelRepository(this);
+    let query = Model.query.call(this);
     if (options.orderBy) {
       query = query.orderBy(options.orderBy);
     }
@@ -1431,8 +1432,8 @@ class Model {
   }
   static async firstWhere(where, options = {}) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    let query = Model.query.call(Model).where(where);
+    const repository = resolveModelRepository(this);
+    let query = Model.query.call(this).where(where);
     if (options.orderBy) {
       query = query.orderBy(options.orderBy);
     }

package/dist/entries/queue/queueMetrics.js

@@ -1760,25 +1760,26 @@ class Model {
     throw new Error(`${this.constructor.name}.primaryKey() is not implemented.`);
   }
   static primaryKeyField() {
-    return resolveModelRepository(Model).getTable().primaryKey;
+    return resolveModelRepository(this).getTable().primaryKey;
   }
   static hydrateAttributes(attributes) {
-    const casts = Model.$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "hydrate");
   }
   static dehydrateAttributes(attributes) {
-    const casts = Model.$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "dehydrate");
   }
   static fromRecord(record, repository, exists = true) {
-    const hydrated = Model.hydrateAttributes(record);
-    return new Model(hydrated, repository, exists);
+    const statics = modelStatics(this);
+    const hydrated = statics.hydrateAttributes(record);
+    return new statics(hydrated, repository, exists);
   }
   static boot() {}
   static addGlobalScope(_name, scope) {
-    ensureBooted(Model);
-    const existing = modelGlobalScopes.get(Model) ?? [];
-    modelGlobalScopes.set(Model, [
+    ensureBooted(this);
+    const existing = modelGlobalScopes.get(this) ?? [];
+    modelGlobalScopes.set(this, [
       ...existing,
       scope
     ]);
@@ -1788,17 +1789,17 @@ class Model {
   }
   static query() {
     ensureBooted(this);
-    const repository = resolveModelRepository(Model);
+    const repository = resolveModelRepository(this);
     let query = repository.query();
-    for (const scope of getGlobalScopes(Model)) {
+    for (const scope of getGlobalScopes(this)) {
       query = scope(query);
     }
     return query;
   }
   static async create(attributes) {
     const statics = modelStatics(this);
-    ensureBooted(Model);
-    const repository = resolveModelRepository(Model);
+    ensureBooted(this);
+    const repository = resolveModelRepository(this);
     const table = repository.getTable();
     const timestamps = statics.$timestamps ?? true;
     const assignable = filterMassAssignable(statics.$fillable, statics.$guarded, attributes);
@@ -1809,22 +1810,22 @@ class Model {
   }
   static async find(id) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    const primaryKey = statics.primaryKeyField();
-    const record = await Model.query.call(Model).where({ [primaryKey]: id }).first();
+    const repository = resolveModelRepository(this);
+    const primaryKey = repository.getTable().primaryKey;
+    const record = await Model.query.call(this).where({ [primaryKey]: id }).first();
     return record ? statics.fromRecord(record, repository, true) : null;
   }
   static async findOrFail(id, errorFactory) {
-    const model = await Model.find.call(Model, id);
+    const model = await Model.find.call(this, id);
     if (model) {
       return model;
     }
-    throw errorFactory?.(id) ?? new NotFoundError(`${Model.name} ${String(id)} not found.`);
+    throw errorFactory?.(id) ?? new NotFoundError(`${this.name} ${String(id)} not found.`);
   }
   static async all(options = {}) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    let query = Model.query.call(Model);
+    const repository = resolveModelRepository(this);
+    let query = Model.query.call(this);
     if (options.orderBy) {
       query = query.orderBy(options.orderBy);
     }
@@ -1836,8 +1837,8 @@ class Model {
   }
   static async firstWhere(where, options = {}) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    let query = Model.query.call(Model).where(where);
+    const repository = resolveModelRepository(this);
+    let query = Model.query.call(this).where(where);
     if (options.orderBy) {
       query = query.orderBy(options.orderBy);
     }

package/dist/entries/storage/storage.js

@@ -1,8 +1,8 @@
 // @bun
 // ../../src/core/storage/storage.ts
-var {S3Client } = globalThis.Bun;
 import { mkdir, readFile, unlink, writeFile } from "fs/promises";
 import { dirname, join } from "path";
+var {S3Client } = globalThis.Bun;
 
 class LocalStorageDriver {
   rootDirectory;

package/dist/entries/view.js

@@ -1564,25 +1564,26 @@ class Model {
     throw new Error(`${this.constructor.name}.primaryKey() is not implemented.`);
   }
   static primaryKeyField() {
-    return resolveModelRepository(Model).getTable().primaryKey;
+    return resolveModelRepository(this).getTable().primaryKey;
   }
   static hydrateAttributes(attributes) {
-    const casts = Model.$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "hydrate");
   }
   static dehydrateAttributes(attributes) {
-    const casts = Model.$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "dehydrate");
   }
   static fromRecord(record, repository, exists = true) {
-    const hydrated = Model.hydrateAttributes(record);
-    return new Model(hydrated, repository, exists);
+    const statics = modelStatics(this);
+    const hydrated = statics.hydrateAttributes(record);
+    return new statics(hydrated, repository, exists);
   }
   static boot() {}
   static addGlobalScope(_name, scope) {
-    ensureBooted(Model);
-    const existing = modelGlobalScopes.get(Model) ?? [];
-    modelGlobalScopes.set(Model, [
+    ensureBooted(this);
+    const existing = modelGlobalScopes.get(this) ?? [];
+    modelGlobalScopes.set(this, [
       ...existing,
       scope
     ]);
@@ -1592,17 +1593,17 @@ class Model {
   }
   static query() {
     ensureBooted(this);
-    const repository = resolveModelRepository(Model);
+    const repository = resolveModelRepository(this);
     let query = repository.query();
-    for (const scope of getGlobalScopes(Model)) {
+    for (const scope of getGlobalScopes(this)) {
       query = scope(query);
     }
     return query;
   }
   static async create(attributes) {
     const statics = modelStatics(this);
-    ensureBooted(Model);
-    const repository = resolveModelRepository(Model);
+    ensureBooted(this);
+    const repository = resolveModelRepository(this);
     const table = repository.getTable();
     const timestamps = statics.$timestamps ?? true;
     const assignable = filterMassAssignable(statics.$fillable, statics.$guarded, attributes);
@@ -1613,22 +1614,22 @@ class Model {
   }
   static async find(id) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    const primaryKey = statics.primaryKeyField();
-    const record = await Model.query.call(Model).where({ [primaryKey]: id }).first();
+    const repository = resolveModelRepository(this);
+    const primaryKey = repository.getTable().primaryKey;
+    const record = await Model.query.call(this).where({ [primaryKey]: id }).first();
     return record ? statics.fromRecord(record, repository, true) : null;
   }
   static async findOrFail(id, errorFactory) {
-    const model = await Model.find.call(Model, id);
+    const model = await Model.find.call(this, id);
     if (model) {
       return model;
     }
-    throw errorFactory?.(id) ?? new NotFoundError(`${Model.name} ${String(id)} not found.`);
+    throw errorFactory?.(id) ?? new NotFoundError(`${this.name} ${String(id)} not found.`);
   }
   static async all(options = {}) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    let query = Model.query.call(Model);
+    const repository = resolveModelRepository(this);
+    let query = Model.query.call(this);
     if (options.orderBy) {
       query = query.orderBy(options.orderBy);
     }
@@ -1640,8 +1641,8 @@ class Model {
   }
   static async firstWhere(where, options = {}) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    let query = Model.query.call(Model).where(where);
+    const repository = resolveModelRepository(this);
+    let query = Model.query.call(this).where(where);
     if (options.orderBy) {
       query = query.orderBy(options.orderBy);
     }

package/dist/index.js

@@ -1665,25 +1665,26 @@ class Model {
     throw new Error(`${this.constructor.name}.primaryKey() is not implemented.`);
   }
   static primaryKeyField() {
-    return resolveModelRepository(Model).getTable().primaryKey;
+    return resolveModelRepository(this).getTable().primaryKey;
   }
   static hydrateAttributes(attributes) {
-    const casts = Model.$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "hydrate");
   }
   static dehydrateAttributes(attributes) {
-    const casts = Model.$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "dehydrate");
   }
   static fromRecord(record, repository, exists = true) {
-    const hydrated = Model.hydrateAttributes(record);
-    return new Model(hydrated, repository, exists);
+    const statics = modelStatics(this);
+    const hydrated = statics.hydrateAttributes(record);
+    return new statics(hydrated, repository, exists);
   }
   static boot() {}
   static addGlobalScope(_name, scope) {
-    ensureBooted(Model);
-    const existing = modelGlobalScopes.get(Model) ?? [];
-    modelGlobalScopes.set(Model, [
+    ensureBooted(this);
+    const existing = modelGlobalScopes.get(this) ?? [];
+    modelGlobalScopes.set(this, [
       ...existing,
       scope
     ]);
@@ -1693,17 +1694,17 @@ class Model {
   }
   static query() {
     ensureBooted(this);
-    const repository = resolveModelRepository(Model);
+    const repository = resolveModelRepository(this);
     let query = repository.query();
-    for (const scope of getGlobalScopes(Model)) {
+    for (const scope of getGlobalScopes(this)) {
       query = scope(query);
     }
     return query;
   }
   static async create(attributes) {
     const statics = modelStatics(this);
-    ensureBooted(Model);
-    const repository = resolveModelRepository(Model);
+    ensureBooted(this);
+    const repository = resolveModelRepository(this);
     const table = repository.getTable();
     const timestamps = statics.$timestamps ?? true;
     const assignable = filterMassAssignable(statics.$fillable, statics.$guarded, attributes);
@@ -1714,22 +1715,22 @@ class Model {
   }
   static async find(id) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    const primaryKey = statics.primaryKeyField();
-    const record = await Model.query.call(Model).where({ [primaryKey]: id }).first();
+    const repository = resolveModelRepository(this);
+    const primaryKey = repository.getTable().primaryKey;
+    const record = await Model.query.call(this).where({ [primaryKey]: id }).first();
     return record ? statics.fromRecord(record, repository, true) : null;
   }
   static async findOrFail(id, errorFactory) {
-    const model = await Model.find.call(Model, id);
+    const model = await Model.find.call(this, id);
     if (model) {
       return model;
     }
-    throw errorFactory?.(id) ?? new NotFoundError(`${Model.name} ${String(id)} not found.`);
+    throw errorFactory?.(id) ?? new NotFoundError(`${this.name} ${String(id)} not found.`);
   }
   static async all(options = {}) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    let query = Model.query.call(Model);
+    const repository = resolveModelRepository(this);
+    let query = Model.query.call(this);
     if (options.orderBy) {
       query = query.orderBy(options.orderBy);
     }
@@ -1741,8 +1742,8 @@ class Model {
   }
   static async firstWhere(where, options = {}) {
     const statics = modelStatics(this);
-    const repository = resolveModelRepository(Model);
-    let query = Model.query.call(Model).where(where);
+    const repository = resolveModelRepository(this);
+    let query = Model.query.call(this).where(where);
     if (options.orderBy) {
       query = query.orderBy(options.orderBy);
     }
@@ -2758,9 +2759,9 @@ function mailer() {
 }
 
 // ../../src/core/storage/storage.ts
-var {S3Client } = globalThis.Bun;
 import { mkdir, readFile, unlink, writeFile } from "fs/promises";
 import { dirname, join as join3 } from "path";
+var {S3Client } = globalThis.Bun;
 
 class LocalStorageDriver {
   rootDirectory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getstrata/core",
-  "version": "0.5.0",
+  "version": "0.5.3",
   "description": "Strata — Laravel-inspired Bun framework public API",
   "type": "module",
   "license": "MIT",