pyrefly 0.33.1__tar.gz → 0.34.0__tar.gz

{pyrefly-0.33.1 → pyrefly-0.34.0}/Cargo.lock

@@ -2070,7 +2070,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly"
-version = "0.33.1"
+version = "0.34.0"
 dependencies = [
  "anstream",
  "anyhow",
@@ -2121,7 +2121,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_build"
-version = "0.33.1"
+version = "0.34.0"
 dependencies = [
  "anyhow",
  "dupe",
@@ -2137,7 +2137,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_bundled"
-version = "0.33.1"
+version = "0.34.0"
 dependencies = [
  "anyhow",
  "starlark_map",
@@ -2147,7 +2147,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_config"
-version = "0.33.1"
+version = "0.34.0"
 dependencies = [
  "anyhow",
  "clap",
@@ -2182,7 +2182,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_derive"
-version = "0.33.1"
+version = "0.34.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2191,7 +2191,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_python"
-version = "0.33.1"
+version = "0.34.0"
 dependencies = [
  "anyhow",
  "dupe",
@@ -2215,7 +2215,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_types"
-version = "0.33.1"
+version = "0.34.0"
 dependencies = [
  "compact_str 0.8.0",
  "dupe",
@@ -2235,7 +2235,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_util"
-version = "0.33.1"
+version = "0.34.0"
 dependencies = [
  "anstream",
  "anyhow",
@@ -3276,7 +3276,7 @@ dependencies = [
 
 [[package]]
 name = "tsp_types"
-version = "0.33.1"
+version = "0.34.0"
 dependencies = [
  "lsp-server",
  "lsp-types",

{pyrefly-0.33.1 → pyrefly-0.34.0}/PKG-INFO

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

{pyrefly-0.33.1 → pyrefly-0.34.0}/crates/pyrefly_build/Cargo.toml

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

{pyrefly-0.33.1 → pyrefly-0.34.0}/crates/pyrefly_bundled/Cargo.toml

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

{pyrefly-0.33.1 → pyrefly-0.34.0}/crates/pyrefly_config/Cargo.toml

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

{pyrefly-0.33.1 → pyrefly-0.34.0}/crates/pyrefly_derive/Cargo.toml

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

{pyrefly-0.33.1 → pyrefly-0.34.0}/crates/pyrefly_python/Cargo.toml

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

{pyrefly-0.33.1 → pyrefly-0.34.0}/crates/pyrefly_python/src/nesting_context.rs

@@ -12,6 +12,7 @@ use std::sync::Arc;
 
 use dupe::Dupe;
 use pyrefly_util::display::DisplayWith;
+use pyrefly_util::display::intersperse_iter;
 
 use crate::module::Module;
 use crate::short_identifier::ShortIdentifier;
@@ -71,7 +72,6 @@ impl NestingContext {
 
 impl DisplayWith<Module> for NestingContext {
     fn fmt(&self, f: &mut fmt::Formatter<'_>, ctx: &Module) -> fmt::Result {
-        write!(f, "{}", ctx.name())?;
         let mut components = Vec::new();
         let mut current = self;
         loop {
@@ -87,10 +87,11 @@ impl DisplayWith<Module> for NestingContext {
                 }
             }
         }
-        for name in components.into_iter().rev() {
-            write!(f, ".{}", ctx.display(name))?;
-        }
-        Ok(())
+        write!(
+            f,
+            "{}",
+            intersperse_iter(".", || components.iter().rev().map(|id| ctx.display(*id)))
+        )
     }
 }
 
@@ -126,11 +127,11 @@ mod tests {
         let class_context = NestingContext::class(class_id, toplevel.clone());
         let function_context = NestingContext::function(func_id, class_context.clone());
 
-        assert_eq!(module.display(&toplevel).to_string(), "test");
-        assert_eq!(module.display(&class_context).to_string(), "test.TestClass");
+        assert_eq!(module.display(&toplevel).to_string(), "");
+        assert_eq!(module.display(&class_context).to_string(), "TestClass");
         assert_eq!(
             module.display(&function_context).to_string(),
-            "test.TestClass.test_func"
+            "TestClass.test_func"
         );
     }
 }

{pyrefly-0.33.1 → pyrefly-0.34.0}/crates/pyrefly_python/src/qname.rs

@@ -121,23 +121,26 @@ impl QName {
     }
 
     pub fn fmt_name(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.name)
-    }
-
-    pub fn fmt_with_module(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         if self.parent().is_toplevel() {
-            write!(f, "{}", self.module_name())?;
+            write!(f, "{}", self.name)
         } else {
             write!(f, "{}", self.module().display(self.parent()))?;
+            write!(f, ".{}", self.name)
+        }
+    }
+
+    pub fn fmt_with_module(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.module_name())?;
+        if !self.parent().is_toplevel() {
+            write!(f, ".{}", self.module().display(self.parent()))?;
         }
         write!(f, ".{}", self.name)
     }
 
     pub fn fmt_with_location(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if self.parent().is_toplevel() {
-            write!(f, "{}", self.module_name())?;
-        } else {
-            write!(f, "{}", self.module().display(self.parent()))?;
+        write!(f, "{}", self.module_name())?;
+        if !self.parent().is_toplevel() {
+            write!(f, ".{}", self.module().display(self.parent()))?;
         }
         write!(
             f,

{pyrefly-0.33.1 → pyrefly-0.34.0}/crates/pyrefly_python/src/short_identifier.rs

@@ -18,7 +18,7 @@ use ruff_text_size::TextRange;
 use crate::module::Module;
 
 /// An identifier, where we can drop the `Name` part because it came from a `Module`.
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct ShortIdentifier(TextRange);
 
 impl ShortIdentifier {

{pyrefly-0.33.1 → pyrefly-0.34.0}/crates/pyrefly_types/Cargo.toml

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

{pyrefly-0.33.1 → pyrefly-0.34.0}/crates/pyrefly_types/src/globals.rs

@@ -17,7 +17,7 @@ use super::stdlib::Stdlib;
 use super::types::Type;
 
 #[derive(Debug, Clone)]
-pub struct Global {
+pub struct ImplicitGlobal {
     name: Name,
     ty: fn(&Stdlib) -> Type,
 }
@@ -29,27 +29,27 @@ fn dict_str_any(stdlib: &Stdlib) -> Type {
         .to_type()
 }
 
-const GLOBALS: &[Global] = &[
-    Global::new("__annotations__", dict_str_any),
-    Global::new("__builtins__", |_| Type::any_explicit()),
-    Global::new("__cached__", |stdlib| stdlib.str().clone().to_type()),
-    Global::new("__debug__", |stdlib| stdlib.bool().clone().to_type()),
-    Global::new("__dict__", dict_str_any),
-    Global::new("__file__", |stdlib| stdlib.str().clone().to_type()),
-    Global::new("__loader__", |_| Type::any_explicit()),
-    Global::new("__name__", |stdlib| stdlib.str().clone().to_type()),
-    Global::new("__package__", |stdlib| {
+const IMPLICIT_GLOBALS: &[ImplicitGlobal] = &[
+    ImplicitGlobal::new("__annotations__", dict_str_any),
+    ImplicitGlobal::new("__builtins__", |_| Type::any_explicit()),
+    ImplicitGlobal::new("__cached__", |stdlib| stdlib.str().clone().to_type()),
+    ImplicitGlobal::new("__debug__", |stdlib| stdlib.bool().clone().to_type()),
+    ImplicitGlobal::new("__dict__", dict_str_any),
+    ImplicitGlobal::new("__file__", |stdlib| stdlib.str().clone().to_type()),
+    ImplicitGlobal::new("__loader__", |_| Type::any_explicit()),
+    ImplicitGlobal::new("__name__", |stdlib| stdlib.str().clone().to_type()),
+    ImplicitGlobal::new("__package__", |stdlib| {
         Type::optional(stdlib.str().clone().to_type())
     }),
-    Global::new("__path__", |stdlib| {
+    ImplicitGlobal::new("__path__", |stdlib| {
         stdlib
             .mutable_sequence(stdlib.str().clone().to_type())
             .to_type()
     }),
-    Global::new("__spec__", |_| Type::any_explicit()),
+    ImplicitGlobal::new("__spec__", |_| Type::any_explicit()),
 ];
 
-impl Global {
+impl ImplicitGlobal {
     const fn new(name: &'static str, ty: fn(&Stdlib) -> Type) -> Self {
         Self {
             name: Name::new_static(name),
@@ -57,17 +57,17 @@ impl Global {
         }
     }
 
-    pub fn globals(has_docstring: bool) -> impl Iterator<Item = Global> {
-        GLOBALS
+    pub fn implicit_globals(has_docstring: bool) -> impl Iterator<Item = ImplicitGlobal> {
+        IMPLICIT_GLOBALS
             .iter()
             .cloned()
             .chain(iter::once(Self::doc(has_docstring)))
     }
 
     #[allow(dead_code)]
-    pub fn from_name(name: &Name) -> Option<Global> {
+    pub fn from_name(name: &Name) -> Option<ImplicitGlobal> {
         if name.starts_with("__") && name.ends_with("__") {
-            GLOBALS.iter().find(|x| &x.name == name).cloned()
+            IMPLICIT_GLOBALS.iter().find(|x| &x.name == name).cloned()
         } else {
             None
         }

{pyrefly-0.33.1 → pyrefly-0.34.0}/crates/pyrefly_util/Cargo.toml

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

{pyrefly-0.33.1 → pyrefly-0.34.0}/crates/tsp_types/Cargo.toml

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

{pyrefly-0.33.1 → pyrefly-0.34.0}/pyrefly/Cargo.toml

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

{pyrefly-0.33.1 → pyrefly-0.34.0}/pyrefly/lib/alt/function.rs

@@ -1078,15 +1078,15 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
             sig
         };
         for (range, overload) in overloads.iter() {
+            let (overload_tparams, original_overload_func) = match overload {
+                OverloadType::Function(func) => (None, func),
+                OverloadType::Forall(forall) => (Some(&forall.tparams), &forall.body),
+            };
             let overload_func = {
-                let (tparams, func) = match overload {
-                    OverloadType::Function(func) => (None, func),
-                    OverloadType::Forall(forall) => (Some(&forall.tparams), &forall.body),
-                };
-                if let Some(tparams) = all_tparams(tparams) {
-                    self.subst_function(&tparams, func.clone())
+                if let Some(tparams) = all_tparams(overload_tparams) {
+                    self.subst_function(&tparams, original_overload_func.clone())
                 } else {
-                    func.clone()
+                    original_overload_func.clone()
                 }
             };
             let impl_func = {
@@ -1112,7 +1112,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 errors,
                 &|| {
                     TypeCheckContext::of_kind(TypeCheckKind::OverloadInput(
-                        overload_func.signature.clone(),
+                        original_overload_func.signature.clone(),
                         impl_sig.clone(),
                     ))
                 },

{pyrefly-0.33.1 → pyrefly-0.34.0}/pyrefly/lib/alt/solve.rs

@@ -12,6 +12,7 @@ use dupe::Dupe;
 use pyrefly_python::ast::Ast;
 use pyrefly_python::dunder;
 use pyrefly_python::short_identifier::ShortIdentifier;
+use pyrefly_types::facet::FacetKind;
 use pyrefly_types::typed_dict::ExtraItems;
 use pyrefly_types::typed_dict::TypedDict;
 use pyrefly_util::prelude::SliceExt;
@@ -209,7 +210,23 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         &self,
         binding: &BindingLegacyTypeParam,
     ) -> Arc<LegacyTypeParameterLookup> {
-        match self.get_idx(binding.0).ty() {
+        let maybe_parameter = match binding {
+            BindingLegacyTypeParam::ParamKeyed(k) => self.get_idx(*k),
+            BindingLegacyTypeParam::ModuleKeyed(k, attr) => {
+                let module = self.get_idx(*k);
+                // Errors in attribute lookup are reported elsewhere, so we provide dummy values
+                // for arguments related to error reporting.
+                self.attr_infer(
+                    &module,
+                    attr,
+                    TextRange::default(),
+                    &self.error_swallower(),
+                    None,
+                )
+                .into()
+            }
+        };
+        match maybe_parameter.ty() {
             Type::TypeVar(x) => {
                 let q = Quantified::type_var(
                     x.qname().id().clone(),
@@ -1948,6 +1965,42 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                     TypeInfo::of_ty(Type::never())
                 }
             }
+            Binding::CheckLegacyTypeParam(key, range_if_scoped_params_exist) => {
+                let ty = match &*self.get_idx(*key) {
+                    LegacyTypeParameterLookup::Parameter(p) => {
+                        // This class or function has scoped (PEP 695) type parameters. Mixing legacy-style parameters is an error.
+                        if let Some(r) = range_if_scoped_params_exist {
+                            self.error(
+                                errors,
+                                *r,
+                                ErrorInfo::Kind(ErrorKind::InvalidTypeVar),
+                                format!(
+                                    "Type parameter {} is not included in the type parameter list",
+                                    self.module().display(&self.bindings().idx_to_key(*key).0)
+                                ),
+                            );
+                        }
+                        p.quantified.clone().to_value()
+                    }
+                    LegacyTypeParameterLookup::NotParameter(ty) => ty.clone(),
+                };
+                match self.bindings().get(*key) {
+                    BindingLegacyTypeParam::ModuleKeyed(idx, attr) => {
+                        // `idx` points to a module whose `attr` attribute may be a legacy type
+                        // variable that needs to be replaced with a QuantifiedValue. Since the
+                        // ModuleKeyed binding is for the module itself, we use the mechanism for
+                        // attribute ("facet") type narrowing to change the type that will be
+                        // produced when `attr` is accessed.
+                        let module = (*self.get_idx(*idx)).clone();
+                        if matches!(ty, Type::QuantifiedValue(_)) {
+                            module.with_narrow(&vec1![FacetKind::Attribute((**attr).clone())], ty)
+                        } else {
+                            module
+                        }
+                    }
+                    BindingLegacyTypeParam::ParamKeyed(_) => TypeInfo::of_ty(ty),
+                }
+            }
             _ => {
                 // All other Bindings model `Type` level operations where we do not
                 // propagate any attribute narrows.
@@ -2216,7 +2269,8 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
             | Binding::Phi(..)
             | Binding::Narrow(..)
             | Binding::AssignToAttribute(..)
-            | Binding::AssignToSubscript(..) => {
+            | Binding::AssignToSubscript(..)
+            | Binding::CheckLegacyTypeParam(..) => {
                 // These forms require propagating attribute narrowing information, so they
                 // are handled in `binding_to_type_info`
                 self.binding_to_type_info(binding, errors).into_ty()
@@ -2998,26 +3052,6 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                     }
                 }
             }
-            Binding::CheckLegacyTypeParam(key, range_if_scoped_params_exist) => {
-                match &*self.get_idx(*key) {
-                    LegacyTypeParameterLookup::Parameter(p) => {
-                        // This class or function has scoped (PEP 695) type parameters. Mixing legacy-style parameters is an error.
-                        if let Some(r) = range_if_scoped_params_exist {
-                            self.error(
-                                errors,
-                                *r,
-                                ErrorInfo::Kind(ErrorKind::InvalidTypeVar),
-                                format!(
-                                    "Type parameter {} is not included in the type parameter list",
-                                    self.module().display(&self.bindings().idx_to_key(*key).0)
-                                ),
-                            );
-                        }
-                        p.quantified.clone().to_value()
-                    }
-                    LegacyTypeParameterLookup::NotParameter(ty) => ty.clone(),
-                }
-            }
             Binding::ScopedTypeAlias(name, params, expr) => {
                 let ty = self.expr_infer(expr, errors);
                 let ta = self.as_type_alias(name, TypeAliasStyle::Scoped, ty, expr, None, errors);

{pyrefly-0.33.1 → pyrefly-0.34.0}/pyrefly/lib/binding/binding.rs

@@ -66,7 +66,7 @@ use crate::types::class::Class;
 use crate::types::class::ClassDefIndex;
 use crate::types::class::ClassFieldProperties;
 use crate::types::equality::TypeEq;
-use crate::types::globals::Global;
+use crate::types::globals::ImplicitGlobal;
 use crate::types::quantified::QuantifiedKind;
 use crate::types::stdlib::Stdlib;
 use crate::types::tuple::Tuple;
@@ -102,7 +102,7 @@ assert_words!(BindingClassMetadata, 8);
 assert_bytes!(BindingClassMro, 4);
 assert_words!(BindingClassField, 21);
 assert_bytes!(BindingClassSynthesizedFields, 4);
-assert_bytes!(BindingLegacyTypeParam, 4);
+assert_bytes!(BindingLegacyTypeParam, 16);
 assert_words!(BindingYield, 4);
 assert_words!(BindingYieldFrom, 4);
 assert_bytes!(BindingDecoratedFunction, 20);
@@ -317,8 +317,8 @@ pub enum Key {
     /// Used for `import foo.x` (the `foo` might not be literally present with `.` modules),
     /// and `from foo import *` (the names are injected from the exports)
     Import(Name, TextRange),
-    /// I am a module-level global variable like `__file__` or `__doc__`.
-    Global(Name),
+    /// I am an implicit module-level global variable like `__file__` or `__doc__`.
+    ImplicitGlobal(Name),
     /// I am defined in this module at this location.
     Definition(ShortIdentifier),
     /// I am a mutable capture (`global` or `nonlocal`) declared at this location.
@@ -387,7 +387,7 @@ impl Ranged for Key {
     fn range(&self) -> TextRange {
         match self {
             Self::Import(_, r) => *r,
-            Self::Global(_) => TextRange::default(),
+            Self::ImplicitGlobal(_) => TextRange::default(),
             Self::Definition(x) => x.range(),
             Self::MutableCapture(x) => x.range(),
             Self::UpstreamPinnedDefinition(x) => x.range(),
@@ -420,7 +420,7 @@ impl DisplayWith<ModuleInfo> for Key {
 
         match self {
             Self::Import(n, r) => write!(f, "Key::Import({n} {})", ctx.display(r)),
-            Self::Global(n) => write!(f, "Key::Global({n})"),
+            Self::ImplicitGlobal(n) => write!(f, "Key::Global({n})"),
             Self::Definition(x) => write!(f, "Key::Definition({})", short(x)),
             Self::MutableCapture(x) => write!(f, "Key::Declaration({})", short(x)),
             Self::UpstreamPinnedDefinition(x) => {
@@ -1182,7 +1182,7 @@ pub enum Binding {
     /// An explicit type.
     Type(Type),
     /// A global variable.
-    Global(Global),
+    Global(ImplicitGlobal),
     /// A type parameter.
     TypeParameter(Box<TypeParameter>),
     /// The type of a function. The fields are:
@@ -1974,11 +1974,33 @@ impl DisplayWith<Bindings> for BindingClassMro {
 }
 
 #[derive(Clone, Debug)]
-pub struct BindingLegacyTypeParam(pub Idx<Key>);
+/// A legacy type parameter (`T = typing.TypeVar("T")`).
+pub enum BindingLegacyTypeParam {
+    /// The key points directly to an expression that may be a legacy type parameter.
+    ParamKeyed(Idx<Key>),
+    /// The key points to a module with an attribute that may be a legacy type parameter.
+    ModuleKeyed(Idx<Key>, Box<Name>),
+}
 
 impl DisplayWith<Bindings> for BindingLegacyTypeParam {
     fn fmt(&self, f: &mut fmt::Formatter<'_>, ctx: &Bindings) -> fmt::Result {
-        write!(f, "BindingLegacyTypeParam({})", ctx.display(self.0))
+        write!(
+            f,
+            "BindingLegacyTypeParam({})",
+            match self {
+                Self::ParamKeyed(k) => format!("{}", ctx.display(*k)),
+                Self::ModuleKeyed(k, attr) => format!("{}.{attr}", ctx.display(*k)),
+            }
+        )
+    }
+}
+
+impl BindingLegacyTypeParam {
+    pub fn idx(&self) -> Idx<Key> {
+        match self {
+            Self::ParamKeyed(idx) => *idx,
+            Self::ModuleKeyed(idx, _) => *idx,
+        }
     }
 }