jax-hono 1.0.18 → 1.0.20

package/config.ts

@@ -1,10 +1,10 @@
-import { existsSync } from 'node:fs';
-import { cwd } from 'node:process';
-import merge from 'deepmerge';
-import { config as loadDotenv } from 'dotenv';
-import minimist from 'minimist';
-import { requireGeneratedModule, type GeneratedProjectConfig } from './core/generated';
-import type { JaxConfig } from './types/config';
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import merge from 'deepmerge';
+import { config as loadDotenv } from 'dotenv';
+import minimist from 'minimist';
+import { getProjectDir, requireGeneratedModule, type GeneratedProjectConfig } from './core/generated';
+import type { JaxConfig } from './types/config';
 
 type PlainConfig = Record<string, unknown>;
 type ProjectConfig = GeneratedProjectConfig;
@@ -16,7 +16,8 @@ type ConfigModuleItem = {
 export type { JaxConfig } from './types/config';
 export type Config = JaxConfig & ProjectConfig;
 
-const { configModules } = requireGeneratedModule<{ configModules: readonly ConfigModuleItem[] }>('config.ts');
+const { configModules } = requireGeneratedModule<{ configModules: readonly ConfigModuleItem[] }>('config.ts');
+const projectDir = getProjectDir();
 
 loadDotenvFile('.env');
 
@@ -33,11 +34,13 @@ console.log('env', env);
 
 loadDotenvFile(`.env.${env}`);
 
-function loadDotenvFile(file: string) {
-  if (existsSync(file)) {
-    loadDotenv({ path: file, override: true });
-  }
-}
+function loadDotenvFile(file: string) {
+  const path = join(projectDir, file);
+
+  if (existsSync(path)) {
+    loadDotenv({ path, override: true });
+  }
+}
 
 function isPlainConfig(value: unknown): value is PlainConfig {
   return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
@@ -54,8 +57,8 @@ function parsePort(value: string | undefined) {
 }
 
 export function loadConfig(): Config {
-  const jaxConfig: JaxConfig = {
-    rootDir: cwd(),
+  const jaxConfig: JaxConfig = {
+    rootDir: projectDir,
     port: parsePort(Bun.env.PORT),
     env
   };

package/core/generated.ts

@@ -1,6 +1,6 @@
-import { existsSync } from 'node:fs';
-import { cwd, execPath } from 'node:process';
-import { dirname, resolve } from 'node:path';
+import { existsSync } from 'node:fs';
+import { cwd, execPath } from 'node:process';
+import { dirname, resolve } from 'node:path';
 
 export interface JaxGenerated {}
 
@@ -28,15 +28,19 @@ export function registerGeneratedModules(modules: GeneratedModuleMap) {
   Object.assign(generatedModules, modules);
 }
 
-export function getProjectGeneratedDir() {
-  const configuredDir = Bun.env.JAX_HONO_GENERATED_DIR;
+export function getProjectGeneratedDir() {
+  const configuredDir = Bun.env.JAX_HONO_GENERATED_DIR;
 
   if (configuredDir) {
     return resolve(cwd(), configuredDir);
   }
 
-  return findProjectGeneratedDir();
-}
+  return findProjectGeneratedDir();
+}
+
+export function getProjectDir() {
+  return dirname(getProjectGeneratedDir());
+}
 
 export function requireGeneratedModule<T>(fileName: string): T {
   if (fileName in generatedModules) {
@@ -78,19 +82,37 @@ function findGeneratedFile(fileName: string) {
   return resolve(getGeneratedDirCandidates()[0], fileName);
 }
 
-function getGeneratedDirCandidates() {
-  const cwdDir = cwd();
-  const executableDir = dirname(execPath);
-  const dirs = [
-    resolve(cwdDir, '.jax-hono'),
-    resolve(cwdDir, '..', '.jax-hono'),
-    resolve(executableDir, '.jax-hono'),
-    resolve(executableDir, '..', '.jax-hono'),
-    resolve(cwdDir, 'generated'),
-    resolve(cwdDir, '..', 'generated'),
-    resolve(executableDir, 'generated'),
-    resolve(executableDir, '..', 'generated'),
-  ];
-
-  return [...new Set(dirs)];
-}
+function getGeneratedDirCandidates() {
+  const cwdDir = cwd();
+  const executableDir = dirname(execPath);
+  const entryDir = getEntryDir();
+  const baseDirs = [
+    cwdDir,
+    resolve(cwdDir, '..'),
+    executableDir,
+    resolve(executableDir, '..'),
+    ...entryDir
+      ? [
+          entryDir,
+          resolve(entryDir, '..'),
+          resolve(entryDir, '..', '..'),
+        ]
+      : [],
+  ];
+  const dirs = [
+    ...baseDirs.map((dir) => resolve(dir, '.jax-hono')),
+    ...baseDirs.map((dir) => resolve(dir, 'generated')),
+  ];
+
+  return [...new Set(dirs)];
+}
+
+function getEntryDir() {
+  const main = Bun.main;
+
+  if (!main || main === '[eval]') {
+    return undefined;
+  }
+
+  return dirname(resolve(cwd(), main));
+}

package/docs/agent.md

@@ -63,9 +63,11 @@ setup 会在执行命令期间临时把入口文件里对 `jax-hono` 的导入
 import { config, createApp } from 'jax-hono';
 ```
 
-这样 Bun 才能在编译时把生成模块放进可执行文件；运行时动态查找 `.jax-hono/*.ts` 只能作为开发态兜底，旧 `generated/*.ts` 仅作为兼容路径。
-
-## 插件生成约定
+这样 Bun 才能在编译时把生成模块放进可执行文件；运行时动态查找 `.jax-hono/*.ts` 只能作为开发态兜底，旧 `generated/*.ts` 仅作为兼容路径。
+
+运行时除当前 `cwd` 外，也会根据 Bun 入口脚本位置向上查找 `.jax-hono`。这可以兼容 PM2 配成父目录 `cwd`、脚本指向子项目入口的情况；但仍推荐把 PM2 `cwd` 配到具体项目根。
+
+## 插件生成约定
 
 生成器只扫描已启用插件。插件启用来源包括：
 

package/docs/jax.md

@@ -115,7 +115,9 @@ import { config, createApp } from 'jax-hono';
 
 不要依赖 `jax-hono/generated` 这种包内目录或 Junction。`.jax-hono` 是每个调用项目自己的生成物；多个项目同时 link 到同一个 `jax-hono` 源码目录时，也不应该共享同一份生成结果。
 
-如果确实需要从非项目根目录运行未编译源码，可以设置 `JAX_HONO_GENERATED_DIR` 指向当前项目的生成目录；旧项目仍可把它设为 `generated`。编译产物仍应通过 setup 包裹构建命令，让 Bun 把 `.jax-hono` 模块打进可执行文件。
+如果确实需要从非项目根目录运行未编译源码，可以设置 `JAX_HONO_GENERATED_DIR` 指向当前项目的生成目录；旧项目仍可把它设为 `generated`。编译产物仍应通过 setup 包裹构建命令，让 Bun 把 `.jax-hono` 模块打进可执行文件。
+
+运行时会优先按当前 `cwd` 查找 `.jax-hono`，也会根据 Bun 入口脚本位置向上查找。例如 PM2 使用 `cwd: "/data/node/acs"`、`script: "acs-server/src/main.ts"` 时，框架会兼容查找 `/data/node/acs/acs-server/.jax-hono`。推荐配置仍然是把 `cwd` 指向具体项目根。
 
 ### `helpers`
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jax-hono",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "Lightweight framework layer on top of Hono, built for Bun",
   "type": "module",
   "main": "./index.ts",