@tnotesjs/core 0.4.2 → 0.6.0

package/vitepress/configs/markdown.config.ts

@@ -13,9 +13,9 @@ import path from 'path'
 import { generateAnchor } from '../../utils'
 import {
   normalizeMindmapMarkdown,
-  parseMarkmapFence,
+  parseMindmapFence,
   parseMindmapReference,
-} from '../components/MindmapPreview/compat'
+} from '../components/MindmapPreview/markdown'
 
 import type MarkdownIt from 'markdown-it'
 import type { MarkdownOptions } from 'vitepress'
@@ -70,196 +70,7 @@ const simpleMermaidMarkdown = (md: MarkdownIt) => {
   }
 }
 
-/**
- * Mindmap 容器配置（兼容旧的 markmap 围栏名）
- */
-function configureMindmapContainer(md: MarkdownIt) {
-  md.use(markdownItContainer, 'markmap', {
-    marker: '`',
-    validate(params: string) {
-      return (params || '').trim().startsWith('markmap')
-    },
-    render() {
-      return ''
-    },
-  })
-
-  // 在 core 阶段把整个 container 区间替换成一个 html_block（MarkMap 组件标签）
-  // 这样渲染时就只输出 <MarkMap ...>，中间的列表 token 已被移除
-  md.core.ruler.after('block', 'tn_replace_markmap_container', (state) => {
-    const src = state.env.source || ''
-    const lines = src.split('\n')
-    const tokens = state.tokens
-
-    for (let i = 0; i < tokens.length; i++) {
-      const t = tokens[i]
-      if (t.type === 'container_markmap_open') {
-        const containerName = 'markmap'
-        const closeType = 'container_markmap_close'
-        // 找到对应的 close token
-        let j = i + 1
-        while (
-          j < tokens.length &&
-          tokens[j].type !== closeType
-        )
-          j++
-        if (j >= tokens.length) continue // safety
-
-        // 使用 token.map 提取源文件对应行（open.token.map 存着 container 起止行）
-        const open = t
-        const startLine = open.map ? open.map[0] + 1 : null
-        const endLine = open.map ? open.map[1] - 1 : null
-
-        // 1) 从开头 fence 行解析参数（支持 `{a=1 b="x"}`、`a=1 b="x"`，并支持单个数字 shorthand）
-        const params: { [key: string]: any; initialExpandLevel?: number } = {}
-        let explicitTitle: string | undefined
-
-        if (open.map && typeof open.map[0] === 'number') {
-          const openLine = (lines[open.map[0]] || '').trim()
-          const fenceOptions = parseMarkmapFence(openLine)
-          explicitTitle = fenceOptions.title
-          let paramPart = ''
-
-          // 优先匹配大括号形式 ```markmap{...}
-          const braceMatch = openLine.match(/\{([^}]*)\}/)
-          if (braceMatch) {
-            paramPart = braceMatch[1].trim()
-          } else {
-            // 否则尝试去掉前缀 ``` 和 markmap，剩下的作为参数部分
-            const after = openLine.replace(/^`+\s*/, '')
-            if (after.startsWith(containerName)) {
-              paramPart = after.slice(containerName.length).trim()
-            }
-          }
-          if (fenceOptions.initialExpandLevel !== undefined) {
-            params.initialExpandLevel = fenceOptions.initialExpandLevel
-          }
-
-          if (paramPart) {
-            // 使用正则按 token 切分：保持用引号包裹的片段为单个 token（支持包含空格）
-            const tokenArr = paramPart.match(/"[^"]*"|'[^']*'|\S+/g) || []
-
-            // 如果第一个 token 是纯数字，把它当作 initialExpandLevel
-            let startIdx = 0
-            if (tokenArr.length > 0 && /^\d+$/.test(tokenArr[0] as string)) {
-              params.initialExpandLevel = Number(tokenArr[0])
-              startIdx = 1
-            }
-
-            // 解析剩余 token 为 key=value（支持 key=val 或 key:val）
-            for (let k = startIdx; k < tokenArr.length; k++) {
-              const pair = tokenArr[k]
-              if (!pair) continue
-              const m = pair.match(/^([^=:\s]+)\s*(=|:)\s*(.+)$/)
-              if (m) {
-                const key = m[1]
-                let val = m[3]
-
-                // 去除外层引号（若存在）
-                if (
-                  (/^".*"$/.test(val) && val.length >= 2) ||
-                  (/^'.*'$/.test(val) && val.length >= 2)
-                ) {
-                  val = val.slice(1, -1)
-                } else if (/^\d+$/.test(val)) {
-                  // 纯数字转字符串
-                  val = String(Number(val))
-                }
-
-                params[key] = val
-              }
-            }
-          }
-        }
-
-        // 2) 提取内容（支持文件引用语法 `<<< ./path/to/file.md`）
-        let content = ''
-        if (startLine !== null && endLine !== null) {
-          for (let k = startLine; k <= endLine && k < lines.length; k++) {
-            content += lines[k] + '\n'
-          }
-        } else {
-          // 回退：如果没有 map 信息，尝试用中间 tokens 拼接文本
-          for (let k = i + 1; k < j; k++) {
-            content += tokens[k].content || ''
-          }
-        }
-
-        // --- 检查第一非空行是否为引用语法 ---
-        const firstNonEmptyLine =
-          (content || '').split('\n').find((ln) => ln.trim() !== '') || ''
-        const reference = parseMindmapReference(firstNonEmptyLine)
-        let referencedTitle: string | undefined
-        if (reference) {
-          const refRaw = reference.path
-          referencedTitle = reference.title
-
-          // 尝试同步读取文件内容（兼容常见 Node 环境）
-          try {
-            // 尝试根据当前 markdown 文件位置解析相对路径
-            const env = state.env || {}
-            const possibleRel =
-              env.relativePath || env.path || env.filePath || env.file || ''
-            let refFullPath = refRaw
-
-            if (!path.isAbsolute(refRaw)) {
-              if (possibleRel) {
-                // 将 relativePath 视作相对于项目根的路径（例如 'notes/foo/bar.md'），取其目录
-                const currentDir = path.dirname(possibleRel)
-                // 解析到 process.cwd()
-                refFullPath = path.resolve(process.cwd(), currentDir, refRaw)
-              } else {
-                // 没有相对文件信息，则相对于项目根解析
-                refFullPath = path.resolve(process.cwd(), refRaw)
-              }
-            } else {
-              // 绝对路径直接使用（按系统路径）
-              refFullPath = refRaw
-            }
-
-            // console.log('refFullPath:', refFullPath)
-            const fileContent = fs.readFileSync(refFullPath, 'utf-8')
-            content = fileContent
-          } catch (err) {
-            // 读取失败：将错误写入 content 以便排查（不会让流程直接崩溃）
-            const errorMsg = err instanceof Error ? err.message : String(err)
-            content = `- Failed to load referenced file: ${esc(String(refRaw))}\n  - Error: ${esc(errorMsg)}`
-          }
-        }
-
-        content = normalizeMindmapMarkdown(content, {
-          title: explicitTitle || referencedTitle,
-        })
-
-        // 3) 构造组件标签并把参数注入为 props
-        const encodedContent = encodeURIComponent(content.trim())
-        let propsStr = `content="${encodedContent}"`
-
-        for (const [k, v] of Object.entries(params)) {
-          if (typeof v === 'number' || /^\d+$/.test(String(v))) {
-            propsStr += ` :${k}="${v}"`
-          } else {
-            const safe = String(v).replace(/"/g, '&quot;')
-            propsStr += ` ${k}="${safe}"`
-          }
-        }
-
-        const html = `<MindmapPreview ${propsStr}></MindmapPreview>\n`
-
-        // 创建 html_block token
-        const htmlToken = new state.Token('html_block', '', 0)
-        htmlToken.content = html
-
-        // 用单个 html_token 替换 open..close 区间
-        tokens.splice(i, j - i + 1, htmlToken as any)
-      }
-    }
-
-    return true
-  })
-}
-
-/** Canonical `mindmap` fence. Legacy `markmap` stays on its historical container path. */
+/** Canonical `mindmap` fence. */
 function configureMindmapFence(md: MarkdownIt) {
   const fence = md.renderer.rules.fence
     ? md.renderer.rules.fence.bind(md.renderer.rules)
@@ -268,11 +79,8 @@ function configureMindmapFence(md: MarkdownIt) {
   md.renderer.rules.fence = (tokens, index, options, env, slf) => {
     const token = tokens[index]
     const info = token.info.trim()
-    if (!/^mindmap(?=\s|\{|\[|$)/.test(info)) {
-      return fence(tokens, index, options, env, slf)
-    }
-
-    const fenceOptions = parseMarkmapFence(info)
+    const fenceOptions = parseMindmapFence(info)
+    if (!fenceOptions) return fence(tokens, index, options, env, slf)
     let content = token.content
     const firstNonEmptyLine = content.split('\n').find((line) => line.trim()) ?? ''
     const reference = parseMindmapReference(firstNonEmptyLine)
@@ -396,8 +204,7 @@ export function getMarkdownConfig(): MarkdownOptions {
       // 添加 Mermaid 支持
       simpleMermaidMarkdown(md)
 
-      // 添加 Mindmap 支持，并继续兼容旧 MarkMap 围栏
-      configureMindmapContainer(md)
+      // 添加规范的 Mindmap 围栏支持
       configureMindmapFence(md)
 
       // 添加任务列表支持

package/vitepress/plugins/localSearchReindexLogic.ts

@@ -34,11 +34,19 @@ export function getDocIdFromFile(input: {
   rewrites?: Record<string, string>
   absoluteOrRelativeFile: string
 }): string {
-  const absoluteFile = path.isAbsolute(input.absoluteOrRelativeFile)
+  // A knowledge base can be indexed on a different host platform in tests,
+  // build workers or cached metadata. Select the path implementation from the
+  // value instead of assuming the current Node.js platform.
+  const pathApi = /^[a-zA-Z]:[\\/]/.test(
+    input.absoluteOrRelativeFile || input.srcDir,
+  )
+    ? path.win32
+    : path
+  const absoluteFile = pathApi.isAbsolute(input.absoluteOrRelativeFile)
     ? input.absoluteOrRelativeFile
-    : path.join(input.srcDir, input.absoluteOrRelativeFile)
+    : pathApi.join(input.srcDir, input.absoluteOrRelativeFile)
 
-  let relFile = slash(path.relative(input.srcDir, absoluteFile))
+  let relFile = slash(pathApi.relative(input.srcDir, absoluteFile))
   if (input.rewrites?.[relFile]) {
     relFile = input.rewrites[relFile]
   }

package/vitepress/theme/index.ts

@@ -45,8 +45,6 @@ function registerCoreComponents(ctx: EnhanceAppContext) {
   app.component('Footprints', Footprints)
   app.component('F', Footprints)
   app.component('SidebarCard', SidebarCard)
-  // Keep the historical component name so existing note fences need no migration.
-  app.component('MarkMap', MindmapPreview)
   app.component('MindmapPreview', MindmapPreview)
   app.component('Mermaid', Mermaid)
   app.component('NotesTable', NotesTable)

package/vitepress/components/MindmapPreview/compat.test.ts

@@ -1,93 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import {
-  normalizeMindmapMarkdown,
-  parseMarkmapFence,
-  parseMindmapReference,
-} from './compat'
-
-describe('parseMarkmapFence', () => {
-  it.each([
-    ['```markmap', {}],
-    ['```markmap 2', { initialExpandLevel: 2 }],
-    ['```markmap {2}', { initialExpandLevel: 2 }],
-    ['```markmap {initialExpandLevel=3}', { initialExpandLevel: 3 }],
-    ['```markmap [ESM 模块] 2', { title: 'ESM 模块', initialExpandLevel: 2 }],
-    ['```markmap 2 [ESM 模块]', { title: 'ESM 模块', initialExpandLevel: 2 }],
-    ['```mindmap', {}],
-    ['```mindmap [项目架构] 1', { title: '项目架构', initialExpandLevel: 1 }],
-  ])('parses %s', (input, expected) => {
-    expect(parseMarkmapFence(input)).toEqual(expected)
-  })
-})
-
-describe('parseMindmapReference', () => {
-  it.each([
-    ['<<< ./assets/tree.md', { path: './assets/tree.md' }],
-    ['<<< ./assets/tree.md [项目架构]', { path: './assets/tree.md', title: '项目架构' }],
-    ['<<< "./assets/tree with spaces.md" [项目架构]', { path: './assets/tree with spaces.md', title: '项目架构' }],
-  ])('parses %s', (input, expected) => {
-    expect(parseMindmapReference(input)).toEqual(expected)
-  })
-})
-
-describe('normalizeMindmapMarkdown', () => {
-  it('injects the default root for historical unordered-list input', () => {
-    expect(normalizeMindmapMarkdown('- A\n  - B')).toBe('# root\n\n- A\n  - B\n')
-  })
-
-  it('promotes a single legacy root item instead of rendering duplicate roots', () => {
-    expect(normalizeMindmapMarkdown('- root\n  - item1\n  - item2')).toBe(
-      '# root\n\n- item1\n- item2\n',
-    )
-    expect(normalizeMindmapMarkdown('- Custom\n  - item', { title: 'Custom' })).toBe(
-      '# Custom\n\n- item\n',
-    )
-  })
-
-  it('does not promote a matching root item when it has top-level siblings', () => {
-    expect(normalizeMindmapMarkdown('- root\n  - nested\n- sibling')).toBe(
-      '# root\n\n- root\n  - nested\n- sibling\n',
-    )
-  })
-
-  it('preserves an existing H1 and lets explicit fence metadata override it', () => {
-    const source = '# Existing\n\n- A\n'
-    expect(normalizeMindmapMarkdown(source)).toBe(source)
-    expect(normalizeMindmapMarkdown(source, { title: 'Explicit' })).toBe('# Explicit\n\n- A\n')
-  })
-
-  it('converts legacy H2/H3 sections into a nested unordered-list tree', () => {
-    const source = [
-      '# ESM',
-      '',
-      '## 基本语法',
-      '',
-      '### 导出方式',
-      '',
-      '- 命名导出',
-      '  - 统一导出',
-      '### 导入方式',
-      '- 默认导入',
-    ].join('\n')
-
-    expect(normalizeMindmapMarkdown(source)).toBe([
-      '# ESM',
-      '',
-      '- 基本语法',
-      '',
-      '  - 导出方式',
-      '',
-      '    - 命名导出',
-      '      - 统一导出',
-      '  - 导入方式',
-      '    - 默认导入',
-      '',
-    ].join('\n'))
-  })
-
-  it('is stable when normalized more than once', () => {
-    const once = normalizeMindmapMarkdown('- A\n  - B')
-    expect(normalizeMindmapMarkdown(once)).toBe(once)
-  })
-})

package/vitepress/components/MindmapPreview/compat.ts

@@ -1,128 +0,0 @@
-export interface MarkmapFenceOptions {
-  title?: string
-  initialExpandLevel?: number
-}
-
-export interface MindmapReference {
-  path: string
-  title?: string
-}
-
-function cleanHeadingText(value: string): string {
-  return value.trim().replace(/\s+#+\s*$/, '').trim()
-}
-
-function promoteLegacyRootList(body: string[], rootTitle: string): string[] {
-  const firstContentIndex = body.findIndex((line) => line.trim() !== '')
-  if (firstContentIndex < 0) return body
-
-  const firstItem = body[firstContentIndex].match(/^[-+*]\s+(.+?)\s*$/)
-  if (!firstItem || cleanHeadingText(firstItem[1]) !== rootTitle) return body
-
-  const descendants = body.slice(firstContentIndex + 1)
-  if (descendants.some((line) => line.trim() !== '' && !/^\s{2,}/.test(line))) return body
-
-  return [
-    ...body.slice(0, firstContentIndex),
-    ...descendants.map((line) => line.replace(/^ {2}/, '')),
-  ]
-}
-
-/** Parse the opening fence while retaining every legacy expand-level spelling. */
-export function parseMarkmapFence(openLine: string): MarkmapFenceOptions {
-  const fenceBody = openLine.trim().replace(/^`+\s*/, '')
-  const nameMatch = fenceBody.match(/^(mindmap|markmap)(?=\s|\{|\[|$)/)
-  if (!nameMatch) return {}
-  let rest = fenceBody.slice(nameMatch[1].length).trim()
-  const options: MarkmapFenceOptions = {}
-
-  const titleMatch = rest.match(/\[([^\]]+)\]/)
-  if (titleMatch) {
-    options.title = titleMatch[1].trim()
-    rest = `${rest.slice(0, titleMatch.index)} ${rest.slice((titleMatch.index ?? 0) + titleMatch[0].length)}`.trim()
-  }
-
-  const braceMatch = rest.match(/\{([^}]*)\}/)
-  const paramPart = braceMatch ? braceMatch[1].trim() : rest
-  const tokens = paramPart.match(/"[^"]*"|'[^']*'|\S+/g) ?? []
-  for (const [index, token] of tokens.entries()) {
-    if (/^\d+$/.test(token) && index === 0) {
-      options.initialExpandLevel = Number(token)
-      continue
-    }
-    const pair = token.match(/^([^=:\s]+)\s*(?:=|:)\s*(.+)$/)
-    if (!pair || pair[1] !== 'initialExpandLevel') continue
-    const value = pair[2].replace(/^['"]|['"]$/g, '')
-    if (/^\d+$/.test(value)) options.initialExpandLevel = Number(value)
-  }
-  return options
-}
-
-/** Parse `<<< file.md [title]`; the title is optional and paths may be quoted. */
-export function parseMindmapReference(line: string): MindmapReference | null {
-  const match = line.trim().match(/^<<<\s+(.+?)\s*$/)
-  if (!match) return null
-
-  let rest = match[1].trim()
-  let title: string | undefined
-  const titleMatch = rest.match(/\s+\[([^\]]+)\]\s*$/)
-  if (titleMatch) {
-    title = cleanHeadingText(titleMatch[1]) || undefined
-    rest = rest.slice(0, titleMatch.index).trim()
-  }
-
-  const path = rest.replace(/^(?:"([\s\S]*)"|'([\s\S]*)')$/, '$1$2').trim()
-  return path ? { path, title } : null
-}
-
-export interface NormalizeMindmapOptions {
-  title?: string
-  defaultTitle?: string
-}
-
-/** Convert historical VitePress markmap input into the strict mindmap-core format. */
-export function normalizeMindmapMarkdown(
-  source: string,
-  options: NormalizeMindmapOptions = {},
-): string {
-  const lines = source.replace(/\r\n?/g, '\n').split('\n')
-  let existingTitle = ''
-  let rootIndex = -1
-
-  for (let index = 0; index < lines.length; index++) {
-    const match = lines[index].match(/^\s{0,3}#(?!#)\s+(.+?)\s*$/)
-    if (!match) continue
-    existingTitle = cleanHeadingText(match[1])
-    rootIndex = index
-    break
-  }
-
-  const rootTitle = cleanHeadingText(options.title || existingTitle || options.defaultTitle || 'root') || 'root'
-  const body: string[] = []
-  let headingDepth: number | null = null
-
-  for (let index = 0; index < lines.length; index++) {
-    if (index === rootIndex) continue
-    const line = lines[index]
-    const heading = line.match(/^\s{0,3}(#{2,6})\s+(.+?)\s*$/)
-    if (heading) {
-      headingDepth = heading[1].length - 2
-      body.push(`${'  '.repeat(headingDepth)}- ${cleanHeadingText(heading[2])}`)
-      continue
-    }
-
-    const listItem = line.match(/^(\s*)([-+*])\s+(.+)$/)
-    if (listItem && headingDepth !== null) {
-      body.push(`${'  '.repeat(headingDepth + 1)}${line}`)
-      continue
-    }
-    body.push(line)
-  }
-
-  const normalizedBody = promoteLegacyRootList(body, rootTitle)
-  while (normalizedBody[0]?.trim() === '') normalizedBody.shift()
-  while (normalizedBody[normalizedBody.length - 1]?.trim() === '') normalizedBody.pop()
-  return normalizedBody.length > 0
-    ? `# ${rootTitle}\n\n${normalizedBody.join('\n')}\n`
-    : `# ${rootTitle}\n`
-}

package/vitepress/components/MindmapPreview/legacyCorpus.test.ts

@@ -1,57 +0,0 @@
-import { parseMarkdown } from '@tnotesjs/mindmap-core'
-import fs from 'node:fs'
-import path from 'node:path'
-import { fileURLToPath } from 'node:url'
-import { describe, expect, it } from 'vitest'
-
-import {
-  normalizeMindmapMarkdown,
-  parseMarkmapFence,
-  parseMindmapReference,
-} from './compat'
-
-const tnotesRoot = path.resolve(fileURLToPath(new URL('../../../../', import.meta.url)))
-const noteFiles = [
-  'TNotes.canvas/notes/0035. 使用 ctx.drawImage 引入图像/README.md',
-  'TNotes.docs/notes/0013. Mindmap/README.md',
-  'TNotes.docs/notes/0014. 分仓库模式/README.md',
-  'TNotes.javascript/notes/0070. CommonJS/README.md',
-  'TNotes.javascript/notes/0071. ESM/README.md',
-  'TNotes.sql/notes/0001. MySQL 8 从入门到精通/README.md',
-  'TNotes.vite/notes/0014. vite 思维导图/README.md',
-].map((relative) => path.join(tnotesRoot, relative))
-
-const corpusAvailable = noteFiles.every((file) => fs.existsSync(file))
-
-describe.skipIf(!corpusAvailable)('legacy TNotes markmap corpus', () => {
-  it('normalizes every historical block into valid mindmap-core Markdown', () => {
-    const diagnostics: string[] = []
-    let blockCount = 0
-
-    for (const noteFile of noteFiles) {
-      const note = fs.readFileSync(noteFile, 'utf8')
-      const blocks = note.matchAll(/^(```(?:mindmap|markmap)[^\n]*)\n([\s\S]*?)^```\s*$/gm)
-      for (const match of blocks) {
-        blockCount += 1
-        const options = parseMarkmapFence(match[1])
-        let source = match[2]
-        const reference = parseMindmapReference(
-          source.split('\n').find((line) => line.trim()) ?? '',
-        )
-        if (reference) {
-          source = fs.readFileSync(path.resolve(path.dirname(noteFile), reference.path), 'utf8')
-        }
-        const normalized = normalizeMindmapMarkdown(source, {
-          title: options.title || reference?.title,
-        })
-        const result = parseMarkdown(normalized, path.basename(noteFile))
-        if (!result.valid) {
-          diagnostics.push(`${noteFile}\n${result.diagnostics.map((item) => item.message).join('\n')}`)
-        }
-      }
-    }
-
-    expect(blockCount).toBe(16)
-    expect(diagnostics).toEqual([])
-  })
-})