houdini-svelte 3.0.1 → 3.0.3

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,6 +1,6 @@
 {
   "name": "houdini-svelte",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/HoudiniGraphql/houdini.git"
@@ -19,13 +19,13 @@
     "svelte": "^5.19.0"
   },
   "optionalDependencies": {
-    "houdini-svelte-darwin-x64": "3.0.1",
-    "houdini-svelte-darwin-arm64": "3.0.1",
-    "houdini-svelte-linux-x64": "3.0.1",
-    "houdini-svelte-linux-arm64": "3.0.1",
-    "houdini-svelte-win32-x64": "3.0.1",
-    "houdini-svelte-win32-arm64": "3.0.1",
-    "houdini-svelte-wasm": "3.0.1"
+    "houdini-svelte-darwin-x64": "3.0.3",
+    "houdini-svelte-darwin-arm64": "3.0.3",
+    "houdini-svelte-linux-x64": "3.0.3",
+    "houdini-svelte-linux-arm64": "3.0.3",
+    "houdini-svelte-win32-x64": "3.0.3",
+    "houdini-svelte-win32-arm64": "3.0.3",
+    "houdini-svelte-wasm": "3.0.3"
   },
   "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.1'
+const BINARY_DISTRIBUTION_VERSION = '3.0.3'
 
 // Windows binaries end with .exe so we need to special case them.
 const binaryName = process.platform === 'win32' ? 'houdini-svelte.exe' : 'houdini-svelte'

package/runtime/stores/fragment.ts

@@ -21,14 +21,17 @@ export class FragmentStore<
 	_Data extends GraphQLObject,
 	_ReferenceType extends {},
 	_Input extends GraphQLVariables = GraphQLVariables,
+	// generated stores narrow this to their document's artifact type so a store
+	// can be matched back to its data/input types (e.g. by record.read/write)
+	_Artifact extends FragmentArtifact = FragmentArtifact,
 > {
-	artifact: FragmentArtifact
+	artifact: _Artifact
 	name: string
 	kind = CompiledFragmentKind
 
 	protected context: HoudiniFetchContext | null = null
 
-	constructor({ artifact, storeName }: { artifact: FragmentArtifact; storeName: string }) {
+	constructor({ artifact, storeName }: { artifact: _Artifact; storeName: string }) {
 		this.artifact = artifact
 		this.name = storeName
 	}

package/runtime/stores/pagination/fragment.ts

@@ -26,16 +26,19 @@ import type { OffsetFragmentStoreInstance } from '../../types.js'
 import { FragmentStore } from '../fragment.js'
 import type { StoreConfig } from '../query.js'
 
-type FragmentStoreConfig<_Data extends GraphQLObject, _Input> = StoreConfig<
-	_Data,
+type FragmentStoreConfig<
+	_Data extends GraphQLObject,
 	_Input,
-	FragmentArtifact
-> & { paginationArtifact: QueryArtifact }
+	_Artifact extends FragmentArtifact = FragmentArtifact,
+> = StoreConfig<_Data, _Input, _Artifact> & { paginationArtifact: QueryArtifact }
 
 export class BasePaginatedFragmentStore<
 	_Data extends GraphQLObject,
 	_ReferenceType extends {},
 	_Input,
+	// generated stores narrow this to their document's artifact type so a store
+	// can be matched back to its data/input types (e.g. by record.read/write)
+	_Artifact extends FragmentArtifact = FragmentArtifact,
 > {
 	// all paginated stores need to have a flag to distinguish from other fragment stores
 	paginated = true
@@ -43,9 +46,9 @@ export class BasePaginatedFragmentStore<
 	protected paginationArtifact: QueryArtifact
 	name: string
 	kind = CompiledFragmentKind
-	artifact: FragmentArtifact
+	artifact: _Artifact
 
-	constructor(config: FragmentStoreConfig<_Data, _Input>) {
+	constructor(config: FragmentStoreConfig<_Data, _Input, _Artifact>) {
 		this.paginationArtifact = config.paginationArtifact
 		this.name = config.storeName
 		this.artifact = config.artifact
@@ -93,7 +96,8 @@ export class FragmentStoreCursor<
 	_Data extends GraphQLObject,
 	_ReferenceType extends {},
 	_Input extends GraphQLVariables,
-> extends BasePaginatedFragmentStore<_Data, _ReferenceType, _Input> {
+	_Artifact extends FragmentArtifact = FragmentArtifact,
+> extends BasePaginatedFragmentStore<_Data, _ReferenceType, _Input, _Artifact> {
 	// we want to add the cursor-based fetch to the return value of get
 	get(initialValue: _Data | { [fragmentKey]: _ReferenceType } | null) {
 		const base = new FragmentStore<_Data, {}, _Input>({
@@ -286,7 +290,8 @@ export class FragmentStoreOffset<
 	_Data extends GraphQLObject,
 	_ReferenceType extends {},
 	_Input extends GraphQLVariables,
-> extends BasePaginatedFragmentStore<_Data, _ReferenceType, _Input> {
+	_Artifact extends FragmentArtifact = FragmentArtifact,
+> extends BasePaginatedFragmentStore<_Data, _ReferenceType, _Input, _Artifact> {
 	get(initialValue: _Data | null): OffsetFragmentStoreInstance<_Data, _Input> {
 		const base = new FragmentStore<_Data, {}, _Input>({
 			artifact: this.artifact,

package/runtime/stores/pagination/query.ts

@@ -2,6 +2,7 @@ import { extractPageInfo } from 'houdini/runtime'
 import { cursorHandlers, offsetHandlers } from 'houdini/runtime'
 import type {
 	GraphQLObject,
+	QueryArtifact,
 	QueryResult,
 	CursorHandlers,
 	OffsetHandlers,
@@ -30,7 +31,8 @@ export type CursorStoreResult<
 export class QueryStoreCursor<
 	_Data extends GraphQLObject,
 	_Input extends GraphQLVariables | null | undefined,
-> extends QueryStore<_Data, _Input> {
+	_Artifact extends QueryArtifact = QueryArtifact,
+> extends QueryStore<_Data, _Input, _Artifact> {
 	// all paginated stores need to have a flag to distinguish from other query stores
 	paginated = true
 
@@ -130,7 +132,8 @@ export class QueryStoreCursor<
 export class QueryStoreOffset<
 	_Data extends GraphQLObject,
 	_Input extends GraphQLVariables | null | undefined,
-> extends QueryStore<_Data, _Input> {
+	_Artifact extends QueryArtifact = QueryArtifact,
+> extends QueryStore<_Data, _Input, _Artifact> {
 	// all paginated stores need to have a flag to distinguish from other query stores
 	paginated = true
 

package/runtime/stores/query.ts

@@ -29,7 +29,10 @@ import { BaseStore } from './base.js'
 export class QueryStore<
 	_Data extends GraphQLObject,
 	_Input extends GraphQLVariables | null | undefined,
-> extends BaseStore<_Data, _Input, QueryArtifact> {
+	// generated stores narrow this to their document's artifact type so a store
+	// can be matched back to its result/input types (e.g. by cache.read/write)
+	_Artifact extends QueryArtifact = QueryArtifact,
+> extends BaseStore<_Data, _Input, _Artifact> {
 	// whether the store requires variables for input
 	variables: boolean
 
@@ -42,7 +45,7 @@ export class QueryStore<
 	// the string identifying the store
 	protected storeName: string
 
-	constructor({ artifact, storeName, variables }: StoreConfig<_Data, _Input, QueryArtifact>) {
+	constructor({ artifact, storeName, variables }: StoreConfig<_Data, _Input, _Artifact>) {
 		super({
 			artifact,
 		})

package/runtime/stores/refetchable.ts

@@ -16,11 +16,11 @@ import { getSession } from '../session.js'
 import { FragmentStore } from './fragment.js'
 import type { StoreConfig } from './query.js'
 
-type RefetchableFragmentStoreConfig<_Data extends GraphQLObject, _Input> = StoreConfig<
-	_Data,
+type RefetchableFragmentStoreConfig<
+	_Data extends GraphQLObject,
 	_Input,
-	FragmentArtifact
-> & { refetchArtifact: QueryArtifact }
+	_Artifact extends FragmentArtifact = FragmentArtifact,
+> = StoreConfig<_Data, _Input, _Artifact> & { refetchArtifact: QueryArtifact }
 
 // the value handed back to components subscribing to a refetchable fragment store
 export type RefetchableFragmentResult<_Data extends GraphQLObject, _Input> = {
@@ -42,15 +42,18 @@ export class FragmentStoreRefetchable<
 	_Data extends GraphQLObject,
 	_ReferenceType extends {},
 	_Input extends GraphQLVariables,
+	// generated stores narrow this to their document's artifact type so a store
+	// can be matched back to its data/input types (e.g. by record.read/write)
+	_Artifact extends FragmentArtifact = FragmentArtifact,
 > {
 	kind = CompiledFragmentKind
-	artifact: FragmentArtifact
+	artifact: _Artifact
 	name: string
 	// a flag the refetchableFragment() helper looks for to validate the store
 	refetchable = true
 	protected refetchArtifact: QueryArtifact
 
-	constructor(config: RefetchableFragmentStoreConfig<_Data, _Input>) {
+	constructor(config: RefetchableFragmentStoreConfig<_Data, _Input, _Artifact>) {
 		this.artifact = config.artifact
 		this.name = config.storeName
 		this.refetchArtifact = config.refetchArtifact