@kaspernj/api-maker 1.0.123 → 1.0.127

package/.eslintrc.js

@@ -9,6 +9,7 @@ module.exports = {
     "plugin:react/recommended",
     "plugin:jest/recommended"
   ],
+  parser: "@babel/eslint-parser",
   parserOptions: {
     ecmaFeatures: {
       jsx: true
@@ -36,62 +37,62 @@ module.exports = {
     "block-scoped-var": "error",
     "block-spacing": "error",
     "brace-style": "error",
-    "class-methods-use-this": "error",
+    "class-methods-use-this": "off",
     "comma-dangle": "error",
     "comma-spacing": "error",
     "comma-style": "error",
     "complexity": "error",
     "computed-property-spacing": "error",
-    "consistent-return": "error",
+    "consistent-return": "off",
     "consistent-this": "error",
-    "curly": ["error", "multi-or-nest"],
+    "curly": "off",
     "default-case": "error",
     "default-case-last": "error",
     "default-param-last": "error",
     "dot-location": ["error", "property"],
     "dot-notation": "error",
     "eol-last": "error",
-    "eqeqeq": "error",
+    "eqeqeq": "off",
+    "function-call-argument-newline": "off",
     "func-call-spacing": "error",
     "func-name-matching": "error",
     "func-style": "error",
     "function-paren-newline": "error",
     "generator-star-spacing": "error",
     "grouped-accessor-pairs": "error",
-    "guard-for-in": "error",
+    "guard-for-in": "off", // Disabled because insane?
     "id-denylist": "error",
     "id-match": "error",
     "implicit-arrow-linebreak": "error",
     "indent": ["error", 2, {"MemberExpression": "off"}],
-    "init-declarations": "error",
-    "jest/lowercase-name": ["error", {ignore: ["describe"]}],
+    "init-declarations": "off",
     "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",
     "jsx-quotes": "error",
     "key-spacing": "error",
-    "keyword-spacing": "error",
+    "keyword-spacing": "off",
     "linebreak-style": ["error", "unix"],
     "line-comment-position": "off",
     "lines-around-comment": "error",
-    "lines-between-class-members": "error",
-    "max-classes-per-file": "error",
+    "lines-between-class-members": "off",
+    "max-classes-per-file": "off",
     "max-depth": "error",
     "max-nested-callbacks": "error",
     "max-params": "error",
@@ -110,7 +111,7 @@ module.exports = {
     "no-continue": "error",
     "no-div-regex": "error",
     "no-duplicate-imports": "error",
-    "no-else-return": "error",
+    "no-else-return": "off",
     "no-eq-null": "error",
     "no-eval": "error",
     "no-extra-bind": "error",
@@ -143,7 +144,7 @@ module.exports = {
     "no-nonoctal-decimal-escape": "error",
     "no-octal-escape": "error",
     "no-param-reassign": "error",
-    "no-plusplus": "error",
+    "no-plusplus": "off",
     "no-promise-executor-return": "error",
     "no-proto": "error",
     "no-restricted-exports": "error",
@@ -165,8 +166,10 @@ 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-unused-vars": ["error", {"argsIgnorePattern": "^_", "ignoreRestSiblings": true}],
     "no-use-before-define": "error",
     "no-useless-backreference": "error",
     "no-useless-call": "error",
@@ -178,14 +181,14 @@ module.exports = {
     "no-void": "error",
     "no-warning-comments": "off",
     "no-whitespace-before-property": "error",
-    "nonblock-statement-body-position": "error",
+    "nonblock-statement-body-position": ["error", "any"],
     "object-curly-newline": "error",
     "object-curly-spacing": "error",
     "object-shorthand": "error",
     "one-var-declaration-per-line": "error",
     "operator-assignment": "error",
     "operator-linebreak": "error",
-    "padded-blocks": "off",
+    "padded-blocks": ["error", "never"],
     "padding-line-between-statements": "error",
     "prefer-arrow-callback": "error",
     "prefer-exponentiation-operator": "error",
@@ -201,13 +204,13 @@ module.exports = {
     "radix": "error",
     "react/boolean-prop-naming": "error",
     "react/button-has-type": "error",
-    "react/default-props-match-prop-types": "error",
-    "react/destructuring-assignment": "error",
-    "react/forbid-component-props": "error",
+    "react/default-props-match-prop-types": "off",
+    "react/destructuring-assignment": "off",
+    "react/forbid-component-props": "off",
     "react/forbid-dom-props": "error",
     "react/forbid-elements": "error",
     "react/forbid-foreign-prop-types": "error",
-    "react/forbid-prop-types": "error",
+    "react/forbid-prop-types": "off",
     "react/function-component-definition": "error",
     "react/jsx-boolean-value": "error",
     "react/jsx-child-element-spacing": "error",
@@ -220,12 +223,12 @@ module.exports = {
     "react/jsx-filename-extension": "error",
     "react/jsx-first-prop-new-line": "error",
     "react/jsx-fragments": "error",
-    "react/jsx-handler-names": "error",
-    "react/jsx-indent": "error",
-    "react/jsx-indent-props": "error",
+    "react/jsx-handler-names": "off",
+    "react/jsx-indent": ["error", 2],
+    "react/jsx-indent-props": ["error", 2],
     "react/jsx-max-depth": "error",
     "react/jsx-max-props-per-line": "error",
-    "react/jsx-newline": "error",
+    "react/jsx-newline": "off",
     "react/jsx-no-bind": "error",
     "react/jsx-no-constructed-context-values": "error",
     "react/jsx-no-literals": "error",
@@ -234,7 +237,7 @@ module.exports = {
     "react/jsx-one-expression-per-line": "error",
     "react/jsx-pascal-case": "error",
     "react/jsx-props-no-multi-spaces": "error",
-    "react/jsx-props-no-spreading": "error",
+    "react/jsx-props-no-spreading": "off",
     "react/jsx-sort-default-props": "error",
     "react/jsx-sort-props": "error",
     "react/jsx-tag-spacing": "error",
@@ -242,16 +245,19 @@ 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",
-    "react/no-set-state": "error",
+    "react/no-set-state": "off",
     "react/no-this-in-sfc": "error",
     "react/no-typos": "error",
     "react/no-unstable-nested-components": "error",
+    "react/no-unused-class-component-methods": "off",
     "react/no-unused-prop-types": "error",
     "react/no-unused-state": "error",
     "react/no-will-update-set-state": "error",
@@ -259,12 +265,13 @@ module.exports = {
     "react/prefer-exact-props": "error",
     "react/prefer-read-only-props": "error",
     "react/prefer-stateless-function": "error",
-    "react/require-default-props": "error",
+    "react/prop-types": "off", // Disabled because it doesn't work with propTypesExact
+    "react/require-default-props": "off",
     "react/require-optimization": "error",
     "react/self-closing-comp": "error",
-    "react/sort-comp": "error",
+    "react/sort-comp": "off",
     "react/sort-prop-types": "error",
-    "react/state-in-constructor": "error",
+    "react/state-in-constructor": "off",
     "react/static-property-placement": "error",
     "react/style-prop-object": "error",
     "react/void-dom-elements-no-children": "error",
@@ -276,6 +283,7 @@ module.exports = {
     "sort-imports": "error",
     "sort-vars": "error",
     "space-before-blocks": "error",
+    "space-before-function-paren": "error",
     "space-in-parens": "error",
     "space-infix-ops": "error",
     "space-unary-ops": "error",
@@ -296,7 +304,6 @@ module.exports = {
     "camelcase": "off",
     "capitalized-comments": "off",
     "func-names": "off",
-    "function-call-argument-newline": "off",
     "id-length": "off",
     "jest/consistent-test-it": "off",
     "jest/prefer-called-with": "off",
@@ -304,7 +311,7 @@ module.exports = {
     "jest/prefer-strict-equal": "off",
     "no-shadow": "off",
     "jest/prefer-to-have-length": "off",
-    "max-len": "off",
+    "max-len": ["error", {"code": 160}],
     "max-lines": "off",
     "max-lines-per-function": "off",
     "max-statements": "off",
@@ -324,7 +331,6 @@ module.exports = {
     "require-await": "off",
     "require-unicode-regexp": "off",
     "sort-keys": "off",
-    "space-before-function-paren": "off",
     "spaced-comment": "off"
   }
 }

package/__tests__/cable-connection-pool.test.js

@@ -75,7 +75,7 @@ describe("CableConnectionPool", () => {
       const cableSubscriptionPool = new CableSubscriptionPool()
 
       cableSubscriptionPool.connected = true
-      cableSubscriptionPool.connectUnsubscriptionForSubscription = function() {
+      cableSubscriptionPool.connectUnsubscriptionForSubscription = function () {
         connectedUnsubscribeEvent = true
       }
       cableSubscriptionPool.subscriptions = {
@@ -109,7 +109,7 @@ describe("CableConnectionPool", () => {
       }
 
       cableConnectionPool.connected = false
-      cableConnectionPool.connectUpcoming = function() {
+      cableConnectionPool.connectUpcoming = function () {
         const subscriptionData = this.upcomingSubscriptionData
         const subscriptions = this.upcomingSubscriptions
 
@@ -173,7 +173,7 @@ describe("CableConnectionPool", () => {
       const cableSubscriptionPool = new CableSubscriptionPool()
 
       cableSubscriptionPool.connected = true
-      cableSubscriptionPool.connectUnsubscriptionForSubscription = function() {
+      cableSubscriptionPool.connectUnsubscriptionForSubscription = function () {
         connectedUnsubscribeEvent = true
       }
       cableSubscriptionPool.subscriptions = {
@@ -201,7 +201,7 @@ describe("CableConnectionPool", () => {
       const cableSubscriptionPool = new CableSubscriptionPool()
 
       cableSubscriptionPool.connected = true
-      cableSubscriptionPool.connectUnsubscriptionForSubscription = function() {
+      cableSubscriptionPool.connectUnsubscriptionForSubscription = function () {
         connectedUnsubscribeEvent = true
       }
       cableSubscriptionPool.subscriptions = {

package/__tests__/custom-error.test.js

@@ -0,0 +1,13 @@
+const CustomError = require("../src/custom-error.cjs")
+
+describe("CustomError", () => {
+  it("handles when response is a string", () => {
+    const xhr = {status: 401}
+    const response = "An error happened"
+    const customError = new CustomError(`Request failed with code: ${xhr.status}`, {response, xhr})
+
+    expect(customError.message).toEqual("Request failed with code: 401")
+    expect(customError.errorMessages()).toEqual(undefined)
+    expect(customError.errorTypes()).toEqual(undefined)
+  })
+})

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/__tests__/support/task.js

@@ -1,27 +1,27 @@
 module.exports = class Task {
-  static modelClassData() {
+  static modelClassData () {
     return {
       attributes: [],
       name: "Task"
     }
   }
 
-  static modelName() {
+  static modelName () {
     return "Task"
   }
 
-  constructor({a, b, isNewRecord = false, r} = {}) {
+  constructor ({a, b, isNewRecord = false, r} = {}) {
     this.abilities = b
     this._isNewRecord = isNewRecord
     this.modelData = a
     this.relationshipsCache = r
   }
 
-  isNewRecord() {
+  isNewRecord () {
     return this._isNewRecord
   }
 
-  isPersisted() {
+  isPersisted () {
     return !this._isNewRecord
   }
 }

package/__tests__/support/user.js

@@ -1,7 +1,7 @@
 const BaseModel = require("../../src/base-model.cjs")
 
 module.exports = class User extends BaseModel {
-  static modelClassData() {
+  static modelClassData () {
     return {
       attributes: [],
       name: "User",
@@ -9,11 +9,11 @@ module.exports = class User extends BaseModel {
     }
   }
 
-  static modelName() {
+  static modelName () {
     return "User"
   }
 
-  constructor({a, b, isNewRecord = false, r}) {
+  constructor ({a, b, isNewRecord = false, r}) {
     super({a})
 
     this.abilities = b
@@ -22,11 +22,11 @@ module.exports = class User extends BaseModel {
     this.relationshipsCache = r
   }
 
-  isNewRecord() {
+  isNewRecord () {
     return this._isNewRecord
   }
 
-  isPersisted() {
+  isPersisted () {
     return !this._isNewRecord
   }
 }

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.123",
+  "version": "1.0.127",
   "description": "",
   "main": "index.js",
   "repository": {
@@ -30,7 +30,7 @@
   },
   "homepage": "https://github.com/kaspernj/api_maker",
   "scripts": {
-    "eslint": "eslint",
+    "eslint": "eslint --ext .cjs,.js,.jsx",
     "eslint-find-rules": "eslint-find-rules",
     "test": "jest"
   },
@@ -44,16 +44,17 @@
     "stacktrace-parser": ">= 0.1.9"
   },
   "devDependencies": {
+    "@babel/eslint-parser": "^7.16.3",
     "@babel/preset-env": "^7.12.11",
     "@babel/preset-react": "^7.12.10",
     "babel-jest": "^27.0.6",
-    "eslint": "^7.26.0",
+    "eslint": "^8.2.0",
     "eslint-find-rules": "^4.0.0",
-    "eslint-plugin-jest": "^24.3.6",
+    "eslint-plugin-jest": "^26.0.0",
     "eslint-plugin-react": "^7.23.2",
     "i18n-on-steroids": "^1.0.2",
     "jest": "^27.0.6",
-    "jsdom": "^18.0.0"
+    "jsdom": "^19.0.0"
   },
   "dependencies": {
     "@rails/actioncable": ">= 6.1.0",