@bbn/bbn 2.0.36 → 2.0.38

package/dist/dt/functions/buildLocaleFromIntl.d.ts

@@ -23,12 +23,6 @@ type CommonFormats = {
  *  - Date: only sensible combos (Y-M-D ± weekday, Y-M, M-D).
  *  - Time: hour / hour:minute / hour:minute:second (+ optional TZ).
  *  - Datetime: only full dates (Y-M-D ± weekday) combined with time.
- *
- * Fully numeric date forms (like "1/1/1970") are explicitly included via:
- *   { year: 'numeric', month: 'numeric', day: 'numeric' }
- *   { year: '2-digit', month: 'numeric', day: 'numeric' }
- *   { year: 'numeric', month: '2-digit', day: '2-digit' }
- *   { year: '2-digit', month: '2-digit', day: '2-digit' }
  */
 export declare function getCommonFormatsForLocale(lng: string | string[]): CommonFormats;
 export default function buildLocaleFromIntl(): void;

package/dist/dt/functions/buildLocaleFromIntl.js

@@ -3,31 +3,50 @@ import numProperties from "../../fn/object/numProperties.js";
 /**
  * Build a token pattern (YYYY, MM, DD, dddd, HH, II, SS, A, z) from Intl parts.
  * Uses Intl options to distinguish MMM vs MMMM, ddd vs dddd, etc.
- * All literal chunks are wrapped in square brackets so they can't be mistaken
- * for tokens by the parser.
  */
 function partsToPattern(parts, hourCycle, opts) {
     let pattern = '';
     const hasDayPeriod = parts.some(p => p.type === 'dayPeriod');
     const is12h = hasDayPeriod || hourCycle === 'h12' || hourCycle === 'h11';
+    // ---- detect "all numeric date" ----
+    const yearIsNumeric = opts.year === 'numeric' || opts.year === '2-digit';
+    const monthIsNumeric = opts.month === 'numeric' || opts.month === '2-digit';
+    const dayIsNumeric = opts.day === 'numeric' || opts.day === '2-digit';
+    const hasYear = !!opts.year;
+    const hasMonth = !!opts.month;
+    const hasDay = !!opts.day;
+    const hasWeekday = !!opts.weekday;
+    const hasTextMonth = opts.month === 'short' || opts.month === 'long';
+    const isAllNumericDate = hasYear && hasMonth && hasDay &&
+        yearIsNumeric && monthIsNumeric && dayIsNumeric &&
+        !hasWeekday && !hasTextMonth;
     for (const p of parts) {
         switch (p.type) {
             case 'year':
-                pattern += 'YYYY';
+                if (opts.year === '2-digit') {
+                    pattern += 'YY';
+                }
+                else {
+                    pattern += 'YYYY';
+                }
                 break;
             case 'month':
-                if (opts.month === 'short') {
+                if (isAllNumericDate) {
+                    // normalize to single M when date is fully numeric
+                    pattern += 'M';
+                }
+                else if (opts.month === 'short') {
                     pattern += 'MMM';
                 }
                 else if (opts.month === 'long') {
                     pattern += 'MMMM';
                 }
                 else if (opts.month === 'numeric' || opts.month === '2-digit') {
-                    // numeric month
+                    // non "all numeric" case (e.g., month+year or month+day only)
                     pattern += /^\d{2}$/.test(p.value) ? 'MM' : 'M';
                 }
                 else {
-                    // Fallback: infer from value
+                    // Fallback
                     if (/^\d+$/.test(p.value)) {
                         pattern += p.value.length === 2 ? 'MM' : 'M';
                     }
@@ -37,7 +56,13 @@ function partsToPattern(parts, hourCycle, opts) {
                 }
                 break;
             case 'day':
-                pattern += p.value.length === 2 ? 'DD' : 'D';
+                if (isAllNumericDate) {
+                    // normalize to single D when date is fully numeric
+                    pattern += 'D';
+                }
+                else {
+                    pattern += p.value.length === 2 ? 'DD' : 'D';
+                }
                 break;
             case 'weekday':
                 if (opts.weekday === 'short' || opts.weekday === 'narrow') {
@@ -71,7 +96,7 @@ function partsToPattern(parts, hourCycle, opts) {
                 pattern += 'z';
                 break;
             case 'literal': {
-                // Wrap ALL literals into [ ... ] to avoid confusion with tokens
+                // Wrap literals in [ ... ] so your parser doesn't confuse them
                 if (p.value.length) {
                     const v = p.value.replace(/]/g, '\\]');
                     pattern += `[${v}]`;
@@ -79,7 +104,6 @@ function partsToPattern(parts, hourCycle, opts) {
                 break;
             }
             default:
-                // Fallback, should be rare
                 pattern += p.value;
                 break;
         }
@@ -94,12 +118,6 @@ function partsToPattern(parts, hourCycle, opts) {
  *  - Date: only sensible combos (Y-M-D ± weekday, Y-M, M-D).
  *  - Time: hour / hour:minute / hour:minute:second (+ optional TZ).
  *  - Datetime: only full dates (Y-M-D ± weekday) combined with time.
- *
- * Fully numeric date forms (like "1/1/1970") are explicitly included via:
- *   { year: 'numeric', month: 'numeric', day: 'numeric' }
- *   { year: '2-digit', month: 'numeric', day: 'numeric' }
- *   { year: 'numeric', month: '2-digit', day: '2-digit' }
- *   { year: '2-digit', month: '2-digit', day: '2-digit' }
  */
 export function getCommonFormatsForLocale(lng) {
     const sample = new Date(Date.UTC(2000, 0, 2, 13, 45, 30));
@@ -110,14 +128,11 @@ export function getCommonFormatsForLocale(lng) {
     const seenTimePatterns = new Set();
     const seenDateTimePatterns = new Set();
     // ---- 1) DATE: curated list of useful patterns ----
-    // Numeric full dates (this covers "1/1/1970"-style formats as masks like D/M/YYYY or DD/MM/YYYY).
+    // Includes your important one: { day: "numeric", month: "short", year: "numeric" }
     const dateOptionsList = [
-        // Fully numeric YYYY-M-D variants
-        { year: 'numeric', month: 'numeric', day: 'numeric' },
+        // Full dates
         { year: 'numeric', month: '2-digit', day: '2-digit' },
-        { year: '2-digit', month: 'numeric', day: 'numeric' },
-        { year: '2-digit', month: '2-digit', day: '2-digit' },
-        // Full dates with textual month
+        { year: 'numeric', month: 'numeric', day: 'numeric' },
         { year: 'numeric', month: 'short', day: 'numeric' },
         { year: 'numeric', month: 'long', day: 'numeric' },
         // Full dates with weekday
@@ -131,7 +146,7 @@ export function getCommonFormatsForLocale(lng) {
         // Month–day (no year)
         { month: 'numeric', day: 'numeric' },
         { month: '2-digit', day: '2-digit' },
-        { month: 'short', day: 'numeric' },
+        { month: 'short', day: 'numeric' }, // ← e.g. "22 janv."
         { month: 'long', day: 'numeric' }
     ];
     const fullDateOptions = []; // Y+M+D (± weekday)
@@ -176,7 +191,7 @@ export function getCommonFormatsForLocale(lng) {
             });
         }
     }
-    // ---- 3) DATETIME: only full dates (Y-M-D ± weekday) × time ----
+    // ---- 3) DATETIME: only full dates (Y-M-D ± weekday) × time
     for (const dOpts of fullDateOptions) {
         for (const tOpts of timeOptionsList) {
             const opts = Object.assign(Object.assign({}, dOpts), tOpts);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbn/bbn",
-  "version": "2.0.36",
+  "version": "2.0.38",
   "description": "Javascript toolkit",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",