@tachybase/test 1.6.14 → 1.6.15

package/es/index.mjs

@@ -8,7 +8,7 @@ import { Application, Gateway, AppSupervisor, PluginManager } from "@tego/core";
 import jwt from "jsonwebtoken";
 import qs from "qs";
 import fs from "node:fs";
-import { createRequire } from "node:module";
+import { createRequire, Module } from "node:module";
 import os from "node:os";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
@@ -221,6 +221,81 @@ const workspacePluginNameAliases = {
 };
 const ImportedTachybaseGlobal = TachybaseGlobalModule.getInstance ? TachybaseGlobalModule : TachybaseGlobalModule.default;
 const testUnsafeBuiltinPlugins = /* @__PURE__ */ new Set(["event-source", "worker-thread"]);
+const cjsResolverPatched = Symbol.for("tego.test.server-env-cjs-resolver-patched");
+function patchSlowBuffer() {
+  try {
+    const buffer = runtimeRequire("node:buffer");
+    buffer.SlowBuffer ??= buffer.Buffer;
+  } catch {
+  }
+}
+function patchCjsResolverForTestRuntime(workspaceRoot) {
+  if (globalThis[cjsResolverPatched]) {
+    return;
+  }
+  const resolvedWorkspaceRoot = workspaceRoot || process.cwd();
+  createRequire(path.resolve(resolvedWorkspaceRoot, "package.json"));
+  let testServerPath;
+  let testCorePath;
+  try {
+    testServerPath = selfRequire.resolve("@tego/server");
+  } catch {
+  }
+  try {
+    testCorePath = selfRequire.resolve("@tego/core");
+  } catch {
+  }
+  if (!testServerPath && !testCorePath) {
+    return;
+  }
+  const runtimeResolutions = /* @__PURE__ */ new Map();
+  if (testServerPath) {
+    runtimeResolutions.set("@tego/server", testServerPath);
+    try {
+      runtimeResolutions.set("@tego/server/package.json", selfRequire.resolve("@tego/server/package.json"));
+    } catch {
+    }
+  }
+  if (testCorePath) {
+    runtimeResolutions.set("@tego/core", testCorePath);
+    try {
+      runtimeResolutions.set("@tego/core/package.json", selfRequire.resolve("@tego/core/package.json"));
+    } catch {
+    }
+  }
+  const ModuleWithResolver = Module;
+  const originalResolveFilename = ModuleWithResolver._resolveFilename;
+  ModuleWithResolver._resolveFilename = function resolveTestRuntime(request, ...args) {
+    return runtimeResolutions.get(request) || originalResolveFilename.call(this, request, ...args);
+  };
+  globalThis[cjsResolverPatched] = true;
+}
+function configureWorkerGlobalsForContexts(workspaceRoot, pluginPaths) {
+  const workspaceRequire = createRequire(path.resolve(workspaceRoot, "package.json"));
+  const contexts = [runtimeRequire, selfRequire, workspaceRequire];
+  for (const packageName of ["@tego/core", "@tego/server"]) {
+    for (const req of [selfRequire, workspaceRequire]) {
+      try {
+        contexts.push(createRequire(req.resolve(`${packageName}/package.json`)));
+      } catch {
+      }
+    }
+  }
+  const workerPaths = [workspaceRoot, ...pluginPaths];
+  const uniqueContexts = [...new Set(contexts)];
+  for (const req of uniqueContexts) {
+    try {
+      const tachybaseGlobal = getTachybaseGlobal(req);
+      tachybaseGlobal.getInstance().set("PLUGIN_PATHS", pluginPaths);
+      tachybaseGlobal.getInstance().set("WORKER_PATHS", workerPaths);
+      tachybaseGlobal.getInstance().set("WORKER_MODULES", []);
+    } catch (error) {
+      if (error.code !== "MODULE_NOT_FOUND") {
+        throw error;
+      }
+    }
+  }
+}
 function createRuntimeRequire(workspaceRoot) {
   const hostPackageJson = path.resolve(workspaceRoot, "package.json");
   if (fs.existsSync(hostPackageJson)) {
@@ -621,6 +696,10 @@ function setupServerTestEnvironment(options = {}) {
   TachybaseGlobal.getInstance().set("WORKER_MODULES", []);
   process.env.TEGO_RUNTIME_HOME = path.join(os.tmpdir(), "test-sqlite");
   process.env.APP_ENV_PATH = process.env.APP_ENV_PATH || ".env.test";
+  patchSlowBuffer();
+  if (pluginPaths.length > 0) {
+    configureWorkerGlobalsForContexts(workspaceRoot, pluginPaths);
+  }
   const coreModules = getCoreModules(workspaceRoot, runtimeRequire2);
   for (const core of coreModules) {
     patchPluginRuntime(core, workspaceRoot, packageDirByPluginName);
@@ -713,6 +792,7 @@ export {
   isPg,
   mockDatabase2 as mockDatabase,
   mockServer,
+  patchCjsResolverForTestRuntime,
   pgOnly,
   randomStr,
   setupServerTestEnvironment,

package/es/server/setupTestEnvironment.d.ts

@@ -5,4 +5,10 @@ export interface ServerTestEnvironmentOptions {
     disableRuntimePlugins?: boolean;
     disableOtherPlugins?: boolean;
 }
+/**
+ * Patch CJS _resolveFilename so that @tego/server and @tego/core always resolve
+ * to the copy used by @tachybase/test. Call this at module level in your setup
+ * file (before setupServerTestEnvironment) to prevent dual-instance bugs.
+ */
+export declare function patchCjsResolverForTestRuntime(workspaceRoot?: string): void;
 export declare function setupServerTestEnvironment(options?: ServerTestEnvironmentOptions): void;

package/es/vitest.d.ts

@@ -1,11 +1,20 @@
 export interface TegoVitestConfigOptions {
     server?: {
         setupFile?: string;
+        /** Force CJS entry for @tachybase/test in server tests (avoids ESM createRequire issues). */
+        forceCjsEntry?: boolean;
     };
     client?: {
         setupFile?: string;
+        /** Override the default client test timeout (ms). */
+        testTimeout?: number;
     };
+    /** Additional path aliases merged with defaults from tsconfig.paths.json. */
+    aliases?: Array<{
+        find: string | RegExp;
+        replacement: string;
+    }>;
 }
-export declare function defineTegoVitestConfig(options?: TegoVitestConfigOptions): import("vite").UserConfig & Promise<import("vite").UserConfig> & (import("vitest/config.js").UserConfigFnObject & import("vitest/config.js").UserConfigExport);
-declare const _default: import("vite").UserConfig & Promise<import("vite").UserConfig> & (import("vitest/config.js").UserConfigFnObject & import("vitest/config.js").UserConfigExport);
+export declare function defineTegoVitestConfig(options?: TegoVitestConfigOptions): import("vite").UserConfig;
+declare const _default: import("vite").UserConfig;
 export default _default;

package/es/vitest.mjs

@@ -53,9 +53,41 @@ function tsConfigPathsToAlias() {
   ];
 }
 function defineTegoVitestConfig(options = {}) {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const serverSetupFile = ((_a = options.server) == null ? void 0 : _a.setupFile) || resolve(packageRoot, "./setup/server.ts");
   const clientSetupFiles = [resolve(packageRoot, "./setup/client.ts"), (_b = options.client) == null ? void 0 : _b.setupFile].filter(Boolean);
+  const mergedAliases = [...options.aliases || [], ...tsConfigPathsToAlias()];
+  const serverProject = {
+    root: process.cwd(),
+    resolve: {
+      mainFields: ["module"]
+    },
+    extends: true,
+    test: {
+      name: "server",
+      setupFiles: serverSetupFile,
+      include: ["packages/**/__tests__/**/*.test.ts", "apps/**/__tests__/**/*.test.ts"],
+      exclude: [
+        "**/node_modules/**",
+        "**/dist/**",
+        "**/lib/**",
+        "**/es/**",
+        "**/e2e/**",
+        "**/__e2e__/**",
+        "**/{vitest,commitlint}.config.*",
+        "packages/**/{sdk,client,schema,components}/**/__tests__/**/*.{test,spec}.{ts,tsx}"
+      ],
+      alias: [...mergedAliases]
+    }
+  };
+  if ((_c = options.server) == null ? void 0 : _c.forceCjsEntry) {
+    try {
+      const testRequire = createRequire(path.resolve(process.cwd(), "node_modules/@tachybase/test/package.json"));
+      const testCjsEntry = testRequire.resolve("@tachybase/test");
+      serverProject.test.alias.push({ find: "@tachybase/test", replacement: testCjsEntry });
+    } catch {
+    }
+  }
   return defineConfig({
     test: {
       testTimeout: 6e4,
@@ -73,30 +105,9 @@ function defineTegoVitestConfig(options = {}) {
       },
       silent: !!process.env.GITHUB_ACTIONS,
       globals: true,
-      alias: tsConfigPathsToAlias(),
+      alias: mergedAliases,
       projects: [
-        {
-          root: process.cwd(),
-          resolve: {
-            mainFields: ["module"]
-          },
-          extends: true,
-          test: {
-            name: "server",
-            setupFiles: serverSetupFile,
-            include: ["packages/**/__tests__/**/*.test.ts", "apps/**/__tests__/**/*.test.ts"],
-            exclude: [
-              "**/node_modules/**",
-              "**/dist/**",
-              "**/lib/**",
-              "**/es/**",
-              "**/e2e/**",
-              "**/__e2e__/**",
-              "**/{vitest,commitlint}.config.*",
-              "packages/**/{sdk,client,schema,components}/**/__tests__/**/*.{test,spec}.{ts,tsx}"
-            ]
-          }
-        },
+        serverProject,
         {
           // @ts-ignore
           plugins: [react()],
@@ -113,7 +124,8 @@ function defineTegoVitestConfig(options = {}) {
             setupFiles: clientSetupFiles,
             environment: "jsdom",
             css: false,
-            alias: tsConfigPathsToAlias(),
+            alias: mergedAliases,
+            testTimeout: (_d = options.client) == null ? void 0 : _d.testTimeout,
             include: ["packages/**/{sdk,client,schema,components}/**/__tests__/**/*.{test,spec}.{ts,tsx}"],
             exclude: [
               "**/node_modules/**",

package/lib/server/setupTestEnvironment.d.ts

@@ -5,4 +5,10 @@ export interface ServerTestEnvironmentOptions {
     disableRuntimePlugins?: boolean;
     disableOtherPlugins?: boolean;
 }
+/**
+ * Patch CJS _resolveFilename so that @tego/server and @tego/core always resolve
+ * to the copy used by @tachybase/test. Call this at module level in your setup
+ * file (before setupServerTestEnvironment) to prevent dual-instance bugs.
+ */
+export declare function patchCjsResolverForTestRuntime(workspaceRoot?: string): void;
 export declare function setupServerTestEnvironment(options?: ServerTestEnvironmentOptions): void;

package/lib/server/setupTestEnvironment.js

@@ -28,6 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var setupTestEnvironment_exports = {};
 __export(setupTestEnvironment_exports, {
+  patchCjsResolverForTestRuntime: () => patchCjsResolverForTestRuntime,
   setupServerTestEnvironment: () => setupServerTestEnvironment
 });
 module.exports = __toCommonJS(setupTestEnvironment_exports);
@@ -46,6 +47,84 @@ const workspacePluginNameAliases = {
 };
 const ImportedTachybaseGlobal = import_globals.default.getInstance ? import_globals.default : import_globals.default.default;
 const testUnsafeBuiltinPlugins = /* @__PURE__ */ new Set(["event-source", "worker-thread"]);
+const cjsResolverPatched = Symbol.for("tego.test.server-env-cjs-resolver-patched");
+function patchSlowBuffer() {
+  try {
+    const buffer = runtimeRequire("node:buffer");
+    buffer.SlowBuffer ??= buffer.Buffer;
+  } catch {
+  }
+}
+__name(patchSlowBuffer, "patchSlowBuffer");
+function patchCjsResolverForTestRuntime(workspaceRoot) {
+  if (globalThis[cjsResolverPatched]) {
+    return;
+  }
+  const resolvedWorkspaceRoot = workspaceRoot || process.cwd();
+  const workspaceRequire = (0, import_node_module.createRequire)(import_node_path.default.resolve(resolvedWorkspaceRoot, "package.json"));
+  let testServerPath;
+  let testCorePath;
+  try {
+    testServerPath = selfRequire.resolve("@tego/server");
+  } catch {
+  }
+  try {
+    testCorePath = selfRequire.resolve("@tego/core");
+  } catch {
+  }
+  if (!testServerPath && !testCorePath) {
+    return;
+  }
+  const runtimeResolutions = /* @__PURE__ */ new Map();
+  if (testServerPath) {
+    runtimeResolutions.set("@tego/server", testServerPath);
+    try {
+      runtimeResolutions.set("@tego/server/package.json", selfRequire.resolve("@tego/server/package.json"));
+    } catch {
+    }
+  }
+  if (testCorePath) {
+    runtimeResolutions.set("@tego/core", testCorePath);
+    try {
+      runtimeResolutions.set("@tego/core/package.json", selfRequire.resolve("@tego/core/package.json"));
+    } catch {
+    }
+  }
+  const ModuleWithResolver = import_node_module.Module;
+  const originalResolveFilename = ModuleWithResolver._resolveFilename;
+  ModuleWithResolver._resolveFilename = /* @__PURE__ */ __name(function resolveTestRuntime(request, ...args) {
+    return runtimeResolutions.get(request) || originalResolveFilename.call(this, request, ...args);
+  }, "resolveTestRuntime");
+  globalThis[cjsResolverPatched] = true;
+}
+__name(patchCjsResolverForTestRuntime, "patchCjsResolverForTestRuntime");
+function configureWorkerGlobalsForContexts(workspaceRoot, pluginPaths) {
+  const workspaceRequire = (0, import_node_module.createRequire)(import_node_path.default.resolve(workspaceRoot, "package.json"));
+  const contexts = [runtimeRequire, selfRequire, workspaceRequire];
+  for (const packageName of ["@tego/core", "@tego/server"]) {
+    for (const req of [selfRequire, workspaceRequire]) {
+      try {
+        contexts.push((0, import_node_module.createRequire)(req.resolve(`${packageName}/package.json`)));
+      } catch {
+      }
+    }
+  }
+  const workerPaths = [workspaceRoot, ...pluginPaths];
+  const uniqueContexts = [...new Set(contexts)];
+  for (const req of uniqueContexts) {
+    try {
+      const tachybaseGlobal = getTachybaseGlobal(req);
+      tachybaseGlobal.getInstance().set("PLUGIN_PATHS", pluginPaths);
+      tachybaseGlobal.getInstance().set("WORKER_PATHS", workerPaths);
+      tachybaseGlobal.getInstance().set("WORKER_MODULES", []);
+    } catch (error) {
+      if (error.code !== "MODULE_NOT_FOUND") {
+        throw error;
+      }
+    }
+  }
+}
+__name(configureWorkerGlobalsForContexts, "configureWorkerGlobalsForContexts");
 function createRuntimeRequire(workspaceRoot) {
   const hostPackageJson = import_node_path.default.resolve(workspaceRoot, "package.json");
   if (import_node_fs.default.existsSync(hostPackageJson)) {
@@ -459,6 +538,10 @@ function setupServerTestEnvironment(options = {}) {
   TachybaseGlobal.getInstance().set("WORKER_MODULES", []);
   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";
+  patchSlowBuffer();
+  if (pluginPaths.length > 0) {
+    configureWorkerGlobalsForContexts(workspaceRoot, pluginPaths);
+  }
   const coreModules = getCoreModules(workspaceRoot, runtimeRequire2);
   for (const core of coreModules) {
     patchPluginRuntime(core, workspaceRoot, packageDirByPluginName);
@@ -479,5 +562,6 @@ function setupServerTestEnvironment(options = {}) {
 __name(setupServerTestEnvironment, "setupServerTestEnvironment");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  patchCjsResolverForTestRuntime,
   setupServerTestEnvironment
 });

package/lib/vitest.d.ts

@@ -1,11 +1,20 @@
 export interface TegoVitestConfigOptions {
     server?: {
         setupFile?: string;
+        /** Force CJS entry for @tachybase/test in server tests (avoids ESM createRequire issues). */
+        forceCjsEntry?: boolean;
     };
     client?: {
         setupFile?: string;
+        /** Override the default client test timeout (ms). */
+        testTimeout?: number;
     };
+    /** Additional path aliases merged with defaults from tsconfig.paths.json. */
+    aliases?: Array<{
+        find: string | RegExp;
+        replacement: string;
+    }>;
 }
-export declare function defineTegoVitestConfig(options?: TegoVitestConfigOptions): import("vite").UserConfig & Promise<import("vite").UserConfig> & (import("vitest/config.js").UserConfigFnObject & import("vitest/config.js").UserConfigExport);
-declare const _default: import("vite").UserConfig & Promise<import("vite").UserConfig> & (import("vitest/config.js").UserConfigFnObject & import("vitest/config.js").UserConfigExport);
+export declare function defineTegoVitestConfig(options?: TegoVitestConfigOptions): import("vite").UserConfig;
+declare const _default: import("vite").UserConfig;
 export default _default;

package/lib/vitest.js

@@ -88,9 +88,41 @@ function tsConfigPathsToAlias() {
 }
 __name(tsConfigPathsToAlias, "tsConfigPathsToAlias");
 function defineTegoVitestConfig(options = {}) {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const serverSetupFile = ((_a = options.server) == null ? void 0 : _a.setupFile) || (0, import_node_path.resolve)(packageRoot, "./setup/server.ts");
   const clientSetupFiles = [(0, import_node_path.resolve)(packageRoot, "./setup/client.ts"), (_b = options.client) == null ? void 0 : _b.setupFile].filter(Boolean);
+  const mergedAliases = [...options.aliases || [], ...tsConfigPathsToAlias()];
+  const serverProject = {
+    root: process.cwd(),
+    resolve: {
+      mainFields: ["module"]
+    },
+    extends: true,
+    test: {
+      name: "server",
+      setupFiles: serverSetupFile,
+      include: ["packages/**/__tests__/**/*.test.ts", "apps/**/__tests__/**/*.test.ts"],
+      exclude: [
+        "**/node_modules/**",
+        "**/dist/**",
+        "**/lib/**",
+        "**/es/**",
+        "**/e2e/**",
+        "**/__e2e__/**",
+        "**/{vitest,commitlint}.config.*",
+        "packages/**/{sdk,client,schema,components}/**/__tests__/**/*.{test,spec}.{ts,tsx}"
+      ],
+      alias: [...mergedAliases]
+    }
+  };
+  if ((_c = options.server) == null ? void 0 : _c.forceCjsEntry) {
+    try {
+      const testRequire = (0, import_node_module.createRequire)(import_node_path.default.resolve(process.cwd(), "node_modules/@tachybase/test/package.json"));
+      const testCjsEntry = testRequire.resolve("@tachybase/test");
+      serverProject.test.alias.push({ find: "@tachybase/test", replacement: testCjsEntry });
+    } catch {
+    }
+  }
   return (0, import_config.defineConfig)({
     test: {
       testTimeout: 6e4,
@@ -108,30 +140,9 @@ function defineTegoVitestConfig(options = {}) {
       },
       silent: !!process.env.GITHUB_ACTIONS,
       globals: true,
-      alias: tsConfigPathsToAlias(),
+      alias: mergedAliases,
       projects: [
-        {
-          root: process.cwd(),
-          resolve: {
-            mainFields: ["module"]
-          },
-          extends: true,
-          test: {
-            name: "server",
-            setupFiles: serverSetupFile,
-            include: ["packages/**/__tests__/**/*.test.ts", "apps/**/__tests__/**/*.test.ts"],
-            exclude: [
-              "**/node_modules/**",
-              "**/dist/**",
-              "**/lib/**",
-              "**/es/**",
-              "**/e2e/**",
-              "**/__e2e__/**",
-              "**/{vitest,commitlint}.config.*",
-              "packages/**/{sdk,client,schema,components}/**/__tests__/**/*.{test,spec}.{ts,tsx}"
-            ]
-          }
-        },
+        serverProject,
         {
           // @ts-ignore
           plugins: [(0, import_plugin_react.default)()],
@@ -148,7 +159,8 @@ function defineTegoVitestConfig(options = {}) {
             setupFiles: clientSetupFiles,
             environment: "jsdom",
             css: false,
-            alias: tsConfigPathsToAlias(),
+            alias: mergedAliases,
+            testTimeout: (_d = options.client) == null ? void 0 : _d.testTimeout,
             include: ["packages/**/{sdk,client,schema,components}/**/__tests__/**/*.{test,spec}.{ts,tsx}"],
             exclude: [
               "**/node_modules/**",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/test",
-  "version": "1.6.14",
+  "version": "1.6.15",
   "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/database": "1.6.14",
-    "@tachybase/globals": "1.6.14",
-    "@tachybase/schema": "1.6.14",
-    "@tego/core": "1.6.14"
+    "@tachybase/database": "1.6.15",
+    "@tachybase/schema": "1.6.15",
+    "@tego/core": "1.6.15",
+    "@tachybase/globals": "1.6.15"
   }
 }

package/setup/server.ts

@@ -1,7 +1,10 @@
 import path from 'node:path';
-import { setupServerTestEnvironment } from '@tachybase/test/server';
+import { patchCjsResolverForTestRuntime, setupServerTestEnvironment } from '@tachybase/test/server';
 import { initEnv } from '@tego/devkit';
 
+// Patch CJS resolver BEFORE any test modules load to prevent dual-instance bugs
+patchCjsResolverForTestRuntime();
+
 setupServerTestEnvironment({
   workspaceRoot: process.cwd(),
   pluginPaths: [path.resolve(process.cwd(), 'packages')],