@tachybase/test 1.6.13-alpha.3 → 1.6.13-alpha.5

package/es/index.mjs

@@ -12,6 +12,7 @@ import { createRequire } from "node:module";
 import os from "node:os";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
+import { require as require$1 } from "tsx/cjs/api";
 class MockServer extends Application {
   async loadAndInstall(options = {}) {
     await this.load({ method: "install" });
@@ -208,6 +209,11 @@ async function createMockServer(options = {}) {
   }
   return app;
 }
+function moduleNotFound(request) {
+  const error = new Error(`Cannot find module '${request}'`);
+  error.code = "MODULE_NOT_FOUND";
+  return error;
+}
 const runtimeRequire = createRequire(path.resolve(process.cwd(), "package.json"));
 const selfRequire = createRequire(require.resolve("@tachybase/test/package.json"));
 const workspacePluginNameAliases = {
@@ -233,19 +239,28 @@ function getTachybaseGlobal(runtimeRequire2) {
     throw error;
   }
 }
-function getCoreModules() {
+function getCoreModules(workspaceRoot, workspaceRequire = runtimeRequire) {
   const cores = [];
-  try {
-    cores.push(selfRequire("@tego/core"));
-  } catch (e) {
-    if ((e == null ? void 0 : e.code) !== "MODULE_NOT_FOUND") throw e;
-  }
-  try {
-    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;
-  }
+  const addCore = (loader) => {
+    try {
+      cores.push(loader());
+    } catch (e) {
+      if ((e == null ? void 0 : e.code) !== "MODULE_NOT_FOUND") throw e;
+    }
+  };
+  addCore(() => selfRequire("@tego/core"));
+  addCore(() => workspaceRequire("@tego/core"));
+  addCore(() => {
+    const sourceEntry = path.resolve(workspaceRoot, "packages/core/src/index.ts");
+    if (!fs.existsSync(sourceEntry)) {
+      throw moduleNotFound(sourceEntry);
+    }
+    return require$1(sourceEntry, path.resolve(workspaceRoot, "package.json"));
+  });
+  addCore(() => selfRequire("@tego/server"));
+  addCore(() => workspaceRequire("@tego/server"));
+  addCore(() => createRequire(selfRequire.resolve("@tego/server/package.json"))("@tego/core"));
+  addCore(() => createRequire(workspaceRequire.resolve("@tego/server/package.json"))("@tego/core"));
   return [...new Set(cores)];
 }
 function createTestDbStorage() {
@@ -577,7 +592,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();
+  const coreModules = getCoreModules(workspaceRoot, runtimeRequire2);
   for (const core of coreModules) {
     patchPluginRuntime(core, workspaceRoot, packageDirByPluginName);
     patchPluginManager(core, {

package/es/server/errors.d.ts

@@ -0,0 +1 @@
+export declare function moduleNotFound(request: string): NodeJS.ErrnoException;

package/lib/server/errors.d.ts

@@ -0,0 +1 @@
+export declare function moduleNotFound(request: string): NodeJS.ErrnoException;

package/lib/server/errors.js

@@ -0,0 +1,33 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var errors_exports = {};
+__export(errors_exports, {
+  moduleNotFound: () => moduleNotFound
+});
+module.exports = __toCommonJS(errors_exports);
+function moduleNotFound(request) {
+  const error = new Error(`Cannot find module '${request}'`);
+  error.code = "MODULE_NOT_FOUND";
+  return error;
+}
+__name(moduleNotFound, "moduleNotFound");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  moduleNotFound
+});

package/lib/server/setupTestEnvironment.js

@@ -37,6 +37,8 @@ var import_node_os = __toESM(require("node:os"));
 var import_node_path = __toESM(require("node:path"));
 var import_node_url = require("node:url");
 var import_globals = __toESM(require("@tachybase/globals"));
+var import_api = require("tsx/cjs/api");
+var import_errors = require("./errors");
 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 = {
@@ -64,19 +66,28 @@ function getTachybaseGlobal(runtimeRequire2) {
   }
 }
 __name(getTachybaseGlobal, "getTachybaseGlobal");
-function getCoreModules() {
+function getCoreModules(workspaceRoot, workspaceRequire = runtimeRequire) {
   const cores = [];
-  try {
-    cores.push(selfRequire("@tego/core"));
-  } catch (e) {
-    if ((e == null ? void 0 : e.code) !== "MODULE_NOT_FOUND") throw e;
-  }
-  try {
-    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;
-  }
+  const addCore = /* @__PURE__ */ __name((loader) => {
+    try {
+      cores.push(loader());
+    } catch (e) {
+      if ((e == null ? void 0 : e.code) !== "MODULE_NOT_FOUND") throw e;
+    }
+  }, "addCore");
+  addCore(() => selfRequire("@tego/core"));
+  addCore(() => workspaceRequire("@tego/core"));
+  addCore(() => {
+    const sourceEntry = import_node_path.default.resolve(workspaceRoot, "packages/core/src/index.ts");
+    if (!import_node_fs.default.existsSync(sourceEntry)) {
+      throw (0, import_errors.moduleNotFound)(sourceEntry);
+    }
+    return (0, import_api.require)(sourceEntry, import_node_path.default.resolve(workspaceRoot, "package.json"));
+  });
+  addCore(() => selfRequire("@tego/server"));
+  addCore(() => workspaceRequire("@tego/server"));
+  addCore(() => (0, import_node_module.createRequire)(selfRequire.resolve("@tego/server/package.json"))("@tego/core"));
+  addCore(() => (0, import_node_module.createRequire)(workspaceRequire.resolve("@tego/server/package.json"))("@tego/core"));
   return [...new Set(cores)];
 }
 __name(getCoreModules, "getCoreModules");
@@ -419,7 +430,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();
+  const coreModules = getCoreModules(workspaceRoot, runtimeRequire2);
   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.3",
+  "version": "1.6.13-alpha.5",
   "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/globals": "1.6.13-alpha.3",
-    "@tachybase/schema": "1.6.13-alpha.3",
-    "@tego/core": "1.6.13-alpha.3",
-    "@tachybase/database": "1.6.13-alpha.3"
+    "@tachybase/schema": "1.6.13-alpha.5",
+    "@tachybase/database": "1.6.13-alpha.5",
+    "@tachybase/globals": "1.6.13-alpha.5",
+    "@tego/core": "1.6.13-alpha.5"
   }
 }

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 {