@midwayjs/mock 3.0.0-beta.9 → 3.0.4-beta.1

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,18 +1,23 @@
 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>;
+/**
+ * Create a real project but not ready or a virtual project
+ * @param baseDir
+ * @param options
+ */
 export declare function createLightApp(baseDir?: string, options?: MockAppConfigurationOptions): Promise<IMidwayApplication>;
 //# sourceMappingURL=creator.d.ts.map

package/dist/creator.js

@@ -8,30 +8,35 @@ const decorator_1 = require("@midwayjs/decorator");
 const logger_1 = require("@midwayjs/logger");
 const utils_1 = require("./utils");
 const util_1 = require("util");
+const fs_1 = require("fs");
 const debug = (0, util_1.debuglog)('midway:debug');
 process.setMaxListeners(0);
 async function create(appDir = process.cwd(), options, customFramework) {
     debug(`[mock]: Create app, appDir="${appDir}"`);
     process.env.MIDWAY_TS_MODE = 'true';
-    // 处理测试的 fixtures
-    if (!(0, path_1.isAbsolute)(appDir)) {
-        appDir = (0, path_1.join)(process.cwd(), 'test', 'fixtures', appDir);
+    if (appDir) {
+        // 处理测试的 fixtures
+        if (!(0, path_1.isAbsolute)(appDir)) {
+            appDir = (0, path_1.join)(process.cwd(), 'test', 'fixtures', appDir);
+        }
+        if (!(0, fs_1.existsSync)(appDir)) {
+            throw new core_1.MidwayCommonError(`Path "${appDir}" not exists, please check it.`);
+        }
     }
     (0, logger_1.clearAllLoggers)();
     options = options || {};
     if (options.baseDir) {
         (0, core_1.safeRequire)((0, path_1.join)(`${options.baseDir}`, 'interface'));
     }
-    else {
+    else if (appDir) {
         options.baseDir = `${appDir}/src`;
         (0, core_1.safeRequire)((0, path_1.join)(`${options.baseDir}`, 'interface'));
     }
-    if (!options.configurationModule && customFramework) {
-        options.configurationModule =
-            (0, utils_1.transformFrameworkToConfiguration)(customFramework);
+    if (!options.imports && customFramework) {
+        options.imports = (0, utils_1.transformFrameworkToConfiguration)(customFramework);
     }
     if (customFramework === null || customFramework === void 0 ? void 0 : customFramework['Configuration']) {
-        options.configurationModule = customFramework;
+        options.imports = customFramework;
         customFramework = customFramework['Framework'];
     }
     const container = new core_1.MidwayContainer();
@@ -61,9 +66,11 @@ async function create(appDir = process.cwd(), options, customFramework) {
     await (0, core_1.initializeGlobalApplicationContext)({
         ...options,
         appDir,
-        configurationModule: []
-            .concat(options.configurationModule)
-            .concat((0, core_1.safeRequire)((0, path_1.join)(options.baseDir, 'configuration'))),
+        imports: []
+            .concat(options.imports)
+            .concat(options.baseDir
+            ? (0, core_1.safeRequire)((0, path_1.join)(options.baseDir, 'configuration'))
+            : []),
     });
     if (customFramework) {
         return container.getAsync(customFramework);
@@ -104,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,
-        configurationModule: (0, utils_1.transformFrameworkToConfiguration)(customFramework),
-    });
-    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;
 /**
@@ -134,13 +149,25 @@ class LightFramework extends core_1.BaseFramework {
         return {};
     }
 }
+/**
+ * Create a real project but not ready or a virtual project
+ * @param baseDir
+ * @param options
+ */
 async function createLightApp(baseDir = '', options = {}) {
+    var _a;
     (0, decorator_1.Framework)()(LightFramework);
+    options.globalConfig = Object.assign({
+        midwayLogger: {
+            default: {
+                disableFile: true,
+                disableError: true,
+            },
+        },
+    }, (_a = options.globalConfig) !== null && _a !== void 0 ? _a : {});
     return createApp(baseDir, {
         ...options,
-        configurationModule: [
-            (0, utils_1.transformFrameworkToConfiguration)(LightFramework),
-        ].concat(options === null || options === void 0 ? void 0 : options.configurationModule),
+        imports: [(0, utils_1.transformFrameworkToConfiguration)(LightFramework)].concat(options === null || options === void 0 ? void 0 : options.imports),
     });
 }
 exports.createLightApp = createLightApp;

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,13 +1,13 @@
 {
   "name": "@midwayjs/mock",
-  "version": "3.0.0-beta.9",
+  "version": "3.0.4-beta.1",
   "description": "create your test app from midway framework",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit",
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
     "link": "npm link"
   },
   "keywords": [
@@ -26,23 +26,24 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.0.0-beta.9",
-    "@midwayjs/decorator": "^3.0.0-beta.9",
-    "@midwayjs/logger": "^3.0.0-beta.9",
-    "@types/amqplib": "*",
-    "amqplib": "*",
-    "socket.io": "^4.0.0",
-    "socket.io-client": "^4.0.0",
-    "ws": "^7.4.5"
+    "@midwayjs/core": "^3.0.4-beta.1",
+    "@midwayjs/decorator": "^3.0.4-beta.1",
+    "@midwayjs/logger": "^2.14.0",
+    "@types/amqplib": "0.8.2",
+    "amqplib": "0.8.0",
+    "socket.io": "4.4.1",
+    "socket.io-client": "4.4.1",
+    "ws": "8.4.2"
   },
   "dependencies": {
-    "fs-extra": "^8.0.1",
-    "supertest": "^6.0.0"
+    "@types/supertest": "2.0.11",
+    "fs-extra": "10.0.0",
+    "supertest": "6.2.2"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
     "type": "git",
     "url": "http://github.com/midwayjs/midway.git"
   },
-  "gitHead": "d23e4a4fee58097b98461625c428a37d55535cec"
+  "gitHead": "52bc37e7a570806c121b33a0e8ac1cd084445f5d"
 }