marko 5.39.35 → 5.39.37

package/dist/runtime/helpers/dynamic-tag.js

@@ -178,6 +178,8 @@ function addTagsEvents(attrs, componentDef, customEvents) {
     var eventName = event[0];
     var handler = event[1];
     var extraArgs = event[3];
+    // A Class parent addresses a Tags child by the child's own camelCase prop
+    // (`onSetFilter`); a dashed name does not type-check against its `Input`.
     var prop = "on" + eventName.charAt(0).toUpperCase() + eventName.slice(1);
 
     if (IS_SERVER) {

package/dist/translator/index.js

@@ -152,7 +152,7 @@ const analyze = exports.analyze = {
       const childFile = (0, _babelUtils.loadFileForTag)(tag);
       if (childFile?.ast.program.extra?.featureType === "tags") {
         tag.node.extra.featureType = "tags";
-        (file.path.node.extra ??= {}).needsCompat = true;
+        markInteropBoundary(file, tag);
       }
     } else if ((0, _babelUtils.isDynamicTag)(tag)) {
       // A dynamic `<${expr}/>` whose name references an imported Tags API
@@ -169,7 +169,7 @@ const analyze = exports.analyze = {
           );
           if (childFile?.ast.program.extra?.featureType === "tags") {
             (tag.node.extra ??= {}).featureType = "tags";
-            (file.path.node.extra ??= {}).needsCompat = true;
+            markInteropBoundary(file, tag);
             return true;
           }
         }
@@ -702,6 +702,50 @@ function getRuntimeEntryFiles(output, optimize) {
 
 }
 
+/**
+ * Records what crosses into a Tags child so the page entry can link the client
+ * side of the boundary: anything passed at all is revived through the compat
+ * layer, and a direct function attribute is hoisted into this module and
+ * registered for resume, so the module itself has to load — a split component's
+ * browser file is not enough.
+ */
+function markInteropBoundary(file, tag) {
+  const extra = file.path.node.extra ??= {};
+  extra.needsCompat = true;
+
+  if (!extra.resumesClassFns) {
+    for (const attr of tag.get("attributes")) {
+      const value = attr.isMarkoAttribute() && attr.get("value");
+      if (
+      value && (
+      value.isFunctionExpression() || value.isArrowFunctionExpression()))
+      {
+        extra.resumesClassFns = true;
+        break;
+      }
+    }
+  }
+
+  if (
+  tag.node.body.body.length ||
+  tag.node.attributeTags.length ||
+  tag.node.attributes.some(isRevivedAttr))
+  {
+    extra.resumesCompat = true;
+  }
+}
+
+// A literal cannot be a Class renderer or a handler the Tags side revives, so
+// passing one does not pull the compat layer into the page entry.
+function isRevivedAttr(attr) {
+  return (
+    !_compiler.types.isMarkoAttribute(attr) ||
+    !!attr.arguments?.length ||
+    !_compiler.types.isLiteral(attr.value) ||
+    _compiler.types.isTemplateLiteral(attr.value));
+
+}
+
 function isRenderContent({ node }) {
   return /^Marko/.test(node.type) && !node.static;
 }
@@ -733,15 +777,25 @@ function getClassHydrationMode(file, visited = new Set()) {
   // A Tags template records interactivity on its program, not in metadata;
   // it hydrates itself, so a Class ancestor has to keep the boundary.
   if (file.ast.program.extra?.isInteractive) {
+    file.ast.program.extra.hydratesTags = true;
     return meta.classHydration = CLASS_HYDRATION_SELF;
   }
 
+  let mode;
   for (const tag of meta.tags) {
     if (tag.endsWith(".marko")) {
       const childFile = (0, _babelUtils.loadFileForImport)(file, tag);
       if (childFile && getClassHydrationMode(childFile, visited)) {
-        return meta.classHydration = CLASS_HYDRATION_DESCENDANT;
+        mode = CLASS_HYDRATION_DESCENDANT;
+        // A Tags descendant resumes through this boundary, which a Tags
+        // ancestor has to keep alive; a Class one hydrates on its own.
+        if (childFile.ast.program.extra?.hydratesTags) {
+          (file.ast.program.extra ??= {}).hydratesTags = true;
+          break;
+        }
       }
     }
   }
+
+  return mode && (meta.classHydration = mode);
 }

package/dist/translator/text/index[vdom].js

@@ -1,10 +1,8 @@
 "use strict";exports.__esModule = true;exports.default = _default;var _compiler = require("@marko/compiler");
-var _he = _interopRequireDefault(require("he"));
-
-
+var _babelUtils = require("@marko/compiler/babel-utils");
 
 var _vdomOutWrite = _interopRequireDefault(require("../util/vdom-out-write"));
-var _withPreviousLocation = _interopRequireDefault(require("../util/with-previous-location"));function _interopRequireDefault(e) {return e && e.__esModule ? e : { default: e };}const { decode } = _he.default;
+var _withPreviousLocation = _interopRequireDefault(require("../util/with-previous-location"));function _interopRequireDefault(e) {return e && e.__esModule ? e : { default: e };}
 
 function _default(path) {
   const { node } = path;
@@ -13,7 +11,7 @@ function _default(path) {
     (0, _withPreviousLocation.default)(
       (0, _vdomOutWrite.default)(
         "t",
-        _compiler.types.stringLiteral(decode(node.value)),
+        _compiler.types.stringLiteral((0, _babelUtils.decodeHTML)(node.value)),
         path.hub.file._componentInstanceIdentifier
       ),
       node

package/dist/translator/util/optimize-vdom-create.js

@@ -6,13 +6,11 @@ var _babelUtils = require("@marko/compiler/babel-utils");
 
 
 
-var _he = _interopRequireDefault(require("he"));
-
 
 
 var _attributes = _interopRequireDefault(require("../tag/native-tag[vdom]/attributes"));
 var _keyManager = require("./key-manager");
-var _vdomOutWrite = _interopRequireDefault(require("./vdom-out-write"));function _interopRequireDefault(e) {return e && e.__esModule ? e : { default: e };}const { decode } = _he.default;
+var _vdomOutWrite = _interopRequireDefault(require("./vdom-out-write"));function _interopRequireDefault(e) {return e && e.__esModule ? e : { default: e };}
 
 const skipDirectives = new Set([
 "key",
@@ -29,7 +27,7 @@ const mergeStaticCreateVisitor = {
     const { node } = path;
     state.currentRoot = _compiler.types.callExpression(
       _compiler.types.memberExpression(state.currentRoot, _compiler.types.identifier("t")),
-      [_compiler.types.stringLiteral(decode(node.value))]
+      [_compiler.types.stringLiteral((0, _babelUtils.decodeHTML)(node.value))]
     );
   },
   MarkoPlaceholder(path, state) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "5.39.35",
+  "version": "5.39.37",
   "private": false,
   "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
   "keywords": [
@@ -67,15 +67,14 @@
   },
   "types": "index.d.ts",
   "dependencies": {
-    "@marko/compiler": "^5.42.1",
-    "@marko/runtime-tags": "^6.3.41",
+    "@marko/compiler": "^5.42.3",
+    "@marko/runtime-tags": "^6.3.45",
     "app-module-path": "^2.2.0",
     "argly": "^1.2.0",
     "browser-refresh-client": "1.1.4",
     "complain": "^1.6.1",
     "csstype": "^3.2.3",
     "events-light": "^1.0.5",
-    "he": "^1.2.0",
     "listener-tracker": "^2.0.0",
     "magic-string": "^0.30.21",
     "minimatch": "^10.2.5",
@@ -85,7 +84,7 @@
     "warp10": "^2.1.0"
   },
   "devDependencies": {
-    "marko": "5.39.35"
+    "marko": "5.39.37"
   },
   "engines": {
     "node": ">=22"

package/src/runtime/helpers/dynamic-tag.js

@@ -178,6 +178,8 @@ function addTagsEvents(attrs, componentDef, customEvents) {
     var eventName = event[0];
     var handler = event[1];
     var extraArgs = event[3];
+    // A Class parent addresses a Tags child by the child's own camelCase prop
+    // (`onSetFilter`); a dashed name does not type-check against its `Input`.
     var prop = "on" + eventName.charAt(0).toUpperCase() + eventName.slice(1);
 
     if (IS_SERVER) {

package/src/translator/index.js

@@ -152,7 +152,7 @@ export const analyze = {
       const childFile = loadFileForTag(tag);
       if (childFile?.ast.program.extra?.featureType === "tags") {
         tag.node.extra.featureType = "tags";
-        (file.path.node.extra ??= {}).needsCompat = true;
+        markInteropBoundary(file, tag);
       }
     } else if (isDynamicTag(tag)) {
       // A dynamic `<${expr}/>` whose name references an imported Tags API
@@ -169,7 +169,7 @@ export const analyze = {
           );
           if (childFile?.ast.program.extra?.featureType === "tags") {
             (tag.node.extra ??= {}).featureType = "tags";
-            (file.path.node.extra ??= {}).needsCompat = true;
+            markInteropBoundary(file, tag);
             return true;
           }
         }
@@ -702,6 +702,50 @@ export function getRuntimeEntryFiles(output, optimize) {
   ];
 }
 
+/**
+ * Records what crosses into a Tags child so the page entry can link the client
+ * side of the boundary: anything passed at all is revived through the compat
+ * layer, and a direct function attribute is hoisted into this module and
+ * registered for resume, so the module itself has to load — a split component's
+ * browser file is not enough.
+ */
+function markInteropBoundary(file, tag) {
+  const extra = (file.path.node.extra ??= {});
+  extra.needsCompat = true;
+
+  if (!extra.resumesClassFns) {
+    for (const attr of tag.get("attributes")) {
+      const value = attr.isMarkoAttribute() && attr.get("value");
+      if (
+        value &&
+        (value.isFunctionExpression() || value.isArrowFunctionExpression())
+      ) {
+        extra.resumesClassFns = true;
+        break;
+      }
+    }
+  }
+
+  if (
+    tag.node.body.body.length ||
+    tag.node.attributeTags.length ||
+    tag.node.attributes.some(isRevivedAttr)
+  ) {
+    extra.resumesCompat = true;
+  }
+}
+
+// A literal cannot be a Class renderer or a handler the Tags side revives, so
+// passing one does not pull the compat layer into the page entry.
+function isRevivedAttr(attr) {
+  return (
+    !t.isMarkoAttribute(attr) ||
+    !!attr.arguments?.length ||
+    !t.isLiteral(attr.value) ||
+    t.isTemplateLiteral(attr.value)
+  );
+}
+
 function isRenderContent({ node }) {
   return /^Marko/.test(node.type) && !node.static;
 }
@@ -733,15 +777,25 @@ function getClassHydrationMode(file, visited = new Set()) {
   // A Tags template records interactivity on its program, not in metadata;
   // it hydrates itself, so a Class ancestor has to keep the boundary.
   if (file.ast.program.extra?.isInteractive) {
+    file.ast.program.extra.hydratesTags = true;
     return (meta.classHydration = CLASS_HYDRATION_SELF);
   }
 
+  let mode;
   for (const tag of meta.tags) {
     if (tag.endsWith(".marko")) {
       const childFile = loadFileForImport(file, tag);
       if (childFile && getClassHydrationMode(childFile, visited)) {
-        return (meta.classHydration = CLASS_HYDRATION_DESCENDANT);
+        mode = CLASS_HYDRATION_DESCENDANT;
+        // A Tags descendant resumes through this boundary, which a Tags
+        // ancestor has to keep alive; a Class one hydrates on its own.
+        if (childFile.ast.program.extra?.hydratesTags) {
+          (file.ast.program.extra ??= {}).hydratesTags = true;
+          break;
+        }
       }
     }
   }
+
+  return mode && (meta.classHydration = mode);
 }

package/src/translator/text/index[vdom].js

@@ -1,7 +1,5 @@
 import { types as t } from "@marko/compiler";
-import he from "he";
-
-const { decode } = he;
+import { decodeHTML } from "@marko/compiler/babel-utils";
 
 import write from "../util/vdom-out-write";
 import withPreviousLocation from "../util/with-previous-location";
@@ -13,7 +11,7 @@ export default function (path) {
     withPreviousLocation(
       write(
         "t",
-        t.stringLiteral(decode(node.value)),
+        t.stringLiteral(decodeHTML(node.value)),
         path.hub.file._componentInstanceIdentifier,
       ),
       node,

package/src/translator/util/optimize-vdom-create.js

@@ -6,9 +6,7 @@ import {
   isLoopTag,
   isNativeTag,
 } from "@marko/compiler/babel-utils";
-import he from "he";
-
-const { decode } = he;
+import { decodeHTML } from "@marko/compiler/babel-utils";
 
 import translateAttributes from "../tag/native-tag[vdom]/attributes";
 import { getKeyManager, hasUserKey } from "./key-manager";
@@ -29,7 +27,7 @@ const mergeStaticCreateVisitor = {
     const { node } = path;
     state.currentRoot = t.callExpression(
       t.memberExpression(state.currentRoot, t.identifier("t")),
-      [t.stringLiteral(decode(node.value))],
+      [t.stringLiteral(decodeHTML(node.value))],
     );
   },
   MarkoPlaceholder(path, state) {