aprog 1.5.9 → 1.6.1

package/README.md

@@ -54,27 +54,6 @@ document.addEventListener("DOMContentLoaded", async function() {
 
 ```
 
-Створення Pages:
-
-```shell
-
-const NamePage = () => {
-  return div({
-    class: "w-full h-screen flex flex-col items-center justify-center text-3xl",
-      value: [
-        div({
-          class: "text-red font-bold text-5xl",
-          value: "Блок №1"
-        }),
-        div({value: "Блок №2"})
-      ]
-  });
-}
-
-export default NamePage;
-
-```
-
 Приклад використання методів формування HTML елементів:
 
 ```shell
@@ -96,6 +75,27 @@ document.body.appendChild(elDiv);
 
 ```
 
+Створення Pages:
+
+```shell
+
+const NamePage = () => {
+  return div({
+    class: "w-full h-screen flex flex-col items-center justify-center text-3xl",
+      value: [
+        div({
+          class: "text-red font-bold text-5xl",
+          value: "Блок №1"
+        }),
+        div({value: "Блок №2"})
+      ]
+  });
+}
+
+export default NamePage;
+
+```
+
 Приклад використання методів дебагу:
 
 ```shell
@@ -148,7 +148,7 @@ onInput: (event) => {
 - *encrypt(str), decrypt(encryptedStr)*
 
 - *div, span, button, a, img, meta, label, input, select, option, options, form, hr, textarea, table, caption, thead, tbody, tr, th, td, pre, attachCustomTitle* 
-- *_get, GUID, apState, date, pause, apFetch, chars, elementToObject, copyText, scrollToTop, scrollToBottom, firstKey, checkArrays, ucfirst, deepEqual, nodeListToObject*
+- *_get, _getAll, GUID, apState, date, pause, apFetch, chars, elementToObject, copyText, scrollToTop, scrollToBottom, firstKey, checkArrays, ucfirst, deepEqual, nodeListToObject*
 - *isEmpty, isNull, isFloat, isNumeric, isObject, isArray, isNumber, isString, isPromise, isNull, isFloat, isNumeric, isObject*
 
 - *router({ routes, main, "Page Not Found" })*

package/index.js

@@ -1,6 +1,7 @@
 export {
     div, span, button, a, img, meta, label, input, select, option, options, form, hr, textarea,
-    table, caption, thead, tbody, tr, th, td, pre, attachCustomTitle, _get, GUID, isEmpty, apState, date, pause, apFetch,
+    table, caption, thead, tbody, tr, th, td, pre,
+    attachCustomTitle, _get, _getAll, GUID, isEmpty, apState, date, pause, apFetch,
     chars, isNull, isFloat, isNumeric, isObject, elementToObject, copyText, scrollToTop, scrollToBottom,
     firstKey, isArray, checkArrays, isNumber, isString, isPromise, ucfirst, deepEqual, nodeListToObject
 } from './src/aprog.js';
@@ -11,4 +12,4 @@ export { encrypt, decrypt } from './src/shifrator.js';
 export { gemini } from './src/OpenAI.js';
 export { mathInput } from './src/math.js';
 export { cookie, storage } from './src/storage.js';
-export { paginate, parseData } from './src/Paginate.js';
+export { paginate, parseData } from './src/paginate.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aprog",
-  "version": "1.5.9",
+  "version": "1.6.1",
   "description": "Допоміжна бібліотека js",
   "main": "index.js",
   "scripts": {

package/src/aprog.js

@@ -1314,7 +1314,17 @@ export const _get = (name, defaulting = null) => {
             : searchParams.get(name);
     }
     return defaulting;
-}
+};
+
+export const _getAll = () => {
+    let url = new URL(window.location.href);
+    let searchParams = new URLSearchParams(url.search);
+    let params = {};
+    searchParams.forEach((value, key) => {
+        params[key] = isFloat(value) || isNumeric(value) ? parseFloat(value) : value;
+    });
+    return params;
+};
 
 export const GUID = () => {
     return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (char) {
@@ -1322,7 +1332,7 @@ export const GUID = () => {
         const value = char === 'x' ? random : (random & 0x3 | 0x8);
         return value.toString(16);
     });
-}
+};
 
 export const checkArrays = (arr1, arr2, checkAll = false) => {
     const set1 = new Set(arr1);
@@ -1331,7 +1341,7 @@ export const checkArrays = (arr1, arr2, checkAll = false) => {
     } else {
         return arr2.some(item => set1.has(item));
     }
-}
+};
 
 const customTitle = (text) => {
     const title = div({
@@ -1351,7 +1361,7 @@ const customTitle = (text) => {
         },
         value: text
     });
-    document.body.append(title);
+    document.body.appendChild(title);
 
     return title;
 };

package/src/paginate.js

@@ -119,9 +119,13 @@ export const paginate = ({ count = 0, currentPage = 1, onPageChange = () => {},
 
     const navigateTo = (path) => {
         window.history.pushState("", "", path);
-    }
+    };
+
+    let url = new URL(window.location.href);
+    let searchParams = new URLSearchParams(url.search);
 
-    navigateTo(`${window.location.pathname}?page=${currentPage || 1}`);
+    searchParams.set("page", String(currentPage || 1));
+    navigateTo(`${window.location.pathname}?${searchParams.toString()}`);
 
     return div({
         class: "paginate-block",