houdini-core 2.0.0-go.3 → 2.0.0-go.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini-core",
-  "version": "2.0.0-go.3",
+  "version": "2.0.0-go.5",
   "description": "The core GraphQL client for Houdini",
   "keywords": [
     "graphql",
@@ -21,14 +21,19 @@
     "minimatch": "^5.1.0"
   },
   "optionalDependencies": {
-    "houdini-core-darwin-x64": "2.0.0-go.3",
-    "houdini-core-darwin-arm64": "2.0.0-go.3",
-    "houdini-core-linux-x64": "2.0.0-go.3",
-    "houdini-core-linux-arm64": "2.0.0-go.3",
-    "houdini-core-win32-x64": "2.0.0-go.3",
-    "houdini-core-win32-arm64": "2.0.0-go.3"
+    "houdini-core-darwin-x64": "2.0.0-go.5",
+    "houdini-core-darwin-arm64": "2.0.0-go.5",
+    "houdini-core-linux-x64": "2.0.0-go.5",
+    "houdini-core-linux-arm64": "2.0.0-go.5",
+    "houdini-core-win32-x64": "2.0.0-go.5",
+    "houdini-core-win32-arm64": "2.0.0-go.5"
   },
   "bin": "./shim.cjs",
+  "files": [
+    "postInstall.js",
+    "runtime",
+    "shim.cjs"
+  ],
   "scripts": {
     "compile": "scripts build-go",
     "typedefs": "scripts typedefs --go-package",

package/postInstall.js

@@ -4,7 +4,7 @@ const zlib = require('zlib')
 const https = require('https')
 
 // Adjust the version you want to install. You can also make this dynamic.
-const BINARY_DISTRIBUTION_VERSION = '2.0.0-go.3'
+const BINARY_DISTRIBUTION_VERSION = '2.0.0-go.5'
 
 // Windows binaries end with .exe so we need to special case them.
 const binaryName = process.platform === 'win32' ? 'houdini-core.exe' : 'houdini-core'
@@ -87,11 +87,14 @@ async function downloadBinaryFromNpm() {
 
 function isPlatformSpecificPackageInstalled() {
 	try {
-		// Resolving will fail if the optionalDependency was not installed
-		require.resolve(`${platformSpecificPackageName}/bin/${binaryName}`)
+		// Try to resolve the platform package itself
+		require.resolve(`${platformSpecificPackageName}/package.json`)
 		return true
 	} catch (e) {
-		return false
+		// Also check if it exists as a sibling directory
+		const siblingPath = path.join(__dirname, '..', platformSpecificPackageName)
+		const siblingBinaryPath = path.join(siblingPath, 'bin', binaryName)
+		return fs.existsSync(siblingBinaryPath)
 	}
 }
 
@@ -100,17 +103,44 @@ if (!platformSpecificPackageName) {
 }
 
 // once we've confirmed the required package is installed we want to overwrite the bin entry of our package.json
-// to point to the correct binary
+// to point to the correct binary for optimal performance (skip Node.js overhead)
 function overwriteBinary() {
 	const packageJsonPath = path.join(__dirname, 'package.json')
 	const packageJson = require(packageJsonPath)
-	packageJson.bin = path.join('..', platformSpecificPackageName, 'bin', binaryName)
-	fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2))
+
+	let binaryPath = null
+
+	try {
+		// Method 1: Use require.resolve to find the actual path to the platform-specific package
+		// This works with pnpm and other package managers that use symlinks
+		const platformPackagePath = require.resolve(`${platformSpecificPackageName}/package.json`)
+		const platformPackageDir = path.dirname(platformPackagePath)
+		binaryPath = path.join(platformPackageDir, 'bin', binaryName)
+	} catch (error) {
+		// Method 2: Check if platform package is installed as a sibling directory
+		// This works with npm and local installs
+		const siblingPath = path.join(__dirname, '..', platformSpecificPackageName)
+		const siblingBinaryPath = path.join(siblingPath, 'bin', binaryName)
+
+		if (fs.existsSync(siblingBinaryPath)) {
+			binaryPath = siblingBinaryPath
+		} else {
+			// Use shim as fallback
+			return
+		}
+	}
+
+	if (binaryPath) {
+		// Make the path relative to the main package directory
+		const relativeBinaryPath = path.relative(__dirname, binaryPath)
+		packageJson.bin = relativeBinaryPath
+
+		fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2))
+	}
 }
 
 // Skip downloading the binary if it was already installed via optionalDependencies
 if (!isPlatformSpecificPackageInstalled()) {
-	console.log('Platform specific package not found. Will manually download binary.')
 	downloadBinaryFromNpm().then(overwriteBinary)
 } else {
 	overwriteBinary()