diff --git a/lib/modules/datasource/rubygems/common.ts b/lib/modules/datasource/rubygems/common.ts index 319a53b3ca8433faa88026b6ea4b30661089380d..1704c779023b647b9124720f5eb64affe1042bc2 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 a78097e74deeb0cfcc8aba45e2d37a45104ea001..047be99f16b9c1af4b43705eeb8e8142b542b170 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 3146224b722b4d09afb3e6cff11b3f92ac04725c..60c49df062118baaf1e189eed8be28345facc166 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 27ad335ee8bc09489dc45b6012ba6e8b3be519d2..6041c4c5a6eb4c3cec607237ba8f6c3ede733a6c 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 61b0957ca8e29c3f1f8455d5f982bedf6245f92b..a035fce181521d1caeab891e3d76216291bfaee6 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 f6649b65028faae1f49175b9a7bf1bd2eb2328da..af699f33eaa448c50992d57ffdf2d9a0fd50a3f6 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)); } /**