Merge pull request #201 from atomic-state/enhancements/global-cache

Enhancements/global cache

Author: danybeltran

package.json

@@ -1,6 +1,6 @@
 {
   "name": "http-react",
-  "version": "3.7.2",
+  "version": "3.7.3",
   "description": "React hooks for data fetching",
   "main": "dist/index.js",
   "scripts": {

src/components/FetchConfigAsync.tsx

@@ -1,66 +1,47 @@
-import { isDefined, serialize } from '../client'
-import {
-  defaultCache,
-  fetcherDefaults,
-  valuesMemory,
-  willSuspend
-} from '../internal'
+import { isDefined } from '../client'
 import { $context } from '../internal/shared'
 import { FetchContextType } from '../types'
+import { FetchConfigSync } from './server'
 
 export async function FetchConfigAsync(props: FetchContextType) {
-  const { children, defaults = {}, value = {}, suspense = [] } = props
+  const { children, defaults = {}, value = {} } = props
+
+  let $values = new Map()
 
   const previousConfig = $context.value as any
-  const { cacheProvider = defaultCache } = previousConfig
 
   for (let valueKey in value) {
-    const resolvedKey = serialize({
-      idString: serialize(valueKey)
-    })
-
     const $value = await value[valueKey]
 
     const $data = $value.data ?? $value
 
-    valuesMemory.set(resolvedKey, $data)
+    $values.set(valueKey, $data)
 
-    fetcherDefaults.set(resolvedKey, $data)
+    // fetcherDefaults.set(resolvedKey, $data)
 
-    cacheProvider.set(resolvedKey, $data)
+    // cacheProvider.set(resolvedKey, $data)
   }
 
   for (let defaultKey in defaults) {
     const { id = defaultKey } = defaults[defaultKey]
-    const resolvedKey = serialize({
-      idString: serialize(id)
-    })
 
     if (isDefined(id)) {
-      valuesMemory.set(resolvedKey, await defaults[defaultKey]?.value)
-      fetcherDefaults.set(resolvedKey, await defaults[defaultKey]?.value)
-      cacheProvider.set(resolvedKey, await defaults[defaultKey]?.value)
+      $values.set(defaultKey, await defaults[defaultKey]?.value)
+      // fetcherDefaults.set(resolvedKey, await defaults[defaultKey]?.value)
+      // cacheProvider.set(resolvedKey, await defaults[defaultKey]?.value)
     }
   }
 
-  for (let suspenseKey of suspense) {
-    const key = serialize({
-      idString: serialize(suspenseKey)
-    })
-    willSuspend.set(key, true)
-  }
-
   let mergedConfig = {
     ...previousConfig,
     ...props,
     headers: {
       ...previousConfig.headers,
       ...props.headers
     },
+    value: Object.fromEntries($values.entries()),
     children: undefined
   }
 
-  $context.value = mergedConfig
-
-  return children
+  return <FetchConfigSync value={mergedConfig}>{children}</FetchConfigSync>
 }

src/components/index.tsx

@@ -12,7 +12,7 @@ import {
 
 import { FetchContextType } from '../types'
 
-import { isDefined, serialize } from '../utils/shared'
+import { isDefined, serialize, windowExists } from '../utils/shared'
 
 let isServer: boolean = true
 /**
@@ -39,18 +39,16 @@ export function SSRSuspense({
 }
 
 export function FetchConfig(props: FetchContextType) {
-  const {
-    children,
-    defaults = {},
-    value = {},
-    suspense = [],
-    clientOnly
-  } = props
+  const { children, defaults = {}, value: $val = {}, suspense = [] } = props
+
+  const value = (windowExists ? $val : $val.value) ?? {}
 
   const previousConfig = useHRFContext()
 
   const { cacheProvider = defaultCache } = previousConfig
 
+  const $values = new Map()
+
   for (let valueKey in value) {
     const resolvedKey = serialize({
       idString: serialize(valueKey)
@@ -77,11 +75,15 @@ export function FetchConfig(props: FetchContextType) {
       parsedChunk = dataChunk
     }
 
-    valuesMemory.set(resolvedKey, parsedChunk)
+    $values.set(resolvedKey, parsedChunk)
+
+    if (windowExists) {
+      valuesMemory.set(resolvedKey, parsedChunk)
 
-    fetcherDefaults.set(resolvedKey, parsedChunk)
+      fetcherDefaults.set(resolvedKey, parsedChunk)
 
-    cacheProvider.set(resolvedKey, parsedChunk)
+      cacheProvider.set(resolvedKey, parsedChunk)
+    }
   }
 
   for (let defaultKey in defaults) {
@@ -91,9 +93,12 @@ export function FetchConfig(props: FetchContextType) {
     })
 
     if (isDefined(id)) {
-      valuesMemory.set(resolvedKey, defaults[defaultKey]?.value)
-      fetcherDefaults.set(resolvedKey, defaults[defaultKey]?.value)
-      cacheProvider.set(resolvedKey, defaults[defaultKey]?.value)
+      $values.set(resolvedKey, defaults[defaultKey]?.value)
+      if (windowExists) {
+        valuesMemory.set(resolvedKey, defaults[defaultKey]?.value)
+        fetcherDefaults.set(resolvedKey, defaults[defaultKey]?.value)
+        cacheProvider.set(resolvedKey, defaults[defaultKey]?.value)
+      }
     }
   }
 
@@ -111,6 +116,7 @@ export function FetchConfig(props: FetchContextType) {
       ...previousConfig.headers,
       ...props.headers
     },
+    value: Object.fromEntries($values.entries()),
     children: undefined
   }
 

src/components/server/index.tsx

@@ -1,9 +1,9 @@
-'use client'
+"use client"
 
-import { FetchConfigAsync } from '../FetchConfigAsync'
+import { FetchConfigAsync } from "../FetchConfigAsync"
 
-import { FetchConfig as FConfig, SSRSuspense } from '../index'
+import { FetchConfig as FConfig, SSRSuspense } from "../index"
 
-const FetchConfig = typeof window === 'undefined' ? FetchConfigAsync : FConfig
+const FetchConfig = typeof window === "undefined" ? FetchConfigAsync : FConfig
 
-export { FetchConfig, SSRSuspense }
+export { FetchConfig, SSRSuspense, FConfig as FetchConfigSync }