Merge pull request #80 from alfonsogarciacaro/patch-3

Fix #77 (again)
Zaid-Ajaj · Sep 30, 2021 · cc2725c · cc2725c
2 parents 624911d + 4b15476
commit cc2725c
Showing 1 changed file with 23 additions and 26 deletions.
diff --git a/src/Program.fs b/src/Program.fs
@@ -122,34 +122,31 @@ let findInstalledPackages (packageJson: string) : ResizeArray<InstalledNpmPackag
         let rec checkPackageJsons nodeModulePath =
             for dir in IO.Directory.GetDirectories nodeModulePath do
                 let dirname = IO.Path.GetFileName(dir)
-                let pkgJson = IO.Path.Combine(dir, "package.json")
-                // Some packages create a cache dir in node_modules starting with . like .vite
-                if dirname.StartsWith(".")
-                    then ()
                 // Scoped packages
-                elif dirname.StartsWith("@")
-                    then checkPackageJsons dir
-                if not (IO.File.Exists pkgJson)
-                    then ()
+                if dirname.StartsWith("@") then
+                    checkPackageJsons dir
                 else
-                    let nameAndVersionDecoder = Decode.object (fun get ->
-                        (get.Required.Field "name" Decode.string,
-                         get.Required.Field "version" Decode.string)
-                    )
-
-                    let decoded =
-                        File.readAllTextNonBlocking pkgJson
-                        |> Decode.fromString nameAndVersionDecoder
-
-                    match decoded with
-                    | Ok (name, version) ->
-                        for package in topLevelPackages do
-                            if package.Name = name
-                            then package.Installed <- Some (SemVer.Version version)
-                            else ()
-                    | Error errorMessage ->
-                        logger.Error("Couldn't decode 'package.json' from {PackageJson}. Reason: {Message}", pkgJson, errorMessage)
-                        ()
+                    let pkgJson = IO.Path.Combine(dir, "package.json")
+                    // Some packages create a cache dir in node_modules starting with . like .vite
+                    if not(dirname.StartsWith(".")) && IO.File.Exists pkgJson then
+                        let nameAndVersionDecoder = Decode.object (fun get ->
+                            (get.Required.Field "name" Decode.string,
+                             get.Required.Field "version" Decode.string)
+                        )
+
+                        let decoded =
+                            File.readAllTextNonBlocking pkgJson
+                            |> Decode.fromString nameAndVersionDecoder
+
+                        match decoded with
+                        | Ok (name, version) ->
+                            for package in topLevelPackages do
+                                if package.Name = name
+                                then package.Installed <- Some (SemVer.Version version)
+                                else ()
+                        | Error errorMessage ->
+                            logger.Error("Couldn't decode 'package.json' from {PackageJson}. Reason: {Message}", pkgJson, errorMessage)
+                            ()
 
         checkPackageJsons nodeModulePath
         topLevelPackages