the-math - npm Package Compare versions

Comparing version 1.0.0 to 1.0.1

dist/resolve.js

@@ -41,19 +41,19 @@ "use strict";
 }
-function Additions(fragments) {
-    var additionIndex = fragments.indexOf('+');
-    if (additionIndex !== -1) {
-        var internalResult = add_1.default(Number(fragments[additionIndex - 1]), Number(fragments[additionIndex + 1]));
-        fragments[additionIndex - 1] = String(internalResult);
-        fragments.splice(additionIndex, 2);
-        Additions(fragments);
+function additionsOrSubtract(fragments) {
+    var subtractIndex = fragments.indexOf('-');
+    var addIndex = fragments.indexOf('+');
+    if (subtractIndex === -1 && addIndex === -1) {
+        return;
     }
-}
-function Minus(fragments) {
-    var minusIndex = fragments.indexOf('-');
-    if (minusIndex !== -1) {
-        var internalResult = subtract_1.default(Number(fragments[minusIndex - 1]), Number(fragments[minusIndex + 1]));
-        fragments[minusIndex - 1] = String(internalResult);
-        fragments.splice(minusIndex, 2);
-        Minus(fragments);
+    if (subtractIndex !== -1 && subtractIndex > addIndex) {
+        var internalResult = subtract_1.default(Number(fragments[subtractIndex - 1]), Number(fragments[subtractIndex + 1]));
+        fragments[subtractIndex - 1] = String(internalResult);
+        fragments.splice(subtractIndex, 2);
     }
+    if (addIndex !== -1 && addIndex > subtractIndex) {
+        var internalResult = add_1.default(Number(fragments[addIndex - 1]), Number(fragments[addIndex + 1]));
+        fragments[addIndex - 1] = String(internalResult);
+        fragments.splice(addIndex, 2);
+    }
+    additionsOrSubtract(fragments);
 }
@@ -68,8 +68,5 @@ exports.default = (function (operation) {
     var numberAdditions = (operation.match(/\+/g) || []).length;
-    if (numberAdditions > 0) {
-        Additions(fragments);
-    }
     var numberMinus = (operation.match(/-/g) || []).length;
-    if (numberMinus > 0) {
-        Minus(fragments);
+    if (numberAdditions > 0 || numberMinus > 0) {
+        additionsOrSubtract(fragments);
     }
@@ -76,0 +73,0 @@ var result = fragments[0];

package.json

 {
   "name": "the-math",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Core of TheMath Calculator",
@@ -5,0 +5,0 @@ "main": "./dist/index.js",

No alert changes

Improved metrics

Total package byte prevSize

15057

increased by0.29%

Worsened metrics

Lines of code

265

decreased by-1.12%

No dependency changes