marko 6.0.0-next.3.50 → 6.0.0-next.3.52

package/dist/common/types.d.ts

@@ -31,17 +31,16 @@ export declare enum ResumeSymbol {
     ClosestBranch = "$"
 }
 export declare enum AccessorChar {
-    Dynamic = "?",
-    Mark = "#",
-    Subscribers = "*",
-    LifecycleAbortController = "-",
-    DynamicPlaceholderLastChild = "-",
-    TagVariable = "/",
-    TagVariableChange = "@",
+    ClosureScopes = "!",
+    ClosureSignalIndex = "(",
     ConditionalScope = "!",
     ConditionalRenderer = "(",
     LoopScopeArray = "!",
     LoopScopeMap = "(",
+    LifecycleAbortController = "-",
+    DynamicPlaceholderLastChild = "-",
+    TagVariable = "/",
+    TagVariableChange = "@",
     EventAttributes = "~",
     ControlledValue = ":",
     ControlledHandler = ";",

package/dist/debug/dom.js

@@ -46,6 +46,7 @@ __export(dom_exports, {
   createTemplate: () => createTemplate,
   data: () => data,
   dynamicClosure: () => dynamicClosure,
+  dynamicClosureRead: () => dynamicClosureRead,
   dynamicTag: () => dynamicTag,
   effect: () => effect,
   forIn: () => forIn,
@@ -69,7 +70,6 @@ __export(dom_exports, {
   register: () => register,
   registerBoundSignal: () => registerBoundSignal,
   registerContent: () => registerContent,
-  registerDynamicClosure: () => registerDynamicClosure,
   resetAbortSignal: () => resetAbortSignal,
   run: () => run,
   setTagVar: () => setTagVar,
@@ -1406,21 +1406,6 @@ function getDebugKey(index, node) {
 }
 
 // src/dom/renderer.ts
-function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentScope, parentNode) {
-  const branch = createBranch(
-    $global,
-    tagNameOrRenderer,
-    parentScope,
-    parentNode
-  );
-  if (typeof tagNameOrRenderer === "string") {
-    branch[true ? `#${tagNameOrRenderer}/0` : 0] = branch.___startNode = branch.___endNode = document.createElementNS(
-      tagNameOrRenderer === "svg" ? "http://www.w3.org/2000/svg" : tagNameOrRenderer === "math" ? "http://www.w3.org/1998/Math/MathML" : parentNode.namespaceURI,
-      tagNameOrRenderer
-    );
-  }
-  return branch;
-}
 function createBranch($global, renderer, parentScope, parentNode) {
   const branch = createScope($global);
   const parentBranch = parentScope?.___closestBranch;
@@ -1433,49 +1418,76 @@ function createBranch($global, renderer, parentScope, parentNode) {
   if (true) {
     branch.___renderer = renderer;
   }
-  renderer.___init?.(
+  renderer.___clone?.(
     branch,
     parentNode.namespaceURI
   );
   return branch;
 }
-function createContent(id, template, walks, setup, getArgs, dynamicScopesAccessor) {
+function createAndSetupBranch($global, renderer, parentScope, parentNode) {
+  return setupBranch(
+    renderer,
+    createBranch($global, renderer, parentScope, parentNode)
+  );
+}
+function setupBranch(renderer, branch) {
+  if (renderer.___setup || renderer.___closures) {
+    queueRender(
+      branch,
+      (branch2) => {
+        renderer.___setup?.(branch2);
+        renderer.___closures?.(branch2);
+      },
+      -1
+    );
+  }
+  return branch;
+}
+function createContent(id, template, walks, setup, params, closures, dynamicScopesAccessor) {
   walks = walks ? walks.replace(/[^\0-1]+$/, "") : "";
-  let args;
-  const init2 = template ? (branch, ns) => {
+  setup ||= void 0;
+  params ||= void 0;
+  closures ||= void 0;
+  const clone = template ? (branch, ns) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
       ns
     ))(branch, walks);
-    setup && queueRender(branch, setup, -1);
   } : (branch) => {
     walk(
       branch.___startNode = branch.___endNode = new Text(),
       walks,
       branch
     );
-    setup && queueRender(branch, setup, -1);
   };
   return (owner) => {
     return {
       ___id: id,
-      ___init: init2,
+      ___clone: clone,
       ___owner: owner,
-      ___accessor: dynamicScopesAccessor,
-      get ___args() {
-        return args ||= getArgs ? getArgs() : void 0;
-      }
+      ___setup: setup,
+      ___params: params,
+      ___closures: closures,
+      ___accessor: dynamicScopesAccessor
     };
   };
 }
-function registerContent(id, template, walks, setup, getArgs, dynamicScopesAccessor) {
+function registerContent(id, template, walks, setup, params, closures, dynamicScopesAccessor) {
   return register(
     id,
-    createContent(id, template, walks, setup, getArgs, dynamicScopesAccessor)
+    createContent(
+      id,
+      template,
+      walks,
+      setup,
+      params,
+      closures,
+      dynamicScopesAccessor
+    )
   );
 }
-function createRenderer(template, walks, setup, getArgs) {
-  return createContent("", template, walks, setup, getArgs)();
+function createRenderer(template, walks, setup, params, closures) {
+  return createContent("", template, walks, setup, params, closures)();
 }
 var cloneCache = {};
 function createCloneableHTML(html2, ns) {
@@ -1586,7 +1598,6 @@ function value(valueAccessor, fn = () => {
     }
   };
 }
-var accessorId = 0;
 function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "___id") {
   return (scope) => {
     if (scope.___pending) {
@@ -1649,34 +1660,39 @@ function subscribeToScopeSet(ownerScope, accessor, scope) {
     );
   }
 }
-function dynamicClosure(valueAccessor, fn, getOwnerScope) {
-  const subscribersAccessor = "?" /* Dynamic */ + accessorId++;
-  const childSignal = closure(valueAccessor, fn, getOwnerScope);
-  const ownerSignal = (ownerScope) => {
-    const subscribers = ownerScope[subscribersAccessor];
-    if (subscribers) {
-      for (const subscriber of subscribers) {
-        if (!subscriber.___pending) {
-          queueRender(subscriber, childSignal, -1);
+function dynamicClosure(...closureSignals) {
+  const [{ ___scopeInstancesAccessor, ___signalIndexAccessor }] = closureSignals;
+  for (let i = closureSignals.length; i--; ) {
+    closureSignals[i].___index = i;
+  }
+  return (scope) => {
+    if (scope[___scopeInstancesAccessor]) {
+      for (const childScope of scope[___scopeInstancesAccessor]) {
+        if (!childScope.___pending) {
+          queueRender(
+            childScope,
+            closureSignals[childScope[___signalIndexAccessor]],
+            -1
+          );
         }
       }
     }
   };
-  const subscribe = ownerSignal.___subscribe = (scope) => subscribeToScopeSet(
-    getOwnerScope ? getOwnerScope(scope) : scope._,
-    subscribersAccessor,
-    scope
-  );
-  ownerSignal._ = (scope) => {
+}
+function dynamicClosureRead(valueAccessor, fn, getOwnerScope) {
+  const childSignal = closure(valueAccessor, fn, getOwnerScope);
+  const closureSignal = (scope) => {
+    scope[closureSignal.___signalIndexAccessor] = closureSignal.___index;
     childSignal(scope);
-    subscribe(scope);
+    subscribeToScopeSet(
+      getOwnerScope ? getOwnerScope(scope) : scope._,
+      closureSignal.___scopeInstancesAccessor,
+      scope
+    );
   };
-  return ownerSignal;
-}
-function registerDynamicClosure(registryId, valueAccessor, fn, getOwnerScope) {
-  const signal = dynamicClosure(valueAccessor, fn, getOwnerScope);
-  register(registryId, signal.___subscribe);
-  return signal;
+  closureSignal.___scopeInstancesAccessor = valueAccessor + "!" /* ClosureScopes */;
+  closureSignal.___signalIndexAccessor = valueAccessor + "(" /* ClosureSignalIndex */;
+  return closureSignal;
 }
 function closure(valueAccessor, fn, getOwnerScope) {
   return (scope) => {
@@ -1733,7 +1749,7 @@ function conditional(nodeAccessor, ...branches) {
         scope,
         nodeAccessor,
         branches[scope[branchAccessor] = newBranch],
-        createBranch
+        createAndSetupBranch
       );
     }
   };
@@ -1763,7 +1779,7 @@ var dynamicTag = function dynamicTag2(nodeAccessor, getContent, getTagVar, input
             scope[childScopeAccessor],
             true ? `#${normalizedRenderer}/0` : 0,
             content,
-            createBranch
+            createAndSetupBranch
           );
           if (content.___accessor) {
             subscribeToScopeSet(
@@ -1789,9 +1805,9 @@ var dynamicTag = function dynamicTag2(nodeAccessor, getContent, getTagVar, input
           true ? `#${normalizedRenderer}/0` : 0,
           (inputIsArgs ? args[0] : args) || {}
         );
-      } else if (normalizedRenderer.___args) {
+      } else if (normalizedRenderer.___params) {
         if (inputIsArgs) {
-          normalizedRenderer.___args(
+          normalizedRenderer.___params(
             scope[childScopeAccessor],
             normalizedRenderer._ ? args[0] : args
           );
@@ -1800,7 +1816,7 @@ var dynamicTag = function dynamicTag2(nodeAccessor, getContent, getTagVar, input
             ...args,
             content: getContent(scope)
           } : args || {};
-          normalizedRenderer.___args(
+          normalizedRenderer.___params(
             scope[childScopeAccessor],
             normalizedRenderer._ ? inputWithContent : [inputWithContent]
           );
@@ -1865,7 +1881,7 @@ function loopTo(nodeAccessor, renderer) {
   );
 }
 function loop(nodeAccessor, renderer, forEach) {
-  const params = renderer.___args;
+  const params = renderer.___params;
   return (scope, value2) => {
     const referenceNode = scope[nodeAccessor];
     const oldMap = scope[nodeAccessor + "(" /* LoopScopeMap */];
@@ -1876,7 +1892,7 @@ function loop(nodeAccessor, renderer, forEach) {
     const newMap = scope[nodeAccessor + "(" /* LoopScopeMap */] = /* @__PURE__ */ new Map();
     const newArray = scope[nodeAccessor + "!" /* LoopScopeArray */] = [];
     forEach(value2, (key, args) => {
-      const branch = oldMap?.get(key) || createBranch(scope.$global, renderer, scope, parentNode);
+      const branch = oldMap?.get(key) || createAndSetupBranch(scope.$global, renderer, scope, parentNode);
       params?.(branch, args);
       newMap.set(key, branch);
       newArray.push(branch);
@@ -1896,6 +1912,23 @@ function loop(nodeAccessor, renderer, forEach) {
     reconcile(parentNode, oldArray, newArray, afterReference);
   };
 }
+function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentScope, parentNode) {
+  const branch = createBranch(
+    $global,
+    tagNameOrRenderer,
+    parentScope,
+    parentNode
+  );
+  if (typeof tagNameOrRenderer === "string") {
+    branch[true ? `#${tagNameOrRenderer}/0` : 0] = branch.___startNode = branch.___endNode = document.createElementNS(
+      tagNameOrRenderer === "svg" ? "http://www.w3.org/2000/svg" : tagNameOrRenderer === "math" ? "http://www.w3.org/1998/Math/MathML" : parentNode.namespaceURI,
+      tagNameOrRenderer
+    );
+  } else {
+    setupBranch(tagNameOrRenderer, branch);
+  }
+  return branch;
+}
 function bySecondArg(_item, index) {
   return index;
 }
@@ -1918,7 +1951,7 @@ var compat = {
     register(RENDERER_REGISTER_ID, fn);
   },
   isRenderer(renderer) {
-    return renderer.___init;
+    return renderer.___clone;
   },
   getStartNode(branch) {
     return branch.___startNode;
@@ -1947,9 +1980,9 @@ var compat = {
     }
     return value2;
   },
-  createRenderer(args, clone) {
-    const renderer = createRenderer(0, 0, 0, () => args);
-    renderer.___init = (branch) => {
+  createRenderer(params, clone) {
+    const renderer = createRenderer(0, 0, 0, params);
+    renderer.___clone = (branch) => {
       const cloned = clone();
       branch.___startNode = cloned.startNode;
       branch.___endNode = cloned.endNode;
@@ -1976,7 +2009,7 @@ var compat = {
     component.effects = prepareEffects(() => {
       if (!branch) {
         out.global.___nextScopeId ||= 0;
-        branch = component.scope = createBranch(
+        branch = component.scope = createAndSetupBranch(
           out.global,
           renderer,
           renderer.___owner,
@@ -1985,7 +2018,7 @@ var compat = {
       } else {
         existing = true;
       }
-      renderer.___args?.(branch, renderer._ ? args[0] : args);
+      renderer.___params?.(branch, renderer._ ? args[0] : args);
     });
     if (!existing) {
       return toInsertNode(branch.___startNode, branch.___endNode);
@@ -2000,7 +2033,7 @@ var createTemplate = (id, template, walks, setup, inputSignal) => {
     template,
     walks,
     setup,
-    inputSignal && (() => inputSignal)
+    inputSignal
   )();
   renderer.mount = mount;
   renderer._ = renderer;
@@ -2046,7 +2079,7 @@ function mount(input = {}, reference, position) {
       nextSibling = reference.nextSibling;
       break;
   }
-  const args = this.___args;
+  const args = this.___params;
   const effects = prepareEffects(() => {
     branch = createBranch(
       $global,
@@ -2054,6 +2087,7 @@ function mount(input = {}, reference, position) {
       void 0,
       parentNode
     );
+    this.___setup?.(branch);
     args?.(branch, input);
   });
   insertChildNodes(