From 83e47694efda1e4e3871ac03cb3b3e99f6a87709 Mon Sep 17 00:00:00 2001 From: Jen Basch <421772+HT154@users.noreply.github.com> Date: Tue, 17 Nov 2026 02:07:19 -0800 Subject: [PATCH] Fix import analysis failures for glob imports into local package deps (#1992) --- .../pkl/core/runtime/VmImportAnalyzer.java | 3 +- .../analyzeLocalPackageGlob/PklProject | 8 ++++ .../analyzeLocalPackageGlob/mods/one.pkl | 1 + .../analyzeLocalPackageGlob/mods/two.pkl | 1 + .../analyzeLocalPackageGlob/PklProject | 3 ++ .../PklProject.deps.json | 10 +++++ .../analyzeLocalPackageGlob/analyze.pkl | 26 +++++++++++++ .../projects/analyzeLocalPackageGlob/glob.pkl | 1 + .../analyzeLocalPackageGlob/single.pkl | 1 + .../analyzeLocalPackageGlob/analyze.pcf | 39 +++++++++++++++++++ .../projects/analyzeLocalPackageGlob/glob.pcf | 1 + .../analyzeLocalPackageGlob/single.pcf | 1 + 12 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 pkl-core/src/test/files/LanguageSnippetTests/input-helper/projects/analyzeLocalPackageGlob/PklProject create mode 100644 pkl-core/src/test/files/LanguageSnippetTests/input-helper/projects/analyzeLocalPackageGlob/mods/one.pkl create mode 100644 pkl-core/src/test/files/LanguageSnippetTests/input-helper/projects/analyzeLocalPackageGlob/mods/two.pkl create mode 100644 pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/PklProject create mode 100644 pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/PklProject.deps.json create mode 100644 pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/analyze.pkl create mode 100644 pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/glob.pkl create mode 100644 pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/single.pkl create mode 100644 pkl-core/src/test/files/LanguageSnippetTests/output/projects/analyzeLocalPackageGlob/analyze.pcf create mode 100644 pkl-core/src/test/files/LanguageSnippetTests/output/projects/analyzeLocalPackageGlob/glob.pcf create mode 100644 pkl-core/src/test/files/LanguageSnippetTests/output/projects/analyzeLocalPackageGlob/single.pcf diff --git a/pkl-core/src/main/java/org/pkl/core/runtime/VmImportAnalyzer.java b/pkl-core/src/main/java/org/pkl/core/runtime/VmImportAnalyzer.java index 53e615b29..b1980f39b 100644 --- a/pkl-core/src/main/java/org/pkl/core/runtime/VmImportAnalyzer.java +++ b/pkl-core/src/main/java/org/pkl/core/runtime/VmImportAnalyzer.java @@ -102,7 +102,8 @@ public class VmImportAnalyzer { try { if (entry.isGlob()) { var theModuleKey = - moduleResolver.resolve(moduleKey.resolveUri(IoUtils.toUri(entry.stringValue()))); + moduleResolver.resolve( + IoUtils.resolve(securityManager, moduleKey, IoUtils.toUri(entry.stringValue()))); var elements = GlobResolver.resolveGlob( securityManager, diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input-helper/projects/analyzeLocalPackageGlob/PklProject b/pkl-core/src/test/files/LanguageSnippetTests/input-helper/projects/analyzeLocalPackageGlob/PklProject new file mode 100644 index 000000000..700eb4732 --- /dev/null +++ b/pkl-core/src/test/files/LanguageSnippetTests/input-helper/projects/analyzeLocalPackageGlob/PklProject @@ -0,0 +1,8 @@ +amends "pkl:Project" + +package { + name = "a" + baseUri = "package://example.com/a" + version = "1.0.0" + packageZipUrl = "https://example.com/a.zip" +} diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input-helper/projects/analyzeLocalPackageGlob/mods/one.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input-helper/projects/analyzeLocalPackageGlob/mods/one.pkl new file mode 100644 index 000000000..7d4290a11 --- /dev/null +++ b/pkl-core/src/test/files/LanguageSnippetTests/input-helper/projects/analyzeLocalPackageGlob/mods/one.pkl @@ -0,0 +1 @@ +x = 1 diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input-helper/projects/analyzeLocalPackageGlob/mods/two.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input-helper/projects/analyzeLocalPackageGlob/mods/two.pkl new file mode 100644 index 000000000..407de3068 --- /dev/null +++ b/pkl-core/src/test/files/LanguageSnippetTests/input-helper/projects/analyzeLocalPackageGlob/mods/two.pkl @@ -0,0 +1 @@ +x = 2 diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/PklProject b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/PklProject new file mode 100644 index 000000000..6fa6990c8 --- /dev/null +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/PklProject @@ -0,0 +1,3 @@ +amends "pkl:Project" + +dependencies { ["a"] = import(".../input-helper/projects/analyzeLocalPackageGlob/PklProject") } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/PklProject.deps.json b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/PklProject.deps.json new file mode 100644 index 000000000..3b0f70614 --- /dev/null +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/PklProject.deps.json @@ -0,0 +1,10 @@ +{ + "schemaVersion": 1, + "resolvedDependencies": { + "package://example.com/a@1": { + "type": "local", + "uri": "projectpackage://example.com/a@1.0.0", + "path": "../../../input-helper/projects/analyzeLocalPackageGlob" + } + } +} diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/analyze.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/analyze.pkl new file mode 100644 index 000000000..a786f249f --- /dev/null +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/analyze.pkl @@ -0,0 +1,26 @@ +amends ".../snippetTest.pkl" + +import "pkl:analyze" +import "pkl:reflect" + +import "glob.pkl" +import "single.pkl" + +examples { + ["single"] { + analyze.importGraph(Set(reflect.Module(single).uri)) + } + ["glob"] { + analyze.importGraph(Set(reflect.Module(glob).uri)) + } +} + +output { + renderer { + // mimick result of `pkl analyze imports` CLI command + converters { + [Map] = (it) -> it.toMapping() + [Set] = (it) -> it.toListing() + } + } +} diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/glob.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/glob.pkl new file mode 100644 index 000000000..606256c07 --- /dev/null +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/glob.pkl @@ -0,0 +1 @@ +res = import*("@a/mods/*.pkl").toMap().mapValues((_, m) -> m.x) diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/single.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/single.pkl new file mode 100644 index 000000000..8f25e25a1 --- /dev/null +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/analyzeLocalPackageGlob/single.pkl @@ -0,0 +1 @@ +res = import("@a/mods/one.pkl").x diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/projects/analyzeLocalPackageGlob/analyze.pcf b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/analyzeLocalPackageGlob/analyze.pcf new file mode 100644 index 000000000..ea7cc6e53 --- /dev/null +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/analyzeLocalPackageGlob/analyze.pcf @@ -0,0 +1,39 @@ +examples { + ["single"] { + new { + imports { + ["file:///$snippetsDir/input/projects/analyzeLocalPackageGlob/single.pkl"] { + new { + uri = "projectpackage://example.com/a@1.0.0#/mods/one.pkl" + } + } + ["projectpackage://example.com/a@1.0.0#/mods/one.pkl"] {} + } + resolvedImports { + ["file:///$snippetsDir/input/projects/analyzeLocalPackageGlob/single.pkl"] = "file:///$snippetsDir/input/projects/analyzeLocalPackageGlob/single.pkl" + ["projectpackage://example.com/a@1.0.0#/mods/one.pkl"] = "file:///$snippetsDir/input-helper/projects/analyzeLocalPackageGlob/mods/one.pkl" + } + } + } + ["glob"] { + new { + imports { + ["file:///$snippetsDir/input/projects/analyzeLocalPackageGlob/glob.pkl"] { + new { + uri = "projectpackage://example.com/a@1.0.0#/mods/one.pkl" + } + new { + uri = "projectpackage://example.com/a@1.0.0#/mods/two.pkl" + } + } + ["projectpackage://example.com/a@1.0.0#/mods/one.pkl"] {} + ["projectpackage://example.com/a@1.0.0#/mods/two.pkl"] {} + } + resolvedImports { + ["file:///$snippetsDir/input/projects/analyzeLocalPackageGlob/glob.pkl"] = "file:///$snippetsDir/input/projects/analyzeLocalPackageGlob/glob.pkl" + ["projectpackage://example.com/a@1.0.0#/mods/one.pkl"] = "file:///$snippetsDir/input-helper/projects/analyzeLocalPackageGlob/mods/one.pkl" + ["projectpackage://example.com/a@1.0.0#/mods/two.pkl"] = "file:///$snippetsDir/input-helper/projects/analyzeLocalPackageGlob/mods/two.pkl" + } + } + } +} diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/projects/analyzeLocalPackageGlob/glob.pcf b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/analyzeLocalPackageGlob/glob.pcf new file mode 100644 index 000000000..7a28fdf0a --- /dev/null +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/analyzeLocalPackageGlob/glob.pcf @@ -0,0 +1 @@ +res = Map("@a/mods/one.pkl", 1, "@a/mods/two.pkl", 2) diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/projects/analyzeLocalPackageGlob/single.pcf b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/analyzeLocalPackageGlob/single.pcf new file mode 100644 index 000000000..ead6a55a9 --- /dev/null +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/analyzeLocalPackageGlob/single.pcf @@ -0,0 +1 @@ +res = 1