node-plantuml-2 1.1.0 → 1.1.1

package/lib/dot-resolver.js

@@ -63,6 +63,46 @@ function resolveBundledGraphviz () {
   return null
 }
 
+/**
+ * Get Graphviz library path for bundled Graphviz (for LD_LIBRARY_PATH on Linux)
+ *
+ * @param {string} dotPath - Path to dot executable (from resolveBundledGraphviz)
+ * @returns {string|null} - Path to Graphviz lib directory, or null if not bundled
+ */
+function getBundledGraphvizLibPath (dotPath) {
+  if (!dotPath) {
+    return null
+  }
+
+  var platform = os.platform()
+
+  // Only needed on Linux (and possibly macOS with DYLD_LIBRARY_PATH)
+  if (platform !== 'linux' && platform !== 'darwin') {
+    return null
+  }
+
+  try {
+    // Check if this is a bundled Graphviz path
+    // Bundled path format: .../node_modules/@node-plantuml-2/graphviz-*/graphviz/bin/dot
+    // Handle both / and \ path separators (Windows uses \)
+    var isBundled = dotPath.includes('@node-plantuml-2/graphviz-') &&
+                    (dotPath.includes('/graphviz/bin/') || dotPath.includes('\\graphviz\\bin\\'))
+    if (isBundled) {
+      // Extract the graphviz directory
+      var graphvizDir = path.dirname(path.dirname(dotPath)) // Go up from bin/ to graphviz/
+      var libDir = path.join(graphvizDir, 'lib')
+
+      if (fs.existsSync(libDir)) {
+        return libDir
+      }
+    }
+  } catch (e) {
+    // Silently fail
+  }
+
+  return null
+}
+
 /**
  * Get Graphviz package name based on platform and architecture
  *
@@ -270,6 +310,7 @@ function verifyDot (dotPath) {
 module.exports = {
   resolveDotExecutable: resolveDotExecutable,
   resolveBundledGraphviz: resolveBundledGraphviz,
+  getBundledGraphvizLibPath: getBundledGraphvizLibPath,
   getGraphvizPackageName: getGraphvizPackageName,
   getCommonDotPaths: getCommonDotPaths,
   findDotInPath: findDotInPath,

package/lib/plantuml-executor.js

@@ -5,6 +5,7 @@ var path = require('path')
 var nailgun = require('node-nailgun-server')
 var ngClient = require('node-nailgun-client')
 var javaResolver = require('./java-resolver')
+var dotResolver = require('./dot-resolver')
 
 var INCLUDED_PLANTUML_JAR = path.join(__dirname, '../vendor/plantuml.jar')
 var PLANTUML_JAR = process.env.PLANTUML_HOME || INCLUDED_PLANTUML_JAR
@@ -84,7 +85,106 @@ function execWithSpawn (argv, cwd, options, cb) {
     '-jar', PLANTUML_JAR
   ].concat(argv)
 
-  return childProcess.spawn(javaExe, opts)
+  // Set LD_LIBRARY_PATH for bundled Graphviz on Linux
+  var spawnOptions = {
+    cwd: cwd
+  }
+
+  // Check if we're using bundled Graphviz and need to set library path
+  var dotPath = null
+  // Extract dot path from argv if present
+  for (var i = 0; i < argv.length; i++) {
+    if (argv[i] === '-graphvizdot' && i + 1 < argv.length) {
+      dotPath = argv[i + 1]
+      break
+    }
+  }
+
+  // If no dot path in argv, try to detect it
+  if (!dotPath) {
+    dotPath = dotResolver.resolveDotExecutable({ dotPath: null })
+  }
+
+  // Get library path for bundled Graphviz
+  var libPath = dotResolver.getBundledGraphvizLibPath(dotPath)
+  var platform = require('os').platform()
+  
+  // Only create new env object if we need to modify it
+  var envModified = false
+  var env = null
+
+  if (libPath) {
+    env = Object.assign({}, process.env)
+    envModified = true
+    if (platform === 'linux') {
+      // Set LD_LIBRARY_PATH for Linux
+      var existingLibPath = env.LD_LIBRARY_PATH || ''
+      env.LD_LIBRARY_PATH = libPath + (existingLibPath ? ':' + existingLibPath : '')
+    } else if (platform === 'darwin') {
+      // Set DYLD_LIBRARY_PATH for macOS
+      var existingDyldPath = env.DYLD_LIBRARY_PATH || ''
+      env.DYLD_LIBRARY_PATH = libPath + (existingDyldPath ? ':' + existingDyldPath : '')
+    }
+  }
+
+  // For Windows, add Graphviz bin directory to PATH
+  // This is needed for both bundled and system-installed Graphviz to find DLLs
+  if (platform === 'win32' && dotPath) {
+    if (!env) {
+      env = Object.assign({}, process.env)
+      envModified = true
+    }
+    
+    var binDir = path.dirname(dotPath)
+    // On Windows, PATH might be Path (case-insensitive but Node.js preserves case)
+    var pathKey = 'PATH'
+    for (var key in process.env) {
+      if (key.toUpperCase() === 'PATH') {
+        pathKey = key
+        break
+      }
+    }
+    
+    var existingPath = env[pathKey] || env.PATH || ''
+    
+    // Normalize binDir to Windows path format
+    binDir = binDir.replace(/\//g, '\\')
+    
+    // Check if bin directory is already in PATH
+    var pathEntries = existingPath.split(';')
+    var alreadyInPath = false
+    for (var i = 0; i < pathEntries.length; i++) {
+      var normalizedEntry = pathEntries[i].replace(/\//g, '\\').toLowerCase().trim()
+      if (normalizedEntry && normalizedEntry === binDir.toLowerCase()) {
+        alreadyInPath = true
+        break
+      }
+    }
+    
+    // Add bin directory to PATH if not already present
+    // Always add it at the beginning to ensure it's found first
+    if (!alreadyInPath) {
+      env[pathKey] = binDir + (existingPath ? ';' + existingPath : '')
+      // Also set PATH (lowercase) for compatibility
+      env.PATH = env[pathKey]
+    }
+    
+    // Debug: Log PATH modification (only in development/debug mode)
+    if (process.env.DEBUG_PLANTUML) {
+      console.log('[DEBUG] Windows PATH modified for Graphviz')
+      console.log('[DEBUG] Dot path:', dotPath)
+      console.log('[DEBUG] Bin directory:', binDir)
+      console.log('[DEBUG] PATH key:', pathKey)
+      console.log('[DEBUG] PATH (first 300 chars):', env[pathKey].substring(0, 300))
+    }
+  }
+
+  // Set environment if we modified it
+  if (envModified) {
+    spawnOptions.env = env
+  }
+
+  return childProcess.spawn(javaExe, opts, spawnOptions)
 }
 
 module.exports.exec = function (argv, cwd, callbackOrOptions, callback) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-plantuml-2",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "plantumlVersion": "1.2026.1",
   "description": "Node.js PlantUML renderer with Java backend. Multiple output formats (PNG, SVG, EPS, ASCII, Unicode) with full UTF-8 support",
   "main": "index.js",
@@ -26,13 +26,13 @@
     "plantuml-encoder": "^1.2.5"
   },
   "optionalDependencies": {
-    "@node-plantuml-2/jre-win32-x64": "^1.1.0",
-    "@node-plantuml-2/jre-darwin-arm64": "^1.1.0",
-    "@node-plantuml-2/jre-linux-x64": "^1.1.0",
-    "@node-plantuml-2/graphviz-win32-x64": "^1.1.0",
-    "@node-plantuml-2/graphviz-darwin-arm64": "^1.1.0",
-    "@node-plantuml-2/graphviz-darwin-x64": "^1.1.0",
-    "@node-plantuml-2/graphviz-linux-x64": "^1.1.0"
+    "@node-plantuml-2/jre-win32-x64": "^1.1.1",
+    "@node-plantuml-2/jre-darwin-arm64": "^1.1.1",
+    "@node-plantuml-2/jre-linux-x64": "^1.1.1",
+    "@node-plantuml-2/graphviz-win32-x64": "^1.1.1",
+    "@node-plantuml-2/graphviz-darwin-arm64": "^1.1.1",
+    "@node-plantuml-2/graphviz-darwin-x64": "^1.1.1",
+    "@node-plantuml-2/graphviz-linux-x64": "^1.1.1"
   },
   "devDependencies": {
     "chai": "^4.x",