marko 6.0.0-next.3.68 → 6.0.0-next.3.70

package/dist/translator/index.js

@@ -1271,13 +1271,6 @@ var [_getScopeIdentifier] = createSectionState(
   "scopeIdentifier",
   () => import_compiler6.types.identifier("undefined")
 );
-var getScopeIdentifier = (section, ignoreDefault) => {
-  const scopeId = _getScopeIdentifier(section);
-  if (!ignoreDefault && scopeId.name === "undefined") {
-    scopeId.name = currentProgramPath.scope.generateUid(`scope${section.id}_`);
-  }
-  return scopeId;
-};
 function forEachSection(fn) {
   const { sections } = currentProgramPath.node.extra;
   sections?.forEach(fn);
@@ -5753,104 +5746,19 @@ var for_default = {
         const hasHoists = isSectionWithHoists(bodySection);
         const serializeReason = hasHoists || sectionSources?.all;
         const singleNodeOptimization = bodySection.content === null || bodySection.content.singleChild && bodySection.content.startType !== 4 /* Text */;
-        let keyExpression;
-        if (sectionSources?.referenced && onlyChildInParentOptimization) {
+        if (serializeReason && onlyChildInParentOptimization) {
           getParentTag(tag).node.extra[kSerializeMarker] = false;
         }
-        if (serializeReason) {
-          serializeSectionIfNeeded(bodySection, serializeReason);
-          const defaultParamNames = {
-            of: ["list", "index"],
-            in: ["key", "value"],
-            to: ["value"]
-          }[forType];
-          const defaultByParamIndex = forType === "of" ? 1 : 0;
-          const requiredParamsIndex = forAttrs.by ? defaultParamNames.length - 1 : defaultByParamIndex;
-          for (let i = 0; i <= requiredParamsIndex; i++) {
-            const existingParam = params[i];
-            if (!existingParam || !import_compiler32.types.isIdentifier(existingParam)) {
-              const id = params[i] = currentProgramPath.scope.generateUidIdentifier(
-                defaultParamNames[i]
-              );
-              if (existingParam) {
-                bodyStatements.unshift(
-                  import_compiler32.types.variableDeclaration("let", [
-                    import_compiler32.types.variableDeclarator(existingParam, id)
-                  ])
-                );
-              }
-            }
-          }
-          if (forAttrs.by) {
-            if (import_compiler32.types.isStringLiteral(forAttrs.by)) {
-              keyExpression = toMemberExpression(
-                params[0],
-                forAttrs.by.value
-              );
-            } else if (import_compiler32.types.isFunction(forAttrs.by)) {
-              const byIdentifier = currentProgramPath.scope.generateUidIdentifier("by");
-              statements.push(
-                import_compiler32.types.variableDeclaration("const", [
-                  import_compiler32.types.variableDeclarator(byIdentifier, forAttrs.by)
-                ])
-              );
-              keyExpression = import_compiler32.types.callExpression(
-                byIdentifier,
-                params
-              );
-            } else {
-              keyExpression = callRuntime(
-                forTypeToHTMLByRuntime(forType),
-                forAttrs.by,
-                ...params
-              );
-            }
-          } else {
-            keyExpression = params[defaultByParamIndex];
-          }
-          const forScopesIdentifier = getScopeIdentifier(bodySection);
-          getHTMLSectionStatements(tagSection).push(
-            import_compiler32.types.variableDeclaration("const", [
-              import_compiler32.types.variableDeclarator(
-                forScopesIdentifier,
-                import_compiler32.types.newExpression(import_compiler32.types.identifier("Map"), [])
-              )
-            ])
-          );
-          bodyStatements.push(
-            import_compiler32.types.expressionStatement(
-              import_compiler32.types.callExpression(
-                import_compiler32.types.memberExpression(forScopesIdentifier, import_compiler32.types.identifier("set")),
-                [
-                  keyExpression,
-                  callRuntime(
-                    "ensureScopeWithId",
-                    getScopeIdIdentifier(bodySection)
-                  )
-                ]
-              )
-            )
-          );
-          setSerializedProperty(
-            tagSection,
-            getAccessorPrefix().LoopScopeMap + getScopeAccessor(nodeRef2),
-            import_compiler32.types.conditionalExpression(
-              import_compiler32.types.memberExpression(forScopesIdentifier, import_compiler32.types.identifier("size")),
-              forScopesIdentifier,
-              import_compiler32.types.identifier("undefined")
-            ),
-            serializeReason
-          );
-        }
         flushInto(tag);
         writeHTMLResumeStatements(tagBody);
         const forTagArgs = getBaseArgsInForTag(forType, forAttrs);
-        const forTagHTMLRuntime = sectionSources?.referenced ? forTypeToHTMLResumeRuntime(forType, singleNodeOptimization) : forTypeToRuntime(forType);
+        const forTagHTMLRuntime = serializeReason ? forTypeToHTMLResumeRuntime(forType, singleNodeOptimization) : forTypeToRuntime(forType);
         forTagArgs.push(
           import_compiler32.types.arrowFunctionExpression(params, import_compiler32.types.blockStatement(bodyStatements))
         );
-        if (sectionSources?.referenced) {
+        if (serializeReason) {
           forTagArgs.push(
+            forAttrs.by || import_compiler32.types.numericLiteral(0),
             getScopeIdIdentifier(tagSection),
             getScopeAccessorLiteral(nodeRef2)
           );
@@ -6062,16 +5970,6 @@ function forTypeToDOMRuntime(type) {
       return "loopTo";
   }
 }
-function forTypeToHTMLByRuntime(type) {
-  switch (type) {
-    case "of":
-      return "forOfBy";
-    case "in":
-      return "forInBy";
-    case "to":
-      return "forToBy";
-  }
-}
 function getBaseArgsInForTag(type, attrs2) {
   switch (type) {
     case "in":
@@ -7624,7 +7522,6 @@ var IfTag = {
         const hasHoists = hasHoistsInBranches(branches);
         const serializeReason = hasHoists || branchSources?.all;
         if (bodySection) {
-          serializeSectionIfNeeded(bodySection, serializeReason);
           flushInto(tag);
           writeHTMLResumeStatements(tagBody);
         }
@@ -7632,38 +7529,17 @@ var IfTag = {
           const nodeRef2 = getOptimizedOnlyChildNodeRef(rootTag, section);
           const onlyChildInParentOptimization = isOnlyChildInParent(rootTag);
           const nextTag = tag.getNextSibling();
-          const ifScopeIdIdentifier = rootTag.scope.generateUidIdentifier("ifScopeId");
-          const ifBranchIdentifier = rootTag.scope.generateUidIdentifier("ifBranch");
           let statement;
           if (branchSources?.referenced && onlyChildInParentOptimization) {
             getParentTag(rootTag).node.extra[kSerializeMarker] = false;
           }
           for (let i = branches.length; i--; ) {
-            const [branchTag, branchBodySection] = branches[i];
+            const [branchTag] = branches[i];
             const bodyStatements = branchTag.node.body.body;
-            if (branchBodySection) {
-              if (branchSources?.referenced) {
-                bodyStatements.push(
-                  import_compiler41.types.expressionStatement(
-                    import_compiler41.types.assignmentExpression(
-                      "=",
-                      ifBranchIdentifier,
-                      import_compiler41.types.numericLiteral(i)
-                    )
-                  )
-                );
-              }
-              if (serializeReason) {
-                bodyStatements.push(
-                  import_compiler41.types.expressionStatement(
-                    import_compiler41.types.assignmentExpression(
-                      "=",
-                      ifScopeIdIdentifier,
-                      getScopeIdIdentifier(branchBodySection)
-                    )
-                  )
-                );
-              }
+            if (serializeReason) {
+              bodyStatements.push(
+                import_compiler41.types.returnStatement(import_compiler41.types.numericLiteral(i))
+              );
             }
             const [testAttr] = branchTag.node.attributes;
             const curStatement = toFirstStatementOrBlock(bodyStatements);
@@ -7679,51 +7555,29 @@ var IfTag = {
             branchTag.remove();
           }
           if (serializeReason) {
-            if (branchSources?.referenced) {
-              setSerializedProperty(
-                section,
-                getAccessorPrefix().ConditionalRenderer + getScopeAccessor(nodeRef2),
-                ifBranchIdentifier,
-                branchSources.referenced
-              );
-              const cbNode = import_compiler41.types.arrowFunctionExpression(
-                [],
-                import_compiler41.types.blockStatement([statement])
-              );
-              statement = import_compiler41.types.expressionStatement(
-                singleNodeOptimization ? callRuntime(
-                  "resumeSingleNodeConditional",
-                  cbNode,
-                  getScopeIdIdentifier(section),
-                  getScopeAccessorLiteral(nodeRef2),
-                  onlyChildInParentOptimization && import_compiler41.types.numericLiteral(1)
-                ) : callRuntime(
-                  "resumeConditional",
-                  cbNode,
-                  getScopeIdIdentifier(section),
-                  getScopeAccessorLiteral(nodeRef2)
-                )
-              );
-            }
-            nextTag.insertBefore(statement);
-            getHTMLSectionStatements(section).push(
-              import_compiler41.types.variableDeclaration(
-                "let",
-                [
-                  import_compiler41.types.variableDeclarator(ifScopeIdIdentifier),
-                  branchSources?.referenced && import_compiler41.types.variableDeclarator(ifBranchIdentifier)
-                ].filter(Boolean)
-              )
+            const conditionSerializeReason = branchSources?.referenced;
+            const cbNode = import_compiler41.types.arrowFunctionExpression(
+              [],
+              import_compiler41.types.blockStatement([statement])
             );
-            setSerializedProperty(
-              section,
-              getAccessorPrefix().ConditionalScope + getScopeAccessor(nodeRef2),
-              callRuntime("getScopeById", ifScopeIdIdentifier),
-              serializeReason
+            statement = import_compiler41.types.expressionStatement(
+              singleNodeOptimization ? callRuntime(
+                "resumeSingleNodeConditional",
+                cbNode,
+                getScopeIdIdentifier(section),
+                getScopeAccessorLiteral(nodeRef2),
+                conditionSerializeReason ? import_compiler41.types.numericLiteral(1) : onlyChildInParentOptimization ? import_compiler41.types.numericLiteral(0) : void 0,
+                onlyChildInParentOptimization && import_compiler41.types.numericLiteral(1)
+              ) : callRuntime(
+                "resumeConditional",
+                cbNode,
+                getScopeIdIdentifier(section),
+                getScopeAccessorLiteral(nodeRef2),
+                conditionSerializeReason ? import_compiler41.types.numericLiteral(1) : void 0
+              )
             );
-          } else {
-            nextTag.insertBefore(statement);
           }
+          nextTag.insertBefore(statement);
         }
       }
     },
@@ -9859,34 +9713,36 @@ var dynamic_tag_default = {
       if (isOutputHTML()) {
         flushInto(tag);
         writeHTMLResumeStatements(tag.get("body"));
-        if (node.var) {
-          if (!hasMultipleArgs && args.length === 1) {
-            args.push(import_compiler55.types.unaryExpression("void", import_compiler55.types.numericLiteral(0)));
-          }
-        }
-        const dynamicScopeIdentifier = currentProgramPath.scope.generateUidIdentifier("dynamicScope");
+        const serializeReason = isClassAPI || !!node.var || getDynamicSourcesForReferences(referencedBindings);
         const dynamicTagExpr = hasMultipleArgs ? callRuntime(
-          "dynamicTagArgs",
+          "dynamicTag",
           getScopeIdIdentifier(section),
           getScopeAccessorLiteral(nodeRef2),
           tagExpression,
-          import_compiler55.types.arrayExpression(args)
+          import_compiler55.types.arrayExpression(args),
+          import_compiler55.types.numericLiteral(0),
+          import_compiler55.types.numericLiteral(1),
+          serializeReason ? import_compiler55.types.numericLiteral(1) : void 0
         ) : callRuntime(
-          "dynamicTagInput",
+          "dynamicTag",
           getScopeIdIdentifier(section),
           getScopeAccessorLiteral(nodeRef2),
           tagExpression,
-          ...args
-        );
-        statements.push(
-          import_compiler55.types.variableDeclaration("const", [
-            import_compiler55.types.variableDeclarator(
-              dynamicScopeIdentifier,
-              callRuntime("peekNextScope")
-            )
-          ])
+          args[0],
+          args[1] || (serializeReason ? import_compiler55.types.numericLiteral(0) : void 0),
+          serializeReason ? import_compiler55.types.numericLiteral(0) : void 0,
+          serializeReason ? import_compiler55.types.numericLiteral(1) : void 0
         );
         if (node.var) {
+          const dynamicScopeIdentifier = currentProgramPath.scope.generateUidIdentifier("dynamicScope");
+          statements.push(
+            import_compiler55.types.variableDeclaration("const", [
+              import_compiler55.types.variableDeclarator(
+                dynamicScopeIdentifier,
+                callRuntime("peekNextScope")
+              )
+            ])
+          );
           statements.push(
             import_compiler55.types.variableDeclaration("const", [
               import_compiler55.types.variableDeclarator(node.var, dynamicTagExpr)
@@ -9913,24 +9769,6 @@ var dynamic_tag_default = {
         } else {
           statements.push(import_compiler55.types.expressionStatement(dynamicTagExpr));
         }
-        const serializeReason = isClassAPI || !!node.var || getDynamicSourcesForReferences(referencedBindings);
-        if (serializeReason) {
-          setSerializedProperty(
-            section,
-            getAccessorPrefix().ConditionalScope + getScopeAccessor(nodeRef2),
-            callRuntime("writeExistingScope", dynamicScopeIdentifier),
-            serializeReason
-          );
-          setSerializedProperty(
-            section,
-            getAccessorPrefix().ConditionalRenderer + getScopeAccessor(nodeRef2),
-            callRuntime(
-              "dynamicTagId",
-              import_compiler55.types.isIdentifier(tagExpression) ? import_compiler55.types.identifier(tagExpression.name) : tagExpression
-            ),
-            serializeReason
-          );
-        }
         for (const replacement of tag.replaceWithMultiple(statements)) {
           replacement.skip();
         }

package/package.json

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