@olenbetong/appframe-core 2.7.6 → 2.8.1

package/es/alert.js

@@ -15,9 +15,17 @@ if (globalThis.document && !document.querySelector("#AlertDialogTemplate")) {
     $template.innerHTML = template;
     document.body.append($template);
 }
-export function waitForDialog(dialog) {
+export function waitForDialog(dialog, cancelValue = "No") {
     return new Promise((resolve) => {
-        dialog.addEventListener("close", resolve, { once: true });
+        let controller = new AbortController();
+        dialog.addEventListener("close", () => {
+            resolve(dialog.returnValue);
+            controller.abort();
+        }, { signal: controller.signal });
+        dialog.addEventListener("cancel", () => {
+            resolve(cancelValue);
+            controller.abort();
+        }, { signal: controller.signal });
     });
 }
 const alertDialogPromiseMap = new Map();
@@ -55,17 +63,13 @@ export async function openAlertDialog({ buttons, content, className, id, title }
     }
     document.body.appendChild($dialog);
     $dialog.showModal();
-    let dialogPromise = waitForDialog($dialog)
-        .then(() => {
+    let dialogPromise = waitForDialog($dialog).then((returnValue) => {
         if (id && alertDialogPromiseMap.has(id)) {
             alertDialogPromiseMap.delete(id);
         }
-    })
-        .then(() => {
-        let result = $dialog?.returnValue || "cancel";
         if ($dialog)
             document.body.removeChild($dialog);
-        return result;
+        return returnValue;
     });
     if (id) {
         alertDialogPromiseMap.set(id, dialogPromise);

package/es/index.d.ts

@@ -5,7 +5,7 @@ import { expose } from "./expose.js";
 import { getLocalizedString } from "./getLocalizedString.js";
 import afLocalStorage from "./localStorage.js";
 import { localize } from "./localize.js";
-import { logActivity, startActivity } from "./logActivity.js";
+import { logActivity, startActivity, time } from "./logActivity.js";
 export { default as mitt } from "mitt";
 export { toLocalISODate, toLocalISODateTime } from "./date.js";
 export { downloadBlob } from "./downloadBlob.js";
@@ -19,7 +19,7 @@ export { has } from "./has.js";
 export { invariant } from "./invariant.js";
 export { localize } from "./localize.js";
 export { afLocalStorage as localStorage };
-export { logActivity, startActivity } from "./logActivity.js";
+export { logActivity, startActivity, time } from "./logActivity.js";
 export { default as SessionHandler } from "./SessionHandler.js";
 export { UserSession };
 export { getSettings, saveSettings } from "./settings.js";
@@ -51,6 +51,7 @@ export interface AfCore {
         alert: typeof alert;
         confirm: typeof confirm;
         openAlertDialog: typeof openAlertDialog;
+        time: typeof time;
     };
     controls?: {
         alert?: (message: string, callback?: () => void) => void;

package/es/index.js

@@ -12,9 +12,9 @@ export { has } from "./has.js";
 export { invariant } from "./invariant.js";
 export { localize } from "./localize.js";
 export { afLocalStorage as localStorage };
-export { logActivity, startActivity } from "./logActivity.js";
+export { logActivity, startActivity, time } from "./logActivity.js";
 export { default as SessionHandler } from "./SessionHandler.js";
 export { UserSession };
 export { getSettings, saveSettings } from "./settings.js";
 export { alert, confirm, ConfirmButtons, openAlertDialog, waitForDialog } from "./alert.js";
-export const version = "2.7.6";
+export const version = "2.8.1";

package/es/logActivity.d.ts

@@ -14,4 +14,9 @@ export declare function logActivity(activity: string, parameters: Record<string,
  * @param parameters A dictionary of parameters used when doing the activity
  * @returns A function that should be called when the activity is completed to log it to the website log
  */
-export declare function startActivity(activity: string, parameters: Record<string, any>): () => Promise<void>;
+export declare function startActivity(activity: string, startParameters?: Record<string, any>): (endParameters?: Record<string, any>) => Promise<void>;
+/**
+ * Records the time used to execute an operation and returns the value of the operation and the time
+ * in milliseconds
+ */
+export declare function time<T>(callback: () => T | Promise<T>): Promise<[T, number]>;

package/es/logActivity.js

@@ -37,7 +37,16 @@ export async function logActivity(activity, parameters, timeElapsed = 0) {
  * @param parameters A dictionary of parameters used when doing the activity
  * @returns A function that should be called when the activity is completed to log it to the website log
  */
-export function startActivity(activity, parameters) {
+export function startActivity(activity, startParameters = {}) {
     let start = performance.now();
-    return () => logActivity(activity, parameters, performance.now() - start);
+    return (endParameters = {}) => logActivity(activity, { ...startParameters, ...endParameters }, performance.now() - start);
+}
+/**
+ * Records the time used to execute an operation and returns the value of the operation and the time
+ * in milliseconds
+ */
+export async function time(callback) {
+    let start = performance.now();
+    let returnValue = await callback();
+    return [returnValue, performance.now() - start];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@olenbetong/appframe-core",
-	"version": "2.7.6",
+	"version": "2.8.1",
 	"description": "Javascript libraries to utilize the Appframe framework",
 	"type": "module",
 	"sideEffects": [
@@ -48,5 +48,5 @@
 	"devDependencies": {
 		"chalk": "^5.3.0"
 	},
-	"gitHead": "4d916b61b922d41861b51c07d560447b3834e02a"
+	"gitHead": "bd38247c3326720c7d80384e0ad52063de28006d"
 }

package/src/alert.ts

@@ -18,12 +18,29 @@ if (globalThis.document && !document.querySelector("#AlertDialogTemplate")) {
 	document.body.append($template);
 }
 
-export function waitForDialog(dialog: HTMLDialogElement) {
+export function waitForDialog(dialog: HTMLDialogElement, cancelValue: string = "No"): Promise<string> {
 	return new Promise((resolve) => {
-		dialog.addEventListener("close", resolve, { once: true });
+		let controller = new AbortController();
+
+		dialog.addEventListener(
+			"close",
+			() => {
+				resolve(dialog.returnValue);
+				controller.abort();
+			},
+			{ signal: controller.signal },
+		);
+
+		dialog.addEventListener(
+			"cancel",
+			() => {
+				resolve(cancelValue);
+				controller.abort();
+			},
+			{ signal: controller.signal },
+		);
 	});
 }
-
 export type AlertDialogButton = {
 	label: string;
 	value: string;
@@ -80,18 +97,13 @@ export async function openAlertDialog({ buttons, content, className, id, title }
 	document.body.appendChild($dialog);
 	$dialog.showModal();
 
-	let dialogPromise = waitForDialog($dialog)
-		.then(() => {
-			if (id && alertDialogPromiseMap.has(id)) {
-				alertDialogPromiseMap.delete(id);
-			}
-		})
-		.then(() => {
-			let result = $dialog?.returnValue || "cancel";
-			if ($dialog) document.body.removeChild($dialog);
-
-			return result;
-		});
+	let dialogPromise = waitForDialog($dialog).then((returnValue) => {
+		if (id && alertDialogPromiseMap.has(id)) {
+			alertDialogPromiseMap.delete(id);
+		}
+		if ($dialog) document.body.removeChild($dialog);
+		return returnValue;
+	});
 
 	if (id) {
 		alertDialogPromiseMap.set(id, dialogPromise);

package/src/index.ts

@@ -5,7 +5,7 @@ import { expose } from "./expose.js";
 import { getLocalizedString } from "./getLocalizedString.js";
 import afLocalStorage from "./localStorage.js";
 import { localize } from "./localize.js";
-import { logActivity, startActivity } from "./logActivity.js";
+import { logActivity, startActivity, time } from "./logActivity.js";
 
 export { default as mitt } from "mitt";
 export { toLocalISODate, toLocalISODateTime } from "./date.js";
@@ -20,7 +20,7 @@ export { has } from "./has.js";
 export { invariant } from "./invariant.js";
 export { localize } from "./localize.js";
 export { afLocalStorage as localStorage };
-export { logActivity, startActivity } from "./logActivity.js";
+export { logActivity, startActivity, time } from "./logActivity.js";
 export { default as SessionHandler } from "./SessionHandler.js";
 export { UserSession };
 export { getSettings, saveSettings } from "./settings.js";
@@ -57,6 +57,7 @@ export interface AfCore {
 		alert: typeof alert;
 		confirm: typeof confirm;
 		openAlertDialog: typeof openAlertDialog;
+		time: typeof time;
 	};
 	controls?: {
 		alert?: (message: string, callback?: () => void) => void;

package/src/logActivity.ts

@@ -37,7 +37,19 @@ export async function logActivity(activity: string, parameters: Record<string, a
  * @param parameters A dictionary of parameters used when doing the activity
  * @returns A function that should be called when the activity is completed to log it to the website log
  */
-export function startActivity(activity: string, parameters: Record<string, any>) {
+export function startActivity(activity: string, startParameters: Record<string, any> = {}) {
 	let start = performance.now();
-	return () => logActivity(activity, parameters, performance.now() - start);
+	return (endParameters: Record<string, any> = {}) =>
+		logActivity(activity, { ...startParameters, ...endParameters }, performance.now() - start);
+}
+
+/**
+ * Records the time used to execute an operation and returns the value of the operation and the time
+ * in milliseconds
+ */
+export async function time<T>(callback: () => T | Promise<T>): Promise<[T, number]> {
+	let start = performance.now();
+	let returnValue = await callback();
+
+	return [returnValue, performance.now() - start];
 }