velocious 1.0.100 → 1.0.102

package/src/database/drivers/base.js

@@ -23,7 +23,7 @@
  * @property {string[]} [columns]
  * @property {{[key: string]: any}} [data]
  * @property {boolean} [multiple]
- * @property {boolean} [returnLastInsertedColumnNames]
+ * @property {boolean | string[]} [returnLastInsertedColumnNames]
  * @property {Array<Array<any>>} [rows]
  * @property {string} tableName
  */
@@ -91,7 +91,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @param {import("../table-data/index.js").default} _tableData
    * @returns {Promise<string[]>}
    */
@@ -100,7 +100,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @returns {Promise<void>}
    */
   connect() {
@@ -108,7 +108,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @param {CreateIndexSqlArgs} indexData
    * @returns {string}
    */
@@ -129,7 +129,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @param {import("../table-data/index.js").default} tableData
    * @returns {string[]}
    */
@@ -148,7 +148,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @param {DeleteSqlArgsType} args
    * @returns {string}
    */
@@ -170,7 +170,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @param {string} tableName
    * @param {DropTableSqlArgsType} [args]
    * @returns {string}
@@ -180,7 +180,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @param {any} value
    * @returns {any}
    */
@@ -189,7 +189,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   /**
-   * @returns {object}
+   * @returns {import("../../configuration-types.js").DatabaseConfigurationType}
    */
   getArgs() {
     return this._args
@@ -212,7 +212,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @returns {Array<import("./base-table.js").default>}
    */
   getTables() {
@@ -227,15 +227,27 @@ export default class VelociousDatabaseDriversBase {
    */
   async getTableByName(name, args) {
     const tables = await this.getTables()
-    const table = tables.find((table) => table.getName() == name)
+    const tableNames = []
+    let table
 
-    if (!table && args?.throwError !== false) throw new Error(`Couldn't find a table by that name: ${name}`)
+    for (const candidate of tables) {
+      const candidateName = candidate.getName()
+
+      if (candidateName == name) {
+        table = candidate
+        break
+      }
+
+      tableNames.push(candidateName)
+    }
+
+    if (!table && args?.throwError !== false) throw new Error(`Couldn't find a table by that name "${name}" in: ${tableNames.join(", ")}`)
 
     return table
   }
 
   /**
-   * @interface
+   * @abstract
    * @returns {string}
    */
   getType() {
@@ -253,7 +265,18 @@ export default class VelociousDatabaseDriversBase {
   }
 
   /**
-   * @interface
+   * @abstract
+   * @param {string} tableName
+   * @param {Array<string>} columns
+   * @param {Array<Array<string>>} rows
+   * @returns {Promise<void>}
+   */
+  async insertMultiple(tableName, columns, rows) { // eslint-disable-line no-unused-vars
+    throw new Error("'insertMultiple' not implemented")
+  }
+
+  /**
+   * @abstract
    * @param {InsertSqlArgsType} args
    * @returns {string}
    */
@@ -262,7 +285,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @returns {Promise<number>}
    */
   lastInsertID() {
@@ -282,7 +305,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @returns {import("../query-parser/options.js").default}
    */
   options() {
@@ -361,7 +384,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @returns {boolean}
    */
   shouldSetAutoIncrementWhenPrimaryKey() {
@@ -498,7 +521,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @param {string} sql
    * @returns {Promise<QueryResultType>}
    */
@@ -507,14 +530,13 @@ export default class VelociousDatabaseDriversBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @param {Query} _query
    * @returns {string}
    */
   queryToSql(_query) { throw new Error("queryToSql not implemented") } // eslint-disable-line no-unused-vars
 
   /**
-   * @interface
    * @param {Error} _error
    * @returns {boolean}
    */
@@ -674,7 +696,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @param {UpdateSqlArgsType} args
    * @returns {string}
    */
@@ -683,7 +705,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @returns {Promise<void>}
    */
   disableForeignKeys() {
@@ -691,7 +713,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @returns {Promise<void>}
    */
   enableForeignKeys() {

package/src/database/pool/base.js

@@ -36,7 +36,7 @@ class VelociousDatabasePoolBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @param {import("../drivers/base.js").default} _connection
    */
   checkin(_connection) { // eslint-disable-line no-unused-vars
@@ -44,7 +44,7 @@ class VelociousDatabasePoolBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @returns {Promise<import("../drivers/base.js").default>}
    */
   checkout() {
@@ -52,7 +52,7 @@ class VelociousDatabasePoolBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @returns {import("../drivers/base.js").default}
    */
   getCurrentConnection() {
@@ -67,7 +67,7 @@ class VelociousDatabasePoolBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @returns {string}
    */
   primaryKeyType() {
@@ -119,7 +119,7 @@ class VelociousDatabasePoolBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @param {function(import("../drivers/base.js").default) : void} _callback
    * @returns {Promise<void>}
    */

package/src/database/query/base.js

@@ -37,7 +37,7 @@ export default class VelociousDatabaseQueryBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @returns {string[]}
    */
   toSqls() {

package/src/database/query/from-base.js

@@ -1,9 +1,7 @@
 // @ts-check
 
-import Query from "./index.js"
-
 export default class VelociousDatabaseQueryFromBase {
-  /** @type {Query | null} */
+  /** @type {import("./index.js").default  | null} */
   query = null
 
   /**
@@ -24,7 +22,7 @@ export default class VelociousDatabaseQueryFromBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @returns {string[]}
    */
   toSql() {

package/src/database/query/index.js

@@ -1,5 +1,11 @@
 // @ts-check
 
+/**
+ * @typedef {{[key: string]: boolean | NestedPreloadRecord }} NestedPreloadRecord
+ * @typedef {string|SelectPlain} SelectArgumentType
+ * @typedef {object|string} WhereArgumentType
+ */
+
 import FromPlain from "./from-plain.js"
 import {incorporate} from "incorporator"
 import * as inflection from "inflection"
@@ -16,10 +22,6 @@ import WhereHash from "./where-hash.js"
 import WherePlain from "./where-plain.js"
 import restArgsError from "../../utils/rest-args-error.js"
 
-/**
- * @typedef {{[key: string]: boolean | NestedPreloadRecord }} NestedPreloadRecord
- */
-
 /**
  * A generic query over some model type.
  */
@@ -112,7 +114,7 @@ export default class VelociousDatabaseQuery {
    */
   async count() {
     // Generate count SQL
-    let sql = `COUNT(${this.driver.quoteTable(this.modelClass.tableName())}.${this.driver.quoteColumn(this.modelClass.primaryKey())})`
+    let sql = `COUNT(${this.driver.quoteTable(this.getModelClass().tableName())}.${this.driver.quoteColumn(this.getModelClass().primaryKey())})`
 
     if (this.driver.getType() == "pgsql") sql += "::int"
 
@@ -162,6 +164,15 @@ export default class VelociousDatabaseQuery {
     return this._groups
   }
 
+  /**
+   * @returns {typeof import("../record/index.js").default}
+   */
+  getModelClass() {
+    if (!this.modelClass) throw new Error("modelClass not set")
+
+    return this.modelClass
+  }
+
   /**
    * @returns {import("../query-parser/options.js").default}
    */
@@ -191,13 +202,13 @@ export default class VelociousDatabaseQuery {
     /** @type {{[key: string]: number | string}} */
     const conditions = {}
 
-    conditions[this.modelClass.primaryKey()] = recordId
+    conditions[this.getModelClass().primaryKey()] = recordId
 
     const query = this.clone().where(conditions)
     const record = await query.first()
 
     if (!record) {
-      throw new RecordNotFoundError(`Couldn't find ${this.modelClass.name} with '${this.modelClass.primaryKey()}'=${recordId}`)
+      throw new RecordNotFoundError(`Couldn't find ${this.getModelClass().name} with '${this.getModelClass().primaryKey()}'=${recordId}`)
     }
 
     return record
@@ -268,7 +279,8 @@ export default class VelociousDatabaseQuery {
 
     if (record) return record
 
-    const newRecord = new this.modelClass(conditions)
+    const ModelClass = this.getModelClass()
+    const newRecord = new ModelClass(conditions)
 
     if (callback) {
       callback(newRecord)
@@ -281,14 +293,14 @@ export default class VelociousDatabaseQuery {
    * @returns {Promise<import("../record/index.js").default>}
    */
   async first() {
-    const newQuery = this.clone().limit(1).reorder(`${this.driver.quoteTable(this.modelClass.tableName())}.${this.driver.quoteColumn(this.modelClass.orderableColumn())}`)
+    const newQuery = this.clone().limit(1).reorder(`${this.driver.quoteTable(this.getModelClass().tableName())}.${this.driver.quoteColumn(this.getModelClass().orderableColumn())}`)
     const results = await newQuery.toArray()
 
     return results[0]
   }
 
   /**
-   * @param {string|FromPlain} from
+   * @param {string|import("./from-base.js").default} from
    * @returns {this}
    */
   from(from) {
@@ -327,8 +339,8 @@ export default class VelociousDatabaseQuery {
    * @returns {Promise<import("../record/index.js").default>}
    */
   async last() {
-    const primaryKey = this.modelClass.primaryKey()
-    const tableName = this.modelClass.tableName()
+    const primaryKey = this.getModelClass().primaryKey()
+    const tableName = this.getModelClass().tableName()
     const results = await this.clone().reorder(`${this.driver.quoteTable(tableName)}.${this.driver.quoteColumn(primaryKey)} DESC`).limit(1).toArray()
 
     return results[0]
@@ -353,7 +365,7 @@ export default class VelociousDatabaseQuery {
   }
 
   /**
-   * @param {*} order
+   * @param {string | number} order
    * @returns {this}
    */
   order(order) {
@@ -393,7 +405,7 @@ export default class VelociousDatabaseQuery {
   }
 
   /**
-   * @param {string} data
+   * @param {NestedPreloadRecord} data
    * @returns {this}
    */
   preload(data) {
@@ -402,7 +414,7 @@ export default class VelociousDatabaseQuery {
   }
 
   /**
-   * @param {string|OrderPlain} order
+   * @param {string | number} order
    * @returns {this}
    */
   reorder(order) {
@@ -423,7 +435,7 @@ export default class VelociousDatabaseQuery {
   }
 
   /**
-   * @param {string|SelectPlain} select
+   * @param {SelectArgumentType} select
    * @returns {this}
    */
   select(select) {
@@ -474,7 +486,8 @@ export default class VelociousDatabaseQuery {
     const results = await this.results()
 
     for (const result of results) {
-      const model = new this.modelClass()
+      const ModelClass = this.getModelClass()
+      const model = new ModelClass()
 
       model.loadExistingRecord(result)
       models.push(model)
@@ -500,7 +513,7 @@ export default class VelociousDatabaseQuery {
   toSql() { return this.driver.queryToSql(this) }
 
   /**
-   * @param {object|string} where
+   * @param {WhereArgumentType} where
    * @returns {VelociousDatabaseQuery} This query instance
    */
   where(where) {

package/src/database/query/order-base.js

@@ -16,7 +16,7 @@ export default class VelociousDatabaseQueryOrderBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @param {boolean} _reverseOrder
    * @returns {void}
    */

package/src/database/query/select-base.js

@@ -18,7 +18,7 @@ export default class VelociousDatabaseQuerySelectBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @returns {string}
    */
   toSql() {

package/src/database/query/where-base.js

@@ -25,7 +25,7 @@ export default class VelociousDatabaseQueryWhereBase {
   }
 
   /**
-   * @interface
+   * @abstract
    * @returns {string}
    */
   toSql() {