@8ms/helpers 1.1.110 → 1.1.112

package/number/getPercentIncrease.js

@@ -10,9 +10,9 @@ const getNumber_1 = __importDefault(require("./getNumber"));
 const getPercentageIncrease = ({ comparison, current, defaultValue }) => {
     const currentValue = (0, getNumber_1.default)({ input: current });
     const comparisonValue = (0, getNumber_1.default)({ input: comparison });
-    if (0 === currentValue) {
+    if (0 === comparisonValue) {
         return defaultValue;
     }
-    return (currentValue - comparisonValue) / currentValue * 100;
+    return (currentValue - comparisonValue) / comparisonValue * 100;
 };
 exports.default = getPercentageIncrease;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@8ms/helpers",
 	"license": "UNLICENSED",
-	"version": "1.1.110",
+	"version": "1.1.112",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"

package/util/defaultTo.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const isObject_1 = __importDefault(require("lodash/isObject"));
 const getArray_1 = __importDefault(require("../array/getArray"));
 /**
  * Function to default to a value, whilst filtering through an instance
@@ -11,8 +12,8 @@ const defaultTo = ({ defaultValue, instance, keys }) => {
     const keysArray = (0, getArray_1.default)({ input: keys });
     let found = true;
     let pointer = instance;
-    // Instance is undefined
-    if (undefined === instance) {
+    // Instance is undefined or is null
+    if (undefined === instance || null === pointer) {
         found = false;
     }
     // Instance exists
@@ -20,12 +21,17 @@ const defaultTo = ({ defaultValue, instance, keys }) => {
         keysArray.forEach(key => {
             if (found) {
                 // Sub key doesn't exist
-                if (undefined === pointer[key]) {
-                    found = false;
+                if ((0, isObject_1.default)(pointer)) {
+                    if (undefined === pointer[key] || null === pointer[key]) {
+                        found = false;
+                    }
+                    // Sub key exists, update pointer
+                    else {
+                        pointer = pointer[key];
+                    }
                 }
-                // Sub key exists, update pointer
                 else {
-                    pointer = pointer[key];
+                    found = false;
                 }
             }
         });