@supercmd/calculator 1.0.1 → 1.0.3

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 };
   }
@@ -1870,7 +1870,10 @@ var DATE_PATTERNS = [
   /^(?:what(?:'s| is) )?(?:the )?(?:current )?date(?: today)?$/i,
   /^(?:(?:what(?:'s|s| is))\s+today|(?:what(?:'s|s| is))\s+today'?s date|what day is it|what date is .+|todays date|today'?s date|date today|current date|what day is .+|when is .+)$/i,
   // Days between dates
-  /^(?:days?\s+)?(?:between|from)\s+.+\s+(?:to|and|until)\s+.+$/i
+  /^(?:days?\s+)?(?:between|from)\s+.+\s+(?:to|and|until)\s+.+$/i,
+  // Days until
+  /^(?:days?\s+)?(?:until|till|to)\s+.+$/i,
+  /^(?:how many days?\s+)?(?:until|till|to|before)\s+.+$/i
 ];
 function tryDateIntent(input) {
   for (const pattern of DATE_PATTERNS) {
@@ -1936,6 +1939,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 = {
@@ -2640,6 +2646,25 @@ function evaluateDate(query) {
         return formatDateResult(query, d, { iso: d.toISOString(), unix: Math.floor(d.getTime() / 1e3) });
       }
     }
+    const daysUntilMatch = lower.match(/^(?:(?:how many )?days?\s+)?(?:until|till|to|before)\s+(.+)$/);
+    if (daysUntilMatch) {
+      const target = parseDateTarget(daysUntilMatch[1].trim());
+      if (target) {
+        const now = /* @__PURE__ */ new Date();
+        now.setHours(0, 0, 0, 0);
+        const targetDate = new Date(target);
+        targetDate.setHours(0, 0, 0, 0);
+        const diffMs = targetDate.getTime() - now.getTime();
+        const diffDays = Math.round(diffMs / (1e3 * 60 * 60 * 24));
+        return {
+          type: "date",
+          input: query,
+          result: diffDays,
+          formatted: `${diffDays} days`,
+          metadata: { from: now.toISOString(), to: target.toISOString() }
+        };
+      }
+    }
     const betweenMatch = lower.match(/^(?:days?\s+)?(?:between|from)\s+(.+)\s+(?:to|and|until)\s+(.+)$/);
     if (betweenMatch) {
       const d1 = parseFlexibleDate(betweenMatch[1].trim());
@@ -2732,6 +2757,82 @@ function formatDateResult(input, d, extraMeta) {
     }
   };
 }
+function getNextOccurrence(month, day) {
+  const now = /* @__PURE__ */ new Date();
+  const thisYear = new Date(now.getFullYear(), month - 1, day);
+  if (thisYear.getTime() >= new Date(now.getFullYear(), now.getMonth(), now.getDate()).getTime()) {
+    return thisYear;
+  }
+  return new Date(now.getFullYear() + 1, month - 1, day);
+}
+var NAMED_DATES = {
+  "christmas": () => getNextOccurrence(12, 25),
+  "christmas day": () => getNextOccurrence(12, 25),
+  "christmas eve": () => getNextOccurrence(12, 24),
+  "new year": () => getNextOccurrence(1, 1),
+  "new years": () => getNextOccurrence(1, 1),
+  "new year's": () => getNextOccurrence(1, 1),
+  "new year's day": () => getNextOccurrence(1, 1),
+  "new years day": () => getNextOccurrence(1, 1),
+  "new years eve": () => getNextOccurrence(12, 31),
+  "new year's eve": () => getNextOccurrence(12, 31),
+  "valentines": () => getNextOccurrence(2, 14),
+  "valentines day": () => getNextOccurrence(2, 14),
+  "valentine's day": () => getNextOccurrence(2, 14),
+  "halloween": () => getNextOccurrence(10, 31),
+  "independence day": () => getNextOccurrence(7, 4),
+  "st patricks day": () => getNextOccurrence(3, 17),
+  "st patrick's day": () => getNextOccurrence(3, 17)
+};
+var MONTH_NAMES = {
+  january: 1,
+  jan: 1,
+  february: 2,
+  feb: 2,
+  march: 3,
+  mar: 3,
+  april: 4,
+  apr: 4,
+  may: 5,
+  june: 6,
+  jun: 6,
+  july: 7,
+  jul: 7,
+  august: 8,
+  aug: 8,
+  september: 9,
+  sep: 9,
+  sept: 9,
+  october: 10,
+  oct: 10,
+  november: 11,
+  nov: 11,
+  december: 12,
+  dec: 12
+};
+function parseMonthDay(str) {
+  const cleaned = str.replace(/(\d+)(?:st|nd|rd|th)/gi, "$1");
+  let match = cleaned.match(/^(\d{1,2})\s+([a-z]+)$/i);
+  if (match) {
+    const day = parseInt(match[1]);
+    const month = MONTH_NAMES[match[2].toLowerCase()];
+    if (month && day >= 1 && day <= 31) return getNextOccurrence(month, day);
+  }
+  match = cleaned.match(/^([a-z]+)\s+(\d{1,2})$/i);
+  if (match) {
+    const month = MONTH_NAMES[match[1].toLowerCase()];
+    const day = parseInt(match[2]);
+    if (month && day >= 1 && day <= 31) return getNextOccurrence(month, day);
+  }
+  return null;
+}
+function parseDateTarget(str) {
+  const lower = str.toLowerCase().trim();
+  if (NAMED_DATES[lower]) return NAMED_DATES[lower]();
+  const monthDay = parseMonthDay(lower);
+  if (monthDay) return monthDay;
+  return parseFlexibleDate(lower);
+}
 function parseFlexibleDate(str) {
   if (str === "today" || str === "now" || str === "date") return /* @__PURE__ */ new Date();
   if (str === "tomorrow") {
@@ -2870,6 +2971,46 @@ async function calculate(input, options) {
   const locale = options?.locale ?? "en-US";
   const precision = options?.precision ?? 10;
   const rateProvider = options?.rateProvider ?? getDefaultProvider();
+  const convMathMatch = trimmed.match(
+    /^(.+?\s+(?:to|in)\s+[a-zA-Z$€£¥₹₩₽₺₦₵₪฿]+(?:\s+[a-zA-Z]+)?)\s*([+\-*/^])\s*(.+)$/i
+  );
+  if (convMathMatch) {
+    const convPart = convMathMatch[1].trim();
+    const operator = convMathMatch[2];
+    const mathPart = convMathMatch[3].trim();
+    const convIntent = detectIntent(convPart);
+    if (convIntent.kind === "currency" || convIntent.kind === "crypto" || convIntent.kind === "unit") {
+      let convResult;
+      switch (convIntent.kind) {
+        case "currency":
+          convResult = await evaluateCurrency(convIntent.amount, convIntent.from, convIntent.to, rateProvider, locale, precision);
+          break;
+        case "crypto":
+          convResult = await evaluateCrypto(convIntent.amount, convIntent.from, convIntent.to, rateProvider, locale, precision);
+          break;
+        case "unit":
+          convResult = evaluateUnit(convIntent.amount, convIntent.from, convIntent.to, locale, precision);
+          break;
+      }
+      if (convResult.type !== "error" && typeof convResult.result === "number") {
+        const mathExpr = `${convResult.result} ${operator} ${mathPart}`;
+        const mathResult = evaluateMath(mathExpr, locale, precision);
+        if (mathResult.type !== "error") {
+          return {
+            ...mathResult,
+            type: convResult.type,
+            input: trimmed,
+            metadata: {
+              ...mathResult.metadata,
+              conversionResult: convResult.result,
+              conversionFormatted: convResult.formatted,
+              operation: `${convResult.formatted} ${operator} ${mathPart}`
+            }
+          };
+        }
+      }
+    }
+  }
   const intent = detectIntent(trimmed);
   switch (intent.kind) {
     case "time":

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 };
   }
@@ -1833,7 +1833,10 @@ var DATE_PATTERNS = [
   /^(?:what(?:'s| is) )?(?:the )?(?:current )?date(?: today)?$/i,
   /^(?:(?:what(?:'s|s| is))\s+today|(?:what(?:'s|s| is))\s+today'?s date|what day is it|what date is .+|todays date|today'?s date|date today|current date|what day is .+|when is .+)$/i,
   // Days between dates
-  /^(?:days?\s+)?(?:between|from)\s+.+\s+(?:to|and|until)\s+.+$/i
+  /^(?:days?\s+)?(?:between|from)\s+.+\s+(?:to|and|until)\s+.+$/i,
+  // Days until
+  /^(?:days?\s+)?(?:until|till|to)\s+.+$/i,
+  /^(?:how many days?\s+)?(?:until|till|to|before)\s+.+$/i
 ];
 function tryDateIntent(input) {
   for (const pattern of DATE_PATTERNS) {
@@ -1899,6 +1902,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 = {
@@ -2603,6 +2609,25 @@ function evaluateDate(query) {
         return formatDateResult(query, d, { iso: d.toISOString(), unix: Math.floor(d.getTime() / 1e3) });
       }
     }
+    const daysUntilMatch = lower.match(/^(?:(?:how many )?days?\s+)?(?:until|till|to|before)\s+(.+)$/);
+    if (daysUntilMatch) {
+      const target = parseDateTarget(daysUntilMatch[1].trim());
+      if (target) {
+        const now = /* @__PURE__ */ new Date();
+        now.setHours(0, 0, 0, 0);
+        const targetDate = new Date(target);
+        targetDate.setHours(0, 0, 0, 0);
+        const diffMs = targetDate.getTime() - now.getTime();
+        const diffDays = Math.round(diffMs / (1e3 * 60 * 60 * 24));
+        return {
+          type: "date",
+          input: query,
+          result: diffDays,
+          formatted: `${diffDays} days`,
+          metadata: { from: now.toISOString(), to: target.toISOString() }
+        };
+      }
+    }
     const betweenMatch = lower.match(/^(?:days?\s+)?(?:between|from)\s+(.+)\s+(?:to|and|until)\s+(.+)$/);
     if (betweenMatch) {
       const d1 = parseFlexibleDate(betweenMatch[1].trim());
@@ -2695,6 +2720,82 @@ function formatDateResult(input, d, extraMeta) {
     }
   };
 }
+function getNextOccurrence(month, day) {
+  const now = /* @__PURE__ */ new Date();
+  const thisYear = new Date(now.getFullYear(), month - 1, day);
+  if (thisYear.getTime() >= new Date(now.getFullYear(), now.getMonth(), now.getDate()).getTime()) {
+    return thisYear;
+  }
+  return new Date(now.getFullYear() + 1, month - 1, day);
+}
+var NAMED_DATES = {
+  "christmas": () => getNextOccurrence(12, 25),
+  "christmas day": () => getNextOccurrence(12, 25),
+  "christmas eve": () => getNextOccurrence(12, 24),
+  "new year": () => getNextOccurrence(1, 1),
+  "new years": () => getNextOccurrence(1, 1),
+  "new year's": () => getNextOccurrence(1, 1),
+  "new year's day": () => getNextOccurrence(1, 1),
+  "new years day": () => getNextOccurrence(1, 1),
+  "new years eve": () => getNextOccurrence(12, 31),
+  "new year's eve": () => getNextOccurrence(12, 31),
+  "valentines": () => getNextOccurrence(2, 14),
+  "valentines day": () => getNextOccurrence(2, 14),
+  "valentine's day": () => getNextOccurrence(2, 14),
+  "halloween": () => getNextOccurrence(10, 31),
+  "independence day": () => getNextOccurrence(7, 4),
+  "st patricks day": () => getNextOccurrence(3, 17),
+  "st patrick's day": () => getNextOccurrence(3, 17)
+};
+var MONTH_NAMES = {
+  january: 1,
+  jan: 1,
+  february: 2,
+  feb: 2,
+  march: 3,
+  mar: 3,
+  april: 4,
+  apr: 4,
+  may: 5,
+  june: 6,
+  jun: 6,
+  july: 7,
+  jul: 7,
+  august: 8,
+  aug: 8,
+  september: 9,
+  sep: 9,
+  sept: 9,
+  october: 10,
+  oct: 10,
+  november: 11,
+  nov: 11,
+  december: 12,
+  dec: 12
+};
+function parseMonthDay(str) {
+  const cleaned = str.replace(/(\d+)(?:st|nd|rd|th)/gi, "$1");
+  let match = cleaned.match(/^(\d{1,2})\s+([a-z]+)$/i);
+  if (match) {
+    const day = parseInt(match[1]);
+    const month = MONTH_NAMES[match[2].toLowerCase()];
+    if (month && day >= 1 && day <= 31) return getNextOccurrence(month, day);
+  }
+  match = cleaned.match(/^([a-z]+)\s+(\d{1,2})$/i);
+  if (match) {
+    const month = MONTH_NAMES[match[1].toLowerCase()];
+    const day = parseInt(match[2]);
+    if (month && day >= 1 && day <= 31) return getNextOccurrence(month, day);
+  }
+  return null;
+}
+function parseDateTarget(str) {
+  const lower = str.toLowerCase().trim();
+  if (NAMED_DATES[lower]) return NAMED_DATES[lower]();
+  const monthDay = parseMonthDay(lower);
+  if (monthDay) return monthDay;
+  return parseFlexibleDate(lower);
+}
 function parseFlexibleDate(str) {
   if (str === "today" || str === "now" || str === "date") return /* @__PURE__ */ new Date();
   if (str === "tomorrow") {
@@ -2833,6 +2934,46 @@ async function calculate(input, options) {
   const locale = options?.locale ?? "en-US";
   const precision = options?.precision ?? 10;
   const rateProvider = options?.rateProvider ?? getDefaultProvider();
+  const convMathMatch = trimmed.match(
+    /^(.+?\s+(?:to|in)\s+[a-zA-Z$€£¥₹₩₽₺₦₵₪฿]+(?:\s+[a-zA-Z]+)?)\s*([+\-*/^])\s*(.+)$/i
+  );
+  if (convMathMatch) {
+    const convPart = convMathMatch[1].trim();
+    const operator = convMathMatch[2];
+    const mathPart = convMathMatch[3].trim();
+    const convIntent = detectIntent(convPart);
+    if (convIntent.kind === "currency" || convIntent.kind === "crypto" || convIntent.kind === "unit") {
+      let convResult;
+      switch (convIntent.kind) {
+        case "currency":
+          convResult = await evaluateCurrency(convIntent.amount, convIntent.from, convIntent.to, rateProvider, locale, precision);
+          break;
+        case "crypto":
+          convResult = await evaluateCrypto(convIntent.amount, convIntent.from, convIntent.to, rateProvider, locale, precision);
+          break;
+        case "unit":
+          convResult = evaluateUnit(convIntent.amount, convIntent.from, convIntent.to, locale, precision);
+          break;
+      }
+      if (convResult.type !== "error" && typeof convResult.result === "number") {
+        const mathExpr = `${convResult.result} ${operator} ${mathPart}`;
+        const mathResult = evaluateMath(mathExpr, locale, precision);
+        if (mathResult.type !== "error") {
+          return {
+            ...mathResult,
+            type: convResult.type,
+            input: trimmed,
+            metadata: {
+              ...mathResult.metadata,
+              conversionResult: convResult.result,
+              conversionFormatted: convResult.formatted,
+              operation: `${convResult.formatted} ${operator} ${mathPart}`
+            }
+          };
+        }
+      }
+    }
+  }
   const intent = detectIntent(trimmed);
   switch (intent.kind) {
     case "time":

package/package.json

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