velocious 1.0.88 → 1.0.90

package/package.json

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

package/src/cli/base-command.js

@@ -1,16 +1,39 @@
 import restArgsError from "../utils/rest-args-error.js"
 
 export default class VelociousCliBaseCommand {
-  constructor({args = {}, environmentHandler, ...restArgs}) {
+  /**
+   * @param {object} args
+   * @param {object} args.args
+   */
+  constructor({args = {}, ...restArgs}) {
     restArgsError(restArgs)
 
     this.args = args
     this._configuration = args.configuration
-    this._environmentHandler = environmentHandler
+    this._environmentHandler = args.configuration.getEnvironmentHandler()
     this.processArgs = args.processArgs
   }
 
+  /**
+   * @returns {string}
+   */
   directory() { return this.getConfiguration().getDirectory() }
+
+  /**
+   * @interface
+   */
+  execute() {
+    throw new Error("execute not implemented")
+  }
+
+  /**
+   * @returns {import("../configuration.js").default}
+   */
   getConfiguration() { return this._configuration }
+
+  /**
+   * @template T extends import("../environment-handlers/base.js").default
+   * @returns {T}
+   */
   getEnvironmentHandler() { return this._environmentHandler }
 }

package/src/cli/commands/destroy/migration.js

@@ -1,35 +1,7 @@
 import BaseCommand from "../../base-command.js"
-import fs from "fs/promises"
 
 export default class DbDestroyMigration extends BaseCommand {
   async execute() {
-    const migrationName = this.processArgs[1]
-    const migrationDir = `${this.getConfiguration().getDirectory()}/src/database/migrations`
-    const migrationFiles = await fs.readdir(migrationDir)
-    const destroyed = []
-
-    for (const migrationFile of migrationFiles) {
-      const match = migrationFile.match(/^(\d{14})-(.+)\.js$/)
-
-      if (!match) {
-        continue
-      }
-
-      const fileName = match[2]
-
-      if (fileName != migrationName) continue
-
-      const fullFilePath = `${migrationDir}/${migrationFile}`
-      destroyed.push(fileName)
-
-      if (!this.args.testing) {
-        console.log(`Destroy src/database/migrations/${migrationFile}`)
-        await fs.unlink(fullFilePath)
-      }
-    }
-
-    if (this.args.testing) {
-      return {destroyed}
-    }
+    return await this.getConfiguration().getEnvironmentHandler().cliCommandsMigrationDestroy(this)
   }
 }

package/src/cli/commands/generate/migration.js

@@ -1,33 +1,7 @@
 import BaseCommand from "../../base-command.js"
-import fileExists from "../../../utils/file-exists.js"
-import fs from "fs/promises"
-import * as inflection from "inflection"
-import strftime from "strftime"
 
 export default class DbGenerateMigration extends BaseCommand {
   async execute() {
-    const migrationName = this.processArgs[1]
-    const migrationNameCamelized = inflection.camelize(migrationName.replaceAll("-", "_"))
-    const date = new Date()
-    const migrationNumber = strftime("%Y%m%d%H%M%S")
-    const migrationFileName = `${migrationNumber}-${migrationName}.js`
-    const velociousPath = await this.getEnvironmentHandler().getVelociousPath()
-    const templateFilePath = `${velociousPath}/src/templates/generate-migration.js`
-    const migrationContentBuffer = await fs.readFile(templateFilePath)
-    const migrationContent = migrationContentBuffer.toString().replaceAll("__MIGRATION_NAME__", migrationNameCamelized)
-    const migrationDir = `${process.cwd()}/src/database/migrations`
-    const migrationPath = `${migrationDir}/${migrationFileName}`
-
-    if (this.args.testing) {
-      return {date, migrationContent, migrationName, migrationNameCamelized, migrationNumber, migrationPath}
-    } else {
-      if (!await fileExists(migrationDir)) {
-        await fs.mkdir(migrationDir, {recursive: true})
-      }
-
-      await fs.writeFile(migrationPath, migrationContent)
-
-      console.log(`create src/database/migrations/${migrationFileName}`)
-    }
+    return await this.getConfiguration().getEnvironmentHandler().cliCommandsMigrationGenerate(this)
   }
 }

package/src/cli/commands/generate/model.js

@@ -1,33 +1,7 @@
 import BaseCommand from "../../base-command.js"
-import fileExists from "../../../utils/file-exists.js"
-import fs from "fs/promises"
-import * as inflection from "inflection"
 
 export default class DbGenerateModel extends BaseCommand {
   async execute() {
-    const modelName = this.processArgs[1]
-    const modelNameCamelized = inflection.camelize(modelName.replaceAll("-", "_"))
-    const date = new Date()
-    const modelFileName = `${inflection.dasherize(inflection.underscore(modelName))}.js`
-    const velociousPath = await this.getEnvironmentHandler().getVelociousPath()
-    const templateFilePath = `${velociousPath}/src/templates/generate-model.js`
-    const modelContentBuffer = await fs.readFile(templateFilePath)
-    const modelContent = modelContentBuffer.toString().replaceAll("__MODEL_NAME__", modelNameCamelized)
-    const modelsDir = `${process.cwd()}/src/models`
-    const modelPath = `${modelsDir}/${modelFileName}`
-
-    if (await fileExists(modelPath)) throw new Error(`Model file already exists: ${modelPath}`)
-
-    if (this.args.testing) {
-      return {date, modelContent, modelName, modelNameCamelized, modelPath}
-    } else {
-      if (!await fileExists(modelsDir)) {
-        await fs.mkdir(modelsDir, {recursive: true})
-      }
-
-      await fs.writeFile(modelPath, modelContent)
-
-      console.log(`create src/models/${modelFileName}`)
-    }
+    return await this.getConfiguration().getEnvironmentHandler().cliCommandsModelGenerate(this)
   }
 }

package/src/cli/commands/init.js

@@ -1,56 +1,8 @@
 import BaseCommand from "../base-command.js"
-import fileExists from "../../utils/file-exists.js"
-import fs from "fs/promises"
 
 export default class VelociousCliCommandsInit extends BaseCommand {
   async execute() {
-    const velociousPath = await this.getEnvironmentHandler().getVelociousPath()
-    const projectPath = this.getConfiguration()?.getDirectory() || process.cwd()
-    const projectConfigPath = `${projectPath}/src/config`
-    const fileMappings = [
-      {
-        source: `${velociousPath}/src/templates/configuration.js`,
-        target: `${projectConfigPath}/configuration.js`
-      },
-      {
-        source: `${velociousPath}/src/templates/routes.js`,
-        target: `${projectConfigPath}/routes.js`
-      }
-    ]
-    const paths = [
-      projectConfigPath,
-      `${projectPath}/src/database/migrations`,
-      `${projectPath}/src/models`,
-      `${projectPath}/src/routes`
-    ]
-
-    if (this.args.testing) {
-      return {
-        fileMappings
-      }
-    }
-
-    for (const path of paths) {
-      if (await fileExists(path)) {
-        console.log(`Config dir already exists: ${path}`)
-      } else {
-        console.log(`Config dir doesn't exists: ${path}`)
-        await fs.mkdir(path, {recursive: true})
-      }
-    }
-
-    for (const fileMapping of fileMappings) {
-      if (!await fileExists(fileMapping.source)) {
-        throw new Error(`Template doesn't exist: ${fileMapping.source}`)
-      }
-
-      if (await fileExists(fileMapping.target)) {
-        console.log(`File already exists: ${fileMapping.target}`)
-      } else {
-        console.log(`File doesnt exist: ${fileMapping.target}`)
-        await fs.copyFile(fileMapping.source, fileMapping.target)
-      }
-    }
+    return await this.getConfiguration().getEnvironmentHandler().cliCommandsInit(this)
   }
 }
 

package/src/cli/index.js

@@ -23,7 +23,7 @@ export default class VelociousCli {
     }
 
     const CommandClass = await this.environmentHandler.requireCommand({commandParts: parsedCommandParts})
-    const commandInstance = new CommandClass({args: this.args, environmentHandler: this.environmentHandler})
+    const commandInstance = new CommandClass({args: this.args})
 
     if (commandInstance.initialize) {
       await commandInstance.initialize()

package/src/environment-handlers/base.js

@@ -9,6 +9,20 @@ export default class VelociousEnvironmentHandlerBase {
    */
   async findMigrations() { throw new Error("findMigrations not implemneted") }
 
+  /**
+   * @template T extends import("../cli/base-command.js").default
+   * @param {T} command
+   * @param {typeof T} CommandClass
+   * @returns {any}
+   */
+  async forwardCommand(command, CommandClass) {
+    const newCommand = new CommandClass({
+      args: command.args
+    })
+
+    return await newCommand.execute()
+  }
+
   /**
    * @interface
    */

package/src/environment-handlers/browser.js

@@ -15,6 +15,22 @@ export default class VelociousEnvironmentsHandlerBrowser extends Base {
     this.migrationsRequireContextCallback = migrationsRequireContextCallback
   }
 
+  async cliCommandsInit(_command) { // eslint-disable-line no-unused-vars
+    throw new Error("Unsupported on browser")
+  }
+
+  async cliCommandsMigrationGenerate(_command) { // eslint-disable-line no-unused-vars
+    throw new Error("Unsupported on browser")
+  }
+
+  async cliCommandsMigrationDestroy(_command) { // eslint-disable-line no-unused-vars
+    throw new Error("Unsupported on browser")
+  }
+
+  async cliCommandsModelGenerate(_command) { // eslint-disable-line no-unused-vars
+    throw new Error("Unsupported on browser")
+  }
+
   /**
    * @returns {object}
    */

package/src/environment-handlers/node/cli/commands/destroy/migration.js

@@ -0,0 +1,35 @@
+import BaseCommand from "../../../../../cli/base-command.js"
+import fs from "fs/promises"
+
+export default class DbDestroyMigration extends BaseCommand {
+  async execute() {
+    const migrationName = this.processArgs[1]
+    const migrationDir = `${this.getConfiguration().getDirectory()}/src/database/migrations`
+    const migrationFiles = await fs.readdir(migrationDir)
+    const destroyed = []
+
+    for (const migrationFile of migrationFiles) {
+      const match = migrationFile.match(/^(\d{14})-(.+)\.js$/)
+
+      if (!match) {
+        continue
+      }
+
+      const fileName = match[2]
+
+      if (fileName != migrationName) continue
+
+      const fullFilePath = `${migrationDir}/${migrationFile}`
+      destroyed.push(fileName)
+
+      if (!this.args.testing) {
+        console.log(`Destroy src/database/migrations/${migrationFile}`)
+        await fs.unlink(fullFilePath)
+      }
+    }
+
+    if (this.args.testing) {
+      return {destroyed}
+    }
+  }
+}

package/src/environment-handlers/node/cli/commands/generate/migration.js

@@ -0,0 +1,33 @@
+import BaseCommand from "../../../../../cli/base-command.js"
+import fileExists from "../../../../../utils/file-exists.js"
+import fs from "fs/promises"
+import * as inflection from "inflection"
+import strftime from "strftime"
+
+export default class DbGenerateMigration extends BaseCommand {
+  async execute() {
+    const migrationName = this.processArgs[1]
+    const migrationNameCamelized = inflection.camelize(migrationName.replaceAll("-", "_"))
+    const date = new Date()
+    const migrationNumber = strftime("%Y%m%d%H%M%S")
+    const migrationFileName = `${migrationNumber}-${migrationName}.js`
+    const velociousPath = await this.getEnvironmentHandler().getVelociousPath()
+    const templateFilePath = `${velociousPath}/src/templates/generate-migration.js`
+    const migrationContentBuffer = await fs.readFile(templateFilePath)
+    const migrationContent = migrationContentBuffer.toString().replaceAll("__MIGRATION_NAME__", migrationNameCamelized)
+    const migrationDir = `${process.cwd()}/src/database/migrations`
+    const migrationPath = `${migrationDir}/${migrationFileName}`
+
+    if (this.args.testing) {
+      return {date, migrationContent, migrationName, migrationNameCamelized, migrationNumber, migrationPath}
+    } else {
+      if (!await fileExists(migrationDir)) {
+        await fs.mkdir(migrationDir, {recursive: true})
+      }
+
+      await fs.writeFile(migrationPath, migrationContent)
+
+      console.log(`create src/database/migrations/${migrationFileName}`)
+    }
+  }
+}

package/src/environment-handlers/node/cli/commands/generate/model.js

@@ -0,0 +1,33 @@
+import BaseCommand from "../../../../../cli/base-command.js"
+import fileExists from "../../../../../utils/file-exists.js"
+import fs from "fs/promises"
+import * as inflection from "inflection"
+
+export default class DbGenerateModel extends BaseCommand {
+  async execute() {
+    const modelName = this.processArgs[1]
+    const modelNameCamelized = inflection.camelize(modelName.replaceAll("-", "_"))
+    const date = new Date()
+    const modelFileName = `${inflection.dasherize(inflection.underscore(modelName))}.js`
+    const velociousPath = await this.getEnvironmentHandler().getVelociousPath()
+    const templateFilePath = `${velociousPath}/src/templates/generate-model.js`
+    const modelContentBuffer = await fs.readFile(templateFilePath)
+    const modelContent = modelContentBuffer.toString().replaceAll("__MODEL_NAME__", modelNameCamelized)
+    const modelsDir = `${process.cwd()}/src/models`
+    const modelPath = `${modelsDir}/${modelFileName}`
+
+    if (await fileExists(modelPath)) throw new Error(`Model file already exists: ${modelPath}`)
+
+    if (this.args.testing) {
+      return {date, modelContent, modelName, modelNameCamelized, modelPath}
+    } else {
+      if (!await fileExists(modelsDir)) {
+        await fs.mkdir(modelsDir, {recursive: true})
+      }
+
+      await fs.writeFile(modelPath, modelContent)
+
+      console.log(`create src/models/${modelFileName}`)
+    }
+  }
+}

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

@@ -0,0 +1,59 @@
+import BaseCommand from "../../../../cli/base-command.js"
+import fileExists from "../../../../utils/file-exists.js"
+import fs from "fs/promises"
+
+export default class VelociousCliCommandsInit extends BaseCommand {
+  async execute() {
+    const velociousPath = await this.getEnvironmentHandler().getVelociousPath()
+    const projectPath = this.getConfiguration()?.getDirectory() || process.cwd()
+    const projectConfigPath = `${projectPath}/src/config`
+    const fileMappings = [
+      {
+        source: `${velociousPath}/src/templates/configuration.js`,
+        target: `${projectConfigPath}/configuration.js`
+      },
+      {
+        source: `${velociousPath}/src/templates/routes.js`,
+        target: `${projectConfigPath}/routes.js`
+      }
+    ]
+    const paths = [
+      projectConfigPath,
+      `${projectPath}/src/database/migrations`,
+      `${projectPath}/src/models`,
+      `${projectPath}/src/routes`
+    ]
+
+    if (this.args.testing) {
+      return {
+        fileMappings
+      }
+    }
+
+    for (const path of paths) {
+      if (await fileExists(path)) {
+        console.log(`Config dir already exists: ${path}`)
+      } else {
+        console.log(`Config dir doesn't exists: ${path}`)
+        await fs.mkdir(path, {recursive: true})
+      }
+    }
+
+    for (const fileMapping of fileMappings) {
+      if (!await fileExists(fileMapping.source)) {
+        throw new Error(`Template doesn't exist: ${fileMapping.source}`)
+      }
+
+      if (await fileExists(fileMapping.target)) {
+        console.log(`File already exists: ${fileMapping.target}`)
+      } else {
+        console.log(`File doesnt exist: ${fileMapping.target}`)
+        await fs.copyFile(fileMapping.source, fileMapping.target)
+      }
+    }
+  }
+}
+
+const dontLoadConfiguration = true
+
+export {dontLoadConfiguration}

package/src/environment-handlers/node.js

@@ -1,4 +1,8 @@
 import Base from "./base.js"
+import CliCommandsDestroyMigration from "./node/cli/commands/destroy/migration.js"
+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 {dirname} from "path"
 import {fileURLToPath} from "url"
 import fs from "fs/promises"
@@ -42,6 +46,22 @@ export default class VelociousEnvironmentHandlerNode extends Base{
     return commands
   }
 
+  async cliCommandsInit(command) {
+    return await this.forwardCommand(command, CliCommandsInit)
+  }
+
+  async cliCommandsMigrationGenerate(command) {
+    return await this.forwardCommand(command, CliCommandsGenerateMigration)
+  }
+
+  async cliCommandsMigrationDestroy(command) {
+    return await this.forwardCommand(command, CliCommandsDestroyMigration)
+  }
+
+  async cliCommandsModelGenerate(command) {
+    return await this.forwardCommand(command, CliCommandsGenerateModel)
+  }
+
   /**
    * @param {Array<string>} commandParts
    * @template T extends import ("./base-command.js").default

package/src/cli/commands/destroy/migration.native.js

@@ -1,7 +0,0 @@
-import BaseCommand from "../../base-command.js"
-
-export default class DbDestroyMigration extends BaseCommand {
-  async execute() {
-    throw new Error("Unsupported on native")
-  }
-}

package/src/cli/commands/generate/migration.native.js

@@ -1,7 +0,0 @@
-import BaseCommand from "../../base-command.js"
-
-export default class DbGenerateMigration extends BaseCommand {
-  async execute() {
-    throw new Error("Unsupported on native")
-  }
-}

package/src/cli/commands/generate/model.native.js

@@ -1,7 +0,0 @@
-import BaseCommand from "../../base-command.js"
-
-export default class DbGenerateModel extends BaseCommand {
-  async execute() {
-    throw new Error("Unsupported on native")
-  }
-}