@astryxdesign/core 0.7.9-canary.4d7dca6 → 0.7.9-canary.52e65f3

package/dist/utils/calendarDateParser.d.ts

@@ -71,6 +71,8 @@ export interface CalendarDateLexicon {
     readonly eras: ReadonlyMap<string, string>;
     readonly yearAliases: ReadonlyMap<string, string>;
     readonly trailers: ReadonlySet<string>;
+    readonly yearMarkers: ReadonlySet<string>;
+    readonly separators: ReadonlySet<string>;
     readonly weekdays: ReadonlySet<string>;
     readonly vocabulary: ReadonlyArray<string>;
     readonly vocabularySet: ReadonlySet<string>;

package/dist/utils/calendarDateParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calendarDateParser.d.ts","sourceRoot":"","sources":["../../src/utils/calendarDateParser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"calendarDateParser.d.ts","sourceRoot":"","sources":["../../src/utils/calendarDateParser.ts"],"names":[],"mappings":"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"}

package/dist/utils/calendarDateParser.js

@@ -291,6 +291,8 @@ function buildLexicon(locale, calendar) {
   const yearAliases = new Map();
   const skip = new Set();
   const trailers = new Set();
+  const yearMarkers = new Set();
+  const separators = new Set();
   const weekdays = new Set();
   const addSkip = (text, words = skip) => {
     for (const word of norm(text).replace(NOT_WORDS, ' ').split(/\s+/)) {
@@ -370,10 +372,13 @@ function buildLexicon(locale, calendar) {
     for (const options of literalFormats) {
       for (const pd of literalDates) {
         const parts = partsOf(loc, calendar, options, pd);
-        for (const part of parts) {
+        for (const [k, part] of parts.entries()) {
           if (part.type === 'literal' || partType(part) === 'yearName') {
             addSkip(part.value);
           }
+          if (part.type === 'literal' && parts[k - 1]?.type === 'year') {
+            addSkip(part.value, yearMarkers);
+          }
         }
         if (loc === locale) {
           const tail = parts.at(-1);
@@ -405,6 +410,13 @@ function buildLexicon(locale, calendar) {
       }
     }
   }
+  const hint = displayOptions(locale, calendar, NUMERIC);
+  for (const part of partsOf(locale, calendar, hint, literalDates[0])) {
+    const separator = norm(part.value).replace(/\s+/g, '');
+    if (part.type === 'literal' && separator) {
+      separators.add(separator);
+    }
+  }
   if (LUNISOLAR.has(calendar)) {
     // Year names cycle every 60 years.
     for (let year = 1996; year < 2057; year++) {
@@ -496,6 +508,8 @@ function buildLexicon(locale, calendar) {
     eras,
     yearAliases,
     trailers,
+    yearMarkers,
+    separators,
     weekdays,
     vocabulary: [...vocabularySet].sort((a, b) => b.length - a.length),
     vocabularySet,
@@ -517,8 +531,9 @@ function calendarEraYear(locale, calendar, pd) {
 // Tokens
 // =============================================================================
 
-function tokenize(s, lex) {
+function tokenize(s, lex, isDigitNameRead = true) {
   const out = [];
+  let hasDigitName = false;
   let i = 0;
   const end = s.trimEnd().length;
   while (i < end) {
@@ -533,6 +548,13 @@ function tokenize(s, lex) {
       i = template.end;
       continue;
     }
+    const digitName = isDigitNameRead && /\d/.test(ch) && matchWord(s, i, lex);
+    if (digitName) {
+      out.push(wordToken(digitName, lex));
+      hasDigitName = true;
+      i += digitName.length;
+      continue;
+    }
     if (/\d/.test(ch)) {
       let j = i;
       while (j < s.length && /\d/.test(s[j])) {
@@ -588,6 +610,17 @@ function tokenize(s, lex) {
     }
     return 'unreadable';
   }
+  // Latvian "1. adars" is a month, and also day 1 of "adars". It is the day
+  // when no other number can be the day. A number before the year word, as in
+  // "26. g.", is the year.
+  const canBeDay = (token, k) => {
+    const next = out.slice(k + 1).find(t => t.t !== 'sep');
+    const isYear = next?.t === 'word' && next.isYearMarker === true;
+    return token.t === 'num' && Number(token.v) <= 31 && !isYear;
+  };
+  if (hasDigitName && !out.some(canBeDay)) {
+    return tokenize(s, lex, false);
+  }
   return out;
 }
 function matchTemplate(s, i, lex) {
@@ -681,7 +714,8 @@ function wordToken(word, lex) {
     };
   }
   return {
-    t: 'word'
+    t: 'word',
+    isYearMarker: lex.yearMarkers.has(word)
   };
 }
 
@@ -803,7 +837,7 @@ export function parseCalendarDate(text, lex, options = {}) {
     if (nums.length < 2) {
       return INCOMPLETE;
     }
-    if (nums.length > 3 || !sameSeparators(tokens)) {
+    if (nums.length > 3 || !sameSeparators(tokens, lex)) {
       return UNREADABLE;
     }
     let order = nums.length === 2 ? lex.order.filter(field => field !== 'year') : lex.order;
@@ -912,7 +946,12 @@ function finish(date, isComplete, isDateDisabled) {
     isComplete
   };
 }
-function sameSeparators(tokens) {
+
+/**
+ * Whether the numbers share one separator. Two separators of the locale's own
+ * numeric pattern also match, such as Hindi Buddhist "1/1`/2443".
+ */
+function sameSeparators(tokens, lex) {
   let previous = null;
   let seenNumber = false;
   let pending = null;
@@ -920,7 +959,7 @@ function sameSeparators(tokens) {
     if (token.t === 'num') {
       if (seenNumber) {
         const separator = pending ?? '';
-        if (previous != null && separator !== previous) {
+        if (previous != null && separator !== previous && !(lex.separators.has(separator) && lex.separators.has(previous))) {
           return false;
         }
         previous = separator;
@@ -1057,11 +1096,35 @@ function resolveDate(lex, fields) {
 // =============================================================================
 
 const displayOptionCache = new WeakMap();
+const eraChangeCache = new Map();
+
+/**
+ * Whether the era changes between 1900 and 2100. Only then can a year without
+ * its era read as two dates.
+ */
+function hasEraChange(calendar) {
+  let result = eraChangeCache.get(calendar);
+  if (result == null) {
+    const eraOf = date => calendarEraYear('en', calendar, date).era;
+    result = eraOf({
+      year: 1900,
+      month: 1,
+      day: 1
+    }) !== eraOf({
+      year: 2100,
+      month: 12,
+      day: 31
+    });
+    eraChangeCache.set(calendar, result);
+  }
+  return result;
+}
 
 /**
  * Adds the era to a format that omits it, so a year never reads as a
  * Gregorian year. Keeps the locale's own pattern when the era would reorder
- * the fields.
+ * the fields. Where the era changes, it uses a narrow era that keeps the
+ * order instead, such as Amharic Japanese "1/1/8 R".
  */
 function displayOptions(locale, calendar, options) {
   if (WITHOUT_ERA.has(calendar)) {
@@ -1082,14 +1145,19 @@ function displayOptions(locale, calendar, options) {
     };
     const parts = partsOf(locale, calendar, options, sample);
     result = options;
+    const order = fieldOrder(parts).join();
     if (!parts.some(p => p.type === 'era')) {
-      const withEra = {
-        ...options,
-        era: 'short'
-      };
-      const eraParts = partsOf(locale, calendar, withEra, sample);
-      if (fieldOrder(parts).join() === fieldOrder(eraParts).join()) {
-        result = withEra;
+      const widths = hasEraChange(calendar) ? ['short', 'narrow'] : ['short'];
+      for (const era of widths) {
+        const withEra = {
+          ...options,
+          era
+        };
+        const eraParts = partsOf(locale, calendar, withEra, sample);
+        if (fieldOrder(eraParts).join() === order) {
+          result = withEra;
+          break;
+        }
       }
     }
     byLocale.set(key, result);
@@ -1102,10 +1170,30 @@ function formatInCalendar(pd, options, locale, calendar) {
       relatedYear: true
     });
   }
-  return plainDateFormat(pd, {
-    ...displayOptions(locale, calendar, options),
+  const display = displayOptions(locale, calendar, options);
+  const text = plainDateFormat(pd, {
+    ...display,
     calendar
   }, locale);
+  // When every era width reorders the fields, such as the Amharic short-month
+  // date, the text has no era. Text without an era reads in the latest era.
+  // So a date of an earlier era adds the era. It goes at the start or the
+  // end, as in the era format.
+  const eraOf = date => calendarEraYear('en', calendar, date).era;
+  if (!hasEraChange(calendar) || eraOf(pd) === eraOf({
+    year: 9999,
+    month: 12,
+    day: 31
+  }) || partsOf(locale, calendar, display, pd).some(p => p.type === 'era')) {
+    return text;
+  }
+  const withEra = partsOf(locale, calendar, {
+    ...options,
+    era: 'short'
+  }, pd);
+  const at = withEra.findIndex(p => p.type === 'era');
+  const era = withEra.slice(at === 0 ? 0 : at - 1, at === 0 ? 2 : at + 1).map(p => p.value).join('');
+  return at === 0 ? era + text : text + era;
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astryxdesign/core",
-  "version": "0.7.9-canary.4d7dca6",
+  "version": "0.7.9-canary.52e65f3",
   "displayName": "Astryx Core",
   "description": "The component library. Accessible, themeable React components with built-in spacing, dark mode, and StyleX styling.",
   "author": "Meta Open Source",
@@ -880,9 +880,9 @@
     "react-dom": ">=19.0.0"
   },
   "devDependencies": {
-    "@astryxdesign/a11y-spec": "0.7.9-canary.4d7dca6",
-    "@astryxdesign/cli": "0.7.9-canary.4d7dca6",
-    "@astryxdesign/interaction-harness": "0.7.9-canary.4d7dca6",
+    "@astryxdesign/a11y-spec": "0.7.9-canary.52e65f3",
+    "@astryxdesign/cli": "0.7.9-canary.52e65f3",
+    "@astryxdesign/interaction-harness": "0.7.9-canary.52e65f3",
     "@babel/cli": "^7.29.7",
     "@babel/core": "^7.29.7",
     "@babel/preset-react": "^7.29.7",

package/src/utils/calendarDateParser.ts

@@ -91,6 +91,8 @@ export interface CalendarDateLexicon {
   readonly eras: ReadonlyMap<string, string>;
   readonly yearAliases: ReadonlyMap<string, string>;
   readonly trailers: ReadonlySet<string>;
+  readonly yearMarkers: ReadonlySet<string>;
+  readonly separators: ReadonlySet<string>;
   readonly weekdays: ReadonlySet<string>;
   readonly vocabulary: ReadonlyArray<string>;
   readonly vocabularySet: ReadonlySet<string>;
@@ -352,6 +354,8 @@ function buildLexicon(
   const yearAliases = new Map<string, string>();
   const skip = new Set<string>();
   const trailers = new Set<string>();
+  const yearMarkers = new Set<string>();
+  const separators = new Set<string>();
   const weekdays = new Set<string>();
 
   const addSkip = (text: string, words = skip) => {
@@ -439,10 +443,13 @@ function buildLexicon(
     for (const options of literalFormats) {
       for (const pd of literalDates) {
         const parts = partsOf(loc, calendar, options, pd);
-        for (const part of parts) {
+        for (const [k, part] of parts.entries()) {
           if (part.type === 'literal' || partType(part) === 'yearName') {
             addSkip(part.value);
           }
+          if (part.type === 'literal' && parts[k - 1]?.type === 'year') {
+            addSkip(part.value, yearMarkers);
+          }
         }
         if (loc === locale) {
           const tail = parts.at(-1);
@@ -472,6 +479,13 @@ function buildLexicon(
       }
     }
   }
+  const hint = displayOptions(locale, calendar, NUMERIC);
+  for (const part of partsOf(locale, calendar, hint, literalDates[0])) {
+    const separator = norm(part.value).replace(/\s+/g, '');
+    if (part.type === 'literal' && separator) {
+      separators.add(separator);
+    }
+  }
   if (LUNISOLAR.has(calendar)) {
     // Year names cycle every 60 years.
     for (let year = 1996; year < 2057; year++) {
@@ -576,6 +590,8 @@ function buildLexicon(
     eras,
     yearAliases,
     trailers,
+    yearMarkers,
+    separators,
     weekdays,
     vocabulary: [...vocabularySet].sort((a, b) => b.length - a.length),
     vocabularySet,
@@ -617,13 +633,18 @@ type Token =
   | {readonly t: 'monthNum'; readonly v: string; readonly isLeap: boolean}
   | {readonly t: 'era'; readonly code: string; readonly isWeekday?: boolean}
   | {readonly t: 'leap'}
-  | {readonly t: 'word'}
+  | {readonly t: 'word'; readonly isYearMarker?: boolean}
   | {readonly t: 'sep'; readonly v: string};
 
 type Tokens = Token[] | 'incomplete' | 'unreadable';
 
-function tokenize(s: string, lex: CalendarDateLexicon): Tokens {
+function tokenize(
+  s: string,
+  lex: CalendarDateLexicon,
+  isDigitNameRead = true,
+): Tokens {
   const out: Token[] = [];
+  let hasDigitName = false;
   let i = 0;
   const end = s.trimEnd().length;
   while (i < end) {
@@ -638,6 +659,13 @@ function tokenize(s: string, lex: CalendarDateLexicon): Tokens {
       i = template.end;
       continue;
     }
+    const digitName = isDigitNameRead && /\d/.test(ch) && matchWord(s, i, lex);
+    if (digitName) {
+      out.push(wordToken(digitName, lex));
+      hasDigitName = true;
+      i += digitName.length;
+      continue;
+    }
     if (/\d/.test(ch)) {
       let j = i;
       while (j < s.length && /\d/.test(s[j])) {
@@ -684,6 +712,17 @@ function tokenize(s: string, lex: CalendarDateLexicon): Tokens {
     }
     return 'unreadable';
   }
+  // Latvian "1. adars" is a month, and also day 1 of "adars". It is the day
+  // when no other number can be the day. A number before the year word, as in
+  // "26. g.", is the year.
+  const canBeDay = (token: Token, k: number) => {
+    const next = out.slice(k + 1).find(t => t.t !== 'sep');
+    const isYear = next?.t === 'word' && next.isYearMarker === true;
+    return token.t === 'num' && Number(token.v) <= 31 && !isYear;
+  };
+  if (hasDigitName && !out.some(canBeDay)) {
+    return tokenize(s, lex, false);
+  }
   return out;
 }
 
@@ -777,7 +816,7 @@ function wordToken(word: string, lex: CalendarDateLexicon): Token {
   if (alias != null) {
     return {t: 'num', v: alias, isAlias: true};
   }
-  return {t: 'word'};
+  return {t: 'word', isYearMarker: lex.yearMarkers.has(word)};
 }
 
 /** The month a typed abbreviation names when it starts only one month name. */
@@ -913,7 +952,7 @@ export function parseCalendarDate(
     if (nums.length < 2) {
       return INCOMPLETE;
     }
-    if (nums.length > 3 || !sameSeparators(tokens)) {
+    if (nums.length > 3 || !sameSeparators(tokens, lex)) {
       return UNREADABLE;
     }
     let order: ReadonlyArray<DateField> =
@@ -1022,7 +1061,11 @@ function finish(
   return {kind: 'value', date, isComplete};
 }
 
-function sameSeparators(tokens: Token[]): boolean {
+/**
+ * Whether the numbers share one separator. Two separators of the locale's own
+ * numeric pattern also match, such as Hindi Buddhist "1/1`/2443".
+ */
+function sameSeparators(tokens: Token[], lex: CalendarDateLexicon): boolean {
   let previous: string | null = null;
   let seenNumber = false;
   let pending: string | null = null;
@@ -1030,7 +1073,11 @@ function sameSeparators(tokens: Token[]): boolean {
     if (token.t === 'num') {
       if (seenNumber) {
         const separator = pending ?? '';
-        if (previous != null && separator !== previous) {
+        if (
+          previous != null &&
+          separator !== previous &&
+          !(lex.separators.has(separator) && lex.separators.has(previous))
+        ) {
           return false;
         }
         previous = separator;
@@ -1195,10 +1242,30 @@ const displayOptionCache = new WeakMap<
   Map<string, Intl.DateTimeFormatOptions>
 >();
 
+const eraChangeCache = new Map<CalendarSystem, boolean>();
+
+/**
+ * Whether the era changes between 1900 and 2100. Only then can a year without
+ * its era read as two dates.
+ */
+function hasEraChange(calendar: CalendarSystem): boolean {
+  let result = eraChangeCache.get(calendar);
+  if (result == null) {
+    const eraOf = (date: PlainDate) =>
+      calendarEraYear('en', calendar, date).era;
+    result =
+      eraOf({year: 1900, month: 1, day: 1}) !==
+      eraOf({year: 2100, month: 12, day: 31});
+    eraChangeCache.set(calendar, result);
+  }
+  return result;
+}
+
 /**
  * Adds the era to a format that omits it, so a year never reads as a
  * Gregorian year. Keeps the locale's own pattern when the era would reorder
- * the fields.
+ * the fields. Where the era changes, it uses a narrow era that keeps the
+ * order instead, such as Amharic Japanese "1/1/8 R".
  */
 function displayOptions(
   locale: Locale,
@@ -1219,11 +1286,18 @@ function displayOptions(
     const sample = {year: 2026, month: 11, day: 2};
     const parts = partsOf(locale, calendar, options, sample);
     result = options;
+    const order = fieldOrder(parts).join();
     if (!parts.some(p => p.type === 'era')) {
-      const withEra = {...options, era: 'short'} as const;
-      const eraParts = partsOf(locale, calendar, withEra, sample);
-      if (fieldOrder(parts).join() === fieldOrder(eraParts).join()) {
-        result = withEra;
+      const widths = hasEraChange(calendar)
+        ? (['short', 'narrow'] as const)
+        : (['short'] as const);
+      for (const era of widths) {
+        const withEra = {...options, era};
+        const eraParts = partsOf(locale, calendar, withEra, sample);
+        if (fieldOrder(eraParts).join() === order) {
+          result = withEra;
+          break;
+        }
       }
     }
     byLocale.set(key, result);
@@ -1242,11 +1316,27 @@ function formatInCalendar(
       relatedYear: true,
     });
   }
-  return plainDateFormat(
-    pd,
-    {...displayOptions(locale, calendar, options), calendar},
-    locale,
-  );
+  const display = displayOptions(locale, calendar, options);
+  const text = plainDateFormat(pd, {...display, calendar}, locale);
+  // When every era width reorders the fields, such as the Amharic short-month
+  // date, the text has no era. Text without an era reads in the latest era.
+  // So a date of an earlier era adds the era. It goes at the start or the
+  // end, as in the era format.
+  const eraOf = (date: PlainDate) => calendarEraYear('en', calendar, date).era;
+  if (
+    !hasEraChange(calendar) ||
+    eraOf(pd) === eraOf({year: 9999, month: 12, day: 31}) ||
+    partsOf(locale, calendar, display, pd).some(p => p.type === 'era')
+  ) {
+    return text;
+  }
+  const withEra = partsOf(locale, calendar, {...options, era: 'short'}, pd);
+  const at = withEra.findIndex(p => p.type === 'era');
+  const era = withEra
+    .slice(at === 0 ? 0 : at - 1, at === 0 ? 2 : at + 1)
+    .map(p => p.value)
+    .join('');
+  return at === 0 ? era + text : text + era;
 }
 
 /**