octane 0.2.13 → 0.2.15

package/dist/cjs/constants.cjs

@@ -33,7 +33,7 @@ __export(constants_exports, {
   HYDRATE_SEED_ATTR: () => HYDRATE_SEED_ATTR,
   HYDRATE_STATIC_END: () => HYDRATE_STATIC_END,
   HYDRATE_STATIC_ID_COUNT_PREFIX: () => HYDRATE_STATIC_ID_COUNT_PREFIX,
-  HYDRATE_STREAM_TOKEN_ATTR: () => import_stream_protocol.HYDRATE_STREAM_TOKEN_ATTR,
+  HYDRATE_STREAM_TOKEN_ATTR: () => import_stream_protocol2.HYDRATE_STREAM_TOKEN_ATTR,
   HYDRATE_WHEN_ATTR: () => HYDRATE_WHEN_ATTR,
   HYDRATION_END: () => HYDRATION_END,
   HYDRATION_FOR_EMPTY: () => HYDRATION_FOR_EMPTY,
@@ -46,16 +46,16 @@ __export(constants_exports, {
   POSITIVE_NUMERIC_ATTR_PROPS: () => POSITIVE_NUMERIC_ATTR_PROPS,
   REJECTION_SENTINEL_KEY: () => REJECTION_SENTINEL_KEY,
   SIGNAL_CONTROL_ATTR: () => import_hydration_markers.SIGNAL_CONTROL_ATTR,
-  STREAM_BOUNDARY_ATTR: () => import_stream_protocol2.STREAM_BOUNDARY_ATTR,
+  STREAM_BOUNDARY_ATTR: () => import_stream_protocol3.STREAM_BOUNDARY_ATTR,
   STREAM_RESOURCE_ATTR: () => STREAM_RESOURCE_ATTR,
-  STREAM_SCRIPT_ATTR: () => STREAM_SCRIPT_ATTR,
+  STREAM_SCRIPT_ATTR: () => import_stream_protocol4.STREAM_SCRIPT_ATTR,
   STREAM_SEED_ATTR: () => STREAM_SEED_ATTR,
   STREAM_SEED_COMMENT: () => STREAM_SEED_COMMENT,
   STREAM_SEGMENT_ATTR: () => STREAM_SEGMENT_ATTR,
   SUSPENSE_RESOLVED_COMMENT: () => SUSPENSE_RESOLVED_COMMENT,
   SUSPENSE_RESOLVED_NATIVE_ATTR: () => SUSPENSE_RESOLVED_NATIVE_ATTR,
   SUSPENSE_RESOLVED_SEED_ATTR: () => SUSPENSE_RESOLVED_SEED_ATTR,
-  SUSPENSE_SCRIPT_ATTR: () => SUSPENSE_SCRIPT_ATTR,
+  SUSPENSE_SCRIPT_ATTR: () => import_stream_protocol.SUSPENSE_SCRIPT_ATTR,
   SUSPENSE_SEED_WIRE_PREFIX: () => SUSPENSE_SEED_WIRE_PREFIX,
   SVG_ONLY_TAGS: () => SVG_ONLY_TAGS,
   UNDEFINED_SENTINEL_KEY: () => UNDEFINED_SENTINEL_KEY,
@@ -67,8 +67,10 @@ __export(constants_exports, {
 });
 module.exports = __toCommonJS(constants_exports);
 var import_stream_protocol = require("./stream-protocol.cjs");
-var import_hydration_markers = require("./hydration-markers.cjs");
 var import_stream_protocol2 = require("./stream-protocol.cjs");
+var import_hydration_markers = require("./hydration-markers.cjs");
+var import_stream_protocol3 = require("./stream-protocol.cjs");
+var import_stream_protocol4 = require("./stream-protocol.cjs");
 var import_dom_tables = require("./dom-tables.cjs");
 const HYDRATION_START = "[";
 const HYDRATION_END = "]";
@@ -80,7 +82,6 @@ const FOR_BLOCK_OPEN_EMPTY = `<!--${HYDRATION_FOR_EMPTY}-->`;
 const FOR_BLOCK_OPEN_ITEMS = `<!--${HYDRATION_FOR_ITEMS}-->`;
 const EMPTY_COMMENT = "<!---->";
 const HYDRATION_TEXT_SEP = " ";
-const SUSPENSE_SCRIPT_ATTR = "data-octane-suspense";
 const SUSPENSE_RESOLVED_COMMENT = "oct-suspense:";
 const SUSPENSE_RESOLVED_SEED_ATTR = "data-octane-suspense-seeds";
 const SUSPENSE_RESOLVED_NATIVE_ATTR = "data-octane-suspense-signals";
@@ -101,7 +102,6 @@ const HYDRATE_ID_COUNT_ATTR = "data-octane-hydrate-id-count";
 const HYDRATE_SEED_ATTR = "data-octane-hydrate-seed";
 const STREAM_SEGMENT_ATTR = "data-oct-s";
 const STREAM_SEED_ATTR = "data-oct-seed";
-const STREAM_SCRIPT_ATTR = "data-octane-stream";
 const STREAM_RESOURCE_ATTR = "data-oct-fr";
 const STREAM_SEED_COMMENT = "oct-seed:";
 const VOID_ELEMENTS = import_dom_tables.VOID_ELEMENTS;

package/dist/cjs/dom-binding-claims.cjs

@@ -0,0 +1,28 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var dom_binding_claims_exports = {};
+__export(dom_binding_claims_exports, {
+  domBindingClaims: () => domBindingClaims
+});
+module.exports = __toCommonJS(dom_binding_claims_exports);
+const domBindingClaims = /* @__PURE__ */ new WeakMap();
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  domBindingClaims
+});

package/dist/cjs/dom-binding-handoff.cjs

@@ -18,7 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var dom_binding_handoff_exports = {};
 __export(dom_binding_handoff_exports, {
-  BINDING_HANDOFF: () => BINDING_HANDOFF,
+  BINDING_HANDOFF: () => import_control_handoff.BINDING_HANDOFF,
   beginBindingEvent: () => beginBindingEvent,
   claimBindingHandoff: () => claimBindingHandoff,
   consumeBindingEvent: () => consumeBindingEvent,
@@ -28,7 +28,7 @@ __export(dom_binding_handoff_exports, {
   releaseBindingHandoff: () => releaseBindingHandoff
 });
 module.exports = __toCommonJS(dom_binding_handoff_exports);
-const BINDING_HANDOFF = /* @__PURE__ */ Symbol.for("octane.binding-handoff");
+var import_control_handoff = require("./signals/control-handoff.cjs");
 const events = /* @__PURE__ */ new WeakMap();
 const delivered = /* @__PURE__ */ new WeakMap();
 function registerBindingEvent(node, type) {

package/dist/cjs/dom-bindings.cjs

@@ -31,7 +31,11 @@ __export(dom_bindings_exports, {
 });
 module.exports = __toCommonJS(dom_bindings_exports);
 var import_class_names = require("./class-names.cjs");
+var import_dom_binding_claims = require("./dom-binding-claims.cjs");
 var import_sanitize_url = require("./sanitize-url.cjs");
+var import_stream_protocol = require("./stream-protocol.cjs");
+var import_native_read_seeds = require("./signals/native-read-seeds.cjs");
+var import_control_handoff = require("./signals/control-handoff.cjs");
 var import_owner_context = require("./signals/owner-context.cjs");
 var import_read_protocol = require("./signals/read-protocol.cjs");
 function unbound(value) {
@@ -88,6 +92,11 @@ function __releaseBinding(node, name) {
   const channels = claims.get(node);
   channels.delete(name);
   if (channels.size === 0) claims.delete(node);
+  const published = import_dom_binding_claims.domBindingClaims.get(node);
+  if (published) {
+    published.delete(name);
+    if (published.size === 0) import_dom_binding_claims.domBindingClaims.delete(node);
+  }
 }
 function resolveNodes(root, descriptor) {
   if (root?.nodeType !== 1 || root.getAttribute("data-octane-bindings") !== descriptor.id || descriptor.nodes.length === 0) {
@@ -97,9 +106,9 @@ function resolveNodes(root, descriptor) {
   const nodes = [];
   const childIndices = [];
   for (let i = 0; i < descriptor.nodes.length; i++) {
-    const [parent, tag, namespace, children] = descriptor.nodes[i];
+    const [parent, tag, namespace, children, , text] = descriptor.nodes[i];
     const node = i === 0 ? parent === -1 ? root : void 0 : parent >= 0 && parent < i && descriptor.nodes[parent][3] !== null ? nodes[parent]?.children[childIndices[parent]++] : void 0;
-    if (node === void 0 || descriptor.nodes[i][4] === true || node.localName !== tag || node.namespaceURI !== namespaces[namespace] || children !== null && (node.childNodes.length !== children || node.children.length !== children)) {
+    if (node === void 0 || descriptor.nodes[i][4] === true || node.localName !== tag || node.namespaceURI !== namespaces[namespace] || (text ? node.childNodes.length > 1 || node.firstChild !== null && node.firstChild.nodeType !== 3 : children !== null && (node.childNodes.length !== children || node.children.length !== children))) {
       throw new Error("DOM bindings cannot adopt a mismatched static element topology.");
     }
     nodes.push(node);
@@ -140,9 +149,9 @@ function resolveAddressedNodes(root, descriptor) {
   }
   const childCounts = new Array(descriptor.nodes.length).fill(0);
   for (let i = 0; i < descriptor.nodes.length; i++) {
-    const [parent, tag, namespace, children, openChildren] = descriptor.nodes[i];
+    const [parent, tag, namespace, children, openChildren, text] = descriptor.nodes[i];
     const node = nodes[i];
-    if (node === void 0 || node.localName !== tag || node.namespaceURI !== namespaces[namespace] || (i === 0 ? parent !== -1 || node !== root : parent < 0 || parent >= i || descriptor.nodes[parent][3] === null || node.parentElement !== nodes[parent] || descriptor.nodes[parent][4] !== true && nodes[parent].children[childCounts[parent]] !== node) || openChildren && children === null || children !== null && !openChildren && (node.childNodes.length !== children || node.children.length !== children)) {
+    if (node === void 0 || node.localName !== tag || node.namespaceURI !== namespaces[namespace] || (i === 0 ? parent !== -1 || node !== root : parent < 0 || parent >= i || descriptor.nodes[parent][3] === null || node.parentElement !== nodes[parent] || descriptor.nodes[parent][4] !== true && nodes[parent].children[childCounts[parent]] !== node) || openChildren && children === null || (text ? node.childNodes.length > 1 || node.firstChild !== null && node.firstChild.nodeType !== 3 : children !== null && !openChildren && (node.childNodes.length !== children || node.children.length !== children))) {
       throw new Error("DOM bindings cannot adopt a mismatched addressed element topology.");
     }
     if (parent !== -1) childCounts[parent]++;
@@ -157,6 +166,11 @@ function resolveAddressedNodes(root, descriptor) {
 function normalize(binding, value) {
   const type = typeof value;
   switch (binding[1]) {
+    case "text":
+      if (value == null || value === false) return "";
+      if (type !== "string" && type !== "number" && type !== "bigint" && type !== "boolean")
+        throw new TypeError("DOM binding text must be a synchronous scalar.");
+      return String(value);
     case "styleObject":
       return value;
     case "class":
@@ -184,7 +198,11 @@ function normalize(binding, value) {
 }
 function write(node, binding, value) {
   const name = binding[2];
-  if (binding[1] === "classToken") {
+  if (binding[1] === "text") {
+    const text = node.firstChild;
+    if (text === null) node.appendChild(node.ownerDocument.createTextNode(value));
+    else if (text.nodeValue !== value) text.nodeValue = value;
+  } else if (binding[1] === "classToken") {
     node.classList.toggle(name, value !== null);
   } else if (binding[1] === "url") {
     if (value === "" && !(name === "href" && node.localName === "a")) value = null;
@@ -283,16 +301,28 @@ function __adoptBindings(root, descriptor, source, options) {
   let dirty = false;
   let revision = 0;
   let unsubscribe;
+  let publicationRetries;
+  let published;
   const signal = options?.signal;
-  const dispose = () => {
-    if (disposed) return;
+  const dispose = (_disposal, publish, preservePresentation = false) => {
+    if (disposed) {
+      publish?.();
+      return;
+    }
     disposed = true;
+    publicationRetries?.clear();
     signal?.removeEventListener("abort", dispose);
     let failed = false;
     let failure;
+    try {
+      publish?.();
+    } catch (error) {
+      failed = true;
+      failure = error;
+    }
     for (const connection of signalConnections?.values() ?? []) {
       try {
-        connection.dispose();
+        connection.dispose(preservePresentation);
       } catch (error) {
         if (!failed) {
           failed = true;
@@ -302,7 +332,7 @@ function __adoptBindings(root, descriptor, source, options) {
     }
     for (const connection of projections ? new Set(projections.values()) : []) {
       try {
-        connection.dispose();
+        connection.dispose(preservePresentation);
       } catch (error) {
         if (!failed) {
           failed = true;
@@ -327,9 +357,9 @@ function __adoptBindings(root, descriptor, source, options) {
     for (let i = 0; i < owned.length; i++) {
       const [node, name] = owned[i];
       try {
-        groups?.get(i)?.dispose();
-        styles?.get(i)?.dispose();
-        if (bindings[i][1] === "classToken" && previous[i] === "")
+        groups?.get(i)?.dispose(preservePresentation);
+        styles?.get(i)?.dispose(preservePresentation);
+        if (!preservePresentation && bindings[i][1] === "classToken" && previous[i] === "")
           node.classList.remove(bindings[i][2]);
       } catch (error) {
         if (!failed) {
@@ -385,7 +415,21 @@ function __adoptBindings(root, descriptor, source, options) {
           styles.set(i, style = __createBindingStyleRestoration(nodes[binding[0]], binding));
         style.write(next[i]);
       } else write(nodes[binding[0]], binding, next[i]);
-      if (!disposed) previous[i] = next[i];
+      if (!disposed) {
+        previous[i] = next[i];
+        if (binding[1] === "attr" || binding[1] === "boolean" || binding[1] === "aria" || binding[1] === "class" || binding[1] === "styleProperty" || binding[1] === "text") {
+          const [node, name] = owned[i];
+          let published2 = next[i];
+          if (binding[1] === "styleProperty") {
+            const style = node.style;
+            const value = style.getPropertyValue(binding[2]);
+            published2 = value === "" ? null : value + (style.getPropertyPriority(binding[2]) ? " !important" : "");
+          }
+          let claims2 = import_dom_binding_claims.domBindingClaims.get(node);
+          if (claims2 === void 0) import_dom_binding_claims.domBindingClaims.set(node, claims2 = /* @__PURE__ */ new Map());
+          claims2.set(name, published2);
+        }
+      }
     }
   };
   const drain = (preview = false) => {
@@ -600,6 +644,7 @@ function __adoptBindings(root, descriptor, source, options) {
                 writePrepared(next, indices, preparedControls, preparedGroups);
               } finally {
                 busy = false;
+                published?.();
               }
             }
           };
@@ -622,6 +667,7 @@ function __adoptBindings(root, descriptor, source, options) {
         for (const index of previousUpdates ?? []) signalUpdates.add(index);
       }
       busy = false;
+      if (!preview) published?.();
     }
   };
   const refresh = () => {
@@ -637,6 +683,52 @@ function __adoptBindings(root, descriptor, source, options) {
     prepare: () => run(() => drain(true))
   };
   const handle = { refresh, dispose };
+  if (descriptor.handoff === "host") {
+    published = () => {
+      if (!publicationRetries?.size) return;
+      const pending = [...publicationRetries];
+      publicationRetries.clear();
+      for (const retry of pending)
+        queueMicrotask(() => {
+          if (!disposed) retry();
+        });
+    };
+    const host = root;
+    const document = host.ownerDocument;
+    const ancestry = [];
+    for (let node = host; node !== null; node = node.parentNode)
+      ancestry.push([node, node.parentNode]);
+    const sibling = (node, previous2) => {
+      let next = previous2 ? node.previousSibling : node.nextSibling;
+      while (next?.nodeType === 1 && next.localName === "script" && (next.hasAttribute(import_native_read_seeds.NATIVE_SIGNAL_SEED_ATTR) || next.hasAttribute(import_stream_protocol.SUSPENSE_SCRIPT_ATTR) || next.hasAttribute(import_stream_protocol.STREAM_SCRIPT_ATTR)))
+        next = previous2 ? next.previousSibling : next.nextSibling;
+      return next;
+    };
+    const previousSibling = sibling(host, true);
+    const nextSibling = sibling(host, false);
+    let handoff;
+    handle[import_control_handoff.BINDING_HANDOFF] = () => {
+      if (handoff !== void 0) return handoff;
+      return handoff = {
+        id: descriptor.id,
+        root: host,
+        anchor: host,
+        host: new Set(
+          bindings.map(
+            (binding) => binding[1] === "styleProperty" ? "style:" + binding[2] : binding[1].startsWith("style") ? "style" : binding[2]
+          )
+        ),
+        revision: () => busy ? -1 : revision,
+        afterPublication: (callback) => {
+          (publicationRetries ??= /* @__PURE__ */ new Set()).add(callback);
+          return () => publicationRetries.delete(callback);
+        },
+        valid: () => host.parentNode !== null && host.ownerDocument === document && ancestry.every(([node, parent]) => node.parentNode === parent) && sibling(host, true) === previousSibling && sibling(host, false) === nextSibling && host.getAttribute("data-octane-bindings") === descriptor.id,
+        active: () => !disposed,
+        retire: (publish) => dispose(void 0, publish, true)
+      };
+    };
+  }
   if (signal?.aborted) {
     dispose();
     return handle;