marko 6.0.0-next.3.37 → 6.0.0-next.3.38

package/dist/debug/dom.js

@@ -29,7 +29,6 @@ __export(dom_exports, {
   compat: () => compat,
   conditional: () => conditional,
   conditionalClosure: () => conditionalClosure,
-  conditionalOnlyChild: () => conditionalOnlyChild,
   controllable_detailsOrDialog_open: () => controllable_detailsOrDialog_open,
   controllable_detailsOrDialog_open_effect: () => controllable_detailsOrDialog_open_effect,
   controllable_input_checked: () => controllable_input_checked,
@@ -47,6 +46,7 @@ __export(dom_exports, {
   createTemplate: () => createTemplate,
   data: () => data,
   dynamicClosure: () => dynamicClosure,
+  dynamicTag: () => dynamicTag,
   dynamicTagAttrs: () => dynamicTagAttrs,
   effect: () => effect,
   forIn: () => forIn,
@@ -1415,7 +1415,12 @@ function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
           "A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead."
         );
       }
-      setConditionalRendererOnlyChild(childScope, nodeAccessor2, content);
+      setConditionalRendererOnlyChild(
+        childScope,
+        nodeAccessor2,
+        content,
+        createBranchScopeWithTagNameOrRenderer
+      );
       attrs(childScope, nodeAccessor2, attrsOrOp());
     } else if (renderer.___args) {
       const attributes = attrsOrOp();
@@ -1467,11 +1472,23 @@ function createCloneableHTML(html2, ns) {
 }
 
 // src/dom/control-flow.ts
-function patchConditionals(fn) {
-  conditional = fn(conditional);
-  conditionalOnlyChild = fn(conditionalOnlyChild);
+function conditional(nodeAccessor, ...branches) {
+  const branchAccessor = nodeAccessor + "(" /* ConditionalRenderer */;
+  return (scope, newBranchIndexOrOp) => {
+    if (newBranchIndexOrOp !== scope[branchAccessor] && newBranchIndexOrOp !== DIRTY && newBranchIndexOrOp !== MARK && newBranchIndexOrOp !== CLEAN) {
+      (scope[nodeAccessor].nodeType > 1 /* Element */ ? setConditionalRenderer : setConditionalRendererOnlyChild)(
+        scope,
+        nodeAccessor,
+        branches[scope[branchAccessor] = newBranchIndexOrOp],
+        createBranchScopeWithRenderer
+      );
+    }
+  };
+}
+function patchDynamicTag(fn) {
+  dynamicTag = fn(dynamicTag);
 }
-var conditional = function conditional2(nodeAccessor, fn, getIntersection) {
+var dynamicTag = function dynamicTag2(nodeAccessor, fn, getIntersection) {
   const rendererAccessor = nodeAccessor + "(" /* ConditionalRenderer */;
   let intersection2 = getIntersection && ((scope, op) => (intersection2 = getIntersection())(scope, op));
   return (scope, newRendererOrOp) => {
@@ -1482,7 +1499,12 @@ var conditional = function conditional2(nodeAccessor, fn, getIntersection) {
       const normalizedRenderer = normalizeDynamicRenderer(newRendererOrOp);
       if (isDifferentRenderer(normalizedRenderer, currentRenderer)) {
         scope[rendererAccessor] = normalizedRenderer;
-        setConditionalRenderer(scope, nodeAccessor, normalizedRenderer);
+        setConditionalRenderer(
+          scope,
+          nodeAccessor,
+          normalizedRenderer,
+          createBranchScopeWithTagNameOrRenderer
+        );
         fn && fn(scope);
         op = DIRTY;
       } else {
@@ -1492,56 +1514,28 @@ var conditional = function conditional2(nodeAccessor, fn, getIntersection) {
     intersection2?.(scope, op);
   };
 };
-function setConditionalRenderer(scope, nodeAccessor, newRenderer) {
+function setConditionalRenderer(scope, nodeAccessor, newRenderer, createBranch2) {
   const prevBranch = scope[nodeAccessor + "!" /* ConditionalScope */] || getEmptyBranch(scope[nodeAccessor]);
-  const newBranch = newRenderer ? createBranchScopeWithTagNameOrRenderer(
+  const newBranch = newRenderer ? createBranch2(
     newRenderer,
     scope.$global,
     scope,
     prevBranch.___endNode.parentNode
   ) : getEmptyBranch(scope[nodeAccessor]);
-  insertBranchBefore(
-    newBranch,
-    prevBranch.___endNode.parentNode,
-    prevBranch.___endNode.nextSibling
-  );
-  removeAndDestroyBranch(prevBranch);
-  scope[nodeAccessor + "!" /* ConditionalScope */] = newRenderer && newBranch;
+  if (prevBranch !== newBranch) {
+    insertBranchBefore(
+      newBranch,
+      prevBranch.___endNode.parentNode,
+      prevBranch.___endNode.nextSibling
+    );
+    removeAndDestroyBranch(prevBranch);
+    scope[nodeAccessor + "!" /* ConditionalScope */] = newRenderer && newBranch;
+  }
 }
-var conditionalOnlyChild = function conditional3(nodeAccessor, fn, getIntersection) {
-  const rendererAccessor = nodeAccessor + "(" /* ConditionalRenderer */;
-  let intersection2 = getIntersection && ((scope, op) => (intersection2 = getIntersection())(scope, op));
-  return (scope, newRendererOrOp) => {
-    if (newRendererOrOp === DIRTY) return;
-    let currentRenderer = scope[rendererAccessor];
-    let op = newRendererOrOp;
-    if (newRendererOrOp !== MARK && newRendererOrOp !== CLEAN) {
-      const normalizedRenderer = normalizeDynamicRenderer(newRendererOrOp);
-      if (isDifferentRenderer(normalizedRenderer, currentRenderer)) {
-        currentRenderer = scope[rendererAccessor] = normalizedRenderer;
-        setConditionalRendererOnlyChild(
-          scope,
-          nodeAccessor,
-          normalizedRenderer
-        );
-        fn && fn(scope);
-        op = DIRTY;
-      } else {
-        op = CLEAN;
-      }
-    }
-    intersection2?.(scope, op);
-  };
-};
-function setConditionalRendererOnlyChild(scope, nodeAccessor, newRenderer) {
+function setConditionalRendererOnlyChild(scope, nodeAccessor, newRenderer, createBranch2) {
   const prevBranch = scope[nodeAccessor + "!" /* ConditionalScope */];
   const referenceNode = scope[nodeAccessor];
-  const newBranch = newRenderer && createBranchScopeWithTagNameOrRenderer(
-    newRenderer,
-    scope.$global,
-    scope,
-    referenceNode
-  );
+  const newBranch = newRenderer && createBranch2(newRenderer, scope.$global, scope, referenceNode);
   referenceNode.textContent = "";
   if (newBranch) {
     insertBranchBefore(newBranch, referenceNode, null);
@@ -1771,14 +1765,14 @@ function loopClosure(ownerLoopNodeAccessor, fn, getIntersection) {
   helperSignal._ = signal;
   return helperSignal;
 }
-function conditionalClosure(ownerConditionalNodeAccessor, getRenderer, fn, getIntersection) {
+function conditionalClosure(ownerConditionalNodeAccessor, branch, fn, getIntersection) {
   const signal = closure(fn, getIntersection);
   const scopeAccessor = ownerConditionalNodeAccessor + "!" /* ConditionalScope */;
-  const rendererAccessor = ownerConditionalNodeAccessor + "(" /* ConditionalRenderer */;
+  const branchAccessor = ownerConditionalNodeAccessor + "(" /* ConditionalRenderer */;
   const helperSignal = (scope, value2) => {
-    const conditionalScope = scope[scopeAccessor];
-    if (conditionalScope && !conditionalScope.___pending && scope[rendererAccessor]?.___id === getRenderer().___id) {
-      queueSource(conditionalScope, signal, value2);
+    const ifScope = scope[scopeAccessor];
+    if (ifScope && !ifScope.___pending && scope[branchAccessor] === branch) {
+      queueSource(ifScope, signal, value2);
     }
   };
   helperSignal._ = signal;
@@ -1980,7 +1974,7 @@ var RENDER_BODY_ID = prefix + (true ? "renderBody" : "b");
 // src/dom/compat.ts
 var classIdToBranch = /* @__PURE__ */ new Map();
 var compat = {
-  patchConditionals,
+  patchConditionals: patchDynamicTag,
   queueEffect,
   init(warp10Noop) {
     register(SET_SCOPE_REGISTER_ID, (branch) => {

package/dist/debug/dom.mjs

@@ -1329,7 +1329,12 @@ function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
           "A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead."
         );
       }
-      setConditionalRendererOnlyChild(childScope, nodeAccessor2, content);
+      setConditionalRendererOnlyChild(
+        childScope,
+        nodeAccessor2,
+        content,
+        createBranchScopeWithTagNameOrRenderer
+      );
       attrs(childScope, nodeAccessor2, attrsOrOp());
     } else if (renderer.___args) {
       const attributes = attrsOrOp();
@@ -1381,11 +1386,23 @@ function createCloneableHTML(html2, ns) {
 }
 
 // src/dom/control-flow.ts
-function patchConditionals(fn) {
-  conditional = fn(conditional);
-  conditionalOnlyChild = fn(conditionalOnlyChild);
+function conditional(nodeAccessor, ...branches) {
+  const branchAccessor = nodeAccessor + "(" /* ConditionalRenderer */;
+  return (scope, newBranchIndexOrOp) => {
+    if (newBranchIndexOrOp !== scope[branchAccessor] && newBranchIndexOrOp !== DIRTY && newBranchIndexOrOp !== MARK && newBranchIndexOrOp !== CLEAN) {
+      (scope[nodeAccessor].nodeType > 1 /* Element */ ? setConditionalRenderer : setConditionalRendererOnlyChild)(
+        scope,
+        nodeAccessor,
+        branches[scope[branchAccessor] = newBranchIndexOrOp],
+        createBranchScopeWithRenderer
+      );
+    }
+  };
+}
+function patchDynamicTag(fn) {
+  dynamicTag = fn(dynamicTag);
 }
-var conditional = function conditional2(nodeAccessor, fn, getIntersection) {
+var dynamicTag = function dynamicTag2(nodeAccessor, fn, getIntersection) {
   const rendererAccessor = nodeAccessor + "(" /* ConditionalRenderer */;
   let intersection2 = getIntersection && ((scope, op) => (intersection2 = getIntersection())(scope, op));
   return (scope, newRendererOrOp) => {
@@ -1396,7 +1413,12 @@ var conditional = function conditional2(nodeAccessor, fn, getIntersection) {
       const normalizedRenderer = normalizeDynamicRenderer(newRendererOrOp);
       if (isDifferentRenderer(normalizedRenderer, currentRenderer)) {
         scope[rendererAccessor] = normalizedRenderer;
-        setConditionalRenderer(scope, nodeAccessor, normalizedRenderer);
+        setConditionalRenderer(
+          scope,
+          nodeAccessor,
+          normalizedRenderer,
+          createBranchScopeWithTagNameOrRenderer
+        );
         fn && fn(scope);
         op = DIRTY;
       } else {
@@ -1406,56 +1428,28 @@ var conditional = function conditional2(nodeAccessor, fn, getIntersection) {
     intersection2?.(scope, op);
   };
 };
-function setConditionalRenderer(scope, nodeAccessor, newRenderer) {
+function setConditionalRenderer(scope, nodeAccessor, newRenderer, createBranch2) {
   const prevBranch = scope[nodeAccessor + "!" /* ConditionalScope */] || getEmptyBranch(scope[nodeAccessor]);
-  const newBranch = newRenderer ? createBranchScopeWithTagNameOrRenderer(
+  const newBranch = newRenderer ? createBranch2(
     newRenderer,
     scope.$global,
     scope,
     prevBranch.___endNode.parentNode
   ) : getEmptyBranch(scope[nodeAccessor]);
-  insertBranchBefore(
-    newBranch,
-    prevBranch.___endNode.parentNode,
-    prevBranch.___endNode.nextSibling
-  );
-  removeAndDestroyBranch(prevBranch);
-  scope[nodeAccessor + "!" /* ConditionalScope */] = newRenderer && newBranch;
+  if (prevBranch !== newBranch) {
+    insertBranchBefore(
+      newBranch,
+      prevBranch.___endNode.parentNode,
+      prevBranch.___endNode.nextSibling
+    );
+    removeAndDestroyBranch(prevBranch);
+    scope[nodeAccessor + "!" /* ConditionalScope */] = newRenderer && newBranch;
+  }
 }
-var conditionalOnlyChild = function conditional3(nodeAccessor, fn, getIntersection) {
-  const rendererAccessor = nodeAccessor + "(" /* ConditionalRenderer */;
-  let intersection2 = getIntersection && ((scope, op) => (intersection2 = getIntersection())(scope, op));
-  return (scope, newRendererOrOp) => {
-    if (newRendererOrOp === DIRTY) return;
-    let currentRenderer = scope[rendererAccessor];
-    let op = newRendererOrOp;
-    if (newRendererOrOp !== MARK && newRendererOrOp !== CLEAN) {
-      const normalizedRenderer = normalizeDynamicRenderer(newRendererOrOp);
-      if (isDifferentRenderer(normalizedRenderer, currentRenderer)) {
-        currentRenderer = scope[rendererAccessor] = normalizedRenderer;
-        setConditionalRendererOnlyChild(
-          scope,
-          nodeAccessor,
-          normalizedRenderer
-        );
-        fn && fn(scope);
-        op = DIRTY;
-      } else {
-        op = CLEAN;
-      }
-    }
-    intersection2?.(scope, op);
-  };
-};
-function setConditionalRendererOnlyChild(scope, nodeAccessor, newRenderer) {
+function setConditionalRendererOnlyChild(scope, nodeAccessor, newRenderer, createBranch2) {
   const prevBranch = scope[nodeAccessor + "!" /* ConditionalScope */];
   const referenceNode = scope[nodeAccessor];
-  const newBranch = newRenderer && createBranchScopeWithTagNameOrRenderer(
-    newRenderer,
-    scope.$global,
-    scope,
-    referenceNode
-  );
+  const newBranch = newRenderer && createBranch2(newRenderer, scope.$global, scope, referenceNode);
   referenceNode.textContent = "";
   if (newBranch) {
     insertBranchBefore(newBranch, referenceNode, null);
@@ -1685,14 +1679,14 @@ function loopClosure(ownerLoopNodeAccessor, fn, getIntersection) {
   helperSignal._ = signal;
   return helperSignal;
 }
-function conditionalClosure(ownerConditionalNodeAccessor, getRenderer, fn, getIntersection) {
+function conditionalClosure(ownerConditionalNodeAccessor, branch, fn, getIntersection) {
   const signal = closure(fn, getIntersection);
   const scopeAccessor = ownerConditionalNodeAccessor + "!" /* ConditionalScope */;
-  const rendererAccessor = ownerConditionalNodeAccessor + "(" /* ConditionalRenderer */;
+  const branchAccessor = ownerConditionalNodeAccessor + "(" /* ConditionalRenderer */;
   const helperSignal = (scope, value2) => {
-    const conditionalScope = scope[scopeAccessor];
-    if (conditionalScope && !conditionalScope.___pending && scope[rendererAccessor]?.___id === getRenderer().___id) {
-      queueSource(conditionalScope, signal, value2);
+    const ifScope = scope[scopeAccessor];
+    if (ifScope && !ifScope.___pending && scope[branchAccessor] === branch) {
+      queueSource(ifScope, signal, value2);
     }
   };
   helperSignal._ = signal;
@@ -1894,7 +1888,7 @@ var RENDER_BODY_ID = prefix + (true ? "renderBody" : "b");
 // src/dom/compat.ts
 var classIdToBranch = /* @__PURE__ */ new Map();
 var compat = {
-  patchConditionals,
+  patchConditionals: patchDynamicTag,
   queueEffect,
   init(warp10Noop) {
     register(SET_SCOPE_REGISTER_ID, (branch) => {
@@ -2064,7 +2058,6 @@ export {
   compat,
   conditional,
   conditionalClosure,
-  conditionalOnlyChild,
   controllable_detailsOrDialog_open,
   controllable_detailsOrDialog_open_effect,
   controllable_input_checked,
@@ -2082,6 +2075,7 @@ export {
   createTemplate,
   data,
   dynamicClosure,
+  dynamicTag,
   dynamicTagAttrs,
   effect,
   forIn,

package/dist/dom/compat.d.ts

@@ -1,8 +1,8 @@
-import { patchConditionals } from "./control-flow";
+import { patchDynamicTag } from "./control-flow";
 import { queueEffect } from "./queue";
 import { type Renderer } from "./renderer";
 export declare const compat: {
-    patchConditionals: typeof patchConditionals;
+    patchConditionals: typeof patchDynamicTag;
     queueEffect: typeof queueEffect;
     init(warp10Noop: any): void;
     registerRenderer(fn: any): void;

package/dist/dom/control-flow.d.ts

@@ -1,11 +1,10 @@
 import { type Accessor, type BranchScope, type Scope } from "../common/types";
 import { type Renderer } from "./renderer";
 import { type Signal, type SignalOp } from "./signals";
-export declare function patchConditionals(fn: <T extends typeof conditional | typeof conditionalOnlyChild>(cond: T) => T): void;
-export declare let conditional: (nodeAccessor: Accessor, fn?: ((scope: Scope) => void) | 0, getIntersection?: () => Signal<never>) => Signal<Renderer | string | undefined>;
-export declare function setConditionalRenderer(scope: Scope, nodeAccessor: Accessor, newRenderer: Renderer | string | undefined): void;
-export declare let conditionalOnlyChild: (nodeAccessor: Accessor, fn?: ((scope: Scope) => void) | 0, getIntersection?: () => Signal<never>) => Signal<Renderer | string | undefined>;
-export declare function setConditionalRendererOnlyChild(scope: Scope, nodeAccessor: Accessor, newRenderer: Renderer | string | undefined): void;
+export declare function conditional(nodeAccessor: Accessor, ...branches: Renderer[]): Signal<number>;
+export declare function patchDynamicTag(fn: <T extends typeof dynamicTag>(cond: T) => T): void;
+export declare let dynamicTag: (nodeAccessor: Accessor, fn?: ((scope: Scope) => void) | 0, getIntersection?: () => Signal<never>) => Signal<Renderer | string | undefined>;
+export declare function setConditionalRendererOnlyChild<T>(scope: Scope, nodeAccessor: Accessor, newRenderer: T, createBranch: (renderer: NonNullable<T>, $global: Scope["$global"], parentScope: Scope, parentNode: ParentNode) => BranchScope): void;
 export declare const emptyMarkerArray: BranchScope[];
 export declare function loopOf(nodeAccessor: Accessor, renderer: Renderer): (scope: Scope, valueOrOp: SignalOp | [all: unknown[], by?: ((item: unknown, index: number) => unknown) | undefined]) => void;
 export declare function loopIn(nodeAccessor: Accessor, renderer: Renderer): (scope: Scope, valueOrOp: SignalOp | [obj: {}, by?: ((key: string, v: unknown) => unknown) | undefined]) => void;

package/dist/dom/signals.d.ts

@@ -1,5 +1,4 @@
 import { type Accessor, type Scope } from "../common/types";
-import type { Renderer } from "./renderer";
 export declare const MARK: unique symbol;
 export declare const CLEAN: unique symbol;
 export declare const DIRTY: unique symbol;
@@ -13,7 +12,7 @@ export declare function value<T>(valueAccessor: Accessor, fn: SignalFn<T> | 0, g
 export declare function intersection(count: number, fn: SignalFn<never>, getIntersection?: () => Signal<never>): Signal<never>;
 export declare function closure<T>(fn: SignalFn<T> | 0, getIntersection?: () => Signal<never>): Signal<T>;
 export declare function loopClosure<T>(ownerLoopNodeAccessor: Accessor, fn: SignalFn<T> | 0, getIntersection?: () => Signal<never>): SignalFn<T>;
-export declare function conditionalClosure<T>(ownerConditionalNodeAccessor: Accessor, getRenderer: () => Renderer, fn: SignalFn<T> | 0, getIntersection?: () => Signal<never>): SignalFn<T>;
+export declare function conditionalClosure<T>(ownerConditionalNodeAccessor: Accessor, branch: number, fn: SignalFn<T> | 0, getIntersection?: () => Signal<never>): SignalFn<T>;
 export declare function dynamicClosure<T>(fn: Signal<T> | 0, getOwnerScope?: (scope: Scope) => Scope, getIntersection?: () => Signal<never>): SignalFn<T>;
 export declare function setTagVar(scope: Scope, childAccessor: Accessor, tagVarSignal: Signal<unknown>): void;
 export declare const tagVarSignal: (scope: Scope, valueOrOp: unknown | SignalOp) => any;

package/dist/dom.d.ts

@@ -2,7 +2,7 @@ export { attrTag, attrTags } from "./common/attr-tag";
 export { forIn, forOf, forTo } from "./common/for";
 export { getAbortSignal, resetAbortSignal } from "./dom/abort-signal";
 export { compat } from "./dom/compat";
-export { conditional, conditionalOnlyChild, loopIn, loopOf, loopTo, } from "./dom/control-flow";
+export { conditional, dynamicTag, loopIn, loopOf, loopTo, } from "./dom/control-flow";
 export { controllable_detailsOrDialog_open, controllable_detailsOrDialog_open_effect, controllable_input_checked, controllable_input_checked_effect, controllable_input_checkedValue, controllable_input_checkedValue_effect, controllable_input_value, controllable_input_value_effect, controllable_select_value, controllable_select_value_effect, controllable_textarea_value, controllable_textarea_value_effect, } from "./dom/controllable";
 export { attr, attrs, attrsEvents, classAttr, data, html, lifecycle, partialAttrs, props, styleAttr, textContent, } from "./dom/dom";
 export { on } from "./dom/event";