Error response wrapping

stone/backends/js_client.py

@@ -45,6 +45,13 @@
     help=('Wraps the response in a response class')
 )
 
+_cmdline_parser.add_argument(
+    '--wrap-error-in',
+    type=str,
+    default='',
+    help=('Wraps the error in an error class')
+)
+
 _header = """\
 // Auto-generated by Stone, do not modify.
 var routes = {};
@@ -99,7 +106,7 @@ def _generate_route(self, route_schema, namespace, route):
                     fmt_type(route.arg_data_type))
         self.emit(' * @returns {Promise.<%s, %s>}' %
                 (return_type,
-                 fmt_error_type(route.error_data_type)))
+                 fmt_error_type(route.error_data_type, self.args.wrap_error_in)))
         self.emit(' */')
 
         if route.arg_data_type.__class__ != Void:

stone/backends/js_helpers.py

@@ -49,11 +49,14 @@ def fmt_obj(o):
         return json.dumps(o, indent=2)
 
 
-def fmt_error_type(data_type):
+def fmt_error_type(data_type, wrap_error_in=''):
     """
     Converts the error type into a JSDoc type.
     """
-    return 'Error.<%s>' % fmt_type(data_type)
+    return '%s.<%s>' % (
+        (wrap_error_in if (wrap_error_in != '') else 'Error'),
+        fmt_type(data_type)
+    )
 
 
 def fmt_type_name(data_type):

stone/backends/tsd_client.py

@@ -66,7 +66,12 @@
     default='',
     help=('Wraps the response in a response class')
 )
-
+_cmdline_parser.add_argument(
+    '--wrap-error-in',
+    type=str,
+    default='',
+    help=('Wraps the error in an error class')
+)
 _cmdline_parser.add_argument(
     '--import-namespaces',
     default=False,
@@ -169,7 +174,8 @@ def _generate_route(self, namespace, route):
             self.emit_wrapped_text(self.process_doc(route.doc, self._docf), prefix=' * ')
             self.emit(' *')
         self.emit_wrapped_text('When an error occurs, the route rejects the promise with type %s.'
-                               % fmt_error_type(route.error_data_type), prefix=' * ')
+                               % fmt_error_type(route.error_data_type,
+                               self.args.wrap_error_in), prefix=' * ')
         if route.deprecated:
             self.emit(' * @deprecated')
 

stone/backends/tsd_helpers.py

@@ -41,13 +41,16 @@
 }
 
 
-def fmt_error_type(data_type, inside_namespace=None):
+def fmt_error_type(data_type, inside_namespace=None, wrap_error_in=''):
     """
     Converts the error type into a TypeScript type.
     inside_namespace should be set to the namespace that the reference
     occurs in, or None if this parameter is not relevant.
     """
-    return 'Error<%s>' % fmt_type(data_type, inside_namespace)
+    return '%s<%s>' % (
+        (wrap_error_in if (wrap_error_in != '') else 'Error'),
+        fmt_type(data_type, inside_namespace)
+    )
 
 def fmt_type_name(data_type, inside_namespace=None):
     """