@getstrata/core 0.5.1 → 0.5.4

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

@@ -12,12 +12,12 @@ declare function buildWhereClause<TEntity extends object>(tableName: string, whe
     clause: string;
     params: unknown[];
 };
-declare function buildAdvancedWhereClause<TEntity extends object>(tableName: string, where?: QueryWhere<TEntity>, whereNodes?: readonly WhereNode<TEntity>[]): {
+declare function buildAdvancedWhereClause<TEntity extends object>(tableName: string, where?: QueryWhere<TEntity>, whereNodes?: readonly WhereNode<TEntity>[], params?: unknown[]): {
     clause: string;
     params: unknown[];
 };
 declare function resolveSoftDeleteColumn<TEntity>(table: TableDefinition<TEntity>): string | null;
-declare function buildQueryWhereClause<TEntity extends object>(table: TableDefinition<TEntity>, options?: Pick<QueryOptions<TEntity>, "where" | "withTrashed" | "onlyTrashed">, whereNodes?: readonly WhereNode<TEntity>[]): {
+declare function buildQueryWhereClause<TEntity extends object>(table: TableDefinition<TEntity>, options?: Pick<QueryOptions<TEntity>, "where" | "withTrashed" | "onlyTrashed">, whereNodes?: readonly WhereNode<TEntity>[], params?: unknown[]): {
     clause: string;
     params: unknown[];
 };

package/dist/entries/auth/guard.js

@@ -508,8 +508,7 @@ function buildWhereGroupClause(tableName, nodes, params) {
   }
   return result;
 }
-function buildAdvancedWhereClause(tableName, where = {}, whereNodes = []) {
-  const params = [];
+function buildAdvancedWhereClause(tableName, where = {}, whereNodes = [], params = []) {
   const nodes = [];
   if (Object.keys(where).length > 0) {
     nodes.push({ kind: "and", where });
@@ -544,18 +543,18 @@ function appendSoftDeleteScope(table, options, clauses) {
     clauses.push(`${qualifiedColumn} IS NULL`);
   }
 }
-function buildQueryWhereClause(table, options = {}, whereNodes = []) {
-  const { clause, params } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes);
+function buildQueryWhereClause(table, options = {}, whereNodes = [], params = []) {
+  const { clause, params: whereParams } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes, params);
   const softDeleteClauses = [];
   appendSoftDeleteScope(table, options, softDeleteClauses);
   if (softDeleteClauses.length === 0) {
-    return { clause, params };
+    return { clause, params: whereParams };
   }
   const base = clause.replace(/^ WHERE /, "");
   const scope = softDeleteClauses.join(" AND ");
   return {
     clause: base ? ` WHERE (${base}) AND ${scope}` : ` WHERE ${scope}`,
-    params
+    params: whereParams
   };
 }
 function isQueryOrder(value) {
@@ -659,8 +658,7 @@ function getDefinedColumnEntries(table, values, options = {}) {
 function buildSelectQuery(table, options = {}, whereNodes = []) {
   const params = [];
   const columns = buildSelectList(table, options.select, params);
-  const { clause, params: whereParams } = buildQueryWhereClause(table, options, whereNodes);
-  params.push(...whereParams);
+  const { clause } = buildQueryWhereClause(table, options, whereNodes, params);
   const joins = buildJoinClause(options.joins);
   const groupBy = buildGroupByClause(table.name, options.groupBy);
   const havingClause = buildHavingClause(table.name, options.having, params);
@@ -1557,26 +1555,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 = modelStatics(Model).$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "hydrate");
   }
   static dehydrateAttributes(attributes) {
-    const casts = modelStatics(Model).$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "dehydrate");
   }
   static fromRecord(record, repository, exists = true) {
-    const statics = modelStatics(Model);
+    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
     ]);
@@ -1586,17 +1584,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);
@@ -1607,22 +1605,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);
     }
@@ -1634,8 +1632,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

@@ -306,8 +306,7 @@ function buildWhereGroupClause(tableName, nodes, params) {
   }
   return result;
 }
-function buildAdvancedWhereClause(tableName, where = {}, whereNodes = []) {
-  const params = [];
+function buildAdvancedWhereClause(tableName, where = {}, whereNodes = [], params = []) {
   const nodes = [];
   if (Object.keys(where).length > 0) {
     nodes.push({ kind: "and", where });
@@ -342,18 +341,18 @@ function appendSoftDeleteScope(table, options, clauses) {
     clauses.push(`${qualifiedColumn} IS NULL`);
   }
 }
-function buildQueryWhereClause(table, options = {}, whereNodes = []) {
-  const { clause, params } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes);
+function buildQueryWhereClause(table, options = {}, whereNodes = [], params = []) {
+  const { clause, params: whereParams } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes, params);
   const softDeleteClauses = [];
   appendSoftDeleteScope(table, options, softDeleteClauses);
   if (softDeleteClauses.length === 0) {
-    return { clause, params };
+    return { clause, params: whereParams };
   }
   const base = clause.replace(/^ WHERE /, "");
   const scope = softDeleteClauses.join(" AND ");
   return {
     clause: base ? ` WHERE (${base}) AND ${scope}` : ` WHERE ${scope}`,
-    params
+    params: whereParams
   };
 }
 function isQueryOrder(value) {
@@ -457,8 +456,7 @@ function getDefinedColumnEntries(table, values, options = {}) {
 function buildSelectQuery(table, options = {}, whereNodes = []) {
   const params = [];
   const columns = buildSelectList(table, options.select, params);
-  const { clause, params: whereParams } = buildQueryWhereClause(table, options, whereNodes);
-  params.push(...whereParams);
+  const { clause } = buildQueryWhereClause(table, options, whereNodes, params);
   const joins = buildJoinClause(options.joins);
   const groupBy = buildGroupByClause(table.name, options.groupBy);
   const havingClause = buildHavingClause(table.name, options.having, params);
@@ -1355,26 +1353,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 = modelStatics(Model).$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "hydrate");
   }
   static dehydrateAttributes(attributes) {
-    const casts = modelStatics(Model).$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "dehydrate");
   }
   static fromRecord(record, repository, exists = true) {
-    const statics = modelStatics(Model);
+    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
     ]);
@@ -1384,17 +1382,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);
@@ -1405,22 +1403,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);
     }
@@ -1432,8 +1430,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

@@ -530,8 +530,7 @@ function buildWhereGroupClause(tableName, nodes, params) {
   }
   return result;
 }
-function buildAdvancedWhereClause(tableName, where = {}, whereNodes = []) {
-  const params = [];
+function buildAdvancedWhereClause(tableName, where = {}, whereNodes = [], params = []) {
   const nodes = [];
   if (Object.keys(where).length > 0) {
     nodes.push({ kind: "and", where });
@@ -566,18 +565,18 @@ function appendSoftDeleteScope(table, options, clauses) {
     clauses.push(`${qualifiedColumn} IS NULL`);
   }
 }
-function buildQueryWhereClause(table, options = {}, whereNodes = []) {
-  const { clause, params } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes);
+function buildQueryWhereClause(table, options = {}, whereNodes = [], params = []) {
+  const { clause, params: whereParams } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes, params);
   const softDeleteClauses = [];
   appendSoftDeleteScope(table, options, softDeleteClauses);
   if (softDeleteClauses.length === 0) {
-    return { clause, params };
+    return { clause, params: whereParams };
   }
   const base = clause.replace(/^ WHERE /, "");
   const scope = softDeleteClauses.join(" AND ");
   return {
     clause: base ? ` WHERE (${base}) AND ${scope}` : ` WHERE ${scope}`,
-    params
+    params: whereParams
   };
 }
 function isQueryOrder(value) {
@@ -681,8 +680,7 @@ function getDefinedColumnEntries(table, values, options = {}) {
 function buildSelectQuery(table, options = {}, whereNodes = []) {
   const params = [];
   const columns = buildSelectList(table, options.select, params);
-  const { clause, params: whereParams } = buildQueryWhereClause(table, options, whereNodes);
-  params.push(...whereParams);
+  const { clause } = buildQueryWhereClause(table, options, whereNodes, params);
   const joins = buildJoinClause(options.joins);
   const groupBy = buildGroupByClause(table.name, options.groupBy);
   const havingClause = buildHavingClause(table.name, options.having, params);
@@ -1579,26 +1577,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 = modelStatics(Model).$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "hydrate");
   }
   static dehydrateAttributes(attributes) {
-    const casts = modelStatics(Model).$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "dehydrate");
   }
   static fromRecord(record, repository, exists = true) {
-    const statics = modelStatics(Model);
+    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
     ]);
@@ -1608,17 +1606,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);
@@ -1629,22 +1627,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);
     }
@@ -1656,8 +1654,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

@@ -530,8 +530,7 @@ function buildWhereGroupClause(tableName, nodes, params) {
   }
   return result;
 }
-function buildAdvancedWhereClause(tableName, where = {}, whereNodes = []) {
-  const params = [];
+function buildAdvancedWhereClause(tableName, where = {}, whereNodes = [], params = []) {
   const nodes = [];
   if (Object.keys(where).length > 0) {
     nodes.push({ kind: "and", where });
@@ -566,18 +565,18 @@ function appendSoftDeleteScope(table, options, clauses) {
     clauses.push(`${qualifiedColumn} IS NULL`);
   }
 }
-function buildQueryWhereClause(table, options = {}, whereNodes = []) {
-  const { clause, params } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes);
+function buildQueryWhereClause(table, options = {}, whereNodes = [], params = []) {
+  const { clause, params: whereParams } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes, params);
   const softDeleteClauses = [];
   appendSoftDeleteScope(table, options, softDeleteClauses);
   if (softDeleteClauses.length === 0) {
-    return { clause, params };
+    return { clause, params: whereParams };
   }
   const base = clause.replace(/^ WHERE /, "");
   const scope = softDeleteClauses.join(" AND ");
   return {
     clause: base ? ` WHERE (${base}) AND ${scope}` : ` WHERE ${scope}`,
-    params
+    params: whereParams
   };
 }
 function isQueryOrder(value) {
@@ -681,8 +680,7 @@ function getDefinedColumnEntries(table, values, options = {}) {
 function buildSelectQuery(table, options = {}, whereNodes = []) {
   const params = [];
   const columns = buildSelectList(table, options.select, params);
-  const { clause, params: whereParams } = buildQueryWhereClause(table, options, whereNodes);
-  params.push(...whereParams);
+  const { clause } = buildQueryWhereClause(table, options, whereNodes, params);
   const joins = buildJoinClause(options.joins);
   const groupBy = buildGroupByClause(table.name, options.groupBy);
   const havingClause = buildHavingClause(table.name, options.having, params);
@@ -1579,26 +1577,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 = modelStatics(Model).$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "hydrate");
   }
   static dehydrateAttributes(attributes) {
-    const casts = modelStatics(Model).$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "dehydrate");
   }
   static fromRecord(record, repository, exists = true) {
-    const statics = modelStatics(Model);
+    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
     ]);
@@ -1608,17 +1606,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);
@@ -1629,22 +1627,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);
     }
@@ -1656,8 +1654,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

@@ -771,8 +771,7 @@ function buildWhereGroupClause(tableName, nodes, params) {
   }
   return result;
 }
-function buildAdvancedWhereClause(tableName, where = {}, whereNodes = []) {
-  const params = [];
+function buildAdvancedWhereClause(tableName, where = {}, whereNodes = [], params = []) {
   const nodes = [];
   if (Object.keys(where).length > 0) {
     nodes.push({ kind: "and", where });
@@ -807,18 +806,18 @@ function appendSoftDeleteScope(table, options, clauses) {
     clauses.push(`${qualifiedColumn} IS NULL`);
   }
 }
-function buildQueryWhereClause(table, options = {}, whereNodes = []) {
-  const { clause, params } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes);
+function buildQueryWhereClause(table, options = {}, whereNodes = [], params = []) {
+  const { clause, params: whereParams } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes, params);
   const softDeleteClauses = [];
   appendSoftDeleteScope(table, options, softDeleteClauses);
   if (softDeleteClauses.length === 0) {
-    return { clause, params };
+    return { clause, params: whereParams };
   }
   const base = clause.replace(/^ WHERE /, "");
   const scope = softDeleteClauses.join(" AND ");
   return {
     clause: base ? ` WHERE (${base}) AND ${scope}` : ` WHERE ${scope}`,
-    params
+    params: whereParams
   };
 }
 function isQueryOrder(value) {
@@ -922,8 +921,7 @@ function getDefinedColumnEntries(table, values, options = {}) {
 function buildSelectQuery(table, options = {}, whereNodes = []) {
   const params = [];
   const columns = buildSelectList(table, options.select, params);
-  const { clause, params: whereParams } = buildQueryWhereClause(table, options, whereNodes);
-  params.push(...whereParams);
+  const { clause } = buildQueryWhereClause(table, options, whereNodes, params);
   const joins = buildJoinClause(options.joins);
   const groupBy = buildGroupByClause(table.name, options.groupBy);
   const havingClause = buildHavingClause(table.name, options.having, params);
@@ -1750,26 +1748,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 = modelStatics(Model).$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "hydrate");
   }
   static dehydrateAttributes(attributes) {
-    const casts = modelStatics(Model).$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "dehydrate");
   }
   static fromRecord(record, repository, exists = true) {
-    const statics = modelStatics(Model);
+    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
     ]);
@@ -1779,17 +1777,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);
@@ -1800,22 +1798,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);
     }
@@ -1827,8 +1825,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

@@ -306,8 +306,7 @@ function buildWhereGroupClause(tableName, nodes, params) {
   }
   return result;
 }
-function buildAdvancedWhereClause(tableName, where = {}, whereNodes = []) {
-  const params = [];
+function buildAdvancedWhereClause(tableName, where = {}, whereNodes = [], params = []) {
   const nodes = [];
   if (Object.keys(where).length > 0) {
     nodes.push({ kind: "and", where });
@@ -342,18 +341,18 @@ function appendSoftDeleteScope(table, options, clauses) {
     clauses.push(`${qualifiedColumn} IS NULL`);
   }
 }
-function buildQueryWhereClause(table, options = {}, whereNodes = []) {
-  const { clause, params } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes);
+function buildQueryWhereClause(table, options = {}, whereNodes = [], params = []) {
+  const { clause, params: whereParams } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes, params);
   const softDeleteClauses = [];
   appendSoftDeleteScope(table, options, softDeleteClauses);
   if (softDeleteClauses.length === 0) {
-    return { clause, params };
+    return { clause, params: whereParams };
   }
   const base = clause.replace(/^ WHERE /, "");
   const scope = softDeleteClauses.join(" AND ");
   return {
     clause: base ? ` WHERE (${base}) AND ${scope}` : ` WHERE ${scope}`,
-    params
+    params: whereParams
   };
 }
 function isQueryOrder(value) {
@@ -457,8 +456,7 @@ function getDefinedColumnEntries(table, values, options = {}) {
 function buildSelectQuery(table, options = {}, whereNodes = []) {
   const params = [];
   const columns = buildSelectList(table, options.select, params);
-  const { clause, params: whereParams } = buildQueryWhereClause(table, options, whereNodes);
-  params.push(...whereParams);
+  const { clause } = buildQueryWhereClause(table, options, whereNodes, params);
   const joins = buildJoinClause(options.joins);
   const groupBy = buildGroupByClause(table.name, options.groupBy);
   const havingClause = buildHavingClause(table.name, options.having, params);
@@ -1355,26 +1353,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 = modelStatics(Model).$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "hydrate");
   }
   static dehydrateAttributes(attributes) {
-    const casts = modelStatics(Model).$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "dehydrate");
   }
   static fromRecord(record, repository, exists = true) {
-    const statics = modelStatics(Model);
+    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
     ]);
@@ -1384,17 +1382,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);
@@ -1405,22 +1403,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);
     }
@@ -1432,8 +1430,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

@@ -781,8 +781,7 @@ function buildWhereGroupClause(tableName, nodes, params) {
   }
   return result;
 }
-function buildAdvancedWhereClause(tableName, where = {}, whereNodes = []) {
-  const params = [];
+function buildAdvancedWhereClause(tableName, where = {}, whereNodes = [], params = []) {
   const nodes = [];
   if (Object.keys(where).length > 0) {
     nodes.push({ kind: "and", where });
@@ -817,18 +816,18 @@ function appendSoftDeleteScope(table, options, clauses) {
     clauses.push(`${qualifiedColumn} IS NULL`);
   }
 }
-function buildQueryWhereClause(table, options = {}, whereNodes = []) {
-  const { clause, params } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes);
+function buildQueryWhereClause(table, options = {}, whereNodes = [], params = []) {
+  const { clause, params: whereParams } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes, params);
   const softDeleteClauses = [];
   appendSoftDeleteScope(table, options, softDeleteClauses);
   if (softDeleteClauses.length === 0) {
-    return { clause, params };
+    return { clause, params: whereParams };
   }
   const base = clause.replace(/^ WHERE /, "");
   const scope = softDeleteClauses.join(" AND ");
   return {
     clause: base ? ` WHERE (${base}) AND ${scope}` : ` WHERE ${scope}`,
-    params
+    params: whereParams
   };
 }
 function isQueryOrder(value) {
@@ -932,8 +931,7 @@ function getDefinedColumnEntries(table, values, options = {}) {
 function buildSelectQuery(table, options = {}, whereNodes = []) {
   const params = [];
   const columns = buildSelectList(table, options.select, params);
-  const { clause, params: whereParams } = buildQueryWhereClause(table, options, whereNodes);
-  params.push(...whereParams);
+  const { clause } = buildQueryWhereClause(table, options, whereNodes, params);
   const joins = buildJoinClause(options.joins);
   const groupBy = buildGroupByClause(table.name, options.groupBy);
   const havingClause = buildHavingClause(table.name, options.having, params);
@@ -1760,26 +1758,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 = modelStatics(Model).$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "hydrate");
   }
   static dehydrateAttributes(attributes) {
-    const casts = modelStatics(Model).$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "dehydrate");
   }
   static fromRecord(record, repository, exists = true) {
-    const statics = modelStatics(Model);
+    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
     ]);
@@ -1789,17 +1787,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);
@@ -1810,22 +1808,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);
     }
@@ -1837,8 +1835,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/view.js

@@ -515,8 +515,7 @@ function buildWhereGroupClause(tableName, nodes, params) {
   }
   return result;
 }
-function buildAdvancedWhereClause(tableName, where = {}, whereNodes = []) {
-  const params = [];
+function buildAdvancedWhereClause(tableName, where = {}, whereNodes = [], params = []) {
   const nodes = [];
   if (Object.keys(where).length > 0) {
     nodes.push({ kind: "and", where });
@@ -551,18 +550,18 @@ function appendSoftDeleteScope(table, options, clauses) {
     clauses.push(`${qualifiedColumn} IS NULL`);
   }
 }
-function buildQueryWhereClause(table, options = {}, whereNodes = []) {
-  const { clause, params } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes);
+function buildQueryWhereClause(table, options = {}, whereNodes = [], params = []) {
+  const { clause, params: whereParams } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes, params);
   const softDeleteClauses = [];
   appendSoftDeleteScope(table, options, softDeleteClauses);
   if (softDeleteClauses.length === 0) {
-    return { clause, params };
+    return { clause, params: whereParams };
   }
   const base = clause.replace(/^ WHERE /, "");
   const scope = softDeleteClauses.join(" AND ");
   return {
     clause: base ? ` WHERE (${base}) AND ${scope}` : ` WHERE ${scope}`,
-    params
+    params: whereParams
   };
 }
 function isQueryOrder(value) {
@@ -666,8 +665,7 @@ function getDefinedColumnEntries(table, values, options = {}) {
 function buildSelectQuery(table, options = {}, whereNodes = []) {
   const params = [];
   const columns = buildSelectList(table, options.select, params);
-  const { clause, params: whereParams } = buildQueryWhereClause(table, options, whereNodes);
-  params.push(...whereParams);
+  const { clause } = buildQueryWhereClause(table, options, whereNodes, params);
   const joins = buildJoinClause(options.joins);
   const groupBy = buildGroupByClause(table.name, options.groupBy);
   const havingClause = buildHavingClause(table.name, options.having, params);
@@ -1564,26 +1562,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 = modelStatics(Model).$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "hydrate");
   }
   static dehydrateAttributes(attributes) {
-    const casts = modelStatics(Model).$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "dehydrate");
   }
   static fromRecord(record, repository, exists = true) {
-    const statics = modelStatics(Model);
+    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
     ]);
@@ -1593,17 +1591,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);
@@ -1614,22 +1612,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);
     }
@@ -1641,8 +1639,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

@@ -508,8 +508,7 @@ function buildWhereGroupClause(tableName, nodes, params) {
   }
   return result;
 }
-function buildAdvancedWhereClause(tableName, where = {}, whereNodes = []) {
-  const params = [];
+function buildAdvancedWhereClause(tableName, where = {}, whereNodes = [], params = []) {
   const nodes = [];
   if (Object.keys(where).length > 0) {
     nodes.push({ kind: "and", where });
@@ -544,18 +543,18 @@ function appendSoftDeleteScope(table, options, clauses) {
     clauses.push(`${qualifiedColumn} IS NULL`);
   }
 }
-function buildQueryWhereClause(table, options = {}, whereNodes = []) {
-  const { clause, params } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes);
+function buildQueryWhereClause(table, options = {}, whereNodes = [], params = []) {
+  const { clause, params: whereParams } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes, params);
   const softDeleteClauses = [];
   appendSoftDeleteScope(table, options, softDeleteClauses);
   if (softDeleteClauses.length === 0) {
-    return { clause, params };
+    return { clause, params: whereParams };
   }
   const base = clause.replace(/^ WHERE /, "");
   const scope = softDeleteClauses.join(" AND ");
   return {
     clause: base ? ` WHERE (${base}) AND ${scope}` : ` WHERE ${scope}`,
-    params
+    params: whereParams
   };
 }
 function isQueryOrder(value) {
@@ -659,8 +658,7 @@ function getDefinedColumnEntries(table, values, options = {}) {
 function buildSelectQuery(table, options = {}, whereNodes = []) {
   const params = [];
   const columns = buildSelectList(table, options.select, params);
-  const { clause, params: whereParams } = buildQueryWhereClause(table, options, whereNodes);
-  params.push(...whereParams);
+  const { clause } = buildQueryWhereClause(table, options, whereNodes, params);
   const joins = buildJoinClause(options.joins);
   const groupBy = buildGroupByClause(table.name, options.groupBy);
   const havingClause = buildHavingClause(table.name, options.having, params);
@@ -1665,26 +1663,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 = modelStatics(Model).$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "hydrate");
   }
   static dehydrateAttributes(attributes) {
-    const casts = modelStatics(Model).$casts ?? {};
+    const casts = modelStatics(this).$casts ?? {};
     return applyCasts(attributes, casts, "dehydrate");
   }
   static fromRecord(record, repository, exists = true) {
-    const statics = modelStatics(Model);
+    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
     ]);
@@ -1694,17 +1692,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);
@@ -1715,22 +1713,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);
     }
@@ -1742,8 +1740,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/package.json

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