pyrefly 0.7.0__tar.gz → 0.8.0__tar.gz

{pyrefly-0.7.0 → pyrefly-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrefly
-Version: 0.7.0
+Version: 0.8.0
 Author: Meta
 License: MIT
 Project-URL: Source Code, https://github.com/facebook/pyre-check/tree/main/pyre2

{pyrefly-0.7.0 → pyrefly-0.8.0}/pyre2/Cargo.lock

@@ -1394,6 +1394,24 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
+[[package]]
+name = "path-absolutize"
+version = "3.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5"
+dependencies = [
+ "path-dedot",
+]
+
+[[package]]
+name = "path-dedot"
+version = "3.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397"
+dependencies = [
+ "once_cell",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -1530,7 +1548,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly"
-version = "0.7.0"
+version = "0.8.0"
 dependencies = [
  "anyhow",
  "argfile",
@@ -1553,6 +1571,7 @@ dependencies = [
  "notify",
  "parse-display",
  "paste",
+ "path-absolutize",
  "pretty_assertions",
  "pyrefly_derive",
  "rayon",

{pyrefly-0.7.0 → pyrefly-0.8.0}/pyre2/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["Meta"]
 edition = "2021"
 repository = "https://github.com/facebook/pyre-check/tree/main/pyre2"
@@ -38,6 +38,7 @@ memory-stats = "1.2.0"
 notify = "5"
 parse-display = "0.8.2"
 paste = "1.0.14"
+path-absolutize = { version = "3.0", features = ["use_unix_paths_on_wasm"] }
 pyrefly_derive = { path = "../pyrefly_derive" }
 rayon = "1.9.0"
 regex = "1.11.1"
@@ -73,5 +74,11 @@ zstd = { version = "0.13", features = ["experimental", "zstdmt"] }
 [target.'cfg(not(target_arch = "wasm32"))'.build-dependencies]
 zstd = { version = "0.13", features = ["experimental", "zstdmt"] }
 
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+zstd = "0.13"
+
+[target.'cfg(target_arch = "wasm32")'.build-dependencies]
+zstd = "0.13"
+
 [lints]
 rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }

{pyrefly-0.7.0 → pyrefly-0.8.0}/pyre2/bin/main.rs

@@ -12,9 +12,12 @@ use std::path::PathBuf;
 use std::process::ExitCode;
 
 use anyhow::anyhow;
+use anyhow::Context as _;
 use clap::Parser;
 use clap::Subcommand;
+use path_absolutize::Absolutize;
 use pyre2::clap_env;
+use pyre2::fs_upward_search::first_match;
 use pyre2::get_args_expanded;
 use pyre2::globs::FilteredGlobs;
 use pyre2::globs::Globs;
@@ -93,13 +96,23 @@ fn exit_on_panic() {
 }
 
 fn get_open_source_config(file: &Path) -> anyhow::Result<ConfigFile> {
-    // TODO: Implement upward-searching for open source config.
     ConfigFile::from_file(file, true).map_err(|err| {
         let file_str = file.display();
         anyhow!("Failed to parse configuration at {file_str}: {err}")
     })
 }
 
+fn get_implicit_config_path_from(path: &Path) -> anyhow::Result<PathBuf> {
+    if let Some(search_result) = first_match(path, &["pyrefly.toml", "pyproject.toml"]) {
+        Ok(search_result.to_path_buf())
+    } else {
+        Err(anyhow!(
+            "Cannot locate a config file using upward-searching heuristics from `{}`",
+            path.display()
+        ))
+    }
+}
+
 fn to_exit_code(status: CommandExitStatus) -> ExitCode {
     match status {
         CommandExitStatus::Success => ExitCode::SUCCESS,
@@ -129,6 +142,18 @@ async fn run_check(
     }
 }
 
+fn get_implicit_config_for_project() -> ConfigFile {
+    fn get_config_path() -> anyhow::Result<ConfigFile> {
+        let current_dir = std::env::current_dir().context("cannot identify current dir")?;
+        let config_path = get_implicit_config_path_from(&current_dir)?;
+        get_open_source_config(&config_path)
+    }
+    get_config_path().unwrap_or_else(|err| {
+        tracing::debug!("{err}. Default configuration will be used as fallback.");
+        ConfigFile::default()
+    })
+}
+
 async fn run_check_on_project(
     watch: bool,
     config: Option<PathBuf>,
@@ -136,10 +161,15 @@ async fn run_check_on_project(
     args: pyre2::run::CheckArgs,
     allow_forget: bool,
 ) -> anyhow::Result<CommandExitStatus> {
-    let config = config
-        .map(|c| get_open_source_config(c.as_path()))
-        .transpose()?
-        .unwrap_or_default();
+    let config = if let Some(explicit_config_path) = config {
+        tracing::info!(
+            "Using config file explicitly provided at `{}`",
+            explicit_config_path.display()
+        );
+        get_open_source_config(&explicit_config_path)?
+    } else {
+        get_implicit_config_for_project()
+    };
     let project_excludes =
         project_excludes.map_or_else(|| config.project_excludes.clone(), Globs::new);
     run_check(
@@ -152,6 +182,22 @@ async fn run_check_on_project(
     .await
 }
 
+fn get_implicit_config_for_file(path: &Path) -> ConfigFile {
+    fn get_implicit_config_path(path: &Path) -> anyhow::Result<ConfigFile> {
+        let parent_dir = path
+            .parent()
+            .with_context(|| format!("Path `{}` has no parent directory", path.display()))?
+            .absolutize()
+            .with_context(|| format!("Path `{}` cannot be absolutized", path.display()))?;
+        let config_path = get_implicit_config_path_from(parent_dir.as_ref())?;
+        get_open_source_config(&config_path)
+    }
+    get_implicit_config_path(path).unwrap_or_else(|err| {
+        tracing::debug!("{err}. Default configuration will be used as fallback.");
+        ConfigFile::default()
+    })
+}
+
 async fn run_check_on_files(
     files_to_check: Globs,
     project_excludes: Option<Vec<String>>,
@@ -165,8 +211,7 @@ async fn run_check_on_files(
         args,
         watch,
         FilteredGlobs::new(files_to_check, project_excludes),
-        // TODO(connernilsen): replace this when we have search paths working
-        &|_| ConfigFile::default(),
+        &|path| get_implicit_config_for_file(path),
         allow_forget,
     )
     .await

{pyrefly-0.7.0 → pyrefly-0.8.0}/pyre2/lib/alt/answers.rs

@@ -586,8 +586,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         } else if self.solver().is_subset_eq(got, want, self.type_order()) {
             got.clone()
         } else {
-            self.solver()
-                .error(want, got, errors, ErrorKind::TypeMismatch, loc, tcc);
+            self.solver().error(want, got, errors, loc, tcc);
             want.clone()
         }
     }

{pyrefly-0.7.0 → pyrefly-0.8.0}/pyre2/lib/alt/attr.rs

@@ -965,7 +965,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
     }
 
     fn get_exported_type(&self, exports: &Exports, from: ModuleName, name: &Name) -> Option<Type> {
-        if exports.contains(name, self.exports) {
+        if exports.exports(self.exports).contains(name) {
             Some(
                 self.get_from_module(from, &KeyExport(name.clone()))
                     .arc_clone(),

{pyrefly-0.7.0 → pyrefly-0.8.0}/pyre2/lib/alt/callable.rs

@@ -142,7 +142,11 @@ impl CallArgPreEval<'_> {
         context: Option<&dyn Fn() -> ErrorContext>,
     ) {
         let tcc = &|| TypeCheckContext {
-            kind: TypeCheckKind::CallArgument(param_name.cloned(), callable_name.cloned()),
+            kind: if vararg {
+                TypeCheckKind::CallVarArgs(param_name.cloned(), callable_name.cloned())
+            } else {
+                TypeCheckKind::CallArgument(param_name.cloned(), callable_name.cloned())
+            },
             context: context.map(|ctx| ctx()),
         };
         match self {
@@ -260,15 +264,15 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                             iparams.next();
                             Some((ty, Some(name), false))
                         }
-                        Param::VarArg(Type::Unpack(box ty)) => {
+                        Param::VarArg(name, Type::Unpack(box ty)) => {
                             // Store args that get matched to an unpacked *args param
                             // Matched args are typechecked separately later
-                            unpacked_vararg = Some(ty);
+                            unpacked_vararg = Some((name, ty));
                             unpacked_vararg_matched_args.push(arg_pre.clone());
                             matched_unpacked_vararg = true;
                             None
                         }
-                        Param::VarArg(ty) => Some((ty, None, true)),
+                        Param::VarArg(name, ty) => Some((ty, name.as_ref(), true)),
                         Param::KwOnly(..) | Param::Kwargs(..) => None,
                     }
                 } else {
@@ -300,7 +304,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 }
             }
         }
-        if let Some(unpacked_param_ty) = unpacked_vararg {
+        if let Some((unpacked_name, unpacked_param_ty)) = unpacked_vararg {
             let mut prefix = Vec::new();
             let mut middle = Vec::new();
             let mut suffix = Vec::new();
@@ -355,7 +359,10 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 range,
                 arg_errors,
                 &|| TypeCheckContext {
-                    kind: TypeCheckKind::CallVarArgs(callable_name.clone()),
+                    kind: TypeCheckKind::CallUnpackVarArgs(
+                        unpacked_name.clone(),
+                        callable_name.clone(),
+                    ),
                     context: context.map(|ctx| ctx()),
                 },
             );

{pyrefly-0.7.0 → pyrefly-0.8.0}/pyre2/lib/alt/class/typed_dict.rs

@@ -48,7 +48,6 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         typed_dict: &TypedDict,
         range: TextRange,
         errors: &ErrorCollector,
-        tcc: &dyn Fn() -> TypeCheckContext,
     ) {
         let fields = typed_dict.fields();
         let mut has_expansion = false;
@@ -96,7 +95,9 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 has_expansion = true;
                 self.expr(
                     &x.value,
-                    Some((&Type::TypedDict(Box::new(typed_dict.clone())), tcc)),
+                    Some((&Type::TypedDict(Box::new(typed_dict.clone())), &|| {
+                        TypeCheckContext::of_kind(TypeCheckKind::TypedDictUnpacking)
+                    })),
                     errors,
                 );
             }