@modern-js/bff-core 2.0.0-beta.0 → 2.0.0-beta.1

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

@@ -7,19 +7,12 @@ var _exportNames = {
   ApiRouter: true
 };
 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;
@@ -31,11 +24,8 @@ Object.keys(_constants).forEach(function (key) {
     }
   });
 });
-
 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;
@@ -47,54 +37,40 @@ Object.keys(_types2).forEach(function (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: _apiDir,
     lambdaDir: _lambdaDir,
     prefix
   }) {
     _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(_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 _constants.APIMode.FARMEWORK;
       }
-
       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 === _constants.APIMode.FARMEWORK ? _path.default.join(apiDir, _constants.FRAMEWORK_MODE_LAMBDA_DIR) : apiDir;
       return lambdaDir;
     });
-
     this.validateAbsolute(_apiDir, 'apiDir');
     this.validateAbsolute(_lambdaDir, 'lambdaDir');
     this.prefix = this.initPrefix(prefix);
@@ -103,45 +79,34 @@ class ApiRouter {
     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,
@@ -152,105 +117,80 @@ class ApiRouter {
         routePath: this.getRoutePath(this.prefix, routeName)
       };
     }
-
     return null;
-  } // TODO: 性能提升，开发环境，判断下 lambda 目录修改时间
-
+  }
 
+  // TODO: 性能提升，开发环境，判断下 lambda 目录修改时间
   getSafeRoutePath(filename, handler) {
     this.loadApiFiles();
     this.validateValidApifile(filename);
     return this.getRouteName(filename, handler);
   }
-
   getRouteName(filename, handler) {
     if (handler) {
       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`);
         }
-
         return trigger.path;
       }
     }
-
     const routePath = (0, _utils3.getPathFromFilename)(this.lambdaDir, filename);
     return routePath;
   }
-
   getHttpMethod(originHandlerName, handler) {
     if (handler) {
       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 _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:
         _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 [];
-    } // eslint-disable-next-line no-multi-assign
-
-
+    }
+    // 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);
@@ -258,30 +198,25 @@ class ApiRouter {
     (0, _utils2.debug)('apiHandlers', apiHandlers.length, apiHandlers);
     return apiHandlers;
   }
+
   /**
    * 如果用户未传入或传入空串，默认为 /api
    * 如果传入 /，则 prefix 为 /
    */
-
-
   initPrefix(prefix) {
     if (prefix === '/') {
       return '';
     }
-
     return prefix || '/api';
   }
-
   validateAbsolute(filename, paramsName) {
     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));
   }
-
   getModuleInfo(filename) {
     try {
       const module = (0, _utils3.requireHandlerModule)(filename);
@@ -298,12 +233,10 @@ class ApiRouter {
       }
     }
   }
-
   getHandlerInfos(moduleInfos) {
     let apiHandlers = [];
     moduleInfos.forEach(moduleInfo => {
       const handlerInfos = this.getModuleHandlerInfos(moduleInfo);
-
       if (handlerInfos) {
         apiHandlers = apiHandlers.concat(handlerInfos);
       }
@@ -311,7 +244,6 @@ class ApiRouter {
     const sortedHandlers = (0, _utils3.sortRoutes)(apiHandlers);
     return sortedHandlers;
   }
-
   getModuleHandlerInfos(moduleInfo) {
     const {
       module,
@@ -323,23 +255,17 @@ class ApiRouter {
       return 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 '/';
     }
-
     return `${prefix}${finalRouteName}`;
   }
-
 }
-
 exports.ApiRouter = ApiRouter;

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

@@ -4,22 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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 => _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('.');
@@ -29,34 +22,25 @@ const getPathFromFilename = (baseDir, filename) => {
         return `:${item.substring(1, item.length - 1)}`;
       }
     }
-
     return item;
   });
   const name = nameSplit.join('/');
   const finalName = name.endsWith(_constants.INDEX_SUFFIX) ? name.substring(0, name.length - _constants.INDEX_SUFFIX.length) : name;
   return clearRouteName(finalName);
 };
-
 exports.getPathFromFilename = getPathFromFilename;
-
 const clearRouteName = routeName => {
   let finalRouteName = routeName.trim();
-
   if (!finalRouteName.startsWith('/')) {
     finalRouteName = `/${finalRouteName}`;
   }
-
   if (finalRouteName.length > 1 && finalRouteName.endsWith('/')) {
     finalRouteName = finalRouteName.substring(0, finalRouteName.length - 1);
   }
-
   return finalRouteName;
 };
-
 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
@@ -68,54 +52,45 @@ const enableRegister = requireFn => {
       existTsLoader = Boolean(require.extensions['.ts']);
       firstCall = false;
     }
-
     if (!existTsLoader) {
       const {
         register
       } = require('esbuild-register/dist/node');
-
       const {
         unregister
-      } = register({});
+      } = register({
+        extensions: ['.ts']
+      });
       const requiredModule = requireFn(modulePath);
       unregister();
       return requiredModule;
     }
-
     const requiredModule = requireFn(modulePath);
     return requiredModule;
   };
 };
-
 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 module;
 });
 exports.requireHandlerModule = requireHandlerModule;
-
 const routeValue = routePath => {
   if (routePath.includes(':')) {
     return 11;
   }
-
   return 1;
 };
-
 const sortRoutes = apiHandlers => {
   return apiHandlers.sort((handlerA, handlerB) => {
     return routeValue(handlerA.routeName) - routeValue(handlerB.routeName);
   });
 };
-
 exports.sortRoutes = sortRoutes;

package/dist/js/node/types.js

@@ -6,22 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 exports.httpMethods = exports.TriggerType = exports.ResponseMetaType = exports.OperatorType = exports.HttpMethod = exports.HttpMetadata = void 0;
 let OperatorType;
 exports.OperatorType = OperatorType;
-
 (function (OperatorType) {
   OperatorType[OperatorType["Trigger"] = 0] = "Trigger";
   OperatorType[OperatorType["Middleware"] = 1] = "Middleware";
 })(OperatorType || (exports.OperatorType = OperatorType = {}));
-
 let TriggerType;
 exports.TriggerType = TriggerType;
-
 (function (TriggerType) {
   TriggerType[TriggerType["Http"] = 0] = "Http";
 })(TriggerType || (exports.TriggerType = TriggerType = {}));
-
 let HttpMetadata;
 exports.HttpMetadata = HttpMetadata;
-
 (function (HttpMetadata) {
   HttpMetadata["Method"] = "METHOD";
   HttpMetadata["Data"] = "DATA";
@@ -30,19 +25,15 @@ exports.HttpMetadata = HttpMetadata;
   HttpMetadata["Headers"] = "HEADERS";
   HttpMetadata["Response"] = "RESPONSE";
 })(HttpMetadata || (exports.HttpMetadata = HttpMetadata = {}));
-
 let ResponseMetaType;
 exports.ResponseMetaType = ResponseMetaType;
-
 (function (ResponseMetaType) {
   ResponseMetaType[ResponseMetaType["StatusCode"] = 0] = "StatusCode";
   ResponseMetaType[ResponseMetaType["Redirect"] = 1] = "Redirect";
   ResponseMetaType[ResponseMetaType["Headers"] = 2] = "Headers";
 })(ResponseMetaType || (exports.ResponseMetaType = ResponseMetaType = {}));
-
 let HttpMethod;
 exports.HttpMethod = HttpMethod;
-
 (function (HttpMethod) {
   HttpMethod["Get"] = "GET";
   HttpMethod["Post"] = "POST";
@@ -54,6 +45,5 @@ exports.HttpMethod = HttpMethod;
   HttpMethod["Option"] = "OPTION";
   HttpMethod["Head"] = "HEAD";
 })(HttpMethod || (exports.HttpMethod = HttpMethod = {}));
-
 const httpMethods = Object.values(HttpMethod);
 exports.httpMethods = httpMethods;

package/dist/js/node/utils/alias.js

@@ -4,24 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.registerPaths = exports.getRelativeRuntimePath = exports.createMatchPath = void 0;
-
 var path = _interopRequireWildcard(require("path"));
-
 var os = _interopRequireWildcard(require("os"));
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _module = _interopRequireDefault(require("module"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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 getRelativeRuntimePath = (appDirectory, serverRuntimePath) => {
   let relativeRuntimePath = '';
-
   if (os.platform() === 'win32') {
     // isRelative function in babel-plugin-resolver plugin can't handle windows relative path correctly, see babel-plugin-resolver's utils.
     relativeRuntimePath = `../${path.relative(appDirectory, serverRuntimePath)}`;
@@ -29,20 +20,15 @@ const getRelativeRuntimePath = (appDirectory, serverRuntimePath) => {
     // Look up one level, because the artifacts after build have dist directories
     relativeRuntimePath = path.join('../', path.relative(appDirectory, serverRuntimePath));
   }
-
   if (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') {
     relativeRuntimePath = `./${path.relative(appDirectory, serverRuntimePath)}`;
   }
-
   return relativeRuntimePath;
 };
-
 exports.getRelativeRuntimePath = getRelativeRuntimePath;
-
 const sortByLongestPrefix = arr => {
   return arr.concat().sort((a, b) => b.length - a.length);
 };
-
 const createMatchPath = paths => {
   const sortedKeys = sortByLongestPrefix(Object.keys(paths));
   const sortedPaths = {};
@@ -53,63 +39,48 @@ const createMatchPath = paths => {
     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.default.existsSync(foundPath)) {
           return foundPath;
         }
       }
-
       return request.replace(found, foundPaths[0]);
     }
-
     return null;
   };
-}; // every path must be a absolute path;
-
+};
 
+// every path must be a absolute path;
 exports.createMatchPath = createMatchPath;
-
 const registerPaths = paths => {
-  const originalResolveFilename = _module.default._resolveFilename; // eslint-disable-next-line node/no-unsupported-features/node-builtins
-
+  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
-
-
+    }
+    // eslint-disable-next-line prefer-rest-params
     return originalResolveFilename.apply(this, arguments);
   };
-
   return () => {
     _module.default._resolveFilename = originalResolveFilename;
   };
 };
-
 exports.registerPaths = registerPaths;

package/dist/js/node/utils/debug.js

@@ -4,8 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.debug = void 0;
-
 var _utils = require("@modern-js/utils");
-
 const debug = (0, _utils.createDebugger)('bff');
 exports.debug = debug;

package/dist/js/node/utils/index.js

@@ -12,9 +12,7 @@ Object.defineProperty(exports, "debug", {
     return _debug.debug;
   }
 });
-
 var _storage = require("./storage");
-
 Object.keys(_storage).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -26,9 +24,7 @@ Object.keys(_storage).forEach(function (key) {
     }
   });
 });
-
 var _alias = require("./alias");
-
 Object.keys(_alias).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -40,11 +36,8 @@ Object.keys(_alias).forEach(function (key) {
     }
   });
 });
-
 var _debug = require("./debug");
-
 var _meta = require("./meta");
-
 Object.keys(_meta).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -56,9 +49,7 @@ Object.keys(_meta).forEach(function (key) {
     }
   });
 });
-
 var _validate = require("./validate");
-
 Object.keys(_validate).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;

package/dist/js/node/utils/meta.js

@@ -6,9 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.isWithMetaHandler = exports.HANDLER_WITH_META = void 0;
 const HANDLER_WITH_META = 'HANDLER_WITH_META';
 exports.HANDLER_WITH_META = HANDLER_WITH_META;
-
 const isWithMetaHandler = handler => {
   return typeof handler === 'function' && handler[HANDLER_WITH_META];
 };
-
 exports.isWithMetaHandler = isWithMetaHandler;