refactor(cli): greatly reduce the public api

Author: gadomski

cli/Cargo.toml

@@ -15,18 +15,13 @@ rust-version = "1.75"
 default = ["gdal", "geoparquet", "pgstac"]
 duckdb = ["dep:stac-duckdb", "dep:duckdb"]
 gdal = ["stac/gdal"]
-geoparquet = [
-    "dep:bytes",
-    "dep:geoarrow",
-    "stac/geoparquet-compression",
-    "parquet",
-]
+geoparquet = ["dep:geoarrow", "stac/geoparquet-compression", "parquet"]
 pgstac = ["stac-server/pgstac"]
 python = ["dep:pyo3", "pgstac", "geoparquet"]
 
 [dependencies]
 axum = "0.7"
-bytes = { version = "1", optional = true }
+bytes = { version = "1" }
 clap = { version = "4", features = ["derive"] }
 duckdb = { version = "1", optional = true }                                      # We have this dependency only to allow us to bundle it
 geoarrow = { version = "0.3", optional = true }

cli/src/args/item.rs

@@ -6,7 +6,7 @@ use tokio::sync::mpsc::Sender;
 
 /// Arguments for the `item` subcommand.
 #[derive(clap::Args, Debug)]
-pub struct Args {
+pub(crate) struct Args {
     /// The item id or asset href
     pub(crate) id_or_href: String,
 

cli/src/args/items.rs

@@ -4,7 +4,7 @@ use tokio::{sync::mpsc::Sender, task::JoinSet};
 
 /// Arguments for the `items` subcommand.
 #[derive(clap::Args, Debug)]
-pub struct Args {
+pub(crate) struct Args {
     /// The asset hrefs
     hrefs: Vec<String>,
 

cli/src/args/migrate.rs

@@ -5,7 +5,7 @@ use tokio::sync::mpsc::Sender;
 
 /// Arguments for the `migrate` subcommand.
 #[derive(clap::Args, Debug)]
-pub struct Args {
+pub(crate) struct Args {
     /// The input file, if not provided or `-` the input will be read from standard input
     infile: Option<String>,
 

cli/src/args/mod.rs

@@ -10,7 +10,7 @@ mod serve;
 mod translate;
 mod validate;
 
-use crate::{Entry, Input, Output, Result, Value};
+use crate::{config::Entry, input::Input, output::Output, Result, Value};
 use clap::Parser;
 use tokio::sync::mpsc::Sender;
 use tokio::task::JoinHandle;
@@ -35,10 +35,14 @@ pub struct Args {
     #[arg(short, long, global = true)]
     output_format: Option<crate::output::Format>,
 
-    /// key=value pairs to use for the input object store
+    /// key=value pairs to use for the output object store
     #[arg(short = 'c', long)]
     output_config: Vec<Entry>,
 
+    /// If the output is a local file, create its parent directories before creating the file
+    #[arg(long, default_value_t = true)]
+    create_parent_directories: bool,
+
     /// Stream the items to output as ndjson, default behavior is to return them all at the end of the operation
     #[arg(short, long)]
     stream: bool,
@@ -69,10 +73,10 @@ pub struct Args {
     subcommand: Subcommand,
 }
 
-/// A sucommand.
+/// A subcommand.
 #[derive(Debug, clap::Subcommand)]
 #[allow(clippy::large_enum_variant)]
-pub enum Subcommand {
+enum Subcommand {
     /// Create a STAC Item from an id or the href to an asset
     Item(item::Args),
 
@@ -137,7 +141,9 @@ impl Args {
                 }
             }),
             self.output_config,
-        )?;
+            self.create_parent_directories,
+        )
+        .await?;
         let value = if self.stream {
             if output.format != crate::output::Format::NdJson {
                 tracing::warn!(

cli/src/args/search.rs

@@ -9,7 +9,7 @@ use tokio_stream::StreamExt;
 use tracing::info;
 
 #[derive(Debug, clap::Args)]
-pub struct Args {
+pub(crate) struct Args {
     /// The href of the STAC API or the stac-geoparquet file to search
     #[cfg(feature = "duckdb")]
     href: String,

cli/src/args/serve.rs

@@ -10,7 +10,7 @@ const DEFAULT_COLLECTION_ID: &str = "auto-generated-collection";
 
 /// Arguments for serving an API.
 #[derive(Debug, clap::Args)]
-pub struct Args {
+pub(crate) struct Args {
     /// Hrefs of collections, items, and item collections to load into the server on start
     ///
     /// If this is a single `-`, the data will be read from standard input.

cli/src/args/translate.rs

@@ -4,7 +4,7 @@ use tokio::sync::mpsc::Sender;
 
 /// Arguments for the `translate` subcommand.
 #[derive(clap::Args, Debug)]
-pub struct Args {
+pub(crate) struct Args {
     /// The input file, if not provided or `-` the input will be read from standard input
     infile: Option<String>,
 

cli/src/args/validate.rs

@@ -5,7 +5,7 @@ use tokio::sync::mpsc::Sender;
 
 /// Arguments for the `validate` subcommand.
 #[derive(clap::Args, Debug)]
-pub struct Args {
+pub(crate) struct Args {
     /// The input file, if not provided or `-` the input will be read from standard input
     infile: Option<String>,
 

cli/src/config.rs

@@ -1,19 +1,19 @@
 use std::{convert::Infallible, str::FromStr};
 
 /// A collection of configuration entries.
-#[derive(Clone, Debug)]
-pub struct Config(Vec<Entry>);
+#[derive(Clone, Debug, Default)]
+pub(crate) struct Config(Vec<Entry>);
 
-/// key=value pairs for object store configuration
+/// `key=value`` pairs for object store configuration
 #[derive(Clone, Debug)]
-pub struct Entry {
+pub(crate) struct Entry {
     key: String,
     value: String,
 }
 
 impl Config {
     /// Returns an iterator over this config's key value pairs.
-    pub fn iter(&self) -> impl Iterator<Item = (&str, &str)> {
+    pub(crate) fn iter(&self) -> impl Iterator<Item = (&str, &str)> {
         self.0
             .iter()
             .map(|entry| (entry.key.as_str(), entry.value.as_str()))