@kaspernj/api-maker 1.0.331 → 1.0.333

package/package.json

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

package/src/use-current-user.mjs

@@ -7,19 +7,35 @@ 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])
 
   s.meta.scope = scope
-  s.meta.scopeName = useMemo(() => `current${camelize(s.m.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.scope
+    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,20 +45,30 @@ const useCurrentUser = (args) => {
     if (scope in currentUserData) {
       return currentUserData[scope]
     } else if (Devise.current().hasCurrentScope(scope)) {
+      debugs(() => `Setting ${scope} from current scope`)
+
       currentUserData[scope] = Devise[scopeName]()
 
       return currentUserData[scope]
     }
   }, [])
 
-  s.useStates({currentUser: defaultCurrentUser()})
+  const useStatesArgument = {}
+
+  useStatesArgument[scopeName] = defaultCurrentUser()
+
+  s.useStates(useStatesArgument)
 
   const updateCurrentUser = useCallback(() => {
-    s.set({currentUser: Devise[s.m.scopeName]()})
+    const setStatesArgument = {}
+
+    setStatesArgument[s.m.scopeName] = Devise[s.m.scopeName]()
+
+    s.set(setStatesArgument)
   }, [])
 
   useEffect(() => {
-    if (!(s.m.scope in currentUserData)) {
+    if (!(s.m.scope in currentUserData) && !Devise.current().hasCurrentScope(s.m.scope)) {
       loadCurrentUserFromRequest()
     }
   }, [])
@@ -63,7 +89,7 @@ const useCurrentUser = (args) => {
     }
   }, [])
 
-  return s.s.currentUser
+  return s.s[scopeName]
 }
 
 export default useCurrentUser