@arrirpc/codegen-dart 0.66.0 → 0.68.0

package/README.md

@@ -69,28 +69,37 @@ final service = MyClientUsersService(
 );
 ```
 
+#### Client / Service Options
+
+| name       | Type                                        | description                                                   |
+| ---------- | ------------------------------------------- | ------------------------------------------------------------- |
+| httpClient | `http.Client`                               | Use this to pass in a custom `http.Client` instance           |
+| baseUrl    | `String`                                    | The base url for the backend server                           |
+| headers    | `FutureOr<Map<String, String>> Function()?` | A function that returns a Map of headers                      |
+| onError    | `Function(Object)?`                         | A hook that fires whenever any error is thrown by the client. |
+
 ### Using Arri Models
 
 All generated models will be immutable. They will have access to the following features:
 
 **Methods**:
 
--   `Map<String, dynamic> toJson()`
--   `String toJsonString()`
--   `String toUrlQueryParams()`
--   `copyWith()`
+- `Map<String, dynamic> toJson()`
+- `String toJsonString()`
+- `String toUrlQueryParams()`
+- `copyWith()`
 
 **Factory Methods**:
 
--   `empty()`
--   `fromJson(Map<String, dynamic> input)`
--   `fromJsonString(String input)`
+- `empty()`
+- `fromJson(Map<String, dynamic> input)`
+- `fromJsonString(String input)`
 
 **Overrides**:
 
--   `==` operator (allows for deep equality checking)
--   `hashMap` (allows for deep equality checking)
--   `toString` (will print out all properties and values instead of `Instance of X`)
+- `==` operator (allows for deep equality checking)
+- `hashMap` (allows for deep equality checking)
+- `toString` (will print out all properties and values instead of `Instance of X`)
 
 This library was generated with [Nx](https://nx.dev).
 

package/dist/index.cjs

@@ -866,7 +866,16 @@ function dartHttpRpcFromSchema(schema, context) {
                 onMessage: onMessage,
                 onOpen: onOpen,
                 onClose: onClose,
-                onError: onError,
+                onError: onError != null && _onError != null
+                    ? (err, es) {
+                        _onError?.call(onError);
+                        return onError(err, es);
+                    }
+                    : onError != null
+                        ? onError
+                        : _onError != null
+                            ? (err, _) => _onError?.call(err)
+                            : null,
             );
         }`;
   }
@@ -879,6 +888,7 @@ function dartHttpRpcFromSchema(schema, context) {
             clientVersion: _clientVersion,
             ${paramsType ? "params: params.toJson()," : ""}
             parser: (body) ${schema.response ? `=> ${responseType}.fromJsonString(body)` : "{}"},
+            onError: _onError,
         );
     }`;
 }
@@ -907,6 +917,7 @@ function dartWsRpcFromSchema(schema, context) {
             clientVersion: _clientVersion,
             parser: (msg) ${responseType ? `=> ${responseType}.fromJsonString(msg)` : "{}"},
             serializer: (msg) ${paramsType ? "=> msg.toJsonString()" : '=> ""'},
+            onError: _onError,
         );
     }`;
 }
@@ -963,14 +974,17 @@ function dartServiceFromSchema(schema, context) {
   final http.Client? _httpClient;
   final String _baseUrl;
   final String _clientVersion = "${context.clientVersion}";
-  late final FutureOr<Map<String, String>> Function()? _headers;
+  final FutureOr<Map<String, String>> Function()? _headers;
+  final Function(Object)? _onError;
   ${serviceName}({
     http.Client? httpClient,
     required String baseUrl,
     FutureOr<Map<String, String>> Function()? headers,
+    Function(Object)? onError,
   }) : _httpClient = httpClient,
        _baseUrl = baseUrl,
-       _headers = headers;
+       _headers = headers,
+       _onError = onError;
 
   ${rpcParts.join("\n\n")}
 
@@ -979,6 +993,7 @@ function dartServiceFromSchema(schema, context) {
           baseUrl: _baseUrl,
           headers: _headers,
           httpClient: _httpClient,
+          onError: _onError,
         );`
   ).join("\n\n")}
 }
@@ -1191,14 +1206,17 @@ class ${clientName} {
   final http.Client? _httpClient;
   final String _baseUrl;
   final String _clientVersion = "${context.clientVersion ?? ""}";
-  late final FutureOr<Map<String, String>> Function()? _headers;
+  final FutureOr<Map<String, String>> Function()? _headers;
+  final Function(Object)? _onError;
   ${clientName}({
     http.Client? httpClient,
     required String baseUrl,
     FutureOr<Map<String, String>> Function()? headers,
+    Function(Object)? onError,
   }) : _httpClient = httpClient,
        _baseUrl = baseUrl,
-       _headers = headers;
+       _headers = headers,
+       _onError = onError;
   
   ${rpcParts.join("\n\n")}
 
@@ -1207,6 +1225,7 @@ ${subServices.map(
           baseUrl: _baseUrl,
           headers: _headers,
           httpClient: _httpClient,
+          onError: _onError,
         );`
   ).join("\n\n")}
 }

package/dist/index.mjs

@@ -859,7 +859,16 @@ function dartHttpRpcFromSchema(schema, context) {
                 onMessage: onMessage,
                 onOpen: onOpen,
                 onClose: onClose,
-                onError: onError,
+                onError: onError != null && _onError != null
+                    ? (err, es) {
+                        _onError?.call(onError);
+                        return onError(err, es);
+                    }
+                    : onError != null
+                        ? onError
+                        : _onError != null
+                            ? (err, _) => _onError?.call(err)
+                            : null,
             );
         }`;
   }
@@ -872,6 +881,7 @@ function dartHttpRpcFromSchema(schema, context) {
             clientVersion: _clientVersion,
             ${paramsType ? "params: params.toJson()," : ""}
             parser: (body) ${schema.response ? `=> ${responseType}.fromJsonString(body)` : "{}"},
+            onError: _onError,
         );
     }`;
 }
@@ -900,6 +910,7 @@ function dartWsRpcFromSchema(schema, context) {
             clientVersion: _clientVersion,
             parser: (msg) ${responseType ? `=> ${responseType}.fromJsonString(msg)` : "{}"},
             serializer: (msg) ${paramsType ? "=> msg.toJsonString()" : '=> ""'},
+            onError: _onError,
         );
     }`;
 }
@@ -956,14 +967,17 @@ function dartServiceFromSchema(schema, context) {
   final http.Client? _httpClient;
   final String _baseUrl;
   final String _clientVersion = "${context.clientVersion}";
-  late final FutureOr<Map<String, String>> Function()? _headers;
+  final FutureOr<Map<String, String>> Function()? _headers;
+  final Function(Object)? _onError;
   ${serviceName}({
     http.Client? httpClient,
     required String baseUrl,
     FutureOr<Map<String, String>> Function()? headers,
+    Function(Object)? onError,
   }) : _httpClient = httpClient,
        _baseUrl = baseUrl,
-       _headers = headers;
+       _headers = headers,
+       _onError = onError;
 
   ${rpcParts.join("\n\n")}
 
@@ -972,6 +986,7 @@ function dartServiceFromSchema(schema, context) {
           baseUrl: _baseUrl,
           headers: _headers,
           httpClient: _httpClient,
+          onError: _onError,
         );`
   ).join("\n\n")}
 }
@@ -1184,14 +1199,17 @@ class ${clientName} {
   final http.Client? _httpClient;
   final String _baseUrl;
   final String _clientVersion = "${context.clientVersion ?? ""}";
-  late final FutureOr<Map<String, String>> Function()? _headers;
+  final FutureOr<Map<String, String>> Function()? _headers;
+  final Function(Object)? _onError;
   ${clientName}({
     http.Client? httpClient,
     required String baseUrl,
     FutureOr<Map<String, String>> Function()? headers,
+    Function(Object)? onError,
   }) : _httpClient = httpClient,
        _baseUrl = baseUrl,
-       _headers = headers;
+       _headers = headers,
+       _onError = onError;
   
   ${rpcParts.join("\n\n")}
 
@@ -1200,6 +1218,7 @@ ${subServices.map(
           baseUrl: _baseUrl,
           headers: _headers,
           httpClient: _httpClient,
+          onError: _onError,
         );`
   ).join("\n\n")}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arrirpc/codegen-dart",
-  "version": "0.66.0",
+  "version": "0.68.0",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -23,6 +23,6 @@
   ],
   "dependencies": {
     "pathe": "^1.1.2",
-    "@arrirpc/codegen-utils": "0.66.0"
+    "@arrirpc/codegen-utils": "0.68.0"
   }
 }