@kaspernj/api-maker 1.0.243 → 1.0.245

package/.eslintrc.cjs

@@ -75,6 +75,7 @@ module.exports = {
     "jest/no-if": "error",
     "jest/no-large-snapshots": "error",
     "jest/no-restricted-matchers": "error",
+    "jest/no-restricted-jest-methods": "error",
     "jest/no-test-return-statement": "error",
     "jest/prefer-comparison-matcher": "error",
     "jest/prefer-each": "error",

package/package.json

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

package/src/base-model/reflection.mjs

@@ -16,7 +16,7 @@ export default class ApiMakerBaseModelReflection {
   }
 
   modelClass() {
-    const modelClass = modelClassRequire(inflection.singularize(inflection.camelize(digg(this, "reflectionData", "name"))))
+    const modelClass = modelClassRequire(inflection.singularize(inflection.camelize(digg(this, "reflectionData", "resource_name"))))
 
     return modelClass
   }

package/src/compose.js

@@ -0,0 +1,11 @@
+export default function apiMakerCompose(wrappedComponentClass, ...funcs) {
+  if (!wrappedComponentClass) throw new Error("No 'wrappedComponentClass' given")
+
+  let currentComponentClass = wrappedComponentClass
+
+  for (const func of funcs) {
+    currentComponentClass = func(currentComponentClass)
+  }
+
+  return currentComponentClass
+}

package/src/table/filters/filter-form.jsx

@@ -196,7 +196,16 @@ export default class ApiMakerTableFiltersFilterForm extends React.PureComponent
     let currentModelClass = modelClass
 
     for (const pathPart of path) {
-      currentModelClass = currentModelClass.ransackableAssociations().find((reflection) => reflection.name() == pathPart).modelClass()
+      const camelizedPathPart = inflection.camelize(pathPart, true)
+      const association = currentModelClass.ransackableAssociations().find((reflection) => reflection.name() == camelizedPathPart)
+
+      if (!association) {
+        const ransackableAssociationNames = currentModelClass.ransackableAssociations().map((reflection) => reflection.name()).join(", ")
+
+        throw new Error(`Could not find a Ransackable association by that name: ${camelizedPathPart} in ${ransackableAssociationNames}`)
+      }
+
+      currentModelClass = association.modelClass()
     }
 
     return currentModelClass
@@ -214,9 +223,10 @@ export default class ApiMakerTableFiltersFilterForm extends React.PureComponent
     })
 
     for (const pathPart of path) {
-      const pathPartTranslation = currentModelClass.humanAttributeName(pathPart)
+      const camelizedPathPart = inflection.camelize(pathPart, true)
+      const pathPartTranslation = currentModelClass.humanAttributeName(camelizedPathPart)
 
-      currentModelClass = currentModelClass.ransackableAssociations().find((reflection) => reflection.name() == pathPart).modelClass()
+      currentModelClass = currentModelClass.ransackableAssociations().find((reflection) => reflection.name() == camelizedPathPart).modelClass()
 
       result.push({
         modelClass: currentModelClass,
@@ -239,7 +249,7 @@ export default class ApiMakerTableFiltersFilterForm extends React.PureComponent
   }
 
   onReflectionClicked = ({reflection}) => {
-    const newPath = this.shape.path.concat([reflection.name()])
+    const newPath = this.shape.path.concat([inflection.underscore(reflection.name())])
 
     this.shape.set({
       attribute: undefined,