From b01dcc78e4554b4f287a463f79c15a3611e75b29 Mon Sep 17 00:00:00 2001
From: Sergei Zharinov <zharinov@users.noreply.github.com>
Date: Thu, 28 Nov 2024 14:04:02 -0300
Subject: [PATCH] refactor: Rename `unwrapOrElse` to `unwrapOr` for `Result`
utility (#32787)
---
lib/modules/datasource/rubygems/common.ts | 2 +-
lib/modules/manager/pep621/processors/pdm.ts | 2 +-
lib/modules/manager/poetry/extract.ts | 2 +-
lib/modules/manager/poetry/update-locked.ts | 2 +-
lib/util/result.spec.ts | 12 ++++++------
lib/util/result.ts | 10 +++++-----
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/lib/modules/datasource/rubygems/common.ts b/lib/modules/datasource/rubygems/common.ts
index 319a53b3ca..1704c77902 100644
--- a/lib/modules/datasource/rubygems/common.ts
+++ b/lib/modules/datasource/rubygems/common.ts
@@ -39,6 +39,6 @@ export function getV1Releases(
return http.getJsonSafe(versionsUrl, GemVersions).transform((releaseResult) =>
getV1Metadata(http, registryUrl, packageName)
.transform((metadata) => assignMetadata(releaseResult, metadata))
- .unwrapOrElse(releaseResult),
+ .unwrapOr(releaseResult),
);
}
diff --git a/lib/modules/manager/pep621/processors/pdm.ts b/lib/modules/manager/pep621/processors/pdm.ts
index a78097e74d..047be99f16 100644
--- a/lib/modules/manager/pep621/processors/pdm.ts
+++ b/lib/modules/manager/pep621/processors/pdm.ts
@@ -77,7 +77,7 @@ export class PdmProcessor implements PyProjectProcessor {
const lockFileMapping = Result.parse(
lockFileContent,
PdmLockfileSchema.transform(({ lock }) => lock),
- ).unwrapOrElse({});
+ ).unwrapOr({});
for (const dep of deps) {
const packageName = dep.packageName;
diff --git a/lib/modules/manager/poetry/extract.ts b/lib/modules/manager/poetry/extract.ts
index 3146224b72..60c49df062 100644
--- a/lib/modules/manager/poetry/extract.ts
+++ b/lib/modules/manager/poetry/extract.ts
@@ -30,7 +30,7 @@ export async function extractPackageFile(
const lockfileMapping = Result.parse(
lockContents,
Lockfile.transform(({ lock }) => lock),
- ).unwrapOrElse({});
+ ).unwrapOr({});
let pythonVersion: string | undefined;
filterMap(res.deps, (dep) => {
diff --git a/lib/modules/manager/poetry/update-locked.ts b/lib/modules/manager/poetry/update-locked.ts
index 27ad335ee8..6041c4c5a6 100644
--- a/lib/modules/manager/poetry/update-locked.ts
+++ b/lib/modules/manager/poetry/update-locked.ts
@@ -20,5 +20,5 @@ export function updateLockedDependency(
? { status: 'already-updated' }
: { status: 'unsupported' },
)
- .unwrapOrElse({ status: 'unsupported' });
+ .unwrapOr({ status: 'unsupported' });
}
diff --git a/lib/util/result.spec.ts b/lib/util/result.spec.ts
index 61b0957ca8..a035fce181 100644
--- a/lib/util/result.spec.ts
+++ b/lib/util/result.spec.ts
@@ -124,22 +124,22 @@ describe('util/result', () => {
it('skips fallback for successful value', () => {
const res: Result<number> = Result.ok(42);
- expect(res.unwrapOrElse(-1)).toBe(42);
+ expect(res.unwrapOr(-1)).toBe(42);
});
it('uses fallback for error value', () => {
const res: Result<number, string> = Result.err('oops');
- expect(res.unwrapOrElse(42)).toBe(42);
+ expect(res.unwrapOr(42)).toBe(42);
});
- it('unwrapOrElse throws uncaught transform error', () => {
+ it('unwrapOr throws uncaught transform error', () => {
const res = Result.ok(42);
expect(() =>
res
.transform(() => {
throw 'oops';
})
- .unwrapOrElse(0),
+ .unwrapOr(0),
).toThrow('oops');
});
@@ -408,12 +408,12 @@ describe('util/result', () => {
it('skips fallback for successful AsyncResult', async () => {
const res = Result.wrap(Promise.resolve(42));
- await expect(res.unwrapOrElse(0)).resolves.toBe(42);
+ await expect(res.unwrapOr(0)).resolves.toBe(42);
});
it('uses fallback for error AsyncResult', async () => {
const res = Result.wrap(Promise.reject('oops'));
- await expect(res.unwrapOrElse(42)).resolves.toBe(42);
+ await expect(res.unwrapOr(42)).resolves.toBe(42);
});
it('returns ok-value for unwrapOrThrow', async () => {
diff --git a/lib/util/result.ts b/lib/util/result.ts
index f6649b6502..af699f33ea 100644
--- a/lib/util/result.ts
+++ b/lib/util/result.ts
@@ -337,12 +337,12 @@ export class Result<T extends Val, E extends Val = Error> {
*
* ```ts
*
- * const value = Result.err('bar').unwrapOrElse('foo');
+ * const value = Result.err('bar').unwrapOr('foo');
* expect(val).toBe('foo');
*
* ```
*/
- unwrapOrElse(fallback: T): T {
+ unwrapOr(fallback: T): T {
if (this.res.ok) {
return this.res.val;
}
@@ -706,14 +706,14 @@ export class AsyncResult<T extends Val, E extends Val>
*
* ```ts
*
- * const val = await Result.wrap(readFile('foo.txt')).unwrapOrElse('bar');
+ * const val = await Result.wrap(readFile('foo.txt')).unwrapOr('bar');
* expect(val).toBe('bar');
* expect(err).toBeUndefined();
*
* ```
*/
- unwrapOrElse(fallback: T): Promise<T> {
- return this.asyncResult.then<T>((res) => res.unwrapOrElse(fallback));
+ unwrapOr(fallback: T): Promise<T> {
+ return this.asyncResult.then<T>((res) => res.unwrapOr(fallback));
}
/**
--
GitLab