squawk-cli 2.48.0__tar.gz → 2.50.0__tar.gz

{squawk_cli-2.48.0 → squawk_cli-2.50.0}/Cargo.lock

@@ -1545,9 +1545,9 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
 [[package]]
 name = "openssl"
-version = "0.10.73"
+version = "0.10.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
+checksum = "f38c4372413cdaaf3cc79dd92d29d7d9f5ab09b51b10dded508fb90bb70b9222"
 dependencies = [
  "bitflags 2.9.3",
  "cfg-if",
@@ -1586,9 +1586,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.109"
+version = "0.9.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
+checksum = "13ce1245cd07fcc4cfdb438f7507b0c7e4f3849a69fd84d52374c66d83741bb6"
 dependencies = [
  "cc",
  "libc",
@@ -1816,9 +1816,9 @@ checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
 name = "rand"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
 dependencies = [
  "libc",
  "rand_chacha",
@@ -2385,7 +2385,7 @@ dependencies = [
 
 [[package]]
 name = "squawk"
-version = "2.48.0"
+version = "2.50.0"
 dependencies = [
  "annotate-snippets",
  "anyhow",
@@ -2399,6 +2399,7 @@ dependencies = [
  "log",
  "lsp-server",
  "lsp-types",
+ "rayon",
  "serde",
  "serde_json",
  "simplelog",
@@ -2415,17 +2416,23 @@ dependencies = [
 
 [[package]]
 name = "squawk-fmt"
-version = "2.48.0"
+version = "2.50.0"
 dependencies = [
+ "anyhow",
+ "camino",
+ "clap",
+ "dir-test",
  "insta",
  "itertools",
+ "rowan",
+ "squawk-lexer",
  "squawk-syntax",
  "tiny_pretty",
 ]
 
 [[package]]
 name = "squawk-github"
-version = "2.48.0"
+version = "2.50.0"
 dependencies = [
  "jsonwebtoken",
  "log",
@@ -2436,7 +2443,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-ide"
-version = "2.48.0"
+version = "2.50.0"
 dependencies = [
  "annotate-snippets",
  "etcetera",
@@ -2458,14 +2465,14 @@ dependencies = [
 
 [[package]]
 name = "squawk-lexer"
-version = "2.48.0"
+version = "2.50.0"
 dependencies = [
  "insta",
 ]
 
 [[package]]
 name = "squawk-linter"
-version = "2.48.0"
+version = "2.50.0"
 dependencies = [
  "annotate-snippets",
  "enum-iterator",
@@ -2480,7 +2487,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-parser"
-version = "2.48.0"
+version = "2.50.0"
 dependencies = [
  "annotate-snippets",
  "camino",
@@ -2493,7 +2500,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-server"
-version = "2.48.0"
+version = "2.50.0"
 dependencies = [
  "anyhow",
  "crossbeam-channel",
@@ -2519,11 +2526,12 @@ dependencies = [
 
 [[package]]
 name = "squawk-syntax"
-version = "2.48.0"
+version = "2.50.0"
 dependencies = [
  "annotate-snippets",
  "camino",
  "dir-test",
+ "either",
  "insta",
  "rowan",
  "smol_str",
@@ -2532,7 +2540,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-thread"
-version = "2.48.0"
+version = "2.50.0"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-utils",
@@ -2544,7 +2552,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-wasm"
-version = "2.48.0"
+version = "2.50.0"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -3420,7 +3428,7 @@ checksum = "32ac00cd3f8ec9c1d33fb3e7958a82df6989c42d747bd326c822b1d625283547"
 
 [[package]]
 name = "xtask"
-version = "2.48.0"
+version = "2.50.0"
 dependencies = [
  "anyhow",
  "camino",

{squawk_cli-2.48.0 → squawk_cli-2.50.0}/Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "2.48.0"
+version = "2.50.0"
 edition = "2024"
 rust-version = "1.94"
 authors = ["Squawk Team & Contributors"]
@@ -22,7 +22,11 @@ glob = "0.3.1"
 insta = "1.39.0"
 jsonwebtoken = { version = "10.3.0", features = ["rust_crypto"] }
 log = "0.4.25"
-reqwest = { version = "0.11.27", features = ["native-tls-vendored", "blocking", "json"] }
+reqwest = { version = "0.11.27", features = [
+  "native-tls-vendored",
+  "blocking",
+  "json",
+] }
 la-arena = "0.3.1"
 serde = { version = "1.0.215", features = ["derive"] }
 serde_json = "1.0"
@@ -52,6 +56,7 @@ console_error_panic_hook = "0.1.7"
 console_log = "1.0.0"
 annotate-snippets = "0.12.4"
 anyhow = "1.0.94"
+either = "1.15.0"
 convert_case = "0.7.1"
 clap = { version = "4.5.8", features = ["derive", "env"] }
 ungrammar = "1.1.4"
@@ -66,20 +71,21 @@ url = "2.5.4"
 crossbeam-channel = "0.5.15"
 crossbeam-utils = "0.8.21"
 jod-thread = "0.1.2"
+rayon = "1"
 libc = "0.2.171"
 tracing = "0.1.40"
 rustc-hash = "2.1.1"
 
 # local
 # we have to make the versions explicit otherwise `cargo publish` won't work
-squawk-github = { path = "./crates/squawk_github", version = "2.48.0" }
-squawk-ide = { path = "./crates/squawk_ide", version = "2.48.0" }
-squawk-lexer = { path = "./crates/squawk_lexer", version = "2.48.0" }
-squawk-parser = { path = "./crates/squawk_parser", version = "2.48.0" }
-squawk-syntax = { path = "./crates/squawk_syntax", version = "2.48.0" }
-squawk-linter = { path = "./crates/squawk_linter", version = "2.48.0" }
-squawk-server = { path = "./crates/squawk_server", version = "2.48.0" }
-squawk-thread = { path = "./crates/squawk_thread", version = "2.48.0" }
+squawk-github = { path = "./crates/squawk_github", version = "2.50.0" }
+squawk-ide = { path = "./crates/squawk_ide", version = "2.50.0" }
+squawk-lexer = { path = "./crates/squawk_lexer", version = "2.50.0" }
+squawk-parser = { path = "./crates/squawk_parser", version = "2.50.0" }
+squawk-syntax = { path = "./crates/squawk_syntax", version = "2.50.0" }
+squawk-linter = { path = "./crates/squawk_linter", version = "2.50.0" }
+squawk-server = { path = "./crates/squawk_server", version = "2.50.0" }
+squawk-thread = { path = "./crates/squawk_thread", version = "2.50.0" }
 
 [workspace.lints.clippy]
 collapsible_else_if = "allow"

{squawk_cli-2.48.0 → squawk_cli-2.50.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: squawk-cli
-Version: 2.48.0
+Version: 2.50.0
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: MacOS

{squawk_cli-2.48.0 → squawk_cli-2.50.0}/crates/squawk/Cargo.toml

@@ -34,6 +34,7 @@ squawk-server.workspace = true
 squawk-thread.workspace = true
 toml.workspace = true
 glob.workspace = true
+rayon.workspace = true
 anyhow.workspace = true
 annotate-snippets.workspace = true
 line-index.workspace = true

{squawk_cli-2.48.0 → squawk_cli-2.50.0}/crates/squawk/README.md

@@ -265,7 +265,7 @@ to your project's `.pre-commit-config.yaml`:
 ```yaml
 repos:
   - repo: https://github.com/sbdchd/squawk
-    rev: 2.48.0
+    rev: 2.50.0
     hooks:
       - id: squawk
         files: path/to/postgres/migrations/written/in/sql

{squawk_cli-2.48.0 → squawk_cli-2.50.0}/crates/squawk/src/github.rs

@@ -205,7 +205,7 @@ fn get_summary_comment_body(
 
         let summary = format!(
             r"
-<h3><code>{filename}</code></h3>
+<h3><code>{path}</code></h3>
 
 📄 **{line_count} lines** | {violations_emoji} **{violation_count} violations**
 
@@ -213,7 +213,7 @@ fn get_summary_comment_body(
 
 ---
     ",
-            filename = file.filename,
+            path = file.path,
             line_count = line_count,
             violations_emoji = violations_emoji,
             violation_count = violation_count,
@@ -312,7 +312,7 @@ fn get_sql_file_content(violation: &CheckReport) -> Result<String> {
     let mut buff = Vec::new();
     let violation_count = violation.violations.len();
     for v in &violation.violations {
-        fmt_tty_violation(&mut buff, v, &violation.filename, sql)?;
+        fmt_tty_violation(&mut buff, v, &violation.path, sql)?;
     }
     let violations_text_raw = &String::from_utf8_lossy(&buff);
     let violations_text = strip_ansi_codes(violations_text_raw);
@@ -340,7 +340,7 @@ fn get_sql_file_content(violation: &CheckReport) -> Result<String> {
 
     Ok(format!(
         r"
-<h3><code>{filename}</code></h3>
+<h3><code>{path}</code></h3>
 
 ```sql
 {sql}
@@ -353,7 +353,7 @@ fn get_sql_file_content(violation: &CheckReport) -> Result<String> {
 ---
     ",
         violations_emoji = violations_emoji,
-        filename = violation.filename,
+        path = violation.path,
         sql = display_sql,
         truncation_notice = truncation_notice,
         violation_count = violation_count,
@@ -376,7 +376,7 @@ mod test_github_comment {
     #[test]
     fn generating_comment_multiple_files() {
         let violations = vec![CheckReport {
-            filename: "alpha.sql".into(),
+            path: "alpha.sql".into(),
             sql: "SELECT 1;".into(),
             violations: vec![ReportViolation {
                 file: "alpha.sql".into(),
@@ -405,7 +405,7 @@ mod test_github_comment {
     fn generating_comment_no_violations() {
         let violations = vec![
             CheckReport {
-                filename: "alpha.sql".into(),
+                path: "alpha.sql".into(),
                 sql: r#"
 BEGIN;
 --
@@ -420,7 +420,7 @@ CREATE TABLE "core_bar" (
                 violations: vec![],
             },
             CheckReport {
-                filename: "bravo.sql".into(),
+                path: "bravo.sql".into(),
                 sql: r#"
 ALTER TABLE "core_recipe" ADD COLUMN "foo" integer DEFAULT 10;
                 "#
@@ -470,7 +470,7 @@ ALTER TABLE "core_recipe" ADD COLUMN "foo" integer DEFAULT 10;
             .join("\n");
 
         let violations = vec![CheckReport {
-            filename: "large.sql".into(),
+            path: "large.sql".into(),
             sql: large_sql,
             violations: vec![ReportViolation {
                 file: "large.sql".into(),
@@ -505,7 +505,7 @@ ALTER TABLE "core_recipe" ADD COLUMN "foo" integer DEFAULT 10;
             .join("\n");
 
         let violations = vec![CheckReport {
-            filename: "massive.sql".into(),
+            path: "massive.sql".into(),
             sql: massive_sql,
             violations: vec![ReportViolation {
                 file: "massive.sql".into(),

{squawk_cli-2.48.0 → squawk_cli-2.50.0}/crates/squawk/src/reporter.rs

@@ -4,6 +4,7 @@ use console::style;
 use line_index::LineIndex;
 use line_index::TextRange;
 use log::info;
+use rayon::prelude::*;
 use serde::Serialize;
 use squawk_linter::{Fix, Linter, Rule, Version};
 use squawk_syntax::SourceFile;
@@ -60,7 +61,7 @@ fn check_sql(
             })
             .collect();
         return CheckReport {
-            filename: path.into(),
+            path: path.into(),
             sql: sql.into(),
             violations,
         };
@@ -91,7 +92,7 @@ fn check_sql(
         .collect();
 
     CheckReport {
-        filename: path.into(),
+        path: path.into(),
         sql: sql.into(),
         violations,
     }
@@ -151,44 +152,45 @@ pub(crate) struct LintArgs {
 }
 
 pub fn lint_files(args: &LintArgs) -> Result<Vec<CheckReport>> {
-    let mut violations = vec![];
     match &args.input {
         Input::Stdin(stdin) => {
             info!("reading content from stdin");
             let sql = sql_from_stdin()?;
-            // ignore stdin if it's empty.
             if sql.trim().is_empty() {
                 info!("ignoring empty stdin");
-            } else {
-                let path = stdin.path.clone().unwrap_or_else(|| "stdin".into());
-                let content = check_sql(
-                    &sql,
-                    &path,
-                    &args.included_rules,
-                    &args.excluded_rules,
-                    args.pg_version,
-                    args.assume_in_transaction,
-                );
-                violations.push(content);
+                return Ok(vec![]);
             }
+            let path = stdin.path.clone().unwrap_or_else(|| "stdin".into());
+            let content = check_sql(
+                &sql,
+                &path,
+                &args.included_rules,
+                &args.excluded_rules,
+                args.pg_version,
+                args.assume_in_transaction,
+            );
+            Ok(vec![content])
         }
         Input::Paths(path_bufs) => {
-            for path in path_bufs {
-                info!("checking file path: {}", path.display());
-                let sql = sql_from_path(path)?;
-                let content = check_sql(
-                    &sql,
-                    path.to_str().unwrap(),
-                    &args.included_rules,
-                    &args.excluded_rules,
-                    args.pg_version,
-                    args.assume_in_transaction,
-                );
-                violations.push(content);
-            }
+            let mut reports: Vec<CheckReport> = path_bufs
+                .par_iter()
+                .map(|path| {
+                    info!("checking file path: {}", path.display());
+                    let sql = sql_from_path(path)?;
+                    Ok(check_sql(
+                        &sql,
+                        path.to_str().unwrap(),
+                        &args.included_rules,
+                        &args.excluded_rules,
+                        args.pg_version,
+                        args.assume_in_transaction,
+                    ))
+                })
+                .collect::<Result<Vec<_>>>()?;
+            reports.sort_by(|a, b| a.path.cmp(&b.path));
+            Ok(reports)
         }
     }
-    Ok(violations)
 }
 
 pub fn lint_and_report<W: io::Write>(f: &mut W, args: LintArgs) -> Result<ExitCode> {
@@ -337,7 +339,7 @@ pub fn fmt_tty<W: io::Write>(f: &mut W, reports: &[CheckReport]) -> Result<()> {
     let summary = Summary::from(reports);
     for report in reports {
         for violation in &report.violations {
-            fmt_tty_violation(f, violation, &report.filename, &report.sql)?;
+            fmt_tty_violation(f, violation, &report.path, &report.sql)?;
         }
     }
     print_summary(f, &summary)?;
@@ -460,7 +462,7 @@ fn fmt_gitlab<W: io::Write>(f: &mut W, reports: Vec<CheckReport>) -> Result<()>
 
 #[derive(Debug)]
 pub struct CheckReport {
-    pub filename: String,
+    pub path: String,
     pub sql: String,
     pub violations: Vec<ReportViolation>,
 }

{squawk_cli-2.48.0 → squawk_cli-2.50.0}/crates/squawk/src/snapshots/squawk__reporter__test_reporter__span_offsets.snap

@@ -1,9 +1,9 @@
 ---
 source: crates/squawk/src/reporter.rs
-expression: "check_sql(sql, filename, &[], None, false)"
+expression: "check_sql(sql, filename, &[], &[], None, false)"
 ---
 CheckReport {
-    filename: "main.sql",
+    path: "main.sql",
     sql: "\n\n   ALTER TABLE \"core_recipe\" ADD COLUMN \"foo\" integer NOT NULL;\nALTER TABLE \"core_foo\" ADD COLUMN \"bar\" integer NOT NULL;\nSELECT 1;\n",
     violations: [
         ReportViolation {

{squawk_cli-2.48.0 → squawk_cli-2.50.0}/crates/squawk_github/src/app.rs

@@ -11,7 +11,7 @@ use serde_json::Value;
 use std::time::Duration;
 use std::time::{SystemTime, UNIX_EPOCH};
 
-pub(crate) const SQUAWK_USER_AGENT: &str = "squawk/2.48.0";
+pub(crate) const SQUAWK_USER_AGENT: &str = "squawk/2.50.0";
 
 #[derive(Debug, Serialize)]
 struct CommentBody {