node-plantuml-2 1.1.1 → 1.1.3

package/lib/node-plantuml.js

@@ -224,8 +224,16 @@ function joinOptions (argv, options) {
   }
 
   if (options.dot) {
+    // Ensure dot path is absolute - PlantUML Java process needs absolute path
+    var absoluteDotPath = path.resolve(options.dot)
+    // Normalize path separators
+    if (process.platform === 'win32') {
+      absoluteDotPath = absoluteDotPath.replace(/\//g, '\\')
+    } else {
+      absoluteDotPath = absoluteDotPath.replace(/\\/g, '/')
+    }
     argv.push(DOT)
-    argv.push(options.dot)
+    argv.push(absoluteDotPath)
   }
 
   if (options.charset) {

package/lib/plantuml-executor.js

@@ -92,10 +92,12 @@ function execWithSpawn (argv, cwd, options, cb) {
 
   // Check if we're using bundled Graphviz and need to set library path
   var dotPath = null
+  var dotPathIndex = -1
   // 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]
+      dotPathIndex = i + 1
       break
     }
   }
@@ -105,17 +107,55 @@ function execWithSpawn (argv, cwd, options, cb) {
     dotPath = dotResolver.resolveDotExecutable({ dotPath: null })
   }
 
+  // CRITICAL FIX: Ensure dot path is absolute and properly formatted
+  // PlantUML Java process needs absolute path to launch Graphviz subprocess
+  if (dotPath) {
+    // Convert to absolute path
+    var absoluteDotPath = path.resolve(dotPath)
+    
+    // Normalize path separators for the platform
+    if (process.platform === 'win32') {
+      // Windows: Use backslashes and ensure .exe extension
+      absoluteDotPath = absoluteDotPath.replace(/\//g, '\\')
+      if (!absoluteDotPath.toLowerCase().endsWith('.exe')) {
+        // If path doesn't end with .exe, check if it's a directory and add dot.exe
+        var fs = require('fs')
+        try {
+          var stat = fs.statSync(absoluteDotPath)
+          if (stat.isDirectory()) {
+            absoluteDotPath = path.join(absoluteDotPath, 'dot.exe')
+          }
+        } catch (e) {
+          // Ignore errors
+        }
+      }
+    } else {
+      // Unix: Use forward slashes
+      absoluteDotPath = absoluteDotPath.replace(/\\/g, '/')
+    }
+    
+    // Update argv with absolute path if it was found in argv
+    if (dotPathIndex >= 0) {
+      argv[dotPathIndex] = absoluteDotPath
+    }
+    
+    // Use absolute path for environment variable setup
+    dotPath = absoluteDotPath
+  }
+
   // 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
+  // Always create env object to ensure environment variables are properly set
+  // This is critical for Java subprocess to inherit correct environment
+  var env = Object.assign({}, process.env)
+  var envModified = true
 
   if (libPath) {
-    env = Object.assign({}, process.env)
-    envModified = true
+    // Ensure libPath is absolute
+    libPath = path.resolve(libPath)
+    
     if (platform === 'linux') {
       // Set LD_LIBRARY_PATH for Linux
       var existingLibPath = env.LD_LIBRARY_PATH || ''
@@ -130,12 +170,10 @@ function execWithSpawn (argv, cwd, options, cb) {
   // 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)
+    // Normalize to Windows path format
+    binDir = binDir.replace(/\//g, '\\')
+    
     // On Windows, PATH might be Path (case-insensitive but Node.js preserves case)
     var pathKey = 'PATH'
     for (var key in process.env) {
@@ -147,14 +185,11 @@ function execWithSpawn (argv, cwd, options, cb) {
     
     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()
+    for (var j = 0; j < pathEntries.length; j++) {
+      var normalizedEntry = pathEntries[j].replace(/\//g, '\\').toLowerCase().trim()
       if (normalizedEntry && normalizedEntry === binDir.toLowerCase()) {
         alreadyInPath = true
         break

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-plantuml-2",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "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.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"
+    "@node-plantuml-2/jre-win32-x64": "^1.1.3",
+    "@node-plantuml-2/jre-darwin-arm64": "^1.1.3",
+    "@node-plantuml-2/jre-linux-x64": "^1.1.3",
+    "@node-plantuml-2/graphviz-win32-x64": "^1.1.3",
+    "@node-plantuml-2/graphviz-darwin-arm64": "^1.1.3",
+    "@node-plantuml-2/graphviz-darwin-x64": "^1.1.3",
+    "@node-plantuml-2/graphviz-linux-x64": "^1.1.3"
   },
   "devDependencies": {
     "chai": "^4.x",
@@ -48,6 +48,7 @@
     "nail/plantumlnail.jar",
     "scripts/download.js",
     "scripts/get-vizjs.js",
+    "scripts/install-graphviz.js",
     "README.md"
   ],
   "scripts": {

package/scripts/install-graphviz.js

@@ -0,0 +1,335 @@
+#!/usr/bin/env node
+'use strict'
+
+/**
+ * Cross-platform Graphviz installation script
+ * Attempts to automatically install Graphviz on Windows, Linux, and macOS
+ */
+
+var os = require('os')
+var childProcess = require('child_process')
+var dotResolver = require('../lib/dot-resolver')
+
+var platform = os.platform()
+var isWindows = platform === 'win32'
+var isMac = platform === 'darwin'
+var isLinux = platform === 'linux'
+
+/**
+ * Check if a command exists
+ */
+function commandExists (command) {
+  try {
+    if (isWindows) {
+      childProcess.execSync('where ' + command + ' >nul 2>&1', { stdio: 'ignore' })
+    } else {
+      childProcess.execSync('which ' + command + ' > /dev/null 2>&1', { stdio: 'ignore' })
+    }
+    return true
+  } catch (e) {
+    return false
+  }
+}
+
+/**
+ * Execute command and return result
+ */
+function execCommand (command, args, options) {
+  return new Promise(function (resolve, reject) {
+    var child = childProcess.spawn(command, args, {
+      stdio: 'pipe',
+      shell: isWindows,
+      ...options
+    })
+
+    var stdout = []
+    var stderr = []
+
+    child.stdout.on('data', function (chunk) {
+      stdout.push(chunk)
+    })
+
+    child.stderr.on('data', function (chunk) {
+      stderr.push(chunk)
+    })
+
+    child.on('close', function (code) {
+      resolve({
+        code: code,
+        stdout: Buffer.concat(stdout).toString(),
+        stderr: Buffer.concat(stderr).toString()
+      })
+    })
+
+    child.on('error', function (err) {
+      reject(err)
+    })
+  })
+}
+
+/**
+ * Install Graphviz on macOS using Homebrew
+ */
+async function installOnMac () {
+  console.log('🍺 Attempting to install Graphviz on macOS using Homebrew...')
+
+  // Check if Homebrew is installed
+  if (!commandExists('brew')) {
+    console.log('')
+    console.log('❌ Homebrew is not installed.')
+    console.log('')
+    console.log('Please install Homebrew first:')
+    console.log('  /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"')
+    console.log('')
+    console.log('Then run: brew install graphviz')
+    return false
+  }
+
+  try {
+    console.log('Installing Graphviz via Homebrew...')
+    var result = await execCommand('brew', ['install', 'graphviz'])
+
+    if (result.code === 0) {
+      console.log('✅ Graphviz installed successfully!')
+      return true
+    } else {
+      // Try upgrade if already installed
+      console.log('Attempting to upgrade Graphviz...')
+      var upgradeResult = await execCommand('brew', ['upgrade', 'graphviz'])
+      if (upgradeResult.code === 0) {
+        console.log('✅ Graphviz upgraded successfully!')
+        return true
+      } else {
+        console.log('⚠️  Installation failed. Please install manually:')
+        console.log('  brew install graphviz')
+        return false
+      }
+    }
+  } catch (err) {
+    console.log('❌ Error installing Graphviz:', err.message)
+    console.log('Please install manually: brew install graphviz')
+    return false
+  }
+}
+
+/**
+ * Install Graphviz on Linux
+ */
+async function installOnLinux () {
+  console.log('🐧 Attempting to install Graphviz on Linux...')
+
+  // Detect package manager
+  var packageManager = null
+  var packageName = 'graphviz'
+
+  var installArgs = null
+
+  if (commandExists('apt-get')) {
+    packageManager = 'apt-get'
+    installArgs = ['apt-get', 'install', '-y', packageName]
+  } else if (commandExists('yum')) {
+    packageManager = 'yum'
+    installArgs = ['yum', 'install', '-y', packageName]
+  } else if (commandExists('dnf')) {
+    packageManager = 'dnf'
+    installArgs = ['dnf', 'install', '-y', packageName]
+  } else if (commandExists('pacman')) {
+    packageManager = 'pacman'
+    installArgs = ['pacman', '-S', '--noconfirm', packageName]
+  } else if (commandExists('zypper')) {
+    packageManager = 'zypper'
+    installArgs = ['zypper', 'install', '-y', packageName]
+  } else {
+    console.log('❌ Could not detect package manager.')
+    console.log('Please install Graphviz manually using your system package manager.')
+    return false
+  }
+
+  console.log('Detected package manager: ' + packageManager)
+  console.log('Note: This requires sudo/administrator privileges.')
+
+  try {
+    // For apt-get, we need to run update first
+    if (packageManager === 'apt-get') {
+      console.log('Updating package list...')
+      var updateResult = await execCommand('sudo', ['apt-get', 'update'])
+      if (updateResult.code !== 0) {
+        console.log('⚠️  Failed to update package list. Trying installation anyway...')
+      }
+    }
+
+    console.log('Installing Graphviz...')
+    var result = await execCommand('sudo', installArgs)
+
+    if (result.code === 0) {
+      console.log('✅ Graphviz installed successfully!')
+      return true
+    } else {
+      console.log('⚠️  Installation failed. Please install manually:')
+      if (packageManager === 'apt-get') {
+        console.log('  sudo apt-get update && sudo apt-get install -y graphviz')
+      } else {
+        console.log('  sudo ' + installArgs.join(' '))
+      }
+      return false
+    }
+  } catch (err) {
+    console.log('❌ Error installing Graphviz:', err.message)
+    console.log('Please install manually:')
+    if (packageManager === 'apt-get') {
+      console.log('  sudo apt-get update && sudo apt-get install -y graphviz')
+    } else {
+      console.log('  sudo ' + installArgs.join(' '))
+    }
+    return false
+  }
+}
+
+/**
+ * Install Graphviz on Windows
+ */
+async function installOnWindows () {
+  console.log('🪟 Attempting to install Graphviz on Windows...')
+
+  // Try Chocolatey first
+  if (commandExists('choco')) {
+    console.log('Detected Chocolatey package manager.')
+    try {
+      console.log('Installing Graphviz via Chocolatey...')
+      var result = await execCommand('choco', ['install', 'graphviz', '-y'], {
+        shell: true
+      })
+
+      if (result.code === 0 || result.stdout.indexOf('installed') !== -1) {
+        console.log('✅ Graphviz installed successfully!')
+        return true
+      }
+    } catch (err) {
+      console.log('⚠️  Chocolatey installation failed, trying other methods...')
+    }
+  }
+
+  // Try Winget
+  if (commandExists('winget')) {
+    console.log('Detected Winget package manager.')
+    try {
+      console.log('Installing Graphviz via Winget...')
+      var wingetResult = await execCommand('winget', ['install', 'Graphviz.Graphviz', '--accept-package-agreements', '--accept-source-agreements'], {
+        shell: true
+      })
+
+      if (wingetResult.code === 0) {
+        console.log('✅ Graphviz installed successfully!')
+        return true
+      }
+    } catch (err) {
+      console.log('⚠️  Winget installation failed...')
+    }
+  }
+
+  // If both failed, provide manual instructions
+  console.log('')
+  console.log('❌ Could not automatically install Graphviz.')
+  console.log('')
+  console.log('Please install Graphviz manually:')
+  console.log('')
+  console.log('Option 1: Using Chocolatey (if installed):')
+  console.log('  choco install graphviz -y')
+  console.log('')
+  console.log('Option 2: Using Winget (Windows 10/11):')
+  console.log('  winget install Graphviz.Graphviz')
+  console.log('')
+  console.log('Option 3: Download installer:')
+  console.log('  https://graphviz.org/download/')
+  console.log('')
+
+  return false
+}
+
+/**
+ * Main installation function
+ */
+async function installGraphviz () {
+  console.log('')
+  console.log('🔍 Checking if Graphviz is already installed...')
+  console.log('')
+
+  // First check if Graphviz is already installed
+  var detected = dotResolver.resolveDotExecutable({ dotPath: null })
+  if (detected) {
+    console.log('✅ Graphviz is already installed at: ' + detected)
+    console.log('')
+    try {
+      var testResult = await execCommand(detected, ['-V'])
+      if (testResult.code === 0 || testResult.stdout) {
+        console.log('Version info:')
+        console.log(testResult.stdout.split('\n')[0])
+      }
+    } catch (e) {
+      // Ignore
+    }
+    return true
+  }
+
+  console.log('❌ Graphviz is not installed.')
+  console.log('')
+
+  // Attempt automatic installation based on platform
+  var installed = false
+
+  if (isMac) {
+    installed = await installOnMac()
+  } else if (isLinux) {
+    installed = await installOnLinux()
+  } else if (isWindows) {
+    installed = await installOnWindows()
+  } else {
+    console.log('❌ Unsupported platform: ' + platform)
+    console.log('Please install Graphviz manually.')
+    return false
+  }
+
+  if (installed) {
+    // Verify installation
+    console.log('')
+    console.log('🔍 Verifying installation...')
+    var newDetected = dotResolver.resolveDotExecutable({ dotPath: null })
+    if (newDetected) {
+      console.log('✅ Graphviz is now available at: ' + newDetected)
+      return true
+    } else {
+      console.log('⚠️  Graphviz was installed but cannot be found.')
+      console.log('You may need to restart your terminal or add it to PATH.')
+      return false
+    }
+  }
+
+  return false
+}
+
+// Run if called directly
+if (require.main === module) {
+  installGraphviz()
+    .then(function (success) {
+      if (success) {
+        console.log('')
+        console.log('✅ Graphviz installation completed successfully!')
+        process.exit(0)
+      } else {
+        console.log('')
+        console.log('⚠️  Automatic installation failed. Please install Graphviz manually.')
+        process.exit(1)
+      }
+    })
+    .catch(function (err) {
+      console.error('❌ Error:', err.message)
+      process.exit(1)
+    })
+}
+
+module.exports = {
+  installGraphviz: installGraphviz,
+  installOnMac: installOnMac,
+  installOnLinux: installOnLinux,
+  installOnWindows: installOnWindows
+}