kimaki 0.4.33 → 0.4.35

package/src/unnest-code-blocks.test.ts

@@ -12,8 +12,7 @@ test('basic - single item with code block', () => {
 
     \`\`\`js
     const x = 1
-    \`\`\`
-    "
+    \`\`\`"
   `)
 })
 
@@ -53,8 +52,7 @@ test('multiple code blocks in one item', () => {
     \`\`\`
     \`\`\`python
     b = 2
-    \`\`\`
-    "
+    \`\`\`"
   `)
 })
 
@@ -132,8 +130,7 @@ test('mixed - some items have code, some dont', () => {
 
     \`\`\`python
     y = 2
-    \`\`\`
-    "
+    \`\`\`"
   `)
 })
 
@@ -150,8 +147,7 @@ test('text before and after code in same item', () => {
     \`\`\`js
     const x = 1
     \`\`\`
-    - End text
-    "
+    - End text"
   `)
 })
 
@@ -178,7 +174,6 @@ More text after.`
     const x = 1
     \`\`\`
 
-
     More text after."
   `)
 })
@@ -206,8 +201,7 @@ test('handles code block without language', () => {
 
     \`\`\`
     plain code
-    \`\`\`
-    "
+    \`\`\`"
   `)
 })
 
@@ -219,7 +213,243 @@ test('handles empty list item with code', () => {
   expect(result).toMatchInlineSnapshot(`
     "\`\`\`js
     const x = 1
+    \`\`\`"
+  `)
+})
+
+test('numbered list with text after code block', () => {
+  const input = `1. First item
+   \`\`\`js
+   const a = 1
+   \`\`\`
+   Text after the code
+2. Second item`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "1. First item
+
+    \`\`\`js
+    const a = 1
+    \`\`\`
+    - Text after the code
+    2. Second item"
+  `)
+})
+
+test('numbered list with multiple code blocks and text between', () => {
+  const input = `1. First item
+   \`\`\`js
+   const a = 1
+   \`\`\`
+   Middle text
+   \`\`\`python
+   b = 2
+   \`\`\`
+   Final text
+2. Second item`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "1. First item
+
+    \`\`\`js
+    const a = 1
+    \`\`\`
+    - Middle text
+
+    \`\`\`python
+    b = 2
+    \`\`\`
+    - Final text
+    2. Second item"
+  `)
+})
+
+test('unordered list with multiple code blocks and text between', () => {
+  const input = `- First item
+  \`\`\`js
+  const a = 1
+  \`\`\`
+  Middle text
+  \`\`\`python
+  b = 2
+  \`\`\`
+  Final text
+- Second item`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "- First item
+
+    \`\`\`js
+    const a = 1
+    \`\`\`
+    - Middle text
+
+    \`\`\`python
+    b = 2
+    \`\`\`
+    - Final text
+    - Second item"
+  `)
+})
+
+test('numbered list starting from 5', () => {
+  const input = `5. Fifth item
+   \`\`\`js
+   code
+   \`\`\`
+   Text after
+6. Sixth item`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "5. Fifth item
+
+    \`\`\`js
+    code
+    \`\`\`
+    - Text after
+    6. Sixth item"
+  `)
+})
+
+test('deeply nested list with code', () => {
+  const input = `- Level 1
+  - Level 2
+    - Level 3
+      \`\`\`js
+      deep code
+      \`\`\`
+      Text after deep code
+    - Another level 3
+  - Back to level 2`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "- Level 1
+    - Level 2
+    - Level 3
+
+    \`\`\`js
+    deep code
+    \`\`\`
+    - Text after deep code
+    - Another level 3
+    - Back to level 2"
+  `)
+})
+
+test('nested numbered list inside unordered with code', () => {
+  const input = `- Unordered item
+  1. Nested numbered
+     \`\`\`js
+     code
+     \`\`\`
+     Text after
+  2. Second nested
+- Another unordered`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "- Unordered item
+    1. Nested numbered
+
+    \`\`\`js
+    code
+    \`\`\`
+    - Text after
+    2. Second nested
+    - Another unordered"
+  `)
+})
+
+test('code block at end of numbered item no text after', () => {
+  const input = `1. First with text
+   \`\`\`js
+   code here
+   \`\`\`
+2. Second item
+3. Third item`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "1. First with text
+
+    \`\`\`js
+    code here
+    \`\`\`
+    2. Second item
+    3. Third item"
+  `)
+})
+
+test('multiple items each with code and text after', () => {
+  const input = `1. First
+   \`\`\`js
+   code1
+   \`\`\`
+   After first
+2. Second
+   \`\`\`python
+   code2
+   \`\`\`
+   After second
+3. Third no code`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "1. First
+
+    \`\`\`js
+    code1
+    \`\`\`
+    - After first
+    2. Second
+
+    \`\`\`python
+    code2
+    \`\`\`
+    - After second
+    3. Third no code"
+  `)
+})
+
+test('code block immediately after list marker', () => {
+  const input = `1. \`\`\`js
+   immediate code
+   \`\`\`
+2. Normal item`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`js
+    immediate code
+    \`\`\`
+    2. Normal item"
+  `)
+})
+
+test('code block with filename metadata', () => {
+  const input = `- Item with code
+  \`\`\`tsx filename=example.tsx
+  const x = 1
+  \`\`\``
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "- Item with code
+
+    \`\`\`tsx filename=example.tsx
+    const x = 1
+    \`\`\`"
+  `)
+})
+
+test('numbered list with filename metadata code block', () => {
+  const input = `1. First item
+   \`\`\`tsx filename=app.tsx
+   export default function App() {}
+   \`\`\`
+2. Second item`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "1. First item
+
+    \`\`\`tsx filename=app.tsx
+    export default function App() {}
     \`\`\`
-    "
+    2. Second item"
   `)
 })

package/src/unnest-code-blocks.ts

@@ -41,11 +41,15 @@ function processListToken(list: Tokens.List): Segment[] {
 function processListItem(item: Tokens.ListItem, prefix: string): Segment[] {
   const segments: Segment[] = []
   let currentText: string[] = []
+  // Track if we've seen a code block - text after code uses continuation prefix
+  let seenCodeBlock = false
 
   const flushText = (): void => {
     const text = currentText.join('').trim()
     if (text) {
-      segments.push({ type: 'list-item', prefix, content: text })
+      // After a code block, use '-' as continuation prefix to avoid repeating numbers
+      const effectivePrefix = seenCodeBlock ? '- ' : prefix
+      segments.push({ type: 'list-item', prefix: effectivePrefix, content: text })
     }
     currentText = []
   }
@@ -59,6 +63,7 @@ function processListItem(item: Tokens.ListItem, prefix: string): Segment[] {
         type: 'code',
         content: '```' + lang + '\n' + codeToken.text + '\n```\n',
       })
+      seenCodeBlock = true
     } else if (token.type === 'list') {
       flushText()
       // Recursively process nested list - segments bubble up
@@ -118,10 +123,12 @@ function renderSegments(segments: Segment[]): string {
         result.push(segment.prefix + segment.content + '\n')
       } else {
         // Raw content (no prefix means it's original raw)
-        result.push(segment.content)
+        // Ensure raw ends with newline for proper separation from next segment
+        const raw = segment.content.trimEnd()
+        result.push(raw + '\n')
       }
     }
   }
 
-  return result.join('')
+  return result.join('').trimEnd()
 }