marko 6.0.0-next.3.82 → 6.0.0-next.3.84

package/dist/debug/html.js

@@ -1666,6 +1666,12 @@ var K_SCOPE_ID = Symbol("Scope ID");
 function getChunk() {
   return $chunk;
 }
+function getContext(key) {
+  return $chunk.context?.[key];
+}
+function getState() {
+  return $chunk.boundary.state;
+}
 function getScopeId(scope) {
   return scope[K_SCOPE_ID];
 }
@@ -2592,8 +2598,8 @@ function styleAttr(value) {
   return stringAttr("style", styleValue(value));
 }
 function optionValueAttr(value) {
-  const { [kSelectedValue]: selectedValue } = getChunk()?.context || {};
-  return attr("value", value) + (!isVoid(value) && (Array.isArray(value) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
+  const selectedValue = getContext(kSelectedValue);
+  return attr("value", value) + (!isVoid(value) && (Array.isArray(selectedValue) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
 }
 var kSelectedValue = Symbol("selectedValue");
 function controllable_select_value(scopeId, nodeAccessor, value, valueChange, content) {
@@ -2841,7 +2847,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
       throw new Error(`Invalid renderer passed for dynamic tag: ${renderer}`);
     }
   }
-  const chunk = getChunk();
+  const state = getState();
   const branchId = peekNextScopeId();
   let result;
   if (typeof renderer === "string") {
@@ -2883,8 +2889,8 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
       throw new Error(`Body content is not supported for a "${renderer}" tag.`);
     }
     if (resume) {
-      chunk.writeHTML(
-        chunk.boundary.state.mark(
+      write(
+        state.mark(
           "|" /* BranchSingleNode */,
           scopeId + " " + accessor + " " + branchId
         )
@@ -2892,9 +2898,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
     }
   } else {
     if (resume) {
-      chunk.writeHTML(
-        chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-      );
+      write(state.mark("[" /* BranchStart */, branchId + ""));
     }
     result = withBranchId(branchId, () => {
       if (renderer) {
@@ -2906,12 +2910,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
       }
     });
     if (resume) {
-      chunk.writeHTML(
-        chunk.boundary.state.mark(
-          "]" /* BranchEnd */,
-          scopeId + " " + accessor
-        )
-      );
+      write(state.mark("]" /* BranchEnd */, scopeId + " " + accessor));
     }
   }
   const rendered = peekNextScopeId() !== branchId;

package/dist/debug/html.mjs

@@ -1584,6 +1584,12 @@ var K_SCOPE_ID = Symbol("Scope ID");
 function getChunk() {
   return $chunk;
 }
+function getContext(key) {
+  return $chunk.context?.[key];
+}
+function getState() {
+  return $chunk.boundary.state;
+}
 function getScopeId(scope) {
   return scope[K_SCOPE_ID];
 }
@@ -2510,8 +2516,8 @@ function styleAttr(value) {
   return stringAttr("style", styleValue(value));
 }
 function optionValueAttr(value) {
-  const { [kSelectedValue]: selectedValue } = getChunk()?.context || {};
-  return attr("value", value) + (!isVoid(value) && (Array.isArray(value) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
+  const selectedValue = getContext(kSelectedValue);
+  return attr("value", value) + (!isVoid(value) && (Array.isArray(selectedValue) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
 }
 var kSelectedValue = Symbol("selectedValue");
 function controllable_select_value(scopeId, nodeAccessor, value, valueChange, content) {
@@ -2759,7 +2765,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
       throw new Error(`Invalid renderer passed for dynamic tag: ${renderer}`);
     }
   }
-  const chunk = getChunk();
+  const state = getState();
   const branchId = peekNextScopeId();
   let result;
   if (typeof renderer === "string") {
@@ -2801,8 +2807,8 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
       throw new Error(`Body content is not supported for a "${renderer}" tag.`);
     }
     if (resume) {
-      chunk.writeHTML(
-        chunk.boundary.state.mark(
+      write(
+        state.mark(
           "|" /* BranchSingleNode */,
           scopeId + " " + accessor + " " + branchId
         )
@@ -2810,9 +2816,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
     }
   } else {
     if (resume) {
-      chunk.writeHTML(
-        chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-      );
+      write(state.mark("[" /* BranchStart */, branchId + ""));
     }
     result = withBranchId(branchId, () => {
       if (renderer) {
@@ -2824,12 +2828,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
       }
     });
     if (resume) {
-      chunk.writeHTML(
-        chunk.boundary.state.mark(
-          "]" /* BranchEnd */,
-          scopeId + " " + accessor
-        )
-      );
+      write(state.mark("]" /* BranchEnd */, scopeId + " " + accessor));
     }
   }
   const rendered = peekNextScopeId() !== branchId;

package/dist/html/writer.d.ts

@@ -11,6 +11,8 @@ declare enum Mark {
     ReorderMarker = "#"
 }
 export declare function getChunk(): Chunk | undefined;
+export declare function getContext(key: keyof NonNullable<Chunk["context"]>): unknown;
+export declare function getState(): State;
 export declare function getScopeId(scope: unknown): number | undefined;
 export declare function write(html: string): void;
 export declare function writeScript(script: string): void;

package/dist/html.js

@@ -1083,6 +1083,12 @@ var $chunk, NOOP = () => {
 function getChunk() {
   return $chunk;
 }
+function getContext(key) {
+  return $chunk.context?.[key];
+}
+function getState() {
+  return $chunk.boundary.state;
+}
 function getScopeId(scope) {
   return scope[K_SCOPE_ID];
 }
@@ -1659,8 +1665,8 @@ function styleAttr(value) {
   return stringAttr("style", styleValue(value));
 }
 function optionValueAttr(value) {
-  let { [kSelectedValue]: selectedValue } = getChunk()?.context || {};
-  return attr("value", value) + (!isVoid(value) && (Array.isArray(value) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
+  let selectedValue = getContext(kSelectedValue);
+  return attr("value", value) + (!isVoid(value) && (Array.isArray(selectedValue) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
 }
 var kSelectedValue = Symbol("selectedValue");
 function controllable_select_value(scopeId, nodeAccessor, value, valueChange, content) {
@@ -1851,7 +1857,7 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, resume) => {
-  let renderer = normalizeDynamicRenderer(tag), chunk = getChunk(), branchId = peekNextScopeId(), result;
+  let renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = peekNextScopeId(), result;
   if (typeof renderer == "string") {
     let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
     nextScopeId(), write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`), voidElementsReg.test(renderer) || (withBranchId(branchId, () => {
@@ -1869,28 +1875,21 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
         input.valueChange,
         content
       ) : content());
-    }), write(`</${renderer}>`)), resume && chunk.writeHTML(
-      chunk.boundary.state.mark(
+    }), write(`</${renderer}>`)), resume && write(
+      state.mark(
         "|" /* BranchSingleNode */,
         scopeId + " " + accessor + " " + branchId
       )
     );
   } else
-    resume && chunk.writeHTML(
-      chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-    ), result = withBranchId(branchId, () => {
+    resume && write(state.mark("[" /* BranchStart */, branchId + "")), result = withBranchId(branchId, () => {
       if (renderer)
         return inputIsArgs ? renderer(...inputOrArgs) : renderer(
           content ? { ...inputOrArgs, content } : inputOrArgs
         );
       if (content)
         return content();
-    }), resume && chunk.writeHTML(
-      chunk.boundary.state.mark(
-        "]" /* BranchEnd */,
-        scopeId + " " + accessor
-      )
-    );
+    }), resume && write(state.mark("]" /* BranchEnd */, scopeId + " " + accessor));
   return peekNextScopeId() !== branchId ? resume && writeScope(scopeId, {
     ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {}),
     ["c" /* ConditionalRenderer */ + accessor]: renderer?.h || renderer

package/dist/html.mjs

@@ -1004,6 +1004,12 @@ var $chunk, NOOP = () => {
 function getChunk() {
   return $chunk;
 }
+function getContext(key) {
+  return $chunk.context?.[key];
+}
+function getState() {
+  return $chunk.boundary.state;
+}
 function getScopeId(scope) {
   return scope[K_SCOPE_ID];
 }
@@ -1580,8 +1586,8 @@ function styleAttr(value) {
   return stringAttr("style", styleValue(value));
 }
 function optionValueAttr(value) {
-  let { [kSelectedValue]: selectedValue } = getChunk()?.context || {};
-  return attr("value", value) + (!isVoid(value) && (Array.isArray(value) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
+  let selectedValue = getContext(kSelectedValue);
+  return attr("value", value) + (!isVoid(value) && (Array.isArray(selectedValue) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
 }
 var kSelectedValue = Symbol("selectedValue");
 function controllable_select_value(scopeId, nodeAccessor, value, valueChange, content) {
@@ -1772,7 +1778,7 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, resume) => {
-  let renderer = normalizeDynamicRenderer(tag), chunk = getChunk(), branchId = peekNextScopeId(), result;
+  let renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = peekNextScopeId(), result;
   if (typeof renderer == "string") {
     let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
     nextScopeId(), write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`), voidElementsReg.test(renderer) || (withBranchId(branchId, () => {
@@ -1790,28 +1796,21 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
         input.valueChange,
         content
       ) : content());
-    }), write(`</${renderer}>`)), resume && chunk.writeHTML(
-      chunk.boundary.state.mark(
+    }), write(`</${renderer}>`)), resume && write(
+      state.mark(
         "|" /* BranchSingleNode */,
         scopeId + " " + accessor + " " + branchId
       )
     );
   } else
-    resume && chunk.writeHTML(
-      chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-    ), result = withBranchId(branchId, () => {
+    resume && write(state.mark("[" /* BranchStart */, branchId + "")), result = withBranchId(branchId, () => {
       if (renderer)
         return inputIsArgs ? renderer(...inputOrArgs) : renderer(
           content ? { ...inputOrArgs, content } : inputOrArgs
         );
       if (content)
         return content();
-    }), resume && chunk.writeHTML(
-      chunk.boundary.state.mark(
-        "]" /* BranchEnd */,
-        scopeId + " " + accessor
-      )
-    );
+    }), resume && write(state.mark("]" /* BranchEnd */, scopeId + " " + accessor));
   return peekNextScopeId() !== branchId ? resume && writeScope(scopeId, {
     ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {}),
     ["c" /* ConditionalRenderer */ + accessor]: renderer?.h || renderer

package/dist/translator/core/html-comment.d.ts

@@ -1,10 +1,10 @@
 import { type Tag } from "@marko/compiler/babel-utils";
 import { type Binding } from "../util/references";
-export declare const kCommentTagBinding: unique symbol;
+declare const kNodeBinding: unique symbol;
 declare const kGetterId: unique symbol;
 declare module "@marko/compiler/dist/types" {
     interface NodeExtra {
-        [kCommentTagBinding]?: Binding;
+        [kNodeBinding]?: Binding;
         [kGetterId]?: string;
     }
 }

package/dist/translator/core/html-script.d.ts

@@ -1,7 +1,10 @@
 import { type Tag } from "@marko/compiler/babel-utils";
+import { type Binding } from "../util/references";
+declare const kNodeBinding: unique symbol;
 declare const kGetterId: unique symbol;
 declare module "@marko/compiler/dist/types" {
     interface NodeExtra {
+        [kNodeBinding]?: Binding;
         [kGetterId]?: string;
     }
 }

package/dist/translator/core/html-style.d.ts

@@ -1,7 +1,10 @@
 import { type Tag } from "@marko/compiler/babel-utils";
+import { type Binding } from "../util/references";
+declare const kNodeBinding: unique symbol;
 declare const kGetterId: unique symbol;
 declare module "@marko/compiler/dist/types" {
     interface NodeExtra {
+        [kNodeBinding]?: Binding;
         [kGetterId]?: string;
     }
 }