Skip to content

Remove unsafe Object.entries assertions in compoundParamsKey #100554

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.

Sign up for GitHub

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

Draft
KJ21-ENG wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −2
Draft

Remove unsafe Object.entries assertions in compoundParamsKey #100554

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/libs/compoundParamsKey.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ function normalizeForKey(value: unknown): unknown {
}
if (typeof value === 'object') {
// Recursively sort so differently-ordered nested keys produce the same compound.
const entries = Object.entries(value as Record<string, unknown>)
const objectEntries: Array<[string, unknown]> = Object.entries(value);
const entries = objectEntries
.sort(([a], [b]) => {
if (a < b) {
return -1;
Expand All @@ -49,7 +50,8 @@ function compoundParamsKey(routeKey: string, params: unknown): string {
return `${routeKey}${COMPOUND_KEY_DELIMITER}${JSON.stringify(normalizeForKey(params))}`;
}
// Explicit-undefined fields must match path-rehydrated (omitted) params.
const entries = Object.entries(params as Record<string, unknown>)
const objectEntries: Array<[string, unknown]> = Object.entries(params);
const entries = objectEntries
.filter(([, value]) => value !== undefined)
.map(([k, v]) => [k, normalizeForKey(v)] as const)
.sort(([a], [b]) => {
Expand Down
Loading