Merge pull request #673 from swimos/no_publish

swimos · Jun 26, 2024 · f1d3d6d · f1d3d6d
2 parents a97fa1b + 8b8cfc8
commit f1d3d6d
Show file tree

Hide file tree

Showing 86 changed files with 699 additions and 766 deletions.
diff --git a/.tarpaulin.toml b/.tarpaulin.toml
@@ -31,7 +31,7 @@ exclude = [
     "time_series",
     "swimos_form_derive",
     "swimos_agent_derive",
-    "macro_utilities",
+    "swimos_macro_utilities",
     "example_client_2_2",
     "example_server_2_2",
     "example_client_2_3",

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,11 +1,11 @@
 [workspace]
 resolver = "2"
 members = [
-    "client/*",
+    "swimos_client",
     "swimos",
     "api/swimos_*",
     "api/formats/swimos_*",
-    "macro_utilities",
+    "swimos_macro_utilities",
     "runtime/swimos_*",
     "swimos_utilities",
     "swimos_utilities/swimos_*",
@@ -44,10 +44,6 @@ members = [
     "example_apps/devguide/2_3/*",
 ]
 
-exclude = [
-    "cookbook"
-]
-
 [profile.release]
 opt-level = 3
 

diff --git a/api/formats/swimos_msgpack/Cargo.toml b/api/formats/swimos_msgpack/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
 [dependencies]
 base64 = { workspace = true }
 either = { workspace = true }
-swimos_form = { path = "../../swimos_form" }
-swimos_model = { path = "../../swimos_model" }
+swimos_form = { path = "../../swimos_form", version = "0.1.0" }
+swimos_model = { path = "../../swimos_model", version = "0.1.0" }
 bytes = { workspace = true }
 byteorder = { workspace = true }
 rmp = { workspace = true }

diff --git a/api/formats/swimos_recon/Cargo.toml b/api/formats/swimos_recon/Cargo.toml
@@ -10,9 +10,9 @@ default = []
 [dependencies]
 base64 = { workspace = true }
 either = { workspace = true }
-swimos_form = { path = "../../swimos_form" }
-swimos_model = { path = "../../swimos_model" }
-swimos_utilities = { path = "../../../swimos_utilities", features = ["encoding"] }
+swimos_form = { path = "../../swimos_form", version = "0.1.0" }
+swimos_model = { path = "../../swimos_model", version = "0.1.0" }
+swimos_utilities = { path = "../../../swimos_utilities", features = ["encoding"], version = "0.1.0" }
 nom = { workspace = true }
 nom_locate = { workspace = true }
 num-traits = { workspace = true }

diff --git a/api/swimos_agent_protocol/Cargo.toml b/api/swimos_agent_protocol/Cargo.toml
@@ -7,10 +7,10 @@ edition = "2021"
 [dependencies]
 bytes = { workspace = true }
 tokio-util = { workspace = true, features = ["codec"] }
-swimos_api = { path = "../swimos_api" }
-swimos_model = { path = "../swimos_model" }
+swimos_api = { path = "../swimos_api", version = "0.1.0" }
+swimos_model = { path = "../swimos_model", version = "0.1.0" }
 uuid = { workspace = true }
-swimos_form = { path = "../swimos_form" }
-swimos_recon = { path = "../formats/swimos_recon" }
+swimos_form = { path = "../swimos_form", version = "0.1.0" }
+swimos_recon = { path = "../formats/swimos_recon", version = "0.1.0" }
 thiserror = { workspace = true }
-swimos_utilities = { path = "../../swimos_utilities", features = ["encoding"] }
+swimos_utilities = { path = "../../swimos_utilities", features = ["encoding"], version = "0.1.0" }
diff --git a/api/swimos_api/Cargo.toml b/api/swimos_api/Cargo.toml
@@ -6,10 +6,10 @@ edition = "2021"
 
 [dependencies]
 futures = { workspace = true }
-swimos_utilities = { path = "../../swimos_utilities", features = ["io", "errors", "trigger"] }
-swimos_model = { path = "../swimos_model" }
-swimos_form = { path = "../swimos_form" }
-swimos_recon = { path = "../formats/swimos_recon" }
+swimos_utilities = { path = "../../swimos_utilities", features = ["io", "errors", "trigger"], version = "0.1.0" }
+swimos_model = { path = "../swimos_model", version = "0.1.0" }
+swimos_form = { path = "../swimos_form", version = "0.1.0" }
+swimos_recon = { path = "../formats/swimos_recon", version = "0.1.0" }
 thiserror = { workspace = true }
 bytes = { workspace = true }
 tokio = { workspace = true }

diff --git a/api/swimos_client_api/Cargo.toml b/api/swimos_client_api/Cargo.toml
@@ -6,11 +6,11 @@ edition = "2021"
 
 [dependencies]
 futures = { workspace = true }
-swimos_utilities = { path = "../../swimos_utilities", features = ["io"] }
-swimos_model = { path = "../swimos_model" }
-swimos_form = { path = "../swimos_form" }
-swimos_recon = { path = "../formats/swimos_recon" }
-swimos_api = { path = "../swimos_api" }
+swimos_utilities = { path = "../../swimos_utilities", features = ["io"], version = "0.1.0" }
+swimos_model = { path = "../swimos_model", version = "0.1.0" }
+swimos_form = { path = "../swimos_form", version = "0.1.0" }
+swimos_recon = { path = "../formats/swimos_recon", version = "0.1.0" }
+swimos_api = { path = "../swimos_api", version = "0.1.0" }
 thiserror = { workspace = true }
 static_assertions = { workspace = true }
 
diff --git a/api/swimos_form/Cargo.toml b/api/swimos_form/Cargo.toml
@@ -5,9 +5,9 @@ authors = ["Swim Inc. developers [email protected]"]
 edition = "2021"
 
 [dependencies]
-swimos_utilities = { path = "../../swimos_utilities", features = ["text", "future"] }
-swimos_form_derive = { path = "../swimos_form_derive" }
-swimos_model = { path = "../swimos_model" }
+swimos_utilities = { path = "../../swimos_utilities", features = ["text", "future"], version = "0.1.0" }
+swimos_form_derive = { path = "../swimos_form_derive", version = "0.1.0" }
+swimos_model = { path = "../swimos_model", version = "0.1.0" }
 chrono = { workspace = true }
 either = { workspace = true }
 num-traits = { workspace = true }

diff --git a/api/swimos_form_derive/Cargo.toml b/api/swimos_form_derive/Cargo.toml
@@ -10,8 +10,8 @@ proc-macro = true
 
 [dependencies]
 either = { workspace = true }
-swimos_utilities = { path = "../../swimos_utilities", features = ["errors", "text"] }
-macro_utilities = { path = "../../macro_utilities" }
+swimos_utilities = { path = "../../swimos_utilities", features = ["errors", "text"], version = "0.1.0" }
+swimos_macro_utilities = { path = "../../swimos_macro_utilities", version = "0.1.0" }
 proc-macro2 = { workspace = true }
 syn = { workspace = true, features = ["full"] }
 quote = { workspace = true }

diff --git a/api/swimos_form_derive/src/modifiers.rs b/api/swimos_form_derive/src/modifiers.rs
@@ -14,13 +14,15 @@
 
 use crate::structural::model::field::FieldSelector;
 use crate::SynValidation;
-use macro_utilities::attr_names::{CONV_NAME, FIELDS_NAME, NEWTYPE_PATH, SCHEMA_NAME, TAG_NAME};
-use macro_utilities::attributes::{IgnoreConsumer, NestedMetaConsumer};
-use macro_utilities::{
+use quote::ToTokens;
+use swimos_macro_utilities::attr_names::{
+    CONV_NAME, FIELDS_NAME, NEWTYPE_PATH, SCHEMA_NAME, TAG_NAME,
+};
+use swimos_macro_utilities::attributes::{IgnoreConsumer, NestedMetaConsumer};
+use swimos_macro_utilities::{
     CaseConvention, NameTransform, NameTransformConsumer, Symbol, Transformation,
     TypeLevelNameTransform, TypeLevelNameTransformConsumer,
 };
-use quote::ToTokens;
 use swimos_utilities::errors::Errors;
 use swimos_utilities::errors::{Validation, ValidationItExt};
 

diff --git a/api/swimos_form_derive/src/structural/model/enumeration/mod.rs b/api/swimos_form_derive/src/structural/model/enumeration/mod.rs
@@ -16,10 +16,10 @@ use crate::modifiers::{combine_enum_trans_parts, EnumPartConsumer, StructTransfo
 use crate::structural::model::record::{SegregatedStructModel, StructDef, StructModel};
 use crate::structural::model::ValidateFrom;
 use crate::SynValidation;
-use macro_utilities::attr_names::FORM_NAME;
-use macro_utilities::attributes::consume_attributes;
 use quote::ToTokens;
 use std::collections::HashSet;
+use swimos_macro_utilities::attr_names::FORM_NAME;
+use swimos_macro_utilities::attributes::consume_attributes;
 use swimos_utilities::errors::Errors;
 use swimos_utilities::errors::{Validation, ValidationItExt};
 use syn::{Attribute, DataEnum, Ident};

diff --git a/api/swimos_form_derive/src/structural/model/field/mod.rs b/api/swimos_form_derive/src/structural/model/field/mod.rs
@@ -13,16 +13,18 @@
 // limitations under the License.
 
 use crate::SynValidation;
-use macro_utilities::attr_names::{
-    ATTR_PATH, BODY_PATH, CONV_NAME, FORM_PATH, HEADER_BODY_PATH, HEADER_PATH, NAME_NAME,
-    SCHEMA_NAME, SKIP_PATH, SLOT_PATH, TAG_PATH,
-};
-use macro_utilities::attributes::NestedMetaConsumer;
-use macro_utilities::{FieldKind, NameTransform, NameTransformConsumer, Symbol, Transformation};
 use proc_macro2::TokenStream;
 use quote::{ToTokens, TokenStreamExt};
 use std::borrow::Cow;
 use std::ops::Add;
+use swimos_macro_utilities::attr_names::{
+    ATTR_PATH, BODY_PATH, CONV_NAME, FORM_PATH, HEADER_BODY_PATH, HEADER_PATH, NAME_NAME,
+    SCHEMA_NAME, SKIP_PATH, SLOT_PATH, TAG_PATH,
+};
+use swimos_macro_utilities::attributes::NestedMetaConsumer;
+use swimos_macro_utilities::{
+    FieldKind, NameTransform, NameTransformConsumer, Symbol, Transformation,
+};
 use swimos_utilities::errors::Validation;
 use syn::{Field, Ident, Meta, NestedMeta, Type};
 

diff --git a/api/swimos_form_derive/src/structural/model/record/mod.rs b/api/swimos_form_derive/src/structural/model/record/mod.rs
@@ -22,14 +22,14 @@ use crate::structural::model::field::{
 };
 use crate::structural::model::StructLike;
 use crate::SynValidation;
-use macro_utilities::attr_names::FORM_NAME;
-use macro_utilities::attributes::consume_attributes;
-use macro_utilities::CompoundTypeKind;
-use macro_utilities::FieldKind;
 use proc_macro2::TokenStream;
 use quote::ToTokens;
 use std::collections::HashSet;
 use std::ops::Add;
+use swimos_macro_utilities::attr_names::FORM_NAME;
+use swimos_macro_utilities::attributes::consume_attributes;
+use swimos_macro_utilities::CompoundTypeKind;
+use swimos_macro_utilities::FieldKind;
 use swimos_utilities::errors::Errors;
 use swimos_utilities::errors::{validate2, Validation, ValidationItExt};
 use swimos_utilities::format::comma_sep;

diff --git a/api/swimos_form_derive/src/structural/read/mod.rs b/api/swimos_form_derive/src/structural/read/mod.rs
@@ -19,7 +19,7 @@ use proc_macro2::{Span, TokenStream};
 use quote::ToTokens;
 use syn::{Generics, TypeGenerics};
 
-use macro_utilities::{CompoundTypeKind, FieldKind};
+use swimos_macro_utilities::{CompoundTypeKind, FieldKind};
 
 use crate::quote::TokenStreamExt;
 use crate::structural::model::enumeration::SegregatedEnumModel;

diff --git a/api/swimos_form_derive/src/structural/write/mod.rs b/api/swimos_form_derive/src/structural/write/mod.rs
@@ -19,9 +19,9 @@ use crate::structural::model::field::{
 };
 use crate::structural::model::record::{SegregatedStructModel, StructModel};
 use either::Either;
-use macro_utilities::CompoundTypeKind;
 use proc_macro2::TokenStream;
 use quote::ToTokens;
+use swimos_macro_utilities::CompoundTypeKind;
 use syn::{Generics, Pat, Path};
 
 /// Implements the StructuralWritable trait for either of [`SegregatedStructModel`] or

diff --git a/api/swimos_form_derive/src/tag/mod.rs b/api/swimos_form_derive/src/tag/mod.rs
@@ -13,12 +13,12 @@
 // limitations under the License.
 
 use crate::quote::TokenStreamExt;
-use macro_utilities::attr_names::{CONV_NAME, FORM_NAME, TAG_NAME};
-use macro_utilities::attributes::consume_attributes;
-use macro_utilities::{combine_name_transform, NameTransform, NameTransformConsumer};
 use proc_macro2::TokenStream;
 use quote::ToTokens;
 use std::fmt::{Display, Formatter};
+use swimos_macro_utilities::attr_names::{CONV_NAME, FORM_NAME, TAG_NAME};
+use swimos_macro_utilities::attributes::consume_attributes;
+use swimos_macro_utilities::{combine_name_transform, NameTransform, NameTransformConsumer};
 use swimos_utilities::errors::Errors;
 use swimos_utilities::errors::{Validation, ValidationItExt};
 

diff --git a/api/swimos_meta/Cargo.toml b/api/swimos_meta/Cargo.toml
@@ -5,6 +5,6 @@ authors = ["Swim Inc. developers [email protected]"]
 edition = "2021"
 
 [dependencies]
-swimos_model = { path = "../swimos_model" }
-swimos_form = { path = "../swimos_form" }
-swimos_api = { path = "../swimos_api" }
+swimos_model = { path = "../swimos_model", version = "0.1.0" }
+swimos_form = { path = "../swimos_form", version = "0.1.0" }
+swimos_api = { path = "../swimos_api", version = "0.1.0" }
diff --git a/api/swimos_model/Cargo.toml b/api/swimos_model/Cargo.toml
@@ -11,7 +11,7 @@ either = { workspace = true }
 num-bigint = { workspace = true }
 base64 = { workspace = true }
 http = { workspace = true }
-swimos_utilities = { path = "../../swimos_utilities", features = ["text", "encoding"] }
+swimos_utilities = { path = "../../swimos_utilities", features = ["text", "encoding"], version = "0.1.0" }
 num-traits = { workspace = true }
 thiserror = { workspace = true }
 

diff --git a/client/fixture/Cargo.toml b/client/fixture/Cargo.toml