Main branch merge conflict resolution#4
Merged
wszxdhr merged 4 commits intofeat/make-real-pdfjs-dist-to-unit-testfrom Jan 5, 2026
Merged
Conversation
feat: 修正 PdfParser 文本坐标映射
- 新增 Jest 测试框架及相关依赖(@jest/globals, @types/jest, jest, ts-jest) - 添加 jest.config.js 配置文件 - 新增测试脚本: test, test:watch, test:coverage - 大幅扩展测试覆盖范围: - mapTextContentToIntermediate.test.ts: 从1个测试扩展到多个测试套件,覆盖坐标转换、内容处理、ID生成、文本方向映射、样式处理、EOL处理、无效项过滤等场景 - 新增 asTextItem.test.ts: 测试文本项转换功能 - 新增 collectMetrics.test.ts: 测试指标收集功能 - 新增 mapTextDir.test.ts: 测试文本方向映射 - 新增 outline-mapping.test.ts: 测试大纲映射功能 - 新增 transformToViewport.test.ts: 测试视口转换功能 - 在 src/index.ts 中添加 encode 方法的接口声明(当前抛出未实现错误) - 升级依赖版本: @hamster-note/document-parser 和 @hamster-note/types 从 ^0.1.0 升级到 ^0.2.0 - 新增测试 mock 文件: @hamster-note/document-parser.ts 和 @hamster-note/types.ts - 添加 CHANGELOG.md 记录版本变更 - 版本号升级: 0.1.0 → 0.2.0 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit updates project dependencies to their latest versions and introduces comprehensive Jest tests for various parsing and mapping functionalities. It also includes mock implementations for external types and parsers to facilitate testing. Co-authored-by: wszxdhr <wszxdhr@126.com>
|
Cursor Agent can help with this pull request. Just |
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Co-authored-by: wszxdhr <wszxdhr@126.com>
wszxdhr
merged commit 3d6aa1d
into
feat/make-real-pdfjs-dist-to-unit-test
1 check passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolve merge conflicts with the
mainbranch, integrating updated dependencies, build configurations, and expanded test suites.