@modern-js/bff-core 1.21.6 → 1.21.7-beta.0

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

@@ -4,17 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createHttpOperator = exports.Trace = exports.SetHeaders = exports.Redirect = exports.Query = exports.Put = exports.Post = exports.Patch = exports.Params = exports.Option = exports.HttpCode = exports.Headers = exports.Head = exports.Get = exports.Delete = exports.Data = exports.Connect = void 0;
-
 var _types = require("../types");
-
 var _http = require("../errors/http");
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 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; }
-
 const validateInput = async (schema, input) => {
   try {
     return await schema.parseAsync(input);
@@ -22,20 +16,16 @@ const validateInput = async (schema, input) => {
     const {
       z: zod
     } = require('zod');
-
     if (error instanceof zod.ZodError) {
       throw new _http.ValidationError(400, error.message);
     }
-
     throw error;
   }
 };
-
 const createHttpOperator = method => {
   return urlPath => {
     return {
       name: method,
-
       metadata({
         setMetadata
       }) {
@@ -45,11 +35,9 @@ const createHttpOperator = method => {
           method
         });
       }
-
     };
   };
 };
-
 exports.createHttpOperator = createHttpOperator;
 const Get = createHttpOperator(_types.HttpMethod.Get);
 exports.Get = Get;
@@ -69,17 +57,14 @@ const Option = createHttpOperator(_types.HttpMethod.Option);
 exports.Option = Option;
 const Head = createHttpOperator(_types.HttpMethod.Head);
 exports.Head = Head;
-
 const Data = schema => {
   return {
     name: _types.HttpMetadata.Data,
-
     metadata({
       setMetadata
     }) {
       setMetadata(_types.HttpMetadata.Data, schema);
     },
-
     async validate(helper, next) {
       const {
         inputs: {
@@ -91,22 +76,17 @@ const Data = schema => {
       });
       return next();
     }
-
   };
 };
-
 exports.Data = Data;
-
 const Query = schema => {
   return {
     name: _types.HttpMetadata.Query,
-
     metadata({
       setMetadata
     }) {
       setMetadata(_types.HttpMetadata.Query, schema);
     },
-
     async validate(helper, next) {
       const {
         inputs: {
@@ -118,22 +98,17 @@ const Query = schema => {
       });
       return next();
     }
-
   };
 };
-
 exports.Query = Query;
-
 const Params = schema => {
   return {
     name: _types.HttpMetadata.Params,
-
     metadata({
       setMetadata
     }) {
       setMetadata(_types.HttpMetadata.Params, schema);
     },
-
     async validate(helper, next) {
       const {
         inputs: {
@@ -145,22 +120,17 @@ const Params = schema => {
       });
       return next();
     }
-
   };
 };
-
 exports.Params = Params;
-
 const Headers = schema => {
   return {
     name: _types.HttpMetadata.Headers,
-
     metadata({
       setMetadata
     }) {
       setMetadata(_types.HttpMetadata.Headers, schema);
     },
-
     async validate(helper, next) {
       const {
         inputs: {
@@ -172,12 +142,9 @@ const Headers = schema => {
       });
       return next();
     }
-
   };
 };
-
 exports.Headers = Headers;
-
 const setResponseMeta = (helper, type, value) => {
   const responseMetaData = helper.getMetadata(_types.HttpMetadata.Response) || [];
   helper.setMetadata(_types.HttpMetadata.Response, [...responseMetaData, {
@@ -185,42 +152,30 @@ const setResponseMeta = (helper, type, value) => {
     value
   }]);
 };
-
 const HttpCode = statusCode => {
   return {
     name: 'HttpCode',
-
     metadata(helper) {
       setResponseMeta(helper, _types.ResponseMetaType.StatusCode, statusCode);
     }
-
   };
 };
-
 exports.HttpCode = HttpCode;
-
 const SetHeaders = headers => {
   return {
     name: 'SetHeaders',
-
     metadata(helper) {
       setResponseMeta(helper, _types.ResponseMetaType.Headers, headers);
     }
-
   };
 };
-
 exports.SetHeaders = SetHeaders;
-
 const Redirect = url => {
   return {
     name: 'Redirect',
-
     metadata(helper) {
       setResponseMeta(helper, _types.ResponseMetaType.Redirect, url);
     }
-
   };
 };
-
 exports.Redirect = Redirect;

package/dist/js/node/router/constants.js

@@ -4,19 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.INDEX_SUFFIX = exports.FRAMEWORK_MODE_LAMBDA_DIR = exports.FRAMEWORK_MODE_APP_DIR = exports.AllHttpMethods = exports.API_FILE_RULES = exports.API_DIR = exports.APIMode = void 0;
-
 var _types = require("../types");
-
 const AllHttpMethods = Object.values(_types.HttpMethod);
 exports.AllHttpMethods = AllHttpMethods;
 let APIMode;
 exports.APIMode = APIMode;
-
 (function (APIMode) {
   APIMode["FARMEWORK"] = "framework";
   APIMode["FUNCTION"] = "function";
 })(APIMode || (exports.APIMode = APIMode = {}));
-
 const FRAMEWORK_MODE_LAMBDA_DIR = 'lambda';
 exports.FRAMEWORK_MODE_LAMBDA_DIR = FRAMEWORK_MODE_LAMBDA_DIR;
 const FRAMEWORK_MODE_APP_DIR = 'app';

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,56 +52,45 @@ const enableRegister = requireFn => {
       existTsLoader = Boolean(require.extensions['.ts']);
       firstCall = false;
     }
-
     if (!existTsLoader) {
       const {
         register
       } = require('esbuild-register/dist/node');
-
       const {
         unregister
       } = register({
-        extensions: ['.ts']
+        extensions: ['.ts', '.js']
       });
       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;