@modern-js/bff-core 1.0.1-beta.5 → 1.0.1-beta.6

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

@@ -6,10 +6,10 @@ const validateInput = async (schema, input) => {
     await schema.parseAsync(input);
   } catch (error) {
     const {
-      z
-    } = await import('zod');
+      z: zod
+    } = require('zod');
 
-    if (error instanceof z.ZodError) {
+    if (error instanceof zod.ZodError) {
       throw new ValidationError(400, error.message);
     }
 

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

@@ -47,9 +47,10 @@ export const requireHandlerModule = modulePath => {
 
   const {
     unregister
-  } = register({});
+  } = register({}); // 测试环境不走缓存，因为缓存的 handler 文件，会被 mockAPI 函数进行 mock，升级 jest28，setupFilesAfterEnv 能做异步操作的话，可解此问题
 
-  const module = require(modulePath);
+  const originRequire = process.env.NODE_ENV === 'test' ? jest.requireActual : require;
+  const module = originRequire(modulePath);
 
   if (isFunction(module)) {
     return {

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

@@ -9,19 +9,15 @@ var _types = require("../types");
 
 var _http = require("../errors/http");
 
-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 validateInput = async (schema, input) => {
   try {
     await schema.parseAsync(input);
   } catch (error) {
     const {
-      z
-    } = await Promise.resolve().then(() => _interopRequireWildcard(require('zod')));
+      z: zod
+    } = require('zod');
 
-    if (error instanceof z.ZodError) {
+    if (error instanceof zod.ZodError) {
       throw new _http.ValidationError(400, error.message);
     }
 

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

@@ -66,9 +66,10 @@ const requireHandlerModule = modulePath => {
 
   const {
     unregister
-  } = register({});
+  } = register({}); // 测试环境不走缓存，因为缓存的 handler 文件，会被 mockAPI 函数进行 mock，升级 jest28，setupFilesAfterEnv 能做异步操作的话，可解此问题
 
-  const module = require(modulePath);
+  const originRequire = process.env.NODE_ENV === 'test' ? jest.requireActual : require;
+  const module = originRequire(modulePath);
 
   if (isFunction(module)) {
     return {

package/dist/types/client/result.d.ts

@@ -1,15 +1,15 @@
-export declare type Err<T = any> = {
+export declare type Err<T = unknown> = {
   kind: 'Err';
   value: T;
   isErr: true;
   isOk: false;
 };
-export declare type Ok<T = any> = {
+export declare type Ok<T = unknown> = {
   kind: 'Ok';
   value: T;
   isErr: false;
   isOk: true;
 };
-export declare type Result<T = any, E = string> = Err<E> | Ok<T>;
+export declare type Result<T = unknown, E = string> = Err<E> | Ok<T>;
 export declare const Err: <E = string>(value: E) => Err<E>;
 export declare const Ok: <T, E = string>(value: T) => Result<T, E>;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.0.1-beta.5",
+  "version": "1.0.1-beta.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -29,7 +29,6 @@
     "@modern-js/utils": "^1.7.6",
     "esbuild": "^0.14.38",
     "esbuild-register": "^3.3.3",
-    "http-errors": "^2.0.0",
     "koa-compose": "^4.1.0",
     "reflect-metadata": "^0.1.13"
   },