@clairejs/client 3.4.1 → 3.4.3

package/README.md

@@ -1,7 +1,9 @@
 ## Change Log
 
-#### 3.4.1:
+#### 3.4.3:
 
+-   fix mergeInstances not merge null
+-   fix http client cache headers
 -   update claire core
 -   apply LogHandler to some implementations
 

package/dist/api/AbstractHttpClient.d.ts

@@ -1,9 +1,12 @@
+import { LogHandler } from "@clairejs/core";
 export interface RequestOptions {
     noAuthorization?: boolean;
     withCredentials?: boolean;
     noErrorHandling?: boolean;
 }
 export declare abstract class AbstractHttpClient {
+    protected readonly logger?: LogHandler | undefined;
+    constructor(logger?: LogHandler | undefined);
     protected issuedGetRequests: Record<string, boolean>;
     resetCache(pattern: string): void;
     protected abstract doGet<T = any>(url: string, headers?: object, options?: RequestOptions): Promise<T | undefined>;

package/dist/api/AbstractHttpClient.js

@@ -1,4 +1,9 @@
+import { LogLevel } from "@clairejs/core";
 export class AbstractHttpClient {
+    logger;
+    constructor(logger) {
+        this.logger = logger;
+    }
     issuedGetRequests = {};
     /*
         Keep track off all get request had been sent and allow decache (using regex pattern) those requests
@@ -14,7 +19,8 @@ export class AbstractHttpClient {
     //-- has intercepted and decided to return nothing
     async get(url, headers, options) {
         const shouldUseCache = this.issuedGetRequests[url];
-        const result = await this.doGet(url, { ...headers, ...(shouldUseCache ? {} : { "cache-control": "no-cache" }) }, options);
+        this.logger?.log(LogLevel.DEBUG, `[cache:${!!shouldUseCache}] Request: ${url}`);
+        const result = await this.doGet(url, { ...(!shouldUseCache && { "cache-control": "no-cache" }), ...headers }, options);
         this.issuedGetRequests[url] = true;
         return result;
     }

package/dist/api/CrudApi.js

@@ -53,7 +53,8 @@ export const mergeInstances = (model, target, source, syncTarget) => {
                 if (!mergeByModel) {
                     if (typeof targetObj[field] === "object" &&
                         !Array.isArray(targetObj[field]) &&
-                        targetObj[field] !== null) {
+                        targetObj[field] !== null &&
+                        sourceObject[field] !== null) {
                         //-- call deep merge to merge object
                         deepMerge(targetObj[field], sourceObject[field]);
                     }

package/dist/api/DefaultHttpClient.js

@@ -9,7 +9,7 @@ export class DefaultHttpClient extends AbstractHttpClient {
     storage;
     api = axios.create();
     constructor(apiServerUrl, logger, maxRetryCount = 2, delayMsBetweenRetry = 200, storage) {
-        super();
+        super(logger);
         this.apiServerUrl = apiServerUrl;
         this.logger = logger;
         this.maxRetryCount = maxRetryCount;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clairejs/client",
-    "version": "3.4.1",
+    "version": "3.4.3",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "type": "module",
@@ -13,7 +13,7 @@
         "axios": "^1.3.4"
     },
     "peerDependencies": {
-        "@clairejs/core": "^3.7.3"
+        "@clairejs/core": "^3.8.3"
     },
     "devDependencies": {
         "@types/mocha": "^10.0.1",