marko 5.38.3 → 5.38.4

package/dist/runtime/helpers/tags-compat/runtime-dom.js

@@ -2,6 +2,7 @@
 const {
   T_
 } = require("../../components/ComponentsContext");
+const ComponentDef = require("../../components/ComponentDef");
 const defineComponent = require("../../components/defineComponent");
 const { r: registerComponent } = require("../../components/registry");
 const createRenderer = require("../../components/renderer");
@@ -46,6 +47,14 @@ exports.p = function (domCompat) {
     this.bq_(customEvents, scopeId);
   };
 
+  const defDeserialize = ComponentDef._F_;
+  ComponentDef._F_ = function (o, types, global, registry) {
+    if (typeof o[2] === "number") {
+      o[2] = self[global.runtimeId][global.renderId].s[o[2]].m5i;
+    }
+    return defDeserialize(o, types, global, registry);
+  };
+
   const TagsCompatId = "tags-compat";
   const TagsCompat = createRenderer(
     function (_, out, componentDef, component) {

package/dist/runtime/helpers/tags-compat/runtime-html.js

@@ -43,7 +43,7 @@ exports.p = function (htmlCompat) {
       writers.classAPI = [];
     }
 
-    if (componentDefs) {
+    if (componentDefs?.length) {
       scripts = _h_($global, componentDefs);
       if (scripts) {
         htmlCompat.ensureState($global).walkOnNextFlush = true;
@@ -198,11 +198,15 @@ exports.p = function (htmlCompat) {
 
         const componentDef = componentsContext.b_[0];
         if (componentDef) {
-          htmlCompat.writeSetScopeForComponent(branchId, componentDef.id);
+          const rawInput = componentDef.s_.P_;
+          const { toJSON: _, ...serializeInput } = rawInput;
           componentDef.s_.X_ = customEvents;
-          if (componentDef.s_.P_.toJSON) {
-            componentDef.s_.P_.toJSON = undefined;
-          }
+          rawInput.toJSON = () => branchId;
+          htmlCompat.writeSetScopeForComponent(
+            branchId,
+            componentDef.id,
+            serializeInput
+          );
         }
       } else {
         renderBody5(out, input, ...args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "5.38.3",
+  "version": "5.38.4",
   "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
   "keywords": [
     "front-end",
@@ -71,7 +71,7 @@
   "dependencies": {
     "@babel/runtime": "^7.28.2",
     "@marko/compiler": "^5.39.45",
-    "@marko/runtime-tags": "^6.0.122",
+    "@marko/runtime-tags": "^6.0.123",
     "app-module-path": "^2.2.0",
     "argly": "^1.2.0",
     "browser-refresh-client": "1.1.4",

package/src/runtime/helpers/tags-compat/runtime-dom.js

@@ -2,6 +2,7 @@ const { ___componentLookup } = require("@internal/components-util");
 const {
   ___getComponentsContext,
 } = require("../../components/ComponentsContext");
+const ComponentDef = require("../../components/ComponentDef");
 const defineComponent = require("../../components/defineComponent");
 const { r: registerComponent } = require("../../components/registry");
 const createRenderer = require("../../components/renderer");
@@ -46,6 +47,14 @@ exports.p = function (domCompat) {
     this.___setCustomEventsOriginal(customEvents, scopeId);
   };
 
+  const defDeserialize = ComponentDef.___deserialize;
+  ComponentDef.___deserialize = function (o, types, global, registry) {
+    if (typeof o[2] === "number") {
+      o[2] = self[global.runtimeId][global.renderId].s[o[2]].m5i;
+    }
+    return defDeserialize(o, types, global, registry);
+  };
+
   const TagsCompatId = "tags-compat";
   const TagsCompat = createRenderer(
     function (_, out, componentDef, component) {

package/src/runtime/helpers/tags-compat/runtime-html.js

@@ -43,7 +43,7 @@ exports.p = function (htmlCompat) {
       writers.classAPI = [];
     }
 
-    if (componentDefs) {
+    if (componentDefs?.length) {
       scripts = ___getInitComponentsCodeForDefs($global, componentDefs);
       if (scripts) {
         htmlCompat.ensureState($global).walkOnNextFlush = true;
@@ -198,11 +198,15 @@ exports.p = function (htmlCompat) {
 
         const componentDef = componentsContext.___components[0];
         if (componentDef) {
-          htmlCompat.writeSetScopeForComponent(branchId, componentDef.id);
+          const rawInput = componentDef.___component.___input;
+          const { toJSON: _, ...serializeInput } = rawInput;
           componentDef.___component.___customEvents = customEvents;
-          if (componentDef.___component.___input.toJSON) {
-            componentDef.___component.___input.toJSON = undefined;
-          }
+          rawInput.toJSON = () => branchId;
+          htmlCompat.writeSetScopeForComponent(
+            branchId,
+            componentDef.id,
+            serializeInput,
+          );
         }
       } else {
         renderBody5(out, input, ...args);