velocious 1.0.21 → 1.0.22

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "main": "index.js",
   "scripts": {
     "test": "jasmine",
@@ -34,6 +34,7 @@
     "debounce": "^2.2.0",
     "diggerize": "^1.0.5",
     "ejs": "^3.1.6",
+    "env-sense": "^1.0.0",
     "escape-string-regexp": "^1.0.5",
     "incorporator": "^1.0.2",
     "inflection": "^3.0.0",

package/src/cli/commands/init.js

@@ -22,9 +22,9 @@ export default class VelociousCliCommandsInit extends BaseCommand {
     ]
     const paths = [
       projectConfigPath,
-      `${projectPath}/database/migrations`,
-      `${projectPath}/models`,
-      `${projectPath}/routes`
+      `${projectPath}/src/database/migrations`,
+      `${projectPath}/src/models`,
+      `${projectPath}/src/routes`
     ]
 
     if (this.args.testing) {

package/src/configuration.js

@@ -97,11 +97,13 @@ export default class VelociousConfiguration {
   isInitialized = () => this._isInitialized
 
   async initialize() {
-    if (this._initializeModels) {
-      await this._initializeModels({configuration: this})
-    }
+    if (!this.isInitialized()) {
+      if (this._initializeModels) {
+        await this._initializeModels({configuration: this})
+      }
 
-    this._isInitialized = true
+      this._isInitialized = true
+    }
   }
 
   registerModelClass(modelClass) {

package/src/database/drivers/sqlite/index.web.js

@@ -1,6 +1,5 @@
 import BetterLocalStorage from "better-localstorage"
 import ConnectionSqlJs from "./connection-sql-js"
-import {digg} from "diggerize"
 import initSqlJs from "sql.js"
 
 import Base from "./base.js"

package/src/database/migration/index.js

@@ -1,4 +1,5 @@
 import * as inflection from "inflection"
+import restArgsError from "../../utils/rest-args-error.js"
 import TableData, {TableColumn} from "../table-data/index.js"
 
 export default class VelociousDatabaseMigration {
@@ -61,14 +62,29 @@ export default class VelociousDatabaseMigration {
     }
   }
 
-  async createTable(tableName, callback) {
+  async createTable(tableName, arg1, arg2) {
+    let args
+    let callback
+
+    if (typeof arg1 == "function") {
+      args = {}
+      callback = arg1
+    } else {
+      args = arg1
+      callback = arg2
+    }
+
     const databasePool = this.configuration.getDatabasePool()
-    const primaryKeyType = databasePool.primaryKeyType()
+    const {id = {}, ...restArgs} = args
+    const {default: idDefault, type: idType = databasePool.primaryKeyType(), ...restArgsId} = id
     const tableData = new TableData(tableName)
 
-    if (!(primaryKeyType in tableData)) throw new Error(`Unsupported primary key type: ${primaryKeyType}`)
+    restArgsError(restArgs)
+    restArgsError(restArgsId)
+
+    if (!(idType in tableData)) throw new Error(`Unsupported primary key type: ${idType}`)
 
-    tableData[primaryKeyType]("id", {autoIncrement: true, null: false, primaryKey: true})
+    tableData[idType]("id", {autoIncrement: true, default: idDefault, null: false, primaryKey: true})
 
     if (callback) {
       callback(tableData)

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

@@ -47,6 +47,13 @@ export default class VelociousDatabaseQueryCreateTableBase extends QueryBase {
       if (maxlength !== undefined) sql += `(${maxlength})`
 
       if (column.getAutoIncrement() && this.driver.shouldSetAutoIncrementWhenPrimaryKey()) sql += " AUTO_INCREMENT"
+
+      if (typeof column.getDefault() == "function") {
+        sql += ` DEFAULT (${column.getDefault()()})`
+      } else if (column.getDefault()) {
+        sql += ` DEFAULT ${this.driver.quote(column.getDefault())}`
+      }
+
       if (column.getPrimaryKey()) sql += " PRIMARY KEY"
       if (column.getNull() === false) sql += " NOT NULL"
 

package/src/database/table-data/index.js

@@ -3,7 +3,7 @@ import restArgsError from "../../utils/rest-args-error.js"
 class TableColumn {
   constructor(name, args) {
     if (args) {
-      const {autoIncrement, foreignKey, maxLength, name, null: argsNull, primaryKey, type, ...restArgs} = args
+      const {autoIncrement, default: columnDefault, foreignKey, maxLength, name, null: argsNull, primaryKey, type, ...restArgs} = args
 
       restArgsError(restArgs)
     }
@@ -13,6 +13,7 @@ class TableColumn {
   }
 
   getAutoIncrement = () => this.args?.autoIncrement
+  getDefault = () => this.args?.default
   getForeignKey = () => this.args?.foreignKey
   getMaxLength = () => this.args?.maxLength
   getName = () => this.name
@@ -70,6 +71,7 @@ export default class TableData {
   getReferences = () => this._references
 
   bigint = (name, args = {}) => this._defineColumn(name, Object.assign({type: "bigint"}, args))
+  blob = (name, args = {}) => this._defineColumn(name, Object.assign({type: "blob"}, args))
   boolean = (name, args) => this._defineColumn(name, Object.assign({type: "boolean"}, args))
   datetime = (name, args) => this._defineColumn(name, Object.assign({type: "datetime"}, args))
   integer = (name, args = {}) => this._defineColumn(name, Object.assign({type: "integer"}, args))
@@ -94,4 +96,6 @@ export default class TableData {
     this.datetime("created_at", args)
     this.datetime("updated_at", args)
   }
+
+  uuid = (name, args) => this._defineColumn(name, Object.assign({type: "uuid"}, args))
 }

package/src/database/use-database.js

@@ -0,0 +1,40 @@
+import DatabaseMigrateFromRequireContext from "./migrate-from-require-context.js"
+import React from "react"
+import useEnvSense from "env-sense/src/use-env-sense.js"
+
+import Configuration from "../configuration.js"
+import restArgsError from "../utils/rest-args-error.js"
+
+const shared = {
+  loaded: false
+}
+
+const loadMigrations = function loadMigrations({migrationsRequireContext, ...restArgs}) {
+  const {isServer} = useEnvSense()
+  const [loaded, setLoaded] = React.useState(shared.loaded)
+
+  const loadDatabase = React.useCallback(async () => {
+    await Configuration.current().getDatabasePool().withConnection(async () => {
+      const databaseMigrateFromRequireContext = new DatabaseMigrateFromRequireContext()
+
+      await databaseMigrateFromRequireContext.execute(migrationsRequireContext)
+    })
+
+    await Configuration.current().initialize()
+
+    shared.loaded = true
+    setLoaded(true)
+  }, [])
+
+  React.useMemo(() => {
+    if (!loaded && !isServer) {
+      loadDatabase()
+    }
+  }, [loaded])
+
+  restArgsError(restArgs)
+
+  return {loaded}
+}
+
+export default loadMigrations