+
);
diff --git a/src/component/ButtonPanel.js b/src/component/ButtonPanel.js
index 994bca43d..58828a26a 100644
--- a/src/component/ButtonPanel.js
+++ b/src/component/ButtonPanel.js
@@ -1,15 +1,15 @@
-import Button from "./Button";
-import React from "react";
-import PropTypes from "prop-types";
+import React from 'react';
+import PropTypes from 'prop-types';
+import Button from './Button';
-import "./ButtonPanel.css";
+import './ButtonPanel.css';
export default class ButtonPanel extends React.Component {
static propTypes = {
clickHandler: PropTypes.func,
};
- handleClick = buttonName => {
+ handleClick = (buttonName) => {
this.props.clickHandler(buttonName);
};
diff --git a/src/component/Display.js b/src/component/Display.js
index 31a942d81..ff44e1aae 100644
--- a/src/component/Display.js
+++ b/src/component/Display.js
@@ -1,7 +1,7 @@
-import React from "react";
-import PropTypes from "prop-types";
+import React from 'react';
+import PropTypes from 'prop-types';
-import "./Display.css";
+import './Display.css';
export default class Display extends React.Component {
static propTypes = {
diff --git a/src/index.js b/src/index.js
index 923b6d97a..ae7573246 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,7 +1,7 @@
-import React from "react";
-import ReactDOM from "react-dom";
-import App from "./component/App";
-import "./index.css";
-import "github-fork-ribbon-css/gh-fork-ribbon.css";
+import React from 'react';
+import ReactDOM from 'react-dom';
+import App from './component/App';
+import './index.css';
+import 'github-fork-ribbon-css/gh-fork-ribbon.css';
-ReactDOM.render(
, document.getElementById("root"));
+ReactDOM.render(
, document.getElementById('root'));
diff --git a/src/logic/calculate.js b/src/logic/calculate.js
index 97e653205..7497d142c 100644
--- a/src/logic/calculate.js
+++ b/src/logic/calculate.js
@@ -1,7 +1,7 @@
-import Big from "big.js";
+import Big from 'big.js';
-import operate from "./operate";
-import isNumber from "./isNumber";
+import operate from './operate';
+import isNumber from './isNumber';
/**
* Given a button name and a calculator data object, return an updated
@@ -13,7 +13,7 @@ import isNumber from "./isNumber";
* operation:String +, -, etc.
*/
export default function calculate(obj, buttonName) {
- if (buttonName === "AC") {
+ if (buttonName === 'AC') {
return {
total: null,
next: null,
@@ -22,7 +22,7 @@ export default function calculate(obj, buttonName) {
}
if (isNumber(buttonName)) {
- if (buttonName === "0" && obj.next === "0") {
+ if (buttonName === '0' && obj.next === '0') {
return {};
}
// If there is an operation, update next
@@ -34,7 +34,7 @@ export default function calculate(obj, buttonName) {
}
// If there is no operation, update next and clear the value
if (obj.next) {
- const next = obj.next === "0" ? buttonName : obj.next + buttonName;
+ const next = obj.next === '0' ? buttonName : obj.next + buttonName;
return {
next,
total: null,
@@ -46,12 +46,12 @@ export default function calculate(obj, buttonName) {
};
}
- if (buttonName === "%") {
+ if (buttonName === '%') {
if (obj.operation && obj.next) {
const result = operate(obj.total, obj.next, obj.operation);
return {
total: Big(result)
- .div(Big("100"))
+ .div(Big('100'))
.toString(),
next: null,
operation: null,
@@ -60,38 +60,37 @@ export default function calculate(obj, buttonName) {
if (obj.next) {
return {
next: Big(obj.next)
- .div(Big("100"))
+ .div(Big('100'))
.toString(),
};
}
return {};
}
- if (buttonName === ".") {
+ if (buttonName === '.') {
if (obj.next) {
// ignore a . if the next number already has one
- if (obj.next.includes(".")) {
+ if (obj.next.includes('.')) {
return {};
}
- return { next: obj.next + "." };
+ return { next: `${obj.next}.` };
}
- return { next: "0." };
+ return { next: '0.' };
}
- if (buttonName === "=") {
+ if (buttonName === '=') {
if (obj.next && obj.operation) {
return {
total: operate(obj.total, obj.next, obj.operation),
next: null,
operation: null,
};
- } else {
- // '=' with no operation, nothing to do
- return {};
}
+ // '=' with no operation, nothing to do
+ return {};
}
- if (buttonName === "+/-") {
+ if (buttonName === '+/-') {
if (obj.next) {
return { next: (-1 * parseFloat(obj.next)).toString() };
}
diff --git a/src/logic/calculate.test.js b/src/logic/calculate.test.js
index 939e83331..02be23142 100644
--- a/src/logic/calculate.test.js
+++ b/src/logic/calculate.test.js
@@ -1,18 +1,18 @@
-import calculate from "./calculate";
-import chai from "chai";
+import chai from 'chai';
+import calculate from './calculate';
// https://github.com/chaijs/chai/issues/469
chai.config.truncateThreshold = 0;
-const expect = chai.expect;
+const { expect } = chai;
function pressButtons(buttons) {
const value = {};
- buttons.forEach(button => {
+ buttons.forEach((button) => {
Object.assign(value, calculate(value, button));
});
// no need to distinguish between null and undefined values
- Object.keys(value).forEach(key => {
+ Object.keys(value).forEach((key) => {
if (value[key] === null) {
delete value[key];
}
@@ -26,148 +26,148 @@ function expectButtons(buttons, expectation) {
function test(buttons, expectation, only = false) {
const func = only ? it.only : it;
- func(`buttons ${buttons.join(",")} -> ${JSON.stringify(expectation)}`, () => {
+ func(`buttons ${buttons.join(',')} -> ${JSON.stringify(expectation)}`, () => {
expectButtons(buttons, expectation);
});
}
-describe("calculate", function() {
- test(["6"], { next: "6" });
+describe('calculate', () => {
+ test(['6'], { next: '6' });
- test(["6", "6"], { next: "66" });
+ test(['6', '6'], { next: '66' });
- test(["6", "+", "6"], {
- next: "6",
- total: "6",
- operation: "+",
+ test(['6', '+', '6'], {
+ next: '6',
+ total: '6',
+ operation: '+',
});
- test(["6", "+", "6", "="], {
- total: "12",
+ test(['6', '+', '6', '='], {
+ total: '12',
});
- test(["0", "0", "+", "0", "="], {
- total: "0",
+ test(['0', '0', '+', '0', '='], {
+ total: '0',
});
- test(["6", "+", "6", "=", "9"], {
- next: "9",
+ test(['6', '+', '6', '=', '9'], {
+ next: '9',
});
- test(["3", "+", "6", "=", "+"], {
- total: "9",
- operation: "+",
+ test(['3', '+', '6', '=', '+'], {
+ total: '9',
+ operation: '+',
});
- test(["3", "+", "6", "=", "+", "9"], {
- total: "9",
- operation: "+",
- next: "9",
+ test(['3', '+', '6', '=', '+', '9'], {
+ total: '9',
+ operation: '+',
+ next: '9',
});
- test(["3", "+", "6", "=", "+", "9", "="], {
- total: "18",
+ test(['3', '+', '6', '=', '+', '9', '='], {
+ total: '18',
});
// When '=' is pressed and there is not enough information to complete
// an operation, the '=' should be disregarded.
- test(["3", "+", "=", "3", "="], {
- total: "6",
+ test(['3', '+', '=', '3', '='], {
+ total: '6',
});
- test(["+"], {
- operation: "+",
+ test(['+'], {
+ operation: '+',
});
- test(["+", "2"], {
- next: "2",
- operation: "+",
+ test(['+', '2'], {
+ next: '2',
+ operation: '+',
});
- test(["+", "2", "+"], {
- total: "2",
- operation: "+",
+ test(['+', '2', '+'], {
+ total: '2',
+ operation: '+',
});
- test(["+", "2", "+", "+"], {
- total: "2",
- operation: "+",
+ test(['+', '2', '+', '+'], {
+ total: '2',
+ operation: '+',
});
- test(["+", "2", "+", "5"], {
- next: "5",
- total: "2",
- operation: "+",
+ test(['+', '2', '+', '5'], {
+ next: '5',
+ total: '2',
+ operation: '+',
});
- test(["+", "2", "5"], {
- next: "25",
- operation: "+",
+ test(['+', '2', '5'], {
+ next: '25',
+ operation: '+',
});
- test(["+", "2", "5"], {
- next: "25",
- operation: "+",
+ test(['+', '2', '5'], {
+ next: '25',
+ operation: '+',
});
- test(["+", "6", "+", "5", "="], {
- total: "11",
+ test(['+', '6', '+', '5', '='], {
+ total: '11',
});
- test(["0", ".", "4"], {
- next: "0.4",
+ test(['0', '.', '4'], {
+ next: '0.4',
});
- test([".", "4"], {
- next: "0.4",
+ test(['.', '4'], {
+ next: '0.4',
});
- test([".", "4", "-", ".", "2"], {
- total: "0.4",
- next: "0.2",
- operation: "-",
+ test(['.', '4', '-', '.', '2'], {
+ total: '0.4',
+ next: '0.2',
+ operation: '-',
});
- test([".", "4", "-", ".", "2", "="], {
- total: "0.2",
+ test(['.', '4', '-', '.', '2', '='], {
+ total: '0.2',
});
// should clear the operator when AC is pressed
- test(["1", "+", "2", "AC"], {});
- test(["+", "2", "AC"], {});
+ test(['1', '+', '2', 'AC'], {});
+ test(['+', '2', 'AC'], {});
- test(["4", "%"], {
- next: "0.04",
+ test(['4', '%'], {
+ next: '0.04',
});
- test(["4", "%", "x", "2", "="], {
- total: "0.08",
+ test(['4', '%', 'x', '2', '='], {
+ total: '0.08',
});
- test(["4", "%", "x", "2"], {
- total: "0.04",
- operation: "x",
- next: "2",
+ test(['4', '%', 'x', '2'], {
+ total: '0.04',
+ operation: 'x',
+ next: '2',
});
// the percentage sign should also act as '='
- test(["2", "x", "2", "%"], {
- total: "0.04",
+ test(['2', 'x', '2', '%'], {
+ total: '0.04',
});
- //Test that pressing the multiplication or division sign multiple times should not affect the current computation
- test(["2", "x", "x"], {
- total: "2",
- operation: "x"
+ // Test that pressing the multiplication or division sign multiple times should not affect the current computation
+ test(['2', 'x', 'x'], {
+ total: '2',
+ operation: 'x',
});
- test(["2", "÷", "÷"], {
- total: "2",
- operation: "÷"
+ test(['2', '÷', '÷'], {
+ total: '2',
+ operation: '÷',
});
- test(["2", "÷", "x", "+", "-", "x"], {
- total: "2",
- operation: 'x'
+ test(['2', '÷', 'x', '+', '-', 'x'], {
+ total: '2',
+ operation: 'x',
});
});
diff --git a/src/logic/operate.js b/src/logic/operate.js
index 0274e3a74..622db8200 100644
--- a/src/logic/operate.js
+++ b/src/logic/operate.js
@@ -1,24 +1,23 @@
-import Big from "big.js";
+import Big from 'big.js';
export default function operate(numberOne, numberTwo, operation) {
- const one = Big(numberOne || "0");
- const two = Big(numberTwo || (operation === "÷" || operation === 'x' ? "1": "0")); //If dividing or multiplying, then 1 maintains current value in cases of null
- if (operation === "+") {
+ const one = Big(numberOne || '0');
+ const two = Big(numberTwo || (operation === '÷' || operation === 'x' ? '1' : '0')); // If dividing or multiplying, then 1 maintains current value in cases of null
+ if (operation === '+') {
return one.plus(two).toString();
}
- if (operation === "-") {
+ if (operation === '-') {
return one.minus(two).toString();
}
- if (operation === "x") {
+ if (operation === 'x') {
return one.times(two).toString();
}
- if (operation === "÷") {
- if (two === "0") {
- alert("Divide by 0 error");
- return "0";
- } else {
- return one.div(two).toString();
+ if (operation === '÷') {
+ if (two === '0') {
+ alert('Divide by 0 error');
+ return '0';
}
+ return one.div(two).toString();
}
throw Error(`Unknown operation '${operation}'`);
}
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 000000000..bdd9854cc
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,40 @@
+{
+ "compilerOptions": {
+ "module": "esnext",
+ "target": "es5",
+ "lib": [
+ "es5",
+ "es6",
+ "es7",
+ "es2017",
+ "dom",
+ "dom.iterable",
+ "esnext",
+ ],
+ "sourceMap": true,
+ "allowJs": true,
+ "jsx": "react",
+ "moduleResolution": "node",
+ "forceConsistentCasingInFileNames": true,
+ "strict": true,
+ "resolveJsonModule": true,
+ "declaration": false,
+ "esModuleInterop": true,
+ "noImplicitThis": true,
+ "noImplicitAny": true,
+ "strictNullChecks": true,
+ "noUnusedLocals": true,
+ "allowSyntheticDefaultImports": true,
+ "experimentalDecorators": true,
+ "emitDecoratorMetadata": true,
+ "baseUrl": "src",
+ "useDefineForClassFields": true
+ },
+ "exclude": [
+ "**/*.spec.ts",
+ "node_modules",
+ "vendor",
+ "public"
+ ],
+ "compileOnSave": false
+}