marko 6.0.0-next.3.30 → 6.0.0-next.3.32

package/dist/translator/index.js

@@ -1102,6 +1102,7 @@ function startSection(path5) {
       params: void 0,
       closures: void 0,
       bindings: void 0,
+      assignments: void 0,
       content: getContentInfo(path5),
       upstreamExpression: void 0,
       hasAbortSignal: false,
@@ -2512,6 +2513,18 @@ function writeHTMLResumeStatements(path5, tagVarIdentifier) {
   if (!section) return;
   const allSignals = Array.from(getSignals(section).values());
   const scopeIdIdentifier = getScopeIdIdentifier(section);
+  forEach(section.assignments, (assignment) => {
+    let currentSection = section;
+    while (currentSection !== assignment.section) {
+      getSerializedScopeProperties(currentSection).set(
+        import_compiler17.types.stringLiteral("_"),
+        callRuntime(
+          "ensureScopeWithId",
+          getScopeIdIdentifier(currentSection = currentSection.parent)
+        )
+      );
+    }
+  });
   forEach(section.closures, (closure) => {
     if (isStatefulReferences(closure)) {
       let currentSection = section;
@@ -3350,6 +3363,7 @@ function trackAssignment(assignment, binding) {
   forEachIdentifier(assignment.node, (id) => {
     if (id.name === binding.name) {
       const extra = id.extra ??= {};
+      section.assignments = bindingUtil.add(section.assignments, binding);
       extra.assignment = binding;
       extra.section = section;
     }
@@ -4202,6 +4216,7 @@ function analyzeAttributeTags(tag) {
       if ((0, import_babel_utils16.isAttributeTag)(child)) {
         const name2 = getTagName(child);
         lookup[name2] ||= createAttrTagMeta(name2, [name2]);
+        (attrTagNodesByName[name2] ||= []).push(child);
         analyzeAttributeTags(child);
       } else {
         const isRepeated = (0, import_babel_utils16.isLoopTag)(child);
@@ -8516,7 +8531,8 @@ function translateDOM(tag) {
       circular: childFile.opts.filename === file.opts.filename,
       tagSection,
       relativePath,
-      childScopeBinding
+      childScopeBinding,
+      attrTagCallsByTag: void 0
     });
   }
   write2`${(0, import_babel_utils40.importNamed)(file, relativePath, childExports.template, `${tagName}_template`)}`;
@@ -8714,7 +8730,38 @@ function writeAttrsToExports(tag, templateExport, importAlias, info) {
     }
     let translatedProps = propsToExpression(translatedAttrs.properties);
     if ((0, import_babel_utils40.isAttributeTag)(tag)) {
-      translatedProps = callRuntime("attrTag", translatedProps);
+      const attrTagName = getTagName(tag);
+      const parentTag = tag.parentPath;
+      const repeated = analyzeAttributeTags(parentTag)?.[attrTagName]?.repeated;
+      if (repeated) {
+        let attrTagCallsForTag = (info.attrTagCallsByTag ||= /* @__PURE__ */ new Map()).get(
+          parentTag
+        );
+        if (!attrTagCallsForTag) {
+          info.attrTagCallsByTag.set(
+            parentTag,
+            attrTagCallsForTag = /* @__PURE__ */ new Map()
+          );
+        }
+        const attrTagCall = attrTagCallsForTag.get(attrTagName);
+        if (attrTagCall) {
+          attrTagCall.expression = callRuntime(
+            "attrTags",
+            attrTagCall.expression,
+            translatedProps
+          );
+          return;
+        } else {
+          attrTagCallsForTag.set(
+            attrTagName,
+            translatedProps = import_compiler51.types.parenthesizedExpression(
+              callRuntime("attrTag", translatedProps)
+            )
+          );
+        }
+      } else {
+        translatedProps = callRuntime("attrTag", translatedProps);
+      }
     }
     addValue(
       info.tagSection,

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

@@ -16,6 +16,7 @@ export interface Section {
     params: undefined | Binding;
     closures: ReferencedBindings;
     bindings: ReferencedBindings;
+    assignments: ReferencedBindings;
     upstreamExpression: t.NodeExtra | undefined;
     hasAbortSignal: boolean;
     isBranch: boolean;
@@ -29,10 +30,6 @@ declare module "@marko/compiler/dist/types" {
     interface ProgramExtra {
         section?: Section;
         sections?: Section[];
-        assignments?: [
-            valueSection: Section,
-            assignment: t.NodePath<t.UpdateExpression> | t.NodePath<t.AssignmentExpression>
-        ][];
     }
     interface MarkoTagBodyExtra {
         section?: Section;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.0-next.3.30",
+  "version": "6.0.0-next.3.32",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",