@@ -598,233 +384,8 @@
class="md:col-span-2 bg-white rounded shadow p-4 min-h-[400px] flex flex-col"
>
Parsed Stream
-
- {#each parsedBlocks as block}
- {@const blockType = block[0]?.block.type}
- {@const blockLevel = block[0]?.block.level}
- {@const blockLanguage = block[0]?.block.language}
- {@const hasTableCells =
- blockType === "table_header_cell" || blockType === "table_cell"}
- {@const tableRows = hasTableCells ? buildTableRows(block) : []}
-
-
- {#if blockType === "heading"}
- {#if blockLevel === 1}
-
- {#each block as chunk}
- {@const styles = [
- ...chunk.contained.map((s) => s.type),
- ...chunk.opening.map((s) => s.type),
- ]}
- {#if hasCodeStyle(styles)}
- {chunk.text}
- {:else}
- {chunk.text}
- {/if}
- {/each}
-
- {:else if blockLevel === 2}
-
- {#each block as chunk}
- {@const styles = [
- ...chunk.contained.map((s) => s.type),
- ...chunk.opening.map((s) => s.type),
- ]}
- {#if hasCodeStyle(styles)}
- {chunk.text}
- {:else}
- {chunk.text}
- {/if}
- {/each}
-
- {:else if blockLevel === 3}
-
- {#each block as chunk}
- {@const styles = [
- ...chunk.contained.map((s) => s.type),
- ...chunk.opening.map((s) => s.type),
- ]}
- {#if hasCodeStyle(styles)}
- {chunk.text}
- {:else}
- {chunk.text}
- {/if}
- {/each}
-
- {:else if blockLevel === 4}
-
- {#each block as chunk}
- {@const styles = [
- ...chunk.contained.map((s) => s.type),
- ...chunk.opening.map((s) => s.type),
- ]}
- {#if hasCodeStyle(styles)}
- {chunk.text}
- {:else}
- {chunk.text}
- {/if}
- {/each}
-
- {:else if blockLevel === 5}
-
- {#each block as chunk}
- {@const styles = [
- ...chunk.contained.map((s) => s.type),
- ...chunk.opening.map((s) => s.type),
- ]}
- {#if hasCodeStyle(styles)}
- {chunk.text}
- {:else}
- {chunk.text}
- {/if}
- {/each}
-
- {:else if blockLevel === 6}
-
- {#each block as chunk}
- {@const styles = [
- ...chunk.contained.map((s) => s.type),
- ...chunk.opening.map((s) => s.type),
- ]}
- {#if hasCodeStyle(styles)}
- {chunk.text}
- {:else}
- {chunk.text}
- {/if}
- {/each}
-
- {:else}
-
- {#each block as chunk}
- {@const styles = [
- ...chunk.contained.map((s) => s.type),
- ...chunk.opening.map((s) => s.type),
- ]}
- {#if hasCodeStyle(styles)}
- {chunk.text}
- {:else}
- {chunk.text}
- {/if}
- {/each}
-
- {/if}
- {:else if blockType === "code_block"}
-
{#each block as chunk}{chunk.text}{/each}
- {#if blockLanguage}
-
{blockLanguage}
- {/if}
- {:else if blockType === "blockquote"}
-
- {#each block as chunk}
- {@const styles = [
- ...chunk.contained.map((s) => s.type),
- ...chunk.opening.map((s) => s.type),
- ]}
- {#if hasCodeStyle(styles)}
- {chunk.text}
- {:else}
- {chunk.text}
- {/if}
- {/each}
-
- {:else if blockType === "list_item"}
- {@const list = block[0]?.block.list}
-
-
- {#if list?.type === "ordered"}
- {list.ordinal ?? ""}{list.marker}
- {:else}
- •
- {/if}
-
- {#each block as chunk}
- {@const styles = [
- ...chunk.contained.map((s) => s.type),
- ...chunk.opening.map((s) => s.type),
- ]}
- {#if hasCodeStyle(styles)}
- {chunk.text}
- {:else}
- {chunk.text}
- {/if}
- {/each}
-
- {:else if blockType === "table_header_cell" || blockType === "table_cell"}
-
-
- {#each tableRows as row}
-
- {#each row.cells as cell}
-
- {#each cell.chunks as chunk}
- {@const styles = [
- ...chunk.contained.map((s) => s.type),
- ...chunk.opening.map((s) => s.type),
- ]}
- {#if hasCodeStyle(styles)}
- {chunk.text}
- {:else}
- {chunk.text}
- {/if}
- {/each}
-
- {/each}
-
- {/each}
-
-
- {:else}
-
-
- {#each block as chunk}
- {@const styles = [
- ...chunk.contained.map((s) => s.type),
- ...chunk.opening.map((s) => s.type),
- ]}
- {#if hasCodeStyle(styles)}
- {chunk.text}
- {:else}
- {chunk.text}
- {/if}
- {/each}
-
- {/if}
-
- {/each}
+
diff --git a/demo/svelte-demo/tsconfig.json b/demo/svelte-demo/tsconfig.json
index 6f788f1..5622bac 100644
--- a/demo/svelte-demo/tsconfig.json
+++ b/demo/svelte-demo/tsconfig.json
@@ -5,6 +5,7 @@
"checkJs": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
+ "allowImportingTsExtensions": true,
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
diff --git a/demo/svelte-demo/vitest.config.ts b/demo/svelte-demo/vitest.config.ts
new file mode 100644
index 0000000..1dace44
--- /dev/null
+++ b/demo/svelte-demo/vitest.config.ts
@@ -0,0 +1,9 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+ test: {
+ environment: 'node',
+ include: ['src/**/*.test.ts'],
+ exclude: ['.svelte-kit/**', 'dist/**', 'node_modules/**'],
+ },
+})
diff --git a/src/tree-sitter-markdown-stream-parser.ts b/src/tree-sitter-markdown-stream-parser.ts
index f440876..0867fdc 100644
--- a/src/tree-sitter-markdown-stream-parser.ts
+++ b/src/tree-sitter-markdown-stream-parser.ts
@@ -1,4 +1,4 @@
-import { Parser, Language, type Tree, type Node } from 'web-tree-sitter'
+import { Parser, Language, type Tree, type Node, type Edit } from 'web-tree-sitter'
import TokensStreamBuffer from './tokens-stream-buffer.ts'
import type {
Chunk,
@@ -353,14 +353,14 @@ export class MarkdownStreamParser {
// For proper incremental parsing, tell tree-sitter what changed
if (this.currentTree) {
- this.currentTree.edit({
+ this.currentTree.edit(({
startIndex: oldLength,
oldEndIndex: oldLength,
newEndIndex: this.content.length,
startPosition: oldEndPosition,
oldEndPosition,
newEndPosition: this.endPosition
- })
+ }) as Edit)
}
// Parse the updated content
diff --git a/src/tree-sitter/inline-detection.ts b/src/tree-sitter/inline-detection.ts
index 1723e40..3996a6a 100644
--- a/src/tree-sitter/inline-detection.ts
+++ b/src/tree-sitter/inline-detection.ts
@@ -263,6 +263,9 @@ export function isInsideCodeBlock(
if (inlineNode) {
const inlineContent = inlineNode.text
const inlineTree = inlineParser.parse(inlineContent)
+ if (!inlineTree) {
+ return false
+ }
const relativePos = position - inlineNode.startIndex
// Check if position is inside any code_span
diff --git a/src/tree-sitter/segment-generator.ts b/src/tree-sitter/segment-generator.ts
index caf88d8..ae286ef 100644
--- a/src/tree-sitter/segment-generator.ts
+++ b/src/tree-sitter/segment-generator.ts
@@ -379,79 +379,80 @@ export function generateSegments(
if (inlineNode && inlineParser) {
const inlineContent = inlineNode.text
const inlineTree = inlineParser.parse(inlineContent)
+ if (inlineTree) {
+ // Count the range in the new portion
+ const newPortionStart = actualFromIndex - inlineNode.startIndex
+ const newPortionEnd = actualToIndex - inlineNode.startIndex
+ const newPortion = inlineContent.substring(Math.max(0, newPortionStart), newPortionEnd)
+
+ // Check for unmatched backtick
+ if (newPortion.includes('`')) {
+ const hasCompleteCodeSpan = hasCompleteCodeSpanAt(inlineTree.rootNode, newPortionStart, newPortionEnd)
+ if (!hasCompleteCodeSpan) {
+ state.pendingInlineContent = newContent
+ state.pendingInlineStartIndex = actualFromIndex
+ state.sourceOffset = actualToIndex
+ return { segments, state }
+ }
+ }
- // Count the range in the new portion
- const newPortionStart = actualFromIndex - inlineNode.startIndex
- const newPortionEnd = actualToIndex - inlineNode.startIndex
- const newPortion = inlineContent.substring(Math.max(0, newPortionStart), newPortionEnd)
-
- // Check for unmatched backtick
- if (newPortion.includes('`')) {
- const hasCompleteCodeSpan = hasCompleteCodeSpanAt(inlineTree.rootNode, newPortionStart, newPortionEnd)
- if (!hasCompleteCodeSpan) {
- state.pendingInlineContent = newContent
- state.pendingInlineStartIndex = actualFromIndex
- state.sourceOffset = actualToIndex
- return { segments, state }
+ // Check for unmatched bold markers
+ if (newPortion.includes('**')) {
+ const hasCompleteBold = hasCompleteBoldAt(inlineTree.rootNode, newPortionStart, newPortionEnd)
+ if (!hasCompleteBold) {
+ state.pendingInlineContent = newContent
+ state.pendingInlineStartIndex = actualFromIndex
+ state.sourceOffset = actualToIndex
+ return { segments, state }
+ }
}
- }
- // Check for unmatched bold markers
- if (newPortion.includes('**')) {
- const hasCompleteBold = hasCompleteBoldAt(inlineTree.rootNode, newPortionStart, newPortionEnd)
- if (!hasCompleteBold) {
- state.pendingInlineContent = newContent
- state.pendingInlineStartIndex = actualFromIndex
- state.sourceOffset = actualToIndex
- return { segments, state }
+ // Check for unmatched italic markers (skip if inside code block)
+ const insideCodeBlock = isInsideCodeBlock(currentTree.rootNode, actualFromIndex, currentTree, inlineParser)
+ if (!insideCodeBlock) {
+ const hasUnmatchedItalic = hasUnmatchedItalicMarker(newPortion, inlineParser)
+ if (hasUnmatchedItalic) {
+ const hasCompleteItalic = hasCompleteItalicAt(inlineTree.rootNode, newPortionStart, newPortionEnd)
+ if (!hasCompleteItalic) {
+ state.pendingInlineContent = newContent
+ state.pendingInlineStartIndex = actualFromIndex
+ state.sourceOffset = actualToIndex
+ return { segments, state }
+ }
+ }
}
- }
- // Check for unmatched italic markers (skip if inside code block)
- const insideCodeBlock = isInsideCodeBlock(currentTree.rootNode, actualFromIndex, currentTree, inlineParser)
- if (!insideCodeBlock) {
- const hasUnmatchedItalic = hasUnmatchedItalicMarker(newPortion, inlineParser)
- if (hasUnmatchedItalic) {
- const hasCompleteItalic = hasCompleteItalicAt(inlineTree.rootNode, newPortionStart, newPortionEnd)
- if (!hasCompleteItalic) {
+ // Check for unmatched strikethrough markers
+ if (newPortion.includes('~~')) {
+ const hasCompleteStrikethrough = hasCompleteStrikethroughAt(inlineTree.rootNode, newPortionStart, newPortionEnd)
+ if (!hasCompleteStrikethrough) {
state.pendingInlineContent = newContent
state.pendingInlineStartIndex = actualFromIndex
state.sourceOffset = actualToIndex
return { segments, state }
}
}
- }
-
- // Check for unmatched strikethrough markers
- if (newPortion.includes('~~')) {
- const hasCompleteStrikethrough = hasCompleteStrikethroughAt(inlineTree.rootNode, newPortionStart, newPortionEnd)
- if (!hasCompleteStrikethrough) {
- state.pendingInlineContent = newContent
- state.pendingInlineStartIndex = actualFromIndex
- state.sourceOffset = actualToIndex
- return { segments, state }
- }
- }
- // Check for incomplete link opening [
- if (newPortion.includes('[')) {
- const hasCompleteLink = hasCompleteLinkAt(inlineTree.rootNode, newPortionStart, newPortionEnd)
- if (!hasCompleteLink && hasIncompleteLinkOpening(newPortion, inlineParser)) {
- state.pendingInlineContent = newContent
- state.pendingInlineStartIndex = actualFromIndex
- state.sourceOffset = actualToIndex
- return { segments, state }
+ // Check for incomplete link opening [
+ if (newPortion.includes('[')) {
+ const hasCompleteLink = hasCompleteLinkAt(inlineTree.rootNode, newPortionStart, newPortionEnd)
+ if (!hasCompleteLink && hasIncompleteLinkOpening(newPortion, inlineParser)) {
+ state.pendingInlineContent = newContent
+ state.pendingInlineStartIndex = actualFromIndex
+ state.sourceOffset = actualToIndex
+ return { segments, state }
+ }
}
- }
- // Check for incomplete image opening ![
- if (newPortion.includes('![')) {
- const hasCompleteImage = hasCompleteImageAt(inlineTree.rootNode, newPortionStart, newPortionEnd)
- if (!hasCompleteImage && hasIncompleteImageOpening(newPortion, inlineParser)) {
- state.pendingInlineContent = newContent
- state.pendingInlineStartIndex = actualFromIndex
- state.sourceOffset = actualToIndex
- return { segments, state }
+ // Check for incomplete image opening ![
+ if (newPortion.includes('![')) {
+ const hasCompleteImage = hasCompleteImageAt(inlineTree.rootNode, newPortionStart, newPortionEnd)
+ if (!hasCompleteImage && hasIncompleteImageOpening(newPortion, inlineParser)) {
+ state.pendingInlineContent = newContent
+ state.pendingInlineStartIndex = actualFromIndex
+ state.sourceOffset = actualToIndex
+ return { segments, state }
+ }
}
}
}
@@ -641,40 +642,42 @@ export function generateSegments(
usedInlineContent = hostInlineNode !== null
const inlineContent = hostInlineNode?.text ?? processedContent
const inlineTree = inlineParser.parse(inlineContent)
- const delimiterRanges = collectInlineDelimiterRanges(inlineTree)
- const chunkStartInInline = hostInlineNode
- ? Math.max(0, actualFromIndex - hostInlineNode.startIndex)
- : 0
- const chunkEndInInline = hostInlineNode
- ? Math.max(chunkStartInInline, actualToIndex - hostInlineNode.startIndex)
- : processedContent.length
-
- const spanResult = processInlineSpans(
- inlineTree,
- chunkStartInInline,
- chunkEndInInline,
- inlineContent,
- state,
- delimiterRanges,
- chunkStartUtf16 - rawToRenderedOffset(chunkStartInInline, delimiterRanges)
- )
- opening = spanResult.opening
- closing = spanResult.closing
- contained = spanResult.contained
- state = { ...state, openSpans: spanResult.newOpenSpans }
-
- // Strip inline markers from the content
- strippedContent = getInlineContent(
- hostInlineNode ? inlineContent.substring(chunkStartInInline, chunkEndInInline) : processedContent,
- inlineTree,
- chunkStartInInline,
- chunkEndInInline
- )
-
- if (hostInlineNode && blockInfo.type !== 'header' && actualToIndex > hostInlineNode.endIndex) {
- const tailStart = Math.max(actualFromIndex, hostInlineNode.endIndex)
- const tailText = content.substring(tailStart, actualToIndex)
- strippedContent += stripListSuppressedRanges(tailText, currentTree.rootNode, content, tailStart, actualToIndex)
+ if (inlineTree) {
+ const delimiterRanges = collectInlineDelimiterRanges(inlineTree)
+ const chunkStartInInline = hostInlineNode
+ ? Math.max(0, actualFromIndex - hostInlineNode.startIndex)
+ : 0
+ const chunkEndInInline = hostInlineNode
+ ? Math.max(chunkStartInInline, actualToIndex - hostInlineNode.startIndex)
+ : processedContent.length
+
+ const spanResult = processInlineSpans(
+ inlineTree,
+ chunkStartInInline,
+ chunkEndInInline,
+ inlineContent,
+ state,
+ delimiterRanges,
+ chunkStartUtf16 - rawToRenderedOffset(chunkStartInInline, delimiterRanges)
+ )
+ opening = spanResult.opening
+ closing = spanResult.closing
+ contained = spanResult.contained
+ state = { ...state, openSpans: spanResult.newOpenSpans }
+
+ // Strip inline markers from the content
+ strippedContent = getInlineContent(
+ hostInlineNode ? inlineContent.substring(chunkStartInInline, chunkEndInInline) : processedContent,
+ inlineTree,
+ chunkStartInInline,
+ chunkEndInInline
+ )
+
+ if (hostInlineNode && blockInfo.type !== 'header' && actualToIndex > hostInlineNode.endIndex) {
+ const tailStart = Math.max(actualFromIndex, hostInlineNode.endIndex)
+ const tailText = content.substring(tailStart, actualToIndex)
+ strippedContent += stripListSuppressedRanges(tailText, currentTree.rootNode, content, tailStart, actualToIndex)
+ }
}
}
diff --git a/vitest.config.ts b/vitest.config.ts
index bb2b066..ef3f5f2 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -4,6 +4,7 @@ export default defineConfig({
test: {
environment: 'node',
globals: true,
+ include: ['src/**/*.test.ts'],
},
esbuild: {
target: 'node23'