@modern-js/bff-core 1.0.1-beta.6 → 1.1.0

package/dist/js/modern/router/utils.js

@@ -38,19 +38,40 @@ const clearRouteName = routeName => {
 
 export const isHandler = input => input && typeof input === 'function';
 
-const isFunction = input => input && {}.toString.call(input) === '[object Function]';
+const enableRegister = requireFn => {
+  // esbuild-register 做 unRegister 时，不会删除 register 添加的 require.extensions，导致第二次调用时 require.extensions['.ts'] 是 nodejs 默认 loader
+  // 所以这里根据第一次调用时，require.extensions 有没有，来判断是否需要使用 esbuild-register
+  let existTsLoader = false;
+  let firstCall = true;
+  return modulePath => {
+    if (firstCall) {
+      // eslint-disable-next-line node/no-deprecated-api
+      existTsLoader = Boolean(require.extensions['.ts']);
+      firstCall = false;
+    }
+
+    if (!existTsLoader) {
+      const {
+        register
+      } = require('esbuild-register/dist/node');
+
+      const {
+        unregister
+      } = register({});
+      const requiredModule = requireFn(modulePath);
+      unregister();
+      return requiredModule;
+    }
 
-export const requireHandlerModule = modulePath => {
-  const {
-    register
-  } = require('esbuild-register/dist/node');
+    const requiredModule = requireFn(modulePath);
+    return requiredModule;
+  };
+};
 
-  const {
-    unregister
-  } = register({}); // 测试环境不走缓存，因为缓存的 handler 文件，会被 mockAPI 函数进行 mock，升级 jest28，setupFilesAfterEnv 能做异步操作的话，可解此问题
+const isFunction = input => input && {}.toString.call(input) === '[object Function]';
 
-  const originRequire = process.env.NODE_ENV === 'test' ? jest.requireActual : require;
-  const module = originRequire(modulePath);
+export const requireHandlerModule = enableRegister(modulePath => {
+  const module = require(modulePath);
 
   if (isFunction(module)) {
     return {
@@ -58,9 +79,8 @@ export const requireHandlerModule = modulePath => {
     };
   }
 
-  unregister();
   return module;
-};
+});
 
 const routeValue = routePath => {
   if (routePath.includes(':')) {

package/dist/js/node/router/utils.js

@@ -57,19 +57,40 @@ const isHandler = input => input && typeof input === 'function';
 
 exports.isHandler = isHandler;
 
-const isFunction = input => input && {}.toString.call(input) === '[object Function]';
+const enableRegister = requireFn => {
+  // esbuild-register 做 unRegister 时，不会删除 register 添加的 require.extensions，导致第二次调用时 require.extensions['.ts'] 是 nodejs 默认 loader
+  // 所以这里根据第一次调用时，require.extensions 有没有，来判断是否需要使用 esbuild-register
+  let existTsLoader = false;
+  let firstCall = true;
+  return modulePath => {
+    if (firstCall) {
+      // eslint-disable-next-line node/no-deprecated-api
+      existTsLoader = Boolean(require.extensions['.ts']);
+      firstCall = false;
+    }
 
-const requireHandlerModule = modulePath => {
-  const {
-    register
-  } = require('esbuild-register/dist/node');
+    if (!existTsLoader) {
+      const {
+        register
+      } = require('esbuild-register/dist/node');
+
+      const {
+        unregister
+      } = register({});
+      const requiredModule = requireFn(modulePath);
+      unregister();
+      return requiredModule;
+    }
 
-  const {
-    unregister
-  } = register({}); // 测试环境不走缓存，因为缓存的 handler 文件，会被 mockAPI 函数进行 mock，升级 jest28，setupFilesAfterEnv 能做异步操作的话，可解此问题
+    const requiredModule = requireFn(modulePath);
+    return requiredModule;
+  };
+};
 
-  const originRequire = process.env.NODE_ENV === 'test' ? jest.requireActual : require;
-  const module = originRequire(modulePath);
+const isFunction = input => input && {}.toString.call(input) === '[object Function]';
+
+const requireHandlerModule = enableRegister(modulePath => {
+  const module = require(modulePath);
 
   if (isFunction(module)) {
     return {
@@ -77,10 +98,8 @@ const requireHandlerModule = modulePath => {
     };
   }
 
-  unregister();
   return module;
-};
-
+});
 exports.requireHandlerModule = requireHandlerModule;
 
 const routeValue = routePath => {

package/dist/types/router/utils.d.ts

@@ -1,10 +1,10 @@
-import { APIHandlerInfo } from './types';
+import { APIHandlerInfo, HandlerModule } from './types';
 declare type MaybeAsync<I> = I | Promise<I>;
 export declare type NormalHandler = (...args: any[]) => any;
 export declare type Handler<I, O> = (input: I) => MaybeAsync<O>;
 export declare const getFiles: (lambdaDir: string, rules: string | string[]) => string[];
 export declare const getPathFromFilename: (baseDir: string, filename: string) => string;
 export declare const isHandler: (input: any) => input is Handler<any, any>;
-export declare const requireHandlerModule: (modulePath: string) => any;
+export declare const requireHandlerModule: (modulePath: string) => HandlerModule;
 export declare const sortRoutes: (apiHandlers: APIHandlerInfo[]) => APIHandlerInfo[];
 export {};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.0.1-beta.6",
+  "version": "1.1.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -24,9 +24,9 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7.15.4",
-    "@modern-js/bff-runtime": "^1.2.3",
-    "@modern-js/utils": "^1.7.6",
+    "@babel/runtime": "^7.18.0",
+    "@modern-js/bff-runtime": "^1.3.0",
+    "@modern-js/utils": "^1.7.9",
     "esbuild": "^0.14.38",
     "esbuild-register": "^3.3.3",
     "koa-compose": "^4.1.0",
@@ -58,8 +58,7 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "wireit": {
     "build": {