fix: cargo clippy

Option has been removed as a wrapper around opts. This makes it much
more convenient to use

```rust
client.container_opts(Some(ContainerOpts{}))
// ->
client.container_opts(ContainerOpts{})
```

The same options are still available, either an empty object can be
passed, or a non _opts function can be used

Cargo.lock

@@ -352,6 +352,7 @@ version = "0.2.4"
 dependencies = [
  "base64",
  "dagger-core 0.2.2",
+ "derive_builder",
  "eyre",
  "futures",
  "genco",
@@ -363,6 +364,72 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "darling"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "derive_builder"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
+dependencies = [
+ "derive_builder_macro",
+]
+
+[[package]]
+name = "derive_builder_core"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "derive_builder_macro"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
+dependencies = [
+ "derive_builder_core",
+ "syn",
+]
+
 [[package]]
 name = "diff"
 version = "0.1.13"
@@ -839,6 +906,12 @@ dependencies = [
  "tokio-native-tls",
 ]
 
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
 [[package]]
 name = "idna"
 version = "0.3.0"

README.md

@@ -22,7 +22,7 @@ See [dagger-sdk](./crates/dagger-sdk/README.md)
   - [x] Deserializer for nested response (bind)
 - [x] Add codegen to hook into querier
 - [x] fix build / release cycle
-- [ ] general api stabilisation
+- [x] general api stabilisation
 - [x] document usage
 - [ ] make async variant
 

ci/src/main.rs

@@ -28,7 +28,7 @@ fn main() -> eyre::Result<()> {
     }
 }
 
-fn release(client: Arc<Query>, subm: &clap::ArgMatches) -> Result<(), color_eyre::Report> {
+fn release(client: Arc<Query>, _subm: &clap::ArgMatches) -> Result<(), color_eyre::Report> {
     let src_dir = client.host().directory(
         ".".into(),
         Some(HostDirectoryOpts {

crates/dagger-codegen/src/functions.rs

@@ -6,8 +6,8 @@ use eyre::ContextCompat;
 use crate::utility::OptionExt;
 
 pub trait FormatTypeFuncs {
-    fn format_kind_list(&self, representation: &str) -> String;
+    fn format_kind_list(&self, representation: &str, input: bool, immutable: bool) -> String;
-    fn format_kind_scalar_string(&self, representation: &str) -> String;
+    fn format_kind_scalar_string(&self, representation: &str, input: bool) -> String;
     fn format_kind_scalar_int(&self, representation: &str) -> String;
     fn format_kind_scalar_float(&self, representation: &str) -> String;
     fn format_kind_scalar_boolean(&self, representation: &str) -> String;
@@ -36,14 +36,18 @@ impl CommonFunctions {
     }
 
     pub fn format_input_type(&self, t: &TypeRef) -> String {
-        self.format_type(t, true)
+        self.format_type(t, true, false)
     }
 
     pub fn format_output_type(&self, t: &TypeRef) -> String {
-        self.format_type(t, false)
+        self.format_type(t, false, false)
     }
 
-    fn format_type(&self, t: &TypeRef, input: bool) -> String {
+    pub fn format_immutable_input_type(&self, t: &TypeRef) -> String {
+        self.format_type(t, true, true)
+    }
+
+    fn format_type(&self, t: &TypeRef, input: bool, immutable: bool) -> String {
         let mut representation = String::new();
         let mut r = Some(t.clone());
         while r.is_some() {
@@ -57,9 +61,14 @@ impl CommonFunctions {
                             Scalar::Float => self
                                 .format_type_funcs
                                 .format_kind_scalar_float(&mut representation),
-                            Scalar::String => self
+                            Scalar::String => {
-                                .format_type_funcs
+                                if immutable {
-                                .format_kind_scalar_string(&mut representation),
+                                    "&'a str".into()
+                                } else {
+                                    self.format_type_funcs
+                                        .format_kind_scalar_string(&mut representation, input)
+                                }
+                            }
                             Scalar::Boolean => self
                                 .format_type_funcs
                                 .format_kind_scalar_boolean(&mut representation),
@@ -87,12 +96,15 @@ impl CommonFunctions {
                                 .as_ref()
                                 .map(|t| t.clone())
                                 .map(|t| *t)
-                                .map(|t| self.format_type(&t, input))
+                                .map(|t| self.format_type(&t, input, immutable))
                                 .context("could not get inner type of list")
                                 .unwrap();
 
-                            representation =
+                            representation = self.format_type_funcs.format_kind_list(
-                                self.format_type_funcs.format_kind_list(&mut inner_type);
+                                &mut inner_type,
+                                input,
+                                immutable,
+                            );
 
                             return representation;
                         }

crates/dagger-codegen/src/rust/format.rs

@@ -5,13 +5,17 @@ use super::functions::format_name;
 pub struct FormatTypeFunc;
 
 impl FormatTypeFuncs for FormatTypeFunc {
-    fn format_kind_list(&self, representation: &str) -> String {
+    fn format_kind_list(&self, representation: &str, _input: bool, _immutable: bool) -> String {
         format!("Vec<{}>", representation)
     }
 
-    fn format_kind_scalar_string(&self, representation: &str) -> String {
+    fn format_kind_scalar_string(&self, representation: &str, input: bool) -> String {
         let mut rep = representation.to_string();
-        rep.push_str("String");
+        if input {
+            rep.push_str("impl Into<String>");
+        } else {
+            rep.push_str("String");
+        }
         rep
     }
 

crates/dagger-codegen/src/rust/functions.rs

@@ -5,8 +5,8 @@ use genco::quote;
 use genco::tokens::quoted;
 
 use crate::functions::{
-    type_field_has_optional, type_ref_is_list_of_objects, type_ref_is_object, type_ref_is_optional,
+    type_field_has_optional, type_ref_is_list, type_ref_is_list_of_objects, type_ref_is_object,
-    CommonFunctions,
+    type_ref_is_optional, type_ref_is_scalar, CommonFunctions, Scalar,
 };
 use crate::utility::OptionExt;
 
@@ -39,18 +39,44 @@ pub fn format_function(funcs: &CommonFunctions, field: &FullTypeFields) -> Optio
         .pipe(|t| &t.type_ref)
         .pipe(|t| render_output_type(funcs, t));
 
-    Some(quote! {
+    if let Some((args, true)) = args {
-        $(signature)(
+        let required_args = format_required_function_args(funcs, field);
-            $(args)
+        Some(quote! {
-        ) -> $(output_type) {
+            $(&signature)(
-            let mut query = self.selection.select($(quoted(field.name.as_ref())));
+                $(required_args)
+            ) -> $(output_type.as_ref()) {
+                let mut query = self.selection.select($(quoted(field.name.as_ref())));
 
-            $(render_required_args(funcs, field))
+                $(render_required_args(funcs, field))
-            $(render_optional_args(funcs, field))
 
-            $(render_execution(funcs, field))
+                $(render_execution(funcs, field))
-        }
+            }
-    })
+
+            $(&signature)_opts(
+                $args
+            ) -> $(output_type) {
+                let mut query = self.selection.select($(quoted(field.name.as_ref())));
+
+                $(render_required_args(funcs, field))
+                $(render_optional_args(funcs, field))
+
+                $(render_execution(funcs, field))
+            }
+        })
+    } else {
+        Some(quote! {
+            $(signature)(
+                $(if let Some((args, _)) = args => $args)
+            ) -> $(output_type) {
+                let mut query = self.selection.select($(quoted(field.name.as_ref())));
+
+                $(render_required_args(funcs, field))
+                $(render_optional_args(funcs, field))
+
+                $(render_execution(funcs, field))
+            }
+        })
+    }
 }
 
 fn render_required_args(_funcs: &CommonFunctions, field: &FullTypeFields) -> Option<rust::Tokens> {
@@ -66,6 +92,40 @@ fn render_required_args(_funcs: &CommonFunctions, field: &FullTypeFields) -> Opt
                     let n = format_struct_name(&s.input_value.name);
                     let name = &s.input_value.name;
 
+                    if type_ref_is_scalar(&s.input_value.type_) {
+                        if let Scalar::String =
+                            Scalar::from(&*s.input_value.type_.of_type.as_ref().unwrap().clone())
+                        {
+                            return Some(quote! {
+                                query = query.arg($(quoted(name)), $(&n).into());
+                            });
+                        }
+                    }
+
+                    if type_ref_is_list(&s.input_value.type_) {
+                        let inner = *s
+                            .input_value
+                            .type_
+                            .of_type
+                            .as_ref()
+                            .unwrap()
+                            .clone()
+                            .of_type
+                            .as_ref()
+                            .unwrap()
+                            .clone();
+                        println!("type: {:?}", inner);
+                        if type_ref_is_scalar(&inner) {
+                            if let Scalar::String =
+                                Scalar::from(&*inner.of_type.as_ref().unwrap().clone())
+                            {
+                                return Some(quote! {
+                                    query = query.arg($(quoted(name)), $(&n).into_iter().map(|i| i.into()).collect::<Vec<String>>());
+                                });
+                            }
+                        }
+                    }
+
                     Some(quote! {
                         query = query.arg($(quoted(name)), $(n));
                     })
@@ -111,9 +171,7 @@ fn render_optional_args(_funcs: &CommonFunctions, field: &FullTypeFields) -> Opt
         }
 
         let required_args = quote! {
-            if let Some(opts) = opts {
+            $(for arg in args join ($['\r']) => $arg)
-                $(for arg in args join ($['\r']) => $arg)
-            }
         };
 
         Some(required_args)
@@ -181,7 +239,10 @@ fn render_execution(funcs: &CommonFunctions, field: &FullTypeFields) -> rust::To
     }
 }
 
-fn format_function_args(funcs: &CommonFunctions, field: &FullTypeFields) -> Option<rust::Tokens> {
+fn format_function_args(
+    funcs: &CommonFunctions,
+    field: &FullTypeFields,
+) -> Option<(rust::Tokens, bool)> {
     if let Some(args) = field.args.as_ref() {
         let args = args
             .into_iter()
@@ -207,14 +268,51 @@ fn format_function_args(funcs: &CommonFunctions, field: &FullTypeFields) -> Opti
         };
 
         if type_field_has_optional(field) {
-            Some(quote! {
+            Some((
-                $(required_args)
+                quote! {
-                opts: Option<$(field_options_struct_name(field))>
+                    $(required_args)
-            })
+                    opts: $(field_options_struct_name(field))
+                },
+                true,
+            ))
         } else {
-            Some(required_args)
+            Some((required_args, false))
         }
     } else {
         None
     }
 }
+
+fn format_required_function_args(
+    funcs: &CommonFunctions,
+    field: &FullTypeFields,
+) -> Option<rust::Tokens> {
+    if let Some(args) = field.args.as_ref() {
+        let args = args
+            .into_iter()
+            .map(|a| {
+                a.as_ref().and_then(|s| {
+                    if type_ref_is_optional(&s.input_value.type_) {
+                        return None;
+                    }
+
+                    let t = funcs.format_input_type(&s.input_value.type_);
+                    let n = format_struct_name(&s.input_value.name);
+
+                    Some(quote! {
+                        $(n): $(t),
+                    })
+                })
+            })
+            .flatten()
+            .collect::<Vec<_>>();
+        let required_args = quote! {
+            &self,
+            $(for arg in args join ($['\r']) => $arg)
+        };
+
+        Some(required_args)
+    } else {
+        None
+    }
+}

crates/dagger-codegen/src/rust/templates/enum_tmpl.rs

@@ -28,7 +28,7 @@ pub fn render_enum(t: &FullType) -> eyre::Result<rust::Tokens> {
     let serialize = rust::import("serde", "Serialize");
 
     Ok(quote! {
-        #[derive($serialize)]
+        #[derive($serialize, Clone, PartialEq, Debug)]
         pub enum $(t.name.as_ref()) {
             $(render_enum_values(t))
         }

crates/dagger-codegen/src/rust/templates/input_tmpl.rs

@@ -9,7 +9,7 @@ pub fn render_input(funcs: &CommonFunctions, t: &FullType) -> eyre::Result<rust:
     let deserialize = rust::import("serde", "Deserialize");
     let serialize = rust::import("serde", "Serialize");
     Ok(quote! {
-        #[derive($serialize, $deserialize)]
+        #[derive($serialize, $deserialize, Debug, PartialEq, Clone)]
         pub struct $(format_name(t.name.as_ref().unwrap())) {
             $(render_input_fields(funcs, t.input_fields.as_ref().unwrap_or(&Vec::new())  ))
         }
@@ -33,6 +33,6 @@ pub fn render_input_fields(
 
 pub fn render_input_field(funcs: &CommonFunctions, field: &FullTypeInputFields) -> rust::Tokens {
     quote! {
-        pub $(format_struct_name(&field.input_value.name)): $(funcs.format_input_type(&field.input_value.type_)),
+        pub $(format_struct_name(&field.input_value.name)): $(funcs.format_output_type(&field.input_value.type_)),
     }
 }

crates/dagger-codegen/src/rust/templates/object_tmpl.rs

@@ -1,6 +1,7 @@
 use dagger_core::introspection::{FullType, FullTypeFields, FullTypeFieldsArgs};
 use genco::prelude::rust;
 use genco::quote;
+use itertools::Itertools;
 
 use crate::functions::{type_ref_is_optional, CommonFunctions};
 use crate::rust::functions::{
@@ -61,9 +62,15 @@ fn render_optional_arg(funcs: &CommonFunctions, field: &FullTypeFields) -> Optio
         .pipe(|t| render_optional_field_args(funcs, t))
         .flatten();
 
-    if let Some(fields) = fields {
+    let builder = rust::import("derive_builder", "Builder");
+    let _phantom_data = rust::import("std::marker", "PhantomData");
+
+    if let Some((fields, contains_lifetime)) = fields {
         Some(quote! {
-            pub struct $output_type {
+            #[derive($builder, Debug, PartialEq)]
+            pub struct $output_type$(if contains_lifetime => <'a>) {
+                //#[builder(default, setter(skip))]
+                //pub marker: $(phantom_data)<&'a ()>,
                 $fields
             }
         })
@@ -75,19 +82,28 @@ fn render_optional_arg(funcs: &CommonFunctions, field: &FullTypeFields) -> Optio
 fn render_optional_field_args(
     funcs: &CommonFunctions,
     args: &Vec<&FullTypeFieldsArgs>,
-) -> Option<rust::Tokens> {
+) -> Option<(rust::Tokens, bool)> {
     if args.len() == 0 {
         return None;
     }
+    let mut contains_lifetime = false;
     let rendered_args = args.into_iter().map(|a| &a.input_value).map(|a| {
+        let type_ = funcs.format_immutable_input_type(&a.type_);
+        if type_.contains("str") {
+            contains_lifetime = true;
+        }
         quote! {
-            pub $(format_struct_name(&a.name)): Option<$(funcs.format_output_type(&a.type_))>,
+            #[builder(setter(into, strip_option))]
+            pub $(format_struct_name(&a.name)): Option<$(type_)>,
         }
     });
 
-    Some(quote! {
+    Some((
-        $(for arg in rendered_args join ($['\r']) => $arg)
+        quote! {
-    })
+            $(for arg in rendered_args join ($['\r']) => $arg)
+        },
+        contains_lifetime,
+    ))
 }
 
 fn render_functions(funcs: &CommonFunctions, fields: &Vec<FullTypeFields>) -> Option<rust::Tokens> {

crates/dagger-codegen/src/rust/templates/scalar_tmpl.rs

@@ -10,7 +10,7 @@ pub fn render_scalar(t: &FullType) -> eyre::Result<rust::Tokens> {
     let serialize = rust::import("serde", "Serialize");
 
     Ok(quote! {
-        #[derive($serialize, $deserialize)]
+        #[derive($serialize, $deserialize, PartialEq, Debug, Clone)]
         pub struct $(t.name.pipe(|n|format_name(n)))(String);
     })
 }

crates/dagger-sdk/Cargo.toml

@@ -20,6 +20,7 @@ gql_client = "1.0.7"
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.93"
 tokio = { version = "1.25.0", features = ["full"] }
+derive_builder = "0.12.0"
 
 [dev-dependencies]
 pretty_assertions = "1.3.0"

crates/dagger-sdk/examples/build-the-application/main.rs

@@ -3,40 +3,32 @@ use dagger_sdk::HostDirectoryOpts;
 fn main() -> eyre::Result<()> {
     let client = dagger_sdk::connect()?;
 
-    let host_source_dir = client.host().directory(
+    let host_source_dir = client.host().directory_opts(
-        "examples/build-the-application/app".into(),
+        "examples/build-the-application/app",
-        Some(HostDirectoryOpts {
+        HostDirectoryOpts {
             exclude: Some(vec!["node_modules".into(), "ci/".into()]),
             include: None,
-        }),
+        },
     );
 
     let source = client
-        .container(None)
+        .container()
-        .from("node:16".into())
+        .from("node:16")
-        .with_mounted_directory("/src".into(), host_source_dir.id()?);
+        .with_mounted_directory("/src", host_source_dir.id()?);
 
     let runner = source
-        .with_workdir("/src".into())
+        .with_workdir("/src")
-        .with_exec(vec!["npm".into(), "install".into()], None);
+        .with_exec(vec!["npm", "install"]);
 
-    let test = runner.with_exec(
+    let test = runner.with_exec(vec!["npm", "test", "--", "--watchAll=false"]);
-        vec![
-            "npm".into(),
-            "test".into(),
-            "--".into(),
-            "--watchAll=false".into(),
-        ],
-        None,
-    );
 
     let build_dir = test
-        .with_exec(vec!["npm".into(), "run".into(), "build".into()], None)
+        .with_exec(vec!["npm", "run", "build"])
-        .directory("./build".into());
+        .directory("./build");
 
-    let _ = build_dir.export("./build".into());
+    let _ = build_dir.export("./build");
 
-    let entries = build_dir.entries(None);
+    let entries = build_dir.entries();
 
     println!("build dir contents: \n {:?}", entries);
 

crates/dagger-sdk/examples/caching/main.rs

@@ -1,53 +1,40 @@
-use dagger_sdk::HostDirectoryOpts;
 use rand::Rng;
 
 fn main() -> eyre::Result<()> {
     let client = dagger_sdk::connect()?;
 
-    let host_source_dir = client.host().directory(
+    let host_source_dir = client.host().directory_opts(
-        "./examples/caching/app".into(),
+        "./examples/caching/app",
-        Some(HostDirectoryOpts {
+        dagger_sdk::HostDirectoryOptsBuilder::default()
-            exclude: Some(vec!["node_modules".into(), "ci/".into()]),
+            .exclude(vec!["node_modules", "ci/"])
-            include: None,
+            .build()?,
-        }),
     );
 
-    let node_cache = client.cache_volume("node".into()).id()?;
+    let node_cache = client.cache_volume("node").id()?;
 
     let source = client
-        .container(None)
+        .container()
-        .from("node:16".into())
+        .from("node:16")
-        .with_mounted_directory("/src".into(), host_source_dir.id()?)
+        .with_mounted_directory("/src", host_source_dir.id()?)
-        .with_mounted_cache("/src/node_modules".into(), node_cache, None);
+        .with_mounted_cache("/src/node_modules", node_cache);
 
     let runner = source
-        .with_workdir("/src".into())
+        .with_workdir("/src")
-        .with_exec(vec!["npm".into(), "install".into()], None);
+        .with_exec(vec!["npm", "install"]);
 
-    let test = runner.with_exec(
+    let test = runner.with_exec(vec!["npm", "test", "--", "--watchAll=false"]);
-        vec![
-            "npm".into(),
-            "test".into(),
-            "--".into(),
-            "--watchAll=false".into(),
-        ],
-        None,
-    );
 
     let build_dir = test
-        .with_exec(vec!["npm".into(), "run".into(), "build".into()], None)
+        .with_exec(vec!["npm", "run", "build"])
-        .directory("./build".into());
+        .directory("./build");
 
     let mut rng = rand::thread_rng();
 
     let ref_ = client
-        .container(None)
+        .container()
-        .from("nginx".into())
+        .from("nginx")
-        .with_directory("/usr/share/nginx/html".into(), build_dir.id()?, None)
+        .with_directory("/usr/share/nginx/html", build_dir.id()?)
-        .publish(
+        .publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()))?;
-            format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()),
-            None,
-        )?;
 
     println!("published image to: {}", ref_);
 

crates/dagger-sdk/examples/existing-dockerfile/main.rs

@@ -7,15 +7,12 @@ fn main() -> eyre::Result<()> {
 
     let context_dir = client
         .host()
-        .directory("./examples/existing-dockerfile/app".into(), None);
+        .directory("./examples/existing-dockerfile/app");
 
     let ref_ = client
-        .container(None)
+        .container()
-        .build(context_dir.id()?, None)
+        .build(context_dir.id()?)
-        .publish(
+        .publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()))?;
-            format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()),
-            None,
-        )?;
 
     println!("published image to: {}", ref_);
 

crates/dagger-sdk/examples/first-pipeline/main.rs

@@ -2,9 +2,9 @@ fn main() -> eyre::Result<()> {
     let client = dagger_sdk::connect()?;
 
     let version = client
-        .container(None)
+        .container()
-        .from("golang:1.19".into())
+        .from("golang:1.19")
-        .with_exec(vec!["go".into(), "version".into()], None)
+        .with_exec(vec!["go", "version".into()])
         .stdout()?;
 
     println!("Hello from Dagger and {}", version.trim());

crates/dagger-sdk/examples/multi-stage-build/main.rs

@@ -4,47 +4,36 @@ use rand::Rng;
 fn main() -> eyre::Result<()> {
     let client = dagger_sdk::connect()?;
 
-    let host_source_dir = client.host().directory(
+    let host_source_dir = client.host().directory_opts(
-        "examples/publish-the-application/app".into(),
+        "examples/publish-the-application/app",
-        Some(HostDirectoryOpts {
+        HostDirectoryOpts {
-            exclude: Some(vec!["node_modules".into(), "ci/".into()]),
+            exclude: Some(vec!["node_modules", "ci/"]),
             include: None,
-        }),
+        },
     );
 
     let source = client
-        .container(None)
+        .container()
-        .from("node:16".into())
+        .from("node:16")
-        .with_mounted_directory("/src".into(), host_source_dir.id()?);
+        .with_mounted_directory("/src", host_source_dir.id()?);
 
     let runner = source
-        .with_workdir("/src".into())
+        .with_workdir("/src")
-        .with_exec(vec!["npm".into(), "install".into()], None);
+        .with_exec(vec!["npm", "install"]);
 
-    let test = runner.with_exec(
+    let test = runner.with_exec(vec!["npm", "test", "--", "--watchAll=false"]);
-        vec![
-            "npm".into(),
-            "test".into(),
-            "--".into(),
-            "--watchAll=false".into(),
-        ],
-        None,
-    );
 
     let build_dir = test
-        .with_exec(vec!["npm".into(), "run".into(), "build".into()], None)
+        .with_exec(vec!["npm", "run", "build"])
-        .directory("./build".into());
+        .directory("./build");
 
     let mut rng = rand::thread_rng();
 
     let ref_ = client
-        .container(None)
+        .container()
-        .from("nginx".into())
+        .from("nginx")
-        .with_directory("/usr/share/nginx/html".into(), build_dir.id()?, None)
+        .with_directory("/usr/share/nginx/html", build_dir.id()?)
-        .publish(
+        .publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()))?;
-            format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()),
-            None,
-        )?;
 
     println!("published image to: {}", ref_);
 

crates/dagger-sdk/examples/publish-the-application/main.rs

@@ -5,52 +5,40 @@ fn main() -> eyre::Result<()> {
     let client = dagger_sdk::connect()?;
     let output = "examples/publish-the-application/app/build";
 
-    let host_source_dir = client.host().directory(
+    let host_source_dir = client.host().directory_opts(
-        "examples/publish-the-application/app".into(),
+        "examples/publish-the-application/app",
-        Some(HostDirectoryOpts {
+        HostDirectoryOpts {
-            exclude: Some(vec!["node_modules".into(), "ci/".into()]),
+            exclude: Some(vec!["node_modules", "ci/"]),
             include: None,
-        }),
+        },
     );
 
     let source = client
-        .container(None)
+        .container()
-        .from("node:16".into())
+        .from("node:16")
-        .with_mounted_directory("/src".into(), host_source_dir.id()?);
+        .with_mounted_directory("/src", host_source_dir.id()?);
 
     let runner = source
-        .with_workdir("/src".into())
+        .with_workdir("/src")
-        .with_exec(vec!["npm".into(), "install".into()], None);
+        .with_exec(vec!["npm", "install"]);
 
-    let test = runner.with_exec(
+    let test = runner.with_exec(vec!["npm", "test", "--", "--watchAll=false"]);
-        vec![
-            "npm".into(),
-            "test".into(),
-            "--".into(),
-            "--watchAll=false".into(),
-        ],
-        None,
-    );
 
     let _ = test
-        .with_exec(vec!["npm".into(), "run".into(), "build".into()], None)
+        .with_exec(vec!["npm", "run", "build"])
-        .directory("./build".into())
+        .directory("./build")
-        .export(output.into());
+        .export(output);
 
     let mut rng = rand::thread_rng();
 
     let ref_ = client
-        .container(None)
+        .container()
-        .from("nginx".into())
+        .from("nginx")
         .with_directory(
-            "/usr/share/nginx/html".into(),
+            "/usr/share/nginx/html",
-            client.host().directory(output.into(), None).id()?,
+            client.host().directory(output).id()?,
-            None,
         )
-        .publish(
+        .publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()))?;
-            format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()),
-            None,
-        )?;
 
     println!("published image to: {}", ref_);
 

crates/dagger-sdk/examples/test-the-application/main.rs

@@ -3,33 +3,25 @@ use dagger_sdk::HostDirectoryOpts;
 fn main() -> eyre::Result<()> {
     let client = dagger_sdk::connect()?;
 
-    let host_source_dir = client.host().directory(
+    let host_source_dir = client.host().directory_opts(
-        "examples/test-the-application/app".into(),
+        "examples/test-the-application/app",
-        Some(HostDirectoryOpts {
+        HostDirectoryOpts {
-            exclude: Some(vec!["node_modules".into(), "ci/".into()]),
+            exclude: Some(vec!["node_modules", "ci/"]),
             include: None,
-        }),
+        },
     );
 
     let source = client
-        .container(None)
+        .container()
-        .from("node:16".into())
+        .from("node:16")
-        .with_mounted_directory("/src".into(), host_source_dir.id()?);
+        .with_mounted_directory("/src", host_source_dir.id()?);
 
     let runner = source
-        .with_workdir("/src".into())
+        .with_workdir("/src")
-        .with_exec(vec!["npm".into(), "install".into()], None);
+        .with_exec(vec!["npm", "install"]);
 
     let out = runner
-        .with_exec(
+        .with_exec(vec!["npm", "test", "--", "--watchAll=false"])
-            vec![
-                "npm".into(),
-                "test".into(),
-                "--".into(),
-                "--watchAll=false".into(),
-            ],
-            None,
-        )
         .stderr()?;
 
     println!("{}", out);

crates/dagger-sdk/tests/mod.rs

@@ -1,19 +1,18 @@
-use dagger_sdk::{connect, ContainerExecOpts};
+use dagger_sdk::{connect, ContainerExecOptsBuilder};
 
 #[test]
 fn test_example_container() {
     let client = connect().unwrap();
 
-    let alpine = client.container(None).from("alpine:3.16.2".into());
+    let alpine = client.container().from("alpine:3.16.2");
 
     let out = alpine
-        .exec(Some(ContainerExecOpts {
+        .exec_opts(
-            args: Some(vec!["cat".into(), "/etc/alpine-release".into()]),
+            ContainerExecOptsBuilder::default()
-            stdin: None,
+                .args(vec!["cat", "/etc/alpine-release"])
-            redirect_stdout: None,
+                .build()
-            redirect_stderr: None,
+                .unwrap(),
-            experimental_privileged_nesting: None,
+        )
-        }))
         .stdout()
         .unwrap();