marko 6.0.118 → 6.0.120

package/dist/translator/index.js

@@ -145,11 +145,13 @@ var AccessorProp = /* @__PURE__ */ ((AccessorProp4) => {
   AccessorProp4["ClosestBranchId"] = "#ClosestBranchId";
   AccessorProp4["Creating"] = "#Creating";
   AccessorProp4["Destroyed"] = "#Destroyed";
+  AccessorProp4["DetachedAwait"] = "#DetachedAwait";
   AccessorProp4["EndNode"] = "#EndNode";
   AccessorProp4["Id"] = "#Id";
   AccessorProp4["LoopKey"] = "#LoopKey";
   AccessorProp4["ParentBranch"] = "#ParentBranch";
   AccessorProp4["PendingEffects"] = "#PendingEffects";
+  AccessorProp4["PendingRenders"] = "#PendingRenders";
   AccessorProp4["PlaceholderBranch"] = "#PlaceholderBranch";
   AccessorProp4["PlaceholderContent"] = "#PlaceholderContent";
   AccessorProp4["Renderer"] = "#Renderer";
@@ -1128,6 +1130,9 @@ function find(data, cb) {
     }
   }
 }
+function some(data, cb) {
+  return data ? Array.isArray(data) ? data.some(cb) : !!cb(data, 0) : false;
+}
 function toArray(data, cb) {
   return data ? Array.isArray(data) ? data.map(cb) : [cb(data, 0)] : [];
 }
@@ -1297,11 +1302,13 @@ var AccessorProp2 = /* @__PURE__ */ ((AccessorProp4) => {
   AccessorProp4["ClosestBranchId"] = "G";
   AccessorProp4["Creating"] = "H";
   AccessorProp4["Destroyed"] = "I";
+  AccessorProp4["DetachedAwait"] = "V";
   AccessorProp4["EndNode"] = "K";
   AccessorProp4["Id"] = "L";
   AccessorProp4["LoopKey"] = "M";
   AccessorProp4["ParentBranch"] = "N";
   AccessorProp4["PendingEffects"] = "J";
+  AccessorProp4["PendingRenders"] = "W";
   AccessorProp4["PlaceholderBranch"] = "P";
   AccessorProp4["PlaceholderContent"] = "Q";
   AccessorProp4["Renderer"] = "R";
@@ -3336,6 +3343,7 @@ var [getClosureSignalBuilder, _setClosureSignalBuilder] = createSectionState("qu
 function setClosureSignalBuilder(tag, builder) {
   _setClosureSignalBuilder(getSectionForBody(tag.get("body")), builder);
 }
+var [getTryHasPlaceholder, setTryHasPlaceholder] = createSectionState("tryWithPlaceholder");
 var [getSerializedAccessors] = createSectionState("serializedScopeProperties", () => /* @__PURE__ */ new Map());
 function setSectionSerializedValue(section, prop, expression) {
   const reason = getSerializeReason(section, prop);
@@ -3429,23 +3437,37 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
       };
     } else if (referencedBindings.section !== section && bindingUtil.find(section.referencedClosures, referencedBindings)) {
       signal.build = () => {
-        const canonicalClosure = getCanonicalBinding(referencedBindings);
+        const closure = getCanonicalBinding(referencedBindings);
         const render = getSignalFn(signal);
         const closureSignalBuilder = getClosureSignalBuilder(section);
-        return !closureSignalBuilder || isDynamicClosure(section, canonicalClosure) ? callRuntime(
+        if (closureSignalBuilder && !isDynamicClosure(section, closure)) {
+          return closureSignalBuilder(closure, render);
+        }
+        return callRuntime(
           "_closure_get",
-          getScopeAccessorLiteral(canonicalClosure, true),
+          getScopeAccessorLiteral(closure, true),
           render,
-          isImmediateOwner(section, canonicalClosure) ? void 0 : import_compiler22.types.arrowFunctionExpression(
+          isImmediateOwner(section, closure) ? void 0 : import_compiler22.types.arrowFunctionExpression(
             [scopeIdentifier],
-            getScopeExpression(section, canonicalClosure.section)
-          )
-        ) : getClosureSignalBuilder(section)(canonicalClosure, render);
+            getScopeExpression(section, closure.section)
+          ),
+          some(closure.closureSections, underTryPlaceholder) ? import_compiler22.types.stringLiteral(getResumeRegisterId(section, closure)) : void 0
+        );
       };
     }
   }
   return signal;
 }
+function underTryPlaceholder(section) {
+  let curSection = section.parent;
+  while (curSection) {
+    if (getTryHasPlaceholder(curSection)) {
+      return true;
+    }
+    curSection = curSection.parent;
+  }
+  return false;
+}
 function initValue(binding, isLet = false) {
   const section = binding.section;
   const signal = getSignal(section, binding);
@@ -4038,10 +4060,29 @@ function writeHTMLResumeStatements(path5) {
           import_compiler22.types.numericLiteral(getDynamicClosureIndex(closure, section)),
           getAccessorPrefix().ClosureSignalIndex
         );
-        addWriteScopeBuilder(
-          section,
-          (expr) => callRuntime("_subscribe", identifier, expr)
-        );
+        if (underTryPlaceholder(section)) {
+          const reason = getSerializeReason(section);
+          if (reason) {
+            getHTMLSectionStatements(section).push(
+              import_compiler22.types.expressionStatement(
+                getExprIfSerialized(
+                  section,
+                  reason,
+                  callRuntime(
+                    "_script",
+                    getScopeIdIdentifier(section),
+                    import_compiler22.types.stringLiteral(getResumeRegisterId(section, closure))
+                  )
+                )
+              )
+            );
+          }
+        } else {
+          addWriteScopeBuilder(
+            section,
+            (expr) => callRuntime("_subscribe", identifier, expr)
+          );
+        }
       }
     }
   });
@@ -5528,7 +5569,7 @@ var native_tag_default = {
         );
       }
       const tagName = getCanonicalTagName(tag);
-      const textOnly = isTextOnlyNativeTag(tag);
+      const isTextOnly = isTextOnlyNativeTag(tag);
       const seen = {};
       const { attributes } = tag.node;
       let injectNonce = isInjectNonceTag(tagName);
@@ -5573,7 +5614,7 @@ var native_tag_default = {
         throw tag.get("name").buildCodeFrameError(msg);
       });
       let textPlaceholders;
-      if (textOnly) {
+      if (isTextOnly) {
         for (const child of tag.node.body.body) {
           if (import_compiler33.types.isMarkoPlaceholder(child)) {
             (textPlaceholders ||= []).push(child.value);
@@ -5762,10 +5803,11 @@ var native_tag_default = {
           }
         }
         const isOpenOnly = !!(tagDef && tagDef.parseOptions?.openTagOnly);
+        const isTextOnly = isTextOnlyNativeTag(tag);
         const hasChildren = !!tag.node.body.body.length;
         if (spreadExpression) {
           addHTMLEffectCall(tagSection, tagExtra.referencedBindings);
-          if (isOpenOnly || hasChildren || staticContentAttr) {
+          if (isTextOnly || isOpenOnly || hasChildren || staticContentAttr) {
             if (skipExpression) {
               write`${callRuntime(
                 "_attrs_partial",
@@ -5796,57 +5838,57 @@ var native_tag_default = {
               write`>`;
               break;
           }
-        } else {
-          if (staticContentAttr) {
-            write`>`;
-            tagExtra[kTagContentAttr] = true;
-            tag.node.body.body = [
-              import_compiler33.types.expressionStatement(
-                callRuntime(
-                  "_attr_content",
-                  visitAccessor,
-                  getScopeIdIdentifier(tagSection),
-                  staticContentAttr.value,
-                  getSerializeGuard(
-                    tagSection,
-                    nodeBinding && getSerializeReason(tagSection, nodeBinding),
-                    true
-                  )
+        } else if (isTextOnly) {
+          write`>`;
+        } else if (staticContentAttr) {
+          write`>`;
+          tagExtra[kTagContentAttr] = true;
+          tag.node.body.body = [
+            import_compiler33.types.expressionStatement(
+              callRuntime(
+                "_attr_content",
+                visitAccessor,
+                getScopeIdIdentifier(tagSection),
+                staticContentAttr.value,
+                getSerializeGuard(
+                  tagSection,
+                  nodeBinding && getSerializeReason(tagSection, nodeBinding),
+                  true
                 )
               )
-            ];
-          } else if (spreadExpression && !hasChildren) {
-            const serializeReason = getSerializeGuard(
-              tagSection,
-              nodeBinding && getSerializeReason(tagSection, nodeBinding),
-              true
-            );
-            tagExtra[kTagContentAttr] = true;
-            tag.node.body.body = [
-              skipExpression ? import_compiler33.types.expressionStatement(
-                callRuntime(
-                  "_attrs_partial_content",
-                  spreadExpression,
-                  skipExpression,
-                  visitAccessor,
-                  getScopeIdIdentifier(tagSection),
-                  import_compiler33.types.stringLiteral(tagName),
-                  serializeReason
-                )
-              ) : import_compiler33.types.expressionStatement(
-                callRuntime(
-                  "_attrs_content",
-                  spreadExpression,
-                  visitAccessor,
-                  getScopeIdIdentifier(tagSection),
-                  import_compiler33.types.stringLiteral(tagName),
-                  serializeReason
-                )
+            )
+          ];
+        } else if (spreadExpression && !hasChildren) {
+          const serializeReason = getSerializeGuard(
+            tagSection,
+            nodeBinding && getSerializeReason(tagSection, nodeBinding),
+            true
+          );
+          tagExtra[kTagContentAttr] = true;
+          tag.node.body.body = [
+            skipExpression ? import_compiler33.types.expressionStatement(
+              callRuntime(
+                "_attrs_partial_content",
+                spreadExpression,
+                skipExpression,
+                visitAccessor,
+                getScopeIdIdentifier(tagSection),
+                import_compiler33.types.stringLiteral(tagName),
+                serializeReason
               )
-            ];
-          } else {
-            write`>`;
-          }
+            ) : import_compiler33.types.expressionStatement(
+              callRuntime(
+                "_attrs_content",
+                spreadExpression,
+                visitAccessor,
+                getScopeIdIdentifier(tagSection),
+                import_compiler33.types.stringLiteral(tagName),
+                serializeReason
+              )
+            )
+          ];
+        } else {
+          write`>`;
         }
         if (writeAtStartOfBody) {
           write`${writeAtStartOfBody}`;
@@ -5855,8 +5897,8 @@ var native_tag_default = {
       exit(tag) {
         const tagExtra = tag.node.extra;
         const nodeBinding = tagExtra[kNativeTagBinding];
-        const openTagOnly = (0, import_babel_utils21.getTagDef)(tag)?.parseOptions?.openTagOnly;
-        const textOnly = isTextOnlyNativeTag(tag);
+        const isOpenOnly = (0, import_babel_utils21.getTagDef)(tag)?.parseOptions?.openTagOnly;
+        const isTextOnly = isTextOnlyNativeTag(tag);
         const selectArgs = htmlSelectArgs.get(tag.node);
         const tagName = getCanonicalTagName(tag);
         const tagSection = getSection(tag);
@@ -5888,7 +5930,7 @@ var native_tag_default = {
               )
             )
           );
-        } else if (textOnly) {
+        } else if (isTextOnly) {
           for (const child of tag.node.body.body) {
             if (import_compiler33.types.isMarkoText(child)) {
               write`${child.value}`;
@@ -5899,7 +5941,7 @@ var native_tag_default = {
         } else {
           tag.insertBefore(tag.node.body.body).forEach((child) => child.skip());
         }
-        if (!tagExtra[kSkipEndTag] && !openTagOnly && !selectArgs) {
+        if (!tagExtra[kSkipEndTag] && !isOpenOnly && !selectArgs) {
           write`</${tagName}>`;
         }
         if (markerSerializeReason) {
@@ -5930,6 +5972,7 @@ var native_tag_default = {
           injectNonce
         } = getUsedAttrs(tagName, tag.node);
         const isOpenOnly = !!(tagDef && tagDef.parseOptions?.openTagOnly);
+        const isTextOnly = isTextOnlyNativeTag(tag);
         const hasChildren = !!tag.node.body.body.length;
         if (injectNonce) {
           addStatement(
@@ -6069,7 +6112,7 @@ var native_tag_default = {
           }
         }
         if (spreadExpression) {
-          const canHaveAttrContent = !(isOpenOnly || hasChildren || staticContentAttr);
+          const canHaveAttrContent = !(isTextOnly || isOpenOnly || hasChildren || staticContentAttr);
           if (skipExpression) {
             addStatement(
               "render",
@@ -6144,12 +6187,13 @@ var native_tag_default = {
         const tagExtra = tag.node.extra;
         const nodeBinding = tagExtra[kNativeTagBinding];
         const openTagOnly = (0, import_babel_utils21.getTagDef)(tag)?.parseOptions?.openTagOnly;
-        const textOnly = isTextOnlyNativeTag(tag);
+        const tagName = getCanonicalTagName(tag);
         if (!openTagOnly) {
-          if (textOnly) {
+          const write = writeTo(tag);
+          if (tagName !== "textarea" && isTextOnlyNativeTag(tag)) {
             const textLiteral = bodyToTextLiteral(tag.node.body);
             if (import_compiler33.types.isStringLiteral(textLiteral)) {
-              writeTo(tag)`${textLiteral}`;
+              write`${textLiteral}`;
             } else {
               addStatement(
                 "render",
@@ -6167,7 +6211,7 @@ var native_tag_default = {
           } else {
             tag.insertBefore(tag.node.body.body).forEach((child) => child.skip());
           }
-          writeTo(tag)`</${getCanonicalTagName(tag)}>`;
+          write`</${tagName}>`;
         }
         exit2(tag);
         tag.remove();
@@ -11118,6 +11162,9 @@ var try_default = {
         }
         const tagBody = tag.get("body");
         const bodySection = getSectionForBody(tagBody);
+        if (tag.node.extra?.attributeTags?.["@placeholder"]) {
+          setTryHasPlaceholder(bodySection, true);
+        }
         setSectionParentIsOwner(bodySection, true);
         flushBefore(tag);
       },
@@ -11157,6 +11204,9 @@ var try_default = {
       enter(tag) {
         const tagBody = tag.get("body");
         const bodySection = getSectionForBody(tagBody);
+        if (tag.node.extra?.attributeTags?.["@placeholder"]) {
+          setTryHasPlaceholder(bodySection, true);
+        }
         setSectionParentIsOwner(bodySection, true);
         visit(tag, 37 /* Replace */);
         enterShallow(tag);

package/dist/translator/util/optional.d.ts

@@ -21,6 +21,7 @@ export declare function forEach<T>(data: Opt<T>, cb: (item: T, index: number) =>
 export declare function fromIter<T>(data: Iterable<T>): T | Many<T> | undefined;
 export declare function toIter<T>(data: Opt<T>): Iterable<T>;
 export declare function find<T>(data: Opt<T>, cb: (item: T, index: number) => boolean): Opt<T>;
+export declare function some<T>(data: Opt<T>, cb: (item: T, index: number) => boolean): boolean;
 export declare function toArray<T, R>(data: Opt<T>, cb: (item: T, index: number) => R): R[];
 export declare function mapToString<T>(data: Opt<T>, sep: string, cb: (item: T, index: number) => string): string;
 export declare function filterMap<T, R>(data: Opt<T>, cb: (item: T) => undefined | R): Opt<R>;

package/dist/translator/util/signals.d.ts

@@ -26,6 +26,7 @@ export type Signal = {
 };
 type closureSignalBuilder = (closure: Binding, render: t.Expression) => t.Expression;
 export declare function setClosureSignalBuilder(tag: t.NodePath<t.MarkoTag>, builder: closureSignalBuilder): void;
+export declare const getTryHasPlaceholder: (section: Section) => true | undefined, setTryHasPlaceholder: (section: Section, value: true | undefined) => void;
 export declare function setSectionSerializedValue(section: Section, prop: AccessorProp, expression: t.Expression): void;
 export declare function setBindingSerializedValue(section: Section, binding: Binding, expression: t.Expression, prefix?: AccessorPrefix): void;
 export declare function setSerializedValue(section: Section, key: string, expression: t.Expression): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.118",
+  "version": "6.0.120",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",