Skip to content

Commit ecb556b

Browse files
psteinroeclaude
andcommitted
fix: address PR review feedback
Remove unnecessary indirection in generate_bindings and rename WasmSchemaTypes to SchemaTypes since it's not WASM-specific. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 6301285 commit ecb556b

6 files changed

Lines changed: 13 additions & 17 deletions

File tree

justfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ gen-lint:
2828
cargo run -p xtask_codegen -- analyser
2929
cargo run -p xtask_codegen -- configuration
3030
cargo run -p xtask_codegen -- bindings
31-
cargo run -p xtask_codegen -- wasm-schema-types
31+
cargo run -p xtask_codegen -- schema-types
3232
cargo run -p xtask_codegen -- splinter
3333
cargo run -p xtask_codegen -- pglinter
3434
cargo run -p rules_check
@@ -114,7 +114,7 @@ ready:
114114
cargo run -p xtask_codegen -- configuration
115115
cargo run -p docs_codegen
116116
cargo run -p xtask_codegen -- bindings
117-
cargo run -p xtask_codegen -- wasm-schema-types
117+
cargo run -p xtask_codegen -- schema-types
118118
cargo sqlx prepare --workspace
119119
just format # format after codegen, so we don't have staged changes before lint-fix
120120
just lint-fix

packages/@postgres-language-server/wasm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"scripts": {
4747
"build": "bun run build:wasm && bun run build:ts",
4848
"build:wasm": "../../../crates/pgls_wasm/build-wasm.sh --release && mkdir -p wasm && cp ../../../crates/pgls_wasm/dist/pgls.js ../../../crates/pgls_wasm/dist/pgls.wasm ./wasm/",
49-
"gen:schema-types": "cargo run -p xtask_codegen -- wasm-schema-types",
49+
"gen:schema-types": "cargo run -p xtask_codegen -- schema-types",
5050
"build:ts": "bun run gen:schema-types && tsc -p tsconfig.build.json && cp src/schema-cache.d.ts dist/schema-cache.d.ts && cp wasm/pgls.wasm wasm/pgls.js dist/",
5151
"build:types": "bun run gen:schema-types && tsc --declaration --emitDeclarationOnly --outDir dist && cp src/schema-cache.d.ts dist/schema-cache.d.ts",
5252
"test": "bun test",

xtask/codegen/src/generate_bindings.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ use convert_case::{Case, Casing};
44
use pgls_workspace::workspace_types::{generate_type, methods, ModuleQueue};
55
use xtask::{project_root, Mode, Result};
66

7-
pub fn generate_bindings(mode: Mode) -> Result<()> {
8-
generate_workspace_bindings(&mode)
9-
}
10-
11-
fn generate_workspace_bindings(mode: &Mode) -> Result<()> {
7+
pub fn generate_bindings(mode: &Mode) -> Result<()> {
128
let bindings_path_postgrestools =
139
project_root().join("packages/@postgrestools/backend-jsonrpc/src/workspace.ts");
1410
let bindings_path_postgres_language_server =

xtask/codegen/src/generate_wasm_schema_types.rs renamed to xtask/codegen/src/generate_schema_types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use pgls_workspace::workspace_types::{generate_type, ModuleQueue};
44
use schemars::r#gen::{SchemaGenerator, SchemaSettings};
55
use xtask::{project_root, Mode, Result};
66

7-
pub fn generate_wasm_schema_types(mode: Mode) -> Result<()> {
7+
pub fn generate_schema_types(mode: Mode) -> Result<()> {
88
let output_path =
99
project_root().join("packages/@postgres-language-server/wasm/src/schema-cache.d.ts");
1010

xtask/codegen/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ mod generate_crate;
99
mod generate_new_analyser_rule;
1010
mod generate_pglinter;
1111
mod generate_splinter;
12-
mod generate_wasm_schema_types;
12+
mod generate_schema_types;
1313

1414
pub use self::generate_analyser::generate_analyser;
1515
pub use self::generate_bindings::generate_bindings;
@@ -18,7 +18,7 @@ pub use self::generate_crate::generate_crate;
1818
pub use self::generate_new_analyser_rule::generate_new_analyser_rule;
1919
pub use self::generate_pglinter::generate_pglinter;
2020
pub use self::generate_splinter::generate_splinter;
21-
pub use self::generate_wasm_schema_types::generate_wasm_schema_types;
21+
pub use self::generate_schema_types::generate_schema_types;
2222
use bpaf::Bpaf;
2323
use generate_new_analyser_rule::Category;
2424
use pgls_diagnostics::Severity;
@@ -119,7 +119,7 @@ pub enum TaskCommand {
119119
/// Generate pglinter rules from pglinter_repo/sql/rules.sql
120120
#[bpaf(command)]
121121
Pglinter,
122-
/// Generate WASM schema cache TypeScript types
122+
/// Generate schema cache TypeScript types
123123
#[bpaf(command)]
124-
WasmSchemaTypes,
124+
SchemaTypes,
125125
}

xtask/codegen/src/main.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use xtask::{project_root, pushd, Result};
33

44
use xtask_codegen::{
55
generate_analyser, generate_bindings, generate_crate, generate_new_analyser_rule,
6-
generate_pglinter, generate_rules_configuration, generate_splinter, generate_wasm_schema_types,
6+
generate_pglinter, generate_rules_configuration, generate_schema_types, generate_splinter,
77
task_command, TaskCommand,
88
};
99

@@ -30,16 +30,16 @@ fn main() -> Result<()> {
3030
generate_rules_configuration(Overwrite)?;
3131
}
3232
TaskCommand::Bindings => {
33-
generate_bindings(Overwrite)?;
33+
generate_bindings(&Overwrite)?;
3434
}
3535
TaskCommand::Splinter => {
3636
generate_splinter()?;
3737
}
3838
TaskCommand::Pglinter => {
3939
generate_pglinter()?;
4040
}
41-
TaskCommand::WasmSchemaTypes => {
42-
generate_wasm_schema_types(Overwrite)?;
41+
TaskCommand::SchemaTypes => {
42+
generate_schema_types(Overwrite)?;
4343
}
4444
}
4545

0 commit comments

Comments
 (0)