marko 6.0.163 → 6.0.165

package/dist/debug/dom.js

@@ -413,7 +413,7 @@ function skipScope() {
 }
 function findBranchWithKey(scope, key) {
   let branch = scope["#ClosestBranch" /* ClosestBranch */];
-  while (branch && !branch[key]) {
+  while (branch && branch[key] == null) {
     branch = branch["#ParentBranch" /* ParentBranch */];
   }
   return branch;
@@ -1941,7 +1941,7 @@ function _try(nodeAccessor, template, walks, setup) {
     const branch = scope[branchAccessor];
     if (branch) {
       branch["#BranchAccessor" /* BranchAccessor */] = nodeAccessor;
-      branch["#CatchContent" /* CatchContent */] = normalizeDynamicRenderer(input.catch);
+      branch["#CatchContent" /* CatchContent */] = input.catch && (normalizeDynamicRenderer(input.catch) || 0);
       branch["#PlaceholderContent" /* PlaceholderContent */] = normalizeDynamicRenderer(
         input.placeholder
       );
@@ -1968,7 +1968,7 @@ function renderCatch(scope, error) {
       tryWithCatch["#CatchContent" /* CatchContent */],
       createAndSetupBranch
     );
-    tryWithCatch["#CatchContent" /* CatchContent */].___params?.(
+    tryWithCatch["#CatchContent" /* CatchContent */]?.___params?.(
       owner["BranchScopes:" /* BranchScopes */ + tryWithCatch["#BranchAccessor" /* BranchAccessor */]],
       [error]
     );

package/dist/debug/dom.mjs

@@ -297,7 +297,7 @@ function skipScope() {
 }
 function findBranchWithKey(scope, key) {
   let branch = scope["#ClosestBranch" /* ClosestBranch */];
-  while (branch && !branch[key]) {
+  while (branch && branch[key] == null) {
     branch = branch["#ParentBranch" /* ParentBranch */];
   }
   return branch;
@@ -1825,7 +1825,7 @@ function _try(nodeAccessor, template, walks, setup) {
     const branch = scope[branchAccessor];
     if (branch) {
       branch["#BranchAccessor" /* BranchAccessor */] = nodeAccessor;
-      branch["#CatchContent" /* CatchContent */] = normalizeDynamicRenderer(input.catch);
+      branch["#CatchContent" /* CatchContent */] = input.catch && (normalizeDynamicRenderer(input.catch) || 0);
       branch["#PlaceholderContent" /* PlaceholderContent */] = normalizeDynamicRenderer(
         input.placeholder
       );
@@ -1852,7 +1852,7 @@ function renderCatch(scope, error) {
       tryWithCatch["#CatchContent" /* CatchContent */],
       createAndSetupBranch
     );
-    tryWithCatch["#CatchContent" /* CatchContent */].___params?.(
+    tryWithCatch["#CatchContent" /* CatchContent */]?.___params?.(
       owner["BranchScopes:" /* BranchScopes */ + tryWithCatch["#BranchAccessor" /* BranchAccessor */]],
       [error]
     );

package/dist/debug/html.js

@@ -47,6 +47,7 @@ __export(html_exports, {
   _el_read_error: () => _el_read_error,
   _el_resume: () => _el_resume,
   _escape: () => _escape,
+  _escape_comment: () => _escape_comment,
   _escape_script: () => _escape_script,
   _escape_style: () => _escape_style,
   _existing_scope: () => _existing_scope,
@@ -256,16 +257,21 @@ var escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, r
 function _escape(val) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
-var unsafeScriptReg = /<\/script/g;
+var unsafeScriptReg = /<\/script/gi;
 var escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
 function _escape_script(val) {
   return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
 }
-var unsafeStyleReg = /<\/style/g;
+var unsafeStyleReg = /<\/style/gi;
 var escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str;
 function _escape_style(val) {
   return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
 }
+var unsafeCommentReg = />/g;
+var escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str;
+function _escape_comment(val) {
+  return val ? escapeCommentStr(val + "") : val === 0 ? "0" : "";
+}
 
 // src/common/for.ts
 function forIn(obj, cb) {
@@ -2354,12 +2360,13 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 function _try(scopeId, accessor, content, input) {
   const branchId = _peek_scope_id();
   $chunk.writeHTML($chunk.boundary.state.mark("[" /* BranchStart */, ""));
-  const catchContent = normalizeDynamicRenderer(input.catch);
+  const catchContent = input.catch ? normalizeDynamicRenderer(input.catch) || 0 : void 0;
   const placeholderContent = normalizeDynamicRenderer(input.placeholder);
-  if (catchContent) {
+  if (catchContent !== void 0) {
     tryCatch(
       placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId) : content,
-      catchContent
+      catchContent || (() => {
+      })
     );
   } else if (placeholderContent) {
     tryPlaceholder(content, placeholderContent, branchId);
@@ -3764,6 +3771,7 @@ function NOOP3() {
   _el_read_error,
   _el_resume,
   _escape,
+  _escape_comment,
   _escape_script,
   _escape_style,
   _existing_scope,

package/dist/debug/html.mjs

@@ -164,16 +164,21 @@ var escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, r
 function _escape(val) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
-var unsafeScriptReg = /<\/script/g;
+var unsafeScriptReg = /<\/script/gi;
 var escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
 function _escape_script(val) {
   return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
 }
-var unsafeStyleReg = /<\/style/g;
+var unsafeStyleReg = /<\/style/gi;
 var escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str;
 function _escape_style(val) {
   return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
 }
+var unsafeCommentReg = />/g;
+var escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str;
+function _escape_comment(val) {
+  return val ? escapeCommentStr(val + "") : val === 0 ? "0" : "";
+}
 
 // src/common/for.ts
 function forIn(obj, cb) {
@@ -2262,12 +2267,13 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 function _try(scopeId, accessor, content, input) {
   const branchId = _peek_scope_id();
   $chunk.writeHTML($chunk.boundary.state.mark("[" /* BranchStart */, ""));
-  const catchContent = normalizeDynamicRenderer(input.catch);
+  const catchContent = input.catch ? normalizeDynamicRenderer(input.catch) || 0 : void 0;
   const placeholderContent = normalizeDynamicRenderer(input.placeholder);
-  if (catchContent) {
+  if (catchContent !== void 0) {
     tryCatch(
       placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId) : content,
-      catchContent
+      catchContent || (() => {
+      })
     );
   } else if (placeholderContent) {
     tryPlaceholder(content, placeholderContent, branchId);
@@ -3671,6 +3677,7 @@ export {
   _el_read_error,
   _el_resume,
   _escape,
+  _escape_comment,
   _escape_script,
   _escape_style,
   _existing_scope,

package/dist/dom.js

@@ -267,7 +267,7 @@ function skipScope() {
 }
 function findBranchWithKey(scope, key) {
   let branch = scope.F;
-  for (; branch && !branch[key]; )
+  for (; branch && branch[key] == null; )
     branch = branch.N;
   return branch;
 }
@@ -1216,7 +1216,7 @@ function _try(nodeAccessor, template, walks, setup) {
       createAndSetupBranch
     );
     let branch = scope[branchAccessor];
-    branch && (branch.C = nodeAccessor, branch.E = normalizeDynamicRenderer(input.catch), branch.Q = normalizeDynamicRenderer(
+    branch && (branch.C = nodeAccessor, branch.E = input.catch && (normalizeDynamicRenderer(input.catch) || 0), branch.Q = normalizeDynamicRenderer(
       input.placeholder
     ));
   };
@@ -1230,7 +1230,7 @@ function renderCatch(scope, error) {
       tryWithCatch.C,
       tryWithCatch.E,
       createAndSetupBranch
-    ), tryWithCatch.E.d?.(
+    ), tryWithCatch.E?.d?.(
       owner["A" /* BranchScopes */ + tryWithCatch.C],
       [error]
     );

package/dist/dom.mjs

@@ -154,7 +154,7 @@ function skipScope() {
 }
 function findBranchWithKey(scope, key) {
   let branch = scope.F;
-  for (; branch && !branch[key]; )
+  for (; branch && branch[key] == null; )
     branch = branch.N;
   return branch;
 }
@@ -1103,7 +1103,7 @@ function _try(nodeAccessor, template, walks, setup) {
       createAndSetupBranch
     );
     let branch = scope[branchAccessor];
-    branch && (branch.C = nodeAccessor, branch.E = normalizeDynamicRenderer(input.catch), branch.Q = normalizeDynamicRenderer(
+    branch && (branch.C = nodeAccessor, branch.E = input.catch && (normalizeDynamicRenderer(input.catch) || 0), branch.Q = normalizeDynamicRenderer(
       input.placeholder
     ));
   };
@@ -1117,7 +1117,7 @@ function renderCatch(scope, error) {
       tryWithCatch.C,
       tryWithCatch.E,
       createAndSetupBranch
-    ), tryWithCatch.E.d?.(
+    ), tryWithCatch.E?.d?.(
       owner["A" /* BranchScopes */ + tryWithCatch.C],
       [error]
     );

package/dist/html/content.d.ts

@@ -2,3 +2,4 @@ export declare function _unescaped(val: unknown): string;
 export declare function _escape(val: unknown): string;
 export declare function _escape_script(val: unknown): string;
 export declare function _escape_style(val: unknown): string;
+export declare function _escape_comment(val: unknown): string;

package/dist/html.d.ts

@@ -2,7 +2,7 @@ export { attrTag, attrTags } from "./common/attr-tag";
 export { _assert_hoist, _el_read_error, _hoist_read_error, } from "./common/errors";
 export { _attr, _attr_class, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_option_value, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, } from "./html/attrs";
 export { compat } from "./html/compat";
-export { _escape, _escape_script, _escape_style, _unescaped, } from "./html/content";
+export { _escape, _escape_comment, _escape_script, _escape_style, _unescaped, } from "./html/content";
 export { _content, _content_resume, _dynamic_tag } from "./html/dynamic-tag";
 export { forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, } from "./html/for";
 export { _template } from "./html/template";

package/dist/html.js

@@ -44,6 +44,7 @@ __export(html_exports, {
   _el_read_error: () => _el_read_error,
   _el_resume: () => _el_resume,
   _escape: () => _escape,
+  _escape_comment: () => _escape_comment,
   _escape_script: () => _escape_script,
   _escape_style: () => _escape_style,
   _existing_scope: () => _existing_scope,
@@ -159,14 +160,18 @@ var unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt
 function _escape(val) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
-var unsafeScriptReg = /<\/script/g, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
+var unsafeScriptReg = /<\/script/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
 function _escape_script(val) {
   return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
 }
-var unsafeStyleReg = /<\/style/g, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str;
+var unsafeStyleReg = /<\/style/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str;
 function _escape_style(val) {
   return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
 }
+var unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str;
+function _escape_comment(val) {
+  return val ? escapeCommentStr(val + "") : val === 0 ? "0" : "";
+}
 
 // src/common/for.ts
 function forIn(obj, cb) {
@@ -1474,10 +1479,11 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 function _try(scopeId, accessor, content, input) {
   let branchId = _peek_scope_id();
   $chunk.writeHTML($chunk.boundary.state.mark("[" /* BranchStart */, ""));
-  let catchContent = normalizeDynamicRenderer(input.catch), placeholderContent = normalizeDynamicRenderer(input.placeholder);
-  catchContent ? tryCatch(
+  let catchContent = input.catch ? normalizeDynamicRenderer(input.catch) || 0 : void 0, placeholderContent = normalizeDynamicRenderer(input.placeholder);
+  catchContent !== void 0 ? tryCatch(
     placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId) : content,
-    catchContent
+    catchContent || (() => {
+    })
   ) : placeholderContent ? tryPlaceholder(content, placeholderContent, branchId) : content(), writeScope(branchId, {
     C: accessor,
     E: catchContent,
@@ -2394,6 +2400,7 @@ function NOOP3() {
   _el_read_error,
   _el_resume,
   _escape,
+  _escape_comment,
   _escape_script,
   _escape_style,
   _existing_scope,

package/dist/html.mjs

@@ -70,14 +70,18 @@ var unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt
 function _escape(val) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
-var unsafeScriptReg = /<\/script/g, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
+var unsafeScriptReg = /<\/script/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
 function _escape_script(val) {
   return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
 }
-var unsafeStyleReg = /<\/style/g, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str;
+var unsafeStyleReg = /<\/style/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str;
 function _escape_style(val) {
   return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
 }
+var unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str;
+function _escape_comment(val) {
+  return val ? escapeCommentStr(val + "") : val === 0 ? "0" : "";
+}
 
 // src/common/for.ts
 function forIn(obj, cb) {
@@ -1385,10 +1389,11 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 function _try(scopeId, accessor, content, input) {
   let branchId = _peek_scope_id();
   $chunk.writeHTML($chunk.boundary.state.mark("[" /* BranchStart */, ""));
-  let catchContent = normalizeDynamicRenderer(input.catch), placeholderContent = normalizeDynamicRenderer(input.placeholder);
-  catchContent ? tryCatch(
+  let catchContent = input.catch ? normalizeDynamicRenderer(input.catch) || 0 : void 0, placeholderContent = normalizeDynamicRenderer(input.placeholder);
+  catchContent !== void 0 ? tryCatch(
     placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId) : content,
-    catchContent
+    catchContent || (() => {
+    })
   ) : placeholderContent ? tryPlaceholder(content, placeholderContent, branchId) : content(), writeScope(branchId, {
     C: accessor,
     E: catchContent,
@@ -2304,6 +2309,7 @@ export {
   _el_read_error,
   _el_resume,
   _escape,
+  _escape_comment,
   _escape_script,
   _escape_style,
   _existing_scope,

package/dist/translator/index.js

@@ -2377,16 +2377,21 @@ var escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, r
 function _escape(val) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
-var unsafeScriptReg = /<\/script/g;
+var unsafeScriptReg = /<\/script/gi;
 var escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
 function _escape_script(val) {
   return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
 }
-var unsafeStyleReg = /<\/style/g;
+var unsafeStyleReg = /<\/style/gi;
 var escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str;
 function _escape_style(val) {
   return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
 }
+var unsafeCommentReg = />/g;
+var escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str;
+function _escape_comment(val) {
+  return val ? escapeCommentStr(val + "") : val === 0 ? "0" : "";
+}
 
 // src/html/writer.ts
 if (false) {
@@ -2530,6 +2535,7 @@ function callRuntime(name2, ...args) {
 function getHTMLRuntime() {
   return {
     _escape,
+    _escape_comment,
     _unescaped,
     _attr,
     _attr_class,
@@ -10827,7 +10833,7 @@ var html_comment_default = {
           if (import_compiler45.types.isMarkoText(child)) {
             write`${child.value}`;
           } else if (import_compiler45.types.isMarkoPlaceholder(child)) {
-            write`${callRuntime("_escape", child.value)}`;
+            write`${callRuntime(child.escape ? "_escape_comment" : "_unescaped", child.value)}`;
           }
         }
       } else {

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

@@ -1,12 +1,13 @@
 import { types as t } from "@marko/compiler";
 import type { Falsy } from "../../common/types";
-import { _attr, _attr_class, _attr_style, _escape, _escape_script, _escape_style, _unescaped } from "../../html";
+import { _attr, _attr_class, _attr_style, _escape, _escape_comment, _escape_script, _escape_style, _unescaped } from "../../html";
 export type DOMRuntimeHelpers = keyof typeof import("../../dom");
 export type HTMLRuntimeHelpers = keyof typeof import("../../html");
 export declare function importRuntime(name: DOMRuntimeHelpers | HTMLRuntimeHelpers): t.MemberExpression;
 export declare function callRuntime(name: DOMRuntimeHelpers | HTMLRuntimeHelpers, ...args: Array<Parameters<typeof t.callExpression>[1][number] | Falsy>): t.CallExpression;
 export declare function getHTMLRuntime(): {
     _escape: typeof _escape;
+    _escape_comment: typeof _escape_comment;
     _unescaped: typeof _unescaped;
     _attr: typeof _attr;
     _attr_class: typeof _attr_class;

package/package.json

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