@kaspernj/api-maker 1.0.280 → 1.0.282

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.280",
+  "version": "1.0.282",
   "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 = {}
@@ -184,13 +196,14 @@ export default class BaseModel {
   assignAttributes (newAttributes) {
     for (const key in newAttributes) {
       const newValue = newAttributes[key]
+      const attributeUnderscore = inflection.underscore(key)
 
       let applyChange = true
       let deleteChange = false
 
       if (this.isAttributeLoaded(key)) {
-        const oldValue = this.readAttributeUnderscore(key)
-        const originalValue = this.modelData[key]
+        const oldValue = this.readAttribute(key)
+        const originalValue = this.modelData[attributeUnderscore]
 
         if (newValue == oldValue) {
           applyChange = false
@@ -201,9 +214,9 @@ export default class BaseModel {
       }
 
       if (applyChange) {
-        this.changes[key] = newValue
+        this.changes[attributeUnderscore] = newValue
       } else if (deleteChange) {
-        delete this.changes[key]
+        delete this.changes[attributeUnderscore]
       }
     }
   }
@@ -907,7 +920,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
   }