@kaspernj/api-maker 1.0.160 → 1.0.163

package/package.json

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

package/src/base-error.cjs

@@ -0,0 +1,33 @@
+const {dig, digg} = require("diggerize")
+const errorMessages = require("./error-messages.cjs")
+
+class BaseError extends Error {
+  constructor (message, args = {}) {
+    let messageToUse = message
+
+    if (typeof args.response == "object" && dig(args, "response", "errors")) {
+      messageToUse = `${messageToUse}: ${errorMessages(args).join(". ")}`
+    }
+
+    super(messageToUse)
+    this.args = args
+
+    // Maintains proper stack trace for where our error was thrown (only available on V8)
+    if (Error.captureStackTrace)
+      Error.captureStackTrace(this, BaseError)
+  }
+
+  errorMessages () {
+    return errorMessages(this.args)
+  }
+
+  errorTypes () {
+    if (typeof this.args.response == "object") {
+      return digg(this, "args", "response", "errors").map((error) => digg(error, "type"))
+    }
+  }
+}
+
+BaseError.apiMakerType = "BaseError"
+
+module.exports = BaseError

package/src/commands-pool.cjs

@@ -1,6 +1,7 @@
 const Api = require("./api.cjs")
 const CommandSubmitData = require("./command-submit-data.cjs")
 const CustomError = require("./custom-error.cjs")
+const DestroyError = require("./destroy-error.cjs")
 const Deserializer = require("./deserializer.cjs")
 const {dig, digg} = require("diggerize")
 const FormDataObjectizer = require("form-data-objectizer")
@@ -152,14 +153,16 @@ module.exports = class ApiMakerCommandsPool {
   handleFailedResponse (commandData, commandResponseData) {
     let error
 
-    if (commandResponseData.error_type == "validation_error") {
+    if (commandResponseData.error_type == "destroy_error") {
+      error = new DestroyError(`Destroy failed`, {response: commandResponseData})
+    } else if (commandResponseData.error_type == "validation_error") {
       const validationErrors = new ValidationErrors({
         model: digg(commandResponseData, "model"),
         validationErrors: digg(commandResponseData, "validation_errors")
       })
       error = new ValidationError(validationErrors, {response: commandResponseData})
     } else {
-      error = new CustomError("Command failed", {response: commandResponseData})
+      error = new CustomError(`Command failed`, {response: commandResponseData})
     }
 
     commandData.reject(error)

package/src/custom-error.cjs

@@ -1,43 +1,6 @@
-const {dig, digg} = require("diggerize")
+const BaseError = require("./base-error.cjs")
 
-const errorMessages = (args) => {
-  if (typeof args.response == "object") {
-    return digg(args, "response", "errors").map((error) => {
-      if (typeof error == "string") {
-        return error
-      }
-
-      return digg(error, "message")
-    })
-  }
-}
-
-class CustomError extends Error {
-  constructor (message, args = {}) {
-    let messageToUse = message
-
-    if (typeof args.response == "object" && dig(args, "response", "errors")) {
-      messageToUse = `${messageToUse}: ${errorMessages(args).join(". ")}`
-    }
-
-    super(messageToUse)
-    this.args = args
-
-    // Maintains proper stack trace for where our error was thrown (only available on V8)
-    if (Error.captureStackTrace)
-      Error.captureStackTrace(this, CustomError)
-  }
-
-  errorMessages () {
-    return errorMessages(this.args)
-  }
-
-  errorTypes () {
-    if (typeof this.args.response == "object") {
-      return digg(this, "args", "response", "errors").map((error) => digg(error, "type"))
-    }
-  }
-}
+class CustomError extends BaseError {}
 
 CustomError.apiMakerType = "CustomError"
 

package/src/destroy-error.cjs

@@ -0,0 +1,7 @@
+const BaseError = require("./base-error.cjs")
+
+class DestroyError extends BaseError {}
+
+DestroyError.apiMakerType = "DestroyError"
+
+module.exports = DestroyError

package/src/error-messages.cjs

@@ -0,0 +1,14 @@
+const {digg} = require("diggerize")
+const errorMessages = (args) => {
+  if (typeof args.response == "object") {
+    return digg(args, "response", "errors").map((error) => {
+      if (typeof error == "string") {
+        return error
+      }
+
+      return digg(error, "message")
+    })
+  }
+}
+
+module.exports = errorMessages

package/src/validation-error.cjs

@@ -22,6 +22,6 @@ class ValidationError extends CustomError {
   }
 }
 
-ValidationError.apiMakerType = "CustomError"
+ValidationError.apiMakerType = "ValidationError"
 
 module.exports = ValidationError

package/src/with-router.jsx

@@ -118,7 +118,7 @@ export default (WrapperComponent) => class WithRouter extends React.Component {
     const matchingRoute = this.findMatchingRoute()
     const match = {
       matchingRoute,
-      params: matchingRoute.params
+      params: matchingRoute?.params
     }
 
     return (