adminforth 3.27.1 → 3.28.0

package/dist/spa/src/afcl/DatePicker.vue

@@ -51,6 +51,7 @@ import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
 
 import {useCoreStore} from '@/stores/core';
+import {FLEXIBLE_DATEPICKER_FORMAT} from '@/utils';
 
 import IconCalendar from "@/components/icons/IconCalendar.vue";
 import IconTime from "@/components/icons/IconTime.vue";
@@ -138,7 +139,7 @@ watch(start, () => {
 
 async function initDatepickers() {
   const LS_LANG_KEY = `afLanguage`;
-  const options = {format: 'dd M yyyy', language: localStorage.getItem(LS_LANG_KEY)};
+  const options = {format: FLEXIBLE_DATEPICKER_FORMAT, language: localStorage.getItem(LS_LANG_KEY)};
 
   if (props.autoHide) {
     options.autohide = true;

package/dist/spa/src/components/CustomDateRangePicker.vue

@@ -69,6 +69,7 @@ import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
 
 import {useCoreStore} from '@/stores/core';
+import {FLEXIBLE_DATEPICKER_FORMAT} from '@/utils';
 
 import IconCalendar from "@/components/icons/IconCalendar.vue";
 import IconTime from "@/components/icons/IconTime.vue";
@@ -213,8 +214,9 @@ async function initDatepickers() {
   }
 
   const LS_LANG_KEY = `afLanguage`;
-  datepickerStartObject.value = new Datepicker(datepickerStartEl.value, {format: 'dd M yyyy', language: localStorage.getItem(LS_LANG_KEY)});
-  datepickerEndObject.value = new Datepicker(datepickerEndEl.value, {format: 'dd M yyyy', language: localStorage.getItem(LS_LANG_KEY)});
+  const options = {format: FLEXIBLE_DATEPICKER_FORMAT, language: localStorage.getItem(LS_LANG_KEY)};
+  datepickerStartObject.value = new Datepicker(datepickerStartEl.value, options);
+  datepickerEndObject.value = new Datepicker(datepickerEndEl.value, options);
   addChangeDateListener();
 }
 

package/dist/spa/src/utils/dateUtils.ts

@@ -49,3 +49,109 @@ export function formatTime(time: string | null | undefined): string {
   if (!time) return '';
   return dayjs(`0000-00-00 ${time}`).format(getTimeFormat());
 }
+
+/** Locale shape flowbite-datepicker passes to custom format functions. */
+type DatepickerLocale = { months: string[], monthsShort: string[] };
+
+/** A run of letters or a run of digits, so "18Aug2003" and "Jun 23, 2022 ·" both tokenize cleanly. */
+const DATE_TOKEN_RE = /\p{L}+|\p{N}+/gu;
+/** Time (and timezone offset) part of a pasted datetime, dropped before tokenizing the date. */
+const TIME_PART_RE = /\d{1,2}:\d{2}(:\d{2})?(\.\d+)?\s*([ap]\.?m\.?)?/gi;
+/** A token consisting of digits only. */
+const DIGITS_RE = /^\p{N}+$/u;
+
+const EN_MONTHS = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
+const EN_MONTHS_SHORT = EN_MONTHS.map(m => m.slice(0, 3));
+
+/** Two-digit years below this belong to the 2000s, the rest to the 1900s. */
+const CENTURY_PIVOT = 50;
+/** Shortest month abbreviation across locales; single letters would match random words. */
+const MIN_MONTH_NAME_LENGTH = 2;
+
+function findMonthIndex(name: string, locale: DatepickerLocale): number {
+  if (name.length < MIN_MONTH_NAME_LENGTH) {
+    return -1;
+  }
+  const lowered = name.toLowerCase();
+  const startsWithToken = (monthName: string) => monthName.toLowerCase().startsWith(lowered);
+  // both short and full names, in the active language and in English (pasted dates are often English)
+  for (const names of [locale.monthsShort, locale.months, EN_MONTHS_SHORT, EN_MONTHS]) {
+    const index = names.findIndex(startsWithToken);
+    if (index >= 0) {
+      return index;
+    }
+  }
+  return -1;
+}
+
+function normalizeYear(year: number, digits: number): number {
+  if (digits > 2) {
+    return year;
+  }
+  return year < CENTURY_PIVOT ? 2000 + year : 1900 + year;
+}
+
+/**
+ * Parses a human-typed or pasted date in whatever order the parts came in:
+ * "18 Aug 2003", "Aug 18, 2003", "18.08.2003", "2003-08-18", "Jun 23, 2022 ·".
+ * Returns a local-midnight timestamp, or NaN when the string is not a date.
+ */
+export function parseFlexibleDate(dateStr: string, locale: DatepickerLocale): number {
+  const tokens = dateStr.replace(TIME_PART_RE, ' ').match(DATE_TOKEN_RE) || [];
+
+  let month = -1;
+  const numbers: { value: number, digits: number }[] = [];
+  for (const token of tokens) {
+    if (DIGITS_RE.test(token)) {
+      numbers.push({ value: parseInt(token, 10), digits: token.length });
+    } else if (month < 0) {
+      month = findMonthIndex(token, locale);
+    }
+  }
+
+  const yearIndex = numbers.findIndex(n => n.digits > 2);
+  const yearToken = yearIndex >= 0 ? numbers.splice(yearIndex, 1)[0] : undefined;
+
+  let day: number;
+  if (month >= 0) {
+    day = numbers.length ? numbers.shift()!.value : 1;
+  } else if (numbers.length >= 2) {
+    // year first means ISO-like order, otherwise day first (the format we render)
+    const [first, second] = yearIndex === 0 ? [numbers[1], numbers[0]] : numbers;
+    day = first.value;
+    month = second.value - 1;
+    numbers.splice(0, 2);
+    if (month > 11 && day <= 12) {
+      [day, month] = [month + 1, day - 1];
+    }
+  } else if (numbers.length === 1) {
+    day = numbers.shift()!.value;
+    month = new Date().getMonth();
+  } else {
+    return NaN;
+  }
+
+  const leftover = numbers.shift();
+  const year = yearToken
+    ? normalizeYear(yearToken.value, yearToken.digits)
+    : leftover
+      ? normalizeYear(leftover.value, leftover.digits)
+      : new Date().getFullYear();
+
+  const date = new Date(year, month, day);
+  date.setFullYear(year);
+  // rejects impossible dates like "31 Feb" instead of silently rolling them over
+  return date.getMonth() === month && date.getDate() === day ? date.getTime() : NaN;
+}
+
+/**
+ * flowbite-datepicker format: renders as "18 Aug 2003" and accepts any parsable order on input.
+ */
+export const FLEXIBLE_DATEPICKER_FORMAT = {
+  toDisplay(date: Date, format: unknown, locale: DatepickerLocale): string {
+    return `${String(date.getDate()).padStart(2, '0')} ${locale.monthsShort[date.getMonth()]} ${date.getFullYear()}`;
+  },
+  toValue(dateStr: string, format: unknown, locale: DatepickerLocale): number {
+    return parseFlexibleDate(dateStr, locale);
+  },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "3.27.1",
+  "version": "3.28.0",
   "description": "OpenSource Agent-Native forth-generation admin panel",
   "keywords": [
     "adminforth",