@modern-js/utils 1.3.4 → 1.3.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @modern-js/utils
 
+## 1.3.5
+
+### Patch Changes
+
+- 5bf5868d: fix: isObject should return false when input is null
+
 ## 1.3.4
 
 ### Patch Changes

package/dist/js/modern/is/type.js

@@ -5,18 +5,17 @@ export function isUndefined(obj) {
   return typeof obj === 'undefined';
 }
 export function isArray(obj) {
-  return Object.prototype.toString.call(obj) === '[object Array]';
+  return Array.isArray(obj);
 } // eslint-disable-next-line @typescript-eslint/ban-types
 
 export function isFunction(func) {
   return typeof func === 'function';
-} // eslint-disable-next-line @typescript-eslint/ban-types
-
+}
 export function isObject(obj) {
-  return typeof obj === 'object';
+  return obj !== null && typeof obj === 'object';
 }
 export function isPlainObject(obj) {
-  return obj && typeof obj === 'object' && Object.prototype.toString.call(obj) === '[object Object]';
+  return isObject(obj) && Object.prototype.toString.call(obj) === '[object Object]';
 }
 export function isPromise(obj) {
   /* eslint-disable promise/prefer-await-to-then */

package/dist/js/node/is/type.js

@@ -21,21 +21,20 @@ function isUndefined(obj) {
 }
 
 function isArray(obj) {
-  return Object.prototype.toString.call(obj) === '[object Array]';
+  return Array.isArray(obj);
 } // eslint-disable-next-line @typescript-eslint/ban-types
 
 
 function isFunction(func) {
   return typeof func === 'function';
-} // eslint-disable-next-line @typescript-eslint/ban-types
-
+}
 
 function isObject(obj) {
-  return typeof obj === 'object';
+  return obj !== null && typeof obj === 'object';
 }
 
 function isPlainObject(obj) {
-  return obj && typeof obj === 'object' && Object.prototype.toString.call(obj) === '[object Object]';
+  return isObject(obj) && Object.prototype.toString.call(obj) === '[object Object]';
 }
 
 function isPromise(obj) {

package/dist/js/treeshaking/is/type.js

@@ -7,18 +7,17 @@ export function isUndefined(obj) {
   return typeof obj === 'undefined';
 }
 export function isArray(obj) {
-  return Object.prototype.toString.call(obj) === '[object Array]';
+  return Array.isArray(obj);
 } // eslint-disable-next-line @typescript-eslint/ban-types
 
 export function isFunction(func) {
   return typeof func === 'function';
-} // eslint-disable-next-line @typescript-eslint/ban-types
-
+}
 export function isObject(obj) {
-  return _typeof(obj) === 'object';
+  return obj !== null && _typeof(obj) === 'object';
 }
 export function isPlainObject(obj) {
-  return obj && _typeof(obj) === 'object' && Object.prototype.toString.call(obj) === '[object Object]';
+  return isObject(obj) && Object.prototype.toString.call(obj) === '[object Object]';
 }
 export function isPromise(obj) {
   /* eslint-disable promise/prefer-await-to-then */

package/dist/types/format.d.ts

@@ -6,7 +6,7 @@
  * https://github.com/facebook/create-react-app/blob/master/LICENSE
  */
 import { StatsCompilation } from 'webpack';
-import { ProxyDetail, ProxyOptions } from '@modern-js/types';
+import type { ProxyDetail, ProxyOptions } from '@modern-js/types';
 declare function formatWebpackMessages(json: StatsCompilation): {
   errors: string[];
   warnings: string[];

package/dist/types/is/type.d.ts

@@ -1,8 +1,8 @@
 export declare function isString(str: any): str is string;
 export declare function isUndefined(obj: any): obj is undefined;
-export declare function isArray(obj: any): obj is any[];
+export declare function isArray(obj: unknown): obj is any[];
 export declare function isFunction(func: any): func is Function;
-export declare function isObject(obj: any): obj is object;
-export declare function isPlainObject(obj: any): obj is Record<string, any>;
+export declare function isObject(obj: unknown): obj is Record<string, any>;
+export declare function isPlainObject(obj: unknown): obj is Record<string, any>;
 export declare function isPromise(obj: any): obj is Promise<any>;
 export declare function isRegExp(obj: any): obj is RegExp;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.3.4",
+  "version": "1.3.5",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -76,7 +76,7 @@
     "@scripts/build": "0.0.0",
     "jest": "^27",
     "@scripts/jest-config": "0.0.0",
-    "@modern-js/types": "^1.3.4"
+    "@modern-js/types": "^1.3.5"
   },
   "sideEffects": false,
   "publishConfig": {

package/tests/isType.test.ts

@@ -1,4 +1,12 @@
-import { isString, isUndefined } from '../src/is/type';
+import {
+  isArray,
+  isObject,
+  isString,
+  isRegExp,
+  isPromise,
+  isUndefined,
+  isPlainObject,
+} from '../src/is/type';
 
 describe('validate type', () => {
   it('should validate string correctly', () => {
@@ -8,10 +16,70 @@ describe('validate type', () => {
     expect(isString(123)).toBeFalsy();
   });
 
-  it('should validate undeinfed correctly', () => {
+  it('should validate undefined correctly', () => {
     expect(isUndefined(undefined)).toBeTruthy();
     expect(isUndefined(null)).toBeFalsy();
     expect(isUndefined('')).toBeFalsy();
     expect(isUndefined(123)).toBeFalsy();
   });
+
+  it('should validate array correctly', () => {
+    expect(isArray(undefined)).toBeFalsy();
+    expect(isArray(null)).toBeFalsy();
+    expect(isArray('')).toBeFalsy();
+    expect(isArray(123)).toBeFalsy();
+    expect(isArray({})).toBeFalsy();
+    expect(isArray([])).toBeTruthy();
+  });
+
+  it('should validate object correctly', () => {
+    expect(isObject(1)).toBeFalsy();
+    expect(isObject('1')).toBeFalsy();
+    expect(isObject(undefined)).toBeFalsy();
+    expect(isObject(null)).toBeFalsy();
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    expect(isObject(() => {})).toBeFalsy();
+    expect(isObject({})).toBeTruthy();
+    expect(isObject([])).toBeTruthy();
+    expect(isObject(/foo/)).toBeTruthy();
+  });
+
+  it('should validate plain object correctly', () => {
+    expect(isPlainObject(1)).toBeFalsy();
+    expect(isPlainObject('1')).toBeFalsy();
+    expect(isPlainObject(undefined)).toBeFalsy();
+    expect(isPlainObject(null)).toBeFalsy();
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    expect(isPlainObject(() => {})).toBeFalsy();
+    expect(isPlainObject({})).toBeTruthy();
+    expect(isPlainObject([])).toBeFalsy();
+    expect(isPlainObject(/foo/)).toBeFalsy();
+  });
+
+  it('should validate RegExp correctly', () => {
+    expect(isRegExp(1)).toBeFalsy();
+    expect(isRegExp('1')).toBeFalsy();
+    expect(isRegExp(undefined)).toBeFalsy();
+    expect(isRegExp(null)).toBeFalsy();
+    expect(isRegExp({})).toBeFalsy();
+    expect(isRegExp([])).toBeFalsy();
+    expect(isRegExp(/foo/)).toBeTruthy();
+  });
+
+  it('should validate Promise correctly', () => {
+    expect(isPromise(1)).toBeFalsy();
+    expect(isPromise('1')).toBeFalsy();
+    expect(isPromise(undefined)).toBeFalsy();
+    expect(isPromise(null)).toBeFalsy();
+    expect(isPromise({})).toBeFalsy();
+    expect(isPromise([])).toBeFalsy();
+    expect(isPromise(/foo/)).toBeFalsy();
+    expect(
+      isPromise(
+        new Promise<void>(resolve => {
+          resolve();
+        }),
+      ),
+    ).toBeTruthy();
+  });
 });