marko 5.34.3 → 5.34.5

package/dist/core-tags/core/await/renderer.js

@@ -106,6 +106,7 @@ module.exports = function awaitTag(input, out) {
   };
 
   if (clientReorder) {
+    awaitInfo.parent = out;
     awaitInfo.after = input.showAfter;
 
     clientReorderContext =

package/dist/core-tags/core/await/reorderer-renderer.js

@@ -50,9 +50,27 @@ module.exports = function (input, out) {
     }
 
     function handleAwait(awaitInfo) {
+      let flushedScript = false;
+      let flushedContent = false;
+      let flushedPlaceholder = false;
+      awaitInfo.parent.on("c_", () => {
+        flushedPlaceholder = true;
+        if (!flushedScript && flushedContent) {
+          flushedScript = true;
+          asyncOut.script(
+            `$${reorderFunctionId}(` + (
+            typeof awaitInfo.id === "number" ?
+            awaitInfo.id :
+            '"' + awaitInfo.id + '"') + (
+            awaitInfo.after ? ',"' + awaitInfo.after + '"' : "") +
+            ")"
+          );
+        }
+      });
       awaitInfo.out.
       on("c_", out.emit.bind(out, "c_")).
       on("finish", function (result) {
+        flushedContent = true;
         if (!global._afRuntime) {
           // Minified version of ./client-reorder-runtime.js
           asyncOut.script(
@@ -86,14 +104,17 @@ module.exports = function (input, out) {
           );
         }
 
-        asyncOut.script(
-          `$${reorderFunctionId}(` + (
-          typeof awaitInfo.id === "number" ?
-          awaitInfo.id :
-          '"' + awaitInfo.id + '"') + (
-          awaitInfo.after ? ',"' + awaitInfo.after + '"' : "") +
-          ")"
-        );
+        if (!flushedScript && flushedPlaceholder) {
+          flushedScript = true;
+          asyncOut.script(
+            `$${reorderFunctionId}(` + (
+            typeof awaitInfo.id === "number" ?
+            awaitInfo.id :
+            '"' + awaitInfo.id + '"') + (
+            awaitInfo.after ? ',"' + awaitInfo.after + '"' : "") +
+            ")"
+          );
+        }
 
         awaitInfo.out.writer = asyncOut.writer;
 

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

@@ -81,13 +81,13 @@ exports.p = function (domCompat) {
 
   domCompat.patchConditionals((conditional) => (...args) => {
     const signal = conditional(...args);
-    const hasAttrs = args.length > 1;
+    const skipAttrs = args.length <= 1;
     return (scope, renderer, clean) => {
-      return signal(scope, create5to6Renderer(renderer, hasAttrs), clean);
+      return signal(scope, create5to6Renderer(renderer, skipAttrs), clean);
     };
   });
 
-  function create5to6Renderer(renderer, hasAttrs) {
+  function create5to6Renderer(renderer, skipAttrs) {
     let newRenderer = renderer;
     if (renderer && typeof renderer !== "string") {
       const rendererFromAnywhere =
@@ -115,7 +115,7 @@ exports.p = function (domCompat) {
           }
           newRenderer = domCompat.createRenderer(
             (scope) => {
-              if (!hasAttrs) {
+              if (skipAttrs) {
                 renderAndMorph(scope, rendererFromAnywhere, renderer, {});
               }
             },

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

@@ -12,8 +12,7 @@ exports.p = function (tagsAPI) {
     createRenderFn,
     fork,
     write,
-    makeSerializable,
-    register,
+    serializerRegister,
     writeScope,
     nextScopeId,
     getRegistryInfo
@@ -168,19 +167,11 @@ exports.p = function (tagsAPI) {
     }
   );
 
-  function dummyCreate5to6Renderer() {}
-
-  register(dummyCreate5to6Renderer, "@marko/tags-compat-5-to-6");
-
   return function serialized5to6(renderer, id) {
-    const dummyRenderer = () => {};
-    register(dummyRenderer, id);
-    return makeSerializable(renderer, (s) =>
-    s.
-    value(dummyCreate5to6Renderer).
-    code("(").
-    value(dummyRenderer).
-    code(",!0)")
+    return serializerRegister(
+      "@marko/tags-compat-5-to-6",
+      renderer,
+      serializerRegister(id, () => {})
     );
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "5.34.3",
+  "version": "5.34.5",
   "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
   "keywords": [
     "front-end",
@@ -64,8 +64,8 @@
     "build": "babel ./src --out-dir ./dist --extensions .js --copy-files --config-file ../../babel.config.js --env-name=production"
   },
   "dependencies": {
-    "@marko/compiler": "^5.36.1",
-    "@marko/translator-default": "^6.0.0",
+    "@marko/compiler": "^5.36.2",
+    "@marko/translator-default": "^6.0.1",
     "app-module-path": "^2.2.0",
     "argly": "^1.2.0",
     "browser-refresh-client": "1.1.4",

package/src/core-tags/core/await/renderer.js

@@ -106,6 +106,7 @@ module.exports = function awaitTag(input, out) {
   };
 
   if (clientReorder) {
+    awaitInfo.parent = out;
     awaitInfo.after = input.showAfter;
 
     clientReorderContext =

package/src/core-tags/core/await/reorderer-renderer.js

@@ -50,9 +50,27 @@ module.exports = function (input, out) {
     }
 
     function handleAwait(awaitInfo) {
+      let flushedScript = false;
+      let flushedContent = false;
+      let flushedPlaceholder = false;
+      awaitInfo.parent.on("___toString", () => {
+        flushedPlaceholder = true;
+        if (!flushedScript && flushedContent) {
+          flushedScript = true;
+          asyncOut.script(
+            `$${reorderFunctionId}(` +
+              (typeof awaitInfo.id === "number"
+                ? awaitInfo.id
+                : '"' + awaitInfo.id + '"') +
+              (awaitInfo.after ? ',"' + awaitInfo.after + '"' : "") +
+              ")",
+          );
+        }
+      });
       awaitInfo.out
         .on("___toString", out.emit.bind(out, "___toString"))
         .on("finish", function (result) {
+          flushedContent = true;
           if (!global._afRuntime) {
             // Minified version of ./client-reorder-runtime.js
             asyncOut.script(
@@ -86,14 +104,17 @@ module.exports = function (input, out) {
             );
           }
 
-          asyncOut.script(
-            `$${reorderFunctionId}(` +
-              (typeof awaitInfo.id === "number"
-                ? awaitInfo.id
-                : '"' + awaitInfo.id + '"') +
-              (awaitInfo.after ? ',"' + awaitInfo.after + '"' : "") +
-              ")",
-          );
+          if (!flushedScript && flushedPlaceholder) {
+            flushedScript = true;
+            asyncOut.script(
+              `$${reorderFunctionId}(` +
+                (typeof awaitInfo.id === "number"
+                  ? awaitInfo.id
+                  : '"' + awaitInfo.id + '"') +
+                (awaitInfo.after ? ',"' + awaitInfo.after + '"' : "") +
+                ")",
+            );
+          }
 
           awaitInfo.out.writer = asyncOut.writer;
 

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

@@ -81,13 +81,13 @@ exports.p = function (domCompat) {
 
   domCompat.patchConditionals((conditional) => (...args) => {
     const signal = conditional(...args);
-    const hasAttrs = args.length > 1;
+    const skipAttrs = args.length <= 1;
     return (scope, renderer, clean) => {
-      return signal(scope, create5to6Renderer(renderer, hasAttrs), clean);
+      return signal(scope, create5to6Renderer(renderer, skipAttrs), clean);
     };
   });
 
-  function create5to6Renderer(renderer, hasAttrs) {
+  function create5to6Renderer(renderer, skipAttrs) {
     let newRenderer = renderer;
     if (renderer && typeof renderer !== "string") {
       const rendererFromAnywhere =
@@ -115,7 +115,7 @@ exports.p = function (domCompat) {
           }
           newRenderer = domCompat.createRenderer(
             (scope) => {
-              if (!hasAttrs) {
+              if (skipAttrs) {
                 renderAndMorph(scope, rendererFromAnywhere, renderer, {});
               }
             },

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

@@ -12,8 +12,7 @@ exports.p = function (tagsAPI) {
     createRenderFn,
     fork,
     write,
-    makeSerializable,
-    register,
+    serializerRegister,
     writeScope,
     nextScopeId,
     getRegistryInfo,
@@ -168,19 +167,11 @@ exports.p = function (tagsAPI) {
     },
   );
 
-  function dummyCreate5to6Renderer() {}
-
-  register(dummyCreate5to6Renderer, "@marko/tags-compat-5-to-6");
-
   return function serialized5to6(renderer, id) {
-    const dummyRenderer = () => {};
-    register(dummyRenderer, id);
-    return makeSerializable(renderer, (s) =>
-      s
-        .value(dummyCreate5to6Renderer)
-        .code("(")
-        .value(dummyRenderer)
-        .code(",!0)"),
+    return serializerRegister(
+      "@marko/tags-compat-5-to-6",
+      renderer,
+      serializerRegister(id, () => {}),
     );
   };
 };