marko 5.39.30 → 5.39.32

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

@@ -178,7 +178,7 @@ exports.p = function (domCompat) {
         );
       }
       host = rootNode.startNode;
-      domCompat.setScopeNodes(host, rootNode.startNode, rootNode.endNode);
+      domCompat.setScopeNodes(scope, rootNode.startNode, rootNode.endNode);
     }
     const existingComponent = scope.bs_;
     const componentsContext = T_(out);

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

@@ -39,38 +39,45 @@ exports.p = function (htmlCompat) {
     const { classAPI, tagsAPI } = writers;
     let scripts = "";
     let componentDefs = flushDefs;
+    let chunk;
 
     if (classAPI.length) {
       componentDefs = flushDefs ? flushDefs.concat(classAPI) : classAPI;
       writers.classAPI = [];
     }
 
+    if (tagsAPI.length) {
+      chunk = tagsAPI[0];
+      for (let i = 1; i < tagsAPI.length; i++) {
+        chunk.append(tagsAPI[i]);
+      }
+      writers.tagsAPI = [];
+    }
+
     if (componentDefs?.length) {
-      scripts = _h_($global, componentDefs);
+      // Serializing a bridged handler registers a tags scope, so it needs a chunk:
+      // this flush's, else the one rendering, else a new one for a direct render.
+      const live = chunk || htmlCompat.getChunk();
+      const target = live || htmlCompat.createChunk($global);
+      scripts = htmlCompat.withChunk(target, () =>
+      _h_($global, componentDefs)
+      );
       if (scripts) {
         htmlCompat.ensureState($global).walkOnNextFlush = true;
 
-        if (!tagsAPI.length) {
-          scripts = concatScripts(htmlCompat.flushScript($global), scripts);
+        if (!chunk) {
+          scripts = concatScripts(
+            live ?
+            htmlCompat.flushScript($global) :
+            htmlCompat.flushScript($global, target),
+            scripts
+          );
         }
       }
     }
 
-    if (tagsAPI.length) {
-      const [chunk] = tagsAPI;
-      for (let i = 1; i < tagsAPI.length; i++) {
-        chunk.append(tagsAPI[i]);
-      }
-
-      chunk.boundary.flush();
-      if (chunk.boundary.count) {
-        throw new Error(
-          "Cannot serialize promise across tags/class compat layer."
-        );
-      }
-
-      scripts = concatScripts(chunk.flushScript().scripts, scripts);
-      writers.tagsAPI = [];
+    if (chunk) {
+      scripts = concatScripts(htmlCompat.flushScript($global, chunk), scripts);
     }
 
     return scripts;
@@ -93,9 +100,8 @@ exports.p = function (htmlCompat) {
 
     return (input, out) => {
       if (!tagsRenderer && renderBody) {
-        renderBody.toJSON = htmlCompat.toJSON(
-          htmlCompat.ensureState(out.global)
-        );
+        htmlCompat.ensureState(out.global);
+        renderBody.toJSON = htmlCompat.toJSON();
       }
       TagsCompat(
         args ?
@@ -128,6 +134,7 @@ exports.p = function (htmlCompat) {
       const tagsRenderer = _.r;
       const willRerender = componentDef._wrr || htmlCompat.isInResumedBranch();
       out.bf("1", component, willRerender);
+      htmlCompat.registerClassFunctions(input);
       // A split parent won't re-feed the child a live handler at hydration, so
       // register the child scope to let the resolver revive a bridged marker.
       htmlCompat.render(
@@ -173,7 +180,7 @@ exports.p = function (htmlCompat) {
     return (input, ...args) => {
       // tags to class
       const $global = htmlCompat.$global();
-      const state = htmlCompat.ensureState($global);
+      htmlCompat.ensureState($global);
       const out = defaultCreateOut($global);
       const branchId = htmlCompat.nextScopeId();
       let forceBoundary = boundaryModeByRenderer.get(tag);
@@ -192,7 +199,7 @@ exports.p = function (htmlCompat) {
             value]
             );
             forceBoundary = true;
-            value.toJSON = htmlCompat.toJSON(state);
+            value.toJSON = htmlCompat.toJSON();
           } else {
             input[key === "content" ? "renderBody" : key] = value;
           }

package/dist/translator/util/load-import.js

@@ -22,6 +22,26 @@ function analyzeLoadImport(importDecl, tagEntry) {
 
   if (!loadAttrPath) return;
 
+  const loadImport = getLoadImportConfig(loadAttrPath.get("value"));
+
+  if ((importDecl.node.importKind || "value") !== "value") {
+    throw importDecl.buildCodeFrameError("Invalid load import.");
+  }
+
+  for (const specifier of importDecl.get("specifiers")) {
+    if (!_compiler.types.isImportDefaultSpecifier(specifier.node)) {
+      throw specifier.buildCodeFrameError(
+        "Invalid load import, only a default specifier is allowed."
+      );
+    }
+  }
+
+  if (!importDecl.node.specifiers.some(_compiler.types.isImportDefaultSpecifier)) {
+    throw importDecl.buildCodeFrameError(
+      "Invalid load import, a default specifier is required."
+    );
+  }
+
   // Under hot reload every module is already eagerly loaded, so the lazy facade
   // buys nothing and its HMR-cached template collides with the real template's
   // `_` slot, recursing on render (see load-tag-browser.js). Without `linkAssets`
@@ -33,28 +53,13 @@ function analyzeLoadImport(importDecl, tagEntry) {
     return;
   }
 
-  const loadAttrValuePath = loadAttrPath.get("value");
-
   if (!tagEntry) {
     throw importDecl.buildCodeFrameError(
       "Unable to resolve marko file for load import."
     );
   }
 
-  if ((importDecl.node.importKind || "value") !== "value") {
-    throw importDecl.buildCodeFrameError("Invalid load import.");
-  }
-
-  for (const specifier of importDecl.get("specifiers")) {
-    if (!_compiler.types.isImportDefaultSpecifier(specifier.node)) {
-      throw specifier.buildCodeFrameError(
-        "Invalid load import, only a default specifier is allowed."
-      );
-    }
-  }
-
-  (importDecl.node.extra ??= {}).loadImport =
-  getLoadImportConfig(loadAttrValuePath);
+  (importDecl.node.extra ??= {}).loadImport = loadImport;
 }
 
 function translateLoadTag(path, tagName, relativePath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "5.39.30",
+  "version": "5.39.32",
   "private": false,
   "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
   "keywords": [
@@ -67,8 +67,8 @@
   },
   "types": "index.d.ts",
   "dependencies": {
-    "@marko/compiler": "^5.41.10",
-    "@marko/runtime-tags": "^6.3.26",
+    "@marko/compiler": "^5.41.18",
+    "@marko/runtime-tags": "^6.3.34",
     "app-module-path": "^2.2.0",
     "argly": "^1.2.0",
     "browser-refresh-client": "1.1.4",
@@ -85,7 +85,7 @@
     "warp10": "^2.1.0"
   },
   "devDependencies": {
-    "marko": "5.39.30"
+    "marko": "5.39.32"
   },
   "engines": {
     "node": ">=22"

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

@@ -178,7 +178,7 @@ exports.p = function (domCompat) {
         );
       }
       host = rootNode.startNode;
-      domCompat.setScopeNodes(host, rootNode.startNode, rootNode.endNode);
+      domCompat.setScopeNodes(scope, rootNode.startNode, rootNode.endNode);
     }
     const existingComponent = scope.___marko5Component;
     const componentsContext = ___getComponentsContext(out);

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

@@ -39,38 +39,45 @@ exports.p = function (htmlCompat) {
     const { classAPI, tagsAPI } = writers;
     let scripts = "";
     let componentDefs = flushDefs;
+    let chunk;
 
     if (classAPI.length) {
       componentDefs = flushDefs ? flushDefs.concat(classAPI) : classAPI;
       writers.classAPI = [];
     }
 
+    if (tagsAPI.length) {
+      chunk = tagsAPI[0];
+      for (let i = 1; i < tagsAPI.length; i++) {
+        chunk.append(tagsAPI[i]);
+      }
+      writers.tagsAPI = [];
+    }
+
     if (componentDefs?.length) {
-      scripts = ___getInitComponentsCodeForDefs($global, componentDefs);
+      // Serializing a bridged handler registers a tags scope, so it needs a chunk:
+      // this flush's, else the one rendering, else a new one for a direct render.
+      const live = chunk || htmlCompat.getChunk();
+      const target = live || htmlCompat.createChunk($global);
+      scripts = htmlCompat.withChunk(target, () =>
+        ___getInitComponentsCodeForDefs($global, componentDefs),
+      );
       if (scripts) {
         htmlCompat.ensureState($global).walkOnNextFlush = true;
 
-        if (!tagsAPI.length) {
-          scripts = concatScripts(htmlCompat.flushScript($global), scripts);
+        if (!chunk) {
+          scripts = concatScripts(
+            live
+              ? htmlCompat.flushScript($global)
+              : htmlCompat.flushScript($global, target),
+            scripts,
+          );
         }
       }
     }
 
-    if (tagsAPI.length) {
-      const [chunk] = tagsAPI;
-      for (let i = 1; i < tagsAPI.length; i++) {
-        chunk.append(tagsAPI[i]);
-      }
-
-      chunk.boundary.flush();
-      if (chunk.boundary.count) {
-        throw new Error(
-          "Cannot serialize promise across tags/class compat layer.",
-        );
-      }
-
-      scripts = concatScripts(chunk.flushScript().scripts, scripts);
-      writers.tagsAPI = [];
+    if (chunk) {
+      scripts = concatScripts(htmlCompat.flushScript($global, chunk), scripts);
     }
 
     return scripts;
@@ -93,9 +100,8 @@ exports.p = function (htmlCompat) {
 
     return (input, out) => {
       if (!tagsRenderer && renderBody) {
-        renderBody.toJSON = htmlCompat.toJSON(
-          htmlCompat.ensureState(out.global),
-        );
+        htmlCompat.ensureState(out.global);
+        renderBody.toJSON = htmlCompat.toJSON();
       }
       TagsCompat(
         args
@@ -128,6 +134,7 @@ exports.p = function (htmlCompat) {
       const tagsRenderer = _.r;
       const willRerender = componentDef._wrr || htmlCompat.isInResumedBranch();
       out.bf("1", component, willRerender);
+      htmlCompat.registerClassFunctions(input);
       // A split parent won't re-feed the child a live handler at hydration, so
       // register the child scope to let the resolver revive a bridged marker.
       htmlCompat.render(
@@ -173,7 +180,7 @@ exports.p = function (htmlCompat) {
     return (input, ...args) => {
       // tags to class
       const $global = htmlCompat.$global();
-      const state = htmlCompat.ensureState($global);
+      htmlCompat.ensureState($global);
       const out = defaultCreateOut($global);
       const branchId = htmlCompat.nextScopeId();
       let forceBoundary = boundaryModeByRenderer.get(tag);
@@ -192,7 +199,7 @@ exports.p = function (htmlCompat) {
               value,
             ]);
             forceBoundary = true;
-            value.toJSON = htmlCompat.toJSON(state);
+            value.toJSON = htmlCompat.toJSON();
           } else {
             input[key === "content" ? "renderBody" : key] = value;
           }

package/src/translator/util/load-import.js

@@ -22,6 +22,26 @@ export function analyzeLoadImport(importDecl, tagEntry) {
 
   if (!loadAttrPath) return;
 
+  const loadImport = getLoadImportConfig(loadAttrPath.get("value"));
+
+  if ((importDecl.node.importKind || "value") !== "value") {
+    throw importDecl.buildCodeFrameError("Invalid load import.");
+  }
+
+  for (const specifier of importDecl.get("specifiers")) {
+    if (!t.isImportDefaultSpecifier(specifier.node)) {
+      throw specifier.buildCodeFrameError(
+        "Invalid load import, only a default specifier is allowed.",
+      );
+    }
+  }
+
+  if (!importDecl.node.specifiers.some(t.isImportDefaultSpecifier)) {
+    throw importDecl.buildCodeFrameError(
+      "Invalid load import, a default specifier is required.",
+    );
+  }
+
   // Under hot reload every module is already eagerly loaded, so the lazy facade
   // buys nothing and its HMR-cached template collides with the real template's
   // `_` slot, recursing on render (see load-tag-browser.js). Without `linkAssets`
@@ -33,28 +53,13 @@ export function analyzeLoadImport(importDecl, tagEntry) {
     return;
   }
 
-  const loadAttrValuePath = loadAttrPath.get("value");
-
   if (!tagEntry) {
     throw importDecl.buildCodeFrameError(
       "Unable to resolve marko file for load import.",
     );
   }
 
-  if ((importDecl.node.importKind || "value") !== "value") {
-    throw importDecl.buildCodeFrameError("Invalid load import.");
-  }
-
-  for (const specifier of importDecl.get("specifiers")) {
-    if (!t.isImportDefaultSpecifier(specifier.node)) {
-      throw specifier.buildCodeFrameError(
-        "Invalid load import, only a default specifier is allowed.",
-      );
-    }
-  }
-
-  (importDecl.node.extra ??= {}).loadImport =
-    getLoadImportConfig(loadAttrValuePath);
+  (importDecl.node.extra ??= {}).loadImport = loadImport;
 }
 
 export function translateLoadTag(path, tagName, relativePath) {