@kaspernj/api-maker 1.0.284 → 1.0.286

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.284",
+  "version": "1.0.286",
   "type": "module",
   "description": "",
   "main": "index.js",
@@ -74,7 +74,7 @@
     "eslint-find-rules": "^4.0.0",
     "eslint-plugin-jest": "^27.0.1",
     "eslint-plugin-react": "^7.23.2",
-    "i18n-on-steroids": "^1.0.5",
+    "i18n-on-steroids": "^1.0.7",
     "jest": "^29.0.1",
     "jsdom": "^22.0.0"
   }

package/src/base-model.mjs

@@ -222,7 +222,17 @@ export default class BaseModel {
   }
 
   attributes () {
-    return digg(this, "modelData")
+    const result = {}
+
+    for (const key in this.modelData) {
+      result[key] = this.modelData[key]
+    }
+
+    for (const key in this.changes) {
+      result[key] = this.changes[key]
+    }
+
+    return result
   }
 
   can (givenAbilityName) {
@@ -271,6 +281,12 @@ export default class BaseModel {
     }
   }
 
+  localCacheKey() {
+    const cacheKeyGenerator = new CacheKeyGenerator(this)
+
+    return cacheKeyGenerator.local()
+  }
+
   fullCacheKey() {
     const cacheKeyGenerator = new CacheKeyGenerator(this)
 

package/src/cache-key-generator.mjs

@@ -2,11 +2,20 @@ import SparkMD5 from "spark-md5"
 
 export default class CacheKeyGenerator {
   constructor(model) {
+    this.model = model
     this.allModels = [model]
     this.readModels = {}
     this.recordModelType(model.modelClassData().name)
     this.recordModel(model.modelClassData().name, model)
-    this.fillModels(model)
+    this.filledModels = false
+  }
+
+  local() {
+    const md5 = new SparkMD5()
+
+    this.feedModel(this.model, md5)
+
+    return md5.end()
   }
 
   recordModelType(relationshipType) {
@@ -39,32 +48,42 @@ export default class CacheKeyGenerator {
         this.fillModels(anotherModel)
       }
     }
+
+    this.filledModels = true
   }
 
   cacheKey() {
+    if (!this.filledModels) {
+      this.fillModels(this.model)
+    }
+
     const md5 = new SparkMD5()
 
     for (const model of this.allModels) {
-      md5.append("--model--")
-      md5.append(model.modelClassData().name)
-      md5.append("--unique-key--")
-      md5.append(model.id() || model.uniqueKey())
-
-      if (model.markedForDestruction()) {
-        md5.append("--marked-for-destruction--")
-      }
+      this.feedModel(model, md5)
+    }
 
-      md5.append("-attributes-")
+    return md5.end()
+  }
 
-      const attributes = model.attributes()
+  feedModel(model, md5) {
+    md5.append("--model--")
+    md5.append(model.modelClassData().name)
+    md5.append("--unique-key--")
+    md5.append(model.id() || model.uniqueKey())
 
-      for (const attributeName in attributes) {
-        md5.append(attributeName)
-        md5.append("--attribute--")
-        md5.append(`${model.readAttributeUnderscore(attributeName)}`)
-      }
+    if (model.markedForDestruction()) {
+      md5.append("--marked-for-destruction--")
     }
 
-    return md5.end()
+    md5.append("-attributes-")
+
+    const attributes = model.attributes()
+
+    for (const attributeName in attributes) {
+      md5.append(attributeName)
+      md5.append("--attribute--")
+      md5.append(`${model.readAttributeUnderscore(attributeName)}`)
+    }
   }
 }

package/src/event-emitter-listener.jsx

@@ -9,11 +9,6 @@ export default class ApiMakerEventEmitterListener extends React.PureComponent {
     onCalled: PropTypes.func.isRequired
   }
 
-  constructor (props) {
-    super(props)
-    this.onCalled = this.onCalled.bind(this)
-  }
-
   componentDidMount () {
     this.props.events.addListener(this.props.event, this.onCalled)
   }
@@ -22,7 +17,7 @@ export default class ApiMakerEventEmitterListener extends React.PureComponent {
     this.props.events.removeListener(this.props.event, this.onCalled)
   }
 
-  onCalled (...args) {
+  onCalled = (...args) => {
     this.props.onCalled.apply(null, ...args)
   }
 

package/src/resize-observer.jsx

@@ -1,5 +1,6 @@
 import PropTypes from "prop-types"
 import PropTypesExact from "prop-types-exact"
+import React from "react"
 
 export default class ApiMakerResizeObserver extends React.PureComponent {
   static propTypes = PropTypesExact({

package/src/routes-native.mjs

@@ -33,8 +33,10 @@ export default class ApiMakerRoutesNative {
 
             if (variableMatch) {
               localizedPathParts.push({type: "variable", count: variableCount++})
-            } else {
-              localizedPathParts.push({type: "pathPart", name: dig(this.routeTranslationParts, locale, pathPart) || pathPart})
+            } else if (pathPart) {
+              const name = this.i18n.t(`routes.${pathPart}`, null, {default: pathPart, locale})
+
+              localizedPathParts.push({type: "pathPart", name})
             }
           }
 
@@ -63,6 +65,7 @@ export default class ApiMakerRoutesNative {
   }
 
   loadRouteTranslations (i18n) {
+    this.i18n = i18n
     const locales = digg(i18n, "locales")
 
     for (const locale in locales) {