velocious 1.0.96 → 1.0.97

package/package.json

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

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

@@ -1,3 +1,5 @@
+// @ts-check
+
 import BaseCommand from "../../../../cli/base-command.js"
 import TestFilesFinder from "../../../../testing/test-files-finder.js"
 import TestRunner from "../../../../testing/test-runner.js"
@@ -6,15 +8,27 @@ 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})
+    let directory
+    const directories = []
+
+    if (process.env.VELOCIOUS_TEST_DIR) {
+      directory = process.env.VELOCIOUS_TEST_DIR
+      directories.push(process.env.VELOCIOUS_TEST_DIR)
+    } else {
+      directory = this.directory()
+      directories.push(`${this.directory()}/__tests__`)
+      directories.push(`${this.directory()}/tests`)
+      directories.push(`${this.directory()}/spec`)
+    }
+
+    const testFilesFinder = new TestFilesFinder({directory, directories, 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")
+      throw new Error(`${testRunner.getTestsCount()} tests was found in ${testFiles.length} file(s)`)
     }
 
     await testRunner.run()

package/src/testing/test-files-finder.js

@@ -1,21 +1,75 @@
+// @ts-check
+
 import fs from "fs/promises"
 
+import fileExists from "../utils/file-exists.js"
+import restArgsError from "../utils/rest-args-error.js"
+
 // Incredibly complex class to find files in multiple simultanious running promises to do it as fast as possible.
 export default class TestFilesFinder {
   static IGNORED_NAMES = [".git", "node_modules"]
 
-  constructor({directory, processArgs}) {
+  /**
+   * @param {object} args
+   * @param {string} args.directory
+   * @param {string[]} args.directories
+   * @param {string[]} args.processArgs
+   */
+  constructor({directory, directories, processArgs, ...restArgs}) {
+    restArgsError(restArgs)
+
     this.directory = directory
-    this.foundFiles = []
+
+    if (directories) {
+      this.directories = directories
+    } else {
+      this.directories = [
+        `${this.directory}/__tests__`,
+        `${this.directory}/tests`,
+        `${this.directory}/spec`
+      ]
+    }
+
     this.findingCount = 0
-    this.findingPromises = {}
     this.processArgs = processArgs
+
+    /** @type {string[]} */
+    this.foundFiles = []
+
+    /** @type {Record<number, Promise<void>>} */
+    this.findingPromises = {}
+
+    /** @type {string[]} */
     this.testArgs = this.processArgs.filter((processArg, index) => index != 0)
+
+    /** @type {string[]} */
+    this.directoryArgs = []
+
+    /** @type {string[]} */
+    this.fileArgs = []
+
+    for (const testArg of this.testArgs) {
+      if (testArg.endsWith("/")) {
+        this.directoryArgs.push(testArg)
+      } else {
+        this.fileArgs.push(testArg)
+      }
+    }
   }
 
+  /**
+   * @returns {Promise<string[]>}
+   */
   async findTestFiles() {
     await this.withFindingCount(async () => {
-      await this.findTestFilesInDir(this.directory)
+      for (const directory of this.directories) {
+        console.log({directory})
+
+        if (await fileExists(directory)) {
+          console.log("Exists!")
+          await this.findTestFilesInDir(directory)
+        }
+      }
     })
 
     await this.waitForFindingPromises()
@@ -23,6 +77,9 @@ export default class TestFilesFinder {
     return this.foundFiles
   }
 
+  /**
+   * @returns {number}
+   */
   findingPromisesLength() { return Object.keys(this.findingPromises).length }
 
   async waitForFindingPromises() {
@@ -31,6 +88,9 @@ export default class TestFilesFinder {
     }
   }
 
+  /**
+   * @returns {Promise<void>}
+   */
   async waitForFindingPromisesIteration() {
     const unfinishedPromises = []
 
@@ -43,6 +103,9 @@ export default class TestFilesFinder {
     await Promise.all(unfinishedPromises)
   }
 
+  /**
+   * @param {function() : Promise<void>} callback
+   */
   withFindingCount(callback) {
     return new Promise((resolve) => {
       const findingPromise = callback()
@@ -54,11 +117,15 @@ export default class TestFilesFinder {
       findingPromise.finally(() => {
         delete this.findingPromises[findingCount]
 
-        resolve()
+        resolve(undefined)
       })
     })
   }
 
+  /**
+   * @param {string} dir
+   * @returns {Promise<void>}
+   */
   async findTestFilesInDir(dir) {
     await this.withFindingCount(async () => {
       const files = await fs.readdir(dir)
@@ -89,16 +156,32 @@ export default class TestFilesFinder {
    * @returns {boolean}
    */
   isFileMatchingRequirements(file, localPath) {
-    if (this.testArgs.length > 0) {
-      for (const testArg of this.testArgs) {
-        if (testArg == localPath) {
+    if (this.directoryArgs.length > 0) {
+      for (const directoryArg of this.directoryArgs) {
+        if (localPath.startsWith(directoryArg) && this.looksLikeTestFile(file)) {
           return true
         }
       }
-    } else if (file.match(/-(spec|test)\.(m|)js$/)) {
+    }
+
+    if (this.fileArgs.length > 0) {
+      for (const fileArg of this.fileArgs) {
+        if (fileArg == localPath) {
+          return true
+        }
+      }
+    } else if (this.looksLikeTestFile(file)) {
       return true
     }
 
     return false
   }
+
+  /**
+   * @param {string} file
+   * @returns {boolean}
+   */
+  looksLikeTestFile(file) {
+    return Boolean(file.match(/-(spec|test)\.(m|)js$/))
+  }
 }

package/src/testing/test-runner.js

@@ -26,7 +26,7 @@ export default class TestRunner {
   getConfiguration() { return this._configuration }
 
   /**
-   * @returns {Array<string>}
+   * @returns {string[]}
    */
   getTestFiles() { return this._testFiles }