-
Notifications
You must be signed in to change notification settings - Fork 167
Fix api collection icon rendering #1343
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
patshaughnessy
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change looks good.
There are many different DocumentationNode.Kind values... have we tested if any other icons are incorrect?
9213698 to
b385a24
Compare
|
Hi Pat, I made some changes to address the radar concerns for cross-framework API collection icons, can you please take another look?
This radar is specific for API Collections, if more icons appear incorrect, we should fix them too, but probably in different PRs. :) Thanks! |
patshaughnessy
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some minor suggestions. Thanks for the fix!
Sources/SwiftDocC/Infrastructure/Link Resolution/ExternalPathHierarchyResolver.swift
Outdated
Show resolved
Hide resolved
Tests/SwiftDocCTests/Rendering/DocumentationContentRendererTests.swift
Outdated
Show resolved
Hide resolved
d-ronnqvist
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can't rely on the task groups information for this. Is there some other information that indicates that a external page is an API collection?
Sources/SwiftDocC/Model/Rendering/DocumentationContentRenderer.swift
Outdated
Show resolved
Hide resolved
| /// Create a topic render render reference for this link summary and its content variants. | ||
| func makeTopicRenderReference() -> TopicRenderReference { | ||
| let (kind, role) = DocumentationContentRenderer.renderKindAndRole(kind, semantic: nil) | ||
| let (kind, role) = DocumentationContentRenderer.renderKindAndRole(kind, semantic: nil, linkSummary: self) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Question: Is there some other value about the link summary that we can use to determine if it's an API collection?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After analyzing the LinkDestinationSummary structure and the actual Apple documentation data, I found that there are no reliable alternatives to taskGroups for identifying API Collections in external references. The available fields (title patterns, URL patterns, abstract content, references) would all be fragile heuristics.
We could add an optional role to LinkDestinationSummary, but that would be a much larger change. Would you prefer that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The taskGroup information isn't a reliable source for this information. It's not requited for documentation sources to include it and we are also talking about removing it because the link summary isn't meant to be a representation of the documentation hierarchy.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there another DocumentationNode.Kind value that API collection pages should be using? I see that we have both collection and collectionGroup but I don't recall what either of those are meant to represent. If not, should we introduce a dedicated "API Collection" kind and use that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe collection is the root/framework page, and collectionGroup are API Collections or pages that groups symbol pages together.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reading the kind values documentation I would think that a framework would use module. Regardless, if we have a kind value that represents API collections then it sounds like we should use that to identify API collections.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you, both! I spoke with @d-ronnqvist and ended up taking a different approach, let me know your thoughts. :)
Sources/SwiftDocC/Model/Rendering/DocumentationContentRenderer.swift
Outdated
Show resolved
Hide resolved
b385a24 to
c7d498f
Compare
c7d498f to
b582adb
Compare
d-ronnqvist
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks like a good solution to me.
I'm curious how the code would behave if the API Collection specified an explicit "Article" kind using
@Metadata {
@PageKind(article)
}
I feel that an explicit page kind like that should override any default kind inferred from the page's content. I think that maybe the new code already works like this, but it would be good to have a second test that verifies that behavior.
(none of the individual questions or minor feedback are blocking)
| // Verify round-trip encoding preserves the correct kind | ||
| let encoded = try JSONEncoder().encode(pageSummary) | ||
| let decoded = try JSONDecoder().decode(LinkDestinationSummary.self, from: encoded) | ||
| XCTAssertEqual(decoded.kind, .collectionGroup) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
minor: We have a test helper that does this
| // Verify round-trip encoding preserves the correct kind | |
| let encoded = try JSONEncoder().encode(pageSummary) | |
| let decoded = try JSONDecoder().decode(LinkDestinationSummary.self, from: encoded) | |
| XCTAssertEqual(decoded.kind, .collectionGroup) | |
| try assertRoundTripCoding(pageSummary) |
| let renderNode = converter.convert(node) | ||
|
|
||
| let summaries = node.externallyLinkableElementSummaries(context: context, renderNode: renderNode) | ||
| let pageSummary = summaries[0] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
minor: If this page didn't produce any summaries, then line would trap and stop running all the other tests. If you use an optional expression that's wrapped in XCTUnwrap, then if the code would behave unexpectedly, the failure would be limited to this test, and the rest would continue to run.
| let pageSummary = summaries[0] | |
| let pageSummary = try XCTUnwrap(summaries.first) |
|
|
||
| let catalogHierarchy = Folder(name: "unit-test.docc", content: [ | ||
| TextFile(name: "APICollection.md", utf8Content: """ | ||
| # Time Pitch Algorithm Settings |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
minor: This title is oddly specific for a test
| # Time Pitch Algorithm Settings | |
| # Some API collection |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated! Changed from specific 'Time Pitch Algorithm Settings' to generic 'API Collection' title to avoid confusion with real-world examples.
| ## Topics | ||
| ### Algorithms |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
minor: This topic name doesn't match the symbol that it's curating.
Because the API collection only has a single topic section, you can probably remove its title if we don't have a better title for it.
| ### Algorithms |
| - ``TestModule/TestClass`` | ||
| """), | ||
| JSONFile(name: "TestModule.symbols.json", content: symbolGraph), | ||
| InfoPlist(displayName: "TestBundle", identifier: "com.test.example") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Question: is it intentional that the Info.plist file specifies a name that's different from the module name? That's a bit unusual (but completely valid).
I'm asking because catalogs generally don't need an Info.plist file except that in this test you're hardcoding its name below when creating the reference, so removing it would cause the API collection to not be found for that reference string.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe this is correct! 'TestBundle' (display name) vs 'TestModule' (module name) should follow the convention for testing cross-module references.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This test doesn't verify any cross-module linking behaviors and even then it's uncommon and a bit unconventional to specify a display name in the Info.plist that's different from the module name. It's more common for documentation to either explicitly specify the same display name as the module name (often redundantly) or to not have an Info.plist at all.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done! Removed the Info.plist from both test methods since they focus on API Collection kind detection rather than cross-module linking. Thanks!
b582adb to
83bba6d
Compare
|
Thanks for the thorough review, @d-ronnqvist ! All feedback addressed with improved test quality, better error handling, and added regression test for
Good catch! Added |
Adds tests to verify that API Collections (articles with Topics sections) are correctly identified as .collectionGroup kind in linkable entities, ensuring cross-framework references display the correct icon. Includes regression test for explicit @pagekind(article) metadata override behavior to ensure the fix doesn't break existing functionality. The first test is temporarily skipped until the fix is implemented in the next commit. rdar://135837611
Ensures API Collections are correctly identified as collectionGroup kind in linkable entities by using DocumentationContentRenderer.roleForArticle logic. This fixes cross-framework references where API Collections were incorrectly showing Article icons instead of Collection Group icons. rdar://135837611
83bba6d to
83cf898
Compare
|
@swift-ci please test |
Bug/issue: rdar://135837611
Summary
This PR addresses an issue where API Collections were displaying incorrect icons in external references. The issue occurred when external references to API Collections were rendering with
"role": "article"instead of"role": "collectionGroup", causing them to display article icons instead of the proper collection icons.The implementation adds the missing
.collectionGroupcase to therenderKindAndRolefunction to ensure API Collections render consistently as articles with the collectionGroup role, displaying the correct collection icon in both main documents and external references.Dependencies
None.
Testing
The functionality can be tested using the provided test case in
DocumentationContentRendererTests.swift:Checklist
./bin/testscript and it succeeded