refactor(versioning/gradle): ensure strict null check

lib/versioning/gradle/compare.ts

@@ -192,6 +192,27 @@ export function compare(left: string, right: string): number {
   return 0;
 }
 
+export function valid(input: string): Token[] | null {
+  if (!input) {
+    return null;
+  }
+
+  if (!regEx(/^[-._+a-zA-Z0-9]+$/i).test(input)) {
+    return null;
+  }
+
+  if (regEx(/^latest\.?/i).test(input)) {
+    return null;
+  }
+
+  const tokens = tokenize(input);
+  // istanbul ignore if: should not happen
+  if (!tokens?.length) {
+    return null;
+  }
+  return tokens;
+}
+
 export function isVersion(input: string): boolean {
   if (!input) {
     return false;

lib/versioning/gradle/index.spec.ts

@@ -155,11 +155,14 @@ describe('versioning/gradle/index', () => {
   test.each`
     input                                   | expected
     ${''}                                   | ${false}
+    ${'latest'}                             | ${false}
     ${'foobar'}                             | ${true}
     ${'final'}                              | ${true}
     ${'1'}                                  | ${true}
+    ${'1..2'}                               | ${false}
     ${'1.2'}                                | ${true}
     ${'1.2.3'}                              | ${true}
+    ${'1.2.3.4 s'}                          | ${false}
     ${'1.2.3.4'}                            | ${true}
     ${'v1.2.3.4'}                           | ${true}
     ${'1-alpha-1'}                          | ${false}
@@ -205,7 +208,7 @@ describe('versioning/gradle/index', () => {
 
   test.each`
     version          | range      | expected
-    ${'1'}           | ${'[[]]'}  | ${null}
+    ${'1'}           | ${'[[]]'}  | ${false}
     ${'0'}           | ${'[0,1]'} | ${true}
     ${'1'}           | ${'[0,1]'} | ${true}
     ${'0'}           | ${'(0,1)'} | ${false}

lib/versioning/gradle/index.ts

@@ -8,7 +8,7 @@ import {
   isVersion,
   parseMavenBasedRange,
   parsePrefixRange,
-  tokenize,
+  valid,
 } from './compare';
 
 export const id = 'gradle';
@@ -22,19 +22,19 @@ export const supportedRangeStrategies = ['pin'];
 const equals = (a: string, b: string): boolean => compare(a, b) === 0;
 
 const getMajor = (version: string): number | null => {
-  if (isVersion(version)) {
-    const tokens = tokenize(version.replace(regEx(/^v/i), ''));
+  const tokens = valid(version?.replace(regEx(/^v/i), ''));
+  if (tokens) {
     const majorToken = tokens?.[0];
     if (majorToken && majorToken.type === TokenType.Number) {
-      return +majorToken.val;
+      return majorToken.val as number;
     }
   }
   return null;
 };
 
 const getMinor = (version: string): number | null => {
-  if (isVersion(version)) {
-    const tokens = tokenize(version.replace(regEx(/^v/i), ''));
+  const tokens = valid(version?.replace(regEx(/^v/i), ''));
+  if (tokens) {
     const majorToken = tokens[0];
     const minorToken = tokens[1];
     if (
@@ -43,16 +43,16 @@ const getMinor = (version: string): number | null => {
       minorToken &&
       minorToken.type === TokenType.Number
     ) {
-      return +minorToken.val;
+      return minorToken.val as number;
     }
     return 0;
   }
   return null;
 };
 
 const getPatch = (version: string): number | null => {
-  if (isVersion(version)) {
-    const tokens = tokenize(version.replace(regEx(/^v/i), ''));
+  const tokens = valid(version?.replace(regEx(/^v/i), ''));
+  if (tokens) {
     const majorToken = tokens[0];
     const minorToken = tokens[1];
     const patchToken = tokens[2];
@@ -64,7 +64,7 @@ const getPatch = (version: string): number | null => {
       patchToken &&
       patchToken.type === TokenType.Number
     ) {
-      return +patchToken.val;
+      return patchToken.val as number;
     }
     return 0;
   }
@@ -88,8 +88,8 @@ const unstable = new Set([
 ]);
 
 const isStable = (version: string): boolean => {
-  if (isVersion(version)) {
-    const tokens = tokenize(version);
+  const tokens = valid(version);
+  if (tokens) {
     for (const token of tokens) {
       if (token.type === TokenType.String) {
         const val = token.val.toString().toLowerCase();
@@ -104,7 +104,8 @@ const isStable = (version: string): boolean => {
 };
 
 const matches = (a: string, b: string): boolean => {
-  if (!a || !isVersion(a) || !b) {
+  const versionTokens = valid(a);
+  if (!a || !versionTokens || !b) {
     return false;
   }
   if (isVersion(b)) {
@@ -117,7 +118,6 @@ const matches = (a: string, b: string): boolean => {
     if (tokens.length === 0) {
       return true;
     }
-    const versionTokens = tokenize(a);
     const x = versionTokens
       .slice(0, tokens.length)
       .map(({ val }) => val)
@@ -128,7 +128,7 @@ const matches = (a: string, b: string): boolean => {
 
   const mavenBasedRange = parseMavenBasedRange(b);
   if (!mavenBasedRange) {
-    return null;
+    return false;
   }
 
   const { leftBound, leftVal, rightBound, rightVal } = mavenBasedRange;
@@ -152,8 +152,11 @@ const matches = (a: string, b: string): boolean => {
   return leftResult && rightResult;
 };
 
-const getSatisfyingVersion = (versions: string[], range: string): string =>
-  versions.reduce((result, version) => {
+function getSatisfyingVersion(
+  versions: string[],
+  range: string
+): string | null {
+  return versions.reduce((result: string | null, version) => {
     if (matches(version, range)) {
       if (!result) {
         return version;
@@ -164,9 +167,13 @@ const getSatisfyingVersion = (versions: string[], range: string): string =>
     }
     return result;
   }, null);
+}
 
-const minSatisfyingVersion = (versions: string[], range: string): string =>
-  versions.reduce((result, version) => {
+function minSatisfyingVersion(
+  versions: string[],
+  range: string
+): string | null {
+  return versions.reduce((result: string | null, version) => {
     if (matches(version, range)) {
       if (!result) {
         return version;
@@ -177,6 +184,7 @@ const minSatisfyingVersion = (versions: string[], range: string): string =>
     }
     return result;
   }, null);
+}
 
 function getNewValue({
   currentValue,

tsconfig.strict.json

@@ -43,7 +43,7 @@
     "lib/proxy.ts",
     "lib/types/**/*.ts",
     "lib/util/**/*.ts",
-    "lib/versioning/gradle/compare.ts",
+    "lib/versioning/gradle/**/*.ts",
     "lib/versioning/hex/**/*.ts",
     "lib/versioning/loose/**/*.ts",
     "lib/versioning/maven/**/*.ts",