marko 6.0.158 → 6.0.159

package/dist/debug/dom.js

@@ -549,6 +549,9 @@ function _const(valueAccessor, fn) {
   };
 }
 function _or(id, fn, defaultPending = 1, scopeIdAccessor = "#Id" /* Id */) {
+  if (false) {
+    scopeIdAccessor = decodeAccessor(scopeIdAccessor);
+  }
   return (scope) => {
     if (scope["#Creating" /* Creating */]) {
       if (id in scope) {

package/dist/debug/dom.mjs

@@ -433,6 +433,9 @@ function _const(valueAccessor, fn) {
   };
 }
 function _or(id, fn, defaultPending = 1, scopeIdAccessor = "#Id" /* Id */) {
+  if (false) {
+    scopeIdAccessor = decodeAccessor(scopeIdAccessor);
+  }
   return (scope) => {
     if (scope["#Creating" /* Creating */]) {
       if (id in scope) {

package/dist/dom/signals.d.ts

@@ -5,7 +5,7 @@ export type Signal<T> = ((scope: Scope, value: T) => void) & {
 };
 export declare function _let<T>(id: EncodedAccessor, fn?: SignalFn): (scope: Scope, value: T, valueChange?: (v: T) => void) => T;
 export declare function _const<T>(valueAccessor: EncodedAccessor, fn?: SignalFn): Signal<T>;
-export declare function _or(id: number, fn: SignalFn, defaultPending?: number, scopeIdAccessor?: Accessor): Signal<never>;
+export declare function _or(id: number, fn: SignalFn, defaultPending?: number, scopeIdAccessor?: EncodedAccessor): Signal<never>;
 export declare function _for_closure(ownerLoopNodeAccessor: EncodedAccessor, fn: SignalFn): SignalFn;
 export declare function _if_closure(ownerConditionalNodeAccessor: EncodedAccessor, branch: number, fn: SignalFn): SignalFn;
 export declare function subscribeToScopeSet(ownerScope: Scope, accessor: Accessor, scope: Scope): void;

package/dist/dom.js

@@ -341,7 +341,7 @@ function _const(valueAccessor, fn) {
   };
 }
 function _or(id, fn, defaultPending = 1, scopeIdAccessor = "L" /* Id */) {
-  return (scope) => {
+  return scopeIdAccessor !== "L" /* Id */ && (scopeIdAccessor = decodeAccessor(scopeIdAccessor)), (scope) => {
     scope.H ? id in scope ? --scope[id] || fn(scope) : scope[id] = defaultPending : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
   };
 }

package/dist/dom.mjs

@@ -228,7 +228,7 @@ function _const(valueAccessor, fn) {
   };
 }
 function _or(id, fn, defaultPending = 1, scopeIdAccessor = "L" /* Id */) {
-  return (scope) => {
+  return scopeIdAccessor !== "L" /* Id */ && (scopeIdAccessor = decodeAccessor(scopeIdAccessor)), (scope) => {
     scope.H ? id in scope ? --scope[id] || fn(scope) : scope[id] = defaultPending : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
   };
 }

package/dist/translator/index.js

@@ -1760,6 +1760,7 @@ function startSection(path7) {
       serializeReason: void 0,
       serializeReasons: /* @__PURE__ */ new Map(),
       paramReasonGroups: void 0,
+      returnValueExpr: void 0,
       returnSerializeReason: void 0,
       content: getContentInfo(path7),
       upstreamExpression: void 0,
@@ -2310,17 +2311,6 @@ var entry_builder_default = {
   }
 };
 
-// src/translator/util/get-known-attr-values.ts
-function getKnownAttrValues(tag) {
-  const attrs = {};
-  for (const attr of tag.attributes) {
-    if (attr.type === "MarkoAttribute") {
-      attrs[attr.name] = attr.value;
-    }
-  }
-  return attrs;
-}
-
 // src/translator/util/runtime.ts
 var import_compiler11 = require("@marko/compiler");
 var import_babel_utils13 = require("@marko/compiler/babel-utils");
@@ -2637,6 +2627,17 @@ var import_babel_utils15 = require("@marko/compiler/babel-utils");
 var import_compiler17 = require("@marko/compiler");
 var import_babel_utils14 = require("@marko/compiler/babel-utils");
 
+// src/translator/util/get-known-attr-values.ts
+function getKnownAttrValues(tag) {
+  const attrs = {};
+  for (const attr of tag.attributes) {
+    if (attr.type === "MarkoAttribute") {
+      attrs[attr.name] = attr.value;
+    }
+  }
+  return attrs;
+}
+
 // src/translator/util/plugin-hooks.ts
 var import_compiler12 = require("@marko/compiler");
 function enter(modulePlugin, path7) {
@@ -3115,7 +3116,6 @@ function unwrapWrite(write) {
 }
 
 // src/translator/core/return.ts
-var tagsWithReturn = /* @__PURE__ */ new WeakSet();
 var [getSectionReturnValueIdentifier, setReturnValueIdentifier] = createSectionState("returnValue");
 var return_default = {
   analyze(tag) {
@@ -3136,12 +3136,11 @@ var return_default = {
         );
       }
     }
-    if (tagsWithReturn.has(tag.parentPath)) {
+    const section = getOrCreateSection(tag);
+    if (section.returnValueExpr) {
       throw tag.get("name").buildCodeFrameError(
         `Cannot have multiple [\`<return>\` tags](https://markojs.com/docs/reference/core-tag#return) ${tag.parent.type === "Program" ? "for the template" : "within a tag's body content"}.`
       );
-    } else {
-      tagsWithReturn.add(tag.parentPath);
     }
     const attrs = getKnownAttrValues(tag.node);
     if (!attrs.value) {
@@ -3151,12 +3150,9 @@ var return_default = {
     }
     if (attrs.valueChange) {
       (attrs.valueChange.extra ??= {}).isEffect = true;
-      addSerializeReason(
-        getOrCreateSection(tag),
-        true,
-        getAccessorProp().TagVariableChange
-      );
+      addSerializeReason(section, true, getAccessorProp().TagVariableChange);
     }
+    section.returnValueExpr = attrs.value.extra ??= {};
   },
   translate: translateByTarget({
     html: {
@@ -5311,15 +5307,6 @@ var program_default = {
         setup: generateUid("setup"),
         params: void 0
       };
-      for (const child of program.get("body")) {
-        if (isCoreTagName(child, "return")) {
-          const { value } = getKnownAttrValues(child.node);
-          if (value) {
-            programExtra.returnValueExpr = value.extra ??= {};
-          }
-          break;
-        }
-      }
     },
     exit(program) {
       finalizeReferences();
@@ -7504,14 +7491,6 @@ function knownTagAnalyze(tag, contentSection, propTree) {
   setTagDownstream(tag, propTree?.props?.[0]?.binding);
   tagExtra[kContentSection] = contentSection;
   const varBinding = trackVarReferences(tag, 5 /* derived */);
-  const mutatesTagVar = !!(tag.node.var?.type === "Identifier" && tag.scope.getBinding(tag.node.var.name)?.constantViolations.length);
-  if (varBinding) {
-    varBinding.scopeOffset = tagExtra[kChildOffsetScopeBinding] = createBinding(
-      "#scopeOffset",
-      0 /* dom */,
-      section
-    );
-  }
   const exprs = tagExtra[kKnownExprs] = analyzeParams(
     tagExtra,
     section,
@@ -7520,10 +7499,15 @@ function knownTagAnalyze(tag, contentSection, propTree) {
     attrExprs
   );
   if (varBinding) {
-    const { returnSerializeReason } = contentSection;
-    const varExpr = mapParamReasonToExpr(
+    const mutatesTagVar = !!(tag.node.var.type === "Identifier" && tag.scope.getBinding(tag.node.var.name)?.constantViolations.length);
+    const varExpr = tagExtra.defineBodySection ? contentSection.returnValueExpr : mapParamReasonToExpr(
       exprs,
-      returnSerializeReason && (returnSerializeReason === true || !!returnSerializeReason.state || returnSerializeReason.param)
+      contentSection.returnSerializeReason && (contentSection.returnSerializeReason === true || !!contentSection.returnSerializeReason.state || contentSection.returnSerializeReason.param)
+    );
+    varBinding.scopeOffset = tagExtra[kChildOffsetScopeBinding] = createBinding(
+      "#scopeOffset",
+      0 /* dom */,
+      section
     );
     setBindingDownstream(varBinding, varExpr);
     addSerializeExpr(section, mutatesTagVar || varExpr, childScopeBinding);
@@ -7691,7 +7675,7 @@ function finalizeKnownTags(section) {
     const scopeBinding = tagExtra[kChildScopeBinding];
     const knownExprs = tagExtra[kKnownExprs];
     const contentSection = tagExtra[kContentSection];
-    if (knownExprs && scopeBinding && contentSection?.paramReasonGroups) {
+    if (knownExprs && scopeBinding && contentSection.paramReasonGroups) {
       for (const group of contentSection.paramReasonGroups) {
         addSerializeReason(
           section,
@@ -9382,10 +9366,10 @@ function finalizeReferences() {
       });
     }
   });
-  const programExtra = (0, import_babel_utils27.getProgram)().node.extra;
-  if (programExtra.returnValueExpr) {
-    programExtra.section.returnSerializeReason = getSerializeSourcesForExpr(
-      programExtra.returnValueExpr
+  const programSection = (0, import_babel_utils27.getProgram)().node.extra.section;
+  if (programSection.returnValueExpr) {
+    programSection.returnSerializeReason = getSerializeSourcesForExpr(
+      programSection.returnValueExpr
     );
   }
   readsByExpression.clear();
@@ -10095,7 +10079,7 @@ function getAllSerializeReasonsForExtra(extra) {
   let reason = serializeReasonCache.get(extra);
   if (reason === false) return;
   if (reason === void 0) {
-    if (extra === (0, import_babel_utils27.getProgram)().node.extra?.returnValueExpr) {
+    if (extra === (0, import_babel_utils27.getProgram)().node.extra?.section.returnValueExpr) {
       reason = true;
     } else {
       serializeReasonCache.set(extra, false);

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

@@ -38,6 +38,7 @@ export interface Section {
     serializeReason: undefined | SerializeReason;
     serializeReasons: Map<symbol, SerializeReason>;
     paramReasonGroups: ParamSerializeReasonGroups | undefined;
+    returnValueExpr: t.NodeExtra | undefined;
     returnSerializeReason: SerializeReason | undefined;
     isHoistThrough: true | undefined;
     upstreamExpression: t.NodeExtra | undefined;

package/dist/translator/visitors/program/index.d.ts

@@ -16,7 +16,6 @@ export declare function isScopeIdentifier(node: t.Node): node is t.Identifier;
 export type TemplateExports = BindingPropTree["props"];
 declare module "@marko/compiler/dist/types" {
     interface ProgramExtra {
-        returnValueExpr?: t.NodeExtra;
         domExports?: {
             template: string;
             walks: string;

package/package.json

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