@openpkg-ts/extract 0.14.3 → 0.14.5

package/dist/bin/tspec.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   extract
-} from "../shared/chunk-axmbd6k1.js";
+} from "../shared/chunk-mhaxcbzq.js";
 
 // src/cli/spec.ts
 import * as fs from "node:fs";
@@ -497,6 +497,7 @@ var chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
 var source_default = chalk;
 
 // ../cli-utils/dist/index.js
+import { Worker } from "node:worker_threads";
 var colors = {
   success: source_default.green,
   error: source_default.red,
@@ -655,8 +656,8 @@ class MultiProgress {
     hideCursor();
     this.setupSignalHandler();
     this.timer = setInterval(() => {
-      this.spinnerIndex = (this.spinnerIndex + 1) % this.spinnerFrames.length;
       if (this.bars.size > 0 && [...this.bars.values()].some((b) => b.status === "active")) {
+        this.spinnerIndex = (this.spinnerIndex + 1) % this.spinnerFrames.length;
         this.render();
       }
     }, this.options.spinnerInterval);
@@ -1029,11 +1030,13 @@ class Spinner {
   symbols = getSymbols(supportsUnicode());
   lastRenderedLines = 0;
   sigintHandler = null;
+  animate;
   constructor(options = {}) {
     this.label = options.label ?? "";
     this.detail = options.detail;
     this.interval = options.interval ?? 80;
     this.colorFn = spinnerColors[options.color ?? "cyan"];
+    this.animate = options.animate ?? true;
     const style = options.style ?? "circle";
     this.frames = supportsUnicode() ? FRAME_SETS[style] : ASCII_FRAME_SET;
   }
@@ -1045,7 +1048,7 @@ class Spinner {
     this.state = "spinning";
     this.frameIndex = 0;
     this.lastRenderedLines = 0;
-    if (!isInteractive()) {
+    if (!isInteractive() || !this.animate) {
       console.log(`${this.symbols.bullet} ${this.label}`);
       return this;
     }
@@ -1103,14 +1106,12 @@ class Spinner {
       this.timer = null;
     }
     this.state = state;
-    if (!isInteractive()) {
-      const symbol = state === "success" ? this.symbols.success : this.symbols.error;
-      const colorFn = state === "success" ? colors.success : colors.error;
+    const symbol = state === "success" ? this.symbols.success : this.symbols.error;
+    const colorFn = state === "success" ? colors.success : colors.error;
+    if (!isInteractive() || !this.animate) {
       console.log(`${colorFn(symbol)} ${this.label}`);
     } else {
       this.clearOutput();
-      const symbol = state === "success" ? this.symbols.success : this.symbols.error;
-      const colorFn = state === "success" ? colors.success : colors.error;
       process.stdout.write(`${colorFn(symbol)} ${this.label}
 `);
     }
@@ -1186,8 +1187,8 @@ class StepProgress {
     this.setupSignalHandler();
     this.render();
     this.timer = setInterval(() => {
-      this.spinnerIndex = (this.spinnerIndex + 1) % this.spinnerFrames.length;
       if (this.steps.some((s) => s.status === "active")) {
+        this.spinnerIndex = (this.spinnerIndex + 1) % this.spinnerFrames.length;
         this.render();
       }
     }, this.spinnerInterval);
@@ -1488,10 +1489,24 @@ import { normalize, validateSpec } from "@openpkg-ts/spec";
 import { Command } from "commander";
 function createProgram() {
   const program = new Command("tspec").description("Extract TypeScript package API to OpenPkg spec").argument("[entry]", "Entry point file").option("-o, --output <file>", "Output file", "openpkg.json").option("--max-depth <n>", "Max type depth (default: 4)").option("--skip-resolve", "Skip external type resolution").option("--runtime", "Enable Standard Schema runtime extraction").option("-v, --verbose", "Show detailed output").action(async (entry, options) => {
-    const entryFile = entry || findEntryPoint(process.cwd());
-    if (!entryFile) {
-      console.error("No entry point found. Please specify an entry file.");
-      process.exit(1);
+    let entryFile;
+    let fromDts = false;
+    if (entry) {
+      entryFile = entry;
+      fromDts = entry.endsWith(".d.ts");
+    } else {
+      const found = findEntryPoint(process.cwd());
+      if (!found) {
+        console.error("No entry point found. Please specify an entry file.");
+        process.exit(1);
+      }
+      entryFile = found.path;
+      fromDts = found.fromDts;
+    }
+    if (fromDts) {
+      console.warn("⚠ Using .d.ts file. TSDoc comments may be missing.");
+      console.warn(`  Consider: tspec src/index.ts
+`);
     }
     const spin = spinner("Extracting...");
     const result = await extract({
@@ -1523,29 +1538,36 @@ function createProgram() {
   return program;
 }
 function findEntryPoint(cwd) {
+  const sourceEntries = ["src/index.ts", "index.ts", "lib/index.ts"];
+  for (const entry of sourceEntries) {
+    const fullPath = path.join(cwd, entry);
+    if (fs.existsSync(fullPath))
+      return { path: fullPath, fromDts: false };
+  }
   const pkgPath = path.join(cwd, "package.json");
   if (fs.existsSync(pkgPath)) {
     try {
       const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
-      if (pkg.types)
-        return path.join(cwd, pkg.types);
-      if (pkg.typings)
-        return path.join(cwd, pkg.typings);
-      if (pkg.exports?.["."]?.types)
-        return path.join(cwd, pkg.exports["."].types);
+      if (pkg.types) {
+        const p = path.join(cwd, pkg.types);
+        return { path: p, fromDts: pkg.types.endsWith(".d.ts") };
+      }
+      if (pkg.typings) {
+        const p = path.join(cwd, pkg.typings);
+        return { path: p, fromDts: pkg.typings.endsWith(".d.ts") };
+      }
+      if (pkg.exports?.["."]?.types) {
+        const p = path.join(cwd, pkg.exports["."].types);
+        return { path: p, fromDts: pkg.exports["."].types.endsWith(".d.ts") };
+      }
       if (pkg.main) {
         const mainTs = pkg.main.replace(/\.js$/, ".ts");
-        if (fs.existsSync(path.join(cwd, mainTs)))
-          return path.join(cwd, mainTs);
+        const fullPath = path.join(cwd, mainTs);
+        if (fs.existsSync(fullPath))
+          return { path: fullPath, fromDts: false };
       }
     } catch {}
   }
-  const fallbacks = ["src/index.ts", "index.ts", "lib/index.ts"];
-  for (const fallback of fallbacks) {
-    const fullPath = path.join(cwd, fallback);
-    if (fs.existsSync(fullPath))
-      return fullPath;
-  }
   return null;
 }
 

package/dist/shared/{chunk-axmbd6k1.js → chunk-mhaxcbzq.js}

@@ -1673,24 +1673,82 @@ function serializeDeclaration(declaration, exportSymbol, _targetSymbol, exportNa
       result = serializeVariable(declaration, varStatement, ctx);
     }
   } else if (ts8.isNamespaceExport(declaration) || ts8.isModuleDeclaration(declaration)) {
-    result = serializeNamespaceExport(exportSymbol, exportName);
+    result = serializeNamespaceExport(exportSymbol, exportName, ctx);
   } else if (ts8.isSourceFile(declaration)) {
-    result = serializeNamespaceExport(exportSymbol, exportName);
+    result = serializeNamespaceExport(exportSymbol, exportName, ctx);
   }
   if (result) {
     result = withExportName(result, exportName);
   }
   return result;
 }
-function serializeNamespaceExport(symbol, exportName) {
+function serializeNamespaceExport(symbol, exportName, ctx) {
   const { description, tags, examples } = getJSDocFromExportSymbol(symbol);
+  const members = [];
+  const checker = ctx.program.getTypeChecker();
+  let targetSymbol = symbol;
+  if (symbol.flags & ts8.SymbolFlags.Alias) {
+    const aliased = checker.getAliasedSymbol(symbol);
+    if (aliased && aliased !== symbol) {
+      targetSymbol = aliased;
+    }
+  }
+  const nsExports = checker.getExportsOfModule(targetSymbol);
+  for (const memberSymbol of nsExports) {
+    const memberName = memberSymbol.getName();
+    const member = serializeNamespaceMember(memberSymbol, memberName, ctx);
+    if (member) {
+      members.push(member);
+    }
+  }
   return {
     id: exportName,
     name: exportName,
     kind: "namespace",
     description,
     tags,
-    ...examples.length > 0 ? { examples } : {}
+    ...examples.length > 0 ? { examples } : {},
+    ...members.length > 0 ? { members } : {}
+  };
+}
+function serializeNamespaceMember(symbol, memberName, ctx) {
+  const checker = ctx.program.getTypeChecker();
+  let targetSymbol = symbol;
+  if (symbol.flags & ts8.SymbolFlags.Alias) {
+    const aliased = checker.getAliasedSymbol(symbol);
+    if (aliased && aliased !== symbol) {
+      targetSymbol = aliased;
+    }
+  }
+  const declarations = targetSymbol.declarations ?? [];
+  const declaration = targetSymbol.valueDeclaration || declarations.find((d) => d.kind !== ts8.SyntaxKind.ExportSpecifier) || declarations[0];
+  if (!declaration)
+    return null;
+  let kind = "variable";
+  if (ts8.isFunctionDeclaration(declaration) || ts8.isFunctionExpression(declaration)) {
+    kind = "function";
+  } else if (ts8.isClassDeclaration(declaration)) {
+    kind = "class";
+  } else if (ts8.isInterfaceDeclaration(declaration)) {
+    kind = "interface";
+  } else if (ts8.isTypeAliasDeclaration(declaration)) {
+    kind = "type";
+  } else if (ts8.isEnumDeclaration(declaration)) {
+    kind = "enum";
+  } else if (ts8.isVariableDeclaration(declaration)) {
+    const type = checker.getTypeAtLocation(declaration);
+    const callSignatures = type.getCallSignatures();
+    if (callSignatures.length > 0) {
+      kind = "function";
+    }
+  }
+  const docComment = targetSymbol.getDocumentationComment(checker);
+  const description = docComment.map((c) => c.text).join(`
+`) || undefined;
+  return {
+    name: memberName,
+    kind,
+    ...description ? { description } : {}
   };
 }
 function getJSDocFromExportSymbol(symbol) {

package/dist/src/index.js

@@ -26,7 +26,7 @@ import {
   serializeTypeAlias,
   serializeVariable,
   withDescription
-} from "../shared/chunk-axmbd6k1.js";
+} from "../shared/chunk-mhaxcbzq.js";
 // src/schema/registry.ts
 function isTypeReference(type) {
   return !!(type.flags & 524288 && type.objectFlags && type.objectFlags & 4);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openpkg-ts/extract",
-  "version": "0.14.3",
+  "version": "0.14.5",
   "description": "TypeScript export extraction to OpenPkg spec",
   "keywords": [
     "openpkg",