marko 6.0.47 → 6.0.49

package/dist/translator/index.js

@@ -1567,7 +1567,7 @@ function filterArguments(args) {
 }
 function getCompatRuntimeFile() {
   const markoOpts = getMarkoOpts();
-  return `marko/src/runtime/helpers/tags-compat/${isOutputHTML() ? "html" : "dom"}${markoOpts.optimize ? "" : "-debug"}.${markoOpts.modules === "esm" ? "mjs" : "js"}`;
+  return `marko/${markoOpts.optimize ? "dist" : "src"}/runtime/helpers/tags-compat/${isOutputHTML() ? "html" : "dom"}${markoOpts.optimize ? "" : "-debug"}.${markoOpts.modules === "esm" ? "mjs" : "js"}`;
 }
 
 // src/translator/util/sections.ts
@@ -6804,7 +6804,7 @@ function getUsedAttrs(tagName, tag) {
       seen[attr2.name] = attr2;
       if (spreadProps) {
         spreadProps.push(toObjectProperty(attr2.name, attr2.value));
-      } else if (attr2.name === "content") {
+      } else if (attr2.name === "content" && tagName !== "meta") {
         staticContentAttr = attr2;
       } else {
         maybeStaticAttrs.add(attr2);
@@ -10000,6 +10000,7 @@ var function_default = {
       filename,
       `${section.id}/${name2.slice(1)}`
     );
+    (0, import_babel_utils44.getProgram)().node.extra.isInteractive = true;
   }
 };
 function isMarkoAttribute(path5) {
@@ -10323,6 +10324,7 @@ var referenced_identifier_default = {
 };
 
 // src/translator/visitors/scriptlet.ts
+var import_babel_utils46 = require("@marko/compiler/babel-utils");
 var scriptlet_default = {
   analyze(scriptlet) {
     if (!scriptlet.node.static) {
@@ -10335,6 +10337,9 @@ var scriptlet_default = {
       scriptlet.node,
       scriptlet.node.body
     );
+    if (scriptlet.node.target === "client") {
+      (0, import_babel_utils46.getProgram)().node.extra.isInteractive = true;
+    }
   },
   translate: {
     exit(scriptlet) {
@@ -10355,20 +10360,20 @@ var scriptlet_default = {
 
 // src/translator/visitors/tag/index.ts
 var import_compiler58 = require("@marko/compiler");
-var import_babel_utils49 = require("@marko/compiler/babel-utils");
+var import_babel_utils50 = require("@marko/compiler/babel-utils");
 
 // src/translator/visitors/tag/attribute-tag.ts
 var import_compiler55 = require("@marko/compiler");
-var import_babel_utils46 = require("@marko/compiler/babel-utils");
+var import_babel_utils47 = require("@marko/compiler/babel-utils");
 var attribute_tag_default = {
   analyze: {
     enter(tag) {
-      (0, import_babel_utils46.assertNoVar)(tag);
-      (0, import_babel_utils46.assertNoArgs)(tag);
+      (0, import_babel_utils47.assertNoVar)(tag);
+      (0, import_babel_utils47.assertNoArgs)(tag);
       const body = tag.get("body");
       startSection(body);
       trackParamsReferences(body, 3 /* param */);
-      if (!(0, import_babel_utils46.findParentTag)(tag)) {
+      if (!(0, import_babel_utils47.findParentTag)(tag)) {
         throw tag.get("name").buildCodeFrameError("@tags must be nested within another tag.");
       }
     }
@@ -10390,7 +10395,7 @@ var attribute_tag_default = {
 
 // src/translator/visitors/tag/custom-tag.ts
 var import_compiler56 = require("@marko/compiler");
-var import_babel_utils47 = require("@marko/compiler/babel-utils");
+var import_babel_utils48 = require("@marko/compiler/babel-utils");
 var import_path4 = __toESM(require("path"));
 var kChildScopeBinding = Symbol("custom tag child scope");
 var kChildOffsetScopeBinding = Symbol("custom tag scope offset");
@@ -10400,9 +10405,9 @@ var kChildInputSerializePropIds = Symbol(
 var custom_tag_default = {
   analyze: {
     enter(tag) {
-      (0, import_babel_utils47.assertAttributesOrSingleArg)(tag);
+      (0, import_babel_utils48.assertAttributesOrSingleArg)(tag);
       analyzeAttributeTags(tag);
-      const templateFile = (0, import_babel_utils47.getTagTemplate)(tag);
+      const templateFile = (0, import_babel_utils48.getTagTemplate)(tag);
       if (!templateFile) {
         const tagName = getTagName(tag);
         if (tagName && tag.scope.hasBinding(tagName)) {
@@ -10423,7 +10428,7 @@ var custom_tag_default = {
       const attrExprs = /* @__PURE__ */ new Set([tagExtra]);
       startSection(tagBody);
       trackParamsReferences(tagBody, 3 /* param */);
-      const childFile = (0, import_babel_utils47.loadFileForTag)(tag);
+      const childFile = (0, import_babel_utils48.loadFileForTag)(tag);
       if (!childFile) {
         throw tag.get("name").buildCodeFrameError("Unable to resolve file for tag.");
       }
@@ -10434,7 +10439,7 @@ var custom_tag_default = {
       if (childFile.opts.filename === tag.hub.file.opts.filename) {
         mergeReferences(section, tag.node, getAllTagReferenceNodes(tag.node));
         if (varBinding) {
-          const varSerializeReason = (0, import_babel_utils47.getProgram)().node.extra.returnValueExpr;
+          const varSerializeReason = (0, import_babel_utils48.getProgram)().node.extra.returnValueExpr;
           setBindingValueExpr(varBinding, varSerializeReason);
           addBindingSerializeReasonExpr(
             section,
@@ -10481,7 +10486,7 @@ var custom_tag_default = {
             );
           }
         }
-        (0, import_babel_utils47.getProgram)().node.extra.hasInteractiveChild = childExtra?.isInteractive || childExtra?.hasInteractiveChild || false;
+        (0, import_babel_utils48.getProgram)().node.extra.hasInteractiveChild = childExtra?.isInteractive || childExtra?.hasInteractiveChild || false;
       }
       addBindingSerializeReasonExpr(
         section,
@@ -10515,13 +10520,13 @@ function translateHTML(tag) {
   writeHTMLResumeStatements(tagBody);
   if (import_compiler56.types.isStringLiteral(node.name)) {
     const relativePath = getTagRelativePath(tag);
-    tagIdentifier = isCircularRequest(tag.hub.file, relativePath) ? import_compiler56.types.identifier(getTemplateContentName()) : (0, import_babel_utils47.importDefault)(tag.hub.file, relativePath, getTagName(tag));
+    tagIdentifier = isCircularRequest(tag.hub.file, relativePath) ? import_compiler56.types.identifier(getTemplateContentName()) : (0, import_babel_utils48.importDefault)(tag.hub.file, relativePath, getTagName(tag));
   } else {
     tagIdentifier = node.name;
   }
   const tagVar = node.var;
   const section = getSection(tag);
-  const childProgram = (0, import_babel_utils47.loadFileForTag)(tag).ast.program;
+  const childProgram = (0, import_babel_utils48.loadFileForTag)(tag).ast.program;
   const childExtra = childProgram.extra;
   const inputExport = childExtra.domExports?.input;
   const { properties, statements } = inputExport ? translateAttrs(tag, inputExport.props) : {
@@ -10672,7 +10677,7 @@ function translateDOM(tag) {
   const { file } = tag.hub;
   const tagName = import_compiler56.types.isIdentifier(node.name) ? node.name.name : import_compiler56.types.isStringLiteral(node.name) ? node.name.value : "tag";
   const relativePath = getTagRelativePath(tag);
-  const childFile = (0, import_babel_utils47.loadFileForTag)(tag);
+  const childFile = (0, import_babel_utils48.loadFileForTag)(tag);
   const childExports = childFile.ast.program.extra.domExports;
   const tagIdentifier = importOrSelfReferenceName(
     file,
@@ -10726,10 +10731,10 @@ function translateDOM(tag) {
       attrTagCallsByTag: void 0
     });
   }
-  write2`${(0, import_babel_utils47.importNamed)(file, relativePath, childExports.template, `${tagName}_template`)}`;
+  write2`${(0, import_babel_utils48.importNamed)(file, relativePath, childExports.template, `${tagName}_template`)}`;
   injectWalks(
     tag,
-    (0, import_babel_utils47.importNamed)(file, relativePath, childExports.walks, `${tagName}_walks`)
+    (0, import_babel_utils48.importNamed)(file, relativePath, childExports.walks, `${tagName}_walks`)
   );
   tag.remove();
 }
@@ -10740,8 +10745,8 @@ function getTagRelativePath(tag) {
   } = tag;
   let relativePath;
   if (import_compiler56.types.isStringLiteral(node.name)) {
-    const template = (0, import_babel_utils47.getTagTemplate)(tag);
-    relativePath = template && (0, import_babel_utils47.resolveRelativePath)(file, template);
+    const template = (0, import_babel_utils48.getTagTemplate)(tag);
+    relativePath = template && (0, import_babel_utils48.resolveRelativePath)(file, template);
   } else if (node.extra?.tagNameImported) {
     relativePath = node.extra.tagNameImported;
   }
@@ -10792,7 +10797,7 @@ function analyzeAttrs(rootTagExtra, section, tag, templateExport, rootAttrExprs,
     const attrTags2 = tag.node.body.attributeTags ? tag.get("body").get("body") : tag.get("attributeTags");
     for (const child of attrTags2) {
       if (child.isMarkoTag()) {
-        if ((0, import_babel_utils47.isAttributeTag)(child)) {
+        if ((0, import_babel_utils48.isAttributeTag)(child)) {
           const attrTagMeta = attrTagLookup[getTagName(child)];
           const childAttrExports = templateExport.props[attrTagMeta.name];
           if (childAttrExports) {
@@ -10918,7 +10923,7 @@ function writeAttrsToExports(tag, templateExport, importAlias, info) {
       );
     }
     let translatedProps = propsToExpression(translatedAttrs.properties);
-    if ((0, import_babel_utils47.isAttributeTag)(tag)) {
+    if ((0, import_babel_utils48.isAttributeTag)(tag)) {
       const attrTagName = getTagName(tag);
       const parentTag = tag.parentPath;
       const repeated = analyzeAttributeTags(parentTag)?.[attrTagName]?.repeated;
@@ -10994,7 +10999,7 @@ function writeAttrsToExports(tag, templateExport, importAlias, info) {
     for (let i = 0; i < attrTags2.length; i++) {
       const child = attrTags2[i];
       if (child.isMarkoTag()) {
-        if ((0, import_babel_utils47.isAttributeTag)(child)) {
+        if ((0, import_babel_utils48.isAttributeTag)(child)) {
           const attrTagMeta = attrTagLookup[getTagName(child)];
           const childAttrExport = templateExport.props[attrTagMeta.name];
           if (childAttrExport) {
@@ -11058,7 +11063,7 @@ function writeAttrsToExports(tag, templateExport, importAlias, info) {
   if (bodySection && !seen.has("content")) {
     seen.add("content");
     if (templateExport.props.content) {
-      const contentExportIdentifier = (0, import_babel_utils47.importNamed)(
+      const contentExportIdentifier = (0, import_babel_utils48.importNamed)(
         tag.hub.file,
         info.relativePath,
         templateExport.props.content.id,
@@ -11159,7 +11164,7 @@ function importOrSelfReferenceName(file, request, name2, nameHint) {
   if (isCircularRequest(file, request)) {
     return import_compiler56.types.identifier(name2);
   }
-  return (0, import_babel_utils47.importNamed)(file, request, name2, nameHint);
+  return (0, import_babel_utils48.importNamed)(file, request, name2, nameHint);
 }
 function mapChildReasonToLocalReason(childReason, childInputBinding, inputExpr) {
   if (childReason) {
@@ -11207,13 +11212,13 @@ function buildUndefined2() {
 
 // src/translator/visitors/tag/dynamic-tag.ts
 var import_compiler57 = require("@marko/compiler");
-var import_babel_utils48 = require("@marko/compiler/babel-utils");
+var import_babel_utils49 = require("@marko/compiler/babel-utils");
 var kDOMBinding3 = Symbol("dynamic tag dom binding");
 var kChildOffsetScopeBinding2 = Symbol("custom tag scope offset");
 var dynamic_tag_default = {
   analyze: {
     enter(tag) {
-      (0, import_babel_utils48.assertAttributesOrArgs)(tag);
+      (0, import_babel_utils49.assertAttributesOrArgs)(tag);
       analyzeAttributeTags(tag);
       const tagSection = getOrCreateSection(tag);
       const tagExtra = mergeReferences(tagSection, tag.node, [
@@ -11228,6 +11233,9 @@ var dynamic_tag_default = {
         0 /* dom */,
         tagSection
       );
+      (0, import_babel_utils49.getProgram)().node.extra.isInteractive ||= hasVar || tag.node.attributes.some(
+        (attr2) => import_compiler57.types.isMarkoSpreadAttribute(attr2) || isEventHandler(attr2.name)
+      );
       if (hasVar) {
         trackVarReferences(tag, 5 /* derived */);
         tag.node.var.extra.binding.scopeOffset = tagExtra[kChildOffsetScopeBinding2] = createBinding("#scopeOffset", 0 /* dom */, tagSection);
@@ -11260,7 +11268,7 @@ var dynamic_tag_default = {
       const isClassAPI = tagExtra.featureType === "class";
       let tagExpression = node.name;
       if (import_compiler57.types.isStringLiteral(tagExpression)) {
-        tagExpression = (0, import_babel_utils48.importDefault)(
+        tagExpression = (0, import_babel_utils49.importDefault)(
           tag.hub.file,
           getTagRelativePath(tag),
           tagExpression.value
@@ -11268,15 +11276,15 @@ var dynamic_tag_default = {
       }
       if (isClassAPI) {
         if (isOutputHTML()) {
-          (0, import_babel_utils48.getProgram)().node.body.push(
+          (0, import_babel_utils49.getProgram)().node.body.push(
             import_compiler57.types.markoScriptlet(
               [
                 import_compiler57.types.expressionStatement(
                   import_compiler57.types.callExpression(
-                    (0, import_babel_utils48.importNamed)(tag.hub.file, getCompatRuntimeFile(), "s"),
+                    (0, import_babel_utils49.importNamed)(tag.hub.file, getCompatRuntimeFile(), "s"),
                     [
                       import_compiler57.types.identifier(tagExpression.name),
-                      import_compiler57.types.stringLiteral((0, import_babel_utils48.loadFileForTag)(tag).metadata.marko.id)
+                      import_compiler57.types.stringLiteral((0, import_babel_utils49.loadFileForTag)(tag).metadata.marko.id)
                     ]
                   )
                 )
@@ -11285,11 +11293,11 @@ var dynamic_tag_default = {
             )
           );
         } else {
-          (0, import_babel_utils48.getProgram)().node.body.push(
+          (0, import_babel_utils49.getProgram)().node.body.push(
             import_compiler57.types.expressionStatement(
               callRuntime(
                 "register",
-                import_compiler57.types.stringLiteral((0, import_babel_utils48.loadFileForTag)(tag).metadata.marko.id),
+                import_compiler57.types.stringLiteral((0, import_babel_utils49.loadFileForTag)(tag).metadata.marko.id),
                 import_compiler57.types.identifier(tagExpression.name)
               )
             )
@@ -11470,7 +11478,7 @@ var tag_default = {
   },
   analyze: {
     enter(tag) {
-      const tagDef = (0, import_babel_utils49.getTagDef)(tag);
+      const tagDef = (0, import_babel_utils50.getTagDef)(tag);
       const type = analyzeTagNameType(tag);
       const hook = tagDef?.analyzer?.hook;
       if (hook) {
@@ -11494,7 +11502,7 @@ var tag_default = {
       }
     },
     exit(tag) {
-      const hook = (0, import_babel_utils49.getTagDef)(tag)?.analyzer?.hook;
+      const hook = (0, import_babel_utils50.getTagDef)(tag)?.analyzer?.hook;
       if (hook) {
         exit(hook, tag);
         return;
@@ -11503,7 +11511,7 @@ var tag_default = {
   },
   translate: {
     enter(tag) {
-      const tagDef = (0, import_babel_utils49.getTagDef)(tag);
+      const tagDef = (0, import_babel_utils50.getTagDef)(tag);
       const extra = tag.node.extra;
       if (tagDef?.translator) {
         if (tagDef.translator.path) {
@@ -11520,7 +11528,7 @@ var tag_default = {
             );
           }
           if (attr2.node.modifier) {
-            if ((0, import_babel_utils49.isNativeTag)(attr2.parentPath)) {
+            if ((0, import_babel_utils50.isNativeTag)(attr2.parentPath)) {
               attr2.node.name += `:${attr2.node.modifier}`;
             } else {
               throw attr2.buildCodeFrameError(
@@ -11556,7 +11564,7 @@ var tag_default = {
       }
     },
     exit(tag) {
-      const translator = (0, import_babel_utils49.getTagDef)(tag)?.translator;
+      const translator = (0, import_babel_utils50.getTagDef)(tag)?.translator;
       if (translator) {
         exit(translator.hook, tag);
         return;

package/index.d.ts

@@ -50,7 +50,7 @@ declare global {
         next: Return extends { valueChange?(next: infer Next): any }
           ? Next
           : never,
-      ): void;
+      );
       update(input: Marko.TemplateInput<Input>): void;
       destroy(): void;
     };

package/package.json

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