bahttext 2.2.0 → 2.3.1

package/README-en.md

@@ -1,6 +1,7 @@
 # bahttext
 
 [![Version - npm](https://img.shields.io/npm/v/bahttext.svg)](https://www.npmjs.com/package/bahttext)
+[![Download - npm](https://img.shields.io/npm/dt/bahttext.svg)](https://www.npmjs.com/package/bahttext)
 [![License - npm](https://img.shields.io/npm/l/bahttext.svg)](http://opensource.org/licenses/MIT)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)](https://github.com/semantic-release/semantic-release) [![Greenkeeper badge](https://badges.greenkeeper.io/jojoee/bahttext.svg)](https://greenkeeper.io/)
 [![Codecov](https://img.shields.io/codecov/c/github/jojoee/bahttext.svg)](https://codecov.io/github/jojoee/bahttext)

package/README.md

@@ -1,6 +1,7 @@
 # bahttext
 
 [![Version - npm](https://img.shields.io/npm/v/bahttext.svg)](https://www.npmjs.com/package/bahttext)
+[![Download - npm](https://img.shields.io/npm/dt/bahttext.svg)](https://www.npmjs.com/package/bahttext)
 [![License - npm](https://img.shields.io/npm/l/bahttext.svg)](http://opensource.org/licenses/MIT)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)](https://github.com/semantic-release/semantic-release) [![Greenkeeper badge](https://badges.greenkeeper.io/jojoee/bahttext.svg)](https://greenkeeper.io/)
 [![Codecov](https://img.shields.io/codecov/c/github/jojoee/bahttext.svg)](https://codecov.io/github/jojoee/bahttext)
@@ -93,4 +94,3 @@ bahttext(-0.20) // ลบยี่สิบสตางค์
 - [Google Sheets BAHTTEXT function](https://support.google.com/docs/answer/9982303?hl=en)
 - [Microsoft Office's BAHTTEXT function](https://support.office.com/en-us/article/BAHTTEXT-function-5ba4d0b4-abd3-4325-8d22-7a92d59aab9c)
 - แรงบัลดาลใจจาก [earthchie/BAHTTEXT.js](https://github.com/earthchie/BAHTTEXT.js)
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bahttext",
-  "version": "2.2.0",
+  "version": "2.3.1",
   "description": "Change number to Thai pronunciation string",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
@@ -35,15 +35,15 @@
   },
   "homepage": "https://github.com/jojoee/bahttext#readme",
   "devDependencies": {
-    "@stryker-mutator/core": "^6.3.1",
-    "@stryker-mutator/jest-runner": "^6.3.1",
+    "@stryker-mutator/core": "^8.7.1",
+    "@stryker-mutator/jest-runner": "^8.7.1",
     "@to-da-moon/thai-baht-lib": "^0.0.12",
     "baht": "^0.7.1",
-    "jest": "^26.6.3",
-    "jest-expect-message": "^1.0.2",
-    "semantic-release": "^19.0.5",
-    "standard": "^15.0.1",
-    "thai-baht-text": "^1.0.8",
+    "jest": "^29.7.0",
+    "jest-expect-message": "^1.1.3",
+    "semantic-release": "^24.2.2",
+    "standard": "^17.1.2",
+    "thai-baht-text": "^2.0.5",
     "thai-baht-text-ts": "^1.1.0",
     "typescript": "*"
   },

package/src/index.js

@@ -4,28 +4,56 @@ const bahtxtConst = {
   placeNameStrs: ['', 'สิบ', 'ร้อย', 'พัน', 'หมื่น', 'แสน', 'ล้าน']
 }
 
+const GrammarFixs = [
+  { pat: /หนึ่งสิบ/g, replace: 'สิบ' },
+  { pat: /สองสิบ/g, replace: 'ยี่สิบ' },
+  { pat: /สิบหนึ่ง/g, replace: 'สิบเอ็ด' }
+]
+
 /**
  * @private
  * @param {number[]} nums
  * @returns {string}
  */
 function bahtxtNum2Word (nums) {
-  let result = ''
-  const len = nums.length
-  const maxLen = 7
+  /**
+   * Converts a numeric string (or legacy digit array) into Thai words without unit suffix.
+   * The new implementation iterates over the input string directly, eliminating
+   * the intermediate `Array.from(...).map(Number)` allocations previously used.
+   *
+   * @param {string|number[]} nums – string of digits ("123") or array \[1,2,3].
+   * @returns {string}
+   */
+  let numStr = ''
+
+  if (typeof nums === 'string') {
+    numStr = nums
+  } else if (Array.isArray(nums)) {
+    numStr = nums.join('')
+  } else {
+    return ''
+  }
+
+  // Trim leading zeros but leave at least one digit so "0" stays "0"
+  numStr = numStr.replace(/^0+/, '') || '0'
+
+  const len = numStr.length
+  const maxLen = 7 // handle up to 6-digit group + 1-digit look-ahead for "ล้าน" logic
 
   if (len > maxLen) {
-    // more than million
     const overflowIndex = len - maxLen + 1
-    const overflowNums = nums.slice(0, overflowIndex)
-    const remainingNumbs = nums.slice(overflowIndex)
-    return bahtxtNum2Word(overflowNums) + 'ล้าน' + bahtxtNum2Word(remainingNumbs)
-  } else {
-    for (let i = 0; i < len; i++) {
-      const digit = nums[i]
-      if (digit > 0) {
-        result += bahtxtConst.singleUnitStrs[digit] + bahtxtConst.placeNameStrs[len - i - 1]
-      }
+    const overflowStr = numStr.slice(0, overflowIndex)
+    const remainingStr = numStr.slice(overflowIndex)
+    return bahtxtNum2Word(overflowStr) + 'ล้าน' + bahtxtNum2Word(remainingStr)
+  }
+
+  let result = ''
+  for (let i = 0; i < len; i++) {
+    const digit = numStr.charCodeAt(i) - 48 // faster than parseInt(numStr[i], 10)
+    if (digit > 0) {
+      result +=
+        bahtxtConst.singleUnitStrs[digit] +
+        bahtxtConst.placeNameStrs[len - i - 1]
     }
   }
 
@@ -39,9 +67,10 @@ function bahtxtNum2Word (nums) {
  * @returns {string}
  */
 function bahtxtGrammarFix (str) {
-  return str.replace(/หนึ่งสิบ/g, 'สิบ')
-    .replace(/สองสิบ/g, 'ยี่สิบ')
-    .replace(/สิบหนึ่ง/g, 'สิบเอ็ด')
+  for (const GrammarFix of GrammarFixs) {
+    str = str.replace(GrammarFix.pat, GrammarFix.replace)
+  }
+  return str
 }
 
 /**
@@ -73,31 +102,27 @@ function bahtxtCombine (baht, satang) {
  * @returns {string}
  */
 function bahttext (num) {
-  if (!num || // no null
+  if (num === null || num === undefined || // explicit null/undefined check, allow 0
     typeof num === 'boolean' || // no boolean
-    isNaN(Number(num)) || // must be number only
-    num < Number.MIN_SAFE_INTEGER || // not less than Number.MIN_SAFE_INTEGER
-    num > Number.MAX_SAFE_INTEGER // no more than Number.MAX_SAFE_INTEGER
+    isNaN(Number(num)) || // must be numeric coercible
+    num < Number.MIN_SAFE_INTEGER || // outside JS safe integer range
+    num > Number.MAX_SAFE_INTEGER
   ) {
     return bahtxtConst.defaultResult
   }
 
-  // set
-  const positiveNum = Math.abs(num)
+  // normalise sign & prepare parts
+  const positiveNum = Math.abs(Number(num))
 
-  // split baht and satang e.g. 432.214567 >> 432, 21
-  const bahtStr = Math.floor(positiveNum).toString()
-  /** @type {string} */
-  const satangStr = (positiveNum % 1 * 100).toFixed(0)
+  const bahtPart = Math.floor(positiveNum)
 
-  /** @type {number[]} */
-  const bahtArr = Array.from(bahtStr).map(Number)
-  /** @type {number[]} */
-  const satangArr = Array.from(satangStr).map(Number)
+  const bahtStr = String(bahtPart)
+  // Keep original rounding behaviour ("toFixed(0)") to avoid output drift
+  const satangStr = (positiveNum % 1 * 100).toFixed(0)
 
-  // proceed
-  let baht = bahtxtNum2Word(bahtArr)
-  let satang = bahtxtNum2Word(satangArr)
+  // Convert directly without creating intermediate digit arrays
+  let baht = bahtxtNum2Word(bahtStr)
+  let satang = bahtxtNum2Word(satangStr)
 
   // grammar
   baht = bahtxtGrammarFix(baht)

package/src/index.test.js

@@ -1,119 +0,0 @@
-const {
-  bahttext,
-  bahtxtGrammarFix: grammarFix,
-  bahtxtCombine: combine
-} = require('./index')
-const defaultResult = 'ศูนย์บาทถ้วน'
-const groupedTestCasesKey = 'categoryCase'
-const googleSheetTestCases = require('../misc/testcases.json').map(item => {
-  item[groupedTestCasesKey] = `${item.category}-${item.case}`
-  return item
-})
-jest.autoMockOff()
-
-// TODO: move to somewhere else
-// TODO: write test
-function groupBy (arr, key) {
-  return arr.reduce((acc, curr) => {
-    acc[curr[key]] = (acc[curr[key]] || []).concat(curr)
-    return acc
-  }, {})
-}
-
-const groupedTestCases = groupBy(googleSheetTestCases, groupedTestCasesKey)
-
-// TODO: to be implemented
-describe('num2Word', () => {
-  test('test', () => {
-    expect(true).toBeTruthy()
-  })
-})
-
-describe('grammarFix', () => {
-  test('replace "หนึ่งสิบ" with "สิบ"', () => {
-    expect(grammarFix('หนึ่งสิบหก')).toBe('สิบหก')
-    expect(grammarFix('หนึ่งสิบสี่')).toBe('สิบสี่')
-    expect(grammarFix('ห้าร้อยหนึ่งสิบสาม')).toBe('ห้าร้อยสิบสาม')
-    expect(grammarFix('สี่หมื่นหนึ่งสิบสาม')).toBe('สี่หมื่นสิบสาม')
-  })
-
-  test('replace "สองสิบ" with "ยี่สิบ"', () => {
-    expect(grammarFix('ห้าร้อยสองสิบหนึ่ง')).toBe('ห้าร้อยยี่สิบเอ็ด')
-    expect(grammarFix('สองสิบสี่')).toBe('ยี่สิบสี่')
-    expect(grammarFix('เก้าแสนหกหมื่นสามพันสามร้อยสองสิบสี่')).toBe('เก้าแสนหกหมื่นสามพันสามร้อยยี่สิบสี่')
-    expect(grammarFix('เจ็ดหมื่นห้าพันสี่ร้อยสองสิบหนึ่ง')).toBe('เจ็ดหมื่นห้าพันสี่ร้อยยี่สิบเอ็ด')
-  })
-
-  test('replace "สิบหนึ่ง" with "สิบเอ็ด"', () => {
-    expect(grammarFix('หนึ่งสิบหนึ่ง')).toBe('สิบเอ็ด')
-  })
-})
-
-describe('combine', () => {
-  test('both baht and satang are empty', () => {
-    expect(combine('', '')).toBe('ศูนย์บาทถ้วน')
-  })
-
-  test('both baht and satang are not empty', () => {
-    expect(combine('หนึ่งร้อยยี่สิบสาม', 'ห้าสิบหก')).toBe('หนึ่งร้อยยี่สิบสามบาทห้าสิบหกสตางค์')
-  })
-
-  test('has only baht', () => {
-    expect(combine('แปดแสนเจ็ดหมื่นสี่พันห้าร้อยหกสิบสาม', '')).toBe('แปดแสนเจ็ดหมื่นสี่พันห้าร้อยหกสิบสามบาทถ้วน')
-  })
-
-  test('has only satang', () => {
-    expect(combine('', 'ลบสามสิบหก')).toBe('ลบสามสิบหกสตางค์')
-  })
-})
-
-describe('bahttext', () => {
-  test('invalid number', () => {
-    const zeroText = 'ศูนย์บาทถ้วน'
-
-    expect(bahttext(null)).toBe(zeroText)
-    expect(bahttext(true)).toBe(zeroText)
-    expect(bahttext(false)).toBe(zeroText)
-    expect(bahttext([])).toBe(zeroText)
-    expect(bahttext([1, 2, 3])).toBe(zeroText)
-    expect(bahttext({})).toBe(zeroText)
-    expect(bahttext('')).toBe(zeroText)
-    expect(bahttext()).toBe(zeroText)
-    expect(bahttext(undefined)).toBe(zeroText)
-    expect(bahttext('this-is-not-number')).toBe(zeroText)
-    expect(bahttext('it-must-be-number-only')).toBe(zeroText)
-    expect(bahttext('a123')).toBe(zeroText)
-  })
-
-  test('leading with zero', () => {
-    expect(bahttext('0.1')).toBe('สิบสตางค์')
-    expect(bahttext('01.1')).toBe('หนึ่งบาทสิบสตางค์')
-    expect(bahttext('-01.1')).toBe('ลบหนึ่งบาทสิบสตางค์')
-    expect(bahttext('000.01')).toBe('หนึ่งสตางค์')
-  })
-
-  test('less than Number.MIN_SAFE_INTEGER', () => {
-    const items = [1, 20, 9451, 5656549]
-    for (let i = 0; i < items.length; i++) {
-      expect(bahttext(Number.MIN_SAFE_INTEGER - items[i])).toBe(defaultResult)
-    }
-  })
-
-  test('more than Number.MAX_SAFE_INTEGER', () => {
-    const items = [1, 20, 9451, 5656549]
-    for (let i = 0; i < items.length; i++) {
-      expect(bahttext(Number.MAX_SAFE_INTEGER + items[i])).toBe(defaultResult)
-    }
-  })
-
-  // numbers are imported from Google Sheets
-  for (const [groupedName, testCases] of Object.entries(groupedTestCases)) {
-    test(`imported Google Sheets: ${groupedName}`, () => {
-      for (let i = 0; i < testCases.length; i++) {
-        const customMessage = JSON.stringify(testCases[i])
-        const number = Number(testCases[i].number)
-        expect(bahttext(number), customMessage).toBe(testCases[i].text)
-      }
-    })
-  }
-})