@wrongstack/tools 1.0.10 → 1.0.12

package/dist/test.js

@@ -1,6 +1,6 @@
 import {
   testTool
-} from "./chunk-OUERRFEM.js";
+} from "./chunk-OMQDKZOT.js";
 import "./chunk-E7A4SLKR.js";
 import "./chunk-G7CYW5EP.js";
 import "./chunk-UVYRQKPZ.js";

package/dist/tool-tier.js

@@ -2,16 +2,16 @@ import {
   BUILTIN_TIER_COUNTS,
   registerBuiltinToolTier,
   selectBuiltinToolsForTier
-} from "./chunk-V25Q6TQ7.js";
-import "./chunk-FVSMTEO3.js";
-import "./chunk-6I6RXQFG.js";
+} from "./chunk-K3VX6V5P.js";
+import "./chunk-VMNWQI4V.js";
+import "./chunk-2BCRQAIW.js";
 import "./chunk-BVHKBBGA.js";
-import "./chunk-ENE22I5W.js";
-import "./chunk-XRNN44QY.js";
+import "./chunk-K37AKCTN.js";
+import "./chunk-2IRHFHZY.js";
 import "./chunk-MRXWOOOR.js";
 import "./chunk-7V33PHT6.js";
 import "./chunk-OKZJJDOG.js";
-import "./chunk-OUERRFEM.js";
+import "./chunk-OMQDKZOT.js";
 import "./chunk-ULI2J6TX.js";
 import "./chunk-YKSOSI2N.js";
 import "./chunk-DOAHONOS.js";
@@ -19,17 +19,17 @@ import "./chunk-C3WP6ZOT.js";
 import "./chunk-JPK2HHBK.js";
 import "./chunk-KS2OEZWV.js";
 import "./chunk-SPNXDTCJ.js";
-import "./chunk-2UVAIS5O.js";
+import "./chunk-YPSVPCIE.js";
 import "./chunk-D6RQZMZS.js";
 import "./chunk-2OCAAFAT.js";
 import "./chunk-M4ZHHCCW.js";
 import "./chunk-KPDCKSN5.js";
 import "./chunk-4SUGLJLO.js";
-import "./chunk-5RBUYFRV.js";
+import "./chunk-4IMNVQRB.js";
 import "./chunk-E7A4SLKR.js";
 import "./chunk-G7CYW5EP.js";
 import "./chunk-UVYRQKPZ.js";
-import "./chunk-C6ZOXNXV.js";
+import "./chunk-CSS42GRP.js";
 import "./chunk-ON6ET5ER.js";
 import "./chunk-DLZCOEVG.js";
 import "./chunk-YJTXRH5Y.js";
@@ -48,17 +48,17 @@ import "./chunk-DBG7UQGK.js";
 import "./chunk-VMJY6FYJ.js";
 import "./chunk-YZECCW3F.js";
 import "./chunk-O2MHULBO.js";
-import "./chunk-IE4KDAOB.js";
-import "./chunk-PWZUHZP7.js";
-import "./chunk-7GOE2ZTZ.js";
+import "./chunk-OYQE2UNT.js";
+import "./chunk-Z77XMU3U.js";
+import "./chunk-OMWC2OGT.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/{tree-sitter-parser-GILYQLS4.js → tree-sitter-parser-KU6JF3ZC.js}

@@ -3,13 +3,15 @@ import {
   getGrammarWasmPath,
   loadTreeSitterLanguage,
   parseSymbols,
-  parseTreeSitterAst
-} from "./chunk-XRNN44QY.js";
+  parseTreeSitterAst,
+  treeSitterDeclarationName
+} from "./chunk-2IRHFHZY.js";
 export {
   __smokeRootType,
   getGrammarWasmPath,
   loadTreeSitterLanguage,
   parseSymbols,
-  parseTreeSitterAst
+  parseTreeSitterAst,
+  treeSitterDeclarationName
 };
-//# sourceMappingURL=tree-sitter-parser-GILYQLS4.js.map
+//# sourceMappingURL=tree-sitter-parser-KU6JF3ZC.js.map

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/typecheck.js

@@ -1,6 +1,6 @@
 import {
   typecheckTool
-} from "./chunk-5RBUYFRV.js";
+} from "./chunk-4IMNVQRB.js";
 import "./chunk-E7A4SLKR.js";
 import "./chunk-G7CYW5EP.js";
 import "./chunk-UVYRQKPZ.js";

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.10",
+  "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.10",
-    "@wrongstack/kanban": "1.0.10",
-    "@wrongstack/persistence": "1.0.10",
-    "@wrongstack/primitives": "1.0.10",
+    "@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",