@midwayjs/mock 3.11.12 → 3.12.0-beta.2

package/dist/creator.js

@@ -42,13 +42,6 @@ async function create(appDir, options = {}, customFramework) {
         }
         (0, logger_1.clearAllLoggers)();
         options = options || {};
-        if (options.baseDir) {
-            (0, core_1.safeRequire)((0, path_1.join)(`${options.baseDir}`, 'interface'));
-        }
-        else if (appDir) {
-            options.baseDir = `${appDir}/src`;
-            (0, core_1.safeRequire)((0, path_1.join)(`${options.baseDir}`, 'interface'));
-        }
         if (options.entryFile) {
             // start from entry file, like bootstrap.js
             options.entryFile = formatPath(appDir, options.entryFile);
@@ -73,8 +66,28 @@ async function create(appDir, options = {}, customFramework) {
             });
             return;
         }
+        if (!options.moduleLoadType) {
+            const pkgJSON = await (0, core_1.loadModule)((0, path_1.join)(appDir, 'package.json'), {
+                safeLoad: true,
+                enableCache: false,
+            });
+            options.fileLoadMode = (pkgJSON === null || pkgJSON === void 0 ? void 0 : pkgJSON.type) === 'module' ? 'esm' : 'commonjs';
+        }
+        if (options.baseDir) {
+            await (0, core_1.loadModule)((0, path_1.join)(`${options.baseDir}`, 'interface.ts'), {
+                safeLoad: true,
+                loadMode: options.fileLoadMode,
+            });
+        }
+        else if (appDir) {
+            options.baseDir = `${appDir}/src`;
+            await (0, core_1.loadModule)((0, path_1.join)(`${options.baseDir}`, 'interface.ts'), {
+                safeLoad: true,
+                loadMode: options.fileLoadMode,
+            });
+        }
         if (!options.imports && customFramework) {
-            options.imports = (0, utils_1.transformFrameworkToConfiguration)(customFramework);
+            options.imports = await (0, utils_1.transformFrameworkToConfiguration)(customFramework, options.moduleLoadType);
         }
         if (customFramework === null || customFramework === void 0 ? void 0 : customFramework['Configuration']) {
             options.imports = customFramework;
@@ -125,10 +138,11 @@ async function create(appDir, options = {}, customFramework) {
             ...options,
             appDir,
             asyncContextManager: (0, async_hooks_context_manager_1.createContextManager)(),
-            imports: []
-                .concat(options.imports)
-                .concat(options.baseDir
-                ? (0, core_1.safeRequire)((0, path_1.join)(options.baseDir, 'configuration'))
+            imports: [].concat(options.imports).concat(options.baseDir
+                ? await (0, core_1.loadModule)((0, path_1.join)(options.baseDir, 'configuration.ts'), {
+                    safeLoad: true,
+                    loadMode: options.fileLoadMode,
+                })
                 : []),
         });
         if (customFramework) {
@@ -213,7 +227,7 @@ async function createFunctionApp(baseDir, options = {}, customFrameworkModule) {
             const doc = yaml.load((0, fs_1.readFileSync)((0, path_1.join)(baseDir, 'f.yml'), 'utf8'));
             starterName = (_a = doc === null || doc === void 0 ? void 0 : doc['provider']) === null || _a === void 0 ? void 0 : _a['starter'];
             if (starterName) {
-                const m = (0, core_1.safeRequire)(starterName);
+                const m = await (0, core_1.loadModule)(starterName);
                 if (m && m['BootstrapStarter']) {
                     options.starter = new m['BootstrapStarter']();
                 }
@@ -238,13 +252,24 @@ async function createFunctionApp(baseDir, options = {}, customFrameworkModule) {
             }
         }
         (0, logger_1.clearAllLoggers)();
+        const pkgJSON = await (0, core_1.loadModule)((0, path_1.join)(options.appDir, 'package.json'), {
+            safeLoad: true,
+            enableCache: false,
+        });
+        options.fileLoadMode = (pkgJSON === null || pkgJSON === void 0 ? void 0 : pkgJSON.type) === 'module' ? 'esm' : 'commonjs';
         options = options || {};
         if (options.baseDir) {
-            (0, core_1.safeRequire)((0, path_1.join)(`${options.baseDir}`, 'interface'));
+            await (0, core_1.loadModule)((0, path_1.join)(`${options.baseDir}`, 'interface.ts'), {
+                safeLoad: true,
+                loadMode: options.fileLoadMode,
+            });
         }
         else if (options.appDir) {
             options.baseDir = `${options.appDir}/src`;
-            (0, core_1.safeRequire)((0, path_1.join)(`${options.baseDir}`, 'interface'));
+            await (0, core_1.loadModule)((0, path_1.join)(`${options.baseDir}`, 'interface.ts'), {
+                safeLoad: true,
+                loadMode: options.fileLoadMode,
+            });
         }
         // new mode
         const exports = options.starter.start(options);
@@ -364,7 +389,7 @@ async function createFunctionApp(baseDir, options = {}, customFrameworkModule) {
             '@ali/serverless-app',
             '@midwayjs/serverless-app',
         ]);
-        const serverlessModule = (0, utils_1.transformFrameworkToConfiguration)(customFramework);
+        const serverlessModule = await (0, utils_1.transformFrameworkToConfiguration)(customFramework, options.moduleLoadType);
         if (serverlessModule) {
             if (options && options.imports) {
                 options.imports.unshift(serverlessModule);
@@ -401,6 +426,9 @@ class LightFramework extends core_1.BaseFramework {
     }
 }
 class BootstrapAppStarter {
+    constructor(options) {
+        this.options = options;
+    }
     getApp(type) {
         const applicationContext = (0, core_1.getCurrentApplicationContext)();
         const applicationManager = applicationContext.get(core_1.MidwayApplicationManager);
@@ -408,7 +436,10 @@ class BootstrapAppStarter {
     }
     async close(options = {}) {
         // eslint-disable-next-line node/no-extraneous-require
-        const BootstrapModule = (0, core_1.safeRequire)('@midwayjs/bootstrap');
+        const BootstrapModule = await (0, core_1.loadModule)('@midwayjs/bootstrap', {
+            loadMode: this.options.fileLoadMode,
+            safeLoad: true,
+        });
         if (BootstrapModule === null || BootstrapModule === void 0 ? void 0 : BootstrapModule.Bootstrap) {
             await BootstrapModule.Bootstrap.stop();
         }
@@ -436,19 +467,32 @@ async function createLightApp(baseDir = '', options = {}) {
             },
         },
     }, (_a = options.globalConfig) !== null && _a !== void 0 ? _a : {});
+    if (!options.moduleLoadType) {
+        const cwd = process.cwd();
+        const pkgJSON = await (0, core_1.loadModule)((0, path_1.join)(cwd, 'package.json'), {
+            safeLoad: true,
+            enableCache: false,
+        });
+        options.fileLoadMode = (pkgJSON === null || pkgJSON === void 0 ? void 0 : pkgJSON.type) === 'module' ? 'esm' : 'commonjs';
+    }
     return createApp(baseDir, {
         ...options,
-        imports: [(0, utils_1.transformFrameworkToConfiguration)(LightFramework)].concat(options === null || options === void 0 ? void 0 : options.imports),
+        imports: [
+            await (0, utils_1.transformFrameworkToConfiguration)(LightFramework, options.moduleLoadType),
+        ].concat(options === null || options === void 0 ? void 0 : options.imports),
     });
 }
 exports.createLightApp = createLightApp;
 async function createBootstrap(entryFile, options = {}) {
+    const cwd = process.cwd();
     if (!options.bootstrapMode) {
-        options.bootstrapMode = (0, core_1.safeRequire)('@midwayjs/faas') ? 'faas' : 'app';
+        options.bootstrapMode = (0, fs_1.existsSync)((0, path_1.join)(cwd, 'node_modules/@midwayjs/faas'))
+            ? 'faas'
+            : 'app';
     }
     if (options.bootstrapMode === 'faas') {
         options.entryFile = entryFile;
-        const app = await createFunctionApp(process.cwd(), options);
+        const app = await createFunctionApp(cwd, options);
         return {
             close: async () => {
                 return close(app);
@@ -459,7 +503,7 @@ async function createBootstrap(entryFile, options = {}) {
         await create(undefined, {
             entryFile,
         });
-        return new BootstrapAppStarter();
+        return new BootstrapAppStarter(options);
     }
 }
 exports.createBootstrap = createBootstrap;

package/dist/utils.d.ts

@@ -7,10 +7,10 @@ export declare function findFirstExistModule(moduleList: any): ComponentModule;
  * transform a framework component or framework module to configuration class
  * @param Framework
  */
-export declare function transformFrameworkToConfiguration<T extends IMidwayFramework<any, any, any>>(Framework: any): {
+export declare function transformFrameworkToConfiguration<T extends IMidwayFramework<any, any, any>>(Framework: any, loadMode: 'commonjs' | 'esm'): Promise<{
     [key: string]: any;
     Configuration: any;
-};
+}>;
 export declare function removeFile(file: string): Promise<void>;
 export declare function mergeGlobalConfig(globalConfig: any, newConfigObject: Record<string, any>): any;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.js

@@ -39,12 +39,15 @@ exports.findFirstExistModule = findFirstExistModule;
  * transform a framework component or framework module to configuration class
  * @param Framework
  */
-function transformFrameworkToConfiguration(Framework) {
+async function transformFrameworkToConfiguration(Framework, loadMode) {
     if (!Framework)
         return null;
     let CustomFramework = Framework;
     if (typeof Framework === 'string') {
-        Framework = (0, core_1.safeRequire)(Framework);
+        Framework = await (0, core_1.loadModule)(Framework, {
+            loadMode,
+            safeLoad: true,
+        });
     }
     if (Framework.Configuration) {
         return Framework;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/mock",
-  "version": "3.11.12",
+  "version": "3.12.0-beta.2",
   "description": "create your test app from midway framework",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -27,7 +27,7 @@
   },
   "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",
@@ -37,7 +37,7 @@
     "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": "7454a59cd57e693a04e4c887535c9193354e2980"
+  "gitHead": "a603d2348d6141f8f723901498f03a162a037708"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2013 - Now midwayjs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.