@eggjs/mock 7.0.0-beta.18 → 7.0.0-beta.20

package/dist/lib/agent_handler.js

@@ -1,26 +1,9 @@
-import { getEggOptions } from "./utils.js";
-import { createAgent } from "./parallel/agent.js";
-import { debuglog } from "node:util";
+import "../utils-MhP_Krx1.js";
+import "../format_options-LRnReKde.js";
+import "../context-BIduDy1M.js";
+import "../mock_custom_loader-f_tHRojG.js";
+import "../util-BpppqTXv.js";
+import "../agent-BKYkjoCx.js";
+import { closeAgent, setupAgent } from "../agent_handler-DeUtoRVT.js";
 
-//#region src/lib/agent_handler.ts
-const debug = debuglog("egg/mock/lib/agent_handler");
-let agent;
-async function setupAgent() {
-	debug("setupAgent call, env.ENABLE_MOCHA_PARALLEL: %s, process.env.AUTO_AGENT: %s, agent: %s", process.env.ENABLE_MOCHA_PARALLEL, process.env.AUTO_AGENT, !!agent);
-	if (agent) {
-		await agent.ready();
-		return agent;
-	}
-	if (process.env.ENABLE_MOCHA_PARALLEL && process.env.AUTO_AGENT) {
-		agent = createAgent(getEggOptions());
-		await agent.ready();
-	}
-	return agent;
-}
-async function closeAgent() {
-	debug("setupAgent call, agent: %s", !!agent);
-	if (agent) await agent.close();
-}
-
-//#endregion
 export { closeAgent, setupAgent };

package/dist/lib/app.d.ts

@@ -1,7 +1,6 @@
-import { MockOptions } from "./types.js";
-import ApplicationUnittest from "../app/extend/application.js";
-
-//#region src/lib/app.d.ts
-declare function createApp(createOptions?: MockOptions): ApplicationUnittest;
-//#endregion
+import "../mock_httpclient-1EgQkMxi.js";
+import "../supertest-BIds28yL.js";
+import "../types-CjZ-JeCo.js";
+import "../application-BPpvw5dg.js";
+import { createApp } from "../app-l47a-gqT.js";
 export { createApp };

package/dist/lib/app.js

@@ -1,254 +1,14 @@
-import { createServer } from "./mock_http_server.js";
-import { getProperty, getSourceDirname, rimraf, sleep } from "./utils.js";
-import { formatOptions } from "./format_options.js";
-import { context } from "./context.js";
-import { setCustomLoader } from "./mock_custom_loader.js";
-import "../app/extend/application.js";
-import "../app/extend/agent.js";
-import { strict } from "node:assert";
-import path from "node:path";
-import { debuglog } from "node:util";
-import os from "node:os";
-import { importModule } from "@eggjs/utils";
-import { Base } from "sdk-base";
-import { detectPort } from "detect-port";
+import "../mock_http_server-De0r07gr.js";
+import "../utils-MhP_Krx1.js";
+import "../supertest-Cg412Los.js";
+import "../format_options-LRnReKde.js";
+import "../context-BIduDy1M.js";
+import "../mock_custom_loader-f_tHRojG.js";
+import "../mock_agent-CxT7Q0_N.js";
+import "../mock_httpclient-B6UVI7GS.js";
+import "../types-CPNMyF89.js";
+import "../application-LrKwuOKn.js";
+import "../agent-DZ_fHoxJ.js";
+import { createApp } from "../app-6Bn3F5Uw.js";
 
-//#region src/lib/app.ts
-const debug = debuglog("egg/mock/lib/app");
-const apps = /* @__PURE__ */ new Map();
-const APP_INIT = Symbol("appInit");
-const MESSENGER = Symbol("messenger");
-const MOCK_APP_METHOD = [
-	"ready",
-	"closed",
-	"isClosed",
-	"close",
-	"_agent",
-	"_app",
-	"on",
-	"once",
-	"then"
-];
-var MockApplicationWorker = class extends Base {
-	_agent;
-	_app;
-	baseDir;
-	[APP_INIT] = false;
-	_initOnListeners;
-	_initOnceListeners;
-	constructor(options) {
-		super({
-			initMethod: "_init",
-			...options
-		});
-		this.baseDir = options.baseDir;
-		this._initOnListeners = /* @__PURE__ */ new Set();
-		this._initOnceListeners = /* @__PURE__ */ new Set();
-	}
-	async _init() {
-		if (this.options.beforeInit) {
-			await this.options.beforeInit(this);
-			this.options.beforeInit = void 0;
-		}
-		if (this.options.clean !== false) {
-			const logDir = path.join(this.options.baseDir, "logs");
-			try {
-				if (os.platform() === "win32") await sleep(1e3);
-				await rimraf(logDir);
-			} catch (err) {
-				console.error(`remove log dir ${logDir} failed: ${err.stack}`);
-			}
-			const runDir = path.join(this.options.baseDir, "run");
-			try {
-				if (os.platform() === "win32") await sleep(1e3);
-				await rimraf(runDir);
-			} catch (err) {
-				console.error(`remove run dir ${runDir} failed: ${err.stack}`);
-			}
-		}
-		this.options.clusterPort = await detectPort();
-		debug("[init] options: %o", this.options);
-		const egg = await importModule(this.options.framework);
-		strict(egg.Agent, `should export Agent class from framework ${this.options.framework}`);
-		const Agent = egg.Agent;
-		const agent = this._agent = new Agent({ ...this.options });
-		debug("agent instantiate");
-		await agent.ready();
-		debug("agent ready");
-		const app = this._app = new (bindMessenger(egg.Application, agent))({ ...this.options });
-		app.agent = agent;
-		Reflect.set(agent, "app", app);
-		Object.assign(app.context, context);
-		debug("app instantiate");
-		this[APP_INIT] = true;
-		debug("this[APP_INIT] = true");
-		this.#bindEvent();
-		debug("http server instantiate");
-		createServer(app);
-		await app.ready();
-		setCustomLoader(app);
-		const msg = {
-			action: "egg-ready",
-			data: this.options
-		};
-		app.messenger.onMessage(msg);
-		agent.messenger.onMessage(msg);
-		debug("app ready");
-	}
-	#bindEvent() {
-		debug("bind cache events to app");
-		for (const args of this._initOnListeners) {
-			debug("on(%s), use cache and pass to app", args);
-			this._app.on(args[0], args[1]);
-			this.removeListener(args[0], args[1]);
-		}
-		for (const args of this._initOnceListeners) {
-			debug("once(%s), use cache and pass to app", args);
-			this._app.once(args[0], args[1]);
-			this.removeListener(args[0], args[1]);
-		}
-	}
-	on(...args) {
-		if (this[APP_INIT]) {
-			debug("on(%s), pass to app", args);
-			this._app.on(args[0], args[1]);
-		} else {
-			debug("on(%s), cache it because app has not init", args);
-			this._initOnListeners.add(args);
-			super.on(args[0], args[1]);
-		}
-		return this;
-	}
-	once(...args) {
-		if (this[APP_INIT]) {
-			debug("once(%s), pass to app", args);
-			this._app.once(args[0], args[1]);
-		} else {
-			debug("once(%s), cache it because app has not init", args);
-			this._initOnceListeners.add(args);
-			super.on(args[0], args[1]);
-		}
-		return this;
-	}
-	/**
-	* close app
-	*/
-	async _close() {
-		const baseDir = this.baseDir;
-		if (this._app) await this._app.close();
-		else await sleep(200);
-		if (this._agent) await this._agent.close();
-		apps.delete(baseDir);
-		debug("delete app cache %s, remain %s", baseDir, [...apps.keys()]);
-		if (os.platform() === "win32") await sleep(1e3);
-	}
-	/**
-	* @deprecated please use isClosed instead, keep compatible with old version
-	*/
-	get closed() {
-		return this.isClosed;
-	}
-};
-function createApp(createOptions) {
-	const options = formatOptions({
-		...createOptions,
-		mode: "all-in-one-process"
-	});
-	debug("[createApp] options: %o", options);
-	if (options.cache && apps.has(options.baseDir)) {
-		const app = apps.get(options.baseDir);
-		if (app && !app.isClosed) {
-			debug("use cache app %s", options.baseDir);
-			return app;
-		}
-		apps.delete(options.baseDir);
-	}
-	const appWorker = new MockApplicationWorker(options);
-	const proxyApp = new Proxy(appWorker, {
-		get(target, prop) {
-			if (MOCK_APP_METHOD.includes(prop)) return getProperty(target, prop);
-			if (!target[APP_INIT]) throw new Error(`can't get ${prop} before ready`);
-			debug("proxy handler.get %s", prop);
-			return target._app[prop];
-		},
-		set(target, prop, value) {
-			if (MOCK_APP_METHOD.includes(prop)) return true;
-			if (!target[APP_INIT]) throw new Error(`can't set ${prop} before ready`);
-			debug("proxy handler.set %s", prop);
-			target._app[prop] = value;
-			return true;
-		},
-		defineProperty(target, prop, descriptor) {
-			if (MOCK_APP_METHOD.includes(prop)) return true;
-			if (!target[APP_INIT]) throw new Error(`can't defineProperty ${prop} before ready`);
-			debug("proxy handler.defineProperty %s", prop);
-			Object.defineProperty(target._app, prop, descriptor);
-			return true;
-		},
-		deleteProperty(target, prop) {
-			if (MOCK_APP_METHOD.includes(prop)) return true;
-			if (!target[APP_INIT]) throw new Error(`can't delete ${prop} before ready`);
-			debug("proxy handler.deleteProperty %s", prop);
-			delete target._app[prop];
-			return true;
-		},
-		getOwnPropertyDescriptor(target, prop) {
-			if (MOCK_APP_METHOD.includes(prop)) return Object.getOwnPropertyDescriptor(target, prop);
-			if (!target[APP_INIT]) throw new Error(`can't getOwnPropertyDescriptor ${prop} before ready`);
-			debug("proxy handler.getOwnPropertyDescriptor %s", prop);
-			return Object.getOwnPropertyDescriptor(target._app, prop);
-		},
-		getPrototypeOf(target) {
-			if (!target[APP_INIT]) throw new Error("can't getPrototypeOf before ready");
-			debug("proxy handler.getPrototypeOf %s");
-			return Object.getPrototypeOf(target._app);
-		}
-	});
-	apps.set(options.baseDir, proxyApp);
-	return proxyApp;
-}
-function bindMessenger(ApplicationClass, agent) {
-	const agentMessenger = agent.messenger;
-	return class MessengerApplication extends ApplicationClass {
-		[MESSENGER];
-		constructor(options) {
-			super(options);
-			this.messenger.sendRandom = (action, data) => {
-				this.messenger.sendToAgent(action, data);
-			};
-			agentMessenger.on("egg-ready", () => {
-				agentMessenger.sendRandom = (action, data) => {
-					agentMessenger.sendToApp(action, data);
-					return agentMessenger;
-				};
-			});
-			agentMessenger.send = new Proxy(agentMessenger.send, { apply: this._sendMessage.bind(this) });
-		}
-		_sendMessage(_target, _thisArg, [action, data, to]) {
-			const appMessenger = this.messenger;
-			setImmediate(() => {
-				if (to === "app") appMessenger.onMessage({
-					action,
-					data
-				});
-				else agentMessenger.onMessage({
-					action,
-					data
-				});
-			});
-		}
-		get messenger() {
-			return this[MESSENGER];
-		}
-		set messenger(m) {
-			m.send = new Proxy(m.send, { apply: this._sendMessage.bind(this) });
-			this[MESSENGER] = m;
-		}
-		get [Symbol.for("egg#eggPath")]() {
-			return path.join(getSourceDirname(), "lib/tmp");
-		}
-	};
-}
-
-//#endregion
 export { createApp };

package/dist/lib/app_handler.d.ts

@@ -1,9 +1,6 @@
-import ApplicationUnittest from "../app/extend/application.js";
-
-//#region src/lib/app_handler.d.ts
-declare function setupApp(): ApplicationUnittest;
-declare function setGetAppCallback(cb: (suite: unknown, test?: unknown) => any): void;
-declare function getApp(suite?: unknown, test?: unknown): Promise<any>;
-declare function getBootstrapApp(): ApplicationUnittest;
-//#endregion
+import "../mock_httpclient-1EgQkMxi.js";
+import "../supertest-BIds28yL.js";
+import "../types-CjZ-JeCo.js";
+import "../application-BPpvw5dg.js";
+import { getApp, getBootstrapApp, setGetAppCallback, setupApp } from "../app_handler-Gp5J9X-v.js";
 export { getApp, getBootstrapApp, setGetAppCallback, setupApp };

package/dist/lib/app_handler.js

@@ -1,56 +1,21 @@
-import { getEggOptions } from "./utils.js";
-import "../app/extend/application.js";
-import { createApp as createApp$1 } from "./app.js";
-import { restore } from "./restore.js";
-import { createApp } from "./parallel/app.js";
-import { setupAgent } from "./agent_handler.js";
-import { debuglog } from "node:util";
+import "../mock_http_server-De0r07gr.js";
+import "../utils-MhP_Krx1.js";
+import "../supertest-Cg412Los.js";
+import "../format_options-LRnReKde.js";
+import "../cluster-CA_hr9eV.js";
+import "../context-BIduDy1M.js";
+import "../mock_custom_loader-f_tHRojG.js";
+import "../mock_agent-CxT7Q0_N.js";
+import "../mock_httpclient-B6UVI7GS.js";
+import "../types-CPNMyF89.js";
+import "../application-LrKwuOKn.js";
+import "../agent-DZ_fHoxJ.js";
+import "../app-6Bn3F5Uw.js";
+import "../restore-CVQYXquh.js";
+import "../util-BpppqTXv.js";
+import "../app-CoypamK1.js";
+import "../agent-BKYkjoCx.js";
+import "../agent_handler-DeUtoRVT.js";
+import { getApp, getBootstrapApp, setGetAppCallback, setupApp } from "../app_handler-CkiK6fyC.js";
 
-//#region src/lib/app_handler.ts
-const debug = debuglog("egg/mock/lib/app_handler");
-globalThis.__eggMockAppInstance = null;
-function setupApp() {
-	let app = globalThis.__eggMockAppInstance;
-	if (app) {
-		debug("return exists app");
-		return app;
-	}
-	const options = getEggOptions();
-	debug("env.ENABLE_MOCHA_PARALLEL: %s, process.env.AUTO_AGENT: %s", process.env.ENABLE_MOCHA_PARALLEL, process.env.AUTO_AGENT);
-	if (process.env.ENABLE_MOCHA_PARALLEL && process.env.AUTO_AGENT) {
-		app = createApp({
-			...options,
-			beforeInit: async (parallelApp) => {
-				const agent = await setupAgent();
-				parallelApp.options.clusterPort = agent.options.clusterPort;
-				debug("mockParallelApp beforeInit get clusterPort: %s", parallelApp.options.clusterPort);
-			}
-		});
-		debug("mockParallelApp app: %s", !!app);
-	} else {
-		app = createApp$1(options);
-		if (typeof beforeAll === "function") beforeAll(() => app.ready());
-		if (typeof afterEach === "function") {
-			afterEach(() => app.backgroundTasksFinished());
-			afterEach(restore);
-		}
-	}
-	globalThis.__eggMockAppInstance = app;
-	return app;
-}
-let getAppCallback;
-function setGetAppCallback(cb) {
-	getAppCallback = cb;
-}
-async function getApp(suite, test) {
-	if (getAppCallback) return getAppCallback(suite, test);
-	const app = globalThis.__eggMockAppInstance;
-	if (app) await app.ready();
-	return app;
-}
-function getBootstrapApp() {
-	return globalThis.__eggMockAppInstance;
-}
-
-//#endregion
 export { getApp, getBootstrapApp, setGetAppCallback, setupApp };

package/dist/lib/cluster.d.ts

@@ -1,126 +1,6 @@
-import { EggTestRequest } from "./supertest.js";
-import { MockClusterApplicationOptions, MockClusterOptions } from "./types.js";
-import ApplicationUnittest from "../app/extend/application.js";
-import { Coffee } from "coffee";
-
-//#region src/lib/cluster.d.ts
-declare global {
-  var eggMockMasterPort: number;
-}
-/**
- * A cluster version of egg.Application, you can test with supertest
- * @example
- * ```js
- * const mm = require('mm');
- * const request = require('supertest');
- *
- * describe('ClusterApplication', () => {
- *   let app;
- *   before(function (done) {
- *     app = mm.cluster({ baseDir });
- *     app.ready(done);
- *   });
- *
- *   after(function () {
- *     app.close();
- *   });
- *
- *   it('should 200', function (done) {
- *     request(app.callback())
- *     .get('/')
- *     .expect(200, done);
- *   });
- * });
- */
-declare class ClusterApplication extends Coffee {
-  [key: string | symbol]: any;
-  options: MockClusterApplicationOptions;
-  port: number;
-  baseDir: string;
-  closed: boolean;
-  private _address;
-  /**
-   * @class
-   * @param {Object} options
-   * - {String} baseDir - The directory of the application
-   * - {Object} plugins - Custom you plugins
-   * - {String} framework - The directory of the egg framework
-   * - {Boolean} [cache=true] - Cache application based on baseDir
-   * - {Boolean} [coverage=true] - Switch on process coverage, but it'll be slower
-   * - {Boolean} [clean=true] - Remove $baseDir/logs
-   * - {Object}  [opt] - opt pass to coffee, such as { execArgv: ['--debug'] }
-   * ```
-   */
-  constructor(options: MockClusterApplicationOptions);
-  /**
-   * the process that forked
-   * @member {ChildProcess}
-   */
-  get process(): any;
-  /**
-   * Compatible API for supertest
-   */
-  callback(): this;
-  /**
-   * Compatible API for supertest
-   * @member {String} url
-   * @private
-   */
-  get url(): string;
-  /**
-   * Compatible API for supertest
-   */
-  address(): {
-    port: number;
-    address: string | undefined;
-  };
-  /**
-   * Compatible API for supertest
-   */
-  listen(): this;
-  /**
-   * kill the process
-   */
-  close(): Promise<void>;
-  get isClosed(): boolean;
-  get router(): {
-    pathFor(url: string): any;
-  };
-  /**
-   * get app[property] value in app worker
-   */
-  getAppInstanceProperty(property: string): any;
-  /**
-   * collection logger message, then can be use on `expectLog()`
-   * it's different from `app.expectLog()`, only support string params.
-   *
-   * @param {String} [logger] - logger instance name, default is `logger`
-   * @function ClusterApplication#expectLog
-   */
-  mockLog(logger?: string): void;
-  /**
-   * expect str in the logger
-   * it's different from `app.expectLog()`, only support string params.
-   *
-   * @param {String} str - test str
-   * @param {String} [logger] - logger instance name, default is `logger`
-   * @function ClusterApplication#expectLog
-   */
-  expectLog(str: string, logger?: string): void;
-  /**
-   * not expect str in the logger
-   * it's different from `app.notExpectLog()`, only support string params.
-   *
-   * @param {String} str - test str
-   * @param {String} [logger] - logger instance name, default is `logger`
-   * @function ClusterApplication#notExpectLog
-   */
-  notExpectLog(str: string, logger?: string): void;
-  httpRequest(): EggTestRequest;
-  _callFunctionOnAppWorker(method: string, args?: any[], property?: any, needResult?: boolean): any;
-}
-type MockClusterApplication = ClusterApplication & ApplicationUnittest;
-declare function createCluster(initOptions?: MockClusterOptions): MockClusterApplication;
-declare function restore(): Promise<void>;
-//#endregion
+import "../mock_httpclient-1EgQkMxi.js";
+import "../supertest-BIds28yL.js";
+import "../types-CjZ-JeCo.js";
+import "../application-BPpvw5dg.js";
+import { ClusterApplication, MockClusterApplication, createCluster, restore } from "../cluster-RTfUwmUd.js";
 export { ClusterApplication, MockClusterApplication, createCluster, restore };