@hyperfixi/engine 7.3.0 → 7.4.0

package/dist/index.js

@@ -36,13 +36,22 @@ var host = {
   enter(_elt) {
   }
 };
-var store = /* @__PURE__ */ new WeakMap();
-var peekData = (elt) => store.get(elt);
-var dropData = (elt) => store.delete(elt);
+var windowHolders = /* @__PURE__ */ new WeakMap();
+function holder(elt) {
+  if (elt.window !== elt) return elt;
+  let h = windowHolders.get(elt);
+  if (!h) windowHolders.set(elt, h = {});
+  return h;
+}
+var peekData = (elt) => holder(elt)._hyperscript;
+function dropData(elt) {
+  const h = holder(elt);
+  const had = h._hyperscript !== void 0;
+  delete h._hyperscript;
+  return had;
+}
 function dataOf(elt) {
-  let d = store.get(elt);
-  if (!d) store.set(elt, d = {});
-  return d;
+  return holder(elt)._hyperscript ??= {};
 }
 var rx = {
   /** True while an effect is evaluating: reads are then recorded as its dependencies. */
@@ -1607,6 +1616,108 @@ function arrayIndex(p, root) {
   return indirect(p, node);
 }
 
+// src/htmx-compat.ts
+var installed = /* @__PURE__ */ new WeakSet();
+function installHtmxCompat(hs) {
+  if (installed.has(hs)) return;
+  installed.add(hs);
+  let fromHtmx = false;
+  const asHtmx = (f) => {
+    const was = fromHtmx;
+    fromHtmx = true;
+    try {
+      f();
+    } finally {
+      fromHtmx = was;
+    }
+  };
+  document.addEventListener(
+    "htmx:load",
+    (evt) => asHtmx(() => hs.process(evt.detail?.elt))
+  );
+  document.addEventListener("htmx:after:process", (evt) => asHtmx(() => hs.process(evt.target)));
+  document.addEventListener("fx:swapped", (evt) => {
+    const target = evt.detail?.cfg?.target;
+    hs.process(
+      target instanceof Element && target.isConnected ? target.parentElement ?? target : document.body
+    );
+  });
+  const htmx = Reflect.get(globalThis, "htmx");
+  if (typeof htmx?.process !== "function") return;
+  hs.addAfterProcessHook((elt) => {
+    if (!fromHtmx) asHtmx(() => htmx.process(elt));
+  });
+  if (htmx.version?.startsWith("4")) {
+    htmx.registerExtension?.("hs-include", {
+      htmx_config_request(elt, detail) {
+        const ctx = detail?.ctx;
+        if (!ctx) return;
+        const found = findHsInclude(ctx.sourceElement || elt);
+        if (!found) return;
+        const vars = resolveSpecifiers(found.value, found.scopeElt);
+        const body = ctx.request?.body;
+        if (body instanceof FormData) for (const k in vars) body.set(k, vars[k]);
+      }
+    });
+  }
+}
+function findHsInclude(sourceElt) {
+  const attr = sourceElt.getAttribute("hs-include");
+  if (attr !== null) return { value: attr, scopeElt: sourceElt };
+  for (let elt = sourceElt.parentElement; elt; elt = elt.parentElement) {
+    const inherited2 = elt.getAttribute("hs-include:inherited");
+    if (inherited2 !== null) return { value: inherited2, scopeElt: elt };
+  }
+  return null;
+}
+var readScope = (elt) => elt && peekData(elt)?.scopes?.elementScope || {};
+function serialize(value) {
+  if (value == null) return "";
+  if (typeof value === "object") {
+    try {
+      return JSON.stringify(value);
+    } catch {
+      return "";
+    }
+  }
+  return String(value);
+}
+function resolveInherited(scopeKey, startElt) {
+  for (let elt = startElt; elt; elt = elt.parentElement) {
+    const scope = readScope(elt);
+    if (scopeKey in scope) return scope[scopeKey];
+  }
+  return void 0;
+}
+function resolveSpecifiers(attrValue, scopeElt) {
+  const result = {};
+  const raw = attrValue.trim();
+  if (raw === "*") {
+    const scope = readScope(scopeElt);
+    for (const k of Object.keys(scope)) result[k[0] === ":" ? k.slice(1) : k] = serialize(scope[k]);
+    return result;
+  }
+  for (let part of raw.split(",")) {
+    part = part.trim();
+    if (!part) continue;
+    if (part[0] === ":") {
+      const scope = readScope(scopeElt);
+      if (part in scope) result[part.slice(1)] = serialize(scope[part]);
+    } else if (part[0] === "^") {
+      const value = resolveInherited(":" + part.slice(1), scopeElt);
+      if (value !== void 0) result[part.slice(1)] = serialize(value);
+    } else if (part[0] === "#") {
+      const colon = part.lastIndexOf(":");
+      if (colon > 0) {
+        const scope = readScope(document.querySelector(part.slice(0, colon)));
+        const name = part.slice(colon + 1);
+        if (":" + name in scope) result[name] = serialize(scope[":" + name]);
+      }
+    }
+  }
+  return result;
+}
+
 // src/parser.ts
 var ParseError = class extends Error {
   constructor(message, token, source, expected) {
@@ -1972,14 +2083,21 @@ function initElement(elt) {
 }
 var beforeProcess = [];
 var afterProcess = [];
+var processing = /* @__PURE__ */ new Set();
 function processNode(node) {
   if (!(node instanceof Element || node instanceof Document || node instanceof DocumentFragment))
     return;
-  for (const hook of beforeProcess) hook(node);
-  const selector = attributes().map((a) => `[${a}]`).join(", ") + ", [type='text/hyperscript']";
-  if (node instanceof Element && node.matches(selector)) initElement(node);
-  node.querySelectorAll(selector).forEach(initElement);
-  for (const hook of afterProcess) hook(node);
+  if (processing.has(node)) return;
+  processing.add(node);
+  try {
+    for (const hook of beforeProcess) hook(node);
+    const selector = attributes().map((a) => `[${a}]`).join(", ") + ", [type='text/hyperscript']";
+    if (node instanceof Element && node.matches(selector)) initElement(node);
+    node.querySelectorAll(selector).forEach(initElement);
+    for (const hook of afterProcess) hook(node);
+  } finally {
+    processing.delete(node);
+  }
 }
 function cleanup(elt) {
   const data = peekData(elt);
@@ -2025,7 +2143,7 @@ var api = Object.assign(evaluate, {
   cleanup,
   /** The part of upstream's `internals` that pages and tests reach for. */
   internals: { runtime: { cleanup, processNode } },
-  version: false ? "dev" : "7.3.0"
+  version: false ? "dev" : "7.4.0"
 });
 function boot() {
   Object.assign(globalThis, { _hyperscript: api });
@@ -2033,6 +2151,7 @@ function boot() {
   const start = () => {
     processNode(document.documentElement);
     document.dispatchEvent(new Event("hyperscript:ready"));
+    installHtmxCompat(api);
   };
   if (document.readyState === "loading") document.addEventListener("DOMContentLoaded", start);
   else setTimeout(start);
@@ -3869,9 +3988,9 @@ function fetchCommand(g) {
         };
         const pending2 = Reflect.apply(fetch, globalThis, [address, detail]);
         return Promise.resolve(pending2).then((received) => {
-          const holder = { response: received };
-          triggerEvent(me, "fetch:afterResponse", holder);
-          const response = holder.response;
+          const holder2 = { response: received };
+          triggerEvent(me, "fetch:afterResponse", holder2);
+          const response = holder2.response;
           if (!(response instanceof Response))
             throw new Error("fetch did not return a Response");
           if (!dontThrow && kind !== "response" && config.fetchThrowsOn.some((re) => re.test(String(response.status)))) {

package/dist/minimal.js

@@ -37,13 +37,22 @@
     enter(_elt) {
     }
   };
-  var store = /* @__PURE__ */ new WeakMap();
-  var peekData = (elt) => store.get(elt);
-  var dropData = (elt) => store.delete(elt);
+  var windowHolders = /* @__PURE__ */ new WeakMap();
+  function holder(elt) {
+    if (elt.window !== elt) return elt;
+    let h = windowHolders.get(elt);
+    if (!h) windowHolders.set(elt, h = {});
+    return h;
+  }
+  var peekData = (elt) => holder(elt)._hyperscript;
+  function dropData(elt) {
+    const h = holder(elt);
+    const had = h._hyperscript !== void 0;
+    delete h._hyperscript;
+    return had;
+  }
   function dataOf(elt) {
-    let d = store.get(elt);
-    if (!d) store.set(elt, d = {});
-    return d;
+    return holder(elt)._hyperscript ??= {};
   }
   var rx = {
     /** True while an effect is evaluating: reads are then recorded as its dependencies. */
@@ -1876,6 +1885,108 @@
     };
   }
 
+  // src/htmx-compat.ts
+  var installed = /* @__PURE__ */ new WeakSet();
+  function installHtmxCompat(hs) {
+    if (installed.has(hs)) return;
+    installed.add(hs);
+    let fromHtmx = false;
+    const asHtmx = (f) => {
+      const was = fromHtmx;
+      fromHtmx = true;
+      try {
+        f();
+      } finally {
+        fromHtmx = was;
+      }
+    };
+    document.addEventListener(
+      "htmx:load",
+      (evt) => asHtmx(() => hs.process(evt.detail?.elt))
+    );
+    document.addEventListener("htmx:after:process", (evt) => asHtmx(() => hs.process(evt.target)));
+    document.addEventListener("fx:swapped", (evt) => {
+      const target = evt.detail?.cfg?.target;
+      hs.process(
+        target instanceof Element && target.isConnected ? target.parentElement ?? target : document.body
+      );
+    });
+    const htmx = Reflect.get(globalThis, "htmx");
+    if (typeof htmx?.process !== "function") return;
+    hs.addAfterProcessHook((elt) => {
+      if (!fromHtmx) asHtmx(() => htmx.process(elt));
+    });
+    if (htmx.version?.startsWith("4")) {
+      htmx.registerExtension?.("hs-include", {
+        htmx_config_request(elt, detail) {
+          const ctx = detail?.ctx;
+          if (!ctx) return;
+          const found = findHsInclude(ctx.sourceElement || elt);
+          if (!found) return;
+          const vars = resolveSpecifiers(found.value, found.scopeElt);
+          const body = ctx.request?.body;
+          if (body instanceof FormData) for (const k in vars) body.set(k, vars[k]);
+        }
+      });
+    }
+  }
+  function findHsInclude(sourceElt) {
+    const attr = sourceElt.getAttribute("hs-include");
+    if (attr !== null) return { value: attr, scopeElt: sourceElt };
+    for (let elt = sourceElt.parentElement; elt; elt = elt.parentElement) {
+      const inherited2 = elt.getAttribute("hs-include:inherited");
+      if (inherited2 !== null) return { value: inherited2, scopeElt: elt };
+    }
+    return null;
+  }
+  var readScope = (elt) => elt && peekData(elt)?.scopes?.elementScope || {};
+  function serialize(value) {
+    if (value == null) return "";
+    if (typeof value === "object") {
+      try {
+        return JSON.stringify(value);
+      } catch {
+        return "";
+      }
+    }
+    return String(value);
+  }
+  function resolveInherited(scopeKey, startElt) {
+    for (let elt = startElt; elt; elt = elt.parentElement) {
+      const scope = readScope(elt);
+      if (scopeKey in scope) return scope[scopeKey];
+    }
+    return void 0;
+  }
+  function resolveSpecifiers(attrValue, scopeElt) {
+    const result = {};
+    const raw = attrValue.trim();
+    if (raw === "*") {
+      const scope = readScope(scopeElt);
+      for (const k of Object.keys(scope)) result[k[0] === ":" ? k.slice(1) : k] = serialize(scope[k]);
+      return result;
+    }
+    for (let part of raw.split(",")) {
+      part = part.trim();
+      if (!part) continue;
+      if (part[0] === ":") {
+        const scope = readScope(scopeElt);
+        if (part in scope) result[part.slice(1)] = serialize(scope[part]);
+      } else if (part[0] === "^") {
+        const value = resolveInherited(":" + part.slice(1), scopeElt);
+        if (value !== void 0) result[part.slice(1)] = serialize(value);
+      } else if (part[0] === "#") {
+        const colon = part.lastIndexOf(":");
+        if (colon > 0) {
+          const scope = readScope(document.querySelector(part.slice(0, colon)));
+          const name = part.slice(colon + 1);
+          if (":" + name in scope) result[name] = serialize(scope[":" + name]);
+        }
+      }
+    }
+    return result;
+  }
+
   // src/parser.ts
   var ParseError = class extends Error {
     constructor(message, token, source, expected) {
@@ -2241,14 +2352,21 @@
   }
   var beforeProcess = [];
   var afterProcess = [];
+  var processing = /* @__PURE__ */ new Set();
   function processNode(node) {
     if (!(node instanceof Element || node instanceof Document || node instanceof DocumentFragment))
       return;
-    for (const hook of beforeProcess) hook(node);
-    const selector = attributes().map((a) => `[${a}]`).join(", ") + ", [type='text/hyperscript']";
-    if (node instanceof Element && node.matches(selector)) initElement(node);
-    node.querySelectorAll(selector).forEach(initElement);
-    for (const hook of afterProcess) hook(node);
+    if (processing.has(node)) return;
+    processing.add(node);
+    try {
+      for (const hook of beforeProcess) hook(node);
+      const selector = attributes().map((a) => `[${a}]`).join(", ") + ", [type='text/hyperscript']";
+      if (node instanceof Element && node.matches(selector)) initElement(node);
+      node.querySelectorAll(selector).forEach(initElement);
+      for (const hook of afterProcess) hook(node);
+    } finally {
+      processing.delete(node);
+    }
   }
   function cleanup(elt) {
     const data = peekData(elt);
@@ -2294,7 +2412,7 @@
     cleanup,
     /** The part of upstream's `internals` that pages and tests reach for. */
     internals: { runtime: { cleanup, processNode } },
-    version: false ? "dev" : "7.3.0"
+    version: false ? "dev" : "7.4.0"
   });
   function boot() {
     Object.assign(globalThis, { _hyperscript: api });
@@ -2302,6 +2420,7 @@
     const start = () => {
       processNode(document.documentElement);
       document.dispatchEvent(new Event("hyperscript:ready"));
+      installHtmxCompat(api);
     };
     if (document.readyState === "loading") document.addEventListener("DOMContentLoaded", start);
     else setTimeout(start);