@zelgadis87/utils-core 5.3.3 → 5.3.4

package/.rollup/index.cjs

@@ -2141,8 +2141,8 @@ class TimeInstant extends TimeBase {
         return timeInstantBuilder();
     }
     static fromIso8601(str) {
-        // Regex to capture: YYYY-MM-DDTHH:mm:ss.sssZ or YYYY-MM-DDTHH:mm:ss.sss±HH:mm
-        const iso8601Regex = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})\.(\d{3})(Z|[+-]\d{2}:\d{2})?$/;
+        // Regex to capture: YYYY-MM-DDTHH:mm:ss[.sss]Z or YYYY-MM-DDTHH:mm:ss[.sss]±HH:mm
+        const iso8601Regex = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.(\d{3})|)(Z|[+-]\d{2}:\d{2})?$/;
         const match = str.match(iso8601Regex);
         if (!match) {
             throw new Error('Invalid ISO 8601 date format: ' + str);
@@ -2155,7 +2155,7 @@ class TimeInstant extends TimeBase {
         const hours = parseInt(hourStr, 10);
         const minutes = parseInt(minuteStr, 10);
         const seconds = parseInt(secondStr, 10);
-        const milliseconds = parseInt(millisecondStr, 10);
+        const milliseconds = millisecondStr ? parseInt(millisecondStr, 10) : 0;
         // Validate each component using standalone validation functions
         if (!isValidYear(year))
             throw new Error('Invalid year in: ' + str);
@@ -2591,6 +2591,216 @@ function parseTimeInstantComponents(dateString, pattern, config = {}) {
     }
     return result;
 }
+/**
+    * Parses a date string using only basic patterns that don't require Intl.
+    * This is a safer alternative to parseTimeInstantComponents that works even when Intl is not available.
+    *
+    * @param dateString The date string to parse
+    * @param pattern A basic pattern that doesn't require Intl (strongly typed)
+    * @returns Partial time instant parameters that were parsed from the string
+    * @throws Error if the string doesn't match the pattern or contains invalid values
+    */
+function parseTimeInstantBasicComponents(dateString, pattern) {
+    // Check if Intl is available, if so warn the user about the existing function
+    const isIntlAvailable = typeof Intl !== 'undefined' && typeof Intl.DateTimeFormat !== 'undefined';
+    if (isIntlAvailable)
+        console.warn('Intl is available, use parseTimeInstantComponents instead of parseTimeInstantBasicComponents.');
+    const result = {};
+    let patternIndex = 0;
+    let dateStringIndex = 0;
+    // Helper function to check if a character is a pattern token
+    const isPatternChar = (char) => ['y', 'M', 'd', 'H', 'm', 's', 'S'].includes(char);
+    // Token extraction rules dictionary
+    const tokenRules = {
+        '': { maxLength: undefined }, // Default rule
+        'H': {
+            maxLength: 2,
+            validator: (value) => /^\d{1,2}$/.test(value) && parseInt(value, 10) >= 0 && parseInt(value, 10) <= 23,
+            description: 'Hour (0-23, 1-2 digits)'
+        },
+        'HH': {
+            maxLength: 2,
+            validator: (value) => /^\d{2}$/.test(value) && parseInt(value, 10) >= 0 && parseInt(value, 10) <= 23,
+            description: 'Hour (00-23, exactly 2 digits)'
+        },
+        'M': {
+            maxLength: 2,
+            validator: (value) => /^\d{1,2}$/.test(value) && parseInt(value, 10) >= 1 && parseInt(value, 10) <= 12,
+            description: 'Month (1-12, 1-2 digits)'
+        },
+        'MM': {
+            maxLength: 2,
+            validator: (value) => /^\d{2}$/.test(value) && parseInt(value, 10) >= 1 && parseInt(value, 10) <= 12,
+            description: 'Month (01-12, exactly 2 digits)'
+        },
+        'd': {
+            maxLength: 2,
+            validator: (value) => /^\d{1,2}$/.test(value) && parseInt(value, 10) >= 1 && parseInt(value, 10) <= 31,
+            description: 'Day (1-31, 1-2 digits)'
+        },
+        'dd': {
+            maxLength: 2,
+            validator: (value) => /^\d{2}$/.test(value) && parseInt(value, 10) >= 1 && parseInt(value, 10) <= 31,
+            description: 'Day (01-31, exactly 2 digits)'
+        },
+        'm': {
+            maxLength: 2,
+            validator: (value) => /^\d{1,2}$/.test(value) && parseInt(value, 10) >= 0 && parseInt(value, 10) <= 59,
+            description: 'Minutes (0-59, 1-2 digits)'
+        },
+        'mm': {
+            maxLength: 2,
+            validator: (value) => /^\d{2}$/.test(value) && parseInt(value, 10) >= 0 && parseInt(value, 10) <= 59,
+            description: 'Minutes (00-59, exactly 2 digits)'
+        },
+        's': {
+            maxLength: 2,
+            validator: (value) => /^\d{1,2}$/.test(value) && parseInt(value, 10) >= 0 && parseInt(value, 10) <= 59,
+            description: 'Seconds (0-59, 1-2 digits)'
+        },
+        'ss': {
+            maxLength: 2,
+            validator: (value) => /^\d{2}$/.test(value) && parseInt(value, 10) >= 0 && parseInt(value, 10) <= 59,
+            description: 'Seconds (00-59, exactly 2 digits)'
+        },
+        'S': {
+            maxLength: 3,
+            validator: (value) => /^\d{1,3}$/.test(value) && parseInt(value, 10) >= 0 && parseInt(value, 10) <= 999,
+            description: 'Milliseconds (0-999, 1-3 digits)'
+        },
+        'SS': {
+            maxLength: 2,
+            validator: (value) => /^\d{2}$/.test(value) && parseInt(value, 10) >= 0 && parseInt(value, 10) <= 99,
+            description: 'Milliseconds (0-99, exactly 2 digits)'
+        },
+        'SSS': {
+            maxLength: 3,
+            validator: (value) => /^\d{3}$/.test(value) && parseInt(value, 10) >= 0 && parseInt(value, 10) <= 999,
+            description: 'Milliseconds (000-999, exactly 3 digits)'
+        },
+        'y': {
+            maxLength: 4,
+            validator: (value) => /^\d{1,4}$/.test(value) && parseInt(value, 10) >= 0 && parseInt(value, 10) <= 9999,
+            description: 'Year (0-9999, 1-4 digits)'
+        },
+        'yy': {
+            maxLength: 2,
+            validator: (value) => /^\d{2}$/.test(value),
+            description: 'Year (2 digits)'
+        },
+        'yyyy': {
+            maxLength: 4,
+            validator: (value) => /^\d{4}$/.test(value),
+            description: 'Year (4 digits)'
+        }
+    };
+    // Helper function to extract a token value from the date string using token rules
+    const extractValue = (tokenType, tokenLength) => {
+        const tokenKey = tokenType.repeat(tokenLength);
+        const rule = tokenRules[tokenKey] || tokenRules[''];
+        // Extract consecutive digits up to maxLength
+        let endIndex = dateStringIndex;
+        let digitCount = 0;
+        const maxChars = rule.maxLength || tokenLength;
+        while (endIndex < dateString.length && /\d/.test(dateString[endIndex]) && digitCount < maxChars) {
+            endIndex++;
+            digitCount++;
+        }
+        const value = dateString.substring(dateStringIndex, endIndex);
+        dateStringIndex = endIndex;
+        // Validate the extracted value if a validator is provided
+        if (rule.validator && !rule.validator(value)) {
+            // Extract field name from description for better error messages
+            const fieldName = (rule.description || tokenKey).split(' ')[0].toLowerCase();
+            throw new Error(`Invalid ${fieldName} value: "${value}"`);
+        }
+        return value;
+    };
+    // Helper function to parse and validate a numeric value
+    const parseNumericValue = (value, min, max, field) => {
+        const num = parseInt(value, 10);
+        if (isNaN(num) || num < min || num > max)
+            throw new Error(`Invalid ${field} value: ${value}`);
+        return num;
+    };
+    while (patternIndex < pattern.length) {
+        const patternChar = pattern[patternIndex];
+        if (isPatternChar(patternChar)) {
+            // Start of a token - determine its full length
+            let tokenLength = 0;
+            while (patternIndex + tokenLength < pattern.length &&
+                pattern[patternIndex + tokenLength] === patternChar) {
+                tokenLength++;
+            }
+            // Extract and parse the corresponding value from the date string
+            const value = extractValue(patternChar, tokenLength);
+            // Check if we got enough characters for this token (after extraction)
+            if (value.length < tokenLength) {
+                throw new Error(`Date string "${dateString}" does not match pattern "${pattern}"`);
+            }
+            // Debug: log pattern processing (commented out for production)
+            // console.log( `Processing patternChar="${patternChar}" with tokenLength=${tokenLength}, value="${value}"` );
+            switch (patternChar) {
+                case 'y': {
+                    if (tokenLength === 2) {
+                        // 2-digit year
+                        const shortYear = parseNumericValue(value, 0, 99, 'year');
+                        result.year = shortYear < 50 ? 2000 + shortYear : 1900 + shortYear;
+                    }
+                    else {
+                        // 4-digit year
+                        result.year = parseNumericValue(value, 0, 9999, 'year');
+                    }
+                    break;
+                }
+                case 'M':
+                    result.month = parseNumericValue(value, 1, 12, 'month');
+                    break;
+                case 'd':
+                    result.date = parseNumericValue(value, 1, 31, 'day');
+                    break;
+                case 'H':
+                    result.hours = parseNumericValue(value, 0, 23, 'hours');
+                    break;
+                case 'm':
+                    result.minutes = parseNumericValue(value, 0, 59, 'minutes');
+                    break;
+                case 's':
+                    result.seconds = parseNumericValue(value, 0, 59, 'seconds');
+                    break;
+                case 'S': {
+                    let ms = parseInt(value, 10);
+                    if (isNaN(ms))
+                        throw new Error(`Invalid milliseconds value: ${value}`);
+                    // Normalize to milliseconds based on length
+                    if (tokenLength === 1)
+                        ms *= 100;
+                    else if (tokenLength === 2)
+                        ms *= 10;
+                    result.milliseconds = ms;
+                    break;
+                }
+                default:
+                    throw new Error(`Unsupported pattern character: ${patternChar}`);
+            }
+            patternIndex += tokenLength;
+        }
+        else {
+            // Non-pattern character (separator like '-', '/', ':', ' ', '.')
+            if (dateStringIndex >= dateString.length ||
+                dateString[dateStringIndex] !== patternChar) {
+                throw new Error(`Date string "${dateString}" does not match pattern "${pattern}"`);
+            }
+            patternIndex++;
+            dateStringIndex++;
+        }
+    }
+    // After processing the entire pattern, check if we consumed the entire date string
+    if (dateStringIndex < dateString.length) {
+        throw new Error(`Date string "${dateString}" does not match pattern "${pattern}"`);
+    }
+    return result;
+}
 
 const LEVELS = ["trace", "log", "debug", "info", "warn", "error"];
 const timestamp = () => TimeInstant.now().format('HH:mm:ss');
@@ -3404,6 +3614,8 @@ exports.pad = pad;
 exports.padLeft = padLeft;
 exports.padRight = padRight;
 exports.parseJson = parseJson;
+exports.parseTimeInstantBasicComponents = parseTimeInstantBasicComponents;
+exports.parseTimeInstantComponents = parseTimeInstantComponents;
 exports.partition = partition;
 exports.pick = pick;
 exports.pipedInvoke = pipedInvoke;