Skip to content

Commit e347b26

Browse files
authored
Avoid resolving paths on fragments (#357)
Fixes an issue where modules with fragment paths are resolved against the URI path.
1 parent c9ed183 commit e347b26

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

pkl-doc/src/main/kotlin/org/pkl/doc/DocPackageInfo.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ data class DocPackageInfo(
161161
"pkl:/" -> "pkl:${moduleName.substring(4)}".toUri()
162162
else -> {
163163
val path = getModulePath(moduleName, moduleNamePrefix).uriEncoded + ".pkl"
164-
URI(importUri).resolve(path)
164+
URI(importUri + path)
165165
}
166166
}
167167

pkl-doc/src/test/files/DocGeneratorTest/output/localhost:0/birds/0.5.0/Bird/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h1 id="declaration-title">birds.Bird<span id="declaration-version">0.5.0</span>
2828
<div class="member-signature">open module <span class="name-decl">birds.Bird</span></div>
2929
<dl class="member-info">
3030
<dt class="">Module URI:</dt>
31-
<dd><span class="import-uri">package://localhost:0/Bird.pkl</span><i class="copy-uri-button material-icons">content_copy</i></dd>
31+
<dd><span class="import-uri">package://localhost:0/birds@0.5.0#/Bird.pkl</span><i class="copy-uri-button material-icons">content_copy</i></dd>
3232
<dt class="">Source code:</dt>
3333
<dd><a href="https://example.com/birds/v0.5.0/blob/Bird.pkl">Bird.pkl</a></dd>
3434
<dt class="runtime-data hidden">Known subtypes:</dt>

pkl-doc/src/test/files/DocGeneratorTest/output/localhost:0/birds/0.5.0/allFruit/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h1 id="declaration-title">birds.allFruit<span id="declaration-version">0.5.0</s
2828
<div class="member-signature">module <span class="name-decl">birds.allFruit</span></div>
2929
<dl class="member-info">
3030
<dt class="">Module URI:</dt>
31-
<dd><span class="import-uri">package://localhost:0/allFruit.pkl</span><i class="copy-uri-button material-icons">content_copy</i></dd>
31+
<dd><span class="import-uri">package://localhost:0/birds@0.5.0#/allFruit.pkl</span><i class="copy-uri-button material-icons">content_copy</i></dd>
3232
<dt class="">Source code:</dt>
3333
<dd><a href="https://example.com/birds/v0.5.0/blob/allFruit.pkl">allFruit.pkl</a></dd>
3434
<dt class="runtime-data hidden">Known subtypes:</dt>

pkl-doc/src/test/files/DocGeneratorTest/output/localhost:0/birds/0.5.0/catalog/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h1 id="declaration-title">birds.catalog<span id="declaration-version">0.5.0</sp
2828
<div class="member-signature">module <span class="name-decl">birds.catalog</span></div>
2929
<dl class="member-info">
3030
<dt class="">Module URI:</dt>
31-
<dd><span class="import-uri">package://localhost:0/catalog.pkl</span><i class="copy-uri-button material-icons">content_copy</i></dd>
31+
<dd><span class="import-uri">package://localhost:0/birds@0.5.0#/catalog.pkl</span><i class="copy-uri-button material-icons">content_copy</i></dd>
3232
<dt class="">Source code:</dt>
3333
<dd><a href="https://example.com/birds/v0.5.0/blob/catalog.pkl">catalog.pkl</a></dd>
3434
<dt class="runtime-data hidden">Known subtypes:</dt>

pkl-doc/src/test/files/DocGeneratorTest/output/localhost:0/fruit/1.1.0/Fruit/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h1 id="declaration-title">fruit.Fruit<span id="declaration-version">1.1.0</span
2828
<div class="member-signature">module <span class="name-decl">fruit.Fruit</span></div>
2929
<dl class="member-info">
3030
<dt class="">Module URI:</dt>
31-
<dd><span class="import-uri">package://localhost:0/Fruit.pkl</span><i class="copy-uri-button material-icons">content_copy</i></dd>
31+
<dd><span class="import-uri">package://localhost:0/fruit@1.1.0#/Fruit.pkl</span><i class="copy-uri-button material-icons">content_copy</i></dd>
3232
<dt class="runtime-data hidden">Known subtypes:</dt>
3333
<dd id="known-subtypes" class="runtime-data hidden"></dd>
3434
<dt class="runtime-data hidden">Known usages:</dt>

0 commit comments

Comments
 (0)