@wrongstack/tools 0.7.8 → 0.8.2

package/dist/codebase-index/index.js

@@ -1,11 +1,12 @@
 import * as fs2 from 'node:fs/promises';
-import * as path3 from 'node:path';
+import * as path4 from 'node:path';
 import { compileGlob } from '@wrongstack/core';
 import { createRequire } from 'node:module';
 import * as fs from 'node:fs';
-import { mkdirSync, writeFileSync, unlinkSync } from 'node:fs';
+import { mkdirSync, writeFileSync } from 'node:fs';
 import * as ts from 'typescript';
 import { execSync, spawnSync } from 'node:child_process';
+import * as os from 'node:os';
 
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
@@ -111,10 +112,10 @@ function loadDatabaseSync() {
 var IndexStore = class {
   constructor(projectRoot) {
     this.projectRoot = projectRoot;
-    const dir = path3.join(projectRoot, INDEX_DIR);
+    const dir = path4.join(projectRoot, INDEX_DIR);
     fs.mkdirSync(dir, { recursive: true });
     const Database = loadDatabaseSync();
-    this.db = new Database(path3.join(dir, DB_FILE));
+    this.db = new Database(path4.join(dir, DB_FILE));
     this.initSchema();
   }
   projectRoot;
@@ -309,7 +310,7 @@ var IndexStore = class {
       totalFiles,
       byLang,
       byKind,
-      indexPath: path3.join(this.projectRoot, INDEX_DIR),
+      indexPath: path4.join(this.projectRoot, INDEX_DIR),
       lastIndexed,
       sizeBytes,
       version: SCHEMA_VERSION
@@ -402,7 +403,7 @@ var IndexStore = class {
     }));
   }
   sizeBytes() {
-    const dbPath = path3.join(this.projectRoot, INDEX_DIR, DB_FILE);
+    const dbPath = path4.join(this.projectRoot, INDEX_DIR, DB_FILE);
     try {
       return fs.statSync(dbPath).size;
     } catch {
@@ -617,6 +618,7 @@ import (
 	"go/ast"
 	"go/parser"
 	"go/token"
+	"io"
 	"os"
 	"strings"
 )
@@ -631,17 +633,13 @@ type Sym struct {
 }
 
 func main() {
-	if len(os.Args) < 2 {
-		fmt.Print("[]")
-		return
-	}
-	src, err := os.ReadFile(os.Args[1])
+	src, err := io.ReadAll(os.Stdin)
 	if err != nil {
 		fmt.Print("[]")
 		return
 	}
 	fset := token.NewFileSet()
-	node, err := parser.ParseFile(fset, os.Args[1], src, 0)
+	node, err := parser.ParseFile(fset, "src.go", src, 0)
 	if err != nil {
 		fmt.Print("[]")
 		return
@@ -785,7 +783,7 @@ func formatMethods(fields []*ast.Field) string {
 	return formatFields(fields)
 }
 
-func formatTypeParams(tp *ast.TypeParams) string {
+func formatTypeParams(tp *ast.FieldList) string {
 	if tp == nil || len(tp.List) == 0 {
 		return ""
 	}
@@ -828,30 +826,33 @@ func formatType(t ast.Expr) string {
 		return "chan " + formatType(v.Value)
 	case *ast.BasicLit:
 		return v.Value
+	case *ast.IndexExpr:
+		// Generic instantiation with one type arg, e.g. Logger[int].
+		return formatType(v.X) + "[" + formatType(v.Index) + "]"
+	case *ast.IndexListExpr:
+		// Generic instantiation with multiple type args, e.g. Map[K, V].
+		args := make([]string, len(v.Indices))
+		for i, idx := range v.Indices {
+			args[i] = formatType(idx)
+		}
+		return formatType(v.X) + "[" + strings.Join(args, ", ") + "]"
 	default:
 		return "?"
 	}
 }
 `;
-function syncGoParse(filePath, _content, lang) {
-  const tmpDir = path3.join(process.env.TEMP ?? "/tmp", "ws-go-parse");
+function syncGoParse(filePath, content, lang) {
+  const tmpDir = path4.join(os.tmpdir(), "ws-go-parse");
   try {
     mkdirSync(tmpDir, { recursive: true });
-    const scriptPath = path3.join(tmpDir, "parse.go");
+    const scriptPath = path4.join(tmpDir, "parse.go");
     writeFileSync(scriptPath, GO_PARSE_SCRIPT, "utf8");
-    let stdout;
-    try {
-      stdout = execSync(`go run "${scriptPath}" "${filePath}"`, {
-        timeout: 15e3,
-        encoding: "utf8",
-        windowsHide: true
-      });
-    } finally {
-      try {
-        unlinkSync(scriptPath);
-      } catch {
-      }
-    }
+    const stdout = execSync(`go run "${scriptPath}"`, {
+      input: content,
+      timeout: 15e3,
+      encoding: "utf8",
+      windowsHide: true
+    });
     if (!stdout.trim()) {
       return { file: filePath, lang, symbols: [], mtimeMs: Date.now() };
     }
@@ -1088,7 +1089,11 @@ print(json.dumps([s.to_dict() for s in syms]))
 `;
 function syncPyParse(filePath, lang) {
   try {
-    const stdout = execSync(`python -c "${PY_PARSE_SCRIPT.replace(/"/g, '\\"')}" "${filePath}"`, {
+    const tmpDir = path4.join(os.tmpdir(), "ws-py-parse");
+    mkdirSync(tmpDir, { recursive: true });
+    const scriptPath = path4.join(tmpDir, "parse.py");
+    writeFileSync(scriptPath, PY_PARSE_SCRIPT, "utf8");
+    const stdout = execSync(`python "${scriptPath}" "${filePath}"`, {
       timeout: 15e3,
       encoding: "utf8",
       windowsHide: true
@@ -1127,10 +1132,10 @@ function parseSymbols4(opts) {
 function checkNativeParser() {
   try {
     execSync("rustc --version", { stdio: "pipe" });
-    const toolsDir = path3.join(process.cwd(), "tools");
+    const toolsDir = path4.join(process.cwd(), "tools");
     try {
       execSync(
-        "cargo metadata --no-deps --format-version 1 --manifest-path " + path3.join(toolsDir, "Cargo.toml"),
+        "cargo metadata --no-deps --format-version 1 --manifest-path " + path4.join(toolsDir, "Cargo.toml"),
         { stdio: "pipe" }
       );
       return true;
@@ -1143,14 +1148,14 @@ function checkNativeParser() {
 }
 function tryNativeParse(file, content) {
   try {
-    const toolsDir = path3.join(process.cwd(), "tools");
-    const crateDir = path3.join(toolsDir, "syn-parser");
-    const tmpFile = path3.join(crateDir, "src", "input.rs");
-    const { writeFileSync: writeFileSync2 } = __require("node:fs");
-    writeFileSync2(tmpFile, content, "utf8");
+    const toolsDir = path4.join(process.cwd(), "tools");
+    const crateDir = path4.join(toolsDir, "syn-parser");
+    const tmpFile = path4.join(crateDir, "src", "input.rs");
+    const { writeFileSync: writeFileSync3 } = __require("node:fs");
+    writeFileSync3(tmpFile, content, "utf8");
     const result = spawnSync(
       "cargo",
-      ["run", "--manifest-path", path3.join(toolsDir, "Cargo.toml")],
+      ["run", "--manifest-path", path4.join(toolsDir, "Cargo.toml")],
       {
         cwd: process.cwd(),
         encoding: "utf8",
@@ -1248,7 +1253,7 @@ function parseSymbols5(opts) {
 function regexParse2(opts) {
   const { file, content, lang } = opts;
   const symbols = [];
-  const basename2 = path3.basename(file).toLowerCase();
+  const basename2 = path4.basename(file).toLowerCase();
   const isPackageJson = basename2 === "package.json";
   const isTsconfig = basename2 === "tsconfig.json" || basename2 === "tsconfig.build.json";
   const isJsonSchema = content.includes("$schema") || content.includes("$id") || content.includes("$ref");
@@ -1274,11 +1279,11 @@ function regexParse2(opts) {
     const line = lineFromOffset(offset);
     symbols.push(
       makeSymbol({
-        name: path3.basename(file),
+        name: path4.basename(file),
         kind: "object",
         line,
         col: 0,
-        signature: `"${path3.basename(file)}" = { ... }`,
+        signature: `"${path4.basename(file)}" = { ... }`,
         file,
         lang
       })
@@ -1626,12 +1631,12 @@ async function findSourceFiles(projectRoot, ignore) {
     }
     for (const e of entries) {
       if (ignoreSet.has(e.name)) continue;
-      const full = path3.join(dir, e.name);
+      const full = path4.join(dir, e.name);
       if (e.isDirectory()) {
         await walk(full);
       } else if (e.isFile()) {
-        const rel = path3.relative(projectRoot, full).replace(/\\/g, "/");
-        const ext = path3.extname(e.name);
+        const rel = path4.relative(projectRoot, full).replace(/\\/g, "/");
+        const ext = path4.extname(e.name);
         for (const { ext: extName, pat } of globs) {
           if (ext === extName && (pat.test(rel) || pat.test(e.name))) {
             results.push(full);
@@ -1675,7 +1680,7 @@ async function runIndexer(ctx, opts) {
   let symbolsIndexed = 0;
   let files;
   if (opts.files && opts.files.length > 0) {
-    files = opts.files.map((f) => path3.resolve(projectRoot, f));
+    files = opts.files.map((f) => path4.resolve(projectRoot, f));
   } else {
     files = await findSourceFiles(projectRoot, ignore);
   }