Skip to content

Commit 35616b9

Browse files
committed
FileConventions: fix the function
Fix DetectUnpinnedNpmPackageInstallVersions function.
1 parent 97ccbf2 commit 35616b9

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

src/FileConventions/Library.fs

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,22 @@ let DetectUnpinnedNpmPackageInstallVersions(fileInfo: FileInfo) =
7979

8080
let unpinnedNpmPackageInstallVersions =
8181
fileLines
82+
|> Seq.filter(fun line -> npmPackageInstallRegex.IsMatch line)
8283
|> 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
8598
)
8699
|> (fun unpinnedVersions -> Seq.length unpinnedVersions > 0)
87100

0 commit comments

Comments
 (0)