@supercmd/calculator 1.0.3 → 1.0.4

package/dist/index.js

@@ -1883,12 +1883,31 @@ function tryDateIntent(input) {
   }
   return null;
 }
-var CONVERSION_PATTERN = /^([\d.,]+)?\s*([a-zA-Z$€£¥₹₩₽₺₦₵₪฿]+(?:\s+[a-zA-Z]+)?)\s+(?:to|in|into|as|=)\s+([a-zA-Z$€£¥₹₩₽₺₦₵₪฿]+(?:\s+[a-zA-Z]+)?)$/i;
+var CONVERSION_PATTERN = /^([\d.,]+[kKmMbB]?)?\s*([a-zA-Z$€£¥₹₩₽₺₦₵₪฿]+(?:\s+[a-zA-Z]+)?)\s+(?:to|in|into|as|=)\s+([a-zA-Z$€£¥₹₩₽₺₦₵₪฿]+(?:\s+[a-zA-Z]+)?)$/i;
+function parseAmountWithSuffix(str) {
+  if (!str) return 1;
+  const m = str.match(/^([\d.,]+)([kKmMbB]?)$/);
+  if (!m) return parseFloat(str) || 1;
+  let numStr = m[1];
+  const suffix = m[2].toLowerCase();
+  if (numStr.includes(",")) {
+    const lastComma = numStr.lastIndexOf(",");
+    const afterComma = numStr.slice(lastComma + 1);
+    if (afterComma.length <= 2 && !numStr.includes(".")) {
+      numStr = numStr.slice(0, lastComma) + "." + afterComma;
+    } else {
+      numStr = numStr.replace(/,/g, "");
+    }
+  }
+  const base = parseFloat(numStr);
+  const multipliers = { k: 1e3, m: 1e6, b: 1e9 };
+  return isNaN(base) ? 1 : base * (multipliers[suffix] ?? 1);
+}
 function tryCurrencyOrCryptoIntent(input) {
   const normalized = normalizeConversionInput(input);
   const match = normalized.match(CONVERSION_PATTERN);
   if (!match) return null;
-  const amount = match[1] ? parseFloat(match[1].replace(/,/g, "")) : 1;
+  const amount = parseAmountWithSuffix(match[1]);
   const fromToken = match[2].trim();
   const toToken = match[3].trim();
   const fromCrypto = resolveCrypto(fromToken);
@@ -1906,13 +1925,13 @@ function tryCurrencyOrCryptoIntent(input) {
   }
   return null;
 }
-var UNIT_PATTERN = /^(-?[\d.,]+)\s*([a-zA-Z°/µμ'"²³]+(?:\s+[a-zA-Z]+(?:\s+[a-zA-Z]+)?)?)\s+(?:to|in|into|as|=)\s+([a-zA-Z°/µμ'"²³]+(?:\s+[a-zA-Z]+(?:\s+[a-zA-Z]+)?)?)$/i;
-var UNIT_PATTERN_NO_SPACE = /^(-?[\d.,]+)([a-zA-Z°]+)\s+(?:to|in|into|as)\s+([a-zA-Z°]+(?:\s+[a-zA-Z]+)?)$/i;
+var UNIT_PATTERN = /^(-?[\d.,]+[kKmMbB]?)\s*([a-zA-Z°/µμ'"²³]+(?:\s+[a-zA-Z]+(?:\s+[a-zA-Z]+)?)?)\s+(?:to|in|into|as|=)\s+([a-zA-Z°/µμ'"²³]+(?:\s+[a-zA-Z]+(?:\s+[a-zA-Z]+)?)?)$/i;
+var UNIT_PATTERN_NO_SPACE = /^(-?[\d.,]+[kKmMbB]?)([a-zA-Z°]+)\s+(?:to|in|into|as)\s+([a-zA-Z°]+(?:\s+[a-zA-Z]+)?)$/i;
 function tryUnitIntent(input) {
   const normalized = normalizeConversionInput(input);
   const match = normalized.match(UNIT_PATTERN) || normalized.match(UNIT_PATTERN_NO_SPACE);
   if (!match) return null;
-  const amount = parseFloat(match[1].replace(/,/g, ""));
+  const amount = parseAmountWithSuffix(match[1]);
   const fromToken = match[2].trim().toLowerCase();
   const toToken = match[3].trim().toLowerCase();
   const fromUnit = lookupUnit(fromToken);
@@ -2199,6 +2218,16 @@ var Parser = class {
       if (this.pos < this.expr.length && /[+-]/.test(this.expr[this.pos])) this.pos++;
       while (this.pos < this.expr.length && /[0-9]/.test(this.expr[this.pos])) this.pos++;
     }
+    const numEnd = this.pos;
+    if (/[kKmMbB]/.test(this.charAt(this.pos)) && !/[a-zA-Z0-9_]/.test(this.charAt(this.pos + 1))) {
+      const suffix = this.expr[this.pos].toLowerCase();
+      this.pos++;
+      const multipliers = { k: 1e3, m: 1e6, b: 1e9 };
+      const numStr2 = this.expr.slice(start, numEnd);
+      const num2 = parseFloat(numStr2);
+      if (isNaN(num2)) throw new Error(`Invalid number: '${numStr2}'`);
+      return num2 * multipliers[suffix];
+    }
     const numStr = this.expr.slice(start, this.pos);
     const num = parseFloat(numStr);
     if (isNaN(num)) throw new Error(`Invalid number: '${numStr}'`);
@@ -2303,6 +2332,25 @@ function evaluateMath(expression, locale = "en-US", precision = 10) {
     };
   }
 }
+function normalizeEuropeanDecimalSeparators(expr) {
+  let result = "";
+  let depth = 0;
+  for (let i = 0; i < expr.length; i++) {
+    const ch = expr[i];
+    if (ch === "(") depth++;
+    else if (ch === ")") depth--;
+    else if (ch === "," && depth === 0) {
+      const prevIsDigit = i > 0 && /[0-9]/.test(expr[i - 1]);
+      const nextIsDigit = i < expr.length - 1 && /[0-9]/.test(expr[i + 1]);
+      if (prevIsDigit && nextIsDigit) {
+        result += ".";
+        continue;
+      }
+    }
+    result += ch;
+  }
+  return result;
+}
 function normalizeMathExpression(expression) {
   let normalized = expression.trim().replace(/\s+/g, " ");
   normalized = normalized.replace(/^(?:(?:what(?:'s|s| is))\s+the\s+|(?:what(?:'s|s| is))\s+|calculate\s+)/i, "");
@@ -2336,6 +2384,7 @@ function normalizeMathExpression(expression) {
     }
   }
   normalized = normalized.replace(/\bdivided by\b/gi, "/").replace(/\btimes\b/gi, "*").replace(/\bplus\b/gi, "+").replace(/\bminus\b/gi, "-");
+  normalized = normalizeEuropeanDecimalSeparators(normalized);
   return normalized.replace(/\s+/g, " ").trim();
 }
 

package/dist/index.mjs

@@ -1846,12 +1846,31 @@ function tryDateIntent(input) {
   }
   return null;
 }
-var CONVERSION_PATTERN = /^([\d.,]+)?\s*([a-zA-Z$€£¥₹₩₽₺₦₵₪฿]+(?:\s+[a-zA-Z]+)?)\s+(?:to|in|into|as|=)\s+([a-zA-Z$€£¥₹₩₽₺₦₵₪฿]+(?:\s+[a-zA-Z]+)?)$/i;
+var CONVERSION_PATTERN = /^([\d.,]+[kKmMbB]?)?\s*([a-zA-Z$€£¥₹₩₽₺₦₵₪฿]+(?:\s+[a-zA-Z]+)?)\s+(?:to|in|into|as|=)\s+([a-zA-Z$€£¥₹₩₽₺₦₵₪฿]+(?:\s+[a-zA-Z]+)?)$/i;
+function parseAmountWithSuffix(str) {
+  if (!str) return 1;
+  const m = str.match(/^([\d.,]+)([kKmMbB]?)$/);
+  if (!m) return parseFloat(str) || 1;
+  let numStr = m[1];
+  const suffix = m[2].toLowerCase();
+  if (numStr.includes(",")) {
+    const lastComma = numStr.lastIndexOf(",");
+    const afterComma = numStr.slice(lastComma + 1);
+    if (afterComma.length <= 2 && !numStr.includes(".")) {
+      numStr = numStr.slice(0, lastComma) + "." + afterComma;
+    } else {
+      numStr = numStr.replace(/,/g, "");
+    }
+  }
+  const base = parseFloat(numStr);
+  const multipliers = { k: 1e3, m: 1e6, b: 1e9 };
+  return isNaN(base) ? 1 : base * (multipliers[suffix] ?? 1);
+}
 function tryCurrencyOrCryptoIntent(input) {
   const normalized = normalizeConversionInput(input);
   const match = normalized.match(CONVERSION_PATTERN);
   if (!match) return null;
-  const amount = match[1] ? parseFloat(match[1].replace(/,/g, "")) : 1;
+  const amount = parseAmountWithSuffix(match[1]);
   const fromToken = match[2].trim();
   const toToken = match[3].trim();
   const fromCrypto = resolveCrypto(fromToken);
@@ -1869,13 +1888,13 @@ function tryCurrencyOrCryptoIntent(input) {
   }
   return null;
 }
-var UNIT_PATTERN = /^(-?[\d.,]+)\s*([a-zA-Z°/µμ'"²³]+(?:\s+[a-zA-Z]+(?:\s+[a-zA-Z]+)?)?)\s+(?:to|in|into|as|=)\s+([a-zA-Z°/µμ'"²³]+(?:\s+[a-zA-Z]+(?:\s+[a-zA-Z]+)?)?)$/i;
-var UNIT_PATTERN_NO_SPACE = /^(-?[\d.,]+)([a-zA-Z°]+)\s+(?:to|in|into|as)\s+([a-zA-Z°]+(?:\s+[a-zA-Z]+)?)$/i;
+var UNIT_PATTERN = /^(-?[\d.,]+[kKmMbB]?)\s*([a-zA-Z°/µμ'"²³]+(?:\s+[a-zA-Z]+(?:\s+[a-zA-Z]+)?)?)\s+(?:to|in|into|as|=)\s+([a-zA-Z°/µμ'"²³]+(?:\s+[a-zA-Z]+(?:\s+[a-zA-Z]+)?)?)$/i;
+var UNIT_PATTERN_NO_SPACE = /^(-?[\d.,]+[kKmMbB]?)([a-zA-Z°]+)\s+(?:to|in|into|as)\s+([a-zA-Z°]+(?:\s+[a-zA-Z]+)?)$/i;
 function tryUnitIntent(input) {
   const normalized = normalizeConversionInput(input);
   const match = normalized.match(UNIT_PATTERN) || normalized.match(UNIT_PATTERN_NO_SPACE);
   if (!match) return null;
-  const amount = parseFloat(match[1].replace(/,/g, ""));
+  const amount = parseAmountWithSuffix(match[1]);
   const fromToken = match[2].trim().toLowerCase();
   const toToken = match[3].trim().toLowerCase();
   const fromUnit = lookupUnit(fromToken);
@@ -2162,6 +2181,16 @@ var Parser = class {
       if (this.pos < this.expr.length && /[+-]/.test(this.expr[this.pos])) this.pos++;
       while (this.pos < this.expr.length && /[0-9]/.test(this.expr[this.pos])) this.pos++;
     }
+    const numEnd = this.pos;
+    if (/[kKmMbB]/.test(this.charAt(this.pos)) && !/[a-zA-Z0-9_]/.test(this.charAt(this.pos + 1))) {
+      const suffix = this.expr[this.pos].toLowerCase();
+      this.pos++;
+      const multipliers = { k: 1e3, m: 1e6, b: 1e9 };
+      const numStr2 = this.expr.slice(start, numEnd);
+      const num2 = parseFloat(numStr2);
+      if (isNaN(num2)) throw new Error(`Invalid number: '${numStr2}'`);
+      return num2 * multipliers[suffix];
+    }
     const numStr = this.expr.slice(start, this.pos);
     const num = parseFloat(numStr);
     if (isNaN(num)) throw new Error(`Invalid number: '${numStr}'`);
@@ -2266,6 +2295,25 @@ function evaluateMath(expression, locale = "en-US", precision = 10) {
     };
   }
 }
+function normalizeEuropeanDecimalSeparators(expr) {
+  let result = "";
+  let depth = 0;
+  for (let i = 0; i < expr.length; i++) {
+    const ch = expr[i];
+    if (ch === "(") depth++;
+    else if (ch === ")") depth--;
+    else if (ch === "," && depth === 0) {
+      const prevIsDigit = i > 0 && /[0-9]/.test(expr[i - 1]);
+      const nextIsDigit = i < expr.length - 1 && /[0-9]/.test(expr[i + 1]);
+      if (prevIsDigit && nextIsDigit) {
+        result += ".";
+        continue;
+      }
+    }
+    result += ch;
+  }
+  return result;
+}
 function normalizeMathExpression(expression) {
   let normalized = expression.trim().replace(/\s+/g, " ");
   normalized = normalized.replace(/^(?:(?:what(?:'s|s| is))\s+the\s+|(?:what(?:'s|s| is))\s+|calculate\s+)/i, "");
@@ -2299,6 +2347,7 @@ function normalizeMathExpression(expression) {
     }
   }
   normalized = normalized.replace(/\bdivided by\b/gi, "/").replace(/\btimes\b/gi, "*").replace(/\bplus\b/gi, "+").replace(/\bminus\b/gi, "-");
+  normalized = normalizeEuropeanDecimalSeparators(normalized);
   return normalized.replace(/\s+/g, " ").trim();
 }
 

package/package.json

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