lilact 0.26.15 → 0.27.0

package/dist/lilact.development.js

@@ -1417,9 +1417,9 @@ function handleInterpolation(mergedProps, registered, interpolation) {
     case "function": {
       if (mergedProps !== void 0) {
         var previousCursor = cursor;
-        var result = interpolation(mergedProps);
+        var result2 = interpolation(mergedProps);
         cursor = previousCursor;
-        return handleInterpolation(mergedProps, registered, result);
+        return handleInterpolation(mergedProps, registered, result2);
       }
       break;
     }
@@ -1927,8 +1927,8 @@ var forwardRef = (render2) => {
 };
 function getComponentByPointer() {
   let resolve_func;
-  const pr = new Promise((res2, rej) => {
-    resolve_func = res2;
+  const pr = new Promise((res, rej) => {
+    resolve_func = res;
   });
   function click_handler(event2) {
     event2.stopImmediatePropagation();
@@ -2528,8 +2528,8 @@ var ComponentCore = class {
           this.outlet.splice(i2, 1);
           i2--;
         } else if (typeof item === "function") {
-          const res2 = this.childFunctionHandler(item);
-          this.outlet.splice(i2, 1, res2);
+          const res = this.childFunctionHandler(item);
+          this.outlet.splice(i2, 1, res);
           i2--;
         } else if (item.constructor.name === "Array") {
           this.outlet.splice(i2, 1, ...item);
@@ -2579,24 +2579,25 @@ var ComponentCore = class {
       if (this.outlet !== void 0) {
         for (let c of this.outlet) {
           if (c.cleanup) {
-            c.cleanup();
+            promises.push(c.cleanup());
           }
         }
       }
       if (((_c = this.props) == null ? void 0 : _c.children) !== void 0) {
         for (let c of this.props.children) {
           if (c.cleanup) {
-            c.cleanup();
+            promises.push(c.cleanup());
           }
         }
       }
       if (this.hooks !== void 0) {
         for (let h of this.hooks) {
           if (h.cleanup) {
-            h.cleanup();
+            promises.push(h.cleanup());
           }
         }
       }
+      await Promise.all(promises);
     } catch (e) {
       throw e;
     }
@@ -2627,7 +2628,7 @@ var ComponentCore = class {
         if (events_set.has(al)) {
           this.event_detachers[al]();
         } else {
-          this.element.setAttribute(a, void 0);
+          this.element.removeAttribute(a);
         }
       }
     }
@@ -2670,6 +2671,7 @@ var ComponentCore = class {
           }
         } else if (boolean_html_attributes_set.has(a)) {
           this.element[a] = toBool(patch[a]);
+          if (!this.element[a]) this.element.removeAttribute(a);
         } else if (a === "autoFocus") {
           this.element["autofocus"] = toBool(patch[a]);
         } else if (a === "htmlFor") {
@@ -3443,7 +3445,7 @@ function useRef(initialValue = null) {
   return hk;
 }
 async function useLayoutEffect(effect, deps = void 0) {
-  if (deps !== void 0 && (typeof deps !== "object" || deps.constructor.name !== "Array")) {
+  if (deps !== void 0 && (typeof deps !== "object" && deps.constructor.name !== "Array")) {
     throw new Error("Layout effect dependencies must be an array, object or omitted.");
   }
   const hk = useHook();
@@ -3452,6 +3454,7 @@ async function useLayoutEffect(effect, deps = void 0) {
   }
   if (hk == null ? void 0 : hk.cleanup) {
     await hk.cleanup();
+    hk.cleanup = void 0;
   }
   hk.deps = deps;
   lilact_default.layout_effects.add(async () => {
@@ -3461,7 +3464,7 @@ async function useLayoutEffect(effect, deps = void 0) {
   lilact_default.setTimeout(lilact_default.processEffects, 0);
 }
 async function useEffect(effect, deps = void 0) {
-  if (deps !== void 0 && (typeof deps !== "object" || deps.constructor.name !== "Array")) {
+  if (deps !== void 0 && (typeof deps !== "object" && deps.constructor.name !== "Array")) {
     throw new Error("Effect dependencies must be an array, object or omitted.");
   }
   const hk = useHook();
@@ -3470,6 +3473,7 @@ async function useEffect(effect, deps = void 0) {
   }
   if (hk == null ? void 0 : hk.cleanup) {
     await hk.cleanup();
+    hk.cleanup = void 0;
   }
   hk.deps = deps;
   lilact_default.passive_effects.add(async () => {
@@ -3479,7 +3483,7 @@ async function useEffect(effect, deps = void 0) {
   lilact_default.setTimeout(lilact_default.processEffects, 0);
 }
 async function useInsertionEffect(effect, deps = void 0) {
-  if (deps !== void 0 && (typeof deps !== "object" || deps.constructor.name !== "Array")) {
+  if (deps !== void 0 && (typeof deps !== "object" && deps.constructor.name !== "Array")) {
     throw new Error("Insertion effect dependencies must be an array, object, or omitted.");
   }
   const hk = useHook();
@@ -3488,6 +3492,7 @@ async function useInsertionEffect(effect, deps = void 0) {
   }
   if (hk == null ? void 0 : hk.cleanup) {
     await hk.cleanup();
+    hk.cleanup = void 0;
   }
   hk.deps = deps;
   lilact_default.insertion_effects.add(async () => {
@@ -3497,7 +3502,7 @@ async function useInsertionEffect(effect, deps = void 0) {
   lilact_default.setTimeout(lilact_default.processEffects, 0);
 }
 function useMemo(factory, deps = void 0) {
-  if (deps !== void 0 && (typeof deps !== "object" || deps.constructor.name !== "Array")) {
+  if (deps !== void 0 && (typeof deps !== "object" && deps.constructor.name !== "Array")) {
     throw new Error("Memo dependencies must be an array or omitted.");
   }
   const hk = useHook();
@@ -3601,181 +3606,242 @@ __export(run_exports, {
   runScripts: () => runScripts
 });
 function joinPaths(basePath, relativePath) {
-  const isAbs = relativePath.startsWith("/");
-  const stack = [];
-  const parts = (isAbs ? "" : basePath).split("/").filter(Boolean);
-  for (const p of parts) stack.push(p);
-  if (!basePath.endsWith("/")) stack.pop();
-  const relParts = relativePath.split("/");
-  for (const p of relParts) {
-    if (p === "" || p === ".") continue;
-    if (p === "..") {
-      if (stack.length > 0) stack.pop();
-    } else {
-      stack.push(p);
+  const absolute = relativePath.startsWith("/");
+  const parts = (absolute ? "" : basePath).split("/").filter(Boolean);
+  if (!absolute && !basePath.endsWith("/")) parts.pop();
+  for (const part of relativePath.split("/")) {
+    if (!part || part === ".") continue;
+    if (part === "..") parts.pop();
+    else parts.push(part);
+  }
+  return `${absolute ? "/" : ""}${parts.join("/")}`;
+}
+function asError(value, fallback = "Unknown error") {
+  if (value instanceof Error) return value;
+  if ((value == null ? void 0 : value.error) instanceof Error) return value.error;
+  const error2 = new Error(
+    (value == null ? void 0 : value.message) == null ? fallback : String(value.message)
+  );
+  if (value && typeof value === "object") {
+    if (value.name) error2.name = value.name;
+    if (value.stack) error2.stack = value.stack;
+    for (const key of Object.keys(value)) {
+      if (!(key in error2)) error2[key] = value[key];
     }
   }
-  return (isAbs ? "/" : "") + stack.join("/");
+  return error2;
+}
+function markSource(value, path2) {
+  const error2 = asError(value);
+  if (!error2.lilact_source) {
+    error2.lilact_source = { path: path2 };
+  }
+  return error2;
+}
+function report(value, path2) {
+  const error2 = markSource(value, path2);
+  if (error2.isTraced) return error2;
+  if (typeof lilact_default.traceError === "function") {
+    return lilact_default.traceError(error2, path2);
+  }
+  lilact_default.error = error2;
+  return error2;
 }
 var required_scripts = {};
-function run(jsx, path = `InlineJSX-${++lilact_default.eval_num}`, { isInline, isModule } = { isInline: true, isModule: true }) {
-  const mappings = [];
+function run(jsx, path = `InlineJSX-${++lilact_default.eval_num}`, {
+  isInline = true,
+  isModule = true
+} = {}) {
+  var _a, _b;
   const module = {
-    mappings,
-    isInline,
     path,
-    code: jsx,
-    exports: {}
+    code: String(jsx),
+    mappings: [],
+    exports: {},
+    isInline,
+    isModule
   };
-  let processed;
   required_scripts[path] = module;
+  let processed;
   try {
-    processed = lilact_default.transpileJSX(
-      jsx,
-      {
-        path,
-        mappings,
-        factory: "createComponent",
-        appendSourcemap: false,
-        injectTraceLabels: true,
-        produceCJS: true,
-        blocks_info: lilact_default.blocks_info
-      }
-    );
-  } catch (e) {
-    lilact_default.error = e;
-    throw e;
+    processed = lilact_default.transpileJSX(String(jsx), {
+      path,
+      mappings: module.mappings,
+      factory: "createComponent",
+      appendSourcemap: false,
+      injectTraceLabels: true,
+      produceCJS: true,
+      blocks_info: lilact_default.blocks_info
+    });
+  } catch (value) {
+    const error2 = asError(value);
+    (_a = error2.fileName) != null ? _a : error2.fileName = path;
+    error2.sourcePhase = "transpile";
+    module.error = error2;
+    lilact_default.error = error2;
+    throw error2;
   }
-  if (true) {
-    required_scripts[path].processed = processed;
+  if (typeof lilact_default.scanBlockLabels === "function") {
+    lilact_default.scanBlockLabels(processed, path);
   }
-  processed += "\n//# sourceURL=eval:/" + path;
-  lilact_default.scanBlockLabels(processed, path);
+  processed += `
+//# sourceURL=eval:/${path}`;
   try {
     globalThis.Lilact = lilact_default;
     globalThis.createComponent = lilact_default.createComponent;
     globalThis.Fragment = lilact_default.Fragment;
-    const res = eval(processed);
-    if (!isEmpty(module.exports)) return module.exports;
-    return res;
-  } catch (e) {
-    e = lilact_default.traceError(e, path);
-    throw e;
+    const result = eval(processed);
+    return isEmpty(module.exports) ? result : module.exports;
+  } catch (value) {
+    const error2 = report(value, path);
+    (_b = error2.sourcePhase) != null ? _b : error2.sourcePhase = "runtime";
+    module.error = error2;
+    throw error2;
   }
 }
 function require2(path2) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-  let forceUpdate, checkExport, requirer, isLazy;
-  if (arguments.length === 2 && typeof (arguments[1] === "object")) {
-    forceUpdate = (_a = arguments[1]) == null ? void 0 : _a.forceUpdate;
-    checkExport = (_b = arguments[1]) == null ? void 0 : _b.checkExport;
-    requirer = (_c = arguments[1]) == null ? void 0 : _c.requirer;
-    isLazy = (_d = arguments[1]) == null ? void 0 : _d.isLazy;
-  }
-  if ((_e = lilact_default.importObjectPaths) == null ? void 0 : _e[path2]) return lilact_default.importObjectPaths[path2];
-  if (required_scripts[path2] && !forceUpdate) return required_scripts[path2].exports;
-  if (path2[0] === "#") {
-    const el = document.getElementById(path2);
-    if (el) {
-      return run(el.innerText, path2);
-    }
-    throw new Error(`Required element not found (${path2})`);
-  } else {
-    if (requirer && requirer.path) {
-      path2 = joinPaths(requirer.path, path2);
-    }
-    if (((_f = lilact_default) == null ? void 0 : _f[LAZY]) || isLazy) {
-      lilact_default[LAZY] = false;
-      let p = (_h = (_g = lilact_default).resolver) == null ? void 0 : _h.call(_g, path2);
-      if (p) {
-        p = Promise.resolve(p);
+  var _a, _b, _c, _d, _e, _f;
+  let options = {};
+  if (arguments.length === 2 && arguments[1] && typeof arguments[1] === "object") {
+    options = arguments[1];
+  }
+  if ((_a = lilact_default.importObjectPaths) == null ? void 0 : _a[path2]) {
+    return lilact_default.importObjectPaths[path2];
+  }
+  const loadAsync = Boolean(lilact_default[LAZY]) || Boolean(options.isLazy);
+  if ((_b = options.requirer) == null ? void 0 : _b.path) {
+    path2 = joinPaths(options.requirer.path, path2);
+  }
+  if (required_scripts[path2] && !options.forceUpdate && !loadAsync) {
+    return required_scripts[path2].exports;
+  }
+  if (path2.startsWith("#")) {
+    const element = document.getElementById(path2.slice(1));
+    if (!element) {
+      throw report(
+        new Error(`Required element not found (${path2})`),
+        path2
+      );
+    }
+    return run(element.textContent || "", path2);
+  }
+  if (loadAsync) {
+    lilact_default[LAZY] = false;
+    let request2 = (_d = (_c = lilact_default).resolver) == null ? void 0 : _d.call(_c, path2);
+    if (request2 == null) {
+      if (required_scripts[path2] && !options.forceUpdate) {
+        request2 = Promise.resolve(required_scripts[path2].code);
       } else {
-        p = fetch(path2).then((res2) => {
-          if (!res2.ok) throw new Error(`HTTP ${res2.status}`);
-          return res2.text();
+        request2 = fetch(path2).then((response) => {
+          if (!response.ok) {
+            throw report(
+              new Error(
+                `Unable to load ${path2}: HTTP ${response.status}`
+              ),
+              path2
+            );
+          }
+          return response.text();
         });
       }
-      return p.then((res2) => {
-        var _a2;
-        if (path2.endsWith(".css")) {
-          injectGlobal(res2);
-          return;
-        }
-        res2 = run(res2, path2, { isInline: false });
-        return (_a2 = res2 == null ? void 0 : res2.default) != null ? _a2 : res2;
-      }).catch((err) => {
-        throw err;
-      });
     } else {
-      const p = (_j = (_i = lilact_default).resolver) == null ? void 0 : _j.call(_i, path2);
-      if (p) {
-        if (path2.endsWith(".css")) {
-          injectGlobal(p);
-          return;
-        }
-        return run(p, path2, { isInline: false });
-      } else {
-        const request = new XMLHttpRequest();
-        request.open("GET", path2, false);
-        request.send(null);
-        if (request.status === 200) {
-          if (path2.endsWith(".css")) {
-            injectGlobal(res);
-            return;
-          }
-          return run(request.responseText, path2, { isInline: false });
-        }
+      request2 = Promise.resolve(request2);
+    }
+    return request2.then((source) => {
+      if (path2.endsWith(".css")) {
+        injectGlobal(String(source));
+        return;
+      }
+      return run(String(source), path2, {
+        isInline: false,
+        isModule: true
+      });
+    }).then(
+      (result2) => {
+        var _a2;
+        return (_a2 = result2 == null ? void 0 : result2.default) != null ? _a2 : result2;
       }
+    ).catch((error2) => {
+      throw report(error2, path2);
+    });
+  }
+  const resolved = (_f = (_e = lilact_default).resolver) == null ? void 0 : _f.call(_e, path2);
+  if (resolved != null) {
+    if (path2.endsWith(".css")) {
+      injectGlobal(String(resolved));
+      return;
     }
+    return run(String(resolved), path2, {
+      isInline: false,
+      isModule: true
+    });
   }
-  throw new Error(`Required resource not found (${path2})`);
+  const request = new XMLHttpRequest();
+  try {
+    request.open("GET", path2, false);
+    request.send(null);
+  } catch (value) {
+    throw report(value, path2);
+  }
+  if (request.status >= 200 && request.status < 300) {
+    if (path2.endsWith(".css")) {
+      injectGlobal(request.responseText);
+      return;
+    }
+    return run(request.responseText, path2, {
+      isInline: false,
+      isModule: true
+    });
+  }
+  throw report(
+    new Error(`Unable to load ${path2}: HTTP ${request.status || 0}`),
+    path2
+  );
 }
 function lazy(factory) {
   let status = "pending";
-  let result;
+  let result2;
   lilact_default[LAZY] = true;
-  result = factory();
-  if (lilact_default.isThenable(result)) {
-    result.then(
-      (mod) => {
+  try {
+    result2 = factory();
+  } catch (error2) {
+    status = "error";
+    result2 = error2;
+  }
+  if (lilact_default.isThenable(result2)) {
+    result2.then(
+      (value) => {
         status = "success";
-        result = mod;
-        return result;
+        result2 = value;
       },
-      (err) => {
+      (error2) => {
         status = "error";
-        result = err;
-        throw err;
+        result2 = error2;
       }
     );
-  } else {
+  } else if (status !== "error") {
     status = "success";
   }
   function LazyComponent(props) {
-    if (status === "pending") throw result;
-    if (status === "error") throw result;
-    const Component2 = result;
+    if (status === "pending") throw result2;
+    if (status === "error") throw result2;
+    const Component2 = result2;
     return createComponent(Component2, { ...props });
   }
   return LazyComponent;
 }
-function scanScriptTagsWithType() {
-  const scripts = Array.from(
+function scriptTags() {
+  return Array.from(
     document.querySelectorAll('script[type="text/jsx"]')
-  );
-  return scripts.map((el) => {
-    var _a, _b;
-    return {
-      src: (_a = el.getAttribute("src")) != null ? _a : null,
-      content: (_b = el.textContent) != null ? _b : ""
-    };
-  });
+  ).map((element) => ({
+    src: element.getAttribute("src"),
+    content: element.textContent || ""
+  }));
 }
 function runScripts() {
-  const scripts = scanScriptTagsWithType();
-  for (const s of scripts) {
-    if (s.src) require2(s.src);
-    if (s.content) run(s.content);
+  for (const script of scriptTags()) {
+    if (script.src) require2(script.src);
+    if (script.content) run(script.content);
   }
 }
 
@@ -3922,8 +3988,8 @@ function releaseTimers() {
 }
 function timeoutPromise(duration = 0, timerSource = Lilact) {
   let id, resolve, reject;
-  const promise = new Promise((res2, rej) => {
-    resolve = res2;
+  const promise = new Promise((res, rej) => {
+    resolve = res;
     reject = rej;
     id = timerSource.setTimeout(() => {
       resolve();
@@ -4331,8 +4397,8 @@ function wrapListener(fn, opts = {}) {
     const currentTarget = this || nativeEvent.currentTarget || null;
     const sEvent = createSyntheticEvent(nativeEvent, currentTarget);
     try {
-      const result = fn(sEvent);
-      if (stopPropagationOnTrueReturn && result === true) {
+      const result2 = fn(sEvent);
+      if (stopPropagationOnTrueReturn && result2 === true) {
         sEvent.stopPropagation();
       }
     } finally {
@@ -4450,163 +4516,232 @@ __export(errors_exports, {
   scanBlockLabels: () => scanBlockLabels,
   traceError: () => traceError
 });
-function getErrorLocation(err) {
-  if (err.lineno !== void 0 || err.line !== void 0 || err.lineNumber !== void 0) {
-    const l = err.lineNumber || err.lineno || err.line;
-    const c = err.columnNumber || err.colno || err.column;
-    return { line: l, col: c };
-  }
-  let match2 = /:(\d+):(\d+)[\n].*/m.exec(err.stack);
-  if (match2 === null) {
-    match2 = /:(\d+):(\d+)\)\s+at .*/m.exec(err.stack);
+function number(value) {
+  const result2 = Number(value);
+  return Number.isFinite(result2) ? result2 : null;
+}
+function asError2(value) {
+  if (value instanceof Error) return value;
+  if ((value == null ? void 0 : value.error) instanceof Error) return value.error;
+  const error2 = new Error(
+    (value == null ? void 0 : value.message) == null ? String(value) : String(value.message)
+  );
+  if (value && typeof value === "object") {
+    if (value.name) error2.name = value.name;
+    if (value.stack) error2.stack = value.stack;
+    for (const key of Object.keys(value)) {
+      if (!(key in error2)) error2[key] = value[key];
+    }
   }
-  if (match2) {
-    return { line: parseInt(match2[1]), col: parseInt(match2[2]) };
+  return error2;
+}
+function isParserError(error2) {
+  return (error2 == null ? void 0 : error2.name) === "JSXParserError";
+}
+function stackLocation(stack) {
+  if (typeof stack !== "string") return null;
+  for (const line2 of stack.split(/\r?\n/)) {
+    const match2 = line2.match(/(eval:\/.*):(\d+):(\d+)/);
+    if (!match2) continue;
+    return {
+      path: match2[1].replace(/^eval:\/+/, ""),
+      line: Number(match2[2]) - 1,
+      column: Number(match2[3]) - 1
+    };
   }
   return null;
 }
-function parseEvalLocationFromStack(stack, urlPrefix = "eval:/") {
-  const raw = typeof stack === "string" ? stack : String(stack || "");
-  const lines = raw.split(/\r?\n/);
-  const re = new RegExp(`\\(?((?:${escapeRegExp(urlPrefix)})[^\\s):]+):(\\d+):(?:(\\d+))?\\)?$`);
-  for (const l of lines) {
-    const line2 = l.trim();
-    if (!line2.includes(urlPrefix)) continue;
-    const m = line2.match(re);
-    if (!m) continue;
-    const url = m[1];
-    const parsedLine = Number(m[2]);
-    const parsedCol = m[3] == null ? null : Number(m[3]);
-    if (Number.isFinite(parsedLine) && (parsedCol === null || Number.isFinite(parsedCol))) {
-      return { url, line: parsedLine, col: parsedCol, matched: line2 };
-    }
-  }
-  return { url: null, line: null, col: null, matched: null, stackPreview: lines.slice(0, 6).join("\n") };
-}
-function escapeRegExp(s) {
-  return String(s).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function mapLocation(mps, r, c) {
-  let map = null;
-  for (const i2 in mps) {
-    if (mps[i2][0] < r) continue;
-    if (mps[i2][0] > r || mps[i2][0] === r && mps[i2][1] >= c) {
-      map = mps[i2 - 1];
+function browserLocation(error2) {
+  var _a, _b, _c, _d;
+  const line2 = number(
+    (_b = (_a = error2 == null ? void 0 : error2.lineNumber) != null ? _a : error2 == null ? void 0 : error2.lineno) != null ? _b : error2 == null ? void 0 : error2.line
+  );
+  const column2 = number(
+    (_d = (_c = error2 == null ? void 0 : error2.columnNumber) != null ? _c : error2 == null ? void 0 : error2.colno) != null ? _d : error2 == null ? void 0 : error2.column
+  );
+  return {
+    line: line2 == null ? null : Math.max(0, line2 - 1),
+    column: column2 == null ? null : Math.max(0, column2 - 1)
+  };
+}
+function traceBlock(error2) {
+  const trace = error2 == null ? void 0 : error2.lilact_trace;
+  return Array.isArray(trace) ? trace[0] : trace;
+}
+function blockInfo(error2) {
+  var _a, _b;
+  const trace = traceBlock(error2);
+  return trace == null ? null : (_b = (_a = lilact_default.blocks_info) == null ? void 0 : _a.labels) == null ? void 0 : _b[trace];
+}
+function mapLocation(mappings, line2, column2) {
+  if (!Array.isArray(mappings) || !mappings.length || !Number.isFinite(line2) || !Number.isFinite(column2)) {
+    return { line: line2, column: column2 };
+  }
+  const valid = mappings.filter(
+    (mapping) => Array.isArray(mapping) && mapping.length >= 4 && mapping.slice(0, 4).every((value) => Number.isFinite(Number(value)))
+  ).sort(
+    (a, b2) => Number(a[0]) - Number(b2[0]) || Number(a[1]) - Number(b2[1])
+  );
+  if (!valid.length) return { line: line2, column: column2 };
+  let selected = valid[0];
+  for (const mapping of valid) {
+    const generatedLine2 = Number(mapping[0]);
+    const generatedColumn2 = Number(mapping[1]);
+    if (generatedLine2 < line2 || generatedLine2 === line2 && generatedColumn2 <= column2) {
+      selected = mapping;
+    } else {
       break;
     }
   }
-  if (!map) map = mps[mps.length - 1];
-  return { line: r - map[0] + map[2], col: r - map[0] === 0 ? map[3] : 0 };
-}
-function scanBlockLabels(code2, path2) {
-  const ls = Array.from(code2.matchAll(/LILACTBLOCK(\d+):(\d+),(\d+):([^*]+)\*\//mg));
-  ls.forEach(
-    (x) => {
-      lilact_default.blocks_info.labels[x[1]] = {
-        path: path2,
-        desc: x[4]
-      };
-    }
-  );
+  const generatedLine = Number(selected[0]);
+  const generatedColumn = Number(selected[1]);
+  const sourceLine = Number(selected[2]);
+  const sourceColumn = Number(selected[3]);
+  return {
+    line: sourceLine + (line2 === generatedLine ? 0 : line2 - generatedLine),
+    column: line2 === generatedLine ? Math.max(0, sourceColumn + column2 - generatedColumn) : sourceColumn
+  };
 }
-function traceError(error2, run_path) {
-  var _a;
-  if (error2 == null ? void 0 : error2.is_traced) {
-    return error2;
-  }
-  const loc = parseEvalLocationFromStack(error2.stack);
-  const obj = {
-    fileName: ((_a = loc.url) == null ? void 0 : _a.slice(6)) || run_path || error2.fileName,
-    lineNumber: loc.line,
-    columnNumber: loc.col,
-    message: error2.message,
-    name: error2.name,
-    stack: error2.stack,
+function traceError(value, runPath) {
+  var _a, _b, _c, _d, _e, _f;
+  if (value == null ? void 0 : value.isTraced) return value;
+  const error2 = asError2(value);
+  const source = error2.lilact_source;
+  const stack = isParserError(error2) ? null : stackLocation(error2.stack);
+  const browser = isParserError(error2) ? {
+    line: number(error2.lineNumber),
+    column: number(error2.columnNumber)
+  } : browserLocation(error2);
+  const fileName = (source == null ? void 0 : source.path) || (stack == null ? void 0 : stack.path) || error2.fileName || runPath || null;
+  let line2 = (_b = (_a = stack == null ? void 0 : stack.line) != null ? _a : browser.line) != null ? _b : null;
+  let column2 = (_d = (_c = stack == null ? void 0 : stack.column) != null ? _c : browser.column) != null ? _d : null;
+  const result2 = {
+    fileName,
+    lineNumber: line2,
+    columnNumber: column2,
+    message: error2.message == null ? String(error2) : String(error2.message),
+    name: error2.name || "Error",
+    stack: error2.stack || null,
+    lilact_source: source || null,
     _error: error2,
-    is_traced: true
+    isTraced: true
   };
-  if (error2.name !== "JSXParseError") {
-    let mps;
-    if (loc.url) {
-      const rm = required_scripts[obj.fileName];
-      mps = rm.mappings;
-      const mloc = mapLocation(mps, obj.lineNumber - 1, obj.columnNumber - 1);
-      obj.lineNumber = mloc.line;
-      obj.columnNumber = mloc.col;
-    } else {
-      let loc2 = getErrorLocation(error2);
-      if (error2.lilact_trace !== void 0) {
-        let mps2;
-        let blk;
-        if (typeof error2.lilact_trace === "object") {
-          blk = lilact_default.blocks_info.labels[error2.lilact_trace[0]];
-        } else {
-          blk = lilact_default.blocks_info.labels[error2.lilact_trace];
-        }
-        if (blk) {
-          obj.fileName = blk.path;
-          obj.label = blk.label;
-          mps2 = required_scripts[blk.path].mappings;
-          loc2 = mapLocation(mps2, loc2.line - 1, loc2.col - 1);
-        }
-      }
-      obj.lineNumber = loc2.line;
-      obj.columnNumber = loc2.col;
+  const module2 = fileName && required_scripts[fileName];
+  if (module2) {
+    const mapped = mapLocation(
+      module2.mappings,
+      result2.lineNumber,
+      result2.columnNumber
+    );
+    result2.lineNumber = mapped.line;
+    result2.columnNumber = mapped.column;
+  }
+  const block = blockInfo(error2);
+  if (block && (result2.lineNumber == null || result2.columnNumber == null || !result2.fileName)) {
+    result2.fileName || (result2.fileName = block.path || runPath || null);
+    (_e = result2.lineNumber) != null ? _e : result2.lineNumber = block.line;
+    (_f = result2.columnNumber) != null ? _f : result2.columnNumber = block.col;
+    result2.label = block.desc;
+  }
+  lilact_default.error = result2;
+  return result2;
+}
+function escapeHtml(value) {
+  return String(value != null ? value : "").replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&#39;");
+}
+function sourceExcerpt(module2, line2) {
+  var _a, _b, _c, _d;
+  if (!module2 || !Number.isFinite(line2)) return null;
+  const lines = String((_a = module2.code) != null ? _a : "").split(/\r?\n/);
+  return {
+    before: (_b = lines[line2 - 1]) != null ? _b : "",
+    current: (_c = lines[line2]) != null ? _c : "",
+    after: (_d = lines[line2 + 1]) != null ? _d : ""
+  };
+}
+function globalErrorHandler(eventOrError) {
+  var _a, _b;
+  const value = (eventOrError == null ? void 0 : eventOrError.error) instanceof Error ? eventOrError.error : (eventOrError == null ? void 0 : eventOrError.reason) !== void 0 ? eventOrError.reason : eventOrError;
+  const error2 = traceError(
+    value,
+    (eventOrError == null ? void 0 : eventOrError.fileName) || null
+  );
+  const excerpt = sourceExcerpt(
+    required_scripts[error2.fileName],
+    error2.lineNumber
+  );
+  const className = css(`
+    background: linear-gradient(135deg, #fff2f2d4, #ffffffd4);
+    backdrop-filter: blur(10px);
+    border: 1px solid rgba(255,255,255,.25);
+    border-radius: 5px;
+    box-shadow: 0 10px 30px rgba(0,0,0,.35);
+    overflow: hidden;
+    min-width: 400px;
+    width: 66%;
+
+    red {
+      color: #d00;
     }
+
+    code {
+      border: 1px solid #0003;
+      overflow: auto;
+      padding: 10px;
+      display: block;
+    }
+  `);
+  const dialog = document.createElement("dialog");
+  dialog.className = className;
+  const location = error2.fileName ? `At ${escapeHtml(error2.fileName)}` : "";
+  const line2 = Number.isFinite(error2.lineNumber) ? `: Line ${error2.lineNumber + 1}` : "";
+  const componentStack = ((_a = error2._error) == null ? void 0 : _a.componentStackLog) || ((_b = error2._error) == null ? void 0 : _b.componentStack) || "";
+  dialog.innerHTML = `
+    <h3><red>Error!</red></h3>
+    <b>${location}${line2}</b><br><br>
+    <b>${escapeHtml(error2.name)}</b>:
+    <span>${escapeHtml(error2.message)}</span>
+    <br><br>
+
+    ${excerpt ? "<code><pre></pre><red><pre></pre></red><pre></pre></code>" : ""}
+
+    ${componentStack ? `
+          <br>
+          Component Stack:
+          <br>
+          <code><pre>${escapeHtml(componentStack)}</pre></code>
+        ` : ""}
+  `;
+  if (excerpt) {
+    const pre = dialog.querySelectorAll("pre");
+    pre[0].innerText = excerpt.before;
+    pre[1].innerText = excerpt.current;
+    pre[2].innerText = excerpt.after;
+  }
+  document.body.appendChild(dialog);
+  if (typeof dialog.showModal === "function") {
+    dialog.showModal();
   } else {
-    const loc2 = getErrorLocation(error2);
-    if (error2.fileName) obj.fileName = error2.fileName;
-    else if (run_path) obj.fileName = run_path;
-    obj.lineNumber = loc2.line;
-    obj.columnNumber = loc2.col;
-  }
-  lilact_default.error = obj;
-  return obj;
-}
-function globalErrorHandler(error2) {
-  if (error2.error) error2 = error2.error;
-  error2 = traceError(error2);
-  const cls = css(`
-			background: linear-gradient(135deg, #fff2f2d4, #ffffffd4);
-			backdrop-filter: blur(10px);
-			border: 1px solid rgba(255,255,255,.25);
-			border-radius: 5px;
-			box-shadow: 0 10px 30px rgba(0,0,0,.35);
-			overflow:hidden;
-			min-width: 400px;
-			width: 66%;
-			red {
-				color:#d00;
-			}
-			code {
-				border: 1px solid #0003;
-				overflow: auto;
-				padding: 10px;
-				display: block;
-			}
-		`);
-  const el = document.createElement("dialog");
-  el.className = cls;
-  el.innerHTML = `<h3 style=""><red>Error!</red></h3>
-		<b>${error2.fileName ? "At " + error2.fileName : ""}
-		${Number.isFinite(error2.lineNumber) ? ": Line " + (error2.lineNumber + 1) : ""}</b><br><br>
-		<b>${error2.name}</b>:&nbsp;<span>${error2.message}</span><br><br>
-		${required_scripts[error2.fileName] ? "<code><pre></pre><pre><red></red></pre><pre></pre></code>" : ""}
-		${error2._error.componentStackLog ? "<br>Component Stack:<br><code><pre>" + error2._error.componentStackLog + "</pre></code>" : ""}
-		`;
-  document.body.appendChild(el);
-  const pres = el.querySelectorAll("pre");
-  if (required_scripts[error2.fileName]) {
-    const lines = required_scripts[error2.fileName].code.split("\n");
-    if (lines == null ? void 0 : lines[error2.lineNumber - 1])
-      pres[0].innerText = lines[error2.lineNumber - 1];
-    if (lines == null ? void 0 : lines[error2.lineNumber]) el.querySelector("pre red").innerText = lines[error2.lineNumber];
-    if (lines == null ? void 0 : lines[error2.lineNumber + 1])
-      pres[2].innerText = lines[error2.lineNumber + 1];
-  }
-  el.showModal();
-}
-var blocks_info = { counter: 0, labels: {} };
+    dialog.setAttribute("open", "");
+  }
+  return error2;
+}
+function scanBlockLabels(code2, path2) {
+  for (const match2 of String(code2).matchAll(
+    /LILACTBLOCK(\d+):(\d+),(\d+):([^*]+)\*\//gm
+  )) {
+    lilact_default.blocks_info.labels[match2[1]] = {
+      path: path2,
+      line: Number(match2[2]),
+      col: Number(match2[3]),
+      desc: match2[4]
+    };
+  }
+}
+var blocks_info = {
+  counter: 0,
+  labels: {}
+};
 var error = null;
 
 // .tmp/src/router.jsx
@@ -4623,13 +4758,13 @@ __export(router_exports, {
 var RouterContext = createContext(null);
 var RouteContext = createContext({ params: {} });
 var createURL = (to) => typeof to === "string" ? to : (to.pathname || "") + (to.search || "") + (to.hash || "");
-var escapeRegExp2 = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+var escapeRegExp = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 function HashRouter({ children, basename = "" }) {
   const readLocation = () => {
     var _a;
     const raw = window.location.hash || "#/";
     const full = raw.slice(1);
-    const baseRe = new RegExp("^" + escapeRegExp2(basename));
+    const baseRe = new RegExp("^" + escapeRegExp(basename));
     const withoutBase = full.replace(baseRe, "") || "/";
     const [pathAndSearch, hashPart] = withoutBase.split("#");
     const [path2, search = ""] = pathAndSearch.split("?");
@@ -5306,14 +5441,14 @@ function encode(...value) {
   if (typeof value === "number") {
     return encode_integer(value);
   }
-  let result = "";
+  let result2 = "";
   for (let i2 = 0; i2 < value.length; i2 += 1) {
-    result += encode_integer(value[i2]);
+    result2 += encode_integer(value[i2]);
   }
-  return result;
+  return result2;
 }
 function encode_integer(num) {
-  let result = "";
+  let result2 = "";
   if (num < 0) {
     num = -num << 1 | 1;
   } else {
@@ -5325,9 +5460,9 @@ function encode_integer(num) {
     if (num > 0) {
       clamped |= 32;
     }
-    result += integer_to_char[clamped];
+    result2 += integer_to_char[clamped];
   } while (num > 0);
-  return result;
+  return result2;
 }
 
 // .tmp/src/expscan.js
@@ -5477,7 +5612,7 @@ function labeler(custom_words, x) {
     if (x.type === "comment") return "C";
     if (x.type === "regexp") return "R";
     if (x.type === "js") return "J";
-    if (x.type === "paranthesis") return "P";
+    if (x.type === "parenthesis") return "P";
     if (x.type === "string") return "S";
     if (x.type === "xml") return "X";
   }
@@ -5776,7 +5911,7 @@ function lookAhead(f, code2, index2, ...args) {
 function parseRegex(code, index, container) {
   let i = index;
   let dels = `;=,([{}!^~&|:?*%-+/<>${transpilerConfig.preprocessorDelimiter}`;
-  while (--i > 0) {
+  while (--i >= 0) {
     if (" 	\r".indexOf(code[i]) !== -1) continue;
     if (code[i] === "\n") {
       dels += ")]";
@@ -6122,8 +6257,8 @@ function parseXML(code2, index2, container2, look_behind = false) {
           index2++;
           skip_spaces();
           while (code2[index2] === "/") {
-            const res3 = lookAhead(parseComment, code2, index2);
-            if (res3[0] > index2) index2 = res3[0];
+            const res2 = lookAhead(parseComment, code2, index2);
+            if (res2[0] > index2) index2 = res2[0];
             else index2++;
             skip_spaces();
           }
@@ -6172,8 +6307,8 @@ function parseXML(code2, index2, container2, look_behind = false) {
           if (container2) container2.children.push(b2);
           return b2;
         }
-        const res2 = lookAhead(parseComment, code2, index2);
-        if (res2[0] > index2) index2 = res2[0];
+        const res = lookAhead(parseComment, code2, index2);
+        if (res[0] > index2) index2 = res[0];
         else index2++;
         break;
       case ">":
@@ -6198,10 +6333,10 @@ function parseXML(code2, index2, container2, look_behind = false) {
     }
   }
 }
-function parseParanthesis(code2, index2, container2) {
+function parseParenthesis(code2, index2, container2) {
   const b2 = {
     // block
-    type: "paranthesis",
+    type: "parenthesis",
     begin: index2,
     cbegin: ++index2,
     children: [],
@@ -6225,7 +6360,7 @@ function parseParanthesis(code2, index2, container2) {
         [index2] = lookAhead(parseJS, code2, index2, true, b2);
         break;
       case "(":
-        [index2] = lookAhead(parseParanthesis, code2, index2, b2);
+        [index2] = lookAhead(parseParenthesis, code2, index2, b2);
         break;
       case "}":
         raiseError(`Unmatched curly bracket`, b2.begin);
@@ -6247,7 +6382,7 @@ function parseParanthesis(code2, index2, container2) {
         break;
     }
   }
-  raiseError(`Unterminated paranthesis block`, b2.begin);
+  raiseError(`Unterminated parenthesis block`, b2.begin);
 }
 function parseJS(code2, index2 = 0, is_block = false, container2) {
   const b2 = {
@@ -6277,10 +6412,10 @@ function parseJS(code2, index2 = 0, is_block = false, container2) {
         break;
       }
       case "(":
-        [index2] = lookAhead(parseParanthesis, code2, index2, b2);
+        [index2] = lookAhead(parseParenthesis, code2, index2, b2);
         break;
       case ")":
-        raiseError(`Unmatched paranthesis`, b2.begin);
+        raiseError(`Unmatched parenthesis`, b2.begin);
         break;
       case "}":
         if (is_block) {
@@ -6332,7 +6467,7 @@ function labelFunctions(node3, eols, blocks_info2) {
   }
   let i2, nxt, prev2;
   for (let chi = 0; chi < node3.children.length; chi++) {
-    if (typeof node3.children[chi] === "object" && node3.children[chi].type === "paranthesis") {
+    if (typeof node3.children[chi] === "object" && node3.children[chi].type === "parenthesis") {
       [i2, prev2] = getNext(chi, -1);
       if (prev2 === null) continue;
       if (typeof prev2 !== "string" || ["switch", "catch", "try", "class"].find((x) => prev2.trim().endsWith(x)) !== void 0) continue;
@@ -6354,7 +6489,7 @@ function labelFunctions(node3, eols, blocks_info2) {
       }
     } else if (node3.children[chi] === "=>") {
       [i2, prev2] = getNext(chi, -1);
-      if (typeof prev2 === "object" && prev2.type === "paranthesis") {
+      if (typeof prev2 === "object" && prev2.type === "parenthesis") {
         const begin = getRowCol(eols, prev2.begin);
         [i2, nxt] = getNext(chi);
         if (typeof nxt === "object" && nxt.type === "js") {
@@ -6408,7 +6543,7 @@ function getRowCol(eols, i2) {
   }
   return [eols.last - 1, i2 - eols[eols.last - 1]];
 }
-function generateSourceMap(json, path2, jsx_eols, out_eols, mappings2 = []) {
+function generateSourceMap(json, path2, jsx_eols, out_eols, mappings = []) {
   let mpps = [];
   const sourcemap = {
     "version": 3,
@@ -6438,7 +6573,7 @@ function generateSourceMap(json, path2, jsx_eols, out_eols, mappings2 = []) {
       return a[0] - b2[0];
     }
   );
-  mappings2.push(...mpps);
+  mappings.push(...mpps);
   let mstr = "";
   let r = 0, oc = 0;
   let lr = 0, lc = 0;
@@ -6472,7 +6607,7 @@ function transpileJSX(jsx2, {
     labels: {},
     counter: 0
   },
-  mappings: mappings2 = []
+  mappings = []
 } = {}) {
   var _a, _b;
   (_a = transpilerConfig.preprocessorDelimiter) != null ? _a : transpilerConfig.preprocessorDelimiter = "\u0294";
@@ -6483,7 +6618,7 @@ function transpileJSX(jsx2, {
     const er = new Error(msg);
     if (logErrors) console.error(`JSXParserError: ${msg} [file ${path2} at line ${rc[0]}]`);
     [er.lineNumber, er.columnNumber] = rc;
-    er.name = "JSXParseError";
+    er.name = "JSXParserError";
     er.fileName = path2;
     er.lilact_trace = "parse";
     throw er;
@@ -6551,7 +6686,7 @@ function transpileJSX(jsx2, {
     if (node3.type === "regex") return jsx2.substring(node3.begin, node3.end);
     if (node3.type === "comment") return discardComments || is_attr ? "" : jsx2.substring(node3.begin, node3.end);
     if (node3.type === "directive") return node3.value;
-    if (node3.type === "paranthesis") {
+    if (node3.type === "parenthesis") {
       let out2 = "(";
       if (node3.out) {
         if (produceCJS) processImportExports(node3, jsx2);
@@ -6624,7 +6759,7 @@ function transpileJSX(jsx2, {
       out += `}catch(e){ if(typeof(e)!=='object') e=new Error(e);e.lilact_trace=${blocks_info2.counter};throw e}`;
     }
   }
-  const inline_sm = generateSourceMap(json, path2, eols, scanEOLs(out), mappings2);
+  const inline_sm = generateSourceMap(json, path2, eols, scanEOLs(out), mappings);
   if (appendSourcemap) {
     out += inline_sm;
   }
@@ -6633,7 +6768,7 @@ function transpileJSX(jsx2, {
 
 // .tmp/src/lilact.jsx
 var Lilact2 = {
-  VERSION: "RC.3",
+  VERSION: "RC.4",
   // Configuration
   defaultTransitionTimeout: 300,
   defaultIsEqual: Object.is,
@@ -6674,7 +6809,7 @@ document.addEventListener("DOMContentLoaded", () => {
 });
 if (true) {
   window.addEventListener("unhandledrejection", (e) => {
-    Lilact2.globalErrorHandler(e.reason);
+    Lilact2.globalErrorHandler(e);
   });
   window.addEventListener("error", (e) => {
     Lilact2.globalErrorHandler(e);