marko 6.0.0-next.3.55 → 6.0.0-next.3.57

package/dist/debug/dom.js

@@ -206,9 +206,14 @@ function handleDelegated(ev) {
 }
 
 // src/dom/resolve-cursor-position.ts
-function resolveCursorPosition(updatedValue, initialValue, initialPosition, inputType2) {
-  if (initialPosition !== initialValue.length || // short regex to match input types that delete backwards
-  /kw/.test(inputType2)) {
+function resolveCursorPosition(inputType2, initialPosition, initialValue, updatedValue) {
+  if (
+    // If initial position is null or false then
+    // either this node is not the active element
+    // or does not support selection ranges.
+    (initialPosition || initialPosition === 0) && (initialPosition !== initialValue.length || // short regex to match input types that delete backwards
+    /kw/.test(inputType2))
+  ) {
     const before = initialValue.slice(0, initialPosition);
     const after = initialValue.slice(initialPosition);
     if (updatedValue.startsWith(before)) {
@@ -643,22 +648,15 @@ function controllable_detailsOrDialog_open_effect(scope, nodeAccessor) {
 }
 var inputType = "";
 function setValueAndUpdateSelection(el, value2) {
-  const initialValue = el.value;
-  if (initialValue !== value2) {
-    if (el.getRootNode().activeElement === el) {
-      const initialPosition = el.selectionStart;
-      el.value = value2;
-      const updatedPosition = resolveCursorPosition(
-        el.value,
-        initialValue,
-        initialPosition,
-        inputType
-      );
-      if (~updatedPosition) {
-        el.setSelectionRange(updatedPosition, updatedPosition);
-      }
-    } else {
-      el.value = value2;
+  if (el.value !== value2) {
+    const updatedPosition = resolveCursorPosition(
+      inputType,
+      el.getRootNode().activeElement === el && el.selectionStart,
+      el.value,
+      el.value = value2
+    );
+    if (~updatedPosition) {
+      el.selectionStart = updatedPosition;
     }
   }
 }

package/dist/debug/dom.mjs

@@ -121,9 +121,14 @@ function handleDelegated(ev) {
 }
 
 // src/dom/resolve-cursor-position.ts
-function resolveCursorPosition(updatedValue, initialValue, initialPosition, inputType2) {
-  if (initialPosition !== initialValue.length || // short regex to match input types that delete backwards
-  /kw/.test(inputType2)) {
+function resolveCursorPosition(inputType2, initialPosition, initialValue, updatedValue) {
+  if (
+    // If initial position is null or false then
+    // either this node is not the active element
+    // or does not support selection ranges.
+    (initialPosition || initialPosition === 0) && (initialPosition !== initialValue.length || // short regex to match input types that delete backwards
+    /kw/.test(inputType2))
+  ) {
     const before = initialValue.slice(0, initialPosition);
     const after = initialValue.slice(initialPosition);
     if (updatedValue.startsWith(before)) {
@@ -558,22 +563,15 @@ function controllable_detailsOrDialog_open_effect(scope, nodeAccessor) {
 }
 var inputType = "";
 function setValueAndUpdateSelection(el, value2) {
-  const initialValue = el.value;
-  if (initialValue !== value2) {
-    if (el.getRootNode().activeElement === el) {
-      const initialPosition = el.selectionStart;
-      el.value = value2;
-      const updatedPosition = resolveCursorPosition(
-        el.value,
-        initialValue,
-        initialPosition,
-        inputType
-      );
-      if (~updatedPosition) {
-        el.setSelectionRange(updatedPosition, updatedPosition);
-      }
-    } else {
-      el.value = value2;
+  if (el.value !== value2) {
+    const updatedPosition = resolveCursorPosition(
+      inputType,
+      el.getRootNode().activeElement === el && el.selectionStart,
+      el.value,
+      el.value = value2
+    );
+    if (~updatedPosition) {
+      el.selectionStart = updatedPosition;
     }
   }
 }

package/dist/dom/resolve-cursor-position.d.ts

@@ -1 +1 @@
-export declare function resolveCursorPosition(updatedValue: string, initialValue: string, initialPosition: number, inputType: string): number;
+export declare function resolveCursorPosition(inputType: string, initialPosition: number | null | false, initialValue: string, updatedValue: string): number;

package/dist/dom.js

@@ -173,9 +173,14 @@ function handleDelegated(ev) {
 }
 
 // src/dom/resolve-cursor-position.ts
-function resolveCursorPosition(updatedValue, initialValue, initialPosition, inputType2) {
-  if (initialPosition !== initialValue.length || // short regex to match input types that delete backwards
-  /kw/.test(inputType2)) {
+function resolveCursorPosition(inputType2, initialPosition, initialValue, updatedValue) {
+  if (
+    // If initial position is null or false then
+    // either this node is not the active element
+    // or does not support selection ranges.
+    (initialPosition || initialPosition === 0) && (initialPosition !== initialValue.length || // short regex to match input types that delete backwards
+    /kw/.test(inputType2))
+  ) {
     let before = initialValue.slice(0, initialPosition), after = initialValue.slice(initialPosition);
     if (updatedValue.startsWith(before))
       return initialPosition;
@@ -447,20 +452,15 @@ function controllable_detailsOrDialog_open_effect(scope, nodeAccessor) {
 }
 var inputType = "";
 function setValueAndUpdateSelection(el, value2) {
-  let initialValue = el.value;
-  if (initialValue !== value2)
-    if (el.getRootNode().activeElement === el) {
-      let initialPosition = el.selectionStart;
-      el.value = value2;
-      let updatedPosition = resolveCursorPosition(
-        el.value,
-        initialValue,
-        initialPosition,
-        inputType
-      );
-      ~updatedPosition && el.setSelectionRange(updatedPosition, updatedPosition);
-    } else
-      el.value = value2;
+  if (el.value !== value2) {
+    let updatedPosition = resolveCursorPosition(
+      inputType,
+      el.getRootNode().activeElement === el && el.selectionStart,
+      el.value,
+      el.value = value2
+    );
+    ~updatedPosition && (el.selectionStart = updatedPosition);
+  }
 }
 function setCheckboxValue(scope, nodeAccessor, type, checked, checkedChange) {
   scope[nodeAccessor + ";" /* ControlledHandler */] = checkedChange, checkedChange ? (scope[nodeAccessor + "=" /* ControlledType */] = type, scope[nodeAccessor].checked = checked) : (scope[nodeAccessor + "=" /* ControlledType */] = 5 /* None */, scope[nodeAccessor].defaultChecked = checked);

package/dist/dom.mjs

@@ -91,9 +91,14 @@ function handleDelegated(ev) {
 }
 
 // src/dom/resolve-cursor-position.ts
-function resolveCursorPosition(updatedValue, initialValue, initialPosition, inputType2) {
-  if (initialPosition !== initialValue.length || // short regex to match input types that delete backwards
-  /kw/.test(inputType2)) {
+function resolveCursorPosition(inputType2, initialPosition, initialValue, updatedValue) {
+  if (
+    // If initial position is null or false then
+    // either this node is not the active element
+    // or does not support selection ranges.
+    (initialPosition || initialPosition === 0) && (initialPosition !== initialValue.length || // short regex to match input types that delete backwards
+    /kw/.test(inputType2))
+  ) {
     let before = initialValue.slice(0, initialPosition), after = initialValue.slice(initialPosition);
     if (updatedValue.startsWith(before))
       return initialPosition;
@@ -365,20 +370,15 @@ function controllable_detailsOrDialog_open_effect(scope, nodeAccessor) {
 }
 var inputType = "";
 function setValueAndUpdateSelection(el, value2) {
-  let initialValue = el.value;
-  if (initialValue !== value2)
-    if (el.getRootNode().activeElement === el) {
-      let initialPosition = el.selectionStart;
-      el.value = value2;
-      let updatedPosition = resolveCursorPosition(
-        el.value,
-        initialValue,
-        initialPosition,
-        inputType
-      );
-      ~updatedPosition && el.setSelectionRange(updatedPosition, updatedPosition);
-    } else
-      el.value = value2;
+  if (el.value !== value2) {
+    let updatedPosition = resolveCursorPosition(
+      inputType,
+      el.getRootNode().activeElement === el && el.selectionStart,
+      el.value,
+      el.value = value2
+    );
+    ~updatedPosition && (el.selectionStart = updatedPosition);
+  }
 }
 function setCheckboxValue(scope, nodeAccessor, type, checked, checkedChange) {
   scope[nodeAccessor + ";" /* ControlledHandler */] = checkedChange, checkedChange ? (scope[nodeAccessor + "=" /* ControlledType */] = type, scope[nodeAccessor].checked = checked) : (scope[nodeAccessor + "=" /* ControlledType */] = 5 /* None */, scope[nodeAccessor].defaultChecked = checked);

package/dist/translator/index.js

@@ -1172,7 +1172,7 @@ function startSection(path5) {
 function getOrCreateSection(path5) {
   let cur = path5;
   while (true) {
-    if (cur.type === "Program" || cur.type === "MarkoTagBody" && !cur.node.attributeTags && analyzeTagNameType(cur.parentPath) !== 0 /* NativeTag */ && cur.parent.name.value !== "html-comment") {
+    if (cur.type === "Program" || cur.type === "MarkoTagBody" && !cur.node.attributeTags && !isNativeNode(cur.parentPath)) {
       return startSection(cur);
     }
     cur = cur.parentPath;
@@ -1331,6 +1331,19 @@ function getCommonSection(section, other) {
   }
   throw new Error("No common section");
 }
+function isNativeNode(tag) {
+  if (isCoreTag(tag)) {
+    switch (tag.node.name.value) {
+      case "html-comment":
+      case "html-script":
+      case "html-style":
+        return true;
+      default:
+        return false;
+    }
+  }
+  return analyzeTagNameType(tag) === 0 /* NativeTag */;
+}
 
 // src/translator/visitors/program/dom.ts
 var import_compiler18 = require("@marko/compiler");
@@ -7779,7 +7792,7 @@ var let_default = {
           return import_compiler41.types.callExpression(signal.identifier, [scope, value]);
         };
       } else {
-        translateVar(tag, valueAttr.value);
+        translateVar(tag, valueAttr.value, "let");
         if (valueChangeAttr) {
           setSerializedProperty(
             section,
@@ -8481,6 +8494,7 @@ var kBinding = Symbol("placeholder node binding");
 var kSiblingText = Symbol("placeholder has sibling text");
 var placeholder_default = {
   analyze(placeholder) {
+    if (isNonHTMLPlaceholder(placeholder)) return;
     const { node } = placeholder;
     const { confident, computed } = evaluate(node.value);
     if (!(confident && (node.escape || isVoid2(computed)))) {
@@ -8597,6 +8611,18 @@ function analyzeSiblingText(placeholder) {
   }
   return placeholderExtra[kSiblingText] = 0 /* None */;
 }
+function isNonHTMLPlaceholder(placeholder) {
+  const parentTag = placeholder.parentPath.isMarkoTagBody() && placeholder.parentPath.parentPath;
+  if (parentTag && isCoreTag(parentTag)) {
+    switch (parentTag.node.name.value) {
+      case "html-comment":
+      case "html-script":
+      case "html-style":
+        return true;
+    }
+  }
+  return false;
+}
 function isVoid2(value) {
   return value == null || value === false;
 }

package/package.json

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