@openpkg-ts/cli 0.12.0 → 0.12.1

package/dist/index.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import fs from "node:fs";
-import path from "node:path";
+import fs2 from "node:fs";
+import path2 from "node:path";
 import readline from "node:readline/promises";
 import { parseArgs } from "node:util";
 import {
@@ -13,6 +13,7 @@ import {
   extractSpec,
   getAvailableVersions,
   getValidationErrors,
+  isPathLikeInput,
   isRemoteInput,
   listExports,
   loadConfig,
@@ -21,6 +22,78 @@ import {
   recommendSemverBump,
   resolveTarget
 } from "@openpkg-ts/sdk";
+
+// src/env.ts
+import fs from "node:fs";
+import path from "node:path";
+function parseEnvText(content) {
+  const out = {};
+  for (const rawLine of content.split(/\r?\n/)) {
+    let line = rawLine.trim();
+    if (!line || line.startsWith("#"))
+      continue;
+    if (line.startsWith("export "))
+      line = line.slice(7).trimStart();
+    const eq = line.indexOf("=");
+    if (eq <= 0)
+      continue;
+    const key = line.slice(0, eq).trim();
+    if (!key || /\s/.test(key))
+      continue;
+    let value = line.slice(eq + 1);
+    if (value.startsWith(" ") || value.startsWith("\t"))
+      value = value.trimStart();
+    if (value.startsWith('"')) {
+      let i = 1;
+      let parsed = "";
+      while (i < value.length) {
+        const ch = value[i];
+        if (ch === "\\" && i + 1 < value.length) {
+          const next = value[i + 1];
+          parsed += next === "n" ? `
+` : next === "r" ? "\r" : next === "t" ? "\t" : next;
+          i += 2;
+          continue;
+        }
+        if (ch === '"')
+          break;
+        parsed += ch;
+        i++;
+      }
+      out[key] = parsed;
+      continue;
+    }
+    if (value.startsWith("'")) {
+      const end = value.indexOf("'", 1);
+      out[key] = end === -1 ? value.slice(1) : value.slice(1, end);
+      continue;
+    }
+    const hash = value.search(/\s+#/);
+    out[key] = (hash === -1 ? value : value.slice(0, hash)).trim();
+  }
+  return out;
+}
+function parseIfExists(file) {
+  try {
+    if (!fs.existsSync(file))
+      return {};
+    return parseEnvText(fs.readFileSync(file, "utf8"));
+  } catch {
+    return {};
+  }
+}
+function loadCwdEnv(cwd = process.cwd()) {
+  const parsed = {
+    ...parseIfExists(path.join(cwd, ".env")),
+    ...parseIfExists(path.join(cwd, ".env.local"))
+  };
+  for (const [k, v] of Object.entries(parsed)) {
+    if (process.env[k] === undefined)
+      process.env[k] = v;
+  }
+}
+
+// src/index.ts
 var HELP = `openpkg - extract TypeScript API specs and generate docs
 
 Usage:
@@ -56,21 +129,31 @@ cwd. Flags override the file. Example:
   { "followExternal": ["@ai-sdk/*"] }
   { "followExternal": "auto", "decisions": "jev" }
 `;
-function fail(message) {
-  console.error(`error: ${message}`);
-  process.exit(1);
+
+class CliError extends Error {
+  exitCode;
+  printed;
+  constructor(message, exitCode = 1, printed = false) {
+    super(message);
+    this.exitCode = exitCode;
+    this.printed = printed;
+    this.name = "CliError";
+  }
+}
+function fail(message, exitCode = 1) {
+  throw new CliError(message, exitCode);
 }
 function write(content, output) {
   if (output) {
-    fs.mkdirSync(path.dirname(path.resolve(output)), { recursive: true });
-    fs.writeFileSync(output, content);
+    fs2.mkdirSync(path2.dirname(path2.resolve(output)), { recursive: true });
+    fs2.writeFileSync(output, content);
     console.error(`wrote ${output}`);
   } else {
     console.log(content);
   }
 }
 function version() {
-  const pkg = JSON.parse(fs.readFileSync(new URL("../package.json", import.meta.url), "utf-8"));
+  const pkg = JSON.parse(fs2.readFileSync(new URL("../package.json", import.meta.url), "utf-8"));
   return pkg.version;
 }
 function reportDiagnostics(diagnostics) {
@@ -80,7 +163,7 @@ function reportDiagnostics(diagnostics) {
     }
   }
   if (diagnostics.some((d) => d.severity === "error")) {
-    process.exit(1);
+    throw new CliError("", 1, true);
   }
 }
 function parseTargetArgs(positionals, cwd) {
@@ -88,18 +171,18 @@ function parseTargetArgs(positionals, cwd) {
     return { input: cwd };
   const first = positionals[0];
   const rest = positionals.slice(1).join(" ").trim();
-  const abs = path.resolve(cwd, first);
   if (isRemoteInput(first)) {
     return { input: first, ...rest ? { intent: rest } : {} };
   }
-  if (fs.existsSync(abs)) {
+  const abs = path2.resolve(cwd, first);
+  if (fs2.existsSync(abs) || isPathLikeInput(first)) {
     return { input: abs, ...rest ? { intent: rest } : {} };
   }
   return { input: cwd, intent: positionals.join(" ") };
 }
 function formatPackages(candidates, cwd) {
   return candidates.map((c, i) => {
-    const rel = path.relative(cwd, c.dir) || ".";
+    const rel = path2.relative(cwd, c.dir) || ".";
     return `  ${i + 1}. ${c.name}  ${rel}`;
   }).join(`
 `);
@@ -124,54 +207,44 @@ re-run with a path or intent, e.g. openpkg spec . ${hint}`);
     rl.close();
   }
 }
-function loadCwdEnv() {
-  for (const name of [".env.local", ".env"]) {
-    const file = path.join(process.cwd(), name);
-    if (!fs.existsSync(file))
-      continue;
-    for (const line of fs.readFileSync(file, "utf8").split(`
-`)) {
-      const t = line.trim();
-      if (!t || t.startsWith("#"))
-        continue;
-      const i = t.indexOf("=");
-      if (i === -1)
-        continue;
-      const k = t.slice(0, i).trim();
-      const v = t.slice(i + 1).trim();
-      if (k && process.env[k] === undefined)
-        process.env[k] = v;
-    }
-  }
-}
 async function resolveCliTarget(positionals, decisions) {
   loadCwdEnv();
   const cwd = process.cwd();
   const { input, intent } = parseTargetArgs(positionals, cwd);
   const resolved = await resolveTarget({ input, intent, cwd, decisions });
-  if (resolved.kind === "unavailable")
-    fail(resolved.reason);
-  if (resolved.kind === "remote")
-    fail("failed to clone remote repo");
-  if (resolved.kind === "empty")
-    fail(resolved.reason);
-  if (resolved.kind === "needs-build") {
-    console.error(`error: ${resolved.reason}`);
-    if (resolved.command)
-      console.error(`  → ${resolved.command}`);
-    process.exit(2);
-  }
-  if (resolved.kind === "explicit") {
-    return { entryFile: resolved.entryFile, entryPointSource: resolved.entryPointSource };
-  }
-  if (resolved.kind === "ok") {
-    return { entryFile: resolved.entryFile, entryPointSource: resolved.entryPointSource };
+  const cleanup = resolved.cleanup;
+  try {
+    if (resolved.kind === "unavailable")
+      fail(resolved.reason);
+    if (resolved.kind === "empty")
+      fail(resolved.reason);
+    if (resolved.kind === "needs-build") {
+      fail(resolved.command ? `${resolved.reason}
+  → ${resolved.command}` : resolved.reason, 2);
+    }
+    if (resolved.kind === "explicit") {
+      return {
+        entryFile: resolved.entryFile,
+        entryPointSource: resolved.entryPointSource,
+        cleanup
+      };
+    }
+    if (resolved.kind === "ok") {
+      return {
+        entryFile: resolved.entryFile,
+        entryPointSource: resolved.entryPointSource,
+        cleanup
+      };
+    }
+    const chosen = await choosePackage(resolved.candidates, cwd);
+    const picked = pickEntry(chosen.dir);
+    if (!picked)
+      fail(`no TypeScript entry found in ${chosen.name}`);
+    return { ...picked, cleanup };
+  } catch (err) {
+    cleanup?.();
+    throw err;
   }
-  const chosen = await choosePackage(resolved.candidates, cwd);
-  const picked = pickEntry(chosen.dir);
-  if (!picked)
-    fail(`no TypeScript entry found in ${chosen.name}`);
-  return picked;
 }
 function toList(value) {
   if (!value)
@@ -223,24 +296,31 @@ async function specCommand(args) {
     ignore: toList(values.ignore),
     ...values.jev ? { decisions: "jev" } : {}
   };
-  const { entryFile, entryPointSource } = await resolveCliTarget(positionals, cliConfig.decisions ?? fileConfig?.decisions);
-  const config = mergeConfig(fileConfig, cliConfig);
-  if (config.followExternal === "auto" && config.decisions !== "jev") {
-    fail("followExternal auto requires --jev");
+  let cleanup;
+  try {
+    const resolved = await resolveCliTarget(positionals, cliConfig.decisions ?? fileConfig?.decisions);
+    cleanup = resolved.cleanup;
+    const { entryFile, entryPointSource } = resolved;
+    const config = mergeConfig(fileConfig, cliConfig);
+    if (config.followExternal === "auto" && config.decisions !== "jev") {
+      fail("followExternal auto requires --jev");
+    }
+    const { spec, diagnostics } = await extractSpec({
+      entryFile,
+      entryPointSource,
+      followExternal: config.followExternal,
+      only: config.only,
+      ignore: config.ignore,
+      externals: config.externals,
+      decisions: config.decisions
+    });
+    reportDiagnostics(diagnostics);
+    if (!config.followExternal)
+      reportStubbedExternals(spec);
+    write(JSON.stringify(spec, null, 2), values.output);
+  } finally {
+    cleanup?.();
   }
-  const { spec, diagnostics } = await extractSpec({
-    entryFile,
-    entryPointSource,
-    followExternal: config.followExternal,
-    only: config.only,
-    ignore: config.ignore,
-    externals: config.externals,
-    decisions: config.decisions
-  });
-  reportDiagnostics(diagnostics);
-  if (!config.followExternal)
-    reportStubbedExternals(spec);
-  write(JSON.stringify(spec, null, 2), values.output);
 }
 async function docsCommand(args) {
   const { values, positionals } = parseArgs({
@@ -256,17 +336,26 @@ async function docsCommand(args) {
   if (!["md", "html", "json"].includes(format))
     fail(`unknown format "${format}" (md|html|json)`);
   let docs;
-  if (positionals[0]?.endsWith(".json")) {
-    docs = createDocs(positionals[0]);
-  } else {
-    const decisions = values.jev ? "jev" : loadConfig(process.cwd())?.decisions;
-    const { entryFile, entryPointSource } = await resolveCliTarget(positionals, decisions);
-    const { spec, diagnostics } = await extractSpec({ entryFile, entryPointSource });
-    reportDiagnostics(diagnostics);
-    docs = createDocs(spec);
+  let cleanup;
+  try {
+    if (positionals[0]?.endsWith(".json")) {
+      docs = createDocs(positionals[0]);
+    } else {
+      const decisions = values.jev ? "jev" : loadConfig(process.cwd())?.decisions;
+      const resolved = await resolveCliTarget(positionals, decisions);
+      cleanup = resolved.cleanup;
+      const { spec, diagnostics } = await extractSpec({
+        entryFile: resolved.entryFile,
+        entryPointSource: resolved.entryPointSource
+      });
+      reportDiagnostics(diagnostics);
+      docs = createDocs(spec);
+    }
+    const content = format === "md" ? docs.toMarkdown() : format === "html" ? docs.toHTML() : JSON.stringify(docs.toJSON(), null, 2);
+    write(content, values.output);
+  } finally {
+    cleanup?.();
   }
-  const content = format === "md" ? docs.toMarkdown() : format === "html" ? docs.toHTML() : JSON.stringify(docs.toJSON(), null, 2);
-  write(content, values.output);
 }
 async function listCommand(args) {
   const { values, positionals } = parseArgs({
@@ -275,26 +364,32 @@ async function listCommand(args) {
     allowPositionals: true
   });
   const decisions = values.jev ? "jev" : loadConfig(process.cwd())?.decisions;
-  const { entryFile } = await resolveCliTarget(positionals, decisions);
-  const { exports, errors } = await listExports({ entryFile });
-  for (const err of errors) {
-    console.error(`error: ${err}`);
-  }
-  if (errors.length > 0 && exports.length === 0) {
-    process.exit(1);
-  }
-  if (values.json) {
-    console.log(JSON.stringify(exports, null, 2));
-    return;
-  }
-  for (const exp of exports) {
-    const location = exp.file ? ` (${exp.file}:${exp.line})` : "";
-    console.log(`${exp.kind.padEnd(10)}${exp.name}${location}`);
+  let cleanup;
+  try {
+    const resolved = await resolveCliTarget(positionals, decisions);
+    cleanup = resolved.cleanup;
+    const { exports, errors } = await listExports({ entryFile: resolved.entryFile });
+    for (const err of errors) {
+      console.error(`error: ${err}`);
+    }
+    if (errors.length > 0 && exports.length === 0) {
+      throw new CliError("", 1, true);
+    }
+    if (values.json) {
+      console.log(JSON.stringify(exports, null, 2));
+      return;
+    }
+    for (const exp of exports) {
+      const location = exp.file ? ` (${exp.file}:${exp.line})` : "";
+      console.log(`${exp.kind.padEnd(10)}${exp.name}${location}`);
+    }
+  } finally {
+    cleanup?.();
   }
 }
 function readSpecFile(file) {
   try {
-    return JSON.parse(fs.readFileSync(file, "utf-8"));
+    return JSON.parse(fs2.readFileSync(file, "utf-8"));
   } catch (err) {
     fail(`failed to read spec file ${file}: ${err instanceof Error ? err.message : String(err)}`);
   }
@@ -330,7 +425,7 @@ function validateCommand(args) {
   for (const e of errors) {
     console.error(`${e.instancePath || "/"} ${e.message}`);
   }
-  process.exit(1);
+  throw new CliError("", 1, true);
 }
 function diffCommand(args) {
   const { values, positionals } = parseArgs({
@@ -412,5 +507,11 @@ async function main() {
   }
 }
 main().catch((err) => {
-  fail(err instanceof Error ? err.message : String(err));
+  if (err instanceof CliError) {
+    if (!err.printed && err.message)
+      console.error(`error: ${err.message}`);
+    process.exit(err.exitCode);
+  }
+  console.error(`error: ${err instanceof Error ? err.message : String(err)}`);
+  process.exit(1);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openpkg-ts/cli",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "CLI for OpenPkg - extract TypeScript API specs and generate docs",
   "keywords": [
     "openpkg",
@@ -35,7 +35,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@openpkg-ts/sdk": "^0.52.0"
+    "@openpkg-ts/sdk": "^0.52.2"
   },
   "devDependencies": {
     "@types/bun": "latest",