feat(sdk): re-export through lib.rs

this means that you can now use dagger_sdk::connect() instead of
dagger_sdk::client::connect();

CHANGELOG.md

@@ -5,32 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## v0.2.9 (2023-02-19)
-
-### New Features
-
- - <csr-id-19ed6c267f779b72430422c463ceed553f6fc618/> re-export through lib.rs
-   this means that you can now use dagger_sdk::connect() instead of
-   dagger_sdk::client::connect();
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 1 commit contributed to the release.
- - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - re-export through lib.rs ([`19ed6c2`](https://github.com/kjuulh/dagger-rs/commit/19ed6c267f779b72430422c463ceed553f6fc618))
-</details>
-
 ## v0.2.8 (2023-02-19)
 
 ### New Features

Cargo.lock

@@ -114,7 +114,7 @@ version = "0.1.0"
 dependencies = [
  "clap",
  "color-eyre",
- "dagger-sdk 0.2.2",
+ "dagger-sdk 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "eyre",
 ]
 
@@ -245,7 +245,7 @@ dependencies = [
 
 [[package]]
 name = "dagger-codegen"
-version = "0.2.4"
+version = "0.2.2"
 dependencies = [
  "convert_case",
  "dagger-core 0.2.2",
@@ -305,7 +305,7 @@ dependencies = [
 
 [[package]]
 name = "dagger-rs"
-version = "0.2.9"
+version = "0.2.8"
 dependencies = [
  "clap",
  "color-eyre",
@@ -328,6 +328,23 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "dagger-sdk"
+version = "0.2.2"
+dependencies = [
+ "base64",
+ "dagger-core 0.2.2",
+ "eyre",
+ "futures",
+ "genco",
+ "gql_client",
+ "pretty_assertions",
+ "rand",
+ "serde",
+ "serde_json",
+ "tokio",
+]
+
 [[package]]
 name = "dagger-sdk"
 version = "0.2.2"
@@ -346,90 +363,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "dagger-sdk"
-version = "0.2.5"
-dependencies = [
- "base64",
- "dagger-core 0.2.2",
- "derive_builder",
- "eyre",
- "futures",
- "genco",
- "gql_client",
- "pretty_assertions",
- "rand",
- "serde",
- "serde_json",
- "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"
@@ -906,12 +839,6 @@ 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"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dagger-rs"
-version = "0.2.9"
+version = "0.2.8"
 edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"
@@ -19,7 +19,7 @@ members = [
 ]
 
 [dependencies]
-dagger-codegen = { path = "crates/dagger-codegen", version = "^0.2.3" }
+dagger-codegen = { path = "crates/dagger-codegen", version = "^0.2.2" }
 dagger-core = { path = "crates/dagger-core", version = "^0.2.2" }
 
 clap = "4.1.6"

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
-- [x] general api stabilisation
+- [ ] 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/CHANGELOG.md

@@ -5,97 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## v0.2.4 (2023-02-19)
-
-### New Features
-
- - <csr-id-f29ff836cfd72d5e051ca6a71a230ba1e9933091/> without Some in _opts functions
-   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
- - <csr-id-9762da895a164e30c5dc60e89a83e934ceae47ab/> with _opts methods
-   Now all opt values enter into a _opts function instead of the original.
-   This avoids a lot of verbosity for both None in the case opts are
-   unwanted, and Some() if they actually are.
-   
-   They are used like so:
-   
-   ```rust
-   client.container().from("...");
-   client.container_opts(Some(ContainerOpts{ ... }))
-   ```
-   
-   Some from opts will be removed in a future commit/pr
- - <csr-id-94336d06378f035464e233b921dc3858070f582d/> move to &str instead of String and introduce builder.
-   This will make the api much easier to use, as we can now rely on ""
-   instead of "".into() for normal string values.
-   
-   Introduced builder as well, which makes it much easier to use *Opts, as
-   it can handle the building of that, and get the benefits from String ->
-   &str, as that is currently not allowed for optional values
-
-### Bug Fixes
-
- - <csr-id-c627595fd2695e236924175d137c42f1480ccd6b/> cargo clippy
- - <csr-id-02006d40fc2c0383e0412c15c36db9af7eda991f/> without phantom data
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 5 commits contributed to the release.
- - 5 commits were understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - cargo clippy ([`c627595`](https://github.com/kjuulh/dagger-rs/commit/c627595fd2695e236924175d137c42f1480ccd6b))
-    - without Some in _opts functions ([`f29ff83`](https://github.com/kjuulh/dagger-rs/commit/f29ff836cfd72d5e051ca6a71a230ba1e9933091))
-    - with _opts methods ([`9762da8`](https://github.com/kjuulh/dagger-rs/commit/9762da895a164e30c5dc60e89a83e934ceae47ab))
-    - without phantom data ([`02006d4`](https://github.com/kjuulh/dagger-rs/commit/02006d40fc2c0383e0412c15c36db9af7eda991f))
-    - move to &str instead of String and introduce builder. ([`94336d0`](https://github.com/kjuulh/dagger-rs/commit/94336d06378f035464e233b921dc3858070f582d))
-</details>
-
-## v0.2.3 (2023-02-19)
-
-### New Features
-
- - <csr-id-de063eae858eb3335d2558a57ee6a88689635200/> with return result instead of unwrap
- - <csr-id-5d667369900a47d3a6015cd3814c240bc5c54436/> remove unnecessary option returns
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 3 commits contributed to the release.
- - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - Release dagger-sdk v0.2.3, dagger-codegen v0.2.3, dagger-rs v0.2.9 ([`9235030`](https://github.com/kjuulh/dagger-rs/commit/92350306b3f0da40b4fc6dcaffcd90b891e83f70))
-    - with return result instead of unwrap ([`de063ea`](https://github.com/kjuulh/dagger-rs/commit/de063eae858eb3335d2558a57ee6a88689635200))
-    - remove unnecessary option returns ([`5d66736`](https://github.com/kjuulh/dagger-rs/commit/5d667369900a47d3a6015cd3814c240bc5c54436))
-</details>
-
 ## v0.2.2 (2023-02-19)
 
 ### New Features
@@ -106,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <csr-read-only-do-not-edit/>
 
- - 2 commits contributed to the release.
+ - 1 commit contributed to the release.
  - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
  - 0 issues like '(#ID)' were seen in commit messages
 
@@ -117,7 +26,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <details><summary>view details</summary>
 
  * **Uncategorized**
-    - Release dagger-core v0.2.2, dagger-codegen v0.2.2, dagger-rs v0.2.8 ([`1638f15`](https://github.com/kjuulh/dagger-rs/commit/1638f15fba9d16512e8452f87b908d6dce417cd9))
     - update to dagger v0.3.12 ([`6e5f407`](https://github.com/kjuulh/dagger-rs/commit/6e5f4074329ab0462445b31d4153f8497c483438))
 </details>
 

crates/dagger-codegen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dagger-codegen"
-version = "0.2.4"
+version = "0.2.2"
 edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"

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, input: bool, immutable: bool) -> String;
+    fn format_kind_list(&self, representation: &str) -> String;
-    fn format_kind_scalar_string(&self, representation: &str, input: bool) -> String;
+    fn format_kind_scalar_string(&self, representation: &str) -> 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,18 +36,14 @@ impl CommonFunctions {
     }
 
     pub fn format_input_type(&self, t: &TypeRef) -> String {
-        self.format_type(t, true, false)
+        self.format_type(t, true)
     }
 
     pub fn format_output_type(&self, t: &TypeRef) -> String {
-        self.format_type(t, false, false)
+        self.format_type(t, false)
     }
 
-    pub fn format_immutable_input_type(&self, t: &TypeRef) -> String {
+    fn format_type(&self, t: &TypeRef, input: bool) -> 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() {
@@ -61,14 +57,9 @@ impl CommonFunctions {
                             Scalar::Float => self
                                 .format_type_funcs
                                 .format_kind_scalar_float(&mut representation),
-                            Scalar::String => {
+                            Scalar::String => self
-                                if immutable {
+                                .format_type_funcs
-                                    "&'a str".into()
+                                .format_kind_scalar_string(&mut representation),
-                                } else {
-                                    self.format_type_funcs
-                                        .format_kind_scalar_string(&mut representation, input)
-                                }
-                            }
                             Scalar::Boolean => self
                                 .format_type_funcs
                                 .format_kind_scalar_boolean(&mut representation),
@@ -96,15 +87,12 @@ impl CommonFunctions {
                                 .as_ref()
                                 .map(|t| t.clone())
                                 .map(|t| *t)
-                                .map(|t| self.format_type(&t, input, immutable))
+                                .map(|t| self.format_type(&t, input))
                                 .context("could not get inner type of list")
                                 .unwrap();
 
-                            representation = self.format_type_funcs.format_kind_list(
+                            representation =
-                                &mut inner_type,
+                                self.format_type_funcs.format_kind_list(&mut inner_type);
-                                input,
-                                immutable,
-                            );
 
                             return representation;
                         }

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

@@ -5,17 +5,13 @@ use super::functions::format_name;
 pub struct FormatTypeFunc;
 
 impl FormatTypeFuncs for FormatTypeFunc {
-    fn format_kind_list(&self, representation: &str, _input: bool, _immutable: bool) -> String {
+    fn format_kind_list(&self, representation: &str) -> String {
         format!("Vec<{}>", representation)
     }
 
-    fn format_kind_scalar_string(&self, representation: &str, input: bool) -> String {
+    fn format_kind_scalar_string(&self, representation: &str) -> String {
         let mut rep = representation.to_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, type_ref_is_list_of_objects, type_ref_is_object,
+    type_field_has_optional, type_ref_is_list_of_objects, type_ref_is_object, type_ref_is_optional,
-    type_ref_is_optional, type_ref_is_scalar, CommonFunctions, Scalar,
+    CommonFunctions,
 };
 use crate::utility::OptionExt;
 
@@ -39,34 +39,9 @@ pub fn format_function(funcs: &CommonFunctions, field: &FullTypeFields) -> Optio
         .pipe(|t| &t.type_ref)
         .pipe(|t| render_output_type(funcs, t));
 
-    if let Some((args, true)) = args {
-        let required_args = format_required_function_args(funcs, field);
-        Some(quote! {
-            $(&signature)(
-                $(required_args)
-            ) -> $(output_type.as_ref()) {
-                let mut query = self.selection.select($(quoted(field.name.as_ref())));
-
-                $(render_required_args(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)
+            $(args)
         ) -> $(output_type) {
             let mut query = self.selection.select($(quoted(field.name.as_ref())));
 
@@ -76,7 +51,6 @@ pub fn format_function(funcs: &CommonFunctions, field: &FullTypeFields) -> Optio
             $(render_execution(funcs, field))
         }
     })
-    }
 }
 
 fn render_required_args(_funcs: &CommonFunctions, field: &FullTypeFields) -> Option<rust::Tokens> {
@@ -92,40 +66,6 @@ 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));
                     })
@@ -171,7 +111,9 @@ 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)
+            }
         };
 
         Some(required_args)
@@ -239,10 +181,7 @@ fn render_execution(funcs: &CommonFunctions, field: &FullTypeFields) -> rust::To
     }
 }
 
-fn format_function_args(
+fn format_function_args(funcs: &CommonFunctions, field: &FullTypeFields) -> Option<rust::Tokens> {
-    funcs: &CommonFunctions,
-    field: &FullTypeFields,
-) -> Option<(rust::Tokens, bool)> {
     if let Some(args) = field.args.as_ref() {
         let args = args
             .into_iter()
@@ -268,50 +207,13 @@ fn format_function_args(
         };
 
         if type_field_has_optional(field) {
-            Some((
-                quote! {
-                    $(required_args)
-                    opts: $(field_options_struct_name(field))
-                },
-                true,
-            ))
-        } else {
-            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),
+                $(required_args)
+                opts: Option<$(field_options_struct_name(field))>
             })
-                })
+        } else {
-            })
-            .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, Clone, PartialEq, Debug)]
+        #[derive($serialize)]
         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, Debug, PartialEq, Clone)]
+        #[derive($serialize, $deserialize)]
         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_output_type(&field.input_value.type_)),
+        pub $(format_struct_name(&field.input_value.name)): $(funcs.format_input_type(&field.input_value.type_)),
     }
 }

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

@@ -1,7 +1,6 @@
 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::{
@@ -62,15 +61,9 @@ fn render_optional_arg(funcs: &CommonFunctions, field: &FullTypeFields) -> Optio
         .pipe(|t| render_optional_field_args(funcs, t))
         .flatten();
 
-    let builder = rust::import("derive_builder", "Builder");
+    if let Some(fields) = fields {
-    let _phantom_data = rust::import("std::marker", "PhantomData");
-
-    if let Some((fields, contains_lifetime)) = fields {
         Some(quote! {
-            #[derive($builder, Debug, PartialEq)]
+            pub struct $output_type {
-            pub struct $output_type$(if contains_lifetime => <'a>) {
-                //#[builder(default, setter(skip))]
-                //pub marker: $(phantom_data)<&'a ()>,
                 $fields
             }
         })
@@ -82,28 +75,19 @@ fn render_optional_arg(funcs: &CommonFunctions, field: &FullTypeFields) -> Optio
 fn render_optional_field_args(
     funcs: &CommonFunctions,
     args: &Vec<&FullTypeFieldsArgs>,
-) -> Option<(rust::Tokens, bool)> {
+) -> Option<rust::Tokens> {
     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! {
-            #[builder(setter(into, strip_option))]
+            pub $(format_struct_name(&a.name)): Option<$(funcs.format_output_type(&a.type_))>,
-            pub $(format_struct_name(&a.name)): Option<$(type_)>,
         }
     });
 
-    Some((
+    Some(quote! {
-        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, PartialEq, Debug, Clone)]
+        #[derive($serialize, $deserialize)]
         pub struct $(t.name.pipe(|n|format_name(n)))(String);
     })
 }

crates/dagger-sdk/CHANGELOG.md

@@ -5,128 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## v0.2.5 (2023-02-19)
-
-### New Features
-
- - <csr-id-f29ff836cfd72d5e051ca6a71a230ba1e9933091/> without Some in _opts functions
-   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
- - <csr-id-9762da895a164e30c5dc60e89a83e934ceae47ab/> with _opts methods
-   Now all opt values enter into a _opts function instead of the original.
-   This avoids a lot of verbosity for both None in the case opts are
-   unwanted, and Some() if they actually are.
-   
-   They are used like so:
-   
-   ```rust
-   client.container().from("...");
-   client.container_opts(Some(ContainerOpts{ ... }))
-   ```
-   
-   Some from opts will be removed in a future commit/pr
- - <csr-id-94336d06378f035464e233b921dc3858070f582d/> move to &str instead of String and introduce builder.
-   This will make the api much easier to use, as we can now rely on ""
-   instead of "".into() for normal string values.
-   
-   Introduced builder as well, which makes it much easier to use *Opts, as
-   it can handle the building of that, and get the benefits from String ->
-   &str, as that is currently not allowed for optional values
-
-### Bug Fixes
-
- - <csr-id-c627595fd2695e236924175d137c42f1480ccd6b/> cargo clippy
- - <csr-id-02006d40fc2c0383e0412c15c36db9af7eda991f/> without phantom data
- - <csr-id-6e2292cf11942fbd26a52fe4e0fc8471e6eb70a3/> dependencies
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 6 commits contributed to the release.
- - 6 commits were understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - cargo clippy ([`c627595`](https://github.com/kjuulh/dagger-rs/commit/c627595fd2695e236924175d137c42f1480ccd6b))
-    - without Some in _opts functions ([`f29ff83`](https://github.com/kjuulh/dagger-rs/commit/f29ff836cfd72d5e051ca6a71a230ba1e9933091))
-    - with _opts methods ([`9762da8`](https://github.com/kjuulh/dagger-rs/commit/9762da895a164e30c5dc60e89a83e934ceae47ab))
-    - without phantom data ([`02006d4`](https://github.com/kjuulh/dagger-rs/commit/02006d40fc2c0383e0412c15c36db9af7eda991f))
-    - move to &str instead of String and introduce builder. ([`94336d0`](https://github.com/kjuulh/dagger-rs/commit/94336d06378f035464e233b921dc3858070f582d))
-    - dependencies ([`6e2292c`](https://github.com/kjuulh/dagger-rs/commit/6e2292cf11942fbd26a52fe4e0fc8471e6eb70a3))
-</details>
-
-## v0.2.4 (2023-02-19)
-
-### Bug Fixes
-
- - <csr-id-7d04ab1240e497e7804fed23a378d28c78f50a0a/> readme dagger-rs -> dagger-sdk
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 2 commits contributed to the release.
- - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - Release dagger-sdk v0.2.4 ([`cc81124`](https://github.com/kjuulh/dagger-rs/commit/cc81124f899f44f80c1ee7d1e23a7e02d8cc4b7c))
-    - readme dagger-rs -> dagger-sdk ([`7d04ab1`](https://github.com/kjuulh/dagger-rs/commit/7d04ab1240e497e7804fed23a378d28c78f50a0a))
-</details>
-
-## v0.2.3 (2023-02-19)
-
-### New Features
-
- - <csr-id-19ed6c267f779b72430422c463ceed553f6fc618/> re-export through lib.rs
-   this means that you can now use dagger_sdk::connect() instead of
-   dagger_sdk::client::connect();
- - <csr-id-de063eae858eb3335d2558a57ee6a88689635200/> with return result instead of unwrap
- - <csr-id-5d667369900a47d3a6015cd3814c240bc5c54436/> remove unnecessary option returns
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 4 commits contributed to the release.
- - 3 commits were understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - Release dagger-sdk v0.2.3, dagger-codegen v0.2.3, dagger-rs v0.2.9 ([`9235030`](https://github.com/kjuulh/dagger-rs/commit/92350306b3f0da40b4fc6dcaffcd90b891e83f70))
-    - re-export through lib.rs ([`19ed6c2`](https://github.com/kjuulh/dagger-rs/commit/19ed6c267f779b72430422c463ceed553f6fc618))
-    - with return result instead of unwrap ([`de063ea`](https://github.com/kjuulh/dagger-rs/commit/de063eae858eb3335d2558a57ee6a88689635200))
-    - remove unnecessary option returns ([`5d66736`](https://github.com/kjuulh/dagger-rs/commit/5d667369900a47d3a6015cd3814c240bc5c54436))
-</details>
-
 ## v0.2.2 (2023-02-19)
 
 ### New Features
@@ -141,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <csr-read-only-do-not-edit/>
 
- - 4 commits contributed to the release.
+ - 3 commits contributed to the release.
  - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
  - 0 issues like '(#ID)' were seen in commit messages
 
@@ -152,7 +30,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <details><summary>view details</summary>
 
  * **Uncategorized**
-    - Release dagger-sdk v0.2.2 ([`e921ba1`](https://github.com/kjuulh/dagger-rs/commit/e921ba13638987ccf5beaa48c4be9be5fd879bd0))
     - Release dagger-core v0.2.2, dagger-codegen v0.2.2, dagger-rs v0.2.8 ([`1638f15`](https://github.com/kjuulh/dagger-rs/commit/1638f15fba9d16512e8452f87b908d6dce417cd9))
     - fixed fmt errors ([`10bc6f3`](https://github.com/kjuulh/dagger-rs/commit/10bc6f3846b65cc82c2fb343d8cfe921784bef1b))
     - update to dagger v0.3.12 ([`6e5f407`](https://github.com/kjuulh/dagger-rs/commit/6e5f4074329ab0462445b31d4153f8497c483438))

crates/dagger-sdk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dagger-sdk"
-version = "0.2.5"
+version = "0.2.2"
 edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"
@@ -11,18 +11,17 @@ publish = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dagger-core = { path = "../dagger-core", version = "^0.2.2" }
-
 base64 = "0.21.0"
+dagger-core = { path = "../dagger-core", version = "^0.2.2" }
 eyre = "0.6.8"
 futures = "0.3.26"
+
+genco = "0.17.3"
 gql_client = "1.0.7"
+pretty_assertions = "1.3.0"
 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"
 rand = "0.8.5"
-genco = "0.17.3"

crates/dagger-sdk/README.md

@@ -1,4 +1,4 @@
-# dagger-sdk
+# dagger-rs
 
 A dagger sdk written in rust for rust.
 
@@ -19,20 +19,20 @@ The examples match the folder name in each directory in examples
 Simply install like:
 
 ```bash
-cargo add dagger-sdk
+cargo install dagger-sdk
 ```
 
 ### Usage
 
 ```rust
 fn main() -> eyre::Result<()> {
-    let client = dagger_sdk::connect()?;
+    let client = dagger_sdk::client::connect()?;
 
     let version = client
         .container(None)
         .from("golang:1.19".into())
         .with_exec(vec!["go".into(), "version".into()], None)
-        .stdout()?;
+        .stdout();
 
     println!("Hello from Dagger and {}", version.trim());
 

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

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

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

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

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

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

crates/dagger-sdk/tests/mod.rs

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