@modern-js/bff-core 2.58.0 → 2.58.2

package/dist/cjs/client/generateClient.js

@@ -54,7 +54,7 @@ const generateClient = async ({ appDir, resourcePath, apiDir, lambdaDir, prefix,
     prefix,
     httpMethodDecider
   });
-  const handlerInfos = apiRouter.getSingleModuleHandlers(resourcePath);
+  const handlerInfos = await apiRouter.getSingleModuleHandlers(resourcePath);
   if (!handlerInfos) {
     return (0, import_result.Err)(`generate client error: Cannot require module ${resourcePath}`);
   }

package/dist/cjs/operators/http.js

@@ -53,7 +53,7 @@ const validateInput = async (schema, input) => {
   try {
     return await schema.parseAsync(input);
   } catch (error) {
-    const { z: zod } = await Promise.resolve().then(() => __toESM(require("zod")));
+    const { z: zod } = await import("zod");
     if (error instanceof zod.ZodError) {
       throw new import_http.ValidationError(400, error.message);
     }

package/dist/cjs/router/index.js

@@ -57,8 +57,8 @@ class ApiRouter {
     }
     return false;
   }
-  getSingleModuleHandlers(filename) {
-    const moduleInfo = this.getModuleInfo(filename);
+  async getSingleModuleHandlers(filename) {
+    const moduleInfo = await this.getModuleInfo(filename);
     if (moduleInfo) {
       return this.getModuleHandlerInfos(moduleInfo);
     }
@@ -167,9 +167,9 @@ class ApiRouter {
     }
     return this.loadApiFiles();
   }
-  getApiHandlers() {
+  async getApiHandlers() {
     const filenames = this.getApiFiles();
-    const moduleInfos = this.getModuleInfos(filenames);
+    const moduleInfos = await this.getModuleInfos(filenames);
     const apiHandlers = this.getHandlerInfos(moduleInfos);
     (0, import_utils2.debug)("apiHandlers", apiHandlers.length, apiHandlers);
     return apiHandlers;
@@ -189,12 +189,12 @@ class ApiRouter {
       throw new Error(`The ${paramsName} ${filename} is not a abolute path`);
     }
   }
-  getModuleInfos(filenames) {
-    return filenames.map((filename) => this.getModuleInfo(filename)).filter((moduleInfo) => Boolean(moduleInfo));
+  async getModuleInfos(filenames) {
+    return Promise.all(filenames.map((filename) => this.getModuleInfo(filename)).filter((moduleInfo) => Boolean(moduleInfo)));
   }
-  getModuleInfo(filename) {
+  async getModuleInfo(filename) {
     try {
-      const module2 = (0, import_utils3.requireHandlerModule)(filename);
+      const module2 = await (0, import_utils3.requireHandlerModule)(filename);
       return {
         filename,
         module: module2

package/dist/cjs/router/utils.js

@@ -69,9 +69,9 @@ const clearRouteName = (routeName) => {
 };
 const isHandler = (input) => input && typeof input === "function";
 const isFunction = (input) => input && {}.toString.call(input) === "[object Function]";
-const requireHandlerModule = (modulePath) => {
-  const originRequire = process.env.NODE_ENV === "test" ? jest.requireActual : require;
-  const module2 = originRequire(modulePath);
+const requireHandlerModule = async (modulePath) => {
+  const originRequire = process.env.NODE_ENV === "test" ? jest.requireActual : import_utils.compatibleRequire;
+  const module2 = await originRequire(modulePath, false);
   if (isFunction(module2)) {
     return {
       default: module2

package/dist/esm/client/generateClient.js

@@ -20,7 +20,7 @@ const generateClient = async ({ appDir, resourcePath, apiDir, lambdaDir, prefix,
     prefix,
     httpMethodDecider
   });
-  const handlerInfos = apiRouter.getSingleModuleHandlers(resourcePath);
+  const handlerInfos = await apiRouter.getSingleModuleHandlers(resourcePath);
   if (!handlerInfos) {
     return Err(`generate client error: Cannot require module ${resourcePath}`);
   }

package/dist/esm/router/index.js

@@ -23,8 +23,8 @@ class ApiRouter {
     }
     return false;
   }
-  getSingleModuleHandlers(filename) {
-    const moduleInfo = this.getModuleInfo(filename);
+  async getSingleModuleHandlers(filename) {
+    const moduleInfo = await this.getModuleInfo(filename);
     if (moduleInfo) {
       return this.getModuleHandlerInfos(moduleInfo);
     }
@@ -133,9 +133,9 @@ class ApiRouter {
     }
     return this.loadApiFiles();
   }
-  getApiHandlers() {
+  async getApiHandlers() {
     const filenames = this.getApiFiles();
-    const moduleInfos = this.getModuleInfos(filenames);
+    const moduleInfos = await this.getModuleInfos(filenames);
     const apiHandlers = this.getHandlerInfos(moduleInfos);
     debug("apiHandlers", apiHandlers.length, apiHandlers);
     return apiHandlers;
@@ -155,12 +155,12 @@ class ApiRouter {
       throw new Error(`The ${paramsName} ${filename} is not a abolute path`);
     }
   }
-  getModuleInfos(filenames) {
-    return filenames.map((filename) => this.getModuleInfo(filename)).filter((moduleInfo) => Boolean(moduleInfo));
+  async getModuleInfos(filenames) {
+    return Promise.all(filenames.map((filename) => this.getModuleInfo(filename)).filter((moduleInfo) => Boolean(moduleInfo)));
   }
-  getModuleInfo(filename) {
+  async getModuleInfo(filename) {
     try {
-      const module = requireHandlerModule(filename);
+      const module = await requireHandlerModule(filename);
       return {
         filename,
         module

package/dist/esm/router/utils.js

@@ -1,5 +1,5 @@
 import path from "path";
-import { globby } from "@modern-js/utils";
+import { globby, compatibleRequire } from "@modern-js/utils";
 import { INDEX_SUFFIX } from "./constants";
 const getFiles = (lambdaDir, rules) => globby.sync(rules, {
   cwd: lambdaDir,
@@ -32,9 +32,9 @@ const clearRouteName = (routeName) => {
 };
 const isHandler = (input) => input && typeof input === "function";
 const isFunction = (input) => input && {}.toString.call(input) === "[object Function]";
-const requireHandlerModule = (modulePath) => {
-  const originRequire = process.env.NODE_ENV === "test" ? jest.requireActual : require;
-  const module = originRequire(modulePath);
+const requireHandlerModule = async (modulePath) => {
+  const originRequire = process.env.NODE_ENV === "test" ? jest.requireActual : compatibleRequire;
+  const module = await originRequire(modulePath, false);
   if (isFunction(module)) {
     return {
       default: module

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

@@ -1,5 +1,5 @@
 import type { HttpMethodDecider } from '@modern-js/types';
-import { Result } from './result';
+import { type Result } from './result';
 export type GenClientResult = Result<string>;
 export type GenClientOptions = {
     resourcePath: string;

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

@@ -1,5 +1,5 @@
 import type { z } from 'zod';
-import { Operator, HttpMethod, ResponseMetaType } from '../types';
+import { type Operator, HttpMethod, ResponseMetaType } from '../types';
 export interface ResponseMeta {
     type: ResponseMetaType;
     value: unknown;

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

@@ -2,7 +2,7 @@ import 'reflect-metadata';
 import type { HttpMethodDecider } from '@modern-js/types';
 import { HttpMethod } from '../types';
 import { APIMode } from './constants';
-import { ApiHandler, APIHandlerInfo } from './types';
+import type { ApiHandler, APIHandlerInfo } from './types';
 export * from './types';
 export * from './constants';
 export declare class ApiRouter {
@@ -27,14 +27,14 @@ export declare class ApiRouter {
     getApiMode(): APIMode;
     getLambdaDir(): string;
     isApiFile(filename: string): boolean;
-    getSingleModuleHandlers(filename: string): APIHandlerInfo[] | null;
+    getSingleModuleHandlers(filename: string): Promise<APIHandlerInfo[] | null>;
     getHandlerInfo(filename: string, originFuncName: string, handler: ApiHandler): APIHandlerInfo | null;
     getSafeRoutePath(filename: string, handler?: ApiHandler): string;
     getRouteName(filename: string, handler?: ApiHandler): string;
     getHttpMethod(originHandlerName: string, handler?: ApiHandler): HttpMethod | null;
     loadApiFiles(): string[];
     getApiFiles(): string[];
-    getApiHandlers(): APIHandlerInfo[];
+    getApiHandlers(): Promise<APIHandlerInfo[]>;
     /**
      * 如果用户未传入或传入空串，默认为 /api
      * 如果传入 /，则 prefix 为 /

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

@@ -1,4 +1,4 @@
-import { HttpMethod } from '../types';
+import type { HttpMethod } from '../types';
 export type ModuleInfo = {
     filename: string;
     module: HandlerModule;

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

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

package/dist/types/types.d.ts

@@ -1,4 +1,4 @@
-import { Merge } from 'type-fest';
+import type { Merge } from 'type-fest';
 export declare enum OperatorType {
     Trigger = 0,
     Middleware = 1

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

@@ -1 +1 @@
-export declare const debug: import("@modern-js/utils/compiled/debug").Debugger;
+export declare const debug: (...args: unknown[]) => void;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.0",
+  "version": "2.58.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -28,11 +28,11 @@
     }
   },
   "dependencies": {
+    "@swc/helpers": "0.5.3",
     "koa-compose": "^4.1.0",
     "reflect-metadata": "^0.1.13",
     "type-fest": "2.15.0",
-    "@swc/helpers": "0.5.3",
-    "@modern-js/utils": "2.58.0"
+    "@modern-js/utils": "2.58.2"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -43,14 +43,14 @@
     "tsconfig-paths": "^4.1.2",
     "typescript": "^5",
     "zod": "^3.22.3",
-    "@scripts/build": "2.58.0",
-    "@scripts/jest-config": "2.58.0",
-    "@modern-js/types": "2.58.0"
+    "@modern-js/types": "2.58.2",
+    "@scripts/build": "2.58.2",
+    "@scripts/jest-config": "2.58.2"
   },
   "peerDependencies": {
-    "zod": "^3.22.3",
     "ts-node": "^10.9.1",
-    "tsconfig-paths": "^4.1.2"
+    "tsconfig-paths": "^4.1.2",
+    "zod": "^3.22.3"
   },
   "peerDependenciesMeta": {
     "zod": {