diff --git a/lib/versioning/cargo/index.spec.ts b/lib/versioning/cargo/index.spec.ts index d0e83962c83708233113d520a68101604973f50a..b4e6c1c3515c923af092e20efb06269e6bc4907d 100644 --- a/lib/versioning/cargo/index.spec.ts +++ b/lib/versioning/cargo/index.spec.ts @@ -56,7 +56,7 @@ describe('versioning/cargo/index', () => { `( 'isLessThanRange("$version", "$range") === "$expected"', ({ version, range, expected }) => { - expect(semver.isLessThanRange(version, range)).toBe(expected); + expect(semver.isLessThanRange?.(version, range)).toBe(expected); } ); diff --git a/lib/versioning/cargo/index.ts b/lib/versioning/cargo/index.ts index 2a699e8de5d7c9899c354fb7c57573c291eeccf7..3c35d50990c1480363cae17ec3ecbb8800b3c0b8 100644 --- a/lib/versioning/cargo/index.ts +++ b/lib/versioning/cargo/index.ts @@ -55,7 +55,7 @@ function npm2cargo(input: string): string { } const isLessThanRange = (version: string, range: string): boolean => - npm.isLessThanRange(version, cargo2npm(range)); + !!npm.isLessThanRange?.(version, cargo2npm(range)); export const isValid = (input: string): boolean => npm.isValid(cargo2npm(input)); @@ -63,11 +63,19 @@ export const isValid = (input: string): boolean => const matches = (version: string, range: string): boolean => npm.matches(version, cargo2npm(range)); -const getSatisfyingVersion = (versions: string[], range: string): string => - npm.getSatisfyingVersion(versions, cargo2npm(range)); +function getSatisfyingVersion( + versions: string[], + range: string +): string | null { + return npm.getSatisfyingVersion(versions, cargo2npm(range)); +} -const minSatisfyingVersion = (versions: string[], range: string): string => - npm.minSatisfyingVersion(versions, cargo2npm(range)); +function minSatisfyingVersion( + versions: string[], + range: string +): string | null { + return npm.minSatisfyingVersion(versions, cargo2npm(range)); +} const isSingleVersion = (constraint: string): boolean => constraint.trim().startsWith('=') && @@ -96,7 +104,7 @@ function getNewValue({ currentVersion, newVersion, }); - let newCargo = npm2cargo(newSemver); + let newCargo = newSemver ? npm2cargo(newSemver) : null; // istanbul ignore if if (!newCargo) { logger.info( diff --git a/tsconfig.strict.json b/tsconfig.strict.json index c23f0583f7084107013b951b5c54ae5e4442f2b8..9dbfaa564ae4b96ff4ebe5f5f20af76639f4f198 100644 --- a/tsconfig.strict.json +++ b/tsconfig.strict.json @@ -44,6 +44,7 @@ "lib/proxy.ts", "lib/types/**/*.ts", "lib/util/**/*.ts", + "lib/versioning/cargo/**/*.ts", "lib/versioning/gradle/compare.ts", "lib/versioning/hex/**/*.ts", "lib/versioning/loose/**/*.ts",