use underscore to convert to and from camelcase

Author: jannishuebl

src/model.ts

@@ -23,7 +23,7 @@ import {
   IncludeScope
 } from "./scope"
 import { JsonapiTypeRegistry } from "./jsonapi-type-registry"
-import { camelize } from "inflected"
+import { camelize, underscore } from "inflected"
 import { ILogger, logger as defaultLogger } from "./logger"
 import { MiddlewareStack, BeforeFilter, AfterFilter } from "./middleware-stack"
 
@@ -468,7 +468,7 @@ export class JSORMBase {
         let attributeName = key
 
         if (this.klass.camelizeKeys) {
-          attributeName = camelize(key, false)
+          attributeName = camelize(underscore(key), false)
         }
 
         if (key === "id" || this.klass.attributeList[attributeName]) {

src/util/deserialize.ts

@@ -1,6 +1,6 @@
 import { JsonapiTypeRegistry } from "../jsonapi-type-registry"
 import { JSORMBase } from "../model"
-import { camelize } from "inflected"
+import { camelize, underscore } from "inflected"
 import {
   IncludeDirective,
   IncludeScopeHash,
@@ -241,7 +241,11 @@ class Deserializer {
         let relationName = key
 
         if (instance.klass.camelizeKeys) {
-          relationName = camelize(key, false)
+          if (instance.klass.letterCase === "dasherized") {
+            relationName = camelize(underscore(key), false)
+          } else {
+            relationName = camelize(key, false)
+          }
         }
 
         if (instance.klass.attributeList[relationName]) {

src/util/write-payload.ts

@@ -257,7 +257,7 @@ export class WritePayload<T extends JSORMBase> {
 
   private _letterCaseKey(key): string {
     if (this.model.klass.letterCase == "dasherized") {
-      return dasherize(key)
+      return dasherize(underscore(key))
     }
     return underscore(key)
   }

test/unit/model-attributes.test.ts

@@ -20,7 +20,7 @@ describe("Model attributes", () => {
     expect(person.firstName).to.eq("Joe")
   })
 
-  xit("camelizes dasherized strings", function() {
+  it("camelizes dasherized strings", function() {
     const person = new Person({ "first-name": "Joe" })
     expect(person.firstName).to.eq("Joe")
   })

test/unit/write-payload.test.ts

@@ -16,7 +16,7 @@ describe("WritePayload", () => {
     })
   })
 
-  xit("dasherizes attributes", function() {
+  it("dasherizes attributes", function() {
     let person = new PersonWithDasherizedKeys({ first_name: "Joe" })
     let payload = new WritePayload(person, true)
     expect(payload.asJSON()).to.deep.equal({