token-goat 2.9.13 → 2.9.15

package/dist/{token-goat-chunk-6B44WLIF.mjs → token-goat-chunk-GIIHUSZX.mjs}

@@ -25,13 +25,17 @@ import {
   extractSwift,
   extractThrift,
   extractWgsl
-} from "./token-goat-chunk-B3CTCQTH.mjs";
+} from "./token-goat-chunk-XEPXYDPI.mjs";
 import {
+  extractShellBannerHeading
+} from "./token-goat-chunk-NDRP4KJQ.mjs";
+import "./token-goat-chunk-2X2EBBC6.mjs";
+import "./token-goat-chunk-Y4AFKTHK.mjs";
+import {
+  GENERIC_CLAUSE,
   assignBraceBlockSpans,
   assignFlatEndLines,
   buildLineIndex,
-  countContentLines,
-  escapeRegExp,
   extractEnv,
   extractIni,
   findHtmlHeadingMatches,
@@ -46,7 +50,6 @@ import {
   offsetToLine,
   precedingDocComment,
   propagateEndLinesToSymbols,
-  pushAll,
   scanQuotedStringEnd,
   stripBlockCommentSpan,
   stripCstyleComments,
@@ -56,7 +59,17 @@ import {
   stripMultilineStringSpan,
   stripStringLiterals,
   stripXmlComments
-} from "./token-goat-chunk-QKXBGBQR.mjs";
+} from "./token-goat-chunk-K7F2BFIK.mjs";
+import "./token-goat-chunk-S4XRY446.mjs";
+import "./token-goat-chunk-EEIDFMEM.mjs";
+import "./token-goat-chunk-OSUFN2FV.mjs";
+import {
+  countContentLines,
+  escapeRegExp,
+  pushAll
+} from "./token-goat-chunk-PM76YS22.mjs";
+import "./token-goat-chunk-ERTXEKB6.mjs";
+import "./token-goat-chunk-GMOUBOX4.mjs";
 import {
   init_define_import_meta_env
 } from "./token-goat-chunk-A37V4PBF.mjs";
@@ -306,6 +319,7 @@ function extractPhp(content, filePath) {
   const lines = maskPhpInlineHtml(content).split(/\r?\n/);
   const contextStack = [];
   let braceDepth = 0;
+  let parenDepth = 0;
   let inComment = false;
   let mlState = null;
   for (let i = 0; i < lines.length; i++) {
@@ -321,11 +335,17 @@ function extractPhp(content, filePath) {
     inComment = nextInComment;
     const line = codeLine.trimEnd();
     const stripped = line.trimStart();
-    if (!stripped || stripped.startsWith("//") || stripped.startsWith("#")) continue;
-    const braceLine = stripStringLiterals(stripLineComment(line, ["//", "#"]));
+    const attrOpen = stripped.startsWith("#[");
+    if (!stripped || stripped.startsWith("//") || stripped.startsWith("#") && !attrOpen) continue;
+    const commentFrom = attrOpen ? line.indexOf("#[") + 2 : 0;
+    const braceLine = stripStringLiterals(line.slice(0, commentFrom) + stripLineComment(line.slice(commentFrom), ["//", "#"]));
     const openB = (braceLine.match(/\{/g) ?? []).length;
     const closeB = (braceLine.match(/\}/g) ?? []).length;
     braceDepth += openB - closeB;
+    const preLineParenDepth = parenDepth;
+    const openP = (braceLine.match(/\(/g) ?? []).length;
+    const closeP = (braceLine.match(/\)/g) ?? []).length;
+    parenDepth = Math.max(0, parenDepth + openP - closeP);
     const topFrame = contextStack.length > 0 ? contextStack[contextStack.length - 1] : void 0;
     if (topFrame !== void 0 && braceDepth > topFrame[1]) {
       topFrame[2] = true;
@@ -408,7 +428,7 @@ function extractPhp(content, filePath) {
       const name = propM[1] ?? "";
       const preLineDepth = braceDepth - openB + closeB;
       const topFrame2 = contextStack.length > 0 ? contextStack[contextStack.length - 1] : void 0;
-      if (topFrame2 !== void 0 && preLineDepth === topFrame2[1] + 1) {
+      if (topFrame2 !== void 0 && preLineDepth === topFrame2[1] + 1 && preLineParenDepth === 0) {
         symbols.push(makeLineSymbol(filePath, name, "var", lineNum, stripped.slice(0, 200), topFrame2[0], lines, "c"));
       }
       continue;
@@ -631,7 +651,7 @@ function unquoteName(name) {
   return name.length >= 2 && name.startsWith("`") && name.endsWith("`") ? name.slice(1, -1) : name;
 }
 var FUN_RE = new RegExp(
-  "^\\s*(?:(?:public|internal|protected|private|open|override|abstract|suspend|inline|infix|operator|external|actual|expect|final|sealed|tailrec)\\s+)*fun\\s+(?:<[^>]*>\\s*)?" + RECEIVER_RE + "(" + NAME_RE + ")\\s*[(<]"
+  "^\\s*(?:(?:public|internal|protected|private|open|override|abstract|suspend|inline|infix|operator|external|actual|expect|final|sealed|tailrec)\\s+)*fun\\s+(?:" + GENERIC_CLAUSE + "\\s*)?" + RECEIVER_RE + "(" + NAME_RE + ")\\s*[(<]"
 );
 var CONST_RE2 = new RegExp(
   "^\\s*(?:(?:public|internal|protected|private|open|override|abstract|final|actual|expect|const|lateinit|companion|external|inline)\\s+)*(?:const\\s+)?val\\s+([A-Z_][A-Z0-9_]*)\\s*(?::|=)"
@@ -643,10 +663,10 @@ var COMPANION_RE = new RegExp(
   "^(?:(?:public|internal|protected|private)\\s+)*companion\\s+object\\b(?:\\s+(" + NAME_RE + "))?"
 );
 var TYPEALIAS_RE = new RegExp(
-  "^(?:(?:public|internal|private|actual|expect)\\s+)*typealias\\s+(" + NAME_RE + ")(?:\\s*<[^>]*>)?\\s*="
+  "^(?:(?:public|internal|private|actual|expect)\\s+)*typealias\\s+(" + NAME_RE + ")(?:\\s*" + GENERIC_CLAUSE + ")?\\s*="
 );
 var TOP_FUN_RE = new RegExp(
-  "^(?:(?:public|internal|private|suspend|inline|infix|operator|external|actual|expect|tailrec)\\s+)*fun\\s+(?:<[^>]*>\\s*)?" + RECEIVER_RE + "(" + NAME_RE + ")\\s*[(<]"
+  "^(?:(?:public|internal|private|suspend|inline|infix|operator|external|actual|expect|tailrec)\\s+)*fun\\s+(?:" + GENERIC_CLAUSE + "\\s*)?" + RECEIVER_RE + "(" + NAME_RE + ")\\s*[(<]"
 );
 function extractKotlin(content, filePath) {
   const symbols = [];
@@ -1812,16 +1832,16 @@ init_define_import_meta_env();
 var CLASS_RE4 = /^(?:(?:abstract|base|interface|final|sealed|mixin)\s+)*class\s+([A-Za-z_][A-Za-z0-9_]*)/;
 var ENUM_RE2 = /^enum\s+([A-Za-z_][A-Za-z0-9_]*)/;
 var MIXIN_RE = /^(?:base\s+)?mixin\s+([A-Za-z_][A-Za-z0-9_]*)/;
-var EXTENSION_RE = /^extension\s+(?:([A-Za-z_][A-Za-z0-9_]*)\s*(?:<[^>]*>)?\s+)?on\s+/;
+var EXTENSION_RE = new RegExp("^extension\\s+(?:([A-Za-z_][A-Za-z0-9_]*)\\s*(?:" + GENERIC_CLAUSE + ")?\\s+)?on\\s+");
 var EXTENSION_TYPE_RE = /^extension\s+type\s+([A-Za-z_][A-Za-z0-9_]*)/;
-var FUNC_RE5 = /(?:^|\s)(?:static\s+)?(?:(?:void|Future|Stream|async|external)\s+|[A-Za-z_][A-Za-z0-9_<>]*(?:\s*\?)?\s+)([A-Za-z_][A-Za-z0-9_]*)\s*(?:<[^>]*>)?\s*\(/;
-var GETTER_RE = /^(?:(?:static|external|abstract|covariant)\s+)*(?:[A-Za-z_][A-Za-z0-9_<>,\s]*(?:\s*\?)?\s+)?get\s+([A-Za-z_][A-Za-z0-9_]*)/;
+var FUNC_RE5 = new RegExp("(?:^|\\s)(?:static\\s+)?(?:(?:void|Future|Stream|async|external)\\s+|[A-Za-z_][A-Za-z0-9_<>?]*(?:\\s*\\?)?\\s+)([A-Za-z_][A-Za-z0-9_]*)\\s*(?:" + GENERIC_CLAUSE + ")?\\s*\\(");
+var GETTER_RE = /^(?:(?:static|external|abstract|covariant)\s+)*(?:[A-Za-z_][A-Za-z0-9_<>,?\s]*(?:\s*\?)?\s+)?get\s+([A-Za-z_][A-Za-z0-9_]*)/;
 var NAMED_CTOR_RE = /^(?:(?:const|factory|external)\s+)*([A-Za-z_][A-Za-z0-9_]*)\.([A-Za-z_][A-Za-z0-9_]*)\s*\(/;
 var UNNAMED_CTOR_RE = /^(?:(?:const|factory|external)\s+)*([A-Za-z_][A-Za-z0-9_]*)\s*\(/;
 var FIELD_START_RE = /^(?:(?:static|covariant|late|external)\s+)*(?:final|var|const)\s/;
-var CLASS_ALIAS_RE = /^(?:(?:abstract|base|interface|final|sealed|mixin)\s+)*class\s+[A-Za-z_][A-Za-z0-9_]*(?:<[^>]*>)?\s*=/;
-var TYPEDEF_RE = /^typedef\s+([A-Za-z_][A-Za-z0-9_]*)(?:\s*<[^>]*>)?\s*=/;
-var TYPEDEF_LEGACY_RE = /^typedef\s+[A-Za-z_][A-Za-z0-9_<>,?]*\s+([A-Za-z_][A-Za-z0-9_]*)(?:\s*<[^>]*>)?\s*\(/;
+var CLASS_ALIAS_RE = new RegExp("^(?:(?:abstract|base|interface|final|sealed|mixin)\\s+)*class\\s+[A-Za-z_][A-Za-z0-9_]*(?:" + GENERIC_CLAUSE + ")?\\s*=");
+var TYPEDEF_RE = new RegExp("^typedef\\s+([A-Za-z_][A-Za-z0-9_]*)(?:\\s*" + GENERIC_CLAUSE + ")?\\s*=");
+var TYPEDEF_LEGACY_RE = new RegExp("^typedef\\s+[A-Za-z_][A-Za-z0-9_<>,?]*\\s+([A-Za-z_][A-Za-z0-9_]*)(?:\\s*" + GENERIC_CLAUSE + ")?\\s*\\(");
 function extractDart(content, filePath) {
   const symbols = [];
   const imports = [];
@@ -1848,6 +1868,7 @@ function extractDart(content, filePath) {
       braceDepth += (braceLine2.match(/\{/g) ?? []).length - (braceLine2.match(/\}/g) ?? []).length;
       continue;
     }
+    const structural = stripStringLiterals(stripped, { tripleQuotes: true });
     const isIndented = line[0] === " " || line[0] === "	";
     const outerFrame = typeStack.length > 0 ? typeStack[typeStack.length - 1] : null;
     const outerDepthInType = outerFrame !== null ? braceDepth - outerFrame.startDepth : 0;
@@ -1859,7 +1880,8 @@ function extractDart(content, filePath) {
         const cname = cm[1] ?? "";
         const parent = typeStack.length > 0 ? typeStack[typeStack.length - 1].name : void 0;
         symbols.push(makeLineSymbol(filePath, cname, "class", lineNum, stripped.slice(0, 200), parent, lines, "c"));
-        if (!CLASS_ALIAS_RE.test(stripped)) {
+        const bracelessDeclaration = !structural.includes("{") && structural.includes(";");
+        if (!CLASS_ALIAS_RE.test(stripped) && !bracelessDeclaration) {
           typeStack.push({ name: cname, startDepth: braceDepth, bodyEntered: false });
         }
         matched = true;
@@ -1926,7 +1948,7 @@ function extractDart(content, filePath) {
           symbols.push(makeLineSymbol(filePath, gm[1] ?? "", "function", lineNum, stripped.slice(0, 200), frame.name, lines, "c"));
           member = true;
         }
-        const fm = !member ? FUNC_RE5.exec(stripped) : null;
+        const fm = !member ? FUNC_RE5.exec(structural) : null;
         if (fm) {
           let fname = fm[1] ?? "";
           fname = fname.replace(/^operator\s+/, "");
@@ -1938,7 +1960,7 @@ function extractDart(content, filePath) {
       if (gm) {
         symbols.push(makeLineSymbol(filePath, gm[1] ?? "", "function", lineNum, stripped.slice(0, 200), void 0, lines, "c"));
       }
-      const fm = !gm ? FUNC_RE5.exec(stripped) : null;
+      const fm = !gm ? FUNC_RE5.exec(structural) : null;
       if (fm) {
         let fname = fm[1] ?? "";
         fname = fname.replace(/^operator\s+/, "");
@@ -2765,6 +2787,7 @@ function extractBash(content, filePath) {
   let functionBraceDepth = 0;
   let awaitingFunctionBrace = false;
   let openFunctionIndex = null;
+  let openHeadingIndex = null;
   for (let i = 0; i < lines.length; i++) {
     const rawLine = lines[i] ?? "";
     const lineNum = i + 1;
@@ -2772,6 +2795,36 @@ function extractBash(content, filePath) {
       if (rawLine.trim() === heredocs[0]) heredocs.shift();
       continue;
     }
+    if (!inFunction && braceDepth === 0) {
+      const banner = extractShellBannerHeading(rawLine);
+      if (banner !== null) {
+        if (openHeadingIndex !== null) {
+          const prev = symbols[openHeadingIndex];
+          if (prev !== void 0 && lineNum > prev.lineStart) {
+            symbols[openHeadingIndex] = {
+              ...prev,
+              lineEnd: lineNum - 1,
+              body: lines.slice(prev.lineStart - 1, lineNum - 1).join("\n")
+            };
+          }
+          openHeadingIndex = null;
+        }
+        if (symbols.length < MAX_SYMBOLS5) {
+          const pushIdx = symbols.length;
+          symbols.push({
+            filePath,
+            name: banner.heading,
+            kind: "heading",
+            lineStart: lineNum,
+            lineEnd: lineNum,
+            body: rawLine.trim(),
+            docstring: "",
+            parent: ""
+          });
+          openHeadingIndex = pushIdx;
+        }
+      }
+    }
     const noComment = stripBashComment(rawLine);
     const stripped = noComment.trim();
     const opened = findHeredocOpeners(noComment, arithmeticDepth);
@@ -2783,6 +2836,17 @@ function extractBash(content, filePath) {
       const posixMatch = kwMatch === null ? FUNC_POSIX_RE.exec(stripped) : null;
       const funcMatch = kwMatch ?? posixMatch;
       if (funcMatch) {
+        if (openHeadingIndex !== null) {
+          const prev = symbols[openHeadingIndex];
+          if (prev !== void 0 && lineNum > prev.lineStart) {
+            symbols[openHeadingIndex] = {
+              ...prev,
+              lineEnd: lineNum - 1,
+              body: lines.slice(prev.lineStart - 1, lineNum - 1).join("\n")
+            };
+          }
+          openHeadingIndex = null;
+        }
         const fname = funcMatch[1] ?? "";
         let pushedIndex = null;
         if (fname && symbols.length < MAX_SYMBOLS5) {
@@ -2832,6 +2896,16 @@ function extractBash(content, filePath) {
       }
     }
   }
+  if (openHeadingIndex !== null && lines.length > 0) {
+    const prev = symbols[openHeadingIndex];
+    if (prev !== void 0 && lines.length >= prev.lineStart) {
+      symbols[openHeadingIndex] = {
+        ...prev,
+        lineEnd: lines.length,
+        body: lines.slice(prev.lineStart - 1, lines.length).join("\n")
+      };
+    }
+  }
   return symbols;
 }
 
@@ -3307,6 +3381,7 @@ function stripLeadingAttributes2(text) {
 }
 var FUNC_RE7 = new RegExp(`^(?:function|filter|workflow|configuration)\\s+(?:(?:global|local|script|private):)?(${FUNC_IDENT})`, "i");
 var CLASS_RE5 = new RegExp(`^(class|enum)\\s+(${IDENT2})`, "i");
+var PESTER_RE = /^(Describe|Context|It)\b(?:\s+-[A-Za-z0-9_-]+(?:\s+(?:'[^']*'|"[^"]*"|[^\s{]+))?)*\s*(?:'([^']*)'|"([^"]*)"|([A-Za-z0-9_.-]+))/i;
 var METHOD_NAME_RE = new RegExp(
   `^(?!(?:if|elseif|else|while|for|foreach|do|switch|return|throw|try|catch|finally|param|begin|process|end)\\b)(${IDENT2})\\s*\\(`,
   "i"
@@ -3333,6 +3408,7 @@ function extractPowershell(content, filePath) {
   let inBlockComment = false;
   let mlState = null;
   let openQuote = null;
+  const openBlocks = [];
   const pushInlineMethods = (body, className, lineNum) => {
     for (const piece of body.split(/(?<=[{}])/)) {
       const mname = matchMethodName(piece.replace(/^[{}\s]+/, ""));
@@ -3380,7 +3456,28 @@ function extractPowershell(content, filePath) {
       if (funcMatch) {
         const fname = funcMatch[1] ?? "";
         if (symbols.length < MAX_SYMBOLS9) {
+          const pushIdx = symbols.length;
           symbols.push(makeLineSymbol(filePath, fname, "function", lineNum, line.trimEnd().slice(0, 200), void 0, lines, "hash"));
+          openBlocks.push({ symbolIndex: pushIdx, kind: "function", braceDepth, entered: false });
+        }
+      }
+    }
+    if (currentClass === null) {
+      const pesterTrigger = /^(?:Describe|Context|It)\b/i.exec(stripped);
+      if (pesterTrigger) {
+        const rawLine = sourceLine.trimStart();
+        const pesterMatch = PESTER_RE.exec(rawLine);
+        if (pesterMatch) {
+          const blockType = (pesterMatch[1] ?? "").toLowerCase();
+          const testName = (pesterMatch[2] ?? pesterMatch[3] ?? pesterMatch[4] ?? "").trim();
+          if (testName && symbols.length < MAX_SYMBOLS9) {
+            const kind = blockType === "context" ? "context" : "test";
+            const parentBlock = [...openBlocks].reverse().find((b) => b.kind === "test" || b.kind === "context");
+            const parentName = parentBlock !== void 0 ? symbols[parentBlock.symbolIndex]?.name : void 0;
+            const pushIdx = symbols.length;
+            symbols.push(makeLineSymbol(filePath, testName, kind, lineNum, sourceLine.trimEnd().slice(0, 200), parentName, lines, "hash"));
+            openBlocks.push({ symbolIndex: pushIdx, kind, braceDepth, entered: false });
+          }
         }
       }
     }
@@ -3403,6 +3500,7 @@ function extractPowershell(content, filePath) {
             currentClass = cname;
             classBraceDepth = braceDepth;
             classBodyEntered = false;
+            openBlocks.push({ symbolIndex: symbols.length - 1, kind: "class", braceDepth, entered: false });
           }
         }
       }
@@ -3412,10 +3510,33 @@ function extractPowershell(content, filePath) {
       if (mname !== null && symbols.length < MAX_SYMBOLS9) {
         const sigEnd = line.indexOf("{");
         const sig = sigEnd >= 0 ? line.slice(0, sigEnd).trimEnd() : line.trimEnd();
+        const pushIdx = symbols.length;
         symbols.push(makeLineSymbol(filePath, mname, "method", lineNum, sig.slice(0, 200), currentClass, lines, "hash"));
+        openBlocks.push({ symbolIndex: pushIdx, kind: "method", braceDepth, entered: false });
+      }
+    }
+    const openBraces = (line.match(/\{/g) ?? []).length;
+    const closeBraces = (line.match(/\}/g) ?? []).length;
+    for (const block of openBlocks) {
+      if (braceDepth + openBraces > block.braceDepth) {
+        block.entered = true;
+      }
+    }
+    braceDepth += openBraces - closeBraces;
+    for (let b = openBlocks.length - 1; b >= 0; b--) {
+      const block = openBlocks[b];
+      if (block !== void 0 && block.entered && braceDepth <= block.braceDepth) {
+        openBlocks.splice(b, 1);
+        const sym = symbols[block.symbolIndex];
+        if (sym !== void 0 && lineNum > sym.lineStart) {
+          symbols[block.symbolIndex] = {
+            ...sym,
+            lineEnd: lineNum,
+            body: lines.slice(sym.lineStart - 1, lineNum).join("\n")
+          };
+        }
       }
     }
-    braceDepth += (line.match(/\{/g) ?? []).length - (line.match(/\}/g) ?? []).length;
     if (currentClass !== null && braceDepth > classBraceDepth) {
       classBodyEntered = true;
     }