@nocobase/test 1.9.0-beta.8 → 2.0.0-alpha.2

package/es/server/mock-server.d.ts

@@ -85,11 +85,12 @@ export type MockClusterOptions = MockServerOptions & {
     number?: number;
     clusterName?: string;
     appName?: string;
+    mockInstanceId?: boolean;
 };
 export type MockCluster = {
     nodes: MockServer[];
     destroy: () => Promise<void>;
 };
-export declare function createMockCluster({ number, clusterName, appName, ...options }?: MockClusterOptions): Promise<MockCluster>;
+export declare function createMockCluster({ number, clusterName, appName, mockInstanceId, ...options }?: MockClusterOptions): Promise<MockCluster>;
 export declare function createMockServer(options?: MockServerOptions): Promise<MockServer>;
 export default mockServer;

package/lib/server/mock-server.d.ts

@@ -85,11 +85,12 @@ export type MockClusterOptions = MockServerOptions & {
     number?: number;
     clusterName?: string;
     appName?: string;
+    mockInstanceId?: boolean;
 };
 export type MockCluster = {
     nodes: MockServer[];
     destroy: () => Promise<void>;
 };
-export declare function createMockCluster({ number, clusterName, appName, ...options }?: MockClusterOptions): Promise<MockCluster>;
+export declare function createMockCluster({ number, clusterName, appName, mockInstanceId, ...options }?: MockClusterOptions): Promise<MockCluster>;
 export declare function createMockServer(options?: MockServerOptions): Promise<MockServer>;
 export default mockServer;

package/lib/server/mock-server.js

@@ -98,7 +98,7 @@ const _MockServer = class _MockServer extends import_server.Application {
       get(target, method, receiver) {
         if (["login", "loginUsingId"].includes(method)) {
           return async (userOrId, roleName) => {
-            const userId = typeof userOrId === "number" ? userOrId : userOrId == null ? void 0 : userOrId.id;
+            const userId = (userOrId == null ? void 0 : userOrId.id) ? userOrId.id : userOrId;
             const tokenInfo = await authManager.tokenController.add({ userId });
             const expiresIn = (await authManager.tokenController.getConfig()).tokenExpirationTime;
             return proxy.auth(
@@ -228,6 +228,7 @@ async function createMockCluster({
   number = 2,
   clusterName = `cluster_${(0, import_utils.uid)()}`,
   appName = `app_${(0, import_utils.uid)()}`,
+  mockInstanceId = true,
   ...options
 } = {}) {
   const nodes = [];
@@ -242,7 +243,7 @@ async function createMockCluster({
       ...options,
       skipSupervisor: true,
       name: clusterName + "_" + appName,
-      instanceId: `${clusterName}_${appName}_${i}`,
+      instanceId: mockInstanceId ? i : void 0,
       pubSubManager: {
         channelPrefix: clusterName
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/test",
-  "version": "1.9.0-beta.8",
+  "version": "2.0.0-alpha.2",
   "main": "lib/index.js",
   "module": "./src/index.ts",
   "types": "./lib/index.d.ts",
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "@faker-js/faker": "8.1.0",
-    "@nocobase/server": "1.9.0-beta.8",
+    "@nocobase/server": "2.0.0-alpha.2",
     "@playwright/test": "^1.45.3",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.0.0",
@@ -75,5 +75,5 @@
     "vitest-dom": "^0.1.1",
     "ws": "^8.13.0"
   },
-  "gitHead": "f3d4f3d1ba7adbf4d4c60e656c23da45565769c8"
+  "gitHead": "1322f486b248bef53ed8c8f42f0a39dfd02125fd"
 }

package/vitest.mjs

@@ -9,7 +9,7 @@ import { mergeConfig, defineConfig as vitestConfig } from 'vitest/config';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-const CORE_CLIENT_PACKAGES = ['sdk', 'client'];
+const CORE_CLIENT_PACKAGES = ['sdk', 'client', 'flow-engine'];
 
 const relativePathToAbsolute = (relativePath) => {
   return path.resolve(process.cwd(), relativePath);