marko 6.0.0-next.3.58 → 6.0.0-next.3.60

package/dist/translator/index.js

@@ -649,8 +649,10 @@ function toMemberExpression(object, key, optional) {
 
 // src/translator/util/runtime.ts
 var pureFunctions = [
+  "awaitTag",
   "conditional",
   "conditionalClosure",
+  "createTry",
   "dynamicTag",
   "createRenderer",
   "createContent",
@@ -1263,6 +1265,8 @@ function getNodeContentType(path5, extraMember, contentInfo) {
             return 3 /* Tag */;
           case "for":
           case "if":
+          case "await":
+          case "try":
             return 1 /* Dynamic */;
           default:
             return null;
@@ -2194,7 +2198,8 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
           scopeIdentifier,
           import_compiler17.types.identifier(referencedBindings.name)
         ]);
-        return isDynamicClosure(section, referencedBindings) ? callRuntime(
+        const closureSignalBuilder = getClosureSignalBuilder(section);
+        return !closureSignalBuilder || isDynamicClosure(section, referencedBindings) ? callRuntime(
           "dynamicClosureRead",
           getScopeAccessorLiteral(referencedBindings),
           render,
@@ -4349,6 +4354,7 @@ function isStatefulBinding(binding) {
 }
 
 // src/translator/core/await.ts
+var kDOMBinding = Symbol("await tag dom binding");
 var await_default = {
   analyze(tag) {
     (0, import_babel_utils12.assertNoVar)(tag);
@@ -4356,7 +4362,17 @@ var await_default = {
     assertNoSpreadAttrs(tag);
     (0, import_babel_utils12.assertNoAttributeTags)(tag);
     const { node } = tag;
+    const tagBody = tag.get("body");
+    const section = getOrCreateSection(tag);
     const [valueAttr] = node.attributes;
+    const tagExtra = tag.node.extra ??= {};
+    tagExtra[kDOMBinding] = createBinding(
+      "#text",
+      0 /* dom */,
+      section,
+      void 0,
+      tagExtra
+    );
     if (!valueAttr) {
       throw tag.get("name").buildCodeFrameError("The `await` tag requires a value.");
     }
@@ -4373,10 +4389,11 @@ var await_default = {
         "The `await` tag only supports a single parameter."
       );
     }
+    startSection(tagBody);
     getOrCreateSection(tag);
     trackParamsReferences(
-      tag.get("body"),
-      4 /* derived */,
+      tagBody,
+      3 /* param */,
       void 0,
       evaluate(valueAttr.value)
     );
@@ -4396,7 +4413,10 @@ var await_default = {
       exit(tag) {
         const { node } = tag;
         const [valueAttr] = node.attributes;
+        const tagExtra = node.extra;
+        const nodeRef2 = tagExtra[kDOMBinding];
         const tagBody = tag.get("body");
+        const section = getSection(tag);
         const bodySection = getSectionForBody(tagBody);
         if (isStatefulReferences(valueAttr.extra?.referencedBindings) || checkStatefulClosures(bodySection, true)) {
           setForceResumeScope(bodySection);
@@ -4407,6 +4427,8 @@ var await_default = {
           import_compiler23.types.expressionStatement(
             callRuntime(
               "fork",
+              getScopeIdIdentifier(section),
+              getScopeAccessorLiteral(nodeRef2),
               valueAttr.value,
               import_compiler23.types.arrowFunctionExpression(
                 node.body.params,
@@ -4426,8 +4448,29 @@ var await_default = {
           return;
         }
         setSectionParentIsOwner(bodySection, true);
+        visit(tag, 37 /* Replace */);
+        enterShallow(tag);
       },
       exit(tag) {
+        const { node } = tag;
+        const tagExtra = node.extra;
+        const nodeRef2 = tagExtra[kDOMBinding];
+        const section = getSection(tag);
+        const bodySection = getSectionForBody(tag.get("body"));
+        const signal = getSignal(section, nodeRef2, "await");
+        signal.build = () => {
+          return callRuntime(
+            "awaitTag",
+            getScopeAccessorLiteral(nodeRef2),
+            import_compiler23.types.identifier(bodySection.name)
+          );
+        };
+        addValue(
+          section,
+          tag.node.attributes[0].value.extra?.referencedBindings,
+          signal,
+          tag.node.attributes[0].value
+        );
         tag.remove();
       }
     }
@@ -8231,6 +8274,7 @@ var style_default = {
 // src/translator/core/try.ts
 var import_compiler48 = require("@marko/compiler");
 var import_babel_utils37 = require("@marko/compiler/babel-utils");
+var kDOMBinding2 = Symbol("try tag dom binding");
 var try_default = {
   analyze(tag) {
     (0, import_babel_utils37.assertNoVar)(tag);
@@ -8241,9 +8285,19 @@ var try_default = {
     analyzeAttributeTags(tag);
     const { node } = tag;
     const section = getOrCreateSection(tag);
+    const tagExtra = tag.node.extra ??= {};
+    const tagBody = tag.get("body");
+    tagExtra[kDOMBinding2] = createBinding(
+      "#text",
+      0 /* dom */,
+      section,
+      void 0,
+      tagExtra
+    );
     if (!node.body.body.length) {
       throw tag.get("name").buildCodeFrameError("The `try` tag requires body content.");
     }
+    startSection(tagBody);
     mergeReferences(section, tag.node, getAllTagReferenceNodes(tag.node));
   },
   translate: translateByTarget({
@@ -8253,12 +8307,27 @@ var try_default = {
           tag.remove();
           return;
         }
-        setAllSectionsParentIsOwner(tag);
+        const tagBody = tag.get("body");
+        const bodySection = getSectionForBody(tagBody);
+        setSectionParentIsOwner(bodySection, true);
         flushBefore(tag);
       },
       exit(tag) {
+        const { node } = tag;
+        const section = getSection(tag);
+        const tagExtra = node.extra;
         const tagBody = tag.get("body");
         const translatedAttrs = translateAttrs(tag);
+        const nodeRef2 = tagExtra[kDOMBinding2];
+        const contentProp = getTranslatedBodyContentProperty(
+          translatedAttrs.properties
+        );
+        if (contentProp) {
+          translatedAttrs.properties.splice(
+            translatedAttrs.properties.indexOf(contentProp),
+            1
+          );
+        }
         flushInto(tag);
         writeHTMLResumeStatements(tagBody);
         tag.insertBefore(translatedAttrs.statements);
@@ -8266,6 +8335,9 @@ var try_default = {
           import_compiler48.types.expressionStatement(
             callRuntime(
               "tryContent",
+              getScopeIdIdentifier(section),
+              getScopeAccessorLiteral(nodeRef2),
+              contentProp?.value,
               propsToExpression(translatedAttrs.properties)
             )
           )
@@ -8274,9 +8346,56 @@ var try_default = {
     },
     dom: {
       enter(tag) {
-        setAllSectionsParentIsOwner(tag);
+        const tagBody = tag.get("body");
+        const bodySection = getSectionForBody(tagBody);
+        setSectionParentIsOwner(bodySection, true);
+        visit(tag, 37 /* Replace */);
+        enterShallow(tag);
       },
       exit(tag) {
+        const { node } = tag;
+        const tagExtra = node.extra;
+        const nodeRef2 = tagExtra[kDOMBinding2];
+        const referencedBindings = tagExtra.referencedBindings;
+        const translatedAttrs = translateAttrs(tag);
+        const contentProp = getTranslatedBodyContentProperty(
+          translatedAttrs.properties
+        );
+        if (contentProp) {
+          translatedAttrs.properties.splice(
+            translatedAttrs.properties.indexOf(contentProp),
+            1
+          );
+        }
+        const section = getSection(tag);
+        const bodySection = getSectionForBody(tag.get("body"));
+        const signal = getSignal(section, nodeRef2, "try");
+        signal.build = () => {
+          return callRuntime(
+            "createTry",
+            getScopeAccessorLiteral(nodeRef2),
+            import_compiler48.types.identifier(bodySection.name)
+          );
+        };
+        if (translatedAttrs.statements.length) {
+          addStatement(
+            "render",
+            section,
+            referencedBindings,
+            translatedAttrs.statements
+          );
+        }
+        currentProgramPath.pushContainer(
+          "body",
+          import_compiler48.types.expressionStatement(callRuntime("enableCatch"))
+        );
+        addValue(
+          section,
+          referencedBindings,
+          signal,
+          propsToExpression(translatedAttrs.properties)
+        );
+        signal.hasDownstreamIntersections = () => true;
         tag.remove();
       }
     }
@@ -8290,17 +8409,6 @@ var try_default = {
   ],
   types: runtime_info_default.name + "/tag-types/try.d.marko"
 };
-function setAllSectionsParentIsOwner(tag) {
-  for (const attrTag2 of tag.get("attributeTags")) {
-    if (attrTag2.isMarkoTag()) {
-      setAllSectionsParentIsOwner(attrTag2);
-    }
-  }
-  const bodySection = getSectionForBody(tag.get("body"));
-  if (bodySection) {
-    setSectionParentIsOwner(bodySection, true);
-  }
-}
 
 // src/translator/core/index.ts
 var core_default = {
@@ -9418,7 +9526,7 @@ function always() {
 // src/translator/visitors/tag/dynamic-tag.ts
 var import_compiler54 = require("@marko/compiler");
 var import_babel_utils42 = require("@marko/compiler/babel-utils");
-var kDOMBinding = Symbol("dynamic tag dom binding");
+var kDOMBinding3 = Symbol("dynamic tag dom binding");
 var kChildOffsetScopeBinding2 = Symbol("custom tag scope offset");
 var dynamic_tag_default = {
   analyze: {
@@ -9428,7 +9536,7 @@ var dynamic_tag_default = {
       const section = getOrCreateSection(tag);
       const tagExtra = tag.node.extra ??= {};
       const tagBody = tag.get("body");
-      tagExtra[kDOMBinding] = createBinding(
+      tagExtra[kDOMBinding3] = createBinding(
         "#text",
         0 /* dom */,
         section,
@@ -9467,7 +9575,7 @@ var dynamic_tag_default = {
     exit(tag) {
       const { node } = tag;
       const tagExtra = node.extra;
-      const nodeRef2 = tagExtra[kDOMBinding];
+      const nodeRef2 = tagExtra[kDOMBinding3];
       const section = getSection(tag);
       const isClassAPI = tagExtra.featureType === "class";
       const referencedBindings = tagExtra.referencedBindings;
@@ -9483,14 +9591,19 @@ var dynamic_tag_default = {
         if (isOutputHTML()) {
           currentProgramPath.pushContainer(
             "body",
-            import_compiler54.types.expressionStatement(
-              import_compiler54.types.callExpression(
-                (0, import_babel_utils42.importNamed)(tag.hub.file, getCompatRuntimeFile(), "s"),
-                [
-                  import_compiler54.types.identifier(tagExpression.name),
-                  import_compiler54.types.stringLiteral((0, import_babel_utils42.loadFileForTag)(tag).metadata.marko.id)
-                ]
-              )
+            import_compiler54.types.markoScriptlet(
+              [
+                import_compiler54.types.expressionStatement(
+                  import_compiler54.types.callExpression(
+                    (0, import_babel_utils42.importNamed)(tag.hub.file, getCompatRuntimeFile(), "s"),
+                    [
+                      import_compiler54.types.identifier(tagExpression.name),
+                      import_compiler54.types.stringLiteral((0, import_babel_utils42.loadFileForTag)(tag).metadata.marko.id)
+                    ]
+                  )
+                )
+              ],
+              true
             )
           );
         } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.0-next.3.58",
+  "version": "6.0.0-next.3.60",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",