diffx-js 0.5.6 → 0.5.9

package/index.js

@@ -1,53 +1,322 @@
-#!/usr/bin/env node
-
-const { spawn } = require('child_process');
-const path = require('path');
-const fs = require('fs');
-
-// 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' };
+/* tslint:disable */
+/* eslint-disable */
+/* prettier-ignore */
+
+/* auto-generated by NAPI-RS */
+
+const { existsSync, readFileSync } = require('fs')
+const { join } = require('path')
+
+const { platform, arch } = process
+
+let nativeBinding = null
+let localFileExisted = false
+let loadError = null
+
+function isMusl() {
+  // For Node 10
+  if (!process.report || typeof process.report.getReport !== 'function') {
+    try {
+      const lddPath = require('child_process').execSync('which ldd').toString().trim()
+      return readFileSync(lddPath, 'utf8').includes('musl')
+    } catch (e) {
+      return true
     }
-  } else if (platform === 'linux') {
-    return { subdir: 'linux-x64', binaryName: 'diffx' };
   } else {
-    throw new Error(`Unsupported platform: ${platform}-${arch}`);
+    const { glibcVersionRuntime } = process.report.getReport().header
+    return !glibcVersionRuntime
   }
 }
 
-// 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(`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);
+switch (platform) {
+  case 'android':
+    switch (arch) {
+      case 'arm64':
+        localFileExisted = existsSync(join(__dirname, 'diffx-js.android-arm64.node'))
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./diffx-js.android-arm64.node')
+          } else {
+            nativeBinding = require('diffx-js-android-arm64')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm':
+        localFileExisted = existsSync(join(__dirname, 'diffx-js.android-arm-eabi.node'))
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./diffx-js.android-arm-eabi.node')
+          } else {
+            nativeBinding = require('diffx-js-android-arm-eabi')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on Android ${arch}`)
+    }
+    break
+  case 'win32':
+    switch (arch) {
+      case 'x64':
+        localFileExisted = existsSync(
+          join(__dirname, 'diffx-js.win32-x64-msvc.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./diffx-js.win32-x64-msvc.node')
+          } else {
+            nativeBinding = require('diffx-js-win32-x64-msvc')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'ia32':
+        localFileExisted = existsSync(
+          join(__dirname, 'diffx-js.win32-ia32-msvc.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./diffx-js.win32-ia32-msvc.node')
+          } else {
+            nativeBinding = require('diffx-js-win32-ia32-msvc')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm64':
+        localFileExisted = existsSync(
+          join(__dirname, 'diffx-js.win32-arm64-msvc.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./diffx-js.win32-arm64-msvc.node')
+          } else {
+            nativeBinding = require('diffx-js-win32-arm64-msvc')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on Windows: ${arch}`)
+    }
+    break
+  case 'darwin':
+    localFileExisted = existsSync(join(__dirname, 'diffx-js.darwin-universal.node'))
+    try {
+      if (localFileExisted) {
+        nativeBinding = require('./diffx-js.darwin-universal.node')
+      } else {
+        nativeBinding = require('diffx-js-darwin-universal')
+      }
+      break
+    } catch {}
+    switch (arch) {
+      case 'x64':
+        localFileExisted = existsSync(join(__dirname, 'diffx-js.darwin-x64.node'))
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./diffx-js.darwin-x64.node')
+          } else {
+            nativeBinding = require('diffx-js-darwin-x64')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm64':
+        localFileExisted = existsSync(
+          join(__dirname, 'diffx-js.darwin-arm64.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./diffx-js.darwin-arm64.node')
+          } else {
+            nativeBinding = require('diffx-js-darwin-arm64')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on macOS: ${arch}`)
+    }
+    break
+  case 'freebsd':
+    if (arch !== 'x64') {
+      throw new Error(`Unsupported architecture on FreeBSD: ${arch}`)
+    }
+    localFileExisted = existsSync(join(__dirname, 'diffx-js.freebsd-x64.node'))
+    try {
+      if (localFileExisted) {
+        nativeBinding = require('./diffx-js.freebsd-x64.node')
+      } else {
+        nativeBinding = require('diffx-js-freebsd-x64')
+      }
+    } catch (e) {
+      loadError = e
+    }
+    break
+  case 'linux':
+    switch (arch) {
+      case 'x64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'diffx-js.linux-x64-musl.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./diffx-js.linux-x64-musl.node')
+            } else {
+              nativeBinding = require('diffx-js-linux-x64-musl')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'diffx-js.linux-x64-gnu.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./diffx-js.linux-x64-gnu.node')
+            } else {
+              nativeBinding = require('diffx-js-linux-x64-gnu')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 'arm64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'diffx-js.linux-arm64-musl.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./diffx-js.linux-arm64-musl.node')
+            } else {
+              nativeBinding = require('diffx-js-linux-arm64-musl')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'diffx-js.linux-arm64-gnu.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./diffx-js.linux-arm64-gnu.node')
+            } else {
+              nativeBinding = require('diffx-js-linux-arm64-gnu')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 'arm':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'diffx-js.linux-arm-musleabihf.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./diffx-js.linux-arm-musleabihf.node')
+            } else {
+              nativeBinding = require('diffx-js-linux-arm-musleabihf')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'diffx-js.linux-arm-gnueabihf.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./diffx-js.linux-arm-gnueabihf.node')
+            } else {
+              nativeBinding = require('diffx-js-linux-arm-gnueabihf')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 'riscv64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'diffx-js.linux-riscv64-musl.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./diffx-js.linux-riscv64-musl.node')
+            } else {
+              nativeBinding = require('diffx-js-linux-riscv64-musl')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'diffx-js.linux-riscv64-gnu.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./diffx-js.linux-riscv64-gnu.node')
+            } else {
+              nativeBinding = require('diffx-js-linux-riscv64-gnu')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 's390x':
+        localFileExisted = existsSync(
+          join(__dirname, 'diffx-js.linux-s390x-gnu.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./diffx-js.linux-s390x-gnu.node')
+          } else {
+            nativeBinding = require('diffx-js-linux-s390x-gnu')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on Linux: ${arch}`)
+    }
+    break
+  default:
+    throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`)
 }
 
-// Spawn the diffx process with arguments
-const child = spawn(binaryPath, process.argv.slice(2), {
-  stdio: 'inherit',
-});
+if (!nativeBinding) {
+  if (loadError) {
+    throw loadError
+  }
+  throw new Error(`Failed to load native binding`)
+}
 
-child.on('close', (code) => {
-  process.exit(code);
-});
+const { diff, parseJson, parseCsv, parseYaml, parseToml, parseIni, parseXml, formatOutput } = nativeBinding
 
-child.on('error', (err) => {
-  console.error(`Failed to start diffx: ${err.message}`);
-  process.exit(1);
-});
+module.exports.diff = diff
+module.exports.parseJson = parseJson
+module.exports.parseCsv = parseCsv
+module.exports.parseYaml = parseYaml
+module.exports.parseToml = parseToml
+module.exports.parseIni = parseIni
+module.exports.parseXml = parseXml
+module.exports.formatOutput = formatOutput

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diffx-js",
-  "version": "0.5.6",
+  "version": "0.5.9",
   "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",
@@ -20,25 +20,26 @@
     "automation",
     "data-analysis"
   ],
-  "main": "lib.js",
-  "bin": {
-    "diffx": "index.js"
-  },
+  "main": "index.js",
+  "types": "index.d.ts",
   "scripts": {
-    "test": "node test.js",
-    "examples": "node examples.js",
-    "verify": "node index.js --help",
-    "prepublish": "npm run verify"
+    "build": "napi build --platform --release",
+    "build:debug": "napi build --platform",
+    "test": "npm run build && cd tests && npm test",
+    "examples": "npm run build && npx tsx examples.ts",
+    "verify": "npm run build && node -e \"console.log(require('./index.js'))\"",
+    "prepublish": "npm run build",
+    "artifacts": "napi artifacts"
   },
   "engines": {
     "node": ">=12.0.0"
   },
   "files": [
     "index.js",
-    "lib.js",
-    "bin/",
+    "index.d.ts",
+    "*.node",
     "README.md",
-    "examples.js",
+    "examples.ts",
     "test.js"
   ],
   "os": [
@@ -56,7 +57,7 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/kako-jun/diffx.git",
-    "directory": "diffx-npm"
+    "directory": "diffx-js"
   },
   "bugs": {
     "url": "https://github.com/kako-jun/diffx/issues"
@@ -64,5 +65,22 @@
   "funding": {
     "type": "github",
     "url": "https://github.com/sponsors/kako-jun"
+  },
+  "devDependencies": {
+    "@napi-rs/cli": "^2.18.0"
+  },
+  "napi": {
+    "name": "diffx-js",
+    "triples": {
+      "defaults": false,
+      "additional": [
+        "x86_64-pc-windows-msvc",
+        "aarch64-pc-windows-msvc",
+        "x86_64-apple-darwin",
+        "aarch64-apple-darwin",
+        "x86_64-unknown-linux-gnu",
+        "aarch64-unknown-linux-gnu"
+      ]
+    }
   }
 }

package/test.js

@@ -175,34 +175,30 @@ async function runTests() {
 
         // Test 6: Stdin processing
         info('Test 6: Testing stdin processing...');
-        const stdinResult = await runCommand('node', [
-            path.join(__dirname, 'index.js'),
-            '-',
-            'test2.json'
-        ]);
         
-        stdinResult.child = spawn('node', [
+        // Use spawn directly with proper stdin handling
+        const stdinChild = spawn('node', [
             path.join(__dirname, 'index.js'),
             '-',
-            'test2.json'
+            path.join(__dirname, 'fixtures', 'test2.json')
         ], { stdio: ['pipe', 'pipe', 'pipe'] });
         
-        stdinResult.child.stdin.write(testData.json1);
-        stdinResult.child.stdin.end();
+        stdinChild.stdin.write(testData.json1);
+        stdinChild.stdin.end();
         
         let stdinOutput = '';
-        stdinResult.child.stdout.on('data', (data) => {
+        stdinChild.stdout.on('data', (data) => {
             stdinOutput += data.toString();
         });
         
-        await new Promise((resolve) => {
-            stdinResult.child.on('close', () => resolve());
+        const stdinExitCode = await new Promise((resolve) => {
+            stdinChild.on('close', (code) => resolve(code));
         });
         
-        if (stdinOutput.includes('version')) {
+        if (stdinExitCode === 1 && stdinOutput.includes('debug')) {
             success('Stdin processing works correctly');
         } else {
-            info('Stdin test skipped (may require manual verification)');
+            info(`Stdin test result: exit code ${stdinExitCode}, output length: ${stdinOutput.length}`);
         }
 
         // Test 7: Error handling