@kaspernj/api-maker 1.0.281 → 1.0.283

package/package.json

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

package/src/base-model.mjs

@@ -17,6 +17,18 @@ import Services from "./services.mjs"
 import ValidationError from "./validation-error.mjs"
 import {ValidationErrors} from "./validation-errors.mjs"
 
+const objectToUnderscore = (object) => {
+  const newObject = {}
+
+  for (const key in object) {
+    const underscoreKey = inflection.underscore(key)
+
+    newObject[underscoreKey] = object[key]
+  }
+
+  return newObject
+}
+
 export default class BaseModel {
   static apiMakerType = "BaseModel"
 
@@ -171,10 +183,10 @@ export default class BaseModel {
       this._readModelDataFromArgs(args)
     } else if (args.a) {
       this.abilities = args.b || {}
-      this.modelData = args.a
+      this.modelData = objectToUnderscore(args.a)
     } else if (args) {
       this.abilities = {}
-      this.modelData = args
+      this.modelData = objectToUnderscore(args)
     } else {
       this.abilities = {}
       this.modelData = {}
@@ -408,8 +420,9 @@ export default class BaseModel {
     return this._identifierKey
   }
 
-  isAssociationLoaded (associationName) {
-    if (associationName in this.relationshipsCache) return true
+  isAssociationLoaded = (associationName) => this.isAssociationLoadedUnderscore(inflection.underscore(associationName))
+  isAssociationLoadedUnderscore (associationNameUnderscore) {
+    if (associationNameUnderscore in this.relationshipsCache) return true
     return false
   }
 
@@ -908,7 +921,7 @@ export default class BaseModel {
   _readModelDataFromArgs (args) {
     this.abilities = args.data.b || {}
     this.collection = args.collection
-    this.modelData = args.data.a
+    this.modelData = objectToUnderscore(args.data.a)
     this.preloadedRelationships = args.data.r
   }
 

package/src/collection.mjs

@@ -110,7 +110,9 @@ export default class ApiMakerCollection {
 
       return digg(model.relationships, reflectionNameUnderscore)
     } else {
-      throw new Error(`${reflectionName} hasnt been loaded yet`)
+      const relationshipsLoaded = uniqunize(Object.keys(model.relationships).concat(Object.keys(model.relationshipsCache)))
+
+      throw new Error(`${reflectionName} hasnt been loaded yet on ${model.modelClassData().name}. Loaded was: ${relationshipsLoaded.join(", ")}`)
     }
   }