marko 6.0.0-next.3.56 → 6.0.0-next.3.58

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

@@ -2688,27 +2688,12 @@ function writeHTMLResumeStatements(path5) {
   if (!section) return;
   const allSignals = Array.from(getSignals(section).values());
   const scopeIdIdentifier = getScopeIdIdentifier(section);
-  const serializeOwnersUntilBindingSection = (binding) => {
-    let currentSection = section;
-    while (currentSection !== binding.section) {
-      const currentSerialized = getSerializedScopeProperties(currentSection);
-      currentSection = currentSection.parent;
-      if (!currentSerialized.has("_")) {
-        currentSerialized.set(
-          "_",
-          callRuntime(
-            "ensureScopeWithId",
-            getScopeIdIdentifier(currentSection)
-          )
-        );
-      }
-    }
-  };
-  forEach(section.assignments, serializeOwnersUntilBindingSection);
-  forEach(section.referencedHoists, serializeOwnersUntilBindingSection);
+  const serializeOwnersUntilBinding = (binding) => serializeOwners(section, binding.section);
+  forEach(section.assignments, serializeOwnersUntilBinding);
+  forEach(section.referencedHoists, serializeOwnersUntilBinding);
   forEach(section.referencedClosures, (closure) => {
     if (isStatefulReferences(closure)) {
-      serializeOwnersUntilBindingSection(closure);
+      serializeOwnersUntilBinding(closure);
       setForceResumeScope(closure.section);
       if (isDynamicClosure(section, closure)) {
         const closureSignal = getSignal(closure.section, closure);
@@ -2910,6 +2895,21 @@ function writeHTMLResumeStatements(path5) {
     path5.pushContainer("body", import_compiler17.types.returnStatement(returnIdentifier));
   }
 }
+function serializeOwners(from, to) {
+  let cur = from;
+  while (cur !== to) {
+    const parent = cur.parent;
+    if (!parent) break;
+    const serialized = getSerializedScopeProperties(cur);
+    cur = parent;
+    if (!serialized.has("_")) {
+      serialized.set(
+        "_",
+        callRuntime("ensureScopeWithId", getScopeIdIdentifier(cur))
+      );
+    }
+  }
+}
 function getSetup(section) {
   return getSignals(section).get(void 0)?.identifier;
 }
@@ -3863,7 +3863,7 @@ function trackReference(referencePath, binding) {
       propPath = reference.name;
       continue;
     }
-    if (root.parentPath.parentPath.isCallExpression() && !isEventOrChangeHandler(prop)) {
+    if (isInvokedFunction(root.parentPath) && !isEventOrChangeHandler(prop)) {
       break;
     }
     root = root.parentPath;
@@ -4951,19 +4951,7 @@ var native_tag_default = {
           for (const reference of varBinding.referencePaths) {
             const referenceSection = getSection(reference);
             if (!reference.node.extra?.hoist) {
-              let currentSection = referenceSection;
-              while (currentSection !== section && currentSection.parent) {
-                setSerializedProperty(
-                  currentSection,
-                  "_",
-                  callRuntime(
-                    "ensureScopeWithId",
-                    getScopeIdIdentifier(
-                      currentSection = currentSection.parent
-                    )
-                  )
-                );
-              }
+              serializeOwners(referenceSection, section);
             }
           }
           setForceResumeScope(section);
@@ -6336,7 +6324,7 @@ var html_comment_default = {
       }
       needsBinding = true;
       for (const ref of tag.scope.getBinding(tagVar.name).referencePaths) {
-        if (!ref.parentPath?.isCallExpression()) {
+        if (!isInvokedFunction(ref)) {
           needsGetter = true;
           break;
         }
@@ -6407,7 +6395,7 @@ var html_comment_default = {
         }
         for (const reference of references) {
           const referenceSection = getSection(reference);
-          if (reference.parentPath?.isCallExpression()) {
+          if (isInvokedFunction(reference)) {
             reference.parentPath.replaceWith(
               import_compiler35.types.expressionStatement(
                 createScopeReadExpression(referenceSection, commentBinding)
@@ -6571,7 +6559,7 @@ var html_script_default = {
       );
       if (node.var) {
         for (const ref of tag.scope.getBinding(node.var.name).referencePaths) {
-          if (!ref.parentPath?.isCallExpression()) {
+          if (!isInvokedFunction(ref)) {
             tagExtra[kGetterId3] = getRegisterUID(section, bindingName);
             break;
           }
@@ -6592,17 +6580,7 @@ var html_script_default = {
         const varName = tag.node.var.name;
         const references = tag.scope.getBinding(varName).referencePaths;
         for (const reference of references) {
-          let currentSection = getSection(reference);
-          while (currentSection !== section && currentSection.parent) {
-            setSerializedProperty(
-              currentSection,
-              "_",
-              callRuntime(
-                "ensureScopeWithId",
-                getScopeIdIdentifier(currentSection = currentSection.parent)
-              )
-            );
-          }
+          serializeOwners(getSection(reference), section);
         }
         translateVar(
           tag,
@@ -6636,7 +6614,7 @@ var html_script_default = {
         }
         for (const reference of references) {
           const referenceSection = getSection(reference);
-          if (reference.parentPath?.isCallExpression()) {
+          if (isInvokedFunction(reference)) {
             reference.parentPath.replaceWith(
               import_compiler36.types.expressionStatement(
                 createScopeReadExpression(referenceSection, nodeRef2)
@@ -6967,7 +6945,7 @@ var html_style_default = {
       );
       if (node.var) {
         for (const ref of tag.scope.getBinding(node.var.name).referencePaths) {
-          if (!ref.parentPath?.isCallExpression()) {
+          if (!isInvokedFunction(ref)) {
             tagExtra[kGetterId4] = getRegisterUID(section, bindingName);
             break;
           }
@@ -6988,17 +6966,7 @@ var html_style_default = {
         const varName = tag.node.var.name;
         const references = tag.scope.getBinding(varName).referencePaths;
         for (const reference of references) {
-          let currentSection = getSection(reference);
-          while (currentSection !== section && currentSection.parent) {
-            setSerializedProperty(
-              currentSection,
-              "_",
-              callRuntime(
-                "ensureScopeWithId",
-                getScopeIdIdentifier(currentSection = currentSection.parent)
-              )
-            );
-          }
+          serializeOwners(getSection(reference), section);
         }
         translateVar(
           tag,
@@ -7032,7 +7000,7 @@ var html_style_default = {
         }
         for (const reference of references) {
           const referenceSection = getSection(reference);
-          if (reference.parentPath?.isCallExpression()) {
+          if (isInvokedFunction(reference)) {
             reference.parentPath.replaceWith(
               import_compiler37.types.expressionStatement(
                 createScopeReadExpression(referenceSection, nodeRef2)
@@ -8494,6 +8462,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)))) {
@@ -8610,6 +8579,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/dist/translator/util/signals.d.ts

@@ -55,6 +55,7 @@ export declare function writeSignals(section: Section): void;
 export declare function writeRegisteredFns(): void;
 export declare function addHTMLEffectCall(section: Section, referencedBindings?: ReferencedBindings): void;
 export declare function writeHTMLResumeStatements(path: t.NodePath<t.MarkoTagBody | t.Program>): void;
+export declare function serializeOwners(from: Section, to?: Section): void;
 export declare function getSetup(section: Section): t.Identifier | undefined;
 export declare function replaceRegisteredFunctionNode(node: t.Node): t.CallExpression | t.ClassPrivateProperty | t.ClassProperty | t.VariableDeclaration | t.Identifier | t.ObjectProperty | undefined;
 export {};

package/package.json

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