@valkyriestudios/utils 8.2.0 → 8.4.0

package/CHANGELOG.md

@@ -5,6 +5,25 @@ 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.4.0] - 2023-12-06
+### Improved
+- deep/get: Removed internal usage of `X.hasOwnProperty(key)` in favor of `Object.prototype.hasOwnProperty.call(X, key)`, allowing passing objects without prototype (eg: Object.create(null))
+- object/merge: Removed internal usage of `X.hasOwnProperty(key)` in favor of `Object.prototype.hasOwnProperty.call(X, key)`, allowing passing objects without prototype (eg: Object.create(null))
+- array/mapKey: Removed internal usage of `X.hasOwnProperty(key)` in favor of `Object.prototype.hasOwnProperty.call(X, key)`, allowing passing objects without prototype (eg: Object.create(null))
+- array/sort: Removed internal usage of `X.hasOwnProperty(key)` in favor of `Object.prototype.hasOwnProperty.call(X, key)`, allowing passing objects without prototype (eg: Object.create(null))
+- array/sort: Now wraps a custom filter function to ensure non-empty object checks are always applied, this also means custom filter functions no longer need to pass this themselves
+
+## [8.3.0] - 2023-12-06
+### Added
+- Dev Dep: babel-plugin-module-extension@0.1.3
+
+### Improved
+- Dev Dep: Upgrade eslint to 8.55.0
+- Rerun benchmark for v8 on intel i9
+
+### Fixed
+- deep/get: Fix edge case issue where cursor is not an object or array when parts still exist afterwards
+
 ## [8.2.0] - 2023-11-29
 ### Improved
 - Dev Dep: Upgrade @babel/core to 7.23.5

package/README.md

@@ -218,6 +218,7 @@ const out = sort([
 ```
 
 allows passing custom filter function to clean input
+Take note: Sort will still verify that the object is not an empty object, even when passing a custom filter function.
 
 ```js
 const out = sort([
@@ -233,7 +234,7 @@ const out = sort([
     {test: 'Bob'},
     undefined,
     {test: 'Alice'},
-], el => el.test.toLowerCase(), 'desc', {filter_fn: el => isObject(el) && isNotEmptyString(el.test)}); 
+], el => el.test.toLowerCase(), 'desc', {filter_fn: el => isNotEmptyString(el.test)}); 
 // [{test: 'Pony'}, {test: 'Peter'}, {test: 'JOHn'}, {test: 'Joe'}, {test: 'Jack'}, {test: 'Bob'}, {test: 'Alice'}]
 ```
 

package/array/mapKey.js

@@ -22,7 +22,7 @@ function mapKey(arr, key) {
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var el = _step.value;
-      if (Object.prototype.toString.call(el) !== _is.PROTO_OBJ || !el.hasOwnProperty(key)) continue;
+      if (Object.prototype.toString.call(el) !== _is.PROTO_OBJ || !Object.prototype.hasOwnProperty.call(el, key)) continue;
       if (OPTS.merge === !0 && map.hasOwnProperty(el[key])) {
         map[el[key]] = Object.assign(map[el[key]], el);
       } else {

package/array/sort.js

@@ -54,7 +54,9 @@ function sort(arr, by) {
   if (dir !== 'asc' && dir !== 'desc') throw new Error('Direction should be either asc or desc');
   var has_opts = Object.prototype.toString.call(options) === _is2.PROTO_OBJ;
   var OPTS = {
-    filter_fn: has_opts && (0, _is3["default"])(options.filter_fn) ? options.filter_fn : _isNotEmpty["default"],
+    filter_fn: has_opts && (0, _is3["default"])(options.filter_fn) ? function (el) {
+      return (0, _isNotEmpty["default"])(el) && options.filter_fn(el);
+    } : _isNotEmpty["default"],
     nokey_hide: has_opts && (0, _is["default"])(options.nokey_hide) ? options.nokey_hide : !1,
     nokey_atend: has_opts && (0, _is["default"])(options.nokey_atend) ? options.nokey_atend : !0
   };
@@ -67,7 +69,7 @@ function sort(arr, by) {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var el = _step.value;
         if (!OPTS.filter_fn(el)) continue;
-        if (!el.hasOwnProperty(by) || el[by] === undefined) {
+        if (!Object.prototype.hasOwnProperty.call(el, by) || el[by] === undefined) {
           nokey_arr.push(el);
         } else {
           prepared_arr.push({

package/deep/get.js

@@ -20,9 +20,9 @@ function deepGet(obj, path) {
       var ix = parseInt(parts.shift());
       if (!Number.isInteger(ix) || ix < 0 || ix > cursor.length - 1) return undefined;
       cursor = cursor[ix];
-    } else {
+    } else if (Object.prototype.toString.call(cursor) === _is.PROTO_OBJ) {
       var key = parts.shift();
-      if (!cursor.hasOwnProperty(key)) return undefined;
+      if (!Object.prototype.hasOwnProperty.call(cursor, key)) return undefined;
       cursor = cursor[key];
     }
     if (!Array.isArray(cursor) && Object.prototype.toString.call(cursor) !== _is.PROTO_OBJ && parts.length > 0) return undefined;

package/object/merge.js

@@ -12,7 +12,7 @@ var merge = function merge(target) {
     if (Object.prototype.toString.call(target[key]) === _is.PROTO_OBJ && !Array.isArray(target[key])) {
       acc[key] = merge(target[key], source[key] || {});
     } else {
-      acc[key] = source.hasOwnProperty(key) ? source[key] : target[key];
+      acc[key] = Object.prototype.hasOwnProperty.call(source, key) ? source[key] : target[key];
     }
     return acc;
   }, {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valkyriestudios/utils",
-  "version": "8.2.0",
+  "version": "8.4.0",
   "description": "A collection of single-function utilities for common tasks",
   "main": "index.js",
   "author": {
@@ -23,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 && rm -rf ./dist && mkdir ./dist && npx babel src --out-dir ./dist && sh ./adjust_esm_to_cjs.sh && mv -f ./dist/* ./ && rm -rf ./dist",
+    "build": "npm run lint && npm run test:coverage && npx babel src --out-dir ./",
     "codecov": "codecov"
   },
   "repository": {
@@ -39,9 +39,10 @@
     "@babel/core": "^7.23.5",
     "@babel/preset-env": "^7.23.5",
     "@babel/register": "^7.22.15",
+    "babel-plugin-module-extension": "^0.1.3",
     "babel-plugin-transform-minify-booleans": "^6.9.4",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "c8": "^8.0.1",
-    "eslint": "^8.52.0"
+    "eslint": "^8.55.0"
   }
 }

package/src/array/mapKey.mjs

@@ -17,7 +17,9 @@ export default function mapKey (arr, key, opts = {}) {
     for (const el of arr) {
         if (
             Object.prototype.toString.call(el) !== PROTO_OBJ ||
-            !el.hasOwnProperty(key)) continue;
+            !Object.prototype.hasOwnProperty.call(el, key)
+        ) continue;
+
         if (OPTS.merge === true && map.hasOwnProperty(el[key])) {
             map[el[key]] = Object.assign(map[el[key]], el);
         } else {

package/src/array/sort.mjs

@@ -54,7 +54,9 @@ export default function sort (arr, by, dir = 'asc', options = {}) {
     const has_opts = Object.prototype.toString.call(options) === PROTO_OBJ;
 
     const OPTS = {
-        filter_fn   : has_opts && isFunction(options.filter_fn) ? options.filter_fn : isNotEmptyObject,
+        filter_fn   : has_opts && isFunction(options.filter_fn)
+            ? el => isNotEmptyObject(el) && options.filter_fn(el)
+            : isNotEmptyObject,
         nokey_hide  : has_opts && isBoolean(options.nokey_hide) ? options.nokey_hide : false,
         nokey_atend : has_opts && isBoolean(options.nokey_atend) ? options.nokey_atend : true,
     };
@@ -66,7 +68,7 @@ export default function sort (arr, by, dir = 'asc', options = {}) {
         for (const el of arr) {
             if (!OPTS.filter_fn(el)) continue;
 
-            if (!el.hasOwnProperty(by) || el[by] === undefined) {
+            if (!Object.prototype.hasOwnProperty.call(el, by) || el[by] === undefined) {
                 nokey_arr.push(el);
             } else {
                 prepared_arr.push({t: el[by], el});

package/src/deep/get.mjs

@@ -32,9 +32,9 @@ export default function deepGet (obj, path, get_parent = false) {
             const ix = parseInt(parts.shift());
             if (!Number.isInteger(ix) || ix < 0 || ix > (cursor.length - 1)) return undefined;
             cursor = cursor[ix];
-        } else {
+        } else if (Object.prototype.toString.call(cursor) === PROTO_OBJ) {
             const key = parts.shift();
-            if (!cursor.hasOwnProperty(key)) return undefined;
+            if (!Object.prototype.hasOwnProperty.call(cursor, key)) return undefined;
             cursor = cursor[key];
         }
 

package/src/object/merge.mjs

@@ -15,7 +15,7 @@ const merge = (target, source = {}) => {
         ) {
             acc[key] = merge(target[key], source[key] || {});
         } else {
-            acc[key] = source.hasOwnProperty(key)
+            acc[key] = Object.prototype.hasOwnProperty.call(source, key)
                 ? source[key]
                 : target[key];
         }