@eggjs/mock 7.0.2-beta.1 → 7.0.2-beta.11

package/README.md

@@ -321,14 +321,14 @@ console.log(ctx.user.name); // Jason
 
 ```js
 await app.mockContextScope(
-  async ctx => {
+  async (ctx) => {
     console.log(ctx.user.name); // Jason
   },
   {
     user: {
       name: 'Jason',
     },
-  }
+  },
 );
 ```
 
@@ -443,7 +443,7 @@ describe('test app', () => {
     return app
       .httpRequest()
       .get('/foo')
-      .expect(res => {
+      .expect((res) => {
         assert(!res.headers.foo);
       })
       .expect(/bar/);

package/README.zh_CN.md

@@ -333,14 +333,14 @@ console.log(ctx.user.name); // Jason
 
 ```js
 await app.mockContextScope(
-  async ctx => {
+  async (ctx) => {
     console.log(ctx.user.name); // Jason
   },
   {
     user: {
       name: 'Jason',
     },
-  }
+  },
 );
 ```
 
@@ -403,9 +403,9 @@ return app.httpRequest().post('/login').expect(302);
 模拟 httpclient 的请求，例如 `ctx.curl`
 
 ```js
-app.get('/', async ctx => {
+app.get('/', async (ctx) => {
   const ret = await ctx.curl('https://eggjs.org');
-  this.body = ret.data.toString();
+  ctx.body = ret.data.toString();
 });
 
 app.mockHttpclient('https://eggjs.org', {
@@ -432,7 +432,7 @@ describe('test app', () => {
     return app
       .httpRequest()
       .get('/foo')
-      .expect(res => {
+      .expect((res) => {
         assert(!res.headers.foo);
       })
       .expect(/bar/);

package/dist/app/extend/application.js

@@ -53,7 +53,7 @@ var ApplicationUnittest = class extends Application {
 		const req = this.mockRequest(data);
 		const res = new http.ServerResponse(req);
 		if (options.reuseCtxStorage !== false) {
-			if (this.currentContext && !this.currentContext[REUSED_CTX]) {
+			if (this.currentContext && this.currentContext.app === this && !this.currentContext[REUSED_CTX]) {
 				mockRequest(this.currentContext.request.req);
 				this.currentContext[REUSED_CTX] = true;
 				return this.currentContext;

package/dist/lib/app.js

@@ -86,6 +86,7 @@ var MockApplicationWorker = class extends Base {
 		debug("http server instantiate");
 		createServer(app);
 		await app.ready();
+		if (app.server) app.emit("server", app.server);
 		setCustomLoader(app);
 		const msg = {
 			action: "egg-ready",

package/dist/lib/app_handler.js

@@ -29,10 +29,12 @@ function setupApp() {
 		debug("mockParallelApp app: %s", !!app);
 	} else {
 		app = createApp(options);
-		if (typeof beforeAll === "function") beforeAll(() => app.ready());
-		if (typeof afterEach === "function") {
-			afterEach(() => app.backgroundTasksFinished());
-			afterEach(restore);
+		if (!globalThis.__eggMockVitestSetup) {
+			if (typeof beforeAll === "function") beforeAll(() => app.ready());
+			if (typeof afterEach === "function") {
+				afterEach(() => app.backgroundTasksFinished());
+				afterEach(restore);
+			}
 		}
 	}
 	globalThis.__eggMockAppInstance = app;

package/dist/lib/format_options.js

@@ -51,6 +51,7 @@ function formatOptions(initOptions) {
 	const env = process.env.EGG_SERVER_ENV;
 	if (!isMocked(process.env, "HOME") && (env === "default" || env === "test" || env === "prod")) mm(process.env, "HOME", options.baseDir);
 	if (process.env.EGG_MOCK_SERVER_ENV) options.cache = false;
+	if (!options.startMode && process.env.EGG_VITEST_POOL === "threads") options.startMode = "worker_threads";
 	debug("[formatOptions] options: %j", options);
 	return options;
 }

package/dist/lib/mock_http_server.js

@@ -8,7 +8,6 @@ function createServer(app) {
 		server = http.createServer(server);
 		app[SERVER] = server;
 		if (!app.server) app.server = server;
-		app.emit("server", server);
 	}
 	return server;
 }

package/dist/lib/parallel/app.js

@@ -41,6 +41,7 @@ var MockParallelApplication = class extends Base {
 		debug("http server instantiate");
 		createServer(app);
 		await app.ready();
+		if (app.server) app.emit("server", app.server);
 		const msg = {
 			action: "egg-ready",
 			data: this.options

package/dist/lib/types.d.ts

@@ -46,6 +46,10 @@ interface MockOptions {
   */
   mockCtxStorage?: boolean;
   beforeInit?: (app: any) => Promise<void>;
+  /**
+  * Start mode for egg cluster-client
+  */
+  startMode?: "process" | "worker_threads";
 }
 interface MockClusterOptions extends MockOptions {
   workers?: number | string;

package/dist/setup_vitest.js

@@ -7,17 +7,32 @@ if (!g.before) g.before = beforeAll;
 if (!g.after) g.after = afterAll;
 if (!g.beforeEach) g.beforeEach = beforeEach;
 if (!g.afterEach) g.afterEach = afterEach;
+globalThis.__eggMockVitestSetup = true;
+if (!globalThis.__teggVitestConfig) globalThis.__teggVitestConfig = {
+	restoreMocks: true,
+	getApp: async () => {
+		return (await import("./bootstrap.js"))?.app;
+	}
+};
 let app;
+let startupPromise;
 beforeAll(async () => {
-	const { app: bootstrapApp } = await import("./bootstrap.js");
-	app = bootstrapApp;
-	await app.ready();
+	if (!startupPromise) {
+		startupPromise = (async () => {
+			const { app: bootstrapApp } = await import("./bootstrap.js");
+			app = bootstrapApp;
+			await app.ready();
+		})();
+		startupPromise.catch(() => {});
+	}
+	await startupPromise;
 });
 afterEach(async () => {
 	if (app && typeof app.backgroundTasksFinished === "function") await app.backgroundTasksFinished();
 	await proxyMock.restore();
 });
 afterAll(async () => {
+	if (globalThis.__eggVitestSharedMode || process.env.EGG_VITEST_ISOLATE === "false" || process.env.EGG_VITEST_POOL === "threads") return;
 	if (app) await app.close();
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eggjs/mock",
-  "version": "7.0.2-beta.1",
+  "version": "7.0.2-beta.11",
   "description": "mock server plugin for egg",
   "keywords": [
     "egg",
@@ -72,20 +72,20 @@
     "sdk-base": "^5.0.1",
     "urllib": "^4.8.2",
     "utility": "^2.5.0",
-    "@eggjs/extend2": "5.0.2-beta.1",
-    "@eggjs/supertest": "9.0.2-beta.1",
-    "@eggjs/utils": "5.0.2-beta.1"
+    "@eggjs/extend2": "5.0.2-beta.11",
+    "@eggjs/utils": "5.0.2-beta.11",
+    "@eggjs/supertest": "9.0.2-beta.11"
   },
   "devDependencies": {
     "@types/methods": "^1.1.4",
     "typescript": "^5.9.3",
-    "@eggjs/errors": "3.0.2-beta.1",
-    "@eggjs/tracer": "4.0.2-beta.1",
-    "egg": "4.1.2-beta.1"
+    "@eggjs/tracer": "4.0.2-beta.11",
+    "egg": "4.1.2-beta.11",
+    "@eggjs/errors": "3.0.2-beta.11"
   },
   "peerDependencies": {
     "vitest": "^4.0.15",
-    "egg": "4.1.2-beta.1"
+    "egg": "4.1.2-beta.11"
   },
   "peerDependenciesMeta": {
     "vitest": {