feat(vue): add @modular-vue/runtime zones and route data (PR-23) #66
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -144,9 +144,31 @@ describe("mergeRouteStaticData", () => { | |
| nextValue: "ChildTitle", | ||
| previousMatch: parent, | ||
| nextMatch: child, | ||
| // Positions in the matched hierarchy — the always-unique identifier | ||
| // the warner uses to disambiguate matches with a shared router id. | ||
| previousIndex: 0, | ||
| nextIndex: 1, | ||
| }); | ||
| }); | ||
|
|
||
| it("reports each match's hierarchy position, skipping matches that contribute no data", () => { | ||
| const onOverride = vi.fn<(info: RouteStaticDataOverrideInfo) => void>(); | ||
| // The intermediate match (index 1) has no handle, so the override is | ||
| // between index 0 and index 2 — the counter still advances per match. | ||
| const matches: RRMatch[] = [ | ||
| { id: "/", handle: { HeaderTitle: "Root" } }, | ||
| { id: "/layout" }, | ||
| { id: "/layout/leaf", handle: { HeaderTitle: "Leaf" } }, | ||
| ]; | ||
|
|
||
| mergeRouteStaticData(matches, getHandle, { onOverride }); | ||
|
|
||
| expect(onOverride).toHaveBeenCalledTimes(1); | ||
| expect(onOverride).toHaveBeenCalledWith( | ||
| expect.objectContaining({ previousIndex: 0, nextIndex: 2 }), | ||
| ); | ||
| }); | ||
|
|
||
| it("does not fire when a deeper match contributes a brand-new key", () => { | ||
| const onOverride = vi.fn<(info: RouteStaticDataOverrideInfo) => void>(); | ||
| const matches: RRMatch[] = [ | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,16 @@ export interface RouteStaticDataOverrideInfo { | |
| previousMatch: unknown; | ||
| /** The deeper match that contributed `nextValue`. */ | ||
| nextMatch: unknown; | ||
| /** | ||
| * Zero-based position of `previousMatch` in the matched hierarchy | ||
| * (root = 0). A stable, always-unique identifier for the match within a | ||
| * single merge pass — unlike the router-specific id, which is not unique | ||
| * for vue-router nameless index routes (they share their parent's `path`). | ||
| * `undefined` only when the info is hand-constructed (e.g. in tests). | ||
| */ | ||
| previousIndex?: number; | ||
| /** Zero-based position of `nextMatch` in the matched hierarchy. */ | ||
| nextIndex?: number; | ||
| } | ||
|
|
||
| export interface MergeRouteStaticDataOptions { | ||
|
|
@@ -63,9 +73,15 @@ export function mergeRouteStaticData<T extends object>( | |
| const merged: Record<string, unknown> = {}; | ||
| // Only allocate the source-tracking map when a caller actually wants | ||
| // override notifications; the common production path has no overhead. | ||
| // Track each key's contributing match *and its position* — the position | ||
| // is the only always-unique identifier (vue-router nameless index routes | ||
| // share their parent's `path`, so router ids can collide). | ||
| const sources: Record<string, { match: unknown; index: number }> | null = options?.onOverride | ||
| ? {} | ||
| : null; | ||
| const onOverride = options?.onOverride; | ||
|
|
||
| let index = 0; | ||
| for (const match of matches) { | ||
| const data = getData(match); | ||
| // `typeof null === "object"` is the well-known JS footgun — the truthiness | ||
|
|
@@ -80,19 +96,23 @@ export function mergeRouteStaticData<T extends object>( | |
| // `null` is the documented "explicit clear" escape hatch — | ||
| // skip onOverride for it so the canonical intentional path | ||
| // is silent and only real value-replacing overrides warn. | ||
| const previous = sources[key]; | ||
| onOverride!({ | ||
| key, | ||
| previousValue: merged[key], | ||
| nextValue: value, | ||
| previousMatch: previous.match, | ||
| nextMatch: match, | ||
| previousIndex: previous.index, | ||
| nextIndex: index, | ||
| }); | ||
| } | ||
| merged[key] = value; | ||
| if (sources) sources[key] = { match, index }; | ||
| } | ||
| } | ||
| } | ||
| index++; | ||
| } | ||
| return merged as Partial<T>; | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
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.
📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win
Test-count arithmetic doesn't add up.
PR-22 states a "package total 58" and PR-23 says "46 new tests ... package total 108". 58 + 46 = 104, not 108 — a 4-test discrepancy. The individual per-file counts (7+7+9+23=46) are internally consistent, so the "108" running total looks like the error.
🔧 Proposed fix
📝 Committable suggestion
🤖 Prompt for AI Agents