configorama 1.2.1 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "configorama",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Variable support for configuration files",
   "main": "src/index.js",
   "types": "index.d.ts",
@@ -111,5 +111,5 @@
     }
   },
   "packageManager": "pnpm@10.33.0",
-  "gitHead": "2ce70bfa849433ba74c60fa3c1cd3dba942b6556"
+  "gitHead": "05dde9eefc90001bcea7f7e40f173cb87d18b4b6"
 }

package/src/resolvers/valueFromCron.js

@@ -78,15 +78,7 @@ function parseCronExpression(input) {
   // Parse "at X:XX" patterns (e.g., "at 9:30", "at 14:00")
   const atTimeMatch = normalizedInput.match(/^at (\d{1,2}):(\d{2})(\s*(am|pm))?$/i)
   if (atTimeMatch) {
-    let hour = parseInt(atTimeMatch[1])
-    const minute = parseInt(atTimeMatch[2])
-    const amPm = atTimeMatch[4]
-    
-    if (amPm && amPm.toLowerCase() === 'pm' && hour !== 12) {
-      hour += 12
-    } else if (amPm && amPm.toLowerCase() === 'am' && hour === 12) {
-      hour = 0
-    }
+    const { minute, hour } = parseTimeMatch(atTimeMatch, 1, 2, 4)
     
     return `${minute} ${hour} * * *`
   }
@@ -118,15 +110,7 @@ function parseCronExpression(input) {
   const ordinalDateMatch = normalizedInput.match(/^on (\d+)(?:st|nd|rd|th) of month at (\d{1,2}):(\d{2})(\s*(am|pm))?$/i)
   if (ordinalDateMatch) {
     const dayOfMonth = parseInt(ordinalDateMatch[1])
-    let hour = parseInt(ordinalDateMatch[2])
-    const minute = parseInt(ordinalDateMatch[3])
-    const amPm = ordinalDateMatch[5]
-    
-    if (amPm && amPm.toLowerCase() === 'pm' && hour !== 12) {
-      hour += 12
-    } else if (amPm && amPm.toLowerCase() === 'am' && hour === 12) {
-      hour = 0
-    }
+    const { minute, hour } = parseTimeMatch(ordinalDateMatch, 2, 3, 5)
     
     return `${minute} ${hour} ${dayOfMonth} * *`
   }
@@ -143,15 +127,7 @@ function parseCronExpression(input) {
     const days = weekdayTimeMatch[1].split(',').map(day => day.trim())
     const dayOfWeek = days.map(day => dayMap[day.toLowerCase()]).join(',')
     
-    let hour = parseInt(weekdayTimeMatch[2])
-    const minute = parseInt(weekdayTimeMatch[3])
-    const amPm = weekdayTimeMatch[5]
-    
-    if (amPm && amPm.toLowerCase() === 'pm' && hour !== 12) {
-      hour += 12
-    } else if (amPm && amPm.toLowerCase() === 'am' && hour === 12) {
-      hour = 0
-    }
+    const { minute, hour } = parseTimeMatch(weekdayTimeMatch, 2, 3, 5)
     
     return `${minute} ${hour} * * ${dayOfWeek}`
   }
@@ -160,15 +136,7 @@ function parseCronExpression(input) {
   const weekdaysTimeMatch = normalizedInput.match(/^on (weekdays|weekends) at (\d{1,2}):(\d{2})(\s*(am|pm))?$/i)
   if (weekdaysTimeMatch) {
     const dayRange = weekdaysTimeMatch[1].toLowerCase() === 'weekdays' ? '1-5' : '0,6'
-    let hour = parseInt(weekdaysTimeMatch[2])
-    const minute = parseInt(weekdaysTimeMatch[3])
-    const amPm = weekdaysTimeMatch[5]
-    
-    if (amPm && amPm.toLowerCase() === 'pm' && hour !== 12) {
-      hour += 12
-    } else if (amPm && amPm.toLowerCase() === 'am' && hour === 12) {
-      hour = 0
-    }
+    const { minute, hour } = parseTimeMatch(weekdaysTimeMatch, 2, 3, 5)
     
     return `${minute} ${hour} * * ${dayRange}`
   }
@@ -187,6 +155,20 @@ function parseCronExpression(input) {
   throw new Error(`Unrecognized cron pattern: "${input}". Supported patterns include: ${suggestions}`)
 }
 
+function parseTimeMatch(match, hourIndex, minuteIndex, amPmIndex) {
+  let hour = parseInt(match[hourIndex])
+  const minute = parseInt(match[minuteIndex])
+  const amPm = match[amPmIndex]
+
+  if (amPm && amPm.toLowerCase() === 'pm' && hour !== 12) {
+    hour += 12
+  } else if (amPm && amPm.toLowerCase() === 'am' && hour === 12) {
+    hour = 0
+  }
+
+  return { minute, hour }
+}
+
 function getValueFromCron(variableString) {
   // Get value from cron(expression)
   const cronExpression = variableString.match(/cron\((.*)\)/)[1]
@@ -232,4 +214,4 @@ module.exports = {
   resolver: getValueFromCron,
   // Export the parser for testing
   _parseCronExpression: parseCronExpression
-}
+}

package/types/src/resolvers/valueFromCron.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"valueFromCron.d.ts","sourceRoot":"","sources":["../../../src/resolvers/valueFromCron.js"],"names":[],"mappings":"AACA,oCAAkF;AA4LlF,8EAiCC;AA3ND;;;GAGG;AACH,sDAoLC"}
+{"version":3,"file":"valueFromCron.d.ts","sourceRoot":"","sources":["../../../src/resolvers/valueFromCron.js"],"names":[],"mappings":"AACA,oCAAkF;AA0KlF,8EAiCC;AAzMD;;;GAGG;AACH,sDAoJC"}