cordo 2.7.0 → 2.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordo",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "description": "A framework for handling complex discord api interactions",
   "exports": {
     ".": "./src/index.ts",

package/src/core/files/error-boundary.ts

@@ -1,4 +1,3 @@
-import { CordoError } from "../../errors"
 import type { RouteRequest } from "./route"
 
 
@@ -9,7 +8,7 @@ export type CordoErrorBoundary = {
   handler: CordoErrorHandler
 }
 
-export type CordoErrorHandler = (error: CordoError, request: RouteRequest) => any
+export type CordoErrorHandler = (error: Error, request: RouteRequest) => any
 
 export function defineCordoErrorBoundary(handler: CordoErrorHandler): CordoErrorBoundary {
   return {

package/src/core/routing/respond.ts

@@ -90,8 +90,10 @@ export namespace RoutingRespond {
     if (!options)
       return {}
 
-    if (options.length === 1 && options[0].type === ApplicationCommandOptionType.SubcommandGroup)
-      return parseCommandOptions(options[0].options)
+    if (options.length === 1) {
+      if (options[0].type === ApplicationCommandOptionType.Subcommand || options[0].type === ApplicationCommandOptionType.SubcommandGroup)
+        return parseCommandOptions(options[0].options)
+    }
     
     return (options as Record<string, any>[]).reduce((out, opt) => ({ [opt.name]: opt.value, ...out }), {})
   }

package/src/errors/handle.ts

@@ -42,11 +42,14 @@ export namespace HandleErrors {
       .sort((a, b) => b.specificity - a.specificity)
   }
 
-  function useDefaultHandler(error: CordoError) {
-    console.trace('No error handler found for', error.name)
+  function useDefaultHandler(error: Error) {
+    if (error instanceof CordoError)
+      console.trace('No error handler found for', error.name)
+    else
+      console.error(error)
   }
 
-  async function handleErrorStack(initialError: CordoError, handlers: CordoErrorHandler[], request: RouteRequest) {
+  async function handleErrorStack(initialError: Error, handlers: CordoErrorHandler[], request: RouteRequest) {
     const handler = handlers.shift()
     if (!handler)
       return useDefaultHandler(initialError)
@@ -54,10 +57,8 @@ export namespace HandleErrors {
     try {
       await handler(initialError, request)
     } catch (error) {
-      if (error instanceof CordoError)
+      if (error instanceof Error)
         handleErrorStack(error, handlers, request)
-      else
-        handleNonCordoError(error)
     }
   }
 
@@ -68,9 +69,4 @@ export namespace HandleErrors {
     handleErrorStack(error, boundaries.map(b => b.impl.handler), request)
   }
 
-  export function handleNonCordoError(error: any) {
-    console.error('(dev) Non cordo error:')
-    console.error(error)
-  }
-
 }