Move identity state to dispatcher

Author: kitten

src/internals/__tests__/dispatcher.test.js

@@ -1,4 +1,10 @@
-import { Dispatcher } from '../dispatcher'
+import { getCurrentIdentity, Dispatcher } from '../dispatcher'
+
+describe('getCurrentIdentity', () => {
+  it('throws when called outside of function components', () => {
+    expect(getCurrentIdentity).toThrow()
+  })
+})
 
 describe('useEffect', () => {
   it('is a noop', () => {

src/internals/__tests__/state.test.js

@@ -1,15 +1,4 @@
-import {
-  getCurrentIdentity,
-  setCurrentContextMap,
-  readContextMap,
-  maskContext
-} from '../state'
-
-describe('getCurrentIdentity', () => {
-  it('throws when called outside of function components', () => {
-    expect(getCurrentIdentity).toThrow()
-  })
-})
+import { setCurrentContextMap, readContextMap, maskContext } from '../state'
 
 describe('readContextMap', () => {
   it('returns values in a Map by key', () => {

src/internals/dispatcher.js

@@ -2,7 +2,7 @@
 // Source: https://github.com/facebook/react/blob/c21c41e/packages/react-dom/src/server/ReactPartialRendererHooks.js
 
 import is from 'object-is'
-import { getCurrentIdentity, readContextMap, type Identity } from './state'
+import { readContextMap } from './state'
 
 import type {
   AbstractContext,
@@ -13,6 +13,31 @@ import type {
   Hook
 } from '../types'
 
+export opaque type Identity = {}
+
+let currentIdentity: Identity | null = null
+
+export const makeIdentity = (): Identity => ({})
+
+export const setCurrentIdentity = (id: Identity | null) => {
+  currentIdentity = id
+}
+
+export const getCurrentIdentity = (): Identity => {
+  if (currentIdentity === null) {
+    throw new Error(
+      '[react-ssr-prepass] Hooks can only be called inside the body of a function component. ' +
+        '(https://fb.me/react-invalid-hook-call)'
+    )
+  }
+
+  // NOTE: The warning that is used in ReactPartialRendererHooks is obsolete
+  // in a prepass, since it'll be caught by a subsequent renderer anyway
+  // https://github.com/facebook/react/blob/c21c41e/packages/react-dom/src/server/ReactPartialRendererHooks.js#L63-L71
+
+  return (currentIdentity: Identity)
+}
+
 let firstWorkInProgressHook: Hook | null = null
 let workInProgressHook: Hook | null = null
 // Whether the work-in-progress hook is a re-rendered hook

src/internals/state.js

@@ -2,33 +2,9 @@
 
 import type { AbstractContext, UserElement, ContextMap } from '../types'
 
-export opaque type Identity = {}
-
 const emptyMap: ContextMap = new Map()
-let currentIdentity: Identity | null = null
 let currentContextMap: ContextMap = emptyMap
 
-export const makeIdentity = (): Identity => ({})
-
-export const setCurrentIdentity = (id: Identity | null) => {
-  currentIdentity = id
-}
-
-export const getCurrentIdentity = (): Identity => {
-  if (currentIdentity === null) {
-    throw new Error(
-      '[react-ssr-prepass] Hooks can only be called inside the body of a function component. ' +
-        '(https://fb.me/react-invalid-hook-call)'
-    )
-  }
-
-  // NOTE: The warning that is used in ReactPartialRendererHooks is obsolete
-  // in a prepass, since it'll be caught by a subsequent renderer anyway
-  // https://github.com/facebook/react/blob/c21c41e/packages/react-dom/src/server/ReactPartialRendererHooks.js#L63-L71
-
-  return (currentIdentity: Identity)
-}
-
 export const clearCurrentContextMap = () => {
   currentContextMap = emptyMap
 }