Bug Fixed: Can not wrap async functions returning null

aigoncharov · Apr 7, 2019 · 9ef9972 · 9ef9972
1 parent f5f4061
commit 9ef9972
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "class-logger",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Boilerplate-free decorator-based class logging",
   "keywords": [
     "decorator",

diff --git a/src/class-wrapper.service.spec.ts b/src/class-wrapper.service.spec.ts
@@ -21,6 +21,11 @@ describe(ClassWrapperService.name, () => {
       const isPromise = classWrapperService.isPromise({})
       expect(isPromise).toBe(false)
     })
+    test('returns false for null', () => {
+      const classWrapperService: any = new ClassWrapperService()
+      const isPromise = classWrapperService.isPromise(null)
+      expect(isPromise).toBe(false)
+    })
     test('returns false for non-objects', () => {
       const classWrapperService: any = new ClassWrapperService()
       const isPromise = classWrapperService.isPromise('invalid')

diff --git a/src/class-wrapper.service.ts b/src/class-wrapper.service.ts
@@ -79,7 +79,7 @@ export class ClassWrapperService {
   }
 
   protected isPromise(val: any) {
-    return typeof val === 'object' && typeof val.then === 'function' && typeof val.catch === 'function'
+    return !!val && typeof val === 'object' && typeof val.then === 'function' && typeof val.catch === 'function'
   }
 
   protected classGetConfigMerged(target: object) {