Fix: Added better typings

Author: ianhco

nullsafe/core.py

@@ -1,16 +1,15 @@
-from typing import Any, Generic, TypeVar
-from functools import wraps
+from typing import Any, Generic, TypeVar, Union
 
 
 T = TypeVar("T")
 
 
 class NullSafe:
 
-    def __getattr__(self, k: str):
+    def __getattr__(self, k: str) -> "NullSafe":
         return undefined
 
-    def __getitem__(self, k: str):
+    def __getitem__(self, k: str) -> "NullSafe":
         return undefined
 
     def __bool__(self):
@@ -41,7 +40,7 @@ class NullSafeProxy(Generic[T]):
     def __init__(self, o: T) -> None:
         self.__o = o
 
-    def __getitem__(self, k: str) -> Any:
+    def __getitem__(self, k: str) -> Union[Any,  NullSafe]:
         try:
             val = self.__o.__getitem__(k)
             if val is None:
@@ -50,7 +49,7 @@ def __getitem__(self, k: str) -> Any:
         except (KeyError, AttributeError):
             return undefined
 
-    def __getattr__(self, name: str) -> Any:
+    def __getattr__(self, name: str) -> Union[Any,  NullSafe]:
         val = getattr(self.__o, name, undefined)
         return undefined if val is None else val
 
@@ -59,8 +58,14 @@ def __setattr__(self, name: str, value: Any) -> None:
             return super().__setattr__(name, value)
         raise AttributeError(f"'{self.__class__.__name__}' object can't set attribute")
 
+    def __repr__(self) -> str:
+        return f"{self.__class__.__module__}.{self.__class__.__name__}({repr(self.__o)})"
+
+    def __str__(self) -> str:
+        return str(self.__o)
+
 
-def nullsafe(o: T) -> T:
+def nullsafe(o: T) -> Union[T, NullSafe, NullSafeProxy[T]]:
     if o == None:
         return undefined
     return NullSafeProxy(o)

setup.py

@@ -21,7 +21,7 @@
 
 setup(
     name="nullsafe",
-    version="0.1.1",
+    version="0.1.2",
     author="Paaksing",
     author_email="paaksingtech@gmail.com",
     url="https://github.com/paaksing/nullsafe-python",