@kaspernj/api-maker 1.0.330 → 1.0.331

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.330",
+  "version": "1.0.331",
   "type": "module",
   "description": "",
   "main": "index.js",

package/src/devise.mjs

@@ -104,7 +104,19 @@ export default class ApiMakerDevise {
     return this.currents[scope]
   }
 
+  hasCurrentScope(scope) {
+    if (globalThis.apiMakerDeviseCurrent && scope in globalThis.apiMakerDeviseCurrent) {
+      return true
+    }
+
+    return false
+  }
+
   loadCurrentScope (scope) {
+    if (!this.hasCurrentScope(scope)) {
+      return null
+    }
+
     const scopeData = globalThis.apiMakerDeviseCurrent[scope]
 
     if (!scopeData) return null

package/src/use-current-user.mjs

@@ -1,10 +1,50 @@
-import {useCallback, useEffect, useState} from "react"
+import {useCallback, useEffect, useMemo} from "react"
+import {camelize} from "inflection"
 import Devise from "./devise.mjs"
+import Services from "./services.mjs"
+import useShape from "set-state-compare/src/use-shape.js"
+
+const currentUserData = {}
+
+const useCurrentUser = (args) => {
+  const s = useShape()
+  const scope = args?.scope || "user"
+
+  s.meta.scope = scope
+  s.meta.scopeName = useMemo(() => `current${camelize(s.m.scope)}`, [scope])
+
+  const loadCurrentUserFromRequest = useCallback(async () => {
+    const {scope, scopeName} = s.m.scope
+    const result = await Services.current().sendRequest("Devise::Current", {scope})
+    const current = digg(result, "current")
+
+    currentUserData[scope] = current
+
+    s.setStates[scopeName](current)
+  }, [])
+
+  const defaultCurrentUser = useCallback(() => {
+    const {scope, scopeName} = s.m
+
+    if (scope in currentUserData) {
+      return currentUserData[scope]
+    } else if (Devise.current().hasCurrentScope(scope)) {
+      currentUserData[scope] = Devise[scopeName]()
+
+      return currentUserData[scope]
+    }
+  }, [])
+
+  s.useStates({currentUser: defaultCurrentUser()})
 
-const useCurrentUser = () => {
-  const [currentUser, setCurrentUser] = useState(Devise.currentUser())
   const updateCurrentUser = useCallback(() => {
-    setCurrentUser(Devise.currentUser())
+    s.set({currentUser: Devise[s.m.scopeName]()})
+  }, [])
+
+  useEffect(() => {
+    if (!(s.m.scope in currentUserData)) {
+      loadCurrentUserFromRequest()
+    }
   }, [])
 
   useEffect(() => {
@@ -13,7 +53,7 @@ const useCurrentUser = () => {
     return () => {
       Devise.events().removeListener("onDeviseSignIn", updateCurrentUser)
     }
-  })
+  }, [])
 
   useEffect(() => {
     Devise.events().addListener("onDeviseSignOut", updateCurrentUser)
@@ -21,9 +61,9 @@ const useCurrentUser = () => {
     return () => {
       Devise.events().removeListener("onDeviseSignOut", updateCurrentUser)
     }
-  })
+  }, [])
 
-  return currentUser
+  return s.s.currentUser
 }
 
 export default useCurrentUser