From a0104214b741e1930518f6fc52aa967c6e39aeff Mon Sep 17 00:00:00 2001
From: c0dev0id <sh+git@codevoid.de>
Date: Wed, 8 Jul 2026 18:22:12 +0200
Subject: [PATCH] ast-parser: replace manual char scan in _parseRest with regex
 tokenizer

---
 static/ast-parser.js | 42 ++++++------------------------------------
 1 file changed, 6 insertions(+), 36 deletions(-)

diff --git a/static/ast-parser.js b/static/ast-parser.js
index e91f863..f9988a5 100644
--- a/static/ast-parser.js
+++ b/static/ast-parser.js
@@ -45,47 +45,17 @@ export function parseAstLog(text) {
     return root;
 }
 
+const _REST_TOKEN = /(\w+)='([^']*)'|(\w+)=(\S+)|'([^']*)'|(\S+)/g;
+
 function _parseRest(rest) {
     const positionals = [];
     const props = {};
-    let i = 0;
-    const n = rest.length;
     let inProps = false;
 
-    while (i < n) {
-        while (i < n && rest[i] === ' ') i++;
-        if (i >= n) break;
-
-        if (rest[i] === "'") {
-            const j = rest.indexOf("'", i + 1);
-            const val = rest.slice(i + 1, j === -1 ? n : j);
-            i = j === -1 ? n : j + 1;
-            if (!inProps) positionals.push(val);
-        } else {
-            let j = i;
-            while (j < n && rest[j] !== ' ') j++;
-            const tok = rest.slice(i, j);
-            i = j;
-
-            const eqIdx = tok.indexOf('=');
-            if (eqIdx !== -1) {
-                inProps = true;
-                const key = tok.slice(0, eqIdx);
-                let rawVal = tok.slice(eqIdx + 1);
-
-                if (rawVal.startsWith("'")) {
-                    const valStart = i - (tok.length - eqIdx - 1);
-                    const openPos = rest.indexOf("'", rest.lastIndexOf(key + '=', i) + key.length + 1);
-                    const closePos = rest.indexOf("'", openPos + 1);
-                    rawVal = closePos === -1 ? rest.slice(openPos + 1) : rest.slice(openPos + 1, closePos);
-                    i = closePos === -1 ? n : closePos + 1;
-                }
-
-                props[key] = coerce(rawVal);
-            } else if (!inProps) {
-                positionals.push(coerce(tok));
-            }
-        }
+    for (const [, kq, vq, kb, vb, qpos, bpos] of rest.matchAll(_REST_TOKEN)) {
+        if (kq !== undefined)       { inProps = true; props[kq] = coerce(vq); }
+        else if (kb !== undefined)  { inProps = true; props[kb] = coerce(vb); }
+        else if (!inProps)          { positionals.push(coerce(qpos ?? bpos)); }
     }
 
     return { positionals, props };