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
8 changes: 7 additions & 1 deletion lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ const resolveReference = (strategy) => (reference, base) => {

if (resolvedComponents.authority === undefined) {
resolvedComponents.authority = baseComponents.authority;
resolvedComponents.userinfo = baseComponents.userinfo;
resolvedComponents.host = baseComponents.host;
resolvedComponents.port = baseComponents.port;

if (resolvedComponents.path === "") {
resolvedComponents.path = baseComponents.path;
Expand Down Expand Up @@ -165,7 +168,10 @@ const getSegment = (path) => {
/** @type (strategy: Strategy, components: API.IdentifierComponents) => string */
const composeIdentifier = (strategy, components) => {
let resolved = components.scheme.toLowerCase() + ":";
resolved += components.authority === undefined ? "" : "//" + components.authority.toLowerCase();
resolved += components.authority === undefined ? "" : "//"
+ (components.userinfo === undefined ? "" : components.userinfo + "@")
+ components.host.toLowerCase()
+ (components.port === undefined ? "" : ":" + components.port);
resolved += strategy.normalizePath(components.path);
resolved += components.query === undefined ? "" : "?" + strategy.normalizeQuery(components.query);
resolved += components.fragment === undefined ? "" : "#" + strategy.normalizeFragment(components.fragment);
Expand Down
3 changes: 2 additions & 1 deletion lib/resolve-reference.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ const resolveTests = [
["http://example.com/b%2Fc/d/e", "", "http://example.com/b%2Fc/d/e"], // Necessary encoding segment
["http://example.com/b%2fc/d/e", "", "http://example.com/b%2Fc/d/e"], // Case normalization of encoding segment
["http://example.com/b?c%2Fd%3Fe", "", "http://example.com/b?c/d?e"], // Unnecessary encoding query
["http://example.com/b", "#c%2Fd%3Fe", "http://example.com/b#c/d?e"] // Unnecessary encoding fragment
["http://example.com/b", "#c%2Fd%3Fe", "http://example.com/b#c/d?e"], // Unnecessary encoding fragment
["Https://JDesrosiers@Example.com", "", "https://JDesrosiers@example.com"] // Case normalization of authority
];

describe("resolveReference", () => {
Expand Down