@react-pakistan/util-functions 1.25.41 → 1.25.42

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/general/generic-cache.js +15 -17
  2. package/package.json +1 -1
package/general/generic-cache.js CHANGED
@@ -176,7 +176,7 @@ exports.getCachedDataSync = getCachedDataSync;
176
176
  * const active = await getCachedData<UserBE>({ config, filters: { enabled: true }, pageLimit: 200 });
177
177
  */
178
178
  var getCachedData = function (opts) { return __awaiter(void 0, void 0, void 0, function () {
179
- var config, params, headers, cacheKey, apiUrl, responseKey, expirationMs, fallBackPageLimit, fallBackCurrentPage, filters, searchQuery, paramsWithoutFilters_1, otherParams_1, queryObj_1, searchParams_1, response_1, items_1, respCurrentPageRaw_1, respCurrentPage_1, requestCurrentPage_1, raw, currentTime, cachedTime, ageInMs, cachedTime, ageInMs, itemsArray, storedCount, cachedCurrentPage, requestedCurrentPage, paramsWithoutFilters_2, otherParams_2, queryObj_2, searchParams_2, response_2, itemsRaw_1, fetchedItems, respCount, respCurrentPageRaw_2, respCurrentPage_2, newItemsMap, mergedItemsMap, mergedItemsArray, newCount, newCurrentPage, shouldCache_1, updatedCache, paramsWithoutFilters_3, otherParams, queryObj, searchParams, response, itemsRaw, items, count, respCurrentPageRaw, respCurrentPage, requestCurrentPage, shouldCache, itemsMap, updatedCache, error_1;
179
+ var config, params, headers, cacheKey, apiUrl, responseKey, expirationMs, fallBackPageLimit, fallBackCurrentPage, filters, searchQuery, paramsWithoutFilters_1, otherParams_1, queryObj_1, searchParams_1, response_1, itemsRaw_1, items_1, respCurrentPageRaw_1, respCurrentPage_1, requestCurrentPage_1, raw, currentTime, cachedTime, ageInMs, cachedTime, ageInMs, itemsArray, storedCount, cachedCurrentPage, requestedCurrentPage, paramsWithoutFilters_2, otherParams_2, queryObj_2, searchParams_2, response_2, itemsRaw_2, fetchedItems, respCount, respCurrentPageRaw_2, respCurrentPage_2, newItemsMap, mergedItemsMap, mergedItemsArray, newCount, newCurrentPage, shouldCache_1, updatedCache, paramsWithoutFilters_3, otherParams, queryObj, searchParams, response, itemsRaw, items, count, respCurrentPageRaw, respCurrentPage, requestCurrentPage, shouldCache, itemsMap, updatedCache, error_1;
180
180
  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
181
181
  return __generator(this, function (_v) {
182
182
  switch (_v.label) {
@@ -191,8 +191,7 @@ var getCachedData = function (opts) { return __awaiter(void 0, void 0, void 0, f
191
191
  _v.label = 1;
192
192
  case 1:
193
193
  _v.trys.push([1, 8, , 9]);
194
- if (!((searchQuery && searchQuery.trim()) ||
195
- (filters && Object.keys(filters).length > 0))) return [3 /*break*/, 3];
194
+ if (!((searchQuery && searchQuery.trim()) || (params === null || params === void 0 ? void 0 : params.filters))) return [3 /*break*/, 3];
196
195
  paramsWithoutFilters_1 = __assign({}, (params || {}));
197
196
  if (paramsWithoutFilters_1.filters !== undefined) {
198
197
  delete paramsWithoutFilters_1.filters;
@@ -215,9 +214,10 @@ var getCachedData = function (opts) { return __awaiter(void 0, void 0, void 0, f
215
214
  })];
216
215
  case 2:
217
216
  response_1 = _v.sent();
218
- items_1 = responseKey
219
- ? ((_f = response_1 === null || response_1 === void 0 ? void 0 : response_1.data) === null || _f === void 0 ? void 0 : _f[responseKey]) || []
220
- : ((_g = response_1 === null || response_1 === void 0 ? void 0 : response_1.data) === null || _g === void 0 ? void 0 : _g.items) || (response_1 === null || response_1 === void 0 ? void 0 : response_1.data) || [];
217
+ itemsRaw_1 = responseKey
218
+ ? (_f = response_1 === null || response_1 === void 0 ? void 0 : response_1.data) === null || _f === void 0 ? void 0 : _f[responseKey]
219
+ : ((_g = response_1 === null || response_1 === void 0 ? void 0 : response_1.data) === null || _g === void 0 ? void 0 : _g.items) || (response_1 === null || response_1 === void 0 ? void 0 : response_1.data);
220
+ items_1 = Array.isArray(itemsRaw_1) ? itemsRaw_1 : [];
221
221
  respCurrentPageRaw_1 = (_h = response_1 === null || response_1 === void 0 ? void 0 : response_1.data) === null || _h === void 0 ? void 0 : _h.currentPage;
222
222
  respCurrentPage_1 = respCurrentPageRaw_1 == null ? undefined : Number(respCurrentPageRaw_1);
223
223
  requestCurrentPage_1 = (params === null || params === void 0 ? void 0 : params.currentPage)
@@ -271,12 +271,12 @@ var getCachedData = function (opts) { return __awaiter(void 0, void 0, void 0, f
271
271
  })];
272
272
  case 4:
273
273
  response_2 = _v.sent();
274
- itemsRaw_1 = (responseKey
274
+ itemsRaw_2 = (responseKey
275
275
  ? (_l = response_2 === null || response_2 === void 0 ? void 0 : response_2.data) === null || _l === void 0 ? void 0 : _l[responseKey]
276
- : (_m = response_2 === null || response_2 === void 0 ? void 0 : response_2.data) === null || _m === void 0 ? void 0 : _m.items) || [];
277
- fetchedItems = Array.isArray(itemsRaw_1)
278
- ? itemsRaw_1
279
- : [itemsRaw_1];
276
+ : (_m = response_2 === null || response_2 === void 0 ? void 0 : response_2.data) === null || _m === void 0 ? void 0 : _m.items) || (response_2 === null || response_2 === void 0 ? void 0 : response_2.data);
277
+ fetchedItems = Array.isArray(itemsRaw_2)
278
+ ? itemsRaw_2
279
+ : [];
280
280
  respCount = (_o = response_2 === null || response_2 === void 0 ? void 0 : response_2.data) === null || _o === void 0 ? void 0 : _o.count;
281
281
  respCurrentPageRaw_2 = (_p = response_2 === null || response_2 === void 0 ? void 0 : response_2.data) === null || _p === void 0 ? void 0 : _p.currentPage;
282
282
  respCurrentPage_2 = respCurrentPageRaw_2 == null ? undefined : Number(respCurrentPageRaw_2);
@@ -292,7 +292,7 @@ var getCachedData = function (opts) { return __awaiter(void 0, void 0, void 0, f
292
292
  mergedItemsArray = Object.values(mergedItemsMap);
293
293
  newCount = respCount !== null && respCount !== void 0 ? respCount : mergedItemsArray.length;
294
294
  newCurrentPage = respCurrentPage_2 !== null && respCurrentPage_2 !== void 0 ? respCurrentPage_2 : requestedCurrentPage;
295
- shouldCache_1 = Array.isArray(itemsRaw_1) && respCount && fetchedItems.length > 0;
295
+ shouldCache_1 = Array.isArray(itemsRaw_2) && typeof respCount === 'number';
296
296
  if (shouldCache_1) {
297
297
  updatedCache = {
298
298
  items: mergedItemsMap,
@@ -331,17 +331,15 @@ var getCachedData = function (opts) { return __awaiter(void 0, void 0, void 0, f
331
331
  case 7:
332
332
  response = _v.sent();
333
333
  itemsRaw = (responseKey ? (_r = response === null || response === void 0 ? void 0 : response.data) === null || _r === void 0 ? void 0 : _r[responseKey] : (_s = response === null || response === void 0 ? void 0 : response.data) === null || _s === void 0 ? void 0 : _s.items) ||
334
- [];
335
- items = Array.isArray(itemsRaw)
336
- ? itemsRaw
337
- : [itemsRaw];
334
+ (response === null || response === void 0 ? void 0 : response.data);
335
+ items = Array.isArray(itemsRaw) ? itemsRaw : [];
338
336
  count = (_t = response === null || response === void 0 ? void 0 : response.data) === null || _t === void 0 ? void 0 : _t.count;
339
337
  respCurrentPageRaw = (_u = response === null || response === void 0 ? void 0 : response.data) === null || _u === void 0 ? void 0 : _u.currentPage;
340
338
  respCurrentPage = respCurrentPageRaw == null ? undefined : Number(respCurrentPageRaw);
341
339
  requestCurrentPage = (params === null || params === void 0 ? void 0 : params.currentPage)
342
340
  ? Number(params.currentPage)
343
341
  : undefined;
344
- shouldCache = Array.isArray(itemsRaw) && count && items.length > 0;
342
+ shouldCache = Array.isArray(itemsRaw) && typeof count === 'number';
345
343
  if (shouldCache) {
346
344
  itemsMap = items.reduce(function (acc, item, idx) {
347
345
  var _a, _b;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@react-pakistan/util-functions",
3
- "version": "1.25.41",
3
+ "version": "1.25.42",
4
4
  "description": "A library of all util functions",
5
5
  "main": "index.js",
6
6
  "scripts": {