starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-01-11 22:30:54 +01:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Avoid resolving paths on fragments (#357)

Browse Source 
Fixes an issue where modules with fragment paths are resolved against the URI path.
This commit is contained in:
Philip K.F. Hölzenspies
2024-03-26 16:16:02 +01:00
committed by Dan Chao
parent 87d91b1950
commit 4006c087d9
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkl-doc/src/main/kotlin/org/pkl/doc/DocPackageInfo.kt
View File

@@ -161,7 +161,7 @@ data class DocPackageInfo(
"pkl:/" -> "pkl:${moduleName.substring(4)}".toUri()
else -> {
val path = getModulePath(moduleName, moduleNamePrefix).uriEncoded + ".pkl"
URI(importUri).resolve(path)
URI(importUri + path)
}
}

2
pkl-doc/src/test/files/DocGeneratorTest/output/localhost:12110/birds/0.5.0/Bird/index.html vendored
View File

@@ -28,7 +28,7 @@
<div class="member-signature">open module <span class="name-decl">birds.Bird</span></div>
<dl class="member-info">
<dt class="">Module URI:</dt>
<dd><span class="import-uri">package://localhost:12110/Bird.pkl</span><i class="copy-uri-button material-icons">content_copy</i></dd>
<dd><span class="import-uri">package://localhost:12110/birds@0.5.0#/Bird.pkl</span><i class="copy-uri-button material-icons">content_copy</i></dd>
<dt class="">Source code:</dt>
<dd><a href="https://example.com/birds/v0.5.0/blob/Bird.pkl">Bird.pkl</a></dd>
<dt class="runtime-data hidden">Known subtypes:</dt>

2
pkl-doc/src/test/files/DocGeneratorTest/output/localhost:12110/birds/0.5.0/allFruit/index.html vendored
View File

@@ -28,7 +28,7 @@
<div class="member-signature">module <span class="name-decl">birds.allFruit</span></div>
<dl class="member-info">
<dt class="">Module URI:</dt>
<dd><span class="import-uri">package://localhost:12110/allFruit.pkl</span><i class="copy-uri-button material-icons">content_copy</i></dd>
<dd><span class="import-uri">package://localhost:12110/birds@0.5.0#/allFruit.pkl</span><i class="copy-uri-button material-icons">content_copy</i></dd>
<dt class="">Source code:</dt>
<dd><a href="https://example.com/birds/v0.5.0/blob/allFruit.pkl">allFruit.pkl</a></dd>
<dt class="runtime-data hidden">Known subtypes:</dt>

2
pkl-doc/src/test/files/DocGeneratorTest/output/localhost:12110/birds/0.5.0/catalog/index.html vendored
View File

@@ -28,7 +28,7 @@
<div class="member-signature">module <span class="name-decl">birds.catalog</span></div>
<dl class="member-info">
<dt class="">Module URI:</dt>
<dd><span class="import-uri">package://localhost:12110/catalog.pkl</span><i class="copy-uri-button material-icons">content_copy</i></dd>
<dd><span class="import-uri">package://localhost:12110/birds@0.5.0#/catalog.pkl</span><i class="copy-uri-button material-icons">content_copy</i></dd>
<dt class="">Source code:</dt>
<dd><a href="https://example.com/birds/v0.5.0/blob/catalog.pkl">catalog.pkl</a></dd>
<dt class="runtime-data hidden">Known subtypes:</dt>

2
pkl-doc/src/test/files/DocGeneratorTest/output/localhost:12110/fruit/1.1.0/Fruit/index.html vendored
View File

@@ -28,7 +28,7 @@
<div class="member-signature">module <span class="name-decl">fruit.Fruit</span></div>
<dl class="member-info">
<dt class="">Module URI:</dt>
<dd><span class="import-uri">package://localhost:12110/Fruit.pkl</span><i class="copy-uri-button material-icons">content_copy</i></dd>
<dd><span class="import-uri">package://localhost:12110/fruit@1.1.0#/Fruit.pkl</span><i class="copy-uri-button material-icons">content_copy</i></dd>
<dt class="runtime-data hidden">Known subtypes:</dt>
<dd id="known-subtypes" class="runtime-data hidden"></dd>
<dt class="runtime-data hidden">Known usages:</dt>