@kaspernj/api-maker 1.0.2030 → 1.0.2031

package/build/use-current-user.js

@@ -1,26 +1,44 @@
-import React, { createContext, useCallback, useContext, useMemo } from "react";
+import React, { useCallback, useContext, useMemo } from "react";
 import Devise from "./devise";
 import { digg } from "diggerize";
+import EventEmitter from "events";
 import * as inflection from "inflection";
 import Logger from "./logger";
 import Services from "./services";
 import useEventEmitter from "./use-event-emitter";
 import useShape from "set-state-compare/src/use-shape";
+const events = new EventEmitter();
 const logger = new Logger({
   name: "ApiMaker / useCurrentUser"
 });
-
-// logger.setDebug(true)
-
-const useCurrentUser = props => {
-  const scope = props?.scope || "user";
+logger.setDebug(false);
+const useCurrentUser = (props = {}) => {
+  const {
+    scope = "user",
+    withData,
+    ...restProps
+  } = props;
+  if (Object.keys(restProps).length > 0) {
+    throw new Error(`Unknown props given to useCurrentUser: ${Object.keys(restProps).join(", ")}`);
+  }
   const scopeInstance = Devise.getScope(scope);
   const currentUserContext = useContext(scopeInstance.getContext());
-  return currentUserContext;
+  if (withData) {
+    return currentUserContext;
+  } else {
+    return currentUserContext.model;
+  }
 };
-const WithCurrentUser = props => {
-  const s = useShape(props || {});
-  const scope = props?.scope || "user";
+const WithCurrentUser = (props = {}) => {
+  const {
+    children,
+    scope = "user",
+    ...restProps
+  } = props;
+  if (Object.keys(restProps).length > 0) {
+    throw new Error(`Unknown props given to WithCurrentUser: ${Object.keys(restProps).join(", ")}`);
+  }
+  const s = useShape(props);
   const scopeName = `current${inflection.camelize(scope)}`;
   const scopeInstance = Devise.getScope(scope);
   const ScopeContext = scopeInstance.getContext();
@@ -40,9 +58,14 @@ const WithCurrentUser = props => {
     const current = digg(result, "current")[0];
     if (current) Devise.updateSession(current);
     s.set({
+      result: {
+        loaded: true,
+        model: current
+      }
+    });
+    events.emit("currentUserLoaded", {
       current
     });
-    if (s.props.onCurrentUserLoaded) setTimeout(() => s.props.onCurrentUserLoaded(current), 0);
   }, []);
   const defaultCurrentUser = useCallback(() => {
     const {
@@ -57,17 +80,25 @@ const WithCurrentUser = props => {
       current = Devise[scopeName]();
       logger.debug(() => `Setting ${scope} from global current scope: ${current?.id()}`);
     }
-    if (current && s.props.onCurrentUserLoaded) {
-      setTimeout(() => s.props.onCurrentUserLoaded(current), 0);
+    if (current) {
+      events.emit("currentUserLoaded", {
+        current
+      });
     }
     return current;
   }, []);
   s.useStates({
-    current: () => defaultCurrentUser()
+    result: () => ({
+      loaded: false,
+      model: defaultCurrentUser()
+    })
   });
   const updateCurrentUser = useCallback(() => {
     s.set({
-      current: Devise[s.m.scopeName]()
+      result: {
+        loaded: true,
+        model: Devise[s.m.scopeName]()
+      }
     });
   }, []);
   useMemo(() => {
@@ -85,9 +116,9 @@ const WithCurrentUser = props => {
   useEventEmitter(Devise.events(), "onDeviseSignIn", onDeviseSignIn);
   useEventEmitter(Devise.events(), "onDeviseSignOut", onDeviseSignOut);
   return /*#__PURE__*/React.createElement(ScopeContext.Provider, {
-    value: s.s.current
-  }, props.children);
+    value: s.s.result
+  }, children);
 };
-export { WithCurrentUser };
+export { events, WithCurrentUser };
 export default useCurrentUser;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["React","createContext","useCallback","useContext","useMemo","Devise","digg","inflection","Logger","Services","useEventEmitter","useShape","logger","name","useCurrentUser","props","scope","scopeInstance","getScope","currentUserContext","getContext","WithCurrentUser","s","scopeName","camelize","ScopeContext","meta","loadCurrentUserFromRequest","m","getArgsMethodName","args","debug","result","current","sendRequest","query","updateSession","set","onCurrentUserLoaded","setTimeout","defaultCurrentUser","hasCurrentScope","getCurrentScope","id","hasGlobalCurrentScope","useStates","updateCurrentUser","onDeviseSignIn","onDeviseSignOut","events","createElement","Provider","value","children"],"sources":["../src/use-current-user.js"],"sourcesContent":["import React, {createContext, useCallback, useContext, useMemo} from \"react\"\nimport Devise from \"./devise\"\nimport {digg} from \"diggerize\"\nimport * as inflection from \"inflection\"\nimport Logger from \"./logger\"\nimport Services from \"./services\"\nimport useEventEmitter from \"./use-event-emitter\"\nimport useShape from \"set-state-compare/src/use-shape\"\n\nconst logger = new Logger({name: \"ApiMaker / useCurrentUser\"})\n\n// logger.setDebug(true)\n\nconst useCurrentUser = (props) => {\n  const scope = props?.scope || \"user\"\n  const scopeInstance = Devise.getScope(scope)\n  const currentUserContext = useContext(scopeInstance.getContext())\n\n  return currentUserContext\n}\n\nconst WithCurrentUser = (props) => {\n  const s = useShape(props || {})\n  const scope = props?.scope || \"user\"\n  const scopeName = `current${inflection.camelize(scope)}`\n  const scopeInstance = Devise.getScope(scope)\n  const ScopeContext = scopeInstance.getContext()\n\n  s.meta.scope = scope\n  s.meta.scopeName = scopeName\n\n  const loadCurrentUserFromRequest = useCallback(async () => {\n    const {scope} = s.m\n    const getArgsMethodName = `get${inflection.camelize(scope)}Args`\n    const args = Devise[getArgsMethodName]()\n\n    logger.debug(() => `Loading ${scope} with request`)\n\n    const result = await Services.current().sendRequest(\"Devise::Current\", {query: args.query, scope})\n    const current = digg(result, \"current\")[0]\n\n    if (current) Devise.updateSession(current)\n\n    s.set({current})\n\n    if (s.props.onCurrentUserLoaded) setTimeout(() => s.props.onCurrentUserLoaded(current), 0)\n  }, [])\n\n  const defaultCurrentUser = useCallback(() => {\n    const {scope, scopeName} = s.m\n    let current\n\n    if (Devise.current().hasCurrentScope(s.m.scope)) {\n      current = Devise.current().getCurrentScope(scope)\n\n      logger.debug(() => `Setting ${scope} from current scope: ${current?.id()}`)\n    } else if (Devise.current().hasGlobalCurrentScope(scope)) {\n      current = Devise[scopeName]()\n\n      logger.debug(() => `Setting ${scope} from global current scope: ${current?.id()}`)\n    }\n\n    if (current && s.props.onCurrentUserLoaded) {\n      setTimeout(() => s.props.onCurrentUserLoaded(current), 0)\n    }\n\n    return current\n  }, [])\n\n  s.useStates({current: () => defaultCurrentUser()})\n\n  const updateCurrentUser = useCallback(() => {\n    s.set({current: Devise[s.m.scopeName]()})\n  }, [])\n\n  useMemo(() => {\n    if (!Devise.current().hasGlobalCurrentScope(s.m.scope) && !Devise.current().hasCurrentScope(s.m.scope)) {\n      logger.debug(() => `Devise hasn't got current scope ${s.m.scope} so loading from request`)\n      loadCurrentUserFromRequest()\n    }\n  }, [])\n\n  const onDeviseSignIn = useCallback(() => {\n    updateCurrentUser()\n  }, [])\n\n  const onDeviseSignOut = useCallback(() => {\n    updateCurrentUser()\n  }, [])\n\n  useEventEmitter(Devise.events(), \"onDeviseSignIn\", onDeviseSignIn)\n  useEventEmitter(Devise.events(), \"onDeviseSignOut\", onDeviseSignOut)\n\n  return (\n    <ScopeContext.Provider value={s.s.current}>\n      {props.children}\n    </ScopeContext.Provider>\n  )\n}\n\nexport {WithCurrentUser}\nexport default useCurrentUser\n"],"mappings":"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","ignoreList":[]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["React","useCallback","useContext","useMemo","Devise","digg","EventEmitter","inflection","Logger","Services","useEventEmitter","useShape","events","logger","name","setDebug","useCurrentUser","props","scope","withData","restProps","Object","keys","length","Error","join","scopeInstance","getScope","currentUserContext","getContext","model","WithCurrentUser","children","s","scopeName","camelize","ScopeContext","meta","loadCurrentUserFromRequest","m","getArgsMethodName","args","debug","result","current","sendRequest","query","updateSession","set","loaded","emit","defaultCurrentUser","hasCurrentScope","getCurrentScope","id","hasGlobalCurrentScope","useStates","updateCurrentUser","onDeviseSignIn","onDeviseSignOut","createElement","Provider","value"],"sources":["../src/use-current-user.js"],"sourcesContent":["import React, {useCallback, useContext, useMemo} from \"react\"\nimport Devise from \"./devise\"\nimport {digg} from \"diggerize\"\nimport EventEmitter from \"events\"\nimport * as inflection from \"inflection\"\nimport Logger from \"./logger\"\nimport Services from \"./services\"\nimport useEventEmitter from \"./use-event-emitter\"\nimport useShape from \"set-state-compare/src/use-shape\"\n\nconst events = new EventEmitter()\nconst logger = new Logger({name: \"ApiMaker / useCurrentUser\"})\n\nlogger.setDebug(false)\n\nconst useCurrentUser = (props = {}) => {\n  const {scope = \"user\", withData, ...restProps} = props\n\n  if (Object.keys(restProps).length > 0) {\n    throw new Error(`Unknown props given to useCurrentUser: ${Object.keys(restProps).join(\", \")}`)\n  }\n\n  const scopeInstance = Devise.getScope(scope)\n  const currentUserContext = useContext(scopeInstance.getContext())\n\n  if (withData) {\n    return currentUserContext\n  } else {\n    return currentUserContext.model\n  }\n}\n\nconst WithCurrentUser = (props = {}) => {\n  const {children, scope = \"user\", ...restProps} = props\n\n  if (Object.keys(restProps).length > 0) {\n    throw new Error(`Unknown props given to WithCurrentUser: ${Object.keys(restProps).join(\", \")}`)\n  }\n\n  const s = useShape(props)\n  const scopeName = `current${inflection.camelize(scope)}`\n  const scopeInstance = Devise.getScope(scope)\n  const ScopeContext = scopeInstance.getContext()\n\n  s.meta.scope = scope\n  s.meta.scopeName = scopeName\n\n  const loadCurrentUserFromRequest = useCallback(async () => {\n    const {scope} = s.m\n    const getArgsMethodName = `get${inflection.camelize(scope)}Args`\n    const args = Devise[getArgsMethodName]()\n\n    logger.debug(() => `Loading ${scope} with request`)\n\n    const result = await Services.current().sendRequest(\"Devise::Current\", {query: args.query, scope})\n    const current = digg(result, \"current\")[0]\n\n    if (current) Devise.updateSession(current)\n\n    s.set({\n      result: {\n        loaded: true,\n        model: current\n      }\n    })\n\n    events.emit(\"currentUserLoaded\", {current})\n  }, [])\n\n  const defaultCurrentUser = useCallback(() => {\n    const {scope, scopeName} = s.m\n    let current\n\n    if (Devise.current().hasCurrentScope(s.m.scope)) {\n      current = Devise.current().getCurrentScope(scope)\n\n      logger.debug(() => `Setting ${scope} from current scope: ${current?.id()}`)\n    } else if (Devise.current().hasGlobalCurrentScope(scope)) {\n      current = Devise[scopeName]()\n\n      logger.debug(() => `Setting ${scope} from global current scope: ${current?.id()}`)\n    }\n\n    if (current) {\n      events.emit(\"currentUserLoaded\", {current})\n    }\n\n    return current\n  }, [])\n\n  s.useStates({\n    result: () => ({\n      loaded: false,\n      model: defaultCurrentUser()\n    })\n  })\n\n  const updateCurrentUser = useCallback(() => {\n    s.set({\n      result: {\n        loaded: true,\n        model: Devise[s.m.scopeName]()\n      }\n    })\n  }, [])\n\n  useMemo(() => {\n    if (!Devise.current().hasGlobalCurrentScope(s.m.scope) && !Devise.current().hasCurrentScope(s.m.scope)) {\n      logger.debug(() => `Devise hasn't got current scope ${s.m.scope} so loading from request`)\n      loadCurrentUserFromRequest()\n    }\n  }, [])\n\n  const onDeviseSignIn = useCallback(() => {\n    updateCurrentUser()\n  }, [])\n\n  const onDeviseSignOut = useCallback(() => {\n    updateCurrentUser()\n  }, [])\n\n  useEventEmitter(Devise.events(), \"onDeviseSignIn\", onDeviseSignIn)\n  useEventEmitter(Devise.events(), \"onDeviseSignOut\", onDeviseSignOut)\n\n  return (\n    <ScopeContext.Provider value={s.s.result}>\n      {children}\n    </ScopeContext.Provider>\n  )\n}\n\nexport {events, WithCurrentUser}\nexport default useCurrentUser\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaspernj/api-maker",
-  "version": "1.0.2030",
+  "version": "1.0.2031",
   "description": "My new module",
   "main": "build/index.js",
   "scripts": {

package/src/use-current-user.js

@@ -1,27 +1,43 @@
-import React, {createContext, useCallback, useContext, useMemo} from "react"
+import React, {useCallback, useContext, useMemo} from "react"
 import Devise from "./devise"
 import {digg} from "diggerize"
+import EventEmitter from "events"
 import * as inflection from "inflection"
 import Logger from "./logger"
 import Services from "./services"
 import useEventEmitter from "./use-event-emitter"
 import useShape from "set-state-compare/src/use-shape"
 
+const events = new EventEmitter()
 const logger = new Logger({name: "ApiMaker / useCurrentUser"})
 
-// logger.setDebug(true)
+logger.setDebug(false)
+
+const useCurrentUser = (props = {}) => {
+  const {scope = "user", withData, ...restProps} = props
+
+  if (Object.keys(restProps).length > 0) {
+    throw new Error(`Unknown props given to useCurrentUser: ${Object.keys(restProps).join(", ")}`)
+  }
 
-const useCurrentUser = (props) => {
-  const scope = props?.scope || "user"
   const scopeInstance = Devise.getScope(scope)
   const currentUserContext = useContext(scopeInstance.getContext())
 
-  return currentUserContext
+  if (withData) {
+    return currentUserContext
+  } else {
+    return currentUserContext.model
+  }
 }
 
-const WithCurrentUser = (props) => {
-  const s = useShape(props || {})
-  const scope = props?.scope || "user"
+const WithCurrentUser = (props = {}) => {
+  const {children, scope = "user", ...restProps} = props
+
+  if (Object.keys(restProps).length > 0) {
+    throw new Error(`Unknown props given to WithCurrentUser: ${Object.keys(restProps).join(", ")}`)
+  }
+
+  const s = useShape(props)
   const scopeName = `current${inflection.camelize(scope)}`
   const scopeInstance = Devise.getScope(scope)
   const ScopeContext = scopeInstance.getContext()
@@ -41,9 +57,14 @@ const WithCurrentUser = (props) => {
 
     if (current) Devise.updateSession(current)
 
-    s.set({current})
+    s.set({
+      result: {
+        loaded: true,
+        model: current
+      }
+    })
 
-    if (s.props.onCurrentUserLoaded) setTimeout(() => s.props.onCurrentUserLoaded(current), 0)
+    events.emit("currentUserLoaded", {current})
   }, [])
 
   const defaultCurrentUser = useCallback(() => {
@@ -60,17 +81,27 @@ const WithCurrentUser = (props) => {
       logger.debug(() => `Setting ${scope} from global current scope: ${current?.id()}`)
     }
 
-    if (current && s.props.onCurrentUserLoaded) {
-      setTimeout(() => s.props.onCurrentUserLoaded(current), 0)
+    if (current) {
+      events.emit("currentUserLoaded", {current})
     }
 
     return current
   }, [])
 
-  s.useStates({current: () => defaultCurrentUser()})
+  s.useStates({
+    result: () => ({
+      loaded: false,
+      model: defaultCurrentUser()
+    })
+  })
 
   const updateCurrentUser = useCallback(() => {
-    s.set({current: Devise[s.m.scopeName]()})
+    s.set({
+      result: {
+        loaded: true,
+        model: Devise[s.m.scopeName]()
+      }
+    })
   }, [])
 
   useMemo(() => {
@@ -92,11 +123,11 @@ const WithCurrentUser = (props) => {
   useEventEmitter(Devise.events(), "onDeviseSignOut", onDeviseSignOut)
 
   return (
-    <ScopeContext.Provider value={s.s.current}>
-      {props.children}
+    <ScopeContext.Provider value={s.s.result}>
+      {children}
     </ScopeContext.Provider>
   )
 }
 
-export {WithCurrentUser}
+export {events, WithCurrentUser}
 export default useCurrentUser