@wrongstack/tools 0.7.8 → 0.8.0

package/dist/index.js

@@ -8,7 +8,7 @@ import * as os from 'node:os';
 import * as dns from 'node:dns/promises';
 import * as net from 'node:net';
 import * as fs13 from 'node:fs';
-import { statSync, mkdirSync, writeFileSync, unlinkSync } from 'node:fs';
+import { statSync, mkdirSync, writeFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import * as ts from 'typescript';
 
@@ -2758,8 +2758,8 @@ var jsonTool = {
     };
   }
 };
-function query(data, path17) {
-  const parts = path17.replace(/\[(\d+)\]/g, ".$1").split(".").filter(Boolean);
+function query(data, path18) {
+  const parts = path18.replace(/\[(\d+)\]/g, ".$1").split(".").filter(Boolean);
   let current = data;
   for (const part of parts) {
     if (current === null || current === void 0) return void 0;
@@ -4033,7 +4033,7 @@ async function dockerLogs(service, lines, filterRe, cwd, signal, since) {
   });
 }
 var MAX_TAIL_LINES = 1e5;
-async function fileLogs(path17, lines, filterRe, stream) {
+async function fileLogs(path18, lines, filterRe, stream) {
   const { createInterface } = await import('node:readline');
   const { createReadStream } = await import('node:fs');
   const entries = [];
@@ -4042,7 +4042,7 @@ async function fileLogs(path17, lines, filterRe, stream) {
   let writeIdx = 0;
   let totalLines = 0;
   const rl = createInterface({
-    input: createReadStream(path17),
+    input: createReadStream(path18),
     crlfDelay: Number.POSITIVE_INFINITY
   });
   for await (const line of rl) {
@@ -4063,7 +4063,7 @@ async function fileLogs(path17, lines, filterRe, stream) {
     if (parsed) entries.push(parsed);
   }
   return {
-    source: path17,
+    source: path18,
     entries,
     total: entries.length,
     truncated: totalLines > effLines,
@@ -5515,6 +5515,7 @@ import (
 	"go/ast"
 	"go/parser"
 	"go/token"
+	"io"
 	"os"
 	"strings"
 )
@@ -5529,17 +5530,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
@@ -5683,7 +5680,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 ""
 	}
@@ -5726,30 +5723,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 = path.join(process.env.TEMP ?? "/tmp", "ws-go-parse");
+function syncGoParse(filePath, content, lang) {
+  const tmpDir = path.join(os.tmpdir(), "ws-go-parse");
   try {
     mkdirSync(tmpDir, { recursive: true });
     const scriptPath = path.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() };
     }
@@ -5986,7 +5986,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 = path.join(os.tmpdir(), "ws-py-parse");
+    mkdirSync(tmpDir, { recursive: true });
+    const scriptPath = path.join(tmpDir, "parse.py");
+    writeFileSync(scriptPath, PY_PARSE_SCRIPT, "utf8");
+    const stdout = execSync(`python "${scriptPath}" "${filePath}"`, {
       timeout: 15e3,
       encoding: "utf8",
       windowsHide: true
@@ -6044,8 +6048,8 @@ function tryNativeParse(file, content) {
     const toolsDir = path.join(process.cwd(), "tools");
     const crateDir = path.join(toolsDir, "syn-parser");
     const tmpFile = path.join(crateDir, "src", "input.rs");
-    const { writeFileSync: writeFileSync2 } = __require("node:fs");
-    writeFileSync2(tmpFile, content, "utf8");
+    const { writeFileSync: writeFileSync3 } = __require("node:fs");
+    writeFileSync3(tmpFile, content, "utf8");
     const result = spawnSync(
       "cargo",
       ["run", "--manifest-path", path.join(toolsDir, "Cargo.toml")],