diffx-js 0.5.2 → 0.5.4

package/README.md

@@ -8,7 +8,18 @@ A Node.js wrapper for the `diffx` CLI tool.
 npm install diffx-js
 ```
 
-This will automatically download the appropriate `diffx` binary for your system from GitHub Releases.
+This package includes pre-compiled `diffx` binaries for all supported platforms (Linux x64, macOS x64/ARM64, Windows x64), enabling **completely offline installation** with no external downloads required.
+
+### Supported Platforms
+
+- **Linux x64** - Intel/AMD 64-bit
+- **macOS x64** - Intel-based Macs
+- **macOS ARM64** - Apple Silicon Macs (M1/M2/M3)
+- **Windows x64** - 64-bit Windows
+
+The appropriate binary is automatically selected at runtime based on your system.
+
+**Note:** Due to bundling all platform binaries, this package is larger (~20MB) than typical npm packages but provides complete offline functionality.
 
 ## Usage
 

package/index.js

@@ -4,21 +4,37 @@ const { spawn } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 
-// Determine the platform-specific binary name
-let binaryName = 'diffx';
-if (process.platform === 'win32') {
-  binaryName = 'diffx.exe';
+// Determine the platform-specific binary name and directory
+function getPlatformInfo() {
+  const platform = process.platform;
+  const arch = process.arch;
+  
+  if (platform === 'win32') {
+    return { subdir: 'win32-x64', binaryName: 'diffx.exe' };
+  } else if (platform === 'darwin') {
+    if (arch === 'arm64') {
+      return { subdir: 'darwin-arm64', binaryName: 'diffx' };
+    } else {
+      return { subdir: 'darwin-x64', binaryName: 'diffx' };
+    }
+  } else if (platform === 'linux') {
+    return { subdir: 'linux-x64', binaryName: 'diffx' };
+  } else {
+    throw new Error(`Unsupported platform: ${platform}-${arch}`);
+  }
 }
 
-// Construct the path to the binary
-// In a real scenario, this would involve downloading the binary
-// For now, we assume it's in a 'bin' directory relative to this script
-const binaryPath = path.join(__dirname, 'bin', binaryName);
+// Get platform-specific binary path
+const platformInfo = getPlatformInfo();
+const binaryPath = path.join(__dirname, 'bin', platformInfo.subdir, platformInfo.binaryName);
 
 // Check if the binary exists
 if (!fs.existsSync(binaryPath)) {
   console.error(`Error: Binary not found at ${binaryPath}`);
-  console.error('Please ensure diffx is properly installed or built for your platform.');
+  console.error(`Platform: ${process.platform}-${process.arch}`);
+  console.error('Expected platform-specific binary not found.');
+  console.error('This might indicate a packaging issue. Please report this at:');
+  console.error('https://github.com/kako-jun/diffx/issues');
   process.exit(1);
 }
 

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "diffx-js",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "A Node.js wrapper for the diffx CLI tool - semantic diffing of JSON, YAML, TOML, XML, INI, and CSV files. Focuses on structural meaning rather than formatting.",
   "keywords": [
     "diff",
-    "json", 
+    "json",
     "yaml",
     "toml",
     "xml",
@@ -22,10 +22,9 @@
   ],
   "main": "lib.js",
   "bin": {
-    "diffx": "./index.js"
+    "diffx": "index.js"
   },
   "scripts": {
-    "postinstall": "node scripts/download-binary.js",
     "test": "node test.js",
     "examples": "node examples.js",
     "verify": "node index.js --help",
@@ -37,20 +36,26 @@
   "files": [
     "index.js",
     "lib.js",
-    "scripts/download-binary.js",
     "bin/",
     "README.md",
     "examples.js",
     "test.js"
   ],
-  "os": ["linux", "darwin", "win32"],
-  "cpu": ["x64", "arm64"],
+  "os": [
+    "linux",
+    "darwin",
+    "win32"
+  ],
+  "cpu": [
+    "x64",
+    "arm64"
+  ],
   "author": "kako-jun",
   "license": "MIT",
   "homepage": "https://github.com/kako-jun/diffx",
   "repository": {
     "type": "git",
-    "url": "https://github.com/kako-jun/diffx.git",
+    "url": "git+https://github.com/kako-jun/diffx.git",
     "directory": "diffx-npm"
   },
   "bugs": {

package/test.js

@@ -118,12 +118,12 @@ async function runTests() {
             'test2.json'
         ]);
         
-        if (diffResult.code === 0 && 
+        if (diffResult.code === 1 && 
             diffResult.stdout.includes('version') && 
             diffResult.stdout.includes('debug')) {
             success('Basic JSON diff works correctly');
         } else {
-            error(`JSON diff failed: ${diffResult.stderr}`);
+            error(`JSON diff failed. Code: ${diffResult.code}, Stdout: ${diffResult.stdout}, Stderr: ${diffResult.stderr}`);
             throw new Error('JSON diff failed');
         }
 
@@ -137,7 +137,7 @@ async function runTests() {
             'json'
         ]);
 
-        if (jsonOutputResult.code === 0) {
+        if (jsonOutputResult.code === 1) {
             try {
                 const output = JSON.parse(jsonOutputResult.stdout);
                 if (Array.isArray(output) && output.length > 0) {
@@ -166,7 +166,7 @@ async function runTests() {
             'test2.yaml'
         ]);
         
-        if (yamlResult.code === 0 && yamlResult.stdout.includes('version')) {
+        if (yamlResult.code === 1 && yamlResult.stdout.includes('version')) {
             success('YAML diff works correctly');
         } else {
             error(`YAML diff failed: ${yamlResult.stderr}`);
@@ -220,8 +220,34 @@ async function runTests() {
             throw new Error('Error handling failed');
         }
 
-        // Test 8: API functionality with new options
-        info('Test 8: Testing API functionality with new options...');
+        // Test 8: Platform-specific binary verification
+        info('Test 8: Testing platform-specific binary verification...');
+        
+        const platform = process.platform;
+        const arch = process.arch;
+        let expectedBinaryPath;
+        
+        if (platform === 'win32') {
+            expectedBinaryPath = path.join(__dirname, 'bin', 'win32-x64', 'diffx.exe');
+        } else if (platform === 'darwin') {
+            if (arch === 'arm64') {
+                expectedBinaryPath = path.join(__dirname, 'bin', 'darwin-arm64', 'diffx');
+            } else {
+                expectedBinaryPath = path.join(__dirname, 'bin', 'darwin-x64', 'diffx');
+            }
+        } else if (platform === 'linux') {
+            expectedBinaryPath = path.join(__dirname, 'bin', 'linux-x64', 'diffx');
+        }
+        
+        if (fs.existsSync(expectedBinaryPath)) {
+            success(`Platform-specific binary found: ${expectedBinaryPath}`);
+        } else {
+            error(`Platform-specific binary not found: ${expectedBinaryPath}`);
+            throw new Error('Platform binary missing');
+        }
+
+        // Test 9: API functionality with new options
+        info('Test 9: Testing API functionality with new options...');
         
         // Test ignore case option
         try {

package/scripts/download-binary.js

@@ -1,123 +0,0 @@
-#!/usr/bin/env node
-
-const fs = require('fs');
-const path = require('path');
-const https = require('https');
-const { execSync } = require('child_process');
-
-const DIFFX_VERSION = require('../package.json').version;
-const BINARY_DIR = path.join(__dirname, '..', 'bin');
-
-function getPlatform() {
-  const platform = process.platform;
-  const arch = process.arch;
-  
-  if (platform === 'win32') {
-    return 'diffx-windows-x86_64.zip';
-  } else if (platform === 'darwin') {
-    if (arch === 'arm64') {
-      return 'diffx-macos-aarch64.tar.gz';
-    } else {
-      return 'diffx-macos-x86_64.tar.gz';
-    }
-  } else if (platform === 'linux') {
-    return 'diffx-linux-x86_64.tar.gz';
-  } else {
-    throw new Error(`Unsupported platform: ${platform}-${arch}`);
-  }
-}
-
-function downloadFile(url, dest) {
-  return new Promise((resolve, reject) => {
-    console.log(`Downloading diffx binary from ${url}...`);
-    const file = fs.createWriteStream(dest);
-    
-    https.get(url, (response) => {
-      if (response.statusCode === 302 || response.statusCode === 301) {
-        // Follow redirect
-        downloadFile(response.headers.location, dest).then(resolve).catch(reject);
-        return;
-      }
-      
-      if (response.statusCode !== 200) {
-        reject(new Error(`HTTP ${response.statusCode}: ${response.statusMessage}`));
-        return;
-      }
-      
-      response.pipe(file);
-      
-      file.on('finish', () => {
-        file.close();
-        resolve();
-      });
-      
-      file.on('error', (err) => {
-        fs.unlink(dest, () => {}); // Delete the file async
-        reject(err);
-      });
-    }).on('error', (err) => {
-      reject(err);
-    });
-  });
-}
-
-async function extractArchive(archivePath, extractDir) {
-  if (archivePath.endsWith('.zip')) {
-    // Use unzip for Windows
-    if (process.platform === 'win32') {
-      execSync(`powershell -command "Expand-Archive -Path '${archivePath}' -DestinationPath '${extractDir}' -Force"`, { stdio: 'inherit' });
-    } else {
-      execSync(`unzip -o "${archivePath}" -d "${extractDir}"`, { stdio: 'inherit' });
-    }
-  } else if (archivePath.endsWith('.tar.gz')) {
-    execSync(`tar -xzf "${archivePath}" -C "${extractDir}"`, { stdio: 'inherit' });
-  }
-}
-
-async function main() {
-  try {
-    // Skip download if binary already exists
-    const binaryName = process.platform === 'win32' ? 'diffx.exe' : 'diffx';
-    const binaryPath = path.join(BINARY_DIR, binaryName);
-    
-    if (fs.existsSync(binaryPath)) {
-      console.log('diffx binary already exists, skipping download.');
-      return;
-    }
-    
-    const platformFile = getPlatform();
-    const downloadUrl = `https://github.com/kako-jun/diffx/releases/download/v${DIFFX_VERSION}/${platformFile}`;
-    
-    // Create bin directory
-    if (!fs.existsSync(BINARY_DIR)) {
-      fs.mkdirSync(BINARY_DIR, { recursive: true });
-    }
-    
-    // Download archive
-    const archivePath = path.join(BINARY_DIR, platformFile);
-    await downloadFile(downloadUrl, archivePath);
-    
-    console.log('Extracting binary...');
-    await extractArchive(archivePath, BINARY_DIR);
-    
-    // Clean up archive
-    fs.unlinkSync(archivePath);
-    
-    // Make binary executable on Unix systems
-    if (process.platform !== 'win32') {
-      fs.chmodSync(binaryPath, '755');
-    }
-    
-    console.log(`SUCCESS: diffx binary installed successfully at ${binaryPath}`);
-    
-  } catch (error) {
-    console.error('ERROR: Failed to download diffx binary:', error.message);
-    console.error('You may need to install diffx manually from: https://github.com/kako-jun/diffx/releases');
-    // Don't fail the installation, just warn
-    process.exit(0);
-  }
-}
-
-if (require.main === module) {
-  main();
-}