@kaspernj/api-maker 1.0.327 → 1.0.328

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.327",
+  "version": "1.0.328",
   "type": "module",
   "description": "",
   "main": "index.js",
@@ -49,7 +49,7 @@
     "js-money": ">= 0.6.3",
     "numberable": ">= 1.0.0",
     "object-to-formdata": ">= 4.1.0",
-    "on-location-changed": ">= 1.0.9",
+    "on-location-changed": ">= 1.0.10",
     "qs": ">= 6.9.3",
     "replaceall": ">= 0.1.6",
     "set-state-compare": ">= 1.0.28",

package/src/base-model.mjs

@@ -552,15 +552,24 @@ export default class BaseModel {
 
   setNewModel (model) {
     this.setNewModelData(model)
-    this.relationships = digg(model, "relationships")
-    this.relationshipsCache = digg(model, "relationshipsCache")
+
+    for(const relationshipName in model.relationships) {
+      this.relationships[relationshipName] = model.relationships[relationshipName]
+    }
+
+    for(const relationshipCacheName in model.relationshipsCache) {
+      this.relationshipsCache[relationshipCacheName] = model.relationshipsCache[name]
+    }
   }
 
   setNewModelData (model) {
     if (!("modelData" in model)) throw new Error(`No modelData in model: ${JSON.stringify(model)}`)
 
-    this.previousModelData = digg(this, "modelData")
-    this.modelData = digg(model, "modelData")
+    this.previousModelData = Object.assign({}, digg(this, "modelData"))
+
+    for(const attributeName in model.modelData) {
+      this.modelData[attributeName] = model.modelData[attributeName]
+    }
   }
 
   _isDateChanged (oldValue, newValue) {

package/src/devise.mjs

@@ -6,44 +6,38 @@ import * as inflection from "inflection"
 import modelClassRequire from "./model-class-require.mjs"
 import Services from "./services.mjs"
 
+const events = new EventEmitter()
+const shared = {}
+
+events.setMaxListeners(1000)
+
+export {events}
+
 export default class ApiMakerDevise {
   static callSignOutEvent (args) {
-    ApiMakerDevise.events().emit("onDeviseSignOut", {args})
+    events.emit("onDeviseSignOut", {args})
   }
 
   static current () {
-    if (!globalThis.currentApiMakerDevise) {
-      globalThis.currentApiMakerDevise = new ApiMakerDevise()
+    if (!shared.currentApiMakerDevise) {
+      shared.currentApiMakerDevise = new ApiMakerDevise()
     }
 
-    return globalThis.currentApiMakerDevise
+    return shared.currentApiMakerDevise
   }
 
   static events () {
-    if (!globalThis.apiMakerDeviseEvents) {
-      globalThis.apiMakerDeviseEvents = new EventEmitter()
-      globalThis.apiMakerDeviseEvents.setMaxListeners(1000)
-    }
-
-    return globalThis.apiMakerDeviseEvents
+    return events
   }
 
   static addUserScope (scope) {
     const currentMethodName = `current${inflection.camelize(scope)}`
 
-    ApiMakerDevise[currentMethodName] = function () {
-      return ApiMakerDevise.current().getCurrentScope(scope)
-    }
+    ApiMakerDevise[currentMethodName] = () => ApiMakerDevise.current().getCurrentScope(scope)
 
     const isSignedInMethodName = `is${inflection.camelize(scope)}SignedIn`
 
-    ApiMakerDevise[isSignedInMethodName] = function () {
-      if (ApiMakerDevise.current().getCurrentScope(scope)) {
-        return true
-      }
-
-      return false
-    }
+    ApiMakerDevise[isSignedInMethodName] = () => Boolean(ApiMakerDevise.current().getCurrentScope(scope))
   }
 
   static async signIn (username, password, args = {}) {
@@ -59,7 +53,7 @@ export default class ApiMakerDevise {
     await CanCan.current().resetAbilities()
 
     ApiMakerDevise.updateSession(model)
-    ApiMakerDevise.events().emit("onDeviseSignIn", Object.assign({username}, args))
+    events.emit("onDeviseSignIn", Object.assign({username}, args))
 
     return {model, response}
   }
@@ -88,8 +82,8 @@ export default class ApiMakerDevise {
     await CanCan.current().resetAbilities()
 
     // Cannot use the class because they would both import each other
-    if (globalThis.apiMakerSessionStatusUpdater) {
-      globalThis.apiMakerSessionStatusUpdater.updateSessionStatus()
+    if (shared.apiMakerSessionStatusUpdater) {
+      shared.apiMakerSessionStatusUpdater.updateSessionStatus()
     }
 
     ApiMakerDevise.setSignedOut(args)
@@ -103,8 +97,9 @@ export default class ApiMakerDevise {
   }
 
   getCurrentScope (scope) {
-    if (!(scope in this.currents))
+    if (!(scope in this.currents)) {
       this.currents[scope] = this.loadCurrentScope(scope)
+    }
 
     return this.currents[scope]
   }

package/src/use-current-user.mjs

@@ -5,7 +5,7 @@ const useCurrentUser = () => {
   const [currentUser, setCurrentUser] = useState(Devise.currentUser())
   const updateCurrentUser = useCallback(() => {
     setCurrentUser(Devise.currentUser())
-  })
+  }, [])
 
   useEffect(() => {
     Devise.events().addListener("onDeviseSignIn", updateCurrentUser)

package/src/with-current-user.jsx

@@ -1,30 +1,9 @@
-import Devise from "./devise"
-import {digs} from "diggerize"
-import EventEmitterListener from "./event-emitter-listener"
-import PureComponent from "set-state-compare/src/pure-component"
-import React from "react"
+import useCurrentUser from "./use-current-user.mjs"
 
-export default (WrappedComponent) => class WithCurrentUser extends PureComponent {
-  state = {
-    currentUser: Devise.currentUser()
-  }
+export default (WrappedComponent) => (props) => {
+  const currentUser = useCurrentUser()
 
-  render() {
-    const {onDeviseSigned} = digs(this, "onDeviseSigned")
-    const {currentUser} = digs(this.state, "currentUser")
-
-    return (
-      <>
-        <EventEmitterListener events={Devise.events()} event="onDeviseSignIn" onCalled={onDeviseSigned} />
-        <EventEmitterListener events={Devise.events()} event="onDeviseSignOut" onCalled={onDeviseSigned} />
-        <WrappedComponent {...this.props} currentUser={currentUser} />
-      </>
-    )
-  }
-
-  onDeviseSigned = () => {
-    const currentUser = Devise.currentUser()
-
-    if (this.state.currentUser !== currentUser) this.setState({currentUser})
-  }
+  return (
+    <WrappedComponent {...props} currentUser={currentUser} />
+  )
 }