@franzmoca/opencode-lombok 0.1.0 → 0.1.1

package/README.md

@@ -28,7 +28,7 @@ You can also pin a specific version:
 ```json
 {
   "$schema": "https://opencode.ai/config.json",
-  "plugin": ["@franzmoca/opencode-lombok@0.1.0"]
+  "plugin": ["@franzmoca/opencode-lombok@0.1.1"]
 }
 ```
 

package/dist/core.d.ts

@@ -3,6 +3,6 @@ export declare function detectLombokDependency(projectRoot: string): Promise<boo
 export declare function opencodeDataDir(platform?: NodeJS.Platform, env?: NodeJS.ProcessEnv, home?: string): string;
 export declare function lombokJarPath(dataDir?: string): string;
 export declare function isLspDownloadDisabled(env?: NodeJS.ProcessEnv): boolean;
-export declare function ensureLombokJar(file: string, env?: NodeJS.ProcessEnv): Promise<string | undefined>;
+export declare function ensureLombokJar(file: string | URL, env?: NodeJS.ProcessEnv): Promise<string | undefined>;
 export declare function formatJavaAgentArg(file: string): string;
 export declare function mergeJavaToolOptions(current: string | undefined, file: string): string;

package/dist/core.js

@@ -1,6 +1,7 @@
 import fs from "fs/promises";
 import os from "os";
 import path from "path";
+import { fileURLToPath } from "url";
 const LOMBOK_URL = "https://projectlombok.org/downloads/lombok.jar";
 const BUILD_FILES = new Set(["pom.xml", "build.gradle", "build.gradle.kts"]);
 const SKIP_DIRS = new Set([
@@ -19,6 +20,15 @@ const LOMBOK_MATCHERS = [
     /io\.freefair\.lombok/,
 ];
 const LOMBOK_JAVA_AGENT = /-javaagent:(?:"[^"]*lombok\.jar"|[^ "']*lombok\.jar)/i;
+const isNonEmptyString = (value) => typeof value === "string" && value.length > 0;
+const resolveFilePath = (value) => {
+    if (typeof value === "string")
+        return value;
+    if (value instanceof URL && value.protocol === "file:") {
+        return fileURLToPath(value);
+    }
+    return undefined;
+};
 const pathExists = async (file) => fs
     .stat(file)
     .then(() => true)
@@ -59,30 +69,40 @@ export async function detectLombokDependency(projectRoot) {
     return detectInDir(projectRoot);
 }
 export function opencodeDataDir(platform = process.platform, env = process.env, home = os.homedir()) {
-    if (env.XDG_DATA_HOME)
-        return path.join(env.XDG_DATA_HOME, "opencode");
+    const resolvedHome = isNonEmptyString(home) ? home : os.homedir();
+    const xdgDataHome = isNonEmptyString(env.XDG_DATA_HOME)
+        ? env.XDG_DATA_HOME
+        : undefined;
+    if (xdgDataHome)
+        return path.join(xdgDataHome, "opencode");
     if (platform === "darwin")
-        return path.join(home, "Library", "Application Support", "opencode");
+        return path.join(resolvedHome, "Library", "Application Support", "opencode");
     if (platform === "win32") {
-        const appData = env.APPDATA || path.win32.join(home, "AppData", "Roaming");
+        const appData = isNonEmptyString(env.APPDATA)
+            ? env.APPDATA
+            : path.win32.join(resolvedHome, "AppData", "Roaming");
         return path.win32.join(appData, "opencode");
     }
-    return path.join(home, ".local", "share", "opencode");
+    return path.join(resolvedHome, ".local", "share", "opencode");
 }
 export function lombokJarPath(dataDir = opencodeDataDir()) {
-    return path.join(dataDir, "bin", "jdtls", "bin", "lombok.jar");
+    const resolvedDataDir = isNonEmptyString(dataDir) ? dataDir : opencodeDataDir();
+    return path.join(resolvedDataDir, "bin", "jdtls", "bin", "lombok.jar");
 }
 export function isLspDownloadDisabled(env = process.env) {
     const value = env.OPENCODE_DISABLE_LSP_DOWNLOAD || "";
     return /^(1|true|yes)$/i.test(value.trim());
 }
 export async function ensureLombokJar(file, env = process.env) {
-    const exists = await pathExists(file);
+    const resolvedFile = resolveFilePath(file);
+    if (!resolvedFile)
+        return undefined;
+    const exists = await pathExists(resolvedFile);
     if (exists)
-        return file;
+        return resolvedFile;
     if (isLspDownloadDisabled(env))
         return undefined;
-    await fs.mkdir(path.dirname(file), { recursive: true });
+    await fs.mkdir(path.dirname(resolvedFile), { recursive: true });
     const response = await fetch(LOMBOK_URL).catch(() => undefined);
     if (!response?.ok)
         return undefined;
@@ -90,15 +110,15 @@ export async function ensureLombokJar(file, env = process.env) {
     if (!body)
         return undefined;
     const saved = await fs
-        .writeFile(file, Buffer.from(body))
+        .writeFile(resolvedFile, Buffer.from(body))
         .then(() => true)
         .catch(() => false);
     if (!saved)
         return undefined;
-    const present = await pathExists(file);
+    const present = await pathExists(resolvedFile);
     if (!present)
         return undefined;
-    return file;
+    return resolvedFile;
 }
 export function formatJavaAgentArg(file) {
     if (!/\s/.test(file))

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@franzmoca/opencode-lombok",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "OpenCode plugin that adds Lombok support for JDTLS",
   "type": "module",
   "license": "MIT",