velocious 1.0.63 → 1.0.65

package/bin/velocious.js

@@ -22,5 +22,4 @@ for (let i = 0; i < processArgs.length; i++) {
 const cli = new Cli({parsedProcessArgs, processArgs})
 
 await cli.execute()
-
 process.exit(0)

package/package.json

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

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/database/record/index.js

@@ -390,24 +390,26 @@ class VelociousDatabaseRecord {
     const isNewRecord = this.isNewRecord()
     let result
 
-    await this._runValidations()
+    await this.constructor._getConfiguration().ensureConnections(async () => {
+      await this._runValidations()
 
-    await this.constructor.transaction(async () => {
-      // If any belongs-to-relationships was saved, then updated-at should still be set on this record.
-      const {savedCount} = await this._autoSaveBelongsToRelationships()
+      await this.constructor.transaction(async () => {
+        // If any belongs-to-relationships was saved, then updated-at should still be set on this record.
+        const {savedCount} = await this._autoSaveBelongsToRelationships()
 
-      if (this.isPersisted()) {
-        // If any has-many-relationships will be saved, then updated-at should still be set on this record.
-        const autoSaveHasManyrelationships = this._autoSaveHasManyAndHasOneRelationshipsToSave()
+        if (this.isPersisted()) {
+          // If any has-many-relationships will be saved, then updated-at should still be set on this record.
+          const autoSaveHasManyrelationships = this._autoSaveHasManyAndHasOneRelationshipsToSave()
 
-        if (this._hasChanges() || savedCount > 0 || autoSaveHasManyrelationships.length > 0) {
-          result = await this._updateRecordWithChanges()
+          if (this._hasChanges() || savedCount > 0 || autoSaveHasManyrelationships.length > 0) {
+            result = await this._updateRecordWithChanges()
+          }
+        } else {
+          result = await this._createNewRecord()
         }
-      } else {
-        result = await this._createNewRecord()
-      }
 
-      await this._autoSaveHasManyAndHasOneRelationships({isNewRecord})
+        await this._autoSaveHasManyAndHasOneRelationships({isNewRecord})
+      })
     })
 
     return result

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