Merge pull request #1 from shtse8/kirosIsK/isObj

Modify typed.ts

.gitignore

@@ -173,3 +173,5 @@ dist
 
 # Finder (MacOS) folder config
 .DS_Store
+/astro/package-lock.json
+/package-lock.json

src/typed.ts

@@ -52,7 +52,7 @@ export function isFn(value: unknown): value is Function {
  * @returns true if the value is an object, false otherwise
  */
 export function isObj(value: unknown): value is object {
-    return !!value && typeof value === 'object';
+    return !!value && typeof value === 'object' && !isArr(value);
 }
 
 /**
@@ -195,5 +195,8 @@ export function isTruthy(value: unknown): boolean {
  * @returns 
  */
 export function isEmpty(value: any): boolean {
-    return value === null || value === undefined || (typeof value === 'string' && value.trim() === '') || (Array.isArray(value) && value.length === 0) || (typeof value === 'object' && Object.keys(value).length === 0);
+    return isNullish(value)
+      || (isStr(value) && value.trim() === '')
+      || (isArr(value) && value.length === 0)
+      || (isObj(value) && Object.keys(value).length === 0);
 }

tests/typed.test.ts

@@ -15,6 +15,7 @@ describe('typed', () => {
         expect(x.isKeyOf('b', { a: 1 })).toBe(false)
     })
     test('isObj', () => {
+        expect(x.isObj([])).toBe(false)
         expect(x.isObj({})).toBe(true)
         expect(x.isObj(123)).toBe(false)
     })
@@ -79,6 +80,8 @@ describe('typed', () => {
         expect(x.isEmpty('')).toBe(true)
         expect(x.isEmpty([])).toBe(true)
         expect(x.isEmpty({})).toBe(true)
+        expect(x.isEmpty(new Set())).toBe(true)
+        expect(x.isEmpty(new Map())).toBe(true)
         expect(x.isEmpty(0)).toBe(false)
         expect(x.isEmpty('abc')).toBe(false)
         expect(x.isEmpty([1, 2, 3])).toBe(false)