velocious 1.0.90 → 1.0.92

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.90",
+  "version": "1.0.92",
   "main": "index.js",
   "scripts": {
     "lint": "eslint",

package/src/cli/commands/server.js

@@ -1,30 +1,7 @@
-import Application from "../../application.js"
 import BaseCommand from "../base-command.js"
 
 export default class VelociousCliCommandsServer extends BaseCommand{
   async execute() {
-    this.databasePool = this.getConfiguration().getDatabasePool()
-    this.newConfiguration = Object.assign({}, this.databasePool.getConfiguration())
-    this.databaseConnection = await this.databasePool.spawnConnectionWithConfiguration(this.newConfiguration)
-
-    await this.databaseConnection.connect()
-
-    const {parsedProcessArgs} = this.args
-    const host = parsedProcessArgs.h || parsedProcessArgs.host || "127.0.0.1"
-    const port = parsedProcessArgs.p || parsedProcessArgs.port || 3006
-    const application = new Application({
-      configuration: this.getConfiguration(),
-      httpServer: {
-        host,
-        port
-      },
-      type: "server"
-    })
-    const environment = this.getConfiguration().getEnvironment()
-
-    await application.initialize()
-    await application.startHttpServer()
-    console.log(`Started Velocious HTTP server on ${host}:${port} in ${environment} environment`)
-    await application.wait()
+    return await this.getConfiguration().getEnvironmentHandler().cliCommandsServer(this)
   }
 }

package/src/cli/commands/test.js

@@ -1,33 +1,7 @@
 import BaseCommand from "../base-command.js"
-import TestFilesFinder from "../../testing/test-files-finder.js"
-import TestRunner from "../../testing/test-runner.js"
 
 export default class VelociousCliCommandsTest extends BaseCommand {
   async execute() {
-    this.getConfiguration().setEnvironment("test")
-
-    const directory = process.env.VELOCIOUS_TEST_DIR || this.directory()
-    const testFilesFinder = new TestFilesFinder({directory, processArgs: this.processArgs})
-    const testFiles = await testFilesFinder.findTestFiles()
-    const testRunner = new TestRunner({configuration: this.getConfiguration(), testFiles})
-
-    await testRunner.prepare()
-
-    if (testRunner.getTestsCount() === 0) {
-      throw new Error("No tests has been found")
-    }
-
-    await testRunner.run()
-
-    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)
-    }
+    return await this.getConfiguration().getEnvironmentHandler().cliCommandsTest(this)
   }
 }

package/src/environment-handlers/browser.js

@@ -31,6 +31,14 @@ export default class VelociousEnvironmentsHandlerBrowser extends Base {
     throw new Error("Unsupported on browser")
   }
 
+  async cliCommandsServer(_command) { // eslint-disable-line no-unused-vars
+    throw new Error("Unsupported on browser")
+  }
+
+  async cliCommandsTest(_command) { // eslint-disable-line no-unused-vars
+    throw new Error("Unsupported on browser")
+  }
+
   /**
    * @returns {object}
    */

package/src/environment-handlers/node/cli/commands/server.js

@@ -0,0 +1,30 @@
+import Application from "../../../../application.js"
+import BaseCommand from "../../../../cli/base-command.js"
+
+export default class VelociousCliCommandsServer extends BaseCommand{
+  async execute() {
+    this.databasePool = this.getConfiguration().getDatabasePool()
+    this.newConfiguration = Object.assign({}, this.databasePool.getConfiguration())
+    this.databaseConnection = await this.databasePool.spawnConnectionWithConfiguration(this.newConfiguration)
+
+    await this.databaseConnection.connect()
+
+    const {parsedProcessArgs} = this.args
+    const host = parsedProcessArgs.h || parsedProcessArgs.host || "127.0.0.1"
+    const port = parsedProcessArgs.p || parsedProcessArgs.port || 3006
+    const application = new Application({
+      configuration: this.getConfiguration(),
+      httpServer: {
+        host,
+        port
+      },
+      type: "server"
+    })
+    const environment = this.getConfiguration().getEnvironment()
+
+    await application.initialize()
+    await application.startHttpServer()
+    console.log(`Started Velocious HTTP server on ${host}:${port} in ${environment} environment`)
+    await application.wait()
+  }
+}

package/src/environment-handlers/node/cli/commands/test.js

@@ -0,0 +1,33 @@
+import BaseCommand from "../../../../cli/base-command.js"
+import TestFilesFinder from "../../../../testing/test-files-finder.js"
+import TestRunner from "../../../../testing/test-runner.js"
+
+export default class VelociousCliCommandsTest extends BaseCommand {
+  async execute() {
+    this.getConfiguration().setEnvironment("test")
+
+    const directory = process.env.VELOCIOUS_TEST_DIR || this.directory()
+    const testFilesFinder = new TestFilesFinder({directory, processArgs: this.processArgs})
+    const testFiles = await testFilesFinder.findTestFiles()
+    const testRunner = new TestRunner({configuration: this.getConfiguration(), testFiles})
+
+    await testRunner.prepare()
+
+    if (testRunner.getTestsCount() === 0) {
+      throw new Error("No tests has been found")
+    }
+
+    await testRunner.run()
+
+    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/environment-handlers/node.js

@@ -3,6 +3,8 @@ import CliCommandsDestroyMigration from "./node/cli/commands/destroy/migration.j
 import CliCommandsInit from "./node/cli/commands/init.js"
 import CliCommandsGenerateMigration from "./node/cli/commands/generate/migration.js"
 import CliCommandsGenerateModel from "./node/cli/commands/generate/model.js"
+import CliCommandsServer from "./node/cli/commands/server.js"
+import CliCommandsTest from "./node/cli/commands/test.js"
 import {dirname} from "path"
 import {fileURLToPath} from "url"
 import fs from "fs/promises"
@@ -62,6 +64,14 @@ export default class VelociousEnvironmentHandlerNode extends Base{
     return await this.forwardCommand(command, CliCommandsGenerateModel)
   }
 
+  async cliCommandsServer(command) {
+    return await this.forwardCommand(command, CliCommandsServer)
+  }
+
+  async cliCommandsTest(command) {
+    return await this.forwardCommand(command, CliCommandsTest)
+  }
+
   /**
    * @param {Array<string>} commandParts
    * @template T extends import ("./base-command.js").default