complexipy 0.3.2__tar.gz → 0.4.0__tar.gz

{complexipy-0.3.2 → complexipy-0.4.0}/Cargo.lock

@@ -17,54 +17,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "anstream"
-version = "0.6.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
-dependencies = [
- "windows-sys",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
-dependencies = [
- "anstyle",
- "windows-sys",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.79"
@@ -111,21 +63,13 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
-[[package]]
-name = "colorchoice"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
-
 [[package]]
 name = "complexipy"
-version = "0.3.2"
+version = "0.4.0"
 dependencies = [
  "csv",
- "env_logger",
  "ignore",
  "indicatif",
- "log",
  "pyo3",
  "rayon",
  "rustpython-parser",
@@ -240,29 +184,6 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
-[[package]]
-name = "env_filter"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
-dependencies = [
- "log",
- "regex",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e7cf40684ae96ade6232ed84582f40ce0a66efcd43a5117aef610534f8e0b8"
-dependencies = [
- "anstream",
- "anstyle",
- "env_filter",
- "humantime",
- "log",
-]
-
 [[package]]
 name = "errno"
 version = "0.3.8"
@@ -312,12 +233,6 @@ dependencies = [
  "regex-syntax",
 ]
 
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
 [[package]]
 name = "ignore"
 version = "0.4.22"
@@ -425,9 +340,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "malachite"
@@ -746,18 +661,6 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
-[[package]]
-name = "regex"
-version = "1.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
 [[package]]
 name = "regex-automata"
 version = "0.4.5"
@@ -1079,12 +982,6 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c"
 
-[[package]]
-name = "utf8parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
-
 [[package]]
 name = "walkdir"
 version = "2.4.0"

{complexipy-0.3.2 → complexipy-0.4.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "complexipy"
-version = "0.3.2"
+version = "0.4.0"
 edition = "2021"
 authors = ["Robin Quintero <rohaquinlop301@gmail.com>"]
 license = "MIT"
@@ -18,10 +18,8 @@ crate-type = ["cdylib"]
 
 [dependencies]
 csv = "1.3.0"
-env_logger = "0.11.1"
 ignore = "0.4.22"
 indicatif = "0.17.8"
-log = "0.4.20"
 pyo3 = "0.19.0"
 rayon = "1.8.1"
 rustpython-parser = { git = "https://github.com/RustPython/Parser.git", rev = "9ce55aefdeb35e2f706ce0b02d5a2dfe6295fc57" }

{complexipy-0.3.2 → complexipy-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: complexipy
-Version: 0.3.2
+Version: 0.4.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -144,7 +144,7 @@ The cognitive complexity of the file is 1, and the output of the command
 `complexipy path/to/file.py` will be:
 
 ```txt
-───────────────────────────── 🐙 complexipy 0.3.2 ──────────────────────────────
+───────────────────────────── 🐙 complexipy 0.4.0 ──────────────────────────────
                                     Summary
       ┏━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━┳━━━━━━━━━━━━┓
       ┃ Path              ┃ File              ┃ Function    ┃ Complexity ┃

{complexipy-0.3.2 → complexipy-0.4.0}/README.md

@@ -126,7 +126,7 @@ The cognitive complexity of the file is 1, and the output of the command
 `complexipy path/to/file.py` will be:
 
 ```txt
-───────────────────────────── 🐙 complexipy 0.3.2 ──────────────────────────────
+───────────────────────────── 🐙 complexipy 0.4.0 ──────────────────────────────
                                     Summary
       ┏━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━┳━━━━━━━━━━━━┓
       ┃ Path              ┃ File              ┃ Function    ┃ Complexity ┃

{complexipy-0.3.2 → complexipy-0.4.0}/complexipy/main.py

@@ -28,7 +28,7 @@ import typer
 root_dir = Path(__file__).resolve().parent.parent
 app = typer.Typer(name="complexipy")
 console = Console()
-version = "0.3.2"
+version = "0.4.0"
 
 
 @app.command()

{complexipy-0.3.2 → complexipy-0.4.0}/docs/index.md

@@ -126,7 +126,7 @@ The cognitive complexity of the file is 1, and the output of the command
 `complexipy path/to/file.py` will be:
 
 ```txt
-───────────────────────────── 🐙 complexipy 0.3.2 ──────────────────────────────
+───────────────────────────── 🐙 complexipy 0.4.0 ──────────────────────────────
                                     Summary
       ┏━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━┳━━━━━━━━━━━━┓
       ┃ Path              ┃ File              ┃ Function    ┃ Complexity ┃

{complexipy-0.3.2 → complexipy-0.4.0}/src/cognitive_complexity/mod.rs

@@ -271,47 +271,44 @@ fn statement_cognitive_complexity(statement: Stmt, nesting_level: u64) -> PyResu
             }
         }
         Stmt::Assign(a) => {
-            match *a.value {
-                ast::Expr::IfExp(..) => {
-                    complexity += count_bool_ops(*a.value);
-                }
-                _ => {}
-            }
-
-            if complexity > 0 {
-                complexity += nesting_level;
-            }
+            complexity += count_bool_ops(*a.value, nesting_level);
         }
         Stmt::For(f) => {
             complexity += 1 + nesting_level;
             for node in f.body.iter() {
                 complexity += statement_cognitive_complexity(node.clone(), nesting_level + 1)?;
             }
+
+            complexity += count_bool_ops(*f.iter, nesting_level);
         }
         Stmt::While(w) => {
             complexity += 1 + nesting_level;
-            complexity += count_bool_ops(*w.test);
+            complexity += count_bool_ops(*w.test, nesting_level);
             for node in w.body.iter() {
                 complexity += statement_cognitive_complexity(node.clone(), nesting_level + 1)?;
             }
         }
         Stmt::If(i) => {
             complexity += 1 + nesting_level;
-            complexity += count_bool_ops(*i.test);
+            complexity += count_bool_ops(*i.test, nesting_level);
             for node in i.body.iter() {
                 complexity += statement_cognitive_complexity(node.clone(), nesting_level + 1)?;
             }
 
-            let mut orelse_complexity: u64 = 0;
-            for node in i.orelse.iter() {
-                orelse_complexity += statement_cognitive_complexity(node.clone(), nesting_level)?;
-            }
+            let orelse_complexities: Vec<u64> = i
+                .orelse
+                .iter()
+                .map(|node| statement_cognitive_complexity(node.clone(), nesting_level))
+                .filter(|complexity| complexity.is_ok())
+                .filter(|complexity| *complexity.as_ref().unwrap() > 0)
+                .map(|complexity| complexity.unwrap())
+                .collect();
 
-            if orelse_complexity > 0 && i.orelse.len() > 0 {
-                complexity -= (nesting_level) * i.orelse.len() as u64;
+            let orelse_complexity: u64 = orelse_complexities.iter().sum();
+
+            if orelse_complexities.len() > 0 {
                 complexity += orelse_complexity;
-            } else if i.orelse.len() > 0 {
-                complexity += 1;
+                complexity -= (nesting_level) * orelse_complexities.len() as u64;
             }
         }
         Stmt::Try(t) => {

{complexipy-0.3.2 → complexipy-0.4.0}/src/cognitive_complexity/utils.rs

@@ -130,30 +130,60 @@ pub fn is_decorator(statement: Stmt) -> bool {
     ans
 }
 
-pub fn count_bool_ops(expr: ast::Expr) -> u64 {
+pub fn count_bool_ops(expr: ast::Expr, nesting_level: u64) -> u64 {
     let mut complexity: u64 = 0;
 
     match expr {
         ast::Expr::BoolOp(b) => {
             complexity += 1;
             for value in b.values.iter() {
-                complexity += count_bool_ops(value.clone());
+                complexity += count_bool_ops(value.clone(), nesting_level);
             }
         }
         ast::Expr::UnaryOp(u) => {
-            complexity += count_bool_ops(*u.operand);
+            complexity += count_bool_ops(*u.operand, nesting_level);
         }
         ast::Expr::Compare(c) => {
-            complexity += count_bool_ops(*c.left);
+            complexity += count_bool_ops(*c.left, nesting_level);
             for comparator in c.comparators.iter() {
-                complexity += count_bool_ops(comparator.clone());
+                complexity += count_bool_ops(comparator.clone(), nesting_level);
             }
         }
         ast::Expr::IfExp(i) => {
-            complexity += 1;
-            complexity += count_bool_ops(*i.test);
-            complexity += count_bool_ops(*i.body);
-            complexity += count_bool_ops(*i.orelse);
+            complexity += 1 + nesting_level;
+            complexity += count_bool_ops(*i.test, nesting_level);
+            complexity += count_bool_ops(*i.body, nesting_level);
+            complexity += count_bool_ops(*i.orelse, nesting_level);
+        }
+        ast::Expr::Call(c) => {
+            for arg in c.args.iter() {
+                complexity += count_bool_ops(arg.clone(), nesting_level);
+            }
+        }
+        ast::Expr::Tuple(t) => {
+            for element in t.elts.iter() {
+                complexity += count_bool_ops(element.clone(), nesting_level);
+            }
+        }
+        ast::Expr::List(l) => {
+            for element in l.elts.iter() {
+                complexity += count_bool_ops(element.clone(), nesting_level);
+            }
+        }
+        ast::Expr::Set(s) => {
+            for element in s.elts.iter() {
+                complexity += count_bool_ops(element.clone(), nesting_level);
+            }
+        }
+        ast::Expr::Dict(d) => {
+            for key in d.keys.iter() {
+                if let Some(key_value) = key {
+                    complexity += count_bool_ops(key_value.clone(), nesting_level);
+                }
+            }
+            for value in d.values.iter() {
+                complexity += count_bool_ops(value.clone(), nesting_level);
+            }
         }
         _ => {}
     }