@modern-js/bff-core 2.25.1 → 2.25.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @modern-js/bff-core
 
+## 2.25.2
+
+### Patch Changes
+
+- 358ed24: fix: support configuration ts-node and avoid to register ts-node unnecessarily
+  fix: 支持配置 ts-node，避免对 ts-node 不必要的注册
+- Updated dependencies [63d8247]
+- Updated dependencies [6651684]
+- Updated dependencies [272646c]
+- Updated dependencies [358ed24]
+  - @modern-js/utils@2.25.2
+  - @modern-js/bff-runtime@2.25.2
+
 ## 2.25.1
 
 ### Patch Changes

package/dist/cjs/client/generateClient.js

@@ -22,7 +22,7 @@ const _path = /* @__PURE__ */ _interop_require_wildcard._(require("path"));
 const _router = require("../router");
 const _result = require("./result");
 const DEFAULT_CLIENT_REQUEST_CREATOR = "@modern-js/create-request";
-const generateClient = async ({ resourcePath, apiDir, lambdaDir, prefix, port, target, requestCreator, fetcher, requireResolve = require.resolve, httpMethodDecider }) => {
+const generateClient = async ({ appDir, resourcePath, apiDir, lambdaDir, prefix, port, target, requestCreator, fetcher, requireResolve = require.resolve, httpMethodDecider }) => {
   if (!requestCreator) {
     requestCreator = requireResolve(`${DEFAULT_CLIENT_REQUEST_CREATOR}${target ? `/${target}` : ""}`).replace(/\\/g, "/");
   } else {
@@ -34,6 +34,7 @@ const generateClient = async ({ resourcePath, apiDir, lambdaDir, prefix, port, t
     requestCreator = `${resolvedPath}${target ? `/${target}` : ""}`.replace(/\\/g, "/");
   }
   const apiRouter = new _router.ApiRouter({
+    appDir,
     apiDir,
     lambdaDir,
     prefix,
@@ -46,7 +47,7 @@ const generateClient = async ({ resourcePath, apiDir, lambdaDir, prefix, port, t
   let handlersCode = "";
   for (const handlerInfo of handlerInfos) {
     const { name, httpMethod, routePath } = handlerInfo;
-    let exportStatement = `const ${name} =`;
+    let exportStatement = `var ${name} =`;
     if (name.toLowerCase() === "default") {
       exportStatement = "default";
     }

package/dist/cjs/router/index.js

@@ -20,6 +20,35 @@ const _constants = _export_star._(require("./constants"), exports);
 const _utils2 = require("./utils");
 _export_star._(require("./types"), exports);
 class ApiRouter {
+  enableRegister() {
+    const existTsLoader = Boolean(require.extensions[".ts"]);
+    if (!existTsLoader && (process.env.NODE_ENV !== "production" || this.isBuild)) {
+      try {
+        const projectSearchDir = this.appDir || this.apiDir;
+        const tsNode = require("ts-node");
+        tsNode.register({
+          projectSearchDir,
+          compilerOptions: {
+            allowJs: false
+          },
+          scope: true,
+          transpileOnly: true,
+          ignore: [
+            "(?:^|/)node_modules/"
+          ]
+        });
+        const tsConfigPaths = require("tsconfig-paths");
+        const loaderRes = tsConfigPaths.loadConfig(projectSearchDir);
+        if (loaderRes.resultType === "success") {
+          tsConfigPaths.register({
+            baseUrl: loaderRes.absoluteBaseUrl,
+            paths: loaderRes.paths
+          });
+        }
+      } catch (error) {
+      }
+    }
+  }
   isExistLambda() {
     return this.existLambdaDir;
   }
@@ -223,14 +252,16 @@ class ApiRouter {
     }
     return `${prefix}${finalRouteName}`;
   }
-  constructor({ apiDir, lambdaDir, prefix, httpMethodDecider = "functionName" }) {
+  constructor({ appDir, apiDir, lambdaDir, prefix, isBuild, httpMethodDecider = "functionName" }) {
     _define_property._(this, "apiMode", void 0);
+    _define_property._(this, "appDir", void 0);
     _define_property._(this, "apiDir", void 0);
     _define_property._(this, "existLambdaDir", void 0);
     _define_property._(this, "httpMethodDecider", void 0);
     _define_property._(this, "lambdaDir", void 0);
     _define_property._(this, "prefix", void 0);
     _define_property._(this, "apiFiles", []);
+    _define_property._(this, "isBuild", void 0);
     _define_property._(this, "getExactApiMode", (apiDir2, lambdaDir2) => {
       const exist = this.createExistChecker(apiDir2);
       const existLambdaDir = lambdaDir2 && _utils.fs.pathExistsSync(lambdaDir2) || exist(_constants.FRAMEWORK_MODE_LAMBDA_DIR);
@@ -251,11 +282,14 @@ class ApiRouter {
     this.validateAbsolute(apiDir, "apiDir");
     this.validateAbsolute(lambdaDir, "lambdaDir");
     this.prefix = this.initPrefix(prefix);
+    this.appDir = appDir;
     this.apiDir = apiDir;
     this.httpMethodDecider = httpMethodDecider;
+    this.isBuild = isBuild;
     this.apiMode = this.getExactApiMode(apiDir, lambdaDir);
     this.lambdaDir = this.getExactLambdaDir(this.apiDir, lambdaDir);
     this.existLambdaDir = _utils.fs.existsSync(this.lambdaDir);
     (0, _utils1.debug)(`apiDir:`, this.apiDir, `lambdaDir:`, this.lambdaDir);
+    this.enableRegister();
   }
 }

package/dist/cjs/router/utils.js

@@ -60,47 +60,8 @@ const clearRouteName = (routeName) => {
   return finalRouteName;
 };
 const isHandler = (input) => input && typeof input === "function";
-const enableRegister = (requireFn) => {
-  let existTsLoader = false;
-  let firstCall = true;
-  return (modulePath) => {
-    if (firstCall) {
-      existTsLoader = Boolean(require.extensions[".ts"]);
-      firstCall = false;
-    }
-    if (!existTsLoader) {
-      try {
-        const projectSearchDir = _path.default.dirname(modulePath);
-        const tsNode = require("ts-node");
-        tsNode.register({
-          projectSearchDir,
-          compilerOptions: {
-            allowJs: false
-          },
-          scope: true,
-          transpileOnly: true,
-          ignore: [
-            "(?:^|/)node_modules/"
-          ]
-        });
-        existTsLoader = true;
-        const tsConfigPaths = require("tsconfig-paths");
-        const loaderRes = tsConfigPaths.loadConfig(projectSearchDir);
-        if (loaderRes.resultType === "success") {
-          tsConfigPaths.register({
-            baseUrl: loaderRes.absoluteBaseUrl,
-            paths: loaderRes.paths
-          });
-        }
-      } catch (e) {
-      }
-    }
-    const requiredModule = requireFn(modulePath);
-    return requiredModule;
-  };
-};
 const isFunction = (input) => input && {}.toString.call(input) === "[object Function]";
-const requireHandlerModule = enableRegister((modulePath) => {
+const requireHandlerModule = (modulePath) => {
   const originRequire = process.env.NODE_ENV === "test" ? jest.requireActual : require;
   const module = originRequire(modulePath);
   if (isFunction(module)) {
@@ -109,7 +70,7 @@ const requireHandlerModule = enableRegister((modulePath) => {
     };
   }
   return module;
-});
+};
 const routeValue = (routePath) => {
   if (routePath.includes(":")) {
     return 11;

package/dist/esm/client/generateClient.js

@@ -2,7 +2,7 @@ import * as path from "path";
 import { ApiRouter } from "../router";
 import { Ok, Err } from "./result";
 export const DEFAULT_CLIENT_REQUEST_CREATOR = "@modern-js/create-request";
-export const generateClient = async ({ resourcePath, apiDir, lambdaDir, prefix, port, target, requestCreator, fetcher, requireResolve = require.resolve, httpMethodDecider }) => {
+export const generateClient = async ({ appDir, resourcePath, apiDir, lambdaDir, prefix, port, target, requestCreator, fetcher, requireResolve = require.resolve, httpMethodDecider }) => {
   if (!requestCreator) {
     requestCreator = requireResolve(`${DEFAULT_CLIENT_REQUEST_CREATOR}${target ? `/${target}` : ""}`).replace(/\\/g, "/");
   } else {
@@ -14,6 +14,7 @@ export const generateClient = async ({ resourcePath, apiDir, lambdaDir, prefix,
     requestCreator = `${resolvedPath}${target ? `/${target}` : ""}`.replace(/\\/g, "/");
   }
   const apiRouter = new ApiRouter({
+    appDir,
     apiDir,
     lambdaDir,
     prefix,
@@ -26,7 +27,7 @@ export const generateClient = async ({ resourcePath, apiDir, lambdaDir, prefix,
   let handlersCode = "";
   for (const handlerInfo of handlerInfos) {
     const { name, httpMethod, routePath } = handlerInfo;
-    let exportStatement = `const ${name} =`;
+    let exportStatement = `var ${name} =`;
     if (name.toLowerCase() === "default") {
       exportStatement = "default";
     }

package/dist/esm/router/index.js

@@ -9,6 +9,35 @@ import { getFiles, getPathFromFilename, requireHandlerModule, sortRoutes } from
 export * from "./types";
 export * from "./constants";
 export class ApiRouter {
+  enableRegister() {
+    const existTsLoader = Boolean(require.extensions[".ts"]);
+    if (!existTsLoader && (process.env.NODE_ENV !== "production" || this.isBuild)) {
+      try {
+        const projectSearchDir = this.appDir || this.apiDir;
+        const tsNode = require("ts-node");
+        tsNode.register({
+          projectSearchDir,
+          compilerOptions: {
+            allowJs: false
+          },
+          scope: true,
+          transpileOnly: true,
+          ignore: [
+            "(?:^|/)node_modules/"
+          ]
+        });
+        const tsConfigPaths = require("tsconfig-paths");
+        const loaderRes = tsConfigPaths.loadConfig(projectSearchDir);
+        if (loaderRes.resultType === "success") {
+          tsConfigPaths.register({
+            baseUrl: loaderRes.absoluteBaseUrl,
+            paths: loaderRes.paths
+          });
+        }
+      } catch (error) {
+      }
+    }
+  }
   isExistLambda() {
     return this.existLambdaDir;
   }
@@ -212,14 +241,16 @@ export class ApiRouter {
     }
     return `${prefix}${finalRouteName}`;
   }
-  constructor({ apiDir, lambdaDir, prefix, httpMethodDecider = "functionName" }) {
+  constructor({ appDir, apiDir, lambdaDir, prefix, isBuild, httpMethodDecider = "functionName" }) {
     _define_property(this, "apiMode", void 0);
+    _define_property(this, "appDir", void 0);
     _define_property(this, "apiDir", void 0);
     _define_property(this, "existLambdaDir", void 0);
     _define_property(this, "httpMethodDecider", void 0);
     _define_property(this, "lambdaDir", void 0);
     _define_property(this, "prefix", void 0);
     _define_property(this, "apiFiles", []);
+    _define_property(this, "isBuild", void 0);
     _define_property(this, "getExactApiMode", (apiDir2, lambdaDir2) => {
       const exist = this.createExistChecker(apiDir2);
       const existLambdaDir = lambdaDir2 && fs.pathExistsSync(lambdaDir2) || exist(FRAMEWORK_MODE_LAMBDA_DIR);
@@ -240,11 +271,14 @@ export class ApiRouter {
     this.validateAbsolute(apiDir, "apiDir");
     this.validateAbsolute(lambdaDir, "lambdaDir");
     this.prefix = this.initPrefix(prefix);
+    this.appDir = appDir;
     this.apiDir = apiDir;
     this.httpMethodDecider = httpMethodDecider;
+    this.isBuild = isBuild;
     this.apiMode = this.getExactApiMode(apiDir, lambdaDir);
     this.lambdaDir = this.getExactLambdaDir(this.apiDir, lambdaDir);
     this.existLambdaDir = fs.existsSync(this.lambdaDir);
     debug(`apiDir:`, this.apiDir, `lambdaDir:`, this.lambdaDir);
+    this.enableRegister();
   }
 }

package/dist/esm/router/utils.js

@@ -31,47 +31,8 @@ const clearRouteName = (routeName) => {
   return finalRouteName;
 };
 export const isHandler = (input) => input && typeof input === "function";
-const enableRegister = (requireFn) => {
-  let existTsLoader = false;
-  let firstCall = true;
-  return (modulePath) => {
-    if (firstCall) {
-      existTsLoader = Boolean(require.extensions[".ts"]);
-      firstCall = false;
-    }
-    if (!existTsLoader) {
-      try {
-        const projectSearchDir = path.dirname(modulePath);
-        const tsNode = require("ts-node");
-        tsNode.register({
-          projectSearchDir,
-          compilerOptions: {
-            allowJs: false
-          },
-          scope: true,
-          transpileOnly: true,
-          ignore: [
-            "(?:^|/)node_modules/"
-          ]
-        });
-        existTsLoader = true;
-        const tsConfigPaths = require("tsconfig-paths");
-        const loaderRes = tsConfigPaths.loadConfig(projectSearchDir);
-        if (loaderRes.resultType === "success") {
-          tsConfigPaths.register({
-            baseUrl: loaderRes.absoluteBaseUrl,
-            paths: loaderRes.paths
-          });
-        }
-      } catch (e) {
-      }
-    }
-    const requiredModule = requireFn(modulePath);
-    return requiredModule;
-  };
-};
 const isFunction = (input) => input && {}.toString.call(input) === "[object Function]";
-export const requireHandlerModule = enableRegister((modulePath) => {
+export const requireHandlerModule = (modulePath) => {
   const originRequire = process.env.NODE_ENV === "test" ? jest.requireActual : require;
   const module = originRequire(modulePath);
   if (isFunction(module)) {
@@ -80,7 +41,7 @@ export const requireHandlerModule = enableRegister((modulePath) => {
     };
   }
   return module;
-});
+};
 const routeValue = (routePath) => {
   if (routePath.includes(":")) {
     return 11;

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

@@ -4,6 +4,7 @@ export type GenClientResult = Result<string>;
 export type GenClientOptions = {
   resourcePath: string;
   source: string;
+  appDir: string;
   apiDir: string;
   lambdaDir: string;
   prefix: string;
@@ -16,6 +17,7 @@ export type GenClientOptions = {
 };
 export declare const DEFAULT_CLIENT_REQUEST_CREATOR = "@modern-js/create-request";
 export declare const generateClient: ({
+  appDir,
   resourcePath,
   apiDir,
   lambdaDir,

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

@@ -7,23 +7,30 @@ export * from './types';
 export * from './constants';
 export declare class ApiRouter {
   private apiMode;
+  private appDir?;
   private apiDir;
   private existLambdaDir;
   private httpMethodDecider;
   private lambdaDir;
   private prefix;
   private apiFiles;
+  private isBuild?;
   constructor({
+    appDir,
     apiDir,
     lambdaDir,
     prefix,
+    isBuild,
     httpMethodDecider
   }: {
+    appDir?: string;
     apiDir: string;
     lambdaDir?: string;
     prefix?: string;
+    isBuild?: boolean;
     httpMethodDecider?: HttpMethodDecider;
   });
+  private enableRegister;
   isExistLambda(): boolean;
   getApiMode(): APIMode;
   getLambdaDir(): string;

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

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

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.25.1",
+  "version": "2.25.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -31,8 +31,8 @@
     "koa-compose": "^4.1.0",
     "reflect-metadata": "^0.1.13",
     "@swc/helpers": "0.5.1",
-    "@modern-js/bff-runtime": "2.25.1",
-    "@modern-js/utils": "2.25.1"
+    "@modern-js/bff-runtime": "2.25.2",
+    "@modern-js/utils": "2.25.2"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -44,9 +44,9 @@
     "type-fest": "2.15.0",
     "typescript": "^5",
     "zod": "^3.17.3",
-    "@modern-js/types": "2.25.1",
-    "@scripts/build": "2.25.1",
-    "@scripts/jest-config": "2.25.1"
+    "@scripts/jest-config": "2.25.2",
+    "@modern-js/types": "2.25.2",
+    "@scripts/build": "2.25.2"
   },
   "peerDependencies": {
     "zod": "^3.17.3",