gdx 0.4.5 → 0.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gdx",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "Git, but with better DX. The raw power of Git, aligned with human workflows.",
   "homepage": "https://github.com/Type-Delta/gdx#readme",
   "bugs": {
@@ -42,7 +42,7 @@
     "test": "bun test",
     "build": "bun run transpile-esm && bun build ./src/index.ts --outfile=./bin/gdx --compile --bytecode --production --keep-names",
     "ts-check": "bunx tsc --noEmit",
-    "package:node": "bun run transpile-esm && bun build ./src/index.ts --outdir=./dist --target=node --external=keytar --external=cspell-lib --external=@shikijs/cli --external=yaml --external=openai --external=fflate --format=esm --production --keep-names && bun build ./src/workers/generic.worker.ts --outfile=./dist/workers/generic.worker.min.js --target=node --external=@shikijs/cli --format=esm --production --minify --keep-names",
+    "package:node": "bun run transpile-esm && bun build ./src/index.ts --outdir=./dist --target=node --external=keytar --external=cspell-lib --external=@shikijs/cli --external=shiki --external=yaml --external=openai --external=fflate --external=diff --format=esm --production --keep-names && bun build ./src/workers/generic.worker.ts --outfile=./dist/workers/generic.worker.min.js --target=node --external=@shikijs/cli --format=esm --production --minify --keep-names",
     "prepack": "bun run package:node",
     "postinstall": "node scripts/postinstall.cjs",
     "prettier": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\" \"./*.md\"",
@@ -60,6 +60,7 @@
     "@sinclair/typebox": "^0.34.49",
     "@types/chai": "^5.2.3",
     "@types/ini": "^4.1.1",
+    "@types/which": "^3.0.4",
     "@typescript-eslint/eslint-plugin": "^8.59.4",
     "@typescript-eslint/parser": "^8.59.4",
     "bun-types": "latest",
@@ -73,9 +74,11 @@
     "smol-toml": "^1.6.1",
     "tinybench": "^6.0.2",
     "tsx": "^4.22.3",
+    "tty-strings": "^1.5.2",
     "typescript": "^6.0.3",
     "typescript-eslint": "^8.59.4",
-    "unicode-animations": "^1.0.3"
+    "unicode-animations": "^1.0.3",
+    "which": "2.0.2"
   },
   "dependencies": {
     "@shikijs/cli": "^4.1.0",
@@ -85,5 +88,9 @@
     "keytar": "^7.9.0",
     "openai": "^6.38.0",
     "yaml": "^2.9.0"
+  },
+  "patchedDependencies": {
+    "tty-strings@1.5.2": "patches/tty-strings@1.5.2.patch",
+    "execa@9.6.1": "patches/execa@9.6.1.patch"
   }
 }

package/scripts/launcher.cjs

@@ -8,12 +8,16 @@ const { spawn } = require('child_process');
 
 const DIST_DIR = path.join(__dirname, '../dist');
 const NATIVE_DIR = path.join(DIST_DIR, 'native');
-const isWin = process.platform === 'win32';
-const binaryName = isWin ? 'gdx.exe' : 'gdx';
-const binaryPath = path.join(NATIVE_DIR, binaryName);
-
-// Check if native binary exists
-if (fs.existsSync(binaryPath)) {
+const isWin = process.platform === 'win32';
+const binaryName = isWin ? 'gdx.exe' : 'gdx';
+const binaryPath = path.join(NATIVE_DIR, binaryName);
+
+if (process.env.GDX_NODE_SHIM === '1' && process.argv[2] === '--') {
+   process.argv.splice(2, 1);
+}
+
+// Check if native binary exists
+if (fs.existsSync(binaryPath)) {
    const child = spawn(binaryPath, process.argv.slice(2), {
       stdio: 'inherit'
    });

package/scripts/postinstall.cjs

@@ -6,6 +6,7 @@ const { spawnSync, execFileSync } = require('child_process');
 
 // Configuration
 const PACKAGE_JSON_PATH = path.join(__dirname, '../package.json');
+const PACKAGE_DIR = path.join(__dirname, '..');
 const BIN_DIR = path.join(__dirname, '../bin');
 const NATIVE_DIR = path.join(BIN_DIR, 'native');
 const PKG_SRC_PATH = path.join(__dirname, '../dist/index.js');
@@ -33,6 +34,7 @@ function error(message) {
 }
 
 function writeInstallInfo(info) {
+   ensureBinDir();
    fs.writeFileSync(INSTALL_INFO_PATH, JSON.stringify(info, null, 2));
 }
 
@@ -90,10 +92,60 @@ function setExecutable(filePath) {
 }
 
 function writeFileExecutable(filePath, content) {
+   // Remove any existing entry first. npm links bin entries as symlinks
+   // (e.g. <bindir>/gdx -> ../gdx/scripts/launcher.cjs); writing without
+   // unlinking would follow that symlink and overwrite its target
+   // (launcher.cjs) with shim content instead of replacing the bin entry.
+   // fs.rmSync unlinks the symlink itself; force ignores a missing path.
+   fs.rmSync(filePath, { force: true });
    fs.writeFileSync(filePath, content, { encoding: 'utf8' });
    setExecutable(filePath);
 }
 
+function buildNodeShimContents(nodeAbsPath, launcherAbsPath) {
+   return {
+      cmd: [
+         '@echo off',
+         'set "GDX_NODE_SHIM=1"',
+         `"${nodeAbsPath}" "${launcherAbsPath}" -- %*`,
+         'exit /b %ERRORLEVEL%',
+         ''
+      ].join('\r\n'),
+      ps1: [
+         '$env:GDX_NODE_SHIM = "1"',
+         `& "${nodeAbsPath}" "${launcherAbsPath}" -- @args`,
+         'exit $LASTEXITCODE',
+         ''
+      ].join('\r\n'),
+      sh: [
+         '#!/usr/bin/env sh',
+         'export GDX_NODE_SHIM=1',
+         `exec "${nodeAbsPath}" "${launcherAbsPath}" -- "$@"`,
+         ''
+      ].join('\n'),
+   };
+}
+
+function getLocalNodeModulesBinDir() {
+   return path.resolve(PACKAGE_DIR, '..', '.bin');
+}
+
+function overwriteNodeShim(binDir, launcherAbsPath) {
+   if (!binDir || !fs.existsSync(binDir)) return false;
+
+   const nodeAbsPath = process.execPath;
+   const shims = buildNodeShimContents(nodeAbsPath, launcherAbsPath);
+
+   if (process.platform === 'win32') {
+      writeFileExecutable(path.join(binDir, 'gdx.cmd'), shims.cmd);
+      writeFileExecutable(path.join(binDir, 'gdx.ps1'), shims.ps1);
+      return true;
+   }
+
+   writeFileExecutable(path.join(binDir, 'gdx'), shims.sh);
+   return true;
+}
+
 function getNpmGlobalBinDir() {
    if (!isTruthy(process.env.npm_config_global)) return null;
 
@@ -156,6 +208,17 @@ function overwriteGlobalShim(nativeAbsPath) {
    return true;
 }
 
+function installNodeFallbackShims() {
+   const launcherAbsPath = path.join(__dirname, 'launcher.cjs');
+   const localBin = getLocalNodeModulesBinDir();
+   const globalBin = getNpmGlobalBinDir();
+
+   return {
+      local: overwriteNodeShim(localBin, launcherAbsPath),
+      global: overwriteNodeShim(globalBin, launcherAbsPath),
+   };
+}
+
 async function tryDownloadPrebuilt() {
    const version = getPackageVersion();
    const platform = process.platform;
@@ -261,7 +324,18 @@ async function main() {
          tryBuildNative();
       } else {
          log('No native install requested (default). Using Node.js fallback.');
-         // Do nothing
+         const shimInstall = installNodeFallbackShims();
+         writeInstallInfo({
+            mode: 'node',
+            platform: process.platform,
+            arch: process.arch,
+            version: getPackageVersion(),
+            userAgent: process.env.npm_config_user_agent || null,
+            useGlobalShim: shimInstall.global,
+            useLocalShim: shimInstall.local,
+            ts: (new Date).toLocaleString(),
+            launcherPath: path.join(__dirname, 'launcher.cjs')
+         });
       }
    } catch (err) {
       error(err.message);
@@ -269,4 +343,13 @@ async function main() {
    }
 }
 
-main();
+if (require.main === module) {
+   main();
+}
+
+module.exports = {
+   buildNodeShimContents,
+   getLocalNodeModulesBinDir,
+   installNodeFallbackShims,
+   overwriteNodeShim,
+};