@modern-js/bff-core 1.2.1-beta.2 → 1.2.2-beta.1

package/dist/js/modern/api.js

@@ -41,7 +41,7 @@ export function Api(...args) {
     };
     const stack = [...validateHandlers, ...pipeHandlers];
     stack.push(async (helper, next) => {
-      const res = await handler(inputs);
+      const res = await handler(helper.inputs);
       helper.result = res;
       return next();
     });

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

@@ -1,9 +1,15 @@
+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 {
-    await schema.parseAsync(input);
+    return await schema.parseAsync(input);
   } catch (error) {
     const {
       z: zod
@@ -56,12 +62,13 @@ export const Data = schema => {
 
     async validate(helper, next) {
       const {
-        inputs
+        inputs: {
+          data
+        }
       } = helper;
-      const {
-        data
-      } = inputs;
-      await validateInput(schema, data);
+      helper.inputs = _objectSpread(_objectSpread({}, helper.inputs), {}, {
+        data: await validateInput(schema, data)
+      });
       return next();
     }
 
@@ -79,12 +86,13 @@ export const Query = schema => {
 
     async validate(helper, next) {
       const {
-        inputs
+        inputs: {
+          query
+        }
       } = helper;
-      const {
-        query
-      } = inputs;
-      await validateInput(schema, query);
+      helper.inputs = _objectSpread(_objectSpread({}, helper.inputs), {}, {
+        query: await validateInput(schema, query)
+      });
       return next();
     }
 
@@ -102,12 +110,13 @@ export const Params = schema => {
 
     async validate(helper, next) {
       const {
-        inputs
+        inputs: {
+          params
+        }
       } = helper;
-      const {
-        params
-      } = inputs;
-      await validateInput(schema, params);
+      helper.inputs = _objectSpread(_objectSpread({}, helper.inputs), {}, {
+        params: await validateInput(schema, params)
+      });
       return next();
     }
 
@@ -125,12 +134,13 @@ export const Headers = schema => {
 
     async validate(helper, next) {
       const {
-        inputs
+        inputs: {
+          headers
+        }
       } = helper;
-      const {
-        headers
-      } = inputs;
-      await validateInput(schema, headers);
+      helper.inputs = _objectSpread(_objectSpread({}, helper.inputs), {}, {
+        headers: await validateInput(schema, headers)
+      });
       return next();
     }
 

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

@@ -70,8 +70,10 @@ const enableRegister = requireFn => {
 
 const isFunction = input => input && {}.toString.call(input) === '[object Function]';
 
-export const requireHandlerModule = enableRegister(modulePath => {
-  const module = require(modulePath);
+export const requireHandlerModule = modulePath => {
+  // 测试环境不走缓存，因为缓存的 handler 文件，会被 mockAPI 函数进行 mock，升级 jest28，setupFilesAfterEnv 能做异步操作的话，可解此问题
+  const originRequire = process.env.NODE_ENV === 'test' ? jest.requireActual : require;
+  const module = originRequire(modulePath);
 
   if (isFunction(module)) {
     return {
@@ -80,7 +82,7 @@ export const requireHandlerModule = enableRegister(modulePath => {
   }
 
   return module;
-});
+};
 
 const routeValue = routePath => {
   if (routePath.includes(':')) {

package/dist/js/node/api.js

@@ -53,7 +53,7 @@ function Api(...args) {
     };
     const stack = [...validateHandlers, ...pipeHandlers];
     stack.push(async (helper, next) => {
-      const res = await handler(inputs);
+      const res = await handler(helper.inputs);
       helper.result = res;
       return next();
     });

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

@@ -9,9 +9,15 @@ 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 {
-    await schema.parseAsync(input);
+    return await schema.parseAsync(input);
   } catch (error) {
     const {
       z: zod
@@ -76,12 +82,13 @@ const Data = schema => {
 
     async validate(helper, next) {
       const {
-        inputs
+        inputs: {
+          data
+        }
       } = helper;
-      const {
-        data
-      } = inputs;
-      await validateInput(schema, data);
+      helper.inputs = _objectSpread(_objectSpread({}, helper.inputs), {}, {
+        data: await validateInput(schema, data)
+      });
       return next();
     }
 
@@ -102,12 +109,13 @@ const Query = schema => {
 
     async validate(helper, next) {
       const {
-        inputs
+        inputs: {
+          query
+        }
       } = helper;
-      const {
-        query
-      } = inputs;
-      await validateInput(schema, query);
+      helper.inputs = _objectSpread(_objectSpread({}, helper.inputs), {}, {
+        query: await validateInput(schema, query)
+      });
       return next();
     }
 
@@ -128,12 +136,13 @@ const Params = schema => {
 
     async validate(helper, next) {
       const {
-        inputs
+        inputs: {
+          params
+        }
       } = helper;
-      const {
-        params
-      } = inputs;
-      await validateInput(schema, params);
+      helper.inputs = _objectSpread(_objectSpread({}, helper.inputs), {}, {
+        params: await validateInput(schema, params)
+      });
       return next();
     }
 
@@ -154,12 +163,13 @@ const Headers = schema => {
 
     async validate(helper, next) {
       const {
-        inputs
+        inputs: {
+          headers
+        }
       } = helper;
-      const {
-        headers
-      } = inputs;
-      await validateInput(schema, headers);
+      helper.inputs = _objectSpread(_objectSpread({}, helper.inputs), {}, {
+        headers: await validateInput(schema, headers)
+      });
       return next();
     }
 

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

@@ -89,8 +89,10 @@ const enableRegister = requireFn => {
 
 const isFunction = input => input && {}.toString.call(input) === '[object Function]';
 
-const requireHandlerModule = enableRegister(modulePath => {
-  const module = require(modulePath);
+const requireHandlerModule = modulePath => {
+  // 测试环境不走缓存，因为缓存的 handler 文件，会被 mockAPI 函数进行 mock，升级 jest28，setupFilesAfterEnv 能做异步操作的话，可解此问题
+  const originRequire = process.env.NODE_ENV === 'test' ? jest.requireActual : require;
+  const module = originRequire(modulePath);
 
   if (isFunction(module)) {
     return {
@@ -99,7 +101,8 @@ const requireHandlerModule = enableRegister(modulePath => {
   }
 
   return module;
-});
+};
+
 exports.requireHandlerModule = requireHandlerModule;
 
 const routeValue = routePath => {

package/dist/types/api.d.ts

@@ -1,3 +1,3 @@
 import 'reflect-metadata';
-import type { ApiRunner, ArrayToObject, ExtractInputType, Operator, MaybeAsync } from './types';
-export declare function Api<Operators extends Operator<any>[], Res extends MaybeAsync<any>>(...args: [...operators: Operators, handler: (arg: ArrayToObject<ExtractInputType<Operators>>) => Res]): ApiRunner<ExtractInputType<Operators> extends void[] ? void : ArrayToObject<ExtractInputType<Operators>>, Res>;
+import type { ApiRunner, ArrayToObject, ExtractInputType, ExtractOuputType, Operator, MaybeAsync } from './types';
+export declare function Api<Operators extends Operator<any, any>[], Res extends MaybeAsync<any>>(...args: [...operators: Operators, handler: (arg: ArrayToObject<ExtractOuputType<Operators>>) => Res]): ApiRunner<ExtractInputType<Operators> extends void[] ? void : ArrayToObject<ExtractInputType<Operators>>, Res>;

package/dist/types/operators/http.d.ts

@@ -14,17 +14,25 @@ export declare const Trace: (urlPath: string) => Operator<void>;
 export declare const Patch: (urlPath: string) => Operator<void>;
 export declare const Option: (urlPath: string) => Operator<void>;
 export declare const Head: (urlPath: string) => Operator<void>;
-export declare const Data: <T>(schema: z.ZodType<T, z.ZodTypeDef, T>) => Operator<{
-  data: T;
+export declare const Data: <Schema extends z.ZodType<any, z.ZodTypeDef, any>>(schema: Schema) => Operator<{
+  data: z.input<Schema>;
+}, {
+  data: z.output<Schema>;
 }>;
-export declare const Query: <T>(schema: z.ZodType<T, z.ZodTypeDef, T>) => Operator<{
-  query: T;
+export declare const Query: <Schema extends z.ZodType<any, z.ZodTypeDef, any>>(schema: Schema) => Operator<{
+  query: z.input<Schema>;
+}, {
+  query: z.output<Schema>;
 }>;
-export declare const Params: <T>(schema: z.ZodType<T, z.ZodTypeDef, T>) => Operator<{
-  params: T;
+export declare const Params: <Schema extends z.ZodType<any, z.ZodTypeDef, any>>(schema: Schema) => Operator<{
+  params: z.input<Schema>;
+}, {
+  params: z.output<Schema>;
 }>;
-export declare const Headers: <T>(schema: z.ZodType<T, z.ZodTypeDef, T>) => Operator<{
-  headers: T;
+export declare const Headers: <Schema extends z.ZodType<any, z.ZodTypeDef, any>>(schema: Schema) => Operator<{
+  headers: z.input<Schema>;
+}, {
+  headers: z.output<Schema>;
 }>;
 export declare const HttpCode: (statusCode: number) => Operator<void>;
 export declare const SetHeaders: (headers: Record<string, string>) => Operator<void>;

package/dist/types/router/utils.d.ts

@@ -1,10 +1,10 @@
-import { APIHandlerInfo, HandlerModule } from './types';
+import { APIHandlerInfo } 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) => HandlerModule;
+export declare const requireHandlerModule: (modulePath: string) => any;
 export declare const sortRoutes: (apiHandlers: APIHandlerInfo[]) => APIHandlerInfo[];
 export {};

package/dist/types/types.d.ts

@@ -31,26 +31,28 @@ export declare enum HttpMethod {
   Head = "HEAD",
 }
 export declare type InputSchemaMeata = Extract<HttpMetadata, HttpMetadata.Data | HttpMetadata.Query | HttpMetadata.Headers | HttpMetadata.Params>;
-export declare type ExecuteFunc = (helper: ExecuteHelper, next: () => Promise<any>) => Promise<any>;
-export declare type ExecuteHelper = {
+export declare type ExecuteFunc<Outputs> = (helper: ExecuteHelper<Outputs>, next: () => Promise<any>) => Promise<any>;
+export declare type ExecuteHelper<Outputs> = {
   result?: any;
-  inputs: any;
+  inputs: Outputs;
 };
 export declare type MetadataHelper = {
   setMetadata: <T = any>(key: any, value: T) => void;
   getMetadata: <T = any>(key: any) => T;
 };
-export declare type Operator<Input> = {
+export declare type Operator<Input = any, Output = Input> = {
   name: string;
   inputType?: Input;
+  outputType?: Output;
   metadata?: (helper: MetadataHelper) => void;
-  validate?: ExecuteFunc;
-  execute?: ExecuteFunc;
+  validate?: ExecuteFunc<Output>;
+  execute?: ExecuteFunc<Output>;
 };
 export declare type MaybeAsync<T> = Promise<T> | T;
 export declare type ApiRunner<Input extends object | void | unknown, Output extends MaybeAsync<any>> = (...args: Input extends void ? never : [input: Input]) => Output;
 export declare type NonNullable<T> = Exclude<T, null | undefined>;
-export declare type ExtractInputType<T> = { [key in keyof T]: T[key] extends Operator<any> ? NonNullable<T[key]['inputType']> : void };
+export declare type ExtractInputType<T> = { [key in keyof T]: T[key] extends Operator<any, any> ? NonNullable<T[key]['inputType']> : void };
+export declare type ExtractOuputType<T> = { [key in keyof T]: T[key] extends Operator<any, any> ? NonNullable<T[key]['outputType']> : void };
 export declare type ArrayToObject<T, R = {}> = T extends [infer First, ...infer Rest] ? First extends PromiseLike<infer PromiseValue> ? PromiseValue : First extends object ? Merge<First, ArrayToObject<Rest, R>> : ArrayToObject<Rest, R> : R;
 export declare type AsyncFunction = (...args: any[]) => Promise<any>;
 export declare const httpMethods: HttpMethod[];

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.1-beta.2",
+  "version": "1.2.2-beta.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",