@olenbetong/appframe-core 2.11.0 → 2.11.2

package/dist/esm/af.common.js

@@ -110,27 +110,125 @@ var UserSession = class extends SessionHandler {
   }
 };
 
+// src/log.ts
+async function logActivity(activity, parameters = {}, timeElapsed = 0) {
+  try {
+    let response = await fetch("/api/logging/log-activity", {
+      method: "POST",
+      body: JSON.stringify({
+        article: af.article.id,
+        timeElapsed,
+        action: activity,
+        parameters: {
+          ...parameters,
+          _session: getSessionData()
+        }
+      }),
+      headers: { "Content-Type": "application/json", Accept: "application/json" }
+    });
+    if (!response.ok) {
+      if (response.headers.get("Content-Type")?.includes("application/json")) {
+        let data = await response.json();
+        console.error(data.error);
+      } else {
+        console.error(`${response.status} ${response.statusText}`);
+      }
+    }
+  } catch (error) {
+  }
+}
+function startActivity(activity, startParameters = {}) {
+  let start = performance.now();
+  return (endParameters = {}) => logActivity(activity, { ...startParameters, ...endParameters }, performance.now() - start);
+}
+async function time(callback) {
+  let start = performance.now();
+  let returnValue = await callback();
+  return [returnValue, performance.now() - start];
+}
+async function logError(error) {
+  try {
+    if (!error)
+      return;
+    let data = typeof error === "string" ? { error } : typeof error === "object" ? "message" in error ? {
+      error: error.message,
+      stack: error.stack ?? null
+    } : { error: error.toString() } : { error: "Unspecified error" };
+    console.error(error);
+    let result = await fetch("/data/Logger/LogError", {
+      method: "POST",
+      body: JSON.stringify(data),
+      headers: {
+        "Content-Type": "application/json; charset=utf-8"
+      }
+    });
+    if (result.ok) {
+      return await result.json();
+    }
+    console.error(Error("Failed to log error"));
+  } catch {
+  }
+}
+function getSessionId() {
+  return crypto.randomUUID?.();
+}
+var sessionStart = Date.now();
+var sessionId = getSessionId();
+var deviceId = "";
+var browserSessionId = "";
+if ("document" in window) {
+  let startSession = () => logActivity("AfSessionInit", {
+    "appframe-core": af.common.version,
+    "appframe-data": af.data?.version,
+    "app-version": af.article.version
+  });
+  document.addEventListener("DOMContentLoaded", () => {
+    deviceId = localStorage.getItem("_afDeviceId");
+    browserSessionId = sessionStorage.getItem("_afSessionId");
+    if (!deviceId) {
+      deviceId = getSessionId();
+      localStorage.setItem("_afDeviceId", deviceId);
+    }
+    if (!browserSessionId) {
+      browserSessionId = sessionId;
+      sessionStorage.setItem("_afSessionId", browserSessionId);
+    }
+    startSession();
+  });
+  document.addEventListener("visibilitychange", function logData() {
+    if (document.visibilityState === "hidden") {
+      navigator.sendBeacon(
+        "/api/logging/log-activity",
+        JSON.stringify({
+          article: af.article.id,
+          action: "AfSessionEnd",
+          parameters: {
+            _session: getSessionData()
+          }
+        })
+      );
+    } else {
+      startSession();
+    }
+  });
+}
+function getSessionData() {
+  return {
+    browserSessionId,
+    sessionStart,
+    sessionLength: Date.now() - sessionStart,
+    sessionId,
+    deviceId
+  };
+}
+
 // src/errorHandler.ts
 if (true) {
   window.window?.addEventListener("error", (event) => {
-    try {
-      const data = {
-        error: event.error?.message ?? event.message ?? null,
-        file: event.filename,
-        line: event.lineno ?? 0,
-        column: event.colno ?? 0,
-        stack: event.error?.stack ?? null
-      };
-      fetch("/data/Logger/LogError", {
-        body: JSON.stringify(data),
-        headers: {
-          Accept: "application/json",
-          "Content-Type": "application/json; charset=utf-8",
-          "X-Requested-With": "XMLHttpRequest"
-        },
-        method: "POST"
-      });
-    } catch (ex) {
+    if (typeof event === "object" && "error" in event) {
+      logError(event.error);
+    } else if (typeof event === "object" && "message" in event) {
+      logError(event);
     }
   });
 }
@@ -176,13 +274,13 @@ var localStorage_default = new LocalStorage();
 function toLocalISODate(date) {
   return date ? toLocalISODateTime(date).substring(0, 10) : null;
 }
-function pad(num) {
-  return String(num).padStart(2, "0");
+function pad(num, digits = 2) {
+  return String(num).padStart(digits, "0");
 }
 function toLocalISODateTime(date) {
   return date ? `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}T${pad(date.getHours())}:${pad(
     date.getMinutes()
-  )}:${pad(date.getSeconds())}.${pad(date.getMilliseconds())}` : null;
+  )}:${pad(date.getSeconds())}.${pad(date.getMilliseconds(), 3)}` : null;
 }
 function toLocalDateTime(date) {
   return date ? date.toISOString().substring(0, 16) : "";
@@ -267,17 +365,12 @@ async function downloadRequest(request, { fileName, signal, onProgress }) {
   }
 }
 
-// src/has.ts
-function has(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
-}
-
 // src/parseFunc.ts
 var 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)*)\}$/;
 function parseFunc(func) {
   var match = func.toString().match(funcRegex);
   invariant(match, "Unable to parse function!");
-  return { name: match[1], args: match[2].split(","), body: match[3] };
+  return { name: func.name ?? match[1], args: match[2].split(",").map((a) => a.trim()), body: match[3] };
 }
 
 // src/Namespace.ts
@@ -331,7 +424,7 @@ function expose(name, value, options = {}) {
     } else {
       invariant(false, "Invalid typeof parameter 'name', or unable to parse pValue!");
     }
-    if (has(namespace, keyName) && options?.overwrite !== true) {
+    if (Object.hasOwn(namespace, keyName) && options?.overwrite !== true) {
       console.warn([name, keyName].join(".") + " is already defined!");
     } else {
       namespace[keyName] = value;
@@ -385,7 +478,7 @@ function getLocalizedString(string, wait) {
     return;
   }
   if (window.af?.article?.i18n !== void 0) {
-    if (!has(af.article.i18n, string)) {
+    if (!Object.hasOwn(af.article.i18n, string)) {
       af.article.i18n[string] = string;
       let promise = fetchLocalizedString(string).then((text) => {
         af.article.i18n[string] = text;
@@ -415,118 +508,6 @@ function localize(stringParts, ...args) {
   return localized;
 }
 
-// src/log.ts
-async function logActivity(activity, parameters = {}, timeElapsed = 0) {
-  try {
-    let response = await fetch("/api/logging/log-activity", {
-      method: "POST",
-      body: JSON.stringify({
-        article: af.article.id,
-        timeElapsed,
-        action: activity,
-        parameters: {
-          ...parameters,
-          _session: getSessionData()
-        }
-      }),
-      headers: { "Content-Type": "application/json", Accept: "application/json" }
-    });
-    if (!response.ok) {
-      if (response.headers.get("Content-Type")?.includes("application/json")) {
-        let data = await response.json();
-        console.error(data.error);
-      } else {
-        console.error(`${response.status} ${response.statusText}`);
-      }
-    }
-  } catch (error) {
-  }
-}
-function startActivity(activity, startParameters = {}) {
-  let start = performance.now();
-  return (endParameters = {}) => logActivity(activity, { ...startParameters, ...endParameters }, performance.now() - start);
-}
-async function time(callback) {
-  let start = performance.now();
-  let returnValue = await callback();
-  return [returnValue, performance.now() - start];
-}
-async function logError(error) {
-  try {
-    if (!error)
-      return;
-    let data = typeof error === "string" ? { error } : typeof error === "object" ? "message" in error ? {
-      error: error.message,
-      stack: error.stack ?? null
-    } : { error: error.toString() } : { error: "Unspecified error" };
-    console.error(error);
-    let result = await fetch("/data/Logger/LogError", {
-      method: "POST",
-      body: JSON.stringify(data),
-      headers: {
-        "Content-Type": "application/json; charset=utf-8"
-      }
-    });
-    if (result.ok) {
-      return await result.json();
-    }
-    console.error(Error("Failed to log error"));
-  } catch {
-  }
-}
-function getSessionId() {
-  return crypto.randomUUID?.();
-}
-var sessionStart = Date.now();
-var sessionId = getSessionId();
-var deviceId = "";
-var browserSessionId = "";
-if ("document" in window) {
-  let startSession = () => logActivity("AfSessionInit", {
-    "appframe-core": af.common.version,
-    "appframe-data": af.data?.version,
-    "app-version": af.article.version
-  });
-  document.addEventListener("DOMContentLoaded", () => {
-    deviceId = localStorage.getItem("_afDeviceId");
-    browserSessionId = sessionStorage.getItem("_afSessionId");
-    if (!deviceId) {
-      deviceId = getSessionId();
-      localStorage.setItem("_afDeviceId", deviceId);
-    }
-    if (!browserSessionId) {
-      browserSessionId = sessionId;
-      sessionStorage.setItem("_afSessionId", browserSessionId);
-    }
-    startSession();
-  });
-  document.addEventListener("visibilitychange", function logData() {
-    if (document.visibilityState === "hidden") {
-      navigator.sendBeacon(
-        "/api/logging/log-activity",
-        JSON.stringify({
-          article: af.article.id,
-          action: "AfSessionEnd",
-          parameters: {
-            _session: getSessionData()
-          }
-        })
-      );
-    } else {
-      startSession();
-    }
-  });
-}
-function getSessionData() {
-  return {
-    browserSessionId,
-    sessionStart,
-    sessionLength: Date.now() - sessionStart,
-    sessionId,
-    deviceId
-  };
-}
-
 // src/settings.ts
 function getKey(article) {
   const articleKey = article || af.article.id;
@@ -668,7 +649,7 @@ async function alert(prompt, options = {}) {
 }
 
 // src/index.ts
-var version = "2.11.0";
+var version = "2.11.2";
 export {
   ConfirmButtons,
   SessionHandler,
@@ -682,7 +663,6 @@ export {
   getSessionData,
   getSettings,
   getUserImage,
-  has,
   invariant,
   localStorage_default as localStorage,
   localize,

package/dist/esm/af.common.legacy.js

@@ -136,29 +136,131 @@ var UserSession = class extends SessionHandler {
   }
 };
 
+// src/log.ts
+async function logActivity(activity, parameters = {}, timeElapsed = 0) {
+  var _a2;
+  try {
+    let response = await fetch("/api/logging/log-activity", {
+      method: "POST",
+      body: JSON.stringify({
+        article: af.article.id,
+        timeElapsed,
+        action: activity,
+        parameters: __spreadProps(__spreadValues({}, parameters), {
+          _session: getSessionData()
+        })
+      }),
+      headers: { "Content-Type": "application/json", Accept: "application/json" }
+    });
+    if (!response.ok) {
+      if ((_a2 = response.headers.get("Content-Type")) == null ? void 0 : _a2.includes("application/json")) {
+        let data = await response.json();
+        console.error(data.error);
+      } else {
+        console.error("".concat(response.status, " ").concat(response.statusText));
+      }
+    }
+  } catch (error) {
+  }
+}
+function startActivity(activity, startParameters = {}) {
+  let start = performance.now();
+  return (endParameters = {}) => logActivity(activity, __spreadValues(__spreadValues({}, startParameters), endParameters), performance.now() - start);
+}
+async function time(callback) {
+  let start = performance.now();
+  let returnValue = await callback();
+  return [returnValue, performance.now() - start];
+}
+async function logError(error) {
+  var _a2;
+  try {
+    if (!error)
+      return;
+    let data = typeof error === "string" ? { error } : typeof error === "object" ? "message" in error ? {
+      error: error.message,
+      stack: (_a2 = error.stack) != null ? _a2 : null
+    } : { error: error.toString() } : { error: "Unspecified error" };
+    console.error(error);
+    let result = await fetch("/data/Logger/LogError", {
+      method: "POST",
+      body: JSON.stringify(data),
+      headers: {
+        "Content-Type": "application/json; charset=utf-8"
+      }
+    });
+    if (result.ok) {
+      return await result.json();
+    }
+    console.error(Error("Failed to log error"));
+  } catch (e) {
+  }
+}
+function getSessionId() {
+  var _a2;
+  return (_a2 = crypto.randomUUID) == null ? void 0 : _a2.call(crypto);
+}
+var sessionStart = Date.now();
+var sessionId = getSessionId();
+var deviceId = "";
+var browserSessionId = "";
+if ("document" in window) {
+  let startSession = () => {
+    var _a2;
+    return logActivity("AfSessionInit", {
+      "appframe-core": af.common.version,
+      "appframe-data": (_a2 = af.data) == null ? void 0 : _a2.version,
+      "app-version": af.article.version
+    });
+  };
+  document.addEventListener("DOMContentLoaded", () => {
+    deviceId = localStorage.getItem("_afDeviceId");
+    browserSessionId = sessionStorage.getItem("_afSessionId");
+    if (!deviceId) {
+      deviceId = getSessionId();
+      localStorage.setItem("_afDeviceId", deviceId);
+    }
+    if (!browserSessionId) {
+      browserSessionId = sessionId;
+      sessionStorage.setItem("_afSessionId", browserSessionId);
+    }
+    startSession();
+  });
+  document.addEventListener("visibilitychange", function logData() {
+    if (document.visibilityState === "hidden") {
+      navigator.sendBeacon(
+        "/api/logging/log-activity",
+        JSON.stringify({
+          article: af.article.id,
+          action: "AfSessionEnd",
+          parameters: {
+            _session: getSessionData()
+          }
+        })
+      );
+    } else {
+      startSession();
+    }
+  });
+}
+function getSessionData() {
+  return {
+    browserSessionId,
+    sessionStart,
+    sessionLength: Date.now() - sessionStart,
+    sessionId,
+    deviceId
+  };
+}
+
 // src/errorHandler.ts
 var _a;
 if (true) {
   (_a = window.window) == null ? void 0 : _a.addEventListener("error", (event) => {
-    var _a2, _b, _c, _d, _e, _f, _g;
-    try {
-      const data = {
-        error: (_c = (_b = (_a2 = event.error) == null ? void 0 : _a2.message) != null ? _b : event.message) != null ? _c : null,
-        file: event.filename,
-        line: (_d = event.lineno) != null ? _d : 0,
-        column: (_e = event.colno) != null ? _e : 0,
-        stack: (_g = (_f = event.error) == null ? void 0 : _f.stack) != null ? _g : null
-      };
-      fetch("/data/Logger/LogError", {
-        body: JSON.stringify(data),
-        headers: {
-          Accept: "application/json",
-          "Content-Type": "application/json; charset=utf-8",
-          "X-Requested-With": "XMLHttpRequest"
-        },
-        method: "POST"
-      });
-    } catch (ex) {
+    if (typeof event === "object" && "error" in event) {
+      logError(event.error);
+    } else if (typeof event === "object" && "message" in event) {
+      logError(event);
     }
   });
 }
@@ -207,13 +309,13 @@ var localStorage_default = new LocalStorage();
 function toLocalISODate(date) {
   return date ? toLocalISODateTime(date).substring(0, 10) : null;
 }
-function pad(num) {
-  return String(num).padStart(2, "0");
+function pad(num, digits = 2) {
+  return String(num).padStart(digits, "0");
 }
 function toLocalISODateTime(date) {
   return date ? "".concat(date.getFullYear(), "-").concat(pad(date.getMonth() + 1), "-").concat(pad(date.getDate()), "T").concat(pad(date.getHours()), ":").concat(pad(
     date.getMinutes()
-  ), ":").concat(pad(date.getSeconds()), ".").concat(pad(date.getMilliseconds())) : null;
+  ), ":").concat(pad(date.getSeconds()), ".").concat(pad(date.getMilliseconds(), 3)) : null;
 }
 function toLocalDateTime(date) {
   return date ? date.toISOString().substring(0, 16) : "";
@@ -299,17 +401,13 @@ async function downloadRequest(request, { fileName, signal, onProgress }) {
   }
 }
 
-// src/has.ts
-function has(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
-}
-
 // src/parseFunc.ts
 var 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)*)\}$/;
 function parseFunc(func) {
+  var _a2;
   var match = func.toString().match(funcRegex);
   invariant(match, "Unable to parse function!");
-  return { name: match[1], args: match[2].split(","), body: match[3] };
+  return { name: (_a2 = func.name) != null ? _a2 : match[1], args: match[2].split(",").map((a) => a.trim()), body: match[3] };
 }
 
 // src/Namespace.ts
@@ -363,7 +461,7 @@ function expose(name, value, options = {}) {
     } else {
       invariant(false, "Invalid typeof parameter 'name', or unable to parse pValue!");
     }
-    if (has(namespace, keyName) && (options == null ? void 0 : options.overwrite) !== true) {
+    if (Object.hasOwn(namespace, keyName) && (options == null ? void 0 : options.overwrite) !== true) {
       console.warn([name, keyName].join(".") + " is already defined!");
     } else {
       namespace[keyName] = value;
@@ -418,7 +516,7 @@ function getLocalizedString(string, wait) {
     return;
   }
   if (((_b = (_a2 = window.af) == null ? void 0 : _a2.article) == null ? void 0 : _b.i18n) !== void 0) {
-    if (!has(af.article.i18n, string)) {
+    if (!Object.hasOwn(af.article.i18n, string)) {
       af.article.i18n[string] = string;
       let promise = fetchLocalizedString(string).then((text) => {
         af.article.i18n[string] = text;
@@ -448,123 +546,6 @@ function localize(stringParts, ...args) {
   return localized;
 }
 
-// src/log.ts
-async function logActivity(activity, parameters = {}, timeElapsed = 0) {
-  var _a2;
-  try {
-    let response = await fetch("/api/logging/log-activity", {
-      method: "POST",
-      body: JSON.stringify({
-        article: af.article.id,
-        timeElapsed,
-        action: activity,
-        parameters: __spreadProps(__spreadValues({}, parameters), {
-          _session: getSessionData()
-        })
-      }),
-      headers: { "Content-Type": "application/json", Accept: "application/json" }
-    });
-    if (!response.ok) {
-      if ((_a2 = response.headers.get("Content-Type")) == null ? void 0 : _a2.includes("application/json")) {
-        let data = await response.json();
-        console.error(data.error);
-      } else {
-        console.error("".concat(response.status, " ").concat(response.statusText));
-      }
-    }
-  } catch (error) {
-  }
-}
-function startActivity(activity, startParameters = {}) {
-  let start = performance.now();
-  return (endParameters = {}) => logActivity(activity, __spreadValues(__spreadValues({}, startParameters), endParameters), performance.now() - start);
-}
-async function time(callback) {
-  let start = performance.now();
-  let returnValue = await callback();
-  return [returnValue, performance.now() - start];
-}
-async function logError(error) {
-  var _a2;
-  try {
-    if (!error)
-      return;
-    let data = typeof error === "string" ? { error } : typeof error === "object" ? "message" in error ? {
-      error: error.message,
-      stack: (_a2 = error.stack) != null ? _a2 : null
-    } : { error: error.toString() } : { error: "Unspecified error" };
-    console.error(error);
-    let result = await fetch("/data/Logger/LogError", {
-      method: "POST",
-      body: JSON.stringify(data),
-      headers: {
-        "Content-Type": "application/json; charset=utf-8"
-      }
-    });
-    if (result.ok) {
-      return await result.json();
-    }
-    console.error(Error("Failed to log error"));
-  } catch (e) {
-  }
-}
-function getSessionId() {
-  var _a2;
-  return (_a2 = crypto.randomUUID) == null ? void 0 : _a2.call(crypto);
-}
-var sessionStart = Date.now();
-var sessionId = getSessionId();
-var deviceId = "";
-var browserSessionId = "";
-if ("document" in window) {
-  let startSession = () => {
-    var _a2;
-    return logActivity("AfSessionInit", {
-      "appframe-core": af.common.version,
-      "appframe-data": (_a2 = af.data) == null ? void 0 : _a2.version,
-      "app-version": af.article.version
-    });
-  };
-  document.addEventListener("DOMContentLoaded", () => {
-    deviceId = localStorage.getItem("_afDeviceId");
-    browserSessionId = sessionStorage.getItem("_afSessionId");
-    if (!deviceId) {
-      deviceId = getSessionId();
-      localStorage.setItem("_afDeviceId", deviceId);
-    }
-    if (!browserSessionId) {
-      browserSessionId = sessionId;
-      sessionStorage.setItem("_afSessionId", browserSessionId);
-    }
-    startSession();
-  });
-  document.addEventListener("visibilitychange", function logData() {
-    if (document.visibilityState === "hidden") {
-      navigator.sendBeacon(
-        "/api/logging/log-activity",
-        JSON.stringify({
-          article: af.article.id,
-          action: "AfSessionEnd",
-          parameters: {
-            _session: getSessionData()
-          }
-        })
-      );
-    } else {
-      startSession();
-    }
-  });
-}
-function getSessionData() {
-  return {
-    browserSessionId,
-    sessionStart,
-    sessionLength: Date.now() - sessionStart,
-    sessionId,
-    deviceId
-  };
-}
-
 // src/settings.ts
 function getKey(article) {
   const articleKey = article || af.article.id;
@@ -697,7 +678,7 @@ async function alert(prompt, options = {}) {
 }
 
 // src/index.ts
-var version = "2.11.0";
+var version = "2.11.2";
 export {
   ConfirmButtons,
   SessionHandler,
@@ -711,7 +692,6 @@ export {
   getSessionData,
   getSettings,
   getUserImage,
-  has,
   invariant,
   localStorage_default as localStorage,
   localize,