@modern-js/bff-core 1.22.2-beta.0 → 1.22.3

package/dist/js/node/router/index.js

@@ -1,102 +1,147 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {
+  ApiRouter: true
 };
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var router_exports = {};
-__export(router_exports, {
-  ApiRouter: () => ApiRouter
+exports.ApiRouter = void 0;
+
+var _path = _interopRequireDefault(require("path"));
+
+var _utils = require("@modern-js/utils");
+
+require("reflect-metadata");
+
+var _types = require("../types");
+
+var _utils2 = require("../utils");
+
+var _constants = require("./constants");
+
+Object.keys(_constants).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _constants[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _constants[key];
+    }
+  });
 });
-module.exports = __toCommonJS(router_exports);
-var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-var import_reflect_metadata = require("reflect-metadata");
-var import_types = require("../types");
-var import_utils2 = require("../utils");
-var import_constants = require("./constants");
-var import_utils3 = require("./utils");
-__reExport(router_exports, require("./types"), module.exports);
-__reExport(router_exports, require("./constants"), module.exports);
+
+var _utils3 = require("./utils");
+
+var _types2 = require("./types");
+
+Object.keys(_types2).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _types2[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _types2[key];
+    }
+  });
+});
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 class ApiRouter {
+  // lambdaDir is the dir which equal to the apiDir in function mode, and equal to the api/lambda dir in framework mode
   constructor({
-    apiDir,
-    lambdaDir,
+    apiDir: _apiDir,
+    lambdaDir: _lambdaDir,
     prefix
   }) {
-    this.apiFiles = [];
-    this.getExactApiMode = (apiDir) => {
+    _defineProperty(this, "apiMode", void 0);
+
+    _defineProperty(this, "apiDir", void 0);
+
+    _defineProperty(this, "existLambdaDir", void 0);
+
+    _defineProperty(this, "lambdaDir", void 0);
+
+    _defineProperty(this, "prefix", void 0);
+
+    _defineProperty(this, "apiFiles", []);
+
+    _defineProperty(this, "getExactApiMode", apiDir => {
       const exist = this.createExistChecker(apiDir);
-      const existLambdaDir = exist(import_constants.FRAMEWORK_MODE_LAMBDA_DIR);
-      const existAppDir = exist(import_constants.FRAMEWORK_MODE_APP_DIR);
-      const existAppFile = exist("app.ts") || exist("app.js");
+      const existLambdaDir = exist(_constants.FRAMEWORK_MODE_LAMBDA_DIR);
+      const existAppDir = exist(_constants.FRAMEWORK_MODE_APP_DIR);
+      const existAppFile = exist('app.ts') || exist('app.js');
+
       if (existLambdaDir || existAppDir || existAppFile) {
-        return import_constants.APIMode.FARMEWORK;
+        return _constants.APIMode.FARMEWORK;
       }
-      return import_constants.APIMode.FUNCTION;
-    };
-    this.createExistChecker = (base) => (target) => import_utils.fs.pathExistsSync(import_path.default.resolve(base, target));
-    this.getExactLambdaDir = (apiDir) => {
+
+      return _constants.APIMode.FUNCTION;
+    });
+
+    _defineProperty(this, "createExistChecker", base => target => _utils.fs.pathExistsSync(_path.default.resolve(base, target)));
+
+    _defineProperty(this, "getExactLambdaDir", apiDir => {
       if (this.lambdaDir) {
         return this.lambdaDir;
       }
-      const lambdaDir = this.apiMode === import_constants.APIMode.FARMEWORK ? import_path.default.join(apiDir, import_constants.FRAMEWORK_MODE_LAMBDA_DIR) : apiDir;
+
+      const lambdaDir = this.apiMode === _constants.APIMode.FARMEWORK ? _path.default.join(apiDir, _constants.FRAMEWORK_MODE_LAMBDA_DIR) : apiDir;
       return lambdaDir;
-    };
-    this.validateAbsolute(apiDir, "apiDir");
-    this.validateAbsolute(lambdaDir, "lambdaDir");
+    });
+
+    this.validateAbsolute(_apiDir, 'apiDir');
+    this.validateAbsolute(_lambdaDir, 'lambdaDir');
     this.prefix = this.initPrefix(prefix);
-    this.apiDir = apiDir;
-    this.apiMode = this.getExactApiMode(apiDir);
-    this.lambdaDir = lambdaDir || this.getExactLambdaDir(this.apiDir);
-    this.existLambdaDir = import_utils.fs.existsSync(this.lambdaDir);
+    this.apiDir = _apiDir;
+    this.apiMode = this.getExactApiMode(_apiDir);
+    this.lambdaDir = _lambdaDir || this.getExactLambdaDir(this.apiDir);
+    this.existLambdaDir = _utils.fs.existsSync(this.lambdaDir);
   }
+
   isExistLambda() {
     return this.existLambdaDir;
   }
+
   getApiMode() {
     return this.apiMode;
   }
+
   getLambdaDir() {
     return this.lambdaDir;
   }
+
   isApiFile(filename) {
     if (this.existLambdaDir) {
       return false;
     }
+
     if (!this.apiFiles.includes(filename)) {
       return false;
     }
+
     return true;
   }
+
   getSingleModuleHandlers(filename) {
     const moduleInfo = this.getModuleInfo(filename);
+
     if (moduleInfo) {
       return this.getModuleHandlerInfos(moduleInfo);
     }
+
     return null;
   }
+
   getHandlerInfo(filename, originFuncName, handler) {
     const httpMethod = this.getHttpMethod(originFuncName, handler);
     const routeName = this.getRouteName(filename, handler);
+
     if (httpMethod && routeName) {
       return {
         handler,
@@ -107,110 +152,145 @@ class ApiRouter {
         routePath: this.getRoutePath(this.prefix, routeName)
       };
     }
+
     return null;
-  }
+  } // TODO: 性能提升，开发环境，判断下 lambda 目录修改时间
+
+
   getSafeRoutePath(filename, handler) {
     this.loadApiFiles();
     this.validateValidApifile(filename);
     return this.getRouteName(filename, handler);
   }
+
   getRouteName(filename, handler) {
     if (handler) {
-      const trigger = Reflect.getMetadata(import_types.OperatorType.Trigger, handler);
-      if (trigger && trigger.type === import_types.TriggerType.Http) {
+      const trigger = Reflect.getMetadata(_types.OperatorType.Trigger, handler);
+
+      if (trigger && trigger.type === _types.TriggerType.Http) {
         if (!trigger.path) {
-          throw new Error(
-            `The http trigger ${trigger.name} needs to specify a path`
-          );
+          throw new Error(`The http trigger ${trigger.name} needs to specify a path`);
         }
+
         return trigger.path;
       }
     }
-    const routePath = (0, import_utils3.getPathFromFilename)(this.lambdaDir, filename);
+
+    const routePath = (0, _utils3.getPathFromFilename)(this.lambdaDir, filename);
     return routePath;
   }
+
   getHttpMethod(originHandlerName, handler) {
     if (handler) {
-      const trigger = Reflect.getMetadata(import_types.OperatorType.Trigger, handler);
-      if (trigger && import_types.httpMethods.includes(trigger.method)) {
+      const trigger = Reflect.getMetadata(_types.OperatorType.Trigger, handler);
+
+      if (trigger && _types.httpMethods.includes(trigger.method)) {
         return trigger.method;
       }
     }
+
     const upperName = originHandlerName.toUpperCase();
+
     switch (upperName) {
-      case "GET":
-        return import_types.HttpMethod.Get;
-      case "POST":
-        return import_types.HttpMethod.Post;
-      case "PUT":
-        return import_types.HttpMethod.Put;
-      case "DELETE":
-      case "DEL":
-        return import_types.HttpMethod.Delete;
-      case "CONNECT":
-        return import_types.HttpMethod.Connect;
-      case "TRACE":
-        return import_types.HttpMethod.Trace;
-      case "PATCH":
-        return import_types.HttpMethod.Patch;
-      case "OPTION":
-        return import_types.HttpMethod.Option;
-      case "DEFAULT": {
-        return import_types.HttpMethod.Get;
-      }
+      case 'GET':
+        return _types.HttpMethod.Get;
+
+      case 'POST':
+        return _types.HttpMethod.Post;
+
+      case 'PUT':
+        return _types.HttpMethod.Put;
+
+      case 'DELETE':
+      case 'DEL':
+        return _types.HttpMethod.Delete;
+
+      case 'CONNECT':
+        return _types.HttpMethod.Connect;
+
+      case 'TRACE':
+        return _types.HttpMethod.Trace;
+
+      case 'PATCH':
+        return _types.HttpMethod.Patch;
+
+      case 'OPTION':
+        return _types.HttpMethod.Option;
+
+      case 'DEFAULT':
+        {
+          return _types.HttpMethod.Get;
+        }
+
       default:
-        import_utils.logger.warn(
-          `Only api handlers are allowd to be exported, please remove the function ${originHandlerName} from exports`
-        );
+        _utils.logger.warn(`Only api handlers are allowd to be exported, please remove the function ${originHandlerName} from exports`);
+
         return null;
     }
   }
+
   loadApiFiles() {
     if (!this.existLambdaDir) {
       return [];
-    }
-    const apiFiles = this.apiFiles = (0, import_utils3.getFiles)(this.lambdaDir, import_constants.API_FILE_RULES);
+    } // eslint-disable-next-line no-multi-assign
+
+
+    const apiFiles = this.apiFiles = (0, _utils3.getFiles)(this.lambdaDir, _constants.API_FILE_RULES);
     return apiFiles;
   }
+
   getApiFiles() {
     if (!this.existLambdaDir) {
       return [];
     }
+
     if (this.apiFiles.length > 0) {
       return this.apiFiles;
     }
+
     return this.loadApiFiles();
   }
+
   getApiHandlers() {
     const filenames = this.getApiFiles();
     const moduleInfos = this.getModuleInfos(filenames);
     const apiHandlers = this.getHandlerInfos(moduleInfos);
-    (0, import_utils2.debug)("apiHandlers", apiHandlers.length, apiHandlers);
+    (0, _utils2.debug)('apiHandlers', apiHandlers.length, apiHandlers);
     return apiHandlers;
   }
+  /**
+   * 如果用户未传入或传入空串，默认为 /api
+   * 如果传入 /，则 prefix 为 /
+   */
+
+
   initPrefix(prefix) {
-    if (prefix === "/") {
-      return "";
+    if (prefix === '/') {
+      return '';
     }
-    return prefix || "/api";
+
+    return prefix || '/api';
   }
+
   validateAbsolute(filename, paramsName) {
-    if (typeof filename === "string" && !import_path.default.isAbsolute(filename)) {
+    if (typeof filename === 'string' && !_path.default.isAbsolute(filename)) {
       throw new Error(`The ${paramsName} ${filename} is not a abolute path`);
     }
   }
+
   getModuleInfos(filenames) {
-    return filenames.map((filename) => this.getModuleInfo(filename)).filter((moduleInfo) => Boolean(moduleInfo));
+    return filenames.map(filename => this.getModuleInfo(filename)).filter(moduleInfo => Boolean(moduleInfo));
   }
+
   getModuleInfo(filename) {
     try {
-      const module2 = (0, import_utils3.requireHandlerModule)(filename);
+      const module = (0, _utils3.requireHandlerModule)(filename);
       return {
         filename,
-        module: module2
+        module
       };
     } catch (err) {
-      if (process.env.NODE_ENV === "production") {
+      if (process.env.NODE_ENV === 'production') {
         throw err;
       } else {
         console.error(err);
@@ -218,39 +298,48 @@ class ApiRouter {
       }
     }
   }
+
   getHandlerInfos(moduleInfos) {
     let apiHandlers = [];
-    moduleInfos.forEach((moduleInfo) => {
+    moduleInfos.forEach(moduleInfo => {
       const handlerInfos = this.getModuleHandlerInfos(moduleInfo);
+
       if (handlerInfos) {
         apiHandlers = apiHandlers.concat(handlerInfos);
       }
     });
-    const sortedHandlers = (0, import_utils3.sortRoutes)(apiHandlers);
+    const sortedHandlers = (0, _utils3.sortRoutes)(apiHandlers);
     return sortedHandlers;
   }
+
   getModuleHandlerInfos(moduleInfo) {
-    const { module: module2, filename } = moduleInfo;
-    return Object.entries(module2).filter(([, handler]) => typeof handler === "function").map(([key]) => {
-      const handler = module2[key];
+    const {
+      module,
+      filename
+    } = moduleInfo;
+    return Object.entries(module).filter(([, handler]) => typeof handler === 'function').map(([key]) => {
+      const handler = module[key];
       const handlerInfo = this.getHandlerInfo(filename, key, handler);
       return handlerInfo;
-    }).filter((handlerInfo) => Boolean(handlerInfo));
+    }).filter(handlerInfo => Boolean(handlerInfo));
   }
+
   validateValidApifile(filename) {
     if (!this.apiFiles.includes(filename)) {
       throw new Error(`The ${filename} is not a valid api file.`);
     }
   }
+
   getRoutePath(prefix, routeName) {
-    const finalRouteName = routeName === "/" ? "" : routeName;
-    if (prefix === "" && finalRouteName === "") {
-      return "/";
+    const finalRouteName = routeName === '/' ? '' : routeName;
+
+    if (prefix === '' && finalRouteName === '') {
+      return '/';
     }
+
     return `${prefix}${finalRouteName}`;
   }
+
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ApiRouter
-});
+
+exports.ApiRouter = ApiRouter;

package/dist/js/node/router/types.js

@@ -1,15 +1,5 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var types_exports = {};
-module.exports = __toCommonJS(types_exports);
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

@@ -1,116 +1,123 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var utils_exports = {};
-__export(utils_exports, {
-  getFiles: () => getFiles,
-  getPathFromFilename: () => getPathFromFilename,
-  isHandler: () => isHandler,
-  requireHandlerModule: () => requireHandlerModule,
-  sortRoutes: () => sortRoutes
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(utils_exports);
-var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-var import_constants = require("./constants");
-const getFiles = (lambdaDir, rules) => import_utils.globby.sync(rules, {
+exports.sortRoutes = exports.requireHandlerModule = exports.isHandler = exports.getPathFromFilename = exports.getFiles = void 0;
+
+var _path = _interopRequireDefault(require("path"));
+
+var _utils = require("@modern-js/utils");
+
+var _constants = require("./constants");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const getFiles = (lambdaDir, rules) => _utils.globby.sync(rules, {
   cwd: lambdaDir,
   gitignore: true
-}).map((file) => import_path.default.resolve(lambdaDir, file));
+}).map(file => _path.default.resolve(lambdaDir, file));
+
+exports.getFiles = getFiles;
+
 const getPathFromFilename = (baseDir, filename) => {
   const relativeName = filename.substring(baseDir.length);
-  const relativePath = relativeName.split(".").slice(0, -1).join(".");
-  const nameSplit = relativePath.split(import_path.default.sep).map((item) => {
+  const relativePath = relativeName.split('.').slice(0, -1).join('.');
+  const nameSplit = relativePath.split(_path.default.sep).map(item => {
     if (item.length > 2) {
-      if (item.startsWith("[") && item.endsWith("]")) {
+      if (item.startsWith('[') && item.endsWith(']')) {
         return `:${item.substring(1, item.length - 1)}`;
       }
     }
+
     return item;
   });
-  const name = nameSplit.join("/");
-  const finalName = name.endsWith(import_constants.INDEX_SUFFIX) ? name.substring(0, name.length - import_constants.INDEX_SUFFIX.length) : name;
+  const name = nameSplit.join('/');
+  const finalName = name.endsWith(_constants.INDEX_SUFFIX) ? name.substring(0, name.length - _constants.INDEX_SUFFIX.length) : name;
   return clearRouteName(finalName);
 };
-const clearRouteName = (routeName) => {
+
+exports.getPathFromFilename = getPathFromFilename;
+
+const clearRouteName = routeName => {
   let finalRouteName = routeName.trim();
-  if (!finalRouteName.startsWith("/")) {
+
+  if (!finalRouteName.startsWith('/')) {
     finalRouteName = `/${finalRouteName}`;
   }
-  if (finalRouteName.length > 1 && finalRouteName.endsWith("/")) {
+
+  if (finalRouteName.length > 1 && finalRouteName.endsWith('/')) {
     finalRouteName = finalRouteName.substring(0, finalRouteName.length - 1);
   }
+
   return finalRouteName;
 };
-const isHandler = (input) => input && typeof input === "function";
-const enableRegister = (requireFn) => {
+
+const isHandler = input => input && typeof input === 'function';
+
+exports.isHandler = isHandler;
+
+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) => {
+  return modulePath => {
     if (firstCall) {
-      existTsLoader = Boolean(require.extensions[".ts"]);
+      // 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({
-        extensions: [".ts"]
+      } = require('esbuild-register/dist/node');
+
+      const {
+        unregister
+      } = register({
+        extensions: ['.ts']
       });
-      const requiredModule2 = requireFn(modulePath);
+      const requiredModule = requireFn(modulePath);
       unregister();
-      return requiredModule2;
+      return requiredModule;
     }
+
     const requiredModule = requireFn(modulePath);
     return requiredModule;
   };
 };
-const isFunction = (input) => input && {}.toString.call(input) === "[object Function]";
-const requireHandlerModule = enableRegister((modulePath) => {
-  const originRequire = process.env.NODE_ENV === "test" ? jest.requireActual : require;
-  const module2 = originRequire(modulePath);
-  if (isFunction(module2)) {
-    return { default: module2 };
+
+const isFunction = input => input && {}.toString.call(input) === '[object Function]';
+
+const requireHandlerModule = enableRegister(modulePath => {
+  // 测试环境不走缓存，因为缓存的 h andler 文件，会被 mockAPI 函数进行 mock，升级 jest28，setupFilesAfterEnv 能做异步操作的话，可解此问题
+  const originRequire = process.env.NODE_ENV === 'test' ? jest.requireActual : require;
+  const module = originRequire(modulePath);
+
+  if (isFunction(module)) {
+    return {
+      default: module
+    };
   }
-  return module2;
+
+  return module;
 });
-const routeValue = (routePath) => {
-  if (routePath.includes(":")) {
+exports.requireHandlerModule = requireHandlerModule;
+
+const routeValue = routePath => {
+  if (routePath.includes(':')) {
     return 11;
   }
+
   return 1;
 };
-const sortRoutes = (apiHandlers) => {
+
+const sortRoutes = apiHandlers => {
   return apiHandlers.sort((handlerA, handlerB) => {
     return routeValue(handlerA.routeName) - routeValue(handlerB.routeName);
   });
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getFiles,
-  getPathFromFilename,
-  isHandler,
-  requireHandlerModule,
-  sortRoutes
-});
+
+exports.sortRoutes = sortRoutes;