fix(utils): accept null as default option in applyDefault (typescript-eslint#6724)

Solo-steven · bradzacher · web-flow · commit 841889f6bb59 · 2023-07-17T11:26:51.000+09:30
Co-authored-by: Brad Zacher &lt;brad.zacher@gmail.com&gt;
diff --git a/packages/utils/src/eslint-utils/deepMerge.ts b/packages/utils/src/eslint-utils/deepMerge.ts
@@ -6,7 +6,7 @@ type ObjectLike<T = unknown> = Record<string, T>;
  * @returns `true` if obj is an object
  */
 function isObjectNotArray<T extends ObjectLike>(obj: unknown): obj is T {
-  return typeof obj === 'object' && !Array.isArray(obj);
+  return typeof obj === 'object' && obj != null && !Array.isArray(obj);
 }
 
 /**
diff --git a/packages/utils/tests/eslint-utils/applyDefault.test.ts b/packages/utils/tests/eslint-utils/applyDefault.test.ts
@@ -59,4 +59,18 @@ describe('applyDefault', () => {
     expect(result).not.toBe(defaults);
     expect(result).not.toBe(user);
   });
+
+  it('should work when default option is null', () => {
+    const defaults: unknown[] = [null];
+    const user: unknown[] = [
+      {
+        prop: 'setting1',
+        other: 'other',
+      },
+    ];
+    const result = ESLintUtils.applyDefault(defaults, user);
+    expect(result).toStrictEqual(user);
+    expect(result).not.toBe(defaults);
+    expect(result).not.toBe(user);
+  });
 });

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ type ObjectLike<T = unknown> = Record<string, T>;`
`6`	`6`	* @returns `true` if obj is an object
`7`	`7`	`*/`
`8`	`8`	`function isObjectNotArray<T extends ObjectLike>(obj: unknown): obj is T {`
`9`		`- return typeof obj === 'object' && !Array.isArray(obj);`
	`9`	`+ return typeof obj === 'object' && obj != null && !Array.isArray(obj);`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`/**`