From 0b1a68eee14d665733216fae3d1ef137eb343778 Mon Sep 17 00:00:00 2001
From: Chadin Chaipornpisuth <ping47024@icloud.com>
Date: Fri, 17 Jan 2025 19:16:43 +0700
Subject: [PATCH] op

---
 function/TB.js | 14 +++++---------
 index.test.js  | 15 ++++-----------
 octal.test.js  |  6 +++---
 performance.js |  6 ++----
 4 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/function/TB.js b/function/TB.js
index b280320..be76719 100644
--- a/function/TB.js
+++ b/function/TB.js
@@ -12,12 +12,12 @@ const THAINUMBERWORDS = require("../const/array/THAINUMBERWORDS");
 module.exports = (BT, error = `Invalid String`) => {
   if (!BT) return undefined;
 
-  if (/บาท$/.test(BT)) BT = `${BT}${FULLBAHT}`;
-  if (!/สตางค์$/.test(BT) && !/ถ้วน$/.test(BT)) return error;
+  if (BT.endsWith(BAHT)) BT = `${BT}${FULLBAHT}`;
+  if (!BT.endsWith(SATANG) && !BT.endsWith(FULLBAHT)) return error;
 
   const [moneyBaht, moneySatang] = BT.split(BAHT);
 
-  if (/สตางค์$/.test(moneyBaht) && !moneySatang) {
+  if (moneyBaht.endsWith(SATANG) && !moneySatang) {
     return `0.${SatangNum(moneyBaht.replace(SATANG, ``))}`;
   }
 
@@ -57,11 +57,7 @@ module.exports = (BT, error = `Invalid String`) => {
 
     const VL =
       SatangNum(
-        million
-          .replace(/.+แสน/, ``)
-          .replace(/.+หมื่น/, ``)
-          .replace(/.+พัน/, ``)
-          .replace(/.+ร้อย/, ``)
+        million.replace(/.+(แสน|หมื่น|พัน|ร้อย)/, ``)
       ) || `00`;
 
     moneyBahts.push(
@@ -72,7 +68,7 @@ module.exports = (BT, error = `Invalid String`) => {
     );
   }
 
-  return `${removeLeadingingZeros(moneyBahts.reverse().join(""))}.${SatangNum(
+  return `${removeLeadingingZeros(moneyBahts.toReversed().join(""))}.${SatangNum(
     moneySatang.replace(SATANG, ``)
   )}`;
 };
diff --git a/index.test.js b/index.test.js
index 768263b..0ea1d40 100644
--- a/index.test.js
+++ b/index.test.js
@@ -220,7 +220,7 @@ test(`PrintSatangs 2d+`, () => {
 test(`BulkBahtText`, () =>{
     expect(BulkBahtText(`อย่าลืมใช้โค้ด 9arm นะครับ ใช้เถอะ เค้าจะได้จ้างผมต่อ`)).toBe(`อย่าลืมใช้โค้ด 9arm นะครับ ใช้เถอะ เค้าจะได้จ้างผมต่อ`)
     expect(
-      BulkBahtText(`30฿รักษาทุกโรค`, /(\d+)(\.\d{0,2}0*)?\฿/g).replace(
+      BulkBahtText(`30฿รักษาทุกโรค`, /(\d+)(\.\d{0,2}0*)?฿/g).replace(
         FULLBAHT,
         ``
       )
@@ -228,7 +228,7 @@ test(`BulkBahtText`, () =>{
     expect(
       BulkBahtText(`เงินดิจิมอน 10000฿ ใช้ยังไง ได้วันไหน ใครได้บ้าง`)
         .replace(FULLBAHT, ``)
-        .replace(RegExp(`฿`,`g`), ``)
+        .replace(/฿/g, ``)
     ).toBe(`เงินดิจิมอน หนึ่งหมื่นบาท ใช้ยังไง ได้วันไหน ใครได้บ้าง`);
     expect(BulkBahtText(`"900 ถูกมาก" ตุยไปละ`).replace(FULLBAHT, ``)).toBe(
       `"เก้าร้อยบาท ถูกมาก" ตุยไปละ`
@@ -389,8 +389,8 @@ test('Reverse BahtText', () => {
 });
 
 test('repeat',() => {
-  expect(repeat(`ค`,[3])).toBe(`คคค`);
-  expect(`ปิดสวิตซ์ ${repeat(`ป`, [3])} ป่าหี่`).toBe(
+  expect(repeat('ค',[3])).toBe(`คคค`);
+  expect(`ปิดสวิตซ์ ${repeat('ป', [3])} ป่าหี่`).toBe(
     `ปิดสวิตซ์ ปปป ป่าหี่`
   );
 })
@@ -451,13 +451,6 @@ test(`IsValidText`, () => {
   expect(IsValidText(`สองสิบ`)).toBe(false);
 });
 
-test(`Bool Test`, () => {
-  expect(true).toBe(true)
-  expect(true).toBe(!false)
-  expect(false).toBe(false);
-  expect(false).toBe(!true)
-})
-
 test(`IsValidTB`, () => {
     expect(IsValidTB(`แปดสิบแปดบาท`)).toBe(true);
 });
diff --git a/octal.test.js b/octal.test.js
index 25d7f38..bd4e162 100644
--- a/octal.test.js
+++ b/octal.test.js
@@ -12,9 +12,9 @@ test(`isOctal`, () => {
   expect(isOctal(`0o77_`)).toBe(false);
   expect(isOctal(`0o_77_`)).toBe(false);
   expect(isOctal(`0o7__7`)).toBe(false);
-  expect(isOctal(`0000877`)).toBe(!true);
-  expect(isOctal(`000o77`)).toBe(!true);
-  expect(isOctal(`000oo77`)).toBe(!true);
+  expect(isOctal(`0000877`)).toBe(false);
+  expect(isOctal(`000o77`)).toBe(false);
+  expect(isOctal(`000oo77`)).toBe(false);
   expect(isOctal(`053256462753462`)).toBe(true);
   expect(isOctal(0o77)).toBe(undefined);
   expect(isOctal(123)).toBe(undefined);
diff --git a/performance.js b/performance.js
index 4630d07..129e40e 100644
--- a/performance.js
+++ b/performance.js
@@ -7,8 +7,7 @@ const performance = async (money_array) => {
   console.time("thai-baht-text");
 
   for (const money of money_array) {
-    // console.log(THBText(money));
-    await pass(THBText(money));
+    pass(THBText(money));
   }
 
   console.timeEnd("thai-baht-text");
@@ -20,8 +19,7 @@ const performanceBR = async (money_array) => {
   console.time("BahtRext");
 
   for (const money of money_array) {
-    // console.log(BahtRext.BF(money));
-    await pass(BahtRext.BF(money));
+    pass(BahtRext.BF(money));
   }
 
   console.timeEnd("BahtRext");