Add JavaFX bundled version support with -fx suffix

Co-authored-by: bytemain <13938334+bytemain@users.noreply.github.com>

Author: Copilot

README.md

@@ -9,7 +9,7 @@ Support for multiple JDK distributions, such as: Oracle, Graalvm, Eclipse & more
 
 # Usage
 
-**Parameter Format**: `x.y.z-distribution`
+**Parameter Format**: `x.y.z-distribution` or `x.y.z-fx-distribution` (for JavaFX bundled versions)
 
 ```shell
 # add plugin for vfox
@@ -21,13 +21,34 @@ vfox install java@17.0.17-tem      # Temurin
 vfox install java@17.0.17-zulu     # Zulu
 vfox install java@17-graal         # GraalVM (latest 17.x)
 
+# install JavaFX bundled versions (use -fx suffix)
+vfox install java@21.0.5-fx-zulu   # Zulu with JavaFX
+vfox install java@21.0.5-fx-librca # Liberica with JavaFX
+
 # view all available versions
 vfox search java           # view all openjdk versions
 vfox search java tem       # view all temurin versions
 vfox search java zulu      # view all zulu versions
 vfox search java graal     # view all graalvm versions
 ```
 
+## JavaFX Support
+
+Some distributions provide JDK versions bundled with JavaFX. These versions are displayed with the `-fx` suffix in the version list and marked with "JavaFX" in the notes. To install a JavaFX bundled version, add `-fx` to the version string:
+
+```shell
+# List versions (JavaFX versions will show -fx suffix)
+vfox search java zulu
+# Example output:
+# 21.0.5-zulu
+# 21.0.5-fx-zulu    # JavaFX
+# 17.0.13-zulu
+# 17.0.13-fx-zulu   # JavaFX
+
+# Install JavaFX bundled version
+vfox install java@21.0.5-fx-zulu
+```
+
 # Supported JDK Distributions
 
 > Thanks [SDKMAN](https://sdkman.io/jdks)!

README_CN.md

@@ -8,7 +8,7 @@
 
 # 使用
 
-**参数格式**:  x.y.z-distribution
+**参数格式**:  `x.y.z-distribution` 或 `x.y.z-fx-distribution` (带 JavaFX 的版本)
 
 ```shell
 # 添加插件
@@ -18,12 +18,33 @@ vfox add java
 vfox install java@x.y.z  # 默认使用openjdk
 vfox install java@x.y.z-graal # 使用graalvm
 
+# 安装带 JavaFX 的版本 (使用 -fx 后缀)
+vfox install java@21.0.5-fx-zulu   # 带 JavaFX 的 Zulu
+vfox install java@21.0.5-fx-librca # 带 JavaFX 的 Liberica
+
 # 查看所有可用版本
 vfox search java all # 查看所有sdk版本
 vfox search java # 查看所有openjdk版本
 vfox search java graal # 查看所有graalvm版本
 ```
 
+## JavaFX 支持
+
+部分发行版提供了捆绑 JavaFX 的 JDK 版本。这些版本在版本列表中会显示 `-fx` 后缀，并在备注中标注 "JavaFX"。安装带 JavaFX 的版本时，需要在版本字符串中添加 `-fx`：
+
+```shell
+# 查看版本列表 (带 JavaFX 的版本会显示 -fx 后缀)
+vfox search java zulu
+# 示例输出:
+# 21.0.5-zulu
+# 21.0.5-fx-zulu    # JavaFX
+# 17.0.13-zulu
+# 17.0.13-fx-zulu   # JavaFX
+
+# 安装带 JavaFX 的版本
+vfox install java@21.0.5-fx-zulu
+```
+
 # 支持的JDK发行版
 
 > Thanks [SDKMAN](https://sdkman.io/jdks)!

hooks/available.lua

@@ -29,24 +29,35 @@ function PLUGIN:Available(ctx)
     for _, jdk in ipairs(jdks) do
         local v = jdk.java_version
         local short = jdk.short
+        
+        -- Add -fx suffix for JavaFX bundled versions
+        local fx_suffix = ""
+        if jdk.javafx_bundled == true then
+            fx_suffix = "-fx"
+        end
+        
         if query == "all" then
-            v = v .. "-" .. short
+            v = v .. fx_suffix .. "-" .. short
         elseif query == "open" then
-            v = v
+            v = v .. fx_suffix
         else
             local distribution = distribution_version_parser.parse_distribution(query)
             if not distribution then
                 error("Unsupported distribution: " .. query)
             end
-            v = v .. "-" .. distribution.short_name
+            v = v .. fx_suffix .. "-" .. distribution.short_name
         end
 
         if not seen[v] then
             seen[v] = true
             -- check if version exists
+            local note = jdk.term_of_support == "lts" and "LTS" or ""
+            if jdk.javafx_bundled == true then
+                note = note == "" and "JavaFX" or note .. ", JavaFX"
+            end
             table.insert(result, {
                 version = v,
-                note = jdk.term_of_support == "lts" and "LTS" or ""
+                note = note
             })
         end
 

hooks/pre_install.lua

@@ -17,14 +17,35 @@ function PLUGIN:PreInstall(ctx)
     if not jdks or #jdks == 0 then
         error("No JDK found for " .. ctx.version .. " on " .. RUNTIME.osType .. "/" .. RUNTIME.archType .. ". Please check available versions with 'vfox search java'")
     end
-    local jdk = jdks[1]
+    
+    -- Filter JDKs based on JavaFX requirement
+    local filtered_jdks = {}
+    for _, jdk in ipairs(jdks) do
+        local jdk_has_fx = jdk.javafx_bundled == true
+        if distribution_version.javafx_bundled == jdk_has_fx then
+            table.insert(filtered_jdks, jdk)
+        end
+    end
+    
+    if #filtered_jdks == 0 then
+        local fx_msg = distribution_version.javafx_bundled and " with JavaFX" or " without JavaFX"
+        error("No JDK found for " .. ctx.version .. fx_msg .. " on " .. RUNTIME.osType .. "/" .. RUNTIME.archType .. ". Please check available versions with 'vfox search java'")
+    end
+    
+    local jdk = filtered_jdks[1]
     local info = json.decode(httpGet(jdk.links.pkg_info_uri, "Failed to fetch jdk info")).result[1]
     -- TODO: checksum
     -- local checksum = info.checksum
     -- if checksum == "" and info.checksum_uri ~= "" then
     --     checksum = httpGet(info.checksum_uri, "Failed to fetch checksum")
     -- end
-    local finalV = distribution_version.distribution.short_name == "open" and jdk.java_version or jdk.java_version .. "-" .. distribution_version.distribution.short_name
+    
+    -- Build final version string with fx suffix if needed
+    local fx_suffix = ""
+    if jdk.javafx_bundled == true then
+        fx_suffix = "-fx"
+    end
+    local finalV = distribution_version.distribution.short_name == "open" and jdk.java_version .. fx_suffix or jdk.java_version .. fx_suffix .. "-" .. distribution_version.distribution.short_name
     return {
         -- [info.checksum_type] = checksum,
         url = info.direct_download_uri,

lib/distribution_version.lua

@@ -59,6 +59,18 @@ function distribution_version.parse_version (arg)
     local version_parts = strings.split(arg, "-")
     local version
     local distribution
+    local javafx_bundled = false
+
+    -- Check for "fx" in any part and remove it, setting javafx_bundled flag
+    local filtered_parts = {}
+    for _, part in ipairs(version_parts) do
+        if part == "fx" then
+            javafx_bundled = true
+        else
+            table.insert(filtered_parts, part)
+        end
+    end
+    version_parts = filtered_parts
 
     if not version_parts[2] then
         -- no parts, check if we got a distribution name without version
@@ -90,6 +102,7 @@ function distribution_version.parse_version (arg)
     return {
         version = version,
         distribution = distribution,
+        javafx_bundled = javafx_bundled,
     }
 end