@clairejs/client 3.5.4 → 3.5.6

package/README.md

@@ -1,5 +1,13 @@
 ## Change Log
 
+#### 3.5.6:
+
+-   add id field to mergeInstances
+
+#### 3.5.5:
+
+-   improve RefreshHttpClient refreshToken
+
 #### 3.5.4:
 
 -   improve crud api cache

package/dist/api/CrudApi.d.ts

@@ -2,7 +2,7 @@ import { AbstractModel, Constructor, CreateManyRequestBody, CreateManyResponseBo
 import { AbstractHttpClient, RequestOptions } from "./AbstractHttpClient";
 export declare const stringifyQueries: (queries: Record<string, any>) => string;
 export declare const removeInstances: <T extends Identifiable>(target: T[], source: T[]) => T[];
-export declare const mergeInstances: <T extends Identifiable>(model: Constructor<T>, target: readonly T[], source: readonly DeepPartial<T>[] | undefined, syncTarget?: boolean) => T[];
+export declare const mergeInstances: <T extends Identifiable>(model: Constructor<T>, target: readonly T[], source: readonly DeepPartial<T>[] | undefined, idField?: keyof T, syncTarget?: boolean) => T[];
 export declare class CrudApi<T extends AbstractModel> {
     readonly model: Constructor<T>;
     readonly httpClient: AbstractHttpClient;

package/dist/api/CrudApi.js

@@ -13,11 +13,13 @@ export const removeInstances = (target, source) => {
     }
     return result;
 };
-export const mergeInstances = (model, target, source, syncTarget) => {
-    const result = (syncTarget ? target.filter((i) => (source || []).some((newI) => i.id && newI.id && i.id === newI.id)) : target).map((i) => ({ ...i }));
+export const mergeInstances = (model, target, source, idField = "id", syncTarget) => {
+    const result = (syncTarget
+        ? target.filter((i) => (source || []).some((newI) => i[idField] && newI[idField] && i[idField] === newI[idField]))
+        : target).map((i) => ({ ...i }));
     const metadata = getObjectMetadata(model);
     for (const instance of source || []) {
-        const index = result.findIndex((i) => i.id && instance.id && i.id === instance.id);
+        const index = result.findIndex((i) => i[idField] && instance[idField] && i[idField] === instance[idField]);
         if (index < 0) {
             result.push(Object.assign(new model(), instance));
         }
@@ -42,10 +44,10 @@ export const mergeInstances = (model, target, source, syncTarget) => {
                         }
                         else {
                             if (fieldMeta.hasMany.single) {
-                                targetObj[field] = mergeInstances(targetModel, [targetObj[field]], [sourceObject[field]], true);
+                                targetObj[field] = mergeInstances(targetModel, [targetObj[field]], [sourceObject[field]], idField, true);
                             }
                             else {
-                                targetObj[field] = mergeInstances(targetModel, targetObj[field], sourceObject[field], true);
+                                targetObj[field] = mergeInstances(targetModel, targetObj[field], sourceObject[field], idField, true);
                             }
                         }
                     }
@@ -91,7 +93,10 @@ export class CrudApi {
     }
     async getMany(queries, options) {
         const url = `${this.getEndpointBaseUrl()}?${stringifyQueries(queries || {})}`;
-        const result = await this.httpClient.get(url, undefined, { ...options, noCache: options?.noCache || this.dirty.get(url) });
+        const result = await this.httpClient.get(url, undefined, {
+            ...options,
+            noCache: options?.noCache || this.dirty.get(url),
+        });
         this.clearDirty(url);
         return result;
     }

package/dist/api/RefreshHttpClient.d.ts

@@ -14,7 +14,7 @@ export declare abstract class RefreshHttpClient extends DefaultHttpClient {
     private tokenQueue;
     constructor(apiServerUrl: string, tokenManager: AbstractTokenManager, logger?: LogHandler | undefined, maxRetryCount?: number, delayMsBetweenRetry?: number, storage?: AbstractStorage | undefined);
     protected getAuthorization(): Promise<string>;
-    protected abstract refreshSession(refreshToken: string): Promise<AccessToken | undefined>;
+    protected abstract refreshSession(token?: AccessToken): Promise<AccessToken | undefined>;
     protected errorHandler<T = any>(operation: () => Promise<T>, err: any): Promise<T | undefined>;
     protected getAuthorizationHeader(): Promise<Record<string, string>>;
     protected refreshToken(token?: AccessToken): Promise<void>;

package/dist/api/RefreshHttpClient.js

@@ -48,13 +48,9 @@ export class RefreshHttpClient extends DefaultHttpClient {
             });
         }
         token = token || (await this.tokenManager.getAccessToken());
-        if (!token || !token.refreshToken) {
-            //-- there is no refresh token to refresh
-            throw Errors.SESSION_EXPIRED();
-        }
         try {
             this.refreshing = true;
-            token = await this.refreshSession(token.refreshToken).catch(() => undefined);
+            token = await this.refreshSession(token).catch(() => undefined);
             if (!token) {
                 throw Errors.SESSION_EXPIRED();
             }

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@clairejs/client",
-    "version": "3.5.4",
+    "version": "3.5.6",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "type": "module",
     "scripts": {
-        "test": "mocha ./test/*.test.ts",
+        "test": "TS_NODE_TRANSPILE_ONLY=true mocha ./test/*.test.ts",
         "build": "rm -rf ./dist && tsc -p tsconfig-build.json",
         "push": "npm run build && npm run test && npm publish && git push"
     },
@@ -17,9 +17,9 @@
     },
     "devDependencies": {
         "@types/mocha": "^10.0.1",
-        "@types/node": "^18.16.1",
+        "@types/node": "^22.14.0",
         "mocha": "^10.2.0",
-        "ts-node": "^10.9.1",
-        "typescript": "^5.0.4"
+        "ts-node": "^10.9.2",
+        "typescript": "^5.5.4"
     }
 }