@midwayjs/mock 3.11.11 → 3.11.15

package/dist/creator.d.ts

@@ -1,6 +1,6 @@
 import { IMidwayApplication, IMidwayFramework } from '@midwayjs/core';
-import { ComponentModule, MockAppConfigurationOptions, IBootstrapAppStarter } from './interface';
-export declare function create<T extends IMidwayFramework<any, any, any, any, any>>(appDir?: string, options?: MockAppConfigurationOptions, customFramework?: {
+import { ComponentModule, MockAppConfigurationOptions, IBootstrapAppStarter, MockBootstrapOptions } from './interface';
+export declare function create<T extends IMidwayFramework<any, any, any, any, any>>(appDir: string | MockAppConfigurationOptions, options?: MockAppConfigurationOptions, customFramework?: {
     new (...args: any[]): T;
 } | ComponentModule): Promise<T>;
 export declare function createApp<T extends IMidwayFramework<any, any, any, any, any>>(baseDir?: string, options?: MockAppConfigurationOptions, customFramework?: {
@@ -22,5 +22,5 @@ export declare function createFunctionApp<T extends IMidwayFramework<any, any, a
  * @param options
  */
 export declare function createLightApp(baseDir?: string, options?: MockAppConfigurationOptions): Promise<IMidwayApplication>;
-export declare function createBootstrap(entryFile: string, options?: MockAppConfigurationOptions): Promise<IBootstrapAppStarter>;
+export declare function createBootstrap(entryFile: string, options?: MockBootstrapOptions): Promise<IBootstrapAppStarter>;
 //# sourceMappingURL=creator.d.ts.map

package/dist/creator.js

@@ -20,9 +20,13 @@ function formatPath(baseDir, p) {
         return (0, path_1.resolve)(baseDir, p);
     }
 }
-async function create(appDir = process.cwd(), options, customFramework) {
+async function create(appDir, options = {}, customFramework) {
     debug(`[mock]: Create app, appDir="${appDir}"`);
     process.env.MIDWAY_TS_MODE = 'true';
+    if (typeof appDir === 'object') {
+        options = appDir;
+        appDir = options.appDir || '';
+    }
     try {
         if (appDir) {
             // 处理测试的 fixtures
@@ -33,6 +37,9 @@ async function create(appDir = process.cwd(), options, customFramework) {
                 throw new core_1.MidwayCommonError(`Path "${appDir}" not exists, please check it.`);
             }
         }
+        else {
+            appDir = process.cwd();
+        }
         (0, logger_1.clearAllLoggers)();
         options = options || {};
         if (options.baseDir) {
@@ -192,7 +199,7 @@ async function createFunctionApp(baseDir, options = {}, customFrameworkModule) {
     }
     // v3 新的处理 bootstrap 过来的 faas 入口
     if (options.entryFile) {
-        const exportModules = require((0, path_1.join)(baseDir, options.entryFile));
+        const exportModules = require(formatPath(baseDir, options.entryFile));
         options.starter = exportModules.getStarter();
     }
     let starterName;
@@ -436,7 +443,10 @@ async function createLightApp(baseDir = '', options = {}) {
 }
 exports.createLightApp = createLightApp;
 async function createBootstrap(entryFile, options = {}) {
-    if ((0, core_1.safeRequire)('@midwayjs/faas')) {
+    if (!options.bootstrapMode) {
+        options.bootstrapMode = (0, core_1.safeRequire)('@midwayjs/faas') ? 'faas' : 'app';
+    }
+    if (options.bootstrapMode === 'faas') {
         options.entryFile = entryFile;
         const app = await createFunctionApp(process.cwd(), options);
         return {

package/dist/interface.d.ts

@@ -3,7 +3,10 @@ export interface MockAppConfigurationOptions extends IMidwayBootstrapOptions {
     cleanLogsDir?: boolean;
     cleanTempDir?: boolean;
     ssl?: boolean;
+}
+export interface MockBootstrapOptions extends MockAppConfigurationOptions {
     entryFile?: string;
+    bootstrapMode?: 'faas' | 'app';
 }
 export type ComponentModule = {
     Configuration: new () => any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/mock",
-  "version": "3.11.11",
+  "version": "3.11.15",
   "description": "create your test app from midway framework",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -27,17 +27,17 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.11.11",
+    "@midwayjs/core": "^3.11.15",
     "@midwayjs/logger": "^2.15.0",
     "@types/amqplib": "0.10.1",
     "amqplib": "0.10.3",
     "kafkajs": "2.2.4",
-    "socket.io": "4.6.2",
-    "socket.io-client": "4.6.2",
+    "socket.io": "4.7.1",
+    "socket.io-client": "4.7.1",
     "ws": "8.13.0"
   },
   "dependencies": {
-    "@midwayjs/async-hooks-context-manager": "^3.11.11",
+    "@midwayjs/async-hooks-context-manager": "^3.11.15",
     "@types/superagent": "4.1.14",
     "@types/supertest": "2.0.12",
     "js-yaml": "4.1.0",
@@ -49,5 +49,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "3d2e85a212cfecb5cecb8ab45134fa361fe6cba2"
+  "gitHead": "a4054247f3b9f4fc8ba51684c002606d849e0bd3"
 }