Skip to content

fix: resolve proto imports and Excel cleanup - #447

Open
wenchy wants to merge 3 commits into
masterfrom
fix/overlapping-proto-roots
Open

fix: resolve proto imports and Excel cleanup#447
wenchy wants to merge 3 commits into
masterfrom
fix/overlapping-proto-roots

Conversation

@wenchy

@wenchy wenchy commented Aug 12, 2026

Copy link
Copy Markdown
Member

Summary

  • resolve generated protos using the most specific matching proto root
  • prevent duplicate symbol errors when proto roots overlap
  • add regression coverage for overlapping roots and out-of-root file fallback
  • close Excel row iterators before cleanup

Test Plan

  • go test ./...

@github-actions

github-actions Bot commented Aug 12, 2026

Copy link
Copy Markdown

The latest Buf updates on your PR. Results from workflow Buf CI / buf (pull_request).

BuildFormatLintBreakingUpdated (UTC)
✅ passed✅ passed✅ passed✅ passedAug 17, 2026, 12:18 PM

@codecov

codecov Bot commented Aug 12, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 81.81818% with 4 lines in your changes missing coverage. Please review.
✅ Project coverage is 75.61%. Comparing base (7bc5b61) to head (d35a994).
⚠️ Report is 3 commits behind head on master.

Files with missing lines Patch % Lines
internal/importer/excel.go 33.33% 1 Missing and 1 partial ⚠️
internal/x/xproto/protoc/compiler.go 89.47% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master     #447      +/-   ##
==========================================
- Coverage   75.63%   75.61%   -0.03%     
==========================================
  Files          88       88              
  Lines        9531     9609      +78     
==========================================
+ Hits         7209     7266      +57     
- Misses       1747     1760      +13     
- Partials      575      583       +8     

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@wenchy wenchy changed the title fix(protoc): handle overlapping proto roots fix: resolve proto imports and Excel cleanup Aug 12, 2026
Comment thread internal/x/xproto/protoc/compiler.go Outdated
Comment on lines +110 to +112
// protoFilesMap selects the compilation entry points. Their imports
// must still be resolved from the configured proto paths, even when
// an imported dependency is not matched by protoFiles.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is designed deliberately to prevent predefined protos from importing generated protos. Do not remove.

@Kybxd
Kybxd force-pushed the fix/overlapping-proto-roots branch from 45c69f8 to 9549989 Compare August 17, 2026 12:12
@Kybxd
Kybxd force-pushed the fix/overlapping-proto-roots branch from 9549989 to d35a994 Compare August 17, 2026 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants