velocious 1.0.112 → 1.0.114

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,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,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";
@@ -205,17 +214,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,7 +3,7 @@
     "velocious": "dist/bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.112",
+  "version": "1.0.114",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": ["dist/**"],