@kokiito0926/cli2module 0.0.5 → 0.0.6

package/example.js

@@ -2,16 +2,18 @@
 
 import { cli2module } from "./index.js";
 
-// const result = await cli2module("zx/cli", []);
+console.log('--- Case 1: Running zx help ---');
 const result = await cli2module("zx/cli", ["--help"]);
-// const result = await cli2module("zx/cli", ["--version"]);
-console.log(result);
-console.log(result?.code);
-console.log(result?.stdout);
-console.log(result?.stderr);
+console.log(`Code: ${result.code}`);
+console.log(`Stdout length: ${result.stdout.length}`);
 
-const result2 = await cli2module("zx/cli", [], 'console.log("Hello, world!")');
-console.log(result2);
-console.log(result2?.code);
-console.log(result2?.stdout);
-console.log(result2?.stderr);
+console.log('\n--- Case 2: Passing stdin to zx ---');
+const result2 = await cli2module("zx/cli", [], 'console.log("Hello, zx!")');
+console.log(`Stdout: ${result2.stdout}`);
+
+console.log('\n--- Case 3: Error handling (invalid module) ---');
+try {
+    await cli2module("non-existent-module");
+} catch (err) {
+    console.log(`Caught expected error: ${err.message}`);
+}

package/index.js

@@ -1,4 +1,4 @@
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { Worker } from "node:worker_threads";
 
 // zxのCLIのパスを取得しなければいけない。
@@ -15,12 +15,16 @@ function runInWorker(scriptPath, args = [], input = "") {
 	return new Promise((resolve, reject) => {
 		const workerCode = `
       import { workerData } from 'node:worker_threads';
-      // console.log(workerData.path);
-      // console.log(workerData.args);
       
       process.argv = ['node', workerData.path, ...workerData.args];
 
-      await import('file://' + workerData.path);
+      try {
+        await import('file:///' + workerData.path.replace(/\\\\/g, '/'));
+      } catch (err) {
+        // ワーカースレッド内での例外（構文エラーやインポートエラー等）を確実に投げ、
+        // 親スレッドの 'error' イベントでキャッチできるようにする。
+        throw err;
+      }
     `;
 
 		const worker = new Worker(workerCode, {
@@ -56,18 +60,33 @@ function runInWorker(scriptPath, args = [], input = "") {
 			});
 		});
 
-		worker.on("error", reject);
+		worker.on("error", (err) => {
+			reject(err);
+		});
 	});
 }
 
-export async function cli2module(specifier, options = [], input = "") {
-	const cliPath = await import.meta.resolve(specifier);
-	// console.log(cliPath);
-
-	const cliPath2 = fileURLToPath(cliPath);
-	// console.log(cliPath2);
+/**
+ * CLIツールをワーカースレッドで実行します。
+ * 
+ * @param {string} specifier 実行するCLIツールのパスまたはモジュール名
+ * @param {string[]} [args=[]] コマンドライン引数の配列
+ * @param {string} [input=""] 標準入力に渡す文字列
+ * @returns {Promise<{code: number, stdout: string, stderr: string}>}
+ */
+export async function cli2module(specifier, args = [], input = "") {
+	let cliUrl;
+	try {
+		// 相対パス（./ か ../）で始まる場合は、直感的な動作のために process.cwd() を基準に解決を試みる
+		if (specifier.startsWith("./") || specifier.startsWith("../")) {
+			cliUrl = pathToFileURL(path.resolve(process.cwd(), specifier)).href;
+		} else {
+			cliUrl = await import.meta.resolve(specifier);
+		}
+	} catch (err) {
+		throw new Error(`Failed to resolve specifier "${specifier}": ${err.message}`);
+	}
 
-	const result = await runInWorker(cliPath2, options, input);
-	// console.log(result);
-	return result;
+	const cliPath = fileURLToPath(cliUrl);
+	return await runInWorker(cliPath, args, input);
 }

package/package.json

@@ -1,11 +1,10 @@
 {
 	"name": "@kokiito0926/cli2module",
-	"version": "0.0.5",
+	"version": "0.0.6",
 	"private": false,
 	"description": "CLIのツールをワーカースレッドで実行することができるライブラリです。",
 	"keywords": [
 		"cli",
-		"ctm",
 		"module",
 		"nodejs",
 		"cli2module"