@kaspernj/api-maker 1.0.332 → 1.0.334

package/package.json

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

package/src/use-current-user.mjs

@@ -2,25 +2,35 @@ import {useCallback, useEffect, useMemo} from "react"
 import {camelize} from "inflection"
 import Devise from "./devise.mjs"
 import Services from "./services.mjs"
+import useEventEmitter from "./use-event-emitter.mjs"
 import useShape from "set-state-compare/src/use-shape.js"
 
-const currentUserData = {}
-
 const useCurrentUser = (args) => {
-  const s = useShape()
+  const s = useShape(args || {})
   const scope = args?.scope || "user"
-  const scopeName = useMemo(() => `current${camelize(scope)}`, [scope])
+  const scopeName = `current${camelize(scope)}`
 
   s.meta.scope = scope
   s.meta.scopeName = scopeName
 
+  const debugs = useCallback((debugCallback) => {
+    if (s.props.debug) {
+      let debugArgs = debugCallback()
+
+      if (!Array.isArray(debugArgs)) debugArgs = [debugArgs]
+
+      console.log("useCurrentUser", ...debugArgs)
+    }
+  })
+
   const loadCurrentUserFromRequest = useCallback(async () => {
     const {scope, scopeName} = s.m
+
+    debugs(() => `Loading ${scope} with request`)
+
     const result = await Services.current().sendRequest("Devise::Current", {scope})
     const current = digg(result, "current")
 
-    currentUserData[scope] = current
-
     if (!(scopeName in s.setStates)) throw new Error(`'${scopeName}' not found in setStates`)
 
     s.setStates[scopeName](current)
@@ -29,12 +39,10 @@ const useCurrentUser = (args) => {
   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]()
+    if (Devise.current().hasCurrentScope(scope)) {
+      debugs(() => `Setting ${scope} from current scope`)
 
-      return currentUserData[scope]
+      return Devise[scopeName]()
     }
   }, [])
 
@@ -53,26 +61,15 @@ const useCurrentUser = (args) => {
   }, [])
 
   useEffect(() => {
-    if (!(s.m.scope in currentUserData)) {
+    if (!Devise.current().hasCurrentScope(s.m.scope)) {
       loadCurrentUserFromRequest()
     }
   }, [])
 
-  useEffect(() => {
-    Devise.events().addListener("onDeviseSignIn", updateCurrentUser)
-
-    return () => {
-      Devise.events().removeListener("onDeviseSignIn", updateCurrentUser)
-    }
-  }, [])
+  useEventEmitter(Devise.events(), "onDeviseSignIn", updateCurrentUser)
+  useEventEmitter(Devise.events(), "onDeviseSignOut", updateCurrentUser)
 
-  useEffect(() => {
-    Devise.events().addListener("onDeviseSignOut", updateCurrentUser)
-
-    return () => {
-      Devise.events().removeListener("onDeviseSignOut", updateCurrentUser)
-    }
-  }, [])
+  console.error(`DEBUG: Keys: ${Object.keys(s.s).map((key) => `${key}: ${s.s[key]?.id()}`).join(", ")}`)
 
   return s.s[scopeName]
 }