Merge branch 'tangly1024:main' into main

Author: eddiehe99

.github/workflows/bump-version-on-main.yml

@@ -0,0 +1,48 @@
+# 每次向 main 推送（含合并 PR）后，自动将 package.json 最后一位小版本 +1。
+# 自动提交信息含 [skip-version]，避免无限循环。发正式版或大版本时请人工改版本号后再合并。
+
+name: Bump package version on main
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+concurrency:
+  group: bump-package-version-main
+  cancel-in-progress: false
+
+jobs:
+  bump-patch:
+    runs-on: ubuntu-latest
+    # 跳过自动发版机器人自己的提交，防止循环触发
+    if: >-
+      github.event_name == 'workflow_dispatch' ||
+      (github.event.head_commit != null &&
+       !contains(github.event.head_commit.message, '[skip-version]'))
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Bump package.json patch (last segment)
+        run: node scripts/bump-package-patch-version.js
+
+      - name: Commit and push if changed
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          if git diff --quiet package.json; then
+            echo "No version change (unexpected)."
+            exit 0
+          fi
+          NEW_VER=$(node -p "require('./package.json').version")
+          git add package.json
+          git commit -m "chore(release): bump package.json to ${NEW_VER} [skip-version]"
+          git push

__tests__/lib/notion-data-format.test.js

@@ -1,11 +1,21 @@
 import getAllPageIds from '@/lib/db/notion/getAllPageIds'
-import { adapterNotionBlockMap } from '@/lib/utils/notion.util'
+import {
+  adapterNotionBlockMap,
+  normalizeNotionBlockType
+} from '@/lib/utils/notion.util'
 
 jest.mock('p-limit', () => ({
   __esModule: true,
   default: jest.fn(() => fn => fn())
 }))
 
+jest.mock('notion-utils', () => ({
+  getTextContent: jest.fn(value => {
+    if (!Array.isArray(value)) return ''
+    return value.map(item => item?.[0] || '').join('')
+  })
+}))
+
 jest.mock('@/lib/cache/cache_manager', () => ({
   getDataFromCache: jest.fn(),
   getOrSetDataWithCache: jest.fn(),
@@ -21,6 +31,7 @@ jest.mock('@/lib/db/notion/getNotionAPI', () => ({
 }))
 
 const { formatNotionBlock } = require('@/lib/db/notion/getPostBlocks')
+const { getPageTableOfContents } = require('@/lib/db/notion/getPageTableOfContents')
 
 describe('Notion data format compatibility', () => {
   it('unwraps nested block values returned by newer Notion payloads', () => {
@@ -121,4 +132,58 @@ describe('Notion data format compatibility', () => {
       'https://example.com/image.png'
     )
   })
+
+  it('downgrades newer heading block types for older renderers', () => {
+    expect(normalizeNotionBlockType('heading_1')).toBe('header')
+    expect(normalizeNotionBlockType('heading_2')).toBe('sub_header')
+    expect(normalizeNotionBlockType('heading_3')).toBe('sub_sub_header')
+    expect(normalizeNotionBlockType('heading_4')).toBe('sub_sub_header')
+    expect(normalizeNotionBlockType('header_4')).toBe('sub_sub_header')
+  })
+
+  it('formats header_4 blocks into a renderable fallback heading type', () => {
+    const formatted = formatNotionBlock({
+      page_1: {
+        value: {
+          id: 'page_1',
+          type: 'header_4',
+          properties: {
+            title: [['Section 4']]
+          }
+        }
+      }
+    })
+
+    expect(formatted.page_1.value.type).toBe('sub_sub_header')
+  })
+
+  it('builds a stable toc for newer heading block types', () => {
+    const page = {
+      id: 'page_root',
+      content: ['h1', 'h4']
+    }
+    const recordMap = {
+      block: {
+        h1: {
+          value: {
+            id: 'h1',
+            type: 'header',
+            properties: { title: [['Top']] }
+          }
+        },
+        h4: {
+          value: {
+            id: 'h4',
+            type: 'header_4',
+            properties: { title: [['Deep']] }
+          }
+        }
+      }
+    }
+
+    expect(getPageTableOfContents(page, recordMap)).toEqual([
+      expect.objectContaining({ id: 'h1', indentLevel: 0 }),
+      expect.objectContaining({ id: 'h4', indentLevel: 1 })
+    ])
+  })
 })

lib/db/notion/getNotionPost.js

@@ -2,8 +2,9 @@ import BLOG from '@/blog.config'
 import { idToUuid } from 'notion-utils'
 import ReactNotionX from 'react-notion-x'
 import formatDate from '../../utils/formatDate'
-import { fetchNotionPageBlocks } from './getPostBlocks'
+import { fetchNotionPageBlocks, formatNotionBlock } from './getPostBlocks'
 import { checkStrIsNotionId, checkStrIsUuid } from '@/lib/utils'
+import { adapterNotionBlockMap } from '@/lib/utils/notion.util'
 
 /**
  * 根据页面ID获取文章，同时打印获取耗时
@@ -14,14 +15,17 @@ export async function fetchPageFromNotion(pageId) {
   const start = Date.now() // 开始时间
 
   // 获取页面内容块
-  const blockMap = await fetchNotionPageBlocks(pageId, 'slug')
+  const rawBlockMap = await fetchNotionPageBlocks(pageId, 'slug')
   const fetchEnd = Date.now() // fetchNotionPageBlocks 耗时
   console.log(`⏱ [Notion] pageId: ${pageId} fetch blocks耗时: ${fetchEnd - start}ms`)
 
-  if (!blockMap) {
+  if (!rawBlockMap) {
     return null
   }
-
+  const blockMap = adapterNotionBlockMap(rawBlockMap)
+  if (blockMap?.block) {
+    blockMap.block = formatNotionBlock(blockMap.block)
+  }
   if (checkStrIsNotionId(pageId)) {
     pageId = idToUuid(pageId)
   }

lib/db/notion/getPageTableOfContents.js

@@ -6,7 +6,9 @@ const indentLevels = {
   sub_sub_header: 2,
   heading_1: 0,
   heading_2: 1,
-  heading_3: 2
+  heading_3: 2,
+  heading_4: 3,
+  header_4: 3
 }
 
 const unknownHeadingStats = new Map()
@@ -95,7 +97,7 @@ function getBlockHeader(contents, recordMap, toc, pageId) {
     const { type } = block
     const isHeading =
       typeof type === 'string' &&
-      (type.indexOf('header') >= 0 || /^heading_[123]$/.test(type))
+      (type.indexOf('header') >= 0 || /^heading_[1234]$/.test(type))
 
     if (block.content?.length > 0) {
       getBlockHeader(block.content, recordMap, toc, pageId)

lib/db/notion/getPostBlocks.js

@@ -6,14 +6,14 @@ import {
 import { deepClone, delay } from '../../utils'
 import notionAPI from '@/lib/db/notion/getNotionAPI'
 import pLimit from 'p-limit'
+import { normalizeNotionBlockType } from '@/lib/utils/notion.util'
 
 // ⚠️ 全局限流器（非常关键）
 const limit = pLimit(15)
 
 // ⚠️ 每个请求之间的间隔（防 burst）
 const REQUEST_INTERVAL = 50 // ms
 
-
 /**
  * 获取文章内容块
  * @param {string} id
@@ -109,6 +109,7 @@ export function formatNotionBlock(block) {
     if (b?.value) {
       delete b.value.crdt_data
       delete b.value.crdt_format_version
+      b.value.type = normalizeNotionBlockType(b.value.type)
     }
 
     // 原有逻辑不变 ↓↓↓
@@ -269,4 +270,4 @@ function sanitizeBlockUrls(blockValue) {
 
   // 4. 处理其他可能的 URL 字段（可选扩展）
   // 例如：video、audio 的 source 可能也走 properties.source，已覆盖
-}
+}

lib/utils/notion.util.js

@@ -28,6 +28,21 @@ export function adapterNotionBlockMap(blockMap) {
   };
 }
 
+export function normalizeNotionBlockType(type) {
+  switch (type) {
+    case 'heading_1':
+      return 'header'
+    case 'heading_2':
+      return 'sub_header'
+    case 'heading_3':
+    case 'heading_4':
+    case 'header_4':
+      return 'sub_sub_header'
+    default:
+      return type
+  }
+}
+
 
 function unwrapValue(obj) {
   if (!obj) return obj
@@ -50,4 +65,4 @@ function unwrapValue(obj) {
 
   // 兜底：原样返回
   return obj?.value ?? obj
-}
+}

package.json

@@ -25,6 +25,7 @@
     "bundle-report": "cross-env ANALYZE=true next build",
     "build-all-in-dev": "cross-env VERCEL_ENV=production next build",
     "version": "echo $npm_package_version",
+    "bump-patch-version": "node scripts/bump-package-patch-version.js",
     "lint": "next lint",
     "lint:fix": "next lint --fix",
     "type-check": "tsc --noEmit",

pages/index.js

@@ -1,13 +1,15 @@
 import BLOG from '@/blog.config'
 import { siteConfig } from '@/lib/config'
 import { fetchGlobalAllData, getPostBlocks } from '@/lib/db/SiteDataApi'
+import { formatNotionBlock } from '@/lib/db/notion/getPostBlocks'
 import { generateRobotsTxt } from '@/lib/utils/robots.txt'
 import { generateRss } from '@/lib/utils/rss'
 import { generateSitemapXml } from '@/lib/utils/sitemap.xml'
 import { DynamicLayout } from '@/themes/theme'
 import { generateRedirectJson } from '@/lib/utils/redirect'
 import { checkDataFromAlgolia } from '@/lib/plugins/algolia'
 import pLimit from 'p-limit'
+import { adapterNotionBlockMap } from '@/lib/utils/notion.util'
 
 /**
  * 首页布局
@@ -78,7 +80,11 @@ export async function getStaticProps(req) {
     await Promise.all(
       previewTargets.map(post =>
         previewLimit(async () => {
-          post.blockMap = await getPostBlocks(post.id, 'slug', POST_PREVIEW_LINES)
+          const rawBlockMap = await getPostBlocks(post.id, 'slug', POST_PREVIEW_LINES)
+          post.blockMap = adapterNotionBlockMap(rawBlockMap)
+          if (post.blockMap?.block) {
+            post.blockMap.block = formatNotionBlock(post.blockMap.block)
+          }
         })
       )
     )

pages/page/[page].js

@@ -1,6 +1,8 @@
 import BLOG from '@/blog.config'
 import { siteConfig } from '@/lib/config'
 import { fetchGlobalAllData, getPostBlocks } from '@/lib/db/SiteDataApi'
+import { formatNotionBlock } from '@/lib/db/notion/getPostBlocks'
+import { adapterNotionBlockMap } from '@/lib/utils/notion.util'
 import { DynamicLayout } from '@/themes/theme'
 
 /**
@@ -56,7 +58,11 @@ export async function getStaticProps({ params: { page }, locale }) {
       if (post.password && post.password !== '') {
         continue
       }
-      post.blockMap = await getPostBlocks(post.id, 'slug', POST_PREVIEW_LINES)
+      const rawBlockMap = await getPostBlocks(post.id, 'slug', POST_PREVIEW_LINES)
+      post.blockMap = adapterNotionBlockMap(rawBlockMap)
+      if (post.blockMap?.block) {
+        post.blockMap.block = formatNotionBlock(post.blockMap.block)
+      }
     }
   }
 

scripts/bump-package-patch-version.js

@@ -0,0 +1,60 @@
+#!/usr/bin/env node
+/**
+ * Increment the last numeric segment of package.json "version".
+ * Supports 4-part versions (e.g. 4.9.5.2 -> 4.9.5.3) used by this repo,
+ * and falls back to semver patch for 3-part (x.y.z -> x.y.(z+1)).
+ *
+ * Usage: node scripts/bump-package-patch-version.js [--dry-run]
+ */
+
+const fs = require('fs')
+const path = require('path')
+
+const root = path.join(__dirname, '..')
+const pkgPath = path.join(root, 'package.json')
+
+const dryRun = process.argv.includes('--dry-run')
+
+function bumpVersionString(current) {
+  const parts = current.split('.').map(p => {
+    const n = parseInt(p, 10)
+    if (Number.isNaN(n)) {
+      throw new Error(`Invalid version segment in "${current}"`)
+    }
+    return n
+  })
+
+  if (parts.length < 3) {
+    throw new Error(`Expected at least semver x.y.z, got "${current}"`)
+  }
+
+  parts[parts.length - 1] += 1
+  return parts.join('.')
+}
+
+function main() {
+  const raw = fs.readFileSync(pkgPath, 'utf8')
+  const match = raw.match(/"version"\s*:\s*"([^"]+)"/)
+  if (!match) {
+    console.error('Could not find "version" field in package.json')
+    process.exit(1)
+  }
+
+  const current = match[1]
+  const next = bumpVersionString(current)
+
+  if (dryRun) {
+    console.log(`[dry-run] ${current} -> ${next}`)
+    return
+  }
+
+  const updated = raw.replace(
+    /("version"\s*:\s*")([^"]+)(")/,
+    (_, a, __, c) => `${a}${next}${c}`
+  )
+
+  fs.writeFileSync(pkgPath, updated)
+  console.log(`Bumped package.json version: ${current} -> ${next}`)
+}
+
+main()