@zelgadis87/utils-core 5.4.1 → 5.4.3

package/.rollup/index.d.ts

@@ -193,6 +193,14 @@ type TEmptyOptional<T> = TOptional<T> & {
     mapTo<R>(mapper: TFunction<T, R>): TEmptyOptional<T>;
     flatMapTo<R>(mapper: TFunction<T, TOptional<R>>): TEmptyOptional<T>;
     filter(predicate: TPredicate<T>): TEmptyOptional<T>;
+    orElseReturn: <R>(newValue: R) => R;
+    orElseProduce: <R>(newValueProducer: TProducer<R>) => R;
+    orElseReturnNullable: <R>(newValue: R | null | undefined) => TOptional<R>;
+    orElseProduceNullable: <R>(newValueProducer: TProducer<R | null | undefined>) => TOptional<R>;
+    orElseReturnAndApply: <R>(newValue: R) => R;
+    orElseProduceAndApply: <R>(newValueProducer: TProducer<R>) => R;
+    orElseReturnNullableAndApply: <R>(newValue: R | null | undefined) => TOptional<R>;
+    orElseProduceNullableAndApply: <R>(newValueProducer: TProducer<R | null | undefined>) => TOptional<R>;
 };
 type TPresentOptional<T> = TOptional<T> & {
     get(): T;
@@ -201,6 +209,14 @@ type TPresentOptional<T> = TOptional<T> & {
     apply<RP = void, RE = void>(callbackIfPresent: TFunction<T, RP>, callbackIfEmpty: TProducer<RE>): RP;
     mapTo<R>(mapper: TFunction<T, R>): TPresentOptional<R>;
     flatMapTo<R>(mapper: TFunction<T, TOptional<R>>): TOptional<R>;
+    orElseReturn: (newValue: T) => T;
+    orElseProduce: (newValueProducer: TProducer<T>) => T;
+    orElseReturnNullable: (newValue: T | null | undefined) => TOptional<T>;
+    orElseProduceNullable: (newValueProducer: TProducer<T | null | undefined>) => TOptional<T>;
+    orElseReturnAndApply: (newValue: T) => T;
+    orElseProduceAndApply: (newValueProducer: TProducer<T>) => T;
+    orElseReturnNullableAndApply: (newValue: T | null | undefined) => TOptional<T>;
+    orElseProduceNullableAndApply: (newValueProducer: TProducer<T | null | undefined>) => TOptional<T>;
 };
 declare class ErrorGetEmptyOptional extends Error {
     constructor();
@@ -921,7 +937,7 @@ declare function unzip<T, R>(arr: [T, R][]): [T[], R[]];
  * @param index - The index of the element to retrieve
  * @returns An Optional containing the element at the index, or empty if index is out of bounds
  */
-declare function arrayGet<T>(arr: TReadableArray<T>, index: number): TEmptyOptional<T> | TPresentOptional<T>;
+declare function arrayGet<T>(arr: TReadableArray<T>, index: number): TOptional<T>;
 
 declare function isTrue(x: unknown): x is true;
 declare function isFalse(x: unknown): x is false;

package/.rollup/index.mjs

@@ -337,10 +337,10 @@ class Optional {
         throw errorProducer(this.get());
     }
     mapTo(mapper) {
-        return this.flatMapTo(t => Optional.ofNullable(mapper(t)));
+        return this.apply(() => Optional.ofNullable(mapper(this.get())), () => Optional.empty());
     }
     flatMapTo(mapper) {
-        return this.isPresent() ? mapper(this.get()) : Optional.empty();
+        return this.apply(() => mapper(this.get()), () => Optional.empty());
     }
     filter(predicate) {
         if (this.isEmpty())