[services] Use node_module instead of resolve_relative

facebook · Jun 21, 2019 · 1ac6c8b · 1ac6c8b
1 parent 4a750bd
commit 1ac6c8b
Showing 1 changed file with 12 additions and 16 deletions.
diff --git a/src/services/inference/module/module_js.ml b/src/services/inference/module/module_js.ml
@@ -418,22 +418,18 @@ module Node = struct
     let file_options = Options.file_options options in
     lazy_seq [
       lazy (
-        if SSet.mem dir node_modules_containers then
-          lazy_seq (Files.node_resolver_dirnames file_options |> Core_list.map ~f:(fun dirname ->
-            lazy (resolve_relative
-              ~options ~reader
-              loc ?resolution_acc dir (
-                spf 
-                "%s%s%s%s%s" 
-                dirname 
-                Filename.dir_sep 
-                "@flowtyped" 
-                Filename.dir_sep 
-                (flow_typed_node_module r)
-              )
-            )
-          ))
-        else None
+        let flow_typed_r = spf
+          "%s%s%s"
+          "@flowtyped"
+          Filename.dir_sep
+          (flow_typed_node_module r)
+        in
+        if String_utils.string_starts_with r "@flowtyped" then
+          None
+        else
+          node_module
+            ~options ~reader node_modules_containers
+            file loc resolution_acc dir flow_typed_r
       );
 
       lazy (