@hile/cli 1.1.3 → 1.1.5

package/dist/index.js

@@ -2,6 +2,62 @@
 import pkg from '../package.json' with { type: 'json' };
 import { program } from 'commander';
 import { start } from './start.js';
+import { execSync } from 'node:child_process';
+import { existsSync, readFileSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
+import { createRequire } from 'node:module';
+const requireCli = createRequire(import.meta.url);
+/** 从包入口文件路径向上找到 `package.json` 的 `name` 与 `packageName` 一致的目录 */
+function packageDirFromResolvedMain(resolvedMain, packageName) {
+    let dir = dirname(resolvedMain);
+    for (let depth = 0; depth < 50; depth++) {
+        const parent = dirname(dir);
+        const pkgPath = join(dir, 'package.json');
+        if (existsSync(pkgPath)) {
+            try {
+                const { name: n } = JSON.parse(readFileSync(pkgPath, 'utf8'));
+                if (n === packageName)
+                    return dir;
+            }
+            catch {
+                /* 忽略损坏的 package.json */
+            }
+        }
+        if (dir === parent)
+            break;
+        dir = parent;
+    }
+    return dirname(resolvedMain);
+}
+function tryResolvePackageDir(packageName, req) {
+    try {
+        const main = req.resolve(packageName);
+        return packageDirFromResolvedMain(main, packageName);
+    }
+    catch {
+        return undefined;
+    }
+}
+/** 全局 `npm install -g` 下的包根目录（存在 package.json 时） */
+function tryGlobalPackageDir(packageName) {
+    try {
+        const root = execSync('npm root -g', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] }).trim();
+        let candidate;
+        if (packageName.startsWith('@')) {
+            const slash = packageName.indexOf('/');
+            if (slash <= 0)
+                return undefined;
+            candidate = join(root, packageName.slice(0, slash), packageName.slice(slash + 1));
+        }
+        else {
+            candidate = join(root, packageName);
+        }
+        return existsSync(join(candidate, 'package.json')) ? candidate : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 program.version(pkg.version, '-v, --version', '当前版本号');
 /**
  * 启动服务
@@ -14,15 +70,40 @@ program.version(pkg.version, '-v, --version', '当前版本号');
  * @returns - 启动服务
  */
 program
-    .command('start')
+    .command('start [name]')
     .option('-d, --dev', '开发模式', false)
     .option('-s, --silent', '静默模式', false)
     .option('-e, --env-file <path>', '加载指定 env 文件（兼容 Node --env-file 语义；可多次指定，先加载的不被后加载覆盖）', (v, acc) => (acc.push(v), acc), [])
     .description('启动服务，加载所有后缀为 boot.ts 或 boot.js 的服务，并注册退出钩子，在进程退出时销毁所有服务')
-    .action((options) => start({
-    dev: options.dev,
-    envFile: options.envFile,
-    silent: options.silent
-}));
+    .action((name, options) => {
+    const cwd = process.cwd();
+    const filePath = resolve(cwd, name);
+    let directory;
+    if (existsSync(filePath)) {
+        directory = filePath;
+    }
+    else {
+        const cwdPkg = resolve(cwd, 'package.json');
+        if (existsSync(cwdPkg)) {
+            directory = tryResolvePackageDir(name, createRequire(cwdPkg));
+        }
+        if (!directory) {
+            directory = tryResolvePackageDir(name, requireCli);
+        }
+        if (!directory) {
+            directory = tryGlobalPackageDir(name);
+        }
+    }
+    if (!directory) {
+        console.error('package not found');
+        return;
+    }
+    return start({
+        dev: options.dev,
+        cwd: directory,
+        envFile: options.envFile,
+        silent: options.silent
+    });
+});
 program.parseAsync(process.argv);
 export * from './start.js';

package/dist/start.d.ts

@@ -1,5 +1,6 @@
 export declare function start(options: {
     dev: boolean;
+    cwd?: string;
     envFile?: string[];
     silent?: boolean;
 }): Promise<void>;

package/dist/start.js

@@ -77,7 +77,7 @@ export async function start(options) {
     const offEvent = !options.silent && process.env.NODE_ENV === 'development'
         ? container.on(logContainerEvent)
         : () => { };
-    const cwd = process.cwd();
+    const cwd = options.cwd ?? process.cwd();
     const files = [];
     // 加载 package.json 文件
     // 如果 package.json 中存在 hile.auto_load_packages 属性，则加载该属性值中的所有服务
@@ -89,7 +89,7 @@ export async function start(options) {
         }
     }
     // 加载所有后缀为 boot.ts 或 boot.js 的服务
-    const directory = resolve(cwd, process.env.HILE_RUNTIME_DIR || (options.dev ? 'src' : 'dist'));
+    const directory = resolve(cwd, options.dev ? 'src' : 'dist');
     const _files = await glob(`**/*.boot.{ts,js}`, { cwd: directory });
     files.push(..._files.map(file => resolve(directory, file)));
     // 加载所有自启动服务
@@ -103,6 +103,9 @@ export async function start(options) {
         if (!fn || !isService(fn))
             throw new Error(`invalid service file: ${file}`);
         await loadService(fn);
+        if (!options.silent) {
+            console.info(`+ [bootstrap] ${file}`);
+        }
     }));
     // 如果没有服务要加载，则提示
     if (!files.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hile/cli",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -31,5 +31,5 @@
     "glob": "^13.0.6",
     "tsx": "^4.21.0"
   },
-  "gitHead": "fabc6e8b039b9ac6bf3267b825f7295d04111264"
+  "gitHead": "aeb010516219fe30e80679b66787aba1b0d33018"
 }