@dative-gpi/foundation-shared-services 1.0.40 → 1.0.42

package/composables/app/index.ts

@@ -1,4 +1,4 @@
 export * from "./useAppLanguageCode";
 export * from "./useAppLanguages";
 export * from "./useAppTimeZone";
-export * from "./useExtensionJwt";
+export * from "./useAppAuthToken";

package/composables/app/useAppAuthToken.ts

@@ -0,0 +1,17 @@
+import { computed, ref } from "vue";
+
+const authToken = ref<string | undefined>(undefined);
+
+export const useAppAuthToken = () => {
+    const setAppAuthToken = (payload: string) => {
+        authToken.value = payload;
+    };
+
+    const ready = computed(() => authToken.value !== null);
+
+    return {
+        authToken,
+        ready,
+        setAppAuthToken
+    };
+}

package/composables/app/useAppTimeZone.ts

@@ -1,170 +1,56 @@
-import { addMilliseconds, format, parse, subDays } from "date-fns";
 import { computed, ref } from "vue";
 
-import { useTranslations as useTranslationsProvider } from "@dative-gpi/bones-ui/composables";
-import { ISO_FORMAT, OPTIONS } from "@dative-gpi/foundation-shared-domain/tools";
-
-import { useAppLanguageCode } from "./useAppLanguageCode";
-
 const timeZone = ref<string | undefined>(undefined);
 
 export const useAppTimeZone = () => {
-  const { $tr } = useTranslationsProvider();
-
   const setAppTimeZone = (payload: string) => {
     timeZone.value = payload;
   };
 
-  const epochToShortDateFormat = (value: number | null | undefined): string => {
-    if (value == null || !isFinite(value)) {
-      return "";
-    }
-    const date = new Date(value);
-    return date.toLocaleString(useAppLanguageCode().languageCode.value, { ...OPTIONS.shortDate, timeZone: timeZone.value });
-  };
-
-  const epochToLongDateFormat = (value: number | null | undefined): string => {
-    if (value == null || !isFinite(value)) {
-      return "";
-    }
-    const date = new Date(value);
-    const now = new Date();
-    if (date.toLocaleString(useAppLanguageCode().languageCode.value, { ...OPTIONS.shortDate, timeZone: timeZone.value }) === now.toLocaleString(useAppLanguageCode().languageCode.value, { ...OPTIONS.shortDate, timeZone: timeZone.value })) {
-      return $tr("ui.time-zone.today", "Today");
-    }
-    if (date.toLocaleString(useAppLanguageCode().languageCode.value, { ...OPTIONS.shortDate, timeZone: timeZone.value }) === subDays(now, 1).toLocaleString(useAppLanguageCode().languageCode.value, { ...OPTIONS.shortDate, timeZone: timeZone.value })) {
-      return $tr("ui.time-zone.yesterday", "Yesterday");
-    }
-    const dateString = date.toLocaleString(useAppLanguageCode().languageCode.value, { ...OPTIONS.longDate, timeZone: timeZone.value });
-    return dateString[0].toLocaleUpperCase() + dateString.slice(1);
-  };
-
-  const epochToShortTimeFormat = (value: number | null | undefined): string => {
-    if (value == null || !isFinite(value)) {
-      return "";
-    }
-    const date = new Date(value);
-    return date.toLocaleString(useAppLanguageCode().languageCode.value, { ...OPTIONS.shortTime, timeZone: timeZone.value });
-  };
-
-  const epochToLongTimeFormat = (value: number | null | undefined): string => {
-    if (value == null || !isFinite(value)) {
-      return "";
-    }
-    const date = new Date(value);
-    const now = new Date();
-    if (date.toLocaleString(useAppLanguageCode().languageCode.value, { ...OPTIONS.shortDate, timeZone: timeZone.value }) === now.toLocaleString(useAppLanguageCode().languageCode.value, { ...OPTIONS.shortDate, timeZone: timeZone.value })) {
-      return `${$tr("ui.time-zone.today-at", "Today at")} ${date.toLocaleString(useAppLanguageCode().languageCode.value, { ...OPTIONS.time, timeZone: timeZone.value })}`;
-    }
-    if (date.toLocaleString(useAppLanguageCode().languageCode.value, { ...OPTIONS.shortDate, timeZone: timeZone.value }) === subDays(now, 1).toLocaleString(useAppLanguageCode().languageCode.value, { ...OPTIONS.shortDate, timeZone: timeZone.value })) {
-      return `${$tr("ui.time-zone.yesterday-at", "Yesterday at")} ${date.toLocaleString(useAppLanguageCode().languageCode.value, { ...OPTIONS.time, timeZone: timeZone.value })}`;
-    }
-    const dateString = date.toLocaleString(useAppLanguageCode().languageCode.value, { ...OPTIONS.longTime, timeZone: timeZone.value });
-    return dateString[0].toLocaleUpperCase() + dateString.slice(1);
-  };
-
-  const epochToTimeOnlyFormat = (value: number | null | undefined): string => {
-    if (value == null || !isFinite(value)) {
-      return "";
-    }
-    const date = new Date(value);
-    return date.toLocaleString(useAppLanguageCode().languageCode.value, { ...OPTIONS.time, timeZone: timeZone.value });
-  };
-
-  const getOffsetUser = (): number => {
-    const offsetParts = (Intl.DateTimeFormat(undefined, {
-      timeZone: timeZone.value,
+  const getUserFormatter = (): Intl.DateTimeFormat => {
+    return new Intl.DateTimeFormat(undefined, {
+      timeZone: timeZone.value || Intl.DateTimeFormat().resolvedOptions().timeZone,
       timeZoneName: "longOffset"
-    }).formatToParts(new Date).pop()?.value.slice(3) || "+00:00").split(':');
-    return (parseInt(offsetParts[0]) * 60 + parseInt(offsetParts[1])) * 60 * 1000;
-  };
-
-  const getOffsetUserChart = (withUTC: boolean = true): string => {
-    const offsetPart = (Intl.DateTimeFormat(undefined, {
-      timeZone: timeZone.value,
-      timeZoneName: "longOffset"
-    }).formatToParts(new Date).pop()?.value.slice(3) || "+00:00");
-    return `${withUTC ? 'UTC ' : ''}${offsetPart}`;
+    });
   }
 
-  const getOffsetMachine = (): number => {
-    const offsetParts = (Intl.DateTimeFormat(undefined, {
-      timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
-      timeZoneName: "longOffset"
-    }).formatToParts(new Date).pop()?.value.slice(3) || "+00:00").split(':');
-    return (parseInt(offsetParts[0]) * 60 + parseInt(offsetParts[1])) * 60 * 1000;
-  };
-
-  const getOffsetMachineChart = (withUTC: boolean = true): string => {
-    const offsetPart = (Intl.DateTimeFormat(undefined, {
+  const getMachineFormatter = (): Intl.DateTimeFormat => {
+    return new Intl.DateTimeFormat(undefined, {
       timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
       timeZoneName: "longOffset"
-    }).formatToParts(new Date).pop()?.value.slice(3) || "+00:00");
-    return `${withUTC ? 'UTC ' : ''}${offsetPart}`;
+    });
   }
 
-  const getOffsetDifference = (): number => {
-    if (timeZone.value == null) {
-      return 0;
-    }
-    return getOffsetUser() - getOffsetMachine();
-  };
-
-  const todayToEpoch = (): number => {
-    return (new Date().getTime() + getOffsetDifference());
-  };
-
-  const pickerToEpoch = (value: Date | null | undefined): number => {
-    if (value != null) {
-      return value.getTime() - getOffsetDifference();
-    }
-    return 0;
-  };
-
-  const epochToPicker = (value: number | null | undefined): Date => {
-    if (value != null) {
-      return new Date(value + getOffsetDifference());
-    }
-    return new Date(0);
-  };
+  const getUserOffsetName = (): string => {
+    const formatter = getUserFormatter();
+    const currentDate = formatter.formatToParts(new Date());
+    const timeZoneName = currentDate.find((part) => part.type === "timeZoneName")?.value || "UTC+00:00";
+    return timeZoneName
+  }
 
-  const epochToPickerHeader = (value: number): { d: number, m: number, y: number } => {
-    const date = epochToPicker(value);
-    return { d: date.getDate(), m: date.getMonth(), y: date.getFullYear() };
-  };
+  const getUserOffset = (): number => {
+    const timeZoneName = getUserOffsetName();
+    const [hours, minutes] = timeZoneName.slice(3).split(':');
 
-  const todayToPicker = (): string => {
-    const date = addMilliseconds(new Date(), -getOffsetMachine());
-    date.setSeconds(0, 0);
-    return format(date, ISO_FORMAT);
+    return (parseInt(hours) * 60 + parseInt(minutes)) * 60 * 1000;
   };
 
-  const yesterdayToPicker = (): string => {
-    const date = addMilliseconds(subDays(new Date(), 1), -getOffsetMachine());
-    date.setSeconds(0, 0);
-    return format(date, ISO_FORMAT);
+  const getMachineOffsetName = (): string => {
+    const formatter = getMachineFormatter();
+    const currentDate = formatter.formatToParts(new Date());
+    const timeZoneName = currentDate.find((part) => part.type === "timeZoneName")?.value || "UTC+00:00";
+    return timeZoneName;
   };
 
-  const parseForPicker = (value: string, dateFormat: string = ISO_FORMAT): number | null => {
-    const date = addMilliseconds(parse(value, dateFormat, new Date()), getOffsetUser());
-    if (!isFinite(date.getTime())) {
-      return null;
-    }
-    return date.getTime();
-  };
+  const getMachineOffset = (): number => {
+    const timeZoneName = getMachineOffsetName();
+    const [hours, minutes] = timeZoneName.slice(3).split(':');
 
-  const formatFromPicker = (date: number | null): string => {
-    if (date != null) {
-      return format(date - getOffsetMachine(), ISO_FORMAT);
-    }
-    return "";
-  };
+    return (parseInt(hours) * 60 + parseInt(minutes)) * 60 * 1000;
+  }
 
-  const formatEpochToVariable = (epoch: number | undefined): string => {
-    if (epoch == null || !isFinite(epoch)) {
-      return "";
-    }
-    return format(epoch - getOffsetMachine(), ISO_FORMAT);
+  const getOffsetDifference = (): number => {
+    return getUserOffset() - getMachineOffset();
   };
 
   const ready = computed(() => timeZone.value !== null);
@@ -173,24 +59,10 @@ export const useAppTimeZone = () => {
     ready,
     timeZone,
     setAppTimeZone,
-    todayToEpoch,
-    pickerToEpoch,
-    epochToPicker,
-    epochToPickerHeader,
-    epochToLongDateFormat,
-    epochToLongTimeFormat,
-    epochToShortDateFormat,
-    epochToShortTimeFormat,
-    epochToTimeOnlyFormat,
-    parseForPicker,
-    todayToPicker,
-    yesterdayToPicker,
-    formatFromPicker,
-    formatEpochToVariable,
-    getOffsetUser,
-    getOffsetMachine,
+    getUserOffset,
+    getUserOffsetName,
+    getMachineOffset,
+    getMachineOffsetName,
     getOffsetDifference,
-    getOffsetUserChart,
-    getOffsetMachineChart
   };
 }

package/composables/index.ts

@@ -2,4 +2,5 @@ export * from "./services";
 export * from "./app";
 
 export * from "./useFiles";
-export * from "./useFoundationShared";
+export * from "./useFoundationShared";
+export * from "./useDateFormat";

package/composables/useDateFormat.ts

@@ -0,0 +1,153 @@
+import { addMilliseconds, format, parse, subDays } from "date-fns";
+
+import { useTranslations as useTranslationsProvider } from "@dative-gpi/bones-ui/composables";
+import { ISO_FORMAT, OPTIONS } from "@dative-gpi/foundation-shared-domain/tools";
+
+import { useAppLanguageCode, useAppTimeZone } from "./app/";
+
+export const useDateFormat = () => {
+  const { $tr } = useTranslationsProvider();
+
+  const { languageCode } = useAppLanguageCode();
+  const { timeZone, getOffsetDifference, getMachineOffset, getUserOffset } = useAppTimeZone();
+
+  const isEpochToday = (value: number | null | undefined): boolean => {
+    if (value == null || !isFinite(value)) {
+      return false;
+    }
+    const date = new Date(value);
+    const now = new Date();
+    return date.toLocaleString(languageCode.value, { ...OPTIONS.shortDate, timeZone: timeZone.value }) 
+      === now.toLocaleString(languageCode.value, { ...OPTIONS.shortDate, timeZone: timeZone.value });
+  }
+
+  const isEpochYesterday = (value: number | null | undefined): boolean => {
+    if (value == null || !isFinite(value)) {
+      return false;
+    }
+    const date = new Date(value);
+    const now = new Date();
+    return date.toLocaleString(languageCode.value, { ...OPTIONS.shortDate, timeZone: timeZone.value }) 
+      === subDays(now, 1).toLocaleString(languageCode.value, { ...OPTIONS.shortDate, timeZone: timeZone.value });
+  }
+
+  const epochToShortDateFormat = (value: number | null | undefined): string => {
+    if (value == null || !isFinite(value)) {
+      return "";
+    }
+    const date = new Date(value);
+    return date.toLocaleString(languageCode.value, { ...OPTIONS.shortDate, timeZone: timeZone.value });
+  };
+
+  const epochToLongDateFormat = (value: number | null | undefined): string => {
+    if (value == null || !isFinite(value)) {
+      return "";
+    }
+    const date = new Date(value);
+    if (isEpochToday(value)) {
+      return $tr("ui.time-zone.today", "Today");
+    }
+    if (isEpochYesterday(value)) {
+      return $tr("ui.time-zone.yesterday", "Yesterday");
+    }
+    const dateString = date.toLocaleString(languageCode.value, { ...OPTIONS.longDate, timeZone: timeZone.value });
+    return dateString[0].toLocaleUpperCase() + dateString.slice(1);
+  };
+
+  const epochToShortTimeFormat = (value: number | null | undefined): string => {
+    if (value == null || !isFinite(value)) {
+      return "";
+    }
+    const date = new Date(value);
+    return date.toLocaleString(languageCode.value, { ...OPTIONS.shortTime, timeZone: timeZone.value });
+  };
+
+  const epochToLongTimeFormat = (value: number | null | undefined): string => {
+    if (value == null || !isFinite(value)) {
+      return "";
+    }
+    const date = new Date(value);
+    if (isEpochToday(value)) {
+      return `${$tr("ui.time-zone.today-at", "Today at")} ${date.toLocaleString(languageCode.value, { ...OPTIONS.time, timeZone: timeZone.value })}`;
+    }
+    if (isEpochYesterday(value)) {
+      return `${$tr("ui.time-zone.yesterday-at", "Yesterday at")} ${date.toLocaleString(languageCode.value, { ...OPTIONS.time, timeZone: timeZone.value })}`;
+    }
+    const dateString = date.toLocaleString(languageCode.value, { ...OPTIONS.longTime, timeZone: timeZone.value });
+    return dateString[0].toLocaleUpperCase() + dateString.slice(1);
+  };
+
+  const epochToTimeOnlyFormat = (value: number | null | undefined): string => {
+    if (value == null || !isFinite(value)) {
+      return "";
+    }
+    const date = new Date(value);
+    return date.toLocaleString(languageCode.value, { ...OPTIONS.time, timeZone: timeZone.value });
+  };
+
+  const todayToEpoch = (): number => {
+    return new Date().getTime() + getOffsetDifference();
+  };
+
+  const pickerToEpoch = (value: Date | null | undefined): number => {
+    if (value != null) {
+      return value.getTime() - getOffsetDifference();
+    }
+    return 0;
+  };
+
+  const epochToPicker = (value: number | null | undefined): Date => {
+    if (value != null) {
+      return new Date(value + getOffsetDifference());
+    }
+    return new Date(0);
+  };
+
+  const epochToPickerHeader = (value: number): { d: number, m: number, y: number } => {
+    const date = epochToPicker(value);
+    return { d: date.getDate(), m: date.getMonth(), y: date.getFullYear() };
+  };
+
+  const todayToPicker = (): string => {
+    const date = addMilliseconds(new Date(), -getMachineOffset());
+    date.setSeconds(0, 0);
+    return format(date, ISO_FORMAT);
+  };
+
+  const yesterdayToPicker = (): string => {
+    const date = addMilliseconds(subDays(new Date(), 1), -getMachineOffset());
+    date.setSeconds(0, 0);
+    return format(date, ISO_FORMAT);
+  };
+
+  const parseForPicker = (value: string, dateFormat: string = ISO_FORMAT): number | null => {
+    const date = addMilliseconds(parse(value, dateFormat, new Date()), getUserOffset());
+    if (!isFinite(date.getTime())) {
+      return null;
+    }
+    return date.getTime();
+  };
+
+  const epochToISO = (date: number | null): string => {
+    if (date != null) {
+      return format(date - getMachineOffset(), ISO_FORMAT);
+    }
+    return "";
+  };
+
+  return {
+    todayToEpoch,
+    pickerToEpoch,
+    epochToPicker,
+    epochToPickerHeader,
+    epochToLongDateFormat,
+    epochToLongTimeFormat,
+    epochToShortDateFormat,
+    epochToShortTimeFormat,
+    epochToTimeOnlyFormat,
+    parseForPicker,
+    todayToPicker,
+    yesterdayToPicker,
+    epochToISO
+  };
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-services",
   "sideEffects": false,
-  "version": "1.0.40",
+  "version": "1.0.42",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,7 +10,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.40"
+    "@dative-gpi/foundation-shared-domain": "1.0.42"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^0.0.75",
@@ -18,5 +18,5 @@
     "vue": "^3.4.29",
     "vue-router": "^4.3.0"
   },
-  "gitHead": "a1e2c35d0e08ce37a05a56d7d7f0f477b935a645"
+  "gitHead": "0c0ad1947f4b469307f0e9a5c636b4d5df11c589"
 }

package/composables/app/useExtensionJwt.ts

@@ -1,17 +0,0 @@
-import { computed, ref } from "vue";
-
-const jwt = ref<string | undefined>(undefined);
-
-export const useExtensionJwt = () => {
-    const setExtensionJwt = (payload: string) => {
-        jwt.value = payload;
-    };
-
-    const ready = computed(() => jwt.value !== null);
-
-    return {
-        jwt,
-        ready,
-        setExtensionJwt
-    };
-}