[pkl.experimental.net] Fix uri encoding (#54)

Co-authored-by: Rob Napier <rob@neverwood.org>
apple · Apr 24, 2024 · 2387406 · 2387406
1 parent fffa03d
commit 2387406
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 11 deletions.
diff --git a/packages/k8s.contrib.crd/PklProject b/packages/k8s.contrib.crd/PklProject
@@ -29,5 +29,5 @@ dependencies {
 }
 
 package {
-  version = "1.0.3"
+  version = "1.0.4"
 }
diff --git a/packages/k8s.contrib.crd/PklProject.deps.json b/packages/k8s.contrib.crd/PklProject.deps.json
@@ -15,7 +15,7 @@
     },
     "package://pkg.pkl-lang.org/pkl-pantry/org.json_schema.contrib@1": {
       "type": "local",
-      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/org.json_schema.contrib@1.0.4",
+      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/org.json_schema.contrib@1.0.5",
       "path": "../org.json_schema.contrib"
     },
     "package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.syntax@1": {
@@ -25,12 +25,12 @@
     },
     "package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.uri@1": {
       "type": "local",
-      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.uri@1.0.0",
+      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.uri@1.0.1",
       "path": "../pkl.experimental.uri"
     },
     "package://pkg.pkl-lang.org/pkl-pantry/org.json_schema@1": {
       "type": "local",
-      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/org.json_schema@1.0.1",
+      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/org.json_schema@1.0.2",
       "path": "../org.json_schema"
     }
   }

diff --git a/packages/org.json_schema.contrib/PklProject b/packages/org.json_schema.contrib/PklProject
@@ -25,5 +25,5 @@ dependencies {
 }
 
 package {
-  version = "1.0.4"
+  version = "1.0.5"
 }
diff --git a/packages/org.json_schema.contrib/PklProject.deps.json b/packages/org.json_schema.contrib/PklProject.deps.json
@@ -8,12 +8,12 @@
     },
     "package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.uri@1": {
       "type": "local",
-      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.uri@1.0.0",
+      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.uri@1.0.1",
       "path": "../pkl.experimental.uri"
     },
     "package://pkg.pkl-lang.org/pkl-pantry/org.json_schema@1": {
       "type": "local",
-      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/org.json_schema@1.0.1",
+      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/org.json_schema@1.0.2",
       "path": "../org.json_schema"
     }
   }

diff --git a/packages/org.json_schema/PklProject b/packages/org.json_schema/PklProject
@@ -24,5 +24,5 @@ dependencies {
 }
 
 package {
-  version = "1.0.1"
+  version = "1.0.2"
 }
diff --git a/packages/org.json_schema/PklProject.deps.json b/packages/org.json_schema/PklProject.deps.json
@@ -3,7 +3,7 @@
   "resolvedDependencies": {
     "package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.uri@1": {
       "type": "local",
-      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.uri@1.0.0",
+      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.uri@1.0.1",
       "path": "../pkl.experimental.uri"
     }
   }

diff --git a/packages/pkl.experimental.uri/PklProject b/packages/pkl.experimental.uri/PklProject
@@ -16,5 +16,5 @@
 amends "../basePklProject.pkl"
 
 package {
-  version = "1.0.0"
+  version = "1.0.1"
 }
diff --git a/packages/pkl.experimental.uri/URI.pkl b/packages/pkl.experimental.uri/URI.pkl
@@ -236,7 +236,7 @@ local function getUtf8Bytes(codePoint: Int): List<UInt8> =
 /// ```
 local function percentEncode(codePoint: Int) =
   getUtf8Bytes(codePoint)
-    .map((it) -> "%" + it.toRadixString(16).toUpperCase())
+    .map((it) -> "%" + it.toRadixString(16).toUpperCase().padStart(2, "0"))
     .join("")
 
 local hexDigits = "0123456789ABCDEF"

diff --git a/packages/pkl.experimental.uri/tests/URI.pkl b/packages/pkl.experimental.uri/tests/URI.pkl
@@ -34,6 +34,7 @@ facts {
     URI.encode(safeChars) == safeChars
     URI.encode("\u{ffff}") == "%EF%BF%BF"
     URI.encode("🏀") == "%F0%9F%8F%80"
+    URI.encode("\n") == "%0A"
   }
   ["encodeComponent"] {
     URI.encodeComponent("https://example.com/some path") == "https%3A%2F%2Fexample.com%2Fsome%20path"