sibujs 3.1.0 → 3.2.0

package/dist/build.cjs

@@ -394,14 +394,16 @@ function compileHtmlTemplates(code2) {
     const tmpl = templates[i2];
     const ast = parseTemplateToAST(tmpl.strings);
     collectTags(ast, usedTags);
+    if (ast.length > 1) usedTags.add("div");
     if (Array.from(usedTags).some((t) => SVG_TAGS.has(t))) usesSvg = true;
     const valuesVar = "__v";
     const childExprs = ast.map((c) => generateChild(c, valuesVar));
+    const rootExpr = childExprs.length === 1 ? childExprs[0] : `div([${childExprs.join(", ")}])`;
     let compiled;
     if (tmpl.exprCount === 0) {
-      compiled = childExprs.length === 1 ? childExprs[0] : childExprs[0];
+      compiled = rootExpr;
     } else {
-      const body2 = childExprs.length === 1 ? childExprs[0] : childExprs[0];
+      const body2 = rootExpr;
       const exprSource = extractExpressions(code2, tmpl.start, tmpl.end, tmpl.exprCount);
       compiled = `((${valuesVar}) => ${body2})([${exprSource.join(", ")}])`;
     }
@@ -1134,6 +1136,7 @@ __export(index_exports, {
   footer: () => footer,
   form: () => form,
   g: () => g,
+  getRequestScopedCache: () => getRequestScopedCache,
   getSSRStore: () => getSSRStore,
   getSlot: () => getSlot,
   h1: () => h1,
@@ -1282,9 +1285,17 @@ function devWarn(message) {
 }
 
 // src/utils/sanitize.ts
+function stripControlChars(value) {
+  return value.replace(/[\x00-\x20\x7f-\x9f]+/g, "");
+}
+function isEventHandlerAttr(name) {
+  if (name.length < 3) return false;
+  const lower = name.toLowerCase();
+  return lower[0] === "o" && lower[1] === "n" && lower.charCodeAt(2) >= 97 && lower.charCodeAt(2) <= 122;
+}
 var SAFE_URL_PROTOCOLS = ["http:", "https:", "mailto:", "tel:", "ftp:"];
 function sanitizeUrl(url) {
-  const trimmed = url.replace(/[\x00-\x20\x7f-\x9f]+/g, "").trim();
+  const trimmed = stripControlChars(url).trim();
   if (!trimmed) return "";
   const lower = trimmed.toLowerCase();
   let schemeEnd = -1;
@@ -1347,7 +1358,7 @@ var URL_ATTRIBUTES = /* @__PURE__ */ new Set([
   "data"
 ]);
 function isUrlAttribute(attr) {
-  return URL_ATTRIBUTES.has(attr);
+  return URL_ATTRIBUTES.has(attr.toLowerCase());
 }
 
 // src/reactivity/track.ts
@@ -1526,7 +1537,7 @@ function track(effectFn, subscriber) {
 function reactiveBinding(commit) {
   const run = () => {
     const s2 = subscriber;
-    if (s2._reentrant) return;
+    if (s2._disposed || s2._reentrant) return;
     s2._reentrant = true;
     try {
       retrack(commit, subscriber);
@@ -1542,8 +1553,12 @@ function reactiveBinding(commit) {
   subscriber._runEpoch = 0;
   subscriber._runs = 0;
   subscriber._reentrant = false;
+  subscriber._disposed = false;
   run();
-  return subscriber._dispose ?? (subscriber._dispose = () => cleanup(subscriber));
+  return subscriber._dispose ?? (subscriber._dispose = () => {
+    subscriber._disposed = true;
+    cleanup(subscriber);
+  });
 }
 function recordDependency(signal2) {
   if (!currentSubscriber) return;
@@ -1736,11 +1751,6 @@ var _isDev3 = isDev();
 function setProp(el, key, val) {
   el[key] = val;
 }
-function isEventHandlerAttr(name) {
-  if (name.length < 3) return false;
-  const lower = name.toLowerCase();
-  return lower[0] === "o" && lower[1] === "n" && lower.charCodeAt(2) >= 97 && lower.charCodeAt(2) <= 122;
-}
 function bindAttribute(el, attr, getter) {
   if (isEventHandlerAttr(attr)) {
     if (_isDev3)
@@ -1795,7 +1805,7 @@ function bindDynamic(el, nameGetter, valueGetter) {
       if (_isDev3) devWarn(`bindDynamic: value getter threw: ${err instanceof Error ? err.message : String(err)}`);
       return;
     }
-    if ((name[0] === "o" || name[0] === "O") && (name[1] === "n" || name[1] === "N")) return;
+    if (isEventHandlerAttr(name)) return;
     if (prevName !== null && prevName !== name) {
       el.removeAttribute(prevName);
     }
@@ -1816,8 +1826,78 @@ function bindDynamic(el, nameGetter, valueGetter) {
   };
 }
 
-// src/reactivity/bindChildNode.ts
+// src/core/rendering/dispose.ts
+var elementDisposers = /* @__PURE__ */ new WeakMap();
 var _isDev4 = isDev();
+var activeBindingCount = 0;
+function registerDisposer(node, teardown) {
+  let disposers = elementDisposers.get(node);
+  if (!disposers) {
+    disposers = [];
+    elementDisposers.set(node, disposers);
+  }
+  disposers.push(teardown);
+  if (_isDev4) activeBindingCount++;
+}
+function dispose(node) {
+  const stack = [node];
+  const order = [];
+  while (stack.length > 0) {
+    const current = stack.pop();
+    order.push(current);
+    const children = Array.from(current.childNodes);
+    for (let i2 = 0; i2 < children.length; i2++) {
+      stack.push(children[i2]);
+    }
+  }
+  for (let i2 = order.length - 1; i2 >= 0; i2--) {
+    const current = order[i2];
+    const disposers = elementDisposers.get(current);
+    if (disposers) {
+      const snapshot = disposers.slice();
+      elementDisposers.delete(current);
+      if (_isDev4) activeBindingCount -= snapshot.length;
+      for (const d of snapshot) {
+        try {
+          d();
+        } catch (err) {
+          if (_isDev4 && typeof console !== "undefined") {
+            console.warn("[SibuJS] Disposer threw during cleanup:", err);
+          }
+        }
+      }
+      let extraPasses = 0;
+      while (extraPasses++ < 8) {
+        const added = elementDisposers.get(current);
+        if (!added || added.length === 0) break;
+        const moreSnapshot = added.slice();
+        elementDisposers.delete(current);
+        if (_isDev4) activeBindingCount -= moreSnapshot.length;
+        for (const d of moreSnapshot) {
+          try {
+            d();
+          } catch (err) {
+            if (_isDev4 && typeof console !== "undefined") {
+              console.warn("[SibuJS] Disposer threw during cleanup:", err);
+            }
+          }
+        }
+      }
+    }
+  }
+}
+function checkLeaks(warnThreshold = 0) {
+  if (!_isDev4) return 0;
+  if (warnThreshold > 0 && activeBindingCount > warnThreshold) {
+    devWarn(
+      `checkLeaks: ${activeBindingCount} active DOM bindings detected. Expected \u2264${warnThreshold}. This may indicate a component was removed from the DOM without calling dispose().`
+    );
+  }
+  return activeBindingCount;
+}
+
+// src/reactivity/bindChildNode.ts
+var _isDev5 = isDev();
 function bindChildNode(placeholder, getter) {
   let lastNodes = [];
   function commit() {
@@ -1825,12 +1905,13 @@ function bindChildNode(placeholder, getter) {
     try {
       result = getter();
     } catch (err) {
-      if (_isDev4) devWarn(`bindChildNode: getter threw: ${err instanceof Error ? err.message : String(err)}`);
+      if (_isDev5) devWarn(`bindChildNode: getter threw: ${err instanceof Error ? err.message : String(err)}`);
       return;
     }
     if (result == null || typeof result === "boolean") {
       for (let i2 = 0; i2 < lastNodes.length; i2++) {
         const node = lastNodes[i2];
+        dispose(node);
         if (node.parentNode) node.parentNode.removeChild(node);
       }
       lastNodes.length = 0;
@@ -1850,7 +1931,7 @@ function bindChildNode(placeholder, getter) {
         if (item == null || typeof item === "boolean") continue;
         const node = item instanceof Node ? item : document.createTextNode(String(item));
         if (seen.has(node)) {
-          if (_isDev4)
+          if (_isDev5)
             devWarn("bindChildNode: duplicate node reference in array \u2014 only the first occurrence is rendered.");
           continue;
         }
@@ -1872,94 +1953,22 @@ function bindChildNode(placeholder, getter) {
     for (let i2 = 0; i2 < lastNodes.length; i2++) {
       const node = lastNodes[i2];
       if (reused?.has(node)) continue;
+      dispose(node);
       if (node.parentNode) node.parentNode.removeChild(node);
     }
-    const anchor = placeholder.nextSibling;
+    let prev = placeholder;
     for (let i2 = 0; i2 < newNodes.length; i2++) {
       const node = newNodes[i2];
-      if (reused?.has(node) && node.parentNode === parent) {
-        if (node.nextSibling !== anchor) {
-          parent.insertBefore(node, anchor);
-        }
-      } else {
-        parent.insertBefore(node, anchor);
+      if (prev.nextSibling !== node) {
+        parent.insertBefore(node, prev.nextSibling);
       }
+      prev = node;
     }
     lastNodes = newNodes;
   }
   return reactiveBinding(commit);
 }
 
-// src/core/rendering/dispose.ts
-var elementDisposers = /* @__PURE__ */ new WeakMap();
-var _isDev5 = isDev();
-var activeBindingCount = 0;
-function registerDisposer(node, teardown) {
-  let disposers = elementDisposers.get(node);
-  if (!disposers) {
-    disposers = [];
-    elementDisposers.set(node, disposers);
-  }
-  disposers.push(teardown);
-  if (_isDev5) activeBindingCount++;
-}
-function dispose(node) {
-  const stack = [node];
-  const order = [];
-  while (stack.length > 0) {
-    const current = stack.pop();
-    order.push(current);
-    const children = Array.from(current.childNodes);
-    for (let i2 = 0; i2 < children.length; i2++) {
-      stack.push(children[i2]);
-    }
-  }
-  for (let i2 = order.length - 1; i2 >= 0; i2--) {
-    const current = order[i2];
-    const disposers = elementDisposers.get(current);
-    if (disposers) {
-      const snapshot = disposers.slice();
-      elementDisposers.delete(current);
-      if (_isDev5) activeBindingCount -= snapshot.length;
-      for (const d of snapshot) {
-        try {
-          d();
-        } catch (err) {
-          if (_isDev5 && typeof console !== "undefined") {
-            console.warn("[SibuJS] Disposer threw during cleanup:", err);
-          }
-        }
-      }
-      let extraPasses = 0;
-      while (extraPasses++ < 8) {
-        const added = elementDisposers.get(current);
-        if (!added || added.length === 0) break;
-        const moreSnapshot = added.slice();
-        elementDisposers.delete(current);
-        if (_isDev5) activeBindingCount -= moreSnapshot.length;
-        for (const d of moreSnapshot) {
-          try {
-            d();
-          } catch (err) {
-            if (_isDev5 && typeof console !== "undefined") {
-              console.warn("[SibuJS] Disposer threw during cleanup:", err);
-            }
-          }
-        }
-      }
-    }
-  }
-}
-function checkLeaks(warnThreshold = 0) {
-  if (!_isDev5) return 0;
-  if (warnThreshold > 0 && activeBindingCount > warnThreshold) {
-    devWarn(
-      `checkLeaks: ${activeBindingCount} active DOM bindings detected. Expected \u2264${warnThreshold}. This may indicate a component was removed from the DOM without calling dispose().`
-    );
-  }
-  return activeBindingCount;
-}
-
 // src/core/rendering/tagFactory.ts
 var SVG_NS = "http://www.w3.org/2000/svg";
 var _isDev6 = isDev();
@@ -2195,7 +2204,7 @@ var tagFactory = (tag, ns) => {
           const value = props[key];
           if (value == null) continue;
           const lkey = key.toLowerCase();
-          if (lkey[0] === "o" && lkey[1] === "n") continue;
+          if (isEventHandlerAttr(key)) continue;
           if (typeof value === "function") {
             registerDisposer(el, bindAttribute(el, key, value));
           } else if (typeof value === "boolean") {
@@ -2476,14 +2485,28 @@ function parseTemplate(strings) {
       }
       return { kind: "mixed", statics, exprs };
     }
-    const valStart = pos;
-    while (pos < len) {
-      const c = template2.charCodeAt(pos);
-      if (c === 32 || c === 9 || c === 10 || c === 13 || c === 62 || c === 47) break;
-      pos++;
+    {
+      const statics = [];
+      const exprs = [];
+      let current = "";
+      while (pos < len) {
+        const c = template2.charCodeAt(pos);
+        if (c === 32 || c === 9 || c === 10 || c === 13 || c === 62) break;
+        const innerIdx = tryExprIdx();
+        if (innerIdx >= 0) {
+          statics.push(current);
+          current = "";
+          exprs.push(innerIdx);
+        } else {
+          current += template2[pos++];
+        }
+      }
+      statics.push(current);
+      if (exprs.length === 0) {
+        return { kind: "static", value: statics[0] };
+      }
+      return { kind: "mixed", statics, exprs };
     }
-    const val = template2.slice(valStart, pos);
-    return { kind: "static", value: val };
   }
   function parseAttrs() {
     const attrs = [];
@@ -2540,6 +2563,30 @@ function parseTemplate(strings) {
     while (pos < len) {
       if (template2[pos] === "<" && pos + 1 < len && template2[pos + 1] === "/") break;
       if (template2[pos] === "<") {
+        const next = template2[pos + 1];
+        if (next === "!") {
+          if (template2.startsWith("<!--", pos)) {
+            const end = template2.indexOf("-->", pos + 4);
+            pos = end === -1 ? len : end + 3;
+          } else if (template2.startsWith("<![CDATA[", pos)) {
+            const end = template2.indexOf("]]>", pos + 9);
+            pos = end === -1 ? len : end + 3;
+          } else {
+            const end = template2.indexOf(">", pos);
+            pos = end === -1 ? len : end + 1;
+          }
+          continue;
+        }
+        if (next === "?") {
+          const end = template2.indexOf(">", pos);
+          pos = end === -1 ? len : end + 1;
+          continue;
+        }
+        if (!(next >= "a" && next <= "z") && !(next >= "A" && next <= "Z")) {
+          children.push({ t: 1, value: "<" });
+          pos++;
+          continue;
+        }
         pos++;
         const tag = readTagName();
         const attrs = parseAttrs();
@@ -2588,7 +2635,7 @@ function executeElement(tmpl, values) {
       case 1: {
         const name = attr.name;
         const lname = name.toLowerCase();
-        if (lname[0] === "o" && lname[1] === "n") break;
+        if (isEventHandlerAttr(name)) break;
         const val = values[attr.idx];
         if (typeof val === "function") {
           registerDisposer(el, bindAttribute(el, name, val));
@@ -2837,6 +2884,11 @@ function each(getArray, render, options) {
     workMap.clear();
     keyIndexMap.clear();
     for (let i2 = 0; i2 < newLen; i2++) {
+      if (_isDev8 && keyIndexMap.has(newKeys[i2])) {
+        devWarn(
+          `each: duplicate key "${String(newKeys[i2])}" at index ${i2} (first seen at ${keyIndexMap.get(newKeys[i2])}). Keys must be unique \u2014 duplicates cause rows to be dropped or mis-ordered.`
+        );
+      }
       keyIndexMap.set(newKeys[i2], i2);
     }
     for (let i2 = 0; i2 < newLen; i2++) {
@@ -3068,7 +3120,7 @@ function show(condition, element) {
   const update = () => {
     element.style.display = condition() ? "" : "none";
   };
-  track(update);
+  registerDisposer(element, track(update));
   return element;
 }
 function when(condition, thenBranch, elseBranch) {
@@ -3095,7 +3147,7 @@ function when(condition, thenBranch, elseBranch) {
     }
     initialized = true;
   };
-  track(update);
+  registerDisposer(anchor, track(update));
   if (!initialized) {
     queueMicrotask(() => {
       if (!initialized && anchor.parentNode) update();
@@ -3130,7 +3182,7 @@ function match(value, cases, fallback) {
     }
     initialized = true;
   };
-  track(update);
+  registerDisposer(anchor, track(update));
   if (!initialized) {
     queueMicrotask(() => {
       if (!initialized && anchor.parentNode) update();
@@ -3171,6 +3223,12 @@ function KeepAlive(activeKey, cases, options) {
         return;
       }
       node = factory();
+      if (node instanceof DocumentFragment) {
+        const wrapper = document.createElement("div");
+        wrapper.style.display = "contents";
+        wrapper.appendChild(node);
+        node = wrapper;
+      }
       cache2.set(key, node);
       lruOrder.push(key);
       if (max > 0 && lruOrder.length > max) {
@@ -3455,11 +3513,15 @@ function signal(initial, options) {
 var als = null;
 try {
   if (typeof process !== "undefined" && process.versions && process.versions.node) {
-    const req = Function("return typeof require==='function'?require:null")();
-    if (req) {
-      const mod = req("node:async_hooks");
-      als = new mod.AsyncLocalStorage();
+    let mod = null;
+    const getBuiltin = process.getBuiltinModule;
+    if (typeof getBuiltin === "function") {
+      mod = getBuiltin("node:async_hooks");
+    } else {
+      const req = Function("return typeof require==='function'?require:null")();
+      if (req) mod = req("node:async_hooks");
     }
+    if (mod) als = new mod.AsyncLocalStorage();
   }
 } catch {
   als = null;
@@ -3475,6 +3537,17 @@ function getSSRStore() {
 function isSSR() {
   return getSSRStore().ssr;
 }
+function getRequestScopedCache(name) {
+  if (!isSSR()) return null;
+  const store2 = getSSRStore();
+  const caches = store2.caches ?? (store2.caches = /* @__PURE__ */ new Map());
+  let c = caches.get(name);
+  if (!c) {
+    c = /* @__PURE__ */ new Map();
+    caches.set(name, c);
+  }
+  return c;
+}
 function enableSSR() {
   getSSRStore().ssr = true;
 }
@@ -3609,6 +3682,7 @@ function effect(effectFn, options) {
     ctx.fn(ctx.onCleanup);
   };
   const sub2 = (() => {
+    if (ctx.disposed) return;
     if (ctx.running) {
       ctx.rerunPending = true;
       return;
@@ -3651,6 +3725,7 @@ function derived(getter, options) {
   const equals = options?.equals;
   const cs = {};
   cs._d = false;
+  cs._init = false;
   cs._g = getter;
   cs.__v = 0;
   const markDirty = () => {
@@ -3659,11 +3734,18 @@ function derived(getter, options) {
   };
   markDirty._c = 1;
   markDirty._sig = cs;
+  const recompute = () => {
+    const next = getter();
+    cs._v = equals && cs._init ? equals(cs._v, next) ? cs._v : next : next;
+    cs._d = false;
+    cs._init = true;
+  };
   track(() => {
     let threw = true;
     try {
       cs._v = getter();
       cs._d = false;
+      cs._init = true;
       threw = false;
     } finally {
       if (threw) cs._d = true;
@@ -3679,20 +3761,13 @@ function derived(getter, options) {
     }
     if (trackingSuspended) {
       if (cs._d) {
+        const prev = cs._v;
         evaluating = true;
-        let threw = true;
         try {
-          const prev = cs._v;
-          retrack(() => {
-            const next = getter();
-            cs._v = equals && cs._v !== void 0 ? equals(cs._v, next) ? cs._v : next : next;
-            cs._d = false;
-            threw = false;
-          }, markDirty);
+          retrack(recompute, markDirty);
           if (!Object.is(prev, cs._v)) cs.__v++;
         } finally {
           evaluating = false;
-          if (threw) cs._d = true;
         }
       }
       return cs._v;
@@ -3701,18 +3776,11 @@ function derived(getter, options) {
     if (cs._d) {
       const oldValue = cs._v;
       evaluating = true;
-      let threw = true;
       try {
-        retrack(() => {
-          const next = getter();
-          cs._v = equals && cs._v !== void 0 ? equals(cs._v, next) ? cs._v : next : next;
-          cs._d = false;
-          threw = false;
-        }, markDirty);
+        retrack(recompute, markDirty);
         if (!Object.is(oldValue, cs._v)) cs.__v++;
       } finally {
         evaluating = false;
-        if (threw) cs._d = true;
       }
       if (hook && oldValue !== cs._v) {
         hook.emit("computed:update", { signal: cs, oldValue, newValue: cs._v });
@@ -3765,12 +3833,12 @@ function store(initialState) {
     signals[key] = [getter, setter];
   });
   const store2 = new Proxy({}, {
-    get(_, prop) {
-      if (prop in signals) {
+    get(target, prop) {
+      if (typeof prop === "string" && Object.hasOwn(signals, prop)) {
         const getter = signals[prop][0];
         return getter();
       }
-      return void 0;
+      return Reflect.get(target, prop);
     },
     set() {
       throw new Error(
@@ -3790,7 +3858,7 @@ function store(initialState) {
     const nextState = typeof patch === "function" ? patch(current) : patch;
     batch(() => {
       Object.entries(nextState).forEach(([key, value]) => {
-        if (key in signals) {
+        if (Object.hasOwn(signals, key)) {
           signals[key][1](value);
         }
       });
@@ -4088,6 +4156,14 @@ function deepEqual(a2, b2, seen) {
     }
     return true;
   }
+  if (a2 instanceof DataView) {
+    if (!(b2 instanceof DataView)) return false;
+    if (a2.byteLength !== b2.byteLength) return false;
+    for (let i2 = 0; i2 < a2.byteLength; i2++) {
+      if (a2.getUint8(i2) !== b2.getUint8(i2)) return false;
+    }
+    return true;
+  }
   if (ArrayBuffer.isView(a2) && ArrayBuffer.isView(b2)) {
     const ta = a2;
     const tb = b2;
@@ -4106,7 +4182,7 @@ function deepEqual(a2, b2, seen) {
   const keysB = Object.keys(objB);
   if (keysA.length !== keysB.length) return false;
   return keysA.every(
-    (key) => deepEqual(objA[key], objB[key], seen)
+    (key) => Object.hasOwn(objB, key) && deepEqual(objA[key], objB[key], seen)
   );
 }
 function deepSignal(initial) {
@@ -4609,34 +4685,37 @@ function Suspense({ nodes, fallback }) {
   container.appendChild(fallbackEl);
   let suspenseDisposed = false;
   let observer = null;
+  let childEl = null;
   registerDisposer(container, () => {
     suspenseDisposed = true;
     if (observer) {
       observer.disconnect();
       observer = null;
     }
+    if (childEl && !container.contains(childEl)) dispose(childEl);
   });
   queueMicrotask(() => {
     if (suspenseDisposed) return;
     try {
-      const childEl = nodes();
-      if (childEl.classList.contains("sibu-lazy")) {
-        if (!childEl.querySelector(".sibu-lazy-loading")) {
-          container.replaceChildren(childEl);
+      const el = nodes();
+      childEl = el;
+      if (el.classList.contains("sibu-lazy")) {
+        if (!el.querySelector(".sibu-lazy-loading")) {
+          container.replaceChildren(el);
           return;
         }
         observer = new MutationObserver(() => {
           if (suspenseDisposed) return;
-          const loading = childEl.querySelector(".sibu-lazy-loading");
+          const loading = el.querySelector(".sibu-lazy-loading");
           if (!loading) {
             observer?.disconnect();
             observer = null;
-            container.replaceChildren(childEl);
+            container.replaceChildren(el);
           }
         });
-        observer.observe(childEl, { childList: true, subtree: true });
+        observer.observe(el, { childList: true, subtree: true });
       } else {
-        container.replaceChildren(childEl);
+        container.replaceChildren(el);
       }
     } catch (err) {
       const errorObj = err instanceof Error ? err : new Error(String(err));
@@ -5920,25 +5999,34 @@ var lintRules = {
         let braceDepth = 0;
         let insideConditionalOrLoop = false;
         let insideNestedFunction = false;
-        let functionDepth = 0;
+        const fnOpenDepths = [];
         for (let i2 = 0; i2 <= lineIdx; i2++) {
-          const scanLine = lines[i2].trim();
-          if (/\b(function\s+\w+|function\s*\(|=>\s*\{)/.test(scanLine) && i2 < lineIdx) {
-            functionDepth++;
-          }
-          if (i2 < lineIdx && /^\s*(if|else\s+if|else|for|while|do|switch)\s*[({]/.test(lines[i2])) {
+          const rawLine = lines[i2];
+          const scanLine = rawLine.trim();
+          const opensFunction = i2 < lineIdx && /\b(function\s+\w+|function\s*\(|=>\s*\{)/.test(scanLine);
+          if (i2 < lineIdx && /^\s*(if|else\s+if|else|for|while|do|switch)\s*[({]/.test(rawLine)) {
             insideConditionalOrLoop = true;
           }
-          for (const ch of lines[i2]) {
-            if (ch === "{") braceDepth++;
-            if (ch === "}") {
+          let fnBracePending = opensFunction;
+          for (const ch of rawLine) {
+            if (ch === "{") {
+              braceDepth++;
+              if (fnBracePending) {
+                fnOpenDepths.push(braceDepth);
+                fnBracePending = false;
+              }
+            } else if (ch === "}") {
               braceDepth--;
+              while (fnOpenDepths.length > 0 && fnOpenDepths[fnOpenDepths.length - 1] > braceDepth) {
+                fnOpenDepths.pop();
+              }
               if (braceDepth <= 1) {
                 insideConditionalOrLoop = false;
               }
             }
           }
         }
+        const functionDepth = fnOpenDepths.length;
         const beforeHook = line2.substring(0, line2.indexOf(hookMatch[0]));
         const inlineConditional = /\b(if|else|for|while|switch)\s*\(/.test(beforeHook) || /\?\s*$/.test(beforeHook.trim());
         if (insideConditionalOrLoop || inlineConditional) {