@olenbetong/appframe-core 2.11.6 → 2.11.8

package/package.json

@@ -1,54 +1,54 @@
 {
-	"name": "@olenbetong/appframe-core",
-	"version": "2.11.6",
-	"description": "Javascript libraries to utilize the Appframe framework",
-	"type": "module",
-	"sideEffects": [
-		"/src/errorHandler.ts"
-	],
-	"main": "./es/index.js",
-	"exports": {
-		".": {
-			"default": "./es/index.js"
-		}
-	},
-	"types": "./es/index.d.ts",
-	"scripts": {
-		"prepack": "bun test && pnpm run build",
-		"build": "pnpm run build:esbuild && pnpm run build:tsc",
-		"build:esbuild": "node --loader ts-node/esm.mjs ../../shared/esbuild.ts",
-		"build:tsc": " rm -rf ./es && tsc && node ./scripts/replace-version.js"
-	},
-	"files": [
-		"dist",
-		"es",
-		"src"
-	],
-	"author": "Bjørnar Vister Hansen <bvh@olenbetong.no>",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/olenbetong/ui-kit.git"
-	},
-	"license": "MIT",
-	"buildConfig": {
-		"entries": [
-			{
-				"libraryName": "af.common"
-			},
-			{
-				"libraryName": "af.common",
-				"outfile": "af.common.legacy",
-				"target": "safari11"
-			}
-		]
-	},
-	"dependencies": {
-		"@happy-dom/global-registrator": "^15.7.3",
-		"mitt": "^3.0.1"
-	},
-	"devDependencies": {
-		"@types/bun": "^1.1.8",
-		"chalk": "^5.3.0"
-	},
-	"gitHead": "198c77990f2efa888e3d0326172a848da7b426fb"
-}
+  "name": "@olenbetong/appframe-core",
+  "version": "2.11.8",
+  "description": "Javascript libraries to utilize the Appframe framework",
+  "type": "module",
+  "sideEffects": [
+    "./src/errorHandler.ts"
+  ],
+  "main": "./es/index.js",
+  "exports": {
+    ".": {
+      "default": "./es/index.js"
+    }
+  },
+  "types": "./es/index.d.ts",
+  "files": [
+    "dist",
+    "es",
+    "src"
+  ],
+  "author": "Bjørnar Vister Hansen <bvh@olenbetong.no>",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/olenbetong/SynergiWeb.git"
+  },
+  "license": "MIT",
+  "buildConfig": {
+    "entries": [
+      {
+        "libraryName": "af.common"
+      },
+      {
+        "libraryName": "af.common",
+        "outfile": "af.common.legacy",
+        "target": "safari11"
+      }
+    ]
+  },
+  "dependencies": {
+    "@happy-dom/global-registrator": "^15.7.3",
+    "mitt": "^3.0.1"
+  },
+  "devDependencies": {
+    "@types/bun": "^1.1.8",
+    "chalk": "^5.3.0"
+  },
+  "scripts": {
+    "build": "pnpm run build:tsc && pnpm test && pnpm run build:esbuild && pnpm run build:replace-version",
+    "test": "vitest run --config vitest.node.config.ts",
+    "build:esbuild": "node --no-warnings ../../scripts/packages-esbuild.ts",
+    "build:replace-version": "node ./scripts/replace-version.js",
+    "build:tsc": "rm -rf ./es tsconfig.build.tsbuildinfo && tsc -p tsconfig.build.json"
+  }
+}

package/src/SessionHandler.ts

@@ -1,9 +1,9 @@
-import mitt, { Emitter, Handler } from "mitt";
+import mitt, { type Emitter, type Handler } from "mitt";
 
 type SessionHandlerEvent = "onExpired" | "onAuthenticated";
 
 export default class SessionHandler {
-	private eventHandler: Emitter<{ onAuthenticated: void; onExpired: void }> = mitt();
+	private eventHandler: Emitter<{ onAuthenticated: undefined; onExpired: undefined }> = mitt();
 
 	authenticated() {
 		this.eventHandler.emit("onAuthenticated");

package/src/UserSession.ts

@@ -1,17 +1,17 @@
 import SessionHandler from "./SessionHandler.js";
 
 export class UserSession extends SessionHandler {
-	amDesignator: string = "a.m.";
+	amDesignator = "a.m.";
 	dayNames: string[] = ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"];
 	dayNamesShort: string[] = ["sun", "mon", "tue", "wed", "thu", "fri", "sat"];
-	decimalSeparator: string = ".";
-	domain: string = "OB";
+	decimalSeparator = ".";
+	domain = "OB";
 	email: string | null | undefined;
 	formats: undefined | Record<string, string>;
 	groupSeparator: string | null = null;
-	integratedSecurity: boolean = false;
-	isDeveloper: boolean = false;
-	login: string = "";
+	integratedSecurity = false;
+	isDeveloper = false;
+	login = "";
 	loginType: string | undefined;
 	monthNames: string[] = [
 		"january",
@@ -30,10 +30,10 @@ export class UserSession extends SessionHandler {
 	];
 	monthNamesShort: string[] = ["jan", "feb", "mar", "apr", "may", "jun", "jul", "augt", "sep", "oct", "nov", "dec", ""];
 	name: string | undefined;
-	pmDesignator: string = "p.m.";
-	shortDateFormat: string = "dd.MM.yyyy";
-	culture: string = "en-GB";
-	uiculture: string = "en-GB";
+	pmDesignator = "p.m.";
+	shortDateFormat = "dd.MM.yyyy";
+	culture = "en-GB";
+	uiculture = "en-GB";
 
 	constructor(userData: any) {
 		super();

package/src/alert.ts

@@ -18,7 +18,7 @@ if (globalThis.document && !document.querySelector("#AlertDialogTemplate")) {
 	document.body.append($template);
 }
 
-export function waitForDialog(dialog: HTMLDialogElement, cancelValue: string = "No"): Promise<string> {
+export function waitForDialog(dialog: HTMLDialogElement, cancelValue = "No"): Promise<string> {
 	return new Promise((resolve) => {
 		let controller = new AbortController();
 
@@ -72,7 +72,9 @@ export async function openAlertDialog({ buttons, content, className, id, title }
 	if (!$dialog || !$content || !$menu) throw Error("Invalid alert dialog template");
 
 	if (className) {
-		className.split(/\s+/).forEach((className) => $dialog?.classList.add(className));
+		for (const className_ of className.split(/\s+/)) {
+			$dialog?.classList.add(className_);
+		}
 	}
 
 	if (title) {
@@ -113,8 +115,8 @@ export async function openAlertDialog({ buttons, content, className, id, title }
 }
 
 export enum ConfirmButtons {
-	YesNo,
-	OkCancel,
+	YesNo = 0,
+	OkCancel = 1,
 }
 
 export type ConfirmOptions = {
@@ -129,11 +131,11 @@ export async function confirm(prompt: string, options: ConfirmOptions = {}): Pro
 			? [
 					{ label: getLocalizedString("OK"), value: "yes", primary: true },
 					{ label: getLocalizedString("Cancel"), value: "no" },
-			  ]
+				]
 			: [
 					{ label: getLocalizedString("Yes"), value: "yes", primary: true },
 					{ label: getLocalizedString("No"), value: "no" },
-			  ];
+				];
 
 	let result = await openAlertDialog({ content: prompt, buttons, className: "alert-dialog-confirm", title });
 	return result === "yes";

package/src/date.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from "vitest";
 
 import { toLocalDateTime, toLocalISODate, toLocalISODateTime } from "./date.js";
 

package/src/date.ts

@@ -4,7 +4,7 @@ export function toLocalISODate(date: Date | null): string | null {
 	return date ? toLocalISODateTime(date).substring(0, 10) : null;
 }
 
-function pad(num: number, digits: number = 2) {
+function pad(num: number, digits = 2) {
 	return String(num).padStart(digits, "0");
 }
 

package/src/downloadBlob.ts

@@ -1,5 +1,5 @@
 export function downloadBlob(blob: Blob | MediaSource, fileName: string) {
-	return new Promise<void>(function (resolve, reject) {
+	return new Promise<void>((resolve, reject) => {
 		try {
 			const url = URL.createObjectURL(blob);
 			const parent = document.body;
@@ -10,7 +10,7 @@ export function downloadBlob(blob: Blob | MediaSource, fileName: string) {
 			anchor.click();
 			parent.removeChild(anchor);
 
-			setTimeout(function () {
+			setTimeout(() => {
 				URL.revokeObjectURL(url);
 				resolve();
 			}, 250);

package/src/downloadRequest.ts

@@ -32,9 +32,9 @@ export async function downloadRequest(request: Request, { fileName, signal, onPr
 		try {
 			const reader = response.body.getReader();
 			const stream = new ReadableStream({
-				start: function (controller) {
+				start: (controller) => {
 					function pump(): Promise<void> {
-						return reader.read().then(function (read) {
+						return reader.read().then((read) => {
 							if (read.done) {
 								controller.close();
 								return;
@@ -53,7 +53,7 @@ export async function downloadRequest(request: Request, { fileName, signal, onPr
 			});
 
 			response = new Response(stream);
-		} catch (error) {}
+		} catch {}
 
 		const blob = await response.blob();
 

package/src/expose.test.ts

@@ -1,13 +1,12 @@
+import { describe, expect, test } from "vitest";
 import { GlobalRegistrator } from "@happy-dom/global-registrator";
 
-import { describe, expect, test } from "bun:test";
-
 import { expose } from "./expose.js";
 
 GlobalRegistrator.register();
 
 declare global {
-	var test: {
+	var exposeTest: {
 		value?: string;
 		func: () => string;
 		nested: {
@@ -21,39 +20,39 @@ describe("expose", () => {
 		function func() {
 			return "test";
 		}
-		expose("test", func);
+		expose("exposeTest", func);
 
-		expect(globalThis.test.func).toBe(func);
+		expect(globalThis.exposeTest.func).toBe(func);
 	});
 
 	test("should expose function to global scope with nested name", () => {
 		function func() {
 			return "test";
 		}
-		expose("test.nested", func);
+		expose("exposeTest.nested", func);
 
-		expect(globalThis.test.nested.func).toBe(func);
+		expect(globalThis.exposeTest.nested.func).toBe(func);
 	});
 
 	test("should not overwrite existing without overwrite set to true", () => {
 		let value1 = "test1";
 		let value2 = "test2";
 
-		expose("test.value", value1);
-		expect(globalThis.test.value).toBe(value1);
+		expose("exposeTest.value", value1);
+		expect(globalThis.exposeTest.value).toBe(value1);
 
-		expose("test.value", value2);
-		expect(globalThis.test.value).not.toBe(value2);
+		expose("exposeTest.value", value2);
+		expect(globalThis.exposeTest.value).not.toBe(value2);
 	});
 
 	test("should overwrite existing with overwrite set to true", () => {
 		let value1 = "test1";
 		let value2 = "test2";
 
-		expose("test.value", value1);
-		expect(globalThis.test.value).toBe(value1);
+		expose("exposeTest.value", value1);
+		expect(globalThis.exposeTest.value).toBe(value1);
 
-		expose("test.value", value2, { overwrite: true });
-		expect(globalThis.test.value).toBe(value2);
+		expose("exposeTest.value", value2, { overwrite: true });
+		expect(globalThis.exposeTest.value).toBe(value2);
 	});
 });

package/src/expose.ts

@@ -16,7 +16,7 @@ export type ExposeOptions = {
  */
 export function expose(
 	name: object | string,
-	value: object | Function | Function[] | string | number,
+	value: object | ((...args: any[]) => any) | ((...args: any[]) => any)[] | string | number,
 	options: ExposeOptions = {},
 ): void {
 	if (Array.isArray(value)) {
@@ -31,10 +31,10 @@ export function expose(
 		}
 	} else {
 		let keyName: string | undefined;
-		let namespace;
+		let namespace: any;
 
 		if (typeof value === "function") {
-			keyName = parseFunc(value).name;
+			keyName = parseFunc(value as (...args: any[]) => any).name;
 		}
 
 		if (typeof name === "string") {
@@ -54,7 +54,7 @@ export function expose(
 
 		if (Object.hasOwn(namespace, keyName) && options?.overwrite !== true) {
 			// If class is already defined, warn or show an alert
-			console.warn([name, keyName].join(".") + " is already defined!");
+			console.warn(`${[name, keyName].join(".")} is already defined!`);
 		} else {
 			namespace[keyName] = value;
 		}

package/src/getLocalizedString.ts

@@ -13,7 +13,7 @@ async function fetchLocalizedString(text: string) {
 		if (response.ok) {
 			return (await response.json()) as string;
 		}
-	} catch (error) {}
+	} catch {}
 
 	return text;
 }

package/src/getUserImage.test.ts

@@ -1,6 +1,6 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from "vitest";
 
-import { getUserImage } from "./getUserImage";
+import { getUserImage } from "./getUserImage.js";
 
 describe("getUserImage", () => {
 	test("should return empty string when primKey is null", () => {

package/src/index.ts

@@ -1,31 +1,32 @@
+import type { alert, confirm, openAlertDialog } from "./alert.js";
 import { UserSession } from "./UserSession.js";
-import { alert, confirm, openAlertDialog } from "./alert.js";
 import "./errorHandler.js";
-import { expose } from "./expose.js";
-import { getLocalizedString } from "./getLocalizedString.js";
+import type { expose } from "./expose.js";
+import type { getLocalizedString } from "./getLocalizedString.js";
+import type { localize } from "./localize.js";
 import afLocalStorage from "./localStorage.js";
-import { localize } from "./localize.js";
-import { getSessionData, logActivity, logError, startActivity, time } from "./log.js";
+import type { getSessionData, logActivity, logError, startActivity, time } from "./log.js";
 
 export { default as mitt } from "mitt";
-export { toLocalISODate, toLocalISODateTime, toLocalDateTime } from "./date.js";
+export { toLocalDateTime, toLocalISODate, toLocalISODateTime } from "./date.js";
 export { downloadBlob } from "./downloadBlob.js";
+export type { DownloadItem, DownloadParameters } from "./downloadRequest.js";
 export { downloadRequest } from "./downloadRequest.js";
-export type { DownloadParameters, DownloadItem } from "./downloadRequest.js";
 export { expose } from "./expose.js";
-export { getUserImage } from "./getUserImage.js";
-export type { getUserImageOptions } from "./getUserImage.js";
 export { getLocalizedString } from "./getLocalizedString.js";
+export type { getUserImageOptions } from "./getUserImage.js";
+export { getUserImage } from "./getUserImage.js";
 export { invariant } from "./invariant.js";
 export { localize } from "./localize.js";
 export { afLocalStorage as localStorage };
 export { getSessionData, logActivity, logError, startActivity, time } from "./log.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 type { AlertDialogButton, AlertDialogOptions, AlertOptions, ConfirmOptions } from "./alert.js";
+export { alert, ConfirmButtons, confirm, openAlertDialog, waitForDialog } from "./alert.js";
+export { getSettings, saveSettings } from "./settings.js";
 
+// biome-ignore lint/correctness/noInvalidUseBeforeDeclaration: this is injected build time
 export const version = __VERSION__;
 
 declare global {

package/src/invariant.test.ts

@@ -1,6 +1,6 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from "vitest";
 
-import { invariant } from "./invariant";
+import { invariant } from "./invariant.js";
 
 describe("invariant", () => {
 	test("should throw error when condition is false", () => {

package/src/invariant.ts

@@ -1,9 +1,9 @@
 /**
  * Throws an error if the condition is falsy. The provided message is used as the error message.
  * A function can be provided to lazily generate the message.
- * 
- * @param {any} condition 
- * @param {string | (() => string)} [message] 
+ *
+ * @param {any} condition
+ * @param {string | (() => string)} [message]
  * @returns {void}
  */
 export function invariant(condition: any, message?: string | (() => string)): asserts condition {

package/src/localize.ts

@@ -20,11 +20,11 @@ export function localize(stringParts: TemplateStringsArray, ...args: any[]): str
 		"Method 'localize' must be used as a tag function",
 	);
 
-	let stringToLocalize = stringParts.map((s, i) => (i === stringParts.length - 1 ? s : `${s}\$${i}`)).join("");
+	let stringToLocalize = stringParts.map((s, i) => (i === stringParts.length - 1 ? s : `${s}$${i}`)).join("");
 	let localized = getLocalizedString(stringToLocalize);
 
 	args.forEach((arg, index) => {
-		localized = localized.replace("$" + index, arg);
+		localized = localized.replace(`$${index}`, arg);
 	});
 
 	return localized;

package/src/log.ts

@@ -7,7 +7,7 @@ const article = globalThis.af?.article?.id ?? globalThis.window?.location.pathna
  * @param parameters A dictionary of parameters used when doing the activity
  * @param timeElapsed Number of milliseconds elapsed while executing
  */
-export async function logActivity(activity: string, parameters: Record<string, any> = {}, timeElapsed: number = 0) {
+export async function logActivity(activity: string, parameters: Record<string, any> = {}, timeElapsed = 0) {
 	try {
 		let response = await fetch("/api/logging/log-activity", {
 			method: "POST",
@@ -31,7 +31,7 @@ export async function logActivity(activity: string, parameters: Record<string, a
 				console.error(`${response.status} ${response.statusText}`);
 			}
 		}
-	} catch (error) {}
+	} catch {}
 }
 
 /**

package/src/parseFunc.test.ts

@@ -1,6 +1,6 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from "vitest";
 
-import { parseFunc } from "./parseFunc";
+import { parseFunc } from "./parseFunc.js";
 
 function testFunction(arg1: string, arg2: string) {
 	console.log(arg1, arg2);

package/src/parseFunc.ts

@@ -3,8 +3,8 @@ import { invariant } from "./invariant.js";
 const funcRegex =
 	/^function(?:\s+([a-zA-Z$_][a-zA-Z0-9$_]*))?\s*\(((?:(?:\s*[a-zA-Z$_][a-zA-Z0-9$_]*)(?:\s*,\s*[a-zA-Z$_][a-zA-Z0-9$_]*)*)?)\s*\)\s*\{((?:.|\n|\r)*)\}$/;
 
-export function parseFunc(func: Function) {
-	var match = func.toString().match(funcRegex);
+export function parseFunc(func: (...args: any[]) => any) {
+	const match = func.toString().match(funcRegex);
 	invariant(match, "Unable to parse function!");
 	return { name: func.name ?? match[1], args: match[2].split(",").map((a) => a.trim()), body: match[3] };
 }

package/src/test/setup.ts

@@ -0,0 +1,2 @@
+// Force a stable timezone for date-related tests
+process.env.TZ = "UTC";

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) Ølen Betong
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.