initial

Author: psteinroe

Cargo.lock

@@ -14,36 +14,29 @@ rust-version = "1.86.0"
 
 [workspace.dependencies]
 # supporting crates unrelated to postgres
-anyhow                   = "1.0.92"
-biome_deserialize        = "0.6.0"
-biome_deserialize_macros = "0.6.0"
-biome_js_factory         = "0.5.7"
-biome_js_formatter       = "0.5.7"
-biome_js_syntax          = "0.5.7"
-biome_rowan              = "0.5.7"
-biome_string_case        = "0.5.8"
-bpaf                     = { version = "0.9.15", features = ["derive"] }
-criterion                = "0.5"
-crossbeam                = "0.8.4"
-enumflags2               = "0.7.11"
-ignore                   = "0.4.23"
-indexmap                 = { version = "2.6.0", features = ["serde"] }
-insta                    = "1.31.0"
-json-strip-comments      = "3.1.0"
-oxc_resolver             = "1.12.0"
-pg_query                 = "6.1.0"
-proc-macro2              = "1.0.66"
-quote                    = "1.0.33"
-rayon                    = "1.10.0"
-regex                    = "1.11.1"
-rustc-hash               = "2.0.0"
-schemars                 = { version = "0.8.22", features = ["indexmap2", "smallvec"] }
-serde                    = { version = "1.0.195", features = ["rc"] }
-serde_json               = "1.0.114"
-similar                  = "2.6.0"
-slotmap                  = "1.0.7"
-smallvec                 = { version = "1.13.2", features = ["union", "const_new", "serde"] }
-strum                    = { version = "0.27.1", features = ["derive"] }
+anyhow              = "1.0.92"
+bpaf                = { version = "0.9.15", features = ["derive"] }
+criterion           = "0.5"
+crossbeam           = "0.8.4"
+enumflags2          = "0.7.11"
+ignore              = "0.4.23"
+indexmap            = { version = "2.6.0", features = ["serde"] }
+insta               = "1.31.0"
+json-strip-comments = "3.1.0"
+oxc_resolver        = "1.12.0"
+pg_query            = "6.1.0"
+proc-macro2         = "1.0.66"
+quote               = "1.0.33"
+rayon               = "1.10.0"
+regex               = "1.11.1"
+rustc-hash          = "2.0.0"
+schemars            = { version = "0.8.22", features = ["indexmap2", "smallvec"] }
+serde               = { version = "1.0.195", features = ["rc"] }
+serde_json          = "1.0.114"
+similar             = "2.6.0"
+slotmap             = "1.0.7"
+smallvec            = { version = "1.13.2", features = ["union", "const_new", "serde"] }
+strum               = { version = "0.27.1", features = ["derive"] }
 # this will use tokio if available, otherwise async-std
 camino                   = "1.1.9"
 convert_case             = "0.6.0"
@@ -69,6 +62,7 @@ pgls_analyser               = { path = "./crates/pgls_analyser", version = "0.0.
 pgls_cli                    = { path = "./crates/pgls_cli", version = "0.0.0" }
 pgls_completions            = { path = "./crates/pgls_completions", version = "0.0.0" }
 pgls_configuration          = { path = "./crates/pgls_configuration", version = "0.0.0" }
+pgls_configuration_macros   = { path = "./crates/pgls_configuration_macros" }
 pgls_console                = { path = "./crates/pgls_console", version = "0.0.0" }
 pgls_diagnostics            = { path = "./crates/pgls_diagnostics", version = "0.0.0" }
 pgls_diagnostics_categories = { path = "./crates/pgls_diagnostics_categories", version = "0.0.0" }

Cargo.toml

@@ -19,13 +19,11 @@ pgls_query.workspace       = true
 pgls_schema_cache          = { workspace = true, default-features = false }
 rustc-hash                 = { workspace = true }
 
-biome_deserialize        = { workspace = true, optional = true }
-biome_deserialize_macros = { workspace = true, optional = true }
 enumflags2.workspace     = true
 pgls_text_size.workspace = true
 schemars                 = { workspace = true, optional = true }
 serde                    = { workspace = true, features = ["derive"], optional = true }
 
 [features]
 schema = ["dep:schemars"]
-serde  = ["dep:serde", "dep:biome_deserialize", "dep:biome_deserialize_macros"]
+serde  = ["dep:serde"]

crates/pgls_analyse/Cargo.toml

@@ -13,8 +13,6 @@ version              = "0.0.0"
 
 [dependencies]
 anyhow                   = { workspace = true }
-biome_deserialize        = { workspace = true }
-biome_deserialize_macros = { workspace = true }
 bpaf                     = { workspace = true, features = ["bright-color"] }
 crossbeam                = { workspace = true }
 dashmap                  = "5.5.3"

crates/pgls_cli/Cargo.toml

@@ -4,10 +4,10 @@
 //! to parse commands and arguments, redirect the execution of the commands and
 //! execute the traversal of directory and files, based on the command that was passed.
 
-use biome_deserialize::Merge;
 use cli_options::CliOptions;
 use commands::check::{self, CheckArgs};
 use commands::format::{self, FormatArgs};
+use pgls_configuration::Merge;
 use pgls_configuration::PartialConfiguration;
 use pgls_console::{ColorMode, Console, ConsoleExt, markup};
 use pgls_fs::{ConfigName, FileSystem, OsFileSystem};

crates/pgls_cli/src/lib.rs

@@ -12,23 +12,22 @@ version              = "0.0.0"
 
 
 [dependencies]
-biome_deserialize        = { workspace = true, features = ["schema"] }
-biome_deserialize_macros = { workspace = true }
-bpaf                     = { workspace = true }
-indexmap                 = { workspace = true }
-oxc_resolver             = { workspace = true }
-pgls_analyse             = { workspace = true }
-pgls_analyser            = { workspace = true }
-pgls_console             = { workspace = true }
-pgls_diagnostics         = { workspace = true }
-pgls_env                 = { workspace = true }
-pgls_matcher             = { workspace = true }
-pgls_pretty_print        = { workspace = true }
-pgls_text_size           = { workspace = true }
-rustc-hash               = { workspace = true }
-schemars                 = { workspace = true, features = ["indexmap1"], optional = true }
-serde                    = { workspace = true, features = ["derive"] }
-serde_json               = { workspace = true, features = ["raw_value"] }
+bpaf                      = { workspace = true }
+indexmap                  = { workspace = true }
+oxc_resolver              = { workspace = true }
+pgls_analyse              = { workspace = true }
+pgls_analyser             = { workspace = true }
+pgls_configuration_macros = { workspace = true }
+pgls_console              = { workspace = true }
+pgls_diagnostics          = { workspace = true }
+pgls_env                  = { workspace = true }
+pgls_matcher              = { workspace = true }
+pgls_pretty_print         = { workspace = true }
+pgls_text_size            = { workspace = true }
+rustc-hash                = { workspace = true }
+schemars                  = { workspace = true, features = ["indexmap1"], optional = true }
+serde                     = { workspace = true, features = ["derive"] }
+serde_json                = { workspace = true, features = ["raw_value"] }
 
 [lib]
 doctest = false

crates/pgls_configuration/Cargo.toml

@@ -1,6 +1,6 @@
-use biome_deserialize::StringSet;
-use biome_deserialize_macros::{Merge, Partial};
+use crate::StringSet;
 use bpaf::Bpaf;
+use pgls_configuration_macros::{Merge, Partial};
 use serde::{Deserialize, Serialize};
 
 /// The configuration of the database connection.

crates/pgls_configuration/src/database.rs

@@ -1,8 +1,8 @@
 use std::num::NonZeroU64;
 
-use biome_deserialize::StringSet;
-use biome_deserialize_macros::{Merge, Partial};
+use crate::StringSet;
 use bpaf::Bpaf;
+use pgls_configuration_macros::{Merge, Partial};
 use serde::{Deserialize, Serialize};
 
 /// Limit the size of files to 1.0 MiB by default

crates/pgls_configuration/src/files.rs

@@ -1,13 +1,11 @@
-use biome_deserialize::StringSet;
-use biome_deserialize_macros::{Deserializable, Merge, Partial};
+use crate::StringSet;
 use bpaf::Bpaf;
+use pgls_configuration_macros::{Merge, Partial};
 use serde::{Deserialize, Serialize};
 use std::str::FromStr;
 
 /// Indentation style for the formatter.
-#[derive(
-    Clone, Copy, Debug, Default, Deserialize, Deserializable, Eq, Merge, PartialEq, Serialize,
-)]
+#[derive(Clone, Copy, Debug, Default, Deserialize, Eq, Merge, PartialEq, Serialize)]
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[serde(rename_all = "camelCase")]
 pub enum IndentStyle {
@@ -40,9 +38,7 @@ impl From<IndentStyle> for pgls_pretty_print::renderer::IndentStyle {
 }
 
 /// Keyword casing style for the formatter.
-#[derive(
-    Clone, Copy, Debug, Default, Deserialize, Deserializable, Eq, Merge, PartialEq, Serialize,
-)]
+#[derive(Clone, Copy, Debug, Default, Deserialize, Eq, Merge, PartialEq, Serialize)]
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[serde(rename_all = "camelCase")]
 pub enum KeywordCase {

crates/pgls_configuration/src/format.rs

@@ -2,6 +2,10 @@
 //!
 //! The configuration is divided by "tool".
 
+// Allow the crate to reference itself by name, needed by pgls_configuration_macros
+// which generates `pgls_configuration::Merge` paths.
+extern crate self as pgls_configuration;
+
 pub mod database;
 pub mod diagnostics;
 pub mod files;
@@ -13,15 +17,17 @@ pub mod plpgsql_check;
 pub mod rules;
 pub mod splinter;
 pub mod typecheck;
+pub mod utils;
 pub mod vcs;
 
+pub use utils::merge::Merge;
+pub use utils::string_set::StringSet;
+
 pub use crate::diagnostics::ConfigurationDiagnostic;
 
 use std::path::PathBuf;
 
 use crate::vcs::{PartialVcsConfiguration, VcsConfiguration, partial_vcs_configuration};
-use biome_deserialize::StringSet;
-use biome_deserialize_macros::{Merge, Partial};
 use bpaf::Bpaf;
 use database::{
     DatabaseConfiguration, PartialDatabaseConfiguration, partial_database_configuration,
@@ -41,6 +47,7 @@ use migrations::{
 use pglinter::{
     PartialPglinterConfiguration, PglinterConfiguration, partial_pglinter_configuration,
 };
+use pgls_configuration_macros::{Merge, Partial};
 use pgls_env::PGLS_WEBSITE;
 use plpgsql_check::{
     PartialPlPgSqlCheckConfiguration, PlPgSqlCheckConfiguration,