tuijs-util 1.3.7 → 1.3.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tuijs-util",
-    "version": "1.3.7",
+    "version": "1.3.8",
     "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,15 +382,38 @@ 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'
+    });
+    if (!res.ok) {
+      throw new Error(res);
+    }
+    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);
+    const res = await fetch(url, {
+      method: 'GET'
+    });
     if (!res.ok) {
       throw new Error(res);
     }
@@ -408,13 +425,13 @@ 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'
@@ -422,7 +439,8 @@ async function reqGet(url) {
     if (!res.ok) {
       throw new Error(res);
     }
-    return res;
+    const data = await res.text();
+    return data;
   } catch (er) {
     throw new Error(er.message);
   }
@@ -460,14 +478,17 @@ async function reqPostJson(url, dataJson) {
   }
 }
 
-// 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',
@@ -478,7 +499,7 @@ async function reqPostForm(url, dataForm) {
     }
     return res;
   } catch (er) {
-    throw new Error(er);
+    throw new Error(er.message);
   }
 }
 
@@ -614,8 +635,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,15 +41,34 @@ 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' });
+        if (!res.ok) {
+            throw new Error(res);
+        }
+        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);
+        const res = await fetch(url, { method: 'GET' });
         if (!res.ok) {
             throw new Error(res);
         }
@@ -61,19 +80,20 @@ 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);
     }
@@ -111,14 +131,17 @@ export async function reqPostJson(url, dataJson) {
     }
 }
 
-// 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',
@@ -129,6 +152,6 @@ export async function reqPostForm(url, dataForm) {
         }
         return res;
     } catch (er) {
-        throw new Error(er);
+        throw new Error(er.message);
     }
 }