@kohost/api-client 3.0.0-beta.27 → 3.0.0-beta.28

package/dist/cjs/AMQPClient.js

@@ -270,30 +270,29 @@ var KohostAMQPClient = class {
     }
   }
   static parseMessage(message) {
-    var _a, _b, _c, _d, _e;
     debug("parseMessage input %o", message);
     let error = null;
     let data = {};
     let query = {};
     let context = {};
     let headers = {};
-    const isCommand = ((_a = message == null ? void 0 : message.properties) == null ? void 0 : _a.type) === "Command";
-    const isEvent = ((_b = message == null ? void 0 : message.properties) == null ? void 0 : _b.type) === "Event";
-    const messageHeaders = ((_c = message == null ? void 0 : message.properties) == null ? void 0 : _c.headers) || {};
+    const isCommand = message?.properties?.type === "Command";
+    const isEvent = message?.properties?.type === "Event";
+    const messageHeaders = message?.properties?.headers || {};
     const commandName = messageHeaders[HEADER_KEY_COMMAND_NAME] || null;
     const eventName = messageHeaders[HEADER_KEY_EVENT_NAME] || null;
     if (message.content) {
       try {
-        const payload = ((_d = message.properties) == null ? void 0 : _d.contentType) === "application/json" ? JSON.parse(message.content.toString()) : message.content.toString();
-        data = (payload == null ? void 0 : payload.data) || {};
-        error = payload == null ? void 0 : payload.error;
-        query = (payload == null ? void 0 : payload.query) || {};
-        context = (payload == null ? void 0 : payload.context) || {};
+        const payload = message.properties?.contentType === "application/json" ? JSON.parse(message.content.toString()) : message.content.toString();
+        data = payload?.data || {};
+        error = payload?.error;
+        query = payload?.query || {};
+        context = payload?.context || {};
       } catch (error2) {
         data = message.content.toString();
       }
     }
-    if ((_e = message == null ? void 0 : message.properties) == null ? void 0 : _e.headers) {
+    if (message?.properties?.headers) {
       const orgHeader = message.properties.headers[HEADER_KEY_ORGANIZATION_ID];
       const propertyHeader = message.properties.headers[HEADER_KEY_PROPERTY_ID];
       const driverHeader = message.properties.headers[HEADER_KEY_DRIVER];
@@ -325,10 +324,10 @@ var KohostAMQPClient = class {
     return parsed;
   }
   static getMessage(message) {
-    if (!(message == null ? void 0 : message.content))
+    if (!message?.content)
       return null;
     const payload = JSON.parse(message.content.toString());
-    const data = payload == null ? void 0 : payload.data;
+    const data = payload?.data;
     return data;
   }
   static isFatalError(err) {

package/dist/cjs/Client.js

@@ -5206,9 +5206,8 @@ var KohostApiClient = class extends EventEmitter {
     };
   }
   _handleResponse(response) {
-    var _a;
     try {
-      if ((_a = response == null ? void 0 : response.data) == null ? void 0 : _a.data) {
+      if (response?.data?.data) {
         response.query = response.data.query;
         response.pagination = response.data.pagination;
         response.data = response.data.data;
@@ -5219,13 +5218,12 @@ var KohostApiClient = class extends EventEmitter {
     }
   }
   _handleResponseError(error) {
-    var _a, _b;
     const { config: originalReq } = error;
     if (!error.response)
       return Promise.reject(error);
     const { status, data } = error.response;
-    const errorType = (_a = data == null ? void 0 : data.error) == null ? void 0 : _a.type;
-    const errorMessage = (_b = data == null ? void 0 : data.error) == null ? void 0 : _b.message;
+    const errorType = data?.error?.type;
+    const errorMessage = data?.error?.message;
     try {
       const expectedError = status >= 400 && status < 500;
       const newTokensNeeded = expectedError && errorType === "TokenExpiredError";