fix: resource references with property resolving

Author: maxandersen

itests/linuxxyz.java

@@ -0,0 +1,10 @@
+///usr/bin/env jbang "$0" "$@" ; exit $?
+
+import static java.lang.System.*;
+
+public class linux {
+
+    public static void main(String... args) {
+        out.println("Hello linux");
+    }
+}

itests/osxxyz.java

@@ -0,0 +1,10 @@
+///usr/bin/env jbang "$0" "$@" ; exit $?
+
+import static java.lang.System.*;
+
+public class osx {
+
+    public static void main(String... args) {
+        out.println("Hello osx");
+    }
+}

itests/winxyz.java

@@ -0,0 +1,10 @@
+///usr/bin/env jbang "$0" "$@" ; exit $?
+
+import static java.lang.System.*;
+
+public class win {
+
+    public static void main(String... args) {
+        out.println("Hello Windows");
+    }
+}

src/main/java/dev/jbang/dependencies/Detector.java

@@ -3,6 +3,8 @@
 import java.util.List;
 import java.util.Properties;
 
+import dev.jbang.util.Util;
+
 public class Detector extends kr.motd.maven.os.Detector {
 
 	public Detector() {
@@ -16,13 +18,19 @@ protected void log(String message) {
 
 	@Override
 	protected void logProperty(String name, String value) {
-
+		Util.verboseMsg("Auto-detected: " + name + "=" + value);
 	}
 
 	public void detect(Properties properties, List<String> classiferWithLikes) {
 		super.detect(properties, classiferWithLikes);
 
 		// "hack" to expose a property that works with javafx mac classifers
+		// https://repo1.maven.org/maven2/org/openjfx/javafx-controls/26-ea+3/
+		// linux-aarch64
+		// linux
+		// mac-aarch64
+		// mac
+		// win
 		String os = properties.getProperty("os.detected.name");
 		if (os.equals("osx")) {
 			os = "mac";
@@ -31,6 +39,11 @@ public void detect(Properties properties, List<String> classiferWithLikes) {
 			}
 		} else if (os.equals("windows")) {
 			os = "win";
+		} else if (os.equals("linux")) {
+			os = "linux";
+			if ("aarch64".equals(System.getProperty("os.arch"))) {
+				os = "linux-aarch64";
+			}
 		}
 		properties.setProperty("os.detected.jfxname", os);
 	}

src/main/java/dev/jbang/source/ProjectBuilder.java

@@ -258,12 +258,41 @@ private List<MavenRepo> allToMavenRepo(List<String> repos) {
 	}
 
 	public Project build(String resource) {
-		ResourceRef resourceRef = resolveChecked(getResourceResolver(), resource);
+		ResourceRef resourceRef = resolveChecked(getResourceResolver(), resource, true);
 		return build(resourceRef);
 	}
 
 	private ResourceRef resolveChecked(ResourceResolver resolver, String resource) {
-		Util.verboseMsg("Resolving resource ref: " + resource);
+		return resolveChecked(resolver, resource, false);
+	}
+
+	/**
+	 * Resolves the given resource, with property resolution from project context
+	 * and handles retry on caching.
+	 * 
+	 * Note: only enable property replacement if you know the resource is not
+	 * something that can be embedded/included directly in the project from users
+	 * data.
+	 * 
+	 * i.e. jbang run someref${os.detected.os}.jar is ok but //FILES with
+	 * ${user.home} is definitely not.
+	 * 
+	 * @param resolver
+	 * @param resource
+	 * @return
+	 */
+	private ResourceRef resolveChecked(ResourceResolver resolver, String orginal_resource,
+			boolean propertyReplacement) {
+		final String resource = propertyReplacement
+				? PropertiesValueResolver.replaceProperties(orginal_resource, getContextProperties())
+				: orginal_resource;
+
+		if (!resource.equals(orginal_resource)) {
+			Util.verboseMsg("Resolving resource ref: " + orginal_resource + " -> " + resource);
+		} else {
+			Util.verboseMsg("Resolving resource ref:" + resource);
+		}
+
 		boolean retryCandidate = catalogFile == null && !Util.isFresh() && Settings.getCacheEvict() > 0
 				&& (Catalog.isValidName(resource) || Catalog.isValidCatalogReference(resource)
 						|| Util.isRemoteRef(resource));
@@ -618,6 +647,7 @@ private ResourceResolver getAliasResourceResolver(Alias alias) {
 		if (alias != null) {
 			updateFromAlias(alias);
 		}
+
 		return new CombinedResourceResolver(
 				new RenamingScriptResourceResolver(forceType),
 				new LiteralScriptResourceResolver(forceType),

src/test/java/dev/jbang/cli/TestRun.java

@@ -34,6 +34,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.regex.Pattern;
@@ -65,6 +66,7 @@
 import dev.jbang.catalog.Alias;
 import dev.jbang.catalog.Catalog;
 import dev.jbang.catalog.CatalogUtil;
+import dev.jbang.dependencies.Detector;
 import dev.jbang.net.TrustedSources;
 import dev.jbang.source.BuildContext;
 import dev.jbang.source.Builder;
@@ -80,6 +82,7 @@
 import dev.jbang.source.sources.JavaSource;
 import dev.jbang.util.CommandBuffer;
 import dev.jbang.util.JavaUtil;
+import dev.jbang.util.PropertiesValueResolver;
 import dev.jbang.util.Util;
 
 import picocli.CommandLine;
@@ -2101,6 +2104,32 @@ void testJavaFXMagicPropertyViaCommandline() throws IOException {
 
 	}
 
+	@Test
+	void testMagicPropertyViaRun(@TempDir Path tdir) throws IOException {
+
+		String fileref = examplesTestFolder.resolve("${os.detected.name}${customvar}.java").toString();
+		// todo fix so --deps can use system properties
+		CommandLine.ParseResult pr = JBang.getCommandLine()
+			.parseArgs("run",
+					"-Dcustomvar=xyz",
+					fileref.toString());
+
+		Run run = (Run) pr.subcommand().commandSpec().userObject();
+
+		ProjectBuilder pb = run.createProjectBuilderForRun();
+		pb.mainClass("fakemain");
+
+		Project prj = pb.build(fileref.toString());
+		String line = run.updateGeneratorForRun(CmdGenerator.builder(prj)).build().generate();
+
+		Properties props = new Properties();
+		new Detector().detect(props, Collections.emptyList());
+		String expectedJar = PropertiesValueResolver.replaceProperties("${os.detected.name}xyz.jar", props);
+
+		assertThat(line, containsString(expectedJar));
+
+	}
+
 	@Test
 	void testScriptCliReposAndDeps(@TempDir File output) throws IOException {
 		String base = "" +