chore: improve readability / consistency

Author: parker-snyk

lib/analyzer/image-inspector.ts

@@ -54,12 +54,11 @@ async function pullWithDockerBinary(
         "using local docker binary credentials. the credentials you provided will be ignored",
       );
     }
-    await docker.pullCli(targetImage, { platform });
+    await docker.pullCli(targetImage, {platform});
     await docker.save(targetImage, saveLocation);
     return true;
   } catch (err) {
     debug(`couldn't pull ${targetImage} using docker binary: ${err.message}`);
-
     handleDockerPullError(err.stderr, platform);
 
     return false;
@@ -80,10 +79,7 @@ function handleDockerPullError(err: string, platform?: string) {
     "manifest unknown",
   ];
   if (unknownManifestConditions.some((value) => err.includes(value))) {
-    if (platform) {
-      throw new Error(`The image does not exist for ${platform}`);
-    }
-    throw new Error(`The image does not exist for the current platform`);
+    throw new Error(`The image does not exist for ${platform ?? "the current platform"}`);
   }
 
   if (err.includes("invalid reference format")) {

lib/extractor/index.ts

@@ -254,7 +254,7 @@ function layersWithLatestFileModifications(
 * https://www.madebymikal.com/interpreting-whiteout-files-in-docker-image-layers/
 */
 export function isWhitedOutFile(filename: string) {
-  return /\.wh\./.test(filename);
+  return filename.includes(".wh.");
 }
 
 function isBufferType(type: FileContent): type is Buffer {

lib/python-parser/requirements-parser.ts

@@ -15,18 +15,18 @@ export function getRequirements(fileContent: string): PythonRequirement[] {
 
 function parseLine(line: string): PythonRequirement | null {
   line = line.trim();
-  if (line.length === 0) {
+  // there's no point in calling the regex if the line is a comment
+  if (line.length === 0 || line.startsWith("#")) {
     return null;
   }
   const parsedLine = VERSION_PARSE_REGEX.exec(line);
   if (!parsedLine?.groups) {
     return null;
   }
   const { name, extras, specifier, version } = parsedLine.groups;
-  const correctedSpecifier = specifierValidRange(specifier, version);
   return {
     name: name.toLowerCase(),
-    specifier: correctedSpecifier,
+    specifier: specifierValidRange(specifier, version),
     version,
     extras: parseExtraNames(extras),
   } as PythonRequirement;

test/lib/extractor/index.spec.ts

@@ -54,4 +54,4 @@ describe("isWhitedOutFile", () => {
     expect(isWhitedOutFile("end.wh.")).toBe(true);
     expect(isWhitedOutFile("/deeply/nested/path/.wh.present")).toBe(true);
   });
-});
+});