fix tests and markdown handling

ntietje1 · ntietje1 · commit 836cc299a09d · 2026-04-11T17:57:57.000-04:00
diff --git a/convex/_generated/api.d.ts b/convex/_generated/api.d.ts
@@ -115,6 +115,7 @@ import type * as gameMaps_triggers from "../gameMaps/triggers.js";
 import type * as gameMaps_types from "../gameMaps/types.js";
 import type * as gameMaps_validation from "../gameMaps/validation.js";
 import type * as http from "../http.js";
+import type * as notes_blocknote from "../notes/blocknote.js";
 import type * as notes_editorSpecs from "../notes/editorSpecs.js";
 import type * as notes_functions_captureNoteSnapshot from "../notes/functions/captureNoteSnapshot.js";
 import type * as notes_functions_createNote from "../notes/functions/createNote.js";
@@ -326,6 +327,7 @@ declare const fullApi: ApiFromModules<{
   "gameMaps/types": typeof gameMaps_types;
   "gameMaps/validation": typeof gameMaps_validation;
   http: typeof http;
+  "notes/blocknote": typeof notes_blocknote;
   "notes/editorSpecs": typeof notes_editorSpecs;
   "notes/functions/captureNoteSnapshot": typeof notes_functions_captureNoteSnapshot;
   "notes/functions/createNote": typeof notes_functions_createNote;
diff --git a/convex/documentSnapshots/__tests__/rollbackEdgeCases.test.ts b/convex/documentSnapshots/__tests__/rollbackEdgeCases.test.ts
@@ -182,8 +182,8 @@ describe('note rollback data integrity', () => {
       const originalBlocks = [
         {
           id: 'block-1',
-          type: 'paragraph' as const,
-          content: [{ type: 'text' as const, text: 'Original content' }],
+          type: 'paragraph',
+          content: [{ type: 'text', text: 'Original content' }],
           props: {},
           children: [],
         },
@@ -210,8 +210,8 @@ describe('note rollback data integrity', () => {
       const modifiedBlocks = [
         {
           id: 'block-1',
-          type: 'paragraph' as const,
-          content: [{ type: 'text' as const, text: 'Modified content' }],
+          type: 'paragraph',
+          content: [{ type: 'text', text: 'Modified content' }],
           props: {},
           children: [],
         },
@@ -303,8 +303,8 @@ describe('canvas rollback data integrity', () => {
       const modifiedBlocks = [
         {
           id: 'block-1',
-          type: 'paragraph' as const,
-          content: [{ type: 'text' as const, text: 'Modified canvas content' }],
+          type: 'paragraph',
+          content: [{ type: 'text', text: 'Modified canvas content' }],
           props: {},
           children: [],
         },
diff --git a/convex/documentSnapshots/__tests__/snapshot.test.ts b/convex/documentSnapshots/__tests__/snapshot.test.ts
@@ -30,8 +30,8 @@ describe('note snapshots capture Y.Doc state directly', () => {
       const blocks = [
         {
           id: 'block-1',
-          type: 'paragraph' as const,
-          content: [{ type: 'text' as const, text: 'Hello world' }],
+          type: 'paragraph',
+          content: [{ type: 'text', text: 'Hello world' }],
           props: {},
           children: [],
         },
diff --git a/convex/folders/__tests__/getFolderContentsForDownload.test.ts b/convex/folders/__tests__/getFolderContentsForDownload.test.ts
@@ -65,7 +65,6 @@ describe('getFolderContentsForDownload — collectItemsRecursively', () => {
     expect(item.type).toBe(SIDEBAR_ITEM_TYPES.notes)
     expect(item.name).toBe('Session Log.md')
     expect(item.path).toBe('Session Log.md')
-    expect(item.type).toBe(SIDEBAR_ITEM_TYPES.notes)
     if (item.type === SIDEBAR_ITEM_TYPES.notes) {
       expect(item.content.length).toBe(1)
     }
diff --git a/convex/notes/blocknote.ts b/convex/notes/blocknote.ts
@@ -0,0 +1,27 @@
+import type * as Y from 'yjs'
+import { BlockNoteEditor } from '@blocknote/core'
+import { blocksToYDoc as bnBlocksToYDoc, yDocToBlocks as bnYDocToBlocks } from '@blocknote/core/yjs'
+import { editorSchema } from './editorSpecs'
+import type { CustomBlock, CustomPartialBlock } from './editorSpecs'
+
+function createHeadlessEditor() {
+  return BlockNoteEditor.create({ schema: editorSchema, _headless: true })
+}
+
+export function blocksToYDoc(blocks: Array<CustomPartialBlock>, fragment: string): Y.Doc {
+  const editor = createHeadlessEditor()
+  try {
+    return bnBlocksToYDoc(editor, blocks, fragment)
+  } finally {
+    editor._tiptapEditor.destroy()
+  }
+}
+
+export function yDocToBlocks(doc: Y.Doc, fragment: string): Array<CustomBlock> {
+  const editor = createHeadlessEditor()
+  try {
+    return bnYDocToBlocks(editor, doc, fragment)
+  } finally {
+    editor._tiptapEditor.destroy()
+  }
+}
diff --git a/convex/notes/functions/createNote.ts b/convex/notes/functions/createNote.ts
@@ -1,6 +1,4 @@
 import * as Y from 'yjs'
-import { BlockNoteEditor } from '@blocknote/core'
-import { blocksToYDoc } from '@blocknote/core/yjs'
 import { saveTopLevelBlocksForNote } from '../../blocks/functions/saveTopLevelBlocksForNote'
 import {
   findUniqueSidebarItemSlug,
@@ -10,7 +8,7 @@ import {
 import { SIDEBAR_ITEM_LOCATION, SIDEBAR_ITEM_TYPES } from '../../sidebarItems/types/baseTypes'
 import { createYjsDocument } from '../../yjsSync/functions/createYjsDocument'
 import { uint8ToArrayBuffer } from '../../yjsSync/functions/uint8ToArrayBuffer'
-import { editorSchema } from '../editorSpecs'
+import { blocksToYDoc } from '../blocknote'
 import { logEditHistory } from '../../editHistory/log'
 import { EDIT_HISTORY_ACTION } from '../../editHistory/types'
 import type { CampaignMutationCtx } from '../../functions'
@@ -81,17 +79,11 @@ export async function createNote(
   if (content && content.length > 0) {
     await saveTopLevelBlocksForNote(ctx, { noteId, content })
 
-    const editor = BlockNoteEditor.create({
-      schema: editorSchema,
-      _headless: true,
-    })
-    let doc: Y.Doc | undefined
+    const doc = blocksToYDoc(content, 'document')
     try {
-      doc = blocksToYDoc(editor, content, 'document')
       initialState = uint8ToArrayBuffer(Y.encodeStateAsUpdate(doc))
     } finally {
-      doc?.destroy()
-      editor._tiptapEditor.destroy()
+      doc.destroy()
     }
   }
 
diff --git a/convex/notes/mutations.ts b/convex/notes/mutations.ts
@@ -1,14 +1,12 @@
 import { v } from 'convex/values'
-import { BlockNoteEditor } from '@blocknote/core'
-import { yDocToBlocks } from '@blocknote/core/yjs'
 import { campaignMutation } from '../functions'
 import { customBlockValidator } from '../blocks/schema'
 import { saveTopLevelBlocksForNote } from '../blocks/functions/saveTopLevelBlocksForNote'
 import { checkYjsWriteAccess } from '../yjsSync/functions/checkYjsAccess'
 import { reconstructYDoc } from '../yjsSync/functions/reconstructYDoc'
 import { createNote as createNoteFn } from './functions/createNote'
 import { updateNote as updateNoteFn } from './functions/updateNote'
-import { editorSchema } from './editorSpecs'
+import { yDocToBlocks } from './blocknote'
 import type { Id } from '../_generated/dataModel'
 
 export const updateNote = campaignMutation({
@@ -64,22 +62,15 @@ export const persistNoteBlocks = campaignMutation({
     await checkYjsWriteAccess(ctx, documentId)
 
     const { doc } = await reconstructYDoc(ctx, documentId)
-    // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
-    let editor: ReturnType<typeof BlockNoteEditor.create> | undefined
     try {
-      editor = BlockNoteEditor.create({
-        schema: editorSchema,
-        _headless: true,
-      })
-      const blocks = yDocToBlocks(editor, doc, 'document')
+      const blocks = yDocToBlocks(doc, 'document')
 
       await saveTopLevelBlocksForNote(ctx, {
         noteId: documentId,
         content: blocks,
       })
     } finally {
       doc.destroy()
-      editor?._tiptapEditor.destroy()
     }
 
     return null
diff --git a/convex/yjsSync/__tests__/makeYjsUpdate.helper.ts b/convex/yjsSync/__tests__/makeYjsUpdate.helper.ts
@@ -1,10 +1,26 @@
 import * as Y from 'yjs'
-import { BlockNoteEditor } from '@blocknote/core'
-import { blocksToYDoc } from '@blocknote/core/yjs'
-import { editorSchema } from '../../notes/editorSpecs'
-import type { PartialBlock } from '@blocknote/core'
+import { blocksToYDoc } from '../../notes/blocknote'
+import type { CustomPartialBlock } from '../../notes/editorSpecs'
 
-type AnyPartialBlock = PartialBlock<any, any, any>
+export type TestInlineContent = {
+  type: string
+  text?: string
+  styles?: Record<string, boolean | string>
+}
+
+/**
+ * Simplified block type for tests. BlockNote's `PartialBlock` has an optional
+ * `type` discriminant which prevents TypeScript from narrowing per-variant in
+ * object literals. This type captures the shape tests actually use while
+ * keeping basic structural checking.
+ */
+export type TestBlock = {
+  id?: string
+  type: string
+  props?: Record<string, unknown>
+  content?: Array<TestInlineContent>
+  children?: Array<TestBlock>
+}
 
 export function makeYjsUpdate(): ArrayBuffer {
   const doc = new Y.Doc()
@@ -16,21 +32,15 @@ export function makeYjsUpdate(): ArrayBuffer {
   return ab as ArrayBuffer
 }
 
-export function makeYjsUpdateWithBlocks(blocks: Array<AnyPartialBlock>): ArrayBuffer {
-  const editor = BlockNoteEditor.create({
-    schema: editorSchema,
-    _headless: true,
-  })
-  let doc: Y.Doc | undefined
+export function makeYjsUpdateWithBlocks(blocks: Array<TestBlock>): ArrayBuffer {
+  const doc = blocksToYDoc(blocks as Array<CustomPartialBlock>, 'document')
   try {
-    doc = blocksToYDoc(editor, blocks, 'document')
     const update = Y.encodeStateAsUpdate(doc)
     return update.buffer.slice(
       update.byteOffset,
       update.byteOffset + update.byteLength,
     ) as ArrayBuffer
   } finally {
-    doc?.destroy()
-    editor._tiptapEditor.destroy()
+    doc.destroy()
   }
 }
diff --git a/src/features/editor/utils/__tests__/text-to-blocks.test.ts b/src/features/editor/utils/__tests__/text-to-blocks.test.ts
@@ -3,7 +3,6 @@ import {
   convertBlocksToMarkdown,
   convertTextContentToBlocks,
   convertTextToHTML,
-  extractMarkdownLinks,
   isMarkdownFile,
 } from '~/features/editor/utils/text-to-blocks'
 import type { CustomPartialBlock } from 'convex/notes/editorSpecs'
@@ -21,6 +20,12 @@ function getBlockText(block: CustomPartialBlock): string {
     .join('')
 }
 
+type InlineContentItem = { type: string; text?: string; styles?: Record<string, boolean> }
+
+function getInlineContent(block: CustomPartialBlock): Array<InlineContentItem> {
+  return (block.content ?? []) as unknown as Array<InlineContentItem>
+}
+
 interface ExpectedBlock {
   type: string
   text?: string
@@ -161,53 +166,6 @@ describe('isMarkdownFile', () => {
   })
 })
 
-// ===========================================================================
-// extractMarkdownLinks
-// ===========================================================================
-
-describe('extractMarkdownLinks', () => {
-  it('replaces a regular markdown link with a placeholder', () => {
-    const { text, placeholders } = extractMarkdownLinks('[text](url)')
-    expect(placeholders.size).toBe(1)
-    expect(text).not.toContain('[text](url)')
-    // Placeholder should map back to original
-    const [, original] = [...placeholders.entries()][0]
-    expect(original).toBe('[text](url)')
-  })
-
-  it('replaces an image link with a placeholder', () => {
-    const { text, placeholders } = extractMarkdownLinks('![alt](url)')
-    expect(placeholders.size).toBe(1)
-    expect(text).not.toContain('![alt](url)')
-    const [, original] = [...placeholders.entries()][0]
-    expect(original).toBe('![alt](url)')
-  })
-
-  it('replaces multiple links on one line', () => {
-    const { placeholders } = extractMarkdownLinks('[a](b) and [c](d)')
-    expect(placeholders.size).toBe(2)
-  })
-
-  it('does not replace links inside code blocks', () => {
-    const input = '```\n[text](url)\n```'
-    const { text, placeholders } = extractMarkdownLinks(input)
-    expect(placeholders.size).toBe(0)
-    expect(text).toBe(input)
-  })
-
-  it('does not modify lines without links', () => {
-    const { text, placeholders } = extractMarkdownLinks('plain text')
-    expect(placeholders.size).toBe(0)
-    expect(text).toBe('plain text')
-  })
-
-  it('preserves wiki links [[name]]', () => {
-    const { text, placeholders } = extractMarkdownLinks('[[some note]]')
-    expect(placeholders.size).toBe(0)
-    expect(text).toBe('[[some note]]')
-  })
-})
-
 // ===========================================================================
 // convertBlocksToMarkdown (export path)
 // ===========================================================================
@@ -399,12 +357,7 @@ describe('convertTextContentToBlocks - markdown', () => {
     const blocks = md('**bold text**')
     const para = blocks.find((b) => b.type === 'paragraph')
     expect(para).toBeDefined()
-    const content = para!.content as unknown as Array<{
-      type: string
-      text?: string
-      styles?: Record<string, boolean>
-    }>
-    const boldItem = content.find((ic) => ic.styles?.bold)
+    const boldItem = getInlineContent(para!).find((ic) => ic.styles?.bold)
     expect(boldItem).toBeDefined()
     expect(boldItem!.text).toBe('bold text')
   })
@@ -413,12 +366,7 @@ describe('convertTextContentToBlocks - markdown', () => {
     const blocks = md('*italic text*')
     const para = blocks.find((b) => b.type === 'paragraph')
     expect(para).toBeDefined()
-    const content = para!.content as unknown as Array<{
-      type: string
-      text?: string
-      styles?: Record<string, boolean>
-    }>
-    const italicItem = content.find((ic) => ic.styles?.italic)
+    const italicItem = getInlineContent(para!).find((ic) => ic.styles?.italic)
     expect(italicItem).toBeDefined()
     expect(italicItem!.text).toBe('italic text')
   })
@@ -427,25 +375,15 @@ describe('convertTextContentToBlocks - markdown', () => {
     const blocks = md('~~struck~~')
     const para = blocks.find((b) => b.type === 'paragraph')
     expect(para).toBeDefined()
-    const content = para!.content as unknown as Array<{
-      type: string
-      text?: string
-      styles?: Record<string, boolean>
-    }>
-    const struckItem = content.find((ic) => ic.styles?.strike)
+    const struckItem = getInlineContent(para!).find((ic) => ic.styles?.strike)
     expect(struckItem).toBeDefined()
   })
 
   it('parses inline code', () => {
     const blocks = md('some `inline code` here')
     const para = blocks.find((b) => b.type === 'paragraph')
     expect(para).toBeDefined()
-    const content = para!.content as unknown as Array<{
-      type: string
-      text?: string
-      styles?: Record<string, boolean>
-    }>
-    const codeItem = content.find((ic) => ic.styles?.code)
+    const codeItem = getInlineContent(para!).find((ic) => ic.styles?.code)
     expect(codeItem).toBeDefined()
     expect(codeItem!.text).toBe('inline code')
   })
@@ -512,7 +450,7 @@ describe('convertTextContentToBlocks - plain text', () => {
 
   it('preserves empty lines as empty paragraphs', () => {
     const blocks = txt('A\n\nB')
-    // Should have at least 3 blocks: A, empty, B (or A, B with spacing)
+    // At least 2 blocks: A and B (parser may also insert an empty paragraph between them)
     expect(blocks.length).toBeGreaterThanOrEqual(2)
     const textsWithContent = blocks.filter((b) => getBlockText(b) !== '')
     expect(textsWithContent.length).toBe(2)
diff --git a/src/features/editor/utils/text-to-blocks.ts b/src/features/editor/utils/text-to-blocks.ts

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ describe('getFolderContentsForDownload — collectItemsRecursively', () => {`
`65`	`65`	`expect(item.type).toBe(SIDEBAR_ITEM_TYPES.notes)`
`66`	`66`	`expect(item.name).toBe('Session Log.md')`
`67`	`67`	`expect(item.path).toBe('Session Log.md')`
`68`		`- expect(item.type).toBe(SIDEBAR_ITEM_TYPES.notes)`
`69`	`68`	`if (item.type === SIDEBAR_ITEM_TYPES.notes) {`
`70`	`69`	`expect(item.content.length).toBe(1)`
`71`	`70`	`}`