Expose hooks utils from relay-runtime

Reviewed By: poteto

Differential Revision: D29163249

fbshipit-source-id: 488c9171a80b705adc7ed8b6b01ede2371ecf8e4

packages/react-relay/hooks.js

@@ -37,7 +37,7 @@ export type {
   MatchPointer,
 } from './relay-hooks/MatchContainer';
 export type {ProfilerContextType} from './relay-hooks/ProfilerContext';
-export type {Direction, LoadMoreFn} from './relay-hooks/useLoadMoreFunction';
+export type {LoadMoreFn} from './relay-hooks/useLoadMoreFunction';
 export type {UseMutationConfig} from './relay-hooks/useMutation';
 export type {UseQueryLoaderLoadQueryOptions} from './relay-hooks/useQueryLoader';
 export type {
@@ -48,6 +48,7 @@ export type {
 export type {
   DataID,
   DeclarativeMutationConfig,
+  Direction,
   Disposable,
   // RelayRuntime has two environment exports: one interface, one concrete.
   IEnvironment as Environment,

packages/react-relay/index.js

@@ -53,7 +53,7 @@ export type {
   MatchPointer,
 } from './relay-hooks/MatchContainer';
 export type {ProfilerContextType} from './relay-hooks/ProfilerContext';
-export type {Direction, LoadMoreFn} from './relay-hooks/useLoadMoreFunction';
+export type {LoadMoreFn} from './relay-hooks/useLoadMoreFunction';
 export type {UseMutationConfig} from './relay-hooks/useMutation';
 export type {UseQueryLoaderLoadQueryOptions} from './relay-hooks/useQueryLoader';
 export type {
@@ -64,6 +64,7 @@ export type {
 export type {
   DataID,
   DeclarativeMutationConfig,
+  Direction,
   Disposable,
   // RelayRuntime has two environment exports: one interface, one concrete.
   IEnvironment as Environment,

packages/react-relay/relay-hooks/__tests__/useBlockingPaginationFragment-test.js

@@ -16,8 +16,7 @@
 const React = require('react');
 const Scheduler = require('scheduler');
 
-import type {Direction} from '../useLoadMoreFunction';
-import type {OperationDescriptor, Variables} from 'relay-runtime';
+import type {Direction, OperationDescriptor, Variables} from 'relay-runtime';
 const {useMemo, useState} = React;
 const TestRenderer = require('react-test-renderer');
 

packages/react-relay/relay-hooks/__tests__/useBlockingPaginationFragment-with-suspense-transition-test.js

@@ -16,8 +16,7 @@
 const React = require('react');
 const Scheduler = require('scheduler');
 
-import type {Direction} from '../useLoadMoreFunction';
-import type {OperationDescriptor, Variables} from 'relay-runtime';
+import type {Direction, OperationDescriptor, Variables} from 'relay-runtime';
 const {useEffect, useTransition, useMemo, useState} = React;
 const TestRenderer = require('react-test-renderer');
 
@@ -38,7 +37,7 @@ const {
 const {createMockEnvironment} = require('relay-test-utils');
 
 describe('useBlockingPaginationFragment with useTransition', () => {
-  if (typeof React.useTransition !== 'function') {
+  if (typeof useTransition !== 'function') {
     it('empty test to prevent Jest from failing', () => {
       // This suite is only useful with experimental React build
     });

packages/react-relay/relay-hooks/__tests__/usePaginationFragment-test.js

@@ -15,8 +15,7 @@
 
 const React = require('react');
 
-import type {Direction} from '../useLoadMoreFunction';
-import type {OperationDescriptor, Variables} from 'relay-runtime';
+import type {Direction, OperationDescriptor, Variables} from 'relay-runtime';
 const {useMemo, useState} = React;
 const TestRenderer = require('react-test-renderer');
 

packages/react-relay/relay-hooks/useBlockingPaginationFragment.js

@@ -13,14 +13,17 @@
 
 'use strict';
 
-const getPaginationMetadata = require('./getPaginationMetadata');
 const invariant = require('invariant');
 const useLoadMoreFunction = require('./useLoadMoreFunction');
 const useRefetchableFragmentNode = require('./useRefetchableFragmentNode');
 const useStaticFragmentNodeWarning = require('./useStaticFragmentNodeWarning');
 
 const {useCallback, useEffect, useRef, useState} = require('react');
-const {getFragment, getFragmentIdentifier} = require('relay-runtime');
+const {
+  getFragment,
+  getFragmentIdentifier,
+  getPaginationMetadata,
+} = require('relay-runtime');
 
 import type {LoadMoreFn, UseLoadMoreFunctionArgs} from './useLoadMoreFunction';
 import type {RefetchFnDynamic} from './useRefetchableFragmentNode';

packages/react-relay/relay-hooks/useLoadMoreFunction.js

@@ -13,8 +13,6 @@
 
 'use strict';
 
-const getPaginationVariables = require('./getPaginationVariables');
-const getValueAtPath = require('./getValueAtPath');
 const invariant = require('invariant');
 const useFetchTrackingRef = require('./useFetchTrackingRef');
 const useIsMountedRef = require('./useIsMountedRef');
@@ -27,11 +25,14 @@ const {
   ConnectionInterface,
   __internal: {fetchQuery},
   createOperationDescriptor,
+  getPaginationVariables,
+  getValueAtPath,
   getSelector,
 } = require('relay-runtime');
 
 import type {
   ConcreteRequest,
+  Direction,
   Disposable,
   GraphQLResponse,
   Observer,
@@ -41,8 +42,6 @@ import type {
   VariablesOf,
 } from 'relay-runtime';
 
-export type Direction = 'forward' | 'backward';
-
 export type LoadMoreFn<TQuery: OperationType> = (
   count: number,
   options?: {|

packages/react-relay/relay-hooks/usePaginationFragment.js

@@ -13,13 +13,16 @@
 
 'use strict';
 
-const getPaginationMetadata = require('./getPaginationMetadata');
 const useLoadMoreFunction = require('./useLoadMoreFunction');
 const useRefetchableFragmentNode = require('./useRefetchableFragmentNode');
 const useStaticFragmentNodeWarning = require('./useStaticFragmentNodeWarning');
 
 const {useCallback, useDebugValue, useState} = require('react');
-const {getFragment, getFragmentIdentifier} = require('relay-runtime');
+const {
+  getFragment,
+  getFragmentIdentifier,
+  getPaginationMetadata,
+} = require('relay-runtime');
 
 import type {LoadMoreFn, UseLoadMoreFunctionArgs} from './useLoadMoreFunction';
 import type {RefetchFnDynamic} from './useRefetchableFragmentNode';

packages/react-relay/relay-hooks/useRefetchableFragmentNode.js

@@ -15,8 +15,6 @@
 
 const ProfilerContext = require('./ProfilerContext');
 
-const getRefetchMetadata = require('./getRefetchMetadata');
-const getValueAtPath = require('./getValueAtPath');
 const invariant = require('invariant');
 const useFragmentNode = require('./useFragmentNode');
 const useIsMountedRef = require('./useIsMountedRef');
@@ -31,7 +29,9 @@ const {
   __internal: {fetchQuery},
   createOperationDescriptor,
   getFragmentIdentifier,
+  getRefetchMetadata,
   getSelector,
+  getValueAtPath,
 } = require('relay-runtime');
 
 import type {LoaderFn} from './useQueryLoader';

packages/relay-runtime/index.js

@@ -50,8 +50,12 @@ const fetchQuery = require('./query/fetchQuery');
 const fetchQueryInternal = require('./query/fetchQueryInternal');
 const fetchQuery_DEPRECATED = require('./query/fetchQuery_DEPRECATED');
 const getFragmentIdentifier = require('./util/getFragmentIdentifier');
+const getPaginationMetadata = require('./util/getPaginationMetadata');
+const getPaginationVariables = require('./util/getPaginationVariables');
+const getRefetchMetadata = require('./util/getRefetchMetadata');
 const getRelayHandleKey = require('./util/getRelayHandleKey');
 const getRequestIdentifier = require('./util/getRequestIdentifier');
+const getValueAtPath = require('./util/getValueAtPath');
 const isPromise = require('./util/isPromise');
 const isRelayModernEnvironment = require('./store/isRelayModernEnvironment');
 const isScalarAndEqual = require('./util/isScalarAndEqual');
@@ -211,6 +215,7 @@ export type {
   VariablesOf,
 } from './util/RelayRuntimeTypes';
 export type {Local3DPayload} from './util/createPayloadFor3DField';
+export type {Direction} from './util/getPaginationVariables';
 export type {RequestIdentifier} from './util/getRequestIdentifier';
 
 // As early as possible, check for the existence of the JavaScript globals which
@@ -333,6 +338,10 @@ module.exports = {
   recycleNodesInto: recycleNodesInto,
   stableCopy: stableCopy,
   getFragmentIdentifier: getFragmentIdentifier,
+  getRefetchMetadata: getRefetchMetadata,
+  getPaginationMetadata: getPaginationMetadata,
+  getPaginationVariables: getPaginationVariables,
+  getValueAtPath: getValueAtPath,
   __internal: {
     OperationTracker: RelayOperationTracker,
     createRelayContext: createRelayContext,

packages/react-relay/relay-hooks/getPaginationVariables.js → packages/relay-runtime/util/getPaginationVariables.js

@@ -16,8 +16,10 @@
 const invariant = require('invariant');
 const warning = require('warning');
 
-import type {Direction} from './useLoadMoreFunction';
-import type {ReaderPaginationMetadata, Variables} from 'relay-runtime';
+import type {ReaderPaginationMetadata} from './ReaderNode';
+import type {Variables} from './RelayRuntimeTypes';
+
+export type Direction = 'forward' | 'backward';
 
 function getPaginationVariables(
   direction: Direction,