@isograph/react 0.0.0-main-81ce1b46 → 0.0.0-main-a33a3ba5

package/dist/core/cache.d.ts

@@ -20,7 +20,7 @@ export declare function getOrCreateCacheForArtifact<TReadFromStore extends {
     data: object;
 }, TClientFieldValue>(environment: IsographEnvironment, entrypoint: IsographEntrypoint<TReadFromStore, TClientFieldValue>, variables: ExtractParameters<TReadFromStore>, fetchOptions?: FetchOptions): ParentCache<FragmentReference<TReadFromStore, TClientFieldValue>>;
 type NetworkResponseScalarValue = string | number | boolean;
-type NetworkResponseValue = NetworkResponseScalarValue | null | NetworkResponseObject | NetworkResponseObject[] | NetworkResponseScalarValue[];
+type NetworkResponseValue = NetworkResponseScalarValue | null | NetworkResponseObject | (NetworkResponseObject | null)[] | (NetworkResponseScalarValue | null)[];
 export type NetworkResponseObject = {
     [index: string]: undefined | NetworkResponseValue;
     id?: DataId;

package/dist/core/cache.js

@@ -274,7 +274,8 @@ function normalizeLinkedField(environment, astNode, networkResponseParentRecord,
         targetParentRecord[parentRecordKey] = null;
         return existingValue !== null;
     }
-    if (isScalarButNotEmptyArray(networkResponseData)) {
+    if (isScalarOrEmptyArray(networkResponseData) &&
+        !isNullOrEmptyArray(networkResponseData)) {
         throw new Error('Unexpected scalar network response when normalizing a linked field');
     }
     if (Array.isArray(networkResponseData)) {
@@ -282,6 +283,10 @@ function normalizeLinkedField(environment, astNode, networkResponseParentRecord,
         const dataIds = [];
         for (let i = 0; i < networkResponseData.length; i++) {
             const networkResponseObject = networkResponseData[i];
+            if (networkResponseObject === null) {
+                dataIds.push(null);
+                continue;
+            }
             const newStoreRecordId = normalizeNetworkResponseObject(environment, astNode, networkResponseObject, targetParentRecordLink, variables, i, nestedRefetchQueries, mutableEncounteredIds);
             dataIds.push({ __link: newStoreRecordId });
         }
@@ -309,16 +314,15 @@ function normalizeInlineFragment(environment, astNode, networkResponseParentReco
     return false;
 }
 function dataIdsAreTheSame(existingValue, newDataIds) {
+    var _a;
     if (Array.isArray(existingValue)) {
         if (newDataIds.length !== existingValue.length) {
             return false;
         }
         for (let i = 0; i < newDataIds.length; i++) {
             const maybeLink = (0, IsographEnvironment_1.getLink)(existingValue[i]);
-            if (maybeLink !== null) {
-                if (newDataIds[i].__link !== maybeLink.__link) {
-                    return false;
-                }
+            if (((_a = newDataIds[i]) === null || _a === void 0 ? void 0 : _a.__link) !== (maybeLink === null || maybeLink === void 0 ? void 0 : maybeLink.__link)) {
+                return false;
             }
         }
         return true;
@@ -341,24 +345,20 @@ function isScalarOrEmptyArray(data) {
         // This is maybe fixed in a new version of Typescript??
         return data.every((x) => isScalarOrEmptyArray(x));
     }
-    const isScalarValue = typeof data === 'string' ||
+    const isScalarValue = data === null ||
+        typeof data === 'string' ||
         typeof data === 'number' ||
         typeof data === 'boolean';
     return isScalarValue;
 }
-function isScalarButNotEmptyArray(data) {
-    // N.B. empty arrays count as empty arrays of linked fields.
+function isNullOrEmptyArray(data) {
     if (Array.isArray(data)) {
         if (data.length === 0) {
-            return false;
+            return true;
         }
-        // This is maybe fixed in a new version of Typescript??
-        return data.every((x) => isScalarOrEmptyArray(x));
+        return data.every((x) => isNullOrEmptyArray(x));
     }
-    const isScalarValue = typeof data === 'string' ||
-        typeof data === 'number' ||
-        typeof data === 'boolean';
-    return isScalarValue;
+    return data === null;
 }
 function getParentRecordKey(astNode, variables) {
     let parentRecordKey = astNode.fieldName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-81ce1b46",
+  "version": "0.0.0-main-a33a3ba5",
   "description": "Use Isograph with React",
   "homepage": "https://isograph.dev",
   "main": "dist/index.js",
@@ -19,9 +19,9 @@
     "iso-watch": "../../target/debug/isograph_cli --config ./isograph.config.json --watch"
   },
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-81ce1b46",
-    "@isograph/react-disposable-state": "0.0.0-main-81ce1b46",
-    "@isograph/reference-counted-pointer": "0.0.0-main-81ce1b46"
+    "@isograph/disposable-types": "0.0.0-main-a33a3ba5",
+    "@isograph/react-disposable-state": "0.0.0-main-a33a3ba5",
+    "@isograph/reference-counted-pointer": "0.0.0-main-a33a3ba5"
   },
   "peerDependencies": {
     "react": "18.3.1"

package/src/core/cache.ts

@@ -127,8 +127,8 @@ type NetworkResponseValue =
   | NetworkResponseScalarValue
   | null
   | NetworkResponseObject
-  | NetworkResponseObject[]
-  | NetworkResponseScalarValue[];
+  | (NetworkResponseObject | null)[]
+  | (NetworkResponseScalarValue | null)[];
 
 export type NetworkResponseObject = {
   // N.B. undefined is here to support optional id's, but
@@ -461,7 +461,10 @@ function normalizeLinkedField(
     return existingValue !== null;
   }
 
-  if (isScalarButNotEmptyArray(networkResponseData)) {
+  if (
+    isScalarOrEmptyArray(networkResponseData) &&
+    !isNullOrEmptyArray(networkResponseData)
+  ) {
     throw new Error(
       'Unexpected scalar network response when normalizing a linked field',
     );
@@ -469,9 +472,13 @@ function normalizeLinkedField(
 
   if (Array.isArray(networkResponseData)) {
     // TODO check astNode.plural or the like
-    const dataIds: Link[] = [];
+    const dataIds: (Link | null)[] = [];
     for (let i = 0; i < networkResponseData.length; i++) {
       const networkResponseObject = networkResponseData[i];
+      if (networkResponseObject === null) {
+        dataIds.push(null);
+        continue;
+      }
       const newStoreRecordId = normalizeNetworkResponseObject(
         environment,
         astNode,
@@ -539,7 +546,7 @@ function normalizeInlineFragment(
 
 function dataIdsAreTheSame(
   existingValue: DataTypeValue,
-  newDataIds: Link[],
+  newDataIds: (Link | null)[],
 ): boolean {
   if (Array.isArray(existingValue)) {
     if (newDataIds.length !== existingValue.length) {
@@ -547,10 +554,8 @@ function dataIdsAreTheSame(
     }
     for (let i = 0; i < newDataIds.length; i++) {
       const maybeLink = getLink(existingValue[i]);
-      if (maybeLink !== null) {
-        if (newDataIds[i].__link !== maybeLink.__link) {
-          return false;
-        }
+      if (newDataIds[i]?.__link !== maybeLink?.__link) {
+        return false;
       }
     }
     return true;
@@ -596,35 +601,29 @@ function normalizeNetworkResponseObject(
 
 function isScalarOrEmptyArray(
   data: NonNullable<NetworkResponseValue>,
-): data is NetworkResponseScalarValue | NetworkResponseScalarValue[] {
+): data is NetworkResponseScalarValue | (NetworkResponseScalarValue | null)[] {
   // N.B. empty arrays count as empty arrays of scalar fields.
   if (Array.isArray(data)) {
     // This is maybe fixed in a new version of Typescript??
     return (data as any).every((x: any) => isScalarOrEmptyArray(x));
   }
   const isScalarValue =
+    data === null ||
     typeof data === 'string' ||
     typeof data === 'number' ||
     typeof data === 'boolean';
   return isScalarValue;
 }
 
-function isScalarButNotEmptyArray(
-  data: NonNullable<NetworkResponseValue>,
-): data is NetworkResponseScalarValue | NetworkResponseScalarValue[] {
-  // N.B. empty arrays count as empty arrays of linked fields.
+function isNullOrEmptyArray(data: unknown): data is never[] | null[] | null {
   if (Array.isArray(data)) {
     if (data.length === 0) {
-      return false;
+      return true;
     }
-    // This is maybe fixed in a new version of Typescript??
-    return (data as any).every((x: any) => isScalarOrEmptyArray(x));
+    return data.every((x) => isNullOrEmptyArray(x));
   }
-  const isScalarValue =
-    typeof data === 'string' ||
-    typeof data === 'number' ||
-    typeof data === 'boolean';
-  return isScalarValue;
+
+  return data === null;
 }
 
 export function getParentRecordKey(