jsdoczoom 1.2.0 → 1.2.1

package/dist/cli.js

@@ -4,6 +4,7 @@ import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { drilldown, drilldownFiles } from "./drilldown.js";
 import { JsdocError } from "./errors.js";
+import { discoverFiles } from "./file-discovery.js";
 import { lint, lintFiles } from "./lint.js";
 import { search, searchFiles } from "./search.js";
 import { parseSelector } from "./selector.js";
@@ -113,6 +114,7 @@ function parseArgs(args) {
 		cacheDirectory: undefined,
 		explainRule: undefined,
 		selectorArg: undefined,
+		extraArgs: [],
 		searchQuery: undefined,
 	};
 	for (let i = 0; i < args.length; i++) {
@@ -189,6 +191,8 @@ function parseArgs(args) {
 		// Positional selector arg
 		if (parsed.selectorArg === undefined) {
 			parsed.selectorArg = arg;
+		} else {
+			parsed.extraArgs.push(arg);
 		}
 	}
 	return parsed;
@@ -212,10 +216,10 @@ function extractDepthFromArg(selectorArg) {
 	return parsed.depth;
 }
 /**
- * Process stdin mode: file paths piped in.
+ * Process an explicit list of resolved file paths.
  */
-async function processStdin(
-	stdin,
+async function processFileList(
+	filePaths,
 	selectorArg,
 	checkMode,
 	lintMode,
@@ -226,12 +230,11 @@ async function processStdin(
 	cacheConfig,
 	searchQuery,
 ) {
-	const stdinPaths = parseStdinPaths(stdin, cwd);
 	const depth =
 		selectorArg !== undefined ? extractDepthFromArg(selectorArg) : undefined;
 	if (searchQuery !== undefined) {
 		const result = await searchFiles(
-			stdinPaths,
+			filePaths,
 			searchQuery,
 			cwd,
 			limit,
@@ -241,14 +244,14 @@ async function processStdin(
 		return;
 	}
 	if (lintMode) {
-		const result = await lintFiles(stdinPaths, cwd, limit, cacheConfig);
+		const result = await lintFiles(filePaths, cwd, limit, cacheConfig);
 		writeLintResult(result, pretty);
 	} else if (checkMode) {
-		const result = await validateFiles(stdinPaths, cwd, limit, cacheConfig);
+		const result = await validateFiles(filePaths, cwd, limit, cacheConfig);
 		writeValidationResult(result, pretty);
 	} else {
 		const result = await drilldownFiles(
-			stdinPaths,
+			filePaths,
 			depth,
 			cwd,
 			limit,
@@ -257,6 +260,35 @@ async function processStdin(
 		writeDrilldownResult(result, json, pretty);
 	}
 }
+/**
+ * Process stdin mode: file paths piped in.
+ */
+async function processStdin(
+	stdin,
+	selectorArg,
+	checkMode,
+	lintMode,
+	json,
+	pretty,
+	limit,
+	cwd,
+	cacheConfig,
+	searchQuery,
+) {
+	const stdinPaths = parseStdinPaths(stdin, cwd);
+	await processFileList(
+		stdinPaths,
+		selectorArg,
+		checkMode,
+		lintMode,
+		json,
+		pretty,
+		limit,
+		cwd,
+		cacheConfig,
+		searchQuery,
+	);
+}
 /**
  * Process selector mode: glob or path argument.
  */
@@ -305,19 +337,27 @@ async function processSelector(
 	}
 }
 /**
- * Write an error to stderr as JSON and set exit code.
+ * Write an error to stderr as JSON or plain text depending on the json flag.
  */
-function writeError(error) {
+function writeError(error, json) {
+	process.exitCode = 1;
+	if (json) {
+		if (error instanceof JsdocError) {
+			void process.stderr.write(`${JSON.stringify(error.toJSON())}\n`);
+			return;
+		}
+		const message = error instanceof Error ? error.message : String(error);
+		void process.stderr.write(
+			`${JSON.stringify({ error: { code: "INTERNAL_ERROR", message } })}\n`,
+		);
+		return;
+	}
 	if (error instanceof JsdocError) {
-		void process.stderr.write(`${JSON.stringify(error.toJSON())}\n`);
-		process.exitCode = 1;
+		void process.stderr.write(`Error [${error.code}]: ${error.message}\n`);
 		return;
 	}
 	const message = error instanceof Error ? error.message : String(error);
-	void process.stderr.write(
-		`${JSON.stringify({ error: { code: "INTERNAL_ERROR", message } })}\n`,
-	);
-	process.exitCode = 1;
+	void process.stderr.write(`Error: ${message}\n`);
 }
 /**
  * Handle --help flag by printing help text.
@@ -346,7 +386,7 @@ function handleSkill() {
 /**
  * Handle --explain-rule flag by printing rule explanation.
  */
-function handleExplainRule(ruleName) {
+function handleExplainRule(ruleName, json) {
 	const explanation = RULE_EXPLANATIONS[ruleName];
 	if (explanation) {
 		void process.stdout.write(explanation);
@@ -358,13 +398,14 @@ function handleExplainRule(ruleName) {
 			"INVALID_SELECTOR",
 			`Unknown rule: ${ruleName}. Available rules: ${available}`,
 		),
+		json,
 	);
 }
 /**
  * Handle early-exit flags that print output and return without processing files.
  * Returns true if an early-exit flag was handled.
  */
-async function handleEarlyExitFlags(parsed) {
+async function handleEarlyExitFlags(parsed, json) {
 	if (parsed.help) {
 		handleHelp();
 		return true;
@@ -378,7 +419,7 @@ async function handleEarlyExitFlags(parsed) {
 		return true;
 	}
 	if (parsed.explainRule !== undefined) {
-		handleExplainRule(parsed.explainRule);
+		handleExplainRule(parsed.explainRule, json);
 		return true;
 	}
 	return false;
@@ -387,10 +428,11 @@ async function handleEarlyExitFlags(parsed) {
  * Validate that mode flags are not used in incompatible combinations.
  * Returns true if validation passed (no conflicts), false if an error was written.
  */
-function validateModeCombinations(parsed) {
+function validateModeCombinations(parsed, json) {
 	if (parsed.checkMode && parsed.lintMode) {
 		writeError(
 			new JsdocError("INVALID_SELECTOR", "Cannot use -c and -l together"),
+			json,
 		);
 		return false;
 	}
@@ -400,6 +442,7 @@ function validateModeCombinations(parsed) {
 	) {
 		writeError(
 			new JsdocError("INVALID_SELECTOR", "Cannot use --search with -c or -l"),
+			json,
 		);
 		return false;
 	}
@@ -409,10 +452,11 @@ function validateModeCombinations(parsed) {
  * Main CLI entry point. Exported for testability.
  */
 export async function main(args, stdin) {
+	const json = args.includes("--json");
 	try {
 		const parsed = parseArgs(args);
-		if (await handleEarlyExitFlags(parsed)) return;
-		if (!validateModeCombinations(parsed)) return;
+		if (await handleEarlyExitFlags(parsed, json)) return;
+		if (!validateModeCombinations(parsed, json)) return;
 		const cacheConfig = {
 			enabled: !parsed.disableCache,
 			directory: parsed.cacheDirectory ?? DEFAULT_CACHE_DIR,
@@ -431,6 +475,29 @@ export async function main(args, stdin) {
 				cacheConfig,
 				parsed.searchQuery,
 			);
+		} else if (parsed.extraArgs.length > 0) {
+			// Multiple positional args (e.g. shell-expanded glob): expand each to
+			// .ts/.tsx files via discoverFiles (handles directories recursively)
+			const allArgPaths = [
+				...(parsed.selectorArg ? [parsed.selectorArg] : []),
+				...parsed.extraArgs,
+			];
+			const fileLists = await Promise.all(
+				allArgPaths.map((p) => discoverFiles(p, cwd, parsed.gitignore)),
+			);
+			const filePaths = [...new Set(fileLists.flat())];
+			await processFileList(
+				filePaths,
+				parsed.selectorArg,
+				parsed.checkMode,
+				parsed.lintMode,
+				parsed.json,
+				parsed.pretty,
+				parsed.limit,
+				cwd,
+				cacheConfig,
+				parsed.searchQuery,
+			);
 		} else {
 			await processSelector(
 				parsed.selectorArg,
@@ -446,7 +513,7 @@ export async function main(args, stdin) {
 			);
 		}
 	} catch (error) {
-		writeError(error);
+		writeError(error, json);
 	}
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "jsdoczoom",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"description": "CLI tool for extracting JSDoc summaries at configurable depths",
 	"type": "module",
 	"sideEffects": false,