@bsb/tests 9.5.6 → 9.5.8

package/bin/bsb-tests.cjs

@@ -47,6 +47,18 @@ const findFiles = (dir, filename, results = []) => {
 
 const readJson = (filePath) => JSON.parse(fs.readFileSync(filePath, "utf8"));
 
+const resolvePackageBin = (packageName, binName) => {
+  const packageJsonPath = require.resolve(`${packageName}/package.json`);
+  const packageJson = readJson(packageJsonPath);
+  const binPath = typeof packageJson.bin === "string"
+    ? packageJson.bin
+    : packageJson.bin?.[binName];
+  if (!binPath) {
+    throw new Error(`Package ${packageName} does not declare bin ${binName}`);
+  }
+  return path.resolve(path.dirname(packageJsonPath), binPath);
+};
+
 const resolvePluginModule = (pluginRoot, pluginPath, useTs) => {
   const base = path.resolve(pluginRoot, pluginPath || "");
   if (useTs) {
@@ -60,8 +72,22 @@ const resolvePluginModule = (pluginRoot, pluginPath, useTs) => {
   return path.join(swapped, "index.js");
 };
 
+const hasBuiltPluginModule = (pluginRoot, pluginPath) => {
+  return fs.existsSync(resolvePluginModule(pluginRoot, pluginPath, false));
+};
+
 const resolveLocalBaseEntry = (repoRoot, useTs) => {
-  const baseRoot = path.join(repoRoot, "nodejs");
+  const nestedBaseRoot = path.join(repoRoot, "nodejs");
+  let baseRoot = null;
+  if (fs.existsSync(path.join(nestedBaseRoot, "package.json"))) {
+    baseRoot = nestedBaseRoot;
+  } else {
+    const packageJsonPath = path.join(repoRoot, "package.json");
+    if (fs.existsSync(packageJsonPath) && readJson(packageJsonPath).name === "@bsb/base") {
+      baseRoot = repoRoot;
+    }
+  }
+  if (!baseRoot) return null;
   const entryTs = path.join(baseRoot, "src", "index.ts");
   const entryJs = path.join(baseRoot, "lib", "index.js");
   if (useTs && fs.existsSync(entryTs)) return entryTs;
@@ -157,21 +183,20 @@ if (filtered.length === 0) {
 }
 
 const repoRoot = cwd;
-const mochaBin = require.resolve("mocha/bin/mocha.mjs");
-const nycBin = require.resolve("nyc/bin/nyc.js");
-const tsNodeRegister = require.resolve("ts-node/register");
-const setupHook = path.join(__dirname, "..", "src", "runner", "setup.ts");
-const pluginEventsRunner = path.join(__dirname, "..", "src", "runner", "plugin-events.ts");
-const pluginObservableRunner = path.join(__dirname, "..", "src", "runner", "plugin-observable.ts");
-const pluginCustomRunner = path.join(__dirname, "..", "src", "runner", "plugin-custom.ts");
-const eventsDefaultSpec = path.join(__dirname, "..", "src", "plugins", "events-default", "index.ts");
-const loggingDefaultSpec = path.join(__dirname, "..", "src", "plugins", "logging-default", "index.ts");
-const configDefaultSpec = path.join(__dirname, "..", "src", "plugins", "config-default", "index.ts");
-const observableDefaultSpec = path.join(__dirname, "..", "src", "plugins", "observable-default", "index.ts");
+const mochaBin = resolvePackageBin("mocha", "mocha");
+const setupHook = path.join(__dirname, "..", "lib", "runner", "setup.js");
+const pluginEventsRunner = path.join(__dirname, "..", "lib", "runner", "plugin-events.js");
+const pluginObservableRunner = path.join(__dirname, "..", "lib", "runner", "plugin-observable.js");
+const pluginCustomRunner = path.join(__dirname, "..", "lib", "runner", "plugin-custom.js");
+const eventsDefaultSpec = path.join(__dirname, "..", "lib", "plugins", "events-default", "index.js");
+const loggingDefaultSpec = path.join(__dirname, "..", "lib", "plugins", "logging-default", "index.js");
+const configDefaultSpec = path.join(__dirname, "..", "lib", "plugins", "config-default", "index.js");
+const observableDefaultSpec = path.join(__dirname, "..", "lib", "plugins", "observable-default", "index.js");
 
 const runMocha = (env, spec, useTs, coverage, coverageInclude) => {
   const mochaArgs = [];
   if (useTs) {
+    const tsNodeRegister = require.resolve("ts-node/register");
     mochaArgs.push("--require", tsNodeRegister);
   }
   mochaArgs.push("--require", setupHook, spec);
@@ -184,6 +209,7 @@ const runMocha = (env, spec, useTs, coverage, coverageInclude) => {
     return result.status || 0;
   }
 
+  const nycBin = require.resolve("nyc/bin/nyc.js");
   const nycArgs = [
     "--all",
     "--check-coverage",
@@ -226,7 +252,7 @@ for (const plugin of filtered) {
     continue;
   }
 
-  const useTs = forceTs || (!forceJs && fs.existsSync(path.join(plugin.pluginRoot, "src")));
+  const useTs = forceTs || (!forceJs && !hasBuiltPluginModule(plugin.pluginRoot, plugin.pluginPath) && fs.existsSync(path.join(plugin.pluginRoot, "src")));
   const pluginModule = resolvePluginModule(plugin.pluginRoot, plugin.pluginPath, useTs);
   if (!fs.existsSync(pluginModule)) {
     console.error("Plugin module not found:", pluginModule);
@@ -257,6 +283,7 @@ for (const plugin of filtered) {
     const ext = path.extname(resolved).toLowerCase();
     let result;
     if (ext === ".ts") {
+      const tsNodeRegister = require.resolve("ts-node/register");
       result = spawnSync(process.execPath, ["-r", tsNodeRegister, resolved], {
         stdio: "inherit",
         env: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsb/tests",
-  "version": "9.5.6",
+  "version": "9.5.8",
   "description": "Shared test suites for BSB Node.js core and plugins",
   "license": "(AGPL-3.0-only OR Commercial)",
   "author": {
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@bsb/base": "^9.0.0",
-    "mocha": "^12.0.0-beta-9.6",
+    "mocha": "^11.7.6",
     "nyc": "^17.1.0",
     "ts-node": "^10.9.2"
   },