@kaspernj/api-maker 1.0.173 → 1.0.176

package/package.json

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

package/src/base-error.cjs

@@ -6,7 +6,11 @@ class BaseError extends Error {
     let messageToUse = message
 
     if (typeof args.response == "object" && dig(args, "response", "errors")) {
-      messageToUse = `${messageToUse}: ${errorMessages(args).join(". ")}`
+      if (message) {
+        messageToUse = `${messageToUse}: ${errorMessages(args).join(". ")}`
+      } else {
+        messageToUse = errorMessages(args).join(". ")
+      }
     }
 
     super(messageToUse)

package/src/commands-pool.cjs

@@ -162,7 +162,11 @@ module.exports = class ApiMakerCommandsPool {
       })
       error = new ValidationError(validationErrors, {response: commandResponseData})
     } else {
-      error = new CustomError(`Command failed`, {response: commandResponseData})
+      let errorMessage
+
+      if (!commandResponseData.errors) { errorMessage = "Command failed" }
+
+      error = new CustomError(errorMessage, {response: commandResponseData})
     }
 
     commandData.reject(error)

package/src/config.js

@@ -12,7 +12,11 @@ class ApiMakerConfig {
   }
 
   getHost() {
-    return this.global.host
+    const host = this.global.host
+
+    if (typeof host == "function") return host()
+
+    return host
   }
 
   getRouteDefinitions() {

package/src/link.jsx

@@ -5,17 +5,23 @@ export default class Link extends React.PureComponent {
     const {to, onClick, ...restProps} = this.props
 
     return (
-      <a href={to} {...restProps} onClick={onClick || this.onLinkClicked} />
+      <a href={to} {...restProps} onClick={this.onLinkClicked} />
     )
   }
 
-  onLinkClicked = (e) => {
-    e.preventDefault()
+  onLinkClicked = (e, ...restArgs) => {
+    const {onClick} = this.props
 
-    const history = global.apiMakerConfigGlobal?.history
+    if (onClick) onClick(e, ...restArgs)
 
-    if (!history) throw new Error("History hasn't been set in the API maker configuration")
+    if (!e.defaultPrevented) {
+      e.preventDefault()
 
-    history.push(this.props.to)
+      const history = global.apiMakerConfigGlobal?.history
+
+      if (!history) throw new Error("History hasn't been set in the API maker configuration")
+
+      history.push(this.props.to)
+    }
   }
 }