@olenbetong/appframe-core 2.11.5 → 2.11.7

package/src/expose.test.ts

@@ -7,7 +7,7 @@ import { expose } from "./expose.js";
 GlobalRegistrator.register();
 
 declare global {
-	var test: {
+	var exposeTest: {
 		value?: string;
 		func: () => string;
 		nested: {
@@ -21,39 +21,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/index.ts

@@ -1,11 +1,11 @@
 import { UserSession } from "./UserSession.js";
-import { alert, confirm, openAlertDialog } from "./alert.js";
+import type { 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 afLocalStorage from "./localStorage.js";
-import { localize } from "./localize.js";
-import { getSessionData, logActivity, logError, startActivity, time } from "./log.js";
+import type { localize } from "./localize.js";
+import type { getSessionData, logActivity, logError, startActivity, time } from "./log.js";
 
 export { default as mitt } from "mitt";
 export { toLocalISODate, toLocalISODateTime, toLocalDateTime } from "./date.js";
@@ -26,6 +26,7 @@ export { getSettings, saveSettings } from "./settings.js";
 export { alert, confirm, ConfirmButtons, openAlertDialog, waitForDialog } from "./alert.js";
 export type { AlertDialogButton, AlertDialogOptions, AlertOptions, ConfirmOptions } from "./alert.js";
 
+// biome-ignore lint/correctness/noInvalidUseBeforeDeclaration: <explanation>
 export const version = __VERSION__;
 
 declare global {

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

@@ -24,7 +24,7 @@ export function localize(stringParts: TemplateStringsArray, ...args: any[]): str
 	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",

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] };
 }