@midwayjs/mock 3.11.15 → 3.12.0

package/app.js

@@ -0,0 +1,33 @@
+const { createApp, close } = require('./dist');
+const { join } = require('path');
+
+(async () => {
+  process.env.MIDWAY_TS_MODE = 'false';
+  // 查找 process.argv 中的 --port 参数
+  const portIndex = process.argv.findIndex((item) => item === '--port');
+  if (portIndex !== -1) {
+    process.env.MIDWAY_HTTP_PORT = process.argv[portIndex + 1];
+  }
+
+  process.once('SIGINT', onSignal);
+  // kill(3) Ctrl-\
+  process.once('SIGQUIT', onSignal);
+  // kill(15) default
+  process.once('SIGTERM', onSignal);
+
+  const app = await createApp({
+    appDir: process.cwd(),
+    baseDir: join(process.cwd(), 'dist'),
+  });
+
+  process.send({
+    title: 'server-ready',
+    port: process.env.MIDWAY_HTTP_PORT,
+  });
+
+  function onSignal() {
+    close(app).then(() => {
+      process.exit(0);
+    });
+  }
+})();

package/dist/creator.js

@@ -20,13 +20,17 @@ function formatPath(baseDir, p) {
         return (0, path_1.resolve)(baseDir, p);
     }
 }
+function getFileNameWithSuffix(fileName) {
+    return (0, core_1.isTypeScriptEnvironment)() ? `${fileName}.ts` : `${fileName}.js`;
+}
 async function create(appDir, options = {}, customFramework) {
-    debug(`[mock]: Create app, appDir="${appDir}"`);
-    process.env.MIDWAY_TS_MODE = 'true';
+    var _a;
+    process.env.MIDWAY_TS_MODE = (_a = process.env.MIDWAY_TS_MODE) !== null && _a !== void 0 ? _a : 'true';
     if (typeof appDir === 'object') {
         options = appDir;
         appDir = options.appDir || '';
     }
+    debug(`[mock]: Create app, appDir="${appDir}"`);
     try {
         if (appDir) {
             // 处理测试的 fixtures
@@ -42,13 +46,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 +70,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.moduleLoadType = (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}`, getFileNameWithSuffix('interface')), {
+                safeLoad: true,
+                loadMode: options.moduleLoadType,
+            });
+        }
+        else if (appDir) {
+            options.baseDir = `${appDir}/src`;
+            await (0, core_1.loadModule)((0, path_1.join)(`${options.baseDir}`, getFileNameWithSuffix('interface')), {
+                safeLoad: true,
+                loadMode: options.moduleLoadType,
+            });
+        }
         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 +142,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, getFileNameWithSuffix('configuration')), {
+                    safeLoad: true,
+                    loadMode: options.moduleLoadType,
+                })
                 : []),
         });
         if (customFramework) {
@@ -141,7 +159,7 @@ async function create(appDir, options = {}, customFramework) {
                 return mainFramework;
             }
             else {
-                throw new Error('Can not get main framework, please check your configuration.ts.');
+                throw new Error(`Can not get main framework, please check your ${getFileNameWithSuffix('configuration')}.`);
             }
         }
     }
@@ -192,7 +210,8 @@ async function close(app, options) {
 }
 exports.close = close;
 async function createFunctionApp(baseDir, options = {}, customFrameworkModule) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
+    process.env.MIDWAY_TS_MODE = (_a = process.env.MIDWAY_TS_MODE) !== null && _a !== void 0 ? _a : 'true';
     if (typeof baseDir === 'object') {
         options = baseDir;
         baseDir = options.appDir || '';
@@ -211,9 +230,9 @@ async function createFunctionApp(baseDir, options = {}, customFrameworkModule) {
         // load yaml
         try {
             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'];
+            starterName = (_b = doc === null || doc === void 0 ? void 0 : doc['provider']) === null || _b === void 0 ? void 0 : _b['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']();
                 }
@@ -227,7 +246,6 @@ async function createFunctionApp(baseDir, options = {}, customFrameworkModule) {
     if (options.starter) {
         options.appDir = baseDir;
         debug(`[mock]: Create app, appDir="${options.appDir}"`);
-        process.env.MIDWAY_TS_MODE = 'true';
         if (options.appDir) {
             // 处理测试的 fixtures
             if (!(0, path_1.isAbsolute)(options.appDir)) {
@@ -238,13 +256,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.moduleLoadType = (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}`, getFileNameWithSuffix('interface')), {
+                safeLoad: true,
+                loadMode: options.moduleLoadType,
+            });
         }
         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}`, getFileNameWithSuffix('interface')), {
+                safeLoad: true,
+                loadMode: options.moduleLoadType,
+            });
         }
         // new mode
         const exports = options.starter.start(options);
@@ -255,8 +284,8 @@ async function createFunctionApp(baseDir, options = {}, customFrameworkModule) {
         const framework = frameworkService.getMainFramework();
         const appManager = appCtx.get(core_1.MidwayApplicationManager);
         const app = appManager.getApplication(core_1.MidwayFrameworkType.FAAS);
-        const faasConfig = (_b = configService.getConfiguration('faas')) !== null && _b !== void 0 ? _b : {};
-        const customPort = (_d = (_c = process.env.MIDWAY_HTTP_PORT) !== null && _c !== void 0 ? _c : faasConfig['port']) !== null && _d !== void 0 ? _d : options['port'];
+        const faasConfig = (_c = configService.getConfiguration('faas')) !== null && _c !== void 0 ? _c : {};
+        const customPort = (_e = (_d = process.env.MIDWAY_HTTP_PORT) !== null && _d !== void 0 ? _d : faasConfig['port']) !== null && _e !== void 0 ? _e : options['port'];
         if (options.starter.callback2) {
             app.callback2 = options.starter.callback2.bind(options.starter);
         }
@@ -364,7 +393,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 +430,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 +440,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.moduleLoadType,
+            safeLoad: true,
+        });
         if (BootstrapModule === null || BootstrapModule === void 0 ? void 0 : BootstrapModule.Bootstrap) {
             await BootstrapModule.Bootstrap.stop();
         }
@@ -436,19 +471,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.moduleLoadType = (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 +507,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/function.js

@@ -0,0 +1,33 @@
+const { createFunctionApp, close } = require('./dist');
+const { join } = require('path');
+
+(async () => {
+  process.env.MIDWAY_TS_MODE = 'false';
+  // 查找 process.argv 中的 --port 参数
+  const portIndex = process.argv.findIndex(item => item === '--port');
+  if (portIndex !== -1) {
+    process.env.MIDWAY_HTTP_PORT = process.argv[portIndex + 1];
+  }
+
+  process.once('SIGINT', onSignal);
+  // kill(3) Ctrl-\
+  process.once('SIGQUIT', onSignal);
+  // kill(15) default
+  process.once('SIGTERM', onSignal);
+
+  const app = await createFunctionApp({
+    appDir: process.cwd(),
+    baseDir: join(process.cwd(), 'dist'),
+  });
+
+  process.send({
+    title: 'server-ready',
+    port: process.env.MIDWAY_HTTP_PORT,
+  });
+
+  function onSignal() {
+    close(app).then(() => {
+      process.exit(0);
+    });
+  }
+})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/mock",
-  "version": "3.11.15",
+  "version": "3.12.0",
   "description": "create your test app from midway framework",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -20,24 +20,26 @@
   "files": [
     "dist/**/*.js",
     "dist/**/*.d.ts",
-    "ssl"
+    "ssl",
+    "app.js",
+    "function.js"
   ],
   "engines": {
     "node": ">=12"
   },
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.11.15",
+    "@midwayjs/core": "^3.12.0",
     "@midwayjs/logger": "^2.15.0",
     "@types/amqplib": "0.10.1",
     "amqplib": "0.10.3",
     "kafkajs": "2.2.4",
-    "socket.io": "4.7.1",
-    "socket.io-client": "4.7.1",
+    "socket.io": "4.7.2",
+    "socket.io-client": "4.7.2",
     "ws": "8.13.0"
   },
   "dependencies": {
-    "@midwayjs/async-hooks-context-manager": "^3.11.15",
+    "@midwayjs/async-hooks-context-manager": "^3.12.0",
     "@types/superagent": "4.1.14",
     "@types/supertest": "2.0.12",
     "js-yaml": "4.1.0",
@@ -49,5 +51,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "a4054247f3b9f4fc8ba51684c002606d849e0bd3"
+  "gitHead": "0e9a08cd078c4c4dedfa753a8c1025806cc0b0a2"
 }