fix: camel cased relationships do not resolve correctly (#300)

postlight · Aug 10, 2016 · a04c0fd · a04c0fd
1 parent c903770
commit a04c0fd
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/src/packages/database/index.js b/src/packages/database/index.js
@@ -5,6 +5,8 @@ import Model from './model';
 
 import initialize from './initialize';
 
+import normalizeModelName from './utils/normalize-model-name';
+
 import type Logger from '../logger';
 import type { Database$opts } from './interfaces';
 
@@ -43,7 +45,7 @@ class Database {
   }
 
   modelFor(type: string): Class<Model> {
-    const model = this.models.get(type);
+    const model = this.models.get(normalizeModelName(type));
 
     if (!model) {
       throw new ModelMissingError(type);

diff --git a/src/packages/database/model/initialize-class.js b/src/packages/database/model/initialize-class.js
@@ -229,7 +229,7 @@ export default async function initializeClass<T: Class<Model>>({
 
       Object.defineProperties(relationship, {
         model: {
-          value: store.modelFor(relatedModel || singularize(relatedName)),
+          value: store.modelFor(relatedModel || relatedName),
           writable: false,
           enumerable: true,
           configurable: false
@@ -269,7 +269,7 @@ export default async function initializeClass<T: Class<Model>>({
 
       Object.defineProperties(relationship, {
         model: {
-          value: store.modelFor(relatedModel || singularize(relatedName)),
+          value: store.modelFor(relatedModel || relatedName),
           writable: false,
           enumerable: true,
           configurable: false
@@ -314,7 +314,7 @@ export default async function initializeClass<T: Class<Model>>({
       if (typeof relatedModel === 'string') {
         relatedModel = store.modelFor(relatedModel);
       } else {
-        relatedModel = store.modelFor(singularize(relatedName));
+        relatedModel = store.modelFor(relatedName);
       }
 
       if (typeof through === 'string') {

diff --git a/src/packages/database/utils/normalize-model-name.js b/src/packages/database/utils/normalize-model-name.js
@@ -0,0 +1,11 @@
+// @flow
+import { dasherize, singularize } from 'inflection';
+
+import underscore from '../../../utils/underscore';
+
+/**
+ * @private
+ */
+export default function normalizeModelName(modelName: string) {
+  return singularize(dasherize(underscore(modelName)));
+}
diff --git a/src/packages/serializer/index.js b/src/packages/serializer/index.js
@@ -1,8 +1,11 @@
 // @flow
+import { dasherize } from 'inflection';
+
 import { VERSION } from '../jsonapi';
 
 import uniq from '../../utils/uniq';
 import insert from '../../utils/insert';
+import underscore from '../../utils/underscore';
 import promiseHash from '../../utils/promise-hash';
 import { dasherizeKeys } from '../../utils/transform-keys';
 
@@ -386,7 +389,7 @@ class Serializer {
         [...this.hasOne, ...this.hasMany].reduce((hash, name) => ({
           ...hash,
 
-          [name]: (async () => {
+          [dasherize(underscore(name))]: (async () => {
             const related = await Reflect.get(item, name);
 
             if (Array.isArray(related)) {