@blankdotpage/cake 0.1.72 → 0.1.74

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

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/list/list.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAGnB,MAAM,oBAAoB,CAAC;AAknC5B,+CAA+C;AAC/C,MAAM,MAAM,uBAAuB,GAAG;IAAE,IAAI,EAAE,oBAAoB,CAAA;CAAE,CAAC;AAErE,iDAAiD;AACjD,MAAM,MAAM,yBAAyB,GAAG;IAAE,IAAI,EAAE,sBAAsB,CAAA;CAAE,CAAC;AAEzE,kCAAkC;AAClC,MAAM,MAAM,WAAW,GAAG,uBAAuB,GAAG,yBAAyB,CAAC;AAE9E,eAAO,MAAM,sBAAsB,EAAE,aA8HpC,CAAC"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/list/list.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAGnB,MAAM,oBAAoB,CAAC;AA0qC5B,+CAA+C;AAC/C,MAAM,MAAM,uBAAuB,GAAG;IAAE,IAAI,EAAE,oBAAoB,CAAA;CAAE,CAAC;AAErE,iDAAiD;AACjD,MAAM,MAAM,yBAAyB,GAAG;IAAE,IAAI,EAAE,sBAAsB,CAAA;CAAE,CAAC;AAEzE,kCAAkC;AAClC,MAAM,MAAM,WAAW,GAAG,uBAAuB,GAAG,yBAAyB,CAAC;AAE9E,eAAO,MAAM,sBAAsB,EAAE,aA8HpC,CAAC"}

package/dist/cake/extensions/list/list.js

@@ -585,19 +585,23 @@ function handleToggleList(state, isBullet) {
         if (selection.start === selection.end && startLine === endLine && lines[startLine] === "") {
             const marker = isBullet ? "- " : "1. ";
             newLines[startLine] = marker;
-            // Calculate new selection position (after the marker)
-            let newCursorPos = 0;
+            // Calculate new source position after the inserted marker.
+            let newCursorSourcePos = 0;
             for (let i = 0; i < startLine; i++) {
-                newCursorPos += lines[i].length + 1; // +1 for newline
+                newCursorSourcePos += lines[i].length + 1; // +1 for newline
             }
-            newCursorPos += marker.length;
+            newCursorSourcePos += marker.length;
             const newSource = newLines.join("\n");
+            const next = runtime.createState(newSource);
+            // Bias backward so the caret stays on the newly created empty list line
+            // instead of normalizing to the following line at the shared boundary.
+            const nextCursor = next.map.sourceToCursor(newCursorSourcePos, "backward");
             return {
                 source: newSource,
                 selection: {
-                    start: newCursorPos,
-                    end: newCursorPos,
-                    affinity: "forward",
+                    start: nextCursor.cursorOffset,
+                    end: nextCursor.cursorOffset,
+                    affinity: nextCursor.affinity,
                 },
             };
         }
@@ -663,6 +667,34 @@ function handleToggleList(state, isBullet) {
                     newSource.slice(block.endOffset);
         }
     }
+    if (selection.start === selection.end && startLine === endLine) {
+        const originalCursorSource = map.cursorToSource(selection.start, selection.affinity ?? "forward");
+        const originalLineInfo = getLineInfo(source, originalCursorSource);
+        const originalLine = lines[startLine] ?? "";
+        const nextLines = getSourceLines(newSource);
+        const nextLine = nextLines[startLine] ?? "";
+        const originalPrefixLength = getListPrefixLength(originalLine) ?? 0;
+        const nextPrefixLength = getListPrefixLength(nextLine) ?? 0;
+        const originalContentLength = Math.max(0, originalLine.length - originalPrefixLength);
+        const nextContentLength = Math.max(0, nextLine.length - nextPrefixLength);
+        const cursorOffsetInContent = Math.max(0, Math.min(originalContentLength, originalLineInfo.offsetInLine - originalPrefixLength));
+        const nextOffsetInContent = Math.min(nextContentLength, cursorOffsetInContent);
+        let nextCursorSourceOffset = 0;
+        for (let i = 0; i < startLine; i += 1) {
+            nextCursorSourceOffset += (nextLines[i] ?? "").length + 1;
+        }
+        nextCursorSourceOffset += nextPrefixLength + nextOffsetInContent;
+        const next = runtime.createState(newSource);
+        const nextCursor = next.map.sourceToCursor(nextCursorSourceOffset, "forward");
+        return {
+            source: newSource,
+            selection: {
+                start: nextCursor.cursorOffset,
+                end: nextCursor.cursorOffset,
+                affinity: nextCursor.affinity,
+            },
+        };
+    }
     // Calculate new selection to preserve the selected range
     const newSourceLines = getSourceLines(newSource);
     let newStartSourceOffset = 0;

package/package.json

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