@tiptap/extension-list 3.27.2 → 3.27.3

package/src/ordered-list/utils.ts

@@ -40,10 +40,15 @@ export const ORDERED_LIST_LINE_START_REGEX = new RegExp(
 const INDENTED_LINE_REGEX = /^\s/
 
 /**
- * Matches heading lines (1-6 # characters followed by whitespace or end-of-line)
- * Heading lines always starts a new block, so they can never be lazy continuation text of a list item
+ * This are blocks that can interrupt a paragraph, so a line starting with one of
+ * them can never be lazy continuation text of a list item
  */
-const HEADING_LINE_REGEX = /^#{1,6}(?:\s|$)/
+const PARAGRAPH_INTERRUPTERS = {
+  heading: /^#{1,6}(?:\s|$)/,
+  bulletItem: /^[-+*]\s+/,
+  codeFence: /^(?:```|~~~)/,
+  thematicBreak: /^(?:(?:-[ \t]*){3,}|(?:_[ \t]*){3,}|(?:\*[ \t]*){3,})$/,
+}
 
 /**
  * Represents a parsed ordered list item with indentation information
@@ -65,19 +70,22 @@ function isBlockContentLine(line: string): boolean {
   const trimmedLine = line.trimStart()
 
   return (
-    // oxlint-disable-next-line prefer-string-starts-ends-with
-    /^[-+*]\s+/.test(trimmedLine) ||
+    PARAGRAPH_INTERRUPTERS.bulletItem.test(trimmedLine) ||
     isOrderedListMarkerLine(trimmedLine) ||
-    HEADING_LINE_REGEX.test(trimmedLine) ||
+    PARAGRAPH_INTERRUPTERS.heading.test(trimmedLine) ||
+    // dash breaks are excluded: "---" directly below paragraph text is a
+    // setext heading underline, not a thematic break
+    (PARAGRAPH_INTERRUPTERS.thematicBreak.test(trimmedLine) && !trimmedLine.startsWith('-')) ||
     // oxlint-disable-next-line prefer-string-starts-ends-with
     /^>\s?/.test(trimmedLine) ||
-    // oxlint-disable-next-line prefer-string-starts-ends-with
-    /^```/.test(trimmedLine) ||
-    // oxlint-disable-next-line prefer-string-starts-ends-with
-    /^~~~/.test(trimmedLine)
+    PARAGRAPH_INTERRUPTERS.codeFence.test(trimmedLine)
   )
 }
 
+function interruptsLazyContinuation(line: string): boolean {
+  return Object.values(PARAGRAPH_INTERRUPTERS).some(pattern => pattern.test(line))
+}
+
 function splitItemContent(contentLines: string[]): {
   paragraphLines: string[]
   blockLines: string[]
@@ -173,7 +181,7 @@ export function collectOrderedListItems(lines: string[]): [OrderedListItem[], nu
         itemContentLines.push(nextLine.slice(Math.min(leadingWhitespace, contentIndent)))
         nextLineIndex += 1
       } else {
-        if (sawBlankLine || HEADING_LINE_REGEX.test(nextLine)) {
+        if (sawBlankLine || interruptsLazyContinuation(nextLine)) {
           break
         }