@poe-platform/safe-bash 0.1.675 → 0.1.677

package/dist/safe-bash/core.browser.js

@@ -25,7 +25,7 @@ import {
   rawValues,
   stringify,
   yqCommands
-} from "./chunks/chunk-AJMYOERL.js";
+} from "./chunks/chunk-MP5J46WX.js";
 import {
   CurlError,
   cloudflareWorkerNetworkLimits,
@@ -12802,10 +12802,11 @@ var AwkParser = class {
           pattern = this.expression();
           if (this.accept(",")) end = this.expression();
         }
-        const action = this.at("{") ? this.block() : { kind: "print", formatted: false, args: [] };
+        let action = { kind: "print", formatted: false, args: [] };
+        if (this.at("{")) action = this.block();
+        else if (!this.at("\n") && !this.at(";") && !this.ended()) throw new ProgramError(`expected rule separator at byte ${this.token.offset}`);
         program.rules.push({ ...pattern ? { pattern } : {}, ...end ? { end } : {}, action });
       }
-      if (!this.at("\n") && !this.at(";") && !this.ended() && !this.at("{") && !this.at("BEGIN") && !this.at("END") && !this.at("function")) throw new ProgramError(`expected rule separator at byte ${this.token.offset}`);
       this.separators();
     }
     for (const call of this.calls) {
@@ -40094,14 +40095,47 @@ function parseArithmetic(source2, offset = 0, budget = new ParseBudget()) {
   if (cursor < tokens2.length) error("Unexpected arithmetic token");
   return tree;
 }
-function arithmeticEnd(source2, start) {
+function arithmeticEnd(source2, start, allowSubshell = false) {
   let depth = 0;
+  let quote5 = "";
+  let ansiQuote = false;
+  const quotedSubstitutions = [];
   for (let position = start; position < source2.length; position++) {
     const character = source2[position];
+    if (allowSubshell) {
+      if (character === "\\" && (quote5 !== "'" || ansiQuote)) {
+        position++;
+        continue;
+      }
+      if (quote5 === '"' && character === "$" && source2[position + 1] === "(") {
+        if (quotedSubstitutions.length >= 64) throw new ShellSyntaxError("Syntax nesting exceeds 64", position);
+        quotedSubstitutions.push(depth);
+        depth++;
+        position++;
+        quote5 = "";
+        continue;
+      }
+      if (quote5) {
+        if (character === quote5) quote5 = "";
+        continue;
+      }
+      if (character === "'" || character === '"' || character === "`") {
+        quote5 = character;
+        ansiQuote = character === "'" && source2[position - 1] === "$";
+        continue;
+      }
+    }
     if (character === "(") depth++;
     if (character === ")") {
       if (depth === 0 && source2[position + 1] === ")") return position;
-      if (--depth < 0) break;
+      if (--depth < 0) {
+        if (allowSubshell) return -1;
+        break;
+      }
+      if (quotedSubstitutions.at(-1) === depth) {
+        quotedSubstitutions.pop();
+        quote5 = '"';
+      }
     }
   }
   throw new ShellSyntaxError("Unterminated arithmetic expression", start);
@@ -41044,7 +41078,7 @@ shell: command substitution: line ${line}: \`${sourceLine}'
     }
     this.error("Unterminated delimiter expansion syntax");
   }
-  word(terminator, enclosingQuoted = false, literal = false, arithmetic2 = false) {
+  word(terminator, enclosingQuoted = false, literal = false, arithmetic2 = false, arithmeticExpansion = false) {
     this.budget.admit();
     const offset = this.position;
     const reduction = this.printedNewlineReduction;
@@ -41183,7 +41217,7 @@ shell: command substitution: line ${line}: \`${sourceLine}'
         const spelling2 = expansionSpellings.get(parts.at(-1));
         if (spelling2) spelling2.end = Math.min(this.position + 1, this.source.length);
         if (this.position < this.source.length) this.position++;
-      } else if (current === "\\") {
+      } else if (current === "\\" && (!arithmeticExpansion || ["$", "`", '"', "\\", "\n"].includes(this.source[this.position + 1] ?? ""))) {
         if (this.source[this.position + 1] !== "\n") plain = false;
         this.position++;
         if (this.position === this.source.length) {
@@ -41567,6 +41601,7 @@ var Parser2 = class {
   }
   commandInner() {
     this.budget.admit();
+    const arithmeticCommandEnd = this.is("(") && this.lexer.source.startsWith("((", this.current.offset) ? arithmeticEnd(this.lexer.source, this.current.offset + 2, true) : -1;
     let command7;
     if (this.is("[[")) {
       const start = this.current.end;
@@ -41638,9 +41673,9 @@ var Parser2 = class {
       this.lexer.conditional = false;
       this.advance();
       command7 = { kind: "conditional", expression, source: source2, redirects: [] };
-    } else if (this.is("(") && this.lexer.source.startsWith("((", this.current.offset)) {
+    } else if (arithmeticCommandEnd !== -1) {
       const start = this.current.offset + 2;
-      const end = arithmeticEnd(this.lexer.source, start);
+      const end = arithmeticCommandEnd;
       const source2 = this.lexer.source.slice(start, end);
       command7 = { kind: "arithmetic", expression: prepareArithmetic(source2, this.budget), source: source2, redirects: [] };
       this.lexer.position = end + 2;
@@ -41888,6 +41923,10 @@ function parseArraySubscript(source2, budget, byteLocale2 = false, depth = 0, by
   const lexer = new Lexer2(budget, source2, depth, [], 0, byteLocale2, void 0, false, void 0, 0, false, void 0, byteSource, syntax);
   return lexer.word("\0");
 }
+function parseArithmeticExpansion(source2, budget, byteLocale2 = false, depth = 0, line = 1, syntax) {
+  const lexer = new Lexer2(budget, source2, depth, [], line - 1, byteLocale2, void 0, false, void 0, 0, false, void 0, false, captureShellSyntax(syntax));
+  return lexer.word("\0", true, false, false, true);
+}
 function parseBraceWord(source2, opaque, budget) {
   budget.admit(source2.length + 1);
   const lexer = new Lexer2(budget, source2, 0);
@@ -53581,20 +53620,30 @@ ${prefix3} line ${offset + line}: \`${source2.split("\n")[line - 1] ?? ""}'
       return "";
     }
     if (part.kind === "arithmetic") {
+      const allocation = this.budget.values.scope();
       try {
-        return String(evaluatePositionalArithmetic(part.expression, {
-          parseBudget: this.budget.parsing,
-          positional: state.positional,
-          arg0: state.arg0 ?? "virtual-bash",
-          owner: arrayStore(state)?.owner,
-          maximumBytes: this.budget.limits.maxExpansionBytes,
-          checkpoint: () => this.signal.throwIfAborted(),
-          requireParameter: (name2, value3) => this.requireParameter(value3, name2, state, io, part.line),
-          limit: () => this.budget.fail("maxExpansionBytes")
-        }, (prepared) => evaluateArithmetic(prepared, this.arithmeticVariables(state, io.diagnosticLine ?? part.line), this.budget.parsing)));
+        let program = part.expression;
+        if (program.error) {
+          const word = parseArithmeticExpansion(
+            program.source,
+            this.budget.parsing,
+            byteLocale(state.variables),
+            state.depth + (io.parameterDepth ?? 0),
+            io.diagnosticLine ?? part.line,
+            state.extensions?.syntax
+          );
+          const operandIO = this.parameterOperandIO(word, state, { ...io, [valueScope]: allocation });
+          const fields4 = await this.valueWord(word, state, operandIO, false, false, true);
+          const source2 = shellValueText(concatShellValues(fields4, allocation));
+          this.signal.throwIfAborted();
+          program = prepareArithmetic(source2, this.budget.parsing);
+        }
+        return String(evaluateArithmetic(program, this.arithmeticVariables(state, io.diagnosticLine ?? part.line), this.budget.parsing));
       } catch (error) {
         this.rethrowArithmeticControl(error);
         throw new ExpansionFailure(message2(error, this.budget.onInternalError), io.diagnosticLine ?? part.line);
+      } finally {
+        allocation.close();
       }
     }
     if (part.kind === "substitution") {