@isograph/react 0.0.0-main-1bfd646b → 0.0.0-main-905800be

package/dist/IsographEnvironment.d.ts

@@ -49,4 +49,9 @@ export declare function createIsographEnvironment(store: IsographStore, networkF
 export declare function createIsographStore(): {
     __ROOT: {};
 };
+export declare function defaultMissingFieldHandler(_storeRecord: StoreRecord, _root: DataId, fieldName: string, arguments_: {
+    [index: string]: any;
+} | null, variables: {
+    [index: string]: any;
+} | null): Link | undefined;
 export {};

package/dist/IsographEnvironment.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createIsographStore = exports.createIsographEnvironment = exports.ROOT_ID = void 0;
+exports.defaultMissingFieldHandler = exports.createIsographStore = exports.createIsographEnvironment = exports.ROOT_ID = void 0;
 exports.ROOT_ID = '__ROOT';
 const DEFAULT_GC_BUFFER_SIZE = 10;
 function createIsographEnvironment(store, networkFunction, missingFieldHandler) {
@@ -23,3 +23,14 @@ function createIsographStore() {
     };
 }
 exports.createIsographStore = createIsographStore;
+function defaultMissingFieldHandler(_storeRecord, _root, fieldName, arguments_, variables) {
+    if (fieldName === 'node' || fieldName === 'user') {
+        const variable = arguments_ === null || arguments_ === void 0 ? void 0 : arguments_['id'];
+        const value = variables === null || variables === void 0 ? void 0 : variables[variable];
+        // TODO can we handle explicit nulls here too? Probably, after wrapping in objects
+        if (value != null) {
+            return { __link: value };
+        }
+    }
+}
+exports.defaultMissingFieldHandler = defaultMissingFieldHandler;

package/dist/garbageCollection.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.garbageCollectEnvironment = exports.retainQuery = exports.unretainQuery = void 0;
 const IsographEnvironment_1 = require("./IsographEnvironment");
+const index_1 = require("./index");
 const cache_1 = require("./cache");
 function unretainQuery(environment, retainedQuery) {
     environment.retainedQueries.delete(retainedQuery);
@@ -38,16 +39,6 @@ exports.garbageCollectEnvironment = garbageCollectEnvironment;
 function recordReachableIds(store, retainedQuery, mutableRetainedIds) {
     recordReachableIdsFromRecord(store, store[IsographEnvironment_1.ROOT_ID], mutableRetainedIds, retainedQuery.normalizationAst, retainedQuery.variables);
 }
-function getLinkedId(data) {
-    // @ts-expect-error
-    if (data.__link != null) {
-        // @ts-expect-error
-        return data.__link;
-    }
-    else {
-        throw new Error('Record in an invalid state');
-    }
-}
 function recordReachableIdsFromRecord(store, currentRecord, mutableRetainedIds, selections, variables) {
     for (const selection of selections) {
         switch (selection.kind) {
@@ -56,17 +47,17 @@ function recordReachableIdsFromRecord(store, currentRecord, mutableRetainedIds,
                 const linkedFieldOrFields = currentRecord[linkKey];
                 const ids = [];
                 if (Array.isArray(linkedFieldOrFields)) {
-                    for (const link of linkedFieldOrFields) {
+                    for (const maybeLink of linkedFieldOrFields) {
+                        const link = (0, index_1.assertLink)(maybeLink);
                         if (link != null) {
-                            const id = getLinkedId(link);
-                            ids.push(id);
+                            ids.push(link.__link);
                         }
                     }
                 }
                 else {
-                    if (linkedFieldOrFields != null) {
-                        const id = getLinkedId(linkedFieldOrFields);
-                        ids.push(id);
+                    const link = (0, index_1.assertLink)(linkedFieldOrFields);
+                    if (link != null) {
+                        ids.push(link.__link);
                     }
                 }
                 for (const nextRecordId of ids) {

package/dist/index.d.ts

@@ -1,10 +1,10 @@
-import { DataId, IsographEnvironment, Link, StoreRecord } from './IsographEnvironment';
+import { DataId, DataTypeValue, IsographEnvironment, Link } from './IsographEnvironment';
 import { ReaderArtifact } from './reader';
 import { IsographEntrypoint, RefetchQueryArtifactWrapper } from './entrypoint';
 export { retainQuery, unretainQuery, type RetainedQuery, garbageCollectEnvironment, } from './garbageCollection';
 export { type PromiseWrapper } from './PromiseWrapper';
 export { makeNetworkRequest, subscribe } from './cache';
-export { ROOT_ID, type DataId, type DataTypeValue, type IsographEnvironment, type IsographNetworkFunction, type IsographStore, type Link, type StoreRecord, createIsographEnvironment, createIsographStore, } from './IsographEnvironment';
+export { ROOT_ID, type DataId, type DataTypeValue, type IsographEnvironment, type IsographNetworkFunction, type IsographStore, type Link, type StoreRecord, createIsographEnvironment, createIsographStore, defaultMissingFieldHandler, } from './IsographEnvironment';
 export { IsographEnvironmentProvider, useIsographEnvironment, type IsographEnvironmentProviderProps, } from './IsographEnvironmentProvider';
 export { useImperativeReference } from './useImperativeReference';
 export { EntrypointReader } from './EntrypointReader';
@@ -41,11 +41,7 @@ export declare function useLazyReference<TEntrypoint>(entrypoint: TEntrypoint |
 export declare function useResult<TReadFromStore extends Object, TResolverResult>(fragmentReference: FragmentReference<TReadFromStore, TResolverResult>): TResolverResult;
 export declare function read<TReadFromStore extends Object, TResolverResult>(environment: IsographEnvironment, fragmentReference: FragmentReference<TReadFromStore, TResolverResult>): TResolverResult;
 export declare function readButDoNotEvaluate<TReadFromStore extends Object>(environment: IsographEnvironment, reference: FragmentReference<TReadFromStore, unknown>): TReadFromStore;
-export declare function defaultMissingFieldHandler(_storeRecord: StoreRecord, _root: DataId, fieldName: string, arguments_: {
-    [index: string]: any;
-} | null, variables: {
-    [index: string]: any;
-} | null): Link | undefined;
+export declare function assertLink(link: DataTypeValue): Link | null;
 export type IsographComponentProps<TDataType, TOtherProps = Object> = {
     data: TDataType;
 } & TOtherProps;

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultMissingFieldHandler = exports.readButDoNotEvaluate = exports.read = exports.useResult = exports.useLazyReference = exports.assertIsEntrypoint = exports.EntrypointReader = exports.useImperativeReference = exports.useIsographEnvironment = exports.IsographEnvironmentProvider = exports.createIsographStore = exports.createIsographEnvironment = exports.ROOT_ID = exports.subscribe = exports.makeNetworkRequest = exports.garbageCollectEnvironment = exports.unretainQuery = exports.retainQuery = void 0;
+exports.assertLink = exports.readButDoNotEvaluate = exports.read = exports.useResult = exports.useLazyReference = exports.assertIsEntrypoint = exports.EntrypointReader = exports.useImperativeReference = exports.useIsographEnvironment = exports.IsographEnvironmentProvider = exports.defaultMissingFieldHandler = exports.createIsographStore = exports.createIsographEnvironment = exports.ROOT_ID = exports.subscribe = exports.makeNetworkRequest = exports.garbageCollectEnvironment = exports.unretainQuery = exports.retainQuery = void 0;
 const cache_1 = require("./cache");
 const react_disposable_state_1 = require("@isograph/react-disposable-state");
 const componentCache_1 = require("./componentCache");
@@ -19,6 +19,7 @@ var IsographEnvironment_2 = require("./IsographEnvironment");
 Object.defineProperty(exports, "ROOT_ID", { enumerable: true, get: function () { return IsographEnvironment_2.ROOT_ID; } });
 Object.defineProperty(exports, "createIsographEnvironment", { enumerable: true, get: function () { return IsographEnvironment_2.createIsographEnvironment; } });
 Object.defineProperty(exports, "createIsographStore", { enumerable: true, get: function () { return IsographEnvironment_2.createIsographStore; } });
+Object.defineProperty(exports, "defaultMissingFieldHandler", { enumerable: true, get: function () { return IsographEnvironment_2.defaultMissingFieldHandler; } });
 var IsographEnvironmentProvider_2 = require("./IsographEnvironmentProvider");
 Object.defineProperty(exports, "IsographEnvironmentProvider", { enumerable: true, get: function () { return IsographEnvironmentProvider_2.IsographEnvironmentProvider; } });
 Object.defineProperty(exports, "useIsographEnvironment", { enumerable: true, get: function () { return IsographEnvironmentProvider_2.useIsographEnvironment; } });
@@ -165,7 +166,7 @@ function readData(environment, ast, root, variables, nestedRefetchQueries) {
                 let link = assertLink(value);
                 if (link === undefined) {
                     // TODO make this configurable, and also generated and derived from the schema
-                    const missingFieldHandler = (_c = environment.missingFieldHandler) !== null && _c !== void 0 ? _c : defaultMissingFieldHandler;
+                    const missingFieldHandler = (_c = environment.missingFieldHandler) !== null && _c !== void 0 ? _c : IsographEnvironment_1.defaultMissingFieldHandler;
                     const altLink = missingFieldHandler(storeRecord, root, field.fieldName, field.arguments, variables);
                     if (altLink === undefined) {
                         return {
@@ -281,29 +282,19 @@ function readData(environment, ast, root, variables, nestedRefetchQueries) {
     }
     return { kind: 'Success', data: target };
 }
-function defaultMissingFieldHandler(_storeRecord, _root, fieldName, arguments_, variables) {
-    if (fieldName === 'node' || fieldName === 'user') {
-        const variable = arguments_ === null || arguments_ === void 0 ? void 0 : arguments_['id'];
-        const value = variables === null || variables === void 0 ? void 0 : variables[variable];
-        // TODO can we handle explicit nulls here too? Probably, after wrapping in objects
-        if (value != null) {
-            return { __link: value };
-        }
-    }
-}
-exports.defaultMissingFieldHandler = defaultMissingFieldHandler;
 function assertLink(link) {
     if (Array.isArray(link)) {
         throw new Error('Unexpected array');
     }
+    if (link == null) {
+        return null;
+    }
     if (typeof link === 'object') {
         return link;
     }
-    if (link === undefined) {
-        return undefined;
-    }
     throw new Error('Invalid link');
 }
+exports.assertLink = assertLink;
 function filterVariables(variables, allowedVariables) {
     const result = {};
     for (const key of allowedVariables) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-1bfd646b",
+  "version": "0.0.0-main-905800be",
   "description": "Use Isograph with React",
   "homepage": "https://isograph.dev",
   "main": "dist/index.js",
@@ -16,8 +16,8 @@
     "prepack": "yarn run test && yarn run compile"
   },
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-1bfd646b",
-    "@isograph/react-disposable-state": "0.0.0-main-1bfd646b",
+    "@isograph/disposable-types": "0.0.0-main-905800be",
+    "@isograph/react-disposable-state": "0.0.0-main-905800be",
     "react": "^18.2.0"
   },
   "devDependencies": {

package/src/IsographEnvironment.tsx

@@ -95,3 +95,21 @@ export function createIsographStore() {
     [ROOT_ID]: {},
   };
 }
+
+export function defaultMissingFieldHandler(
+  _storeRecord: StoreRecord,
+  _root: DataId,
+  fieldName: string,
+  arguments_: { [index: string]: any } | null,
+  variables: { [index: string]: any } | null,
+): Link | undefined {
+  if (fieldName === 'node' || fieldName === 'user') {
+    const variable = arguments_?.['id'];
+    const value = variables?.[variable];
+
+    // TODO can we handle explicit nulls here too? Probably, after wrapping in objects
+    if (value != null) {
+      return { __link: value };
+    }
+  }
+}

package/src/garbageCollection.ts

@@ -1,12 +1,11 @@
 import {
   DataId,
-  DataTypeValue,
   IsographEnvironment,
   IsographStore,
   ROOT_ID,
   StoreRecord,
 } from './IsographEnvironment';
-import { NormalizationAst } from './index';
+import { NormalizationAst, assertLink } from './index';
 import { getParentRecordKey } from './cache';
 
 export type RetainedQuery = {
@@ -71,16 +70,6 @@ function recordReachableIds(
   );
 }
 
-function getLinkedId(data: Exclude<DataTypeValue, null | void>): string {
-  // @ts-expect-error
-  if (data.__link != null) {
-    // @ts-expect-error
-    return data.__link;
-  } else {
-    throw new Error('Record in an invalid state');
-  }
-}
-
 function recordReachableIdsFromRecord(
   store: IsographStore,
   currentRecord: StoreRecord,
@@ -96,16 +85,16 @@ function recordReachableIdsFromRecord(
 
         const ids = [];
         if (Array.isArray(linkedFieldOrFields)) {
-          for (const link of linkedFieldOrFields) {
+          for (const maybeLink of linkedFieldOrFields) {
+            const link = assertLink(maybeLink);
             if (link != null) {
-              const id = getLinkedId(link);
-              ids.push(id);
+              ids.push(link.__link);
             }
           }
         } else {
-          if (linkedFieldOrFields != null) {
-            const id = getLinkedId(linkedFieldOrFields);
-            ids.push(id);
+          const link = assertLink(linkedFieldOrFields);
+          if (link != null) {
+            ids.push(link.__link);
           }
         }
 

package/src/index.tsx

@@ -13,7 +13,7 @@ import {
   IsographEnvironment,
   Link,
   ROOT_ID,
-  StoreRecord,
+  defaultMissingFieldHandler,
 } from './IsographEnvironment';
 import { useEffect, useState } from 'react';
 import { useIsographEnvironment } from './IsographEnvironmentProvider';
@@ -43,6 +43,7 @@ export {
   type StoreRecord,
   createIsographEnvironment,
   createIsographStore,
+  defaultMissingFieldHandler,
 } from './IsographEnvironment';
 export {
   IsographEnvironmentProvider,
@@ -486,34 +487,16 @@ function readData<TReadFromStore>(
   return { kind: 'Success', data: target as any };
 }
 
-export function defaultMissingFieldHandler(
-  _storeRecord: StoreRecord,
-  _root: DataId,
-  fieldName: string,
-  arguments_: { [index: string]: any } | null,
-  variables: { [index: string]: any } | null,
-): Link | undefined {
-  if (fieldName === 'node' || fieldName === 'user') {
-    const variable = arguments_?.['id'];
-    const value = variables?.[variable];
-
-    // TODO can we handle explicit nulls here too? Probably, after wrapping in objects
-    if (value != null) {
-      return { __link: value };
-    }
-  }
-}
-
-function assertLink(link: DataTypeValue): Link | undefined | null {
+export function assertLink(link: DataTypeValue): Link | null {
   if (Array.isArray(link)) {
     throw new Error('Unexpected array');
   }
+  if (link == null) {
+    return null;
+  }
   if (typeof link === 'object') {
     return link;
   }
-  if (link === undefined) {
-    return undefined;
-  }
   throw new Error('Invalid link');
 }