v2.1.1 (#12)

* Update style guide (#11)

Author: kael89

.prettierrc

@@ -0,0 +1,6 @@
+{
+  "arrowParens": "avoid",
+  "printWidth": 100,
+  "singleQuote": true,
+  "trailingComma": "all"
+}

__tests__/arithmetic.test.js

@@ -103,6 +103,7 @@ describe('Arithmetic', () => {
 
   describe('max function', () => {
     const { max } = Math;
+
     it('should handle max with no arguments', () => {
       const result = runArithmetic('max()');
       expect(result).toEqual(-Infinity);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beyondessential/arithmetic",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Utility to evaluate BODMAS arithmetic formulas",
   "keywords": [
     "arithmetic",
@@ -23,6 +23,8 @@
   "scripts": {
     "build": "babel src --out-dir dist --ignore 'src/__tests__/**'",
     "postinstall": "yarn build",
+    "lint": "eslint --ignore-path .gitignore .",
+    "lint:fix": "yarn lint --fix",
     "test": "NODE_ENV=test jest",
     "test:coverage": "yarn test --coverage",
     "test:watch": "yarn test --watch"
@@ -35,21 +37,17 @@
     ]
   },
   "eslintConfig": {
-    "extends": "@beyondessential/eslint-config-beyondessential",
-    "overrides": [
-      {
-        "files": "**/__tests__/**",
-        "env": {
-          "jest": true
-        }
-      }
+    "extends": [
+      "@beyondessential/js",
+      "@beyondessential/jest"
     ]
   },
   "devDependencies": {
     "@babel/cli": "^7.10.5",
     "@babel/core": "^7.11.1",
     "@babel/preset-env": "^7.11.0",
-    "@beyondessential/eslint-config-beyondessential": "^2.5.0",
+    "@beyondessential/eslint-config-jest": "^1.0.1",
+    "@beyondessential/eslint-config-js": "^1.0.1",
     "babel-jest": "^26.3.0",
     "eslint": "^7.7.0",
     "jest": "^26.4.0",

src/arithmetic.js

@@ -22,9 +22,7 @@
 // that, don't sweat! There're unit tests and you can validate that things
 // work over there.
 
-import {
-  isOperator, getPrecedence, FUNCTION_NAMES, isFunctionToken,
-} from './symbols';
+import { isOperator, getPrecedence, FUNCTION_NAMES, isFunctionToken } from './symbols';
 
 const unaryRegex = /(^|[*x/+\-u,(])-/g;
 function replaceUnaryMinus(text) {
@@ -160,7 +158,7 @@ const noWhitespace = /\s/g;
 // Names with a '(' after them are function calls, not variables
 // e.g. max(5 + max)
 // the first max would not be replaced
-const buildVariableReplacer = (key) => new RegExp(`${key}(?!\\s*\\()`, 'g');
+const buildVariableReplacer = key => new RegExp(`${key}(?!\\s*\\()`, 'g');
 
 export function runArithmetic(formulaText, values = {}) {
   // first replace variables with their actual values

src/symbols.js

@@ -7,7 +7,7 @@
 
 export const FUNCTION_NAMES = ['max'];
 
-export const isFunctionToken = (token) => FUNCTION_NAMES.includes(token);
+export const isFunctionToken = token => FUNCTION_NAMES.includes(token);
 
 export function isOperator(token) {
   return ['+', '-', '/', '*', 'x', 'u'].includes(token) || isFunctionToken(token);
@@ -38,7 +38,7 @@ export function getVariables(formulaText) {
     // Replace functions with a non-alphanumeric character
     .replace(new RegExp(`${FUNCTION_NAMES.join('|')}\\s*\\(`, 'g'), ' ')
     .split(/[+-/*() ]/g)
-    .filter((v) => v !== '' && Number.isNaN(Number(v)));
+    .filter(v => v !== '' && Number.isNaN(Number(v)));
 
   return [...new Set(variables)];
 }