chore: revert

Author: parker-snyk

lib/inputs/file-pattern/static.ts

@@ -5,25 +5,20 @@ import { ExtractAction, ExtractedLayers } from "../../extractor/types";
 import { streamToString } from "../../stream-utils";
 import { ManifestFile } from "../../types";
 
+/**
+ * Return false if any exclusion pattern matches,
+ * return true if any inclusion pattern matches
+ */
 function generatePathMatcher(
   globsInclude: string[],
   globsExclude: string[],
 ): (filePath: string) => boolean {
   return (filePath: string): boolean => {
-    let exclude = false;
-    for (const g of globsExclude) {
-      if (!exclude && minimatch(filePath, g)) {
-        exclude = true;
-      }
-    }
-    if (!exclude) {
-      for (const g of globsInclude) {
-        if (minimatch(filePath, g)) {
-          return true;
-        }
-      }
+    if (globsExclude.some((glob) => minimatch(filePath, glob))) {
+      return false;
     }
-    return false;
+
+    return globsInclude.some((glob) => minimatch(filePath, glob));
   };
 }
 

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;