quasar-ui-danx 0.3.51 → 0.3.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar-ui-danx",
-  "version": "0.3.51",
+  "version": "0.3.52",
   "author": "Dan <dan@flytedesk.com>",
   "description": "DanX Vue / Quasar component library",
   "license": "MIT",

package/src/helpers/formats.ts

@@ -2,15 +2,17 @@ import { DateTime, IANAZone } from "luxon";
 
 const SERVER_TZ = new IANAZone("America/Chicago");
 
+export const LuxonDateTime = DateTime;
+
 /**
  * Converts a date string from the server's time zone to the user's time zone.
  * @param {String} dateTimeString
  * @returns {DateTime}
  */
 export function localizedDateTime(dateTimeString) {
-    dateTimeString = dateTimeString?.replace("T", " ");
-    // noinspection JSCheckFunctionSignatures
-    return DateTime.fromSQL(dateTimeString, { zone: SERVER_TZ }).setZone("local");
+	dateTimeString = dateTimeString?.replace("T", " ");
+	// noinspection JSCheckFunctionSignatures
+	return DateTime.fromSQL(dateTimeString, { zone: SERVER_TZ }).setZone("local");
 }
 
 /**
@@ -19,9 +21,9 @@ export function localizedDateTime(dateTimeString) {
  * @returns {DateTime}
  */
 export function remoteDateTime(dateTimeString) {
-    dateTimeString = dateTimeString?.replace("T", " ");
-    // noinspection JSCheckFunctionSignatures
-    return DateTime.fromSQL(dateTimeString, { zone: "local" }).setZone(SERVER_TZ);
+	dateTimeString = dateTimeString?.replace("T", " ");
+	// noinspection JSCheckFunctionSignatures
+	return DateTime.fromSQL(dateTimeString, { zone: "local" }).setZone(SERVER_TZ);
 }
 
 /**
@@ -29,11 +31,11 @@ export function remoteDateTime(dateTimeString) {
  * @returns {DateTime|*}
  */
 export function parseDateTime(dateTime) {
-    if (typeof dateTime === "string") {
-        dateTime = dateTime.replace("T", " ").replace(/\//g, "-");
-        return DateTime.fromSQL(dateTime);
-    }
-    return dateTime || DateTime.fromSQL("0000-00-00 00:00:00");
+	if (typeof dateTime === "string") {
+		dateTime = dateTime.replace("T", " ").replace(/\//g, "-");
+		return DateTime.fromSQL(dateTime);
+	}
+	return dateTime || DateTime.fromSQL("0000-00-00 00:00:00");
 }
 
 /**
@@ -43,7 +45,7 @@ export function parseDateTime(dateTime) {
  * @returns {DateTime}
  */
 export function parseQDate(date, format = "yyyy/MM/dd") {
-    return DateTime.fromFormat(date, format);
+	return DateTime.fromFormat(date, format);
 }
 
 /**
@@ -53,7 +55,7 @@ export function parseQDate(date, format = "yyyy/MM/dd") {
  * @returns {DateTime}
  */
 export function parseQDateTime(date, format = "yyyy/MM/dd HH:mm:ss") {
-    return DateTime.fromFormat(date, format);
+	return DateTime.fromFormat(date, format);
 }
 
 /**
@@ -62,7 +64,7 @@ export function parseQDateTime(date, format = "yyyy/MM/dd HH:mm:ss") {
  * @returns {string}
  */
 export function fQDate(date) {
-    return fDate(date, { format: "yyyy/MM/dd" });
+	return fDate(date, { format: "yyyy/MM/dd" });
 }
 
 /**
@@ -72,7 +74,7 @@ export function fQDate(date) {
  * @returns {string}
  */
 export function fLocalizedDateTime(dateTimeString, options = {}) {
-    return fDateTime(localizedDateTime(dateTimeString), options);
+	return fDateTime(localizedDateTime(dateTimeString), options);
 }
 
 /**
@@ -84,11 +86,11 @@ export function fLocalizedDateTime(dateTimeString, options = {}) {
  * @returns {string}
  */
 export function fDateTime(
-    dateTime = null,
-    { format = "M/d/yy h:mma", empty = "- -" } = {}
+		dateTime = null,
+		{ format = "M/d/yy h:mma", empty = "- -" } = {}
 ) {
-    const formatted = (dateTime ? parseDateTime(dateTime) : DateTime.now()).toFormat(format).toLowerCase();
-    return formatted === "invalid datetime" ? empty : formatted;
+	const formatted = (dateTime ? parseDateTime(dateTime) : DateTime.now()).toFormat(format).toLowerCase();
+	return formatted === "invalid datetime" ? empty : formatted;
 }
 
 /**
@@ -97,7 +99,7 @@ export function fDateTime(
  * @returns {string}
  */
 export function dbDateTime(dateTime = null) {
-    return fDateTime(dateTime, { format: "yyyy-MM-dd HH:mm:ss", empty: null });
+	return fDateTime(dateTime, { format: "yyyy-MM-dd HH:mm:ss", empty: null });
 }
 
 /**
@@ -108,8 +110,8 @@ export function dbDateTime(dateTime = null) {
  * @returns {string}
  */
 export function fDate(dateTime, { empty = "--", format = "M/d/yy" } = {}) {
-    const formatted = parseDateTime(dateTime).toFormat(format);
-    return ["Invalid DateTime", "invalid datetime"].includes(formatted) ? empty : formatted;
+	const formatted = parseDateTime(dateTime).toFormat(format);
+	return ["Invalid DateTime", "invalid datetime"].includes(formatted) ? empty : formatted;
 }
 
 /**
@@ -119,9 +121,9 @@ export function fDate(dateTime, { empty = "--", format = "M/d/yy" } = {}) {
  * @returns {string}
  */
 export function fSecondsToTime(second) {
-    const time = DateTime.now().setZone("UTC").startOf("year").set({ second });
-    const hours = Math.floor(second / 3600);
-    return (hours ? hours + ":" : "") + time.toFormat("mm:ss");
+	const time = DateTime.now().setZone("UTC").startOf("year").set({ second });
+	const hours = Math.floor(second / 3600);
+	return (hours ? hours + ":" : "") + time.toFormat("mm:ss");
 }
 
 /**
@@ -130,10 +132,10 @@ export function fSecondsToTime(second) {
  * @returns {string}
  */
 export function fCurrency(amount) {
-    return new Intl.NumberFormat("en-US", {
-        style: "currency",
-        currency: "USD"
-    }).format(amount);
+	return new Intl.NumberFormat("en-US", {
+		style: "currency",
+		currency: "USD"
+	}).format(amount);
 }
 
 /**
@@ -143,7 +145,7 @@ export function fCurrency(amount) {
  * @returns {string}
  */
 export function fNumber(number, options = {}) {
-    return new Intl.NumberFormat("en-US", options).format(number);
+	return new Intl.NumberFormat("en-US", options).format(number);
 }
 
 /**
@@ -153,23 +155,23 @@ export function fNumber(number, options = {}) {
  * @returns {string|*}
  */
 export function centerTruncate(str, maxLength) {
-    if (str.length > maxLength) {
-        const frontCharCount = Math.floor((maxLength - 3) / 2);
-        const backCharCount = maxLength - frontCharCount - 3;
-        return (
-            str.substring(0, frontCharCount) +
-            "..." +
-            str.substring(str.length - backCharCount)
-        );
-    } else {
-        return str;
-    }
+	if (str.length > maxLength) {
+		const frontCharCount = Math.floor((maxLength - 3) / 2);
+		const backCharCount = maxLength - frontCharCount - 3;
+		return (
+				str.substring(0, frontCharCount) +
+				"..." +
+				str.substring(str.length - backCharCount)
+		);
+	} else {
+		return str;
+	}
 }
 
 interface FPercentOptions {
-    multiplier?: number,
-    maximumFractionDigits?: number,
-    NaN?: string
+	multiplier?: number,
+	maximumFractionDigits?: number,
+	NaN?: string
 }
 
 /**
@@ -179,54 +181,54 @@ interface FPercentOptions {
  * @returns {string}
  */
 export function fPercent(num: string | number, options: FPercentOptions = {}) {
-    options = { multiplier: 100, maximumFractionDigits: 1, NaN: "N/A", ...options };
+	options = { multiplier: 100, maximumFractionDigits: 1, NaN: "N/A", ...options };
 
-    num = parseFloat("" + num);
+	num = parseFloat("" + num);
 
-    if (isNaN(num)) {
-        return options.NaN;
-    }
+	if (isNaN(num)) {
+		return options.NaN;
+	}
 
-    return fNumber(num * (options.multiplier || 100), options) + "%";
+	return fNumber(num * (options.multiplier || 100), options) + "%";
 }
 
 
 export function fPhone(value) {
-    if (!value || typeof value !== "string") {
-        return value || "";
-    }
-
-    const input = value.replace(/\D/g, "").split("");
-    let phone = "";
-
-    const startsWithOne = input.length > 0 && input[0] === "1";
-    const shift = startsWithOne ? 1 : 0;
-
-    input.map((number, index) => {
-        switch (index) {
-            case shift:
-                phone += "(";
-                break;
-            case shift + 3:
-                phone += ") ";
-                break;
-            case shift + 6:
-                phone += "-";
-                break;
-            case shift + 10:
-                phone += " x";
-                break;
-        }
-        if (index === 0 && number === "1") {
-            phone += "+1 ";
-        } else {
-            phone += number;
-        }
-    });
-
-    if (value === "+1 (") {
-        return "";
-    }
-
-    return phone;
+	if (!value || typeof value !== "string") {
+		return value || "";
+	}
+
+	const input = value.replace(/\D/g, "").split("");
+	let phone = "";
+
+	const startsWithOne = input.length > 0 && input[0] === "1";
+	const shift = startsWithOne ? 1 : 0;
+
+	input.map((number, index) => {
+		switch (index) {
+			case shift:
+				phone += "(";
+				break;
+			case shift + 3:
+				phone += ") ";
+				break;
+			case shift + 6:
+				phone += "-";
+				break;
+			case shift + 10:
+				phone += " x";
+				break;
+		}
+		if (index === 0 && number === "1") {
+			phone += "+1 ";
+		} else {
+			phone += number;
+		}
+	});
+
+	if (value === "+1 (") {
+		return "";
+	}
+
+	return phone;
 }

package/src/helpers/request.ts

@@ -16,15 +16,28 @@ export const request = {
 		requestOptions.value = options;
 	},
 
-	url(url: string) {
-		if (url.startsWith("http")) {
-			return url;
+	url(url: string, params: string | string[][] | Record<string, string> | URLSearchParams | undefined = undefined) {
+		if (!url.startsWith("http")) {
+			url = requestOptions.value.baseUrl + url;
 		}
-		return requestOptions.value.baseUrl + url;
+
+		if (params) {
+			// Transform object values in params to JSON strings
+			for (const [key, value] of Object.entries(params)) {
+				if (typeof value === "object" && value !== null) {
+					params[key] = JSON.stringify(value);
+				}
+			}
+
+			url += (url.match(/\?/) ? "&" : "?") + new URLSearchParams(params).toString();
+		}
+
+		return url;
 	},
 
 	async get(url: string, options = {}): Promise<object> {
-		return fetch(request.url(url), {
+		url = request.url(url, options.params);
+		return fetch(url, {
 			method: "get",
 			headers: {
 				Accept: "application/json",