File tree Expand file tree Collapse file tree 1 file changed +15
-2
lines changed Expand file tree Collapse file tree 1 file changed +15
-2
lines changed Original file line number Diff line number Diff line change @@ -79,9 +79,22 @@ let DetectUnpinnedNpmPackageInstallVersions(fileInfo: FileInfo) =
79
79
80
80
let unpinnedNpmPackageInstallVersions =
81
81
fileLines
82
+ |> Seq.filter( fun line -> npmPackageInstallRegex.IsMatch line)
82
83
|> Seq.filter( fun line ->
83
- npmPackageInstallRegex.IsMatch line
84
- && npmPackageVersionRegex.IsMatch line |> not
84
+ let npmPackagesRegex =
85
+ Regex( " (?<=npm install ).*$" , RegexOptions.Compiled)
86
+
87
+ let npmInstallPackages = npmPackagesRegex.Match line
88
+
89
+ let numNpmInstallPackages =
90
+ npmInstallPackages.Value.Split( " " )
91
+ |> Seq.filter( fun word -> word.Trim() .StartsWith( " -" ) |> not )
92
+ |> Seq.length
93
+
94
+ let numNpmInstallVersions =
95
+ npmPackageVersionRegex.Matches line |> Seq.length
96
+
97
+ numNpmInstallPackages = numNpmInstallVersions |> not
85
98
)
86
99
|> ( fun unpinnedVersions -> Seq.length unpinnedVersions > 0 )
87
100
You can’t perform that action at this time.
0 commit comments