@isograph/react 0.0.0-main-63c03947 → 0.0.0-main-c1486166

package/dist/react/useResult.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useResult = useResult;
 exports.maybeUnwrapNetworkRequest = maybeUnwrapNetworkRequest;
-const IsographEnvironmentProvider_1 = require("../react/IsographEnvironmentProvider");
 const componentCache_1 = require("../core/componentCache");
-const useReadAndSubscribe_1 = require("./useReadAndSubscribe");
-const read_1 = require("../core/read");
 const PromiseWrapper_1 = require("../core/PromiseWrapper");
+const read_1 = require("../core/read");
+const IsographEnvironmentProvider_1 = require("../react/IsographEnvironmentProvider");
+const useReadAndSubscribe_1 = require("./useReadAndSubscribe");
 function useResult(fragmentReference, partialNetworkRequestOptions) {
     const environment = (0, IsographEnvironmentProvider_1.useIsographEnvironment)();
     const networkRequestOptions = (0, read_1.getNetworkRequestOptionsWithDefaults)(partialNetworkRequestOptions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-63c03947",
+  "version": "0.0.0-main-c1486166",
   "description": "Use Isograph with React",
   "homepage": "https://isograph.dev",
   "main": "dist/index.js",
@@ -8,20 +8,20 @@
   "author": "Isograph Labs",
   "license": "MIT",
   "scripts": {
-    "compile": "rm -rf dist/* && tsc -p tsconfig.pkg.json",
+    "compile-typescript": "rm -rf dist/* && tsc -p tsconfig.pkg.json",
     "compile-watch": "tsc -p tsconfig.pkg.json --watch",
     "test": "vitest run",
     "test-watch": "vitest watch",
     "coverage": "vitest run --coverage",
-    "prepack": "pnpm run test && pnpm run compile",
+    "prepack": "pnpm run test && pnpm run compile-typescript",
     "tsc": "tsc",
     "iso": "../../target/debug/isograph_cli --config ./isograph.config.json",
     "iso-watch": "../../target/debug/isograph_cli --config ./isograph.config.json --watch"
   },
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-63c03947",
-    "@isograph/react-disposable-state": "0.0.0-main-63c03947",
-    "@isograph/reference-counted-pointer": "0.0.0-main-63c03947"
+    "@isograph/disposable-types": "0.0.0-main-c1486166",
+    "@isograph/react-disposable-state": "0.0.0-main-c1486166",
+    "@isograph/reference-counted-pointer": "0.0.0-main-c1486166"
   },
   "peerDependencies": {
     "react": "18.3.1"

package/src/core/FragmentReference.ts

@@ -1,5 +1,5 @@
-import { type Link } from './IsographEnvironment';
 import { ReaderWithRefetchQueries } from '../core/entrypoint';
+import { type Link } from './IsographEnvironment';
 import { PromiseWrapper } from './PromiseWrapper';
 
 // TODO type this better

package/src/core/IsographEnvironment.ts

@@ -1,11 +1,11 @@
 import { ParentCache } from '@isograph/react-disposable-state';
-import { RetainedQuery } from './garbageCollection';
-import { WithEncounteredRecords } from './read';
+import { IsographEntrypoint } from './entrypoint';
 import { FragmentReference, Variables } from './FragmentReference';
+import { RetainedQuery } from './garbageCollection';
+import { LogFunction, WrappedLogFunction } from './logging';
 import { PromiseWrapper, wrapPromise } from './PromiseWrapper';
-import { IsographEntrypoint } from './entrypoint';
+import { WithEncounteredRecords } from './read';
 import type { ReaderAst } from './reader';
-import { LogFunction, WrappedLogFunction } from './logging';
 
 export type ComponentOrFieldName = string;
 export type StringifiedArgs = string;

package/src/core/areEqualWithDeepComparison.ts

@@ -1,5 +1,6 @@
 import type { Link } from './IsographEnvironment';
 import type { ReaderAst, ReaderLinkedField, ReaderScalarField } from './reader';
+
 export function mergeUsingReaderAst(
   field: ReaderScalarField | ReaderLinkedField,
   oldItem: unknown,

package/src/core/cache.ts

@@ -3,38 +3,38 @@ import {
   ItemCleanupPair,
   ParentCache,
 } from '@isograph/react-disposable-state';
-import {
-  DataId,
-  Link,
-  ROOT_ID,
-  StoreRecord,
-  type IsographEnvironment,
-  DataTypeValue,
-  getLink,
-  FragmentSubscription,
-  type TypeName,
-} from './IsographEnvironment';
 import {
   IsographEntrypoint,
-  type NormalizationAstNodes,
   NormalizationInlineFragment,
   NormalizationLinkedField,
   NormalizationScalarField,
   RefetchQueryNormalizationArtifactWrapper,
+  type NormalizationAstNodes,
 } from '../core/entrypoint';
-import { ReaderLinkedField, ReaderScalarField, type ReaderAst } from './reader';
-import { Argument, ArgumentValue } from './util';
-import { WithEncounteredRecords, readButDoNotEvaluate } from './read';
+import { mergeObjectsUsingReaderAst } from './areEqualWithDeepComparison';
+import { FetchOptions } from './check';
 import {
+  ExtractParameters,
   FragmentReference,
   Variables,
-  ExtractParameters,
 } from './FragmentReference';
-import { mergeObjectsUsingReaderAst } from './areEqualWithDeepComparison';
+import {
+  DataId,
+  DataTypeValue,
+  FragmentSubscription,
+  getLink,
+  Link,
+  ROOT_ID,
+  StoreRecord,
+  type IsographEnvironment,
+  type TypeName,
+} from './IsographEnvironment';
+import { logMessage } from './logging';
 import { maybeMakeNetworkRequest } from './makeNetworkRequest';
 import { wrapResolvedValue } from './PromiseWrapper';
-import { logMessage } from './logging';
-import { FetchOptions } from './check';
+import { readButDoNotEvaluate, WithEncounteredRecords } from './read';
+import { ReaderLinkedField, ReaderScalarField, type ReaderAst } from './reader';
+import { Argument, ArgumentValue } from './util';
 
 export const TYPENAME_FIELD_NAME = '__typename';
 

package/src/core/componentCache.ts

@@ -1,10 +1,10 @@
+import { useReadAndSubscribe } from '../react/useReadAndSubscribe';
 import { stableCopy } from './cache';
-import { IsographEnvironment } from './IsographEnvironment';
 import { FragmentReference } from './FragmentReference';
-import { useReadAndSubscribe } from '../react/useReadAndSubscribe';
-import { NetworkRequestReaderOptions } from './read';
-import { readPromise } from './PromiseWrapper';
+import { IsographEnvironment } from './IsographEnvironment';
 import { logMessage } from './logging';
+import { readPromise } from './PromiseWrapper';
+import { NetworkRequestReaderOptions } from './read';
 
 export function getOrCreateCachedComponent(
   environment: IsographEnvironment,

package/src/core/garbageCollection.ts

@@ -1,15 +1,15 @@
+import { getParentRecordKey } from './cache';
+import { NormalizationAstNodes } from './entrypoint';
 import { Variables } from './FragmentReference';
 import {
+  assertLink,
   DataId,
   IsographEnvironment,
   IsographStore,
   StoreRecord,
-  assertLink,
   type Link,
   type TypeName,
 } from './IsographEnvironment';
-import { getParentRecordKey } from './cache';
-import { NormalizationAstNodes } from './entrypoint';
 
 export type RetainedQuery = {
   readonly normalizationAst: NormalizationAstNodes;

package/src/core/logging.ts

@@ -1,20 +1,20 @@
 import { CleanupFn } from '@isograph/disposable-types';
+import { NetworkResponseObject, type EncounteredIds } from './cache';
+import { CheckResult } from './check';
+import {
+  IsographEntrypoint,
+  RefetchQueryNormalizationArtifact,
+  type NormalizationAstNodes,
+} from './entrypoint';
+import { FragmentReference, Variables } from './FragmentReference';
 import {
   IsographEnvironment,
   IsographStore,
   StoreRecord,
   type Link,
 } from './IsographEnvironment';
-import {
-  IsographEntrypoint,
-  type NormalizationAstNodes,
-  RefetchQueryNormalizationArtifact,
-} from './entrypoint';
-import { FragmentReference, Variables } from './FragmentReference';
-import { NetworkResponseObject, type EncounteredIds } from './cache';
-import { Arguments } from './util';
 import { ReadDataResult } from './read';
-import { CheckResult } from './check';
+import { Arguments } from './util';
 
 export type LogMessage =
   | {

package/src/core/makeNetworkRequest.ts

@@ -1,4 +1,7 @@
 import { ItemCleanupPair } from '@isograph/disposable-types';
+import { normalizeData } from './cache';
+import { check, DEFAULT_SHOULD_FETCH_VALUE, FetchOptions } from './check';
+import { getOrCreateCachedComponent } from './componentCache';
 import {
   IsographEntrypoint,
   RefetchQueryNormalizationArtifact,
@@ -11,17 +14,14 @@ import {
   unretainQuery,
 } from './garbageCollection';
 import { IsographEnvironment, Link, ROOT_ID } from './IsographEnvironment';
+import { logMessage } from './logging';
 import {
   AnyError,
   PromiseWrapper,
   wrapPromise,
   wrapResolvedValue,
 } from './PromiseWrapper';
-import { normalizeData } from './cache';
-import { logMessage } from './logging';
-import { check, DEFAULT_SHOULD_FETCH_VALUE, FetchOptions } from './check';
 import { readButDoNotEvaluate } from './read';
-import { getOrCreateCachedComponent } from './componentCache';
 
 let networkRequestId = 0;
 

package/src/core/read.ts

@@ -1,19 +1,21 @@
+import { CleanupFn } from '@isograph/disposable-types';
 import {
   getParentRecordKey,
   insertIfNotExists,
   onNextChangeToRecord,
   type EncounteredIds,
 } from './cache';
+import { FetchOptions } from './check';
 import { getOrCreateCachedComponent } from './componentCache';
 import {
   IsographEntrypoint,
   RefetchQueryNormalizationArtifactWrapper,
 } from './entrypoint';
 import {
-  FragmentReference,
-  Variables,
   ExtractData,
   ExtractParameters,
+  FragmentReference,
+  Variables,
 } from './FragmentReference';
 import {
   assertLink,
@@ -21,6 +23,7 @@ import {
   IsographEnvironment,
   type Link,
 } from './IsographEnvironment';
+import { logMessage } from './logging';
 import { maybeMakeNetworkRequest } from './makeNetworkRequest';
 import {
   getPromiseState,
@@ -32,9 +35,6 @@ import {
 } from './PromiseWrapper';
 import { ReaderAst } from './reader';
 import { Arguments } from './util';
-import { logMessage } from './logging';
-import { CleanupFn } from '@isograph/disposable-types';
-import { FetchOptions } from './check';
 
 export type WithEncounteredRecords<T> = {
   readonly encounteredRecords: EncounteredIds;

package/src/core/reader.ts

@@ -1,22 +1,22 @@
 import { Factory } from '@isograph/disposable-types';
+import { FetchOptions } from './check';
+import {
+  IsographEntrypoint,
+  IsographEntrypointLoader,
+  RefetchQueryNormalizationArtifact,
+  RefetchQueryNormalizationArtifactWrapper,
+} from './entrypoint';
 import {
-  FragmentReference,
-  ExtractParameters,
   ExtractData,
+  ExtractParameters,
+  FragmentReference,
 } from './FragmentReference';
 import {
   ComponentOrFieldName,
   IsographEnvironment,
   type Link,
 } from './IsographEnvironment';
-import {
-  IsographEntrypoint,
-  IsographEntrypointLoader,
-  RefetchQueryNormalizationArtifact,
-  RefetchQueryNormalizationArtifactWrapper,
-} from './entrypoint';
 import { Arguments } from './util';
-import { FetchOptions } from './check';
 
 export type TopLevelReaderArtifact<
   TReadFromStore extends { parameters: object; data: object },

package/src/loadable-hooks/useClientSideDefer.ts

@@ -1,12 +1,12 @@
+import { useLazyDisposableState } from '@isograph/react-disposable-state';
+import { getOrCreateItemInSuspenseCache } from '../core/cache';
+import { FetchOptions } from '../core/check';
 import {
   ExtractParameters,
   FragmentReference,
 } from '../core/FragmentReference';
-import { useIsographEnvironment } from '../react/IsographEnvironmentProvider';
-import { getOrCreateItemInSuspenseCache } from '../core/cache';
-import { useLazyDisposableState } from '@isograph/react-disposable-state';
 import { LoadableField } from '../core/reader';
-import { FetchOptions } from '../core/check';
+import { useIsographEnvironment } from '../react/IsographEnvironmentProvider';
 
 export function useClientSideDefer<
   TReadFromStore extends { data: object; parameters: object },

package/src/loadable-hooks/useConnectionSpecPagination.ts

@@ -9,6 +9,7 @@ import {
 } from '@isograph/reference-counted-pointer';
 import { useState } from 'react';
 import { subscribeToAnyChange } from '../core/cache';
+import { FetchOptions } from '../core/check';
 import { FragmentReference } from '../core/FragmentReference';
 import { getPromiseState, readPromise } from '../core/PromiseWrapper';
 import {
@@ -19,7 +20,6 @@ import { LoadableField, type ReaderAst } from '../core/reader';
 import { useIsographEnvironment } from '../react/IsographEnvironmentProvider';
 import { useSubscribeToMultiple } from '../react/useReadAndSubscribe';
 import { maybeUnwrapNetworkRequest } from '../react/useResult';
-import { FetchOptions } from '../core/check';
 
 type UsePaginationReturnValue<
   TReadFromStore extends { parameters: object; data: object },

package/src/loadable-hooks/useImperativeLoadableField.ts

@@ -1,13 +1,13 @@
-import {
-  ExtractParameters,
-  FragmentReference,
-} from '../core/FragmentReference';
 import {
   UnassignedState,
   useUpdatableDisposableState,
 } from '@isograph/react-disposable-state';
-import { LoadableField } from '../core/reader';
 import { FetchOptions } from '../core/check';
+import {
+  ExtractParameters,
+  FragmentReference,
+} from '../core/FragmentReference';
+import { LoadableField } from '../core/reader';
 
 type UseImperativeLoadableFieldReturn<
   TReadFromStore extends { data: object; parameters: object },

package/src/loadable-hooks/useSkipLimitPagination.ts

@@ -1,11 +1,4 @@
-import { LoadableField, type ReaderAst } from '../core/reader';
-import { useIsographEnvironment } from '../react/IsographEnvironmentProvider';
 import { ItemCleanupPair } from '@isograph/disposable-types';
-import { FragmentReference } from '../core/FragmentReference';
-import { maybeUnwrapNetworkRequest } from '../react/useResult';
-import { readButDoNotEvaluate } from '../core/read';
-import { subscribeToAnyChange } from '../core/cache';
-import { useState } from 'react';
 import {
   UNASSIGNED_STATE,
   useUpdatableDisposableState,
@@ -14,10 +7,19 @@ import {
   createReferenceCountedPointer,
   ReferenceCountedPointer,
 } from '@isograph/reference-counted-pointer';
+import { useState } from 'react';
+import { subscribeToAnyChange } from '../core/cache';
+import { FetchOptions } from '../core/check';
+import { FragmentReference } from '../core/FragmentReference';
 import { getPromiseState, readPromise } from '../core/PromiseWrapper';
-import { type WithEncounteredRecords } from '../core/read';
+import {
+  readButDoNotEvaluate,
+  type WithEncounteredRecords,
+} from '../core/read';
+import { LoadableField, type ReaderAst } from '../core/reader';
+import { useIsographEnvironment } from '../react/IsographEnvironmentProvider';
 import { useSubscribeToMultiple } from '../react/useReadAndSubscribe';
-import { FetchOptions } from '../core/check';
+import { maybeUnwrapNetworkRequest } from '../react/useResult';
 
 type UseSkipLimitReturnValue<
   TReadFromStore extends { data: object; parameters: object },

package/src/react/FragmentReader.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { ExtractReadFromStore, IsographEntrypoint } from '../core/entrypoint';
 import { FragmentReference } from '../core/FragmentReference';
-import { useResult } from './useResult';
 import { NetworkRequestReaderOptions } from '../core/read';
+import { useResult } from './useResult';
 
 type IsExactlyIntrinsicAttributes<T> = T extends JSX.IntrinsicAttributes
   ? JSX.IntrinsicAttributes extends T

package/src/react/IsographEnvironmentProvider.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ReactNode, createContext, useContext } from 'react';
+import { createContext, ReactNode, useContext } from 'react';
 import { type IsographEnvironment } from '../core/IsographEnvironment';
 
 export const IsographEnvironmentContext =

package/src/react/useImperativeReference.ts

@@ -2,16 +2,16 @@ import {
   UnassignedState,
   useUpdatableDisposableState,
 } from '@isograph/react-disposable-state';
+import { FetchOptions } from '../core/check';
 import { IsographEntrypoint } from '../core/entrypoint';
 import {
-  FragmentReference,
   ExtractParameters,
+  FragmentReference,
 } from '../core/FragmentReference';
-import { useIsographEnvironment } from './IsographEnvironmentProvider';
 import { ROOT_ID } from '../core/IsographEnvironment';
 import { maybeMakeNetworkRequest } from '../core/makeNetworkRequest';
 import { wrapResolvedValue } from '../core/PromiseWrapper';
-import { FetchOptions } from '../core/check';
+import { useIsographEnvironment } from './IsographEnvironmentProvider';
 
 // TODO rename this to useImperativelyLoadedEntrypoint
 

package/src/react/useLazyReference.ts

@@ -1,13 +1,13 @@
+import { useLazyDisposableState } from '@isograph/react-disposable-state';
+import { getOrCreateCacheForArtifact } from '../core/cache';
+import { FetchOptions } from '../core/check';
+import { IsographEntrypoint } from '../core/entrypoint';
 import {
-  FragmentReference,
   ExtractParameters,
+  FragmentReference,
 } from '../core/FragmentReference';
-import { useIsographEnvironment } from './IsographEnvironmentProvider';
-import { IsographEntrypoint } from '../core/entrypoint';
-import { getOrCreateCacheForArtifact } from '../core/cache';
-import { useLazyDisposableState } from '@isograph/react-disposable-state';
 import { logMessage } from '../core/logging';
-import { FetchOptions } from '../core/check';
+import { useIsographEnvironment } from './IsographEnvironmentProvider';
 
 export function useLazyReference<
   TReadFromStore extends { parameters: object; data: object },

package/src/react/useReadAndSubscribe.ts

@@ -1,18 +1,18 @@
 import { useEffect, useState } from 'react';
+import { subscribe } from '../core/cache';
 import {
+  ExtractData,
   FragmentReference,
   stableIdForFragmentReference,
-  ExtractData,
 } from '../core/FragmentReference';
 import {
   NetworkRequestReaderOptions,
   readButDoNotEvaluate,
   WithEncounteredRecords,
 } from '../core/read';
-import { useRerenderOnChange } from './useRerenderOnChange';
-import { useIsographEnvironment } from './IsographEnvironmentProvider';
-import { subscribe } from '../core/cache';
 import type { ReaderAst } from '../core/reader';
+import { useIsographEnvironment } from './IsographEnvironmentProvider';
+import { useRerenderOnChange } from './useRerenderOnChange';
 
 /**
  * Read the data from a fragment reference and subscribe to updates.

package/src/react/useRerenderOnChange.ts

@@ -1,9 +1,9 @@
 import { useEffect } from 'react';
 import { subscribe } from '../core/cache';
-import { WithEncounteredRecords } from '../core/read';
 import { FragmentReference } from '../core/FragmentReference';
-import { useIsographEnvironment } from './IsographEnvironmentProvider';
+import { WithEncounteredRecords } from '../core/read';
 import type { ReaderAst } from '../core/reader';
+import { useIsographEnvironment } from './IsographEnvironmentProvider';
 
 // TODO add unit tests for this. Add integration tests that test
 // behavior when the encounteredRecords underneath a fragment change.

package/src/react/useResult.ts

@@ -1,16 +1,16 @@
-import { useIsographEnvironment } from '../react/IsographEnvironmentProvider';
-import { FragmentReference } from '../core/FragmentReference';
 import { getOrCreateCachedComponent } from '../core/componentCache';
-import { useReadAndSubscribe } from './useReadAndSubscribe';
-import {
-  getNetworkRequestOptionsWithDefaults,
-  NetworkRequestReaderOptions,
-} from '../core/read';
+import { FragmentReference } from '../core/FragmentReference';
 import {
   getPromiseState,
   PromiseWrapper,
   readPromise,
 } from '../core/PromiseWrapper';
+import {
+  getNetworkRequestOptionsWithDefaults,
+  NetworkRequestReaderOptions,
+} from '../core/read';
+import { useIsographEnvironment } from '../react/IsographEnvironmentProvider';
+import { useReadAndSubscribe } from './useReadAndSubscribe';
 
 export function useResult<
   TReadFromStore extends { parameters: object; data: object },

package/src/tests/garbageCollection.test.ts

@@ -1,14 +1,15 @@
-import { describe, test, expect } from 'vitest';
-import {
-  ROOT_ID,
-  createIsographEnvironment,
-  type IsographStore,
-} from '../core/IsographEnvironment';
+import { describe, expect, test } from 'vitest';
 import {
   garbageCollectEnvironment,
   retainQuery,
 } from '../core/garbageCollection';
+import {
+  createIsographEnvironment,
+  ROOT_ID,
+  type IsographStore,
+} from '../core/IsographEnvironment';
 import { iso } from './__isograph/iso';
+import { meNameSuccessorRetainedQuery } from './meNameSuccessor';
 import { nodeFieldRetainedQuery } from './nodeQuery';
 
 const getDefaultStore = (): IsographStore => ({
@@ -52,7 +53,7 @@ export const meNameField = iso(`
     }
   }
 `)(() => {});
-import { meNameSuccessorRetainedQuery } from './meNameSuccessor';
+
 const meNameEntrypoint = iso(`entrypoint Query.meName`);
 const meNameRetainedQuery = {
   normalizationAst: