marko 6.0.120 → 6.0.121

package/dist/translator/index.js

@@ -4863,30 +4863,25 @@ function withPreviousLocation(newNode, originalNode) {
 var TAG_NAME_IDENTIFIER_REG = /^[A-Z][a-zA-Z0-9_$]*$/;
 var BINDING_CHANGE_HANDLER = /* @__PURE__ */ new WeakMap();
 function preAnalyze2(program) {
-  const state = { crawl: false };
-  normalizeBody(state, program.get("body"));
-  if (state.crawl) {
-    program.scope.crawl();
-  }
+  normalizeBody(program.get("body"));
 }
-function normalizeBody(state, body) {
+function normalizeBody(body) {
   if (body?.length) {
     for (const child of body) {
       if (child.isMarkoTag()) {
-        normalizeTag(state, child);
+        normalizeTag(child);
       }
     }
   }
 }
-function normalizeTag(state, tag) {
+function normalizeTag(tag) {
   const { node } = tag;
   const { name: name2, attributes } = node;
-  normalizeBody(state, tag.get("body").get("body"));
-  normalizeBody(state, tag.get("attributeTags"));
+  normalizeBody(tag.get("body").get("body"));
+  normalizeBody(tag.get("attributeTags"));
   if (node.var) {
     const insertions = getAssignmentInsertions(node.var);
     if (insertions) {
-      state.crawl = true;
       tag.insertAfter(insertions);
     }
   }
@@ -4896,14 +4891,12 @@ function normalizeTag(state, tag) {
       insertions = getAssignmentInsertions(param, insertions);
     }
     if (insertions) {
-      state.crawl = true;
       node.body.body = [...insertions, ...node.body.body];
     }
   }
   if (name2.type === "StringLiteral") {
     const tagName = name2.value;
     if (tag.scope.getBinding(tagName) && TAG_NAME_IDENTIFIER_REG.test(tagName)) {
-      state.crawl = true;
       node.name = withPreviousLocation(import_compiler26.types.identifier(tagName), name2);
     } else {
       switch (tagName) {
@@ -4916,7 +4909,6 @@ function normalizeTag(state, tag) {
   for (let i = 0; i < attributes.length; i++) {
     const attr = attributes[i];
     if (import_compiler26.types.isMarkoAttribute(attr) && attr.bound) {
-      state.crawl = true;
       attr.bound = false;
       attributes.splice(++i, 0, getChangeHandler(tag, attr));
     }
@@ -4978,7 +4970,6 @@ function getChangeHandler(tag, attr) {
     } else {
       markoRoot.unshiftContainer("body", changeHandlerConst);
     }
-    markoRoot.scope.crawl();
     return import_compiler26.types.markoAttribute(
       changeAttrName,
       withPreviousLocation(import_compiler26.types.identifier(changeHandlerId), attr.value)
@@ -11653,6 +11644,7 @@ var referenced_identifier_default = {
 };
 
 // src/translator/visitors/scriptlet.ts
+var import_compiler59 = require("@marko/compiler");
 var import_babel_utils47 = require("@marko/compiler/babel-utils");
 var scriptlet_default = {
   analyze(scriptlet) {
@@ -11675,7 +11667,21 @@ var scriptlet_default = {
       const { node } = scriptlet;
       const isHTML = isOutputHTML();
       if (node.target && node.target !== (isHTML ? "server" : "client")) {
-        scriptlet.remove();
+        const ids = Object.keys(scriptlet.getOuterBindingIdentifiers());
+        const decl = ids.length && import_compiler59.types.variableDeclaration(
+          "var",
+          ids.map((key) => import_compiler59.types.variableDeclarator(import_compiler59.types.identifier(key)))
+        );
+        if (decl) {
+          if (isHTML) {
+            scriptlet.node.target = null;
+            scriptlet.node.body = [decl];
+          } else {
+            scriptlet.replaceWith(decl);
+          }
+        } else {
+          scriptlet.remove();
+        }
         return;
       }
       if (isHTML) {
@@ -11688,11 +11694,11 @@ var scriptlet_default = {
 };
 
 // src/translator/visitors/tag/index.ts
-var import_compiler62 = require("@marko/compiler");
+var import_compiler63 = require("@marko/compiler");
 var import_babel_utils51 = require("@marko/compiler/babel-utils");
 
 // src/translator/visitors/tag/attribute-tag.ts
-var import_compiler59 = require("@marko/compiler");
+var import_compiler60 = require("@marko/compiler");
 var import_babel_utils48 = require("@marko/compiler/babel-utils");
 var attribute_tag_default = {
   analyze: {
@@ -11725,7 +11731,7 @@ var attribute_tag_default = {
 };
 
 // src/translator/visitors/tag/custom-tag.ts
-var import_compiler60 = require("@marko/compiler");
+var import_compiler61 = require("@marko/compiler");
 var import_babel_utils49 = require("@marko/compiler/babel-utils");
 var import_path4 = __toESM(require("path"));
 var custom_tag_default = {
@@ -11779,9 +11785,9 @@ function translateHTML(tag) {
   const childProgram = (0, import_babel_utils49.loadFileForTag)(tag).ast.program;
   const childExtra = childProgram.extra;
   let tagIdentifier;
-  if (import_compiler60.types.isStringLiteral(node.name)) {
+  if (import_compiler61.types.isStringLiteral(node.name)) {
     const relativePath = getTagRelativePath(tag);
-    tagIdentifier = isCircularRequest(tag.hub.file, relativePath) ? import_compiler60.types.identifier(getTemplateContentName()) : (0, import_babel_utils49.importDefault)(tag.hub.file, relativePath, getTagName(tag));
+    tagIdentifier = isCircularRequest(tag.hub.file, relativePath) ? import_compiler61.types.identifier(getTemplateContentName()) : (0, import_babel_utils49.importDefault)(tag.hub.file, relativePath, getTagName(tag));
   } else {
     tagIdentifier = node.name;
   }
@@ -11802,7 +11808,7 @@ function translateDOM(tag) {
   const childExtra = childFile.ast.program.extra;
   const childExports = childExtra.domExports;
   const childSection = childExtra.section;
-  const tagName = import_compiler60.types.isIdentifier(node.name) ? node.name.name : import_compiler60.types.isStringLiteral(node.name) ? node.name.value : "tag";
+  const tagName = import_compiler61.types.isIdentifier(node.name) ? node.name.name : import_compiler61.types.isStringLiteral(node.name) ? node.name.value : "tag";
   if (programSection === childSection) {
     knownTagTranslateDOM(
       tag,
@@ -11813,16 +11819,16 @@ function translateDOM(tag) {
           "render",
           section,
           void 0,
-          import_compiler60.types.expressionStatement(
-            import_compiler60.types.callExpression(import_compiler60.types.identifier(childExports.setup), [
+          import_compiler61.types.expressionStatement(
+            import_compiler61.types.callExpression(import_compiler61.types.identifier(childExports.setup), [
               createScopeReadExpression(childBinding, section)
             ])
           )
         );
       }
     );
-    write`${import_compiler60.types.identifier(childExports.template)}`;
-    injectWalks(tag, tagName, import_compiler60.types.identifier(childExports.walks));
+    write`${import_compiler61.types.identifier(childExports.template)}`;
+    injectWalks(tag, tagName, import_compiler61.types.identifier(childExports.walks));
   } else {
     knownTagTranslateDOM(
       tag,
@@ -11838,8 +11844,8 @@ function translateDOM(tag) {
           "render",
           section,
           void 0,
-          import_compiler60.types.expressionStatement(
-            import_compiler60.types.callExpression(
+          import_compiler61.types.expressionStatement(
+            import_compiler61.types.callExpression(
               importOrSelfReferenceName(
                 file,
                 relativePath,
@@ -11867,7 +11873,7 @@ function getTagRelativePath(tag) {
     hub: { file }
   } = tag;
   let relativePath;
-  if (import_compiler60.types.isStringLiteral(node.name)) {
+  if (import_compiler61.types.isStringLiteral(node.name)) {
     const template = (0, import_babel_utils49.getTagTemplate)(tag);
     relativePath = template && (0, import_babel_utils49.resolveRelativePath)(file, template);
   } else if (node.extra?.tagNameImported) {
@@ -11888,7 +11894,7 @@ function getTagRelativePath(tag) {
 }
 function importOrSelfReferenceName(file, request, name2, nameHint) {
   if (isCircularRequest(file, request)) {
-    return import_compiler60.types.identifier(name2);
+    return import_compiler61.types.identifier(name2);
   }
   return (0, import_babel_utils49.importNamed)(file, request, name2, nameHint);
 }
@@ -11898,7 +11904,7 @@ function isCircularRequest(file, request) {
 }
 
 // src/translator/visitors/tag/dynamic-tag.ts
-var import_compiler61 = require("@marko/compiler");
+var import_compiler62 = require("@marko/compiler");
 var import_babel_utils50 = require("@marko/compiler/babel-utils");
 var kDOMBinding3 = Symbol("dynamic tag dom binding");
 var kChildOffsetScopeBinding2 = Symbol("custom tag scope offset");
@@ -11931,7 +11937,7 @@ var dynamic_tag_default = {
         tagSection
       );
       if (hasVar || tag.node.attributes.some(
-        (attr) => import_compiler61.types.isMarkoSpreadAttribute(attr) || isEventOrChangeHandler(attr.name)
+        (attr) => import_compiler62.types.isMarkoSpreadAttribute(attr) || isEventOrChangeHandler(attr.name)
       )) {
         (0, import_babel_utils50.getProgram)().node.extra.isInteractive = true;
       }
@@ -11971,7 +11977,7 @@ var dynamic_tag_default = {
         if (isOutputHTML()) {
           knownTagTranslateHTML(
             tag,
-            import_compiler61.types.memberExpression(tag.node.name, import_compiler61.types.identifier("content")),
+            import_compiler62.types.memberExpression(tag.node.name, import_compiler62.types.identifier("content")),
             definedBodySection,
             propTree
           );
@@ -11988,9 +11994,9 @@ var dynamic_tag_default = {
                   "render",
                   section,
                   void 0,
-                  import_compiler61.types.expressionStatement(
-                    import_compiler61.types.callExpression(
-                      import_compiler61.types.memberExpression(signal.identifier, import_compiler61.types.identifier("_")),
+                  import_compiler62.types.expressionStatement(
+                    import_compiler62.types.callExpression(
+                      import_compiler62.types.memberExpression(signal.identifier, import_compiler62.types.identifier("_")),
                       [
                         createScopeReadExpression(childBinding, section),
                         getScopeExpression(section, definedBodySection.parent)
@@ -12015,7 +12021,7 @@ var dynamic_tag_default = {
       const nodeBinding = tagExtra[kDOMBinding3];
       const isClassAPI = tagExtra.featureType === "class";
       let tagExpression = node.name;
-      if (import_compiler61.types.isStringLiteral(tagExpression)) {
+      if (import_compiler62.types.isStringLiteral(tagExpression)) {
         tagExpression = (0, import_babel_utils50.importDefault)(
           tag.hub.file,
           getTagRelativePath(tag),
@@ -12025,14 +12031,14 @@ var dynamic_tag_default = {
       if (isClassAPI) {
         if (isOutputHTML()) {
           (0, import_babel_utils50.getProgram)().node.body.push(
-            import_compiler61.types.markoScriptlet(
+            import_compiler62.types.markoScriptlet(
               [
-                import_compiler61.types.expressionStatement(
-                  import_compiler61.types.callExpression(
+                import_compiler62.types.expressionStatement(
+                  import_compiler62.types.callExpression(
                     (0, import_babel_utils50.importNamed)(tag.hub.file, getCompatRuntimeFile(), "s"),
                     [
-                      import_compiler61.types.identifier(tagExpression.name),
-                      import_compiler61.types.stringLiteral((0, import_babel_utils50.loadFileForTag)(tag).metadata.marko.id)
+                      import_compiler62.types.identifier(tagExpression.name),
+                      import_compiler62.types.stringLiteral((0, import_babel_utils50.loadFileForTag)(tag).metadata.marko.id)
                     ]
                   )
                 )
@@ -12042,11 +12048,11 @@ var dynamic_tag_default = {
           );
         } else {
           (0, import_babel_utils50.getProgram)().node.body.push(
-            import_compiler61.types.expressionStatement(
+            import_compiler62.types.expressionStatement(
               callRuntime(
                 "_resume",
-                import_compiler61.types.stringLiteral((0, import_babel_utils50.loadFileForTag)(tag).metadata.marko.id),
-                import_compiler61.types.identifier(tagExpression.name)
+                import_compiler62.types.stringLiteral((0, import_babel_utils50.loadFileForTag)(tag).metadata.marko.id),
+                import_compiler62.types.identifier(tagExpression.name)
               )
             )
           );
@@ -12089,9 +12095,9 @@ var dynamic_tag_default = {
           getScopeIdIdentifier(tagSection),
           getScopeAccessorLiteral(nodeBinding),
           tagExpression,
-          import_compiler61.types.arrayExpression(args),
-          import_compiler61.types.numericLiteral(0),
-          import_compiler61.types.numericLiteral(1),
+          import_compiler62.types.arrayExpression(args),
+          import_compiler62.types.numericLiteral(0),
+          import_compiler62.types.numericLiteral(1),
           serializeArg
         ) : callRuntime(
           "_dynamic_tag",
@@ -12099,8 +12105,8 @@ var dynamic_tag_default = {
           getScopeAccessorLiteral(nodeBinding),
           tagExpression,
           args[0],
-          args[1] || (serializeArg ? import_compiler61.types.numericLiteral(0) : void 0),
-          serializeArg ? import_compiler61.types.numericLiteral(0) : void 0,
+          args[1] || (serializeArg ? import_compiler62.types.numericLiteral(0) : void 0),
+          serializeArg ? import_compiler62.types.numericLiteral(0) : void 0,
           serializeArg
         );
         if (node.var) {
@@ -12108,18 +12114,18 @@ var dynamic_tag_default = {
             tag.get("name").toString() + "_scope"
           );
           statements.push(
-            import_compiler61.types.variableDeclaration("const", [
-              import_compiler61.types.variableDeclarator(
+            import_compiler62.types.variableDeclaration("const", [
+              import_compiler62.types.variableDeclarator(
                 dynamicScopeIdentifier,
                 callRuntime("_peek_scope_id")
               )
             ])
           );
           statements.push(
-            import_compiler61.types.variableDeclaration("let", [
-              import_compiler61.types.variableDeclarator(node.var, dynamicTagExpr)
+            import_compiler62.types.variableDeclaration("let", [
+              import_compiler62.types.variableDeclarator(node.var, dynamicTagExpr)
             ]),
-            import_compiler61.types.expressionStatement(
+            import_compiler62.types.expressionStatement(
               callRuntime(
                 "_var",
                 getScopeIdIdentifier(tagSection),
@@ -12127,7 +12133,7 @@ var dynamic_tag_default = {
                   tag.node.extra[kChildOffsetScopeBinding2]
                 ),
                 dynamicScopeIdentifier,
-                import_compiler61.types.stringLiteral(
+                import_compiler62.types.stringLiteral(
                   getResumeRegisterId(
                     tagSection,
                     node.var.extra?.binding,
@@ -12139,7 +12145,7 @@ var dynamic_tag_default = {
             )
           );
         } else {
-          statements.push(import_compiler61.types.expressionStatement(dynamicTagExpr));
+          statements.push(import_compiler62.types.expressionStatement(dynamicTagExpr));
         }
         for (const replacement of tag.replaceWithMultiple(statements)) {
           replacement.skip();
@@ -12158,9 +12164,9 @@ var dynamic_tag_default = {
           tagVarSignal.register = true;
           tagVarSignal.buildAssignment = (valueSection, value) => {
             const changeArgs = [
-              import_compiler61.types.memberExpression(
+              import_compiler62.types.memberExpression(
                 getScopeExpression(tagVarSignal.section, valueSection),
-                import_compiler61.types.stringLiteral(
+                import_compiler62.types.stringLiteral(
                   getAccessorPrefix().BranchScopes + getScopeAccessor(nodeBinding)
                 ),
                 true
@@ -12168,28 +12174,28 @@ var dynamic_tag_default = {
               value
             ];
             if (!isOptimize()) {
-              changeArgs.push(import_compiler61.types.stringLiteral(varBinding.name));
+              changeArgs.push(import_compiler62.types.stringLiteral(varBinding.name));
             }
-            return import_compiler61.types.callExpression(importRuntime("_var_change"), changeArgs);
+            return import_compiler62.types.callExpression(importRuntime("_var_change"), changeArgs);
           };
         }
         signal.build = () => {
           return callRuntime(
             "_dynamic_tag",
             getScopeAccessorLiteral(nodeBinding, true),
-            bodySection && import_compiler61.types.identifier(bodySection.name),
-            tagVarSignal ? import_compiler61.types.arrowFunctionExpression([], tagVarSignal.identifier) : void 0,
-            hasTagArgs && import_compiler61.types.numericLiteral(1)
+            bodySection && import_compiler62.types.identifier(bodySection.name),
+            tagVarSignal ? import_compiler62.types.arrowFunctionExpression([], tagVarSignal.identifier) : void 0,
+            hasTagArgs && import_compiler62.types.numericLiteral(1)
           );
         };
         if (args.length) {
-          const argsOrInput = hasTagArgs ? import_compiler61.types.arrayExpression(args) : args[0];
-          if (!import_compiler61.types.isObjectExpression(argsOrInput) || argsOrInput.properties.length) {
+          const argsOrInput = hasTagArgs ? import_compiler62.types.arrayExpression(args) : args[0];
+          if (!import_compiler62.types.isObjectExpression(argsOrInput) || argsOrInput.properties.length) {
             signal.extraArgs = [
-              import_compiler61.types.arrowFunctionExpression(
+              import_compiler62.types.arrowFunctionExpression(
                 [],
-                statements.length ? import_compiler61.types.blockStatement(
-                  statements.concat(import_compiler61.types.returnStatement(argsOrInput))
+                statements.length ? import_compiler62.types.blockStatement(
+                  statements.concat(import_compiler62.types.returnStatement(argsOrInput))
                 ) : argsOrInput
               )
             ];
@@ -12209,7 +12215,7 @@ function enableDynamicTagResume(tag) {
       if (attr.type === "MarkoSpreadAttribute" || attr.type === "MarkoAttribute" && isEventOrChangeHandler(attr.name)) {
         importedDynamicTagResume.add(program);
         program.body.push(
-          import_compiler61.types.expressionStatement(callRuntime("_resume_dynamic_tag"))
+          import_compiler62.types.expressionStatement(callRuntime("_resume_dynamic_tag"))
         );
         return;
       }
@@ -12320,7 +12326,7 @@ var tag_default = {
 };
 
 // src/translator/visitors/text.ts
-var import_compiler63 = require("@marko/compiler");
+var import_compiler64 = require("@marko/compiler");
 var text_default = {
   translate: {
     exit(text) {

package/dist/translator/visitors/scriptlet.d.ts

@@ -1,4 +1,4 @@
-import type { types as t } from "@marko/compiler";
+import { types as t } from "@marko/compiler";
 declare const _default: {
     analyze(this: unknown, scriptlet: t.NodePath<t.MarkoScriptlet>): void;
     translate: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.120",
+  "version": "6.0.121",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -48,7 +48,7 @@
     "build": "node -r ~ts ./scripts/bundle.ts"
   },
   "dependencies": {
-    "@marko/compiler": "^5.39.43",
+    "@marko/compiler": "^5.39.44",
     "csstype": "^3.1.3",
     "magic-string": "^0.30.17"
   },