@midwayjs/mock 3.11.6 → 3.11.10

package/dist/creator.d.ts

@@ -1,12 +1,14 @@
-import { IMidwayApplication, IMidwayFramework, MidwayFrameworkType } from '@midwayjs/core';
-import { ComponentModule, MockAppConfigurationOptions } from './interface';
+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?: {
     new (...args: any[]): T;
 } | ComponentModule): Promise<T>;
 export declare function createApp<T extends IMidwayFramework<any, any, any, any, any>>(baseDir?: string, options?: MockAppConfigurationOptions, customFramework?: {
     new (...args: any[]): T;
 } | ComponentModule): Promise<ReturnType<T['getApplication']>>;
-export declare function close<T extends IMidwayApplication<any>>(app: T, options?: {
+export declare function close(app: IMidwayApplication<any> | {
+    close: (...args: any[]) => void;
+}, options?: {
     cleanLogsDir?: boolean;
     cleanTempDir?: boolean;
     sleep?: number;
@@ -14,18 +16,11 @@ export declare function close<T extends IMidwayApplication<any>>(app: T, options
 export declare function createFunctionApp<T extends IMidwayFramework<any, any, any, any, any>, Y = ReturnType<T['getApplication']>>(baseDir?: string | MockAppConfigurationOptions, options?: MockAppConfigurationOptions, customFrameworkModule?: {
     new (...args: any[]): T;
 } | ComponentModule): Promise<Y>;
-declare class BootstrapAppStarter {
-    getApp(type: MidwayFrameworkType | string): IMidwayApplication<any>;
-    close(options?: {
-        sleep?: number;
-    }): Promise<void>;
-}
 /**
  * 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>;
-export declare function createBootstrap(entryFile: string): Promise<BootstrapAppStarter>;
-export {};
+export declare function createBootstrap(entryFile: string, options?: MockAppConfigurationOptions): Promise<IBootstrapAppStarter>;
 //# sourceMappingURL=creator.d.ts.map

package/dist/creator.js

@@ -155,24 +155,31 @@ exports.createApp = createApp;
 async function close(app, options) {
     if (!app)
         return;
-    debug(`[mock]: Closing app, appDir=${app.getAppDir()}`);
-    options = options || {};
-    await (0, core_1.destroyGlobalApplicationContext)(app.getApplicationContext());
-    if ((0, utils_1.isTestEnvironment)()) {
-        // clean first
-        if (options.cleanLogsDir && !(0, utils_1.isWin32)()) {
-            await (0, utils_1.removeFile)((0, path_1.join)(app.getAppDir(), 'logs'));
-        }
-        if (core_1.MidwayFrameworkType.WEB === app.getFrameworkType()) {
-            if (options.cleanTempDir && !(0, utils_1.isWin32)()) {
-                await (0, utils_1.removeFile)((0, path_1.join)(app.getAppDir(), 'run'));
+    if (app instanceof BootstrapAppStarter ||
+        (typeof app['close'] === 'function' && !app['getConfig'])) {
+        await app['close'](options);
+    }
+    else {
+        app = app;
+        debug(`[mock]: Closing app, appDir=${app.getAppDir()}`);
+        options = options || {};
+        await (0, core_1.destroyGlobalApplicationContext)(app.getApplicationContext());
+        if ((0, utils_1.isTestEnvironment)()) {
+            // clean first
+            if (options.cleanLogsDir && !(0, utils_1.isWin32)()) {
+                await (0, utils_1.removeFile)((0, path_1.join)(app.getAppDir(), 'logs'));
+            }
+            if (core_1.MidwayFrameworkType.WEB === app.getFrameworkType()) {
+                if (options.cleanTempDir && !(0, utils_1.isWin32)()) {
+                    await (0, utils_1.removeFile)((0, path_1.join)(app.getAppDir(), 'run'));
+                }
+            }
+            if (options.sleep > 0) {
+                await (0, core_1.sleep)(options.sleep);
+            }
+            else {
+                await (0, core_1.sleep)(50);
             }
-        }
-        if (options.sleep > 0) {
-            await (0, core_1.sleep)(options.sleep);
-        }
-        else {
-            await (0, core_1.sleep)(50);
         }
     }
 }
@@ -183,7 +190,13 @@ async function createFunctionApp(baseDir, options = {}, customFrameworkModule) {
         options = baseDir;
         baseDir = options.appDir || '';
     }
+    // v3 新的处理 bootstrap 过来的 faas 入口
+    if (options.entryFile) {
+        const exportModules = require((0, path_1.join)(baseDir, options.entryFile));
+        options.starter = exportModules.getStarter();
+    }
     let starterName;
+    // 老的 f.yml 逻辑
     if (!options.starter) {
         if (!baseDir) {
             baseDir = process.cwd();
@@ -422,11 +435,22 @@ async function createLightApp(baseDir = '', options = {}) {
     });
 }
 exports.createLightApp = createLightApp;
-async function createBootstrap(entryFile) {
-    await create(undefined, {
-        entryFile,
-    });
-    return new BootstrapAppStarter();
+async function createBootstrap(entryFile, options = {}) {
+    if ((0, core_1.safeRequire)('@midwayjs/faas')) {
+        options.entryFile = entryFile;
+        const app = await createFunctionApp(process.cwd(), options);
+        return {
+            close: async () => {
+                return close(app);
+            },
+        };
+    }
+    else {
+        await create(undefined, {
+            entryFile,
+        });
+        return new BootstrapAppStarter();
+    }
 }
 exports.createBootstrap = createBootstrap;
 //# sourceMappingURL=creator.js.map

package/dist/interface.d.ts

@@ -1,10 +1,17 @@
-import { IMidwayBootstrapOptions } from '@midwayjs/core';
+import { IMidwayApplication, IMidwayBootstrapOptions, MidwayFrameworkType } from '@midwayjs/core';
 export interface MockAppConfigurationOptions extends IMidwayBootstrapOptions {
     cleanLogsDir?: boolean;
     cleanTempDir?: boolean;
     ssl?: boolean;
+    entryFile?: string;
 }
 export type ComponentModule = {
     Configuration: new () => any;
 };
+export interface IBootstrapAppStarter {
+    getApp?(type: MidwayFrameworkType | string): IMidwayApplication<any>;
+    close(options?: {
+        sleep?: number;
+    }): Promise<void>;
+}
 //# sourceMappingURL=interface.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/mock",
-  "version": "3.11.6",
+  "version": "3.11.10",
   "description": "create your test app from midway framework",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -49,5 +49,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "d1ca8ca3ee5223c1c034ad3c97d335348931404b"
+  "gitHead": "521c42cc4af8850b77c5cf1f040b7430a74db041"
 }