@kaspernj/api-maker 1.0.126 → 1.0.129

package/.eslintrc.js

@@ -9,6 +9,7 @@ module.exports = {
     "plugin:react/recommended",
     "plugin:jest/recommended"
   ],
+  parser: "@babel/eslint-parser",
   parserOptions: {
     ecmaFeatures: {
       jsx: true
@@ -36,34 +37,35 @@ 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",
+    "init-declarations": "off",
     "jest/max-nested-describe": "error",
     "jest/no-alias-methods": "error",
     "jest/no-duplicate-hooks": "error",
@@ -85,12 +87,12 @@ module.exports = {
     "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",
@@ -109,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",
@@ -142,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",
@@ -167,6 +169,7 @@ module.exports = {
     "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",
@@ -250,11 +253,11 @@ module.exports = {
     "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": "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",
@@ -262,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",
@@ -279,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",
@@ -299,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",
@@ -307,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",
@@ -327,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__/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/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.126",
+  "version": "1.0.129",
   "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,22 +44,23 @@
     "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": "^8.2.0",
     "eslint-find-rules": "^4.0.0",
-    "eslint-plugin-jest": "^25.2.4",
+    "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",
     "clone-deep": ">= 4.0.1",
     "debounce": ">= 1.2.1",
-    "diggerize": ">= 1.0.3",
+    "diggerize": ">= 1.0.4",
     "epic-locks": ">= 1.0.1",
     "form-data-objectizer": ">= 1.0.0",
     "form-serialize": ">= 0.7.2",

package/src/api.cjs

@@ -3,23 +3,23 @@ const FormDataObjectizer = require("form-data-objectizer")
 const qs = require("qs")
 
 module.exports = class Api {
-  static get(path, pathParams = null) {
+  static get (path, pathParams = null) {
     return this.requestLocal({path, pathParams, method: "GET"})
   }
 
-  static delete(path, pathParams = null) {
+  static delete (path, pathParams = null) {
     return this.requestLocal({path, pathParams, method: "DELETE"})
   }
 
-  static patch(path, data = {}) {
+  static patch (path, data = {}) {
     return this.requestLocal({path, data, method: "PATCH"})
   }
 
-  static post(path, data = {}) {
+  static post (path, data = {}) {
     return this.requestLocal({path, data, method: "POST"})
   }
 
-  static request(args) {
+  static request (args) {
     let path = args.path
 
     if (args.pathParams) {
@@ -32,7 +32,7 @@ module.exports = class Api {
       xhr.open(args.method, path, true)
 
       if (args.headers) {
-        for(const headerName in args.headers) {
+        for (const headerName in args.headers) {
           xhr.setRequestHeader(headerName, args.headers[headerName])
         }
       }
@@ -59,41 +59,41 @@ module.exports = class Api {
     })
   }
 
-  static requestLocal(args) {
+  static requestLocal (args) {
     if (!args.headers) {
-      args["headers"] = {}
+      args.headers = {}
     }
 
     const token = this._token()
 
     if (token) {
-      args["headers"]["X-CSRF-Token"] = token
+      args.headers["X-CSRF-Token"] = token
     }
 
     if (args.data) {
-      args["headers"]["Content-Type"] = "application/json"
-      args["data"] = JSON.stringify(args.data)
+      args.headers["Content-Type"] = "application/json"
+      args.data = JSON.stringify(args.data)
     }
 
     if (args.rawData) {
-      args["data"] = args.rawData
+      args.data = args.rawData
     }
 
     return this.request(args)
   }
 
-  static put(path, data = {}) {
+  static put (path, data = {}) {
     return this.requestLocal({path, data, method: "PUT"})
   }
 
-  static _token() {
+  static _token () {
     const tokenElement = document.querySelector("meta[name='csrf-token']")
 
     if (tokenElement)
       return tokenElement.getAttribute("content")
   }
 
-  static _parseResponse(xhr) {
+  static _parseResponse (xhr) {
     const responseType = xhr.getResponseHeader("content-type")
 
     if (responseType && responseType.startsWith("application/json")) {