Use jest to facilitate source coverage (#23)

Leslie-Wong-H · Apr 26, 2023 · ca7277e · ca7277e
2 parents 5fe6180 + 3cadbdf
commit ca7277e
Show file tree

Hide file tree

Showing 7 changed files with 52,820 additions and 26,509 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -18,8 +18,9 @@ module.exports = {
     commonjs: true,
     es6: true,
     node: true,
+    "jest/globals": true,
   },
-  plugins: ["@typescript-eslint"],
+  plugins: ["@typescript-eslint", "jest"],
   extends: ["eslint:recommended", "plugin:import/errors", "prettier"],
   parserOptions: {
     ecmaVersion: 2018,
@@ -33,4 +34,12 @@ module.exports = {
     "no-unused-vars": ["off"],
     "no-underscore-dangle": ["off"],
   },
+  settings: {
+    "import/resolver": {
+      node: {
+        extensions: [".ts"],
+        moduleDirectory: ["src", "test", "node_modules"],
+      },
+    },
+  },
 };
diff --git a/jest.config.js b/jest.config.js
@@ -0,0 +1,9 @@
+module.exports = {
+  roots: ["<rootDir>/test"],
+  testRegex: "test/(.+)\\.spec\\.(js?|ts?)$",
+  transform: {
+    "^.+\\.ts?$": ["ts-jest", { useESM: true }],
+  },
+  moduleFileExtensions: ["js", "ts"],
+  extensionsToTreatAsEsm: [".ts"],
+};
diff --git a/package.json b/package.json
@@ -13,10 +13,11 @@
     "dev": "tsc --watch",
     "build": "rm -rf tsc-out && tsc && for f in tsc-out/*.js; do mv -- \"$f\" \"${f%.js}.mjs\"; done && rollup --config rollup.config.js",
     "build:win": "rmdir /s/q tsc-out && tsc && for %a in (tsc-out/*.js) do for /f \"tokens=1,* delims=.\" %b in (\"%~nxa\") do ren \"tsc-out\\%a\" \"%b.mjs\" && rollup --config rollup.config.js",
-    "test": "npm run test:cjs && npm run test:esm && npm run test:browser",
-    "test:cjs": "nyc --reporter=lcov mocha",
+    "test": "npm run test:cjs && npm run test:esm && npm run test:browser && npm run test:ts",
+    "test:cjs": "node test/test.js",
     "test:esm": "node --experimental-modules test/test.mjs",
     "test:browser": "node test_browser.js",
+    "test:ts": "jest --coverage",
     "lint": "eslint . --ext ts --fix",
     "ci": "npm run lint && npm run build && npm run test"
   },
@@ -43,6 +44,7 @@
     "@babel/plugin-proposal-class-properties": "^7.14.5",
     "@babel/plugin-transform-object-assign": "^7.16.0",
     "@babel/preset-env": "^7.5.5",
+    "@types/jest": "^29.5.1",
     "@typescript-eslint/eslint-plugin": "4.29.1",
     "@typescript-eslint/parser": "4.29.1",
     "babel-eslint": "^10.1.0",
@@ -51,9 +53,9 @@
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-jest": "^25.7.0",
     "husky": "^4.3.8",
-    "mocha": "^10.2.0",
-    "nyc": "^15.1.0",
+    "jest": "^28.1.3",
     "prettier": "^2.3.2",
     "request": "^2.88.2",
     "rollup": "^1.19.4",
@@ -62,6 +64,7 @@
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "tape": "^4.13.2",
+    "ts-jest": "^28.0.8",
     "typescript": "^4.5.2"
   },
   "dependencies": {

diff --git a/src/jsbi-calculator.ts b/src/jsbi-calculator.ts
@@ -311,7 +311,7 @@ function jsbiCal(tokens: string[]): string {
  * @param {Array} inp
  * @returns {Array}
  */
-function rpnParse(inp: string[]): string[] {
+function rpnParse(inp: (string | number)[]): string[] {
   let outQueue: Token[] = [];
   let opStack: Token[] = [];
 
@@ -384,7 +384,7 @@ interface Prec {
   "-": 2;
 }
 
-function tokenize(expArr: string[]): Token[] {
+function tokenize(expArr: (string | number)[]): Token[] {
   let result: Token[] = [];
 
   const assoc: Assoc = {
@@ -418,7 +418,8 @@ function tokenize(expArr: string[]): Token[] {
 
   // array of tokens
   if (Array.isArray(expArr)) {
-    expArr.forEach(function (char, idx) {
+    expArr.forEach(function (rawChar, idx) {
+      const char = String(rawChar);
       if (isDigit(char)) {
         result.push(new (Token as any)("Literal", char));
       } else if (isLetter(char)) {