@eggjs/mock 6.0.7 → 6.1.0-beta.3

package/{src/lib/types.ts → dist/lib/types.d.ts}

@@ -1,55 +1,49 @@
-export interface MockOptions {
+import { MockHttpClientMethod, MockResponseCallbackOptions, MockResultFunction, MockResultOptions, ResultObject } from "./mock_httpclient.js";
+import { MockAgent } from "urllib";
+
+//#region src/lib/types.d.ts
+interface MockOptions {
   /**
    * The directory of the application
    */
   baseDir?: string;
-
   /**
    * Custom you plugins
    */
   plugins?: any;
-
   /**
    * The directory of the egg framework
    *
    * Set to `true` to use the current directory as framework directory
    */
   framework?: string | boolean;
-
   /**
    * current test on plugin
    */
   plugin?: boolean;
-
   /**
-   * @deprecated please use framework instead
+   * @deprecated please use `framework` instead
    */
   customEgg?: string | boolean;
-
   /**
    * Cache application based on baseDir
    */
   cache?: boolean;
-
   /**
    * Switch on process coverage, but it'll be slower
    */
   coverage?: boolean;
-
   /**
    * Remove $baseDir/logs and $baseDir/run before start, default is `true`
    */
   clean?: boolean;
-
   /**
    * default options.mockCtxStorage value on each mockContext
    */
   mockCtxStorage?: boolean;
-
   beforeInit?: (app: any) => Promise<void>;
 }
-
-export interface MockClusterOptions extends MockOptions {
+interface MockClusterOptions extends MockOptions {
   workers?: number | string;
   cache?: boolean;
   port?: number;
@@ -59,31 +53,20 @@ export interface MockClusterOptions extends MockOptions {
   opt?: object;
   startMode?: 'process' | 'worker_threads';
 }
-
 /**
  * @deprecated please use MockOptions instead
  * keep this for compatible
  */
-export type MockOption = MockOptions;
-
-export interface MockApplicationOptions extends MockOptions {
+type MockOption = MockOptions;
+interface MockApplicationOptions extends MockOptions {
   baseDir: string;
   framework: string;
   clusterPort?: number;
 }
-
-export interface MockClusterApplicationOptions extends MockClusterOptions {
+interface MockClusterApplicationOptions extends MockClusterOptions {
   baseDir: string;
   framework: string;
   port: number;
 }
-
-export type {
-  MockResultOptions, ResultObject,
-  MockResponseCallbackOptions, MockResultFunction,
-  MockHttpClientMethod,
-} from './mock_httpclient.js';
-
-export type {
-  MockAgent,
-} from 'urllib';
+//#endregion
+export { type MockAgent, MockApplicationOptions, MockClusterApplicationOptions, MockClusterOptions, type MockHttpClientMethod, MockOption, MockOptions, type MockResponseCallbackOptions, type MockResultFunction, type MockResultOptions, type ResultObject };

package/dist/lib/types.js

@@ -0,0 +1 @@
+export {  };

package/dist/lib/utils.d.ts

@@ -0,0 +1,12 @@
+//#region src/lib/utils.d.ts
+declare function getSourceDirname(): string;
+declare function sleep(delay: number): Promise<void>;
+declare function rimraf(filepath: string): Promise<void>;
+declare function rimrafSync(filepath: string): void;
+declare function getProperty(target: any, prop: PropertyKey): any;
+declare function getEggOptions(): {
+  baseDir: string;
+  framework: string | undefined;
+};
+//#endregion
+export { getEggOptions, getProperty, getSourceDirname, rimraf, rimrafSync, sleep };

package/dist/lib/utils.js

@@ -0,0 +1,40 @@
+import path from "node:path";
+import { rmSync } from "node:fs";
+import { rm } from "node:fs/promises";
+import { fileURLToPath } from "node:url";
+import { scheduler } from "node:timers/promises";
+
+//#region src/lib/utils.ts
+function getSourceDirname() {
+	if (typeof __dirname !== "undefined") return path.dirname(__dirname);
+	return path.dirname(path.dirname(fileURLToPath(import.meta.url)));
+}
+async function sleep(delay) {
+	await scheduler.wait(delay);
+}
+async function rimraf(filepath) {
+	await rm(filepath, {
+		force: true,
+		recursive: true
+	});
+}
+function rimrafSync(filepath) {
+	rmSync(filepath, {
+		force: true,
+		recursive: true
+	});
+}
+function getProperty(target, prop) {
+	const member = target[prop];
+	if (typeof member === "function") return member.bind(target);
+	return member;
+}
+function getEggOptions() {
+	return {
+		baseDir: process.env.EGG_BASE_DIR ?? process.cwd(),
+		framework: process.env.EGG_FRAMEWORK
+	};
+}
+
+//#endregion
+export { getEggOptions, getProperty, getSourceDirname, rimraf, rimrafSync, sleep };

package/dist/register.d.ts

@@ -0,0 +1,12 @@
+import "mocha";
+
+//#region src/register.d.ts
+declare function mochaGlobalSetup(): Promise<void>;
+declare function mochaGlobalTeardown(): Promise<void>;
+declare const mochaHooks: {
+  beforeAll(): Promise<void>;
+  afterEach(): Promise<void>;
+  afterAll(): Promise<void>;
+};
+//#endregion
+export { mochaGlobalSetup, mochaGlobalTeardown, mochaHooks };

package/dist/register.js

@@ -0,0 +1,65 @@
+import { __require } from "./_virtual/rolldown_runtime.js";
+import { closeAgent, setupAgent } from "./lib/agent_handler.js";
+import { getApp } from "./lib/app_handler.js";
+import { mm as proxyMock } from "./index.js";
+import { injectContext } from "./lib/inject_context.js";
+import { createRequire } from "node:module";
+import { debuglog } from "node:util";
+import "mocha";
+
+//#region src/register.ts
+const debug = debuglog("egg/mock/register");
+async function mochaGlobalSetup() {
+	debug("mochaGlobalSetup, agent.setupAgent() start");
+	await setupAgent();
+	debug("mochaGlobalSetup, agent.setupAgent() end");
+}
+async function mochaGlobalTeardown() {
+	debug("mochaGlobalTeardown, agent.closeAgent() start");
+	await closeAgent();
+	debug("mochaGlobalTeardown, agent.closeAgent() end");
+}
+const mochaHooks = {
+	async beforeAll() {
+		const app = await getApp();
+		debug("mochaHooks.beforeAll call, _app: %s", app);
+		if (app) await app.ready();
+	},
+	async afterEach() {
+		const app = await getApp();
+		debug("mochaHooks.afterEach call, _app: %s", app);
+		if (app) await app.backgroundTasksFinished();
+		await proxyMock.restore();
+	},
+	async afterAll() {
+		if (process.env.ENABLE_MOCHA_PARALLEL) return;
+		const app = await getApp();
+		debug("mochaHooks.afterAll call, _app: %s", app);
+		if (app) await app.close();
+	}
+};
+/**
+* Find active node mocha instances.
+*/
+function findNodeJSMocha() {
+	let children;
+	if (typeof __require === "function") children = __require.cache || {};
+	else {
+		children = createRequire(process.cwd()).cache || {};
+		debug("createRequire on esm");
+	}
+	return Object.keys(children).filter(function(child) {
+		const val = children[child].exports;
+		return typeof val === "function" && val.name === "Mocha";
+	}).map(function(child) {
+		return children[child].exports;
+	});
+}
+const modules = findNodeJSMocha();
+for (const module of modules) {
+	if (!module) continue;
+	injectContext(module);
+}
+
+//#endregion
+export { mochaGlobalSetup, mochaGlobalTeardown, mochaHooks };

package/dist/typings/index.d.ts

@@ -0,0 +1 @@
+export { };

package/package.json

@@ -1,21 +1,56 @@
 {
   "name": "@eggjs/mock",
-  "version": "6.0.7",
+  "version": "6.1.0-beta.3",
   "publishConfig": {
     "access": "public"
   },
   "eggPlugin": {
-    "name": "egg-mock",
-    "exports": {
-      "import": "./dist/esm",
-      "require": "./dist/commonjs"
-    }
+    "name": "egg-mock"
   },
+  "type": "module",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": "./dist/index.js",
+    "./app": "./dist/app.js",
+    "./app/extend/agent": "./dist/app/extend/agent.js",
+    "./app/extend/application": "./dist/app/extend/application.js",
+    "./app/middleware/cluster_app_mock": "./dist/app/middleware/cluster_app_mock.js",
+    "./bootstrap": "./dist/bootstrap.js",
+    "./lib/agent_handler": "./dist/lib/agent_handler.js",
+    "./lib/app": "./dist/lib/app.js",
+    "./lib/app_handler": "./dist/lib/app_handler.js",
+    "./lib/cluster": "./dist/lib/cluster.js",
+    "./lib/context": "./dist/lib/context.js",
+    "./lib/format_options": "./dist/lib/format_options.js",
+    "./lib/inject_context": "./dist/lib/inject_context.js",
+    "./lib/mock_agent": "./dist/lib/mock_agent.js",
+    "./lib/mock_custom_loader": "./dist/lib/mock_custom_loader.js",
+    "./lib/mock_http_server": "./dist/lib/mock_http_server.js",
+    "./lib/mock_httpclient": "./dist/lib/mock_httpclient.js",
+    "./lib/parallel/agent": "./dist/lib/parallel/agent.js",
+    "./lib/parallel/app": "./dist/lib/parallel/app.js",
+    "./lib/parallel/util": "./dist/lib/parallel/util.js",
+    "./lib/prerequire": "./dist/lib/prerequire.js",
+    "./lib/request_call_function": "./dist/lib/request_call_function.js",
+    "./lib/restore": "./dist/lib/restore.js",
+    "./lib/start-cluster": "./dist/lib/start-cluster.js",
+    "./lib/supertest": "./dist/lib/supertest.js",
+    "./lib/tmp/empty": "./dist/lib/tmp/empty.js",
+    "./lib/types": "./dist/lib/types.js",
+    "./lib/utils": "./dist/lib/utils.js",
+    "./register": "./dist/register.js",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "dist"
+  ],
   "description": "mock server plugin for egg",
-  "homepage": "https://github.com/eggjs/mock",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/eggjs/mock.git"
+    "url": "git://github.com/eggjs/egg.git",
+    "directory": "packages/mock"
   },
   "bugs": {
     "url": "https://github.com/eggjs/egg/issues"
@@ -26,111 +61,44 @@
   ],
   "author": "popomore <sakura9515@gmail.com>",
   "engines": {
-    "node": ">= 18.19.0"
+    "node": ">= 20.19.0"
   },
   "dependencies": {
-    "@eggjs/core": "^6.2.11",
-    "@eggjs/supertest": "^8.1.0",
-    "@eggjs/utils": "^4.0.3",
-    "coffee": "^5.2.1",
+    "@eggjs/supertest": "",
+    "coffee": "5",
     "detect-port": "^2.1.0",
     "egg-logger": "^3.5.0",
-    "extend2": "^4.0.0",
-    "get-ready": "^3.4.0",
-    "globby": "^11.1.0",
+    "get-ready": "^3.1.0",
+    "globby": "^11.0.2",
     "is-type-of": "^2.2.0",
     "merge-descriptors": "^2.0.0",
-    "mm": "^4.0.1",
-    "sdk-base": "^5.0.0",
+    "mm": "^4.0.2",
+    "sdk-base": "^5.0.1",
     "urllib": "^4.6.11",
-    "utility": "^2.3.0"
-  },
-  "peerDependencies": {
-    "mocha": "^10 || ^11"
+    "utility": "^2.5.0",
+    "@eggjs/core": "6.6.0-beta.3",
+    "@eggjs/utils": "4.5.0-beta.3",
+    "@eggjs/extend2": "4.1.0-beta.3"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "^0.17.1",
-    "@eggjs/bin": "^7.0.0",
     "@eggjs/tegg": "^3.2.2",
     "@eggjs/tegg-config": "^3.2.2",
     "@eggjs/tegg-controller-plugin": "^3.2.2",
     "@eggjs/tegg-plugin": "^3.2.2",
-    "@eggjs/tsconfig": "1",
     "@types/methods": "^1.1.4",
-    "@types/mocha": "10",
-    "@types/node": "22",
-    "egg": "^4.0.8",
-    "egg-errors": "^2.2.1",
-    "egg-tracer": "^2.0.0",
-    "eslint": "8",
-    "eslint-config-egg": "14",
-    "mocha": "^11.0.1",
-    "pedding": "^2.0.0",
-    "rimraf": "6",
-    "tsd": "^0.31.2",
-    "tshy": "3",
-    "tshy-after": "^1.3.1",
-    "typescript": "5"
+    "@types/node": "24",
+    "egg-errors": "^2.3.2",
+    "egg-tracer": "^2.1.0",
+    "pedding": "^2.0.1",
+    "tsd": "^0.33.0",
+    "tsdown": "^0.15.0",
+    "typescript": "5",
+    "egg": "4.1.0-beta.3",
+    "@eggjs/tsconfig": "3.1.0-beta.3"
   },
   "scripts": {
-    "clean": "rimraf dist",
-    "lint": "eslint --cache src test --ext .ts",
-    "pretest": "npm run clean && npm run lint -- --fix && npm run prepublishOnly",
-    "test": "egg-bin test",
-    "posttest": "npm run clean",
-    "test-local": "egg-bin test",
-    "preci": "npm run clean && npm run lint && npm run prepublishOnly",
-    "ci": "egg-bin test",
-    "postci": "npm run clean",
-    "prepublishOnly": "tshy && tshy-after && attw --pack --profile node16"
-  },
-  "type": "module",
-  "tshy": {
-    "exports": {
-      ".": "./src/index.ts",
-      "./bootstrap": "./src/bootstrap.ts",
-      "./register": "./src/register.ts",
-      "./package.json": "./package.json"
-    }
-  },
-  "exports": {
-    ".": {
-      "import": {
-        "types": "./dist/esm/index.d.ts",
-        "default": "./dist/esm/index.js"
-      },
-      "require": {
-        "types": "./dist/commonjs/index.d.ts",
-        "default": "./dist/commonjs/index.js"
-      }
-    },
-    "./bootstrap": {
-      "import": {
-        "types": "./dist/esm/bootstrap.d.ts",
-        "default": "./dist/esm/bootstrap.js"
-      },
-      "require": {
-        "types": "./dist/commonjs/bootstrap.d.ts",
-        "default": "./dist/commonjs/bootstrap.js"
-      }
-    },
-    "./register": {
-      "import": {
-        "types": "./dist/esm/register.d.ts",
-        "default": "./dist/esm/register.js"
-      },
-      "require": {
-        "types": "./dist/commonjs/register.d.ts",
-        "default": "./dist/commonjs/register.js"
-      }
-    },
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "dist",
-    "src"
-  ],
-  "types": "./dist/commonjs/index.d.ts",
-  "main": "./dist/commonjs/index.js",
-  "module": "./dist/esm/index.js"
-}
+    "build": "tsdown",
+    "lint": "oxlint",
+    "test": "vitest run"
+  }
+}

package/dist/commonjs/app/extend/agent.d.ts

@@ -1,34 +0,0 @@
-import { mock, restore } from 'mm';
-import { EggCore } from '@eggjs/core';
-import { MockResultFunction, MockResultOptions, MockHttpClientMethod } from '../../lib/mock_httpclient.js';
-export default abstract class AgentUnittest extends EggCore {
-    [key: string]: any;
-    _mockHttpClient: MockHttpClientMethod;
-    /**
-     * mock httpclient
-     * @alias mockHttpClient
-     * @function App#mockHttpclient
-     */
-    mockHttpclient(mockUrl: string | RegExp, mockMethod: string | string[] | MockResultOptions | MockResultFunction, mockResult?: MockResultOptions | MockResultFunction | string): void;
-    /**
-     * mock httpclient
-     * @function App#mockHttpClient
-     */
-    mockHttpClient(mockUrl: string | RegExp, mockMethod: string | string[] | MockResultOptions | MockResultFunction, mockResult?: MockResultOptions | MockResultFunction | string): void;
-    /**
-     * get mock httpclient agent
-     * @function Agent#mockHttpclientAgent
-     */
-    mockAgent(): import("urllib").MockAgent<import("urllib").MockAgent.Options>;
-    mockAgentRestore(): Promise<void>;
-    /**
-     * @see mm#restore
-     * @function Agent#mockRestore
-     */
-    mockRestore: typeof restore;
-    /**
-     * @see mm
-     * @function Agent#mm
-     */
-    mm: typeof mock;
-}

package/dist/commonjs/app/extend/agent.js

@@ -1,49 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const mm_1 = require("mm");
-const core_1 = require("@eggjs/core");
-const mock_httpclient_js_1 = require("../../lib/mock_httpclient.js");
-const mock_agent_js_1 = require("../../lib/mock_agent.js");
-class AgentUnittest extends core_1.EggCore {
-    _mockHttpClient;
-    /**
-     * mock httpclient
-     * @alias mockHttpClient
-     * @function App#mockHttpclient
-     */
-    mockHttpclient(mockUrl, mockMethod, mockResult) {
-        return this.mockHttpClient(mockUrl, mockMethod, mockResult);
-    }
-    /**
-     * mock httpclient
-     * @function App#mockHttpClient
-     */
-    mockHttpClient(mockUrl, mockMethod, mockResult) {
-        if (!this._mockHttpClient) {
-            this._mockHttpClient = (0, mock_httpclient_js_1.createMockHttpClient)(this);
-        }
-        return this._mockHttpClient(mockUrl, mockMethod, mockResult);
-    }
-    /**
-     * get mock httpclient agent
-     * @function Agent#mockHttpclientAgent
-     */
-    mockAgent() {
-        return (0, mock_agent_js_1.getMockAgent)(this);
-    }
-    async mockAgentRestore() {
-        await (0, mock_agent_js_1.restoreMockAgent)();
-    }
-    /**
-     * @see mm#restore
-     * @function Agent#mockRestore
-     */
-    mockRestore = mm_1.restore;
-    /**
-     * @see mm
-     * @function Agent#mm
-     */
-    mm = mm_1.mock;
-}
-exports.default = AgentUnittest;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWdlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYXBwL2V4dGVuZC9hZ2VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDJCQUFtQztBQUNuQyxzQ0FBc0M7QUFDdEMscUVBSXNDO0FBQ3RDLDJEQUF5RTtBQUV6RSxNQUE4QixhQUFjLFNBQVEsY0FBTztJQUV6RCxlQUFlLENBQXVCO0lBRXRDOzs7O09BSUc7SUFDSCxjQUFjLENBQUMsT0FBd0IsRUFBRSxVQUFzRSxFQUFFLFVBQTREO1FBQzNLLE9BQU8sSUFBSSxDQUFDLGNBQWMsQ0FBQyxPQUFPLEVBQUUsVUFBVSxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBQzlELENBQUM7SUFFRDs7O09BR0c7SUFDSCxjQUFjLENBQUMsT0FBd0IsRUFBRSxVQUFzRSxFQUFFLFVBQTREO1FBQzNLLElBQUksQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7WUFDMUIsSUFBSSxDQUFDLGVBQWUsR0FBRyxJQUFBLHlDQUFvQixFQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3BELENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQyxlQUFlLENBQUMsT0FBTyxFQUFFLFVBQVUsRUFBRSxVQUFVLENBQUMsQ0FBQztJQUMvRCxDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsU0FBUztRQUNQLE9BQU8sSUFBQSw0QkFBWSxFQUFDLElBQVcsQ0FBQyxDQUFDO0lBQ25DLENBQUM7SUFFRCxLQUFLLENBQUMsZ0JBQWdCO1FBQ3BCLE1BQU0sSUFBQSxnQ0FBZ0IsR0FBRSxDQUFDO0lBQzNCLENBQUM7SUFFRDs7O09BR0c7SUFDSCxXQUFXLEdBQUcsWUFBTyxDQUFDO0lBRXRCOzs7T0FHRztJQUNILEVBQUUsR0FBRyxTQUFJLENBQUM7Q0FDWDtBQS9DRCxnQ0ErQ0MifQ==