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

package/CHANGELOG.md

@@ -1,87 +1,41 @@
 # @modern-js/bff-core
 
-## 2.0.0-beta.2
-
-### Major Changes
-
-- dda38c9c3e: chore: v2
+## 1.22.1
 
 ### Patch Changes
 
-- 2344eb2: fix: esbuild should not handle js files
-  fix: esbuild 不应该处理非 js 文件
-- a2509bfbdb: feat: bump esbuild from 0.14.38 to 0.15.7
-
-  feat: 将 esbuild 从 0.14.38 版本升级至 0.15.7 版本
+- @modern-js/bff-runtime@1.22.1
+- @modern-js/utils@1.22.1
 
-- Updated dependencies [92f0ead]
-- Updated dependencies [edd1cfb1af]
-- Updated dependencies [cc971eabfc]
-- Updated dependencies [5b9049f2e9]
-- Updated dependencies [92004d1]
-- Updated dependencies [b8bbe036c7]
-- Updated dependencies [d5a31df781]
-- Updated dependencies [dda38c9c3e]
-- Updated dependencies [3bbea92b2a]
-- Updated dependencies [abf3421a75]
-- Updated dependencies [543be9558e]
-- Updated dependencies [14b712da84]
-  - @modern-js/utils@2.0.0-beta.2
-  - @modern-js/bff-runtime@2.0.0-beta.2
+## 1.21.6
 
-## 2.0.0-beta.1
+### Patch Changes
 
-### Major Changes
+- @modern-js/bff-runtime@1.21.6
+- @modern-js/utils@1.21.6
 
-- dda38c9: chore: v2
+## 1.21.5
 
 ### Patch Changes
 
-- 2344eb2: fix: esbuild should not handle js files
+- 4876aa7: fix: esbuild should not handle js files
   fix: esbuild 不应该处理非 js 文件
-- a2509bfbdb: feat: bump esbuild from 0.14.38 to 0.15.7
-
-  feat: 将 esbuild 从 0.14.38 版本升级至 0.15.7 版本
+  - @modern-js/bff-runtime@1.21.5
+  - @modern-js/utils@1.21.5
 
-- Updated dependencies [92f0ead]
-- Updated dependencies [edd1cfb1af]
-- Updated dependencies [cc971eabfc]
-- Updated dependencies [5b9049f]
-- Updated dependencies [92004d1]
-- Updated dependencies [b8bbe036c7]
-- Updated dependencies [d5a31df781]
-- Updated dependencies [dda38c9]
-- Updated dependencies [3bbea92b2a]
-- Updated dependencies [abf3421]
-- Updated dependencies [543be9558e]
-- Updated dependencies [14b712d]
-  - @modern-js/utils@2.0.0-beta.1
-  - @modern-js/bff-runtime@2.0.0-beta.1
+## 1.21.4
 
-## 2.0.0-beta.0
+### Patch Changes
 
-### Major Changes
+- @modern-js/bff-runtime@1.21.4
+- @modern-js/utils@1.21.4
 
-- dda38c9: chore: v2
+## 1.21.3
 
 ### Patch Changes
 
-- a2509bf: feat: bump esbuild from 0.14.38 to 0.15.7
-
-  feat: 将 esbuild 从 0.14.38 版本升级至 0.15.7 版本
-
-- Updated dependencies [edd1cfb1a]
-- Updated dependencies [cc971eabf]
-- Updated dependencies [5b9049f]
-- Updated dependencies [b8bbe036c]
-- Updated dependencies [d5a31df78]
-- Updated dependencies [dda38c9]
-- Updated dependencies [3bbea92b2]
-- Updated dependencies [abf3421]
-- Updated dependencies [543be95]
-- Updated dependencies [14b712d]
-  - @modern-js/utils@2.0.0-beta.0
-  - @modern-js/bff-runtime@2.0.0-beta.0
+- @modern-js/bff-runtime@1.21.3
+- @modern-js/utils@1.21.3
 
 ## 1.21.2
 

package/dist/js/modern/api.js

@@ -9,27 +9,35 @@ export function Api(...args) {
     getMetadata(key) {
       return Reflect.getMetadata(key, runner);
     },
+
     setMetadata(key, value) {
       return Reflect.defineMetadata(key, value, runner);
     }
+
   };
+
   for (const operator of operators) {
     if (operator.metadata) {
       operator.metadata(metadataHelper);
     }
   }
+
   const validateHandlers = operators.filter(operator => operator.validate).map(operator => operator.validate);
   const pipeHandlers = operators.filter(operator => operator.execute).map(operator => operator.execute);
+
   async function runner(inputs) {
     const executeHelper = {
       result: null,
+
       get inputs() {
         return inputs;
       },
+
       set inputs(val) {
         // eslint-disable-next-line no-param-reassign
         inputs = val;
       }
+
     };
     const stack = [...validateHandlers, ...pipeHandlers];
     stack.push(async (helper, next) => {
@@ -40,6 +48,7 @@ export function Api(...args) {
     await compose(stack)(executeHelper);
     return executeHelper.result;
   }
+
   runner[HANDLER_WITH_META] = true;
   return runner;
 }

package/dist/js/modern/client/generate-client.js

@@ -18,21 +18,27 @@ export const generateClient = async ({
   } else {
     // 这里约束传入的 requestCreator 包也必须有两个导出 client 和 server，因为目前的机制 client 和 server 要导出不同的 configure 函数；该 api 不对使用者暴露，后续可优化
     let resolvedPath = requestCreator;
+
     try {
       resolvedPath = path.dirname(_requireResolve(requestCreator));
-    } catch (error) {}
-    // eslint-disable-next-line no-param-reassign
+    } catch (error) {} // eslint-disable-next-line no-param-reassign
+
+
     requestCreator = `${resolvedPath}${target ? `/${target}` : ''}`.replace(/\\/g, '/');
   }
+
   const apiRouter = new ApiRouter({
     apiDir,
     prefix
   });
   const handlerInfos = apiRouter.getSingleModuleHandlers(resourcePath);
+
   if (!handlerInfos) {
     return Err(`generate client error: Cannot require module ${resourcePath}`);
   }
+
   let handlersCode = '';
+
   for (const handlerInfo of handlerInfos) {
     const {
       name,
@@ -40,14 +46,17 @@ export const generateClient = async ({
       routePath
     } = handlerInfo;
     let exportStatement = `const ${name} =`;
+
     if (name.toLowerCase() === 'default') {
       exportStatement = 'default';
     }
+
     const upperHttpMethod = httpMethod.toUpperCase();
     const routeName = routePath;
     handlersCode += `export ${exportStatement} createRequest('${routeName}', '${upperHttpMethod}', process.env.PORT || ${String(port)}${fetcher ? `, fetch` : ''});
 `;
   }
+
   const importCode = `import { createRequest } from '${requestCreator}';
 ${fetcher ? `import { fetch } from '${fetcher}';\n` : ''}`;
   return Ok(`${importCode}\n${handlersCode}`);

package/dist/js/modern/client/result.js

@@ -7,9 +7,8 @@ export const Err = value => {
     isOk: false
   };
   return err;
-};
+}; // eslint-disable-next-line @typescript-eslint/no-redeclare
 
-// eslint-disable-next-line @typescript-eslint/no-redeclare
 export const Ok = value => {
   const ok = {
     kind: 'Ok',

package/dist/js/modern/errors/http.js

@@ -1,15 +1,22 @@
 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; }
+
 export class HttpError extends Error {
   constructor(status, message) {
     super(message);
+
     _defineProperty(this, "status", void 0);
+
     this.status = status;
   }
+
 }
 export class ValidationError extends HttpError {
   constructor(status, message) {
     super(status, message);
+
     _defineProperty(this, "code", void 0);
+
     this.code = 'VALIDATION_ERROR';
   }
+
 }

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

@@ -1,8 +1,12 @@
 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; }
+
 import { HttpMetadata, OperatorType, HttpMethod, TriggerType, ResponseMetaType } from "../types";
 import { ValidationError } from "../errors/http";
+
 const validateInput = async (schema, input) => {
   try {
     return await schema.parseAsync(input);
@@ -10,16 +14,20 @@ const validateInput = async (schema, input) => {
     const {
       z: zod
     } = require('zod');
+
     if (error instanceof zod.ZodError) {
       throw new ValidationError(400, error.message);
     }
+
     throw error;
   }
 };
+
 export const createHttpOperator = method => {
   return urlPath => {
     return {
       name: method,
+
       metadata({
         setMetadata
       }) {
@@ -29,6 +37,7 @@ export const createHttpOperator = method => {
           method
         });
       }
+
     };
   };
 };
@@ -44,11 +53,13 @@ export const Head = createHttpOperator(HttpMethod.Head);
 export const Data = schema => {
   return {
     name: HttpMetadata.Data,
+
     metadata({
       setMetadata
     }) {
       setMetadata(HttpMetadata.Data, schema);
     },
+
     async validate(helper, next) {
       const {
         inputs: {
@@ -60,16 +71,19 @@ export const Data = schema => {
       });
       return next();
     }
+
   };
 };
 export const Query = schema => {
   return {
     name: HttpMetadata.Query,
+
     metadata({
       setMetadata
     }) {
       setMetadata(HttpMetadata.Query, schema);
     },
+
     async validate(helper, next) {
       const {
         inputs: {
@@ -81,16 +95,19 @@ export const Query = schema => {
       });
       return next();
     }
+
   };
 };
 export const Params = schema => {
   return {
     name: HttpMetadata.Params,
+
     metadata({
       setMetadata
     }) {
       setMetadata(HttpMetadata.Params, schema);
     },
+
     async validate(helper, next) {
       const {
         inputs: {
@@ -102,16 +119,19 @@ export const Params = schema => {
       });
       return next();
     }
+
   };
 };
 export const Headers = schema => {
   return {
     name: HttpMetadata.Headers,
+
     metadata({
       setMetadata
     }) {
       setMetadata(HttpMetadata.Headers, schema);
     },
+
     async validate(helper, next) {
       const {
         inputs: {
@@ -123,8 +143,10 @@ export const Headers = schema => {
       });
       return next();
     }
+
   };
 };
+
 const setResponseMeta = (helper, type, value) => {
   const responseMetaData = helper.getMetadata(HttpMetadata.Response) || [];
   helper.setMetadata(HttpMetadata.Response, [...responseMetaData, {
@@ -132,27 +154,34 @@ const setResponseMeta = (helper, type, value) => {
     value
   }]);
 };
+
 export const HttpCode = statusCode => {
   return {
     name: 'HttpCode',
+
     metadata(helper) {
       setResponseMeta(helper, ResponseMetaType.StatusCode, statusCode);
     }
+
   };
 };
 export const SetHeaders = headers => {
   return {
     name: 'SetHeaders',
+
     metadata(helper) {
       setResponseMeta(helper, ResponseMetaType.Headers, headers);
     }
+
   };
 };
 export const Redirect = url => {
   return {
     name: 'Redirect',
+
     metadata(helper) {
       setResponseMeta(helper, ResponseMetaType.Redirect, url);
     }
+
   };
 };

package/dist/js/modern/router/constants.js

@@ -1,10 +1,12 @@
 import { HttpMethod } from "../types";
 export const AllHttpMethods = Object.values(HttpMethod);
 export let APIMode;
+
 (function (APIMode) {
   APIMode["FARMEWORK"] = "framework";
   APIMode["FUNCTION"] = "function";
 })(APIMode || (APIMode = {}));
+
 export const FRAMEWORK_MODE_LAMBDA_DIR = 'lambda';
 export const FRAMEWORK_MODE_APP_DIR = 'app';
 export const INDEX_SUFFIX = 'index';

package/dist/js/modern/router/index.js

@@ -1,4 +1,5 @@
 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; }
+
 import path from 'path';
 import { fs, logger } from '@modern-js/utils';
 import 'reflect-metadata';
@@ -10,36 +11,47 @@ export * from "./types";
 export * from "./constants";
 export 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(FRAMEWORK_MODE_LAMBDA_DIR);
       const existAppDir = exist(FRAMEWORK_MODE_APP_DIR);
       const existAppFile = exist('app.ts') || exist('app.js');
+
       if (existLambdaDir || existAppDir || existAppFile) {
         return APIMode.FARMEWORK;
       }
+
       return APIMode.FUNCTION;
     });
+
     _defineProperty(this, "createExistChecker", base => target => fs.pathExistsSync(path.resolve(base, target)));
+
     _defineProperty(this, "getExactLambdaDir", apiDir => {
       if (this.lambdaDir) {
         return this.lambdaDir;
       }
+
       const lambdaDir = this.apiMode === APIMode.FARMEWORK ? path.join(apiDir, FRAMEWORK_MODE_LAMBDA_DIR) : apiDir;
       return lambdaDir;
     });
+
     this.validateAbsolute(_apiDir, 'apiDir');
     this.validateAbsolute(_lambdaDir, 'lambdaDir');
     this.prefix = this.initPrefix(prefix);
@@ -48,34 +60,45 @@ export class ApiRouter {
     this.lambdaDir = _lambdaDir || this.getExactLambdaDir(this.apiDir);
     this.existLambdaDir = 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,
@@ -86,80 +109,104 @@ export 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(OperatorType.Trigger, handler);
+
       if (trigger && trigger.type === TriggerType.Http) {
         if (!trigger.path) {
           throw new Error(`The http trigger ${trigger.name} needs to specify a path`);
         }
+
         return trigger.path;
       }
     }
+
     const routePath = getPathFromFilename(this.lambdaDir, filename);
     return routePath;
   }
+
   getHttpMethod(originHandlerName, handler) {
     if (handler) {
       const trigger = Reflect.getMetadata(OperatorType.Trigger, handler);
+
       if (trigger && httpMethods.includes(trigger.method)) {
         return trigger.method;
       }
     }
+
     const upperName = originHandlerName.toUpperCase();
+
     switch (upperName) {
       case 'GET':
         return HttpMethod.Get;
+
       case 'POST':
         return HttpMethod.Post;
+
       case 'PUT':
         return HttpMethod.Put;
+
       case 'DELETE':
       case 'DEL':
         return HttpMethod.Delete;
+
       case 'CONNECT':
         return HttpMethod.Connect;
+
       case 'TRACE':
         return HttpMethod.Trace;
+
       case 'PATCH':
         return HttpMethod.Patch;
+
       case 'OPTION':
         return HttpMethod.Option;
+
       case 'DEFAULT':
         {
           return HttpMethod.Get;
         }
+
       default:
         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 = getFiles(this.lambdaDir, 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);
@@ -167,25 +214,30 @@ export class ApiRouter {
     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.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 = requireHandlerModule(filename);
@@ -202,10 +254,12 @@ export class ApiRouter {
       }
     }
   }
+
   getHandlerInfos(moduleInfos) {
     let apiHandlers = [];
     moduleInfos.forEach(moduleInfo => {
       const handlerInfos = this.getModuleHandlerInfos(moduleInfo);
+
       if (handlerInfos) {
         apiHandlers = apiHandlers.concat(handlerInfos);
       }
@@ -213,6 +267,7 @@ export class ApiRouter {
     const sortedHandlers = sortRoutes(apiHandlers);
     return sortedHandlers;
   }
+
   getModuleHandlerInfos(moduleInfo) {
     const {
       module,
@@ -224,16 +279,21 @@ export 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}`;
   }
+
 }