@valkyriestudios/utils 8.0.0 → 8.2.0

package/CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic
 Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [8.2.0] - 2023-11-29
+### Improved
+- Dev Dep: Upgrade @babel/core to 7.23.5
+- Dev Dep: Upgrade @babel/preset-env to 7.23.5
+- deep/get: Allow handling of deep keys containing multiple array denominators
+- deep/set: Allow handling of deep keys containing multiple array denominators
+
+## [8.1.0] - 2023-11-29
+### Improved
+- Reverted module type change that caused breakage due to esm vs cjs compatibility
+- Adjusted src files and test files to work with .mjs extension
+
 ## [8.0.0] - 2023-11-29
 ### Added
 - Dev: Dep: c8\@8.0.1

package/README.md

@@ -305,7 +305,7 @@ Returns the current unix timestamp in seconds
 Returns the current unix timestamp in milliseconds
 
 - **startOfUTC(val:Date, key:String)**
-Take the incoming date and return a date set to the start of passed key. Possible key options(year,quarter,month,week,week_sun,day,hour,minute,second).
+Take the incoming date and return a date set to the start of passed key. Possible key options(year,quarter,month,week,week_sun,week_mon,week_tue,week_wed,week_thu,week_fri,week_sat,day,hour,minute,second).
 
 Note: Does not touch the date object passed
 ```js
@@ -325,7 +325,7 @@ startOfUTC(new Date("2023-05-04T12:04:27.043+02:00"), 'second'); // new Date("20
 ```
 
 - **endOfUTC(val:Date, key:String)**
-Take the incoming date and return a date set to the end of passed key. Possible key options(year,quarter,month,week,week_sun,day,hour,minute,second).
+Take the incoming date and return a date set to the end of passed key. Possible key options(year,quarter,month,week,week_sun,week_mon,week_tue,week_wed,week_thu,week_fri,week_sat,day,hour,minute,second).
 
 Note: Does not touch the date object passed
 ```js

package/deep/get.js

@@ -11,7 +11,7 @@ function deepGet(obj, path) {
   var get_parent = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : !1;
   if (Object.prototype.toString.call(obj) !== _is.PROTO_OBJ && !Array.isArray(obj)) throw new TypeError('Deepget is only supported for objects');
   if (!(0, _isNotEmpty["default"])(path)) throw new TypeError('No path was given');
-  var parts = path.replace('[', '.').replace(']', '').split('.');
+  var parts = path.replace(/\[/g, '.').replace(/(\.){2,}/g, '.').replace(/(^\.|\.$|\])/g, '').split('.');
   if (parts.length === 0 || parts.length === 1 && get_parent) return obj;
   if (get_parent) parts.pop();
   var cursor = obj;

package/deep/set.js

@@ -12,7 +12,7 @@ function deepSet(obj, path) {
   var define = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : !1;
   if (Object.prototype.toString.call(obj) !== _is.PROTO_OBJ && !Array.isArray(obj)) throw new TypeError('Deepset is only supported for objects');
   if (!(0, _isNotEmpty["default"])(path)) throw new TypeError('No path was given');
-  var parts = path.replace('[', '.').replace(']', '').split('.');
+  var parts = path.replace(/\[/g, '.').replace(/(\.){2,}/g, '.').replace(/(^\.|\.$|\])/g, '').split('.');
   for (var i = 0; i < parts.length - 1; i++) {
     if (parts[i] === '') continue;
     if (!obj[parts[i]]) obj[parts[i]] = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valkyriestudios/utils",
-  "version": "8.0.0",
+  "version": "8.2.0",
   "description": "A collection of single-function utilities for common tasks",
   "main": "index.js",
   "author": {
@@ -8,7 +8,6 @@
     "email": "contact@valkyriestudios.com",
     "url": "www.valkyriestudios.be"
   },
-  "type": "module",
   "keywords": [
     "utility",
     "library",
@@ -24,7 +23,7 @@
     "lint": "npm run lint:src && npm run lint:test",
     "lint:src": "./node_modules/.bin/eslint --ext .js,.mjs ./src",
     "lint:test": "./node_modules/.bin/eslint --ext .js,.mjs ./test",
-    "build": "npm run lint && npm run test:coverage && npx babel src --out-dir ./",
+    "build": "npm run lint && npm run test:coverage && rm -rf ./dist && mkdir ./dist && npx babel src --out-dir ./dist && sh ./adjust_esm_to_cjs.sh && mv -f ./dist/* ./ && rm -rf ./dist",
     "codecov": "codecov"
   },
   "repository": {
@@ -37,8 +36,8 @@
   "homepage": "https://github.com/ValkyrieStudios/utils#readme",
   "devDependencies": {
     "@babel/cli": "^7.23.4",
-    "@babel/core": "^7.23.2",
-    "@babel/preset-env": "^7.23.2",
+    "@babel/core": "^7.23.5",
+    "@babel/preset-env": "^7.23.5",
     "@babel/register": "^7.22.15",
     "babel-plugin-transform-minify-booleans": "^6.9.4",
     "babel-plugin-transform-remove-console": "^6.9.4",

package/src/array/{dedupe.js → dedupe.mjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-import fnv1A from '../hash/fnv1A.js';
+import fnv1A from '../hash/fnv1A.mjs';
 
 export default function dedupe (val) {
     if (!Array.isArray(val) || val.length === 0)  return [];

package/src/array/{join.js → join.mjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-import isNotEmptyString from '../string/isNotEmpty.js';
-import isNotEmptyObject from '../object/isNotEmpty.js';
-import round            from '../number/round.js';
+import isNotEmptyString from '../string/isNotEmpty.mjs';
+import isNotEmptyObject from '../object/isNotEmpty.mjs';
+import round            from '../number/round.mjs';
 
 //  Join an array of values while autofiltering any non-string/non-number elements
 //

package/src/array/{mapFn.js → mapFn.mjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-import isFunction       from '../function/is.js';
-import isNotEmptyString from '../string/isNotEmpty.js';
-import {PROTO_OBJ}      from '../object/is.js';
+import isFunction       from '../function/is.mjs';
+import isNotEmptyString from '../string/isNotEmpty.mjs';
+import {PROTO_OBJ}      from '../object/is.mjs';
 
 export default function mapFn (arr, fn, opts = {}) {
     if (

package/src/array/{mapKey.js → mapKey.mjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-import isNotEmptyString from '../string/isNotEmpty.js';
-import {PROTO_OBJ}      from '../object/is.js';
+import isNotEmptyString from '../string/isNotEmpty.mjs';
+import {PROTO_OBJ}      from '../object/is.mjs';
 
 export default function mapKey (arr, key, opts = {}) {
     if (

package/src/array/{mapPrimitive.js → mapPrimitive.mjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-import isNotEmptyString from '../string/isNotEmpty.js';
-import isNotEmptyObject from '../object/isNotEmpty.js';
+import isNotEmptyString from '../string/isNotEmpty.mjs';
+import isNotEmptyObject from '../object/isNotEmpty.mjs';
 
 export default function mapPrimitive (arr, opts = {}) {
     if (!Array.isArray(arr) || arr.length === 0) return {};

package/src/array/{sort.js → sort.mjs}

@@ -1,10 +1,10 @@
 'use strict';
 
-import isBoolean        from '../boolean/is.js';
-import isNotEmptyObject from '../object/isNotEmpty.js';
-import {PROTO_OBJ}      from '../object/is.js';
-import isNotEmptyString from '../string/isNotEmpty.js';
-import isFunction       from '../function/is.js';
+import isBoolean        from '../boolean/is.mjs';
+import isNotEmptyObject from '../object/isNotEmpty.mjs';
+import {PROTO_OBJ}      from '../object/is.mjs';
+import isNotEmptyString from '../string/isNotEmpty.mjs';
+import isFunction       from '../function/is.mjs';
 
 function partition (arr, start_ix, end_ix) {
     const pivot_val = arr[Math.floor((start_ix + end_ix) / 2)].t;

package/src/caching/{memoize.js → memoize.mjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-import isFunction from '../function/is.js';
+import isFunction from '../function/is.mjs';
 
 export default function memoize (fn, resolver = false) {
     const has_resolver = isFunction(resolver);

package/src/date/{addUTC.js → addUTC.mjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-import isNotEmptyString from '../string/isNotEmpty.js';
+import isNotEmptyString from '../string/isNotEmpty.mjs';
 
 export default function addUTC (val, amount, key) {
     if (

package/src/date/{diff.js → diff.mjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-import isNotEmptyString from '../string/isNotEmpty.js';
+import isNotEmptyString from '../string/isNotEmpty.mjs';
 
 const SECOND_IN_MILLISECONDS    = 1000;
 const MINUTE_IN_MILLISECONDS    = SECOND_IN_MILLISECONDS * 60;

package/src/date/{endOfUTC.js → endOfUTC.mjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-import isNotEmptyString from '../string/isNotEmpty.js';
+import isNotEmptyString from '../string/isNotEmpty.mjs';
 
 //  Take note: this is the end of week key for weeks starting on key,
 //  eg: end of week for week_mon is sunday as the week starts on monday and ends on sunday

package/src/date/{startOfUTC.js → startOfUTC.mjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-import isNotEmptyString from '../string/isNotEmpty.js';
+import isNotEmptyString from '../string/isNotEmpty.mjs';
 
 const WEEK_START = {
     week    : 1, // Original lib cases only contained week and historical was monday

package/src/deep/{define.js → define.mjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-import deepSet from './set.js';
+import deepSet from './set.mjs';
 
 export default function deepDefine (obj, path, value = null) {
     return deepSet(obj, path, value, true);

package/src/deep/{freeze.js → freeze.mjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-import {PROTO_OBJ} from '../object/is.js';
+import {PROTO_OBJ} from '../object/is.mjs';
 
 function deep (obj) {
     for (const key of Object.keys(obj)) {

package/src/deep/{get.js → get.mjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-import isNotEmptyString from '../string/isNotEmpty.js';
-import {PROTO_OBJ}      from '../object/is.js';
+import isNotEmptyString from '../string/isNotEmpty.mjs';
+import {PROTO_OBJ}      from '../object/is.mjs';
 
 //  Get a value from a path in a json-like structure
 export default function deepGet (obj, path, get_parent = false) {
@@ -14,7 +14,11 @@ export default function deepGet (obj, path, get_parent = false) {
     if (!isNotEmptyString(path)) throw new TypeError('No path was given');
 
     //  Cleanup paths : a.b[2].c --> ['a', 'b', '2', 'c'] (faster processing)
-    const parts = path.replace('[', '.').replace(']', '').split('.');
+    const parts = path
+        .replace(/\[/g, '.')
+        .replace(/(\.){2,}/g, '.')
+        .replace(/(^\.|\.$|\])/g, '')
+        .split('.');
 
     //  Return obj if no parts were passed or if only 1 part and get_parent is true
     if (parts.length === 0 || (parts.length === 1 && get_parent)) return obj;

package/src/deep/{seal.js → seal.mjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-import {PROTO_OBJ} from '../object/is.js';
+import {PROTO_OBJ} from '../object/is.mjs';
 
 function deep (obj) {
     for (const key of Object.keys(obj)) {

package/src/deep/{set.js → set.mjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-import isNotEmptyString from '../string/isNotEmpty.js';
-import {PROTO_OBJ}      from '../object/is.js';
+import isNotEmptyString from '../string/isNotEmpty.mjs';
+import {PROTO_OBJ}      from '../object/is.mjs';
 
 //  Set a value for a path in a json-like structure
 export default function deepSet (obj, path, value = null, define = false) {
@@ -14,7 +14,11 @@ export default function deepSet (obj, path, value = null, define = false) {
     if (!isNotEmptyString(path)) throw new TypeError('No path was given');
 
     //  Cleanup paths : a.b[2].c --> ['a', 'b', '2', 'c'] (faster processing)
-    const parts = path.replace('[', '.').replace(']', '').split('.');
+    const parts = path
+        .replace(/\[/g, '.')
+        .replace(/(\.){2,}/g, '.')
+        .replace(/(^\.|\.$|\])/g, '')
+        .split('.');
 
     //  Build any unknown paths and set cursor
     for (let i = 0; i < parts.length - 1; i++) {

package/src/{equal.js → equal.mjs}

@@ -2,9 +2,9 @@
 
 /* eslint-disable no-use-before-define */
 
-import isNumericalNaN   from './number/isNumericalNaN.js';
-import {PROTO_RGX}      from './regexp/is.js';
-import {PROTO_OBJ}      from './object/is.js';
+import isNumericalNaN   from './number/isNumericalNaN.mjs';
+import {PROTO_RGX}      from './regexp/is.mjs';
+import {PROTO_OBJ}      from './object/is.mjs';
 
 function isArrayEqual (a, b) {
     if (a.length !== b.length) return false;

package/src/hash/{fnv1A.js → fnv1A.mjs}

@@ -2,10 +2,10 @@
 
 /* eslint-disable no-bitwise */
 
-import isString         from '../string/is.js';
-import isNumericalNaN   from '../number/isNumericalNaN.js';
-import {PROTO_RGX}      from '../regexp/is.js';
-import {PROTO_OBJ}      from '../object/is.js';
+import isString         from '../string/is.mjs';
+import isNumericalNaN   from '../number/isNumericalNaN.mjs';
+import {PROTO_RGX}      from '../regexp/is.mjs';
+import {PROTO_OBJ}      from '../object/is.mjs';
 
 //  https://tools.ietf.org/html/draft-eastlake-fnv-03
 

package/src/{is.js → is.mjs}

@@ -1,26 +1,26 @@
 'use strict';
 
-import equal                    from './equal.js';
-import isNotEmptyArray          from './array/isNotEmpty.js';
-import isBoolean                from './boolean/is.js';
-import isDate                   from './date/is.js';
-import isFunction               from './function/is.js';
-import isNumberBetween          from './number/isBetween.js';
-import isNumberBelow            from './number/isBelow.js';
-import isNumberBelowOrEqual     from './number/isBelowOrEqual.js';
-import isNumberAbove            from './number/isAbove.js';
-import isNumberAboveOrEqual     from './number/isAboveOrEqual.js';
-import isIntegerBetween         from './number/isIntegerBetween.js';
-import isIntegerBelow           from './number/isIntegerBelow.js';
-import isIntegerBelowOrEqual    from './number/isIntegerBelowOrEqual.js';
-import isIntegerAbove           from './number/isIntegerAbove.js';
-import isIntegerAboveOrEqual    from './number/isIntegerAboveOrEqual.js';
-import isRegExp                 from './regexp/is.js';
-import isObject                 from './object/is.js';
-import isNotEmptyObject         from './object/isNotEmpty.js';
-import isString                 from './string/is.js';
-import isStringBetween          from './string/isBetween.js';
-import isNotEmptyString         from './string/isNotEmpty.js';
+import equal                    from './equal.mjs';
+import isNotEmptyArray          from './array/isNotEmpty.mjs';
+import isBoolean                from './boolean/is.mjs';
+import isDate                   from './date/is.mjs';
+import isFunction               from './function/is.mjs';
+import isNumberBetween          from './number/isBetween.mjs';
+import isNumberBelow            from './number/isBelow.mjs';
+import isNumberBelowOrEqual     from './number/isBelowOrEqual.mjs';
+import isNumberAbove            from './number/isAbove.mjs';
+import isNumberAboveOrEqual     from './number/isAboveOrEqual.mjs';
+import isIntegerBetween         from './number/isIntegerBetween.mjs';
+import isIntegerBelow           from './number/isIntegerBelow.mjs';
+import isIntegerBelowOrEqual    from './number/isIntegerBelowOrEqual.mjs';
+import isIntegerAbove           from './number/isIntegerAbove.mjs';
+import isIntegerAboveOrEqual    from './number/isIntegerAboveOrEqual.mjs';
+import isRegExp                 from './regexp/is.mjs';
+import isObject                 from './object/is.mjs';
+import isNotEmptyObject         from './object/isNotEmpty.mjs';
+import isString                 from './string/is.mjs';
+import isStringBetween          from './string/isBetween.mjs';
+import isNotEmptyString         from './string/isNotEmpty.mjs';
 
 const Is = Object.freeze(Object.defineProperties(Object.create(null), {
     //  Array -----------------------------------------------------------------------------------------------

package/src/number/{toPercentage.js → toPercentage.mjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-import round from './round.js';
+import round from './round.mjs';
 
 //  Convert a float value to a percentage
 export default function toPercentage (val, precision = 0, min = 0, max = 1) {

package/src/object/{define.js → define.mjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-import {PROTO_OBJ} from './is.js';
+import {PROTO_OBJ} from './is.mjs';
 
 export default function define (props, obj = {}) {
     if (

package/src/object/{isNotEmpty.js → isNotEmpty.mjs}

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

package/src/object/{merge.js → merge.mjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-import {PROTO_OBJ} from './is.js';
+import {PROTO_OBJ} from './is.mjs';
 
 const merge = (target, source = {}) => {
     if (

package/src/object/{pick.js → pick.mjs}

@@ -1,9 +1,9 @@
 'use strict';
 
-import deepGet          from '../deep/get.js';
-import deepSet          from '../deep/set.js';
-import isNotEmptyString from '../string/isNotEmpty.js';
-import {PROTO_OBJ}      from './is.js';
+import deepGet          from '../deep/get.mjs';
+import deepSet          from '../deep/set.mjs';
+import isNotEmptyString from '../string/isNotEmpty.mjs';
+import {PROTO_OBJ}      from './is.mjs';
 
 export default function pick (obj, keys) {
     if (

package/src/regexp/{sanitize.js → sanitize.mjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-import isNotEmptyString from '../string/isNotEmpty.js';
+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

package/src/string/{humanizeBytes.js → humanizeBytes.mjs}

@@ -1,9 +1,9 @@
 'use strict';
 
-import isString         from '../string/is.js';
-import isNotEmptyString from '../string/isNotEmpty.js';
-import {PROTO_OBJ}      from '../object/is.js';
-import humanizeNumber   from './humanizeNumber.js';
+import isString         from '../string/is.mjs';
+import isNotEmptyString from '../string/isNotEmpty.mjs';
+import {PROTO_OBJ}      from '../object/is.mjs';
+import humanizeNumber   from './humanizeNumber.mjs';
 
 //  Humanize a numerical byte value into a readable file size
 //

package/src/string/{humanizeNumber.js → humanizeNumber.mjs}

@@ -1,10 +1,10 @@
 'use strict';
 
-import isBoolean        from '../boolean/is.js';
-import isString         from '../string/is.js';
-import isNotEmptyString from '../string/isNotEmpty.js';
-import round            from '../number/round.js';
-import {PROTO_OBJ}      from '../object/is.js';
+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';
 
 //  Humanize a numerical value into a unit base
 //

package/src/string/{isBetween.js → isBetween.mjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-import isString from './is.js';
+import isString from './is.mjs';
 
 //  Check if a string is between a range in length
 export default function isStringBetween (val, min, max, trimmed = true) {

package/src/string/{shorten.js → shorten.mjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-import isString 		from './is.js';
-import isNumberAbove    from '../number/isAbove.js';
+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
 //