velocious 1.0.111 → 1.0.113

package/dist/src/database/query/index.d.ts

@@ -1,44 +1,27 @@
 /**
- * A generic query over some model type.
+ * @typedef {object} QueryArgsType
+ * @property {import("../drivers/base.js").default} driver
+ * @property {Array<import("./from-base.js").default>} [froms]
+ * @property {string[]} [groups]
+ * @property {Array<import("./join-base.js").default>} [joins]
+ * @property {import("../handler.js").default} handler
+ * @property {number | null} [limit]
+ * @property {number | null} [offset]
+ * @property {Array<import("./order-base.js").default>} [orders]
+ * @property {number | null} [page]
+ * @property {number} [perPage]
+ * @property {NestedPreloadRecord} [preload]
+ * @property {Array<import("./select-base.js").default>} [selects]
+ * @property {Array<import("./where-base.js").default>} [wheres]
  */
 export default class VelociousDatabaseQuery {
     /**
-     * @param {object} args
-     * @param {import("../drivers/base.js").default} args.driver
-     * @param {Array<import("./from-base.js").default>} [args.froms]
-     * @param {string[]} [args.groups]
-     * @param {Array<import("./join-base.js").default>} [args.joins]
-     * @param {import("../handler.js").default} args.handler
-     * @param {number | null} [args.limit]
-     * @param {typeof import("../record/index.js").default} [args.modelClass]
-     * @param {number | null} [args.offset]
-     * @param {Array<import("./order-base.js").default>} [args.orders]
-     * @param {number | null} [args.page]
-     * @param {number} [args.perPage]
-     * @param {NestedPreloadRecord} [args.preload]
-     * @param {Array<import("./select-base.js").default>} [args.selects]
-     * @param {Array<import("./where-base.js").default>} [args.wheres]
+     * @param {QueryArgsType} args
      */
-    constructor({ driver, froms, groups, joins, handler, limit, modelClass, offset, orders, page, perPage, preload, selects, wheres, ...restArgs }: {
-        driver: import("../drivers/base.js").default;
-        froms?: Array<import("./from-base.js").default>;
-        groups?: string[];
-        joins?: Array<import("./join-base.js").default>;
-        handler: import("../handler.js").default;
-        limit?: number | null;
-        modelClass?: typeof import("../record/index.js").default;
-        offset?: number | null;
-        orders?: Array<import("./order-base.js").default>;
-        page?: number | null;
-        perPage?: number;
-        preload?: NestedPreloadRecord;
-        selects?: Array<import("./select-base.js").default>;
-        wheres?: Array<import("./where-base.js").default>;
-    });
+    constructor({ driver, froms, groups, joins, handler, limit, offset, orders, page, perPage, preload, selects, wheres }: QueryArgsType);
     driver: import("../drivers/base.js").default;
     handler: import("../handler.js").default;
     logger: Logger;
-    modelClass: typeof import("../record/index.js").default;
     _froms: import("./from-base.js").default[];
     _groups: string[];
     _joins: import("./join-base.js").default[];
@@ -51,75 +34,16 @@ export default class VelociousDatabaseQuery {
     _selects: SelectBase[];
     /** @type {import("./where-base.js").default[]} */
     _wheres: import("./where-base.js").default[];
-    /**
-     * @returns {VelociousDatabaseQuery}
-     */
-    clone(): VelociousDatabaseQuery;
-    /**
-     * @returns {Promise<number>}
-     */
-    count(): Promise<number>;
-    /**
-     * @returns {import("./from-base.js").default[]}
-     */
+    /** @returns {this} */
+    clone(): this;
+    /** @returns {import("./from-base.js").default[]} */
     getFroms(): import("./from-base.js").default[];
-    /**
-     * @returns {string[]}
-     */
+    /** @returns {string[]} */
     getGroups(): string[];
-    /**
-     * @returns {typeof import("../record/index.js").default}
-     */
-    getModelClass(): typeof import("../record/index.js").default;
-    /**
-     * @returns {import("../query-parser/options.js").default}
-     */
+    /** @returns {import("../query-parser/options.js").default} */
     getOptions(): import("../query-parser/options.js").default;
-    /**
-     * @returns {Array<import("./select-base.js").default>}
-     */
+    /** @returns {Array<import("./select-base.js").default>} */
     getSelects(): Array<import("./select-base.js").default>;
-    /**
-     * @returns {Promise<void>}
-     */
-    destroyAll(): Promise<void>;
-    /**
-     * @param {number|string} recordId
-     * @returns {Promise<import("../record/index.js").default>}
-     */
-    find(recordId: number | string): Promise<import("../record/index.js").default>;
-    /**
-     * @param {{[key: string]: any}} conditions
-     * @returns {Promise<import("../record/index.js").default|null>}
-     */
-    findBy(conditions: {
-        [key: string]: any;
-    }): Promise<import("../record/index.js").default | null>;
-    /**
-     * @param {{[key: string]: any}} conditions
-     * @param {function() : void} callback
-     * @returns {Promise<import("../record/index.js").default>}
-     */
-    findOrCreateBy(conditions: {
-        [key: string]: any;
-    }, callback: () => void): Promise<import("../record/index.js").default>;
-    /**
-     * @param {{[key: string]: any}} conditions
-     * @returns {Promise<import("../record/index.js").default>}
-     */
-    findByOrFail(conditions: {
-        [key: string]: any;
-    }): Promise<import("../record/index.js").default>;
-    /**
-     * @param {object} conditions
-     * @param {function(import("../record/index.js").default) : void} callback
-     * @returns {Promise<import("../record/index.js").default>}
-     */
-    findOrInitializeBy(conditions: object, callback: (arg0: import("../record/index.js").default) => void): Promise<import("../record/index.js").default>;
-    /**
-     * @returns {Promise<import("../record/index.js").default>}
-     */
-    first(): Promise<import("../record/index.js").default>;
     /**
      * @param {string|import("./from-base.js").default} from
      * @returns {this}
@@ -137,10 +61,6 @@ export default class VelociousDatabaseQuery {
     joins(join: string | {
         [key: string]: any;
     }): this;
-    /**
-     * @returns {Promise<import("../record/index.js").default>}
-     */
-    last(): Promise<import("../record/index.js").default>;
     /**
      * @param {number} value
      * @returns {this}
@@ -176,9 +96,7 @@ export default class VelociousDatabaseQuery {
      * @returns {this}
      */
     reorder(order: string | number): this;
-    /**
-     * @returns {this}
-     */
+    /** @returns {this} */
     reverseOrder(): this;
     /**
      * @param {SelectArgumentType} select
@@ -189,15 +107,8 @@ export default class VelociousDatabaseQuery {
      * @returns {Promise<Array<object>>} Array of results from the database
      */
     _executeQuery(): Promise<Array<object>>;
-    /**
-     * @returns {Promise<Array<object>>} Array of results from the database
-     */
+    /** @returns {Promise<Array<object>>} Array of results from the database */
     results(): Promise<Array<object>>;
-    /**
-     * Converts query results to array of model instances
-     * @returns {Promise<Array<import("../record/index.js").default>>}
-     */
-    toArray(): Promise<Array<import("../record/index.js").default>>;
     /**
      * Generates SQL string representing this query
      * @returns {string} SQL string representing this query
@@ -205,15 +116,30 @@ export default class VelociousDatabaseQuery {
     toSql(): string;
     /**
      * @param {WhereArgumentType} where
-     * @returns {VelociousDatabaseQuery} This query instance
+     * @returns {this} This query instance
      */
-    where(where: WhereArgumentType): VelociousDatabaseQuery;
+    where(where: WhereArgumentType): this;
 }
 export type NestedPreloadRecord = {
     [key: string]: boolean | NestedPreloadRecord;
 };
 export type SelectArgumentType = string | string[] | import("./select-base.js").default | import("./select-base.js").default[];
 export type WhereArgumentType = object | string;
+export type QueryArgsType = {
+    driver: import("../drivers/base.js").default;
+    froms?: Array<import("./from-base.js").default>;
+    groups?: string[];
+    joins?: Array<import("./join-base.js").default>;
+    handler: import("../handler.js").default;
+    limit?: number | null;
+    offset?: number | null;
+    orders?: Array<import("./order-base.js").default>;
+    page?: number | null;
+    perPage?: number;
+    preload?: NestedPreloadRecord;
+    selects?: Array<import("./select-base.js").default>;
+    wheres?: Array<import("./where-base.js").default>;
+};
 import { Logger } from "../../logger.js";
 import SelectBase from "./select-base.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/database/query/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/database/query/index.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/database/query/index.js"],"names":[],"mappings":"AAoBA;;;;;;;;;;;;;;;GAeG;AAEH;IACE;;OAEG;IACH,uHAFW,aAAa,EAoCvB;IAhBC,6CAAoB;IACpB,yCAAsB;IACtB,eAA8B;IAC9B,2CAAmB;IACnB,kBAAqB;IACrB,2CAAmB;IACnB,eAAmB;IACnB,gBAAqB;IACrB,6CAAqB;IACrB,cAAiB;IACjB,iBAAuB;IACvB,8BAAuB;IACvB,uBAAuB;IAEvB,kDAAkD;IAClD,SADW,OAAO,iBAAiB,EAAE,OAAO,EAAE,CACzB;IAGvB,sBAAsB;IACtB,SADc,IAAI,CAoBjB;IAED,oDAAoD;IACpD,YADc,OAAO,gBAAgB,EAAE,OAAO,EAAE,CAG/C;IAED,0BAA0B;IAC1B,aADc,MAAM,EAAE,CAGrB;IAED,8DAA8D;IAC9D,cADc,OAAO,4BAA4B,EAAE,OAAO,CACb;IAE7C,2DAA2D;IAC3D,cADc,KAAK,CAAC,OAAO,kBAAkB,EAAE,OAAO,CAAC,CAClB;IAErC;;;OAGG;IACH,WAHW,MAAM,GAAC,OAAO,gBAAgB,EAAE,OAAO,GACrC,IAAI,CAOhB;IAED;;;OAGG;IACH,aAHW,MAAM,GACJ,IAAI,CAKhB;IAED;;;OAGG;IACH,YAHW,MAAM,GAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,GACzB,IAAI,CAYhB;IAED;;;OAGG;IACH,aAHW,MAAM,GACJ,IAAI,CAKhB;IAED;;;OAGG;IACH,cAHW,MAAM,GACJ,IAAI,CAKhB;IAED;;;OAGG;IACH,aAHW,MAAM,GAAG,MAAM,GACb,IAAI,CAYhB;IAED;;;OAGG;IACH,iBAHW,MAAM,GACJ,IAAI,CAWhB;IAED;;;OAGG;IACH,iBAHW,MAAM,GACJ,IAAI,CAKhB;IAED;;;OAGG;IACH,cAHW,mBAAmB,GACjB,IAAI,CAKhB;IAED;;;OAGG;IACH,eAHW,MAAM,GAAG,MAAM,GACb,IAAI,CAMhB;IAED,sBAAsB;IACtB,gBADc,IAAI,CAOjB;IAED;;;OAGG;IACH,eAHW,kBAAkB,GAChB,IAAI,CAoBhB;IAED;;OAEG;IACH,iBAFa,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CASlC;IAED,2EAA2E;IAC3E,WADc,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAGnC;IAED;;;OAGG;IACH,SAFa,MAAM,CAE4B;IAE/C;;;OAGG;IACH,aAHW,iBAAiB,GACf,IAAI,CAYhB;CACF;kCAxSY;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,mBAAmB,CAAA;CAAE;iCAC/C,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,kBAAkB,EAAE,OAAO,GAAG,OAAO,kBAAkB,EAAE,OAAO,EAAE;gCAC7F,MAAM,GAAG,MAAM;;YAiBd,OAAO,oBAAoB,EAAE,OAAO;YACpC,KAAK,CAAC,OAAO,gBAAgB,EAAE,OAAO,CAAC;aACvC,MAAM,EAAE;YACR,KAAK,CAAC,OAAO,gBAAgB,EAAE,OAAO,CAAC;aACvC,OAAO,eAAe,EAAE,OAAO;YAC/B,MAAM,GAAG,IAAI;aACb,MAAM,GAAG,IAAI;aACb,KAAK,CAAC,OAAO,iBAAiB,EAAE,OAAO,CAAC;WACxC,MAAM,GAAG,IAAI;cACb,MAAM;cACN,mBAAmB;cACnB,KAAK,CAAC,OAAO,kBAAkB,EAAE,OAAO,CAAC;aACzC,KAAK,CAAC,OAAO,iBAAiB,EAAE,OAAO,CAAC;;uBArBjC,iBAAiB;uBAEf,kBAAkB"}

package/dist/src/database/query/index.js

@@ -6,50 +6,43 @@
  */
 import FromPlain from "./from-plain.js";
 import { incorporate } from "incorporator";
-import * as inflection from "inflection";
 import { isPlainObject } from "is-plain-object";
 import JoinObject from "./join-object.js";
 import JoinPlain from "./join-plain.js";
 import { Logger } from "../../logger.js";
 import OrderPlain from "./order-plain.js";
-import Preloader from "./preloader.js";
-import RecordNotFoundError from "../record/record-not-found-error.js";
 import SelectBase from "./select-base.js";
 import SelectPlain from "./select-plain.js";
 import WhereHash from "./where-hash.js";
 import WherePlain from "./where-plain.js";
-import restArgsError from "../../utils/rest-args-error.js";
 /**
- * A generic query over some model type.
+ * @typedef {object} QueryArgsType
+ * @property {import("../drivers/base.js").default} driver
+ * @property {Array<import("./from-base.js").default>} [froms]
+ * @property {string[]} [groups]
+ * @property {Array<import("./join-base.js").default>} [joins]
+ * @property {import("../handler.js").default} handler
+ * @property {number | null} [limit]
+ * @property {number | null} [offset]
+ * @property {Array<import("./order-base.js").default>} [orders]
+ * @property {number | null} [page]
+ * @property {number} [perPage]
+ * @property {NestedPreloadRecord} [preload]
+ * @property {Array<import("./select-base.js").default>} [selects]
+ * @property {Array<import("./where-base.js").default>} [wheres]
  */
 export default class VelociousDatabaseQuery {
     /**
-     * @param {object} args
-     * @param {import("../drivers/base.js").default} args.driver
-     * @param {Array<import("./from-base.js").default>} [args.froms]
-     * @param {string[]} [args.groups]
-     * @param {Array<import("./join-base.js").default>} [args.joins]
-     * @param {import("../handler.js").default} args.handler
-     * @param {number | null} [args.limit]
-     * @param {typeof import("../record/index.js").default} [args.modelClass]
-     * @param {number | null} [args.offset]
-     * @param {Array<import("./order-base.js").default>} [args.orders]
-     * @param {number | null} [args.page]
-     * @param {number} [args.perPage]
-     * @param {NestedPreloadRecord} [args.preload]
-     * @param {Array<import("./select-base.js").default>} [args.selects]
-     * @param {Array<import("./where-base.js").default>} [args.wheres]
+     * @param {QueryArgsType} args
      */
-    constructor({ driver, froms = [], groups = [], joins = [], handler, limit = null, modelClass, offset = null, orders = [], page = null, perPage, preload = {}, selects = [], wheres = [], ...restArgs }) {
+    constructor({ driver, froms = [], groups = [], joins = [], handler, limit = null, offset = null, orders = [], page = null, perPage, preload = {}, selects = [], wheres = [] }) {
         if (!driver)
             throw new Error("No driver given to query");
         if (!handler)
             throw new Error("No handler given to query");
-        restArgsError(restArgs);
         this.driver = driver;
         this.handler = handler;
         this.logger = new Logger(this);
-        this.modelClass = modelClass;
         this._froms = froms;
         this._groups = groups;
         this._joins = joins;
@@ -63,18 +56,16 @@ export default class VelociousDatabaseQuery {
         /** @type {import("./where-base.js").default[]} */
         this._wheres = wheres;
     }
-    /**
-     * @returns {VelociousDatabaseQuery}
-     */
+    /** @returns {this} */
     clone() {
-        const newQuery = new VelociousDatabaseQuery({
+        const QueryClass = /** @type {new (args: QueryArgsType) => this} */ (this.constructor);
+        const newQuery = new QueryClass({
             driver: this.driver,
             froms: [...this._froms],
             handler: this.handler.clone(),
             groups: [...this._groups],
             joins: [...this._joins],
             limit: this._limit,
-            modelClass: this.modelClass,
             offset: this._offset,
             orders: [...this._orders],
             page: this._page,
@@ -85,152 +76,18 @@ export default class VelociousDatabaseQuery {
         });
         return newQuery;
     }
-    /**
-     * @returns {Promise<number>}
-     */
-    async count() {
-        // Generate count SQL
-        let sql = `COUNT(${this.driver.quoteTable(this.getModelClass().tableName())}.${this.driver.quoteColumn(this.getModelClass().primaryKey())})`;
-        if (this.driver.getType() == "pgsql")
-            sql += "::int";
-        sql += " AS count";
-        // Clone query and execute count
-        const countQuery = this.clone();
-        countQuery._selects = [];
-        countQuery.select(sql);
-        const results = /** @type {{ count: number }[]} */ (await countQuery._executeQuery());
-        // The query isn't grouped and a single result has been given
-        if (results.length == 1) {
-            return results[0].count;
-        }
-        // The query may be grouped and a lot of different counts a given
-        let countResult = 0;
-        for (const result of results) {
-            if (!("count" in result)) {
-                throw new Error("Invalid count result");
-            }
-            countResult += result.count;
-        }
-        return countResult;
-    }
-    /**
-     * @returns {import("./from-base.js").default[]}
-     */
+    /** @returns {import("./from-base.js").default[]} */
     getFroms() {
         return this._froms;
     }
-    /**
-     * @returns {string[]}
-     */
+    /** @returns {string[]} */
     getGroups() {
         return this._groups;
     }
-    /**
-     * @returns {typeof import("../record/index.js").default}
-     */
-    getModelClass() {
-        if (!this.modelClass)
-            throw new Error("modelClass not set");
-        return this.modelClass;
-    }
-    /**
-     * @returns {import("../query-parser/options.js").default}
-     */
+    /** @returns {import("../query-parser/options.js").default} */
     getOptions() { return this.driver.options(); }
-    /**
-     * @returns {Array<import("./select-base.js").default>}
-     */
+    /** @returns {Array<import("./select-base.js").default>} */
     getSelects() { return this._selects; }
-    /**
-     * @returns {Promise<void>}
-     */
-    async destroyAll() {
-        const records = await this.toArray();
-        for (const record of records) {
-            await record.destroy();
-        }
-    }
-    /**
-     * @param {number|string} recordId
-     * @returns {Promise<import("../record/index.js").default>}
-     */
-    async find(recordId) {
-        /** @type {{[key: string]: number | string}} */
-        const conditions = {};
-        conditions[this.getModelClass().primaryKey()] = recordId;
-        const query = this.clone().where(conditions);
-        const record = await query.first();
-        if (!record) {
-            throw new RecordNotFoundError(`Couldn't find ${this.getModelClass().name} with '${this.getModelClass().primaryKey()}'=${recordId}`);
-        }
-        return record;
-    }
-    /**
-     * @param {{[key: string]: any}} conditions
-     * @returns {Promise<import("../record/index.js").default|null>}
-     */
-    async findBy(conditions) {
-        /** @type {{[key: string]: number | string}} */
-        const newConditions = {};
-        for (const key in conditions) {
-            const keyUnderscore = inflection.underscore(key);
-            newConditions[keyUnderscore] = conditions[key];
-        }
-        return await this.clone().where(newConditions).first();
-    }
-    /**
-     * @param {{[key: string]: any}} conditions
-     * @param {function() : void} callback
-     * @returns {Promise<import("../record/index.js").default>}
-     */
-    async findOrCreateBy(conditions, callback) {
-        const record = await this.findOrInitializeBy(conditions, callback);
-        if (record.isNewRecord()) {
-            await record.save();
-        }
-        return record;
-    }
-    /**
-     * @param {{[key: string]: any}} conditions
-     * @returns {Promise<import("../record/index.js").default>}
-     */
-    async findByOrFail(conditions) {
-        /** @type {{[key: string]: number | string}} */
-        const newConditions = {};
-        for (const key in conditions) {
-            const keyUnderscore = inflection.underscore(key);
-            newConditions[keyUnderscore] = conditions[key];
-        }
-        const model = await this.clone().where(newConditions).first();
-        if (!model) {
-            throw new Error("Record not found");
-        }
-        return model;
-    }
-    /**
-     * @param {object} conditions
-     * @param {function(import("../record/index.js").default) : void} callback
-     * @returns {Promise<import("../record/index.js").default>}
-     */
-    async findOrInitializeBy(conditions, callback) {
-        const record = await this.findBy(conditions);
-        if (record)
-            return record;
-        const ModelClass = this.getModelClass();
-        const newRecord = new ModelClass(conditions);
-        if (callback) {
-            callback(newRecord);
-        }
-        return newRecord;
-    }
-    /**
-     * @returns {Promise<import("../record/index.js").default>}
-     */
-    async first() {
-        const newQuery = this.clone().limit(1).reorder(`${this.driver.quoteTable(this.getModelClass().tableName())}.${this.driver.quoteColumn(this.getModelClass().orderableColumn())}`);
-        const results = await newQuery.toArray();
-        return results[0];
-    }
     /**
      * @param {string|import("./from-base.js").default} from
      * @returns {this}
@@ -265,15 +122,6 @@ export default class VelociousDatabaseQuery {
         }
         return this;
     }
-    /**
-     * @returns {Promise<import("../record/index.js").default>}
-     */
-    async last() {
-        const primaryKey = this.getModelClass().primaryKey();
-        const tableName = this.getModelClass().tableName();
-        const results = await this.clone().reorder(`${this.driver.quoteTable(tableName)}.${this.driver.quoteColumn(primaryKey)} DESC`).limit(1).toArray();
-        return results[0];
-    }
     /**
      * @param {number} value
      * @returns {this}
@@ -344,9 +192,7 @@ export default class VelociousDatabaseQuery {
         this.order(order);
         return this;
     }
-    /**
-     * @returns {this}
-     */
+    /** @returns {this} */
     reverseOrder() {
         for (const order of this._orders) {
             order.setReverseOrder(true);
@@ -384,35 +230,10 @@ export default class VelociousDatabaseQuery {
         this.logger.debug(() => ["SQL:", sql]);
         return results;
     }
-    /**
-     * @returns {Promise<Array<object>>} Array of results from the database
-     */
+    /** @returns {Promise<Array<object>>} Array of results from the database */
     async results() {
         return await this._executeQuery();
     }
-    /**
-     * Converts query results to array of model instances
-     * @returns {Promise<Array<import("../record/index.js").default>>}
-     */
-    async toArray() {
-        const models = [];
-        const results = await this.results();
-        for (const result of results) {
-            const ModelClass = this.getModelClass();
-            const model = new ModelClass();
-            model.loadExistingRecord(result);
-            models.push(model);
-        }
-        if (Object.keys(this._preload).length > 0 && models.length > 0) {
-            const preloader = new Preloader({
-                modelClass: this.modelClass,
-                models,
-                preload: this._preload
-            });
-            await preloader.run();
-        }
-        return models;
-    }
     /**
      * Generates SQL string representing this query
      * @returns {string} SQL string representing this query
@@ -420,7 +241,7 @@ export default class VelociousDatabaseQuery {
     toSql() { return this.driver.queryToSql(this); }
     /**
      * @param {WhereArgumentType} where
-     * @returns {VelociousDatabaseQuery} This query instance
+     * @returns {this} This query instance
      */
     where(where) {
         if (typeof where == "string") {

package/dist/src/database/query/join-object.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"join-object.d.ts","sourceRoot":"","sources":["../../../../src/database/query/join-object.js"],"names":[],"mappings":"AAIA;;GAEG;AAEH;IACE;;OAEG;IACH,oBAFW,UAAU,EAKpB;IADC,mBAAoB;IAGtB,gBAIC;IAED;;;;;;OAMG;IACH,iBANW,UAAU,cACV,cAAc,oBAAoB,EAAE,OAAO,OAC3C,MAAM,cACN,MAAM,GACJ,MAAM,CAqClB;CACF;yBA7DY;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,UAAU,CAAA;CAAC;qBAH7B,gBAAgB"}
+{"version":3,"file":"join-object.d.ts","sourceRoot":"","sources":["../../../../src/database/query/join-object.js"],"names":[],"mappings":"AAIA;;GAEG;AAEH;IACE;;OAEG;IACH,oBAFW,UAAU,EAKpB;IADC,mBAAoB;IAGtB,gBAWC;IAED;;;;;;OAMG;IACH,iBANW,UAAU,cACV,cAAc,oBAAoB,EAAE,OAAO,OAC3C,MAAM,cACN,MAAM,GACJ,MAAM,CAqClB;CACF;yBApEY;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,UAAU,CAAA;CAAC;qBAH7B,gBAAgB"}

package/dist/src/database/query/join-object.js

@@ -12,8 +12,13 @@ export default class VelociousDatabaseQueryJoinObject extends JoinBase {
         this.object = object;
     }
     toSql() {
-        const modelClass = this.getQuery().modelClass;
-        return this.joinObject(this.object, modelClass, "", 0);
+        const query = this.getQuery();
+        if (query.constructor.name != "VelociousDatabaseQueryModelClassQuery") {
+            throw new Error(`Query has to be a ModelClassQuery but was a ${query.constructor.name}`);
+        }
+        // @ts-expect-error
+        const ModelClass = /** @type {typeof import("../record/index.js").default} */ (query.modelClass);
+        return this.joinObject(this.object, ModelClass, "", 0);
     }
     /**
      * @param {JoinObject} join

package/dist/src/database/query/model-class-query.d.ts

@@ -0,0 +1,98 @@
+/**
+ * @typedef {{[key: string]: boolean | NestedPreloadRecord }} NestedPreloadRecord
+ * @typedef {string | string[] | import("./select-base.js").default | import("./select-base.js").default[]} SelectArgumentType
+ * @typedef {object | string} WhereArgumentType
+ */
+/**
+ * @template {typeof import("../record/index.js").default} MC
+ * @typedef {InstanceType<MC>} ModelOf
+ */
+/**
+ * @template {typeof import("../record/index.js").default} MC
+ * @typedef {import("./index.js").QueryArgsType & object} ModelClassQueryArgsType
+ * @property {MC} modelClass
+ */
+/**
+ * A generic query over some model type.
+ * @template {typeof import("../record/index.js").default} MC
+ */
+export default class VelociousDatabaseQueryModelClassQuery<MC extends typeof import("../record/index.js").default> extends DatabaseQuery {
+    /**
+     * @param {ModelClassQueryArgsType<MC>} args
+     */
+    constructor(args: ModelClassQueryArgsType<MC>);
+    modelClass: any;
+    /** @returns {this} */
+    clone(): this;
+    /** @returns {Promise<number>} */
+    count(): Promise<number>;
+    /** @returns {MC} */
+    getModelClass(): MC;
+    /** @returns {Promise<void>} */
+    destroyAll(): Promise<void>;
+    /**
+     * @param {number|string} recordId
+     * @returns {Promise<InstanceType<MC>>}
+     */
+    find(recordId: number | string): Promise<InstanceType<MC>>;
+    /**
+     * @param {{[key: string]: any}} conditions
+     * @returns {Promise<InstanceType<MC> | null>}
+     */
+    findBy(conditions: {
+        [key: string]: any;
+    }): Promise<InstanceType<MC> | null>;
+    /**
+     * @param {{[key: string]: any}} conditions
+     * @param {function() : void} callback
+     * @returns {Promise<InstanceType<MC>>}
+     */
+    findOrCreateBy(conditions: {
+        [key: string]: any;
+    }, callback: () => void): Promise<InstanceType<MC>>;
+    /**
+     * @param {{[key: string]: any}} conditions
+     * @returns {Promise<InstanceType<MC>>}
+     */
+    findByOrFail(conditions: {
+        [key: string]: any;
+    }): Promise<InstanceType<MC>>;
+    /**
+     * @param {object} conditions
+     * @param {function(import("../record/index.js").default) : void} callback
+     * @returns {Promise<InstanceType<MC>>}
+     */
+    findOrInitializeBy(conditions: object, callback: (arg0: import("../record/index.js").default) => void): Promise<InstanceType<MC>>;
+    /**
+     * @returns {Promise<InstanceType<MC>>}
+     */
+    first(): Promise<InstanceType<MC>>;
+    /**
+     * @returns {Promise<InstanceType<MC>>}
+     */
+    last(): Promise<InstanceType<MC>>;
+    /**
+     * @param {NestedPreloadRecord} data
+     * @returns {this}
+     */
+    preload(data: NestedPreloadRecord): this;
+    /**
+     * @param {SelectArgumentType} select
+     * @returns {this}
+     */
+    select(select: SelectArgumentType): this;
+    /**
+     * Converts query results to array of model instances
+     * @returns {Promise<Array<InstanceType<MC>>>}
+     */
+    toArray(): Promise<Array<InstanceType<MC>>>;
+}
+export type NestedPreloadRecord = {
+    [key: string]: boolean | NestedPreloadRecord;
+};
+export type SelectArgumentType = string | string[] | import("./select-base.js").default | import("./select-base.js").default[];
+export type WhereArgumentType = object | string;
+export type ModelOf<MC extends typeof import("../record/index.js").default> = InstanceType<MC>;
+export type ModelClassQueryArgsType<MC extends typeof import("../record/index.js").default> = import("./index.js").QueryArgsType & object;
+import DatabaseQuery from "./index.js";
+//# sourceMappingURL=model-class-query.d.ts.map

package/dist/src/database/query/model-class-query.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-class-query.d.ts","sourceRoot":"","sources":["../../../../src/database/query/model-class-query.js"],"names":[],"mappings":"AAWA;;;;GAIG;AACH;;;GAGG;AACH;;;;GAIG;AAEH;;;GAGG;AACH,2DAF2D,EAAE,SAAhD,cAAe,oBAAoB,EAAE,OAAQ;IAGxD;;OAEG;IACH,kBAFW,uBAAuB,CAAC,EAAE,CAAC,EAUrC;IADC,gBAA4B;IAG9B,sBAAsB;IACtB,SADc,IAAI,CAsBjB;IAED,iCAAiC;IACjC,SADc,OAAO,CAAC,MAAM,CAAC,CAqC5B;IAED,oBAAoB;IACpB,iBADc,EAAE,CAKf;IAED,+BAA+B;IAC/B,cADc,OAAO,CAAC,IAAI,CAAC,CAO1B;IAED;;;OAGG;IACH,eAHW,MAAM,GAAC,MAAM,GACX,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAmBrC;IAED;;;OAGG;IACH,mBAHW;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,GAClB,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAiB5C;IAED;;;;OAIG;IACH,2BAJW;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,YACpB,MAAa,IAAI,GACf,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAUrC;IAED;;;OAGG;IACH,yBAHW;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,GAClB,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAuBrC;IAED;;;;OAIG;IACH,+BAJW,MAAM,YACN,CAAS,IAAoC,EAApC,OAAO,oBAAoB,EAAE,OAAO,KAAI,IAAI,GACnD,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAerC;IAED;;OAEG;IACH,SAFa,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAOrC;IAED;;OAEG;IACH,QAFa,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAQrC;IAED;;;OAGG;IACH,cAHW,mBAAmB,GACjB,IAAI,CAKhB;IAED;;;OAGG;IACH,eAHW,kBAAkB,GAChB,IAAI,CAoBhB;IAED;;;OAGG;IACH,WAFa,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAyB5C;CACF;kCA3SY;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,mBAAmB,CAAA;CAAE;iCAC/C,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,kBAAkB,EAAE,OAAO,GAAG,OAAO,kBAAkB,EAAE,OAAO,EAAE;gCAC7F,MAAM,GAAG,MAAM;oBAG+B,EAAE,SAAhD,cAAe,oBAAoB,EAAE,OAAQ,IAC7C,YAAY,CAAC,EAAE,CAAC;oCAG8B,EAAE,SAAhD,cAAe,oBAAoB,EAAE,OAAQ,IAC7C,OAAO,YAAY,EAAE,aAAa,GAAG,MAAM;0BAhB9B,YAAY"}