pyrefly 0.29.2__tar.gz → 0.30.0__tar.gz

{pyrefly-0.29.2 → pyrefly-0.30.0}/Cargo.lock

@@ -1899,6 +1899,12 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "pathdiff"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -2058,7 +2064,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly"
-version = "0.29.2"
+version = "0.30.0"
 dependencies = [
  "anstream",
  "anyhow",
@@ -2106,7 +2112,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_bundled"
-version = "0.29.2"
+version = "0.30.0"
 dependencies = [
  "anyhow",
  "starlark_map",
@@ -2116,7 +2122,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_config"
-version = "0.29.2"
+version = "0.30.0"
 dependencies = [
  "anyhow",
  "clap",
@@ -2149,7 +2155,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_derive"
-version = "0.29.2"
+version = "0.30.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2158,7 +2164,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_python"
-version = "0.29.2"
+version = "0.30.0"
 dependencies = [
  "anyhow",
  "dupe",
@@ -2166,6 +2172,7 @@ dependencies = [
  "itertools 0.14.0",
  "lsp-types",
  "parse-display",
+ "pathdiff",
  "pyrefly_util",
  "regex",
  "ruff_python_ast",
@@ -2180,7 +2187,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_types"
-version = "0.29.2"
+version = "0.30.0"
 dependencies = [
  "compact_str 0.8.0",
  "dupe",
@@ -2200,7 +2207,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_util"
-version = "0.29.2"
+version = "0.30.0"
 dependencies = [
  "anstream",
  "anyhow",
@@ -2762,12 +2769,12 @@ checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
 
 [[package]]
 name = "socket2"
-version = "0.5.8"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3058,9 +3065,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.46.1"
+version = "1.47.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
+checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3073,7 +3080,7 @@ dependencies = [
  "slab",
  "socket2",
  "tokio-macros",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]

{pyrefly-0.29.2 → pyrefly-0.30.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrefly
-Version: 0.29.2
+Version: 0.30.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pyrefly-0.29.2 → pyrefly-0.30.0}/crates/pyrefly_bundled/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_bundled"
-version = "0.29.2"
+version = "0.30.0"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.29.2 → pyrefly-0.30.0}/crates/pyrefly_config/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_config"
-version = "0.29.2"
+version = "0.30.0"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.29.2 → pyrefly-0.30.0}/crates/pyrefly_derive/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_derive"
-version = "0.29.2"
+version = "0.30.0"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.29.2 → pyrefly-0.30.0}/crates/pyrefly_python/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_python"
-version = "0.29.2"
+version = "0.30.0"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"
@@ -15,6 +15,7 @@ equivalent = "1.0"
 itertools = "0.14.0"
 lsp-types = "0.94.1"
 parse-display = "0.8.2"
+pathdiff = "0.2"
 pyrefly_util = { path = "../pyrefly_util" }
 regex = "1.11.1"
 ruff_python_ast = { git = "https://github.com/astral-sh/ruff/", rev = "9bee8376a17401f9736b45fdefffb62edc2f1668" }

{pyrefly-0.29.2 → pyrefly-0.30.0}/crates/pyrefly_python/src/module_name.rs

@@ -10,6 +10,7 @@ use std::fmt;
 use std::fmt::Debug;
 use std::fmt::Display;
 use std::hash::Hash;
+use std::path::Component;
 use std::path::Path;
 
 use dupe::Dupe;
@@ -172,17 +173,7 @@ impl ModuleName {
         Self::from_string(itertools::join(parts, "."))
     }
 
-    pub fn from_relative_path(path: &Path) -> anyhow::Result<Self> {
-        let mut components = Vec::new();
-        for raw_component in path.components() {
-            if let Some(component) = raw_component.as_os_str().to_str() {
-                components.push(component)
-            } else {
-                return Err(anyhow::anyhow!(PathConversionError::ComponentNotUTF8 {
-                    component: raw_component.as_os_str().to_owned(),
-                }));
-            }
-        }
+    fn from_relative_path_components(mut components: Vec<&str>) -> anyhow::Result<Self> {
         let last_element = components.pop();
         match last_element {
             None => {}
@@ -201,6 +192,39 @@ impl ModuleName {
         Ok(ModuleName::from_parts(components))
     }
 
+    pub fn from_relative_path(path: &Path) -> anyhow::Result<Self> {
+        let mut components = Vec::new();
+        for raw_component in path.components() {
+            if let Some(component) = raw_component.as_os_str().to_str() {
+                components.push(component)
+            } else {
+                return Err(anyhow::anyhow!(PathConversionError::ComponentNotUTF8 {
+                    component: raw_component.as_os_str().to_owned(),
+                }));
+            }
+        }
+        Self::from_relative_path_components(components)
+    }
+
+    pub fn relative_module_name_between(from: &Path, to: &Path) -> Option<ModuleName> {
+        let relative_path = pathdiff::diff_paths(to, from.parent()?)?;
+        // In the following loop, we aim to generate a list of components that can be joined by `.`
+        // to form a correct relative import module name,
+        let mut components = vec![""];
+        for raw_component in relative_path.as_path().components() {
+            match &raw_component {
+                // For each parent, we should create a `.`.
+                // The `.` is already provided during the join, so we only need an empty component.
+                Component::ParentDir => components.push(""),
+                Component::CurDir => {}
+                Component::Prefix(_) | Component::RootDir | Component::Normal(_) => {
+                    components.push(raw_component.as_os_str().to_str()?);
+                }
+            };
+        }
+        Self::from_relative_path_components(components).ok()
+    }
+
     pub fn append(self, name: &Name) -> Self {
         Self::from_string(format!("{}.{}", self.as_str(), name))
     }
@@ -334,4 +358,18 @@ mod tests {
         assert_conversion_error("foo/bar/baz");
         assert_conversion_error("foo/bar/__init__.derp");
     }
+
+    #[test]
+    fn test_relative_module_name_between() {
+        fn assert_module_name(from: &str, to: &str, expected: &str) {
+            let from = Path::new(from);
+            let to = Path::new(to);
+            let actual = ModuleName::relative_module_name_between(from, to);
+            assert_eq!(Some(ModuleName::from_str(expected)), actual);
+        }
+        assert_module_name("foo/bar.py", "foo/baz.py", ".baz");
+        assert_module_name("bar.py", "foo/baz.py", ".foo.baz");
+        assert_module_name("foo/bar.py", "baz.py", "..baz");
+        assert_module_name("foo/bar/boz.py", "baz.py", "...baz");
+    }
 }

{pyrefly-0.29.2 → pyrefly-0.30.0}/crates/pyrefly_types/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_types"
-version = "0.29.2"
+version = "0.30.0"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.29.2 → pyrefly-0.30.0}/crates/pyrefly_types/src/display.rs

@@ -324,7 +324,7 @@ impl<'a> TypeDisplayContext<'a> {
                             if literal_idx.is_none() {
                                 literal_idx = Some(i);
                             }
-                            literals.push(lit)
+                            literals.push(format!("{}", Fmt(|f| self.fmt_lit(lit, f))))
                         }
                         Type::Callable(_) | Type::Function(_) => {
                             display_types.push(format!("({})", self.display_internal(t)))
@@ -397,8 +397,8 @@ impl<'a> TypeDisplayContext<'a> {
                         self.fmt_qname(obj.qname(), f)?;
                         self.fmt_targs(obj.targs(), f)?;
                     }
-                    SuperObj::Class(obj) => {
-                        self.fmt_qname(obj.qname(), f)?;
+                    SuperObj::Class(cls) => {
+                        self.fmt_qname(cls.qname(), f)?;
                     }
                 }
                 write!(f, "]")

{pyrefly-0.29.2 → pyrefly-0.30.0}/crates/pyrefly_types/src/read_only.rs

@@ -27,6 +27,8 @@ pub enum ReadOnlyReason {
     Super,
     /// Field is marked as frozen via a ConfigDict
     PydanticFrozen,
+    /// Field is an enum member's value
+    EnumMemberValue,
 }
 
 impl ReadOnlyReason {
@@ -48,6 +50,9 @@ impl ReadOnlyReason {
             ReadOnlyReason::PydanticFrozen => {
                 "This field belongs to a frozen Pydantic model".to_owned()
             }
+            ReadOnlyReason::EnumMemberValue => {
+                "An enum member's value may not be modified".to_owned()
+            }
         }
     }
 }

{pyrefly-0.29.2 → pyrefly-0.30.0}/crates/pyrefly_types/src/types.rs

@@ -598,7 +598,7 @@ impl Forallable {
 #[derive(Visit, VisitMut, TypeEq)]
 pub enum SuperObj {
     Instance(ClassType),
-    Class(Class),
+    Class(ClassType),
 }
 
 // Note: The fact that Literal and LiteralString are at the front is important for

{pyrefly-0.29.2 → pyrefly-0.30.0}/crates/pyrefly_util/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_util"
-version = "0.29.2"
+version = "0.30.0"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.29.2 → pyrefly-0.30.0}/pyrefly/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly"
-version = "0.29.2"
+version = "0.30.0"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"
@@ -50,7 +50,7 @@ serde_json = { version = "1.0.140", features = ["alloc", "float_roundtrip", "raw
 serde_repr = "0.1.14"
 starlark_map = "0.13.0"
 static_assertions = "1.1.0"
-tokio = { version = "1.46.1", features = ["macros", "rt"] }
+tokio = { version = "1.47.1", features = ["macros", "rt"] }
 toml = { version = "0.9.2", features = ["preserve_order"] }
 tracing = { version = "0.1.41", features = ["attributes", "valuable"] }
 vec1 = { version = "1", features = ["serde"] }