velocious 1.0.61 → 1.0.63

package/package.json

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

package/run-tests.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-VELOCIOUS_TEST_DIR=/home/dev/Development/velocious cd spec/dummy && npx velocious test
+VELOCIOUS_TEST_DIR=/home/dev/Development/velocious/spec cd spec/dummy && npx velocious test
 

package/spec/dummy/index.js

@@ -60,7 +60,8 @@ export default class Dummy {
       httpServer: {
         maxWorkers: 1,
         port: 3006
-      }
+      },
+      type: "dummy"
     })
 
     await this.application.initialize()

package/src/application.js

@@ -4,16 +4,19 @@ import {Logger} from "./logger.js"
 import HttpServer from "./http-server/index.js"
 
 export default class VelociousApplication {
-  constructor({configuration, httpServer}) {
+  constructor({configuration, httpServer, type}) {
     this.configuration = configuration
     this.httpServerConfiguration = httpServer ?? {}
     this.logger = new Logger(this)
+    this._type = type
   }
 
+  getType() { return this._type }
+
   async initialize() {
     const routes = await AppRoutes.getRoutes(this.configuration)
 
-    await this.configuration.initialize()
+    await this.configuration.initialize({type: this.getType()})
 
     this.configuration.setRoutes(routes)
 

package/src/cli/commands/server.js

@@ -17,7 +17,8 @@ export default class VelociousCliCommandsServer extends BaseCommand{
       httpServer: {
         host,
         port
-      }
+      },
+      type: "server"
     })
 
     await application.initialize()

package/src/cli/commands/test.js

@@ -22,6 +22,9 @@ export default class VelociousCliCommandsTest extends BaseCommand {
     if (testRunner.isFailed()) {
       console.error(`\nTest run failed with ${testRunner.getFailedTests()} failed tests and ${testRunner.getSuccessfulTests()} successfull`)
       process.exit(1)
+    } else if (testRunner.areAnyTestsFocussed()) {
+      console.error(`\nFocussed run with ${testRunner.getFailedTests()} failed tests and ${testRunner.getSuccessfulTests()} successfull`)
+      process.exit(1)
     } else {
       console.log(`\nTest run succeeded with ${testRunner.getSuccessfulTests()} successful tests`)
       process.exit(0)

package/src/configuration.js

@@ -9,7 +9,7 @@ export default class VelociousConfiguration {
     return this.velociousConfiguration
   }
 
-  constructor({cors, database, debug, directory, environment, initializeModels, locale, localeFallbacks, locales, testing, ...restArgs}) {
+  constructor({cors, database, debug, directory, environment, initializeModels, initializers, locale, localeFallbacks, locales, testing, ...restArgs}) {
     restArgsError(restArgs)
 
     this.cors = cors
@@ -19,6 +19,7 @@ export default class VelociousConfiguration {
     this._environment = environment || process.env.VELOCIOUS_ENV || process.env.NODE_ENV || "development"
     this._directory = directory
     this._initializeModels = initializeModels
+    this._initializers = initializers
     this._isInitialized = false
     this.locale = locale
     this.localeFallbacks = localeFallbacks
@@ -118,13 +119,29 @@ export default class VelociousConfiguration {
   isDatabasePoolInitialized(identifier = "default") { return Boolean(this.databasePools[identifier]) }
   isInitialized() { return this._isInitialized }
 
-  async initialize() {
+  async initialize({type} = {}) {
     if (!this.isInitialized()) {
+      this._isInitialized = true
+
       if (this._initializeModels) {
-        await this._initializeModels({configuration: this})
+        await this._initializeModels({configuration: this, type})
       }
 
-      this._isInitialized = true
+      if (this._initializers) {
+        const initializers = await this._initializers({configuration: this})
+        const {requireContext, ...restArgs} = initializers
+
+        restArgsError(restArgs)
+
+        if (requireContext) {
+          for (const initializerKey of requireContext.keys()) {
+            const InitializerClass = requireContext(initializerKey).default
+            const initializerInstance = new InitializerClass({configuration: this, type})
+
+            await initializerInstance.run()
+          }
+        }
+      }
     }
   }
 

package/src/database/migration/index.js

@@ -27,6 +27,11 @@ export default class VelociousDatabaseMigration {
   }
 
   getDriver() { return this._db }
+  connection() { return this.getDriver() }
+
+  async execute(sql) {
+    await this.connection().query(sql)
+  }
 
   async addColumn(tableName, columnName, columnType, args) {
     if (!columnType) throw new Error("No column type given")

package/src/http-server/worker-handler/worker-thread.js

@@ -33,10 +33,10 @@ export default class VelociousHttpServerWorkerHandlerWorkerThread {
     this.configuration.setEnvironment(environment)
     this.configuration.setCurrent()
 
-    this.application = new Application({configuration: this.configuration, debug, directory})
+    this.application = new Application({configuration: this.configuration, debug, directory, type: "worker-handler"})
 
     if (this.configuration.isInitialized()) {
-      await this.configuration.initialize()
+      await this.configuration.initialize({type: "worker-handler"})
     }
   }
 

package/src/initializer.js

@@ -0,0 +1,13 @@
+export default class VelociousInitializer {
+  constructor({configuration, type}) {
+    this._configuration = configuration
+    this._type = type
+  }
+
+  getConfiguration() { return this._configuration }
+  getType() { return this._type }
+
+  run() {
+    throw new Error(`'run' hasn't been implemented on ${this.constructor.name})`)
+  }
+}

package/src/templates/generate-migration.js

@@ -2,10 +2,10 @@ import Migration from "velocious/src/database/migration/index.js"
 
 export default class __MIGRATION_NAME__ extends Migration {
   async up() {
-    await this.connection().execute("...")
+    await this.execute("...")
   }
 
   async down() {
-    await this.connection().execute("...")
+    await this.execute("...")
   }
 }

package/src/testing/test-runner.js

@@ -21,7 +21,8 @@ export default class TestRunner {
             password: ""
           }
         },
-        httpServer: {port: 31006}
+        httpServer: {port: 31006},
+        type: "test-runner"
       })
 
       await this._application.initialize()
@@ -62,6 +63,7 @@ export default class TestRunner {
   }
 
   async prepare() {
+    this.anyTestsFocussed = false
     this._failedTests = 0
     this._successfulTests = 0
     this._testsCount = 0
@@ -76,6 +78,14 @@ export default class TestRunner {
     }
   }
 
+  areAnyTestsFocussed() {
+    if (this.anyTestsFocussed === undefined) {
+      throw new Error("Hasn't been detected yet")
+    }
+
+    return this.anyTestsFocussed
+  }
+
   async run() {
     await this.configuration.ensureConnections(async () => {
       await this.runTests({