velocious 1.0.101 → 1.0.103

package/src/database/drivers/sqlite/sql/alter-table.js

@@ -1,12 +1,17 @@
+// @ts-check
+
 import AlterTableBase from "../../../query/alter-table-base.js"
 import CreateIndexBase from "../../../query/create-index-base.js"
-import {digs} from "diggerize"
-import * as inflection from "inflection"
 import {Logger} from "../../../../logger.js"
 import restArgsError from "../../../../utils/rest-args-error.js"
 import TableData from "../../../table-data/index.js"
 
 export default class VelociousDatabaseConnectionDriversSqliteSqlAlterTable extends AlterTableBase {
+  /**
+   * @param {object} args
+   * @param {import("../../base.js").default} args.driver
+   * @param {import("../../../table-data/index.js").default} args.tableData
+   */
   constructor({driver, tableData, ...restArgs}) {
     restArgsError(restArgs)
 
@@ -17,9 +22,15 @@ export default class VelociousDatabaseConnectionDriversSqliteSqlAlterTable exten
     this.tableData = tableData
   }
 
-  async toSqls() {
-    const {tableData} = digs(this, "tableData")
+  /**
+   * @returns {string[]}
+   */
+  async toSQLs() {
+    const {tableData} = this
     const table = await this.getDriver().getTableByName(tableData.getName())
+
+    if (!table) throw new Error(`Table ${tableData.getName()} does not exist`)
+
     const currentTableData = await table.getTableData()
     const options = this.getOptions()
     const tableName = tableData.getName()
@@ -43,19 +54,13 @@ export default class VelociousDatabaseConnectionDriversSqliteSqlAlterTable exten
       const newTableDataColumn = tableData.getColumns().find((newTableDataColumn) => newTableDataColumn.getName() == tableDataColumn.getName())
 
       if (newTableDataColumn) {
-        const settingsToClone = ["autoIncrement", "default", "index", "foreignKey", "maxLength", "primaryKey", "type"]
-
-        for (const settingToClone of settingsToClone) {
-          const camelizedSettingToClone = inflection.camelize(settingToClone)
-
-          if (!newTableDataColumn[`get${camelizedSettingToClone}`]) {
-            throw new Error(`No such method on column: get${camelizedSettingToClone}`)
-          }
-
-          if (!newTableDataColumn[`get${camelizedSettingToClone}`]()) {
-            newTableDataColumn[`set${camelizedSettingToClone}`](tableDataColumn[`get${camelizedSettingToClone}`]())
-          }
-        }
+        newTableDataColumn.setAutoIncrement(tableDataColumn.getAutoIncrement())
+        newTableDataColumn.setDefault(tableDataColumn.getDefault())
+        newTableDataColumn.setIndex(tableDataColumn.getIndex())
+        newTableDataColumn.setForeignKey(tableDataColumn.getForeignKey())
+        newTableDataColumn.setMaxLength(tableDataColumn.getMaxLength())
+        newTableDataColumn.setPrimaryKey(tableDataColumn.getPrimaryKey())
+        newTableDataColumn.setType(tableDataColumn.getType())
       }
 
       newTableData.addColumn(newTableDataColumn || tableDataColumn)
@@ -105,7 +110,7 @@ export default class VelociousDatabaseConnectionDriversSqliteSqlAlterTable exten
 
     const createNewTableSQL = this.getDriver().createTableSql(newTableData)
     const insertSQL = `INSERT INTO ${options.quoteTableName(tempTableName)} (${newColumnsSQL}) SELECT ${oldColumnsSQL} FROM ${options.quoteTableName(tableName)}`
-    const dropTableSQL = `DROP TABLE ${options.quoteTableName(tableName)}`
+    const dropTableSQLs = `DROP TABLE ${options.quoteTableName(tableName)}`
     const renameTableSQL = `ALTER TABLE ${options.quoteTableName(tempTableName)} RENAME TO ${options.quoteTableName(tableName)}`
     const sqls = []
 
@@ -114,7 +119,7 @@ export default class VelociousDatabaseConnectionDriversSqliteSqlAlterTable exten
     }
 
     sqls.push(insertSQL)
-    sqls.push(dropTableSQL)
+    sqls.push(dropTableSQLs)
     sqls.push(renameTableSQL)
 
     for (const tableDataIndex of currentTableData.getIndexes()) {
@@ -136,7 +141,7 @@ export default class VelociousDatabaseConnectionDriversSqliteSqlAlterTable exten
         tableName,
         unique: actualTableIndex.getUnique()
       }
-      const createIndexSQLs = new CreateIndexBase(createIndexArgs).toSqls()
+      const createIndexSQLs = new CreateIndexBase(createIndexArgs).toSQLs()
 
       for (const createIndexSQL of createIndexSQLs) {
         sqls.push(createIndexSQL)

package/src/database/drivers/sqlite/sql/create-index.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 import CreateIndexBase from "../../../query/create-index-base.js"
 
 export default class VelociousDatabaseConnectionDriversSqliteSqlCreateIndex extends CreateIndexBase {

package/src/database/drivers/sqlite/sql/create-table.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 import CreateTableBase from "../../../query/create-table-base.js"
 
 export default class VelociousDatabaseConnectionDriversMysqlSqlCreateTable extends CreateTableBase {

package/src/database/drivers/sqlite/sql/delete.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 import DeleteBase from "../../../query/delete-base.js"
 
 export default class VelociousDatabaseConnectionDriversMysqlSqlDelete extends DeleteBase {
@@ -17,8 +19,8 @@ export default class VelociousDatabaseConnectionDriversMysqlSqlDelete extends De
         sql += this.getOptions().quote(this.conditions[columnName])
         count++
       }
-
-      return sql
     }
+
+    return sql
   }
 }

package/src/database/drivers/sqlite/sql/drop-table.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 import DropTableBase from "../../../query/drop-table-base.js"
 
 export default class VelociousDatabaseConnectionDriversSqliteSqlDropTable extends DropTableBase {

package/src/database/drivers/sqlite/sql/insert.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 import InsertBase from "../../../query/insert-base.js"
 
 export default class VelociousDatabaseConnectionDriversMysqlSqlInsert extends InsertBase {

package/src/database/drivers/sqlite/sql/update.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 import UpdateBase from "../../../query/update-base.js"
 
 export default class VelociousDatabaseConnectionDriversMysqlSqlUpdate extends UpdateBase {

package/src/database/drivers/sqlite/table.js

@@ -1,15 +1,23 @@
+// @ts-check
+
 import BaseTable from "../base-table.js"
 import Column from "./column.js"
 import ColumnsIndex from "./columns-index.js"
 import ForeignKey from "./foreign-key.js"
 
 export default class VelociousDatabaseDriversSqliteTable extends BaseTable {
+  /**
+   * @param {object} args
+   * @param {import("../base.js").default} args.driver
+   * @param {Record<string, any>} args.row
+   */
   constructor({driver, row}) {
     super()
     this.driver = driver
     this.row = row
   }
 
+  /** @returns {Promise<Array<import("../base-column.js").default>>} */
   async getColumns() {
     const result = await this.driver.query(`PRAGMA table_info('${this.getName()}')`)
     const columns = []
@@ -52,8 +60,14 @@ export default class VelociousDatabaseDriversSqliteTable extends BaseTable {
     return indexes
   }
 
+  /** @param {string} sql */
   _parseColumnsFromSQL(sql) {
     const columnsSQLMatch = sql.match(/\((.+?)\)/)
+
+    if (!columnsSQLMatch) {
+      throw new Error(`Could not match columns from SQL: ${sql}`)
+    }
+
     const columnsSQL = columnsSQLMatch[1].split(",")
     const columnNames = []
 

package/src/database/migration/index.js

@@ -90,7 +90,7 @@ export default class VelociousDatabaseMigration {
 
     tableData.addColumn(columnName, tableColumnArgs)
 
-    const sqls = await this.getDriver().alterTableSql(tableData)
+    const sqls = await this.getDriver().alterTableSQLs(tableData)
 
     for (const sql of sqls) {
       await this.getDriver().query(sql)
@@ -108,7 +108,7 @@ export default class VelociousDatabaseMigration {
 
     tableData.addColumn(columnName, tableColumnArgs)
 
-    const sqls = await this.getDriver().alterTableSql(tableData)
+    const sqls = await this.getDriver().alterTableSQLs(tableData)
 
     for (const sql of sqls) {
       await this.getDriver().query(sql)
@@ -135,9 +135,11 @@ export default class VelociousDatabaseMigration {
       },
       args
     )
-    const sql = this.getDriver().createIndexSql(createIndexArgs)
+    const sqls = this.getDriver().createIndexSQLs(createIndexArgs)
 
-    await this.getDriver().query(sql)
+    for (const sql of sqls) {
+      await this.getDriver().query(sql)
+    }
   }
 
   /**

package/src/database/pool/base-methods-forward.js

@@ -4,9 +4,9 @@
 export default function baseMethodsForward(PoolBase) {
   const forwardMethods = [
     "alterTable",
-    "alterTableSql",
+    "alterTableSQLs",
     "createIndex",
-    "createIndexSql",
+    "createIndexSQLs",
     "createTable",
     "createTableSql",
     "delete",

package/src/database/query/alter-table-base.js

@@ -22,7 +22,7 @@ export default class VelociousDatabaseQueryAlterTableBase extends QueryBase {
   /**
    * @returns {string[]}
    */
-  toSqls() {
+  toSQLs() {
     const databaseType = this.getDriver().getType()
     const sqls = []
     const {tableData} = this

package/src/database/query/base.js

@@ -40,7 +40,7 @@ export default class VelociousDatabaseQueryBase {
    * @abstract
    * @returns {string[]}
    */
-  toSqls() {
-    throw new Error("'toSqls' wasn't implemented")
+  toSQLs() {
+    throw new Error("'toSQLs' wasn't implemented")
   }
 }

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

@@ -1,13 +1,17 @@
 // @ts-check
 
+/**
+ * @typedef {object} CreateDatabaseArgsType
+ * @property {import("../drivers/base.js").default} driver
+ * @property {string} databaseName
+ * @property {boolean} [ifNotExists]
+ */
+
 import QueryBase from "./base.js"
 
 export default class VelociousDatabaseQueryCreateDatabaseBase extends QueryBase {
   /**
-   * @param {object} args
-   * @param {import("../drivers/base.js").default} args.driver
-   * @param {string} args.databaseName
-   * @param {boolean} [args.ifNotExists]
+   * @param {CreateDatabaseArgsType} args
    */
   constructor({driver, databaseName, ifNotExists}) {
     super({driver})

package/src/database/query/create-index-base.js

@@ -28,13 +28,15 @@ export default class VelociousDatabaseQueryCreateIndexBase extends QueryBase {
   generateIndexName() {
     const databaseType = this.getDriver().getType()
     let indexName = `index_on_`
+    let columnCount = 0
 
     if (databaseType == "sqlite") indexName += `${this.tableName}_`
 
-    for (const columnIndex in this.columns) {
-      if (typeof columnIndex == "number" && columnIndex > 0) indexName += "_and_"
+    for (const column of this.columns) {
+      columnCount++
+
+      if (columnCount > 1) indexName += "_and_"
 
-      const column = this.columns[columnIndex]
       let columnName
 
       if (typeof column == "string") {
@@ -52,7 +54,7 @@ export default class VelociousDatabaseQueryCreateIndexBase extends QueryBase {
   /**
    * @returns {string[]}
    */
-  toSqls() {
+  toSQLs() {
     const databaseType = this.getDriver().getType()
     const indexName = this.name || this.generateIndexName()
     const options = this.getOptions()
@@ -83,10 +85,13 @@ export default class VelociousDatabaseQueryCreateIndexBase extends QueryBase {
     sql += ` ${options.quoteIndexName(indexName)}`
     sql += ` ON ${options.quoteTableName(tableName)} (`
 
-    for (const columnIndex in this.columns) {
-      if (typeof columnIndex == "number" && columnIndex > 0) sql += ", "
+    let columnCount = 0
+
+    for (const column of this.columns) {
+      columnCount++
+
+      if (columnCount > 1) sql += ", "
 
-      const column = this.columns[columnIndex]
       let columnName
 
       if (typeof column == "string") {

package/src/database/query/create-table-base.js

@@ -10,8 +10,8 @@ export default class VelociousDatabaseQueryCreateTableBase extends QueryBase {
   /**
    * @param {object} args
    * @param {import("../drivers/base.js").default} args.driver
-   * @param {boolean} args.ifNotExists
-   * @param {boolean} args.indexInCreateTable
+   * @param {boolean} [args.ifNotExists]
+   * @param {boolean} [args.indexInCreateTable]
    * @param {TableData} args.tableData
    */
   constructor({driver, ifNotExists, indexInCreateTable = true, tableData}) {
@@ -128,7 +128,7 @@ export default class VelociousDatabaseQueryCreateTableBase extends QueryBase {
           tableName: tableData.getName(),
           unique: index.getUnique()
         }
-        const createIndexSQLs = new CreateIndexBase(createIndexArgs).toSqls()
+        const createIndexSQLs = new CreateIndexBase(createIndexArgs).toSQLs()
 
         for (const createIndexSQL of createIndexSQLs) {
           sqls.push(createIndexSQL)
@@ -156,7 +156,7 @@ export default class VelociousDatabaseQueryCreateTableBase extends QueryBase {
           tableName: tableData.getName(),
           unique
         }
-        const createIndexSQLs = new CreateIndexBase(createIndexArgs).toSqls()
+        const createIndexSQLs = new CreateIndexBase(createIndexArgs).toSQLs()
 
         for (const createIndexSQL of createIndexSQLs) {
           sqls.push(createIndexSQL)

package/src/database/query/drop-table-base.js

@@ -1,18 +1,18 @@
-import {digs} from "diggerize"
+// @ts-check
+
 import QueryBase from "./base.js"
 import restArgsError from "../../utils/rest-args-error.js"
 
 export default class VelociousDatabaseQueryDropTableBase extends QueryBase {
   /**
    * @param {object} args
-   * @param {boolean} args.cascade
+   * @param {boolean} [args.cascade]
    * @param {import("./../drivers/base.js").default} args.driver
-   * @param {boolean} args.ifExists
-   * @param {object} args.options
+   * @param {boolean} [args.ifExists]
    * @param {string} args.tableName
    */
-  constructor({cascade, driver, ifExists, options, tableName, ...restArgs}) {
-    super({driver, options})
+  constructor({cascade, driver, ifExists, tableName, ...restArgs}) {
+    super({driver})
 
     restArgsError(restArgs)
 
@@ -24,10 +24,10 @@ export default class VelociousDatabaseQueryDropTableBase extends QueryBase {
   /**
    * @returns {string[]}
    */
-  toSql() {
+  toSQLs() {
     const databaseType = this.getDatabaseType()
     const options = this.getOptions()
-    const {cascade, ifExists, tableName} = digs(this, "cascade", "ifExists", "tableName")
+    const {cascade, ifExists, tableName} = this
     const sqls = []
     let sql = ""
 

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/insert-base.js

@@ -1,6 +1,18 @@
+// @ts-check
+
 import restArgsError from "../../utils/rest-args-error.js"
 
 export default class VelociousDatabaseQueryInsertBase {
+  /**
+   * @param {object} args
+   * @param {Record<string, any>} [args.data]
+   * @param {import("../drivers/base.js").default} args.driver
+   * @param {string} args.tableName
+   * @param {Array<string>} [args.columns]
+   * @param {boolean} [args.multiple]
+   * @param {string[]} [args.returnLastInsertedColumnNames]
+   * @param {Array<Array<string>>} [args.rows]
+   */
   constructor({columns, data, driver, multiple, tableName, returnLastInsertedColumnNames, rows, ...restArgs}) {
     if (!driver) throw new Error("No driver given to insert base")
     if (!tableName) throw new Error(`Invalid table name given to insert base: ${tableName}`)
@@ -47,7 +59,7 @@ export default class VelociousDatabaseQueryInsertBase {
           lastInsertedSQL += ` INSERTED.${driver.quoteColumn(columnName)}`
         }
 
-        if (Object.keys(this.data).length <= 0) {
+        if (this.data && Object.keys(this.data).length <= 0) {
           sql += lastInsertedSQL
         }
       } else if (driver.getType() == "mysql" || driver.getType() == "pgsql" || (driver.getType() == "sqlite" && driver.supportsInsertIntoReturning())) {
@@ -86,7 +98,7 @@ export default class VelociousDatabaseQueryInsertBase {
       sql += ")"
     }
 
-    if (this.returnLastInsertedColumnNames && driver.getType() == "mssql" && Object.keys(this.data).length > 0) {
+    if (this.returnLastInsertedColumnNames && driver.getType() == "mssql" && this.data && Object.keys(this.data).length > 0) {
       sql += lastInsertedSQL
     }
 
@@ -104,7 +116,7 @@ export default class VelociousDatabaseQueryInsertBase {
         sql += this._valuesSql(row)
       }
     } else {
-      if (Object.keys(this.data).length > 0) {
+      if (this.data && Object.keys(this.data).length > 0) {
         sql += " VALUES "
         sql += this._valuesSql(Object.values(this.data))
       } else if (driver.getType() == "sqlite" || driver.getType() == "mssql") {
@@ -123,6 +135,9 @@ export default class VelociousDatabaseQueryInsertBase {
     return sql
   }
 
+  /**
+   * @param {any[]} data
+   */
   _valuesSql(data) {
     let count = 0
     let sql = "("

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

@@ -11,10 +11,10 @@ import WhereParser from "./where-parser.js"
 export default class VelociousDatabaseBaseQueryParser {
   /**
    * @param {object} args
-   * @param {boolean} args.pretty
+   * @param {boolean} [args.pretty]
    * @param {import("../query/index.js").default} args.query
    */
-  constructor({pretty, query}) {
+  constructor({pretty = false, query}) {
     if (!query) throw new Error("No query given")
 
     this.pretty = pretty