houdini 0.13.2-alpha.3 → 0.13.2-alpha.4

package/build/runtime/cache/cache.d.ts

@@ -63,6 +63,7 @@ declare class CacheInternal {
     }): {
         data: GraphQLObject | null;
         partial: boolean;
+        hasData: boolean;
     };
     id(type: string, data: {
         id?: string;
@@ -79,6 +80,7 @@ declare class CacheInternal {
     }): {
         data: LinkedList<GraphQLValue>;
         partial: boolean;
+        hasData: boolean;
     };
     extractNestedListIDs({ value, abstract, recordID, key, linkedType, fields, variables, applyUpdates, specs, layer, startingWith, }: {
         value: GraphQLValue[];

package/build/runtime/cache/cache.js

@@ -117,7 +117,14 @@ var Cache = /** @class */ (function () {
         for (var _i = 0; _i < arguments.length; _i++) {
             args[_i] = arguments[_i];
         }
-        return (_a = this._internal_unstable).getSelection.apply(_a, __spread(args));
+        var _b = (_a = this._internal_unstable).getSelection.apply(_a, __spread(args)), data = _b.data, partial = _b.partial, hasData = _b.hasData;
+        if (!hasData) {
+            return { data: null, partial: false };
+        }
+        return {
+            data: data,
+            partial: partial,
+        };
     };
     // register the provided callbacks with the fields specified by the selection
     Cache.prototype.subscribe = function (spec, variables) {
@@ -597,7 +604,7 @@ var CacheInternal = /** @class */ (function () {
         var selection = _a.selection, _e = _a.parent, parent = _e === void 0 ? exports.rootID : _e, variables = _a.variables;
         // we could be asking for values of null
         if (parent === null) {
-            return { data: null, partial: false };
+            return { data: null, partial: false, hasData: true };
         }
         var target = {};
         // we need to track if we have a partial data set which means we have _something_ but not everything
@@ -618,14 +625,14 @@ var CacheInternal = /** @class */ (function () {
                 if (typeof value === 'undefined') {
                     partial = true;
                 }
-                // as long as the value is not undefined, we have something
-                else {
-                    hasData = true;
-                }
                 // if we dont have a value to return, use null (we check for non-null fields at the end)
                 if (typeof value === 'undefined' || value === null) {
                     // set the value to null
                     target[attributeName] = null;
+                    // if we didn't just write undefined, there is officially some data in this object
+                    if (typeof value !== 'undefined') {
+                        hasData = true;
+                    }
                 }
                 // if the field is a scalar
                 else if (!fields) {
@@ -638,6 +645,7 @@ var CacheInternal = /** @class */ (function () {
                     else {
                         target[attributeName] = value;
                     }
+                    hasData = true;
                 }
                 // if the field is a list of records
                 else if (Array.isArray(value)) {
@@ -653,6 +661,9 @@ var CacheInternal = /** @class */ (function () {
                     if (listValue.partial) {
                         partial = true;
                     }
+                    if (listValue.hasData) {
+                        hasData = true;
+                    }
                 }
                 // otherwise the field is a linked object
                 else {
@@ -668,6 +679,9 @@ var CacheInternal = /** @class */ (function () {
                     if (objectFields.partial) {
                         partial = true;
                     }
+                    if (objectFields.hasData) {
+                        hasData = true;
+                    }
                 }
                 // regardless of how the field was processed, if we got a null value assigned
                 // and the field is not nullable, we need to cascade up
@@ -688,6 +702,7 @@ var CacheInternal = /** @class */ (function () {
             // our value is considered true if there is some data but not everything
             // has a full value
             partial: hasData && partial,
+            hasData: hasData,
         };
     };
     CacheInternal.prototype.id = function (type, data) {
@@ -713,6 +728,7 @@ var CacheInternal = /** @class */ (function () {
         // to the corresponding record. can't have that now, can we?
         var result = [];
         var partialData = false;
+        var hasValues = false;
         try {
             for (var linkedList_1 = __values(linkedList), linkedList_1_1 = linkedList_1.next(); !linkedList_1_1.done; linkedList_1_1 = linkedList_1.next()) {
                 var entry = linkedList_1_1.value;
@@ -735,11 +751,14 @@ var CacheInternal = /** @class */ (function () {
                     parent: entry,
                     selection: fields,
                     variables: variables,
-                }), data = _c.data, partial = _c.partial;
+                }), data = _c.data, partial = _c.partial, hasData = _c.hasData;
                 result.push(data);
                 if (partial) {
                     partialData = true;
                 }
+                if (hasData) {
+                    hasValues = true;
+                }
             }
         }
         catch (e_10_1) { e_10 = { error: e_10_1 }; }
@@ -749,7 +768,11 @@ var CacheInternal = /** @class */ (function () {
             }
             finally { if (e_10) throw e_10.error; }
         }
-        return { data: result, partial: partialData };
+        return {
+            data: result,
+            partial: partialData,
+            hasData: hasValues,
+        };
     };
     CacheInternal.prototype.extractNestedListIDs = function (_a) {
         var e_11, _b;

package/build/runtime-cjs/cache/cache.d.ts

@@ -63,6 +63,7 @@ declare class CacheInternal {
     }): {
         data: GraphQLObject | null;
         partial: boolean;
+        hasData: boolean;
     };
     id(type: string, data: {
         id?: string;
@@ -79,6 +80,7 @@ declare class CacheInternal {
     }): {
         data: LinkedList<GraphQLValue>;
         partial: boolean;
+        hasData: boolean;
     };
     extractNestedListIDs({ value, abstract, recordID, key, linkedType, fields, variables, applyUpdates, specs, layer, startingWith, }: {
         value: GraphQLValue[];

package/build/runtime-cjs/cache/cache.js

@@ -117,7 +117,14 @@ var Cache = /** @class */ (function () {
         for (var _i = 0; _i < arguments.length; _i++) {
             args[_i] = arguments[_i];
         }
-        return (_a = this._internal_unstable).getSelection.apply(_a, __spread(args));
+        var _b = (_a = this._internal_unstable).getSelection.apply(_a, __spread(args)), data = _b.data, partial = _b.partial, hasData = _b.hasData;
+        if (!hasData) {
+            return { data: null, partial: false };
+        }
+        return {
+            data: data,
+            partial: partial,
+        };
     };
     // register the provided callbacks with the fields specified by the selection
     Cache.prototype.subscribe = function (spec, variables) {
@@ -597,7 +604,7 @@ var CacheInternal = /** @class */ (function () {
         var selection = _a.selection, _e = _a.parent, parent = _e === void 0 ? exports.rootID : _e, variables = _a.variables;
         // we could be asking for values of null
         if (parent === null) {
-            return { data: null, partial: false };
+            return { data: null, partial: false, hasData: true };
         }
         var target = {};
         // we need to track if we have a partial data set which means we have _something_ but not everything
@@ -618,14 +625,14 @@ var CacheInternal = /** @class */ (function () {
                 if (typeof value === 'undefined') {
                     partial = true;
                 }
-                // as long as the value is not undefined, we have something
-                else {
-                    hasData = true;
-                }
                 // if we dont have a value to return, use null (we check for non-null fields at the end)
                 if (typeof value === 'undefined' || value === null) {
                     // set the value to null
                     target[attributeName] = null;
+                    // if we didn't just write undefined, there is officially some data in this object
+                    if (typeof value !== 'undefined') {
+                        hasData = true;
+                    }
                 }
                 // if the field is a scalar
                 else if (!fields) {
@@ -638,6 +645,7 @@ var CacheInternal = /** @class */ (function () {
                     else {
                         target[attributeName] = value;
                     }
+                    hasData = true;
                 }
                 // if the field is a list of records
                 else if (Array.isArray(value)) {
@@ -653,6 +661,9 @@ var CacheInternal = /** @class */ (function () {
                     if (listValue.partial) {
                         partial = true;
                     }
+                    if (listValue.hasData) {
+                        hasData = true;
+                    }
                 }
                 // otherwise the field is a linked object
                 else {
@@ -668,6 +679,9 @@ var CacheInternal = /** @class */ (function () {
                     if (objectFields.partial) {
                         partial = true;
                     }
+                    if (objectFields.hasData) {
+                        hasData = true;
+                    }
                 }
                 // regardless of how the field was processed, if we got a null value assigned
                 // and the field is not nullable, we need to cascade up
@@ -688,6 +702,7 @@ var CacheInternal = /** @class */ (function () {
             // our value is considered true if there is some data but not everything
             // has a full value
             partial: hasData && partial,
+            hasData: hasData,
         };
     };
     CacheInternal.prototype.id = function (type, data) {
@@ -713,6 +728,7 @@ var CacheInternal = /** @class */ (function () {
         // to the corresponding record. can't have that now, can we?
         var result = [];
         var partialData = false;
+        var hasValues = false;
         try {
             for (var linkedList_1 = __values(linkedList), linkedList_1_1 = linkedList_1.next(); !linkedList_1_1.done; linkedList_1_1 = linkedList_1.next()) {
                 var entry = linkedList_1_1.value;
@@ -735,11 +751,14 @@ var CacheInternal = /** @class */ (function () {
                     parent: entry,
                     selection: fields,
                     variables: variables,
-                }), data = _c.data, partial = _c.partial;
+                }), data = _c.data, partial = _c.partial, hasData = _c.hasData;
                 result.push(data);
                 if (partial) {
                     partialData = true;
                 }
+                if (hasData) {
+                    hasValues = true;
+                }
             }
         }
         catch (e_10_1) { e_10 = { error: e_10_1 }; }
@@ -749,7 +768,11 @@ var CacheInternal = /** @class */ (function () {
             }
             finally { if (e_10) throw e_10.error; }
         }
-        return { data: result, partial: partialData };
+        return {
+            data: result,
+            partial: partialData,
+            hasData: hasValues,
+        };
     };
     CacheInternal.prototype.extractNestedListIDs = function (_a) {
         var e_11, _b;

package/build/runtime-esm/cache/cache.d.ts

@@ -63,6 +63,7 @@ declare class CacheInternal {
     }): {
         data: GraphQLObject | null;
         partial: boolean;
+        hasData: boolean;
     };
     id(type: string, data: {
         id?: string;
@@ -79,6 +80,7 @@ declare class CacheInternal {
     }): {
         data: LinkedList<GraphQLValue>;
         partial: boolean;
+        hasData: boolean;
     };
     extractNestedListIDs({ value, abstract, recordID, key, linkedType, fields, variables, applyUpdates, specs, layer, startingWith, }: {
         value: GraphQLValue[];

package/build/runtime-esm/cache/cache.js

@@ -44,7 +44,14 @@ export class Cache {
     }
     // reconstruct an object with the fields/relations specified by a selection
     read(...args) {
-        return this._internal_unstable.getSelection(...args);
+        const { data, partial, hasData } = this._internal_unstable.getSelection(...args);
+        if (!hasData) {
+            return { data: null, partial: false };
+        }
+        return {
+            data,
+            partial,
+        };
     }
     // register the provided callbacks with the fields specified by the selection
     subscribe(spec, variables = {}) {
@@ -439,7 +446,7 @@ class CacheInternal {
         var _a, _b;
         // we could be asking for values of null
         if (parent === null) {
-            return { data: null, partial: false };
+            return { data: null, partial: false, hasData: true };
         }
         const target = {};
         // we need to track if we have a partial data set which means we have _something_ but not everything
@@ -458,14 +465,14 @@ class CacheInternal {
             if (typeof value === 'undefined') {
                 partial = true;
             }
-            // as long as the value is not undefined, we have something
-            else {
-                hasData = true;
-            }
             // if we dont have a value to return, use null (we check for non-null fields at the end)
             if (typeof value === 'undefined' || value === null) {
                 // set the value to null
                 target[attributeName] = null;
+                // if we didn't just write undefined, there is officially some data in this object
+                if (typeof value !== 'undefined') {
+                    hasData = true;
+                }
             }
             // if the field is a scalar
             else if (!fields) {
@@ -478,6 +485,7 @@ class CacheInternal {
                 else {
                     target[attributeName] = value;
                 }
+                hasData = true;
             }
             // if the field is a list of records
             else if (Array.isArray(value)) {
@@ -493,6 +501,9 @@ class CacheInternal {
                 if (listValue.partial) {
                     partial = true;
                 }
+                if (listValue.hasData) {
+                    hasData = true;
+                }
             }
             // otherwise the field is a linked object
             else {
@@ -508,6 +519,9 @@ class CacheInternal {
                 if (objectFields.partial) {
                     partial = true;
                 }
+                if (objectFields.hasData) {
+                    hasData = true;
+                }
             }
             // regardless of how the field was processed, if we got a null value assigned
             // and the field is not nullable, we need to cascade up
@@ -520,6 +534,7 @@ class CacheInternal {
             // our value is considered true if there is some data but not everything
             // has a full value
             partial: hasData && partial,
+            hasData,
         };
     }
     id(type, data) {
@@ -543,6 +558,7 @@ class CacheInternal {
         // to the corresponding record. can't have that now, can we?
         const result = [];
         let partialData = false;
+        let hasValues = false;
         for (const entry of linkedList) {
             // if the entry is an array, keep going
             if (Array.isArray(entry)) {
@@ -559,7 +575,7 @@ class CacheInternal {
                 continue;
             }
             // look up the data for the record
-            const { data, partial } = this.getSelection({
+            const { data, partial, hasData } = this.getSelection({
                 parent: entry,
                 selection: fields,
                 variables,
@@ -568,8 +584,15 @@ class CacheInternal {
             if (partial) {
                 partialData = true;
             }
+            if (hasData) {
+                hasValues = true;
+            }
         }
-        return { data: result, partial: partialData };
+        return {
+            data: result,
+            partial: partialData,
+            hasData: hasValues,
+        };
     }
     extractNestedListIDs({ value, abstract, recordID, key, linkedType, fields, variables, applyUpdates, specs, layer, startingWith, }) {
         var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "houdini",
-	"version": "0.13.2-alpha.3",
+	"version": "0.13.2-alpha.4",
 	"description": "The disappearing graphql client for SvelteKit",
 	"scripts": {
 		"build:runtime": "npm run build:runtime:cjs && npm run build:runtime:esm",
@@ -57,5 +57,5 @@
 		"rollup-plugin-preserve-shebangs": "^0.2.0",
 		"svelte": "^3.34.0"
 	},
-	"gitHead": "f528d92b3af2875d1c9178871d5ab35070c7de2b"
+	"gitHead": "9b4a8076b51a806586ac14560c60b42aab2047ec"
 }

package/runtime/cache/cache.ts

@@ -70,7 +70,16 @@ export class Cache {
 
 	// reconstruct an object with the fields/relations specified by a selection
 	read(...args: Parameters<CacheInternal['getSelection']>) {
-		return this._internal_unstable.getSelection(...args)
+		const { data, partial, hasData } = this._internal_unstable.getSelection(...args)
+
+		if (!hasData) {
+			return { data: null, partial: false }
+		}
+
+		return {
+			data,
+			partial,
+		}
 	}
 
 	// register the provided callbacks with the fields specified by the selection
@@ -608,10 +617,10 @@ class CacheInternal {
 		selection: SubscriptionSelection
 		parent?: string
 		variables?: {}
-	}): { data: GraphQLObject | null; partial: boolean } {
+	}): { data: GraphQLObject | null; partial: boolean; hasData: boolean } {
 		// we could be asking for values of null
 		if (parent === null) {
-			return { data: null, partial: false }
+			return { data: null, partial: false, hasData: true }
 		}
 
 		const target = {} as GraphQLObject
@@ -638,15 +647,16 @@ class CacheInternal {
 			if (typeof value === 'undefined') {
 				partial = true
 			}
-			// as long as the value is not undefined, we have something
-			else {
-				hasData = true
-			}
 
 			// if we dont have a value to return, use null (we check for non-null fields at the end)
 			if (typeof value === 'undefined' || value === null) {
 				// set the value to null
 				target[attributeName] = null
+
+				// if we didn't just write undefined, there is officially some data in this object
+				if (typeof value !== 'undefined') {
+					hasData = true
+				}
 			}
 
 			// if the field is a scalar
@@ -662,6 +672,8 @@ class CacheInternal {
 				else {
 					target[attributeName] = value
 				}
+
+				hasData = true
 			}
 
 			// if the field is a list of records
@@ -680,6 +692,10 @@ class CacheInternal {
 				if (listValue.partial) {
 					partial = true
 				}
+
+				if (listValue.hasData) {
+					hasData = true
+				}
 			}
 
 			// otherwise the field is a linked object
@@ -698,6 +714,10 @@ class CacheInternal {
 				if (objectFields.partial) {
 					partial = true
 				}
+
+				if (objectFields.hasData) {
+					hasData = true
+				}
 			}
 
 			// regardless of how the field was processed, if we got a null value assigned
@@ -712,6 +732,7 @@ class CacheInternal {
 			// our value is considered true if there is some data but not everything
 			// has a full value
 			partial: hasData && partial,
+			hasData,
 		}
 	}
 
@@ -747,12 +768,13 @@ class CacheInternal {
 		fields: SubscriptionSelection
 		variables?: {}
 		linkedList: LinkedList
-	}): { data: LinkedList<GraphQLValue>; partial: boolean } {
+	}): { data: LinkedList<GraphQLValue>; partial: boolean; hasData: boolean } {
 		// the linked list could be a deeply nested thing, we need to call getData for each record
 		// we can't mutate the lists because that would change the id references in the listLinks map
 		// to the corresponding record. can't have that now, can we?
 		const result = []
 		let partialData = false
+		let hasValues = false
 
 		for (const entry of linkedList) {
 			// if the entry is an array, keep going
@@ -772,7 +794,7 @@ class CacheInternal {
 			}
 
 			// look up the data for the record
-			const { data, partial } = this.getSelection({
+			const { data, partial, hasData } = this.getSelection({
 				parent: entry,
 				selection: fields,
 				variables,
@@ -783,9 +805,17 @@ class CacheInternal {
 			if (partial) {
 				partialData = true
 			}
+
+			if (hasData) {
+				hasValues = true
+			}
 		}
 
-		return { data: result, partial: partialData }
+		return {
+			data: result,
+			partial: partialData,
+			hasData: hasValues,
+		}
 	}
 
 	extractNestedListIDs({

package/runtime/cache/tests/readwrite.test.ts

@@ -797,6 +797,10 @@ test('null-value cascade from field value', function () {
 							keyRaw: 'firstName',
 							type: 'String',
 						},
+						id: {
+							keyRaw: 'id',
+							type: 'String',
+						},
 					},
 				},
 			},
@@ -820,12 +824,17 @@ test('null-value field', function () {
 						keyRaw: 'id',
 						type: 'String',
 					},
+					firstName: {
+						keyRaw: 'firstName',
+						type: 'String',
+					},
 				},
 			},
 		},
 		data: {
 			viewer: {
 				id: '1',
+				firstName: null,
 			},
 		},
 	})
@@ -852,6 +861,7 @@ test('null-value field', function () {
 		},
 	})
 
+	console.log('vvvvvvvvvv')
 	expect(
 		cache.read({
 			selection: {
@@ -921,9 +931,12 @@ test('null-value cascade from object value', function () {
 					},
 				},
 			},
-		}).data
+		})
 	).toEqual({
-		viewer: null,
+		partial: true,
+		data: {
+			viewer: null,
+		},
 	})
 
 	// read the data as if the nested value is not required (parent should be null)
@@ -935,6 +948,10 @@ test('null-value cascade from object value', function () {
 					keyRaw: 'viewer',
 					nullable: true,
 					fields: {
+						id: {
+							keyRaw: 'id',
+							type: 'String',
+						},
 						parent: {
 							keyRaw: 'parent',
 							type: 'User',
@@ -943,10 +960,14 @@ test('null-value cascade from object value', function () {
 					},
 				},
 			},
-		}).data
+		})
 	).toEqual({
-		viewer: {
-			parent: null,
+		partial: true,
+		data: {
+			viewer: {
+				id: '1',
+				parent: null,
+			},
 		},
 	})
 })
@@ -1014,6 +1035,10 @@ test('null-value cascade to root', function () {
 							keyRaw: 'parent',
 							type: 'User',
 						},
+						id: {
+							keyRaw: 'id',
+							type: 'String',
+						},
 					},
 				},
 			},
@@ -1022,3 +1047,78 @@ test('null-value cascade to root', function () {
 		viewer: null,
 	})
 })
+
+test('must have a single value in order to use partial data', function () {
+	// instantiate the cache
+	const cache = new Cache(config)
+
+	// write the user data without the nested value
+	cache.write({
+		selection: {
+			viewer: {
+				type: 'User',
+				keyRaw: 'viewer',
+				nullable: true,
+				fields: {
+					id: {
+						keyRaw: 'id',
+						type: 'String',
+					},
+				},
+			},
+		},
+		data: {
+			viewer: {
+				id: '1',
+			},
+		},
+	})
+
+	expect(
+		cache.read({
+			selection: {
+				viewer: {
+					type: 'User',
+					keyRaw: 'viewer',
+					nullable: true,
+					fields: {
+						parent: {
+							keyRaw: 'parent',
+							type: 'User',
+						},
+					},
+				},
+			},
+		})
+	).toEqual({
+		partial: false,
+		data: null,
+	})
+
+	expect(
+		cache.read({
+			selection: {
+				viewer: {
+					type: 'User',
+					keyRaw: 'viewer',
+					nullable: true,
+					fields: {
+						id: {
+							keyRaw: 'id',
+							type: 'String',
+						},
+						parent: {
+							keyRaw: 'parent',
+							type: 'User',
+						},
+					},
+				},
+			},
+		})
+	).toEqual({
+		partial: true,
+		data: {
+			viewer: null,
+		},
+	})
+})