Upload src/viNumberFix.js

src/viNumberFix.js

@@ -29,37 +29,63 @@ var DIGIT = { "khong": 0, "mot": 1, "hai": 2, "ba": 3, "bon": 4, "nam": 5, "sau"
 // Scale words → multiplier
 var SCALE = { "muoi": 10, "tram": 100, "nghin": 1000, "ngan": 1000, "trieu": 1000000, "ty": 1000000000 };
 
-function parseNumberTokens(tokens) {
+/**
+ * Parse Vietnamese number phrases to digits.
+ * Handles: mot, hai, ba... (1-9)
+ *         mot muoi, hai muoi... (10-90)
+ *         mot muoi mot, hai muoi hai... (11-99)
+ *         mot tram, hai tram... (100-900)
+ *         mot nghin, hai nghin... (1000-2000000...)
+ */
+function parseVietnameseNumber(text) {
+  var tokens = text.toLowerCase().split(/[\s,]+/).map(function(t) {
+    return t.replace(/[,.!?;:)]+$/, "").replace(/^[(\[]+/, "");
+  });
+  
   var result = 0;
   var i = 0;
   
   while (i < tokens.length) {
     var base = toBaseForm(tokens[i]);
-    var next = i + 1 < tokens.length ? toBaseForm(tokens[i + 1]) : "";
-    var nextNext = i + 2 < tokens.length ? toBaseForm(tokens[i + 2]) : "";
+    var next = i + 1 < tokens.length ? toBaseForm(tokens[i + 1]) : null;
     
-    // Handle large scales first (ty, trieu, nghin) from right to left
-    if (SCALE[base] !== undefined && SCALE[base] >= 1000) {
-      if (i === 0 || SCALE[toBaseForm(tokens[i-1])] === undefined) {
-        result += SCALE[base]; // Just "hai trieu" = 2000000
+    // Large scale words (tỉ/ty, triệu, nghìn/ngàn)
+    if (base === "ty" || base === "tỉ") {
+      if (next === "muoi" || next === "tram" || SCALE[next] !== undefined || DIGIT[next] !== undefined) {
+        // "hai trieu" = 2000000, "ba muoi lam trieu" = 3,500,000
+        var group = parseGroup(tokens.slice(i + 1));
+        result += (group || 1) * SCALE.ty;
         i++;
+        while (i < tokens.length && (SCALE[toBaseForm(tokens[i])] || DIGIT[toBaseForm(tokens[i])])) i++;
         continue;
       }
-      // "hai trieu lam" means 2,000,000 + 5,000 = 2,005,000
-      if (DIGIT[base] !== undefined) {
-        var group = DIGIT[base] * SCALE[next];
-        result += group;
-        i += 2;
-        continue;
-      }
+      result += SCALE.ty;
+      i++;
+      continue;
+    }
+    
+    if (base === "trieu" || base === "triệu") {
+      var group = parseGroup(tokens.slice(i + 1));
+      result += (group || 1) * SCALE.trieu;
+      i++;
+      while (i < tokens.length && SCALE[toBaseForm(tokens[i])] !== undefined && SCALE[toBaseForm(tokens[i])] < SCALE.trieu) i++;
+      continue;
+    }
+    
+    if (base === "nghin" || base === "ngan" || base === "nghìn" || base === "ngàn") {
+      var group = parseGroup(tokens.slice(i + 1));
+      result += (group || 1) * SCALE.nghin;
+      i++;
+      while (i < tokens.length && SCALE[toBaseForm(tokens[i])] !== undefined && SCALE[toBaseForm(tokens[i])] < SCALE.nghin) i++;
+      continue;
     }
     
     // "muoi mot" = 11
     if (base === "muoi" && (next === "mot" || next === "mơ")) {
-      return 11;
+      return result + 11;
     }
     
-    // "X muoi Y" = X0 + Y (21-99)
+    // "X muoi" patterns (20-90)
     if (next === "muoi" && DIGIT[base] !== undefined) {
       var val = DIGIT[base] * 10;
       i += 2;
@@ -68,20 +94,10 @@ function parseNumberTokens(tokens) {
         if (ones === "mot" || ones === "mơ") val += 1;
         else if (DIGIT[ones] !== undefined) val += DIGIT[ones];
       }
-      return val;
-    }
-    
-    // "X muoi" standalone = X0
-    if (next === "muoi" && DIGIT[base] !== undefined) {
-      return DIGIT[base] * 10;
+      return result + val;
     }
     
-    // Just "muoi" = 10
-    if (base === "muoi") {
-      return 10;
-    }
-    
-    // "X tram Y" = X00 + Y
+    // "X tram" patterns (100-900)
     if (next === "tram" && DIGIT[base] !== undefined) {
       var val = DIGIT[base] * 100;
       i += 2;
@@ -89,18 +105,41 @@ function parseNumberTokens(tokens) {
         val += DIGIT[toBaseForm(tokens[i])];
         i++;
       }
-      return val;
+      return result + val;
+    }
+    
+    // Just "muoi" = 10
+    if (base === "muoi") {
+      return result + 10;
     }
     
     // Single digit
     if (DIGIT[base] !== undefined) {
-      return DIGIT[base];
+      return result + DIGIT[base];
     }
     
     i++;
   }
   
-  return result || null;
+  return result > 0 ? result : null;
+}
+
+// Parse a group like "ba muoi" or "hai tram" 
+function parseGroup(tokens) {
+  if (!tokens || tokens.length === 0) return null;
+  var val = 0;
+  for (var i = 0; i < tokens.length; i++) {
+    var base = toBaseForm(tokens[i]);
+    if (SCALE[base] !== undefined && SCALE[base] >= 10) {
+      // Scale multipliers accumulate
+      if (i > 0 && DIGIT[toBaseForm(tokens[i-1])] !== undefined) {
+        val += DIGIT[toBaseForm(tokens[i-1])] * SCALE[base];
+      } else if (SCALE[base] === 10) val += 10;
+    } else if (DIGIT[base] !== undefined) {
+      val += DIGIT[base];
+    }
+  }
+  return val > 0 ? val : null;
 }
 
 /**
@@ -119,38 +158,44 @@ export function normalizeVietnameseText(text) {
   
   if (!hasNum) return text.replace(/\s+/g, " ").trim();
   
-  var words = text.split(/[\s,]+/);
+  // Try to find and replace number patterns
+  var words = text.split(/([\s,]+)/);
   var output = [];
   var i = 0;
   
   while (i < words.length) {
     var w = words[i].trim().replace(/[,.!?;:)]+$/, "");
+    if (!w) { output.push(words[i]); i++; continue; }
     var base = toBaseForm(w);
-    var remaining = words.slice(i).map(function(t) { return t.trim().replace(/[,.!?;:)]+$/, ""); });
     
-    // Try to parse a number phrase
-    var parsed = parseNumberTokens(remaining);
-    if (parsed !== null) {
-      output.push(String(parsed));
-      // Skip consumed words - find how many were consumed
-      var consumed = 1;
-      var testRem = remaining.slice(1);
-      while (testRem.length && consumed <= 10) {
-        var nextBase = toBaseForm(testRem[0]);
-        if (nextBase === "muoi" || nextBase === "tram" || SCALE[nextBase] !== undefined || DIGIT[nextBase] !== undefined) {
-          consumed++;
-          testRem = testRem.slice(1);
-        } else break;
+    // Check if this starts a number phrase
+    var next = i + 1 < words.length ? toBaseForm(words[i + 1].trim().replace(/[,.!?;:)]+$/, "")) : "";
+    
+    // Try to parse from this position
+    var remaining = [];
+    for (var j = i; j < words.length; j++) {
+      var wt = words[j].trim().replace(/[,.!?;:)]+$/, "");
+      if (wt && (DIGIT[toBaseForm(wt)] !== undefined || SCALE[toBaseForm(wt)] !== undefined)) {
+        remaining.push(wt);
+      } else break;
+    }
+    
+    if (remaining.length >= 1) {
+      var parsed = parseVietnameseNumber(remaining.join(" "));
+      if (parsed !== null) {
+        output.push(String(parsed));
+        i += remaining.length;
+        // Skip any whitespace tokens
+        while (i < words.length && !words[i].trim()) i++;
+        continue;
       }
-      i += consumed;
-      continue;
     }
     
     output.push(words[i]);
     i++;
   }
   
-  return output.join(" ").replace(/\s+/g, " ").trim();
+  return output.join("").replace(/\s+/g, " ").trim();
 }
 
 /**