@zelgadis87/utils-core 4.6.2 → 4.7.0

package/esbuild/index.mjs

@@ -1963,13 +1963,16 @@ var Optional = class _Optional {
     this._value = defined ? t : void 0;
     this._present = defined;
   }
-  get rawValue() {
+  getRawValue() {
     return this._value;
   }
   get() {
+    return this.getOrElseThrow(() => new ErrorGetEmptyOptional());
+  }
+  getOrElseThrow(errorProducer) {
     if (this.isEmpty())
-      throw new ErrorGetEmptyOptional();
-    return this.rawValue;
+      throw errorProducer();
+    return this._value;
   }
   set(t) {
     if (isNullOrUndefined(t))
@@ -1993,13 +1996,13 @@ var Optional = class _Optional {
   }
   ifPresent(callback) {
     if (this.isPresent())
-      callback(this.rawValue);
+      callback(this.get());
   }
   apply(callbackIfPresent, callbackIfEmpty) {
     if (this.isEmpty()) {
       callbackIfEmpty();
     } else {
-      callbackIfPresent(this.rawValue);
+      callbackIfPresent(this.get());
     }
   }
   orElse(newValue) {
@@ -2014,31 +2017,23 @@ var Optional = class _Optional {
     }
     return this;
   }
-  orElseThrow(produceError) {
+  orElseThrow(errorProducer) {
     if (this.isEmpty())
-      throw produceError();
+      throw errorProducer();
     return this;
   }
   mapTo(mapper) {
     return this.flatMapTo((t) => _Optional.ofNullable(mapper(t)));
   }
   flatMapTo(mapper) {
-    if (this.isPresent()) {
-      const newValue = mapper(this.rawValue);
-      return newValue;
-    }
-    return this;
+    return this.isPresent() ? mapper(this.get()) : _Optional.empty();
   }
   filter(predicate) {
-    if (this.isPresent()) {
-      if (predicate(this.rawValue)) {
-        return this;
-      } else {
-        return _Optional.empty();
-      }
-    } else {
+    if (this.isEmpty())
       return this;
-    }
+    if (predicate(this.get()))
+      return this;
+    return _Optional.empty();
   }
   static empty() {
     return new _Optional(void 0);
@@ -2054,7 +2049,7 @@ var Optional = class _Optional {
 };
 var ErrorGetEmptyOptional = class extends Error {
   constructor() {
-    super("Cannot retrieve a value from an EmptyOptional.");
+    super("Cannot retrieve a value from an empty Optional.");
   }
 };
 var ErrorSetEmptyOptional = class extends Error {