velocious 1.0.113 → 1.0.114

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

@@ -1,3 +1,8 @@
+/**
+ * @typedef {{[key: string]: boolean | NestedPreloadRecord }} NestedPreloadRecord
+ * @typedef {string | string[] | import("./select-base.js").default | import("./select-base.js").default[]} SelectArgumentType
+ * @typedef {object | string} WhereArgumentType
+ */
 /**
  * @typedef {object} QueryArgsType
  * @property {import("../drivers/base.js").default} driver
@@ -86,11 +91,6 @@ export default class VelociousDatabaseQuery {
      * @returns {this}
      */
     perPage(perPage: number): this;
-    /**
-     * @param {NestedPreloadRecord} data
-     * @returns {this}
-     */
-    preload(data: NestedPreloadRecord): this;
     /**
      * @param {string | number} order
      * @returns {this}

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":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/database/query/index.js"],"names":[],"mappings":"AAaA;;;;GAIG;AAEH;;;;;;;;;;;;;;;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,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;kCAnRY;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;;YAKd,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;;uBA3BjC,iBAAiB;uBAEf,kBAAkB"}

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

@@ -1,11 +1,5 @@
 // @ts-check
-/**
- * @typedef {{[key: string]: boolean | NestedPreloadRecord }} NestedPreloadRecord
- * @typedef {string | string[] | import("./select-base.js").default | import("./select-base.js").default[]} SelectArgumentType
- * @typedef {object | string} WhereArgumentType
- */
 import FromPlain from "./from-plain.js";
-import { incorporate } from "incorporator";
 import { isPlainObject } from "is-plain-object";
 import JoinObject from "./join-object.js";
 import JoinPlain from "./join-plain.js";
@@ -15,6 +9,11 @@ import SelectBase from "./select-base.js";
 import SelectPlain from "./select-plain.js";
 import WhereHash from "./where-hash.js";
 import WherePlain from "./where-plain.js";
+/**
+ * @typedef {{[key: string]: boolean | NestedPreloadRecord }} NestedPreloadRecord
+ * @typedef {string | string[] | import("./select-base.js").default | import("./select-base.js").default[]} SelectArgumentType
+ * @typedef {object | string} WhereArgumentType
+ */
 /**
  * @typedef {object} QueryArgsType
  * @property {import("../drivers/base.js").default} driver
@@ -175,14 +174,6 @@ export default class VelociousDatabaseQuery {
         this._perPage = perPage;
         return this;
     }
-    /**
-     * @param {NestedPreloadRecord} data
-     * @returns {this}
-     */
-    preload(data) {
-        incorporate(this._preload, data);
-        return this;
-    }
     /**
      * @param {string | number} order
      * @returns {this}

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

@@ -1,27 +1,19 @@
-/**
- * @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
+ * @typedef {import("./index.js").QueryArgsType & {modelClass: MC}} ModelClassQueryArgsType
  */
 /**
  * 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
-     */
+    /** @param {ModelClassQueryArgsType<MC>} args */
     constructor(args: ModelClassQueryArgsType<MC>);
-    modelClass: any;
+    /** @type {MC} */
+    modelClass: MC;
     /** @returns {this} */
     clone(): this;
     /** @returns {Promise<number>} */
@@ -44,12 +36,12 @@ export default class VelociousDatabaseQueryModelClassQuery<MC extends typeof imp
     }): Promise<InstanceType<MC> | null>;
     /**
      * @param {{[key: string]: any}} conditions
-     * @param {function() : void} callback
+     * @param {function(InstanceType<MC>) : void} callback
      * @returns {Promise<InstanceType<MC>>}
      */
     findOrCreateBy(conditions: {
         [key: string]: any;
-    }, callback: () => void): Promise<InstanceType<MC>>;
+    }, callback: (arg0: InstanceType<MC>) => void): Promise<InstanceType<MC>>;
     /**
      * @param {{[key: string]: any}} conditions
      * @returns {Promise<InstanceType<MC>>}
@@ -59,40 +51,27 @@ export default class VelociousDatabaseQueryModelClassQuery<MC extends typeof imp
     }): 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>>;
-    /**
+     * @param {function(InstanceType<MC>) : void} callback
      * @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;
+    findOrInitializeBy(conditions: object, callback: (arg0: InstanceType<MC>) => void): Promise<InstanceType<MC>>;
+    /** @returns {Promise<InstanceType<MC> | undefined>} */
+    first(): Promise<InstanceType<MC> | undefined>;
+    /** @returns {Promise<InstanceType<MC> | undefined>} */
+    last(): Promise<InstanceType<MC> | undefined>;
     /**
-     * @param {SelectArgumentType} select
+     * @param {import("./index.js").NestedPreloadRecord} data
      * @returns {this}
      */
-    select(select: SelectArgumentType): this;
+    preload(data: import("./index.js").NestedPreloadRecord): 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 ModelClassQueryArgsType<MC extends typeof import("../record/index.js").default> = import("./index.js").QueryArgsType & {
+    modelClass: MC;
 };
-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

@@ -1 +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"}
+{"version":3,"file":"model-class-query.d.ts","sourceRoot":"","sources":["../../../../src/database/query/model-class-query.js"],"names":[],"mappings":"AASA;;GAEG;AACH;;;GAGG;AAEH;;;GAGG;AACH,2DAX2D,EAAE,SAAhD,cAAe,oBAAoB,EAAE,OAAQ;IAYxD,gDAAgD;IAChD,kBADY,uBAAuB,CAAC,EAAE,CAAC,EAWtC;IAFC,iBAAiB;IACjB,YADW,EAAE,CACe;IAG9B,sBAAsB;IACtB,SADc,IAAI,CAqBjB;IAED,iCAAiC;IACjC,SADc,OAAO,CAAC,MAAM,CAAC,CAmC5B;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,CAAS,IAAgB,EAAhB,YAAY,CAAC,EAAE,CAAC,KAAI,IAAI,GAC/B,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,IAAgB,EAAhB,YAAY,CAAC,EAAE,CAAC,KAAI,IAAI,GAC/B,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAerC;IAED,uDAAuD;IACvD,SADc,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAMlD;IAED,uDAAuD;IACvD,QADc,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAOlD;IAED;;;OAGG;IACH,cAHW,OAAO,YAAY,EAAE,mBAAmB,GACtC,IAAI,CAKhB;IAED;;;OAGG;IACH,WAFa,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAyB5C;CACF;oCAlQ0D,EAAE,SAAhD,cAAe,oBAAoB,EAAE,OAAQ,IAC7C,OAAO,YAAY,EAAE,aAAa,GAAG;IAAC,UAAU,EAAE,EAAE,CAAA;CAAC;0BARxC,YAAY"}

package/dist/src/database/query/model-class-query.js

@@ -5,42 +5,31 @@ import { Logger } from "../../logger.js";
 import Preloader from "./preloader.js";
 import DatabaseQuery from "./index.js";
 import RecordNotFoundError from "../record/record-not-found-error.js";
-import SelectBase from "./select-base.js";
-import SelectPlain from "./select-plain.js";
-/**
- * @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
+ * @typedef {import("./index.js").QueryArgsType & {modelClass: MC}} ModelClassQueryArgsType
  */
 /**
  * A generic query over some model type.
  * @template {typeof import("../record/index.js").default} MC
  */
 export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery {
-    /**
-     * @param {ModelClassQueryArgsType<MC>} args
-     */
+    /** @param {ModelClassQueryArgsType<MC>} args */
     constructor(args) {
         const { modelClass } = args;
         if (!modelClass)
             throw new Error(`No modelClass given in ${Object.keys(args).join(", ")}`);
         super(args);
         this.logger = new Logger(this);
+        /** @type {MC} */
         this.modelClass = modelClass;
     }
     /** @returns {this} */
     clone() {
-        // @ts-expect-error
-        const newQuery = /** @type {new (args: ModelClassQueryArgsType<MC>) => this} */ (new VelociousDatabaseQueryModelClassQuery({
+        const newQuery = /** @type {VelociousDatabaseQueryModelClassQuery<MC>} */ (new VelociousDatabaseQueryModelClassQuery({
             driver: this.driver,
             froms: [...this._froms],
             handler: this.handler.clone(),
@@ -70,7 +59,7 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
         const countQuery = this.clone();
         countQuery._selects = [];
         countQuery.select(sql);
-        const results = /** @type {{ count: number }[]} */ (await countQuery._executeQuery());
+        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;
@@ -131,7 +120,7 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
     }
     /**
      * @param {{[key: string]: any}} conditions
-     * @param {function() : void} callback
+     * @param {function(InstanceType<MC>) : void} callback
      * @returns {Promise<InstanceType<MC>>}
      */
     async findOrCreateBy(conditions, callback) {
@@ -162,7 +151,7 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
     }
     /**
      * @param {object} conditions
-     * @param {function(import("../record/index.js").default) : void} callback
+     * @param {function(InstanceType<MC>) : void} callback
      * @returns {Promise<InstanceType<MC>>}
      */
     async findOrInitializeBy(conditions, callback) {
@@ -176,17 +165,13 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
         }
         return newRecord;
     }
-    /**
-     * @returns {Promise<InstanceType<MC>>}
-     */
+    /** @returns {Promise<InstanceType<MC> | undefined>} */
     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];
     }
-    /**
-     * @returns {Promise<InstanceType<MC>>}
-     */
+    /** @returns {Promise<InstanceType<MC> | undefined>} */
     async last() {
         const primaryKey = this.getModelClass().primaryKey();
         const tableName = this.getModelClass().tableName();
@@ -194,35 +179,13 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
         return results[0];
     }
     /**
-     * @param {NestedPreloadRecord} data
+     * @param {import("./index.js").NestedPreloadRecord} data
      * @returns {this}
      */
     preload(data) {
         incorporate(this._preload, data);
         return this;
     }
-    /**
-     * @param {SelectArgumentType} select
-     * @returns {this}
-     */
-    select(select) {
-        if (Array.isArray(select)) {
-            for (const selectInArray of select) {
-                this.select(selectInArray);
-            }
-            return this;
-        }
-        if (typeof select == "string") {
-            this._selects.push(new SelectPlain(select));
-        }
-        else if (select instanceof SelectBase) {
-            this._selects.push(select);
-        }
-        else {
-            throw new Error(`Invalid select type: ${typeof select}`);
-        }
-        return this;
-    }
     /**
      * Converts query results to array of model instances
      * @returns {Promise<Array<InstanceType<MC>>>}

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

@@ -203,21 +203,13 @@ declare class VelociousDatabaseRecord {
      * @param {Record<string, boolean | Record<string, any>>} validators The validators to add. Key is the validator name, value is the validator arguments.
      */
     static validates(attributeName: string, validators: Record<string, boolean | Record<string, any>>): Promise<void>;
-    /**
-     * @returns {ModelClassQuery<typeof this>}
-     */
+    /** @returns {ModelClassQuery<typeof this>} */
     static _newQuery(): ModelClassQuery<typeof this>;
-    /**
-     * @returns {string}
-     */
+    /** @returns {string} */
     static orderableColumn(): string;
-    /**
-     * @returns {ModelClassQuery<typeof this>}
-     */
+    /** @returns {ModelClassQuery<typeof this>} */
     static all(): ModelClassQuery<typeof this>;
-    /**
-     * @returns {Promise<number>}
-     */
+    /** @returns {Promise<number>} */
     static count(): Promise<number>;
     static destroyAll(): Promise<void>;
     /**
@@ -249,13 +241,11 @@ declare class VelociousDatabaseRecord {
     }, callback?: () => void): Promise<InstanceType<typeof this>>;
     /**
      * @param {object} conditions
-     * @param {function(import("../record/index.js").default) : void} [callback]
-     * @returns {Promise<InstanceType<typeof this>>}
-     */
-    static findOrInitializeBy(conditions: object, callback?: (arg0: import("../record/index.js").default) => void): Promise<InstanceType<typeof this>>;
-    /**
+     * @param {function(InstanceType<typeof this>) : void} [callback]
      * @returns {Promise<InstanceType<typeof this>>}
      */
+    static findOrInitializeBy(conditions: object, callback?: (arg0: InstanceType<typeof this>) => void): Promise<InstanceType<typeof this>>;
+    /** @returns {Promise<InstanceType<typeof this>>} */
     static first(): Promise<InstanceType<typeof this>>;
     /**
      * @param {string|{[key: string]: any}} join
@@ -264,9 +254,7 @@ declare class VelociousDatabaseRecord {
     static joins(join: string | {
         [key: string]: any;
     }): ModelClassQuery<typeof this>;
-    /**
-     * @returns {Promise<InstanceType<typeof this>>}
-     */
+    /** @returns {Promise<InstanceType<typeof this>>} */
     static last(): Promise<InstanceType<typeof this>>;
     /**
      * @param {number} value
@@ -289,9 +277,9 @@ declare class VelociousDatabaseRecord {
      */
     static select(select: import("../query/index.js").SelectArgumentType): ModelClassQuery<typeof this>;
     /**
-     * @returns {Promise<VelociousDatabaseRecord[]>}
+     * @returns {Promise<InstanceType<typeof this>[]>}
      */
-    static toArray(): Promise<VelociousDatabaseRecord[]>;
+    static toArray(): Promise<InstanceType<typeof this>[]>;
     /**
      * @param {import("../query/index.js").WhereArgumentType} where
      * @returns {ModelClassQuery<typeof this>}
@@ -310,7 +298,7 @@ declare class VelociousDatabaseRecord {
     /** @type {import("../drivers/base.js").default | undefined} */
     __connection: import("../drivers/base.js").default | undefined;
     /** @type {Record<string, import("./instance-relationships/base.js").default>} */
-    _instanceRelationships: Record<string, import("./instance-relationships/base.js").default>;
+    _instanceRelationships: Record<string, import("./instance-relationships/base.js").default<any, any>>;
     /** @type {string | undefined} */
     __tableName: string | undefined;
     /** @type {Record<string, ValidationErrorObjectType[]>} */
@@ -319,7 +307,7 @@ declare class VelociousDatabaseRecord {
      * @param {string} relationshipName
      * @returns {import("./instance-relationships/base.js").default}
      */
-    getRelationshipByName(relationshipName: string): import("./instance-relationships/base.js").default;
+    getRelationshipByName(relationshipName: string): import("./instance-relationships/base.js").default<any, any>;
     /**
      * @returns {import("../../configuration.js").default}
      */
@@ -354,7 +342,7 @@ declare class VelociousDatabaseRecord {
     _autoSaveBelongsToRelationships(): Promise<{
         savedCount: number;
     }>;
-    _autoSaveHasManyAndHasOneRelationshipsToSave(): import("./instance-relationships/base.js").default[];
+    _autoSaveHasManyAndHasOneRelationshipsToSave(): import("./instance-relationships/base.js").default<any, any>[];
     /**
      * @param {object} args
      * @param {boolean} args.isNewRecord

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

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

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

@@ -899,9 +899,7 @@ class VelociousDatabaseRecord {
         assignments[name] = newValue;
         translation.assign(assignments);
     }
-    /**
-     * @returns {ModelClassQuery<typeof this>}
-     */
+    /** @returns {ModelClassQuery<typeof this>} */
     static _newQuery() {
         const handler = new Handler();
         const query = new ModelClassQuery({
@@ -911,22 +909,16 @@ class VelociousDatabaseRecord {
         });
         return query.from(new FromTable(this.tableName()));
     }
-    /**
-     * @returns {string}
-     */
+    /** @returns {string} */
     static orderableColumn() {
         // FIXME: Allow to change to 'created_at' if using UUID?
         return this.primaryKey();
     }
-    /**
-     * @returns {ModelClassQuery<typeof this>}
-     */
+    /** @returns {ModelClassQuery<typeof this>} */
     static all() {
         return this._newQuery();
     }
-    /**
-     * @returns {Promise<number>}
-     */
+    /** @returns {Promise<number>} */
     static async count() {
         return await this._newQuery().count();
     }
@@ -964,15 +956,13 @@ class VelociousDatabaseRecord {
     }
     /**
      * @param {object} conditions
-     * @param {function(import("../record/index.js").default) : void} [callback]
+     * @param {function(InstanceType<typeof this>) : void} [callback]
      * @returns {Promise<InstanceType<typeof this>>}
      */
     static async findOrInitializeBy(conditions, callback) {
         return await this._newQuery().findOrInitializeBy(conditions, callback);
     }
-    /**
-     * @returns {Promise<InstanceType<typeof this>>}
-     */
+    /** @returns {Promise<InstanceType<typeof this>>} */
     static async first() {
         return await this._newQuery().first();
     }
@@ -983,9 +973,7 @@ class VelociousDatabaseRecord {
     static joins(join) {
         return this._newQuery().joins(join);
     }
-    /**
-     * @returns {Promise<InstanceType<typeof this>>}
-     */
+    /** @returns {Promise<InstanceType<typeof this>>} */
     static async last() {
         return await this._newQuery().last();
     }
@@ -1018,10 +1006,11 @@ class VelociousDatabaseRecord {
         return this._newQuery().select(select);
     }
     /**
-     * @returns {Promise<VelociousDatabaseRecord[]>}
+     * @returns {Promise<InstanceType<typeof this>[]>}
      */
-    static toArray() {
-        return this._newQuery().toArray();
+    static async toArray() {
+        const modelClassQuery = /** @type {ModelClassQuery<typeof this>} */ (this._newQuery());
+        return await modelClassQuery.toArray();
     }
     /**
      * @param {import("../query/index.js").WhereArgumentType} where

package/dist/src/database/record/instance-relationships/base.d.ts

@@ -1,30 +1,37 @@
-export default class VelociousDatabaseRecordBaseInstanceRelationship {
+/**
+ * @template {typeof import("../index.js").default} MC
+ * @template {typeof import("../index.js").default} TMC
+ * @typedef {object} InstanceRelationshipsBaseArgs
+ * @property {InstanceType<MC>} model
+   @property {import("../relationships/base.js").default} relationship
+ */
+/**
+ * A generic query over some model type.
+ * @template {typeof import("../index.js").default} MC
+ * @template {typeof import("../index.js").default} TMC
+ */
+export default class VelociousDatabaseRecordBaseInstanceRelationship<MC extends typeof import("../index.js").default, TMC extends typeof import("../index.js").default> {
     /**
-     * @param {object} args
-     * @param {import("../index.js").default} args.model
-     * @param {import("../relationships/base.js").default} args.relationship
+     * @param {InstanceRelationshipsBaseArgs<MC, TMC>} args
      */
-    constructor({ model, relationship }: {
-        model: import("../index.js").default;
-        relationship: import("../relationships/base.js").default;
-    });
+    constructor({ model, relationship }: InstanceRelationshipsBaseArgs<MC, TMC>);
     /** @type {boolean | undefined} */
     _autoSave: boolean | undefined;
     _dirty: boolean;
-    model: import("../index.js").default;
+    model: InstanceType<MC>;
     relationship: import("../relationships/base.js").default;
     /**
      * @abstract
-     * @param {import("../index.js").default[] | import("../index.js").default} models
+     * @param {InstanceType<TMC>[] | InstanceType<TMC>} models
      * @returns {void}
      */
-    addToLoaded(models: import("../index.js").default[] | import("../index.js").default): void;
+    addToLoaded(models: InstanceType<TMC>[] | InstanceType<TMC>): void;
     /**
      * @abstract
      * @param {Record<string, any>} attributes
-     * @returns {import("../index.js").default}
+     * @returns {InstanceType<TMC>}
      */
-    build(attributes: Record<string, any>): import("../index.js").default;
+    build(attributes: Record<string, any>): InstanceType<TMC>;
     /** @returns {boolean | undefined} Whether the relationship should be auto-saved before saving the parent model */
     getAutoSave(): boolean | undefined;
     /**
@@ -46,13 +53,13 @@ export default class VelociousDatabaseRecordBaseInstanceRelationship {
     load(): Promise<void>;
     /**  @returns {boolean} Whether the relationship has been preloaded */
     isLoaded(): boolean;
-    /** @returns {import("../index.js").default | Array<import("../index.js").default> | undefined} The loaded model or models (depending on relationship type) */
-    loaded(): import("../index.js").default | Array<import("../index.js").default> | undefined;
-    /** @param {import("../index.js").default|Array<import("../index.js").default>|undefined} model */
-    setLoaded(model: import("../index.js").default | Array<import("../index.js").default> | undefined): void;
-    _loaded: import("../index.js").default | import("../index.js").default[];
-    /** @returns {import("../index.js").default | import("../index.js").default[] | undefined} */
-    getLoadedOrUndefined(): import("../index.js").default | import("../index.js").default[] | undefined;
+    /** @returns {InstanceType<TMC> | Array<InstanceType<TMC>> | undefined} The loaded model or models (depending on relationship type) */
+    loaded(): InstanceType<TMC> | Array<InstanceType<TMC>> | undefined;
+    /** @param {InstanceType<TMC> | Array<InstanceType<TMC>> | undefined} model */
+    setLoaded(model: InstanceType<TMC> | Array<InstanceType<TMC>> | undefined): void;
+    _loaded: InstanceType<TMC> | InstanceType<TMC>[];
+    /** @returns {InstanceType<TMC> | InstanceType<TMC>[] | undefined} */
+    getLoadedOrUndefined(): InstanceType<TMC> | InstanceType<TMC>[] | undefined;
     /** @returns {boolean} The loaded model or models (depending on relationship type) */
     getPreloaded(): boolean;
     /** @param {boolean} isPreloaded */
@@ -60,15 +67,19 @@ export default class VelociousDatabaseRecordBaseInstanceRelationship {
     _preloaded: boolean;
     /** @returns {string} The foreign key for this relationship */
     getForeignKey(): string;
-    /** @returns {import("../index.js").default} model */
-    getModel(): import("../index.js").default;
+    /** @returns {InstanceType<MC>} */
+    getModel(): InstanceType<MC>;
     /** @returns {string} The primary key for this relationship's model */
     getPrimaryKey(): string;
     /** @returns {import("../relationships/base.js").default} The relationship object that this instance relationship is based on */
     getRelationship(): import("../relationships/base.js").default;
-    /** @returns {typeof import("../index.js").default | undefined} The model class that this instance relationship */
-    getTargetModelClass(): typeof import("../index.js").default | undefined;
+    /** @returns {TMC | undefined} The model class that this instance relationship */
+    getTargetModelClass(): TMC | undefined;
     /** @returns {string} The type of relationship (e.g. "has_many", "belongs_to", etc.) */
     getType(): string;
 }
+export type InstanceRelationshipsBaseArgs<MC extends typeof import("../index.js").default, TMC extends typeof import("../index.js").default> = {
+    model: InstanceType<MC>;
+    relationship: import("../relationships/base.js").default;
+};
 //# sourceMappingURL=base.d.ts.map

package/dist/src/database/record/instance-relationships/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../../src/database/record/instance-relationships/base.js"],"names":[],"mappings":"AAEA;IAIE;;;;OAIG;IACH,qCAHG;QAA4C,KAAK,EAAzC,OAAO,aAAa,EAAE,OAAO;QACoB,YAAY,EAA7D,OAAO,0BAA0B,EAAE,OAAO;KACpD,EAKA;IAZD,kCAAkC;IAClC,WADW,OAAO,GAAG,SAAS,CACT;IAQnB,gBAAmB;IACnB,qCAAkB;IAClB,yDAAgC;IAGlC;;;;OAIG;IACH,oBAHW,OAAO,aAAa,EAAE,OAAO,EAAE,GAAG,OAAO,aAAa,EAAE,OAAO,GAC7D,IAAI,CAIhB;IAED;;;;OAIG;IACH,kBAHW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjB,OAAO,aAAa,EAAE,OAAO,CAIzC;IAED,kHAAkH;IAClH,eADc,OAAO,GAAG,SAAS,CACM;IAEvC;;;OAGG;IACH,8BAHW,OAAO,GACL,IAAI,CAEkD;IAEnE;;;OAGG;IACH,mBAHW,OAAO,GACL,IAAI,CAE4B;IAE7C,+EAA+E;IAC/E,YADc,OAAO,CACY;IAEjC;;;OAGG;IACH,QAFa,OAAO,CAAC,IAAI,CAAC,CAIzB;IAED,sEAAsE;IACtE,YADe,OAAO,CACqB;IAE3C,8JAA8J;IAC9J,UADc,OAAO,aAAa,EAAE,OAAO,GAAG,KAAK,CAAC,OAAO,aAAa,EAAE,OAAO,CAAC,GAAG,SAAS,CAO7F;IAED,kGAAkG;IAClG,iBADY,OAAO,aAAa,EAAE,OAAO,GAAC,KAAK,CAAC,OAAO,aAAa,EAAE,OAAO,CAAC,GAAC,SAAS,QAC/C;IAAtB,yEAAoB;IAEvC,6FAA6F;IAC7F,wBADc,OAAO,aAAa,EAAE,OAAO,GAAG,OAAO,aAAa,EAAE,OAAO,EAAE,GAAG,SAAS,CAC3C;IAE9C,qFAAqF;IACrF,gBADc,OAAO,CAC6B;IAElD,mCAAmC;IACnC,0BADY,OAAO,QACwC;IAA/B,oBAA6B;IAEzD,8DAA8D;IAC9D,iBADc,MAAM,CAC6C;IAEjE,qDAAqD;IACrD,YADc,OAAO,aAAa,EAAE,OAAO,CACX;IAEhC,sEAAsE;IACtE,iBADc,MAAM,CAC6C;IAEjE,gIAAgI;IAChI,mBADc,OAAO,0BAA0B,EAAE,OAAO,CACV;IAE9C,kHAAkH;IAClH,uBADc,cAAc,aAAa,EAAE,OAAO,GAAG,SAAS,CACe;IAE7E,uFAAuF;IACvF,WADc,MAAM,CACiC;CACtD"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../../src/database/record/instance-relationships/base.js"],"names":[],"mappings":"AAEA;;;;;;GAMG;AAEH;;;;GAIG;AACH,qEAHoD,EAAE,SAAzC,cAAe,aAAa,EAAE,OAAQ,EACC,GAAG,SAA1C,cAAe,aAAa,EAAE,OAAQ;IAMjD;;OAEG;IACH,qCAFW,6BAA6B,CAAC,EAAE,EAAE,GAAG,CAAC,EAMhD;IAVD,kCAAkC;IAClC,WADW,OAAO,GAAG,SAAS,CACT;IAMnB,gBAAmB;IACnB,wBAAkB;IAClB,yDAAgC;IAGlC;;;;OAIG;IACH,oBAHW,YAAY,CAAC,GAAG,CAAC,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC,GACrC,IAAI,CAIhB;IAED;;;;OAIG;IACH,kBAHW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjB,YAAY,CAAC,GAAG,CAAC,CAI7B;IAED,kHAAkH;IAClH,eADc,OAAO,GAAG,SAAS,CACM;IAEvC;;;OAGG;IACH,8BAHW,OAAO,GACL,IAAI,CAEkD;IAEnE;;;OAGG;IACH,mBAHW,OAAO,GACL,IAAI,CAE4B;IAE7C,+EAA+E;IAC/E,YADc,OAAO,CACY;IAEjC;;;OAGG;IACH,QAFa,OAAO,CAAC,IAAI,CAAC,CAIzB;IAED,sEAAsE;IACtE,YADe,OAAO,CACqB;IAE3C,sIAAsI;IACtI,UADc,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAOrE;IAED,8EAA8E;IAC9E,iBADY,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,QAC3B;IAAtB,iDAAoB;IAEvC,qEAAqE;IACrE,wBADc,YAAY,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,EAAE,GAAG,SAAS,CACnB;IAE9C,qFAAqF;IACrF,gBADc,OAAO,CAC6B;IAElD,mCAAmC;IACnC,0BADY,OAAO,QACwC;IAA/B,oBAA6B;IAEzD,8DAA8D;IAC9D,iBADc,MAAM,CAC6C;IAEjE,kCAAkC;IAClC,YADc,YAAY,CAAC,EAAE,CAAC,CACE;IAEhC,sEAAsE;IACtE,iBADc,MAAM,CAC6C;IAEjE,gIAAgI;IAChI,mBADc,OAAO,0BAA0B,EAAE,OAAO,CACV;IAE9C,iFAAiF;IACjF,uBADc,GAAG,GAAG,SAAS,CAK5B;IAED,uFAAuF;IACvF,WADc,MAAM,CACiC;CACtD;0CAlHmD,EAAE,SAAzC,cAAe,aAAa,EAAE,OAAQ,EACC,GAAG,SAA1C,cAAe,aAAa,EAAE,OAAQ;WAErC,YAAY,CAAC,EAAE,CAAC;kBAChB,OAAO,0BAA0B,EAAE,OAAO"}

package/dist/src/database/record/instance-relationships/base.js

@@ -1,11 +1,21 @@
 // @ts-check
+/**
+ * @template {typeof import("../index.js").default} MC
+ * @template {typeof import("../index.js").default} TMC
+ * @typedef {object} InstanceRelationshipsBaseArgs
+ * @property {InstanceType<MC>} model
+   @property {import("../relationships/base.js").default} relationship
+ */
+/**
+ * A generic query over some model type.
+ * @template {typeof import("../index.js").default} MC
+ * @template {typeof import("../index.js").default} TMC
+ */
 export default class VelociousDatabaseRecordBaseInstanceRelationship {
     /** @type {boolean | undefined} */
     _autoSave = undefined;
     /**
-     * @param {object} args
-     * @param {import("../index.js").default} args.model
-     * @param {import("../relationships/base.js").default} args.relationship
+     * @param {InstanceRelationshipsBaseArgs<MC, TMC>} args
      */
     constructor({ model, relationship }) {
         this._dirty = false;
@@ -14,7 +24,7 @@ export default class VelociousDatabaseRecordBaseInstanceRelationship {
     }
     /**
      * @abstract
-     * @param {import("../index.js").default[] | import("../index.js").default} models
+     * @param {InstanceType<TMC>[] | InstanceType<TMC>} models
      * @returns {void}
      */
     addToLoaded(models) {
@@ -23,7 +33,7 @@ export default class VelociousDatabaseRecordBaseInstanceRelationship {
     /**
      * @abstract
      * @param {Record<string, any>} attributes
-     * @returns {import("../index.js").default}
+     * @returns {InstanceType<TMC>}
      */
     build(attributes) {
         throw new Error("'build' not implemented");
@@ -51,16 +61,16 @@ export default class VelociousDatabaseRecordBaseInstanceRelationship {
     }
     /**  @returns {boolean} Whether the relationship has been preloaded */
     isLoaded() { return Boolean(this._loaded); }
-    /** @returns {import("../index.js").default | Array<import("../index.js").default> | undefined} The loaded model or models (depending on relationship type) */
+    /** @returns {InstanceType<TMC> | Array<InstanceType<TMC>> | undefined} The loaded model or models (depending on relationship type) */
     loaded() {
         if (!this._preloaded && this.model.isPersisted()) {
             throw new Error(`${this.model.constructor.name}#${this.relationship.getRelationshipName()} hasn't been preloaded`);
         }
         return this._loaded;
     }
-    /** @param {import("../index.js").default|Array<import("../index.js").default>|undefined} model */
+    /** @param {InstanceType<TMC> | Array<InstanceType<TMC>> | undefined} model */
     setLoaded(model) { this._loaded = model; }
-    /** @returns {import("../index.js").default | import("../index.js").default[] | undefined} */
+    /** @returns {InstanceType<TMC> | InstanceType<TMC>[] | undefined} */
     getLoadedOrUndefined() { return this._loaded; }
     /** @returns {boolean} The loaded model or models (depending on relationship type) */
     getPreloaded() { return this._preloaded || false; }
@@ -68,14 +78,17 @@ export default class VelociousDatabaseRecordBaseInstanceRelationship {
     setPreloaded(isPreloaded) { this._preloaded = isPreloaded; }
     /** @returns {string} The foreign key for this relationship */
     getForeignKey() { return this.getRelationship().getForeignKey(); }
-    /** @returns {import("../index.js").default} model */
+    /** @returns {InstanceType<MC>} */
     getModel() { return this.model; }
     /** @returns {string} The primary key for this relationship's model */
     getPrimaryKey() { return this.getRelationship().getPrimaryKey(); }
     /** @returns {import("../relationships/base.js").default} The relationship object that this instance relationship is based on */
     getRelationship() { return this.relationship; }
-    /** @returns {typeof import("../index.js").default | undefined} The model class that this instance relationship */
-    getTargetModelClass() { return this.getRelationship().getTargetModelClass(); }
+    /** @returns {TMC | undefined} The model class that this instance relationship */
+    getTargetModelClass() {
+        const TargetModelClass = /** @type {TMC} */ (this.getRelationship().getTargetModelClass());
+        return TargetModelClass;
+    }
     /** @returns {string} The type of relationship (e.g. "has_many", "belongs_to", etc.) */
     getType() { return this.getRelationship().getType(); }
 }

package/dist/src/database/record/instance-relationships/belongs-to.d.ts

@@ -1,4 +1,14 @@
-export default class VelociousDatabaseRecordBelongsToInstanceRelationship extends BaseInstanceRelationship {
+/**
+ * A generic query over some model type.
+ * @template {typeof import("../index.js").default} MC
+ * @template {typeof import("../index.js").default} TMC
+ */
+export default class VelociousDatabaseRecordBelongsToInstanceRelationship<MC extends typeof import("../index.js").default, TMC extends typeof import("../index.js").default> extends BaseInstanceRelationship<any, any> {
+    /**
+     * @param {Record<string, any>} data
+     * @returns {InstanceType<TMC>}
+     */
+    build(data: Record<string, any>): InstanceType<TMC>;
 }
 import BaseInstanceRelationship from "./base.js";
 //# sourceMappingURL=belongs-to.d.ts.map

package/dist/src/database/record/instance-relationships/belongs-to.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"belongs-to.d.ts","sourceRoot":"","sources":["../../../../../src/database/record/instance-relationships/belongs-to.js"],"names":[],"mappings":"AAIA;CAgCC;qCAlCoC,WAAW"}
+{"version":3,"file":"belongs-to.d.ts","sourceRoot":"","sources":["../../../../../src/database/record/instance-relationships/belongs-to.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,0EAHoD,EAAE,SAAzC,cAAe,aAAa,EAAE,OAAQ,EACC,GAAG,SAA1C,cAAe,aAAa,EAAE,OAAQ;IAUjD;;;OAGG;IACH,YAHW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjB,YAAY,CAAC,GAAG,CAAC,CAY7B;CAiBF;qCA9CoC,WAAW"}

package/dist/src/database/record/instance-relationships/belongs-to.js

@@ -1,15 +1,26 @@
 // @ts-check
 import BaseInstanceRelationship from "./base.js";
+/**
+ * A generic query over some model type.
+ * @template {typeof import("../index.js").default} MC
+ * @template {typeof import("../index.js").default} TMC
+ */
 export default class VelociousDatabaseRecordBelongsToInstanceRelationship extends BaseInstanceRelationship {
+    /**
+     * @param {import("./base.js").InstanceRelationshipsBaseArgs<MC, TMC>} args
+     */
+    constructor(args) {
+        super(args);
+    }
     /**
      * @param {Record<string, any>} data
-     * @returns {import("../index.js").default}
+     * @returns {InstanceType<TMC>}
      */
     build(data) {
-        const TargetModelClass = this.getTargetModelClass();
+        const TargetModelClass = /** @type {TMC} */ (this.getTargetModelClass());
         if (!TargetModelClass)
             throw new Error("Can't build a new record without a target model");
-        const newInstance = new TargetModelClass(data);
+        const newInstance = /** @type {InstanceType<TMC>} */ (new TargetModelClass(data));
         this._loaded = newInstance;
         return newInstance;
     }

package/dist/src/database/record/instance-relationships/has-many.d.ts

@@ -1,8 +1,28 @@
-export default class VelociousDatabaseRecordHasManyInstanceRelationship extends BaseInstanceRelationship {
+/**
+ * A generic query over some model type.
+ * @template {typeof import("../index.js").default} MC
+ * @template {typeof import("../index.js").default} TMC
+ */
+export default class VelociousDatabaseRecordHasManyInstanceRelationship<MC extends typeof import("../index.js").default, TMC extends typeof import("../index.js").default> extends BaseInstanceRelationship<any, any> {
     /**
-     * @param {import("../index.js").default[]} models
+     * @param {Record<string, any>} data
+     * @returns {InstanceType<TMC>}
      */
-    setLoaded(models: import("../index.js").default[]): void;
+    build(data: Record<string, any>): InstanceType<TMC>;
+    /**
+     * @returns {Array<InstanceType<TMC>>} The loaded model or models (depending on relationship type)
+     */
+    loaded(): Array<InstanceType<TMC>>;
+    /**
+     * @param {InstanceType<MC>[] | InstanceType<MC>} models
+     * @returns {void}
+     */
+    addToLoaded(models: InstanceType<MC>[] | InstanceType<MC>): void;
+    /**
+     * @param {InstanceType<TMC>[]} models
+     * @returns {void}
+     */
+    setLoaded(models: InstanceType<TMC>[]): void;
 }
 import BaseInstanceRelationship from "./base.js";
 //# sourceMappingURL=has-many.d.ts.map

package/dist/src/database/record/instance-relationships/has-many.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"has-many.d.ts","sourceRoot":"","sources":["../../../../../src/database/record/instance-relationships/has-many.js"],"names":[],"mappings":"AAIA;IAuGE;;OAEG;IACH,kBAFW,OAAO,aAAa,EAAE,OAAO,EAAE,QAMzC;CACF;qCAjHoC,WAAW"}
+{"version":3,"file":"has-many.d.ts","sourceRoot":"","sources":["../../../../../src/database/record/instance-relationships/has-many.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,wEAHoD,EAAE,SAAzC,cAAe,aAAa,EAAE,OAAQ,EACC,GAAG,SAA1C,cAAe,aAAa,EAAE,OAAQ;IAUjD;;;OAGG;IACH,YAHW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjB,YAAY,CAAC,GAAG,CAAC,CAmC7B;IAsBD;;OAEG;IACH,UAFa,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAYpC;IAED;;;OAGG;IACH,oBAHW,YAAY,CAAC,EAAE,CAAC,EAAE,GAAG,YAAY,CAAC,EAAE,CAAC,GACnC,IAAI,CAwBhB;IAED;;;OAGG;IACH,kBAHW,YAAY,CAAC,GAAG,CAAC,EAAE,GACjB,IAAI,CAMhB;CACF;qCA9HoC,WAAW"}

package/dist/src/database/record/instance-relationships/has-many.js

@@ -1,9 +1,20 @@
 // @ts-check
 import BaseInstanceRelationship from "./base.js";
+/**
+ * A generic query over some model type.
+ * @template {typeof import("../index.js").default} MC
+ * @template {typeof import("../index.js").default} TMC
+ */
 export default class VelociousDatabaseRecordHasManyInstanceRelationship extends BaseInstanceRelationship {
+    /**
+     * @param {import("./base.js").InstanceRelationshipsBaseArgs<MC, TMC>} args
+     */
+    constructor(args) {
+        super(args);
+    }
     /**
      * @param {Record<string, any>} data
-     * @returns {import("../index.js").default}
+     * @returns {InstanceType<TMC>}
      */
     build(data) {
         // Spawn new model of the targeted class
@@ -48,7 +59,7 @@ export default class VelociousDatabaseRecordHasManyInstanceRelationship extends
         this.setPreloaded(true);
     }
     /**
-     * @returns {import("../index.js").default | Array<import("../index.js").default> | undefined} The loaded model or models (depending on relationship type)
+     * @returns {Array<InstanceType<TMC>>} The loaded model or models (depending on relationship type)
      */
     loaded() {
         if (!this._preloaded && this.model.isPersisted()) {
@@ -60,7 +71,7 @@ export default class VelociousDatabaseRecordHasManyInstanceRelationship extends
         return this._loaded;
     }
     /**
-     * @param {import("../index.js").default[] | import("../index.js").default} models
+     * @param {InstanceType<MC>[] | InstanceType<MC>} models
      * @returns {void}
      */
     addToLoaded(models) {
@@ -93,7 +104,8 @@ export default class VelociousDatabaseRecordHasManyInstanceRelationship extends
         }
     }
     /**
-     * @param {import("../index.js").default[]} models
+     * @param {InstanceType<TMC>[]} models
+     * @returns {void}
      */
     setLoaded(models) {
         if (!Array.isArray(models))

package/dist/src/database/record/instance-relationships/has-one.d.ts

@@ -1,7 +1,24 @@
-export default class VelociousDatabaseRecordHasOneInstanceRelationship extends BaseInstanceRelationship {
-    /** @type {import("../index.js").default | undefined} */
-    _loaded: import("../index.js").default | undefined;
-    getLoadedOrUndefined(): import("../index.js").default;
+/**
+ * A generic query over some model type.
+ * @template {typeof import("../index.js").default} MC
+ * @template {typeof import("../index.js").default} TMC
+ */
+export default class VelociousDatabaseRecordHasOneInstanceRelationship<MC extends typeof import("../index.js").default, TMC extends typeof import("../index.js").default> extends BaseInstanceRelationship<any, any> {
+    /** @type {InstanceType<TMC> | undefined} */
+    _loaded: InstanceType<TMC> | undefined;
+    /**
+     * @param {Record<string, any>} data
+     * @returns {InstanceType<TMC>}
+     */
+    build(data: Record<string, any>): InstanceType<TMC>;
+    /**
+     * @returns {InstanceType<TMC> | Array<InstanceType<TMC>> | undefined} The loaded model or models (depending on relationship type)
+     */
+    loaded(): InstanceType<TMC> | Array<InstanceType<TMC>> | undefined;
+    getLoadedOrUndefined(): InstanceType<TMC>;
+    /** @param {InstanceType<TMC> | Array<InstanceType<TMC>>} model */
+    setLoaded(model: InstanceType<TMC> | Array<InstanceType<TMC>>): void;
+    getTargetModelClass(): typeof import("../index.js").default;
 }
 import BaseInstanceRelationship from "./base.js";
 //# sourceMappingURL=has-one.d.ts.map

package/dist/src/database/record/instance-relationships/has-one.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"has-one.d.ts","sourceRoot":"","sources":["../../../../../src/database/record/instance-relationships/has-one.js"],"names":[],"mappings":"AAIA;IACE,wDAAwD;IACxD,SADW,OAAO,aAAa,EAAE,OAAO,GAAG,SAAS,CACjC;IAiDnB,sDAA8C;CAU/C;qCA/DoC,WAAW"}
+{"version":3,"file":"has-one.d.ts","sourceRoot":"","sources":["../../../../../src/database/record/instance-relationships/has-one.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,uEAHoD,EAAE,SAAzC,cAAe,aAAa,EAAE,OAAQ,EACC,GAAG,SAA1C,cAAe,aAAa,EAAE,OAAQ;IAUjD,4CAA4C;IAC5C,SADW,YAAY,CAAC,GAAG,CAAC,GAAG,SAAS,CACrB;IAEnB;;;OAGG;IACH,YAHW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjB,YAAY,CAAC,GAAG,CAAC,CAY7B;IAsBD;;OAEG;IACH,UAFa,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAQpE;IAED,0CAA8C;IAE9C,kEAAkE;IAClE,iBADY,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,QAKvD;IAED,4DAAwE;CACzE;qCA3EoC,WAAW"}

package/dist/src/database/record/instance-relationships/has-one.js

@@ -1,17 +1,28 @@
 // @ts-check
 import BaseInstanceRelationship from "./base.js";
+/**
+ * A generic query over some model type.
+ * @template {typeof import("../index.js").default} MC
+ * @template {typeof import("../index.js").default} TMC
+ */
 export default class VelociousDatabaseRecordHasOneInstanceRelationship extends BaseInstanceRelationship {
-    /** @type {import("../index.js").default | undefined} */
+    /**
+     * @param {import("./base.js").InstanceRelationshipsBaseArgs<MC, TMC>} args
+     */
+    constructor(args) {
+        super(args);
+    }
+    /** @type {InstanceType<TMC> | undefined} */
     _loaded = undefined;
     /**
      * @param {Record<string, any>} data
-     * @returns {import("../index.js").default}
+     * @returns {InstanceType<TMC>}
      */
     build(data) {
-        const TargetModelClass = this.getTargetModelClass();
+        const TargetModelClass = /** @type {TMC} */ (this.getTargetModelClass());
         if (!TargetModelClass)
             throw new Error("Can't build a new record without a target model class");
-        const newInstance = new TargetModelClass(data);
+        const newInstance = /** @type {InstanceType<TMC>} */ (new TargetModelClass(data));
         this._loaded = newInstance;
         return newInstance;
     }
@@ -19,19 +30,19 @@ export default class VelociousDatabaseRecordHasOneInstanceRelationship extends B
         const foreignKey = this.getForeignKey();
         const primaryKey = this.getPrimaryKey();
         const primaryModelID = this.getModel().readColumn(primaryKey);
-        const TargetModelClass = this.getTargetModelClass();
+        const TargetModelClass = /** @type {TMC} */ (this.getTargetModelClass());
         if (!TargetModelClass)
             throw new Error("Can't load without a target model class");
         /** @type {Record<string, any>} */
         const whereArgs = {};
         whereArgs[foreignKey] = primaryModelID;
-        const foreignModel = await TargetModelClass.where(whereArgs).first();
+        const foreignModel = /** @type {InstanceType<TMC>} */ (await TargetModelClass.where(whereArgs).first());
         this.setLoaded(foreignModel);
         this.setDirty(false);
         this.setPreloaded(true);
     }
     /**
-     * @returns {import("../index.js").default | Array<import("../index.js").default> | undefined} The loaded model or models (depending on relationship type)
+     * @returns {InstanceType<TMC> | Array<InstanceType<TMC>> | undefined} The loaded model or models (depending on relationship type)
      */
     loaded() {
         if (!this._preloaded && this.model.isPersisted()) {
@@ -40,7 +51,7 @@ export default class VelociousDatabaseRecordHasOneInstanceRelationship extends B
         return this._loaded;
     }
     getLoadedOrUndefined() { return this._loaded; }
-    /** @param {import("../index.js").default|Array<import("../index.js").default>} model */
+    /** @param {InstanceType<TMC> | Array<InstanceType<TMC>>} model */
     setLoaded(model) {
         if (Array.isArray(model))
             throw new Error(`Argument given to setLoaded was an array: ${typeof model}`);

package/dist/src/environment-handlers/node/cli/commands/generate/base-models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-models.d.ts","sourceRoot":"","sources":["../../../../../../../src/environment-handlers/node/cli/commands/generate/base-models.js"],"names":[],"mappings":"AAKA;IACE,yBA4OC;IAED;;;OAGG;IACH,4BAHW,OAAO,gDAAgD,EAAE,OAAO,GAC9D,MAAM,GAAG,SAAS,CAkB9B;CACF;wBAzQuB,oCAAoC"}
+{"version":3,"file":"base-models.d.ts","sourceRoot":"","sources":["../../../../../../../src/environment-handlers/node/cli/commands/generate/base-models.js"],"names":[],"mappings":"AAKA;IACE,yBAsPC;IAED;;;OAGG;IACH,4BAHW,OAAO,gDAAgD,EAAE,OAAO,GAC9D,MAAM,GAAG,SAAS,CAkB9B;CACF;wBAnRuB,oCAAoC"}

package/dist/src/environment-handlers/node/cli/commands/generate/base-models.js

@@ -5,22 +5,31 @@ import * as inflection from "inflection";
 export default class DbGenerateModel extends BaseCommand {
     async execute() {
         await this.getConfiguration().initializeModels();
-        const modelsDir = `${process.cwd()}/src/model-bases`;
+        const modelsDir = `${process.cwd()}/src/models`;
+        const baseModelsDir = `${process.cwd()}/src/model-bases`;
         const modelClasses = this.getConfiguration().getModelClasses();
         let devMode = false;
-        if (modelsDir.endsWith("velocious/spec/dummy/src/model-bases")) {
+        if (baseModelsDir.endsWith("velocious/spec/dummy/src/model-bases")) {
             devMode = true;
         }
-        if (!await fileExists(modelsDir)) {
-            await fs.mkdir(modelsDir, { recursive: true });
+        if (!await fileExists(baseModelsDir)) {
+            await fs.mkdir(baseModelsDir, { recursive: true });
         }
         for (const modelClassName in modelClasses) {
             const modelClass = modelClasses[modelClassName];
             const modelName = inflection.dasherize(modelClassName);
             const modelNameCamelized = inflection.camelize(modelName.replaceAll("-", "_"));
             const modelBaseFileName = `${inflection.dasherize(inflection.underscore(modelName))}.js`;
-            const modelPath = `${modelsDir}/${modelBaseFileName}`;
+            const modelPath = `${baseModelsDir}/${modelBaseFileName}`;
             console.log(`create src/model-bases/${modelBaseFileName}`);
+            const sourceModelFullFilePath = `${modelsDir}/${modelBaseFileName}`;
+            let sourceModelFilePath;
+            if (await fileExists(sourceModelFullFilePath)) {
+                sourceModelFilePath = `../models/${modelBaseFileName}`;
+            }
+            else {
+                sourceModelFilePath = "velocious/dist/src/database/record/index.js";
+            }
             let fileContent = "";
             let velociousPath;
             if (devMode) {
@@ -169,7 +178,7 @@ export default class DbGenerateModel extends BaseCommand {
                         recordImport = `${velociousPath}/database/record/index.js`;
                     }
                     fileContent += "  /**\n";
-                    fileContent += `   * @returns {import("${hasManyRelationFilePath}").default}\n`;
+                    fileContent += `   * @returns {import("${hasManyRelationFilePath}").default<typeof import("${sourceModelFilePath}").default, typeof import("${recordImport}").default>}\n`;
                     fileContent += "   */\n";
                     fileContent += `  ${relationship.getRelationshipName()}() { return /** @type {import("${hasManyRelationFilePath}").default} */ (this.getRelationshipByName("${relationship.getRelationshipName()}")) }\n`;
                     fileContent += "\n";

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "dist/bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.113",
+  "version": "1.0.114",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": ["dist/**"],