miolo-react 3.0.0-beta.162 → 3.0.0-beta.164

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miolo-react",
-  "version": "3.0.0-beta.162",
+  "version": "3.0.0-beta.164",
   "description": "React utils for miolo",
   "author": "Donato Lorenzo <donato@afialapis.com>",
   "contributors": [

package/src/ssr/useSsrDataOrReload.mjs

@@ -2,30 +2,63 @@ import { useCallback, useEffect, useState } from "react"
 import getSsrDataFromContext from "./getSsrDataFromContext.mjs"
 
 const useSsrDataOrReload = (context, miolo, name, options) => {
-  const { defval = [], loader, modifier, effect } = options
+  const { fetcher } = miolo
+  const {
+    defval = [],
+    loader = undefined,
+    url = undefined,
+    params = undefined,
+    modifier = undefined,
+    effect = undefined,
+    model = undefined
+  } = options
 
-  const _maybeModify = useCallback(
+  const _parseData = useCallback(
     (value) => {
-      return modifier === undefined ? value : modifier(value)
+      let parsed = value
+      if (modifier !== undefined) {
+        parsed = modifier(parsed)
+      }
+      if (model !== undefined) {
+        parsed = new model(parsed)
+      }
+      return parsed
     },
-    [modifier]
+    [modifier, model]
   )
 
   const ssrDataFromContext = getSsrDataFromContext(context, name)
   const [ssrData, setSsrData] = useState(
-    _maybeModify(ssrDataFromContext !== undefined ? ssrDataFromContext : defval)
+    _parseData(ssrDataFromContext !== undefined ? ssrDataFromContext : defval)
   )
+
   const [needToRefresh, setNeedToRefresh] = useState(ssrDataFromContext === undefined)
+  const [status, setStatus] = useState(needToRefresh ? "idle" : "loaded")
+  const [error, setError] = useState(undefined)
 
   const refreshSsrData = useCallback(async () => {
-    if (loader === undefined) {
-      return
+    setStatus("loading")
+    if (loader !== undefined) {
+      const nSsrData = await loader(context, fetcher)
+      setSsrData(_parseData(nSsrData))
+      setStatus("loaded")
+      setError(undefined)
+    } else {
+      if (!url) {
+        setError(`No url provided for ${name}`)
+      } else {
+        const resp = await fetcher.get(url, params)
+        if (resp.ok) {
+          setSsrData(_parseData(resp?.data))
+          setStatus("loaded")
+          setError(undefined)
+        } else {
+          setError(resp?.error || "Unknonwn error")
+          setStatus("loaded")
+        }
+      }
     }
-
-    const { fetcher } = miolo
-    const nSsrData = await loader(context, fetcher)
-    setSsrData(_maybeModify(nSsrData))
-  }, [context, miolo, loader, _maybeModify])
+  }, [context, fetcher, loader, url, params, _parseData, name])
 
   useEffect(() => {
     try {
@@ -39,7 +72,14 @@ const useSsrDataOrReload = (context, miolo, name, options) => {
     } catch (_) {}
   }, [needToRefresh, refreshSsrData, effect, ...(effect?.deps || [])])
 
-  return [ssrData, (data) => setSsrData(_maybeModify(data)), refreshSsrData]
+  return {
+    data: ssrData,
+    setData: (data) => setSsrData(_parseData(data)),
+    refresh: refreshSsrData,
+    error,
+    ok: error === undefined,
+    ready: status === "loaded" || status === "error"
+  }
 }
 
 export { useSsrDataOrReload }