fix: resource references with property resolving

Author: maxandersen

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

@@ -2101,6 +2101,30 @@ void testJavaFXMagicPropertyViaCommandline() throws IOException {
 
 	}
 
+	@Test
+	void testMagicPropertyViaRun(@TempDir Path tdir) throws IOException {
+
+		String res = "https://github.com/HanSolo/jarkanoid/releases/download/17.0.17/jarkanoid-${os.detected.jfxname}-17.0.17.jar";
+		try {
+			TrustedSources.instance().add(res, tdir.resolve("test.trust").toFile());
+			// todo fix so --deps can use system properties
+			CommandLine.ParseResult pr = JBang.getCommandLine()
+				.parseArgs("run", res);
+
+			Run run = (Run) pr.subcommand().commandSpec().userObject();
+
+			ProjectBuilder pb = run.createProjectBuilderForRun();
+
+			Project prj = pb.build(res);
+			String line = run.updateGeneratorForRun(CmdGenerator.builder(prj)).build().generate();
+
+			assertThat(line, containsString(" --module-path "));
+		} finally {
+			TrustedSources.instance().remove(Collections.singletonList(res), tdir.resolve("test.trust").toFile());
+		}
+
+	}
+
 	@Test
 	void testScriptCliReposAndDeps(@TempDir File output) throws IOException {
 		String base = "" +