fix deepkeys to work with empty arrays and objects

sindresorhus · Mar 8, 2023 · 6920d3f · 6920d3f
1 parent 7cfa81f
commit 6920d3f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -3,6 +3,8 @@ const isObject = value => {
  return value !== null && (type === 'object' || type === 'function');
 };
 
+const isEmptyObject = value => isObject(value) && Object.keys(value).length === 0;
+
 const disallowedKeys = new Set([
  '__proto__',
  'prototype',
@@ -316,7 +318,7 @@ function stringifyPath(pathSegments) {
 }
 
 function * deepKeysIterator(object, currentPath = []) {
- if (!isObject(object)) {
+ if (!isObject(object) || isEmptyObject(object)) {
  if (currentPath.length > 0) {
  yield stringifyPath(currentPath);
  }

diff --git a/test.js b/test.js
@@ -413,13 +413,20 @@ test('escapePath', t => {
 
 test('deepKeys', t => {
  const object = {
+ eo: {},
+ ea: [],
  'a.b': {
  c: {
  d: [1, 2, {
  g: 3,
  }],
  e: '🦄',
  f: 0,
+ h: {},
+ i: [],
+ nu: null,
+ na: Number.NaN,
+ un: undefined,
  },
  '': {
  a: 0,
@@ -432,11 +439,18 @@ test('deepKeys', t => {
  const keys = deepKeys(object);
 
  t.deepEqual(keys, [
+ 'eo',
+ 'ea',
  'a\\.b.c.d[0]',
  'a\\.b.c.d[1]',
  'a\\.b.c.d[2].g',
  'a\\.b.c.e',
  'a\\.b.c.f',
+ 'a\\.b.c.h',
+ 'a\\.b.c.i',
+ 'a\\.b.c.nu',
+ 'a\\.b.c.na',
+ 'a\\.b.c.un',
  'a\\.b..a',
  '.a',
  ]);