@supercmd/calculator 1.0.1 → 1.0.2

package/dist/index.js

@@ -1798,7 +1798,7 @@ var TIME_IN_PATTERNS = [
   /^(?:what time is it|whats the time|what is the time|current time|time now) (?:in|at) (.+)$/i,
   /^(?:now|current time) in (.+)$/i
 ];
-var TIME_EXPLICIT_CONVERT_PATTERN = /^(midnight|noon|\d{1,2}(?::\d{2})?(?:\s*(?:am|pm))?)\s+(.+?)\s+to\s+(.+?)$/i;
+var TIME_EXPLICIT_CONVERT_PATTERN = /^(midnight|noon|\d{1,2}(?::\d{2})?(?:\s*(?:am|pm))?)\s+(?:in\s+)?(.+?)\s+to\s+(.+?)(?:\s+time)?$/i;
 var TIME_CONVERT_PATTERN = /^(.+?) to (.+?)(?: time)?$/i;
 var TIME_NOW_PATTERN = /^(?:what(?:'s| is) )?(?:the )?(?:current )?time(?: now)?$/i;
 function tryTimeIntent(input) {
@@ -1806,7 +1806,7 @@ function tryTimeIntent(input) {
   for (const pattern of TIME_IN_PATTERNS) {
     match = input.match(pattern);
     if (match) {
-      const place = match[1].trim();
+      const place = normalizeTimePlace(match[1]);
       const tz2 = resolveTimezone(place);
       if (tz2) return { kind: "time", query: input, to: tz2 };
       return { kind: "time", query: input, to: place };
@@ -1815,8 +1815,8 @@ function tryTimeIntent(input) {
   match = input.match(TIME_EXPLICIT_CONVERT_PATTERN);
   if (match) {
     const time = match[1].trim();
-    const from = match[2].trim();
-    const to = match[3].trim();
+    const from = normalizeTimePlace(match[2]);
+    const to = normalizeTimePlace(match[3]);
     const fromTz = resolveTimezone(from);
     const toTz = resolveTimezone(to);
     if (fromTz && toTz) {
@@ -1825,8 +1825,8 @@ function tryTimeIntent(input) {
   }
   match = input.match(TIME_CONVERT_PATTERN);
   if (match) {
-    const from = match[1].trim();
-    const to = match[2].trim();
+    const from = normalizeTimePlace(match[1]);
+    const to = normalizeTimePlace(match[2]);
     const fromTz = resolveTimezone(from);
     const toTz = resolveTimezone(to);
     if (fromTz || toTz) {
@@ -1842,11 +1842,11 @@ function tryTimeIntent(input) {
   }
   const placeSuffixMatch = input.match(/^(.+?)\s+(?:time|now|time now)$/i);
   if (placeSuffixMatch) {
-    const place = placeSuffixMatch[1].trim();
+    const place = normalizeTimePlace(placeSuffixMatch[1]);
     const tz2 = resolveTimezone(place);
     if (tz2) return { kind: "time", query: place, to: tz2 };
   }
-  const tz = resolveTimezone(input);
+  const tz = resolveTimezone(normalizeTimePlace(input));
   if (tz) {
     return { kind: "time", query: input, to: tz };
   }
@@ -1936,6 +1936,9 @@ function normalizeConversionInput(input) {
   normalized = normalized.replace(/^([$€£¥₹₩₽₺₦₵₪฿])\s*([\d.,]+)/, "$2 $1");
   return normalized;
 }
+function normalizeTimePlace(value) {
+  return normalizeWhitespace(value).replace(/^(?:time|current time|time now|now)\s+(?:in|at)\s+/i, "").replace(/^(?:in|at)\s+/i, "").replace(/\s+(?:time|now|time now)$/i, "").trim();
+}
 
 // src/evaluators/math.ts
 var CONSTANTS = {

package/dist/index.mjs

@@ -1761,7 +1761,7 @@ var TIME_IN_PATTERNS = [
   /^(?:what time is it|whats the time|what is the time|current time|time now) (?:in|at) (.+)$/i,
   /^(?:now|current time) in (.+)$/i
 ];
-var TIME_EXPLICIT_CONVERT_PATTERN = /^(midnight|noon|\d{1,2}(?::\d{2})?(?:\s*(?:am|pm))?)\s+(.+?)\s+to\s+(.+?)$/i;
+var TIME_EXPLICIT_CONVERT_PATTERN = /^(midnight|noon|\d{1,2}(?::\d{2})?(?:\s*(?:am|pm))?)\s+(?:in\s+)?(.+?)\s+to\s+(.+?)(?:\s+time)?$/i;
 var TIME_CONVERT_PATTERN = /^(.+?) to (.+?)(?: time)?$/i;
 var TIME_NOW_PATTERN = /^(?:what(?:'s| is) )?(?:the )?(?:current )?time(?: now)?$/i;
 function tryTimeIntent(input) {
@@ -1769,7 +1769,7 @@ function tryTimeIntent(input) {
   for (const pattern of TIME_IN_PATTERNS) {
     match = input.match(pattern);
     if (match) {
-      const place = match[1].trim();
+      const place = normalizeTimePlace(match[1]);
       const tz2 = resolveTimezone(place);
       if (tz2) return { kind: "time", query: input, to: tz2 };
       return { kind: "time", query: input, to: place };
@@ -1778,8 +1778,8 @@ function tryTimeIntent(input) {
   match = input.match(TIME_EXPLICIT_CONVERT_PATTERN);
   if (match) {
     const time = match[1].trim();
-    const from = match[2].trim();
-    const to = match[3].trim();
+    const from = normalizeTimePlace(match[2]);
+    const to = normalizeTimePlace(match[3]);
     const fromTz = resolveTimezone(from);
     const toTz = resolveTimezone(to);
     if (fromTz && toTz) {
@@ -1788,8 +1788,8 @@ function tryTimeIntent(input) {
   }
   match = input.match(TIME_CONVERT_PATTERN);
   if (match) {
-    const from = match[1].trim();
-    const to = match[2].trim();
+    const from = normalizeTimePlace(match[1]);
+    const to = normalizeTimePlace(match[2]);
     const fromTz = resolveTimezone(from);
     const toTz = resolveTimezone(to);
     if (fromTz || toTz) {
@@ -1805,11 +1805,11 @@ function tryTimeIntent(input) {
   }
   const placeSuffixMatch = input.match(/^(.+?)\s+(?:time|now|time now)$/i);
   if (placeSuffixMatch) {
-    const place = placeSuffixMatch[1].trim();
+    const place = normalizeTimePlace(placeSuffixMatch[1]);
     const tz2 = resolveTimezone(place);
     if (tz2) return { kind: "time", query: place, to: tz2 };
   }
-  const tz = resolveTimezone(input);
+  const tz = resolveTimezone(normalizeTimePlace(input));
   if (tz) {
     return { kind: "time", query: input, to: tz };
   }
@@ -1899,6 +1899,9 @@ function normalizeConversionInput(input) {
   normalized = normalized.replace(/^([$€£¥₹₩₽₺₦₵₪฿])\s*([\d.,]+)/, "$2 $1");
   return normalized;
 }
+function normalizeTimePlace(value) {
+  return normalizeWhitespace(value).replace(/^(?:time|current time|time now|now)\s+(?:in|at)\s+/i, "").replace(/^(?:in|at)\s+/i, "").replace(/\s+(?:time|now|time now)$/i, "").trim();
+}
 
 // src/evaluators/math.ts
 var CONSTANTS = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supercmd/calculator",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Powerful natural language calculator — math, units, currency, crypto, time zones, dates",
   "main": "dist/index.js",
   "module": "dist/index.mjs",