chore: Bump wordpress_client version to 8.4.7 and fix bug in utility …

…functions

CHANGELOG.md

@@ -285,6 +285,11 @@
 - 🛠 Added validations for entered `baseUrl`.
 - 💥Renamed `executeGuarded` to `guardAsync` and added a new `guard` method to guard synchronous functions.
 
+## 🐛 8.4.7
+
+- 🩹 Bug fixes
+- 🛠 Fix validations for entered `baseUrl`; Supporting sites with custom REST Api paths
+
 ## Legend
 
 - 🎉 New features or major changes

README.md

@@ -40,7 +40,7 @@ Add `wordpress_client` in your `pubspec.yaml`:
 
 ```dart
 dependencies:
- wordpress_client: ^8.4.6
+ wordpress_client: ^8.4.7
 ```
 
 > 💡 Ensure you get the [latest version here](https://pub.dev/packages/wordpress_client).

lib/src/operations/create.dart

@@ -12,6 +12,6 @@ base mixin CreateOperation<T, R extends IRequest> on IRequestInterface {
   Future<WordpressRawResponse> createRaw(R request) async {
     final wpRequest = await request.build(baseUrl);
 
-    return executor.execute(wpRequest);
+    return executor.raw(wpRequest);
   }
 }

lib/src/operations/custom.dart

@@ -17,6 +17,6 @@ base mixin CustomOperation<T, R extends IRequest> on IRequestInterface {
   Future<WordpressRawResponse> raw(R request) async {
     final wpRequest = await request.build(baseUrl);
 
-    return executor.execute(wpRequest);
+    return executor.raw(wpRequest);
   }
 }

lib/src/operations/delete.dart

@@ -14,6 +14,6 @@ base mixin DeleteOperation<R extends IRequest> on IRequestInterface {
   Future<WordpressRawResponse> deleteRaw(R request) async {
     final wpRequest = await request.build(baseUrl);
 
-    return executor.execute(wpRequest);
+    return executor.raw(wpRequest);
   }
 }

lib/src/operations/list.dart

@@ -16,6 +16,6 @@ base mixin ListOperation<T, R extends IRequest> on IRequestInterface {
   ) async {
     final wpRequest = await request.build(baseUrl);
 
-    return executor.execute(wpRequest);
+    return executor.raw(wpRequest);
   }
 }

lib/src/operations/retrieve.dart

@@ -12,6 +12,6 @@ base mixin RetrieveOperation<T, R extends IRequest> on IRequestInterface {
   Future<WordpressRawResponse> retrieveRaw(R request) async {
     final wpRequest = await request.build(baseUrl);
 
-    return executor.execute(wpRequest);
+    return executor.raw(wpRequest);
   }
 }

lib/src/operations/update.dart

@@ -12,6 +12,6 @@ base mixin UpdateOperation<T, R extends IRequest> on IRequestInterface {
   Future<WordpressRawResponse> updateRaw(R request) async {
     final wpRequest = await request.build(baseUrl);
 
-    return executor.execute(wpRequest);
+    return executor.raw(wpRequest);
   }
 }

lib/src/request_executor_base.dart

@@ -33,6 +33,41 @@ abstract base class IRequestExecutor {
     );
   }
 
+  @internal
+  Future<WordpressRawResponse> raw(WordpressRequest request) async {
+    return guardAsync<WordpressRawResponse>(
+      function: () async {
+        request = await _handleRequestMiddlewares(
+          request: request,
+          middlewares: middlewares,
+        );
+
+        return _handleResponseMiddlewares(
+          middlewares: middlewares,
+          response: await execute(request),
+        );
+      },
+      onError: (error, stackTrace) async {
+        final isMiddlewareAbortedException =
+            error is MiddlewareAbortedException;
+
+        return WordpressRawResponse(
+          data: null,
+          code: isMiddlewareAbortedException
+              ? -RequestErrorType.middlewareAborted.index
+              : -RequestErrorType.internalGenericError.index,
+          extra: <String, dynamic>{
+            'error': error,
+            'stackTrace': stackTrace,
+          },
+          message: isMiddlewareAbortedException
+              ? error.message
+              : '$error\n\n$stackTrace',
+        );
+      },
+    );
+  }
+
   @internal
   Future<WordpressResponse<T>> create<T>(
     WordpressRequest request,

lib/src/responses/wordpress_raw_response.dart

@@ -188,6 +188,9 @@ final class WordpressRawResponse {
     );
   }
 
+  /// Returns the error and stack trace if the response is a failure.
+  (Object, StackTrace) getError() => (extra['error'], extra['stackTrace']);
+
   /// Maps this instance to a [WordpressResponse] instance.
   ///
   /// The [onSuccess] is called if the response is a success.

lib/src/utilities/helpers.dart

@@ -140,7 +140,8 @@ bool isValidRestApiUrl(Uri uri, {bool forceHttps = false}) {
     return false;
   }
 
-  return uri.pathSegments.first == 'wp-json';
+  // It is possible to not have wp-json on some websites but I don't plan on supporting those in this package because it goes outside of the standards defined by WordPress.
+  return uri.pathSegments.contains('wp-json');
 }
 
 bool isValidPortNumber(int port) => port >= 0 && port <= 65535;

pubspec.yaml

@@ -1,6 +1,6 @@
 name: wordpress_client
 description: A library to interact with the Wordpress REST API. Supports most of the common endpoints and all of the CRUD operations on the endpoints.
-version: 8.4.6
+version: 8.4.7
 topics:
   - wordpress
   - fluent