@isograph/react 0.0.0-main-4089db6d → 0.0.0-main-d564e834

package/dist/{FragmentReference.d.ts → core/FragmentReference.d.ts}

@@ -1,5 +1,5 @@
 import { DataId } from './IsographEnvironment';
-import { RefetchQueryNormalizationArtifactWrapper } from './entrypoint';
+import { RefetchQueryNormalizationArtifactWrapper } from '../core/entrypoint';
 import { TopLevelReaderArtifact } from './reader';
 export type VariableValue = string | number | boolean | null | object;
 export type Variables = {

package/dist/{cache.d.ts → core/cache.d.ts}

@@ -1,7 +1,7 @@
-import { Factory, ItemCleanupPair, ParentCache } from '@isograph/react-disposable-state';
+import { Factory, ParentCache } from '@isograph/react-disposable-state';
 import { PromiseWrapper } from './PromiseWrapper';
 import { DataId, type IsographEnvironment } from './IsographEnvironment';
-import { IsographEntrypoint, NormalizationAst, NormalizationLinkedField, NormalizationScalarField, RefetchQueryNormalizationArtifact, RefetchQueryNormalizationArtifactWrapper } from './entrypoint';
+import { IsographEntrypoint, NormalizationAst, NormalizationLinkedField, NormalizationScalarField, RefetchQueryNormalizationArtifactWrapper } from '../core/entrypoint';
 import { ReaderLinkedField, ReaderScalarField } from './reader';
 import { WithEncounteredRecords } from './read';
 import { FragmentReference, Variables } from './FragmentReference';
@@ -18,7 +18,6 @@ export declare function getOrCreateCache<T>(environment: IsographEnvironment, in
  */
 export declare function stableCopy<T>(value: T): T;
 export declare function getOrCreateCacheForArtifact<TReadFromStore extends Object, TClientFieldValue>(environment: IsographEnvironment, artifact: IsographEntrypoint<TReadFromStore, TClientFieldValue>, variables: Variables): ParentCache<PromiseWrapper<TClientFieldValue>>;
-export declare function makeNetworkRequest<T>(environment: IsographEnvironment, artifact: RefetchQueryNormalizationArtifact | IsographEntrypoint<any, any>, variables: Variables): ItemCleanupPair<PromiseWrapper<T>>;
 type NetworkResponseScalarValue = string | number | boolean;
 type NetworkResponseValue = NetworkResponseScalarValue | null | NetworkResponseObject | NetworkResponseObject[] | NetworkResponseScalarValue[];
 type NetworkResponseObject = {

package/dist/{cache.js → core/cache.js}

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SECOND_SPLIT_KEY = exports.FIRST_SPLIT_KEY = exports.getParentRecordKey = exports.onNextChange = exports.subscribe = exports.subscribeToAnyChange = exports.normalizeData = exports.makeNetworkRequest = exports.getOrCreateCacheForArtifact = exports.stableCopy = exports.getOrCreateCache = void 0;
+exports.SECOND_SPLIT_KEY = exports.FIRST_SPLIT_KEY = exports.getParentRecordKey = exports.onNextChange = exports.subscribe = exports.subscribeToAnyChange = exports.normalizeData = exports.getOrCreateCacheForArtifact = exports.stableCopy = exports.getOrCreateCache = void 0;
 const react_disposable_state_1 = require("@isograph/react-disposable-state");
-const PromiseWrapper_1 = require("./PromiseWrapper");
 const IsographEnvironment_1 = require("./IsographEnvironment");
-const garbageCollection_1 = require("./garbageCollection");
 const read_1 = require("./read");
 const areEqualWithDeepComparison_1 = require("./areEqualWithDeepComparison");
+const makeNetworkRequest_1 = require("./makeNetworkRequest");
 const TYPENAME_FIELD_NAME = '__typename';
 function getOrCreateCache(environment, index, factory) {
     if (typeof window !== 'undefined' && window.__LOG) {
@@ -46,57 +45,10 @@ function stableCopy(value) {
 exports.stableCopy = stableCopy;
 function getOrCreateCacheForArtifact(environment, artifact, variables) {
     const cacheKey = artifact.queryText + JSON.stringify(stableCopy(variables));
-    const factory = () => makeNetworkRequest(environment, artifact, variables);
+    const factory = () => (0, makeNetworkRequest_1.makeNetworkRequest)(environment, artifact, variables);
     return getOrCreateCache(environment, cacheKey, factory);
 }
 exports.getOrCreateCacheForArtifact = getOrCreateCacheForArtifact;
-function makeNetworkRequest(environment, artifact, variables) {
-    if (typeof window !== 'undefined' && window.__LOG) {
-        console.log('make network request', artifact, variables);
-    }
-    let status = {
-        kind: 'UndisposedIncomplete',
-    };
-    // This should be an observable, not a promise
-    const promise = environment
-        .networkFunction(artifact.queryText, variables)
-        .then((networkResponse) => {
-        if (typeof window !== 'undefined' && window.__LOG) {
-            console.log('network response', artifact, networkResponse);
-        }
-        if (status.kind === 'UndisposedIncomplete') {
-            normalizeData(environment, artifact.normalizationAst, networkResponse.data, variables, artifact.kind === 'Entrypoint' ? artifact.nestedRefetchQueries : []);
-            const retainedQuery = {
-                normalizationAst: artifact.normalizationAst,
-                variables,
-            };
-            status = {
-                kind: 'UndisposedComplete',
-                retainedQuery,
-            };
-            (0, garbageCollection_1.retainQuery)(environment, retainedQuery);
-        }
-        // TODO return null
-        return networkResponse;
-    });
-    const wrapper = (0, PromiseWrapper_1.wrapPromise)(promise);
-    const response = [
-        wrapper,
-        () => {
-            if (status.kind === 'UndisposedComplete') {
-                const didUnretainSomeQuery = (0, garbageCollection_1.unretainQuery)(environment, status.retainedQuery);
-                if (didUnretainSomeQuery) {
-                    (0, garbageCollection_1.garbageCollectEnvironment)(environment);
-                }
-            }
-            status = {
-                kind: 'Disposed',
-            };
-        },
-    ];
-    return response;
-}
-exports.makeNetworkRequest = makeNetworkRequest;
 function normalizeData(environment, normalizationAst, networkResponse, variables, nestedRefetchQueries) {
     const encounteredIds = new Set();
     if (typeof window !== 'undefined' && window.__LOG) {

package/dist/{componentCache.js → core/componentCache.js}

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOrCreateCachedComponent = void 0;
 const cache_1 = require("./cache");
-const useReadAndSubscribe_1 = require("./useReadAndSubscribe");
+const useReadAndSubscribe_1 = require("../react/useReadAndSubscribe");
 function getOrCreateCachedComponent(environment, componentName, fragmentReference) {
     var _a, _b, _c;
     // cachedComponentsById is a three layer cache: id, then component name, then

package/dist/core/makeNetworkRequest.d.ts

@@ -0,0 +1,6 @@
+import { ItemCleanupPair } from '@isograph/disposable-types';
+import { IsographEntrypoint, RefetchQueryNormalizationArtifact } from './entrypoint';
+import { Variables } from './FragmentReference';
+import { IsographEnvironment } from './IsographEnvironment';
+import { PromiseWrapper } from './PromiseWrapper';
+export declare function makeNetworkRequest<T>(environment: IsographEnvironment, artifact: RefetchQueryNormalizationArtifact | IsographEntrypoint<any, any>, variables: Variables): ItemCleanupPair<PromiseWrapper<T>>;

package/dist/core/makeNetworkRequest.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeNetworkRequest = void 0;
+const garbageCollection_1 = require("./garbageCollection");
+const PromiseWrapper_1 = require("./PromiseWrapper");
+const cache_1 = require("./cache");
+function makeNetworkRequest(environment, artifact, variables) {
+    if (typeof window !== 'undefined' && window.__LOG) {
+        console.log('make network request', artifact, variables);
+    }
+    let status = {
+        kind: 'UndisposedIncomplete',
+    };
+    // This should be an observable, not a promise
+    const promise = environment
+        .networkFunction(artifact.queryText, variables)
+        .then((networkResponse) => {
+        var _a;
+        if (typeof window !== 'undefined' && window.__LOG) {
+            console.log('network response', artifact, networkResponse);
+        }
+        if (status.kind === 'UndisposedIncomplete') {
+            (0, cache_1.normalizeData)(environment, artifact.normalizationAst, (_a = networkResponse.data) !== null && _a !== void 0 ? _a : {}, variables, artifact.kind === 'Entrypoint' ? artifact.nestedRefetchQueries : []);
+            const retainedQuery = {
+                normalizationAst: artifact.normalizationAst,
+                variables,
+            };
+            status = {
+                kind: 'UndisposedComplete',
+                retainedQuery,
+            };
+            (0, garbageCollection_1.retainQuery)(environment, retainedQuery);
+        }
+        // TODO return null
+        return networkResponse;
+    });
+    const wrapper = (0, PromiseWrapper_1.wrapPromise)(promise);
+    const response = [
+        wrapper,
+        () => {
+            if (status.kind === 'UndisposedComplete') {
+                const didUnretainSomeQuery = (0, garbageCollection_1.unretainQuery)(environment, status.retainedQuery);
+                if (didUnretainSomeQuery) {
+                    (0, garbageCollection_1.garbageCollectEnvironment)(environment);
+                }
+            }
+            status = {
+                kind: 'Disposed',
+            };
+        },
+    ];
+    return response;
+}
+exports.makeNetworkRequest = makeNetworkRequest;

package/dist/{read.js → core/read.js}

@@ -4,6 +4,7 @@ exports.readButDoNotEvaluate = void 0;
 const cache_1 = require("./cache");
 const componentCache_1 = require("./componentCache");
 const IsographEnvironment_1 = require("./IsographEnvironment");
+const makeNetworkRequest_1 = require("./makeNetworkRequest");
 function readButDoNotEvaluate(environment, reference) {
     var _a;
     const mutableEncounteredRecords = new Set();
@@ -218,7 +219,7 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, mutab
                             };
                             const localVariables = includeReadOutData(args !== null && args !== void 0 ? args : {}, refetchReaderParams.data);
                             writeQueryArgsToVariables(localVariables, field.queryArguments, variables);
-                            const [_networkRequest, disposeNetworkRequest] = (0, cache_1.makeNetworkRequest)(environment, field.entrypoint, localVariables);
+                            const [_networkRequest, disposeNetworkRequest] = (0, makeNetworkRequest_1.makeNetworkRequest)(environment, field.entrypoint, localVariables);
                             const fragmentReference = {
                                 kind: 'FragmentReference',
                                 readerArtifact: field.entrypoint.readerArtifact,

package/dist/index.d.ts

@@ -1,16 +1,17 @@
-export { retainQuery, unretainQuery, type RetainedQuery, garbageCollectEnvironment, } from './garbageCollection';
-export { type PromiseWrapper } from './PromiseWrapper';
-export { makeNetworkRequest, subscribe, normalizeData } from './cache';
-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';
-export { EagerReaderArtifact, ComponentReaderArtifact, RefetchReaderArtifact, ReaderAst, ReaderAstNode, ReaderLinkedField, ReaderNonLoadableResolverField, ReaderScalarField, TopLevelReaderArtifact, LoadableField, } from './reader';
-export { NormalizationAst, NormalizationAstNode, NormalizationLinkedField, NormalizationScalarField, IsographEntrypoint, assertIsEntrypoint, RefetchQueryNormalizationArtifact, RefetchQueryNormalizationArtifactWrapper, } from './entrypoint';
-export { readButDoNotEvaluate } from './read';
-export { useResult } from './useResult';
-export { type FragmentReference } from './FragmentReference';
-export { useLazyReference } from './useLazyReference';
-export { ExtractSecondParam, Argument, ArgumentName, ArgumentValue, Arguments, } from './util';
-export { useRerenderOnChange } from './useRerenderOnChange';
+export { retainQuery, unretainQuery, type RetainedQuery, garbageCollectEnvironment, } from './core/garbageCollection';
+export { type PromiseWrapper } from './core/PromiseWrapper';
+export { subscribe, normalizeData } from './core/cache';
+export { makeNetworkRequest } from './core/makeNetworkRequest';
+export { ROOT_ID, type DataId, type DataTypeValue, type IsographEnvironment, type IsographNetworkFunction, type IsographStore, type Link, type StoreRecord, createIsographEnvironment, createIsographStore, defaultMissingFieldHandler, } from './core/IsographEnvironment';
+export { EagerReaderArtifact, ComponentReaderArtifact, RefetchReaderArtifact, ReaderAst, ReaderAstNode, ReaderLinkedField, ReaderNonLoadableResolverField, ReaderScalarField, TopLevelReaderArtifact, LoadableField, } from './core/reader';
+export { NormalizationAst, NormalizationAstNode, NormalizationLinkedField, NormalizationScalarField, IsographEntrypoint, assertIsEntrypoint, RefetchQueryNormalizationArtifact, RefetchQueryNormalizationArtifactWrapper, } from './core/entrypoint';
+export { readButDoNotEvaluate } from './core/read';
+export { ExtractSecondParam, Argument, ArgumentName, ArgumentValue, Arguments, } from './core/util';
+export { type FragmentReference } from './core/FragmentReference';
+export { IsographEnvironmentProvider, useIsographEnvironment, type IsographEnvironmentProviderProps, } from './react/IsographEnvironmentProvider';
+export { useImperativeReference } from './react/useImperativeReference';
+export { FragmentReferenceReader } from './react/FragmentReferenceReader';
+export { useResult } from './react/useResult';
+export { useLazyReference } from './react/useLazyReference';
+export { useRerenderOnChange } from './react/useRerenderOnChange';
 export { useClientSideDefer } from './loadable-hooks/useClientSideDefer';

package/dist/index.js

@@ -1,35 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useClientSideDefer = exports.useRerenderOnChange = exports.useLazyReference = exports.useResult = exports.readButDoNotEvaluate = exports.assertIsEntrypoint = exports.EntrypointReader = exports.useImperativeReference = exports.useIsographEnvironment = exports.IsographEnvironmentProvider = exports.defaultMissingFieldHandler = exports.createIsographStore = exports.createIsographEnvironment = exports.ROOT_ID = exports.normalizeData = exports.subscribe = exports.makeNetworkRequest = exports.garbageCollectEnvironment = exports.unretainQuery = exports.retainQuery = void 0;
-var garbageCollection_1 = require("./garbageCollection");
+exports.useClientSideDefer = exports.useRerenderOnChange = exports.useLazyReference = exports.useResult = exports.FragmentReferenceReader = exports.useImperativeReference = exports.useIsographEnvironment = exports.IsographEnvironmentProvider = exports.readButDoNotEvaluate = exports.assertIsEntrypoint = exports.defaultMissingFieldHandler = exports.createIsographStore = exports.createIsographEnvironment = exports.ROOT_ID = exports.makeNetworkRequest = exports.normalizeData = exports.subscribe = exports.garbageCollectEnvironment = exports.unretainQuery = exports.retainQuery = void 0;
+var garbageCollection_1 = require("./core/garbageCollection");
 Object.defineProperty(exports, "retainQuery", { enumerable: true, get: function () { return garbageCollection_1.retainQuery; } });
 Object.defineProperty(exports, "unretainQuery", { enumerable: true, get: function () { return garbageCollection_1.unretainQuery; } });
 Object.defineProperty(exports, "garbageCollectEnvironment", { enumerable: true, get: function () { return garbageCollection_1.garbageCollectEnvironment; } });
-var cache_1 = require("./cache");
-Object.defineProperty(exports, "makeNetworkRequest", { enumerable: true, get: function () { return cache_1.makeNetworkRequest; } });
+var cache_1 = require("./core/cache");
 Object.defineProperty(exports, "subscribe", { enumerable: true, get: function () { return cache_1.subscribe; } });
 Object.defineProperty(exports, "normalizeData", { enumerable: true, get: function () { return cache_1.normalizeData; } });
-var IsographEnvironment_1 = require("./IsographEnvironment");
+var makeNetworkRequest_1 = require("./core/makeNetworkRequest");
+Object.defineProperty(exports, "makeNetworkRequest", { enumerable: true, get: function () { return makeNetworkRequest_1.makeNetworkRequest; } });
+var IsographEnvironment_1 = require("./core/IsographEnvironment");
 Object.defineProperty(exports, "ROOT_ID", { enumerable: true, get: function () { return IsographEnvironment_1.ROOT_ID; } });
 Object.defineProperty(exports, "createIsographEnvironment", { enumerable: true, get: function () { return IsographEnvironment_1.createIsographEnvironment; } });
 Object.defineProperty(exports, "createIsographStore", { enumerable: true, get: function () { return IsographEnvironment_1.createIsographStore; } });
 Object.defineProperty(exports, "defaultMissingFieldHandler", { enumerable: true, get: function () { return IsographEnvironment_1.defaultMissingFieldHandler; } });
-var IsographEnvironmentProvider_1 = require("./IsographEnvironmentProvider");
+var entrypoint_1 = require("./core/entrypoint");
+Object.defineProperty(exports, "assertIsEntrypoint", { enumerable: true, get: function () { return entrypoint_1.assertIsEntrypoint; } });
+var read_1 = require("./core/read");
+Object.defineProperty(exports, "readButDoNotEvaluate", { enumerable: true, get: function () { return read_1.readButDoNotEvaluate; } });
+var IsographEnvironmentProvider_1 = require("./react/IsographEnvironmentProvider");
 Object.defineProperty(exports, "IsographEnvironmentProvider", { enumerable: true, get: function () { return IsographEnvironmentProvider_1.IsographEnvironmentProvider; } });
 Object.defineProperty(exports, "useIsographEnvironment", { enumerable: true, get: function () { return IsographEnvironmentProvider_1.useIsographEnvironment; } });
-var useImperativeReference_1 = require("./useImperativeReference");
+var useImperativeReference_1 = require("./react/useImperativeReference");
 Object.defineProperty(exports, "useImperativeReference", { enumerable: true, get: function () { return useImperativeReference_1.useImperativeReference; } });
-var EntrypointReader_1 = require("./EntrypointReader");
-Object.defineProperty(exports, "EntrypointReader", { enumerable: true, get: function () { return EntrypointReader_1.EntrypointReader; } });
-var entrypoint_1 = require("./entrypoint");
-Object.defineProperty(exports, "assertIsEntrypoint", { enumerable: true, get: function () { return entrypoint_1.assertIsEntrypoint; } });
-var read_1 = require("./read");
-Object.defineProperty(exports, "readButDoNotEvaluate", { enumerable: true, get: function () { return read_1.readButDoNotEvaluate; } });
-var useResult_1 = require("./useResult");
+var FragmentReferenceReader_1 = require("./react/FragmentReferenceReader");
+Object.defineProperty(exports, "FragmentReferenceReader", { enumerable: true, get: function () { return FragmentReferenceReader_1.FragmentReferenceReader; } });
+var useResult_1 = require("./react/useResult");
 Object.defineProperty(exports, "useResult", { enumerable: true, get: function () { return useResult_1.useResult; } });
-var useLazyReference_1 = require("./useLazyReference");
+var useLazyReference_1 = require("./react/useLazyReference");
 Object.defineProperty(exports, "useLazyReference", { enumerable: true, get: function () { return useLazyReference_1.useLazyReference; } });
-var useRerenderOnChange_1 = require("./useRerenderOnChange");
+var useRerenderOnChange_1 = require("./react/useRerenderOnChange");
 Object.defineProperty(exports, "useRerenderOnChange", { enumerable: true, get: function () { return useRerenderOnChange_1.useRerenderOnChange; } });
 var useClientSideDefer_1 = require("./loadable-hooks/useClientSideDefer");
 Object.defineProperty(exports, "useClientSideDefer", { enumerable: true, get: function () { return useClientSideDefer_1.useClientSideDefer; } });

package/dist/loadable-hooks/useClientSideDefer.d.ts

@@ -1,4 +1,4 @@
-import { FragmentReference } from '../FragmentReference';
-import { LoadableField } from '../reader';
+import { FragmentReference } from '../core/FragmentReference';
+import { LoadableField } from '../core/reader';
 export declare function useClientSideDefer<TResult>(loadableField: LoadableField<void, TResult>): FragmentReference<any, TResult>;
 export declare function useClientSideDefer<TArgs, TResult>(loadableField: LoadableField<TArgs, TResult>, args: TArgs): FragmentReference<any, TResult>;

package/dist/loadable-hooks/useClientSideDefer.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useClientSideDefer = void 0;
-const IsographEnvironmentProvider_1 = require("../IsographEnvironmentProvider");
-const cache_1 = require("../cache");
+const IsographEnvironmentProvider_1 = require("../react/IsographEnvironmentProvider");
+const cache_1 = require("../core/cache");
 const react_disposable_state_1 = require("@isograph/react-disposable-state");
 // TODO allow the user to pass props somehow
 function useClientSideDefer(loadableField, args) {

package/dist/react/FragmentReferenceReader.d.ts

@@ -0,0 +1,10 @@
+import * as React from 'react';
+import { ExtractReadFromStore, IsographEntrypoint } from '../core/entrypoint';
+import { FragmentReference } from '../core/FragmentReference';
+export declare function FragmentReferenceReader<TProps extends Record<any, any>, TEntrypoint extends IsographEntrypoint<any, React.FC<TProps>>>(props: TProps extends Record<string, never> ? {
+    fragmentReference: FragmentReference<ExtractReadFromStore<TEntrypoint>, React.FC<{}>>;
+    additionalProps?: TProps;
+} : {
+    fragmentReference: FragmentReference<ExtractReadFromStore<TEntrypoint>, React.FC<TProps>>;
+    additionalProps: TProps;
+}): React.ReactNode;

package/dist/{EntrypointReader.js → react/FragmentReferenceReader.js}

@@ -23,11 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntrypointReader = void 0;
+exports.FragmentReferenceReader = void 0;
 const React = __importStar(require("react"));
 const useResult_1 = require("./useResult");
-function EntrypointReader(props) {
+function FragmentReferenceReader(props) {
     const Component = (0, useResult_1.useResult)(props.fragmentReference);
     return React.createElement(Component, Object.assign({}, props.additionalProps));
 }
-exports.EntrypointReader = EntrypointReader;
+exports.FragmentReferenceReader = FragmentReferenceReader;

package/dist/{IsographEnvironmentProvider.d.ts → react/IsographEnvironmentProvider.d.ts}

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { ReactNode } from 'react';
-import { type IsographEnvironment } from './IsographEnvironment';
+import { type IsographEnvironment } from '../core/IsographEnvironment';
 export declare const IsographEnvironmentContext: React.Context<IsographEnvironment | null>;
 export type IsographEnvironmentProviderProps = {
     readonly environment: IsographEnvironment;

package/dist/{useImperativeReference.d.ts → react/useImperativeReference.d.ts}

@@ -1,6 +1,6 @@
 import { UnassignedState } from '@isograph/react-disposable-state';
-import { IsographEntrypoint } from './entrypoint';
-import { FragmentReference, Variables } from './FragmentReference';
+import { IsographEntrypoint } from '../core/entrypoint';
+import { FragmentReference, Variables } from '../core/FragmentReference';
 export declare function useImperativeReference<TReadFromStore extends Object, TClientFieldValue>(entrypoint: IsographEntrypoint<TReadFromStore, TClientFieldValue>): {
     fragmentReference: FragmentReference<TReadFromStore, TClientFieldValue> | UnassignedState;
     loadfragmentReference: (variables: Variables) => void;

package/dist/{useImperativeReference.js → react/useImperativeReference.js}

@@ -3,15 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useImperativeReference = void 0;
 const react_disposable_state_1 = require("@isograph/react-disposable-state");
 const IsographEnvironmentProvider_1 = require("./IsographEnvironmentProvider");
-const cache_1 = require("./cache");
-const IsographEnvironment_1 = require("./IsographEnvironment");
+const IsographEnvironment_1 = require("../core/IsographEnvironment");
+const makeNetworkRequest_1 = require("../core/makeNetworkRequest");
 function useImperativeReference(entrypoint) {
     const { state, setState } = (0, react_disposable_state_1.useUpdatableDisposableState)();
     const environment = (0, IsographEnvironmentProvider_1.useIsographEnvironment)();
     return {
         fragmentReference: state,
         loadfragmentReference: (variables) => {
-            const [_networkRequest, disposeNetworkRequest] = (0, cache_1.makeNetworkRequest)(environment, entrypoint, variables);
+            const [_networkRequest, disposeNetworkRequest] = (0, makeNetworkRequest_1.makeNetworkRequest)(environment, entrypoint, variables);
             setState([
                 {
                     kind: 'FragmentReference',

package/dist/{useLazyReference.d.ts → react/useLazyReference.d.ts}

@@ -1,5 +1,5 @@
-import { FragmentReference, Variables } from './FragmentReference';
-import { IsographEntrypoint } from './entrypoint';
+import { FragmentReference, Variables } from '../core/FragmentReference';
+import { IsographEntrypoint } from '../core/entrypoint';
 export declare function useLazyReference<TReadFromStore extends Object, TClientFieldValue>(entrypoint: IsographEntrypoint<TReadFromStore, TClientFieldValue>, variables: Variables): {
     fragmentReference: FragmentReference<TReadFromStore, TClientFieldValue>;
 };

package/dist/{useLazyReference.js → react/useLazyReference.js}

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useLazyReference = void 0;
 const IsographEnvironmentProvider_1 = require("./IsographEnvironmentProvider");
-const IsographEnvironment_1 = require("./IsographEnvironment");
-const cache_1 = require("./cache");
+const IsographEnvironment_1 = require("../core/IsographEnvironment");
+const cache_1 = require("../core/cache");
 const react_disposable_state_1 = require("@isograph/react-disposable-state");
 function useLazyReference(entrypoint, variables) {
     const environment = (0, IsographEnvironmentProvider_1.useIsographEnvironment)();

package/dist/{useReadAndSubscribe.d.ts → react/useReadAndSubscribe.d.ts}

@@ -1,5 +1,5 @@
-import { FragmentReference } from './FragmentReference';
-import { IsographEnvironment } from './IsographEnvironment';
+import { FragmentReference } from '../core/FragmentReference';
+import { IsographEnvironment } from '../core/IsographEnvironment';
 /**
  * Read the data from a fragment reference and subscribe to updates.
  * Does not pass the data to the fragment reference's resolver function.

package/dist/{useReadAndSubscribe.js → react/useReadAndSubscribe.js}

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useReadAndSubscribe = void 0;
 const react_1 = require("react");
-const read_1 = require("./read");
+const read_1 = require("../core/read");
 const useRerenderOnChange_1 = require("./useRerenderOnChange");
 /**
  * Read the data from a fragment reference and subscribe to updates.

package/dist/{useRerenderOnChange.d.ts → react/useRerenderOnChange.d.ts}

@@ -1,4 +1,4 @@
-import { IsographEnvironment } from './IsographEnvironment';
-import { WithEncounteredRecords } from './read';
-import { FragmentReference } from './FragmentReference';
+import { IsographEnvironment } from '../core/IsographEnvironment';
+import { WithEncounteredRecords } from '../core/read';
+import { FragmentReference } from '../core/FragmentReference';
 export declare function useRerenderOnChange<TReadFromStore extends Object>(environment: IsographEnvironment, encounteredDataAndRecords: WithEncounteredRecords<TReadFromStore>, fragmentReference: FragmentReference<any, any>, setEncounteredDataAndRecords: (data: WithEncounteredRecords<TReadFromStore>) => void): void;

package/dist/{useRerenderOnChange.js → react/useRerenderOnChange.js}

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useRerenderOnChange = void 0;
 const react_1 = require("react");
-const cache_1 = require("./cache");
+const cache_1 = require("../core/cache");
 // TODO add unit tests for this. Add integration tests that test
 // behavior when the encounteredRecords underneath a fragment change.
 function useRerenderOnChange(environment, encounteredDataAndRecords, fragmentReference, setEncounteredDataAndRecords) {

package/dist/{useResult.d.ts → react/useResult.d.ts}

@@ -1,2 +1,2 @@
-import { FragmentReference } from './FragmentReference';
+import { FragmentReference } from '../core/FragmentReference';
 export declare function useResult<TReadFromStore extends Object, TClientFieldValue>(fragmentReference: FragmentReference<TReadFromStore, TClientFieldValue>): TClientFieldValue;

package/dist/{useResult.js → react/useResult.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useResult = void 0;
-const IsographEnvironmentProvider_1 = require("./IsographEnvironmentProvider");
-const componentCache_1 = require("./componentCache");
+const IsographEnvironmentProvider_1 = require("../react/IsographEnvironmentProvider");
+const componentCache_1 = require("../core/componentCache");
 const useReadAndSubscribe_1 = require("./useReadAndSubscribe");
 function useResult(fragmentReference) {
     const environment = (0, IsographEnvironmentProvider_1.useIsographEnvironment)();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-4089db6d",
+  "version": "0.0.0-main-d564e834",
   "description": "Use Isograph with React",
   "homepage": "https://isograph.dev",
   "main": "dist/index.js",
@@ -13,11 +13,12 @@
     "test": "vitest run",
     "test-watch": "vitest watch",
     "coverage": "vitest run --coverage",
-    "prepack": "yarn run test && yarn run compile"
+    "prepack": "yarn run test && yarn run compile",
+    "tsc": "tsc"
   },
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-4089db6d",
-    "@isograph/react-disposable-state": "0.0.0-main-4089db6d",
+    "@isograph/disposable-types": "0.0.0-main-d564e834",
+    "@isograph/react-disposable-state": "0.0.0-main-d564e834",
     "react": "^18.2.0"
   },
   "devDependencies": {

package/src/{FragmentReference.ts → core/FragmentReference.ts}

@@ -1,5 +1,5 @@
 import { DataId } from './IsographEnvironment';
-import { RefetchQueryNormalizationArtifactWrapper } from './entrypoint';
+import { RefetchQueryNormalizationArtifactWrapper } from '../core/entrypoint';
 import { TopLevelReaderArtifact } from './reader';
 
 // TODO type this better

package/src/{cache.ts → core/cache.ts}

@@ -1,9 +1,5 @@
-import {
-  Factory,
-  ItemCleanupPair,
-  ParentCache,
-} from '@isograph/react-disposable-state';
-import { PromiseWrapper, wrapPromise } from './PromiseWrapper';
+import { Factory, ParentCache } from '@isograph/react-disposable-state';
+import { PromiseWrapper } from './PromiseWrapper';
 import {
   DataId,
   ROOT_ID,
@@ -13,26 +9,20 @@ import {
   DataTypeValue,
   getLink,
 } from './IsographEnvironment';
-import {
-  RetainedQuery,
-  garbageCollectEnvironment,
-  retainQuery,
-  unretainQuery,
-} from './garbageCollection';
 import {
   IsographEntrypoint,
   NormalizationAst,
   NormalizationInlineFragment,
   NormalizationLinkedField,
   NormalizationScalarField,
-  RefetchQueryNormalizationArtifact,
   RefetchQueryNormalizationArtifactWrapper,
-} from './entrypoint';
+} from '../core/entrypoint';
 import { ReaderLinkedField, ReaderScalarField } from './reader';
 import { Argument, ArgumentValue } from './util';
 import { WithEncounteredRecords, readButDoNotEvaluate } from './read';
 import { FragmentReference, Variables } from './FragmentReference';
 import { areEqualObjectsWithDeepComparison } from './areEqualWithDeepComparison';
+import { makeNetworkRequest } from './makeNetworkRequest';
 
 const TYPENAME_FIELD_NAME = '__typename';
 
@@ -101,81 +91,6 @@ export function getOrCreateCacheForArtifact<
   );
 }
 
-type NetworkRequestStatus =
-  | {
-      readonly kind: 'UndisposedIncomplete';
-    }
-  | {
-      readonly kind: 'Disposed';
-    }
-  | {
-      readonly kind: 'UndisposedComplete';
-      readonly retainedQuery: RetainedQuery;
-    };
-
-export function makeNetworkRequest<T>(
-  environment: IsographEnvironment,
-  artifact: RefetchQueryNormalizationArtifact | IsographEntrypoint<any, any>,
-  variables: Variables,
-): ItemCleanupPair<PromiseWrapper<T>> {
-  if (typeof window !== 'undefined' && window.__LOG) {
-    console.log('make network request', artifact, variables);
-  }
-  let status: NetworkRequestStatus = {
-    kind: 'UndisposedIncomplete',
-  };
-  // This should be an observable, not a promise
-  const promise = environment
-    .networkFunction(artifact.queryText, variables)
-    .then((networkResponse) => {
-      if (typeof window !== 'undefined' && window.__LOG) {
-        console.log('network response', artifact, networkResponse);
-      }
-
-      if (status.kind === 'UndisposedIncomplete') {
-        normalizeData(
-          environment,
-          artifact.normalizationAst,
-          networkResponse.data,
-          variables,
-          artifact.kind === 'Entrypoint' ? artifact.nestedRefetchQueries : [],
-        );
-        const retainedQuery = {
-          normalizationAst: artifact.normalizationAst,
-          variables,
-        };
-        status = {
-          kind: 'UndisposedComplete',
-          retainedQuery,
-        };
-        retainQuery(environment, retainedQuery);
-      }
-      // TODO return null
-      return networkResponse;
-    });
-
-  const wrapper = wrapPromise(promise);
-
-  const response: ItemCleanupPair<PromiseWrapper<T>> = [
-    wrapper,
-    () => {
-      if (status.kind === 'UndisposedComplete') {
-        const didUnretainSomeQuery = unretainQuery(
-          environment,
-          status.retainedQuery,
-        );
-        if (didUnretainSomeQuery) {
-          garbageCollectEnvironment(environment);
-        }
-      }
-      status = {
-        kind: 'Disposed',
-      };
-    },
-  ];
-  return response;
-}
-
 type NetworkResponseScalarValue = string | number | boolean;
 type NetworkResponseValue =
   | NetworkResponseScalarValue

package/src/{componentCache.ts → core/componentCache.ts}

@@ -1,7 +1,7 @@
 import { stableCopy } from './cache';
 import { IsographEnvironment } from './IsographEnvironment';
 import { FragmentReference } from './FragmentReference';
-import { useReadAndSubscribe } from './useReadAndSubscribe';
+import { useReadAndSubscribe } from '../react/useReadAndSubscribe';
 
 export function getOrCreateCachedComponent(
   environment: IsographEnvironment,

package/src/core/makeNetworkRequest.ts

@@ -0,0 +1,90 @@
+import { ItemCleanupPair } from '@isograph/disposable-types';
+import {
+  IsographEntrypoint,
+  RefetchQueryNormalizationArtifact,
+} from './entrypoint';
+import { Variables } from './FragmentReference';
+import {
+  garbageCollectEnvironment,
+  RetainedQuery,
+  retainQuery,
+  unretainQuery,
+} from './garbageCollection';
+import { IsographEnvironment } from './IsographEnvironment';
+import { PromiseWrapper, wrapPromise } from './PromiseWrapper';
+import { normalizeData } from './cache';
+
+export function makeNetworkRequest<T>(
+  environment: IsographEnvironment,
+  artifact: RefetchQueryNormalizationArtifact | IsographEntrypoint<any, any>,
+  variables: Variables,
+): ItemCleanupPair<PromiseWrapper<T>> {
+  if (typeof window !== 'undefined' && window.__LOG) {
+    console.log('make network request', artifact, variables);
+  }
+  let status: NetworkRequestStatus = {
+    kind: 'UndisposedIncomplete',
+  };
+  // This should be an observable, not a promise
+  const promise = environment
+    .networkFunction(artifact.queryText, variables)
+    .then((networkResponse) => {
+      if (typeof window !== 'undefined' && window.__LOG) {
+        console.log('network response', artifact, networkResponse);
+      }
+
+      if (status.kind === 'UndisposedIncomplete') {
+        normalizeData(
+          environment,
+          artifact.normalizationAst,
+          networkResponse.data ?? {},
+          variables,
+          artifact.kind === 'Entrypoint' ? artifact.nestedRefetchQueries : [],
+        );
+        const retainedQuery = {
+          normalizationAst: artifact.normalizationAst,
+          variables,
+        };
+        status = {
+          kind: 'UndisposedComplete',
+          retainedQuery,
+        };
+        retainQuery(environment, retainedQuery);
+      }
+      // TODO return null
+      return networkResponse;
+    });
+
+  const wrapper = wrapPromise(promise);
+
+  const response: ItemCleanupPair<PromiseWrapper<T>> = [
+    wrapper,
+    () => {
+      if (status.kind === 'UndisposedComplete') {
+        const didUnretainSomeQuery = unretainQuery(
+          environment,
+          status.retainedQuery,
+        );
+        if (didUnretainSomeQuery) {
+          garbageCollectEnvironment(environment);
+        }
+      }
+      status = {
+        kind: 'Disposed',
+      };
+    },
+  ];
+  return response;
+}
+
+type NetworkRequestStatus =
+  | {
+      readonly kind: 'UndisposedIncomplete';
+    }
+  | {
+      readonly kind: 'Disposed';
+    }
+  | {
+      readonly kind: 'UndisposedComplete';
+      readonly retainedQuery: RetainedQuery;
+    };

package/src/{read.ts → core/read.ts}

@@ -1,4 +1,4 @@
-import { getParentRecordKey, makeNetworkRequest, onNextChange } from './cache';
+import { getParentRecordKey, onNextChange } from './cache';
 import { getOrCreateCachedComponent } from './componentCache';
 import { RefetchQueryNormalizationArtifactWrapper } from './entrypoint';
 import { FragmentReference, Variables } from './FragmentReference';
@@ -8,6 +8,7 @@ import {
   defaultMissingFieldHandler,
   IsographEnvironment,
 } from './IsographEnvironment';
+import { makeNetworkRequest } from './makeNetworkRequest';
 import { ReaderAst } from './reader';
 import { Arguments } from './util';
 

package/src/index.ts

@@ -3,9 +3,10 @@ export {
   unretainQuery,
   type RetainedQuery,
   garbageCollectEnvironment,
-} from './garbageCollection';
-export { type PromiseWrapper } from './PromiseWrapper';
-export { makeNetworkRequest, subscribe, normalizeData } from './cache';
+} from './core/garbageCollection';
+export { type PromiseWrapper } from './core/PromiseWrapper';
+export { subscribe, normalizeData } from './core/cache';
+export { makeNetworkRequest } from './core/makeNetworkRequest';
 export {
   ROOT_ID,
   type DataId,
@@ -18,14 +19,7 @@ export {
   createIsographEnvironment,
   createIsographStore,
   defaultMissingFieldHandler,
-} from './IsographEnvironment';
-export {
-  IsographEnvironmentProvider,
-  useIsographEnvironment,
-  type IsographEnvironmentProviderProps,
-} from './IsographEnvironmentProvider';
-export { useImperativeReference } from './useImperativeReference';
-export { EntrypointReader } from './EntrypointReader';
+} from './core/IsographEnvironment';
 export {
   EagerReaderArtifact,
   ComponentReaderArtifact,
@@ -37,7 +31,7 @@ export {
   ReaderScalarField,
   TopLevelReaderArtifact,
   LoadableField,
-} from './reader';
+} from './core/reader';
 export {
   NormalizationAst,
   NormalizationAstNode,
@@ -47,17 +41,26 @@ export {
   assertIsEntrypoint,
   RefetchQueryNormalizationArtifact,
   RefetchQueryNormalizationArtifactWrapper,
-} from './entrypoint';
-export { readButDoNotEvaluate } from './read';
-export { useResult } from './useResult';
-export { type FragmentReference } from './FragmentReference';
-export { useLazyReference } from './useLazyReference';
+} from './core/entrypoint';
+export { readButDoNotEvaluate } from './core/read';
 export {
   ExtractSecondParam,
   Argument,
   ArgumentName,
   ArgumentValue,
   Arguments,
-} from './util';
-export { useRerenderOnChange } from './useRerenderOnChange';
+} from './core/util';
+export { type FragmentReference } from './core/FragmentReference';
+
+export {
+  IsographEnvironmentProvider,
+  useIsographEnvironment,
+  type IsographEnvironmentProviderProps,
+} from './react/IsographEnvironmentProvider';
+export { useImperativeReference } from './react/useImperativeReference';
+export { FragmentReferenceReader } from './react/FragmentReferenceReader';
+export { useResult } from './react/useResult';
+export { useLazyReference } from './react/useLazyReference';
+export { useRerenderOnChange } from './react/useRerenderOnChange';
+
 export { useClientSideDefer } from './loadable-hooks/useClientSideDefer';

package/src/loadable-hooks/useClientSideDefer.ts

@@ -1,8 +1,8 @@
-import { FragmentReference } from '../FragmentReference';
-import { useIsographEnvironment } from '../IsographEnvironmentProvider';
-import { getOrCreateCache } from '../cache';
+import { FragmentReference } from '../core/FragmentReference';
+import { useIsographEnvironment } from '../react/IsographEnvironmentProvider';
+import { getOrCreateCache } from '../core/cache';
 import { useLazyDisposableState } from '@isograph/react-disposable-state';
-import { LoadableField } from '../reader';
+import { LoadableField } from '../core/reader';
 
 export function useClientSideDefer<TResult>(
   loadableField: LoadableField<void, TResult>,

package/src/{EntrypointReader.tsx → react/FragmentReferenceReader.tsx}

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { ExtractReadFromStore, IsographEntrypoint } from './entrypoint';
-import { FragmentReference } from './FragmentReference';
+import { ExtractReadFromStore, IsographEntrypoint } from '../core/entrypoint';
+import { FragmentReference } from '../core/FragmentReference';
 import { useResult } from './useResult';
 
-export function EntrypointReader<
+export function FragmentReferenceReader<
   TProps extends Record<any, any>,
   TEntrypoint extends IsographEntrypoint<any, React.FC<TProps>>,
 >(
@@ -11,7 +11,7 @@ export function EntrypointReader<
     ? {
         fragmentReference: FragmentReference<
           ExtractReadFromStore<TEntrypoint>,
-          React.FC<TProps>
+          React.FC<{}>
         >;
         additionalProps?: TProps;
       }

package/src/{IsographEnvironmentProvider.tsx → react/IsographEnvironmentProvider.tsx}

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { ReactNode, createContext, useContext } from 'react';
-import { type IsographEnvironment } from './IsographEnvironment';
+import { type IsographEnvironment } from '../core/IsographEnvironment';
 
 export const IsographEnvironmentContext =
   createContext<IsographEnvironment | null>(null);

package/src/{useImperativeReference.ts → react/useImperativeReference.ts}

@@ -2,11 +2,11 @@ import {
   UnassignedState,
   useUpdatableDisposableState,
 } from '@isograph/react-disposable-state';
-import { IsographEntrypoint } from './entrypoint';
-import { FragmentReference, Variables } from './FragmentReference';
+import { IsographEntrypoint } from '../core/entrypoint';
+import { FragmentReference, Variables } from '../core/FragmentReference';
 import { useIsographEnvironment } from './IsographEnvironmentProvider';
-import { makeNetworkRequest } from './cache';
-import { ROOT_ID } from './IsographEnvironment';
+import { ROOT_ID } from '../core/IsographEnvironment';
+import { makeNetworkRequest } from '../core/makeNetworkRequest';
 
 export function useImperativeReference<
   TReadFromStore extends Object,

package/src/{useLazyReference.ts → react/useLazyReference.ts}

@@ -1,8 +1,8 @@
-import { FragmentReference, Variables } from './FragmentReference';
+import { FragmentReference, Variables } from '../core/FragmentReference';
 import { useIsographEnvironment } from './IsographEnvironmentProvider';
-import { ROOT_ID } from './IsographEnvironment';
-import { IsographEntrypoint } from './entrypoint';
-import { getOrCreateCacheForArtifact } from './cache';
+import { ROOT_ID } from '../core/IsographEnvironment';
+import { IsographEntrypoint } from '../core/entrypoint';
+import { getOrCreateCacheForArtifact } from '../core/cache';
 import { useLazyDisposableState } from '@isograph/react-disposable-state';
 
 export function useLazyReference<

package/src/{useReadAndSubscribe.ts → react/useReadAndSubscribe.ts}

@@ -1,7 +1,7 @@
 import { useState } from 'react';
-import { FragmentReference } from './FragmentReference';
-import { IsographEnvironment } from './IsographEnvironment';
-import { readButDoNotEvaluate } from './read';
+import { FragmentReference } from '../core/FragmentReference';
+import { IsographEnvironment } from '../core/IsographEnvironment';
+import { readButDoNotEvaluate } from '../core/read';
 import { useRerenderOnChange } from './useRerenderOnChange';
 
 /**

package/src/{useRerenderOnChange.ts → react/useRerenderOnChange.ts}

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

package/src/{useResult.ts → react/useResult.ts}

@@ -1,6 +1,6 @@
-import { useIsographEnvironment } from './IsographEnvironmentProvider';
-import { FragmentReference } from './FragmentReference';
-import { getOrCreateCachedComponent } from './componentCache';
+import { useIsographEnvironment } from '../react/IsographEnvironmentProvider';
+import { FragmentReference } from '../core/FragmentReference';
+import { getOrCreateCachedComponent } from '../core/componentCache';
 import { useReadAndSubscribe } from './useReadAndSubscribe';
 
 export function useResult<TReadFromStore extends Object, TClientFieldValue>(

package/src/tests/garbageCollection.test.ts

@@ -1,6 +1,12 @@
 import { describe, test, expect } from 'vitest';
-import { ROOT_ID, createIsographEnvironment } from '../IsographEnvironment';
-import { garbageCollectEnvironment, retainQuery } from '../garbageCollection';
+import {
+  ROOT_ID,
+  createIsographEnvironment,
+} from '../core/IsographEnvironment';
+import {
+  garbageCollectEnvironment,
+  retainQuery,
+} from '../core/garbageCollection';
 import { iso } from './__isograph/iso';
 import { nodeFieldRetainedQuery } from './nodeQuery';
 

package/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.pkg.json",
+  "compilerOptions": {
+    "noEmit": true,
+  },
+}

package/dist/EntrypointReader.d.ts

@@ -1,10 +0,0 @@
-import * as React from 'react';
-import { ExtractReadFromStore, IsographEntrypoint } from './entrypoint';
-import { FragmentReference } from './FragmentReference';
-export declare function EntrypointReader<TProps extends Record<any, any>, TEntrypoint extends IsographEntrypoint<any, React.FC<TProps>>>(props: TProps extends Record<string, never> ? {
-    fragmentReference: FragmentReference<ExtractReadFromStore<TEntrypoint>, React.FC<TProps>>;
-    additionalProps?: TProps;
-} : {
-    fragmentReference: FragmentReference<ExtractReadFromStore<TEntrypoint>, React.FC<TProps>>;
-    additionalProps: TProps;
-}): React.ReactNode;