Handle null in TypeScript optional

jhipster · Sep 19, 2024 · 5418648 · 5418648
1 parent 8b97ff3
commit 5418648
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/main/webapp/app/shared/optional/domain/Optional.ts b/src/main/webapp/app/shared/optional/domain/Optional.ts
@@ -7,12 +7,11 @@ export abstract class Optional<Value> {
     return new ValuatedOptional(value);
   }
 
-  static ofUndefinable<Value>(value: Value | undefined): Optional<Value> {
-    if (value === undefined) {
-      return Optional.empty();
+  static ofUndefinable<Value>(value: Value | undefined | null): Optional<Value> {
+    if (value) {
+      return Optional.of(value);
     }
-
-    return Optional.of(value);
+    return Optional.empty();
   }
 
   abstract map<Output>(mapper: (value: Value) => Output): Optional<Output>;

diff --git a/src/test/webapp/unit/shared/optional/domain/Optional.spec.ts b/src/test/webapp/unit/shared/optional/domain/Optional.spec.ts
@@ -114,6 +114,10 @@ describe('Optional', () => {
       expect(Optional.ofUndefinable(undefined).isEmpty()).toBe(true);
     });
 
+    it('should get empty optional from null value', () => {
+      expect(Optional.ofUndefinable(null).isEmpty()).toBe(true);
+    });
+
     it('should get valuated optional from actual value', () => {
       expect(Optional.ofUndefinable('toto').isEmpty()).toBe(false);
     });