marko 6.0.124 → 6.0.126

package/dist/translator/index.js

@@ -30,15 +30,15 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/translator/index.ts
 var index_exports = {};
 __export(index_exports, {
-  analyze: () => analyze2,
+  analyze: () => analyze,
   createInteropTranslator: () => createInteropTranslator,
-  getRuntimeEntryFiles: () => getRuntimeEntryFiles2,
+  getRuntimeEntryFiles: () => getRuntimeEntryFiles,
   internalEntryBuilder: () => entry_builder_default,
   preferAPI: () => preferAPI,
-  tagDiscoveryDirs: () => tagDiscoveryDirs2,
-  taglibs: () => taglibs2,
-  transform: () => transform2,
-  translate: () => translate2
+  tagDiscoveryDirs: () => tagDiscoveryDirs,
+  taglibs: () => taglibs,
+  transform: () => transform,
+  translate: () => translate
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -1619,14 +1619,14 @@ function analyzeTagNameType(tag, allowDynamic) {
     }
     if (!extra.tagNameDynamic && extra.tagNameType === 1 /* CustomTag */ && !isCoreTag(tag)) {
       const childFile = (0, import_babel_utils9.loadFileForTag)(tag);
-      if (!childFile) {
-        extra.tagNameType = 2 /* DynamicTag */;
-        extra.tagNameDynamic = true;
-      } else if (childFile.ast.program.extra.featureType === "class") {
+      if ((0, import_babel_utils9.getTagDef)(tag)?.renderer || childFile?.ast.program.extra.featureType === "class") {
         extra.tagNameType = 2 /* DynamicTag */;
         extra.tagNameDynamic = true;
         extra.featureType = "class";
         ((0, import_babel_utils9.getProgram)().node.extra ??= {}).needsCompat = true;
+      } else if (!childFile) {
+        extra.tagNameType = 2 /* DynamicTag */;
+        extra.tagNameDynamic = true;
       }
     }
   }
@@ -5498,13 +5498,26 @@ function translateVar(tag, initialValue, kind = "const") {
     const changeName = binding.property + "Change";
     const changeBinding = binding.upstreamAlias.propertyAliases.get(changeName);
     if (changeBinding && changeName !== changeBinding.name) {
-      getDestructurePattern(id)?.pushContainer(
-        "properties",
-        import_compiler32.types.objectProperty(
-          import_compiler32.types.identifier(changeName),
-          import_compiler32.types.identifier(changeBinding.name)
-        )
-      );
+      const pattern = getDestructurePattern(id);
+      if (pattern) {
+        pattern.unshiftContainer(
+          "properties",
+          import_compiler32.types.objectProperty(
+            import_compiler32.types.identifier(changeName),
+            import_compiler32.types.identifier(changeBinding.name)
+          )
+        );
+        const lastProperty = pattern.get("properties").at(-1);
+        if (lastProperty?.node.type === "RestElement") {
+          const restBinding = lastProperty.node.argument.extra?.binding;
+          if (restBinding) {
+            restBinding.excludeProperties = propsUtil.add(
+              restBinding.excludeProperties,
+              changeName
+            );
+          }
+        }
+      }
     }
   });
   tag.insertBefore(
@@ -6487,7 +6500,9 @@ function getOnlyChildParentTagName(tag, branchSize = 1) {
     return extra[kOnlyChildInParent];
   }
   const parentTag = getParentTag(tag);
-  return extra[kOnlyChildInParent] = parentTag && (0, import_babel_utils22.getTagDef)(parentTag)?.html && parentTag.node.name.type === "StringLiteral" && tag.parent.body.length === branchSize ? parentTag.node.name.value : false;
+  return extra[kOnlyChildInParent] = parentTag && (0, import_babel_utils22.getTagDef)(parentTag)?.html && parentTag.node.name.type === "StringLiteral" && tag.parent.body.filter(
+    (node) => node.type !== "MarkoComment"
+  ).length === branchSize ? parentTag.node.name.value : false;
 }
 function getOptimizedOnlyChildNodeBinding(tag, section, branchSize = 1) {
   if (getOnlyChildParentTagName(tag, branchSize)) {
@@ -11874,7 +11889,7 @@ function getTagRelativePath(tag) {
   } = tag;
   let relativePath;
   if (import_compiler61.types.isStringLiteral(node.name)) {
-    const template = (0, import_babel_utils49.getTagTemplate)(tag);
+    const template = node.extra?.featureType === "class" && (0, import_babel_utils49.getTagDef)(tag)?.renderer || (0, import_babel_utils49.getTagTemplate)(tag);
     relativePath = template && (0, import_babel_utils49.resolveRelativePath)(file, template);
   } else if (node.extra?.tagNameImported) {
     relativePath = node.extra.tagNameImported;
@@ -12342,7 +12357,6 @@ var text_default = {
 var import_generator = __toESM(require("@babel/generator"));
 var import_compiler65 = require("@marko/compiler");
 var import_babel_utils53 = require("@marko/compiler/babel-utils");
-var translate6 = __toESM(require("@marko/runtime-tags/translator"));
 var import_path6 = __toESM(require("path"));
 
 // src/translator/interop/feature-detection.ts
@@ -12573,23 +12587,23 @@ function addFeature(state, type, name2, path7) {
 function createInteropTranslator(translate5) {
   return {
     preferAPI: translate5.preferAPI,
-    transform: mergeVisitors(translate5.transform, translate6.transform),
-    analyze: mergeVisitors(translate5.analyze, translate6.analyze),
+    transform: mergeVisitors(translate5.transform, transform),
+    analyze: mergeVisitors(translate5.analyze, analyze),
     translate: patchTranslateProgram(
-      mergeVisitors(translate5.translate, translate6.translate)
+      mergeVisitors(translate5.translate, translate)
     ),
     tagDiscoveryDirs: [
-      ...translate6.tagDiscoveryDirs,
+      ...tagDiscoveryDirs,
       ...translate5.tagDiscoveryDirs
     ],
     taglibs: mergeTaglibs(
       import_compiler65.taglib.resolveOptionalTaglibs(translate5.optionalTaglibs).concat(translate5.taglibs),
-      translate6.taglibs
+      taglibs
     ),
     getRuntimeEntryFiles(output, optimize) {
       return [
         ...translate5.getRuntimeEntryFiles(output, optimize),
-        ...translate6.getRuntimeEntryFiles(output, optimize)
+        ...getRuntimeEntryFiles(output, optimize)
       ];
     }
   };
@@ -12627,7 +12641,7 @@ function createInteropTranslator(translate5) {
             return [
               importHydrateProgram(
                 "6",
-                translate6.internalEntryBuilder.build(entryFile, true)
+                entry_builder_default.build(entryFile, true)
               ),
               importHydrateProgram(
                 "5",
@@ -12644,7 +12658,7 @@ function createInteropTranslator(translate5) {
             return translate5.internalEntryBuilder.build(entryFile);
           }
         } else {
-          return translate6.internalEntryBuilder.build(entryFile);
+          return entry_builder_default.build(entryFile);
         }
       },
       visit(file, entryFile, visitChild) {
@@ -12654,7 +12668,7 @@ function createInteropTranslator(translate5) {
         };
         if (isTagsAPI(file)) {
           state.has6 = true;
-          translate6.internalEntryBuilder.visit(file, entryFile, visitChild);
+          entry_builder_default.visit(file, entryFile, visitChild);
         } else {
           state.has5 = true;
           translate5.internalEntryBuilder.visit(file, entryFile, visitChild);
@@ -12857,10 +12871,10 @@ var visitors = extractVisitors({
   MarkoScriptlet: scriptlet_default,
   MarkoComment: comment_default
 });
-var tagDiscoveryDirs2 = ["tags"];
+var tagDiscoveryDirs = ["tags"];
 var preferAPI = "tags";
-var { transform: transform2, analyze: analyze2, translate: translate2 } = visitors;
-var taglibs2 = [
+var { transform, analyze, translate } = visitors;
+var taglibs = [
   [
     core_default.taglibId,
     {
@@ -12869,7 +12883,7 @@ var taglibs2 = [
     }
   ]
 ];
-function getRuntimeEntryFiles2(output, optimize) {
+function getRuntimeEntryFiles(output, optimize) {
   return [
     `${runtime_info_default.name}${optimize ? "" : "/debug"}/${output === "html" ? "html" : "dom"}`
   ];

package/dist/translator/util/translate-var.d.ts

@@ -1,4 +1,4 @@
 import { types as t } from "@marko/compiler";
-import type { Binding } from "./references";
+import { type Binding } from "./references";
 export default function translateVar(tag: t.NodePath<t.MarkoTag>, initialValue: t.Expression, kind?: "let" | "const"): void;
 export declare function translateDomVar(tag: t.NodePath<t.MarkoTag>, binding: Binding | undefined): void;

package/package.json

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