@opencode/core 0.0.0-dev-20592 → 0.0.0-dev-20599

package/dist/shell/scan.js

@@ -1,6 +1,6 @@
 import {
   __export
-} from "../chunks/location-9rqn6x4v.js";
+} from "../chunks/instance-9rqn6x4v.js";
 
 // src/shell/scan.ts
 var exports_scan = {};
@@ -357,7 +357,7 @@ function scanBash(input, start, depth, context, close, heredocs, outer) {
     if (!state.assignmentWord && (`'"\\`.includes(char) || char === "$" && (input[index + 1] === "'" || input[index + 1] === '"')))
       state.assignmentHeadUnsafe = true;
     const inCasePattern = state.structures.at(-1)?.phase === "pattern";
-    const array = state.assignmentWord && /[^=]=$/.test(state.word) && (state.commandWordIndex < 0 || BASH_ASSIGNMENT_DECLARATIONS.has(state.rawWords[state.commandWordIndex]));
+    const array = (char === "=" || char === "(") && state.assignmentWord && state.word.length > 1 && state.word.endsWith("=") && !state.word.endsWith("==") && (state.commandWordIndex < 0 || BASH_ASSIGNMENT_DECLARATIONS.has(state.rawWords[state.commandWordIndex]));
     if (char === "=" && (!state.wordStarted || array) && input[index + 1] === "(") {
       const end = scanBashNested(input, index + 2, depth, context, state.nestedCommands, ")");
       if (typeof end === "object")
@@ -1412,39 +1412,46 @@ function bashHeredoc(input, start, delimiter) {
   }
 }
 function scanPowerShell(input) {
-  return scanPowerShellNested(input, 0, { remaining: MAX_INPUT_LENGTH * MAX_SUBSTITUTION_DEPTH });
-}
-function scanPowerShellNested(input, depth, budget, hash = false) {
-  budget.remaining -= input.length;
-  if (input.length > MAX_INPUT_LENGTH || depth >= MAX_SUBSTITUTION_DEPTH || budget.remaining < 0)
+  if (input.length > MAX_INPUT_LENGTH)
     return { kind: "opaque", reason: "invalid-structure" };
   if (/[\0\u0085\u2013-\u2015\u2018-\u201e\ufeff]/.test(input))
     return { kind: "opaque", reason: "invalid-structure" };
+  const result = scanPowerShellList(input, 0, 0, { remaining: MAX_INPUT_LENGTH * MAX_SUBSTITUTION_DEPTH });
+  if (result.kind === "opaque")
+    return result;
+  return { kind: "scanned", commands: result.commands };
+}
+function scanPowerShellList(input, start, depth, budget, close, hash = false, skipped) {
+  if (depth >= MAX_SUBSTITUTION_DEPTH || budget.remaining < 0)
+    return { kind: "opaque", reason: "invalid-structure" };
   const commands = [];
   const nestedCommands = [];
   const words = [];
   const rawWords = [];
   const wordEnds = [];
-  let segment = 0;
+  const initialExpression = hash === true || hash === "clause";
+  const initialClause = hash === "clause" || hash === "switch" ? "member" : undefined;
+  let segment = start;
   let word = "";
   let started = false;
-  let wordStart = 0;
+  let wordStart = start;
   let quote;
   let standalone = false;
-  let expression = hash;
-  let compound = false;
+  let expression = initialExpression;
+  let clause = initialClause;
+  let after;
+  let indexable = false;
   let stopParsing = false;
-  let commandEnd = 0;
+  let commandEnd = start;
   let statementHead = true;
   let invalid = false;
   let redirectTarget = false;
-  let comment = false;
   let dangling = false;
   let invocation = false;
   const finishWord = (end) => {
     if (!started)
       return;
-    if (word === "--%" && words.length > 0 && !expression && !/['"]/.test(input[wordStart]))
+    if (word === "--%" && words.length > 0 && !expression && !clause && !redirectTarget && !/['"]/.test(input[wordStart]) && !rawWords.at(-1)?.endsWith(",") && !POWERSHELL_PARAMETER_COLON_RE.test(rawWords.at(-1) ?? ""))
       stopParsing = true;
     if (!redirectTarget) {
       if (!words.length && !invocation && !expression)
@@ -1461,17 +1468,15 @@ function scanPowerShellNested(input, depth, budget, hash = false) {
   };
   const finishCommand = (end, required = false) => {
     finishWord(end);
-    const start = segment + input.slice(segment, commandEnd).search(/\S|$/);
-    const resource = input.slice(start, commandEnd).trimEnd();
-    if (words.length && !expression)
+    if (words.length && !expression && !clause)
       commands.push({
-        resource,
+        resource: input.slice(segment, commandEnd).trimEnd(),
         words: [...words],
         rawWords: [...rawWords],
-        wordEnds: wordEnds.map((end) => end - start),
+        wordEnds: wordEnds.map((value) => value - segment),
         ...statementHead && !invocation ? { statementHead: true } : {}
       });
-    else if (!expression && invocation || required && !words.length && !nestedCommands.length)
+    else if (!expression && !clause && invocation || required && !words.length && !nestedCommands.length || clause !== undefined && clause !== "member")
       invalid = true;
     if (redirectTarget)
       invalid = true;
@@ -1481,16 +1486,25 @@ function scanPowerShellNested(input, depth, budget, hash = false) {
     wordEnds.length = 0;
     redirectTarget = false;
     invocation = false;
-    expression = hash;
-    compound = false;
+    expression = initialExpression;
+    clause = initialClause;
+    after = undefined;
+    indexable = false;
     stopParsing = false;
   };
-  for (let index = 0;index < input.length; index++) {
+  let index = start;
+  for (;index < input.length; index++) {
+    if (--budget.remaining < 0)
+      return { kind: "opaque", reason: "invalid-structure" };
+    if (skipped?.has(index))
+      continue;
     const char = input[index];
+    const inExpression = expression && !redirectTarget;
+    const atBoundary = !started || !inExpression && word.endsWith(",");
     if (!started)
       wordStart = index;
     if (stopParsing) {
-      const stop = powerShellStopParsing(input, index);
+      const stop = powerShellStopParsing(input, index, skipped);
       const text = input.slice(index, stop).trim();
       if (text) {
         wordStart = index + input.slice(index, stop).search(/\S/);
@@ -1502,43 +1516,42 @@ function scanPowerShellNested(input, depth, budget, hash = false) {
       index = stop - 1;
       continue;
     }
-    if (quote === "single") {
-      started = true;
-      if (char === "'" && input[index + 1] === "'") {
-        word += "'";
-        index++;
-      } else if (char === "'") {
-        quote = undefined;
-        if (standalone)
-          finishWord(index + 1);
-      } else
-        word += char;
-      continue;
-    }
-    if (quote === "double") {
-      if (char === '"' && input[index + 1] === '"') {
-        word += '"';
-        index++;
-      } else if (char === '"') {
+    if (quote) {
+      let nextQuote = index + 1;
+      while (skipped?.has(nextQuote))
+        nextQuote++;
+      if (char === quote && input[nextQuote] === quote) {
+        word += quote;
+        index = nextQuote;
+      } else if (char === quote) {
         quote = undefined;
-        if (standalone)
+        if (standalone) {
           finishWord(index + 1);
-      } else if (char === "`") {
-        const escape = powerShellEscape(input, index);
+          indexable = "closed";
+        }
+      } else if (quote === '"' && char === "`") {
+        const escape = powerShellEscape(input, index, false, skipped);
         if (!escape)
           return { kind: "opaque", reason: "unterminated-escape" };
         word += escape.value;
         index = escape.end;
-      } else if (char === "$" && input[index + 1] === "(") {
-        const block = powerShellBlock(input, index + 1, depth);
-        if (!block)
+      } else if (quote === '"' && char === "$" && input[index + 1] === "{") {
+        const end = powerShellBracedVariable(input, index, skipped);
+        if (end === undefined)
+          return { kind: "opaque", reason: "invalid-structure" };
+        word += input.slice(index, end + 1);
+        index = end;
+      } else if (quote === '"' && char === "$" && input[index + 1] === "(") {
+        const sub = powerShellSubExpression(input, index + 2, false, budget, skipped);
+        if (!sub)
           return { kind: "opaque", reason: "invalid-structure" };
-        const result = scanPowerShellNested(block.source, depth + 1, budget);
+        const result = scanPowerShellList(input, index + 2, depth + 1, budget, ")", false, sub.skipped);
         if (result.kind === "opaque")
           return result;
         nestedCommands.push(...result.commands);
-        word += input.slice(index, block.end + 1);
-        index = block.end;
+        const end = sub.rawEnd !== undefined && sub.rawEnd > result.end ? sub.rawEnd : result.end;
+        word += input.slice(index, end + 1);
+        index = end;
       } else
         word += char;
       continue;
@@ -1546,176 +1559,203 @@ function scanPowerShellNested(input, depth, budget, hash = false) {
     if (char === "'" || char === '"') {
       if (!started && words.length === 0 && !invocation)
         expression = true;
-      quote = char === "'" ? "single" : "double";
-      standalone = !started;
+      quote = char;
+      standalone = atBoundary || expression && !redirectTarget || indexable === "member" && /[.:]$/.test(word);
+      if (!standalone)
+        indexable = false;
       started = true;
       continue;
     }
     if (char === "`") {
-      const escape = powerShellEscape(input, index);
+      const escape = powerShellEscape(input, index, atBoundary || inExpression, skipped);
       if (!escape)
         return { kind: "opaque", reason: "unterminated-escape" };
-      if (started || /\S/.test(escape.value)) {
+      const rawSpace = /\s/.test(input[index + 1] ?? "");
+      if ((inExpression || atBoundary) && started && rawSpace)
+        finishWord(index);
+      else if (!atBoundary || !rawSpace) {
         started = true;
+        indexable = false;
         word += escape.value;
       }
       index = escape.end;
       continue;
     }
-    if (!started && words.length > 0 && !expression && /^--%(?=$|[\s;|&(){}])/.test(input.slice(index))) {
+    if (!started && words.length > 0 && !expression && !clause && !redirectTarget && testAt(POWERSHELL_STOP_PARSING_RE, input, index)) {
       word = "--%";
       started = true;
       finishWord(index + 3);
-      stopParsing = true;
       index += 2;
       continue;
     }
-    if (char === "<" && input[index + 1] === "#" && !started) {
-      const end = powerShellComment(input, index);
-      if (end === undefined)
+    if (char === "<" && input[index + 1] === "#" && (atBoundary || inExpression || indexable === "member")) {
+      const memberOperator = indexable === "member" && /[.:]$/.test(started ? word : words.at(-1) ?? "");
+      if (started)
+        finishWord(index);
+      const end = input.indexOf("#>", index + 2);
+      if (end < 0)
         return { kind: "opaque", reason: "invalid-structure" };
-      if (!words.length && !invocation)
-        segment = end + 1;
-      index = end;
+      if (!memberOperator)
+        indexable = false;
+      index = end + 1;
       continue;
     }
-    if (char === "#" && (!started || expression)) {
-      if (words.length || started || invocation)
+    if (char === "#" && (atBoundary || indexable === "member" || inExpression && !(close === "]" && /^[\p{L}\p{Nl}_][\p{L}\p{Nl}\d_.#+`\\]*$/u.test(word)))) {
+      const prev = started ? word : words.at(-1) ?? "";
+      const memberOperator = indexable === "member" && /[.:]$/.test(prev);
+      if (clause && clause !== "member" || prev.endsWith(",") || memberOperator)
+        finishWord(index);
+      else if (words.length || started || invocation)
         finishCommand(index);
       statementHead = !dangling;
-      comment = true;
       const endings = [input.indexOf(`
 `, index), input.indexOf("\r", index)].filter((ending) => ending >= 0);
       const newline = endings.length > 0 ? Math.min(...endings) : -1;
-      if (newline === -1)
+      if (newline === -1) {
+        index = input.length;
         break;
-      comment = false;
+      }
       index = input[newline] === "\r" && input[newline + 1] === `
 ` ? newline + 1 : newline;
-      segment = index + 1;
       continue;
     }
-    const redirect = !started && (char === ">" || char === "*" || /\d/.test(char)) ? powerShellRedirect(input, index) : undefined;
+    if (inExpression && started && (char === ">" || char === "*" && input[index + 1] === ">"))
+      finishWord(index);
+    const redirect = !started && (char === ">" || char === "*" || /\d/.test(char) && (words.length > 0 || testAt(POWERSHELL_MERGE_REDIRECT_RE, input, index))) ? powerShellRedirect(input, index) : undefined;
     if (redirect === false)
       return { kind: "opaque", reason: "invalid-redirect" };
     if (redirect) {
-      if (redirectTarget)
-        return { kind: "opaque", reason: "invalid-redirect" };
-      if (words.length === 0)
+      if (redirectTarget || words.length === 0 || clause && clause !== "member")
         return { kind: "opaque", reason: "invalid-redirect" };
       redirectTarget = !redirect.includes("&");
+      indexable = false;
       index += redirect.length - 1;
       commandEnd = index + 1;
       continue;
     }
-    if (!started && !words.length && !invocation && !expression && /[A-Za-z]/.test(char)) {
-      const keyword = /^[A-Za-z]+(?=$|[\s({])/.exec(input.slice(index))?.[0]?.toLowerCase();
-      if (keyword && /^(?:if|elseif|else|for|while|do|until|switch|function|filter|try|catch|finally|begin|process|end|clean|param|trap|class|enum|data|dynamicparam|using)$/.test(keyword)) {
-        expression = true;
-        compound = true;
-        index += keyword.length - 1;
+    if (!started && !words.length && !invocation && !expression && !clause && char === ":") {
+      const label = matchAt(POWERSHELL_LABEL_RE, input, index);
+      if (label) {
+        index += label[0].length - 1;
         continue;
       }
-      if (keyword === "foreach" && /^foreach\s*\(/i.test(input.slice(index))) {
-        expression = true;
-        compound = true;
+    }
+    if (!started && !invocation && !clause && (!words.length ? !expression : words.every((item) => item.startsWith("["))) && /[A-Za-z]/.test(char)) {
+      const keyword = matchAt(POWERSHELL_KEYWORD_RE, input, index)?.[0]?.toLowerCase();
+      if (keyword && (words.length > 0 ? keyword === "param" && testAt(POWERSHELL_PARAM_RE, input, index) || keyword === "class" || keyword === "enum" : keyword === "param" && testAt(POWERSHELL_PARAM_RE, input, index) || keyword === "foreach" && testAt(POWERSHELL_FOREACH_RE, input, index) || keyword === "until" && after === "do" || (keyword === "else" || keyword === "elseif") && after === "if" || (keyword === "catch" || keyword === "finally") && after === "try" || /^(?:if|for|while|do|switch|function|filter|workflow|parallel|sequence|configuration|try|begin|process|end|clean|trap|class|enum|data|dynamicparam|using|break|continue)$/.test(keyword))) {
+        expression = /^(?:class|enum|break|continue)$/.test(keyword);
+        clause = keyword === "using" || keyword === "break" || keyword === "continue" ? "member" : keyword === "param" || keyword === "until" || keyword === "while" && after === "do" ? "paren" : keyword === "do" ? "do" : keyword === "if" || keyword === "elseif" ? "if" : keyword === "try" || keyword === "catch" ? "try" : keyword === "switch" ? "switch" : keyword === "class" || keyword === "enum" ? "clause" : "block";
+        after = undefined;
         index += keyword.length - 1;
         continue;
       }
-      if (keyword && /^(?:return|throw|exit|break|continue)$/.test(keyword)) {
+      if (!words.length && keyword && /^(?:return|throw|exit)$/.test(keyword)) {
+        after = undefined;
         index += keyword.length - 1;
-        segment = index + 1;
         continue;
       }
     }
-    if (expression && !compound && (char === "=" || /[-+*/%]/.test(char) && input[index + 1] === "=")) {
-      finishWord(index);
+    const assign = inExpression && !clause && (char === "=" || /[-+*/%]/.test(char) && input[index + 1] === "=");
+    if (assign || inExpression && close === ")" && !started && testAt(POWERSHELL_IN_RE, input, index)) {
+      if (assign)
+        finishWord(index);
       words.length = 0;
       rawWords.length = 0;
       wordEnds.length = 0;
       expression = false;
-      if (char !== "=")
+      indexable = false;
+      if (!assign || char !== "=")
         index++;
-      segment = index + 1;
       continue;
     }
-    if (expression && !started && /^in\b/i.test(input.slice(index))) {
-      words.length = 0;
-      rawWords.length = 0;
-      wordEnds.length = 0;
-      expression = false;
-      index++;
-      segment = index + 1;
-      continue;
-    }
-    if (char === "@" && /['"]/.test(input[index + 1] ?? "")) {
-      const literal = powerShellHereString(input, index);
-      if (!literal)
-        return { kind: "opaque", reason: "unterminated-quote" };
+    if (atBoundary && char === "@" && !testAt(POWERSHELL_AT_OPENER_RE, input, index + 1))
+      return { kind: "opaque", reason: "invalid-structure" };
+    if (atBoundary && char === "@" && (input[index + 1] === "'" || input[index + 1] === '"')) {
+      if (started)
+        finishWord(index);
+      wordStart = index;
+      const literal = powerShellHereString(input, index, depth, budget, skipped);
+      if (literal.kind === "opaque")
+        return literal;
       if (!words.length && !invocation)
         expression = true;
-      if (input[index + 1] === '"') {
-        const result = powerShellExpansions(literal.source, depth + 1, budget);
-        if (result.kind === "opaque")
-          return result;
-        nestedCommands.push(...result.commands);
-      }
+      nestedCommands.push(...literal.commands);
       word = literal.source;
       started = true;
       index = literal.end;
       finishWord(index + 1);
+      indexable = "closed";
       continue;
     }
     if (char === "$" && input[index + 1] === "{") {
-      const end = input.indexOf("}", index + 2);
-      if (end < 0)
+      const end = powerShellBracedVariable(input, index, skipped);
+      if (end === undefined)
         return { kind: "opaque", reason: "invalid-structure" };
-      if (!started && !words.length && !invocation)
+      if (!started && !words.length && !invocation && hash !== "switch")
         expression = true;
+      indexable = atBoundary || indexable === "member" && /[.:]$/.test(word) ? "closed" : false;
       word += input.slice(index, end + 1);
       started = true;
       index = end;
+      if (expression && !redirectTarget && input[index + 1] !== "[")
+        finishWord(index + 1);
       continue;
     }
-    const opener = (char === "$" || char === "@") && input[index + 1] === "(" ? index + 1 : char === "@" && input[index + 1] === "{" ? index + 1 : char === "(" || char === "{" || char === "[" && (expression || !started) ? index : undefined;
+    const opener = (char === "$" || atBoundary && char === "@") && input[index + 1] === "(" ? index + 1 : atBoundary && char === "@" && input[index + 1] === "{" ? index + 1 : char === "(" || char === "{" || char === "[" && (inExpression || Boolean(indexable) || !started && !invocation && (!words.length || clause === "block" || clause === "try")) ? index : undefined;
     if (opener !== undefined) {
-      if (started && (char === "{" || char === "(")) {
+      const openChar = input[opener];
+      const standaloneBlock = atBoundary || inExpression || char === "(" || openChar === "{";
+      const blockClose = openChar === "(" ? ")" : openChar === "[" ? "]" : "}";
+      const blockHash = openChar === "[" ? true : char === "@" && openChar === "{" ? true : clause === "switch" && openChar === "{" ? "switch" : clause === "clause" && openChar === "{" ? "clause" : close === "]" && char === "(" && started ? "clause" : false;
+      if (started && (char === "{" || char === "(" || char === "@" && atBoundary)) {
         finishWord(index);
+        if (stopParsing) {
+          index--;
+          continue;
+        }
         wordStart = index;
       }
       if (!started && !words.length && !invocation)
         expression = true;
-      const block = powerShellBlock(input, opener, depth);
-      if (!block)
-        return { kind: "opaque", reason: "invalid-structure" };
-      const result = scanPowerShellNested(block.source, depth + 1, budget, input[opener] === "[" || char === "@" && input[opener] === "{");
+      const result = scanPowerShellList(input, opener + 1, depth + 1, budget, blockClose, blockHash, skipped);
       if (result.kind === "opaque")
         return result;
       nestedCommands.push(...result.commands);
       started = true;
-      word += input.slice(index, block.end + 1);
-      index = block.end;
-      if (input[opener] === "{" || char === "(")
+      word += input.slice(index, result.end + 1);
+      index = result.end;
+      if (openChar === "[") {
+        indexable = "closed";
+        if (input[index + 1] !== "[")
+          finishWord(index + 1);
+      } else if (standaloneBlock) {
         finishWord(index + 1);
-      if (compound && input[opener] === "{") {
+        indexable = "closed";
+      }
+      if (clause === "paren" && char === "(" || clause && clause !== "paren" && char === "{") {
+        const completed = clause === "do" || clause === "if" || clause === "try" ? clause : undefined;
+        clause = "member";
         finishCommand(index + 1);
-        segment = index + 1;
+        after = completed;
       }
       continue;
     }
-    if (char === "}" || char === ")")
+    if (char === close)
+      break;
+    if (char === "}" || char === ")" || char === "]" && inExpression)
       return { kind: "opaque", reason: "invalid-structure" };
-    if (!started && words.length === 0 && (char === "&" && input[index + 1] !== "&" || char === "." && (/\s/.test(input[index + 1] ?? "") || !input[index + 1]))) {
+    if (!started && words.length === 0 && (char === "&" && input[index + 1] !== "&" || char === "." && (!input[index + 1] || /[\s"'$(),;{|}&]/.test(input[index + 1])))) {
       if (invocation)
         return { kind: "opaque", reason: "invalid-structure" };
+      segment = index;
       invocation = true;
+      after = undefined;
       continue;
     }
-    if (!started && !words.length && !invocation && powerShellExpression(input.slice(index)))
-      expression = true;
     if (/\s/.test(char) && char !== `
 ` && char !== "\r") {
       finishWord(index);
+      indexable = false;
       continue;
     }
     const next = input[index + 1];
@@ -1723,12 +1763,25 @@ function scanPowerShellNested(input, depth, budget, hash = false) {
 ` ? char + next : char === "&" && next === "&" || char === "|" && next === "|" ? char + next : char === ";" || char === "|" || char === "&" || char === `
 ` || char === "\r" ? char : undefined;
     if (separator) {
-      if ((separator === `
+      if (close === "]" && (separator === ";" || separator === "|" || separator === "||" || separator === "&&" || separator === "&"))
+        return { kind: "opaque", reason: "invalid-structure" };
+      if (separator === `
 ` || separator === "\r" || separator === `\r
-`) && !started && !words.length && !invocation) {
-        index += separator.length - 1;
-        segment = index + 1;
-        continue;
+`) {
+        const prev = started ? word : words.at(-1) ?? "";
+        const memberOperator = indexable === "member" && /[.:]$/.test(prev);
+        if (clause && clause !== "member" || prev.endsWith(",") || memberOperator) {
+          finishWord(index);
+          index += separator.length - 1;
+          if (!memberOperator)
+            indexable = false;
+          continue;
+        }
+        if (!started && !words.length && !invocation) {
+          index += separator.length - 1;
+          indexable = false;
+          continue;
+        }
       }
       finishCommand(index, dangling || ![";", `
 `, "\r", `\r
@@ -1738,190 +1791,47 @@ function scanPowerShellNested(input, depth, budget, hash = false) {
 `].includes(separator);
       statementHead = !dangling;
       index += separator.length - 1;
-      segment = index + 1;
       continue;
     }
+    if (!started && !words.length && !invocation && hash !== "switch" && testAt(POWERSHELL_EXPRESSION_RE, input, index))
+      expression = true;
+    if ((atBoundary || indexable === "member" && /[.:]$/.test(word)) && char === "$")
+      indexable = testAt(POWERSHELL_INDEXABLE_VAR_RE, input, index + 1) ? "variable" : false;
+    else if (indexable === "closed")
+      indexable = char === "." && input[index + 1] !== "." && !/\s/.test(input[index + 1] ?? "") || !started && char === ":" && input[index + 1] === ":" && !/\s/.test(input[index + 2] ?? "") || !started && char === "?" && input[index + 1] === "." && input[index + 2] !== "." && !/\s/.test(input[index + 2] ?? "") ? "member" : !started && char === "?" && input[index + 1] === "[" ? "closed" : false;
+    else if (indexable === "variable")
+      indexable = char === "." && input[index + 1] !== "." && !/\s/.test(input[index + 1] ?? "") || char === ":" && input[index + 1] === ":" && !/\s/.test(input[index + 2] ?? "") ? "member" : char === "." && input[index + 1] === "." || !/[\p{L}\p{Nl}\d_:?]/u.test(char) ? false : "variable";
+    else if (indexable === "member")
+      indexable = char === "." && input[index + 1] === "." ? false : char === "." && !/\s/.test(input[index + 1] ?? "") || char === ":" && (input[index + 1] === ":" || input[index - 1] === ":") || char === "?" && input[index + 1] === "." && input[index + 2] !== "." || /[\p{L}\p{Nl}\d_]/u.test(char) ? "member" : false;
+    after = undefined;
     started = true;
     dangling = false;
     word += char;
   }
+  if (close !== undefined && input[index] !== close)
+    return { kind: "opaque", reason: "invalid-structure" };
   if (quote)
     return { kind: "opaque", reason: "unterminated-quote" };
-  if (!comment)
-    finishCommand(input.length);
+  finishCommand(index);
   if (redirectTarget || invalid || dangling)
     return { kind: "opaque", reason: "invalid-structure" };
   if (commands.some((command) => !command.words[0]))
     return { kind: "opaque", reason: "dynamic-command-name" };
-  return { kind: "scanned", commands };
-}
-function powerShellBlock(input, start, depth) {
-  if (depth >= MAX_SUBSTITUTION_DEPTH)
-    return;
-  let quote;
-  let standalone = false;
-  let started = false;
-  let head = true;
-  let expression = false;
-  let token = "";
-  const close = input[start] === "(" ? ")" : input[start] === "[" ? "]" : "}";
-  for (let index = start + 1;index < input.length; index++) {
-    const char = input[index];
-    if (quote === "single") {
-      if (char === "'" && input[index + 1] === "'") {
-        token += "'";
-        index++;
-      } else if (char === "'") {
-        quote = undefined;
-        started = !standalone;
-        if (standalone)
-          token = "";
-      } else
-        token += char;
-      continue;
-    }
-    if (quote === "double") {
-      if (char === "`") {
-        const escape = powerShellEscape(input, index);
-        if (!escape)
-          return;
-        token += escape.value;
-        index = escape.end;
-      } else if (char === '"' && input[index + 1] === '"') {
-        token += '"';
-        index++;
-      } else if (char === '"') {
-        quote = undefined;
-        started = !standalone;
-        if (standalone)
-          token = "";
-      } else if (char === "$" && input[index + 1] === "(") {
-        const nested = powerShellBlock(input, index + 1, depth + 1);
-        if (!nested)
-          return;
-        index = nested.end;
-      } else
-        token += char;
-      continue;
-    }
-    if (char === "`") {
-      const escape = powerShellEscape(input, index);
-      if (!escape)
-        return;
-      if (started || /\S/.test(escape.value)) {
-        started = true;
-        token += escape.value;
-      }
-      index = escape.end;
-      continue;
-    }
-    if (char === "<" && input[index + 1] === "#" && !started) {
-      const end = powerShellComment(input, index);
-      if (end === undefined)
-        return;
-      index = end;
-      continue;
-    }
-    if (char === "#" && (!started || expression)) {
-      const endings = [input.indexOf(`
-`, index), input.indexOf("\r", index)].filter((ending) => ending >= 0);
-      const newline = endings.length > 0 ? Math.min(...endings) : -1;
-      if (newline < 0)
-        return;
-      index = newline;
-      started = false;
-      head = true;
-      expression = false;
-      token = "";
-      continue;
-    }
-    if (char === "@" && /['"]/.test(input[index + 1] ?? "")) {
-      const literal = powerShellHereString(input, index);
-      if (!literal)
-        return;
-      index = literal.end;
-      started = false;
-      head = false;
-      continue;
-    }
-    if (head && !started && (char === "&" && input[index + 1] !== "&" || char === "." && /\s/.test(input[index + 1] ?? ""))) {
-      head = false;
-      continue;
-    }
-    if (expression && (char === "=" || !started && /^in\b/i.test(input.slice(index)))) {
-      if (char !== "=")
-        index++;
-      expression = false;
-      head = true;
-      started = false;
-      token = "";
-      continue;
-    }
-    if (char === "'" || char === '"') {
-      quote = char === "'" ? "single" : "double";
-      standalone = !started;
-      if (head && !started)
-        expression = true;
-      started = true;
-      continue;
-    }
-    const redirect = !started && (char === ">" || char === "*" || /\d/.test(char)) ? powerShellRedirect(input, index) : undefined;
-    if (redirect === false)
-      return;
-    if (redirect) {
-      index += redirect.length - 1;
-      token = "";
-      continue;
-    }
-    if (char === "$" && input[index + 1] === "{") {
-      const end = input.indexOf("}", index + 2);
-      if (end < 0)
-        return;
-      if (head && !started)
-        expression = true;
-      index = end;
-      started = true;
-      continue;
-    }
-    if (!started && !head && !expression && /^--%(?=$|[\s;|&(){}])/.test(input.slice(index))) {
-      index = powerShellStopParsing(input, index + 3) - 1;
-      continue;
-    }
-    if (char === close)
-      return { source: input.slice(start + 1, index), end: index };
-    if (char === "(" || char === "{" || char === "[" && (!started || expression)) {
-      if (head && !started)
-        expression = true;
-      const nested = powerShellBlock(input, index, depth + 1);
-      if (!nested)
-        return;
-      index = nested.end;
-      started = false;
-      head = false;
-      token = "";
-      continue;
-    }
-    if (/[\s;&|]/.test(char)) {
-      if (token === "--%" && !expression) {
-        index = powerShellStopParsing(input, index) - 1;
-        token = "";
-        continue;
-      }
-      if (/[;&|\r\n]/.test(char)) {
-        head = true;
-        expression = false;
-      } else if (started)
-        head = false;
-      started = false;
-      token = "";
-      continue;
-    }
-    if (head && !started && powerShellExpression(input.slice(index)))
-      expression = true;
-    started = true;
-    token += char;
-  }
+  return { kind: "scanned", commands, end: index };
 }
+var POWERSHELL_STOP_PARSING_RE = /--%(?=$|[\s;|&(){}])/y;
+var POWERSHELL_PARAMETER_COLON_RE = /^-[\p{L}\p{Nl}_?][\p{L}\p{Nl}\d_?-]*:$/u;
+var POWERSHELL_MERGE_REDIRECT_RE = /\d>&/y;
+var POWERSHELL_LABEL_RE = /:[A-Za-z_]\w*(?=\s*(?:while|for|foreach|do|switch)(?=$|[\s&(),;{|}]))/iy;
+var POWERSHELL_KEYWORD_RE = /[A-Za-z]+(?=$|[\s&(),;{|}])/y;
+var POWERSHELL_FOREACH_RE = /foreach\s*\(/isy;
+var POWERSHELL_PARAM_RE = /param\s*\(/isy;
+var POWERSHELL_IN_RE = /in(?=$|[\s&(),;{|}])/iy;
+var POWERSHELL_AT_OPENER_RE = /[({'"\p{L}\p{Nl}\d_?]/uy;
+var POWERSHELL_INDEXABLE_VAR_RE = /(?::[\p{L}\p{Nl}\d_?]+|[\p{L}\p{Nl}\d_][\p{L}\p{Nl}\d_?]*)/uy;
+var POWERSHELL_HERE_HEADER_RE = /@['"][^\S\r\n]*(?:\r\n|\r|\n)/y;
+var POWERSHELL_UNICODE_ESCAPE_RE = /u\{([0-9a-f]{1,6})\}/iy;
+var POWERSHELL_EXPRESSION_RE = /(?:!*(?:\+\+|--|[+-])?\$(?:\{|(?:\?|\$|\^)(?=$|[\s;|&(){},#>])|:[\p{L}\p{Nl}\d_?]+|[\p{L}\p{Nl}\d_][\p{L}\p{Nl}\d_?]*(?::[\p{L}\p{Nl}\d_?]+)?)|!(?![\p{L}\p{Nl}_.\d])|\+(?![=\p{L}\p{Nl}_.\d])|--(?!=)|-(?![=\p{L}\p{Nl}\d_?.])|,(?!\s*$)|!*[+-]?(?:0[xX][\da-fA-F]+|0[bB][01]+|(?:\d+(?:\.(?!\.)\d*|(?!\.(?!\.)))|\.\d+)(?:[eE][+-]?\d+)?)(?:[dDlLnN]|[uU][sSyYlL]?|[sSyY])?(?:[kKmMgGtTpP][bB])?(?=$|[\s!#%&()*+,\-/.;<=>\]|{}])|-(?:not|bnot|join|[ic]?split)(?![\p{L}\p{Nl}]))/iuy;
 var POWERSHELL_ESCAPES = {
   "0": "\x00",
   a: "\x07",
@@ -1934,80 +1844,145 @@ var POWERSHELL_ESCAPES = {
   t: "\t",
   v: "\v"
 };
-function powerShellEscape(input, start) {
-  const char = input[start + 1];
+function matchAt(regex, input, index) {
+  regex.lastIndex = index;
+  return regex.exec(input);
+}
+function testAt(regex, input, index) {
+  regex.lastIndex = index;
+  return regex.test(input);
+}
+function powerShellEscape(input, start, lineContinuation = false, skipped) {
+  let next = start + 1;
+  while (skipped?.has(next))
+    next++;
+  const char = input[next];
   if (char === undefined)
     return;
   if (char === "\r" || char === `
 `)
     return {
-      value: char === "\r" && input[start + 2] === `
+      value: lineContinuation && char === "\r" && input[next + 1] === `
 ` ? `\r
 ` : char,
-      end: start + (char === "\r" && input[start + 2] === `
-` ? 2 : 1)
+      end: next + (lineContinuation && char === "\r" && input[next + 1] === `
+` ? 1 : 0)
     };
-  if (char === "u" && input[start + 2] === "{") {
-    const code = /^u\{([0-9a-f]{1,6})\}/i.exec(input.slice(start + 1));
+  if (char === "u" && input[next + 1] === "{") {
+    const code = matchAt(POWERSHELL_UNICODE_ESCAPE_RE, input, next);
     if (!code || Number.parseInt(code[1], 16) > 1114111)
       return;
-    return { value: String.fromCodePoint(Number.parseInt(code[1], 16)), end: start + code[0].length };
+    return { value: String.fromCodePoint(Number.parseInt(code[1], 16)), end: next + code[0].length - 1 };
   }
-  return { value: POWERSHELL_ESCAPES[char] ?? char, end: start + 1 };
+  return { value: POWERSHELL_ESCAPES[char] ?? char, end: next };
 }
-function powerShellExpression(input) {
-  return /^(?:[$!,+]|[+-]?\d+(?:\.\d*)?(?:[eE][+-]?\d+)?(?:[dDlLnNuU]|[kKmMgGtTpP][bB])?(?![\w'"`])|0[xX][\da-fA-F]+\b|0[bB][01]+\b|\.[0-9]|-(?:not|bnot|join|split)\b)/i.test(input);
+function powerShellBracedVariable(input, start, skipped) {
+  for (let index = start + 2;index < input.length; index++) {
+    if (skipped?.has(index))
+      continue;
+    if (input[index] === "`") {
+      const escape = powerShellEscape(input, index, false, skipped);
+      if (!escape)
+        return;
+      index = escape.end;
+      continue;
+    }
+    if (input[index] === "}")
+      return index > start + 2 ? index : undefined;
+  }
+}
+function powerShellSubExpression(input, start, hereString, budget, skipped) {
+  const nextSkipped = new Set(skipped);
+  let depth = 1;
+  let rawEnd;
+  for (let index = start;index < input.length; index++) {
+    if (--budget.remaining < 0)
+      return;
+    if (nextSkipped.has(index))
+      continue;
+    const char = input[index];
+    if (char === "(")
+      depth++;
+    else if (char === ")") {
+      if (--depth === 0 && rawEnd === undefined)
+        rawEnd = index;
+    } else if (!hereString && (char === '"' || char === "`")) {
+      let next = index + 1;
+      while (nextSkipped.has(next))
+        next++;
+      if (input[next] === '"') {
+        nextSkipped.add(index);
+        index = next;
+      }
+    }
+  }
+  return { skipped: nextSkipped, rawEnd };
 }
-function powerShellStopParsing(input, start) {
+function powerShellStopParsing(input, start, skipped) {
   let quoted = false;
   for (let index = start;index < input.length; index++) {
+    if (skipped?.has(index))
+      continue;
     if (input[index] === '"')
       quoted = !quoted;
     if (input[index] === "\r" || input[index] === `
-` || input[index] === "|" && !quoted)
+` || (input[index] === "|" || input[index] === "&" && input[index + 1] === "&") && !quoted)
       return index;
   }
   return input.length;
 }
-function powerShellComment(input, start) {
-  const end = input.indexOf("#>", start + 2);
-  return end < 0 ? undefined : end + 1;
-}
-function powerShellHereString(input, start) {
-  const header = /^@['"][ \t]*(?:\r\n|\r|\n)/.exec(input.slice(start));
+function powerShellHereString(input, start, depth, budget, skipped) {
+  const header = matchAt(POWERSHELL_HERE_HEADER_RE, input, start);
   if (!header)
-    return;
+    return { kind: "opaque", reason: "unterminated-quote" };
+  const quote = input[start + 1];
   const body = start + header[0].length;
+  const commands = [];
+  let lineStart = true;
   for (let index = body;index < input.length; index++) {
-    if (index !== body && input[index - 1] !== "\r" && input[index - 1] !== `
-`)
-      continue;
-    if (input[index] !== input[start + 1] || input[index + 1] !== "@")
+    if (--budget.remaining < 0)
+      return { kind: "opaque", reason: "invalid-structure" };
+    if (skipped?.has(index))
       continue;
-    const end = index > body && input[index - 1] === `
+    if (lineStart && input[index] === quote && input[index + 1] === "@") {
+      const end = index > body && input[index - 1] === `
 ` && input[index - 2] === "\r" ? index - 2 : index > body ? index - 1 : index;
-    return { source: input.slice(body, end), end: index + 1 };
-  }
-}
-function powerShellExpansions(input, depth, budget) {
-  const commands = [];
-  for (let index = 0;index < input.length; index++) {
-    if (input[index] === "`") {
-      index++;
-      continue;
+      return { kind: "scanned", commands, source: input.slice(body, end), end: index + 1 };
     }
-    if (!input.startsWith("$(", index))
-      continue;
-    const block = powerShellBlock(input, index + 1, depth);
-    if (!block)
-      return { kind: "opaque", reason: "invalid-structure" };
-    const result = scanPowerShellNested(block.source, depth + 1, budget);
-    if (result.kind === "opaque")
-      return result;
-    commands.push(...result.commands);
-    index = block.end;
+    if (quote === '"') {
+      if (input[index] === "`") {
+        const escape = powerShellEscape(input, index, false, skipped);
+        if (!escape)
+          return { kind: "opaque", reason: "unterminated-escape" };
+        index = escape.end;
+        lineStart = false;
+        continue;
+      }
+      if (input[index] === "$" && input[index + 1] === "{") {
+        const end = powerShellBracedVariable(input, index, skipped);
+        if (end === undefined)
+          return { kind: "opaque", reason: "invalid-structure" };
+        index = end;
+        lineStart = false;
+        continue;
+      }
+      if (input[index] === "$" && input[index + 1] === "(") {
+        const sub = powerShellSubExpression(input, index + 2, true, budget, skipped);
+        if (!sub)
+          return { kind: "opaque", reason: "invalid-structure" };
+        const result = scanPowerShellList(input, index + 2, depth + 1, budget, ")", false, sub.skipped);
+        if (result.kind === "opaque")
+          return result;
+        commands.push(...result.commands);
+        index = sub.rawEnd !== undefined && sub.rawEnd > result.end ? sub.rawEnd : result.end;
+        lineStart = false;
+        continue;
+      }
+    }
+    lineStart = input[index] === "\r" || input[index] === `
+`;
   }
-  return { kind: "scanned", commands };
+  return { kind: "opaque", reason: "unterminated-quote" };
 }
 function powerShellRedirect(input, index) {
   let cursor = index;