houdini-svelte 3.0.0 → 3.0.2

package/bin/houdini-svelte

@@ -125,6 +125,8 @@ if (PLATFORM_OVERRIDE === 'wasm') {
 }
 
 // --- Native binary path ---
+const attempted = [];
+
 function getBinaryPath() {
 	if (MANUAL_BINARY_PATH && fs.existsSync(MANUAL_BINARY_PATH)) {
 		return MANUAL_BINARY_PATH;
@@ -138,36 +140,82 @@ function getBinaryPath() {
 			process.stderr.write(`[houdini-svelte] Unknown platform "${PLATFORM_OVERRIDE}". Valid values: ${Object.keys(BINARY_DISTRIBUTION_PACKAGES).join(', ')}, wasm\n`);
 			process.exit(1);
 		}
-		return path.join(__dirname, binaryName);
+		return path.join(__dirname, '..', binaryName);
 	}
 
+	// module resolution from the shim's own location: real installs, and any
+	// environment that provides NODE_PATH (pnpm scripts do)
 	try {
 		const platformPackagePath = require.resolve(`${platformSpecificPackageName}/package.json`);
 		return path.join(path.dirname(platformPackagePath), 'bin', binaryName);
 	} catch {
-		const siblingPath = path.join(__dirname, '..', platformSpecificPackageName, 'bin', binaryName);
-		if (fs.existsSync(siblingPath)) return siblingPath;
-
-		const pnpmMatch = __dirname.match(/(.+\/node_modules\/)\.pnpm\/[^/]+\/node_modules\//);
-		if (pnpmMatch) {
-			const pnpmDir = path.join(pnpmMatch[1], '.pnpm');
-			try {
-				const packageJSON = require(path.join(__dirname, '..', 'package.json'));
-				const entry = `${platformSpecificPackageName}@${packageJSON.version}`;
-				const found = fs.readdirSync(pnpmDir).find(e => e === entry);
-				if (found) {
-					const p = path.join(pnpmDir, found, 'node_modules', platformSpecificPackageName, 'bin', binaryName);
-					if (fs.existsSync(p)) return p;
-				}
-			} catch {}
-		}
+		attempted.push(`require.resolve('${platformSpecificPackageName}') from ${__dirname}`);
+	}
+
+	// module resolution from the invoking project: a linked development setup puts
+	// the platform package in the project's node_modules, which the walk from the
+	// shim's realpath (inside the linked repo) never visits
+	try {
+		const platformPackagePath = require.resolve(`${platformSpecificPackageName}/package.json`, {
+			paths: [process.cwd()],
+		});
+		return path.join(path.dirname(platformPackagePath), 'bin', binaryName);
+	} catch {
+		attempted.push(`require.resolve('${platformSpecificPackageName}') from ${process.cwd()}`);
+	}
 
-		return path.join(__dirname, binaryName);
+	// flat node_modules: the platform package next to this one
+	const siblingPath = path.join(__dirname, '..', platformSpecificPackageName, 'bin', binaryName);
+	if (fs.existsSync(siblingPath)) return siblingPath;
+	attempted.push(siblingPath);
+
+	// monorepo build layout: the shim lives at <pkg>/build/houdini-svelte/bin and the
+	// platform package at <pkg>/build/<platform package>
+	const buildSiblingPath = path.join(__dirname, '..', '..', platformSpecificPackageName, 'bin', binaryName);
+	if (fs.existsSync(buildSiblingPath)) return buildSiblingPath;
+	attempted.push(buildSiblingPath);
+
+	const pnpmMatch = __dirname.match(/(.+\/node_modules\/)\.pnpm\/[^/]+\/node_modules\//);
+	if (pnpmMatch) {
+		const pnpmDir = path.join(pnpmMatch[1], '.pnpm');
+		try {
+			const packageJSON = require(path.join(__dirname, '..', 'package.json'));
+			const entry = `${platformSpecificPackageName}@${packageJSON.version}`;
+			const found = fs.readdirSync(pnpmDir).find(e => e === entry);
+			if (found) {
+				const p = path.join(pnpmDir, found, 'node_modules', platformSpecificPackageName, 'bin', binaryName);
+				if (fs.existsSync(p)) return p;
+			}
+			attempted.push(path.join(pnpmDir, entry, 'node_modules', platformSpecificPackageName, 'bin', binaryName));
+		} catch {}
 	}
+
+	// the binary postInstall downloads into the package root when no platform
+	// package could be installed (the shim lives in bin/, one level down)
+	return path.join(__dirname, '..', binaryName);
+}
+
+// Refuse to exec ourselves: when every resolution attempt fails, the final
+// candidate (the postInstall download location) can be this very script — exec'ing
+// it recurses forever, forking a new node per iteration until the machine chokes.
+// A missing binary must be a loud error, never a spawn loop.
+const binaryPath = getBinaryPath();
+let realBinaryPath = null;
+try {
+	realBinaryPath = fs.realpathSync(binaryPath);
+} catch {}
+if (!realBinaryPath || realBinaryPath === fs.realpathSync(__filename)) {
+	attempted.push(binaryPath);
+	process.stderr.write(
+		`[houdini-svelte] Could not locate the houdini-svelte binary for ${process.platform}-${process.arch}. Tried:\n` +
+			attempted.map((p) => `  - ${p}\n`).join('') +
+			`Install the platform package for your system or point HOUDINI_SVELTE_BINARY_PATH at the binary.\n`
+	);
+	process.exit(1);
 }
 
 try {
-	execFileSync(getBinaryPath(), process.argv.slice(2), { stdio: 'inherit' });
+	execFileSync(binaryPath, process.argv.slice(2), { stdio: 'inherit' });
 } catch (error) {
 	process.exit(error.status || 1);
 }

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "houdini-svelte",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/HoudiniGraphql/houdini.git"
   },
   "dependencies": {
+    "@jridgewell/sourcemap-codec": "^1.5.0",
     "@sveltejs/kit": "^2.63.0",
     "estree-walker": "^3.0.3",
     "rollup": "^4.61.1",
@@ -18,13 +19,13 @@
     "svelte": "^5.19.0"
   },
   "optionalDependencies": {
-    "houdini-svelte-darwin-x64": "3.0.0",
-    "houdini-svelte-darwin-arm64": "3.0.0",
-    "houdini-svelte-linux-x64": "3.0.0",
-    "houdini-svelte-linux-arm64": "3.0.0",
-    "houdini-svelte-win32-x64": "3.0.0",
-    "houdini-svelte-win32-arm64": "3.0.0",
-    "houdini-svelte-wasm": "3.0.0"
+    "houdini-svelte-darwin-x64": "3.0.2",
+    "houdini-svelte-darwin-arm64": "3.0.2",
+    "houdini-svelte-linux-x64": "3.0.2",
+    "houdini-svelte-linux-arm64": "3.0.2",
+    "houdini-svelte-win32-x64": "3.0.2",
+    "houdini-svelte-win32-arm64": "3.0.2",
+    "houdini-svelte-wasm": "3.0.2"
   },
   "exports": {
     "./package.json": "./package.json",

package/postInstall.js

@@ -5,7 +5,7 @@ const https = require('https')
 const child_process = require('child_process')
 
 // Adjust the version you want to install. You can also make this dynamic.
-const BINARY_DISTRIBUTION_VERSION = '3.0.0'
+const BINARY_DISTRIBUTION_VERSION = '3.0.2'
 
 // Windows binaries end with .exe so we need to special case them.
 const binaryName = process.platform === 'win32' ? 'houdini-svelte.exe' : 'houdini-svelte'

package/vite/transform/index.d.ts

@@ -5,3 +5,7 @@ export default function apply_transforms(framework: Framework, page: TransformPa
     code: string;
     map?: SourceMapInput;
 }>;
+export declare function offset_script_sourcemap(rawMap: {
+    mappings: string;
+    names?: string[];
+}, linesBefore: number, filepath: string, content: string): SourceMapInput;

package/vite/transform/index.js

@@ -1,3 +1,4 @@
+import { decode, encode } from "@jridgewell/sourcemap-codec";
 import { printJS, parseJS } from "houdini";
 import { runPipeline, formatErrors } from "houdini";
 import * as recast from "recast";
@@ -23,7 +24,7 @@ async function apply_transforms(framework, page) {
         position = { start: 0, end: 0 };
       }
     } else {
-      script = parseJS(page.content);
+      script = parseJS(page.content, void 0, page.filepath);
     }
   } catch (e) {
     return { code: page.content, map: page.map };
@@ -46,7 +47,7 @@ async function apply_transforms(framework, page) {
     if (rawMap) {
       const linesBefore = page.content.slice(0, position.start).split("\n").length - 1;
       const mapObj = typeof rawMap.toJSON === "function" ? rawMap.toJSON() : rawMap;
-      map2 = { ...mapObj, mappings: ";".repeat(linesBefore) + mapObj.mappings };
+      map2 = offset_script_sourcemap(mapObj, linesBefore, page.filepath, page.content);
     }
     return {
       code: replace_tag_content(page.content, position.start, position.end, scriptCode),
@@ -59,6 +60,25 @@ async function apply_transforms(framework, page) {
   });
   return { code, map };
 }
+function offset_script_sourcemap(rawMap, linesBefore, filepath, content) {
+  const decoded = decode(rawMap.mappings);
+  for (const line of decoded) {
+    for (const segment of line) {
+      if (segment.length >= 4) {
+        ;
+        segment[2] += linesBefore;
+      }
+    }
+  }
+  const generatedShift = Array.from({ length: linesBefore }, () => []);
+  return {
+    version: 3,
+    sources: [filepath],
+    sourcesContent: [content],
+    names: rawMap.names ?? [],
+    mappings: encode([...generatedShift, ...decoded])
+  };
+}
 function replace_tag_content(source, start, end, insert) {
   if (start === 0 && end === 0) {
     return `<script>${insert}</script>${source}`;
@@ -67,5 +87,6 @@ function replace_tag_content(source, start, end, insert) {
 }
 const replace_between = (origin, startIndex, endIndex, insertion) => origin.substring(0, startIndex) + insertion + origin.substring(endIndex);
 export {
-  apply_transforms as default
+  apply_transforms as default,
+  offset_script_sourcemap
 };