velocious 1.0.112 → 1.0.114

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

@@ -12,7 +12,7 @@ import HasManyRelationship from "./relationships/has-many.js";
 import HasOneInstanceRelationship from "./instance-relationships/has-one.js";
 import HasOneRelationship from "./relationships/has-one.js";
 import * as inflection from "inflection";
-import Query from "../query/index.js";
+import ModelClassQuery from "../query/model-class-query.js";
 import restArgsError from "../../utils/rest-args-error.js";
 import ValidatorsPresence from "./validators/presence.js";
 import ValidatorsUniqueness from "./validators/uniqueness.js";
@@ -27,21 +27,18 @@ class ValidationError extends Error {
     }
     /**
      * @param {VelociousDatabaseRecord} model
+     * @returns {void}
      */
     setModel(model) {
         this._model = model;
     }
-    /**
-     * @returns {Record<string, ValidationErrorObjectType[]>}
-     */
+    /** @returns {Record<string, ValidationErrorObjectType[]>} */
     getValidationErrors() {
         if (!this._validationErrors)
             throw new Error("Validation errors hasn't been set");
         return this._validationErrors;
     }
-    /**
-     * @param {Record<string, ValidationErrorObjectType[]>} validationErrors
-     */
+    /** @param {Record<string, ValidationErrorObjectType[]>} validationErrors */
     setValidationErrors(validationErrors) {
         this._validationErrors = validationErrors;
     }
@@ -902,34 +899,26 @@ class VelociousDatabaseRecord {
         assignments[name] = newValue;
         translation.assign(assignments);
     }
-    /**
-     * @returns {Query}
-     */
+    /** @returns {ModelClassQuery<typeof this>} */
     static _newQuery() {
         const handler = new Handler();
-        const query = new Query({
+        const query = new ModelClassQuery({
             driver: this.connection(),
             handler,
             modelClass: this
         });
         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 {Query}
-     */
+    /** @returns {ModelClassQuery<typeof this>} */
     static all() {
         return this._newQuery();
     }
-    /**
-     * @returns {Promise<number>}
-     */
+    /** @returns {Promise<number>} */
     static async count() {
         return await this._newQuery().count();
     }
@@ -959,7 +948,7 @@ class VelociousDatabaseRecord {
     }
     /**
      * @param {{[key: string]: any}} conditions
-     * @param {function() : void} callback
+     * @param {function() : void} [callback]
      * @returns {Promise<InstanceType<typeof this>>}
      */
     static async findOrCreateBy(conditions, callback) {
@@ -967,68 +956,65 @@ 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();
     }
     /**
      * @param {string|{[key: string]: any}} join
-     * @returns {Query}
+     * @returns {ModelClassQuery<typeof this>}
      */
     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();
     }
     /**
      * @param {number} value
-     * @returns {Query}
+     * @returns {ModelClassQuery<typeof this>}
      */
     static limit(value) {
         return this._newQuery().limit(value);
     }
     /**
      * @param {string | number} order
-     * @returns {Query}
+     * @returns {ModelClassQuery<typeof this>}
      */
     static order(order) {
         return this._newQuery().order(order);
     }
     /**
      * @param {import("../query/index.js").NestedPreloadRecord} preload
-     * @returns {Query}
+     * @returns {ModelClassQuery<typeof this>}
      */
     static preload(preload) {
         return this._newQuery().preload(preload);
     }
     /**
      * @param {import("../query/index.js").SelectArgumentType} select
-     * @returns {Query}
+     * @returns {ModelClassQuery<typeof this>}
      */
     static select(select) {
         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
-     * @returns {Query}
+     * @returns {ModelClassQuery<typeof this>}
      */
     static where(where) {
         return this._newQuery().where(where);
@@ -1235,9 +1221,7 @@ class VelociousDatabaseRecord {
         }
         return belongsToChanges;
     }
-    /**
-     * @returns {Promise<void>}
-     */
+    /** @returns {Promise<void>} */
     async _createNewRecord() {
         if (!this.getModelClass().connection()["insertSql"]) {
             throw new Error(`No insertSql on ${this.getModelClass().connection().constructor.name}`);
@@ -1276,9 +1260,7 @@ class VelociousDatabaseRecord {
             instanceRelationship.setPreloaded(true);
         }
     }
-    /**
-     * @returns {Promise<void>}
-     */
+    /** @returns {Promise<void>} */
     async _updateRecordWithChanges() {
         /** @type {Record<string, any>} */
         const conditions = {};
@@ -1298,9 +1280,7 @@ class VelociousDatabaseRecord {
             await this._reloadWithId(this.id());
         }
     }
-    /**
-     * @returns {number|string}
-     */
+    /** @returns {number|string} */
     id() {
         if (!this.getModelClass()._columnNameToAttributeName) {
             throw new Error(`Column names mapping hasn't been set on ${this.constructor.name}. Has the model been initialized?`);
@@ -1312,13 +1292,9 @@ class VelociousDatabaseRecord {
         }
         return this.readAttribute(attributeName);
     }
-    /**
-     * @returns {boolean}
-     */
+    /** @returns {boolean} */
     isPersisted() { return !this._isNewRecord; }
-    /**
-     * @returns {boolean}
-     */
+    /** @returns {boolean} */
     isNewRecord() { return this._isNewRecord; }
     /**
      * @param {boolean} newIsNewRecord
@@ -1328,14 +1304,16 @@ class VelociousDatabaseRecord {
         this._isNewRecord = newIsNewRecord;
     }
     /**
+     * @template {typeof VelociousDatabaseRecord} MC
      * @param {string | number} id
+     * @returns {Promise<void>}
      */
     async _reloadWithId(id) {
         const primaryKey = this.getModelClass().primaryKey();
         /** @type {Record<string, any>} */
         const whereObject = {};
         whereObject[primaryKey] = id;
-        const query = this.getModelClass().where(whereObject);
+        const query = /** @type {import("../query/model-class-query.js").default<MC>} */ (this.getModelClass().where(whereObject));
         const reloadedModel = await query.first();
         if (!reloadedModel)
             throw new Error(`${this.constructor.name}#${id} couldn't be reloaded - record didn't exist`);
@@ -1346,7 +1324,7 @@ class VelociousDatabaseRecord {
      * @returns {Promise<void>}
      */
     async reload() {
-        this._reloadWithId(this.readAttribute("id"));
+        await this._reloadWithId(this.readAttribute("id"));
     }
     async _runValidations() {
         /** @type {Record<string, {type: string, message: string}>} */
@@ -1367,9 +1345,7 @@ class VelociousDatabaseRecord {
             throw validationError;
         }
     }
-    /**
-     * @returns {string[]}
-     */
+    /** @returns {string[]} */
     fullErrorMessages() {
         /** @type {string[]} */
         const validationErrorMessages = [];

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"}