@blankdotpage/cake 0.1.62 → 0.1.63

package/dist/cake/extensions/heading/heading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"heading.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/heading/heading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAKnB,MAAM,oBAAoB,CAAC;AA2W5B,eAAO,MAAM,gBAAgB,EAAE,aAwM9B,CAAC"}
+{"version":3,"file":"heading.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/heading/heading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAKnB,MAAM,oBAAoB,CAAC;AAwa5B,eAAO,MAAM,gBAAgB,EAAE,aAwM9B,CAAC"}

package/dist/cake/extensions/heading/heading.js

@@ -202,11 +202,13 @@ function handleLineBreakInHeading(state) {
 }
 function handleToggleHeading(state, targetLevel) {
     const { source, selection, map, runtime } = state;
-    // Get the cursor's source position
-    const cursorPos = Math.min(selection.start, selection.end);
-    const sourcePos = map.cursorToSource(cursorPos, selection.affinity ?? "forward");
+    const selectionStart = Math.min(selection.start, selection.end);
+    const selectionEnd = Math.max(selection.start, selection.end);
+    const isCollapsed = selectionStart === selectionEnd;
+    // Keep collapsed cursor behavior affinity-aware.
+    const primarySourcePos = map.cursorToSource(selectionStart, selection.affinity ?? "forward");
     // Find line boundaries in source
-    const lineStart = findLineStartInSource(source, sourcePos);
+    const lineStart = findLineStartInSource(source, primarySourcePos);
     let lineEnd = source.indexOf("\n", lineStart);
     if (lineEnd === -1) {
         lineEnd = source.length;
@@ -214,7 +216,7 @@ function handleToggleHeading(state, targetLevel) {
     const lineContent = source.slice(lineStart, lineEnd);
     const headingMatch = lineContent.match(HEADING_PATTERN);
     let newSource;
-    let newCursorOffset;
+    let remapSourceOffset;
     if (headingMatch) {
         // Line is already a heading
         const currentLevel = headingMatch[1].length;
@@ -225,14 +227,15 @@ function handleToggleHeading(state, targetLevel) {
                 source.slice(0, lineStart) +
                     lineContent.slice(existingMarker.length) +
                     source.slice(lineEnd);
-            // Adjust cursor position - move back by marker length
-            const cursorLineOffset = sourcePos - lineStart;
-            if (cursorLineOffset >= existingMarker.length) {
-                newCursorOffset = sourcePos - existingMarker.length;
-            }
-            else {
-                newCursorOffset = lineStart;
-            }
+            remapSourceOffset = (offset) => {
+                if (offset <= lineStart) {
+                    return offset;
+                }
+                if (offset >= lineEnd) {
+                    return offset - existingMarker.length;
+                }
+                return Math.max(lineStart, offset - existingMarker.length);
+            };
         }
         else {
             // Different level - change the heading level
@@ -242,15 +245,20 @@ function handleToggleHeading(state, targetLevel) {
                     newMarker +
                     lineContent.slice(existingMarker.length) +
                     source.slice(lineEnd);
-            // Adjust cursor position for marker length difference
             const markerDiff = newMarker.length - existingMarker.length;
-            const cursorLineOffset = sourcePos - lineStart;
-            if (cursorLineOffset >= existingMarker.length) {
-                newCursorOffset = sourcePos + markerDiff;
-            }
-            else {
-                newCursorOffset = lineStart + newMarker.length;
-            }
+            remapSourceOffset = (offset) => {
+                if (offset <= lineStart) {
+                    return offset;
+                }
+                if (offset >= lineEnd) {
+                    return offset + markerDiff;
+                }
+                const offsetInLine = offset - lineStart;
+                if (offsetInLine >= existingMarker.length) {
+                    return offset + markerDiff;
+                }
+                return lineStart + newMarker.length;
+            };
         }
     }
     else {
@@ -265,19 +273,47 @@ function handleToggleHeading(state, targetLevel) {
         const removedPrefixLength = lineContent.endsWith(lineContentWithoutBlockMarkers)
             ? lineContent.length - lineContentWithoutBlockMarkers.length
             : 0;
-        const cursorLineOffset = sourcePos - lineStart;
-        const adjustedLineOffset = Math.max(0, cursorLineOffset - Math.min(cursorLineOffset, removedPrefixLength));
-        newCursorOffset = lineStart + newMarker.length + adjustedLineOffset;
+        const markerDiff = newMarker.length - removedPrefixLength;
+        remapSourceOffset = (offset) => {
+            if (offset <= lineStart) {
+                return offset;
+            }
+            if (offset >= lineEnd) {
+                return offset + markerDiff;
+            }
+            const offsetInLine = offset - lineStart;
+            const adjustedLineOffset = Math.max(0, offsetInLine - Math.min(offsetInLine, removedPrefixLength));
+            return lineStart + newMarker.length + adjustedLineOffset;
+        };
     }
-    // Create new state and map cursor through it
+    const nextSelectionSource = isCollapsed
+        ? {
+            start: primarySourcePos,
+            end: primarySourcePos,
+        }
+        : {
+            start: map.cursorToSource(selectionStart, "forward"),
+            end: map.cursorToSource(selectionEnd, "backward"),
+        };
+    const mappedSelectionSource = {
+        start: remapSourceOffset(nextSelectionSource.start),
+        end: remapSourceOffset(nextSelectionSource.end),
+    };
+    // Create new state and map selection through it.
     const next = runtime.createState(newSource);
-    const caretCursor = next.map.sourceToCursor(newCursorOffset, "forward");
+    const nextStartCursor = next.map.sourceToCursor(mappedSelectionSource.start, "forward");
+    const nextEndCursor = next.map.sourceToCursor(mappedSelectionSource.end, "backward");
+    const nextSelectionStart = Math.min(nextStartCursor.cursorOffset, nextEndCursor.cursorOffset);
+    const nextSelectionEnd = Math.max(nextStartCursor.cursorOffset, nextEndCursor.cursorOffset);
+    const nextAffinity = isCollapsed
+        ? nextStartCursor.affinity
+        : (selection.affinity ?? "forward");
     return {
         source: newSource,
         selection: {
-            start: caretCursor.cursorOffset,
-            end: caretCursor.cursorOffset,
-            affinity: "forward",
+            start: nextSelectionStart,
+            end: nextSelectionEnd,
+            affinity: nextAffinity,
         },
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blankdotpage/cake",
-  "version": "0.1.62",
+  "version": "0.1.63",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",