velocious 1.0.53 → 1.0.55

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.53",
+  "version": "1.0.55",
   "main": "index.js",
   "scripts": {
     "test": "VELOCIOUS_TEST_DIR=../ cd spec/dummy && npx velocious test",

package/spec/dummy/src/config/configuration.example.js

@@ -17,7 +17,8 @@ export default new Configuration({
         host: "mariadb",
         username: "username",
         password: "password",
-        database: "velocious_development"
+        database: "velocious_development",
+        migrations: true
       }
     },
     production: {
@@ -28,7 +29,8 @@ export default new Configuration({
         host: "mariadb",
         username: "username",
         password: "password",
-        database: "velocious_production"
+        database: "velocious_production",
+        migrations: true
       }
     },
     test: {
@@ -39,7 +41,8 @@ export default new Configuration({
         host: "mariadb",
         username: "username",
         password: "password",
-        database: "velocious_test"
+        database: "velocious_test",
+        migrations: true
       }
     }
   },

package/spec/dummy/src/config/configuration.peakflow.mariadb.js

@@ -19,7 +19,8 @@ export default new Configuration({
         username: "peakflow",
         password: "password",
         database: "velocious_test",
-        useDatabase: "velocious_test"
+        useDatabase: "velocious_test",
+        migrations: true
       },
       mssql: {
         driver: MssqlDriver,
@@ -27,6 +28,7 @@ export default new Configuration({
         type: "mssql",
         database: "velocious_test",
         useDatabase: "default",
+        migrations: true,
         sqlConfig: {
           user: "sa",
           password: "Super-Secret-Password",

package/spec/dummy/src/config/configuration.peakflow.mssql.js

@@ -16,6 +16,7 @@ export default new Configuration({
         type: "mssql",
         database: "velocious_test",
         useDatabase: "default",
+        migrations: true,
         sqlConfig: {
           user: "sa",
           password: "Super-Secret-Password",
@@ -33,6 +34,7 @@ export default new Configuration({
         type: "mssql",
         database: "velocious_test",
         useDatabase: "default",
+        migrations: true,
         sqlConfig: {
           user: "sa",
           password: "Super-Secret-Password",

package/spec/dummy/src/config/configuration.peakflow.pgsql.js

@@ -19,7 +19,8 @@ export default new Configuration({
         username: "peakflow",
         password: "password",
         database: "velocious_test",
-        useDatabase: "velocious_test"
+        useDatabase: "velocious_test",
+        migrations: true
       },
       mssql: {
         driver: MssqlDriver,
@@ -27,6 +28,7 @@ export default new Configuration({
         type: "mssql",
         database: "velocious_test",
         useDatabase: "default",
+        migrations: true,
         sqlConfig: {
           user: "sa",
           password: "Super-Secret-Password",

package/spec/dummy/src/config/configuration.peakflow.sqlite.js

@@ -16,7 +16,8 @@ export default new Configuration({
         driver: SqliteDriver,
         poolType: SingleMultiUsePool,
         type: "sqlite",
-        name: "test-db"
+        name: "test-db",
+        migrations: true
       },
       mssql: {
         driver: MssqlDriver,
@@ -24,6 +25,7 @@ export default new Configuration({
         type: "mssql",
         database: "velocious_test",
         useDatabase: "default",
+        migrations: true,
         sqlConfig: {
           user: "sa",
           password: "Super-Secret-Password",

package/src/configuration.js

@@ -1,7 +1,6 @@
 import {digg} from "diggerize"
 import restArgsError from "./utils/rest-args-error.js"
-
-// import {withTrackedStack} from "./utils/with-tracked-stack.js"
+import {withTrackedStack} from "./utils/with-tracked-stack.js"
 
 export default class VelociousConfiguration {
   static current(throwError = true) {
@@ -159,9 +158,9 @@ export default class VelociousConfiguration {
     const dbs = {}
     const stack = Error().stack
     const actualCallback = async () => {
-      // await withTrackedStack(stack, async () => {
+      await withTrackedStack(stack, async () => {
         return await callback(dbs)
-      // })
+      })
     }
 
     let runRequest = actualCallback

package/src/database/migrator.js

@@ -17,8 +17,19 @@ export default class VelociousDatabaseMigrator {
   async createMigrationsTable() {
     const dbs = await this.configuration.getCurrentConnections()
 
-    for (const db of Object.values(dbs)) {
-      if (await this.migrationsTableExist(db)) continue
+    for (const dbIdentifier in dbs) {
+      const db = dbs[dbIdentifier]
+      const databaseConfiguration = this.configuration.getDatabaseIdentifier(dbIdentifier)
+
+      if (!databaseConfiguration.migrations) {
+        this.logger.log(`${dbIdentifier} isn't configured for migrations - skipping creating migrations table for it`)
+        continue
+      }
+
+      if (await this.migrationsTableExist(db)) {
+        this.logger.log(`${dbIdentifier} migrations table already exists - skipping`)
+        continue
+      }
 
       const schemaMigrationsTable = new TableData("schema_migrations", {ifNotExists: true})
 
@@ -107,6 +118,18 @@ export default class VelociousDatabaseMigrator {
 
     for (const dbIdentifier in dbs) {
       const db = dbs[dbIdentifier]
+      const databaseConfiguration = this.configuration.getDatabaseIdentifier(dbIdentifier)
+
+      if (!databaseConfiguration.migrations) {
+        this.logger.debug(`${dbIdentifier} isn't configured for migrations - skipping loading migrations versions for it`)
+        continue
+      }
+
+      if (!await this.migrationsTableExist(db)) {
+        this.logger.log(`Migration table does not exist for ${dbIdentifier} - skipping loading migrations versions for it`)
+        continue
+      }
+
       const rows = await db.select("schema_migrations")
 
       this.migrationsVersions[dbIdentifier] = {}
@@ -204,6 +227,13 @@ export default class VelociousDatabaseMigrator {
     const migrationDatabaseIdentifiers = migrationClass.getDatabaseIdentifiers() || ["default"]
 
     for (const dbIdentifier in dbs) {
+      const databaseConfiguration = this.configuration.getDatabaseIdentifier(dbIdentifier)
+
+      if (!databaseConfiguration.migrations) {
+        this.logger.debug(`${dbIdentifier} isn't configured for migrations - skipping migration ${digg(migration, "date")}`)
+        continue
+      }
+
       if (!migrationDatabaseIdentifiers.includes(dbIdentifier)) {
         this.logger.debug(`${dbIdentifier} shouldn't run migration ${migration.file}`, {migrationDatabaseIdentifiers})
         continue

package/src/testing/test-runner.js

@@ -1,4 +1,4 @@
-// import {addTrackedStackToError} from "../utils/with-tracked-stack.js"
+import {addTrackedStackToError} from "../utils/with-tracked-stack.js"
 import Application from "../../src/application.js"
 import BacktraceCleaner from "../utils/backtrace-cleaner.js"
 import RequestClient from "./request-client.js"
@@ -145,8 +145,8 @@ export default class TestRunner {
       } catch (error) {
         this._failedTests++
 
-        // console.error(`${leftPadding}  Test failed: ${error.message}`)
-        // addTrackedStackToError(error)
+        console.error(`${leftPadding}  Test failed: ${error.message}`)
+        addTrackedStackToError(error)
 
         const backtraceCleaner = new BacktraceCleaner(error)
         const cleanedStack = backtraceCleaner.getCleanedStack()

package/src/utils/with-tracked-stack-async-hooks.js

@@ -0,0 +1,69 @@
+import {AsyncLocalStorage} from "async_hooks"
+
+let asyncLocalStorage
+
+if (AsyncLocalStorage) {
+  asyncLocalStorage = new AsyncLocalStorage()
+}
+
+function addTrackedStackToError(error) {
+  // Not supported
+  if (!asyncLocalStorage) return
+
+  const parentStacks = asyncLocalStorage.getStore() || []
+  const additionalStackLines = []
+
+  for (const parentStack of parentStacks) {
+    for (const parentStackLine of parentStack) {
+      additionalStackLines.push(parentStackLine)
+    }
+  }
+
+  // Replace the error message on the first line with this string
+  error.stack += "\n" + additionalStackLines.join("\n")
+}
+
+async function withTrackedStack(arg1, arg2) {
+  let callback, stack
+
+  if (arg2) {
+    callback = arg2
+    stack = arg1
+  } else {
+    callback = arg1
+    stack = Error().stack
+  }
+
+  // Not supported
+  if (!asyncLocalStorage) return await callback()
+
+  const parentStacks = asyncLocalStorage.getStore() || []
+  const additionalStackLines = []
+  const currentStackLines = stack.split("\n")
+
+  currentStackLines[0] = "    [WITH TRACKED STACK]"
+
+  for (let i = currentStackLines.length; i >= 0; i--) {
+    const stackLine = currentStackLines[i]
+
+    additionalStackLines.unshift(stackLine)
+
+    if (stackLine == "    [WITH TRACKED STACK]") {
+      break
+    }
+  }
+
+  const newStacks = [additionalStackLines, ...parentStacks]
+
+  await asyncLocalStorage.run(newStacks, async () => {
+    return await callback()
+  })
+}
+
+if (globalThis.withTrackedStack) {
+  console.warn("globalThis.withTrackedStack was already defined")
+} else {
+  globalThis.withTrackedStack = {addTrackedStackToError, withTrackedStack}
+}
+
+export {addTrackedStackToError, withTrackedStack}

package/src/utils/with-tracked-stack.js

@@ -1,63 +1,23 @@
-import {AsyncLocalStorage} from "async_hooks"
-
-let asyncLocalStorage
-
-if (AsyncLocalStorage) {
-  asyncLocalStorage = new AsyncLocalStorage()
-}
-
 function addTrackedStackToError(error) {
-  // Not supported
-  if (!asyncLocalStorage) return
-
-  const parentStacks = asyncLocalStorage.getStore() || []
-  const additionalStackLines = []
-
-  for (const parentStack of parentStacks) {
-    for (const parentStackLine of parentStack) {
-      additionalStackLines.push(parentStackLine)
-    }
-  }
-
-  // Replace the error message on the first line with this string
-  error.stack += "\n" + additionalStackLines.join("\n")
+  globalThis.withTrackedStack?.addTrackedStackToError(error)
 }
 
-async function withTrackedStack(arg1, arg2) {
-  let callback, stack
+async function withTrackedStack(...args) {
+  const withTrackedStack = globalThis.withTrackedStack?.withTrackedStack
 
-  if (arg2) {
-    callback = arg2
-    stack = arg1
-  } else {
-    callback = arg1
-    stack = Error().stack
-  }
+  let callback
 
-  // Not supported
-  if (!asyncLocalStorage) return await callback()
-
-  const parentStacks = asyncLocalStorage.getStore() || []
-  const additionalStackLines = []
-  const currentStackLines = stack.split("\n")
-
-  currentStackLines[0] = "    [WITH TRACKED STACK]"
-
-  for (let i = currentStackLines.length; i >= 0; i--) {
-    const stackLine = currentStackLines[i]
-
-    additionalStackLines.unshift(stackLine)
-
-    if (stackLine == "    [WITH TRACKED STACK]") {
-      break
-    }
+  if (args[1]) {
+    callback = args[1]
+  } else {
+    callback = args[0]
   }
 
-  const newStacks = [additionalStackLines, ...parentStacks]
-
-  await asyncLocalStorage.run(newStacks, async () => {
+  if (withTrackedStack) {
+    return await withTrackedStack(...args)
+  } else {
     return await callback()
-  })
+  }
 }
 
 export {addTrackedStackToError, withTrackedStack}

package/src/utils/with-tracked-stack.native.js

@@ -1,10 +0,0 @@
-function addTrackedStackToError(error) {
-  // Not supported
-}
-
-async function withTrackedStack(arg1, arg2) {
-  // Not supported
-  return await callback()
-}
-
-export {addTrackedStackToError, withTrackedStack}