@inzombieland/core 1.20.4 → 1.20.7

package/api-client.js

@@ -84,7 +84,7 @@ const optionsHandler = (options = {}, config) => {
   const visitor = { platform: "web", hostname: getHostname() };
   if (token) {
     headers.authorization = `JWT ${token}`;
-  } else if (typeof window !== "undefined" && appClientID && appClientSecret) {
+  } else if (globalThis.window !== void 0 && appClientID && appClientSecret) {
     const credentials = btoa(`${appClientID}:${appClientSecret}`);
     headers.authorization = `Basic ${credentials}`;
   }
@@ -96,7 +96,7 @@ const optionsHandler = (options = {}, config) => {
     options.baseURL = apiBaseURL;
     visitor.platform = "desktop";
   }
-  if (typeof window !== "undefined") {
+  if (globalThis.window !== void 0) {
     visitor.hostname = location.hostname;
   }
   const { platform, hostname } = visitor;
@@ -117,7 +117,7 @@ const optionsHandler = (options = {}, config) => {
 const fetchRequest = (url, options = {}, fetch, config) => {
   const request = async () => {
     const apiActions = useApiActions();
-    if (typeof window !== "undefined") {
+    if (globalThis.window !== void 0) {
       await apiActions.value?.getVisitorIdentifier?.();
     }
     const opts = optionsHandler(options, config);

package/comet-client.d.ts

@@ -3,6 +3,7 @@ declare global {
     interface Window {
         wsPublish: (eventName: string, data: unknown) => void;
     }
+    var wsPublish: (eventName: string, data: unknown) => void;
 }
 export declare function newCometClient(user: User, cometServerURL: string): {
     isStarted: boolean;

package/comet-client.js

@@ -3,8 +3,8 @@ import { getToken } from "./api-client.js";
 import { useApiActions } from "./composables/index.js";
 import { apiHelper } from "./helpers/index.js";
 import { useBus } from "./index.js";
-if (typeof window !== "undefined" && import.meta.env.VITE_MODE !== "production") {
-  window.wsPublish = (eventName, data) => {
+if (globalThis.window !== void 0 && import.meta.env.VITE_MODE !== "production") {
+  globalThis.wsPublish = (eventName, data) => {
     const bus = useBus();
     setTimeout(() => bus.publish(`WS.${eventName}`, data), 0);
   };

package/composables/use-app-locale.js

@@ -1,11 +1,12 @@
 import { useLocalStorage } from "@vueuse/core";
 export const useAppLocale = () => {
+  const namespace = import.meta.env.VITE_APP_NAMESPACE ?? "app";
   let value = "en";
-  if (typeof window !== "undefined" && window.navigator.language) {
-    value = window.navigator.language.split("-")[0] ?? "en";
+  if (globalThis.window !== void 0 && globalThis.navigator.language) {
+    value = globalThis.navigator.language.split("-", 1)[0] ?? "en";
   }
   return useLocalStorage(
-    "app-preferences-locale",
+    `${namespace}-preferences-locale`,
     { value },
     {
       serializer: {

package/composables/use-cookies.js

@@ -9,7 +9,7 @@ const CookieDefaults = {
   decode: (val) => destr(decodeURIComponent(val)),
   encode: (val) => encodeURIComponent(typeof val === "string" ? val : JSON.stringify(val))
 };
-const store = typeof window !== "undefined" ? window.cookieStore : void 0;
+const store = globalThis.window === void 0 ? void 0 : globalThis.cookieStore;
 export function useCookies(name, _opts) {
   const opts = { ...CookieDefaults, ..._opts };
   opts.filter ??= (key) => key === name;
@@ -63,11 +63,11 @@ export function useCookies(name, _opts) {
   if (store) {
     const changeHandler = (event) => {
       const changedCookie = event.changed.find((c) => c.name === name);
-      const removedCookie = event.deleted.find((c) => c.name === name);
+      const hasRemovedCookie = event.deleted.some((c) => c.name === name);
       if (changedCookie) {
         handleChange({ value: changedCookie.value });
       }
-      if (removedCookie) {
+      if (hasRemovedCookie) {
         handleChange({ value: null });
       }
     };

package/composables/use-subscribe.d.ts

@@ -3,8 +3,7 @@ export declare const useSubscribe: <T>(eventName: string, func: (data: T) => voi
     once?: boolean;
     unsubscribeOnUnmount?: boolean;
 }) => Subscription | undefined;
-declare const _default: <T>(eventName: string, func: (data: T) => void, options?: {
+export default function subscribe<T>(eventName: string, func: (data: T) => void, options?: {
     once?: boolean;
     unsubscribeOnUnmount?: boolean;
-}) => Subscription | undefined;
-export default _default;
+}): Subscription | undefined;

package/composables/use-subscribe.js

@@ -1,6 +1,6 @@
 import { onMounted, onUnmounted } from "vue";
 import { useBus } from "../index.js";
-export const useSubscribe = (eventName, func, options = { once: false, unsubscribeOnUnmount: true }) => {
+export const useSubscribe = (eventName, func, options = {}) => {
   const bus = useBus();
   let subscription;
   onMounted(() => {
@@ -12,12 +12,12 @@ export const useSubscribe = (eventName, func, options = { once: false, unsubscri
     });
   });
   onUnmounted(() => {
-    if (options.unsubscribeOnUnmount) {
+    if (options.unsubscribeOnUnmount ?? true) {
       subscription?.unsubscribe();
     }
   });
   return subscription;
 };
-export default (eventName, func, options) => {
+export default function subscribe(eventName, func, options) {
   return useSubscribe(eventName, func, options);
-};
+}

package/composables/use-theme-mode.js

@@ -1,8 +1,9 @@
 import { useLocalStorage, usePreferredDark } from "@vueuse/core";
 export const useThemeMode = () => {
+  const namespace = import.meta.env.VITE_APP_NAMESPACE ?? "app";
   const isDark = usePreferredDark();
   return useLocalStorage(
-    "app-preferences-theme",
+    `${namespace}-preferences-theme`,
     { value: isDark.value ? "dark" : "light" },
     {
       serializer: {

package/get-visitor.js

@@ -4,7 +4,7 @@ import { createSingletonAsync, once } from "./helpers/index.js";
 import { getVisitorId } from "./local-storage-utils.js";
 const setVisitor = (newVisitor) => {
   const visitor = useVisitor();
-  visitor.value = !visitor.value ? newVisitor : { ...visitor.value, ...newVisitor };
+  visitor.value = visitor.value ? { ...visitor.value, ...newVisitor } : newVisitor;
 };
 const getVisitorRequest = async (config) => {
   const visitor = useVisitor();

package/helpers/current-device.js

@@ -1,7 +1,7 @@
 const device = {}
 
 // https://github.com/matthewhudson/current-device
-if (typeof window !== "undefined") {
+if (globalThis.window !== undefined) {
 	// Public functions to get the current value of type, os, or orientation.
 	const findMatch = arr => {
 		for (const name of arr) {
@@ -29,9 +29,8 @@ if (typeof window !== "undefined") {
 
 	// Add one or more CSS classes to the <html> element.
 	const addClass = className => {
-		let currentClassNames = null
 		if (!hasClass(className)) {
-			currentClassNames = documentElement.classList.toString().trim()
+			const currentClassNames = documentElement.classList.toString().trim()
 			documentElement.className = `${currentClassNames} ${className}`
 		}
 	}
@@ -68,19 +67,19 @@ if (typeof window !== "undefined") {
 	}
 
 	// Save the previous value of the device variable.
-	const previousDevice = window.device
+	const previousDevice = globalThis.device
 
 	const changeOrientationList = []
 
 	// Add device as a global object.
-	window.device = device
+	globalThis.device = device
 
 	// The <html> element.
-	const documentElement = window.document.documentElement
+	const documentElement = globalThis.document.documentElement
 
 	// The client user agent string.
 	// Lowercase, so we can use the more efficient indexOf(), instead of Regex
-	const userAgent = window.navigator.userAgent.toLowerCase()
+	const userAgent = globalThis.navigator.userAgent.toLowerCase()
 
 	// Detectable television devices.
 	const television = [
@@ -177,7 +176,7 @@ if (typeof window !== "undefined") {
 	}
 
 	device.cordova = function () {
-		return window.cordova && location.protocol === "file:"
+		return globalThis.cordova && location.protocol === "file:"
 	}
 
 	device.mobile = function () {
@@ -237,7 +236,7 @@ if (typeof window !== "undefined") {
 	// Run device.js in noConflict mode,
 	// returning the device variable to its previous owner.
 	device.noConflict = function () {
-		window.device = previousDevice
+		globalThis.device = previousDevice
 		return this
 	}
 

package/helpers/index.d.ts

@@ -1,7 +1,7 @@
 export { apiHelper } from "./api-helper.js";
+export * from "./composables.js";
 export { deviceHelper, type Device } from "./device-helper.js";
 export { phoneHelper } from "./phone-helper.js";
 export { stringHelper } from "./string-helper.js";
-export * from "./composables.js";
 export declare function once<T extends (...args: any[]) => any>(fn: T): T;
 export declare function createSingletonAsync<T, Args extends unknown[]>(fn: (...args: Args) => Promise<T>): (...args: Args) => Promise<T>;

package/helpers/index.js

@@ -1,8 +1,8 @@
 export { apiHelper } from "./api-helper.js";
+export * from "./composables.js";
 export { deviceHelper } from "./device-helper.js";
 export { phoneHelper } from "./phone-helper.js";
 export { stringHelper } from "./string-helper.js";
-export * from "./composables.js";
 export function once(fn) {
   let executed = false;
   let result;

package/index.d.ts

@@ -1,8 +1,8 @@
 import { type Ref } from "vue";
 import type { Fetch, FetchConfig } from "./types.js";
-export { defineVuePlugins } from "./define-vue-plugins.js";
 export { default as AppProvider, useBus } from "./AppProvider.vue.js";
 export * from "./composables/index.js";
+export { defineVuePlugins } from "./define-vue-plugins.js";
 export * from "./types.js";
 export declare function initApiFetch($fetch: Fetch, config: FetchConfig): {
     fetch: Fetch;

package/index.js

@@ -9,9 +9,9 @@ import { createApiGetVisitorIdentifier } from "./get-visitor.js";
 import { createInitApplication } from "./init-application.js";
 import { createApiRefreshToken } from "./refresh-token.js";
 import { createApiUserActions } from "./user-actions.js";
-export { defineVuePlugins } from "./define-vue-plugins.js";
 export { default as AppProvider, useBus } from "./AppProvider.vue";
 export * from "./composables/index.js";
+export { defineVuePlugins } from "./define-vue-plugins.js";
 export * from "./types.js";
 const apiActions = useApiActions();
 let userActions;
@@ -23,7 +23,7 @@ export function initApiFetch($fetch, config) {
   const refreshToken = createApiRefreshToken(fetch, config);
   userActions = ref(createApiUserActions(fetch, config, getUser));
   apiActions.value = { getVisitorIdentifier, refreshToken };
-  if (typeof window !== "undefined") {
+  if (globalThis.window !== void 0) {
     const loggedIn = useLocalStorage("lin", "no");
     const cometServerURL = config.cometServerURL;
     let cometClient;

package/local-storage-utils.js

@@ -1,22 +1,23 @@
+const namespace = import.meta.env.VITE_APP_NAMESPACE ?? "app";
 export const getSessionId = () => {
-  if (typeof window !== "undefined") {
-    return window.localStorage.getItem("sid");
+  if (globalThis.window !== void 0) {
+    return globalThis.localStorage.getItem(`${namespace}-sid`);
   }
   return null;
 };
 export const setSessionId = (sessionId = "") => {
-  if (typeof window !== "undefined") {
-    window.localStorage.setItem("sid", sessionId);
+  if (globalThis.window !== void 0) {
+    globalThis.localStorage.setItem(`${namespace}-sid`, sessionId);
   }
 };
 export const getVisitorId = () => {
-  if (typeof window !== "undefined") {
-    return window.localStorage.getItem("vid");
+  if (globalThis.window !== void 0) {
+    return globalThis.localStorage.getItem(`${namespace}-vid`);
   }
   return null;
 };
 export const setVisitorId = (visitorId = "") => {
-  if (typeof window !== "undefined") {
-    window.localStorage.setItem("vid", visitorId);
+  if (globalThis.window !== void 0) {
+    globalThis.localStorage.setItem(`${namespace}-vid`, visitorId);
   }
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@inzombieland/core",
-  "version": "1.20.4",
   "type": "module",
+  "version": "1.20.7",
   "license": "ISC",
   "main": "./index.js",
   "types": "./index.d.ts",

package/user-actions.js

@@ -9,7 +9,7 @@ export const createApiUserActions = once(
         const response = await fetch("/account/0/signin", {
           body,
           method: "POST",
-          ...config.useRequestHeaders?.(["cookie"]) ?? {}
+          ...config.useRequestHeaders?.(["cookie"])
         });
         const { key, ...rest } = response;
         if (key) {
@@ -21,7 +21,7 @@ export const createApiUserActions = once(
         const response = await fetch("/account/0/signinbycode/verifycode", {
           body,
           method: "POST",
-          ...config.useRequestHeaders?.(["cookie"]) ?? {}
+          ...config.useRequestHeaders?.(["cookie"])
         });
         const { accessToken, sessionId, visitorId, secretKey, ...rest } = response;
         if (!accessToken || !sessionId || !visitorId || !secretKey) {
@@ -37,7 +37,7 @@ export const createApiUserActions = once(
         const response = await fetch("/account/0/token", {
           body,
           method: "POST",
-          ...config.useRequestHeaders?.(["cookie"]) ?? {}
+          ...config.useRequestHeaders?.(["cookie"])
         });
         const { accessToken, ...rest } = response;
         if (!accessToken) {
@@ -50,21 +50,21 @@ export const createApiUserActions = once(
         return await fetch("/account/0/signup", {
           body,
           method: "POST",
-          ...config.useRequestHeaders?.(["cookie"]) ?? {}
+          ...config.useRequestHeaders?.(["cookie"])
         });
       },
       confirmEmail: async (body) => {
         return await fetch("/account/0/signup", {
           body,
           method: "PUT",
-          ...config.useRequestHeaders?.(["cookie"]) ?? {}
+          ...config.useRequestHeaders?.(["cookie"])
         });
       },
       resendActivationEmail: async (body) => {
         return await fetch("/account/0/signup", {
           body,
           method: "PATCH",
-          ...config.useRequestHeaders?.(["cookie"]) ?? {}
+          ...config.useRequestHeaders?.(["cookie"])
         });
       },
       logout: async () => {
@@ -81,21 +81,21 @@ export const createApiUserActions = once(
         return await fetch("/account/0/recovery", {
           body,
           method: "POST",
-          ...config.useRequestHeaders?.(["cookie"]) ?? {}
+          ...config.useRequestHeaders?.(["cookie"])
         });
       },
       confirmRecovery: async (body) => {
         return await fetch("/account/0/recovery", {
           body,
           method: "PATCH",
-          ...config.useRequestHeaders?.(["cookie"]) ?? {}
+          ...config.useRequestHeaders?.(["cookie"])
         });
       },
       resetPassword: async (body) => {
         return await fetch("/account/0/recovery", {
           body,
           method: "PUT",
-          ...config.useRequestHeaders?.(["cookie"]) ?? {}
+          ...config.useRequestHeaders?.(["cookie"])
         });
       },
       changeName: async (body) => {