@kaspernj/api-maker 1.0.122 → 1.0.126

package/.eslintrc.js

@@ -64,23 +64,22 @@ module.exports = {
     "implicit-arrow-linebreak": "error",
     "indent": ["error", 2, {"MemberExpression": "off"}],
     "init-declarations": "error",
-    "jest/lowercase-name": ["error", {ignore: ["describe"]}],
     "jest/max-nested-describe": "error",
     "jest/no-alias-methods": "error",
     "jest/no-duplicate-hooks": "error",
-    "jest/no-hooks": "error",
+    "jest/no-hooks": "off",
     "jest/no-if": "error",
     "jest/no-large-snapshots": "error",
     "jest/no-restricted-matchers": "error",
     "jest/no-test-return-statement": "error",
     "jest/prefer-expect-resolves": "off", // Needs configuration and no documentation could be found?
     "jest/prefer-hooks-on-top": "error",
+    "jest/prefer-lowercase-title": "off",
     "jest/prefer-to-be": "off", // Needs configuration and no documentation could be found?
     "jest/prefer-spy-on": "error",
-    "jest/prefer-to-be-null": "error",
-    "jest/prefer-to-be-undefined": "error",
     "jest/prefer-to-contain": "error",
     "jest/prefer-todo": "error",
+    "jest/require-hook": "error",
     "jest/require-to-throw-message": "error",
     "jest/require-top-level-describe": "error",
     "jest/unbound-method": "error",
@@ -165,6 +164,7 @@ module.exports = {
     "no-unmodified-loop-condition": "error",
     "no-unneeded-ternary": "error",
     "no-unreachable-loop": "error",
+    "no-unused-private-class-members": "error",
     "no-unsafe-optional-chaining": "error",
     "no-unused-expressions": "error",
     "no-use-before-define": "error",
@@ -242,9 +242,11 @@ module.exports = {
     "react/no-access-state-in-setstate": "error",
     "react/no-adjacent-inline-elements": "error",
     "react/no-array-index-key": "error",
+    "react/no-arrow-function-lifecycle": "error",
     "react/no-danger": "error",
     "react/no-did-mount-set-state": "error",
     "react/no-did-update-set-state": "error",
+    "react/no-invalid-html-attribute": "error",
     "react/no-multi-comp": "error",
     "react/no-namespace": "error",
     "react/no-redundant-should-component-update": "error",
@@ -252,6 +254,7 @@ module.exports = {
     "react/no-this-in-sfc": "error",
     "react/no-typos": "error",
     "react/no-unstable-nested-components": "error",
+    "react/no-unused-class-component-methods": "error",
     "react/no-unused-prop-types": "error",
     "react/no-unused-state": "error",
     "react/no-will-update-set-state": "error",

package/__tests__/model-name.test.js

@@ -2,21 +2,27 @@ const I18nOnSteroids = require("i18n-on-steroids")
 const i18n = new I18nOnSteroids()
 const ModelName = require("../src/model-name.cjs")
 
-i18n.scanObject({
-  da: {
-    activerecord: {
-      models: {
-        user: {
-          one: "Bruger",
-          other: "Brugere"
+const initializeI18n = () => {
+  i18n.scanObject({
+    da: {
+      activerecord: {
+        models: {
+          user: {
+            one: "Bruger",
+            other: "Brugere"
+          }
         }
       }
     }
-  }
-})
-i18n.setLocale("da")
+  })
+  i18n.setLocale("da")
+}
 
 describe("ModelName", () => {
+  beforeEach(() => {
+    initializeI18n()
+  })
+
   test("human", () => {
     const modelClassData = {i18nKey: "user"}
     const modelName = new ModelName({i18n, modelClassData})

package/__tests__/routes-native.test.js

@@ -1,5 +1,5 @@
 const RoutesNative = require("../src/routes-native.cjs")
-const testRoutes = {
+const testRoutes = () => ({
   routes: [
     {"name": "blank", "path": "/blank", "component": "blank"},
 
@@ -10,8 +10,8 @@ const testRoutes = {
     {"name": "drink", "path": "/drinks/:id", "component": "drinks/show"},
     {"name": "drinks", "path": "/drinks", "component": "drinks/index"}
   ]
-}
-const testTranslations = {
+})
+const testTranslations = () => ({
   locales: {
     da: {
       routes: {
@@ -26,94 +26,76 @@ const testTranslations = {
       }
     }
   }
-}
-
-let currentLocale = "en"
+})
 
-const routesNative = ({args}) => {
+const routesNative = ({args, currentLocale}) => {
   const test = new RoutesNative({
     getLocale: () => currentLocale
   })
 
-  test.loadRouteTranslations(testTranslations)
-  test.loadRouteDefinitions(testRoutes, args)
+  test.loadRouteTranslations(testTranslations())
+  test.loadRouteDefinitions(testRoutes(), args)
 
   return test
 }
 
 describe("RoutesNative", () => {
   it("translates routes from the current locale", () => {
-    currentLocale = "da"
-
-    const test = routesNative({args: {localized: true}})
+    const test = routesNative({args: {localized: true}, currentLocale: "da"})
     const daRoute = test.editDrinkPath(5)
 
     expect(daRoute).toEqual("/da/drinks/5/rediger")
   })
 
   it("translates routes from the locale-param", () => {
-    currentLocale = "en"
-
-    const test = routesNative({args: {localized: true}})
+    const test = routesNative({args: {localized: true}, currentLocale: "en"})
     const daRoute = test.editDrinkPath(5, {locale: "da"})
 
     expect(daRoute).toEqual("/da/drinks/5/rediger")
   })
 
   it("defaults to the locale given by the getLocale callback", () => {
-    currentLocale = "en"
-
-    const test = routesNative({args: {localized: true}})
+    const test = routesNative({args: {localized: true}, currentLocale: "en"})
     const daRoute = test.editDrinkPath(5)
 
     expect(daRoute).toEqual("/en/drinks/5/edit")
   })
 
   it("uses the rest of the params as a query string", () => {
-    currentLocale = "en"
-
-    const test = routesNative({args: {localized: true}})
+    const test = routesNative({args: {localized: true}, currentLocale: "en"})
     const daRoute = test.editDrinkPath(5, {drink: {name: "Pina Colada"}, locale: "da"})
 
     expect(daRoute).toEqual("/da/drinks/5/rediger?drink%5Bname%5D=Pina%20Colada")
   })
 
   it("translates a route without localization", () => {
-    currentLocale = "en"
-
-    const test = routesNative({})
+    const test = routesNative({currentLocale: "en"})
     const daRoute = test.editDrinkPath(5, {drink: {name: "Pina Colada"}})
 
     expect(daRoute).toEqual("/drinks/5/edit?drink%5Bname%5D=Pina%20Colada")
   })
 
   it("generates urls", () => {
-    currentLocale = "en"
-
     if (!global.location) global.location = {} // eslint-disable-line jest/no-if
 
     global.location.host = "localhost"
     global.location.protocol = "http:"
 
-    const test = routesNative({args: {localized: true}})
+    const test = routesNative({args: {localized: true}, currentLocale: "en"})
     const daRoute = test.editDrinkUrl(5, {drink: {name: "Pina Colada"}, locale: "da"})
 
     expect(daRoute).toEqual("http://localhost/da/drinks/5/rediger?drink%5Bname%5D=Pina%20Colada")
   })
 
   it("generates urls with custom options", () => {
-    currentLocale = "en"
-
-    const test = routesNative({args: {localized: true}})
+    const test = routesNative({args: {localized: true}, currentLocale: "en"})
     const daRoute = test.editDrinkUrl(5, {drink: {name: "Pina Colada"}, locale: "da", host: "google.com", port: 123, protocol: "https"})
 
     expect(daRoute).toEqual("https://google.com:123/da/drinks/5/rediger?drink%5Bname%5D=Pina%20Colada")
   })
 
   it("generates urls without locales", () => {
-    currentLocale = "en"
-
-    const test = routesNative({})
+    const test = routesNative({currentLocale: "en"})
     const daRoute = test.editDrinkUrl(5, {drink: {name: "Pina Colada"}, locale: "da", host: "google.com", port: 123, protocol: "https"})
 
     expect(daRoute).toEqual("https://google.com:123/drinks/5/edit?drink%5Bname%5D=Pina%20Colada")

package/index.js

@@ -16,10 +16,8 @@ const EventCreated = require("./src/event-created").default
 const EventDestroyed = require("./src/event-destroyed").default
 const EventEmitterListener = require("./src/event-emitter-listener").default
 const EventListener = require("./src/event-listener").default
-const EventLocationChanged = require("./src/event-location-changed").default
 const EventModelClass = require("./src/event-model-class").default
 const EventUpdated = require("./src/event-updated").default
-const HistoryListener = require("./src/history-listener").default
 const instanceOfClassName = require("./src/instance-of-class-name.cjs")
 const KeyValueStore = require("./src/key-value-store.cjs")
 const Logger = require("./src/logger.cjs")
@@ -62,10 +60,8 @@ export {
   EventDestroyed,
   EventEmitterListener,
   EventListener,
-  EventLocationChanged,
   EventModelClass,
   EventUpdated,
-  HistoryListener,
   instanceOfClassName,
   KeyValueStore,
   Logger,

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.122",
+  "version": "1.0.126",
   "description": "",
   "main": "index.js",
   "repository": {
@@ -47,9 +47,9 @@
     "@babel/preset-env": "^7.12.11",
     "@babel/preset-react": "^7.12.10",
     "babel-jest": "^27.0.6",
-    "eslint": "^7.26.0",
-    "eslint-find-rules": "^3.6.1",
-    "eslint-plugin-jest": "^24.3.6",
+    "eslint": "^8.2.0",
+    "eslint-find-rules": "^4.0.0",
+    "eslint-plugin-jest": "^25.2.4",
     "eslint-plugin-react": "^7.23.2",
     "i18n-on-steroids": "^1.0.2",
     "jest": "^27.0.6",

package/src/base-model.cjs

@@ -152,6 +152,10 @@ module.exports = class BaseModel {
     }
   }
 
+  static all() {
+    return this.ransack()
+  }
+
   async create(attributes, options) {
     if (attributes) this.assignAttributes(attributes)
     const paramKey = this.modelClassData().paramKey

package/src/model-recipes-model-loader.cjs

@@ -138,12 +138,14 @@ module.exports = class ApiMakerModelRecipesModelLoader {
         })
       } else if (type == "has_many") {
         this.defineHasManyGetMethod({
+          activeRecordName,
           className,
           foreignKey,
           ModelClass,
           modelMethodName,
           modelRecipesLoader,
           optionsAs,
+          optionsPrimaryKey,
           optionsThrough,
           relationshipName,
           resourceName
@@ -194,7 +196,7 @@ module.exports = class ApiMakerModelRecipesModelLoader {
     }
   }
 
-  defineHasManyGetMethod({className, foreignKey, ModelClass, modelMethodName, modelRecipesLoader, optionsAs, optionsThrough, relationshipName, resourceName}) {
+  defineHasManyGetMethod({activeRecordName, className, foreignKey, ModelClass, modelMethodName, modelRecipesLoader, optionsAs, optionsPrimaryKey, optionsThrough, relationshipName, resourceName}) {
     ModelClass.prototype[modelMethodName] = function () {
       const id = this.primaryKey()
       const modelClass = modelRecipesLoader.getModelClass(resourceName)
@@ -215,7 +217,7 @@ module.exports = class ApiMakerModelRecipesModelLoader {
         queryParameters = {
           params: {
             through: {
-              model: className,
+              model: activeRecordName,
               id: this.primaryKey(),
               reflection: relationshipName
             }
@@ -223,8 +225,12 @@ module.exports = class ApiMakerModelRecipesModelLoader {
         }
       } else {
         const ransack = {}
+        const primaryKeyColumnName = optionsPrimaryKey || digg(ModelClass.modelClassData(), "primaryKey")
+        const primaryKeyMethodName = inflection.camelize(primaryKeyColumnName, true)
+
+        if (!(primaryKeyMethodName in this)) throw new Error(`No such primary key method: ${primaryKeyMethodName}`)
 
-        ransack[`${foreignKey}_eq`] = this.primaryKey()
+        ransack[`${foreignKey}_eq`] = this[primaryKeyMethodName]()
 
         if (optionsAs) {
           ransack[`${optionsAs}_type_eq`] = activeRecordName

package/src/event-location-changed.jsx

@@ -1,21 +0,0 @@
-import PropTypes from "prop-types"
-import React from "react"
-
-export default class EventLocationChanged extends React.PureComponent {
-  static propTypes = {
-    history: PropTypes.object.isRequired,
-    onChanged: PropTypes.func.isRequired
-  }
-
-  componentDidMount() {
-    this.appHistoryUnlisten = this.props.history.listen(this.props.onChanged)
-  }
-
-  componentWillUnmount() {
-    this.appHistoryUnlisten()
-  }
-
-  render() {
-    return null
-  }
-}

package/src/history-listener.jsx

@@ -1,20 +0,0 @@
-const PropTypes = require("prop-types")
-const PropTypesExact = require("prop-types-exact")
-
-export default class ApiMakerHistoryListener extends React.PureComponent {
-  static propTypes = PropTypesExact({
-    onChanged: PropTypes.func.isRequired
-  })
-
-  componentDidMount() {
-    this.unlisten = AppHistory.listen((location, action) => this.props.onChanged({location, action}))
-  }
-
-  componentWillUnmount() {
-    this.unlisten()
-  }
-
-  render() {
-    return null
-  }
-}