pyrefly 0.15.1__tar.gz → 0.15.2__tar.gz

{pyrefly-0.15.1 → pyrefly-0.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrefly
-Version: 0.15.1
+Version: 0.15.2
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
@@ -15,5 +15,19 @@ Keywords: typechecker,typechecking
 Author: Meta
 License: MIT
 Requires-Python: >=3.8
+Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 Project-URL: homepage, https://pyrefly.org
 Project-URL: documentation, https://pyrefly.org/en/docs/
+
+# Pyrefly
+
+Currently incomplete and under active development. Please
+[open an issue](https://github.com/facebook/pyrefly/issues/new/choose) if you
+find any bugs.
+
+Pyrefly is a static type checker for Python that helps you catch type-related
+errors before your code runs. It analyzes your Python code to ensure type
+consistency throughout your codebase, making your applications more reliable and
+easier to maintain. Pyrefly supports both IDE integration and CLI usage, giving
+you flexibility in how you incorporate type checking into your workflow.
+

pyrefly-0.15.2/README.md

@@ -0,0 +1,11 @@
+# Pyrefly
+
+Currently incomplete and under active development. Please
+[open an issue](https://github.com/facebook/pyrefly/issues/new/choose) if you
+find any bugs.
+
+Pyrefly is a static type checker for Python that helps you catch type-related
+errors before your code runs. It analyzes your Python code to ensure type
+consistency throughout your codebase, making your applications more reliable and
+easier to maintain. Pyrefly supports both IDE integration and CLI usage, giving
+you flexibility in how you incorporate type checking into your workflow.

{pyrefly-0.15.1 → pyrefly-0.15.2}/pyproject.toml

@@ -15,6 +15,7 @@ documentation = "https://pyrefly.org/en/docs/"
 [project]
 name = "pyrefly"
 description = "A faster Python type checker written in Rust"
+readme = "README.md"
 requires-python = ">=3.8"
 keywords = ["typechecker", "typechecking"]
 classifiers = [

{pyrefly-0.15.1 → pyrefly-0.15.2}/pyrefly/Cargo.lock

@@ -224,9 +224,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 
 [[package]]
 name = "blake3"
@@ -380,9 +380,9 @@ checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32"
 dependencies = [
  "castaway",
  "cfg-if",
- "itoa",
+ "itoa 1.0.15",
  "rustversion",
- "ryu",
+ "ryu 1.0.20",
  "static_assertions",
 ]
 
@@ -394,9 +394,9 @@ checksum = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a"
 dependencies = [
  "castaway",
  "cfg-if",
- "itoa",
+ "itoa 1.0.15",
  "rustversion",
- "ryu",
+ "ryu 1.0.20",
  "static_assertions",
 ]
 
@@ -658,9 +658,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.11"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
+checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
 dependencies = [
  "libc",
  "windows-sys 0.59.0",
@@ -1157,6 +1157,12 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itoa"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
+
 [[package]]
 name = "itoa"
 version = "1.0.15"
@@ -1241,7 +1247,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "libc",
  "redox_syscall 0.5.12",
 ]
@@ -1740,7 +1746,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly"
-version = "0.15.1"
+version = "0.15.2"
 dependencies = [
  "anstream",
  "anyhow",
@@ -1783,6 +1789,7 @@ dependencies = [
  "ruff_text_size",
  "serde",
  "serde_json",
+ "serde_jsonrc",
  "serde_with",
  "starlark_map",
  "static_assertions",
@@ -1902,7 +1909,7 @@ version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -1967,7 +1974,7 @@ version = "0.0.0"
 source = "git+https://github.com/astral-sh/ruff/?rev=3acf4e716d5d1fb9bd1316dc268deb6824a300c8#3acf4e716d5d1fb9bd1316dc268deb6824a300c8"
 dependencies = [
  "aho-corasick",
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "compact_str 0.9.0",
  "is-macro",
  "itertools 0.14.0",
@@ -1983,7 +1990,7 @@ name = "ruff_python_parser"
 version = "0.0.0"
 source = "git+https://github.com/astral-sh/ruff/?rev=3acf4e716d5d1fb9bd1316dc268deb6824a300c8#3acf4e716d5d1fb9bd1316dc268deb6824a300c8"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "bstr",
  "compact_str 0.9.0",
  "memchr",
@@ -2040,7 +2047,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -2053,7 +2060,7 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "errno",
  "libc",
  "linux-raw-sys 0.9.4",
@@ -2066,6 +2073,12 @@ version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
 
+[[package]]
+name = "ryu"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f"
+
 [[package]]
 name = "ryu"
 version = "1.0.20"
@@ -2136,9 +2149,20 @@ version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
- "itoa",
+ "itoa 1.0.15",
  "memchr",
- "ryu",
+ "ryu 1.0.20",
+ "serde",
+]
+
+[[package]]
+name = "serde_jsonrc"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b591e90bcce7185aa4f8c775c504456586ae0f7df49a4087a1ee4179d402b8a8"
+dependencies = [
+ "itoa 0.4.8",
+ "ryu 0.2.8",
  "serde",
 ]
 
@@ -2454,7 +2478,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
 dependencies = [
  "deranged",
- "itoa",
+ "itoa 1.0.15",
  "libc",
  "num-conv",
  "num_threads",
@@ -3232,7 +3256,7 @@ version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
 ]
 
 [[package]]

{pyrefly-0.15.1 → pyrefly-0.15.2}/pyrefly/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly"
-version = "0.15.1"
+version = "0.15.2"
 authors = ["Meta"]
 edition = "2021"
 repository = "https://github.com/facebook/pyrefly"
@@ -11,10 +11,12 @@ build = "build.rs"
 
 [lib]
 path = "lib/lib.rs"
+edition = "2024"
 
 [[bin]]
 name = "pyrefly"
 path = "bin/main.rs"
+edition = "2024"
 
 [dependencies]
 anstream = "0.6.11"
@@ -56,6 +58,7 @@ ruff_source_file = { git = "https://github.com/astral-sh/ruff/", rev = "3acf4e71
 ruff_text_size = { git = "https://github.com/astral-sh/ruff/", rev = "3acf4e716d5d1fb9bd1316dc268deb6824a300c8" }
 serde = { version = "1.0.185", features = ["derive", "rc"] }
 serde_json = { version = "1.0.140", features = ["float_roundtrip", "unbounded_depth"] }
+serde_jsonrc = "0.1"
 serde_with = { version = "1.14.0", features = ["hex", "json"] }
 starlark_map = "0.13.0"
 static_assertions = "1.1.0"

pyrefly-0.15.2/pyrefly/README.md

@@ -0,0 +1,11 @@
+# Pyrefly
+
+Currently incomplete and under active development. Please
+[open an issue](https://github.com/facebook/pyrefly/issues/new/choose) if you
+find any bugs.
+
+Pyrefly is a static type checker for Python that helps you catch type-related
+errors before your code runs. It analyzes your Python code to ensure type
+consistency throughout your codebase, making your applications more reliable and
+easier to maintain. Pyrefly supports both IDE integration and CLI usage, giving
+you flexibility in how you incorporate type checking into your workflow.

{pyrefly-0.15.1 → pyrefly-0.15.2}/pyrefly/lib/alt/call.rs

@@ -138,7 +138,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 } else {
                     &obj
                 };
-                func.subst_self_type_mut(self_replacement);
+                func.subst_self_type_mut(self_replacement, &|a, b| self.is_subset_eq(a, b));
                 match self.as_call_target(func.as_type()) {
                     Some(CallTarget {
                         qs,
@@ -533,10 +533,11 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 };
                 let self_obj = match first_arg_type {
                     Some(Type::Type(box Type::ClassType(c))) => Some(c.to_type()),
+                    Some(Type::ClassDef(class)) => Some(class.as_class_type().to_type()),
                     _ => None,
                 };
                 if let Some(self_obj) = self_obj {
-                    callable.subst_self_type_mut(&self_obj);
+                    callable.subst_self_type_mut(&self_obj, &|a, b| self.is_subset_eq(a, b));
                 }
                 self.callable_infer(
                     callable,

{pyrefly-0.15.1 → pyrefly-0.15.2}/pyrefly/lib/alt/class/class_field.rs

@@ -1028,7 +1028,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 return None;
             }
         };
-        foralled.subst_self_type_mut(&self.instantiate(cls));
+        foralled.subst_self_type_mut(&self.instantiate(cls), &|a, b| self.is_subset_eq(a, b));
         Some(bind_class_attribute(cls, foralled))
     }
 

{pyrefly-0.15.1 → pyrefly-0.15.2}/pyrefly/lib/alt/operators.rs

@@ -233,8 +233,8 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 {
                     Type::LiteralString
                 } else if x.op == Operator::Add
-                    && let Type::Tuple(ref l) = lhs
-                    && let Type::Tuple(ref r) = rhs
+                    && let Type::Tuple(l) = lhs
+                    && let Type::Tuple(r) = rhs
                 {
                     self.tuple_concat(l, r)
                 } else {
@@ -280,7 +280,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                     Type::LiteralString
                 } else if x.op == Operator::Add
                     && let Type::Tuple(ref l) = base
-                    && let Type::Tuple(ref r) = rhs
+                    && let Type::Tuple(r) = rhs
                 {
                     self.tuple_concat(l, r)
                 } else {

{pyrefly-0.15.1 → pyrefly-0.15.2}/pyrefly/lib/alt/solve.rs

@@ -1839,9 +1839,19 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                         }
                         let annot_ty = annot.ty(self.stdlib);
                         let hint = annot_ty.as_ref().map(|t| (t, tcc));
+                        let expr_ty = self.expr(expr, hint, errors);
+                        let ty = if *style == AnnotationStyle::Direct {
+                            // For direct assignments, user-provided annotation takes
+                            // precedence over inferred expr type.
+                            annot_ty.unwrap_or(expr_ty)
+                        } else {
+                            // For forwarded assignment, user-provided annotation is treated
+                            // as just an upper-bound hint.
+                            expr_ty
+                        };
                         (
                             Some(annot.annotation.qualifiers.contains(&Qualifier::TypeAlias)),
-                            self.expr(expr, hint, errors),
+                            ty,
                         )
                     }
                     None => (None, self.expr(expr, None, errors)),
@@ -2245,8 +2255,8 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 }
                 self.unions(values)
             }
-            Binding::Function(idx, mut pred, class_meta) => {
-                self.solve_function_binding(*idx, &mut pred, class_meta.as_ref(), errors)
+            &Binding::Function(idx, mut pred, class_meta) => {
+                self.solve_function_binding(idx, &mut pred, class_meta.as_ref(), errors)
             }
             Binding::Import(m, name) => self
                 .get_from_module(*m, None, &KeyExport(name.clone()))

{pyrefly-0.15.1 → pyrefly-0.15.2}/pyrefly/lib/alt/special_calls.rs

@@ -51,8 +51,8 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 .anon_callables();
             // Make assert_type(Self@SomeClass, typing.Self) work.
             let self_form = Type::SpecialForm(SpecialForm::SelfType);
-            a.subst_self_type_mut(&self_form);
-            b.subst_self_type_mut(&self_form);
+            a.subst_self_type_mut(&self_form, &|_, _| true);
+            b.subst_self_type_mut(&self_form, &|_, _| true);
             if a != b {
                 self.error(
                     errors,

{pyrefly-0.15.1 → pyrefly-0.15.2}/pyrefly/lib/binding/pattern.rs

@@ -244,9 +244,6 @@ impl<'a> BindingsBuilder<'a> {
             self.stmts(case.body);
             mem::swap(&mut self.scopes.current_mut().flow, &mut base);
             branches.push(base);
-            if exhaustive {
-                break;
-            }
         }
         if !exhaustive {
             branches.push(mem::take(&mut self.scopes.current_mut().flow));

{pyrefly-0.15.1 → pyrefly-0.15.2}/pyrefly/lib/binding/target.rs

@@ -146,9 +146,9 @@ impl<'a> BindingsBuilder<'a> {
         target: &mut Expr,
         make_binding: &dyn Fn(Option<Idx<KeyAnnotation>>) -> Binding,
         value: Option<&Expr>,
-        ensure_mutable_name: bool,
+        is_aug_assign: bool,
     ) {
-        if ensure_mutable_name && let Expr::Name(name) = target {
+        if is_aug_assign && let Expr::Name(name) = target {
             // We normally should not ensure a top-level name, but if the target is for an
             // AugAssign operation, then the name needs to already be in scope and will be used
             // to resolve the target as a (possibly overwriting) mutation.
@@ -182,13 +182,13 @@ impl<'a> BindingsBuilder<'a> {
                 // the name assigned to.
                 self.bind_subscript_assign(x.clone(), ExprOrBinding::Binding(binding.clone()));
             }
-            Expr::Tuple(tup) => {
+            Expr::Tuple(tup) if !is_aug_assign => {
                 self.bind_unpacking(&mut tup.elts, make_binding, tup.range);
             }
-            Expr::List(lst) => {
+            Expr::List(lst) if !is_aug_assign => {
                 self.bind_unpacking(&mut lst.elts, make_binding, lst.range);
             }
-            Expr::Starred(x) => {
+            Expr::Starred(x) if !is_aug_assign => {
                 self.error(
                     x.range,
                     "Starred assignment target must be in a list or tuple".to_owned(),

{pyrefly-0.15.1 → pyrefly-0.15.2}/pyrefly/lib/commands/config_migration.rs

@@ -44,22 +44,17 @@ pub struct Args {
 
 impl Args {
     fn load_from_pyproject(raw_file: &str) -> anyhow::Result<ConfigFile> {
-        info!("Attempting to load [tool.mypy] config");
         match mypy::parse_pyrproject_config(raw_file) {
             ok @ Ok(_) => {
-                info!("Successfully loaded [tool.mypy] config from pyproject.toml");
+                info!("Migrating [tool.mypy] config from pyproject.toml");
                 return ok;
             }
-            Err(e) => {
-                info!("Failed to load [tool.mypy] config from pyproject.toml:\n  {e}");
-                info!("Attempting to load [tool.pyright] config.");
+            Err(_) => {
+                // Try to parse [tool.pyright] instead.
             }
         }
         pyright::parse_pyproject_toml(raw_file)
-            .inspect(|_| info!("Successfully loaded [tool.pyright] config from pyproject.toml"))
-            .inspect_err(|e| {
-                info!("failed to load [tool.pyright] config from pyproject.toml:\n  {e}")
-            })
+            .inspect(|_| info!("Migrating [tool.pyright] config from pyproject.toml"))
     }
 
     fn find_config(start: &Path) -> anyhow::Result<PathBuf> {
@@ -82,16 +77,7 @@ impl Args {
     fn check_and_warn(config: &ConfigFile) {
         if toml::to_string(&config).is_ok_and(|s| s.is_empty()) {
             warn!(
-                "The generated config is empty. This likely means that none of the config options in the migrated config have pyrefly equivalents. Consider running `pyrefly init` instead to generate a new pyrefly config."
-            );
-            return;
-        }
-        if config.project_includes.is_empty() {
-            warn!(
-                "The migrated config had no files that could be used for `project_includes` in the generated config. By default, pyrefly will check every python file in the project."
-            );
-            warn!(
-                "You can invoke pyrefly with the files to check (e.g. `pyrefly check src/`), or you may maually fill in `project_includes` in the config."
+                "The generated config is empty. This likely means that none of the config options in the migrated config have pyrefly equivalents."
             );
         }
     }
@@ -113,44 +99,32 @@ impl Args {
         }
 
         let input_path = match &self.input_path {
-            Some(path) if path.is_file() => {
-                info!("Looking for {}", path.display());
-                path
-            }
-            Some(path) => {
-                info!("Looking for configs to migrate in {}", path.display());
-                &Self::find_config(path)?
-            }
+            Some(path) if path.is_file() => path,
+            Some(path) => &Self::find_config(path)?,
             None => {
                 let cwd = std::env::current_dir()
                     .context("Could not find dir to start search for configs from")?;
-                info!(
-                    "No config path provided. Searching for configs, starting in {}",
-                    cwd.display()
-                );
                 &Self::find_config(&cwd)?
             }
         };
         let config = if input_path.file_name() == Some("pyrightconfig.json".as_ref()) {
             let raw_file = fs_anyhow::read_to_string(input_path)?;
-            info!("Detected pyright config file");
-            let pyr = serde_json::from_str::<PyrightConfig>(&raw_file)?;
+            info!("Migrating pyright config file");
+            let pyr = serde_jsonrc::from_str::<PyrightConfig>(&raw_file)?;
             pyr.convert()
         } else if input_path.file_name() == Some("mypy.ini".as_ref()) {
-            info!("Detected mypy config file");
+            info!("Migrating mypy config file");
             MypyConfig::parse_mypy_config(input_path)?
         } else if input_path.file_name() == Some("pyproject.toml".as_ref()) {
             let raw_file = fs_anyhow::read_to_string(input_path)?;
-            info!("Detected pyproject.toml file.");
             Self::load_from_pyproject(&raw_file)?
         } else {
             error!(
-                "Currently only migration from pyrightconfig.json, mypy.ini, and pyproject.toml is supported, not {}",
+                "Currently only migration from pyrightconfig.json, mypy.ini, and pyproject.toml is supported, not `{}`",
                 input_path.display(),
             );
             return Ok(CommandExitStatus::UserError);
         };
-        info!("Conversion finished");
 
         Self::check_and_warn(&config);
 
@@ -168,7 +142,7 @@ impl Args {
             .parent()
             .ok_or_else(|| {
                 anyhow::anyhow!(
-                    "Could not check if parent directories of {} exist",
+                    "Could not check if parent directories of `{}` exist",
                     output_path.display()
                 )
             })?
@@ -179,11 +153,11 @@ impl Args {
         }
         if output_path.ends_with(ConfigFile::PYPROJECT_FILE_NAME) {
             write_pyproject(output_path, config)?;
-            info!("Config written to {}", output_path.display());
+            info!("Config written to `{}`", output_path.display());
         } else {
             let serialized = toml::to_string_pretty(&config)?;
             fs_anyhow::write(output_path, serialized.as_bytes())?;
-            info!("New config written to {}", output_path.display());
+            info!("New config written to `{}`", output_path.display());
         }
         Ok(CommandExitStatus::Success)
     }
@@ -592,4 +566,22 @@ test = true
         assert_eq!(output, "[tool.pyrefly]\n");
         Ok(())
     }
+
+    #[test]
+    fn test_report_trailing_commas() -> anyhow::Result<()> {
+        let raw_file = r#"
+            {
+                "include": [
+                    "src/**/*.py",
+                    "test/**/*.py",
+                ],
+                "pythonVersion": "3.11",
+                "reportMissingImports": "none"
+            }
+            "#;
+        let pyr = serde_jsonrc::from_str::<PyrightConfig>(raw_file)?;
+        let config = pyr.convert();
+        assert!(!config.project_includes.is_empty());
+        Ok(())
+    }
 }