tuijs-util 1.3.7 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tuijs-util",
-    "version": "1.3.7",
+    "version": "1.4.1",
     "module": "src/esm/index.js",
     "main": "src/cjs/index.cjs",
     "exports": {
@@ -20,6 +20,6 @@
     "devDependencies": {
         "@rollup/plugin-babel": "^6.0.4",
         "@rollup/plugin-node-resolve": "^15.3.0",
-        "rollup": "^4.22.4"
+        "rollup": "^4.24.0"
     }
 }

package/src/cjs/index.cjs

@@ -339,12 +339,6 @@ function elmCleanerArray(templateLit) {
   }
 }
 
-/**
- * @typedef {Array} ImageUrls - A list of image urls
- * @property {string} imageUrl - The url of the desired image
- * @property {Array<string>} imageUrlStrings - An Array of image url strings
- */
-
 /**
  * Adds 'http://' if valid URL and 'http://' or 'https://' is missing.
  * @param {string} url 
@@ -388,18 +382,35 @@ function urlAddHttps(url) {
 }
 
 /**
- * Collects and parses data from a JSON file
+ * Sends GET request to specified URL
  * @async
- * @param {string} filePath
+ * @param {string} url
+ * @returns {Promise<Object>} - Returns response if response is ok, otherwise it throws an Error.
+ * @throws {Error} - Throws Error if an error is detected.
+ */
+async function reqGet(url) {
+  try {
+    const res = await fetch(url, {
+      method: 'GET'
+    });
+    return res;
+  } catch (er) {
+    throw new Error(er.message);
+  }
+}
+
+/**
+ * Collects JSON data from a given url
+ * @async
+ * @param {string} url
  * @returns {Promise<Object>} - Returns data if response is ok, otherwise it throws an Error.
  * @throws {Error} - Throws Error if an error is detected.
  */
-async function reqFileJson(filePath) {
+async function reqGetJson(url) {
   try {
-    const res = await fetch(filePath);
-    if (!res.ok) {
-      throw new Error(res);
-    }
+    const res = await fetch(url, {
+      method: 'GET'
+    });
     const data = await res.json();
     return data;
   } catch (er) {
@@ -408,21 +419,19 @@ async function reqFileJson(filePath) {
 }
 
 /**
- * Sends GET request to specified URL
+ * Collects text data from a given url
  * @async
  * @param {string} url
- * @returns {Promise<Object>} - Returns response if response is ok, otherwise it throws an Error.
+ * @returns {Promise<Object>} - Returns data if response is ok, otherwise it throws an Error.
  * @throws {Error} - Throws Error if an error is detected.
  */
-async function reqGet(url) {
+async function reqGetText(url) {
   try {
     const res = await fetch(url, {
       method: 'GET'
     });
-    if (!res.ok) {
-      throw new Error(res);
-    }
-    return res;
+    const data = await res.text();
+    return data;
   } catch (er) {
     throw new Error(er.message);
   }
@@ -451,31 +460,28 @@ async function reqPostJson(url, dataJson) {
       },
       body: dataJson
     });
-    if (!res.ok) {
-      throw new Error(res);
-    }
     return res;
   } catch (er) {
-    throw new Error(er.message);
+    throw new Error(er);
   }
 }
 
-// Simple POST request. export function is expecting FormData.
 /**
- * IN WORK
+ * Sends POST request to specified URL, which contains FormData in the body.
+ * @param {string} url 
+ * @param {FormData} dataForm 
+ * @returns {Promise<Object>} - Returns response if response is ok, otherwise it throws an Error.
+ * @throws {Error} - Throws Error if an error is detected.
  */
 async function reqPostForm(url, dataForm) {
   try {
     if (!(dataForm instanceof FormData)) {
-      throw `The data provided was not form data`;
+      throw new Error(`The data provided was not form data`);
     }
     const res = await fetch(url, {
       method: 'POST',
       body: dataForm
     });
-    if (!res.ok) {
-      return res;
-    }
     return res;
   } catch (er) {
     throw new Error(er);
@@ -556,29 +562,45 @@ function sleep(ms) {
 }
 
 /**
- * Adds and intersectionObserver for a list of target elements, that calls a function when 
- * @param {Array} targets - An array of elements that will be attached to the observer.
- * @param {Function} callback - The callback function that will run when the observer is triggered.
- * @param {Object} observerOptions - An Object containing the observer options. By default only threshold is set.
- * @returns {Function} - Returns a cleanup function that will disconnect the observer. This is not required to use.
- */
-function scrollIntoView(targets, callback, observerOptions = {
-  threshold: 0.5
-}) {
-  const observer = new IntersectionObserver(entries => {
-    entries.forEach(entry => {
-      if (entry.isIntersecting) {
-        // Only trigger when the element is intersecting
-        callback(entry.target);
+ *
+ */
+function scrollIntoView() {
+  let allObservers = [];
+  function addObserver(targets, callback, observerOptions = {
+    threshold: 0.5
+  }) {
+    const observer = new IntersectionObserver(entries => {
+      entries.forEach(entry => {
+        if (entry.isIntersecting) {
+          // Only trigger when the element is intersecting
+          callback(entry.target);
+        }
+      });
+    }, observerOptions);
+    for (let i = 0; i < targets.length; i++) {
+      observer.observe(targets[i]);
+    }
+    allObservers.push(observer);
+  }
+  function removeNamedObserver(name) {
+    for (let i = 0; i < allObservers.length; i++) {
+      if (allObservers[i].name === name) {
+        allObservers[i].disconnect();
+        allObservers.splice(i, 1);
+        i--;
       }
-    });
-  }, observerOptions);
-  targets.forEach(target => {
-    observer.observe(target);
-  });
-  // Return a cleanup function to disconnect the observer
-  return () => {
-    observer.disconnect();
+    }
+  }
+  function removeAllObservers() {
+    for (let i = 0; i < allObservers.length; i++) {
+      allObservers[i].disconnect();
+    }
+    allObservers = [];
+  }
+  return {
+    addObserver,
+    removeNamedObserver,
+    removeAllObservers
   };
 }
 
@@ -614,8 +636,9 @@ exports.regExNumbers = regExNumbers;
 exports.regExSpecial = regExSpecial;
 exports.regExUrl = regExUrl;
 exports.removeChar = removeChar;
-exports.reqFileJson = reqFileJson;
 exports.reqGet = reqGet;
+exports.reqGetJson = reqGetJson;
+exports.reqGetText = reqGetText;
 exports.reqPostForm = reqPostForm;
 exports.reqPostJson = reqPostJson;
 exports.scrollIntoView = scrollIntoView;

package/src/esm/index.js

@@ -20,8 +20,9 @@ export {
     parseTemplate,
 } from './lib/util.dom.js';
 export {
-    reqFileJson,
     reqGet,
+    reqGetJson,
+    reqGetText,
     reqPostForm,
     reqPostJson,
     urlAddHttp,

package/src/esm/lib/util.dom.js

@@ -78,9 +78,3 @@ export function elmCleanerArray(templateLit) {
         throw new Error(er.message);
     }
 }
-
-/**
- * @typedef {Array} ImageUrls - A list of image urls
- * @property {string} imageUrl - The url of the desired image
- * @property {Array<string>} imageUrlStrings - An Array of image url strings
- */

package/src/esm/lib/util.http.js

@@ -41,18 +41,31 @@ export function urlAddHttps(url) {
 }
 
 /**
- * Collects and parses data from a JSON file
+ * Sends GET request to specified URL
  * @async
- * @param {string} filePath
+ * @param {string} url
+ * @returns {Promise<Object>} - Returns response if response is ok, otherwise it throws an Error.
+ * @throws {Error} - Throws Error if an error is detected.
+ */
+export async function reqGet(url) {
+    try {
+        const res = await fetch(url, { method: 'GET' });
+        return res;
+    } catch (er) {
+        throw new Error(er.message);
+    }
+}
+
+/**
+ * Collects JSON data from a given url
+ * @async
+ * @param {string} url
  * @returns {Promise<Object>} - Returns data if response is ok, otherwise it throws an Error.
  * @throws {Error} - Throws Error if an error is detected.
  */
-export async function reqFileJson(filePath) {
+export async function reqGetJson(url) {
     try {
-        const res = await fetch(filePath);
-        if (!res.ok) {
-            throw new Error(res);
-        }
+        const res = await fetch(url, { method: 'GET' });
         const data = await res.json();
         return data;
     } catch (er) {
@@ -61,19 +74,17 @@ export async function reqFileJson(filePath) {
 }
 
 /**
- * Sends GET request to specified URL
+ * Collects text data from a given url
  * @async
  * @param {string} url
- * @returns {Promise<Object>} - Returns response if response is ok, otherwise it throws an Error.
+ * @returns {Promise<Object>} - Returns data if response is ok, otherwise it throws an Error.
  * @throws {Error} - Throws Error if an error is detected.
  */
-export async function reqGet(url) {
+export async function reqGetText(url) {
     try {
         const res = await fetch(url, { method: 'GET' });
-        if (!res.ok) {
-            throw new Error(res);
-        }
-        return res;
+        const data = await res.text();
+        return data;
     } catch (er) {
         throw new Error(er.message);
     }
@@ -102,31 +113,28 @@ export async function reqPostJson(url, dataJson) {
             },
             body: dataJson
         });
-        if (!res.ok) {
-            throw new Error(res);
-        }
         return res;
     } catch (er) {
-        throw new Error(er.message);
+        throw new Error(er);
     }
 }
 
-// Simple POST request. export function is expecting FormData.
 /**
- * IN WORK
+ * Sends POST request to specified URL, which contains FormData in the body.
+ * @param {string} url 
+ * @param {FormData} dataForm 
+ * @returns {Promise<Object>} - Returns response if response is ok, otherwise it throws an Error.
+ * @throws {Error} - Throws Error if an error is detected.
  */
 export async function reqPostForm(url, dataForm) {
     try {
         if (!(dataForm instanceof FormData)) {
-            throw `The data provided was not form data`;
+            throw new Error(`The data provided was not form data`);
         }
         const res = await fetch(url, {
             method: 'POST',
             body: dataForm
         });
-        if (!res.ok) {
-            return res;
-        }
         return res;
     } catch (er) {
         throw new Error(er);

package/src/esm/lib/util.misc.js

@@ -68,25 +68,46 @@ export function sleep(ms) {
 }
 
 /**
- * Adds and intersectionObserver for a list of target elements, that calls a function when 
- * @param {Array} targets - An array of elements that will be attached to the observer.
- * @param {Function} callback - The callback function that will run when the observer is triggered.
- * @param {Object} observerOptions - An Object containing the observer options. By default only threshold is set.
- * @returns {Function} - Returns a cleanup function that will disconnect the observer. This is not required to use.
+ *
  */
-export function scrollIntoView(targets, callback, observerOptions = { threshold: 0.5}) {
-    const observer = new IntersectionObserver((entries) => {
-        entries.forEach(entry => {
-            if (entry.isIntersecting) {  // Only trigger when the element is intersecting
-                callback(entry.target);
+export function scrollIntoView() {
+    let allObservers = [];
+
+    function addObserver(targets, callback, observerOptions = { threshold: 0.5 }) {
+        const observer = new IntersectionObserver((entries) => {
+            entries.forEach(entry => {
+                if (entry.isIntersecting) {  // Only trigger when the element is intersecting
+                    callback(entry.target);
+                }
+            });
+        }, observerOptions);
+        for (let i = 0; i < targets.length; i++) {
+            observer.observe(targets[i])
+            
+        }
+        allObservers.push(observer);
+    }
+
+    function removeNamedObserver(name) {
+        for (let i = 0; i < allObservers.length; i++) {
+            if (allObservers[i].name === name) {
+                allObservers[i].disconnect();
+                allObservers.splice(i, 1);
+                i--;
             }
-        });
-    }, observerOptions);
-    targets.forEach(target => {
-        observer.observe(target);
-    });
-    // Return a cleanup function to disconnect the observer
-    return () => {
-        observer.disconnect();
-    };
+        }
+    }
+
+    function removeAllObservers() {
+        for (let i = 0; i < allObservers.length; i++) {
+            allObservers[i].disconnect();
+        }
+        allObservers = [];
+    }
+
+    return {
+        addObserver,
+        removeNamedObserver,
+        removeAllObservers
+    }
 }