Fix parsing of dependency notation URIs (#1570)

Fixes a thrown exception when path segments contain characters that
aren't URI safe (e.g. `import "@foo/bar baz.pkl"`).

Closes #1545
This commit is contained in:
Daniel Chao
2026-05-07 13:00:52 -07:00
committed by GitHub
parent 8ff03cfac0
commit 38733e5781
11 changed files with 66 additions and 4 deletions
@@ -0,0 +1,8 @@
amends "pkl:Project"
package {
name = "packageWithSpaces"
baseUri = "package://localhost:0/packageWithSpaces"
version = "1.0.0"
packageZipUrl = "https://localhost:0/packageWithSpaces/packageWithSpaces-\(version).zip"
}
@@ -0,0 +1,8 @@
amends "pkl:Project"
dependencies {
["birds"] {
uri = "package://localhost:0/birds@0.7.0"
}
["packageWithSpaces"] = import("../packageWithSpaces/PklProject")
}
@@ -0,0 +1,17 @@
{
"schemaVersion": 1,
"resolvedDependencies": {
"package://localhost:0/birds@0": {
"type": "remote",
"uri": "projectpackage://localhost:0/birds@0.7.0",
"checksums": {
"sha256": "$skipChecksumVerification"
}
},
"package://localhost:0/packageWithSpaces@1": {
"type": "local",
"uri": "projectpackage://localhost:0/packageWithSpaces@1.0.0",
"path": "../packageWithSpaces/"
}
}
}
@@ -0,0 +1,3 @@
import* "@birds/catalog/{Ostrich,Swallow}.pkl" as myCatalog
res = myCatalog.keys
@@ -0,0 +1,3 @@
import "@packageWithSpaces/module with spaces.pkl" as mod
res = mod
@@ -0,0 +1 @@
res = Set("@birds/catalog/Ostrich.pkl", "@birds/catalog/Swallow.pkl")
@@ -0,0 +1,3 @@
res {
foo = 1
}