fix: handle falsy arg and types improve

rohmanhm · Feb 14, 2021 · 70db74e · 70db74e
1 parent 7a390c3
commit 70db74e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 16 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -15,7 +15,7 @@ export type OxReturn<ObjectType> = RemoveIgnoredKey<ObjectType>;
 
 const toStr = Object.prototype.toString;
 
-function _ox<T extends Obj>(obj: T, strict: boolean): OxReturn<T> {
+function cleanObject<T extends Obj>(obj: T, strict: boolean): OxReturn<T> {
   let k: string;
   for (k in obj) {
     cleanProperty(k, obj[k], obj);
@@ -43,7 +43,7 @@ function _ox<T extends Obj>(obj: T, strict: boolean): OxReturn<T> {
       if (toStr.call(obj[k]) === '[object Array]') {
         ref[key] = ref[key].filter(shouldCleanProperty);
       } else {
-        _ox(ref[key], strict);
+        cleanObject(ref[key], strict);
       }
 
       if (isEmpty(ref[key])) {
@@ -57,18 +57,15 @@ function _ox<T extends Obj>(obj: T, strict: boolean): OxReturn<T> {
   }
 }
 
-export default function ox<T extends Obj>(
-  obj: T,
-  strict?: boolean
-): OxReturn<T> {
-  strict = typeof strict === 'undefined' ? true : strict;
-  let newObj = _ox(obj, strict);
-
-  if (newObj === null) {
-    newObj = {} as any;
+export default function ox<T, U extends boolean>(
+  obj?: T,
+  strict?: U
+): T extends Obj ? (U extends false ? T : OxReturn<T>) : T {
+  if (typeof strict === 'undefined') {
+    strict = true as U;
   }
-
-  return newObj;
+  if (!obj || typeof obj === 'boolean') return {} as any;
+  return cleanObject(obj as Obj, strict as boolean) ?? ({} as any);
 }
 
 export { isEmpty };
diff --git a/src/isEmpty.ts b/src/isEmpty.ts
@@ -1,8 +1,6 @@
 const hasOwnProp = Object.prototype.hasOwnProperty;
 
-export function isEmpty<ObjectType extends { [key: string]: unknown }>(
-  obj: ObjectType
-) {
+export function isEmpty<T extends { [key: string]: unknown }>(obj: T) {
   // Check if obj has .length property
   // and if === 0 - it's empty
   if (obj.length) {

diff --git a/test/index.test.ts b/test/index.test.ts
@@ -36,3 +36,20 @@ test('disable strict mode not remove falsy key value', () => {
 
   expect(actual).toEqual(expected);
 });
+
+test('handle falsy argument value', () => {
+  const expected = {};
+  let actual = ox();
+  expect(actual).toEqual(expected);
+
+  actual = ox(false);
+  expect(actual).toEqual(expected);
+
+  let active = false;
+  actual = ox(active && { lorem: 'ipsum' });
+  expect(actual).toEqual(expected);
+
+  active = true;
+  actual = ox(active && { lorem: 'ipsum' });
+  expect(actual).toEqual({ lorem: 'ipsum' });
+});