@fusion.dev/helix-core 0.159.0 → 0.161.0

package/dist/utils/date-segments/date-segments.js

@@ -1,3 +1,4 @@
+import { valueAsDate as asDate, dateAsValue as fromDate } from '../value-as/value-as.js';
 const SAMPLE = new Date(Date.UTC(2006, 10, 22, 15, 4, 5));
 export const segmentLayout = (kind, locale, options = {}) => {
     const format = kind === 'date'
@@ -40,15 +41,37 @@ export const segmentLayout = (kind, locale, options = {}) => {
     return slots;
 };
 export const isTwelveHourLayout = (layout) => layout.some((slot) => 'kind' in slot && slot.kind === 'dayPeriod');
-const daysIn = (month, year) => month === undefined ? 31 : new Date(Date.UTC(year ?? 2000, month, 0)).getUTCDate();
-export const segmentRange = (kind, segments, twelve) => {
+const yearNow = (system) => system ? system.parts(new Date()).year : new Date().getFullYear();
+const yearsAround = (system) => {
+    const now = yearNow(system);
+    return [now, now + 1, now + 2];
+};
+const monthsIn = (year, system) => {
+    if (!system) {
+        return 12;
+    }
+    return year === undefined
+        ? Math.max(...yearsAround(system).map((one) => system.months(one)))
+        : system.months(year);
+};
+const daysIn = (month, year, system) => {
+    if (!system) {
+        return month === undefined ? 31 : new Date(Date.UTC(year ?? 2000, month, 0)).getUTCDate();
+    }
+    if (month === undefined) {
+        return 31;
+    }
+    const years = year === undefined ? yearsAround(system) : [year];
+    return Math.max(...years.filter((one) => month <= system.months(one)).map((one) => system.days(one, month)), 1);
+};
+export const segmentRange = (kind, segments, twelve, system) => {
     switch (kind) {
         case 'year':
             return { max: 9999, min: 1 };
         case 'month':
-            return { max: 12, min: 1 };
+            return { max: monthsIn(segments.year, system), min: 1 };
         case 'day':
-            return { max: daysIn(segments.month, segments.year), min: 1 };
+            return { max: daysIn(segments.month, segments.year, system), min: 1 };
         case 'hour':
             return twelve ? { max: 12, min: 1 } : { max: 23, min: 0 };
         case 'minute':
@@ -58,8 +81,12 @@ export const segmentRange = (kind, segments, twelve) => {
             return { max: 1, min: 0 };
     }
 };
+const halfCleared = (segments) => Number.isNaN(segments.dayPeriod ?? 0);
 export const shownValue = (kind, segments, twelve) => {
     if (kind === 'dayPeriod') {
+        if (halfCleared(segments)) {
+            return undefined;
+        }
         return segments.hour === undefined ? segments.dayPeriod : segments.hour >= 12 ? 1 : 0;
     }
     const value = segments[kind];
@@ -68,14 +95,28 @@ export const shownValue = (kind, segments, twelve) => {
     }
     return value;
 };
-export const setSegment = (segments, kind, shown, twelve) => {
+export const setSegment = (segments, kind, shown, twelve, system) => {
     const next = { ...segments };
     if (shown === undefined) {
+        if (kind === 'dayPeriod' && twelve && segments.hour !== undefined) {
+            next.hour = segments.hour % 12;
+            next.dayPeriod = Number.NaN;
+            return next;
+        }
+        if (kind === 'hour' && twelve && segments.hour !== undefined && !halfCleared(segments)) {
+            next.dayPeriod = segments.hour >= 12 ? 1 : 0;
+        }
         delete next[kind];
         return next;
     }
     if (kind === 'hour' && twelve) {
-        const half = segments.hour !== undefined ? (segments.hour >= 12 ? 1 : 0) : (segments.dayPeriod ?? 0);
+        const half = halfCleared(segments)
+            ? 0
+            : segments.hour !== undefined
+                ? segments.hour >= 12
+                    ? 1
+                    : 0
+                : (segments.dayPeriod ?? 0);
         next.hour = (shown % 12) + half * 12;
     }
     else if (kind === 'dayPeriod') {
@@ -87,17 +128,20 @@ export const setSegment = (segments, kind, shown, twelve) => {
     else {
         next[kind] = shown;
     }
+    if (next.month !== undefined) {
+        next.month = Math.min(next.month, monthsIn(next.year, system));
+    }
     if (next.day !== undefined) {
-        next.day = Math.min(next.day, daysIn(next.month, next.year));
+        next.day = Math.min(next.day, daysIn(next.month, next.year, system));
     }
     return next;
 };
-export const stepSegment = (segments, kind, by, twelve, thisYear = new Date().getFullYear()) => {
-    const { max, min } = segmentRange(kind, segments, twelve);
+export const stepSegment = (segments, kind, by, twelve, thisYear, system) => {
+    const { max, min } = segmentRange(kind, segments, twelve, system);
     const shown = shownValue(kind, segments, twelve);
     let next;
     if (shown === undefined) {
-        next = kind === 'year' ? thisYear : by > 0 ? min : max;
+        next = kind === 'year' ? (thisYear ?? yearNow(system)) : by > 0 ? min : max;
     }
     else if (kind === 'year') {
         next = Math.min(max, Math.max(min, shown + by));
@@ -106,17 +150,17 @@ export const stepSegment = (segments, kind, by, twelve, thisYear = new Date().ge
         const span = max - min + 1;
         next = ((((shown - min + by) % span) + span) % span) + min;
     }
-    return setSegment(segments, kind, next, twelve);
+    return setSegment(segments, kind, next, twelve, system);
 };
-export const typeDigit = (segments, kind, typed, digit, twelve) => {
-    const { max, min } = segmentRange(kind, segments, twelve);
+export const typeDigit = (segments, kind, typed, digit, twelve, system) => {
+    const { max, min } = segmentRange(kind, segments, twelve, system);
     let text = `${typed}${digit}`;
     if (Number(text) > max) {
         text = digit;
     }
     const value = Number(text);
     const full = text.length >= String(max).length || value * 10 > max;
-    const next = value >= min ? setSegment(segments, kind, value, twelve) : segments;
+    const next = value >= min ? setSegment(segments, kind, value, twelve, system) : segments;
     return { advance: full && value >= min, segments: next, typed: full ? '' : text };
 };
 const pageStep = {
@@ -127,24 +171,24 @@ const pageStep = {
     second: 15,
     year: 5,
 };
-export const segmentKey = (key, { kind, locale, segments, twelve, typed }) => {
+export const segmentKey = (key, { kind, locale, segments, system, twelve, typed }) => {
     const done = (next) => next === undefined ? null : { advance: false, segments: next, typed: '' };
     if (key === 'ArrowUp' || key === 'ArrowDown') {
-        return done(stepSegment(segments, kind, key === 'ArrowUp' ? 1 : -1, twelve));
+        return done(stepSegment(segments, kind, key === 'ArrowUp' ? 1 : -1, twelve, undefined, system));
     }
     if (key === 'PageUp' || key === 'PageDown') {
         const by = (key === 'PageUp' ? 1 : -1) * (pageStep[kind] ?? 1);
-        return done(stepSegment(segments, kind, by, twelve));
+        return done(stepSegment(segments, kind, by, twelve, undefined, system));
     }
     if (key === 'Home' || key === 'End') {
-        const { max, min } = segmentRange(kind, segments, twelve);
-        return done(setSegment(segments, kind, key === 'Home' ? min : max, twelve));
+        const { max, min } = segmentRange(kind, segments, twelve, system);
+        return done(setSegment(segments, kind, key === 'Home' ? min : max, twelve, system));
     }
     if (key === 'Backspace' || key === 'Delete') {
-        return done(setSegment(segments, kind, undefined, twelve));
+        return done(setSegment(segments, kind, undefined, twelve, system));
     }
     if (/^\d$/.test(key) && kind !== 'dayPeriod') {
-        return typeDigit(segments, kind, typed, key, twelve);
+        return typeDigit(segments, kind, typed, key, twelve, system);
     }
     if (kind === 'dayPeriod' && key.length === 1) {
         const letter = key.toLowerCase();
@@ -154,9 +198,13 @@ export const segmentKey = (key, { kind, locale, segments, twelve, typed }) => {
     }
     return null;
 };
-export const segmentsOf = (kind, value) => {
+export const segmentsOf = (kind, value, system) => {
     if (kind === 'date') {
         const parts = /^(\d{4})-(\d{2})-(\d{2})$/.exec(value);
+        const date = system && parts ? asDate(value) : null;
+        if (system && date) {
+            return { ...system.parts(date) };
+        }
         return parts ? { day: Number(parts[3]), month: Number(parts[2]), year: Number(parts[1]) } : {};
     }
     const parts = /^(\d{2}):(\d{2})(?::(\d{2}))?$/.exec(value);
@@ -171,20 +219,24 @@ export const segmentsOf = (kind, value) => {
         ...(parts[3] === undefined ? {} : { second: Number(parts[3]) }),
     };
 };
-export const segmentsValue = (kind, segments, layout) => {
+export const segmentsValue = (kind, segments, layout, system) => {
     const shown = layout.flatMap((slot) => ('kind' in slot ? [slot.kind] : []));
     const needed = shown.filter((one) => one !== 'dayPeriod');
-    if (needed.some((one) => segments[one] === undefined)) {
+    if (needed.some((one) => segments[one] === undefined) ||
+        (shown.includes('dayPeriod') && halfCleared(segments))) {
         return '';
     }
     const pad = (number, width = 2) => String(number ?? 0).padStart(width, '0');
+    if (kind === 'date' && system) {
+        return fromDate(system.from(segments.year ?? 1, segments.month ?? 1, segments.day ?? 1));
+    }
     if (kind === 'date') {
         return `${pad(segments.year, 4)}-${pad(segments.month)}-${pad(segments.day)}`;
     }
     const clock = `${pad(segments.hour)}:${pad(segments.minute)}`;
     return shown.includes('second') ? `${clock}:${pad(segments.second)}` : clock;
 };
-export const isPartial = (kind, segments, layout) => segmentsValue(kind, segments, layout) === '' &&
+export const isPartial = (kind, segments, layout, system) => segmentsValue(kind, segments, layout, system) === '' &&
     layout.some((slot) => 'kind' in slot && slot.kind !== 'dayPeriod' && segments[slot.kind] !== undefined);
 export const segmentText = (kind, segments, twelve, locale) => {
     const shown = shownValue(kind, segments, twelve);
@@ -205,7 +257,7 @@ export const segmentText = (kind, segments, twelve, locale) => {
     }
     return kind === 'hour' && twelve ? String(shown) : String(shown).padStart(width, '0');
 };
-export const segmentValueText = (kind, segments, twelve, locale) => {
+export const segmentValueText = (kind, segments, twelve, locale, system) => {
     const text = segmentText(kind, segments, twelve, locale);
     const month = segments.month;
     if (kind !== 'month' || month === undefined) {
@@ -214,7 +266,9 @@ export const segmentValueText = (kind, segments, twelve, locale) => {
     const name = new Intl.DateTimeFormat(locale || undefined, {
         month: 'long',
         timeZone: 'UTC',
-    }).format(new Date(Date.UTC(2000, month - 1, 1)));
+    }).format(system
+        ? system.from(segments.year ?? yearNow(system), month, 1)
+        : new Date(Date.UTC(2000, month - 1, 1)));
     return `${month} – ${name}`;
 };
 export const segmentName = (kind, locale) => {
@@ -226,3 +280,97 @@ export const segmentName = (kind, locale) => {
         return kind;
     }
 };
+const ZEROS = [
+    0x660, 0x6f0, 0x966, 0x9e6, 0xa66, 0xae6, 0xb66, 0xbe6, 0xc66, 0xce6, 0xd66, 0xe50, 0xed0, 0xf20,
+    0x1040, 0x17e0, 0x1810, 0xff10,
+];
+const latinDigits = (text) => text.replace(/\p{Nd}/gu, (char) => {
+    const code = char.charCodeAt(0);
+    const zero = ZEROS.find((one) => code >= one && code < one + 10);
+    return zero === undefined ? char : String(code - zero);
+});
+const wholeYear = (year, digits, now) => {
+    if (digits > 2) {
+        return year;
+    }
+    const century = Math.floor(now / 100) * 100;
+    const near = century + year;
+    return near > now + 20 ? near - 100 : near;
+};
+export const readWrittenDate = (text, locale, system) => {
+    const plain = latinDigits(text).toLowerCase();
+    const numbers = [...plain.matchAll(/\d+/g)].map((match) => match[0]);
+    let order = segmentLayout('date', locale).flatMap((slot) => 'kind' in slot && slot.kind !== 'dayPeriod' ? [slot.kind] : []);
+    const found = {};
+    if (!system) {
+        const names = (style) => Array.from({ length: 12 }, (_, index) => new Intl.DateTimeFormat(locale || undefined, { month: style, timeZone: 'UTC' })
+            .format(new Date(Date.UTC(2000, index, 1)))
+            .toLowerCase()
+            .replace(/\.$/, ''));
+        const words = plain.match(/\p{L}+/gu) ?? [];
+        for (const style of ['long', 'short']) {
+            const at = names(style).findIndex((name) => name.length > 1 && words.some((word) => word === name));
+            if (at >= 0 && found.month === undefined) {
+                found.month = at + 1;
+                order = order.filter((kind) => kind !== 'month');
+            }
+        }
+    }
+    if (numbers.length !== order.length || numbers.length === 0) {
+        return '';
+    }
+    if (numbers[0].length >= 3) {
+        const shown = order;
+        order = ['year', 'month', 'day'].filter((kind) => shown.includes(kind));
+    }
+    const now = system ? system.parts(new Date()).year : new Date().getFullYear();
+    order.forEach((kind, index) => {
+        const digits = numbers[index];
+        found[kind] = kind === 'year' ? wholeYear(Number(digits), digits.length, now) : Number(digits);
+    });
+    const { day, month, year } = found;
+    if (day === undefined || month === undefined || year === undefined || year < 1 || year > 9999) {
+        return '';
+    }
+    if (month < 1 || month > monthsIn(year, system) || day < 1 || day > daysIn(month, year, system)) {
+        return '';
+    }
+    return system
+        ? fromDate(system.from(year, month, day))
+        : segmentsValue('date', found, [{ kind: 'year' }, { kind: 'month' }, { kind: 'day' }]);
+};
+export const readWrittenTime = (text, locale, seconds = false) => {
+    const plain = latinDigits(text).toLowerCase();
+    const numbers = [...plain.matchAll(/\d+/g)].map((match) => Number(match[0]));
+    const letters = plain.replace(/[\d\s:.,h]/g, '');
+    const words = [0, 1].map((half) => segmentText('dayPeriod', { dayPeriod: half }, true, locale).toLowerCase().replace(/\./g, ''));
+    const bare = letters.replace(/\./g, '');
+    const half = bare === ''
+        ? undefined
+        : words.indexOf(bare) >= 0
+            ? words.indexOf(bare)
+            : /^a(m)?$/.test(bare)
+                ? 0
+                : /^p(m)?$/.test(bare)
+                    ? 1
+                    : -1;
+    if (half === -1 || numbers.length === 0 || numbers.length > 3) {
+        return '';
+    }
+    if (numbers.length === 1 && /\d{3,4}/.test(plain)) {
+        const run = numbers[0];
+        numbers.splice(0, 1, Math.floor(run / 100), run % 100);
+    }
+    let [hour = 0, minute = 0, second = 0] = numbers;
+    if (half !== undefined) {
+        if (hour < 1 || hour > 12) {
+            return '';
+        }
+        hour = (hour % 12) + half * 12;
+    }
+    if (hour > 23 || minute > 59 || second > 59) {
+        return '';
+    }
+    const pad = (number) => String(number).padStart(2, '0');
+    return seconds ? `${pad(hour)}:${pad(minute)}:${pad(second)}` : `${pad(hour)}:${pad(minute)}`;
+};

package/dist/version.d.ts

@@ -6,4 +6,4 @@
  * release, so the two never disagree; a spec beside this holds them to it.
  * Nothing else in the running code knows which release it is.
  */
-export declare const VERSION = "0.159.0";
+export declare const VERSION = "0.161.0";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = '0.159.0';
+export const VERSION = '0.161.0';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fusion.dev/helix-core",
   "description": "Helix element primitives: base classes, mixins, decorators, utilities.",
-  "version": "0.159.0",
+  "version": "0.161.0",
   "license": "MIT",
   "author": "Ross Sheppard <ross.sheppard@fusion.dev>",
   "repository": {
@@ -56,11 +56,11 @@
   "bugs": "https://github.com/project-fusion/fusion/issues",
   "dependencies": {
     "@floating-ui/dom": "^1.8.0",
-    "@fusion.dev/helix-icons": "0.159.0"
+    "@fusion.dev/helix-icons": "0.161.0"
   },
   "devDependencies": {
-    "@fusion.dev/helix-cem": "0.159.0",
-    "@fusion.dev/helix-testing": "0.159.0",
+    "@fusion.dev/helix-cem": "0.161.0",
+    "@fusion.dev/helix-testing": "0.161.0",
     "@lit-labs/ssr": "^4.1.0",
     "lit": "^3.2.1"
   },