@krainovsd/js-helpers 0.10.6 → 0.12.0

package/README.md

@@ -4,24 +4,28 @@ The library of helpers for JS in Browser and NodeJS environments.
 
 ## Installing
 
-### Package manager
-
 Using pnpm:
 ```
 pnpm install @krainovsd/js-helpers
 ```
 
-Using yarn:
-```
-yarn add @krainovsd/js-helpers
-```
+## Monorepo
 
-Using npm:
-```
-npm install @krainovsd/js-helpers
+Using in frontend app with monorepo make sure that node-fetch will be excluded from bundle.
+```js
+export default defineConfig({
+  base: "/",
+  plugins: [
+    react(),
+  ],
+  build: {
+    rollupOptions: {
+      external: ["node-fetch"],
+    },
+  },
+});
 ```
 
-
 ## Usage
 
 ```js

package/lib/cjs/index.cjs

@@ -27,18 +27,18 @@ const POST_API_MIDDLEWARES = {
     Logger: "logger",
 };
 
-/* eslint-disable no-restricted-globals */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 const IS_JEST = typeof process != "undefined" && process.env.JEST_WORKER_ID !== undefined;
-const IS_BUN = typeof process !== "undefined" && process.versions != null && process.versions.bun != null;
-const IS_DENO = // @ts-expect-error
- typeof Deno !== "undefined" &&
+const IS_BUN = typeof process !== "undefined" && process?.versions?.bun != undefined;
+const IS_DENO = 
+// @ts-expect-error
+typeof Deno !== "undefined" &&
     // @ts-expect-error
     typeof Deno.version !== "undefined" &&
     // @ts-expect-error
     typeof Deno.version.deno !== "undefined";
-const IS_NODE = typeof process !== "undefined" && process.versions != null && process.versions.node != null;
+const IS_NODE = typeof process !== "undefined" && process?.versions?.node != undefined;
 const IS_WEB_WORKER = typeof self === "object" &&
     self.constructor &&
     self.constructor.name === "DedicatedWorkerGlobalScope";
@@ -126,7 +126,7 @@ function getByPath(data, path, defaultValue = undefined) {
     return get(data, path, defaultValue);
 }
 
-function dateDifference(type, firstDate, secondDate = new Date(), float = false) {
+function dateDifference({ firstDate, float = false, secondDate = new Date(), type, }) {
     const first = dayjs(firstDate);
     return first.diff(secondDate, type, float);
 }
@@ -277,7 +277,6 @@ function setByPath(data, path, value) {
         set(data, path, value);
     }
     catch (error) {
-        // eslint-disable-next-line no-console
         console.warn(error);
     }
 }
@@ -416,6 +415,8 @@ function limitStreamOfRequests({ countRequests, maxCountInParallel, promiseGette
                     if (resultCb)
                         resultCb(result);
                     currentResponses++;
+                    if (currentResponses === countRequests)
+                        return void resolve(results);
                     request(promiseGetter(++currentRequests), currentRequests);
                 })
                     .catch((error) => {
@@ -456,7 +457,7 @@ function getCallerFunctionName() {
         const stack = error.stack.split("\n");
         if (stack[2]) {
             const callerLine = stack[2].trim();
-            const match = callerLine.match(/at (\w+)/);
+            const match = /at (\w+)/.exec(callerLine);
             if (match) {
                 return match[1];
             }
@@ -466,6 +467,7 @@ function getCallerFunctionName() {
     return null;
 }
 
+/* eslint-disable id-length */
 const translitDict = {
     А: "A",
     Б: "B",
@@ -699,14 +701,14 @@ function getVisiblePosition({ initialPosition, node, visibleArea, placement = "b
     let targetHeight = 0;
     let targetWidth = 0;
     let { top: targetTopPosition, left: targetLeftPosition, height: nodeHeight, width: nodeWidth, } = node.getBoundingClientRect();
-    if (initialPosition && initialPosition.targetNode) {
+    if (initialPosition?.targetNode) {
         const { top: childTop, left: childLeft, height, width, } = initialPosition.targetNode.getBoundingClientRect();
         targetHeight = height;
         targetWidth = width;
         targetTopPosition = childTop;
         targetLeftPosition = childLeft;
     }
-    if (initialPosition && initialPosition.position) {
+    if (initialPosition?.position) {
         if (initialPosition.position.x) {
             targetLeftPosition = initialPosition.position.x;
         }
@@ -1268,6 +1270,26 @@ function getFlexVisiblePosition({ initialLeft, initialTop, isCompletelyVisibleX,
     };
 }
 
+function getQueryValues(keys) {
+    if (!IS_BROWSER && !IS_JEST)
+        return null;
+    const object = {};
+    const queries = window.location.search.substring(1).split("&");
+    for (const query of queries) {
+        const [key, value] = query.split("=");
+        if (keys.includes(key) && value) {
+            const prev = object[key];
+            if (isArray(prev))
+                prev.push(value);
+            else if (isString(prev))
+                object[key] = [prev, value];
+            else
+                object[key] = value;
+        }
+    }
+    return object;
+}
+
 const RESPONSE_DATA_SYMBOL = Symbol("response data");
 
 async function updateAuthToken(options) {
@@ -1358,18 +1380,21 @@ function updateAuthTokenNoRefresh(options) {
     let expires = localStorage.getItem(options.storageTokenExpiresName);
     if (!expires || Number.isNaN(+expires) || Date.now() > +expires)
         expires = null;
-    let hasExpiresQuery = false;
-    if (!expires) {
-        let lastQuery;
-        const queries = window.location.search.substring(1).split("&");
-        for (const query of queries) {
-            const [key, value] = query.split("=");
-            if (key === options.queryTokenExpiresName && value) {
-                lastQuery = value;
-                hasExpiresQuery = true;
-            }
-        }
-        expires = lastQuery;
+    const queries = getQueryValues([options.queryTokenExpiresName, options.queryIsRefreshTokenName]);
+    const refreshQuery = queries?.[options.queryIsRefreshTokenName];
+    const expiresQuery = queries?.[options.queryTokenExpiresName];
+    const isRefresh = isString(refreshQuery)
+        ? refreshQuery === "true"
+        : isArray(refreshQuery)
+            ? refreshQuery[refreshQuery.length - 1] === "true"
+            : false;
+    const expiresFromQuery = isString(expiresQuery)
+        ? expiresQuery
+        : isArray(expiresQuery)
+            ? expiresQuery[expiresQuery.length - 1]
+            : false;
+    if (!expires && expiresFromQuery) {
+        expires = expiresFromQuery;
         if (!expires || Number.isNaN(+expires) || Date.now() > +expires)
             expires = null;
     }
@@ -1378,17 +1403,13 @@ function updateAuthTokenNoRefresh(options) {
         return null;
     }
     localStorage.setItem(options.storageTokenExpiresName, expires);
-    const queries = window.location.search.substring(1).split("&");
-    for (const query of queries) {
-        const [key, value] = query.split("=");
-        if (key === options.queryIsRefreshTokenName && value === "true") {
-            const channel = new BroadcastChannel(options.queryIsRefreshTokenName);
-            channel.postMessage(true);
-            channel.close();
-            window.close();
-        }
+    if (isRefresh) {
+        const channel = new BroadcastChannel(options.queryIsRefreshTokenName);
+        channel.postMessage(true);
+        channel.close();
+        window.close();
     }
-    if (hasExpiresQuery) {
+    if (expiresFromQuery) {
         const url = new URL(window.location.href);
         url.searchParams.delete(options.queryTokenExpiresName);
         window.location.replace(url.toString());
@@ -1634,14 +1655,16 @@ class ResponseError extends Error {
     status;
     code;
     description;
-    constructor({ message, status, description, code }) {
+    headers;
+    constructor({ message, status, description, code, headers }) {
         super(message);
         this.status = status;
         this.description = description;
         this.code = code;
+        this.headers = headers;
     }
 }
-function createRequestClientInstance(options = {}) {
+function createRequestClientInstance(options) {
     let executeMiddlewares;
     let executePostMiddlewares;
     function setMiddlewares({ activeMiddlewares = [], middlewareOptions = {}, customMiddlewares = [], activePostMiddlewares = [], postMiddlewaresOptions = {}, customPostMiddlewares = [], } = {}) {
@@ -1672,34 +1695,17 @@ function createRequestClientInstance(options = {}) {
             if (isObject(body) || isArray(body))
                 preparedBody = JSON.stringify(preparedBody);
         }
-        let response;
-        if (IS_BROWSER || IS_JEST) {
-            response = await fetch(url, {
-                method,
-                body: preparedBody,
-                headers: {
-                    ...(body instanceof FormData || !body
-                        ? {}
-                        : { "Content-Type": "application/json; charset=UTF-8" }),
-                    ...headers,
-                },
-                signal: request.signal,
-            });
-        }
-        if (IS_NODE && !IS_JEST) {
-            const nodeFetch = (await import('node-fetch')).default;
-            response = await nodeFetch(url, {
-                method,
-                body: preparedBody,
-                headers: {
-                    ...(body instanceof FormData || !body
-                        ? {}
-                        : { "Content-Type": "application/json; charset=UTF-8" }),
-                    ...headers,
-                },
-                signal: request.signal,
-            });
-        }
+        const response = await options.client(url, {
+            method,
+            body: preparedBody,
+            headers: {
+                ...(body instanceof FormData || !body
+                    ? {}
+                    : { "Content-Type": "application/json; charset=UTF-8" }),
+                ...headers,
+            },
+            signal: request.signal,
+        });
         await executePostMiddlewares(response);
         if (!response) {
             throw new Error("hasn't response");
@@ -1726,6 +1732,7 @@ function createRequestClientInstance(options = {}) {
                 status: response.status,
                 message: `HTTP error! Status: ${response.status}`,
                 description: result,
+                headers: Object.fromEntries(response.headers.entries()),
             });
         }
         if (request.downloadFile) {
@@ -1903,6 +1910,7 @@ exports.getCallerFunctionName = getCallerFunctionName;
 exports.getColorFormat = getColorFormat;
 exports.getDateByRules = getDateByRules;
 exports.getFileNameFromHeader = getFileNameFromHeader;
+exports.getQueryValues = getQueryValues;
 exports.getRandomColor = getRandomColor;
 exports.getToday = getToday;
 exports.getTomorrow = getTomorrow;