swytchcode 2.16.0 → 2.16.1

package/bin/swytchcode.js

@@ -265,33 +265,98 @@ let binPath;
 if (explicitBin) {
   binPath = explicitBin;
 } else {
-  const PLATFORM_PACKAGES = {
-    'darwin-arm64': 'swytchcode-cli-darwin-arm64',
-    'darwin-x64':   'swytchcode-cli-darwin-x64',
-    'linux-arm64':  'swytchcode-cli-linux-arm64',
-    'linux-x64':    'swytchcode-cli-linux-x64',
-    'win32-arm64':  'swytchcode-cli-win32-arm64',
-    'win32-x64':    'swytchcode-cli-win32-x64',
-  };
-  const key = `${process.platform}-${process.arch}`;
-  const pkg = PLATFORM_PACKAGES[key];
-  if (!pkg) {
-    err(
-      `swytchcode: unsupported platform "${key}".\n` +
-      `Supported: ${Object.keys(PLATFORM_PACKAGES).join(', ')}\n` +
-      `Install via curl instead: https://cli.swytchcode.com`
-    );
-    process.exit(1);
+  const isNpxContext = (process.env.npm_command || '') === 'exec' ||
+    __filename.includes('_npx') ||
+    (process.env.npm_execpath || '').includes('npx');
+  
+  if (isNpxContext) {
+    try {
+      const prefix = execSync('npm prefix -g', { stdio: ['ignore', 'pipe', 'ignore'], encoding: 'utf8' }).trim();
+      if (prefix) {
+        const candidates = process.platform === 'win32'
+          ? ['swytchcode.cmd', 'swytchcode.ps1', 'swytchcode'].map(n => path.join(prefix, n))
+          : [path.join(prefix, 'bin', 'swytchcode')];
+        const found = candidates.find(p => fs.existsSync(p));
+        if (found && !found.includes('_npx')) {
+          let localVersion = '0.0.0';
+          try { localVersion = require('../package.json').version || '0.0.0'; } catch (_) {}
+          
+          let globalVersion = '0.0.0';
+          try {
+            const globalPkgPath = process.platform === 'win32'
+              ? path.join(prefix, 'node_modules', 'swytchcode', 'package.json')
+              : path.join(prefix, 'lib', 'node_modules', 'swytchcode', 'package.json');
+            if (fs.existsSync(globalPkgPath)) {
+              globalVersion = JSON.parse(fs.readFileSync(globalPkgPath, 'utf8')).version || '0.0.0';
+            }
+          } catch (_) {}
+
+          const cmp = (a, b) => {
+            const pa = a.split('-'), pb = b.split('-');
+            const na = pa[0].split('.').map(Number), nb = pb[0].split('.').map(Number);
+            for (let i = 0; i < 3; i++) {
+              const x = na[i] || 0, y = nb[i] || 0;
+              if (x > y) return 1;
+              if (x < y) return -1;
+            }
+            if (!pa[1] && pb[1]) return 1;
+            if (pa[1] && !pb[1]) return -1;
+            if (!pa[1] && !pb[1]) return 0;
+            const ra = pa[1].split('.'), rb = pb[1].split('.');
+            for (let i = 0; i < Math.max(ra.length, rb.length); i++) {
+              if (i >= ra.length) return -1;
+              if (i >= rb.length) return 1;
+              const nx = Number(ra[i]), ny = Number(rb[i]);
+              const xIsNum = !isNaN(nx), yIsNum = !isNaN(ny);
+              if (xIsNum && !yIsNum) return -1;
+              if (!xIsNum && yIsNum) return 1;
+              if (xIsNum && yIsNum) {
+                if (nx !== ny) return nx > ny ? 1 : -1;
+              } else if (ra[i] !== rb[i]) {
+                return ra[i] > rb[i] ? 1 : -1;
+              }
+            }
+            return 0;
+          };
+          const globalIsNewer = cmp(globalVersion, localVersion) > 0;
+
+          if (globalIsNewer) {
+            binPath = found;
+          }
+        }
+      }
+    } catch (_) {}
   }
-  const binName = process.platform === 'win32' ? 'swytchcode.exe' : 'swytchcode';
-  try {
-    binPath = require.resolve(`${pkg}/bin/${binName}`);
-  } catch (_) {
-    err(
-      `swytchcode: could not find the binary for "${key}".\n` +
-      `Try reinstalling: npm install -g swytchcode`
-    );
-    process.exit(1);
+
+  if (!binPath) {
+    const PLATFORM_PACKAGES = {
+      'darwin-arm64': 'swytchcode-cli-darwin-arm64',
+      'darwin-x64':   'swytchcode-cli-darwin-x64',
+      'linux-arm64':  'swytchcode-cli-linux-arm64',
+      'linux-x64':    'swytchcode-cli-linux-x64',
+      'win32-arm64':  'swytchcode-cli-win32-arm64',
+      'win32-x64':    'swytchcode-cli-win32-x64',
+    };
+    const key = `${process.platform}-${process.arch}`;
+    const pkg = PLATFORM_PACKAGES[key];
+    if (!pkg) {
+      err(
+        `swytchcode: unsupported platform "${key}".\n` +
+        `Supported: ${Object.keys(PLATFORM_PACKAGES).join(', ')}\n` +
+        `Install via curl instead: https://cli.swytchcode.com`
+      );
+      process.exit(1);
+    }
+    const binName = process.platform === 'win32' ? 'swytchcode.exe' : 'swytchcode';
+    try {
+      binPath = require.resolve(`${pkg}/bin/${binName}`);
+    } catch (_) {
+      err(
+        `swytchcode: could not find the binary for "${key}".\n` +
+        `Try reinstalling: npm install -g swytchcode`
+      );
+      process.exit(1);
+    }
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swytchcode",
-  "version": "2.16.0",
+  "version": "2.16.1",
   "repository": {
     "type": "git",
     "url": "git+https://gitlab.com/swytchcode/cli.git"
@@ -28,11 +28,11 @@
     "README.md"
   ],
   "optionalDependencies": {
-    "swytchcode-cli-darwin-arm64": "2.16.0",
-    "swytchcode-cli-darwin-x64": "2.16.0",
-    "swytchcode-cli-linux-arm64": "2.16.0",
-    "swytchcode-cli-linux-x64": "2.16.0",
-    "swytchcode-cli-win32-arm64": "2.16.0",
-    "swytchcode-cli-win32-x64": "2.16.0"
+    "swytchcode-cli-darwin-arm64": "2.16.1",
+    "swytchcode-cli-darwin-x64": "2.16.1",
+    "swytchcode-cli-linux-arm64": "2.16.1",
+    "swytchcode-cli-linux-x64": "2.16.1",
+    "swytchcode-cli-win32-arm64": "2.16.1",
+    "swytchcode-cli-win32-x64": "2.16.1"
   }
 }