@koloseum/utils 0.1.7 → 0.1.9

package/dist/utils.d.ts

@@ -1,6 +1,5 @@
-import type { Database } from "@koloseum/types/database";
 import type { CustomError, PronounsCheckboxes, SocialMediaPlatform } from "@koloseum/types/public/auth";
-import type { PostgrestError, SupabaseClient } from "@supabase/supabase-js";
+import type { PostgrestError } from "@supabase/supabase-js";
 import type { MobilePhoneLocale } from "validator";
 export declare const Status: {
     /**
@@ -17,17 +16,6 @@ export declare const Status: {
     PASSWORD_RESET_REQUESTED: string;
 };
 export declare const Utility: {
-    /**
-     * Calls an Edge function.
-     * @param {SupabaseClient} supabase - The Supabase client
-     * @param {string} path - The path to the Edge function
-     * @param {"GET" | "POST"} [method="GET"] - The HTTP method to use
-     * @returns The response from the Edge function
-     */
-    callEdgeFunction: (supabase: SupabaseClient<Database>, path: string, method?: "GET" | "POST") => Promise<{
-        data?: any;
-        error?: string;
-    }>;
     /**
      * Capitalises a given word.
      * @param {string} word - The word to be capitalised

package/dist/utils.js

@@ -1,6 +1,4 @@
-import { FunctionsFetchError, FunctionsHttpError, FunctionsRelayError } from "@supabase/supabase-js";
 import { error as svelteError } from "@sveltejs/kit";
-import parser from "any-date-parser";
 import sanitize from "sanitize-html";
 import validator from "validator";
 /* Helper functions */
@@ -22,26 +20,6 @@ export const Status = {
 };
 /* Utility functions */
 export const Utility = {
-    /**
-     * Calls an Edge function.
-     * @param {SupabaseClient} supabase - The Supabase client
-     * @param {string} path - The path to the Edge function
-     * @param {"GET" | "POST"} [method="GET"] - The HTTP method to use
-     * @returns The response from the Edge function
-     */
-    callEdgeFunction: async (supabase, path, method = "GET") => {
-        // Fetch response
-        const { data, error } = await supabase.functions.invoke(path, { method });
-        // Return error if any
-        if (error instanceof FunctionsHttpError)
-            return { error: await error.context.json() };
-        else if (error instanceof FunctionsRelayError)
-            return { error: error.message };
-        else if (error instanceof FunctionsFetchError)
-            return { error: error.message };
-        // Return response
-        return { data };
-    },
     /**
      * Capitalises a given word.
      * @param {string} word - The word to be capitalised
@@ -73,18 +51,28 @@ export const Utility = {
      * @returns The formatted date string, or `null` if invalid input or in case of an error
      */
     formatDate: (date, forClient = false) => {
-        if (date === "")
+        // Return null if no date is provided
+        if (date === "" || typeof date !== "string")
             return null;
+        // Handle input
         try {
+            // Parse date string
+            const parsedDate = Date.parse(date);
+            // Return null if date string is not parseable
+            if (isNaN(parsedDate))
+                return null;
+            // Use the Intl.DateTimeFormat with explicit options to ensure correct formatting
             const formattedDate = new Intl.DateTimeFormat(forClient ? "fr-CA" : "en-KE", {
                 day: "2-digit",
                 month: "2-digit",
-                year: "numeric"
-                // @ts-ignore: .fromString method exists but is not typed in `any-date-parser` package
-            }).format(parser.fromString(date));
+                year: "numeric",
+                timeZone: "Africa/Nairobi"
+            }).format(parsedDate);
+            // Return formatted date string
             return formattedDate;
         }
         catch (error) {
+            console.log(error);
             return null;
         }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@koloseum/utils",
-	"version": "0.1.7",
+	"version": "0.1.9",
 	"author": "Koloseum Technologies Limited",
 	"type": "module",
 	"description": "Utility logic for use across Koloseum web apps (TypeScript)",
@@ -30,10 +30,9 @@
 		"test": "vitest --run"
 	},
 	"dependencies": {
-		"@koloseum/types": "^0.1.2",
+		"@koloseum/types": "^0.1.3",
 		"@supabase/supabase-js": "^2.48.1",
 		"@sveltejs/kit": "^2.17.1",
-		"any-date-parser": "^2.0.3",
 		"sanitize-html": "^2.14.0",
 		"validator": "^13.12.0"
 	},

package/src/utils.test.ts

@@ -46,9 +46,9 @@ describe("Utility helper", () => {
 	});
 
 	it("formats dates", () => {
-		expect(formatDate("31st December 2021")).toBe("31/12/2021");
-		expect(formatDate("31st December 2021", true)).toBe("2021-12-31");
-		expect(formatDate("31st December 2021", false)).toBe("31/12/2021");
+		expect(formatDate("31 December 2021")).toBe("31/12/2021");
+		expect(formatDate("31 December 2021", true)).toBe("2021-12-31");
+		expect(formatDate("31 December 2021", false)).toBe("31/12/2021");
 	});
 
 	it("formats social media platforms", () => {

package/src/utils.ts

@@ -1,13 +1,9 @@
-import type { Database } from "@koloseum/types/database";
 import type { CustomError, PronounsCheckboxes, SocialMediaPlatform } from "@koloseum/types/public/auth";
-
-import type { PostgrestError, SupabaseClient } from "@supabase/supabase-js";
+import type { PostgrestError } from "@supabase/supabase-js";
 import type { MobilePhoneLocale } from "validator";
 
-import { FunctionsFetchError, FunctionsHttpError, FunctionsRelayError } from "@supabase/supabase-js";
 import { error as svelteError } from "@sveltejs/kit";
 
-import parser from "any-date-parser";
 import sanitize from "sanitize-html";
 import validator from "validator";
 
@@ -32,30 +28,6 @@ export const Status = {
 
 /* Utility functions */
 export const Utility = {
-	/**
-	 * Calls an Edge function.
-	 * @param {SupabaseClient} supabase - The Supabase client
-	 * @param {string} path - The path to the Edge function
-	 * @param {"GET" | "POST"} [method="GET"] - The HTTP method to use
-	 * @returns The response from the Edge function
-	 */
-	callEdgeFunction: async (
-		supabase: SupabaseClient<Database>,
-		path: string,
-		method: "GET" | "POST" = "GET"
-	): Promise<{ data?: any; error?: string }> => {
-		// Fetch response
-		const { data, error } = await supabase.functions.invoke(path, { method });
-
-		// Return error if any
-		if (error instanceof FunctionsHttpError) return { error: await error.context.json() };
-		else if (error instanceof FunctionsRelayError) return { error: error.message };
-		else if (error instanceof FunctionsFetchError) return { error: error.message };
-		else if (error.message) return { error: error.message };
-
-		// Return response
-		return { data };
-	},
 	/**
 	 * Capitalises a given word.
 	 * @param {string} word - The word to be capitalised
@@ -89,17 +61,29 @@ export const Utility = {
 	 * @returns The formatted date string, or `null` if invalid input or in case of an error
 	 */
 	formatDate: (date: string, forClient: boolean = false) => {
-		if (date === "") return null;
+		// Return null if no date is provided
+		if (date === "" || typeof date !== "string") return null;
+
+		// Handle input
 		try {
+			// Parse date string
+			const parsedDate = Date.parse(date);
+
+			// Return null if date string is not parseable
+			if (isNaN(parsedDate)) return null;
+
+			// Use the Intl.DateTimeFormat with explicit options to ensure correct formatting
 			const formattedDate = new Intl.DateTimeFormat(forClient ? "fr-CA" : "en-KE", {
 				day: "2-digit",
 				month: "2-digit",
-				year: "numeric"
-				// @ts-ignore: .fromString method exists but is not typed in `any-date-parser` package
-			}).format(parser.fromString(date));
+				year: "numeric",
+				timeZone: "Africa/Nairobi"
+			}).format(parsedDate);
 
+			// Return formatted date string
 			return formattedDate;
 		} catch (error) {
+			console.log(error);
 			return null;
 		}
 	},