marko 6.0.12 → 6.0.14

package/dist/debug/dom.js

@@ -1338,7 +1338,7 @@ function createContent(id, template, walks, setup, params, closures, dynamicScop
   walks = walks ? walks.replace(/[^\0-1]+$/, "") : "";
   setup ||= void 0;
   params ||= void 0;
-  closures ||= void 0;
+  closures = closures ? closures._ || closures : void 0;
   const clone = template ? (branch, ns) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
@@ -1507,7 +1507,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
   const loopScopeAccessor = "LoopScopeArray:" /* LoopScopeArray */ + ownerLoopNodeAccessor;
   const loopScopeMapAccessor = "LoopScopeMap:" /* LoopScopeMap */ + ownerLoopNodeAccessor;
   const ownerSignal = (ownerScope) => {
-    const scopes = ownerScope[loopScopeAccessor] || ownerScope[loopScopeMapAccessor]?.values() || [];
+    const scopes = ownerScope[loopScopeAccessor] ||= ownerScope[loopScopeMapAccessor] ? [...ownerScope[loopScopeMapAccessor].values()] : [];
     const [firstScope] = scopes;
     if (firstScope) {
       queueRender(

package/dist/debug/dom.mjs

@@ -1246,7 +1246,7 @@ function createContent(id, template, walks, setup, params, closures, dynamicScop
   walks = walks ? walks.replace(/[^\0-1]+$/, "") : "";
   setup ||= void 0;
   params ||= void 0;
-  closures ||= void 0;
+  closures = closures ? closures._ || closures : void 0;
   const clone = template ? (branch, ns) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
@@ -1415,7 +1415,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
   const loopScopeAccessor = "LoopScopeArray:" /* LoopScopeArray */ + ownerLoopNodeAccessor;
   const loopScopeMapAccessor = "LoopScopeMap:" /* LoopScopeMap */ + ownerLoopNodeAccessor;
   const ownerSignal = (ownerScope) => {
-    const scopes = ownerScope[loopScopeAccessor] || ownerScope[loopScopeMapAccessor]?.values() || [];
+    const scopes = ownerScope[loopScopeAccessor] ||= ownerScope[loopScopeMapAccessor] ? [...ownerScope[loopScopeMapAccessor].values()] : [];
     const [firstScope] = scopes;
     if (firstScope) {
       queueRender(

package/dist/dom/renderer.d.ts

@@ -13,7 +13,13 @@ type SetupFn = (scope: Scope) => void;
 export declare function createBranch($global: Scope["$global"], renderer: Renderer | string, parentScope: Scope | undefined, parentNode: ParentNode): BranchScope;
 export declare function createAndSetupBranch($global: Scope["$global"], renderer: Renderer, parentScope: Scope | undefined, parentNode: ParentNode): BranchScope;
 export declare function setupBranch(renderer: Renderer, branch: BranchScope): BranchScope;
-export declare function createContent(id: string, template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0, closures?: Signal<unknown> | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
-export declare function registerContent(id: string, template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0, closures?: Signal<unknown> | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
-export declare function createRenderer(template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0, closures?: Signal<unknown> | 0): Renderer;
+export declare function createContent(id: string, template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0, closures?: {
+    _: Signal<unknown>;
+} | Signal<unknown> | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
+export declare function registerContent(id: string, template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0, closures?: {
+    _: Signal<unknown>;
+} | Signal<unknown> | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
+export declare function createRenderer(template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0, closures?: {
+    _: Signal<unknown>;
+} | Signal<unknown> | 0): Renderer;
 export {};

package/dist/dom.js

@@ -884,7 +884,7 @@ function setupBranch(renderer, branch) {
   ), branch;
 }
 function createContent(id, template, walks, setup, params, closures, dynamicScopesAccessor) {
-  walks = walks ? walks.replace(/[^\0-1]+$/, "") : "", setup ||= void 0, params ||= void 0, closures ||= void 0;
+  walks = walks ? walks.replace(/[^\0-1]+$/, "") : "", setup ||= void 0, params ||= void 0, closures = closures ? closures._ || closures : void 0;
   let clone = template ? (branch, ns) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
@@ -980,7 +980,7 @@ function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__
 }
 function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
   let childSignal = closure(valueAccessor, fn), loopScopeAccessor = "l" /* LoopScopeArray */ + ownerLoopNodeAccessor, loopScopeMapAccessor = "m" /* LoopScopeMap */ + ownerLoopNodeAccessor, ownerSignal = (ownerScope) => {
-    let scopes = ownerScope[loopScopeAccessor] || ownerScope[loopScopeMapAccessor]?.values() || [], [firstScope] = scopes;
+    let scopes = ownerScope[loopScopeAccessor] ||= ownerScope[loopScopeMapAccessor] ? [...ownerScope[loopScopeMapAccessor].values()] : [], [firstScope] = scopes;
     firstScope && queueRender(
       ownerScope,
       () => {

package/dist/dom.mjs

@@ -795,7 +795,7 @@ function setupBranch(renderer, branch) {
   ), branch;
 }
 function createContent(id, template, walks, setup, params, closures, dynamicScopesAccessor) {
-  walks = walks ? walks.replace(/[^\0-1]+$/, "") : "", setup ||= void 0, params ||= void 0, closures ||= void 0;
+  walks = walks ? walks.replace(/[^\0-1]+$/, "") : "", setup ||= void 0, params ||= void 0, closures = closures ? closures._ || closures : void 0;
   let clone = template ? (branch, ns) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
@@ -891,7 +891,7 @@ function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__
 }
 function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
   let childSignal = closure(valueAccessor, fn), loopScopeAccessor = "l" /* LoopScopeArray */ + ownerLoopNodeAccessor, loopScopeMapAccessor = "m" /* LoopScopeMap */ + ownerLoopNodeAccessor, ownerSignal = (ownerScope) => {
-    let scopes = ownerScope[loopScopeAccessor] || ownerScope[loopScopeMapAccessor]?.values() || [], [firstScope] = scopes;
+    let scopes = ownerScope[loopScopeAccessor] ||= ownerScope[loopScopeMapAccessor] ? [...ownerScope[loopScopeMapAccessor].values()] : [], [firstScope] = scopes;
     firstScope && queueRender(
       ownerScope,
       () => {

package/dist/translator/index.js

@@ -3203,7 +3203,9 @@ function getSignalFn(signal) {
   }
   forEach(signal.intersection, (intersection) => {
     signal.render.push(
-      import_compiler20.types.expressionStatement(import_compiler20.types.callExpression(intersection, [scopeIdentifier]))
+      import_compiler20.types.expressionStatement(
+        import_compiler20.types.callExpression(intersection.identifier, [scopeIdentifier])
+      )
     );
   });
   if (isValue && binding.sources) {
@@ -3310,10 +3312,7 @@ function subscribe(provider, subscriber) {
     return;
   }
   const providerSignal = getSignal(subscriber.section, provider);
-  providerSignal.intersection = push(
-    providerSignal.intersection,
-    subscriber.identifier
-  );
+  providerSignal.intersection = push(providerSignal.intersection, subscriber);
 }
 function generateSignalName(referencedBindings) {
   let name2;
@@ -3436,56 +3435,20 @@ function getRegisterUID(section, name2) {
   return id;
 }
 function writeSignals(section) {
-  forEach(section.hoisted, (binding) => {
-    for (const hoistedBinding of binding.hoists.values()) {
-      const accessors = [
-        binding.type === 0 /* dom */ ? import_compiler20.types.stringLiteral(
-          getAccessorPrefix().Getter + getScopeAccessor(binding)
-        ) : getScopeAccessorLiteral(binding)
-      ];
-      let currentSection = section;
-      while (currentSection && currentSection !== hoistedBinding.section) {
-        const parentSection = currentSection.parent;
-        if (parentSection) {
-          accessors.push(getSectionInstancesAccessorLiteral(currentSection));
-        }
-        currentSection = parentSection;
-      }
-      const hoistIdentifier = getHoistFunctionIdentifier(hoistedBinding);
-      (0, import_babel_utils14.getProgram)().node.body.push(
-        import_compiler20.types.variableDeclaration("const", [
-          import_compiler20.types.variableDeclarator(
-            hoistIdentifier,
-            hoistedBinding.downstreamExpressions.size ? callRuntime(
-              "register",
-              import_compiler20.types.stringLiteral(
-                getResumeRegisterId(
-                  hoistedBinding.section,
-                  hoistedBinding,
-                  "hoist"
-                )
-              ),
-              callRuntime("hoist", ...accessors)
-            ) : callRuntime("hoist", ...accessors)
-          )
-        ])
-      );
-      if (hoistedBinding.downstreamExpressions.size) {
-        addValue(
-          hoistedBinding.section,
-          void 0,
-          initValue(hoistedBinding),
-          import_compiler20.types.callExpression(hoistIdentifier, [scopeIdentifier])
-        );
-      }
-    }
-  });
-  const signals = [...getSignals(section).values()].sort(sortSignals);
-  for (const signal of signals) {
-    traverseReplace(signal, "render", replaceRenderNode);
+  const seen = /* @__PURE__ */ new Set();
+  writeHoists(section);
+  for (const signal of getSignals(section).values()) {
+    writeSignal(signal);
+  }
+  function writeSignal(signal) {
+    if (seen.has(signal)) return;
+    seen.add(signal);
     for (const value2 of signal.values) {
+      writeSignal(value2.signal);
       traverseReplace(value2, "value", replaceRenderNode);
     }
+    forEach(signal.intersection, writeSignal);
+    traverseReplace(signal, "render", replaceRenderNode);
     let effectDeclarator;
     if (signal.effect.length) {
       traverseReplace(signal, "effect", replaceEffectNode);
@@ -3519,7 +3482,7 @@ function writeSignals(section) {
       // This ignores writing out those signals in that case.
       signal.referencedBindings && !Array.isArray(signal.referencedBindings) && signal.referencedBindings.upstreamAlias && !signal.referencedBindings.property && import_compiler20.types.isFunction(value) && import_compiler20.types.isBlockStatement(value.body) && !value.body.body.length
     ) {
-      continue;
+      return;
     }
     if (import_compiler20.types.isCallExpression(value)) {
       replaceNullishAndEmptyFunctionsWith0(value.arguments);
@@ -3550,6 +3513,52 @@ function writeSignals(section) {
     (0, import_babel_utils14.getProgram)().node.body.push(...signalStatements);
   }
 }
+function writeHoists(section) {
+  forEach(section.hoisted, (binding) => {
+    for (const hoistedBinding of binding.hoists.values()) {
+      const accessors = [
+        binding.type === 0 /* dom */ ? import_compiler20.types.stringLiteral(
+          getAccessorPrefix().Getter + getScopeAccessor(binding)
+        ) : getScopeAccessorLiteral(binding)
+      ];
+      let currentSection = section;
+      while (currentSection && currentSection !== hoistedBinding.section) {
+        const parentSection = currentSection.parent;
+        if (parentSection) {
+          accessors.push(getSectionInstancesAccessorLiteral(currentSection));
+        }
+        currentSection = parentSection;
+      }
+      const hoistIdentifier = getHoistFunctionIdentifier(hoistedBinding);
+      (0, import_babel_utils14.getProgram)().node.body.push(
+        import_compiler20.types.variableDeclaration("const", [
+          import_compiler20.types.variableDeclarator(
+            hoistIdentifier,
+            hoistedBinding.downstreamExpressions.size ? callRuntime(
+              "register",
+              import_compiler20.types.stringLiteral(
+                getResumeRegisterId(
+                  hoistedBinding.section,
+                  hoistedBinding,
+                  "hoist"
+                )
+              ),
+              callRuntime("hoist", ...accessors)
+            ) : callRuntime("hoist", ...accessors)
+          )
+        ])
+      );
+      if (hoistedBinding.downstreamExpressions.size) {
+        addValue(
+          hoistedBinding.section,
+          void 0,
+          initValue(hoistedBinding),
+          import_compiler20.types.callExpression(hoistIdentifier, [scopeIdentifier])
+        );
+      }
+    }
+  });
+}
 function writeRegisteredFns() {
   const registeredFns = registeredFnsForProgram.get((0, import_babel_utils14.getProgram)().node);
   const statements = [];
@@ -3608,27 +3617,6 @@ function toReturnedFunction(rawFn) {
   const fn = simplifyFunction(rawFn);
   return fn.type === "FunctionDeclaration" ? [fn, import_compiler20.types.returnStatement(fn.id)] : [import_compiler20.types.returnStatement(fn)];
 }
-function sortSignals(a, b) {
-  const aReferencedBindings = getReferencedBindings(a);
-  const bReferencedBindings = getReferencedBindings(b);
-  for (let i = Math.max(aReferencedBindings.length, bReferencedBindings.length) - 1; i >= 0; i--) {
-    const diff = (bReferencedBindings[i] ?? -1) - (aReferencedBindings[i] ?? -1);
-    if (diff !== 0) return diff;
-  }
-  return 0;
-}
-function getReferencedBindings({ referencedBindings: reserve }) {
-  if (!reserve) {
-    return [];
-  } else if (Array.isArray(reserve)) {
-    return reserve.map(getMappedId).sort();
-  } else {
-    return [getMappedId(reserve)];
-  }
-}
-function getMappedId(reference) {
-  return (reference.type === 0 /* dom */ ? 1 : 0) * 1e4 + reference.id;
-}
 function addHTMLEffectCall(section, referencedBindings) {
   addStatement("effect", section, referencedBindings, void 0, false);
 }
@@ -4052,7 +4040,7 @@ var dom_default = {
           const tagParamsSignal = childSection.params && initValue(childSection.params);
           const { walks: walks2, writes: writes2, setup: setup2 } = getSectionMeta(childSection);
           const identifier = import_compiler21.types.identifier(childSection.name);
-          const referencedClosures = childSection.referencedClosures ? import_compiler21.types.arrowFunctionExpression(
+          const referencedClosures = childSection.referencedClosures ? Array.isArray(childSection.referencedClosures) ? import_compiler21.types.arrowFunctionExpression(
             [scopeIdentifier],
             toFirstExpressionOrBlock(
               toArray(childSection.referencedClosures, (closure) => {
@@ -4068,7 +4056,7 @@ var dom_default = {
                 );
               })
             )
-          ) : void 0;
+          ) : getSignal(childSection, childSection.referencedClosures).identifier : void 0;
           const renderer = getSectionParentIsOwner(childSection) ? callRuntime(
             "createRenderer",
             ...replaceNullishAndEmptyFunctionsWith0([
@@ -4684,7 +4672,7 @@ function mergeReferences(section, target, nodes) {
   return targetExtra;
 }
 function compareReferences(a, b) {
-  return a === b ? 0 : Array.isArray(a) ? Array.isArray(b) ? compareIntersections(a, b) : -1 : Array.isArray(b) ? 1 : bindingUtil.compare(a, b);
+  return a === b ? 0 : a ? b ? Array.isArray(a) ? Array.isArray(b) ? compareIntersections(a, b) : -1 : Array.isArray(b) ? 1 : bindingUtil.compare(a, b) : 1 : b ? -1 : 0;
 }
 function compareIntersections(a, b) {
   const len = a.length;

package/dist/translator/util/references.d.ts

@@ -1,5 +1,5 @@
 import { types as t } from "@marko/compiler";
-import { type Many, type OneMany, type Opt, Sorted } from "./optional";
+import { type Many, type Opt, Sorted } from "./optional";
 import { type Section } from "./sections";
 declare const kIsInvoked: unique symbol;
 export declare const kBranchSerializeReason: unique symbol;
@@ -74,7 +74,7 @@ export declare function trackParamsReferences(body: t.NodePath<t.MarkoTagBody |
 export declare function trackHoistedReference(referencePath: t.NodePath<t.Identifier>, binding: Binding): void;
 export declare function setReferencesScope(path: t.NodePath<any>): void;
 export declare function mergeReferences<T extends t.Node>(section: Section, target: T, nodes: (t.Node | undefined)[]): NonNullable<T["extra"]>;
-export declare function compareReferences(a: OneMany<Binding>, b: OneMany<Binding>): number;
+export declare function compareReferences(a: ReferencedBindings, b: ReferencedBindings): number;
 export declare function finalizeReferences(): void;
 export declare const intersectionMeta: WeakMap<Intersection, {
     id: number;

package/dist/translator/util/signals.d.ts

@@ -14,7 +14,7 @@ export type Signal = {
         signal: Signal;
         value: t.Expression;
     }>;
-    intersection: Opt<t.Expression>;
+    intersection: Opt<Signal>;
     render: t.Statement[];
     renderReferencedBindings: ReferencedBindings;
     effect: t.Statement[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.12",
+  "version": "6.0.14",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",