refac

__test__/BT.test.mjs

@@ -1,4 +1,4 @@
-import { BT } from "../index.mjs";
+import BT from "../function/BT.mjs";
 import op from "operation-strint";
 
 test(`BT CEIL`, () => {

__test__/BTTB.test.mjs

@@ -1,5 +1,5 @@
-import { BT } from "../index.mjs";
-import { TB } from "../index.mjs";
+import BT from "../function/BT.mjs";
+import TB from "../function/TB.mjs";
 
 test("Reverse BahtText", () => {
   expect(TB(BT(`123`))).toBe(`123.00`);

__test__/IsValidTB.test.mjs

@@ -1,4 +1,4 @@
-import { IsValidTB } from "../index.mjs";
+import IsValidTB from "../function/IsValidTB.mjs";
 
 test(`IsValidTB`, () => {
   expect(IsValidTB(`แปดสิบแปดบาท`)).toBe(true);

__test__/IsValidText.test.mjs

@@ -1,4 +1,4 @@
-import { IsValidText } from "../index.mjs";
+import IsValidText from "../function/IsValidText.mjs";
 
 test(`IsValidText`, () => {
   expect(

__test__/LNBT.test.mjs

@@ -1,4 +1,4 @@
-import { LNBT } from "../index.mjs";
+import LNBT from "../function/LNBT.mjs";
 
 test(`LNBT`, () => {
   expect(LNBT(`Googolplex`)).toBe(`Don't Try This`);

__test__/PrintSatangs.test.mjs

@@ -1,5 +1,5 @@
-import { PrintSatangs } from "../index.mjs";
-import { FULLBAHT } from "../const/index.mjs";
+import PrintSatangs from "../function/PrintSatangs.mjs";
+import FULLBAHT from "../const/primitive/FULLBAHT.mjs";
 
 test("PrintSatangs", () => {
   expect(PrintSatangs(`67`)[0]).toBe(`หกสิบเจ็ดสตางค์`);

__test__/SEP.test.mjs

@@ -1,4 +1,4 @@
-import { SEP } from "../index.mjs";
+import SEP from "../function/SEP.mjs";
 
 test(`sep`, () => {
   expect(SEP(`11`, `;;;`)).toBe(`สิบ;;;เอ็ด`);

__test__/SatangNum.test.mjs

@@ -1,4 +1,4 @@
-import { SatangNum } from "../index.mjs";
+import SatangNum from "../function/SatangNum.mjs";
 
 test("SatangNum", () => {
   expect(SatangNum("ถ้วน")).toBe("00");

__test__/datatype.test.mjs

@@ -1,5 +1,5 @@
-import { FULLBAHT } from "../const/index.mjs";
-import BAHT from "../const/index.mjs";
+import FULLBAHT from "../const/primitive/FULLBAHT.mjs";
+import BAHT from "../const/primitive/BAHT.mjs";
 import {
   NumText,
   BT,

__test__/repeat.test.mjs

@@ -1,4 +1,4 @@
-import { repeat } from "../index.mjs";
+import repeat from "../function/repeat.mjs";
 
 test("repeat", () => {
   expect(repeat(`ค`, [3])).toBe(`คคค`);

compare.js

@@ -1,5 +1,5 @@
-import {BT} from "./index.mjs"
-import { toDec } from "./octal.mjs";
+import BT from "./function/BT.mjs"
+import toDec from "./octal/toDec.mjs";
 import THBText from "thai-baht-text";
 
 let a = 29999999999999999;

compare.test.mjs

@@ -1,4 +1,4 @@
-import {BT} from "./index.mjs"
+import BT from "./function/BT.mjs";
 import THBText from "thai-baht-text"
 import { bahttext } from "bahttext";
 import { convert } from "numbaht";

function/ABT.mjs

@@ -1,7 +1,7 @@
 import THBText from "thai-baht-text";
 import NEG from "./NEG.mjs";
 import BF from "./BF.mjs";
-import { MAX_SAFE_INTEGER } from "../const/index.mjs";
+import MAX_SAFE_INTEGER from "../const/primitive/MAX_SAFE_INTEGER.mjs";
 
 const ABT = (money, ed = false, allow_neg = false) => {
   let retVal = undefined;

function/BT.mjs

@@ -1,4 +1,4 @@
-import { isOctal, toDec } from "../octal.mjs";
+import { isOctal, toDec } from "../octal/index.mjs";
 import MoneyInvalid from "../snippet/MoneyInvalid.mjs";
 import BahtText from "./BahtText.mjs";
 import READAS from "../const/primitive/READAS.mjs";

function/IsValidTB.mjs

@@ -1,6 +1,6 @@
 import BT from "./BT.mjs";
 import TB from "./TB.mjs";
-import { FULLBAHT } from "../const/index.mjs";
+import FULLBAHT from "../const/primitive/FULLBAHT.mjs";
 
 const IsValidTB = (str) => {
   const BTTB = BT(TB(str)).replace(/\s/g, "");

function/NEG.mjs

@@ -1,4 +1,4 @@
-import { negative } from "../const/index.mjs"
+import negative from "../const/primitive/negative.mjs";
 import BF from "./BF.mjs"
 
 const NEG = (money, ed = false, f = BF, neg = negative) => {

function/SatangNum.mjs

@@ -1,5 +1,5 @@
-import { FULLBAHT } from "../const/index.mjs"
-import {OneToTenTextRegex} from "../const/index.mjs"
+import FULLBAHT from "../const/primitive/FULLBAHT.mjs";
+import OneToTenTextRegex from "../const/regex/OneToTenTextRegex.mjs";
 import ElevenToNineteenRegex from "../const/regex/ElevenToNineteenRegex.mjs"
 import TwentyToNinetyNine from "../const/regex/TwentyToNinetyNine.mjs"
 import FTHAISATANGWORDS from "../const/array/FTHAISATANGWORDS.mjs"

function/hundredThousandToOne.mjs

@@ -1,8 +1,8 @@
 import REVERSETHAIDIGITWORDS from "../const/array/REVERSETHAIDIGITWORDS.mjs";
-import {THAINUMBERWORDS} from "../const/index.mjs";
-import {SPECIALONE} from "../const/index.mjs";
-import {SPECIALTWO} from "../const/index.mjs";
-import {TEN} from "../const/index.mjs";
+import THAINUMBERWORDS from "../const/array/THAINUMBERWORDS.mjs";
+import SPECIALONE from "../const/primitive/SPECIALONE.mjs";
+import SPECIALTWO from "../const/primitive/SPECIALTWO.mjs";
+import TEN from "../const/primitive/TEN.mjs";
 
 import padWithLeadingZeros from "../snippet/padWithLeadingZeros.mjs";
 const hundredThousandToOne = (digits, ed = false) => {

octal/index.mjs

@@ -0,0 +1,7 @@
+import isOctal from "./isOctal.mjs";
+import toDec from "./toDec.mjs";
+
+export {
+  isOctal,
+  toDec,
+};

octal/isOctal.mjs

@@ -0,0 +1,8 @@
+import octalRegex1 from "../const/regex/octalRegex1.mjs";
+import octalRegex2 from "../const/regex/octalRegex2.mjs";
+
+const isOctal = (money) => {
+  if (typeof money !== `string`) return undefined;
+  return octalRegex1.test(money) || octalRegex2.test(money);
+};
+export default isOctal;

octal.test.mjs → octal/octal.test.mjs

@@ -1,4 +1,5 @@
-import { isOctal,toDec } from "./octal.mjs";
+import isOctal from "./isOctal.mjs";
+import toDec from "./toDec.mjs";
 
 test(`isOctal`, () => {
   expect(isOctal(`077`)).toBe(true)

octal/toDec.mjs

@@ -0,0 +1,15 @@
+import op from "operation-strint";
+
+const toDec = (num) => {
+  let val = `0`;
+  if (!isOctal(num)) return num;
+  num = num.replace(/^0+o?/, ``);
+  let pos = -1;
+  for (let i of num.split("").reverse()) {
+    let thispos_val = op.multiply(op.pow(`8`, `${pos + 1}`), i);
+    val = op.sum(val, thispos_val);
+    pos++;
+  }
+  return val;
+};
+export default toDec;