Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions spec/common/utilities/path-pattern.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,5 +125,22 @@ describe("path-pattern", () => {
a: "match_a",
});
});
// handle URL encoded params (e.g. emojis)
it("should correctly decode URL encoded params", () => {
const pp = new pathPattern.PathPattern("{a}/something/{b}/end");

expect(pp.extractMatches("%F0%9F%98%80/something/another%20thing/end")).to.deep.equal({
a: "😀",
b: "another thing",
});
});

it("should safely handle malformed URL encoded params", () => {
const pp = new pathPattern.PathPattern("{a}/something/end");

expect(pp.extractMatches("%XX/something/end")).to.deep.equal({
a: "%XX",
});
});
});
});
15 changes: 13 additions & 2 deletions src/common/utilities/path-pattern.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ export function trimParam(param: string) {
return paramNoBraces;
}

/** @internal */
export function tryDecodeURIComponent(uri: string): string {
try {
return decodeURIComponent(uri);
} catch (_e) {
return uri;
}
}

/** @hidden */
type SegmentName = "segment" | "single-capture" | "multi-capture";

Expand Down Expand Up @@ -144,9 +153,11 @@ export class PathPattern {
const remainingSegments = this.segments.length - 1 - segmentNdx;
const nextPathNdx = pathSegments.length - remainingSegments;
if (segment.name === "single-capture") {
matches[segment.trimmed] = pathSegments[pathNdx];
matches[segment.trimmed] = tryDecodeURIComponent(pathSegments[pathNdx]);
} else if (segment.name === "multi-capture") {
matches[segment.trimmed] = pathSegments.slice(pathNdx, nextPathNdx).join("/");
matches[segment.trimmed] = tryDecodeURIComponent(
pathSegments.slice(pathNdx, nextPathNdx).join("/")
);
}
pathNdx = segment.isMultiSegmentWildcard() ? nextPathNdx : pathNdx + 1;
}
Expand Down
Loading