houdini-core 2.0.4 → 2.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini-core",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "The core GraphQL client for Houdini",
   "keywords": [
     "graphql",
@@ -21,13 +21,13 @@
     "minimatch": "^10.2.5"
   },
   "optionalDependencies": {
-    "houdini-core-darwin-x64": "2.0.4",
-    "houdini-core-darwin-arm64": "2.0.4",
-    "houdini-core-linux-x64": "2.0.4",
-    "houdini-core-linux-arm64": "2.0.4",
-    "houdini-core-win32-x64": "2.0.4",
-    "houdini-core-win32-arm64": "2.0.4",
-    "houdini-core-wasm": "2.0.4"
+    "houdini-core-darwin-x64": "2.0.5",
+    "houdini-core-darwin-arm64": "2.0.5",
+    "houdini-core-linux-x64": "2.0.5",
+    "houdini-core-linux-arm64": "2.0.5",
+    "houdini-core-win32-x64": "2.0.5",
+    "houdini-core-win32-arm64": "2.0.5",
+    "houdini-core-wasm": "2.0.5"
   },
   "files": [
     "bin",

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 = '2.0.4'
+const BINARY_DISTRIBUTION_VERSION = '2.0.5'
 
 // Windows binaries end with .exe so we need to special case them.
 const binaryName = process.platform === 'win32' ? 'houdini-core.exe' : 'houdini-core'

package/runtime/public/types.ts

@@ -28,8 +28,11 @@ export type CacheTypeDef = {
 	// entries in the tuple are graphql tag, query shape, query input
 	queries: [any, any, any][]
 
-	// a union of valid runtime types (default scalars | config types)
-	scalars: any
+	// a union of valid runtime types (default scalars | config types).
+	// optional so the placeholder generated.ts (which re-exports the published
+	// CacheTypeDef, whose scalars only exist via augmentation) satisfies the
+	// constraint before codegen overwrites it
+	scalars?: any
 }
 
 export type ValidTypes<Def extends CacheTypeDef> = keyof Def['types']
@@ -107,60 +110,58 @@ export type ListType<Def extends CacheTypeDef, Name extends ValidLists<Def>> = P
 // it very responsive.
 
 /**
- * Note on the `_Key extends _Target && _Target extends _Key` check:
- * Sometimes two queries might have a similar shape/inputs, e.g.:
- *
- * query Query1($userId: ID!) {    |    query Query2($userId: ID!) {
- *   user(id: $userId) {           |      user($id: $userId) {
- *     id                          |        id
- *     name                        |        name
- *   }                             |        birthDate
- * }                               |      }
- *                                 |    }
- *
- * To TypeScript, it would look like Query2's result would extend Query1's result.
- * But if Query2 was listed in front of Query1 in the queries array above, `_Key extends _Target` will evaluate to true,
- * causing it to return Query2's input/result types, while you were looking for Query1's input/result types.
- * The additional `_Target extends _Key` ensures that the two objects have exactly the same shape, at least prompting the
- * user for the correct fields.
+ * Each entry in the queries/fragments lists is keyed by the document's artifact type
+ * (`X$artifact`, the type of the generated artifact const). Every artifact carries
+ * unique literal values (name, hash) so the mutual-extends check below identifies
+ * exactly one document — even two documents with identical selections have distinct
+ * hashes. The target can be anything that exposes the artifact (a `graphql()` handle
+ * or a framework store), so matching goes through its `artifact` member.
  */
 
 export type FragmentVariables<_List, _Target> = _List extends [infer Head, ...infer Rest]
 	? Head extends [infer _Key, infer _Value, infer _Input]
-		? _Key extends _Target
-			? _Target extends _Key
-				? _Input
-				: FragmentValue<Rest, _Target>
-			: FragmentValue<Rest, _Target>
+		? _Target extends { artifact: infer _Artifact }
+			? _Artifact extends _Key
+				? _Key extends _Artifact
+					? _Input
+					: FragmentVariables<Rest, _Target>
+				: FragmentVariables<Rest, _Target>
+			: 'Encountered unknown fragment. Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).'
 		: 'Encountered unknown fragment. Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).'
 	: 'Encountered unknown fragment. Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).'
 
 export type FragmentValue<List, _Target> = List extends [infer Head, ...infer Rest]
 	? Head extends [infer _Key, infer _Value, infer _Input]
-		? _Key extends _Target
-			? _Target extends _Key
-				? _Value
+		? _Target extends { artifact: infer _Artifact }
+			? _Artifact extends _Key
+				? _Key extends _Artifact
+					? _Value
+					: FragmentValue<Rest, _Target>
 				: FragmentValue<Rest, _Target>
-			: FragmentValue<Rest, _Target>
+			: 'Encountered unknown fragment. Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).'
 		: 'Encountered unknown fragment. Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).'
 	: 'Encountered unknown fragment. Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).'
 
 export type QueryValue<List, _Target> = List extends [infer Head, ...infer Rest]
 	? Head extends [infer _Key, infer _Value, infer _Input]
-		? _Key extends _Target
-			? _Target extends _Key
-				? _Value
+		? _Target extends { artifact: infer _Artifact }
+			? _Artifact extends _Key
+				? _Key extends _Artifact
+					? _Value
+					: QueryValue<Rest, _Target>
 				: QueryValue<Rest, _Target>
-			: QueryValue<Rest, _Target>
+			: 'Encountered unknown query.Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).'
 		: 'Encountered unknown query.Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).'
 	: 'Encountered unknown query.Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).'
 
 export type QueryInput<List, _Target> = List extends [infer Head, ...infer Rest]
 	? Head extends [infer _Key, infer _Value, infer _Input]
-		? _Key extends _Target
-			? _Target extends _Key
-				? _Input
+		? _Target extends { artifact: infer _Artifact }
+			? _Artifact extends _Key
+				? _Key extends _Artifact
+					? _Input
+					: QueryInput<Rest, _Target>
 				: QueryInput<Rest, _Target>
-			: QueryInput<Rest, _Target>
+			: 'Encountered unknown query.Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).'
 		: 'Encountered unknown query.Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).'
 	: 'Encountered unknown query.Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).'