@kaspernj/api-maker 1.0.194 → 1.0.197

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.194",
+  "version": "1.0.197",
   "description": "",
   "main": "index.js",
   "repository": {

package/src/base-error.cjs

@@ -5,11 +5,15 @@ class BaseError extends Error {
   constructor (message, args = {}) {
     let messageToUse = message
 
-    if (typeof args.response == "object" && dig(args, "response", "errors")) {
-      if (message) {
-        messageToUse = `${messageToUse}: ${errorMessages(args).join(". ")}`
-      } else {
-        messageToUse = errorMessages(args).join(". ")
+    if ("addResponseErrorsToErrorMessage" in args && !args.addResponseErrorsToErrorMessage) {
+      messageToUse = message
+    } else {
+      if (typeof args.response == "object" && dig(args, "response", "errors")) {
+        if (message) {
+          messageToUse = `${messageToUse}: ${errorMessages(args).join(". ")}`
+        } else {
+          messageToUse = errorMessages(args).join(". ")
+        }
       }
     }
 
@@ -17,8 +21,7 @@ class BaseError extends Error {
     this.args = args
 
     // Maintains proper stack trace for where our error was thrown (only available on V8)
-    if (Error.captureStackTrace)
-      Error.captureStackTrace(this, BaseError)
+    if (Error.captureStackTrace) Error.captureStackTrace(this, BaseError)
   }
 
   errorMessages () {

package/src/base-model.cjs

@@ -311,7 +311,7 @@ class BaseModel {
   }
 
   static parseValidationErrors ({error, model, options}) {
-    if (!(error instanceof CustomError)) return
+    if (!(error instanceof ValidationError)) return
     if (!error.args.response.validation_errors) return
 
     const validationErrors = new ValidationErrors({

package/src/config.js

@@ -1,50 +1,48 @@
+import inflection from "inflection"
+
+const accessors = {
+  breakPoints: {
+    default: [
+      ["xxl", 1400],
+      ["xl", 1200],
+      ["lg", 992],
+      ["md", 768],
+      ["sm", 576],
+      ["xs", 0]
+    ],
+    required: true
+  },
+  currenciesCollection: {required: true},
+  history: {required: false},
+  host: {required: false},
+  routes: {required: false},
+  routeDefinitions: {required: false}
+}
+
 class ApiMakerConfig {
   constructor() {
     if (!global.apiMakerConfigGlobal) global.apiMakerConfigGlobal = {}
 
     this.global = global.apiMakerConfigGlobal
   }
+}
 
-  getCurrenciesCollection() {
-    if (!this.global.currenciesCollection) throw new Error("Currencies collection hasn't been set")
-
-    return this.global.currenciesCollection
-  }
-
-  getHost() {
-    const host = this.global.host
-
-    if (typeof host == "function") return host()
-
-    return host
-  }
-
-  getRouteDefinitions() {
-    return this.global.routeDefinitions
-  }
+for (const accessorName in accessors) {
+  const accessorData = accessors[accessorName]
+  const camelizedAccessor = inflection.camelize(accessorName)
 
-  getRoutes() {
-    return this.global.routes
-  }
+  ApiMakerConfig.prototype[`set${camelizedAccessor}`] = function (newValue) { this.global[accessorName] = newValue }
+  ApiMakerConfig.prototype[`get${camelizedAccessor}`] = function (...args) {
+    if (!this.global[accessorName]) {
+      if (accessorData.default) return accessorData.default
+      if (accessorData.required) throw new Error(`${accessorName} hasn't been set`)
+    }
 
-  setCurrenciesCollection(newCurrenciesCollection) {
-    this.global.currenciesCollection = newCurrenciesCollection
-  }
+    const value = this.global[accessorName]
 
-  setHistory(history) {
-    this.global.history = history
-  }
-
-  setHost(host) {
-    this.global.host = host
-  }
-
-  setRouteDefinitions(routeDefinitions) {
-    this.global.routeDefinitions = routeDefinitions
-  }
+    if (typeof value == "function") return value(...args)
 
-  setRoutes(routes) {
-    this.global.routes = routes
+    return value
   }
 }
 

package/src/link.jsx

@@ -17,7 +17,7 @@ export default class Link extends React.PureComponent {
     if (!e.defaultPrevented && !e.ctrlKey && !e.metaKey) {
       e.preventDefault()
 
-      const history = global.apiMakerConfigGlobal?.history
+      const history = globalThis.apiMakerConfigGlobal?.history
 
       if (!history) throw new Error("History hasn't been set in the API maker configuration")
 

package/src/source-maps-loader.cjs

@@ -99,7 +99,7 @@ module.exports = class SourceMapsLoader {
   }
 
   includeMapURL(src) {
-    return src.includes("/packs/") || src.includes("/assets/")
+    return src.includes("/packs/")
   }
 
   async loadSourceMapForSource ({originalUrl, sourceMapUrl}) {

package/src/validation-error.cjs

@@ -1,9 +1,13 @@
-const CustomError = require("./custom-error.cjs")
+const BaseError = require("./base-error.cjs")
 const inflection = require("inflection")
 
-class ValidationError extends CustomError {
+class ValidationError extends BaseError {
   constructor (validationErrors, args) {
-    super(validationErrors.getUnhandledErrorMessage() || validationErrors.getErrorMessage(), args)
+    const errorMessage = validationErrors.getUnhandledErrorMessage() || validationErrors.getErrorMessage()
+    const forwardedArgs = {addResponseErrorsToErrorMessage: false}
+    const newArgs = Object.assign({}, args, forwardedArgs)
+
+    super(errorMessage, newArgs)
     this.validationErrors = validationErrors
   }
 

package/src/validation-errors.cjs

@@ -96,8 +96,7 @@ class ValidationErrors {
     return this.validationErrors
   }
 
-  getValidationErrorsForInput (args) {
-    const {attribute, inputName, onMatchValidationError} = args
+  getValidationErrorsForInput ({attribute, inputName, onMatchValidationError}) {
     const validationErrors = this.validationErrors.filter((validationError) => {
       if (onMatchValidationError) {
         return onMatchValidationError(validationError)