@kaspernj/api-maker 1.0.332 → 1.0.333

package/package.json

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

package/src/use-current-user.mjs

@@ -7,15 +7,28 @@ 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 = 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")
 
@@ -32,6 +45,8 @@ 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]
@@ -53,7 +68,7 @@ const useCurrentUser = (args) => {
   }, [])
 
   useEffect(() => {
-    if (!(s.m.scope in currentUserData)) {
+    if (!(s.m.scope in currentUserData) && !Devise.current().hasCurrentScope(s.m.scope)) {
       loadCurrentUserFromRequest()
     }
   }, [])