@wrongstack/tools 1.0.11 → 1.0.12

package/dist/{ts-parser-7W26YB26.js → ts-parser-PML6QIH7.js}

@@ -61,6 +61,32 @@ function getJsDoc(node, sourceFile) {
   }
   return "";
 }
+function declarationNameNodes(node) {
+  const name = node.name;
+  if (!name) return null;
+  if (ts.isIdentifier(name) || ts.isPrivateIdentifier(name) || ts.isStringLiteral(name) || ts.isNumericLiteral(name)) {
+    return [name];
+  }
+  if (ts.isObjectBindingPattern(name) || ts.isArrayBindingPattern(name)) {
+    return bindingIdentifiers(name);
+  }
+  return [];
+}
+function bindingIdentifiers(pattern) {
+  const out = [];
+  for (const element of pattern.elements) {
+    if (ts.isOmittedExpression(element)) continue;
+    if (ts.isIdentifier(element.name)) out.push(element.name);
+    else out.push(...bindingIdentifiers(element.name));
+  }
+  return out;
+}
+function docHostOf(node) {
+  if (ts.isVariableDeclaration(node) && ts.isVariableDeclarationList(node.parent) && node.parent.declarations[0] === node && ts.isVariableStatement(node.parent.parent)) {
+    return node.parent.parent;
+  }
+  return node;
+}
 function pushScopeName(node, parts) {
   if (ts.isClassDeclaration(node) || ts.isInterfaceDeclaration(node) || ts.isEnumDeclaration(node) || ts.isTypeAliasDeclaration(node)) {
     parts.push(node.name?.text ?? "Anon");
@@ -87,30 +113,32 @@ async function parseSymbols(opts) {
     if (kind) {
       if ((kind === "const" || kind === "let" || kind === "var" || kind === "parameter") && funcDepth > 0) {
       } else {
-        const nameNode = node.name;
-        if (!nameNode || !ts.isIdentifier(nameNode)) {
+        const nameNodes = declarationNameNodes(node);
+        if (nameNodes === null) {
           return;
         }
-        const name = nameNode.text;
-        const pos2 = nameNode.getStart(sourceFile);
-        const { line: line2, character } = sourceFile.getLineAndCharacterOfPosition(pos2);
-        const scope = scopeParts.join(".");
-        const signature = getSignature(printer, node, sourceFile);
-        const docComment = getJsDoc(node, sourceFile);
-        const text = [name, signature, docComment].filter(Boolean).join(" | ");
-        symbols.push({
-          id: 0,
-          lang,
-          kind,
-          name,
-          file,
-          line: line2 + 1,
-          col: character,
-          signature,
-          docComment,
-          scope,
-          text
-        });
+        const signature = nameNodes.length > 0 ? getSignature(printer, node, sourceFile) : "";
+        const docComment = nameNodes.length > 0 ? getJsDoc(docHostOf(node), sourceFile) : "";
+        for (const nameNode of nameNodes) {
+          const name = nameNode.text;
+          const pos2 = nameNode.getStart(sourceFile);
+          const { line: line2, character } = sourceFile.getLineAndCharacterOfPosition(pos2);
+          const scope = scopeParts.join(".");
+          const text = [name, signature, docComment].filter(Boolean).join(" | ");
+          symbols.push({
+            id: 0,
+            lang,
+            kind,
+            name,
+            file,
+            line: line2 + 1,
+            col: character,
+            signature,
+            docComment,
+            scope,
+            text
+          });
+        }
       }
     }
     const pos = node.getStart(sourceFile);
@@ -121,6 +149,10 @@ async function parseSymbols(opts) {
       if (ts.isIdentifier(expr)) {
         refs.push({ fromId: 0, toName: expr.text, callType: "call", line: lineNum });
       }
+    } else if (ts.isNewExpression(node)) {
+      if (ts.isIdentifier(node.expression)) {
+        refs.push({ fromId: 0, toName: node.expression.text, callType: "call", line: lineNum });
+      }
     } else if (ts.isPropertyAccessExpression(node)) {
       if (ts.isIdentifier(node.expression)) {
         refs.push({ fromId: 0, toName: node.expression.text, callType: "call", line: lineNum });
@@ -229,4 +261,4 @@ export {
   detectLang,
   parseSymbols
 };
-//# sourceMappingURL=ts-parser-7W26YB26.js.map
+//# sourceMappingURL=ts-parser-PML6QIH7.js.map

package/dist/write.js

@@ -1,14 +1,14 @@
 import {
   writeTool
-} from "./chunk-PWZUHZP7.js";
+} from "./chunk-Z77XMU3U.js";
 import "./chunk-MSOAX3GC.js";
-import "./chunk-HYHE4VNA.js";
-import "./chunk-XPVYZ2S6.js";
-import "./chunk-NEYUPZL6.js";
-import "./chunk-KHUCKLOR.js";
-import "./chunk-4CE3RKEP.js";
-import "./chunk-SKRMUHTU.js";
-import "./chunk-ZKC5UNGD.js";
+import "./chunk-UMOP3VGK.js";
+import "./chunk-RYLMSGR5.js";
+import "./chunk-6D3UIQMF.js";
+import "./chunk-BJ5LXLKE.js";
+import "./chunk-R3HR3QI3.js";
+import "./chunk-HSLDY55L.js";
+import "./chunk-OIFY4XNP.js";
 import "./chunk-YOHO4DVT.js";
 import "./chunk-XHSHNOAF.js";
 import "./chunk-XZLVJD56.js";

package/dist/{yaml-parser-DFBC5FWH.js → yaml-parser-7BJN544B.js}

@@ -30,10 +30,13 @@ function regexParse(opts) {
     }
     return lo + 1;
   }
+  const scalarBody = blockScalarBodyLines(lines);
+  const inScalarBody = (offset) => scalarBody.has(lineFromOffset(offset) - 1);
   const anchorRegex = /(?:^|(?<=[\s:\-[{,]))&(\w[\w-]*)/gm;
   for (let match = anchorRegex.exec(content); match !== null; match = anchorRegex.exec(content)) {
     const name = expectDefined(match[1]);
     const offset = match.index ?? 0;
+    if (inScalarBody(offset)) continue;
     const line = lineFromOffset(offset);
     const col = offset - (lineOffsets[line - 1] ?? 0);
     symbols.push(
@@ -52,6 +55,7 @@ function regexParse(opts) {
   for (let match = aliasRegex.exec(content); match !== null; match = aliasRegex.exec(content)) {
     const name = expectDefined(match[1]);
     const offset = match.index ?? 0;
+    if (inScalarBody(offset)) continue;
     const line = lineFromOffset(offset);
     const col = offset - (lineOffsets[line - 1] ?? 0);
     symbols.push(
@@ -69,9 +73,10 @@ function regexParse(opts) {
   const kvRegex = /^(\s*)([^:#\s][^:#\s]*)\s*:/gm;
   for (let match = kvRegex.exec(content); match !== null; match = kvRegex.exec(content)) {
     const indent = match[1]?.length ?? 0;
-    const key = match[2];
+    const key = unquoteKey(match[2] ?? "");
     if (!key) continue;
     const offset = match.index ?? 0;
+    if (inScalarBody(offset)) continue;
     const line = lineFromOffset(offset);
     const col = offset - (lineOffsets[line - 1] ?? 0);
     const lineContent = lines[line - 1] ?? "";
@@ -79,15 +84,16 @@ function regexParse(opts) {
     if (key === "---" || key === "...") continue;
     if (indent > 12) continue;
     const value = extractValue(content, (match.index ?? 0) + expectDefined(match[0]).length);
-    if (/^[|>](\s|$)/.test(value)) continue;
+    if (BLOCK_SCALAR_VALUE.test(value)) continue;
     const kind = isScalar(value) ? "literal" : "property";
     const signature = `${key}: ${truncate(value, 60)}`;
     symbols.push(makeSymbol({ name: key, kind, line, col, signature, file, lang }));
   }
   const listItemRegex = /^(\s*)-(\s+)([^:#\s][^:#\s]*)\s*:/gm;
   for (let match = listItemRegex.exec(content); match !== null; match = listItemRegex.exec(content)) {
-    const key = expectDefined(match[3]);
+    const key = unquoteKey(expectDefined(match[3]));
     const offset = match.index ?? 0;
+    if (inScalarBody(offset)) continue;
     const line = lineFromOffset(offset);
     const col = offset - (lineOffsets[line - 1] ?? 0);
     const value = extractValue(content, offset + match[0]?.length);
@@ -104,10 +110,11 @@ function regexParse(opts) {
       })
     );
   }
-  const blockScalarRegex = /^(\s*)([^:#\s][^:#\s]*)\s*:\s*[|>](\s|$)/gm;
+  const blockScalarRegex = /^(\s*)([^:#\s][^:#\s]*)\s*:[ \t]*[|>][-+0-9]*(?=[ \t]|$)/gm;
   for (let match = blockScalarRegex.exec(content); match !== null; match = blockScalarRegex.exec(content)) {
-    const key = expectDefined(match[2]);
+    const key = unquoteKey(expectDefined(match[2]));
     const offset = match.index ?? 0;
+    if (inScalarBody(offset)) continue;
     const line = lineFromOffset(offset);
     const col = offset - (lineOffsets[line - 1] ?? 0);
     symbols.push(
@@ -124,6 +131,34 @@ function regexParse(opts) {
   }
   return { file, lang, symbols, mtimeMs: Date.now() };
 }
+var BLOCK_SCALAR_VALUE = /^[|>][-+0-9]*(\s|#|$)/;
+function blockScalarBodyLines(lines) {
+  const body = /* @__PURE__ */ new Set();
+  const header = /^(\s*)(?:(?:-[ \t]+)?[^#\n]*?:|-)[ \t]*[|>][-+0-9]*[ \t]*(?:#.*)?$/;
+  for (let i = 0; i < lines.length; i++) {
+    const line = (lines[i] ?? "").replace(/\r$/, "");
+    const match = header.exec(line);
+    if (!match) continue;
+    const baseIndent = match[1]?.length ?? 0;
+    let j = i + 1;
+    for (; j < lines.length; j++) {
+      const next = (lines[j] ?? "").replace(/\r$/, "");
+      if (next.trim() === "") {
+        body.add(j);
+        continue;
+      }
+      const indent = next.length - next.trimStart().length;
+      if (indent <= baseIndent) break;
+      body.add(j);
+    }
+    i = j - 1;
+  }
+  return body;
+}
+function unquoteKey(key) {
+  const quoted = /^(["'])(.*)\1$/.exec(key);
+  return quoted ? quoted[2] ?? "" : key;
+}
 function extractValue(content, afterColonOffset) {
   const lineEnd = content.indexOf("\n", afterColonOffset);
   const rest = content.slice(afterColonOffset, lineEnd < 0 ? void 0 : lineEnd);
@@ -155,4 +190,4 @@ export {
   detectLang,
   parseSymbols
 };
-//# sourceMappingURL=yaml-parser-DFBC5FWH.js.map
+//# sourceMappingURL=yaml-parser-7BJN544B.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrongstack/tools",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "license": "MIT",
   "description": "WrongStack built-in tools: read/write/edit, bash/exec, grep/glob, git, fetch, test, lint, and more.",
   "repository": {
@@ -237,10 +237,10 @@
     "@msgpack/msgpack": "^3.1.3",
     "@playwright/test": "^1.63.0",
     "@typescript/typescript6": "^6.0.2",
-    "@wrongstack/core": "1.0.11",
-    "@wrongstack/kanban": "1.0.11",
-    "@wrongstack/persistence": "1.0.11",
-    "@wrongstack/primitives": "1.0.11",
+    "@wrongstack/core": "1.0.12",
+    "@wrongstack/kanban": "1.0.12",
+    "@wrongstack/persistence": "1.0.12",
+    "@wrongstack/primitives": "1.0.12",
     "tree-sitter-wasm": "1.1.8",
     "turndown": "^7.2.4",
     "undici": "^8.10.2",

package/dist/chunk-4CE3RKEP.js

@@ -1,390 +0,0 @@
-import {
-  parseGeneric
-} from "./chunk-SKRMUHTU.js";
-import {
-  parseParserOutput,
-  recordParserSubprocess,
-  withSpawnGate
-} from "./chunk-ZKC5UNGD.js";
-import {
-  resolveWin32Command
-} from "./chunk-XZLVJD56.js";
-
-// src/codebase-index/py-parser.ts
-import { spawn } from "node:child_process";
-import * as fs from "node:fs/promises";
-import * as os from "node:os";
-import * as path from "node:path";
-import { StringDecoder } from "node:string_decoder";
-async function parseSymbols(opts) {
-  const { file, content, lang } = opts;
-  try {
-    const native = await withSpawnGate(() => syncPyParse(file, content, lang));
-    if (native !== null) return native;
-  } catch {
-  }
-  return parseGeneric({ file, content, lang: lang === "py" ? "py" : lang });
-}
-var PY_PARSE_SCRIPT = `import ast, json, sys, os
-
-def get_name(node):
-    if isinstance(node, ast.Name):
-        return node.id
-    elif isinstance(node, ast.Attribute):
-        return get_name(node.value) + "." + node.attr
-    elif isinstance(node, ast.Subscript):
-        return get_name(node.value)
-    elif isinstance(node, ast.Call):
-        return get_name(node.func)
-    elif isinstance(node, ast.Constant):
-        return str(node.value)
-    return ""
-
-def get_decorators(node):
-    decs = []
-    for dec in node.decorator_list:
-        decs.append(get_name(dec))
-    return decs
-
-def get_bases(node):
-    bases = []
-    for base in node.bases:
-        bases.append(get_name(base))
-    return bases
-
-def get_args(args):
-    parts = []
-    for arg in args.args:
-        parts.append(arg.arg)
-    return ", ".join(parts)
-
-def get_returns(node):
-    if node.returns is None:
-        return ""
-    return get_name(node.returns)
-
-class Sym:
-    def __init__(self, name, kind, line, col, signature, scope):
-        self.name = name
-        self.kind = kind
-        self.line = line
-        self.col = col
-        self.signature = signature
-        self.scope = scope
-    def to_dict(self):
-        return {
-            "name": self.name,
-            "kind": self.kind,
-            "line": self.line,
-            "col": self.col,
-            "signature": self.signature,
-            "scope": self.scope,
-        }
-
-def is_private(name):
-    return name.startswith("__") and not name.endswith("__")
-
-def leaf_name(node):
-    # Declared name of the callee: \`join\` of \`os.path.join\`. Matches how the
-    # TypeScript and Go extractors record call refs, so resolution behaves the
-    # same across languages.
-    if isinstance(node, ast.Attribute):
-        return node.attr
-    if isinstance(node, ast.Name):
-        return node.id
-    return get_name(node).split(".")[-1]
-
-syms = []
-refs = []
-errors = []
-
-try:
-    source = sys.stdin.read()
-    tree = ast.parse(source, filename=sys.argv[1])
-except Exception as e:
-    errors.append(str(e))
-    print(json.dumps({"symbols": [], "refs": []}))
-    sys.exit(0)
-
-# Module-level scope
-module_scope = os.path.basename(sys.argv[1])[:-3]  # strip .py
-
-class ModuleVisitor(ast.NodeVisitor):
-    def __init__(self):
-        self.scope_stack = [module_scope]
-
-    def visit_ClassDef(self, node):
-        bases = get_bases(node)
-        decs = get_decorators(node)
-        sig = "class " + node.name
-        if bases:
-            sig += "(" + ", ".join(bases) + ")"
-        sig += ": ..."
-        syms.append(Sym(
-            name=node.name,
-            kind="class",
-            line=node.lineno,
-            col=node.col_offset,
-            signature=sig,
-            scope=".".join(self.scope_stack) + "." + node.name,
-        ))
-        self.scope_stack.append(node.name)
-        self.generic_visit(node)
-        self.scope_stack.pop()
-
-    def visit_FunctionDef(self, node):
-        decs = get_decorators(node)
-        args = get_args(node.args)
-        returns = get_returns(node)
-        is_async = isinstance(node, ast.AsyncFunctionDef)
-
-        kind = "function"
-        prefix = "def "
-        if decs:
-            for d in decs:
-                if d.endswith(".staticmethod"):
-                    kind = "staticmethod"
-                elif d.endswith(".classmethod"):
-                    kind = "classmethod"
-                elif d == "property":
-                    kind = "property"
-
-        if is_async:
-            kind = "async_" + kind
-
-        sig = f"{prefix}{node.name}({args})"
-        if returns:
-            sig += f" -> {returns}"
-        scope = ".".join(self.scope_stack) + "." + node.name
-
-        syms.append(Sym(
-            name=node.name,
-            kind=kind,
-            line=node.lineno,
-            col=node.col_offset,
-            signature=sig,
-            scope=scope,
-        ))
-        # Don't descend into function bodies to avoid local symbols
-        # self.generic_visit(node)
-
-    def visit_AsyncFunctionDef(self, node):
-        # Treat as function
-        self.visit_FunctionDef(node)
-
-    def visit_Assign(self, node):
-        for target in node.targets:
-            if isinstance(target, ast.Name):
-                name = target.id
-                if is_private(name):
-                    continue
-                # Infer constness from UPPER_CASE naming
-                kind = "const" if name.isupper() else "var"
-                col = target.col_offset if hasattr(target, 'col_offset') else 0
-                syms.append(Sym(
-                    name=name,
-                    kind=kind,
-                    line=node.lineno,
-                    col=col,
-                    signature=f"{name} = ...",
-                    scope=".".join(self.scope_stack),
-                ))
-
-    def visit_AnnAssign(self, node):
-        if isinstance(node.target, ast.Name):
-            name = node.target.id
-            if is_private(name):
-                return
-            kind = "const" if name.isupper() else "var"
-            col = node.target.col_offset if hasattr(node.target, 'col_offset') else 0
-            sig = f"{name}: {get_name(node.annotation)}"
-            if node.value:
-                sig += " = ..."
-            syms.append(Sym(
-                name=name,
-                kind=kind,
-                line=node.lineno,
-                col=col,
-                signature=sig,
-                scope=".".join(self.scope_stack),
-            ))
-
-    def visit_Import(self, node):
-        for alias in node.names:
-            name = alias.asname or alias.name
-            syms.append(Sym(
-                name=name,
-                kind="import",
-                line=node.lineno,
-                col=node.col_offset,
-                signature=f"import {alias.name}",
-                scope=".".join(self.scope_stack),
-            ))
-
-    def visit_ImportFrom(self, node):
-        module = node.module or ""
-        for alias in node.names:
-            name = alias.asname or alias.name
-            syms.append(Sym(
-                name=name,
-                kind="import",
-                line=node.lineno,
-                col=node.col_offset,
-                signature=f"from {module} import {alias.name}",
-                scope=".".join(self.scope_stack),
-            ))
-
-visitor = ModuleVisitor()
-visitor.visit(tree)
-
-# Refs need a separate full walk: ModuleVisitor deliberately does not descend
-# into function bodies (it would index locals as symbols), but that is exactly
-# where the calls are.
-for node in ast.walk(tree):
-    if isinstance(node, ast.Call):
-        name = leaf_name(node.func)
-        if name:
-            refs.append({"toName": name, "callType": "call", "line": node.lineno})
-    elif isinstance(node, ast.Import):
-        for alias in node.names:
-            refs.append({
-                "toName": alias.name.split(".")[-1],
-                "callType": "import",
-                "line": node.lineno,
-                "module": alias.name,
-            })
-    elif isinstance(node, ast.ImportFrom):
-        # PEP 328: node.level is the number of leading dots. Preserving them is
-        # what lets the resolver walk up from the importing file's package \u2014
-        # dropping them made \`from .foo import X\` indistinguishable from an
-        # absolute \`foo\`.
-        module = ("." * (node.level or 0)) + (node.module or "")
-        for alias in node.names:
-            refs.append({
-                "toName": alias.name,
-                "callType": "import",
-                "line": node.lineno,
-                "module": module,
-            })
-    elif isinstance(node, ast.ClassDef):
-        for base in node.bases:
-            name = leaf_name(base)
-            if name:
-                refs.append({"toName": name, "callType": "inherit", "line": node.lineno})
-
-print(json.dumps({"symbols": [s.to_dict() for s in syms], "refs": refs}))
-`;
-async function resolvePython() {
-  const candidates = process.platform === "win32" ? ["python3", "python", "py"] : ["python3", "python"];
-  for (const name of candidates) {
-    const resolved = resolveWin32Command(name);
-    if (!await commandIsAvailable(resolved)) continue;
-    return resolved;
-  }
-  return null;
-}
-function commandIsAvailable(command) {
-  return new Promise((resolve) => {
-    let settled = false;
-    const proc = spawn(command, ["--version"], {
-      stdio: "ignore",
-      windowsHide: true
-    });
-    const finish = (available) => {
-      if (settled) return;
-      settled = true;
-      clearTimeout(timer);
-      resolve(available);
-    };
-    const timer = setTimeout(() => {
-      proc.kill("SIGKILL");
-      finish(false);
-    }, 5e3);
-    timer.unref?.();
-    proc.once("error", () => finish(false));
-    proc.once("close", (code) => finish(code === 0));
-  });
-}
-function spawnPyParser(pyBinary, scriptPath, filePath, content) {
-  return new Promise((resolve, reject) => {
-    let settled = false;
-    recordParserSubprocess();
-    const proc = spawn(pyBinary, [scriptPath, filePath], {
-      stdio: ["pipe", "pipe", "pipe"],
-      windowsHide: true
-    });
-    proc.on("error", (err) => {
-      if (settled) return;
-      settled = true;
-      reject(err);
-    });
-    proc.stdin?.write(content);
-    proc.stdin?.end();
-    let stdout = "";
-    const stdoutDecoder = new StringDecoder("utf8");
-    proc.stdout?.on("data", (chunk) => {
-      stdout += stdoutDecoder.write(chunk);
-    });
-    proc.stderr?.resume();
-    const timer = setTimeout(() => {
-      if (settled) return;
-      settled = true;
-      proc.kill("SIGKILL");
-      reject(new Error("timeout"));
-    }, 15e3);
-    timer.unref?.();
-    proc.on("close", (code) => {
-      if (settled) return;
-      settled = true;
-      clearTimeout(timer);
-      stdout += stdoutDecoder.end();
-      resolve({ code, stdout });
-    });
-  });
-}
-var _cachedScriptPath = null;
-var cachedPyBinary;
-function resolvePythonBinary() {
-  cachedPyBinary ??= resolvePython();
-  return cachedPyBinary;
-}
-async function syncPyParse(filePath, content, lang) {
-  try {
-    if (!_cachedScriptPath) {
-      const tmpDir = path.join(os.tmpdir(), "ws-py-parse");
-      await fs.mkdir(tmpDir, { recursive: true });
-      _cachedScriptPath = path.join(tmpDir, "parse.py");
-      await fs.writeFile(_cachedScriptPath, PY_PARSE_SCRIPT, "utf8");
-    }
-    cachedPyBinary ??= resolvePython();
-    const pyBinary = await cachedPyBinary;
-    if (!pyBinary) return null;
-    const { code, stdout } = await spawnPyParser(pyBinary, _cachedScriptPath, filePath, content);
-    if (code !== 0 || !stdout.trim()) {
-      return { file: filePath, lang, symbols: [], mtimeMs: Date.now() };
-    }
-    const { symbols: raw, refs } = parseParserOutput(stdout, lang);
-    const symbols = raw.map((s) => ({
-      id: 0,
-      lang,
-      kind: s.kind,
-      name: s.name,
-      file: filePath,
-      line: s.line,
-      col: s.col,
-      signature: s.signature ?? "",
-      docComment: "",
-      scope: s.scope ?? "",
-      text: `${s.name} ${s.signature ?? ""}`.trim()
-    }));
-    return { file: filePath, lang, symbols, refs, mtimeMs: Date.now() };
-  } catch {
-    return null;
-  }
-}
-
-export {
-  parseSymbols,
-  resolvePythonBinary
-};
-//# sourceMappingURL=chunk-4CE3RKEP.js.map