@valkyriestudios/utils 8.1.0 → 8.3.0

package/CHANGELOG.md

@@ -5,6 +5,24 @@ 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.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
+- 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

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;
@@ -20,7 +20,7 @@ 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;
       cursor = cursor[key];

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.1.0",
+  "version": "8.3.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": {
@@ -36,12 +36,13 @@
   "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-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/deep/get.mjs

@@ -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;
@@ -28,7 +32,7 @@ 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;
             cursor = cursor[key];

package/src/deep/set.mjs

@@ -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++) {