pyrefly 0.15.1__tar.gz → 0.16.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrefly
-Version: 0.15.1
+Version: 0.16.0
 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.16.0/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.16.0}/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.16.0}/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"
@@ -296,9 +296,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.22"
+version = "1.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32db95edf998450acc7881c932f94cd9b05c87b4b2599e8bab064753da4acfd1"
+checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766"
 dependencies = [
  "jobserver",
  "libc",
@@ -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.16.0"
 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",
@@ -2946,9 +2970,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-core"
-version = "0.61.0"
+version = "0.61.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
+checksum = "46ec44dc15085cea82cf9c78f85a9114c463a369786585ad2882d1ff0b0acf40"
 dependencies = [
  "windows-implement",
  "windows-interface",
@@ -2987,18 +3011,18 @@ checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
 
 [[package]]
 name = "windows-result"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
+checksum = "4b895b5356fc36103d0f64dd1e94dfa7ac5633f1c9dd6e80fe9ec4adef69e09d"
 dependencies = [
  "windows-link",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
+checksum = "2a7ab927b2637c19b3dbe0965e75d8f2d30bdd697a1516191cad2ec4df8fb28a"
 dependencies = [
  "windows-link",
 ]
@@ -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.16.0}/pyrefly/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly"
-version = "0.15.1"
+version = "0.16.0"
 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"
@@ -89,5 +92,9 @@ zstd = { version = "0.13", features = ["experimental", "zstdmt"] }
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 zstd = "0.13"
 
+[profile.release]
+lto = true
+codegen-units = 1
+
 [lints]
 rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }

pyrefly-0.16.0/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.16.0}/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.16.0}/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.16.0}/pyrefly/lib/alt/class/classdef.rs

@@ -94,7 +94,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         self.get_from_class(cls, &KeyClassMetadata(cls.index()))
     }
 
-    fn get_enum_from_class(&self, cls: &Class) -> Option<EnumMetadata> {
+    pub fn get_enum_from_class(&self, cls: &Class) -> Option<EnumMetadata> {
         self.get_metadata_for_class(cls).enum_metadata().cloned()
     }
 

{pyrefly-0.15.1 → pyrefly-0.16.0}/pyrefly/lib/alt/expr.rs

@@ -911,6 +911,26 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                         ),
                     }
                 }
+                Type::ClassDef(ref cls)
+                    if let Expr::StringLiteral(ExprStringLiteral { value: key, .. }) = slice
+                        && self.get_enum_from_class(cls).is_some() =>
+                {
+                    if let Some(member) = self.get_enum_member(cls, &Name::new(key.to_str())) {
+                        Type::Literal(member)
+                    } else {
+                        self.error(
+                            errors,
+                            slice.range(),
+                            ErrorKind::IndexError,
+                            None,
+                            format!(
+                                "Enum `{}` does not have a member named `{}`",
+                                cls.name(),
+                                key.to_str()
+                            ),
+                        )
+                    }
+                }
                 Type::ClassDef(cls) => Type::type_form(self.specialize(
                     &cls,
                     xs.map(|x| self.expr_untype(x, TypeFormContext::TypeArgument, errors)),
@@ -1215,14 +1235,22 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                                     value_hint.as_ref(),
                                     errors,
                                 );
-                                key_tys.push(key_t);
-                                value_tys.push(value_t);
+                                if key_t != Type::any_error() {
+                                    key_tys.push(key_t);
+                                }
+                                if value_t != Type::any_error() {
+                                    value_tys.push(value_t);
+                                }
                             }
                             None => {
                                 let ty = self.expr_infer(&x.value, errors);
-                                if let Some((key_ty, value_ty)) = self.unwrap_mapping(&ty) {
-                                    key_tys.push(key_ty);
-                                    value_tys.push(value_ty);
+                                if let Some((key_t, value_t)) = self.unwrap_mapping(&ty) {
+                                    if key_t != Type::any_error() {
+                                        key_tys.push(key_t);
+                                    }
+                                    if value_t != Type::any_error() {
+                                        value_tys.push(value_t);
+                                    }
                                 } else {
                                     self.error(
                                         errors,
@@ -1234,6 +1262,12 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                                 }
                             }
                         });
+                        if key_tys.is_empty() {
+                            key_tys.push(Type::any_error())
+                        }
+                        if value_tys.is_empty() {
+                            value_tys.push(Type::any_error())
+                        }
                         let key_ty = self.unions(key_tys);
                         let value_ty = self.unions(value_tys);
                         self.stdlib.dict(key_ty, value_ty).to_type()

{pyrefly-0.15.1 → pyrefly-0.16.0}/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.16.0}/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.16.0}/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.16.0}/pyrefly/lib/binding/narrow.rs

@@ -149,11 +149,23 @@ impl AtomicNarrowOp {
 }
 
 #[derive(Clone, Debug)]
-enum NarrowingSubject {
+pub enum NarrowingSubject {
     Name(Name),
     Property(Name, PropertyChain),
 }
 
+impl NarrowingSubject {
+    pub fn with_property(&self, prop: PropertyKind) -> Self {
+        match self {
+            Self::Name(name) => Self::Property(name.clone(), PropertyChain::new(Vec1::new(prop))),
+            Self::Property(name, props) => {
+                let props = Vec1::from_vec_push(props.properties().to_vec(), prop);
+                Self::Property(name.clone(), PropertyChain::new(props))
+            }
+        }
+    }
+}
+
 impl NarrowOp {
     pub fn negate(&self) -> Self {
         match self {
@@ -228,21 +240,41 @@ impl NarrowOps {
     pub fn from_single_narrow_op(left: &Expr, op: AtomicNarrowOp, range: TextRange) -> Self {
         let mut narrow_ops = Self::new();
         for subject in expr_to_subjects(left) {
-            let (name, attr) = match subject {
+            let (name, prop) = match subject {
                 NarrowingSubject::Name(name) => (name, None),
-                NarrowingSubject::Property(name, attr) => (name, Some(attr)),
+                NarrowingSubject::Property(name, prop) => (name, Some(prop)),
             };
             if let Some((existing, _)) = narrow_ops.0.get_mut(&name) {
-                existing.and(NarrowOp::Atomic(attr, op.clone()));
+                existing.and(NarrowOp::Atomic(prop, op.clone()));
             } else {
                 narrow_ops
                     .0
-                    .insert(name, (NarrowOp::Atomic(attr, op.clone()), range));
+                    .insert(name, (NarrowOp::Atomic(prop, op.clone()), range));
             }
         }
         narrow_ops
     }
 
+    pub fn from_single_narrow_op_for_subject(
+        subject: NarrowingSubject,
+        op: AtomicNarrowOp,
+        range: TextRange,
+    ) -> Self {
+        let mut narrow_ops = Self::new();
+        let (name, prop) = match subject {
+            NarrowingSubject::Name(name) => (name, None),
+            NarrowingSubject::Property(name, prop) => (name, Some(prop)),
+        };
+        if let Some((existing, _)) = narrow_ops.0.get_mut(&name) {
+            existing.and(NarrowOp::Atomic(prop, op.clone()));
+        } else {
+            narrow_ops
+                .0
+                .insert(name, (NarrowOp::Atomic(prop, op.clone()), range));
+        }
+        narrow_ops
+    }
+
     pub fn from_expr(builder: &BindingsBuilder, test: Option<&Expr>) -> Self {
         match test {
             Some(Expr::Compare(ExprCompare {
@@ -515,7 +547,7 @@ fn subject_for_property(expr: &Expr) -> Option<NarrowingSubject> {
         .map(|(identifier, attr)| NarrowingSubject::Property(identifier.id, attr))
 }
 
-fn expr_to_subjects(expr: &Expr) -> Vec<NarrowingSubject> {
+pub fn expr_to_subjects(expr: &Expr) -> Vec<NarrowingSubject> {
     fn f(expr: &Expr, res: &mut Vec<NarrowingSubject>) {
         match expr {
             Expr::Name(name) => res.push(NarrowingSubject::Name(name.id.clone())),
@@ -527,7 +559,6 @@ fn expr_to_subjects(expr: &Expr) -> Vec<NarrowingSubject> {
             _ => {}
         }
     }
-
     let mut res = Vec::new();
     f(expr, &mut res);
     res