@blankdotpage/cake 0.1.75 → 0.1.76

package/dist/cake/core/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/cake/core/runtime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/cake/core/runtime.ts"],"names":[],"mappings":"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"}

package/dist/cake/core/runtime.js

@@ -19,6 +19,7 @@ export function isApplyEditCommand(command) {
         command.type === "delete-forward");
 }
 const defaultSelection = { start: 0, end: 0, affinity: "forward" };
+const WORD_CHARACTER_PATTERN = /[\p{L}\p{N}_]/u;
 function removeFromArray(arr, value) {
     const index = arr.indexOf(value);
     if (index === -1) {
@@ -347,13 +348,17 @@ export function createRuntimeFromRegistry(registry) {
                 }
                 content.push(normalizedInline);
             }
+            const mergedContent = mergeAdjacentInlines(content);
+            if (mergedContent !== content) {
+                changed = true;
+            }
             if (!changed) {
                 normalizedBlockCache.set(block, next);
                 return next;
             }
             const normalized = {
                 ...next,
-                content,
+                content: mergedContent,
             };
             normalizedBlockCache.set(block, normalized);
             return normalized;
@@ -409,17 +414,52 @@ export function createRuntimeFromRegistry(registry) {
         }
         let next = pre;
         if (next.type === "inline-wrapper") {
+            const children = mergeAdjacentInlines(next.children
+                .map((child) => normalizeInline(child))
+                .filter((child) => child !== null));
             next = {
                 ...next,
-                children: next.children
-                    .map((child) => normalizeInline(child))
-                    .filter((child) => child !== null),
+                children,
             };
         }
         const normalized = applyInlineNormalizers(next);
         normalizedInlineCache.set(inline, normalized ?? removedInlineSentinel);
         return normalized;
     }
+    function mergeAdjacentInlines(inlines) {
+        if (inlines.length < 2) {
+            return inlines;
+        }
+        const merged = [];
+        let changed = false;
+        for (const inline of inlines) {
+            const previous = merged[merged.length - 1];
+            if (previous?.type === "text" && inline.type === "text") {
+                merged[merged.length - 1] = {
+                    ...previous,
+                    text: previous.text + inline.text,
+                };
+                changed = true;
+                continue;
+            }
+            if (previous?.type === "inline-wrapper" &&
+                inline.type === "inline-wrapper" &&
+                previous.kind === inline.kind &&
+                stableStringify(previous.data) === stableStringify(inline.data)) {
+                merged[merged.length - 1] = {
+                    ...previous,
+                    children: mergeAdjacentInlines([
+                        ...previous.children,
+                        ...inline.children,
+                    ]),
+                };
+                changed = true;
+                continue;
+            }
+            merged.push(inline);
+        }
+        return changed ? merged : inlines;
+    }
     function createTopLevelBlockSegment(block) {
         const serialized = serializeBlock(block);
         return {
@@ -571,9 +611,15 @@ export function createRuntimeFromRegistry(registry) {
             ? previousSegmented
             : undefined;
         const segmented = buildSegmentedDocState(normalized, reusablePrevious);
+        const cursorLength = segmented.map.cursorLength;
+        const clampedSelection = {
+            ...selection,
+            start: Math.max(0, Math.min(cursorLength, selection.start)),
+            end: Math.max(0, Math.min(cursorLength, selection.end)),
+        };
         return {
             source: segmented.source,
-            selection,
+            selection: normalizeSelection(clampedSelection),
             map: segmented.map,
             doc: normalized,
             runtime: runtime,
@@ -725,7 +771,8 @@ export function createRuntimeFromRegistry(registry) {
                 previousState: useIncrementalSegmentedDerivation ? state : undefined,
             });
             const interimAffinity = structural.nextAffinity ?? "forward";
-            const caretSource = interim.map.cursorToSource(structural.nextCursor, interimAffinity);
+            const interimCursor = Math.max(0, Math.min(interim.map.cursorLength, structural.nextCursor));
+            const caretSource = interim.map.cursorToSource(interimCursor, interimAffinity);
             if (useIncrementalSegmentedDerivation) {
                 const caretCursor = interim.map.sourceToCursor(caretSource, interimAffinity);
                 return {
@@ -812,6 +859,27 @@ export function createRuntimeFromRegistry(registry) {
             replaceText.length > 0 &&
             range.start === range.end &&
             textModel.getGraphemeAtCursor(range.start) === "\u200B";
+        if (command.type === "insert" && shouldReplacePlaceholder) {
+            const leadingWhitespace = replaceText.match(/^\s+/)?.[0] ?? "";
+            const around = marksAroundCursor(doc, range.start);
+            if (leadingWhitespace.length > 0) {
+                if (isMarksPrefix(around.left, around.right) &&
+                    around.right.length > around.left.length) {
+                    const whitespaceInsert = insertTextBeforePendingPlaceholderInDoc(doc, range.start, leadingWhitespace, around.left);
+                    if (whitespaceInsert) {
+                        const trailingText = replaceText.slice(leadingWhitespace.length);
+                        if (trailingText.length === 0) {
+                            return whitespaceInsert;
+                        }
+                        return applyStructuralEdit({ type: "insert", text: trailingText }, whitespaceInsert.doc, {
+                            start: whitespaceInsert.nextCursor,
+                            end: whitespaceInsert.nextCursor,
+                            affinity: whitespaceInsert.nextAffinity,
+                        });
+                    }
+                }
+            }
+        }
         const effectiveRange = shouldReplacePlaceholder
             ? { start: range.start, end: Math.min(docCursorLength, range.start + 1) }
             : range;
@@ -1174,6 +1242,18 @@ export function createRuntimeFromRegistry(registry) {
             return true;
         });
     }
+    function mergeMarksPreservingOrder(...groups) {
+        const next = [];
+        for (const group of groups) {
+            for (const mark of group) {
+                if (next.some((existing) => existing.key === mark.key)) {
+                    continue;
+                }
+                next.push(mark);
+            }
+        }
+        return next;
+    }
     function sliceRuns(runs, startCursor, endCursor) {
         const [left, rest] = splitRunsAt(runs, startCursor);
         const [selected, right] = splitRunsAt(rest, Math.max(0, endCursor - startCursor));
@@ -1330,27 +1410,188 @@ export function createRuntimeFromRegistry(registry) {
             },
         };
     }
-    function canPreserveRemainingMarksAtBoundary(state, cursorOffset, targetKind, remainingMarks) {
+    function rewritePendingPlaceholderAtCursor(state, cursorOffset, marks) {
         const textModel = getEditorTextModelForDoc(state.doc);
         const lines = textModel.getStructuralLines();
         const loc = textModel.resolveOffsetToLine(cursorOffset);
         const line = lines[loc.lineIndex];
         if (!line) {
-            return false;
+            return null;
         }
         const block = getBlockAtPath(state.doc.blocks, line.path);
         if (!block || block.type !== "paragraph") {
-            return false;
+            return null;
         }
+        const placeholder = "\u200B";
         const runs = paragraphToRuns(block);
-        const { before } = sliceRuns(runs, loc.offsetInLine, loc.offsetInLine);
-        const remainingKeys = remainingMarks.map((mark) => mark.key);
-        return before.every((run) => {
-            if (!run.marks.some((mark) => mark.kind === targetKind)) {
-                return true;
+        const { before, after } = sliceRuns(runs, loc.offsetInLine, loc.offsetInLine);
+        const replacement = [];
+        const firstAfter = after[0];
+        if (firstAfter?.type === "text" && firstAfter.text.startsWith(placeholder)) {
+            if (marks && marks.length > 0) {
+                replacement.push({ type: "text", text: placeholder, marks });
+            }
+            if (firstAfter.text.length > placeholder.length) {
+                replacement.push({
+                    ...firstAfter,
+                    text: firstAfter.text.slice(placeholder.length),
+                });
             }
-            return remainingKeys.every((key) => run.marks.some((mark) => mark.key === key));
-        });
+            replacement.push(...after.slice(1));
+        }
+        else {
+            const lastBefore = before[before.length - 1];
+            if (lastBefore?.type !== "text" ||
+                !lastBefore.text.endsWith(placeholder)) {
+                return null;
+            }
+            const prefix = lastBefore.text.slice(0, -placeholder.length);
+            if (prefix) {
+                replacement.push({ ...lastBefore, text: prefix });
+            }
+            if (marks && marks.length > 0) {
+                replacement.push({ type: "text", text: placeholder, marks });
+            }
+            replacement.push(...after);
+            before.pop();
+        }
+        const mergedRuns = normalizeRuns([...before, ...replacement]);
+        const nextBlock = {
+            ...block,
+            content: runsToInlines(mergedRuns),
+        };
+        const parentPath = line.path.slice(0, -1);
+        const indexInParent = line.path[line.path.length - 1] ?? 0;
+        const nextDoc = {
+            ...state.doc,
+            blocks: updateBlocksAtPath(state.doc.blocks, parentPath, (blocks) => blocks.map((child, index) => index === indexInParent ? nextBlock : child)),
+        };
+        const next = createStateFromDoc(nextDoc);
+        return {
+            ...next,
+            selection: {
+                start: cursorOffset,
+                end: cursorOffset,
+                affinity: marks && marks.length > 0 ? "forward" : "backward",
+            },
+        };
+    }
+    function updatePendingPlaceholderMarksAtCursor(state, cursorOffset, marks) {
+        return rewritePendingPlaceholderAtCursor(state, cursorOffset, marks);
+    }
+    function removePendingPlaceholderAtCursor(state, cursorOffset) {
+        return rewritePendingPlaceholderAtCursor(state, cursorOffset, null);
+    }
+    function getPendingPlaceholderMarksAtCursor(state, cursorOffset) {
+        const textModel = getEditorTextModelForDoc(state.doc);
+        const lines = textModel.getStructuralLines();
+        const loc = textModel.resolveOffsetToLine(cursorOffset);
+        const line = lines[loc.lineIndex];
+        if (!line) {
+            return null;
+        }
+        const block = getBlockAtPath(state.doc.blocks, line.path);
+        if (!block || block.type !== "paragraph") {
+            return null;
+        }
+        const placeholder = "\u200B";
+        const runs = paragraphToRuns(block);
+        const { before, after } = sliceRuns(runs, loc.offsetInLine, loc.offsetInLine);
+        const firstAfter = after[0];
+        if (firstAfter?.type === "text" && firstAfter.text.startsWith(placeholder)) {
+            return firstAfter.marks;
+        }
+        const lastBefore = before[before.length - 1];
+        if (lastBefore?.type === "text" &&
+            lastBefore.text.endsWith(placeholder)) {
+            return lastBefore.marks;
+        }
+        return null;
+    }
+    function insertTextBeforePendingPlaceholderInDoc(doc, cursorOffset, text, marks) {
+        const textModel = getEditorTextModelForDoc(doc);
+        const lines = textModel.getStructuralLines();
+        const loc = textModel.resolveOffsetToLine(cursorOffset);
+        const line = lines[loc.lineIndex];
+        if (!line) {
+            return null;
+        }
+        const block = getBlockAtPath(doc.blocks, line.path);
+        if (!block || block.type !== "paragraph") {
+            return null;
+        }
+        const placeholder = "\u200B";
+        const runs = paragraphToRuns(block);
+        const { before, after } = sliceRuns(runs, loc.offsetInLine, loc.offsetInLine);
+        const firstAfter = after[0];
+        if (firstAfter?.type !== "text" ||
+            !firstAfter.text.startsWith(placeholder)) {
+            return null;
+        }
+        const mergedRuns = normalizeRuns([
+            ...before,
+            ...(text.length > 0 ? [{ type: "text", text, marks }] : []),
+            firstAfter,
+            ...after.slice(1),
+        ]);
+        const nextBlock = {
+            ...block,
+            content: runsToInlines(mergedRuns),
+        };
+        const parentPath = line.path.slice(0, -1);
+        const indexInParent = line.path[line.path.length - 1] ?? 0;
+        const nextDoc = {
+            ...doc,
+            blocks: updateBlocksAtPath(doc.blocks, parentPath, (blocks) => blocks.map((child, index) => index === indexInParent ? nextBlock : child)),
+        };
+        return {
+            doc: nextDoc,
+            nextCursor: cursorOffset + Array.from(graphemeSegments(text)).length,
+            nextAffinity: "forward",
+        };
+    }
+    function hasInlineMarkerBoundaryBefore(source, markerStart) {
+        if (markerStart <= 0) {
+            return true;
+        }
+        return !WORD_CHARACTER_PATTERN.test(source[markerStart - 1] ?? "");
+    }
+    function pickSafeCollapsedToggleMarkerSpec(params) {
+        const { defaultSpec, source, insertAt, affinity } = params;
+        const candidates = Array.from(toggleMarkerToSpec.values()).filter((spec, index, all) => spec.kind === defaultSpec.kind &&
+            all.findIndex((candidate) => candidate.kind === spec.kind &&
+                candidate.open === spec.open &&
+                candidate.close === spec.close) === index);
+        if (candidates.length <= 1) {
+            return defaultSpec;
+        }
+        const previousChar = source[insertAt - 1] ?? "";
+        const nextChar = source[insertAt] ?? "";
+        let bestSpec = defaultSpec;
+        let bestScore = Number.POSITIVE_INFINITY;
+        for (const spec of candidates) {
+            if (spec.open === "_" &&
+                !hasInlineMarkerBoundaryBefore(source, insertAt)) {
+                continue;
+            }
+            let score = 0;
+            if (previousChar && spec.open[0] === previousChar) {
+                score += affinity === "forward" ? 8 : 3;
+            }
+            if (nextChar &&
+                spec.close[spec.close.length - 1] === nextChar) {
+                score += affinity === "backward" ? 8 : 3;
+            }
+            if (spec.open === defaultSpec.open &&
+                spec.close === defaultSpec.close) {
+                score -= 0.5;
+            }
+            if (score < bestScore) {
+                bestSpec = spec;
+                bestScore = score;
+            }
+        }
+        return bestSpec;
     }
     function preferredAffinityAtGap(left, right, fallback) {
         if (isMarksPrefix(left, right) && right.length > left.length) {
@@ -1611,18 +1852,39 @@ export function createRuntimeFromRegistry(registry) {
         };
         if (selection.start === selection.end) {
             const caret = selection.start;
+            const pendingPlaceholderMarks = getPendingPlaceholderMarksAtCursor(state, caret);
+            if (pendingPlaceholderMarks) {
+                const hasMarker = pendingPlaceholderMarks.some((mark) => mark.kind === markerKind);
+                const around = marksAroundCursor(state.doc, caret);
+                const nextMarks = hasMarker
+                    ? removeMarkByKind(pendingPlaceholderMarks, markerKind)
+                    : mergeMarksPreservingOrder(around.left, pendingPlaceholderMarks, [markerMark]);
+                const next = nextMarks.length > 0
+                    ? updatePendingPlaceholderMarksAtCursor(state, caret, nextMarks)
+                    : removePendingPlaceholderAtCursor(state, caret);
+                if (next) {
+                    return {
+                        ...next,
+                        selection: {
+                            start: caret,
+                            end: caret,
+                            affinity: "forward",
+                        },
+                    };
+                }
+            }
             // When the caret is at the end boundary of an inline wrapper, toggling the
             // wrapper should "exit" it (so the next character types outside). This is
             // best expressed in cursor space by flipping affinity to "forward" when we
             // are leaving a wrapper of the requested kind.
             const around = marksAroundCursor(state.doc, caret);
             if (isMarksPrefix(around.right, around.left) &&
-                around.left.length > around.right.length) {
+                around.left.length > around.right.length &&
+                (selection.affinity ?? "forward") === "backward") {
                 const exiting = around.left.slice(around.right.length);
                 if (exiting.some((mark) => mark.kind === markerKind)) {
                     const remainingMarks = removeMarkByKind(around.left, markerKind);
-                    if (!marksEqual(remainingMarks, around.right) &&
-                        canPreserveRemainingMarksAtBoundary(state, caret, markerKind, remainingMarks)) {
+                    if (!marksEqual(remainingMarks, around.right)) {
                         const next = createPendingPlaceholderStateAtCursor(state, caret, remainingMarks);
                         if (next) {
                             return next;
@@ -1645,6 +1907,20 @@ export function createRuntimeFromRegistry(registry) {
                 around.right.length > around.left.length) {
                 const entering = around.right.slice(around.left.length);
                 if (entering.some((mark) => mark.kind === markerKind)) {
+                    const remainingMarks = removeMarkByKind(around.right, markerKind);
+                    const next = remainingMarks.length > 0
+                        ? updatePendingPlaceholderMarksAtCursor(state, caret, remainingMarks)
+                        : removePendingPlaceholderAtCursor(state, caret);
+                    if (next) {
+                        return {
+                            ...next,
+                            selection: {
+                                start: caret,
+                                end: caret,
+                                affinity: "backward",
+                            },
+                        };
+                    }
                     const insertAtBackward = map.cursorToSource(caret, "backward");
                     const insertAtForward = map.cursorToSource(caret, "forward");
                     const after = source.slice(insertAtBackward);
@@ -1705,6 +1981,7 @@ export function createRuntimeFromRegistry(registry) {
             }
             if (isMarksPrefix(around.right, around.left) &&
                 around.left.length > around.right.length &&
+                (selection.affinity ?? "forward") === "backward" &&
                 !around.left.some((mark) => mark.kind === markerKind)) {
                 const next = createPendingPlaceholderStateAtCursor(state, caret, [
                     ...around.left,
@@ -1735,34 +2012,63 @@ export function createRuntimeFromRegistry(registry) {
                 return null;
             })();
             // When at a boundary between cursor positions (insertAtBackward !== insertAtForward),
-            // prefer insertAtBackward to keep new markers inside the current formatting context.
-            // However, only do this if the new marker length is <= the boundary marker length,
-            // otherwise we create ambiguous marker sequences (e.g., *italic**​*** doesn't parse).
+            // only prefer insertAtBackward if the caret is intentionally anchored inside the
+            // left formatting context. If the caret affinity is forward, the user explicitly
+            // exited that wrapper and new markers belong on the forward side of the gap.
+            // Still guard against inserting a longer marker into a shorter boundary run,
+            // which would create ambiguous source (e.g., *italic**​***).
             const betweenLen = insertAtForward - insertAtBackward;
-            const preferBackward = insertAtBackward !== insertAtForward && openLen <= betweenLen;
+            const preferBackward = insertAtBackward !== insertAtForward &&
+                (selection.affinity ?? "forward") === "backward" &&
+                openLen <= betweenLen;
             const insertAt = placeholderPos ?? (preferBackward ? insertAtBackward : insertAtForward);
+            const insertMarkerSpec = placeholderPos === null
+                ? pickSafeCollapsedToggleMarkerSpec({
+                    defaultSpec: markerSpec,
+                    source,
+                    insertAt,
+                    affinity: selection.affinity ?? "forward",
+                })
+                : markerSpec;
+            const insertOpenMarker = insertMarkerSpec.open;
+            const insertCloseMarker = insertMarkerSpec.close;
+            const insertOpenLen = insertOpenMarker.length;
+            const baseMarks = (selection.affinity ?? "forward") === "backward"
+                ? around.left
+                : around.right;
+            const nextMarks = [
+                ...baseMarks.filter((mark) => mark.kind !== markerKind),
+                markerMark,
+            ];
+            if (placeholderPos !== null) {
+                const next = updatePendingPlaceholderMarksAtCursor(state, caret, nextMarks);
+                if (next) {
+                    return next;
+                }
+            }
+            const docInserted = createPendingPlaceholderStateAtCursor(state, caret, nextMarks);
+            if (docInserted) {
+                return docInserted;
+            }
             const nextSource = placeholderPos !== null
                 ? source.slice(0, insertAt) +
-                    openMarker +
+                    insertOpenMarker +
                     placeholder +
-                    closeMarker +
+                    insertCloseMarker +
                     source.slice(insertAt + placeholder.length)
                 : source.slice(0, insertAt) +
-                    openMarker +
+                    insertOpenMarker +
                     placeholder +
-                    closeMarker +
+                    insertCloseMarker +
                     source.slice(insertAt);
             const next = createState(nextSource);
-            const placeholderStart = insertAt + openLen;
+            const placeholderStart = insertAt + insertOpenLen;
             const startCursor = next.map.sourceToCursor(placeholderStart, "forward");
-            return {
-                ...next,
-                selection: {
-                    start: startCursor.cursorOffset,
-                    end: startCursor.cursorOffset,
-                    affinity: "forward",
-                },
-            };
+            return createStateFromDoc(next.doc, {
+                start: startCursor.cursorOffset,
+                end: startCursor.cursorOffset,
+                affinity: "forward",
+            });
         }
         const cursorStart = Math.min(selection.start, selection.end);
         const cursorEnd = Math.max(selection.start, selection.end);

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

@@ -1 +1 @@
-{"version":3,"file":"bold.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/bold/bold.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAInB,MAAM,oBAAoB,CAAC;AAU5B,eAAO,MAAM,aAAa,EAAE,aA2I3B,CAAC"}
+{"version":3,"file":"bold.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/bold/bold.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAInB,MAAM,oBAAoB,CAAC;AAU5B,eAAO,MAAM,aAAa,EAAE,aAkJ3B,CAAC"}

package/dist/cake/extensions/bold/bold.js

@@ -69,14 +69,19 @@ export const boldExtension = (editor) => {
         }
         const builder = new CursorSourceBuilder();
         builder.appendSourceOnly("**");
+        const defaultChildResults = inline.children.map((child) => context.serializeInline(child));
+        let previousSource = "";
         inline.children.forEach((child, index) => {
+            const nextSource = defaultChildResults[index + 1]?.source ?? "";
             const serialized = child.type === "inline-wrapper" &&
                 child.kind === "italic" &&
-                index === 0 &&
-                inline.children.length > 1
+                (previousSource.endsWith("*") ||
+                    nextSource.startsWith("*") ||
+                    (index === 0 && inline.children.length > 1))
                 ? serializeItalicInlineWithMarker(child, context, "_")
-                : context.serializeInline(child);
+                : (defaultChildResults[index] ?? context.serializeInline(child));
             builder.appendSerialized(serialized);
+            previousSource = serialized.source;
         });
         builder.appendSourceOnly("**");
         return builder.build();

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;AAwa5B,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,aA2M9B,CAAC"}

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

@@ -351,7 +351,7 @@ export const headingExtension = (editor) => {
         if (selection.start !== selection.end) {
             return null;
         }
-        const cursorPos = selection.start;
+        const cursorPos = Math.max(0, Math.min(map.cursorLength, selection.start));
         const sourcePos = map.cursorToSource(cursorPos, selection.affinity ?? "forward");
         const lineStart = findLineStartInSource(source, sourcePos);
         const prefix = source.slice(lineStart, sourcePos);

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

@@ -1 +1 @@
-{"version":3,"file":"italic.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/italic/italic.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAGlB,KAAK,qBAAqB,EAC3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAmB/C,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,EAC3C,OAAO,EAAE;IACP,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,qBAAqB,CAAC;CAC5D,EACD,MAAM,EAAE,GAAG,GAAG,GAAG,GAChB,qBAAqB,CAGvB;AAkCD,eAAO,MAAM,eAAe,EAAE,aAqI7B,CAAC"}
+{"version":3,"file":"italic.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/italic/italic.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAIlB,KAAK,qBAAqB,EAC3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAS,MAAM,EAAE,MAAM,kBAAkB,CAAC;AA+BtD,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,EAC3C,OAAO,EAAE;IACP,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,qBAAqB,CAAC;CAC5D,EACD,MAAM,EAAE,GAAG,GAAG,GAAG,GAChB,qBAAqB,CAGvB;AAmGD,eAAO,MAAM,eAAe,EAAE,aAsJ7B,CAAC"}

package/dist/cake/extensions/italic/italic.js

@@ -10,29 +10,83 @@ function buildItalicSerialization(childResults, marker) {
     builder.appendSourceOnly(marker);
     return builder.build();
 }
+function canParseSerializedUnderscoreRun(source, start, close) {
+    return (source[start + 1] === "*" ||
+        source[close - 1] === "*" ||
+        source[close + 1] === "*");
+}
 export function serializeItalicInlineWithMarker(inline, context, marker) {
     const childResults = inline.children.map((child) => context.serializeInline(child));
     return buildItalicSerialization(childResults, marker);
 }
+function serializeInlineSequenceWithSafeItalic(inlines, context) {
+    const builder = new CursorSourceBuilder();
+    const defaultResults = inlines.map((inline) => context.serializeInline(inline));
+    let previousSource = "";
+    inlines.forEach((inline, index) => {
+        const nextSource = defaultResults[index + 1]?.source ?? "";
+        const serialized = inline.type === "inline-wrapper" &&
+            inline.kind === ITALIC_KIND &&
+            (previousSource.endsWith("*") || nextSource.startsWith("*"))
+            ? serializeItalicInlineWithMarker(inline, context, "_")
+            : (defaultResults[index] ?? context.serializeInline(inline));
+        builder.appendSerialized(serialized);
+        previousSource = serialized.source;
+    });
+    return builder.build();
+}
 function findItalicClose(source, start, end, marker) {
     if (marker === "_") {
         return source.indexOf("_", start + 1);
     }
-    let fallback = -1;
     for (let i = start + 1; i < end; i += 1) {
         if (source[i] !== "*") {
             continue;
         }
-        const prevIsStar = source[i - 1] === "*";
-        const nextIsStar = source[i + 1] === "*";
-        if (!prevIsStar && !nextIsStar) {
+        let runStart = i;
+        while (runStart > start + 1 && source[runStart - 1] === "*") {
+            runStart -= 1;
+        }
+        let runEnd = i;
+        while (runEnd + 1 < end && source[runEnd + 1] === "*") {
+            runEnd += 1;
+        }
+        const runLength = runEnd - runStart + 1;
+        if (runLength === 1) {
+            if (hasUnmatchedBoldRun(source, start + 1, i)) {
+                continue;
+            }
             return i;
         }
-        if (fallback === -1) {
-            fallback = i;
+        const hasUnmatchedBold = hasUnmatchedBoldRun(source, start + 1, runStart);
+        const hasBoldCloserAhead = source.indexOf("**", runEnd + 1) !== -1;
+        if (!hasBoldCloserAhead) {
+            if (runLength === 2 && hasUnmatchedBold) {
+                i = runEnd;
+                continue;
+            }
+            if (runLength >= 3 && hasUnmatchedBold) {
+                return runEnd;
+            }
+            return runStart;
+        }
+        i = runEnd;
+    }
+    return -1;
+}
+function hasUnmatchedBoldRun(source, start, end) {
+    let parity = 0;
+    for (let i = start; i < end; i += 1) {
+        if (source[i] !== "*" || source[i + 1] !== "*") {
+            continue;
+        }
+        if (source[i - 1] === "*" || source[i + 2] === "*") {
+            continue;
         }
+        parity ^= 1;
+        i += 1;
     }
-    return fallback;
+    return parity === 1;
 }
 export const italicExtension = (editor) => {
     const disposers = [];
@@ -58,9 +112,6 @@ export const italicExtension = (editor) => {
         if (char !== "_" && char !== "*") {
             return null;
         }
-        if (char === "_" && !hasInlineMarkerBoundaryBefore(source, start)) {
-            return null;
-        }
         // Don't match ** (that's bold)
         if (char === "*" && source[start + 1] === "*") {
             return null;
@@ -75,6 +126,11 @@ export const italicExtension = (editor) => {
         if (close === -1 || close >= end) {
             return null;
         }
+        if (char === "_" &&
+            !hasInlineMarkerBoundaryBefore(source, start) &&
+            !canParseSerializedUnderscoreRun(source, start, close)) {
+            return null;
+        }
         // Don't match empty delimiters like ** that could be start of bold
         if (close === start + 1 && close + 1 < end) {
             return null;
@@ -89,6 +145,12 @@ export const italicExtension = (editor) => {
             nextPos: close + 1,
         };
     }));
+    disposers.push(editor.registerSerializeBlock((block, context) => {
+        if (block.type !== "paragraph") {
+            return null;
+        }
+        return serializeInlineSequenceWithSafeItalic(block.content, context);
+    }));
     disposers.push(editor.registerSerializeInline((inline, context) => {
         if (inline.type !== "inline-wrapper" || inline.kind !== ITALIC_KIND) {
             return null;

package/package.json

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