@tachybase/test 1.6.13-alpha.2 → 1.6.13-alpha.4

package/es/index.mjs

@@ -1,5 +1,4 @@
 import TachybaseGlobalModule from "@tachybase/globals";
-import { describe } from "vitest";
 import ws from "ws";
 import { mockDatabase } from "@tachybase/database";
 import { mockDatabase as mockDatabase2 } from "@tachybase/database";
@@ -210,6 +209,7 @@ async function createMockServer(options = {}) {
   return app;
 }
 const runtimeRequire = createRequire(path.resolve(process.cwd(), "package.json"));
+const selfRequire = createRequire(require.resolve("@tachybase/test/package.json"));
 const workspacePluginNameAliases = {
   map: "block-map"
 };
@@ -233,26 +233,18 @@ function getTachybaseGlobal(runtimeRequire2) {
     throw error;
   }
 }
-function getCoreModules(runtimeRequire2) {
+function getCoreModules() {
   const cores = [];
   try {
-    cores.push(runtimeRequire2("@tego/core"));
-  } catch (error) {
-    if (error.code !== "MODULE_NOT_FOUND") {
-      throw error;
-    }
+    cores.push(selfRequire("@tego/core"));
+  } catch (e) {
+    if ((e == null ? void 0 : e.code) !== "MODULE_NOT_FOUND") throw e;
   }
   try {
-    cores.push(runtimeRequire2("@tego/server"));
-    const serverRequire = createRequire(runtimeRequire2.resolve("@tego/server/package.json"));
-    cores.push(serverRequire("@tego/core"));
-  } catch {
-  }
-  for (const mod of Object.values(runtimeRequire2.cache)) {
-    const exports = mod == null ? void 0 : mod.exports;
-    if ((exports == null ? void 0 : exports.Plugin) && (exports == null ? void 0 : exports.PluginManager)) {
-      cores.push(exports);
-    }
+    cores.push(selfRequire("@tego/server"));
+    cores.push(createRequire(selfRequire.resolve("@tego/server/package.json"))("@tego/core"));
+  } catch (e) {
+    if ((e == null ? void 0 : e.code) !== "MODULE_NOT_FOUND") throw e;
   }
   return [...new Set(cores)];
 }
@@ -292,12 +284,19 @@ function workspacePackageDirByPackageName(workspaceRoot, packageName, map = {})
   return fs.existsSync(packageJsonPath) ? packageDir : null;
 }
 function workspaceServerEntry(workspaceRoot, packageDir) {
+  const libEntry = path.resolve(workspaceRoot, "packages", packageDir, "lib/server/index.js");
+  if (fs.existsSync(libEntry)) {
+    return libEntry;
+  }
+  const distEntry = path.resolve(workspaceRoot, "packages", packageDir, "dist/server/index.js");
+  if (fs.existsSync(distEntry)) {
+    return distEntry;
+  }
   const sourceEntry = path.resolve(workspaceRoot, "packages", packageDir, "src/server/index.ts");
   if (fs.existsSync(sourceEntry)) {
     return sourceEntry;
   }
-  const compiledEntry = path.resolve(workspaceRoot, "packages", packageDir, "dist/server/index.js");
-  return fs.existsSync(compiledEntry) ? compiledEntry : null;
+  return null;
 }
 function getModuleDefault(mod) {
   var _a;
@@ -578,7 +577,7 @@ function setupServerTestEnvironment(options = {}) {
   TachybaseGlobal.getInstance().set("PLUGIN_PATHS", pluginPaths);
   process.env.TEGO_RUNTIME_HOME = path.join(os.tmpdir(), "test-sqlite");
   process.env.APP_ENV_PATH = process.env.APP_ENV_PATH || ".env.test";
-  const coreModules = getCoreModules(runtimeRequire2);
+  const coreModules = getCoreModules();
   for (const core of coreModules) {
     patchPluginRuntime(core, workspaceRoot, packageDirByPluginName);
     patchPluginManager(core, {
@@ -597,13 +596,23 @@ function setupServerTestEnvironment(options = {}) {
 }
 const noopDescribe = () => {
 };
+function getDescribe() {
+  const desc = globalThis.describe;
+  if (!desc) {
+    throw new Error(
+      "globalThis.describe is not available. Ensure your test runner (vitest/jest) provides it globally or configure globals: true."
+    );
+  }
+  return desc;
+}
 const pgOnly = () => {
   var _a, _b;
   const isPostgres = ((_b = (_a = TachybaseGlobalModule.settings) == null ? void 0 : _a.database) == null ? void 0 : _b.dialect) === "postgres";
+  const desc = getDescribe();
   if (isPostgres) {
-    return describe || noopDescribe;
+    return desc;
   }
-  return describe.skip || noopDescribe;
+  return desc.skip || noopDescribe;
 };
 const isPg = () => {
   var _a, _b;

package/lib/server/index.js

@@ -40,7 +40,6 @@ __export(server_exports, {
 });
 module.exports = __toCommonJS(server_exports);
 var import_globals = __toESM(require("@tachybase/globals"));
-var import_vitest = require("vitest");
 var import_ws = __toESM(require("ws"));
 var import_database = require("@tachybase/database");
 var import_supertest = __toESM(require("supertest"));
@@ -48,13 +47,24 @@ __reExport(server_exports, require("./mockServer"), module.exports);
 __reExport(server_exports, require("./setupTestEnvironment"), module.exports);
 const noopDescribe = /* @__PURE__ */ __name(() => {
 }, "noopDescribe");
+function getDescribe() {
+  const desc = globalThis.describe;
+  if (!desc) {
+    throw new Error(
+      "globalThis.describe is not available. Ensure your test runner (vitest/jest) provides it globally or configure globals: true."
+    );
+  }
+  return desc;
+}
+__name(getDescribe, "getDescribe");
 const pgOnly = /* @__PURE__ */ __name(() => {
   var _a, _b;
   const isPostgres = ((_b = (_a = import_globals.default.settings) == null ? void 0 : _a.database) == null ? void 0 : _b.dialect) === "postgres";
+  const desc = getDescribe();
   if (isPostgres) {
-    return import_vitest.describe || noopDescribe;
+    return desc;
   }
-  return import_vitest.describe.skip || noopDescribe;
+  return desc.skip || noopDescribe;
 }, "pgOnly");
 const isPg = /* @__PURE__ */ __name(() => {
   var _a, _b;

package/lib/server/setupTestEnvironment.js

@@ -38,6 +38,7 @@ var import_node_path = __toESM(require("node:path"));
 var import_node_url = require("node:url");
 var import_globals = __toESM(require("@tachybase/globals"));
 const runtimeRequire = (0, import_node_module.createRequire)(import_node_path.default.resolve(process.cwd(), "package.json"));
+const selfRequire = (0, import_node_module.createRequire)(require.resolve("@tachybase/test/package.json"));
 const workspacePluginNameAliases = {
   map: "block-map"
 };
@@ -63,26 +64,18 @@ function getTachybaseGlobal(runtimeRequire2) {
   }
 }
 __name(getTachybaseGlobal, "getTachybaseGlobal");
-function getCoreModules(runtimeRequire2) {
+function getCoreModules() {
   const cores = [];
   try {
-    cores.push(runtimeRequire2("@tego/core"));
-  } catch (error) {
-    if (error.code !== "MODULE_NOT_FOUND") {
-      throw error;
-    }
+    cores.push(selfRequire("@tego/core"));
+  } catch (e) {
+    if ((e == null ? void 0 : e.code) !== "MODULE_NOT_FOUND") throw e;
   }
   try {
-    cores.push(runtimeRequire2("@tego/server"));
-    const serverRequire = (0, import_node_module.createRequire)(runtimeRequire2.resolve("@tego/server/package.json"));
-    cores.push(serverRequire("@tego/core"));
-  } catch {
-  }
-  for (const mod of Object.values(runtimeRequire2.cache)) {
-    const exports2 = mod == null ? void 0 : mod.exports;
-    if ((exports2 == null ? void 0 : exports2.Plugin) && (exports2 == null ? void 0 : exports2.PluginManager)) {
-      cores.push(exports2);
-    }
+    cores.push(selfRequire("@tego/server"));
+    cores.push((0, import_node_module.createRequire)(selfRequire.resolve("@tego/server/package.json"))("@tego/core"));
+  } catch (e) {
+    if ((e == null ? void 0 : e.code) !== "MODULE_NOT_FOUND") throw e;
   }
   return [...new Set(cores)];
 }
@@ -126,12 +119,19 @@ function workspacePackageDirByPackageName(workspaceRoot, packageName, map = {})
 }
 __name(workspacePackageDirByPackageName, "workspacePackageDirByPackageName");
 function workspaceServerEntry(workspaceRoot, packageDir) {
+  const libEntry = import_node_path.default.resolve(workspaceRoot, "packages", packageDir, "lib/server/index.js");
+  if (import_node_fs.default.existsSync(libEntry)) {
+    return libEntry;
+  }
+  const distEntry = import_node_path.default.resolve(workspaceRoot, "packages", packageDir, "dist/server/index.js");
+  if (import_node_fs.default.existsSync(distEntry)) {
+    return distEntry;
+  }
   const sourceEntry = import_node_path.default.resolve(workspaceRoot, "packages", packageDir, "src/server/index.ts");
   if (import_node_fs.default.existsSync(sourceEntry)) {
     return sourceEntry;
   }
-  const compiledEntry = import_node_path.default.resolve(workspaceRoot, "packages", packageDir, "dist/server/index.js");
-  return import_node_fs.default.existsSync(compiledEntry) ? compiledEntry : null;
+  return null;
 }
 __name(workspaceServerEntry, "workspaceServerEntry");
 function getModuleDefault(mod) {
@@ -419,7 +419,7 @@ function setupServerTestEnvironment(options = {}) {
   TachybaseGlobal.getInstance().set("PLUGIN_PATHS", pluginPaths);
   process.env.TEGO_RUNTIME_HOME = import_node_path.default.join(import_node_os.default.tmpdir(), "test-sqlite");
   process.env.APP_ENV_PATH = process.env.APP_ENV_PATH || ".env.test";
-  const coreModules = getCoreModules(runtimeRequire2);
+  const coreModules = getCoreModules();
   for (const core of coreModules) {
     patchPluginRuntime(core, workspaceRoot, packageDirByPluginName);
     patchPluginManager(core, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/test",
-  "version": "1.6.13-alpha.2",
+  "version": "1.6.13-alpha.4",
   "homepage": "https://github.com/tegojs/tego#readme",
   "bugs": {
     "url": "https://github.com/tegojs/tego/issues"
@@ -113,9 +113,9 @@
     "vite": "^7.1.10",
     "vitest": "^3.2.4",
     "ws": "^8.18.3",
-    "@tachybase/schema": "1.6.13-alpha.2",
-    "@tachybase/database": "1.6.13-alpha.2",
-    "@tachybase/globals": "1.6.13-alpha.2",
-    "@tego/core": "1.6.13-alpha.2"
+    "@tachybase/database": "1.6.13-alpha.4",
+    "@tachybase/globals": "1.6.13-alpha.4",
+    "@tachybase/schema": "1.6.13-alpha.4",
+    "@tego/core": "1.6.13-alpha.4"
   }
 }

package/setup/client.ts

@@ -12,7 +12,7 @@ import 'jsdom-worker';
 
 import path from 'node:path';
 
-configure({ asyncUtilTimeout: 30000 });
+configure({ asyncUtilTimeout: 5000 });
 dotenv.config({ path: path.resolve(process.cwd(), '.env.test') });
 
 class DOMMatrixMock {