@react-pakistan/util-functions 1.25.26 → 1.25.28

package/general/cnic-formatter.d.ts

@@ -0,0 +1,7 @@
+interface FormatCnicOptions {
+    separator?: string;
+    allowLoose?: boolean;
+}
+export declare const formatCnic: (value: string | number | null | undefined, opts?: FormatCnicOptions) => string | null;
+export declare const isValidCnic: (value: string | number | null | undefined) => boolean;
+export {};

package/general/cnic-formatter.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isValidCnic = exports.formatCnic = void 0;
+var unicodeDigitMap = (function () {
+    var map = {};
+    // Arabic-Indic digits \u0660 - \u0669
+    for (var i = 0; i <= 9; i++) {
+        map[String.fromCharCode(0x660 + i)] = String(i);
+    }
+    // Eastern Arabic-Indic digits \u06F0 - \u06F9
+    for (var i = 0; i <= 9; i++) {
+        map[String.fromCharCode(0x6f0 + i)] = String(i);
+    }
+    return map;
+})();
+var toAsciiDigits = function (input) {
+    return input.replace(/./g, function (ch) { var _a; return (_a = unicodeDigitMap[ch]) !== null && _a !== void 0 ? _a : ch; });
+};
+var formatCnic = function (value, opts) {
+    var _a;
+    if (opts === void 0) { opts = {}; }
+    if (value === null || value === undefined)
+        return null;
+    var separator = (_a = opts.separator) !== null && _a !== void 0 ? _a : '-';
+    var raw = typeof value === 'number' ? String(value) : String(value);
+    raw = raw.trim();
+    if (raw.length === 0)
+        return null;
+    // Normalize unicode digits to ASCII then strip all non-digit characters
+    var ascii = toAsciiDigits(raw);
+    var digits = ascii.replace(/[^0-9]/g, '');
+    if (digits.length === 0)
+        return null;
+    // For strict mode, only accept exactly 13 digits
+    if (!opts.allowLoose && digits.length !== 13)
+        return null;
+    // Build groups: 5, 7, 1. For allowLoose, allow missing trailing groups.
+    var g1 = digits.slice(0, 5);
+    var g2 = digits.slice(5, 12);
+    var g3 = digits.slice(12);
+    var parts = [g1, g2, g3].filter(function (p) { return p && p.length > 0; });
+    return parts.join(separator);
+};
+exports.formatCnic = formatCnic;
+var isValidCnic = function (value) {
+    if (value === null || value === undefined)
+        return false;
+    var raw = typeof value === 'number' ? String(value) : String(value);
+    var ascii = toAsciiDigits(raw);
+    var digits = ascii.replace(/[^0-9]/g, '');
+    return digits.length === 13;
+};
+exports.isValidCnic = isValidCnic;

package/general/generic-cache.js

@@ -112,6 +112,7 @@ function isCachedMapShape(v) {
  * }
  */
 var getCachedDataSync = function (cacheKey, expirationMs) {
+    var _a, _b, _c;
     if (expirationMs === void 0) { expirationMs = constants_1.ONE_DAY_IN_MS; }
     try {
         var raw = (0, local_storage_1.getStorageValue)(cacheKey);
@@ -122,7 +123,11 @@ var getCachedDataSync = function (cacheKey, expirationMs) {
             var cachedTime = new Date(raw.cachedAt).getTime();
             var ageInMs = currentTime - cachedTime;
             if (ageInMs < expirationMs) {
-                return { count: raw.items.length, items: raw.items };
+                return {
+                    count: (_a = raw.count) !== null && _a !== void 0 ? _a : raw.items.length,
+                    items: raw.items,
+                    currentPage: (_b = raw.currentPage) !== null && _b !== void 0 ? _b : undefined,
+                };
             }
             return { count: 0, items: [] };
         }
@@ -131,7 +136,12 @@ var getCachedDataSync = function (cacheKey, expirationMs) {
             var ageInMs = currentTime - cachedTime;
             if (ageInMs < expirationMs) {
                 var itemsArray = Object.values(raw.items || {});
-                return { count: itemsArray.length, items: itemsArray };
+                var storedCount = raw.count;
+                return {
+                    count: storedCount !== null && storedCount !== void 0 ? storedCount : itemsArray.length,
+                    items: itemsArray,
+                    currentPage: (_c = raw.currentPage) !== null && _c !== void 0 ? _c : undefined,
+                };
             }
             return { count: 0, items: [] };
         }
@@ -166,10 +176,10 @@ exports.getCachedDataSync = getCachedDataSync;
  * const active = await getCachedData<UserBE>({ config, filters: { enabled: true }, pageLimit: 200 });
  */
 var getCachedData = function (opts) { return __awaiter(void 0, void 0, void 0, function () {
-    var config, params, headers, cacheKey, apiUrl, responseKey, expirationMs, fallBackPageLimit, fallBackCurrentPage, filters, searchQuery, paramsWithoutFilters_1, otherParams_1, queryObj_1, searchParams_1, response_1, items_1, raw, currentTime, cachedTime, ageInMs, cachedTime, ageInMs, itemsArray, storedCount, paramsWithoutFilters_2, otherParams, queryObj, searchParams, response, itemsRaw, items, count, shouldCache, itemsMap, updatedCache, error_1;
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-    return __generator(this, function (_p) {
-        switch (_p.label) {
+    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;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+    return __generator(this, function (_v) {
+        switch (_v.label) {
             case 0:
                 config = opts.config, params = opts.params, headers = opts.headers;
                 cacheKey = config.cacheKey, apiUrl = config.apiUrl, responseKey = config.responseKey;
@@ -178,9 +188,9 @@ var getCachedData = function (opts) { return __awaiter(void 0, void 0, void 0, f
                 fallBackCurrentPage = (_e = (_d = params === null || params === void 0 ? void 0 : params.currentPage) === null || _d === void 0 ? void 0 : _d.toString()) !== null && _e !== void 0 ? _e : '1';
                 filters = params === null || params === void 0 ? void 0 : params.filters;
                 searchQuery = params === null || params === void 0 ? void 0 : params.searchQuery;
-                _p.label = 1;
+                _v.label = 1;
             case 1:
-                _p.trys.push([1, 5, , 6]);
+                _v.trys.push([1, 8, , 9]);
                 if (!((searchQuery && searchQuery.trim()) ||
                     (filters && Object.keys(filters).length > 0))) return [3 /*break*/, 3];
                 paramsWithoutFilters_1 = __assign({}, (params || {}));
@@ -204,13 +214,19 @@ var getCachedData = function (opts) { return __awaiter(void 0, void 0, void 0, f
                         headers: headers,
                     })];
             case 2:
-                response_1 = _p.sent();
+                response_1 = _v.sent();
                 items_1 = responseKey
                     ? ((_f = response_1 === null || response_1 === void 0 ? void 0 : response_1.data) === null || _f === void 0 ? void 0 : _f[responseKey]) || []
                     : ((_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) || [];
+                respCurrentPageRaw_1 = (_h = response_1 === null || response_1 === void 0 ? void 0 : response_1.data) === null || _h === void 0 ? void 0 : _h.currentPage;
+                respCurrentPage_1 = respCurrentPageRaw_1 == null ? undefined : Number(respCurrentPageRaw_1);
+                requestCurrentPage_1 = (params === null || params === void 0 ? void 0 : params.currentPage)
+                    ? Number(params.currentPage)
+                    : undefined;
                 return [2 /*return*/, {
-                        count: ((_h = response_1 === null || response_1 === void 0 ? void 0 : response_1.data) === null || _h === void 0 ? void 0 : _h.count) || items_1.length,
+                        count: ((_j = response_1 === null || response_1 === void 0 ? void 0 : response_1.data) === null || _j === void 0 ? void 0 : _j.count) || items_1.length,
                         items: items_1,
+                        currentPage: respCurrentPage_1 !== null && respCurrentPage_1 !== void 0 ? respCurrentPage_1 : requestCurrentPage_1,
                     }];
             case 3:
                 raw = (0, local_storage_1.getStorageValue)(cacheKey);
@@ -222,31 +238,89 @@ var getCachedData = function (opts) { return __awaiter(void 0, void 0, void 0, f
                         return [2 /*return*/, {
                                 count: raw.count,
                                 items: raw.items,
-                                currentPage: (_j = raw.currentPage) !== null && _j !== void 0 ? _j : undefined,
-                            }];
-                    }
-                }
-                if (isCachedMapShape(raw)) {
-                    cachedTime = new Date(raw.cachedAt).getTime();
-                    ageInMs = currentTime - cachedTime;
-                    if (ageInMs < expirationMs) {
-                        itemsArray = Object.values(raw.items || {});
-                        storedCount = raw.count;
-                        return [2 /*return*/, {
-                                count: storedCount !== null && storedCount !== void 0 ? storedCount : itemsArray.length,
-                                items: itemsArray,
                                 currentPage: (_k = raw.currentPage) !== null && _k !== void 0 ? _k : undefined,
                             }];
                     }
                 }
+                if (!isCachedMapShape(raw)) return [3 /*break*/, 6];
+                cachedTime = new Date(raw.cachedAt).getTime();
+                ageInMs = currentTime - cachedTime;
+                if (!(ageInMs < expirationMs)) return [3 /*break*/, 6];
+                itemsArray = Object.values(raw.items || {});
+                storedCount = raw.count;
+                cachedCurrentPage = raw.currentPage;
+                requestedCurrentPage = (params === null || params === void 0 ? void 0 : params.currentPage)
+                    ? Number(params.currentPage)
+                    : undefined;
+                if (!(requestedCurrentPage !== undefined &&
+                    requestedCurrentPage !== cachedCurrentPage)) return [3 /*break*/, 5];
                 paramsWithoutFilters_2 = __assign({}, (params || {}));
                 if (paramsWithoutFilters_2.filters !== undefined) {
                     delete paramsWithoutFilters_2.filters;
                 }
-                otherParams = Object.keys(paramsWithoutFilters_2).reduce(function (acc, key) {
+                otherParams_2 = Object.keys(paramsWithoutFilters_2).reduce(function (acc, key) {
                     acc[key] = String(paramsWithoutFilters_2[key]);
                     return acc;
                 }, {});
+                queryObj_2 = __assign({ pageLimit: fallBackPageLimit, currentPage: String(requestedCurrentPage) }, otherParams_2);
+                searchParams_2 = new URLSearchParams(queryObj_2);
+                return [4 /*yield*/, (0, fetch_data_1.fetchData)({
+                        url: "".concat(apiUrl, "?").concat(searchParams_2.toString()),
+                        method: constants_1.API_METHODS.GET,
+                        headers: headers,
+                    })];
+            case 4:
+                response_2 = _v.sent();
+                itemsRaw_1 = (responseKey
+                    ? (_l = response_2 === null || response_2 === void 0 ? void 0 : response_2.data) === null || _l === void 0 ? void 0 : _l[responseKey]
+                    : (_m = response_2 === null || response_2 === void 0 ? void 0 : response_2.data) === null || _m === void 0 ? void 0 : _m.items) || [];
+                fetchedItems = Array.isArray(itemsRaw_1)
+                    ? itemsRaw_1
+                    : [itemsRaw_1];
+                respCount = (_o = response_2 === null || response_2 === void 0 ? void 0 : response_2.data) === null || _o === void 0 ? void 0 : _o.count;
+                respCurrentPageRaw_2 = (_p = response_2 === null || response_2 === void 0 ? void 0 : response_2.data) === null || _p === void 0 ? void 0 : _p.currentPage;
+                respCurrentPage_2 = respCurrentPageRaw_2 == null ? undefined : Number(respCurrentPageRaw_2);
+                newItemsMap = fetchedItems.reduce(function (acc, item, idx) {
+                    var _a, _b;
+                    var obj = item;
+                    var keyCandidate = (_b = (_a = obj === null || obj === void 0 ? void 0 : obj.id) !== null && _a !== void 0 ? _a : obj === null || obj === void 0 ? void 0 : obj.uid) !== null && _b !== void 0 ? _b : idx;
+                    var key = String(keyCandidate);
+                    acc[key] = item;
+                    return acc;
+                }, {});
+                mergedItemsMap = Object.assign({}, raw.items || {}, newItemsMap);
+                mergedItemsArray = Object.values(mergedItemsMap);
+                newCount = respCount !== null && respCount !== void 0 ? respCount : mergedItemsArray.length;
+                newCurrentPage = respCurrentPage_2 !== null && respCurrentPage_2 !== void 0 ? respCurrentPage_2 : requestedCurrentPage;
+                shouldCache_1 = Array.isArray(itemsRaw_1) && respCount && fetchedItems.length > 0;
+                if (shouldCache_1) {
+                    updatedCache = {
+                        items: mergedItemsMap,
+                        cachedAt: new Date().toISOString(),
+                        count: newCount,
+                        currentPage: newCurrentPage,
+                    };
+                    (0, local_storage_1.setStorageValue)(cacheKey, updatedCache);
+                }
+                return [2 /*return*/, {
+                        count: newCount,
+                        items: mergedItemsArray,
+                        currentPage: newCurrentPage,
+                    }];
+            case 5: return [2 /*return*/, {
+                    count: storedCount !== null && storedCount !== void 0 ? storedCount : itemsArray.length,
+                    items: itemsArray,
+                    currentPage: (_q = raw.currentPage) !== null && _q !== void 0 ? _q : undefined,
+                }];
+            case 6:
+                paramsWithoutFilters_3 = __assign({}, (params || {}));
+                if (paramsWithoutFilters_3.filters !== undefined) {
+                    delete paramsWithoutFilters_3.filters;
+                }
+                otherParams = Object.keys(paramsWithoutFilters_3).reduce(function (acc, key) {
+                    acc[key] = String(paramsWithoutFilters_3[key]);
+                    return acc;
+                }, {});
                 queryObj = __assign({ pageLimit: fallBackPageLimit, currentPage: fallBackCurrentPage }, otherParams);
                 searchParams = new URLSearchParams(queryObj);
                 return [4 /*yield*/, (0, fetch_data_1.fetchData)({
@@ -254,14 +328,19 @@ var getCachedData = function (opts) { return __awaiter(void 0, void 0, void 0, f
                         method: constants_1.API_METHODS.GET,
                         headers: headers,
                     })];
-            case 4:
-                response = _p.sent();
-                itemsRaw = (responseKey ? (_l = response === null || response === void 0 ? void 0 : response.data) === null || _l === void 0 ? void 0 : _l[responseKey] : (_m = response === null || response === void 0 ? void 0 : response.data) === null || _m === void 0 ? void 0 : _m.items) ||
+            case 7:
+                response = _v.sent();
+                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) ||
                     [];
                 items = Array.isArray(itemsRaw)
                     ? itemsRaw
                     : [itemsRaw];
-                count = (_o = response === null || response === void 0 ? void 0 : response.data) === null || _o === void 0 ? void 0 : _o.count;
+                count = (_t = response === null || response === void 0 ? void 0 : response.data) === null || _t === void 0 ? void 0 : _t.count;
+                respCurrentPageRaw = (_u = response === null || response === void 0 ? void 0 : response.data) === null || _u === void 0 ? void 0 : _u.currentPage;
+                respCurrentPage = respCurrentPageRaw == null ? undefined : Number(respCurrentPageRaw);
+                requestCurrentPage = (params === null || params === void 0 ? void 0 : params.currentPage)
+                    ? Number(params.currentPage)
+                    : undefined;
                 shouldCache = Array.isArray(itemsRaw) && count && items.length > 0;
                 if (shouldCache) {
                     itemsMap = items.reduce(function (acc, item, idx) {
@@ -276,6 +355,7 @@ var getCachedData = function (opts) { return __awaiter(void 0, void 0, void 0, f
                         items: itemsMap,
                         cachedAt: new Date().toISOString(),
                         count: count,
+                        currentPage: respCurrentPage !== null && respCurrentPage !== void 0 ? respCurrentPage : requestCurrentPage,
                     };
                     (0, local_storage_1.setStorageValue)(cacheKey, updatedCache);
                 }
@@ -283,12 +363,13 @@ var getCachedData = function (opts) { return __awaiter(void 0, void 0, void 0, f
                 return [2 /*return*/, {
                         count: count,
                         items: items,
+                        currentPage: respCurrentPage !== null && respCurrentPage !== void 0 ? respCurrentPage : requestCurrentPage,
                     }];
-            case 5:
-                error_1 = _p.sent();
+            case 8:
+                error_1 = _v.sent();
                 console.error("Error fetching data for ".concat(cacheKey, ":"), error_1);
                 return [2 /*return*/, { count: 0, items: [] }];
-            case 6: return [2 /*return*/];
+            case 9: return [2 /*return*/];
         }
     });
 }); };

package/general/index.d.ts

@@ -15,6 +15,7 @@ export * from './fetch-supabase-private-assets';
 export * from './format-date';
 export * from './format-number';
 export * from './format-phone';
+export * from './cnic-formatter';
 export * from './format-pricing';
 export * from './format-secs';
 export * from './format-time';

package/general/index.js

@@ -31,6 +31,7 @@ __exportStar(require("./fetch-supabase-private-assets"), exports);
 __exportStar(require("./format-date"), exports);
 __exportStar(require("./format-number"), exports);
 __exportStar(require("./format-phone"), exports);
+__exportStar(require("./cnic-formatter"), exports);
 __exportStar(require("./format-pricing"), exports);
 __exportStar(require("./format-secs"), exports);
 __exportStar(require("./format-time"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-pakistan/util-functions",
-  "version": "1.25.26",
+  "version": "1.25.28",
   "description": "A library of all util functions",
   "main": "index.js",
   "scripts": {