@bbn/bbn 2.0.61 → 2.0.62

package/dist/dt/functions/buildLocaleFromIntl.js

@@ -3,23 +3,27 @@ import extend from "../../fn/object/extend.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.
  */
-const partsToPattern = (parts, resolved, requestedOpts) => {
+function partsToPattern(parts, hourCycle, opts) {
     let pattern = '';
-    const hourCycle = resolved.hourCycle;
     const hasDayPeriod = parts.some(p => p.type === 'dayPeriod');
     const is12h = hasDayPeriod || hourCycle === 'h12' || hourCycle === 'h11';
-    const hasYear = !!requestedOpts.year;
-    const hasMonth = !!requestedOpts.month;
-    const hasDay = !!requestedOpts.day;
-    const hasWeekday = !!requestedOpts.weekday;
-    const hasTextMonth = requestedOpts.month === 'short' || requestedOpts.month === 'long';
-    // "Whole numeric date" = year+month+day, all numeric, no weekday, no text month
-    const isWholeNumericDate = hasYear && hasMonth && hasDay && !hasWeekday && !hasTextMonth;
+    const hasWeekday = !!opts.weekday;
+    const hasTextMonth = opts.month === 'short' || opts.month === 'long';
+    // when we *request* year/month/day in "numeric" (not 2-digit, not short),
+    // and all three are present, then we want D/M/YYYY in our mask,
+    // in the locale's order, even if the sample shows "02" / "01".
+    const requestedPureNumericYMD = opts.year === 'numeric' &&
+        opts.month === 'numeric' &&
+        opts.day === 'numeric' &&
+        !hasWeekday &&
+        !hasTextMonth;
     for (const p of parts) {
         switch (p.type) {
             case 'year': {
-                // Keep YY when the locale actually resolved to 2-digit
-                if (resolved.year === '2-digit') {
+                // If you want YY vs YYYY disambiguation you can still
+                // look at opts.year here; I’ll keep it simple:
+                // numeric → YYYY, '2-digit' → YY
+                if (opts.year === '2-digit') {
                     pattern += 'YY';
                 }
                 else {
@@ -28,28 +32,33 @@ const partsToPattern = (parts, resolved, requestedOpts) => {
                 break;
             }
             case 'month': {
-                // textual month
-                if (requestedOpts.month === 'short' || requestedOpts.month === 'long') {
-                    pattern += requestedOpts.month === 'long' ? 'MMMM' : 'MMM';
+                // Textual month first
+                if (opts.month === 'short') {
+                    pattern += 'MMM';
                     break;
                 }
-                if (isWholeNumericDate) {
-                    // whole numeric date → always use M (accepts 1–2 digits)
+                if (opts.month === 'long') {
+                    pattern += 'MMMM';
+                    break;
+                }
+                // 👉 Pure numeric Y-M-D requested: always M
+                if (requestedPureNumericYMD) {
                     pattern += 'M';
                     break;
                 }
-                // other numeric month cases (e.g. year–month or month–day)
+                // Other numeric month cases (year-month, month-day, or 2-digit)
                 if (/^\d+$/.test(p.value)) {
                     pattern += p.value.length === 2 ? 'MM' : 'M';
                 }
                 else {
+                    // should not happen, but be defensive
                     pattern += p.value.length > 3 ? 'MMMM' : 'MMM';
                 }
                 break;
             }
             case 'day': {
-                if (isWholeNumericDate) {
-                    // whole numeric date → always use D (accepts 1–2 digits)
+                // 👉 Pure numeric Y-M-D requested: always D
+                if (requestedPureNumericYMD) {
                     pattern += 'D';
                     break;
                 }
@@ -57,10 +66,10 @@ const partsToPattern = (parts, resolved, requestedOpts) => {
                 break;
             }
             case 'weekday': {
-                if (requestedOpts.weekday === 'short' || requestedOpts.weekday === 'narrow') {
+                if (opts.weekday === 'short' || opts.weekday === 'narrow') {
                     pattern += 'ddd';
                 }
-                else if (requestedOpts.weekday === 'long') {
+                else if (opts.weekday === 'long') {
                     pattern += 'dddd';
                 }
                 else {
@@ -90,20 +99,15 @@ const partsToPattern = (parts, resolved, requestedOpts) => {
                 pattern += 'z';
                 break;
             case 'literal': {
-                if (!p.value) {
+                if (!p.value)
                     break;
-                }
-                // If the literal contains any letter (ASCII or basic Latin-1),
-                // wrap it in [ ... ] so it can't be confused with tokens.
-                // Otherwise (spaces, /, -, :, commas, etc.) keep it raw.
+                // Only wrap *text* literals in [ ... ], not separators like /, -, spaces, etc.
                 const hasLetter = /[A-Za-zÀ-ÖØ-öø-ÿ]/.test(p.value);
                 if (hasLetter) {
-                    // Escape ']' inside the bracketed literal
                     const v = p.value.replace(/]/g, '\\]');
                     pattern += `[${v}]`;
                 }
                 else {
-                    // Non-problematic punctuation/whitespace: just append as-is
                     pattern += p.value;
                 }
                 break;
@@ -114,7 +118,8 @@ const partsToPattern = (parts, resolved, requestedOpts) => {
         }
     }
     return pattern;
-};
+}
+;
 /**
  * Get a curated set of *common* date, time and datetime formats
  * for the given locale, without exploding into thousands of combos.
@@ -162,7 +167,7 @@ const getCommonFormatsForLocale = (lng) => {
         const fmt = new Intl.DateTimeFormat(lng, opts);
         const parts = fmt.formatToParts(sample);
         const resolved = fmt.resolvedOptions();
-        const pattern = partsToPattern(parts, resolved, opts);
+        const pattern = partsToPattern(parts, resolved.hourCycle, opts);
         if (!seenDatePatterns.has(pattern)) {
             seenDatePatterns.add(pattern);
             date.push({
@@ -189,7 +194,7 @@ const getCommonFormatsForLocale = (lng) => {
         const fmt = new Intl.DateTimeFormat(lng, opts);
         const parts = fmt.formatToParts(sample);
         const resolved = fmt.resolvedOptions();
-        const pattern = partsToPattern(parts, resolved, opts);
+        const pattern = partsToPattern(parts, resolved.hourCycle, opts);
         if (!seenTimePatterns.has(pattern)) {
             seenTimePatterns.add(pattern);
             time.push({
@@ -206,7 +211,7 @@ const getCommonFormatsForLocale = (lng) => {
             const fmt = new Intl.DateTimeFormat(lng, opts);
             const parts = fmt.formatToParts(sample);
             const resolved = fmt.resolvedOptions();
-            const pattern = partsToPattern(parts, resolved, opts);
+            const pattern = partsToPattern(parts, resolved.hourCycle, opts);
             if (!seenDateTimePatterns.has(pattern)) {
                 seenDateTimePatterns.add(pattern);
                 datetime.push({

package/dist/dt/functions/guessFormat.js

@@ -30,54 +30,6 @@ const MYSQL_AND_NATIVE_FORMATS = [
     // Tue Oct 29 2024 14:30:00
     'ddd MMM DD YYYY HH:II:SS'
 ];
-const isPureNumericDateFormat = (fmt) => {
-    // Only Y/M/D tokens and literal separators, no time or AM/PM tokens
-    if (/[HhI SAz]/.test(fmt)) {
-        return false;
-    }
-    // Must have year and month and day tokens
-    if (!/[Y]/.test(fmt) || !/[M]/.test(fmt) || !/[D]/.test(fmt)) {
-        return false;
-    }
-    return true;
-};
-const makeRelaxedNumericFormat = (fmt) => {
-    // Relax DD -> D and MM -> M, but don't touch other tokens
-    return fmt.replace(/DD/g, 'D').replace(/MM/g, 'M');
-};
-/**
- * If the format is a pure numeric date like D/M/YYYY or DD/MM/YYYY,
- * and the input clearly uses 2-digit day and 2-digit month (22/11/2022),
- * upgrade to DD/MM/YYYY.
- */
-const normalizeNumericDM = (fmt, input) => {
-    // Only touch "pure numeric date" patterns: D/M/YYYY, DD-MM-YY, etc.
-    // No time tokens, no text months, no weekdays.
-    if (/[HhI SAzM]{2,}|[A-Za-z]/.test(fmt.replace(/[DMY]/g, ''))) {
-        // If there are other letters than D/M/Y (like MMM, ddd), don't touch.
-        // (We only want simple numeric dates)
-        return fmt;
-    }
-    // Quick check: must contain D and M and Y
-    if (!fmt.includes('D') || !fmt.includes('M') || !fmt.includes('Y')) {
-        return fmt;
-    }
-    // Extract numeric chunks from the input: ["22", "11", "2022"] for "22/11/2022"
-    const nums = input.split(/\D+/).filter(Boolean);
-    if (nums.length < 3) {
-        return fmt;
-    }
-    const [dayStr, monthStr] = nums;
-    // Only upgrade if both day and month are exactly 2-digit
-    if (dayStr.length === 2 && monthStr.length === 2) {
-        // Upgrade first D-group to DD and first M-group to MM
-        let out = fmt;
-        out = out.replace(/D+/, 'DD');
-        out = out.replace(/M+/, 'MM');
-        return out;
-    }
-    return fmt;
-};
 export default function guessFormat(input, formats, lng) {
     const str = input.trim();
     if (!str) {
@@ -89,24 +41,11 @@ export default function guessFormat(input, formats, lng) {
             // 1) Try strict format first
             try {
                 parse(str, fmt);
-                return normalizeNumericDM(fmt, str);
+                return fmt;
             }
             catch (_a) {
                 // ignore, we'll maybe try a relaxed version
             }
-            // 2) If it's a pure numeric date pattern, try a relaxed version too
-            if (isPureNumericDateFormat(fmt)) {
-                const relaxed = makeRelaxedNumericFormat(fmt);
-                if (relaxed !== fmt) {
-                    try {
-                        parse(str, relaxed);
-                        return relaxed;
-                    }
-                    catch (_b) {
-                        // still nothing, move on
-                    }
-                }
-            }
         }
         return null;
     };

package/package.json

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