Apply updates to match tc39/proposal-intl-keep-trailing-zeros#10

Author: eemeli

packages/ecma402-abstract/NumberFormat/PartitionNumberPattern.ts

@@ -17,7 +17,6 @@ export function PartitionNumberPattern(
   _x: Decimal
 ): NumberFormatPart[] {
   let x = _x
-  let stringDigitCount = (x as any).__StringDigitCount ?? 0
   // IMPL: We need to record the magnitude of the number
   let magnitude = 0
 
@@ -49,13 +48,9 @@ export function PartitionNumberPattern(
       // 8.a. If x < 0, let x be -x.
       invariant(x.isFinite(), 'Input must be a mathematical value')
 
-      let magnitude_ = Number(x.abs().log(10).floor())
-
       // 8.b. If internalSlots.[[style]] is "percent", let x be 100 × x.
       if (internalSlots.style == 'percent') {
         x = x.times(100)
-        if (magnitude_ < 0) stringDigitCount += Math.max(magnitude_, -2)
-        magnitude_ += 2
       }
 
       // 8.c. Let exponent be ComputeExponent(numberFormat, x).
@@ -67,11 +62,8 @@ export function PartitionNumberPattern(
 
       // 8.d. Let x be x × 10^(-exponent).
       x = x.times(getPowerOf10(-exponent))
-      if (magnitude_ < 0 && exponent < 0) {
-        stringDigitCount += Math.max(magnitude_, exponent)
-      }
     }
-    Object.assign(x, {__StringDigitCount: stringDigitCount})
+    Object.assign(x, {__StringDigitCount: (_x as any).__StringDigitCount})
 
     // 8.e. Let formatNumberResult be FormatNumericToString(internalSlots, x).
     const formatNumberResult = FormatNumericToString(internalSlots, x)

packages/ecma402-abstract/NumberFormat/ToRawFixed.ts

@@ -114,8 +114,13 @@ export function ToRawFixed(
     let b = m.slice(m.length - f)
     // e. Let int be the length of a.
     int = a.length
+
+    let sfc = stringDigitCount - int
+    const zm = (a + b).match(/^0+/)
+    if (zm && !n.isZero()) sfc += zm[0].length
+
     // f. Let cut be maxFraction - max(stringDigitCount - int, minFraction).
-    let cut = maxFraction - Math.max(stringDigitCount - int, minFraction)
+    let cut = maxFraction - Math.max(sfc, minFraction)
     // g. Repeat, while cut > 0 and the last code unit of b is 0x0030 (DIGIT ZERO),
     while (cut > 0 && b[b.length - 1] === '0') {
       // i. Remove the last code unit from b.

packages/ecma402-abstract/NumberFormat/ToRawPrecision.ts

@@ -211,8 +211,14 @@ export function ToRawPrecision(
 
   // 7. If m contains ".", and maxPrecision > minPrecision, then
   if (m.includes('.') && maxPrecision > minPrecision) {
+    let z = 0
+    const zm = m.match(/^0(\.0+)?/)
+    if (zm && !x.isZero()) {
+      z = zm[1]?.length ?? 1
+    }
+
     // a. Let cut be maxPrecision - minPrecision.
-    let cut = maxPrecision - Math.max(stringDigitCount, minPrecision)
+    let cut = maxPrecision - Math.max(z + stringDigitCount, minPrecision)
     // b. Repeat, while cut > 0 and the last character of m is "0",
     while (cut > 0 && m[m.length - 1] === '0') {
       // i. Remove the last character from m.

packages/ecma402-abstract/ToIntlMathematicalValue.ts

@@ -32,39 +32,20 @@ export function ToIntlMathematicalValue(input: unknown): Decimal {
   try {
     const d = new Decimal(primValue as any)
     if (typeof primValue === 'string') {
-      let m = 0
-      let n = 0
       const numericLiteral = primValue.trim()
       const unsignedDecimalLiteral = numericLiteral.startsWith('-')
         ? numericLiteral.substring(1)
         : numericLiteral
 
-      const decDotDec = unsignedDecimalLiteral.match(/^0*([0-9]+)\.([0-9]*)/)
-      if (decDotDec) {
-        m = decDotDec[1].length
-        n = decDotDec[2].length
-      } else {
-        const dotDec = unsignedDecimalLiteral.match(/^0*\.([0-9]+)/)
-        if (dotDec) {
-          m = 1
-          n = dotDec[1].length
-        } else {
-          const dec = unsignedDecimalLiteral.match(/^0*([0-9]+)/)
-          if (dec) {
-            m = dec[1].length
-            n = 0
-          }
-        }
+      let stringDigitCount = 0
+      const match = unsignedDecimalLiteral.match(/^([0-9]*)(?:\.([0-9]*))?/)!
+      if (match) {
+        const fd = match[2] ?? ''
+        stringDigitCount =
+          (match[1] + fd).replace(/^0+/, '').length || 1 + fd.length
       }
 
-      let f = 0
-      const exp = unsignedDecimalLiteral.match(/[eE]([+-]?[0-9]+)$/)
-      if (exp) {
-        const e = Number(exp[1])
-        if (m + e < 1) m = 1 - e
-      }
-
-      Object.assign(d, {__StringDigitCount: m + n + f})
+      Object.assign(d, {__StringDigitCount: stringDigitCount})
     }
     return d
   } catch {

packages/intl-numberformat/tests/keep-trailing-zeros.test.ts

@@ -48,7 +48,7 @@ assert.sameValue(nf.format('1.230e-2'), '0.01230')
 assert.sameValue(nf.format('12.30e-1'), '1.230')
 assert.sameValue(nf.format('12.30e-2'), '0.1230')
 assert.sameValue(nf.format('12.30e-3'), '0.01230')
-assert.sameValue(nf.format('1.2345e-1000'), '0.00000000000000000000')
+assert.sameValue(nf.format('1.2345e-1000'), '0.0000')
 
 // Default maximumfractionDigits is 3
 const nf2 = new NumberFormat('en-US', {minimumFractionDigits: 1})