@eggjs/mock 7.0.0-beta.34 → 7.0.0-beta.36

package/dist/lib/app_handler.js

@@ -1,69 +1,56 @@
-import { debuglog } from 'node:util';
-import { createApp as createParallelApp } from "./parallel/app.js";
-import { setupAgent } from "./agent_handler.js";
+import { getEggOptions } from "./utils.js";
+import "../app/extend/application.js";
 import { createApp } from "./app.js";
+import { setupAgent } from "./agent_handler.js";
+import { createApp as createApp$1 } from "./parallel/app.js";
 import { restore } from "./restore.js";
-import { getEggOptions } from "./utils.js";
-import ApplicationUnittest from "../app/extend/application.js";
-const debug = debuglog('egg/mock/lib/app_handler');
+import { debuglog } from "node:util";
+
+//#region src/lib/app_handler.ts
+const debug = debuglog("egg/mock/lib/app_handler");
 globalThis.__eggMockAppInstance = null;
-export 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) {
-        // setup agent first
-        app = createParallelApp({
-            ...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(options);
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        if (typeof beforeAll === 'function') {
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            // jest
-            beforeAll(() => app.ready());
-        }
-        // @ts-ignore mocha tsd
-        if (typeof afterEach === 'function') {
-            // mocha and jest
-            // @ts-ignore mocha tsd
-            afterEach(() => app.backgroundTasksFinished());
-            // @ts-ignore mocha tsd
-            afterEach(restore);
-        }
-    }
-    globalThis.__eggMockAppInstance = app;
-    return app;
+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$1({
+			...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(options);
+		if (typeof beforeAll === "function") beforeAll(() => app.ready());
+		if (typeof afterEach === "function") {
+			afterEach(() => app.backgroundTasksFinished());
+			afterEach(restore);
+		}
+	}
+	globalThis.__eggMockAppInstance = app;
+	return app;
 }
 let getAppCallback;
-export function setGetAppCallback(cb) {
-    getAppCallback = cb;
+function setGetAppCallback(cb) {
+	getAppCallback = cb;
 }
-export async function getApp(suite, test) {
-    if (getAppCallback) {
-        return getAppCallback(suite, test);
-    }
-    const app = globalThis.__eggMockAppInstance;
-    if (app) {
-        await app.ready();
-    }
-    return app;
+async function getApp(suite, test) {
+	if (getAppCallback) return getAppCallback(suite, test);
+	const app = globalThis.__eggMockAppInstance;
+	if (app) await app.ready();
+	return app;
 }
-export function getBootstrapApp() {
-    return globalThis.__eggMockAppInstance;
+function getBootstrapApp() {
+	return globalThis.__eggMockAppInstance;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwX2hhbmRsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2FwcF9oYW5kbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFFckMsT0FBTyxFQUFFLFNBQVMsSUFBSSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ25FLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQ3JDLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDdkMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUMzQyxPQUFPLG1CQUFtQixNQUFNLDhCQUE4QixDQUFDO0FBRS9ELE1BQU0sS0FBSyxHQUFHLFFBQVEsQ0FBQywwQkFBMEIsQ0FBQyxDQUFDO0FBTW5ELFVBQVUsQ0FBQyxvQkFBb0IsR0FBRyxJQUFJLENBQUM7QUFFdkMsTUFBTSxVQUFVLFFBQVE7SUFDdEIsSUFBSSxHQUFHLEdBQUcsVUFBVSxDQUFDLG9CQUFxQixDQUFDO0lBQzNDLElBQUksR0FBRyxFQUFFLENBQUM7UUFDUixLQUFLLENBQUMsbUJBQW1CLENBQUMsQ0FBQztRQUMzQixPQUFPLEdBQUcsQ0FBQztJQUNiLENBQUM7SUFFRCxNQUFNLE9BQU8sR0FBRyxhQUFhLEVBQUUsQ0FBQztJQUNoQyxLQUFLLENBQ0gsMkRBQTJELEVBQzNELE9BQU8sQ0FBQyxHQUFHLENBQUMscUJBQXFCLEVBQ2pDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUN2QixDQUFDO0lBQ0YsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLHFCQUFxQixJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDaEUsb0JBQW9CO1FBQ3BCLEdBQUcsR0FBRyxpQkFBaUIsQ0FBQztZQUN0QixHQUFHLE9BQU87WUFDVixVQUFVLEVBQUUsS0FBSyxFQUFFLFdBQVcsRUFBRSxFQUFFO2dCQUNoQyxNQUFNLEtBQUssR0FBRyxNQUFNLFVBQVUsRUFBRSxDQUFDO2dCQUNqQyxXQUFXLENBQUMsT0FBTyxDQUFDLFdBQVcsR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQztnQkFDNUQsS0FBSyxDQUFDLGdEQUFnRCxFQUFFLFdBQVcsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUM7WUFDM0YsQ0FBQztTQUNGLENBQUMsQ0FBQztRQUNILEtBQUssQ0FBQyx5QkFBeUIsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDMUMsQ0FBQztTQUFNLENBQUM7UUFDTixHQUFHLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBbUMsQ0FBQztRQUMzRCw2REFBNkQ7UUFDN0QsYUFBYTtRQUNiLElBQUksT0FBTyxTQUFTLEtBQUssVUFBVSxFQUFFLENBQUM7WUFDcEMsNkRBQTZEO1lBQzdELGFBQWE7WUFDYixPQUFPO1lBQ1AsU0FBUyxDQUFDLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDO1FBQy9CLENBQUM7UUFDRCx1QkFBdUI7UUFDdkIsSUFBSSxPQUFPLFNBQVMsS0FBSyxVQUFVLEVBQUUsQ0FBQztZQUNwQyxpQkFBaUI7WUFDakIsdUJBQXVCO1lBQ3ZCLFNBQVMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxHQUFHLENBQUMsdUJBQXVCLEVBQUUsQ0FBQyxDQUFDO1lBQy9DLHVCQUF1QjtZQUN2QixTQUFTLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDckIsQ0FBQztJQUNILENBQUM7SUFDRCxVQUFVLENBQUMsb0JBQW9CLEdBQUcsR0FBRyxDQUFDO0lBQ3RDLE9BQU8sR0FBRyxDQUFDO0FBQ2IsQ0FBQztBQUVELElBQUksY0FBdUQsQ0FBQztBQUU1RCxNQUFNLFVBQVUsaUJBQWlCLENBQUMsRUFBMkM7SUFDM0UsY0FBYyxHQUFHLEVBQUUsQ0FBQztBQUN0QixDQUFDO0FBRUQsTUFBTSxDQUFDLEtBQUssVUFBVSxNQUFNLENBQUMsS0FBZSxFQUFFLElBQWM7SUFDMUQsSUFBSSxjQUFjLEVBQUUsQ0FBQztRQUNuQixPQUFPLGNBQWMsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDckMsQ0FBQztJQUNELE1BQU0sR0FBRyxHQUFHLFVBQVUsQ0FBQyxvQkFBcUIsQ0FBQztJQUM3QyxJQUFJLEdBQUcsRUFBRSxDQUFDO1FBQ1IsTUFBTSxHQUFHLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDcEIsQ0FBQztJQUNELE9BQU8sR0FBRyxDQUFDO0FBQ2IsQ0FBQztBQUVELE1BQU0sVUFBVSxlQUFlO0lBQzdCLE9BQU8sVUFBVSxDQUFDLG9CQUFxQixDQUFDO0FBQzFDLENBQUMifQ==
+
+//#endregion
+export { getApp, getBootstrapApp, setGetAppCallback, setupApp };

package/dist/lib/cluster.d.ts

@@ -1,123 +1,127 @@
-import childProcess from 'node:child_process';
-import { Coffee } from 'coffee';
-import { request as supertestRequest } from './supertest.ts';
-import type { MockClusterOptions, MockClusterApplicationOptions } from './types.ts';
-import type ApplicationUnittest from '../app/extend/application.ts';
+import { request } from "./supertest.js";
+import { MockClusterApplicationOptions, MockClusterOptions } from "./types.js";
+import ApplicationUnittest from "../app/extend/application.js";
+import childProcess from "node:child_process";
+import { Coffee } from "coffee";
+
+//#region src/lib/cluster.d.ts
 declare global {
-    var eggMockMasterPort: number;
+  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);
- *   });
- * });
- */
-export declare class ClusterApplication extends Coffee {
-    [key: string | symbol]: any;
-    options: MockClusterApplicationOptions;
+* 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(): childProcess.ChildProcess;
+  /**
+  * Compatible API for supertest
+  */
+  callback(): this;
+  /**
+  * Compatible API for supertest
+  * @member {String} url
+  * @private
+  */
+  get url(): string;
+  /**
+  * Compatible API for supertest
+  */
+  address(): {
     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(): childProcess.ChildProcess;
-    /**
-     * 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(): ReturnType<typeof supertestRequest>;
-    _callFunctionOnAppWorker(method: string, args?: any[], property?: any, needResult?: boolean): any;
+    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(): ReturnType<typeof request>;
+  _callFunctionOnAppWorker(method: string, args?: any[], property?: any, needResult?: boolean): any;
 }
-export type MockClusterApplication = ClusterApplication & ApplicationUnittest;
-export declare function createCluster(initOptions?: MockClusterOptions): MockClusterApplication;
-export declare function restore(): Promise<void>;
+type MockClusterApplication = ClusterApplication & ApplicationUnittest;
+declare function createCluster(initOptions?: MockClusterOptions): MockClusterApplication;
+declare function restore(): Promise<void>;
+//#endregion
+export { ClusterApplication, MockClusterApplication, createCluster, restore };