starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-05-25 16:19:20 +02:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Fix parsing of dependency notation URIs (#1570)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
pkl-core/src/main/java/org/pkl/core/packages/Dependency.java
+12 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
* Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,8 +16,10 @@
package org.pkl.core.packages;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.file.Path;
import java.util.Objects;
import org.pkl.core.PklBugException;
import org.pkl.core.Version;
import org.pkl.core.util.IoUtils;
import org.pkl.core.util.Nullable;
@@ -53,7 +55,15 @@ public abstract class Dependency {
public URI resolveAssetUri(URI projectBaseUri, PackageAssetUri packageAssetUri) {
// drop 1 to remove leading `/`
var assetPath = packageAssetUri.getAssetPath().substring(1);
return projectBaseUri.resolve(IoUtils.toNormalizedPathString(path.resolve(assetPath)));
var resolvedPath = path.resolve(assetPath);
var normalized = IoUtils.toNormalizedPathString(resolvedPath);
try {
var relativeUri = new URI(null, null, normalized, null);
return projectBaseUri.resolve(relativeUri);
} catch (URISyntaxException e) {
// impossible; we started from valid URIs to begin with.
throw PklBugException.unreachableCode();
}
}
@Override
pkl-core/src/main/java/org/pkl/core/packages/PackageAssetUri.java
+9 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
* Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.pkl.core.packages;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.file.Path;
import org.pkl.core.PklBugException;
import org.pkl.core.Version;
import org.pkl.core.util.ErrorMessages;
import org.pkl.core.util.IoUtils;
@@ -40,7 +41,13 @@ public final class PackageAssetUri {
}
public PackageAssetUri(PackageUri packageUri, String assetPath) {
this.uri = packageUri.getUri().resolve("#" + assetPath);
var base = packageUri.getUri();
try {
this.uri = new URI(base.getScheme(), base.getSchemeSpecificPart(), assetPath);
} catch (URISyntaxException e) {
// impossible condition, we have a valid URI to start with.
throw PklBugException.unreachableCode();
}
this.packageUri = packageUri;
this.assetPath = assetPath;
}