Merge branch 'master' of https://github.com/facebook/flow into module…

…-typings

Changelog.md

@@ -1,3 +1,19 @@
+### 0.139.0
+
+New Features:
+* Support for `this` annotations in functions, like `function f(this: {foo: string}, param1: string): string { return this.foo; }`
+* The `experimental.abstract_locations` config option is now `true` by default, as it enables significant performance improvements. This option is now deprecated and will be removed in a coming version.
+
+Notable bug fixes:
+* Fixed a false positive when a bounded generic like `K: string` flows into `$Keys<{[K]: ...}>`
+* Fixed a false positive when a bounded generic like `K: 'literal'` is checked against itself like `k === 'literal'`
+* Fixed autocomplete inside of JSX attribute values
+* Fixed autocomplete of properties of interfaces
+
+Misc:
+* Updated `flow-remove-types` to support `this` parameters
+* Added SpeechRecognition definitions (thanks @ayshiff)
+
 ### 0.138.0
 
 Likely to cause new Flow errors:

flow_parser.opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "flow_parser"
-version: "0.138.0"
+version: "0.139.0"
 maintainer: "[email protected]"
 authors: ["Flow Team <[email protected]>"]
 homepage: "https://github.com/facebook/flow/tree/master/src/parser"

flowtype.opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "flowtype"
-version: "0.138.0"
+version: "0.139.0"
 maintainer: "[email protected]"
 authors: "Flow Team <[email protected]>"
 license: "MIT"

lib/dom.js

@@ -119,8 +119,10 @@ declare interface CustomElementRegistry {
 }
 
 declare interface ShadowRoot extends DocumentFragment {
-  host: Element;
+  +delegatesFocus: boolean;
+  +host: Element;
   innerHTML: string;
+  +mode: ShadowRootMode;
 }
 
 declare type ShadowRootMode = 'open'|'closed';

newtests/lsp/completion/test.js

@@ -162,34 +162,6 @@ export default (suite(
                     newText: 'foo',
                   },
                 },
-                {
-                  label: 'anInterface',
-                  kind: 8,
-                  detail: 'interface anInterface',
-                  sortText: '00000000000000000000',
-                  insertTextFormat: 1,
-                  textEdit: {
-                    range: {
-                      start: {line: 13, character: 15},
-                      end: {line: 13, character: 15},
-                    },
-                    newText: 'anInterface',
-                  },
-                },
-                {
-                  label: 'aUnion',
-                  kind: 13,
-                  detail: 'type aUnion = "a" | "b"',
-                  sortText: '00000000000000000000',
-                  insertTextFormat: 1,
-                  textEdit: {
-                    range: {
-                      start: {line: 13, character: 15},
-                      end: {line: 13, character: 15},
-                    },
-                    newText: 'aUnion',
-                  },
-                },
                 {
                   label: 'aNumber',
                   kind: 6,
@@ -412,20 +384,6 @@ export default (suite(
                     newText: 'React',
                   },
                 },
-                {
-                  label: 'Props',
-                  kind: 13,
-                  detail: 'type Props = {a: number, ...}',
-                  sortText: '00000000000000000000',
-                  insertTextFormat: 1,
-                  textEdit: {
-                    range: {
-                      start: {line: 11, character: 1},
-                      end: {line: 11, character: 1},
-                    },
-                    newText: 'Props',
-                  },
-                },
                 {
                   label: 'D',
                   kind: 3,

packages/flow-parser-bin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flow-parser-bin",
-  "version": "0.138.0",
+  "version": "0.139.0",
   "description": "The Flow JavaScript parser, via bindings to the native OCaml implementation",
   "main": "index.js",
   "repository": "https://github.com/facebook/flow.git",

packages/flow-parser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flow-parser",
-  "version": "0.138.0",
+  "version": "0.139.0",
   "description": "JavaScript parser written in OCaml. Produces ESTree AST",
   "homepage": "https://flow.org",
   "license": "MIT",

packages/flow-remove-types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flow-remove-types",
-  "version": "2.138.0",
+  "version": "2.139.0",
   "description": "Removes Flow type annotations from JavaScript files with speed and simplicity.",
   "author": {
     "name": "Flow Team",
@@ -43,7 +43,7 @@
     "es6"
   ],
   "dependencies": {
-    "flow-parser": "^0.138.0",
+    "flow-parser": "^0.139.0",
     "pirates": "^3.0.2",
     "vlq": "^0.2.1"
   },

src/codemods/utils/codemod_runner.ml

@@ -389,7 +389,7 @@ module TypedRunnerWithPrepass (C : TYPED_RUNNER_WITH_PREPASS_CONFIG) : TYPED_RUN
         (* Calculate dependencies that need to be merged *)
         let%lwt (sig_dependency_graph, component_map, files_to_merge, files_to_check) =
           let get_dependent_files sig_dependency_graph implementation_dependency_graph roots =
-            SharedMem_js.with_memory_timer_lwt ~options "AllDependentFiles" profiling (fun () ->
+            Memory_utils.with_memory_timer_lwt ~options "AllDependentFiles" profiling (fun () ->
                 Lwt.return
                   (Pure_dep_graph_operations.calc_all_dependents
                      ~sig_dependency_graph

src/codemods/utils/codemod_utils.ml

@@ -75,7 +75,7 @@ module MakeMain (Runner : Codemod_runner.RUNNABLE) = struct
     let initial_lwt_thread () =
       let genv =
         let num_workers = Options.max_workers options in
-        let handle = SharedMem_js.init ~num_workers shared_mem_config in
+        let handle = SharedMem.init ~num_workers shared_mem_config in
         ServerEnvBuild.make_genv ~init_id ~options handle
       in
       Runner.run ~genv ~write ~repeat roots

src/commands/autocompleteCommand.ml

@@ -107,8 +107,8 @@ let autocomplete_response_to_json ~strip_root response =
           ("result", JSON_Array []);
           (* TODO: remove this? kept for BC *)
         ]
-    | Ok completions ->
-      let results = Base.List.map ~f:(autocomplete_result_to_json ~strip_root) completions in
+    | Ok { ServerProt.Response.Completion.items; is_incomplete = _ } ->
+      let results = Base.List.map ~f:(autocomplete_result_to_json ~strip_root) items in
       JSON_Object [("result", JSON_Array results)])
 
 let main base_flags option_values json pretty root strip_root wait_for_recheck lsp args () =
@@ -147,25 +147,26 @@ let main base_flags option_values json pretty root strip_root wait_for_recheck l
     if lsp then
       Base.Result.iter
         results
-        ~f:
-          (List.iter
-             ( Flow_lsp_conversions.flow_completion_to_lsp
-                 ~is_snippet_supported:true
-                 ~is_preselect_supported:true
-             %> Lsp_fmt.print_completionItem ~key:(Path.to_string root)
-             %> Hh_json.print_json_endline ~pretty:true ))
+        ~f:(fun { ServerProt.Response.Completion.items; is_incomplete = _ } ->
+          List.iter
+            ( Flow_lsp_conversions.flow_completion_item_to_lsp
+                ~is_snippet_supported:true
+                ~is_preselect_supported:true
+            %> Lsp_fmt.print_completionItem ~key:(Path.to_string root)
+            %> Hh_json.print_json_endline ~pretty:true )
+            items)
     else if json || pretty then
       results |> autocomplete_response_to_json ~strip_root |> Hh_json.print_json_endline ~pretty
     else (
       match results with
       | Error error -> prerr_endlinef "Error: %s" error
-      | Ok completions ->
+      | Ok { ServerProt.Response.Completion.items; is_incomplete = _ } ->
         List.iter
           (fun res ->
             let name = res.ServerProt.Response.Completion.name in
             let detail = res.ServerProt.Response.Completion.detail in
             print_endline (Printf.sprintf "%s %s" name detail))
-          completions
+          items
     )
 
 let command = CommandSpec.command spec main

src/commands/commandUtils.ml

@@ -274,7 +274,7 @@ let shm_config shm_flags flowconfig =
   let log_level =
     Base.Option.value shm_flags.shm_log_level ~default:(FlowConfig.shm_log_level flowconfig)
   in
-  { SharedMem_js.heap_size = FlowConfig.shm_heap_size flowconfig; hash_table_pow; log_level }
+  { SharedMem.heap_size = FlowConfig.shm_heap_size flowconfig; hash_table_pow; log_level }
 
 let from_flag =
   let collector main from =
@@ -539,13 +539,15 @@ let remove_exclusion pattern =
 
 let file_options =
   let default_lib_dir ~no_flowlib tmp_dir =
-    let lib_dir = Flowlib.mkdir ~no_flowlib tmp_dir in
     try
+      let lib_dir = Flowlib.mkdir ~no_flowlib tmp_dir in
       Flowlib.extract ~no_flowlib lib_dir;
       lib_dir
-    with _ ->
-      let msg = "Could not locate flowlib files" in
-      FlowExitStatus.(exit ~msg Could_not_find_flowconfig)
+    with e ->
+      let e = Exception.wrap e in
+      let err = Exception.get_ctor_string e in
+      let msg = Printf.sprintf "Could not locate flowlib files: %s" err in
+      FlowExitStatus.(exit ~msg Could_not_extract_flowlibs)
   in
   let ignores_of_arg root patterns extras =
     let expand_project_root_token = Files.expand_project_root_token ~root in
@@ -1244,6 +1246,8 @@ let make_options
     opt_enabled_rollouts = FlowConfig.enabled_rollouts flowconfig;
     opt_enforce_local_inference_annotations =
       FlowConfig.enforce_local_inference_annotations flowconfig;
+    opt_run_post_inference_implicit_instantiation =
+      FlowConfig.run_post_inference_implicit_instantiation flowconfig;
     opt_enforce_strict_call_arity = FlowConfig.enforce_strict_call_arity flowconfig;
     opt_enforce_well_formed_exports;
     opt_enums = FlowConfig.enums flowconfig;

src/commands/config/flowConfig.ml

@@ -95,6 +95,7 @@ module Opts = struct
     react_runtime: Options.react_runtime;
     recursion_limit: int;
     root_name: string option;
+    run_post_inference_implicit_instantiation: bool;
     saved_state_fetcher: Options.saved_state_fetcher;
     shm_hash_table_pow: int;
     shm_heap_size: int;
@@ -163,7 +164,7 @@ module Opts = struct
       enums_with_unknown_members = false;
       this_annot = false;
       exact_by_default = false;
-      generate_tests = true;
+      generate_tests = false;
       facebook_fbs = None;
       facebook_fbt = None;
       facebook_module_interop = false;
@@ -205,6 +206,7 @@ module Opts = struct
       react_runtime = Options.ReactRuntimeClassic;
       recursion_limit = 10000;
       root_name = None;
+      run_post_inference_implicit_instantiation = false;
       saved_state_fetcher = Options.Dummy_fetcher;
       shm_hash_table_pow = 19;
       shm_heap_size = 1024 * 1024 * 1024 * 25;
@@ -403,6 +405,9 @@ module Opts = struct
   let local_inference_annotations =
     boolean (fun opts v -> Ok { opts with enforce_local_inference_annotations = v })
 
+  let post_inference_implicit_instantiation =
+    boolean (fun opts v -> Ok { opts with run_post_inference_implicit_instantiation = v })
+
   type deprecated_esproposal_setting =
     | Enable
     | Ignore
@@ -595,6 +600,8 @@ module Opts = struct
       ("types_first", types_first_parser);
       ("experimental.new_signatures", new_signatures_parser);
       ("experimental.enforce_local_inference_annotations", local_inference_annotations);
+      ( "experimental.run_post_inference_implicit_instantiation",
+        post_inference_implicit_instantiation );
       ( "experimental.abstract_locations",
         boolean (fun opts v -> Ok { opts with abstract_locations = v }) );
       ( "experimental.disable_live_non_parse_errors",
@@ -1273,6 +1280,9 @@ let new_signatures c = c.options.Opts.new_signatures
 
 let required_version c = c.version
 
+let run_post_inference_implicit_instantiation c =
+  c.options.Opts.run_post_inference_implicit_instantiation
+
 let wait_for_recheck c = c.options.Opts.wait_for_recheck
 
 let weak c = c.options.Opts.weak

src/commands/config/flowConfig.mli

@@ -159,6 +159,8 @@ val recursion_limit : config -> int
 
 val root_name : config -> string option
 
+val run_post_inference_implicit_instantiation : config -> bool
+
 val saved_state_fetcher : config -> Options.saved_state_fetcher
 
 val shm_hash_table_pow : config -> int

src/common/exit_status/flowExitStatus.ml

@@ -36,6 +36,8 @@ type t =
   | Lock_stolen
   (* Specific error for not being able to find a .flowconfig *)
   | Could_not_find_flowconfig
+  (* Failed to extract flowlibs into temp dir *)
+  | Could_not_extract_flowlibs
   (* Generic out-of-date error. This could be a version thing or maybe
    * something changed and Flow can't handle it incrementally yet *)
   | Server_out_of_date
@@ -113,6 +115,7 @@ let error_code = function
   | Killed_by_monitor -> 19
   | Invalid_saved_state -> 20
   | Restart -> 21
+  | Could_not_extract_flowlibs -> 22
   | Commandline_usage_error -> 64
   | No_input -> 66
   | Server_start_failed _ -> 78
@@ -150,6 +153,7 @@ let error_type = function
   | 19 -> Killed_by_monitor
   | 20 -> Invalid_saved_state
   | 21 -> Restart
+  | 22 -> Could_not_extract_flowlibs
   | 64 -> Commandline_usage_error
   | 66 -> No_input
   (* The process status is made up *)
@@ -176,6 +180,7 @@ let to_string = function
   | No_error -> "Ok"
   | Input_error -> "Input_error"
   | Could_not_find_flowconfig -> "Could_not_find_flowconfig"
+  | Could_not_extract_flowlibs -> "Could_not_extract_flowlibs"
   | Server_out_of_date -> "Server_out_of_date"
   | Server_client_directory_mismatch -> "Server_client_directory_mismatch"
   | Out_of_shared_memory -> "Out_of_shared_memory"

src/common/exit_status/flowExitStatus.mli

@@ -21,6 +21,7 @@ type t =
   | Input_error
   | Lock_stolen
   | Could_not_find_flowconfig
+  | Could_not_extract_flowlibs
   | Server_out_of_date
   | Out_of_shared_memory
   | Flowconfig_changed

src/common/flow_lsp_conversions.ml

@@ -78,7 +78,7 @@ let flow_signature_help_to_lsp
     in
     Some { signatures; activeSignature = 0; activeParameter = active_parameter }
 
-let flow_completion_to_lsp
+let flow_completion_item_to_lsp
     ~is_snippet_supported:(_ : bool)
     ~(is_preselect_supported : bool)
     (item : ServerProt.Response.Completion.completion_item) : Lsp.Completion.completionItem =
@@ -115,6 +115,18 @@ let flow_completion_to_lsp
     data = None;
   }
 
+let flow_completions_to_lsp
+    ~(is_snippet_supported : bool)
+    ~(is_preselect_supported : bool)
+    (completions : ServerProt.Response.Completion.t) : Lsp.Completion.result =
+  let { ServerProt.Response.Completion.items; is_incomplete } = completions in
+  let items =
+    Base.List.map
+      ~f:(flow_completion_item_to_lsp ~is_snippet_supported ~is_preselect_supported)
+      items
+  in
+  { Lsp.Completion.isIncomplete = is_incomplete; items }
+
 let file_key_to_uri (file_key_opt : File_key.t option) : (Lsp.DocumentUri.t, string) result =
   let ( >>| ) = Base.Result.( >>| ) in
   let ( >>= ) = Base.Result.( >>= ) in

src/common/flow_version.ml

@@ -5,4 +5,4 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
-let version = "0.138.0"
+let version = "0.139.0"

src/common/options.ml

@@ -95,6 +95,7 @@ type t = {
   opt_recursion_limit: int;
   opt_root: Path.t;
   opt_root_name: string option;
+  opt_run_post_inference_implicit_instantiation: bool;
   opt_saved_state_fetcher: saved_state_fetcher;
   opt_saved_state_force_recheck: bool;
   opt_saved_state_no_fallback: bool;
@@ -206,6 +207,9 @@ let facebook_fbt opts = opts.opt_facebook_fbt
 
 let facebook_module_interop opts = opts.opt_facebook_module_interop
 
+let run_post_inference_implicit_instantiation opts =
+  opts.opt_run_post_inference_implicit_instantiation
+
 let saved_state_fetcher opts = opts.opt_saved_state_fetcher
 
 let saved_state_force_recheck opts = opts.opt_saved_state_force_recheck