@modern-js/bff-core 1.0.1-beta.5 → 1.0.1-beta.8

package/dist/js/modern/operators/http.js

@@ -6,10 +6,10 @@ const validateInput = async (schema, input) => {
     await schema.parseAsync(input);
   } catch (error) {
     const {
-      z
-    } = await import('zod');
+      z: zod
+    } = require('zod');
 
-    if (error instanceof z.ZodError) {
+    if (error instanceof zod.ZodError) {
       throw new ValidationError(400, error.message);
     }
 

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

@@ -38,17 +38,39 @@ 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({});
+const isFunction = input => input && {}.toString.call(input) === '[object Function]';
 
+export const requireHandlerModule = enableRegister(modulePath => {
   const module = require(modulePath);
 
   if (isFunction(module)) {
@@ -57,9 +79,8 @@ export const requireHandlerModule = modulePath => {
     };
   }
 
-  unregister();
   return module;
-};
+});
 
 const routeValue = routePath => {
   if (routePath.includes(':')) {

package/dist/js/modern/utils.js

@@ -1,4 +1,7 @@
 import util from 'util';
+import fs from 'fs';
+import Module from 'module';
+import path from 'path';
 import { createDebugger } from '@modern-js/utils';
 export const HANDLER_WITH_META = 'HANDLER_WITH_META';
 export const debug = createDebugger('bff'); // export const pick = <T extends Record<string, unknown>, K extends keyof T>(
@@ -60,4 +63,74 @@ export const validateFunction = (maybeFunc, name) => {
 };
 export const isWithMetaHandler = handler => {
   return typeof handler === 'function' && handler[HANDLER_WITH_META];
+};
+
+const sortByLongestPrefix = arr => {
+  return arr.concat().sort((a, b) => b.length - a.length);
+};
+
+export const createMatchPath = paths => {
+  const sortedKeys = sortByLongestPrefix(Object.keys(paths));
+  const sortedPaths = {};
+  sortedKeys.forEach(key => {
+    sortedPaths[key] = paths[key];
+  });
+  return request => {
+    const found = Object.keys(sortedPaths).find(key => {
+      return request.startsWith(key);
+    });
+
+    if (found) {
+      let foundPaths = sortedPaths[found];
+
+      if (!Array.isArray(foundPaths)) {
+        foundPaths = [foundPaths];
+      }
+
+      foundPaths = foundPaths.filter(foundPath => path.isAbsolute(foundPath));
+
+      for (const p of foundPaths) {
+        const foundPath = request.replace(found, p);
+
+        if (fs.existsSync(foundPath)) {
+          return foundPath;
+        }
+      }
+
+      return request.replace(found, foundPaths[0]);
+    }
+
+    return null;
+  };
+}; // paths 中的值只能是绝对路径
+
+export const registerPaths = paths => {
+  const originalResolveFilename = Module._resolveFilename; // eslint-disable-next-line node/no-unsupported-features/node-builtins
+
+  const {
+    builtinModules
+  } = Module;
+  const matchPath = createMatchPath(paths);
+
+  Module._resolveFilename = function (request, _parent) {
+    const isCoreModule = builtinModules.includes(request);
+
+    if (!isCoreModule) {
+      const matched = matchPath(request);
+
+      if (matched) {
+        // eslint-disable-next-line prefer-rest-params
+        const modifiedArguments = [matched, ...[].slice.call(arguments, 1)]; // Passes all arguments. Even those that is not specified above.
+
+        return originalResolveFilename.apply(this, modifiedArguments);
+      }
+    } // eslint-disable-next-line prefer-rest-params
+
+
+    return originalResolveFilename.apply(this, arguments);
+  };
+
+  return () => {
+    Module._resolveFilename = originalResolveFilename;
+  };
 };

package/dist/js/node/operators/http.js

@@ -9,19 +9,15 @@ var _types = require("../types");
 
 var _http = require("../errors/http");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 const validateInput = async (schema, input) => {
   try {
     await schema.parseAsync(input);
   } catch (error) {
     const {
-      z
-    } = await Promise.resolve().then(() => _interopRequireWildcard(require('zod')));
+      z: zod
+    } = require('zod');
 
-    if (error instanceof z.ZodError) {
+    if (error instanceof zod.ZodError) {
       throw new _http.ValidationError(400, error.message);
     }
 

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

@@ -57,17 +57,39 @@ 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({});
+    const requiredModule = requireFn(modulePath);
+    return requiredModule;
+  };
+};
 
+const isFunction = input => input && {}.toString.call(input) === '[object Function]';
+
+const requireHandlerModule = enableRegister(modulePath => {
   const module = require(modulePath);
 
   if (isFunction(module)) {
@@ -76,10 +98,8 @@ const requireHandlerModule = modulePath => {
     };
   }
 
-  unregister();
   return module;
-};
-
+});
 exports.requireHandlerModule = requireHandlerModule;
 
 const routeValue = routePath => {

package/dist/js/node/utils.js

@@ -3,10 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.validateFunction = exports.isWithMetaHandler = exports.getTypeErrorMessage = exports.debug = exports.HANDLER_WITH_META = exports.ERR_INVALID_ARG_TYPE = void 0;
+exports.validateFunction = exports.registerPaths = exports.isWithMetaHandler = exports.getTypeErrorMessage = exports.debug = exports.createMatchPath = exports.HANDLER_WITH_META = exports.ERR_INVALID_ARG_TYPE = void 0;
 
 var _util = _interopRequireDefault(require("util"));
 
+var _fs = _interopRequireDefault(require("fs"));
+
+var _module = _interopRequireDefault(require("module"));
+
+var _path = _interopRequireDefault(require("path"));
+
 var _utils = require("@modern-js/utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -86,4 +92,79 @@ const isWithMetaHandler = handler => {
   return typeof handler === 'function' && handler[HANDLER_WITH_META];
 };
 
-exports.isWithMetaHandler = isWithMetaHandler;
+exports.isWithMetaHandler = isWithMetaHandler;
+
+const sortByLongestPrefix = arr => {
+  return arr.concat().sort((a, b) => b.length - a.length);
+};
+
+const createMatchPath = paths => {
+  const sortedKeys = sortByLongestPrefix(Object.keys(paths));
+  const sortedPaths = {};
+  sortedKeys.forEach(key => {
+    sortedPaths[key] = paths[key];
+  });
+  return request => {
+    const found = Object.keys(sortedPaths).find(key => {
+      return request.startsWith(key);
+    });
+
+    if (found) {
+      let foundPaths = sortedPaths[found];
+
+      if (!Array.isArray(foundPaths)) {
+        foundPaths = [foundPaths];
+      }
+
+      foundPaths = foundPaths.filter(foundPath => _path.default.isAbsolute(foundPath));
+
+      for (const p of foundPaths) {
+        const foundPath = request.replace(found, p);
+
+        if (_fs.default.existsSync(foundPath)) {
+          return foundPath;
+        }
+      }
+
+      return request.replace(found, foundPaths[0]);
+    }
+
+    return null;
+  };
+}; // paths 中的值只能是绝对路径
+
+
+exports.createMatchPath = createMatchPath;
+
+const registerPaths = paths => {
+  const originalResolveFilename = _module.default._resolveFilename; // eslint-disable-next-line node/no-unsupported-features/node-builtins
+
+  const {
+    builtinModules
+  } = _module.default;
+  const matchPath = createMatchPath(paths);
+
+  _module.default._resolveFilename = function (request, _parent) {
+    const isCoreModule = builtinModules.includes(request);
+
+    if (!isCoreModule) {
+      const matched = matchPath(request);
+
+      if (matched) {
+        // eslint-disable-next-line prefer-rest-params
+        const modifiedArguments = [matched, ...[].slice.call(arguments, 1)]; // Passes all arguments. Even those that is not specified above.
+
+        return originalResolveFilename.apply(this, modifiedArguments);
+      }
+    } // eslint-disable-next-line prefer-rest-params
+
+
+    return originalResolveFilename.apply(this, arguments);
+  };
+
+  return () => {
+    _module.default._resolveFilename = originalResolveFilename;
+  };
+};
+
+exports.registerPaths = registerPaths;

package/dist/types/client/result.d.ts

@@ -1,15 +1,15 @@
-export declare type Err<T = any> = {
+export declare type Err<T = unknown> = {
   kind: 'Err';
   value: T;
   isErr: true;
   isOk: false;
 };
-export declare type Ok<T = any> = {
+export declare type Ok<T = unknown> = {
   kind: 'Ok';
   value: T;
   isErr: false;
   isOk: true;
 };
-export declare type Result<T = any, E = string> = Err<E> | Ok<T>;
+export declare type Result<T = unknown, E = string> = Err<E> | Ok<T>;
 export declare const Err: <E = string>(value: E) => Err<E>;
 export declare const Ok: <T, E = string>(value: T) => Result<T, E>;

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/dist/types/utils.d.ts

@@ -5,4 +5,10 @@ export declare class ERR_INVALID_ARG_TYPE extends Error {
   constructor(funcName: string, expectedType: string, actual: unknown);
 }
 export declare const validateFunction: (maybeFunc: unknown, name: string) => boolean;
-export declare const isWithMetaHandler: (handler: any) => any;
+export declare const isWithMetaHandler: (handler: any) => any;
+interface Paths {
+  [key: string]: string[] | string;
+}
+export declare const createMatchPath: (paths: Paths) => (request: string) => string | null;
+export declare const registerPaths: (paths: Paths) => () => void;
+export {};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.0.1-beta.5",
+  "version": "1.0.1-beta.8",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -24,12 +24,11 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7.15.4",
+    "@babel/runtime": "^7.18.0",
     "@modern-js/bff-runtime": "^1.2.3",
     "@modern-js/utils": "^1.7.6",
     "esbuild": "^0.14.38",
     "esbuild-register": "^3.3.3",
-    "http-errors": "^2.0.0",
     "koa-compose": "^4.1.0",
     "reflect-metadata": "^0.1.13"
   },