@valkyriestudios/utils 8.4.0 → 10.0.0

package/src/object/define.mjs

@@ -1,11 +1,9 @@
 'use strict';
 
-import {PROTO_OBJ} from './is.mjs';
-
 export default function define (props, obj = {}) {
     if (
-        Object.prototype.toString.call(props) !== PROTO_OBJ ||
-        Object.prototype.toString.call(obj) !== PROTO_OBJ
+        Object.prototype.toString.call(props) !== '[object Object]' ||
+        Object.prototype.toString.call(obj) !== '[object Object]'
     ) throw new TypeError('Please pass an object as the value for props and obj');
 
     return Object.defineProperties(obj, props);

package/src/object/is.mjs

@@ -1,6 +1,6 @@
 'use strict';
 
-export const PROTO_OBJ = '[object Object]';
+const PROTO_OBJ = '[object Object]';
 
 export default function isObject (val) {
     return Object.prototype.toString.call(val) === PROTO_OBJ;

package/src/object/isNotEmpty.mjs

@@ -1,7 +1,5 @@
 'use strict';
 
-import {PROTO_OBJ} from './is.mjs';
-
 export default function isNotEmptyObject (val) {
-    return Object.prototype.toString.call(val) === PROTO_OBJ && Object.keys(val).length > 0;
+    return Object.prototype.toString.call(val) === '[object Object]' && Object.keys(val).length > 0;
 }

package/src/object/merge.mjs

@@ -1,16 +1,14 @@
 'use strict';
 
-import {PROTO_OBJ} from './is.mjs';
-
 const merge = (target, source = {}) => {
     if (
-        Object.prototype.toString.call(target) !== PROTO_OBJ ||
-        Object.prototype.toString.call(source) !== PROTO_OBJ
+        Object.prototype.toString.call(target) !== '[object Object]' ||
+        Object.prototype.toString.call(source) !== '[object Object]'
     ) throw new TypeError('Please pass a target and object to merge');
 
     return Object.keys(target).reduce((acc, key) => {
         if (
-            Object.prototype.toString.call(target[key]) === PROTO_OBJ &&
+            Object.prototype.toString.call(target[key]) === '[object Object]' &&
             !Array.isArray(target[key])
         ) {
             acc[key] = merge(target[key], source[key] || {});

package/src/object/pick.mjs

@@ -1,13 +1,11 @@
 'use strict';
 
-import deepGet          from '../deep/get.mjs';
-import deepSet          from '../deep/set.mjs';
-import isNotEmptyString from '../string/isNotEmpty.mjs';
-import {PROTO_OBJ}      from './is.mjs';
+import deepGet from '../deep/get.mjs';
+import deepSet from '../deep/set.mjs';
 
 export default function pick (obj, keys) {
     if (
-        Object.prototype.toString.call(obj) !== PROTO_OBJ ||
+        Object.prototype.toString.call(obj) !== '[object Object]' ||
         !Array.isArray(keys) ||
         keys.length === 0
     ) throw new TypeError('Please pass an object to pick from and a keys array');
@@ -16,17 +14,21 @@ export default function pick (obj, keys) {
     let key_deep = false;
     let val;
     for (const key of keys) {
-        if (!isNotEmptyString(key)) continue;
-        key_deep = key.match(/(\.|\[)/g);
+        if (typeof key !== 'string') continue;
+
+        const sanitized = key.trim();
+        if (sanitized.length === 0) continue;
+
+        key_deep = sanitized.match(/(\.|\[)/g);
         val = key_deep
-            ? deepGet(obj, key.trim())
-            : obj[key.trim()];
+            ? deepGet(obj, sanitized)
+            : obj[sanitized];
         if (val === undefined) continue;
 
         if (key_deep) {
-            deepSet(map, key.trim(), val);
+            deepSet(map, sanitized, val);
         } else {
-            map[key.trim()] = val;
+            map[sanitized] = val;
         }
     }
     return map;

package/src/regexp/is.mjs

@@ -1,7 +1,5 @@
 'use strict';
 
-export const PROTO_RGX = '[object RegExp]';
-
 export default function isRegExp (val) {
-    return Object.prototype.toString.call(val) === PROTO_RGX;
+    return Object.prototype.toString.call(val) === '[object RegExp]';
 }

package/src/regexp/sanitize.mjs

@@ -1,12 +1,10 @@
 'use strict';
 
-import isNotEmptyString from '../string/isNotEmpty.mjs';
-
 //  Escapes a value to be used inside of a regular expression (eg: new RegExp(...))
 //  For more info: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#Escaping
 //
 //  @param string   val     Value to escape
 export default function sanitizeRegExp (val) {
-    if (!isNotEmptyString(val)) return false;
+    if (typeof val !== 'string') return false;
     return val.trim().replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&');
 }

package/src/string/humanizeBytes.mjs

@@ -1,20 +1,18 @@
 'use strict';
 
-import isString         from '../string/is.mjs';
-import isNotEmptyString from '../string/isNotEmpty.mjs';
-import {PROTO_OBJ}      from '../object/is.mjs';
 import humanizeNumber   from './humanizeNumber.mjs';
+import isNotEmptyString from '../string/isNotEmpty.mjs';
 
 //  Humanize a numerical byte value into a readable file size
 //
 //  @param int  val     Amount of bytes
 export default function humanizeBytes (val, options = {}) {
-    const has_opts = Object.prototype.toString.call(options) === PROTO_OBJ;
+    const has_opts = Object.prototype.toString.call(options) === '[object Object]';
     return humanizeNumber(val, {
-        delim: has_opts && isString(options.delim)
+        delim: has_opts && typeof options.delim === 'string'
             ? options.delim
             : ',',
-        separator: has_opts && isNotEmptyString(options.separator)
+        separator: has_opts && typeof options.separator === 'string' && options.separator.trim().length > 0
             ? options.separator
             : '.',
         precision: has_opts && Number.isInteger(options.precision) && options.precision >= 0

package/src/string/humanizeNumber.mjs

@@ -1,21 +1,19 @@
 'use strict';
 
-import isBoolean        from '../boolean/is.mjs';
-import isString         from '../string/is.mjs';
-import isNotEmptyString from '../string/isNotEmpty.mjs';
-import round            from '../number/round.mjs';
-import {PROTO_OBJ}      from '../object/is.mjs';
+import isBoolean    from '../boolean/is.mjs';
+import isString     from '../string/is.mjs';
+import round        from '../number/round.mjs';
 
 //  Humanize a numerical value into a unit base
 //
 //  @param int  val     Amount of bytes
 export default function humanizeNumber (val, options = {}) {
-    const has_opts = Object.prototype.toString.call(options) === PROTO_OBJ;
+    const has_opts = Object.prototype.toString.call(options) === '[object Object]';
     const OPTS = {
-        delim: has_opts && isString(options.delim)
+        delim: has_opts && typeof options.delim === 'string'
             ? options.delim
             : ',',
-        separator: has_opts && isNotEmptyString(options.separator)
+        separator: has_opts && typeof options.separator === 'string' && options.separator.trim().length > 0
             ? options.separator
             : '.',
         precision: has_opts && Number.isInteger(options.precision) && options.precision >= 0
@@ -35,16 +33,16 @@ export default function humanizeNumber (val, options = {}) {
     };
 
     //  If not a valid value, return
-    if (!(Number.isFinite(val) || isNotEmptyString(val))) {
+    if (!Number.isFinite(val) && typeof val !== 'string') {
         return `0${OPTS.units.length > 0 ? OPTS.units[0] : ''}`;
     }
 
     //  Ensure we are working with an integer
     let normalized;
     if (OPTS.real) {
-        normalized = parseInt(isString(val) ? val.trim() : val) || 0;
+        normalized = parseInt(typeof val === 'string' ? val.trim() : val) || 0;
     } else {
-        normalized = parseFloat(isString(val) ? val.trim() : val) || 0;
+        normalized = parseFloat(typeof val === 'string' ? val.trim() : val) || 0;
     }
     if (!Number.isFinite(normalized) || normalized === 0) {
         return `0${OPTS.units.length > 0 ? OPTS.units[0] : ''}`;

package/src/string/is.mjs

@@ -1,5 +1,5 @@
 'use strict';
 
 export default function isString (val) {
-    return typeof val === 'string' || val instanceof String;
+    return typeof val === 'string';
 }

package/src/string/isBetween.mjs

@@ -1,11 +1,9 @@
 'use strict';
 
-import isString from './is.mjs';
-
 //  Check if a string is between a range in length
 export default function isStringBetween (val, min, max, trimmed = true) {
     if (
-        !isString(val) ||
+        typeof val !== 'string' ||
         !Number.isFinite(min) ||
         min < 0 ||
         !Number.isFinite(max) ||

package/src/string/isNotEmpty.mjs

@@ -1,6 +1,6 @@
 'use strict';
 
 export default function isNotEmptyString (val, trimmed = true) {
-    if (typeof val !== 'string' && !(val instanceof String)) return false;
+    if (typeof val !== 'string') return false;
     return (trimmed === true ? val.trim() : val).length > 0;
 }

package/src/string/shorten.mjs

@@ -1,8 +1,5 @@
 'use strict';
 
-import isString 		from './is.mjs';
-import isNumberAbove    from '../number/isAbove.mjs';
-
 //  Shorten a string and add a postfix if it goes over a specific length, will autotrim value
 //
 //  @param string   val         Value to shorten, returns false a string is not passed
@@ -10,12 +7,14 @@ import isNumberAbove    from '../number/isAbove.mjs';
 //  @param string   postfix     (default='...') Postfix to use when shortened
 export default function shorten (val, length, postfix = '...') {
     if (
-        !isString(val) ||
-        !isString(postfix) ||
-        !isNumberAbove(length, 0)
+        typeof val !== 'string' ||
+        typeof postfix !== 'string' ||
+        !Number.isFinite(length) ||
+        length <= 0
     ) return false;
 
-    if (val.trim().length <= length) return val.trim();
+    //  Trim first
+    const sanitized = val.trim();
 
-    return `${val.trim().substr(0, length)}${postfix}`;
+    return sanitized.length <= length ? sanitized : `${sanitized.substr(0, length)}${postfix}`;
 }

package/string/humanizeBytes.js

@@ -4,17 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: !0
 });
 exports["default"] = humanizeBytes;
-var _is = _interopRequireDefault(require("../string/is.js"));
-var _isNotEmpty = _interopRequireDefault(require("../string/isNotEmpty.js"));
-var _is2 = require("../object/is.js");
 var _humanizeNumber = _interopRequireDefault(require("./humanizeNumber.js"));
+var _isNotEmpty = _interopRequireDefault(require("../string/isNotEmpty.js"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function humanizeBytes(val) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var has_opts = Object.prototype.toString.call(options) === _is2.PROTO_OBJ;
+  var has_opts = Object.prototype.toString.call(options) === '[object Object]';
   return (0, _humanizeNumber["default"])(val, {
-    delim: has_opts && (0, _is["default"])(options.delim) ? options.delim : ',',
-    separator: has_opts && (0, _isNotEmpty["default"])(options.separator) ? options.separator : '.',
+    delim: has_opts && typeof options.delim === 'string' ? options.delim : ',',
+    separator: has_opts && typeof options.separator === 'string' && options.separator.trim().length > 0 ? options.separator : '.',
     precision: has_opts && Number.isInteger(options.precision) && options.precision >= 0 ? options.precision : 2,
     units: has_opts && Array.isArray(options.units) && options.units.length > 0 ? options.units.filter(_isNotEmpty["default"]) : [' bytes', ' KB', ' MB', ' GB', ' TB', ' PB', ' EB', ' ZB', ' YB'],
     divider: 1024,

package/string/humanizeNumber.js

@@ -6,29 +6,27 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = humanizeNumber;
 var _is = _interopRequireDefault(require("../boolean/is.js"));
 var _is2 = _interopRequireDefault(require("../string/is.js"));
-var _isNotEmpty = _interopRequireDefault(require("../string/isNotEmpty.js"));
 var _round = _interopRequireDefault(require("../number/round.js"));
-var _is3 = require("../object/is.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function humanizeNumber(val) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var has_opts = Object.prototype.toString.call(options) === _is3.PROTO_OBJ;
+  var has_opts = Object.prototype.toString.call(options) === '[object Object]';
   var OPTS = {
-    delim: has_opts && (0, _is2["default"])(options.delim) ? options.delim : ',',
-    separator: has_opts && (0, _isNotEmpty["default"])(options.separator) ? options.separator : '.',
+    delim: has_opts && typeof options.delim === 'string' ? options.delim : ',',
+    separator: has_opts && typeof options.separator === 'string' && options.separator.trim().length > 0 ? options.separator : '.',
     precision: has_opts && Number.isInteger(options.precision) && options.precision >= 0 ? options.precision : 2,
     units: has_opts && (Array.isArray(options.units) && options.units.length > 0 || options.units === !1) ? options.units ? options.units.filter(_is2["default"]) : !1 : ['', 'k', 'm', 'b', 't', 'q'],
     divider: has_opts && Number.isInteger(options.divider) && options.divider > 1 ? options.divider : 1000,
     real: has_opts && (0, _is["default"])(options.real) ? options.real : !1
   };
-  if (!(Number.isFinite(val) || (0, _isNotEmpty["default"])(val))) {
+  if (!Number.isFinite(val) && typeof val !== 'string') {
     return "0".concat(OPTS.units.length > 0 ? OPTS.units[0] : '');
   }
   var normalized;
   if (OPTS.real) {
-    normalized = parseInt((0, _is2["default"])(val) ? val.trim() : val) || 0;
+    normalized = parseInt(typeof val === 'string' ? val.trim() : val) || 0;
   } else {
-    normalized = parseFloat((0, _is2["default"])(val) ? val.trim() : val) || 0;
+    normalized = parseFloat(typeof val === 'string' ? val.trim() : val) || 0;
   }
   if (!Number.isFinite(normalized) || normalized === 0) {
     return "0".concat(OPTS.units.length > 0 ? OPTS.units[0] : '');

package/string/is.js

@@ -5,5 +5,5 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = isString;
 function isString(val) {
-  return typeof val === 'string' || val instanceof String;
+  return typeof val === 'string';
 }

package/string/isBetween.js

@@ -1,14 +1,11 @@
 'use strict';
-
 Object.defineProperty(exports, "__esModule", {
   value: !0
 });
 exports["default"] = isStringBetween;
-var _is = _interopRequireDefault(require("./is.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function isStringBetween(val, min, max) {
   var trimmed = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : !0;
-  if (!(0, _is["default"])(val) || !Number.isFinite(min) || min < 0 || !Number.isFinite(max) || max < 0 || min >= max) return !1;
+  if (typeof val !== 'string' || !Number.isFinite(min) || min < 0 || !Number.isFinite(max) || max < 0 || min >= max) return !1;
   var length = (trimmed === !0 ? val.trim() : val).length;
   return length >= min && length <= max;
 }

package/string/isNotEmpty.js

@@ -6,6 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = isNotEmptyString;
 function isNotEmptyString(val) {
   var trimmed = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !0;
-  if (typeof val !== 'string' && !(val instanceof String)) return !1;
+  if (typeof val !== 'string') return !1;
   return (trimmed === !0 ? val.trim() : val).length > 0;
 }

package/string/shorten.js

@@ -1,15 +1,11 @@
 'use strict';
-
 Object.defineProperty(exports, "__esModule", {
   value: !0
 });
 exports["default"] = shorten;
-var _is = _interopRequireDefault(require("./is.js"));
-var _isAbove = _interopRequireDefault(require("../number/isAbove.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function shorten(val, length) {
   var postfix = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '...';
-  if (!(0, _is["default"])(val) || !(0, _is["default"])(postfix) || !(0, _isAbove["default"])(length, 0)) return !1;
-  if (val.trim().length <= length) return val.trim();
-  return "".concat(val.trim().substr(0, length)).concat(postfix);
+  if (typeof val !== 'string' || typeof postfix !== 'string' || !Number.isFinite(length) || length <= 0) return !1;
+  var sanitized = val.trim();
+  return sanitized.length <= length ? sanitized : "".concat(sanitized.substr(0, length)).concat(postfix);
 }