@react-pakistan/util-functions 1.24.59 → 1.24.60

package/hooks/use-fetch.d.ts

@@ -1,6 +1,8 @@
 export interface FetchResult {
     data: any;
     error: any;
+    status?: number;
+    ok?: boolean;
 }
 export interface FetchConfig extends RequestInit {
     autoFetch?: boolean;

package/hooks/use-fetch.js

@@ -1,5 +1,5 @@
 "use strict";
-/* eslint-disable @typescript-eslint/no-explicit-any, no-void */
+/* eslint-disable @typescript-eslint/no-explicit-any, no-void, no-restricted-globals */
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -94,7 +94,7 @@ var useFetch = function (url, config, deps) {
         };
     }, []);
     var fetchNow = (0, react_1.useCallback)(function (overrideUrl, overrideOptions) { return __awaiter(void 0, void 0, void 0, function () {
-        var finalUrl, finalOptions, controller, response, result, err_1;
+        var finalUrl, finalOptions, controller, response, parsed, e_1, err, err_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -108,45 +108,73 @@ var useFetch = function (url, config, deps) {
                     finalOptions.signal = controller.signal;
                     _a.label = 1;
                 case 1:
-                    _a.trys.push([1, 4, 5, 6]);
+                    _a.trys.push([1, 7, 8, 9]);
                     return [4 /*yield*/, fetch(finalUrl, finalOptions)];
                 case 2:
                     response = _a.sent();
-                    if (!response.ok) {
-                        throw new Error("HTTP error! status: ".concat(response.status));
-                    }
-                    return [4 /*yield*/, response.json()];
+                    parsed = null;
+                    _a.label = 3;
                 case 3:
-                    result = _a.sent();
+                    _a.trys.push([3, 5, , 6]);
+                    return [4 /*yield*/, response.json()];
+                case 4:
+                    parsed = _a.sent();
+                    return [3 /*break*/, 6];
+                case 5:
+                    e_1 = _a.sent();
+                    // non-json or empty body
+                    parsed = null;
+                    return [3 /*break*/, 6];
+                case 6:
                     if (isMounted.current) {
-                        setData(result);
-                        setError(null);
-                        setApiResult(API_RESULT.SUCCESS);
-                        callback === null || callback === void 0 ? void 0 : callback({ data: result, error: null });
+                        if (response.ok) {
+                            setData(parsed);
+                            setError(null);
+                            setApiResult(API_RESULT.SUCCESS);
+                            callback === null || callback === void 0 ? void 0 : callback({
+                                data: parsed,
+                                error: null,
+                                status: response.status,
+                                ok: true,
+                            });
+                        }
+                        else {
+                            err = new Error("HTTP error! status: ".concat(response.status));
+                            setError(err);
+                            setData(parsed);
+                            setApiResult(API_RESULT.ERROR);
+                            callback === null || callback === void 0 ? void 0 : callback({
+                                data: parsed,
+                                error: err,
+                                status: response.status,
+                                ok: false,
+                            });
+                        }
                     }
-                    return [3 /*break*/, 6];
-                case 4:
+                    return [3 /*break*/, 9];
+                case 7:
                     err_1 = _a.sent();
                     if (isMounted.current) {
                         setError(err_1);
                         setData(null);
                         setApiResult(API_RESULT.ERROR);
-                        callback === null || callback === void 0 ? void 0 : callback({ data: null, error: err_1 });
+                        callback === null || callback === void 0 ? void 0 : callback({
+                            data: null,
+                            error: err_1,
+                            status: undefined,
+                            ok: false,
+                        });
                     }
-                    return [3 /*break*/, 6];
-                case 5:
+                    return [3 /*break*/, 9];
+                case 8:
                     if (isMounted.current) {
                         setLoading(false);
                     }
                     return [7 /*endfinally*/];
-                case 6: return [2 /*return*/];
+                case 9: return [2 /*return*/];
             }
         });
-    }); }, __spreadArray([
-        url,
-        defaultOptions,
-        callback
-    ], deps, true));
+    }); }, __spreadArray([url, defaultOptions, callback], deps, true));
     (0, react_1.useEffect)(function () {
         if (autoFetch) {
             fetchNow();

package/hooks/use-module-entity.d.ts

@@ -2,6 +2,8 @@ import { FetchConfig } from './use-fetch';
 export interface CallbackParams {
     data: any;
     error: any;
+    status?: number;
+    ok?: boolean;
 }
 interface Params {
     byIdCallback: (d: CallbackParams) => void;
@@ -29,7 +31,7 @@ interface Return {
     deleteFetchNow?: (url?: string, config?: FetchConfig) => void;
     deleteLoading: boolean;
     listError?: Error;
-    listFetchNow: () => void;
+    listFetchNow: (url?: string, config?: FetchConfig) => void;
     listLoading: boolean;
     updateError?: Error;
     updateFetchNow: (url?: string, config?: FetchConfig) => void;

package/hooks/use-module-entity.js

@@ -1,5 +1,5 @@
 "use strict";
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-explicit-any, no-restricted-globals */
 var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
         if (ar || !(i in from)) {
@@ -11,23 +11,70 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useModuleEntity = void 0;
+var react_1 = require("react");
 var constants_1 = require("../constants");
 var use_fetch_1 = require("./use-fetch");
 var use_debounce_1 = require("./use-debounce");
 var useModuleEntity = function (_a) {
     var byIdCallback = _a.byIdCallback, _b = _a.byIdDeps, byIdDeps = _b === void 0 ? [] : _b, byIdParams = _a.byIdParams, deleteCallback = _a.deleteCallback, _c = _a.deleteDeps, deleteDeps = _c === void 0 ? [] : _c, deleteParams = _a.deleteParams, listCallback = _a.listCallback, _d = _a.listDeps, listDeps = _d === void 0 ? [] : _d, listParams = _a.listParams, listUrl = _a.listUrl, searchQuery = _a.searchQuery, unitByIdUrl = _a.unitByIdUrl, unitUrl = _a.unitUrl, updateCallback = _a.updateCallback, _e = _a.updateDeps, updateDeps = _e === void 0 ? [] : _e, updateParams = _a.updateParams;
     var debouncedQuery = (0, use_debounce_1.useDebounce)(searchQuery, 800);
+    // debounced list refresh to batch multiple updates/deletes
+    var refreshTimerRef = (0, react_1.useRef)(null);
+    (0, react_1.useEffect)(function () { return function () {
+        if (refreshTimerRef.current) {
+            globalThis.clearTimeout(refreshTimerRef.current);
+            refreshTimerRef.current = null;
+        }
+    }; }, []);
     // list
     var _f = (0, use_fetch_1.useFetch)(listUrl, {
         method: constants_1.API_METHODS.POST,
         body: JSON.stringify(listParams),
         callback: listCallback,
-    }, __spreadArray([debouncedQuery], listDeps, true)), listError = _f.error, listFetchNow = _f.fetchNow, listLoading = _f.loading;
+    }, __spreadArray([debouncedQuery, JSON.stringify(listParams)], listDeps, true)), listError = _f.error, listFetchNow = _f.fetchNow, listLoading = _f.loading;
+    var refreshList = function (delay) {
+        if (delay === void 0) { delay = 300; }
+        if (refreshTimerRef.current) {
+            globalThis.clearTimeout(refreshTimerRef.current);
+        }
+        refreshTimerRef.current = globalThis.setTimeout(function () {
+            try {
+                // pass current list params explicitly so the fetch uses the latest values
+                listFetchNow(undefined, {
+                    method: constants_1.API_METHODS.POST,
+                    body: JSON.stringify(listParams),
+                });
+            }
+            catch (e) {
+                // noop
+            }
+            refreshTimerRef.current = null;
+        }, delay);
+    };
     // create / edit
     var _g = (0, use_fetch_1.useFetch)(unitUrl, {
         method: constants_1.API_METHODS.POST,
         body: JSON.stringify(updateParams),
-        callback: updateCallback,
+        callback: function (d) {
+            if (updateCallback) {
+                try {
+                    updateCallback(d);
+                }
+                catch (e) {
+                    // swallow callback errors to ensure list refresh still runs
+                    // caller's callback is responsible for its own error handling
+                }
+            }
+            // refresh the list after update/create only when the operation succeeded
+            try {
+                if (d && d.ok) {
+                    refreshList();
+                }
+            }
+            catch (e) {
+                // noop
+            }
+        },
     }, __spreadArray([], updateDeps, true)), updateError = _g.error, updateLoading = _g.loading, updateFetchNow = _g.fetchNow;
     // by id
     var _h = (0, use_fetch_1.useFetch)(unitByIdUrl, {
@@ -39,7 +86,25 @@ var useModuleEntity = function (_a) {
     var _j = (0, use_fetch_1.useFetch)(unitUrl, {
         method: constants_1.API_METHODS.DELETE,
         body: JSON.stringify(deleteParams),
-        callback: deleteCallback,
+        callback: function (d) {
+            if (deleteCallback) {
+                try {
+                    deleteCallback(d);
+                }
+                catch (e) {
+                    // swallow callback errors to ensure list refresh still runs
+                }
+            }
+            // refresh the list after delete only when the operation succeeded
+            try {
+                if (d && d.ok) {
+                    refreshList();
+                }
+            }
+            catch (e) {
+                // noop
+            }
+        },
     }, __spreadArray([], deleteDeps, true)), deleteError = _j.error, deleteLoading = _j.loading, deleteFetchNow = _j.fetchNow;
     return {
         byIdError: byIdError,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-pakistan/util-functions",
-  "version": "1.24.59",
+  "version": "1.24.60",
   "description": "A library of all util functions",
   "main": "index.js",
   "scripts": {
@@ -45,6 +45,8 @@
     "@babel/preset-typescript": "^7.24.1",
     "@microsoft/tsdoc": "^0.14.2",
     "@react-pakistan/eslint-config-shared": "^1.11.3",
+    "@testing-library/react": "^14.0.0",
+    "@testing-library/react-hooks": "^8.0.1",
     "@types/jest": "^29.5.12",
     "@types/lodash.curry": "^4.1.9",
     "@types/node": "^20.12.8",
@@ -59,12 +61,14 @@
     "eslint-plugin-import": "^2.29.1",
     "husky": "^9.0.11",
     "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "libphonenumber-js": "^1.12.13",
     "lint-staged": "^15.2.2",
     "lodash.curry": "^4.1.1",
     "lodash.isequal": "^4.5.0",
     "next": "^15",
-    "react": "^19",
+    "react": "^19.2.0",
+    "react-dom": "^19.2.0",
     "react-use": "^17",
     "rimraf": "^5.0.5",
     "ts-jest": "^29",

package/setupTests.d.ts

@@ -0,0 +1 @@
+export declare function __restoreConsoleErrors(): void;

package/setupTests.js

@@ -0,0 +1,53 @@
+"use strict";
+// Jest setup file: selectively filter noisy console.error messages that are
+// expected under the test environment. We keep other console.error messages
+// intact so real failures still surface.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.__restoreConsoleErrors = __restoreConsoleErrors;
+var origConsoleError = console.error;
+var IGNORED_PATTERNS = [
+    // React (production build) act warning that appears from some imported
+    // production builds of React when using the test renderer.
+    /act\(\.\.\.\) is not supported in production builds of React/,
+    // ReactDOM warning when the test environment isn't configured for concurrent act
+    /The current testing environment is not configured to support act\(\.\.\.\)/,
+    // requestAnimationFrame / cancelAnimationFrame polyfill warnings from
+    // some vendor bundles that check for window.requestAnimationFrame
+    /This browser doesn't support requestAnimationFrame/,
+    /This browser doesn't support cancelAnimationFrame/,
+    // forceFrameRate debug warning from some React builds
+    /forceFrameRate takes a positive int between 0 and 125/,
+    // Deprecation message when code (or a dependency) calls act from
+    // react-dom/test-utils instead of React.act
+    /ReactDOMTestUtils\.act.*is deprecated in favor of .*React\.act/,
+];
+console.error = function () {
+    var _a;
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    try {
+        if (args.length > 0) {
+            var first = String((_a = args[0]) !== null && _a !== void 0 ? _a : '');
+            for (var _b = 0, IGNORED_PATTERNS_1 = IGNORED_PATTERNS; _b < IGNORED_PATTERNS_1.length; _b++) {
+                var rx = IGNORED_PATTERNS_1[_b];
+                if (rx.test(first)) {
+                    // swallow this noisy, expected message
+                    return;
+                }
+            }
+        }
+    }
+    catch (e) {
+        // if anything goes wrong while matching, fall back to original
+        return origConsoleError.apply(void 0, args);
+    }
+    // otherwise call original
+    return origConsoleError.apply(void 0, args);
+};
+// Provide a small helper to restore console in case tests need it
+function __restoreConsoleErrors() {
+    // @ts-ignore
+    console.error = origConsoleError;
+}