velocious 1.0.62 → 1.0.64

package/package.json

@@ -1,9 +1,9 @@
 {
   "bin": {
-    "velocious": "bin/velocious.js"
+    "velocious": "bin/velocious.mjs"
   },
   "name": "velocious",
-  "version": "1.0.62",
+  "version": "1.0.64",
   "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/configuration-resolver.js

@@ -1,4 +1,6 @@
 import Configuration from "./configuration.js"
+import envSense from "env-sense/src/use-env-sense.js"
+import fileExists from "./utils/file-exists.js"
 
 const configurationResolver = async (args) => {
   if (Configuration.current(false)) {
@@ -6,8 +8,17 @@ const configurationResolver = async (args) => {
   }
 
   const directory = args.directory || process.cwd()
-  const configurationPath = `${directory}/src/config/configuration.js`
-  let configuration
+  let configurationPrePath = `${directory}/src/config/configuration`
+  const configurationPathForNode = `${configurationPrePath}.node.js`
+  const configurationPathDefault = `${configurationPrePath}.js`
+  const {isServer} = envSense()
+  let configuration, configurationPath
+
+  if (isServer && await fileExists(configurationPathForNode)) {
+    configurationPath = configurationPathForNode
+  } else {
+    configurationPath = configurationPathDefault
+  }
 
   try {
     const configurationImport = await import(configurationPath)

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/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/testing/test-files-finder.js

@@ -23,7 +23,7 @@ export default class TestFilesFinder {
     return this.foundFiles
   }
 
-  findingPromisesLength = () => Object.keys(this.findingPromises).length
+  findingPromisesLength() { return Object.keys(this.findingPromises).length }
 
   async waitForFindingPromises() {
     while (this.findingPromisesLength() > 0) {
@@ -90,7 +90,7 @@ export default class TestFilesFinder {
           return true
         }
       }
-    } else if (file.match(/-(spec|test)\.js/)) {
+    } else if (file.match(/-(spec|test)\.(m|)js$/)) {
       return true
     }
 

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()

package/src/utils/file-exists.js

@@ -1,6 +1,6 @@
 import fs from "node:fs/promises"
 
-const fileExists = async (path) => {
+async function fileExists(path) {
   try {
     await fs.access(path)