squawk-cli 2.32.0__tar.gz → 2.33.0__tar.gz

{squawk_cli-2.32.0 → squawk_cli-2.33.0}/Cargo.lock

@@ -966,6 +966,12 @@ dependencies = [
  "simple_asn1",
 ]
 
+[[package]]
+name = "la-arena"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306"
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -1831,7 +1837,7 @@ dependencies = [
 
 [[package]]
 name = "squawk"
-version = "2.32.0"
+version = "2.33.0"
 dependencies = [
  "annotate-snippets",
  "anyhow",
@@ -1860,7 +1866,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-github"
-version = "2.32.0"
+version = "2.33.0"
 dependencies = [
  "jsonwebtoken",
  "log",
@@ -1871,27 +1877,29 @@ dependencies = [
 
 [[package]]
 name = "squawk-ide"
-version = "2.32.0"
+version = "2.33.0"
 dependencies = [
  "annotate-snippets",
  "insta",
+ "la-arena",
  "line-index",
  "log",
  "rowan",
+ "smol_str",
  "squawk-linter",
  "squawk-syntax",
 ]
 
 [[package]]
 name = "squawk-lexer"
-version = "2.32.0"
+version = "2.33.0"
 dependencies = [
  "insta",
 ]
 
 [[package]]
 name = "squawk-linter"
-version = "2.32.0"
+version = "2.33.0"
 dependencies = [
  "enum-iterator",
  "insta",
@@ -1905,7 +1913,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-parser"
-version = "2.32.0"
+version = "2.33.0"
 dependencies = [
  "camino",
  "dir-test",
@@ -1918,7 +1926,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-server"
-version = "2.32.0"
+version = "2.33.0"
 dependencies = [
  "anyhow",
  "insta",
@@ -1938,7 +1946,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-syntax"
-version = "2.32.0"
+version = "2.33.0"
 dependencies = [
  "camino",
  "dir-test",
@@ -1950,7 +1958,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-wasm"
-version = "2.32.0"
+version = "2.33.0"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -2767,7 +2775,7 @@ checksum = "32ac00cd3f8ec9c1d33fb3e7958a82df6989c42d747bd326c822b1d625283547"
 
 [[package]]
 name = "xtask"
-version = "2.32.0"
+version = "2.33.0"
 dependencies = [
  "anyhow",
  "camino",

{squawk_cli-2.32.0 → squawk_cli-2.33.0}/Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "2.32.0"
+version = "2.33.0"
 edition = "2024"
 rust-version = "1.90.0"
 authors = ["Squawk Team & Contributors"]
@@ -23,6 +23,7 @@ jsonwebtoken = "9.3.1"
 lazy_static = "1.5.0"
 log = "0.4.25"
 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"
 serde_plain = "1.0"
@@ -59,13 +60,13 @@ snapbox = { version = "0.6.0", features = ["diff", "term-svg", "cmd"] }
 
 # local
 # we have to make the versions explicit otherwise `cargo publish` won't work
-squawk-github = { path = "./crates/squawk_github", version = "2.32.0" }
-squawk-ide = { path = "./crates/squawk_ide", version = "2.32.0" }
-squawk-lexer = { path = "./crates/squawk_lexer", version = "2.32.0" }
-squawk-parser = { path = "./crates/squawk_parser", version = "2.32.0" }
-squawk-syntax = { path = "./crates/squawk_syntax", version = "2.32.0" }
-squawk-linter = { path = "./crates/squawk_linter", version = "2.32.0" }
-squawk-server = { path = "./crates/squawk_server", version = "2.32.0" }
+squawk-github = { path = "./crates/squawk_github", version = "2.33.0" }
+squawk-ide = { path = "./crates/squawk_ide", version = "2.33.0" }
+squawk-lexer = { path = "./crates/squawk_lexer", version = "2.33.0" }
+squawk-parser = { path = "./crates/squawk_parser", version = "2.33.0" }
+squawk-syntax = { path = "./crates/squawk_syntax", version = "2.33.0" }
+squawk-linter = { path = "./crates/squawk_linter", version = "2.33.0" }
+squawk-server = { path = "./crates/squawk_server", version = "2.33.0" }
 
 [workspace.lints.clippy]
 collapsible_else_if = "allow"

{squawk_cli-2.32.0 → squawk_cli-2.33.0}/PKG-INFO

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

{squawk_cli-2.32.0 → squawk_cli-2.33.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.32.0";
+pub(crate) const SQUAWK_USER_AGENT: &str = "squawk/2.33.0";
 
 #[derive(Debug, Serialize)]
 struct CommentBody {

{squawk_cli-2.32.0 → squawk_cli-2.33.0}/crates/squawk_ide/Cargo.toml

@@ -18,6 +18,8 @@ rowan.workspace = true
 line-index.workspace = true
 annotate-snippets.workspace = true
 log.workspace = true
+smol_str.workspace = true
+la-arena.workspace = true
 
 [dev-dependencies]
 insta.workspace = true

squawk_cli-2.33.0/crates/squawk_ide/src/binder.rs

@@ -0,0 +1,115 @@
+/// Loosely based on TypeScript's binder
+/// see: typescript-go/internal/binder/binder.go
+use la_arena::Arena;
+use squawk_syntax::{SyntaxNodePtr, ast, ast::AstNode};
+
+use crate::scope::{Scope, ScopeId};
+use crate::symbols::{Name, Schema, Symbol, SymbolKind};
+
+pub(crate) struct Binder {
+    pub(crate) scopes: Arena<Scope>,
+    pub(crate) symbols: Arena<Symbol>,
+}
+
+impl Binder {
+    fn new() -> Self {
+        let mut scopes = Arena::new();
+        let _root_scope = scopes.alloc(Scope::with_parent(None));
+        Binder {
+            scopes,
+            symbols: Arena::new(),
+        }
+    }
+
+    pub(crate) fn root_scope(&self) -> ScopeId {
+        self.scopes
+            .iter()
+            .next()
+            .map(|(id, _)| id)
+            .expect("root scope must exist")
+    }
+}
+
+pub(crate) fn bind(file: &ast::SourceFile) -> Binder {
+    let mut binder = Binder::new();
+
+    bind_file(&mut binder, file);
+
+    binder
+}
+
+fn bind_file(b: &mut Binder, file: &ast::SourceFile) {
+    for stmt in file.stmts() {
+        bind_stmt(b, stmt);
+    }
+}
+
+fn bind_stmt(b: &mut Binder, stmt: ast::Stmt) {
+    if let ast::Stmt::CreateTable(create_table) = stmt {
+        bind_create_table(b, create_table)
+    }
+}
+
+fn bind_create_table(b: &mut Binder, create_table: ast::CreateTable) {
+    let Some(path) = create_table.path() else {
+        return;
+    };
+    let Some(table_name) = item_name(&path) else {
+        return;
+    };
+    let name_ptr = path_to_ptr(&path);
+    let is_temp = create_table.temp_token().is_some() || create_table.temporary_token().is_some();
+    let schema = schema_name(&path, is_temp);
+
+    let table_id = b.symbols.alloc(Symbol {
+        kind: SymbolKind::Table,
+        ptr: name_ptr,
+        schema,
+    });
+
+    let root = b.root_scope();
+    b.scopes[root].insert(table_name, table_id);
+}
+
+fn item_name(path: &ast::Path) -> Option<Name> {
+    let segment = path.segment()?;
+
+    if let Some(name) = segment.name() {
+        return Some(Name::new(name.syntax().text().to_string()));
+    }
+    if let Some(name) = segment.name_ref() {
+        return Some(Name::new(name.syntax().text().to_string()));
+    }
+
+    None
+}
+
+fn path_to_ptr(path: &ast::Path) -> SyntaxNodePtr {
+    if let Some(segment) = path.segment() {
+        if let Some(name) = segment.name() {
+            return SyntaxNodePtr::new(name.syntax());
+        }
+        if let Some(name_ref) = segment.name_ref() {
+            return SyntaxNodePtr::new(name_ref.syntax());
+        }
+    }
+    SyntaxNodePtr::new(path.syntax())
+}
+
+fn schema_name(path: &ast::Path, is_temp: bool) -> Schema {
+    let default_schema = if is_temp { "pg_temp" } else { "public" };
+
+    let Some(segment) = path.qualifier().and_then(|q| q.segment()) else {
+        return Schema::new(default_schema);
+    };
+
+    let schema_name = if let Some(name) = segment.name() {
+        Name::new(name.syntax().text().to_string())
+    } else if let Some(name_ref) = segment.name_ref() {
+        Name::new(name_ref.syntax().text().to_string())
+    } else {
+        return Schema::new(default_schema);
+    };
+
+    Schema(schema_name)
+}