@kaspernj/api-maker 1.0.174 → 1.0.177

package/.eslintrc.js

@@ -113,6 +113,7 @@ module.exports = {
     "no-caller": "error",
     "no-confusing-arrow": "error",
     "no-constant-binary-expression": "error",
+    "no-constant-condition": "off",
     "no-constructor-return": "error",
     "no-continue": "error",
     "no-div-regex": "error",
@@ -251,6 +252,7 @@ module.exports = {
     "react/jsx-sort-props": "error",
     "react/jsx-tag-spacing": "error",
     "react/jsx-wrap-multilines": "error",
+    "react/jsx-max-props-per-line": "off",
     "react/no-access-state-in-setstate": "error",
     "react/no-adjacent-inline-elements": "error",
     "react/no-array-index-key": "error",
@@ -292,7 +294,7 @@ module.exports = {
     "sort-imports": "error",
     "sort-vars": "error",
     "space-before-blocks": "error",
-    "space-before-function-paren": "error",
+    "space-before-function-paren": ["error", "never"],
     "space-in-parens": "error",
     "space-infix-ops": "error",
     "space-unary-ops": "error",

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.174",
+  "version": "1.0.177",
   "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

@@ -47,7 +47,7 @@ module.exports = class ApiMakerCommandsPool {
     this.pool = {}
     this.poolData = {}
     this.currentId = 1
-    this.globalRequestData = null
+    this.globalRequestData = {}
   }
 
   addCommand (data) {
@@ -107,7 +107,7 @@ module.exports = class ApiMakerCommandsPool {
     try {
       const submitData = {pool: currentPoolData}
 
-      if (this.globalRequestData)
+      if (Object.keys(this.globalRequestData).length > 0)
         submitData.global = this.globalRequestData
 
       const commandSubmitData = new CommandSubmitData(submitData)
@@ -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/with-router.jsx

@@ -8,8 +8,8 @@ import shouldComponentUpdate from "set-state-compare/src/should-component-update
 export default (WrapperComponent) => class WithRouter extends React.Component {
   static propTypes = {
     path: PropTypes.string,
-    routes: PropTypes.object,
-    routeDefinitions: PropTypes.object
+    routeDefinitions: PropTypes.object,
+    routes: PropTypes.object
   }
 
   parsedRouteDefinitions = this.parseRouteDefinitions()
@@ -18,7 +18,7 @@ export default (WrapperComponent) => class WithRouter extends React.Component {
     return shouldComponentUpdate(this, nextProps, nextState)
   }
 
-  findRouteParams (routeDefinition) {
+  findRouteParams(routeDefinition) {
     const result = []
     const parts = routeDefinition.path.split("/")
 
@@ -33,13 +33,18 @@ export default (WrapperComponent) => class WithRouter extends React.Component {
   path() {
     let path = this.props.path || window.location.pathname
 
-    path = path.replace(/[\/]+$/, "")
+    path = path.replace(/[/]+$/, "")
 
     return path
   }
 
-  routeDefinitions() { return this.props.routeDefinitions || config.getRouteDefinitions() }
-  routes() { return this.props.routes || config.getRoutes() }
+  routeDefinitions() {
+    return this.props.routeDefinitions || config.getRouteDefinitions()
+  }
+
+  routes() {
+    return this.props.routes || config.getRoutes()
+  }
 
   parseRouteDefinitions() {
     const Locales = require("shared/locales").default
@@ -58,10 +63,9 @@ export default (WrapperComponent) => class WithRouter extends React.Component {
         if (!(routePathName in routes))
           throw new Error(`${routePathName} not found in routes: ${Object.keys(routes, ", ")}`)
 
-        const routePath = routes[routePathName](...params).replace(/[\/]+$/, "")
+        const routePath = routes[routePathName](...params).replace(/[/]+$/, "")
         const groups = []
-
-        let pathRegexString = '^'
+        let pathRegexString = "^"
 
         pathRegexString += escapeStringRegexp(routePath)
 
@@ -74,10 +78,10 @@ export default (WrapperComponent) => class WithRouter extends React.Component {
 
           groups.push(variableName)
 
-          pathRegexString = pathRegexString.replace(match[0], `([^\/]+)`)
+          pathRegexString = pathRegexString.replace(match[0], "([^/]+)")
         }
 
-        pathRegexString += '$'
+        pathRegexString += "$"
 
         const pathRegex = new RegExp(pathRegexString)