Update dependencies in compiler-rs (#2878) (#2880)

Author: swallez

compiler-rs/Cargo.lock

@@ -7,6 +7,30 @@ members = [
     "compiler-wasm-lib",
 ]
 
+[workspace.dependencies]
+anyhow = "1"
+arcstr = "1"
+clap = "4"
+console_error_panic_hook = "0.1"
+convert_case = "0.6"
+derive_more = "1.0.0-beta.6"
+either_n = "0.2"
+icu_segmenter = "1"
+indexmap = "2"
+maplit = "1"
+once_cell = "1.16"
+openapiv3 = "2"
+quantiles = "0.7"
+serde = "1"
+serde_ignored = "0.1"
+serde_json = "1"
+serde_path_to_error = "0.1"
+testresult = "0.4"
+tracing = "0.1"
+tracing-subscriber = "0.3"
+wasm-bindgen = "0.2"
+wasm-bindgen-test = "0.3"
+
 [profile.release]
 lto = true
 # Tell `rustc` to optimize for small code size.

compiler-rs/Cargo.toml

@@ -5,17 +5,17 @@ edition = "2021"
 publish = false
 
 [dependencies]
-derive_more = { version = "1.0.0-beta.6", features = ["from"] }
-serde = { version = "1.0", features=["derive", 'rc']}
-serde_json = "1.0"
-typed-builder = "0.11"
-once_cell = "1.16"
-anyhow = "1.0"
-indexmap = { version="1.9.3", features = ["serde"] }
+derive_more = { workspace = true, features = ["from"] }
+serde = { workspace = true, features = ["derive", "rc"] }
+serde_json = { workspace = true }
+once_cell = { workspace = true }
+anyhow = { workspace = true }
+indexmap = { workspace = true, features = ["serde"] }
 
-arcstr = { version = "1.1.5", features = ["serde", "substr"] }
+arcstr = { workspace = true, features = ["serde", "substr"] }
+clap = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-serde_path_to_error = "0.1"
-serde_ignored = "0.1"
-testresult = "0.3.0"
+serde_path_to_error = { workspace = true }
+serde_ignored = { workspace = true }
+testresult = { workspace = true }

compiler-rs/clients_schema/Cargo.toml

@@ -0,0 +1,82 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+use std::path::{Path, PathBuf};
+
+use clap::Parser;
+
+use clients_schema::{Availabilities, Flavor, Visibility};
+
+fn main() -> anyhow::Result<()> {
+    let cli = Cli::parse();
+
+    cli.run()?;
+
+    Ok(())
+}
+
+impl Cli {
+    fn run(self) -> anyhow::Result<()> {
+        let json = if self.schema == Path::new("-") {
+            std::io::read_to_string(std::io::stdin())?
+        } else {
+            std::fs::read_to_string(self.schema)?
+        };
+
+        let mut schema = clients_schema::IndexedModel::from_reader(json.as_bytes())?;
+
+        let filter: fn(&Option<Availabilities>) -> bool = match self.flavor {
+            Flavor::Stack => |a| {
+                Flavor::Stack.available(a)
+            },
+            Flavor::Serverless => |a| {
+                Flavor::Serverless.visibility(a) == Some(Visibility::Public)
+            }
+        };
+
+        schema = clients_schema::transform::filter_availability(schema, filter)?;
+
+        let output: Box<dyn std::io::Write> = {
+            if let Some(output) = self.output {
+                if output == Path::new("-") {
+                    Box::new(std::io::stdout())
+                } else {
+                    Box::new(std::fs::File::create(output)?)
+                }
+            } else {
+                Box::new(std::io::stdout())
+            }
+        };
+        let output = std::io::BufWriter::new(output);
+        serde_json::to_writer_pretty(output, &schema).expect("TODO: panic message");
+
+        Ok(())
+    }
+}
+
+
+#[derive(Debug, Parser)]
+#[command(author, version, about, long_about)]
+pub struct Cli {
+    /// input schema file, eg: ../output/schema/schema-no-generics.json
+    schema: PathBuf,
+    /// filter flavor, eg: stack
+    flavor: Flavor,
+    /// default is stdout
+    #[arg(long)]
+    output: Option<PathBuf>,
+}

compiler-rs/clients_schema/src/bin/filter_by_availability.rs

@@ -0,0 +1,69 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+use std::path::{Path, PathBuf};
+
+use clap::Parser;
+
+use clients_schema::transform::ExpandConfig;
+
+fn main() -> anyhow::Result<()> {
+    let cli = Cli::parse();
+
+    cli.run()?;
+
+    Ok(())
+}
+
+impl Cli {
+    fn run(self) -> anyhow::Result<()> {
+        let json = if self.schema == Path::new("-") {
+            std::io::read_to_string(std::io::stdin())?
+        } else {
+            std::fs::read_to_string(self.schema)?
+        };
+
+        let mut schema = clients_schema::IndexedModel::from_reader(json.as_bytes())?;
+        schema = clients_schema::transform::expand_generics(schema, ExpandConfig::default())?;
+
+        let output: Box<dyn std::io::Write> = {
+            if let Some(output) = self.output {
+                if output == Path::new("-") {
+                    Box::new(std::io::stdout())
+                } else {
+                    Box::new(std::fs::File::create(output)?)
+                }
+            } else {
+                Box::new(std::io::stdout())
+            }
+        };
+        let output = std::io::BufWriter::new(output);
+        serde_json::to_writer_pretty(output, &schema).expect("TODO: panic message");
+
+        Ok(())
+    }
+}
+
+
+#[derive(Debug, Parser)]
+#[command(author, version, about, long_about = None)]
+pub struct Cli {
+    /// input schema file, eg: ../output/schema/schema-no-generics.json
+    schema: PathBuf,
+    /// default is stdout
+    output: Option<PathBuf>,
+}

compiler-rs/clients_schema/src/bin/transform_expand_generics.rs

@@ -20,8 +20,11 @@ use std::fmt::{Debug, Display, Formatter};
 use anyhow::anyhow;
 use derive_more::From;
 use indexmap::IndexMap;
+
 // Re-export crates whose types we expose publicly
-pub use once_cell;
+pub use ::once_cell;
+pub use ::indexmap;
+pub use ::anyhow;
 
 // Child modules
 pub mod builtins;
@@ -50,7 +53,6 @@ pub trait Documented {
     fn doc_url(&self) -> Option<&str>;
     fn doc_id(&self) -> Option<&str>;
     fn description(&self) -> Option<&str>;
-    fn since(&self) -> Option<&str>;
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -241,7 +243,7 @@ pub struct Deprecation {
 }
 
 /// An API flavor
-#[derive(Debug, Clone, Serialize, Deserialize, Hash, PartialEq, Eq)]
+#[derive(Debug, Clone, Serialize, Deserialize, Hash, PartialEq, Eq, clap::ValueEnum)]
 #[serde(rename_all = "snake_case")]
 pub enum Flavor {
     Stack,
@@ -252,9 +254,9 @@ pub enum Flavor {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Availability {
-    since: Option<String>,
-    stability: Option<Stability>,
-    visibility: Option<Visibility>,
+    pub since: Option<String>,
+    pub stability: Option<Stability>,
+    pub visibility: Option<Visibility>,
 }
 
 /// The availability of an
@@ -312,9 +314,6 @@ pub struct Property {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub doc_id: Option<String>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub since: Option<String>,
-
     #[serde(skip_serializing_if = "Option::is_none")]
     pub server_default: Option<ServerDefault>,
 
@@ -324,9 +323,6 @@ pub struct Property {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub availability: Option<Availabilities>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub stability: Option<Stability>,
-
     /// If specified takes precedence over `name` when generating code. `name` is always the value
     /// to be sent over the wire
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -357,10 +353,6 @@ impl Documented for Property {
     fn description(&self) -> Option<&str> {
         self.description.as_deref()
     }
-
-    fn since(&self) -> Option<&str> {
-        self.since.as_deref()
-    }
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -536,10 +528,6 @@ impl Documented for BaseType {
     fn description(&self) -> Option<&str> {
         self.description.as_deref()
     }
-
-    fn since(&self) -> Option<&str> {
-        None
-    }
 }
 
 trait WithBaseType {
@@ -558,10 +546,6 @@ impl<T: WithBaseType> Documented for T {
     fn description(&self) -> Option<&str> {
         self.base().description()
     }
-
-    fn since(&self) -> Option<&str> {
-        self.base().since()
-    }
 }
 
 /// An interface type
@@ -843,20 +827,6 @@ pub struct Endpoint {
 
     pub urls: Vec<UrlTemplate>,
 
-    /// The version when this endpoint reached its current stability level.
-    /// Missing data means "forever", i.e. before any of the target client versions produced from this spec.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub since: Option<String>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub stability: Option<Stability>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub visibility: Option<Visibility>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub feature_flag: Option<String>,
-
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub request_media_type: Vec<String>,
 
@@ -879,10 +849,6 @@ impl Documented for Endpoint {
     fn description(&self) -> Option<&str> {
         Some(self.description.as_str())
     }
-
-    fn since(&self) -> Option<&str> {
-        self.since.as_deref()
-    }
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

compiler-rs/clients_schema/src/lib.rs

@@ -7,21 +7,14 @@ publish = false
 [dependencies]
 clients_schema = {path="../clients_schema"}
 
-serde = {version = "1.0", features=["derive"]}
-serde_json = "1.0"
-serde_path_to_error = "0.1"
-serde_ignored = "0.1"
-icu_segmenter = "1.5.0"
-openapiv3 = "1.0"
-anyhow = "1.0"
-indexmap = "1.9"
-convert_case = "0.6"
-either_n = "0.2.0"
-maplit = "1.0"
+serde_json = { workspace = true }
+serde_ignored = { workspace = true }
+icu_segmenter = { workspace = true }
+openapiv3 = { workspace = true }
+anyhow = { workspace = true }
+indexmap = { workspace = true }
 
-tracing = "0.1.37"
-tracing-subscriber = "0.3.16"
-clap = { version = "4.4.2", features = ["derive"] }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+clap = { workspace = true, features = ["derive"] }
 
-
-quantiles = "0.7.1"