@midwayjs/mock 3.0.0 → 3.0.4

package/dist/client/http.d.ts

@@ -1,4 +1,4 @@
 import { IMidwayApplication } from '@midwayjs/core';
 import * as request from 'supertest';
-export declare function createHttpRequest(app: IMidwayApplication): request.SuperTest<request.Test>;
+export declare function createHttpRequest<T extends IMidwayApplication<any>>(app: T): request.SuperTest<request.Test>;
 //# sourceMappingURL=http.d.ts.map

package/dist/creator.d.ts

@@ -1,17 +1,17 @@
 import { IMidwayApplication, IMidwayFramework } from '@midwayjs/core';
 import { ComponentModule, MockAppConfigurationOptions } from './interface';
-export declare function create<T extends IMidwayFramework<any, any, U>, U = T['configurationOptions']>(appDir?: string, options?: MockAppConfigurationOptions, customFramework?: {
+export declare function create<T extends IMidwayFramework<any, any, any, any, any>>(appDir?: string, options?: MockAppConfigurationOptions, customFramework?: {
     new (...args: any[]): T;
 } | ComponentModule): Promise<T>;
-export declare function createApp<T extends IMidwayFramework<any, any, U>, U = T['configurationOptions'], Y = ReturnType<T['getApplication']>>(baseDir?: string, options?: U & MockAppConfigurationOptions, customFramework?: {
+export declare function createApp<T extends IMidwayFramework<any, any, any, any, any>>(baseDir?: string, options?: MockAppConfigurationOptions, customFramework?: {
     new (...args: any[]): T;
-} | ComponentModule): Promise<IMidwayApplication<any, any>>;
-export declare function close(app: IMidwayApplication, options?: {
+} | ComponentModule): Promise<ReturnType<T['getApplication']>>;
+export declare function close<T extends IMidwayApplication<any>>(app: T, options?: {
     cleanLogsDir?: boolean;
     cleanTempDir?: boolean;
     sleep?: number;
 }): Promise<void>;
-export declare function createFunctionApp<T extends IMidwayFramework<any, any, U>, U = T['configurationOptions'], Y = ReturnType<T['getApplication']>>(baseDir?: string, options?: MockAppConfigurationOptions, customFrameworkName?: {
+export declare function createFunctionApp<T extends IMidwayFramework<any, any, any, any, any>, Y = ReturnType<T['getApplication']>>(baseDir?: string, options?: MockAppConfigurationOptions, customFrameworkModule?: {
     new (...args: any[]): T;
 } | ComponentModule): Promise<Y>;
 /**

package/dist/creator.js

@@ -111,18 +111,26 @@ async function close(app, options) {
     }
 }
 exports.close = close;
-async function createFunctionApp(baseDir = process.cwd(), options, customFrameworkName) {
-    const customFramework = customFrameworkName !== null && customFrameworkName !== void 0 ? customFrameworkName : (0, utils_1.findFirstExistModule)([
+async function createFunctionApp(baseDir = process.cwd(), options, customFrameworkModule) {
+    const customFramework = customFrameworkModule !== null && customFrameworkModule !== void 0 ? customFrameworkModule : (0, utils_1.findFirstExistModule)([
         process.env.MIDWAY_SERVERLESS_APP_NAME,
         '@ali/serverless-app',
         '@midwayjs/serverless-app',
     ]);
-    const framework = await createApp(baseDir, {
-        ...options,
-        imports: (0, utils_1.transformFrameworkToConfiguration)(customFramework),
-    }, customFrameworkName);
-    framework.configurationOptions = options;
-    return framework;
+    const serverlessModule = (0, utils_1.transformFrameworkToConfiguration)(customFramework);
+    if (serverlessModule) {
+        if (options && options.imports) {
+            options.imports.unshift(serverlessModule);
+        }
+        else {
+            options = {};
+            options.imports = [serverlessModule];
+        }
+    }
+    const framework = await createApp(baseDir, options);
+    const appCtx = framework.getApplicationContext();
+    const appManager = appCtx.get(core_1.MidwayApplicationManager);
+    return appManager.getApplication(core_1.MidwayFrameworkType.SERVERLESS_APP);
 }
 exports.createFunctionApp = createFunctionApp;
 /**

package/dist/utils.d.ts

@@ -1,7 +1,8 @@
 import { IMidwayFramework } from '@midwayjs/core';
+import { ComponentModule } from './interface';
 export declare function isTestEnvironment(): boolean;
 export declare function isWin32(): boolean;
-export declare function findFirstExistModule(moduleList: any): string;
+export declare function findFirstExistModule(moduleList: any): ComponentModule;
 /**
  * transform a framework component or framework module to configuration class
  * @param Framework

package/dist/utils.js

@@ -27,8 +27,7 @@ function findFirstExistModule(moduleList) {
         if (!name)
             continue;
         try {
-            require.resolve(name);
-            return name;
+            return require(name);
         }
         catch (e) {
             // ignore
@@ -41,6 +40,8 @@ exports.findFirstExistModule = findFirstExistModule;
  * @param Framework
  */
 function transformFrameworkToConfiguration(Framework) {
+    if (!Framework)
+        return null;
     let CustomFramework = Framework;
     if (typeof Framework === 'string') {
         Framework = (0, core_1.safeRequire)(Framework);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/mock",
-  "version": "3.0.0",
+  "version": "3.0.4",
   "description": "create your test app from midway framework",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -26,16 +26,17 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.0.0",
-    "@midwayjs/decorator": "^3.0.0",
-    "@midwayjs/logger": "2.14.0",
-    "@types/amqplib": "*",
-    "amqplib": "*",
+    "@midwayjs/core": "^3.0.4",
+    "@midwayjs/decorator": "^3.0.4",
+    "@midwayjs/logger": "^2.15.0",
+    "@types/amqplib": "0.8.2",
+    "amqplib": "0.8.0",
     "socket.io": "4.4.1",
     "socket.io-client": "4.4.1",
-    "ws": "8.4.0"
+    "ws": "8.5.0"
   },
   "dependencies": {
+    "@types/supertest": "2.0.11",
     "fs-extra": "10.0.0",
     "supertest": "6.2.2"
   },
@@ -44,5 +45,5 @@
     "type": "git",
     "url": "http://github.com/midwayjs/midway.git"
   },
-  "gitHead": "55c26029bccf7bbb739fa1597e8f418dafa2caa0"
+  "gitHead": "c2a37dd026c7bf3e855f4498691f572ef61396e3"
 }