Merge branch 'main' into fix/duplicate-cols

Author: juleswritescode

.github/workflows/pull_request.yml

@@ -112,6 +112,9 @@ jobs:
             sleep 1
           done
 
+      - name: Install tree-sitter-cli
+        run: cargo install tree-sitter-cli
+
       - name: Setup sqlx-cli
         run: cargo install sqlx-cli
 
@@ -167,12 +170,15 @@ jobs:
       - name: Setup Postgres
         uses: ./.github/actions/setup-postgres
 
+      - name: Install tree-sitter-cli
+        run: cargo install tree-sitter-cli
+
       - name: Run tests
         run: cargo test --workspace
 
   test-js-bindings:
     name:
-      Test JS Bindings
+      Test JS Packages
       # use the same image we use for compiling
     runs-on: ubuntu-22.04
     services:
@@ -195,18 +201,23 @@ jobs:
         uses: moonrepo/setup-rust@v1
         with:
           cache-base: main
+      - name: Install tree-sitter-cli
+        run: cargo install tree-sitter-cli
       - name: Build main binary
         run: cargo build -p pgt_cli --release
       - name: Setup Bun
         uses: oven-sh/setup-bun@v2
       - name: Install JS dependencies
         run: bun install
-      - name: Build TypeScript code
+      - name: Build backend-jsonrpc
         working-directory: packages/@postgrestools/backend-jsonrpc
         run: bun run build
-      - name: Run JS tests
+      - name: Run backend-jsonrpc test
         working-directory: packages/@postgrestools/backend-jsonrpc
         run: bun run test
+      - name: Run cli test
+        working-directory: packages/@postgrestools/postgrestools
+        run: bun run test
 
   codegen:
     name: Check Codegen
@@ -233,6 +244,8 @@ jobs:
           cache-base: main
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install tree-sitter-cli
+        run: cargo install tree-sitter-cli
       - name: Ensure RustFMT on nightly toolchain
         run: rustup component add rustfmt --toolchain nightly
       - name: echo toolchain

.gitignore

@@ -26,3 +26,8 @@ node_modules/
 .claude-session-id
 
 squawk/
+
+# Auto generated treesitter files
+crates/pgt_treesitter_grammar/src/grammar.json
+crates/pgt_treesitter_grammar/src/node-types.json
+crates/pgt_treesitter_grammar/src/parser.c

.sqlx/query-66d92238c94b5f1c99fbf068a0b5cf4c296b594fe9e6cebbdc382acde73f4fb9.json renamed to .sqlx/query-2b27b190ecaed2d961577fcaaf5875a1842ca09da63a7fe68996409e21e7f779.json

@@ -69,7 +69,7 @@ pgt_console                = { path = "./crates/pgt_console", version = "0.0.0"
 pgt_diagnostics            = { path = "./crates/pgt_diagnostics", version = "0.0.0" }
 pgt_diagnostics_categories = { path = "./crates/pgt_diagnostics_categories", version = "0.0.0" }
 pgt_diagnostics_macros     = { path = "./crates/pgt_diagnostics_macros", version = "0.0.0" }
-pgt_flags                  = { path = "./crates/pgt_flags", version = "0.0.0" }
+pgt_env                    = { path = "./crates/pgt_env", version = "0.0.0" }
 pgt_fs                     = { path = "./crates/pgt_fs", version = "0.0.0" }
 pgt_hover                  = { path = "./crates/pgt_hover", version = "0.0.0" }
 pgt_lexer                  = { path = "./crates/pgt_lexer", version = "0.0.0" }

Cargo.lock

@@ -24,7 +24,7 @@ pgt_analyse              = { workspace = true }
 pgt_configuration        = { workspace = true }
 pgt_console              = { workspace = true }
 pgt_diagnostics          = { workspace = true }
-pgt_flags                = { workspace = true }
+pgt_env                  = { workspace = true }
 pgt_fs                   = { workspace = true }
 pgt_lsp                  = { workspace = true }
 pgt_text_edit            = { workspace = true }

Cargo.toml

@@ -1,6 +1,6 @@
 use crate::commands::daemon::default_pgt_log_path;
 use crate::{CliDiagnostic, CliSession};
-use pgt_flags::pgt_env;
+use pgt_env::pgt_env;
 use std::fs::{create_dir, remove_dir_all};
 use std::path::PathBuf;
 

crates/pgt_cli/Cargo.toml

@@ -10,7 +10,6 @@ use commands::check::CheckCommandPayload;
 use pgt_console::{ColorMode, Console};
 use pgt_fs::OsFileSystem;
 use pgt_workspace::{App, DynRef, Workspace, WorkspaceRef};
-use std::env;
 
 mod changed;
 mod cli_options;
@@ -32,10 +31,7 @@ pub use panic::setup_panic_handler;
 pub use reporter::{DiagnosticsPayload, Reporter, ReporterVisitor, TraversalSummary};
 pub use service::{SocketTransport, open_transport};
 
-pub(crate) const VERSION: &str = match option_env!("PGT_VERSION") {
-    Some(version) => version,
-    None => env!("CARGO_PKG_VERSION"),
-};
+pub(crate) use pgt_env::VERSION;
 
 /// Global context for an execution of the CLI
 pub struct CliSession<'app> {