velocious 1.0.111 → 1.0.113

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;
     }
@@ -903,11 +900,11 @@ class VelociousDatabaseRecord {
         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
@@ -922,7 +919,7 @@ class VelociousDatabaseRecord {
         return this.primaryKey();
     }
     /**
-     * @returns {Query}
+     * @returns {ModelClassQuery<typeof this>}
      */
     static all() {
         return this._newQuery();
@@ -959,7 +956,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,7 +964,7 @@ class VelociousDatabaseRecord {
     }
     /**
      * @param {object} conditions
-     * @param {function(import("../record/index.js").default) : void} callback
+     * @param {function(import("../record/index.js").default) : void} [callback]
      * @returns {Promise<InstanceType<typeof this>>}
      */
     static async findOrInitializeBy(conditions, callback) {
@@ -981,7 +978,7 @@ class VelociousDatabaseRecord {
     }
     /**
      * @param {string|{[key: string]: any}} join
-     * @returns {Query}
+     * @returns {ModelClassQuery<typeof this>}
      */
     static joins(join) {
         return this._newQuery().joins(join);
@@ -994,28 +991,28 @@ class VelociousDatabaseRecord {
     }
     /**
      * @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);
@@ -1028,7 +1025,7 @@ class VelociousDatabaseRecord {
     }
     /**
      * @param {import("../query/index.js").WhereArgumentType} where
-     * @returns {Query}
+     * @returns {ModelClassQuery<typeof this>}
      */
     static where(where) {
         return this._newQuery().where(where);
@@ -1235,9 +1232,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 +1271,7 @@ class VelociousDatabaseRecord {
             instanceRelationship.setPreloaded(true);
         }
     }
-    /**
-     * @returns {Promise<void>}
-     */
+    /** @returns {Promise<void>} */
     async _updateRecordWithChanges() {
         /** @type {Record<string, any>} */
         const conditions = {};
@@ -1298,9 +1291,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 +1303,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 +1315,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 +1335,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 +1356,7 @@ class VelociousDatabaseRecord {
             throw validationError;
         }
     }
-    /**
-     * @returns {string[]}
-     */
+    /** @returns {string[]} */
     fullErrorMessages() {
         /** @type {string[]} */
         const validationErrorMessages = [];

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,CAY9B;CACF;wBAnQuB,oCAAoC"}
+{"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"}

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

@@ -205,17 +205,24 @@ export default class DbGenerateModel extends BaseCommand {
      * @returns {string | undefined}
      */
     jsDocTypeFromColumn(column) {
-        if (column.getType() == "varchar") {
+        const type = column.getType();
+        if (type == "boolean") {
+            return "boolean";
+        }
+        else if (type == "json") {
+            return "Record<string, any>";
+        }
+        else if (type == "blob" || type == "varchar" || type == "text" || type == "uuid") {
             return "string";
         }
-        else if (["bigint", "int", "integer", "smallint"].includes(column.getType())) {
+        else if (["bigint", "int", "integer", "smallint"].includes(type)) {
             return "number";
         }
-        else if (["date", "datetime"].includes(column.getType())) {
+        else if (["date", "datetime"].includes(type)) {
             return "Date";
         }
         else {
-            console.error(`Unknown column type: ${column.getType()}`);
+            console.error(`Unknown column type: ${type}`);
         }
     }
 }

package/package.json

@@ -3,12 +3,12 @@
     "velocious": "dist/bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.111",
+  "version": "1.0.113",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": ["dist/**"],
   "scripts": {
-    "build": "rm -rf dist && tsc -p tsconfig.build.json",
+    "build": "rm -rf dist && tsc -p tsconfig.build.json && chmod +x dist/bin/velocious.js",
     "lint": "eslint",
     "test": "VELOCIOUS_TEST_DIR=../ cd spec/dummy && npx velocious test",
     "prepublishOnly": "npm run build",