velocious 1.0.30 → 1.0.32

package/README.md

@@ -66,6 +66,20 @@ export default class CreateEvents extends Migration {
 }
 ```
 
+Run migrations from anywhere
+
+```js
+const migrationsPath = `/some/dir/migrations`
+const files = await new FilesFinder({path: migrationsPath}).findFiles()
+
+await this.configuration.withConnections(async () => {
+  const migrator = new Migrator({configuration: this.configuration})
+
+  await migrator.prepare()
+  await migrator.migrateFiles(files, async (path) => await import(path))
+})
+```
+
 # Querying
 
 ```js

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "main": "index.js",
   "scripts": {
     "test": "jasmine",

package/src/cli/commands/db/migrate.js

@@ -1,39 +1,19 @@
 import BaseCommand from "../../base-command.js"
-import fs from "node:fs/promises"
-import * as inflection from "inflection"
+import FilesFinder from "../../../database/migrator/files-finder.js"
 import Migrator from "../../../database/migrator.js"
 
 export default class DbMigrate extends BaseCommand {
   async execute() {
     const projectPath = this.configuration.getDirectory()
     const migrationsPath = `${projectPath}/src/database/migrations`
-    let files = await fs.readdir(migrationsPath)
-
-    files = files
-      .map((file) => {
-        const match = file.match(/^(\d{14})-(.+)\.js$/)
-
-        if (!match) return null
-
-        const date = parseInt(match[1])
-        const migrationName = match[2]
-        const migrationClassName = inflection.camelize(migrationName.replaceAll("-", "_"))
-
-        return {
-          file,
-          fullPath: `${migrationsPath}/${file}`,
-          date,
-          migrationClassName
-        }
-      })
-      .filter((migration) => Boolean(migration))
-      .sort((migration1, migration2) => migration1.date - migration2.date)
+    const filesFinder = new FilesFinder({path: migrationsPath})
+    const files = await filesFinder.findFiles()
 
     this.migrator = new Migrator({configuration: this.configuration})
 
     await this.configuration.withConnections(async () => {
       await this.migrator.prepare()
-      await this.migrator.migrateFiles(files)
+      await this.migrator.migrateFiles(files, async (importPath) => await import(importPath))
     })
   }
 }

package/src/cli/commands/db/reset.js

@@ -1,40 +1,20 @@
 import BaseCommand from "../../base-command.js"
-import fs from "node:fs/promises"
-import * as inflection from "inflection"
+import FilesFinder from "../../../database/migrator/files-finder.js"
 import Migrator from "../../../database/migrator.js"
 
 export default class DbReset extends BaseCommand {
   async execute() {
     const projectPath = this.configuration.getDirectory()
     const migrationsPath = `${projectPath}/src/database/migrations`
-    let files = await fs.readdir(migrationsPath)
-
-    files = files
-      .map((file) => {
-        const match = file.match(/^(\d{14})-(.+)\.js$/)
-
-        if (!match) return null
-
-        const date = parseInt(match[1])
-        const migrationName = match[2]
-        const migrationClassName = inflection.camelize(migrationName.replaceAll("-", "_"))
-
-        return {
-          file,
-          fullPath: `${migrationsPath}/${file}`,
-          date,
-          migrationClassName
-        }
-      })
-      .filter((migration) => Boolean(migration))
-      .sort((migration1, migration2) => migration1.date - migration2.date)
+    const filesFinder = new FilesFinder({path: migrationsPath})
+    const files = await filesFinder.findFiles()
 
     this.migrator = new Migrator({configuration: this.configuration})
 
     await this.configuration.withConnections(async () => {
       await this.migrator.reset()
       await this.migrator.prepare()
-      await this.migrator.migrateFiles(files)
+      await this.migrator.migrateFiles(files, async (importPath) => await import(importPath))
     })
   }
 }

package/src/database/migrator/files-finder.js

@@ -0,0 +1,40 @@
+import fs from "node:fs/promises"
+import * as inflection from "inflection"
+
+import restArgsError from "../../utils/rest-args-error.js"
+
+export default class VelociousDatabaseMigratorFilesFinder {
+  constructor({path, ...restArgs}) {
+    restArgsError(restArgs)
+
+    if (!path) throw new Error("No path given")
+
+    this.path = path
+  }
+
+  async findFiles() {
+    let files = await fs.readdir(this.path)
+
+    files = files
+      .map((file) => {
+        const match = file.match(/^(\d{14})-(.+)\.js$/)
+
+        if (!match) return null
+
+        const date = parseInt(match[1])
+        const migrationName = match[2]
+        const migrationClassName = inflection.camelize(migrationName.replaceAll("-", "_"))
+
+        return {
+          file,
+          fullPath: `${this.path}/${file}`,
+          date,
+          migrationClassName
+        }
+      })
+      .filter((migration) => Boolean(migration))
+      .sort((migration1, migration2) => migration1.date - migration2.date)
+
+    return files
+  }
+}

package/src/database/migrator.js

@@ -36,20 +36,20 @@ export default class VelociousDatabaseMigrator {
     if (!this.migrationsVersions) throw new Error("Migrations versions hasn't been loaded yet")
     if (!this.migrationsVersions[dbIdentifier]) throw new Error(`Migrations versions hasn't been loaded yet for db: ${dbIdentifier}`)
 
-    if (version in this.migrationsVersions) {
+    if (version in this.migrationsVersions[dbIdentifier]) {
       return true
     }
 
     return false
   }
 
-  async migrateFiles(files) {
+  async migrateFiles(files, importCallback) {
     await this.configuration.withConnections(async () => {
       for (const migration of files) {
         await this.runMigrationFile({
           migration,
           requireMigration: async () => {
-            const migrationImport = await import(migration.fullPath)
+            const migrationImport = await importCallback(migration.fullPath)
 
             return migrationImport.default
           }
@@ -177,6 +177,7 @@ export default class VelociousDatabaseMigrator {
   async runMigrationFile({migration, requireMigration}) {
     if (!this.configuration) throw new Error("No configuration set")
     if (!this.configuration.isDatabasePoolInitialized()) await this.configuration.initializeDatabasePool()
+    if (!this.migrationsVersions) await this.loadMigrationsVersions()
 
     const dbs = await this.configuration.getCurrentConnections()
     const migrationClass = await requireMigration()

package/src/database/query/create-table-base.js

@@ -42,6 +42,10 @@ export default class VelociousDatabaseQueryCreateTableBase extends QueryBase {
         maxlength ||= 255
       }
 
+      if (databaseType == "mssql" && type == "BOOLEAN") {
+        type = "BIT"
+      }
+
       if (databaseType == "sqlite" && column.getAutoIncrement() && column.getPrimaryKey()) {
         type = "INTEGER"
       }

package/src/database/record/index.js

@@ -362,7 +362,9 @@ export default class VelociousDatabaseRecord {
   }
 
   static tableName() {
-    return inflection.underscore(inflection.pluralize(this.name))
+    if (!this._tableName) this._tableName = inflection.underscore(inflection.pluralize(this.name))
+
+    return this._tableName
   }
 
   static setTableName(tableName) {

package/src/database/use-database.js

@@ -1,8 +1,8 @@
-import DatabaseMigrateFromRequireContext from "./migrate-from-require-context.js"
 import React from "react"
 import useEnvSense from "env-sense/src/use-env-sense.js"
 
 import Configuration from "../configuration.js"
+import Migrator from "./migrator.js"
 import restArgsError from "../utils/rest-args-error.js"
 
 const loadMigrations = function loadMigrations({migrationsRequireContext, ...restArgs}) {
@@ -15,9 +15,10 @@ const loadMigrations = function loadMigrations({migrationsRequireContext, ...res
 
     try {
       await Configuration.current().withConnections(async () => {
-        const databaseMigrateFromRequireContext = new DatabaseMigrateFromRequireContext()
+        const migrator = new Migrator({configuration: Configuration.current()})
 
-        await databaseMigrateFromRequireContext.execute(migrationsRequireContext)
+        await migrator.prepare()
+        await migrator.migrateFilesFromRequireContext(migrationsRequireContext)
       })
 
       await Configuration.current().initialize()

package/src/routes/base-route.js

@@ -1,4 +1,5 @@
 import GetRoute from "./get-route.js"
+import PostRoute from "./post-route.js"
 import ResourceRoute from "./resource-route.js"
 
 var VelociousBaseRoute
@@ -19,6 +20,12 @@ export function initBaseRoute() {
       throw new Error(`No 'matchWithPath' implemented on ${this.constructor.name}`)
     }
 
+    post(name, args) {
+      const route = new PostRoute({name, args})
+
+      this.routes.push(route)
+    }
+
     resources(name, callback) {
       const route = new ResourceRoute({name})
 

package/src/routes/post-route.js

@@ -0,0 +1,24 @@
+import BaseRoute, {initBaseRoute} from "./base-route.js"
+import escapeStringRegexp from "escape-string-regexp"
+
+initBaseRoute()
+
+export default class VelociousRoutePostRoute extends BaseRoute {
+  constructor({name}) {
+    super()
+    this.name = name
+    this.regExp = new RegExp(`^(${escapeStringRegexp(name)})(.*)$`)
+  }
+
+  matchWithPath({params, path}) {
+    const match = path.match(this.regExp)
+
+    if (match) {
+      const [_beginnigSlash, _matchedName, restPath] = match
+
+      params.action = this.name
+
+      return {restPath}
+    }
+  }
+}