switch from outrecord to String

no need for a full record
DougAnderson444 · Jan 11, 2024 · 8fc1eeb · 8fc1eeb
1 parent 650c7f4
commit 8fc1eeb
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 66 deletions.
diff --git a/crates/seed-keeper-wit-ui/src/output.rs b/crates/seed-keeper-wit-ui/src/output.rs
@@ -18,13 +18,13 @@ impl Output {
             username: self
                 .username
                 .as_ref()
-                .map(|v| v.value.clone())
+                .map(|v| v.clone())
                 .unwrap_or_default()
                 .into(),
             password: self
                 .password
                 .as_ref()
-                .map(|v| v.value.clone())
+                .map(|v| v.clone())
                 .unwrap_or_default()
                 .into(),
             encrypted: self.encrypted.clone().into(),
@@ -66,11 +66,11 @@ impl Output {
             "{}{}",
             self.username
                 .as_ref()
-                .map(|v| v.value.clone())
+                .map(|v| v.clone())
                 .unwrap_or_default(),
             self.password
                 .as_ref()
-                .map(|v| v.value.clone())
+                .map(|v| v.clone())
                 .unwrap_or_default()
         )
     }
@@ -84,7 +84,7 @@ impl StructObject for Output {
             "username" => Some(Value::from_struct_object(self.username.clone())),
             "password" => Some(Value::from_struct_object(self.password.clone())),
             "value" => Some(Value::from(self.concat())),
-            // self.username.value
+            // self.username
             "count" => Some(Value::from(self.calculate())),
             "seed" => match &self.seed {
                 Some(seed) => Some(Value::from(seed.clone())),
@@ -104,14 +104,14 @@ impl StructObject for Output {
 
 /// Username captures is the username input value.
 #[derive(Debug, Default, Clone)]
-pub(crate) struct Username(Option<wurbo_types::Outrecord>);
+pub(crate) struct Username(Option<String>);
 
 impl StructObject for Username {
     fn get_field(&self, name: &str) -> Option<Value> {
         match name {
             "value" => Some(Value::from(
                 // Deref self and use value if is_Some, otherwise use ""
-                self.as_ref().map(|v| v.value.clone()).unwrap_or_default(),
+                self.as_ref().map(|v| v.clone()).unwrap_or_default(),
             )),
             _ => None,
         }
@@ -123,20 +123,20 @@ impl StructObject for Username {
     }
 }
 
-impl From<&wurbo_types::Outrecord> for Username {
-    fn from(context: &wurbo_types::Outrecord) -> Self {
+impl From<&String> for Username {
+    fn from(context: &String) -> Self {
         Username(Some(context.clone()))
     }
 }
 
-impl From<Option<wurbo_types::Outrecord>> for Username {
-    fn from(context: Option<wurbo_types::Outrecord>) -> Self {
+impl From<Option<String>> for Username {
+    fn from(context: Option<String>) -> Self {
         Username(context)
     }
 }
 
 impl Deref for Username {
-    type Target = Option<wurbo_types::Outrecord>;
+    type Target = Option<String>;
 
     fn deref(&self) -> &Self::Target {
         &self.0
@@ -147,15 +147,14 @@ impl Deref for Username {
 /// We wrap it as a newtype so that we can impl [StructObject] for it
 /// We impl [Deref] so we can access the inner of the Rust smart pointer
 #[derive(Debug, Default, Clone)]
-pub(crate) struct Password(Option<wurbo_types::Outrecord>);
+pub(crate) struct Password(Option<String>);
 
 impl StructObject for Password {
-    // If you add fields to the Outrecord, you'd add them also here below:
     fn get_field(&self, name: &str) -> Option<Value> {
         match name {
             "value" => Some(Value::from(
                 // Deref self and use value if is_Some, otherwise use ""
-                self.as_ref().map(|v| v.value.clone()).unwrap_or_default(),
+                self.as_ref().map(|v| v.clone()).unwrap_or_default(),
             )),
             _ => None,
         }
@@ -167,20 +166,20 @@ impl StructObject for Password {
     }
 }
 
-impl From<&wurbo_types::Outrecord> for Password {
-    fn from(context: &wurbo_types::Outrecord) -> Self {
+impl From<&String> for Password {
+    fn from(context: &String) -> Self {
         Password(Some(context.clone()))
     }
 }
 
-impl From<Option<wurbo_types::Outrecord>> for Password {
-    fn from(context: Option<wurbo_types::Outrecord>) -> Self {
+impl From<Option<String>> for Password {
+    fn from(context: Option<String>) -> Self {
         Password(context)
     }
 }
 
 impl Deref for Password {
-    type Target = Option<wurbo_types::Outrecord>;
+    type Target = Option<String>;
 
     fn deref(&self) -> &Self::Target {
         &self.0

diff --git a/crates/seed-keeper-wit-ui/wit/types.wit b/crates/seed-keeper-wit-ui/wit/types.wit
@@ -17,10 +17,6 @@ interface wurbo-types {
     placeholder: string
   }
 
-  record outrecord {
-    value: string,
-  }
-
   type encrypted = list<u8>;
 
   record output {
@@ -29,9 +25,9 @@ interface wurbo-types {
     // optional id string: None is intial render, Some for update value
     id: option<string>,
     // the output dest for the username changes
-    username: option<outrecord>,
+    username: option<string>,
     // the output dest for the password changes
-    password: option<outrecord>,
+    password: option<string>,
     // the output dest for the encrypted changes
     encrypted: option<encrypted>,
   }
@@ -46,8 +42,8 @@ interface wurbo-types {
   // Context variants
   variant context {
     all-content(content),
-    username(outrecord),
-    password(outrecord),
+    username(string),
+    password(string),
     encrypted(encrypted),
     submit
   }

diff --git a/examples/crates/aggregate-wit-ui/wit/deps/edwards-ui/types.wit b/examples/crates/aggregate-wit-ui/wit/deps/edwards-ui/types.wit
@@ -17,19 +17,15 @@ interface wurbo-types {
     placeholder: string
   }
 
-  record outrecord {
-    value: string,
-  }
-
   record output {
     // the resulting value of the total outputs combined
     value: option<string>,
     // optional id string: None is intial render, Some for update value
     id: option<string>,
     // the output dest for the message changes
-    message: option<outrecord>,
+    message: option<string>,
     // the output dest for the signature changes
-    signature: option<outrecord>
+    signature: option<string>
   }
 
   // COntent for the entire page
@@ -42,8 +38,8 @@ interface wurbo-types {
   // Context variants
   variant context {
     all-content(content),
-    message(outrecord),
-    submit(outrecord),
+    message(string),
+    submit(string),
   }
 
 }
diff --git a/examples/crates/aggregate-wit-ui/wit/deps/seed-keeper-ui/types.wit b/examples/crates/aggregate-wit-ui/wit/deps/seed-keeper-ui/types.wit
@@ -17,10 +17,6 @@ interface wurbo-types {
     placeholder: string
   }
 
-  record outrecord {
-    value: string,
-  }
-
   type encrypted = list<u8>;
 
   record output {
@@ -29,9 +25,9 @@ interface wurbo-types {
     // optional id string: None is intial render, Some for update value
     id: option<string>,
     // the output dest for the username changes
-    username: option<outrecord>,
+    username: option<string>,
     // the output dest for the password changes
-    password: option<outrecord>,
+    password: option<string>,
     // the output dest for the encrypted changes
     encrypted: option<encrypted>,
   }
@@ -46,8 +42,8 @@ interface wurbo-types {
   // Context variants
   variant context {
     all-content(content),
-    username(outrecord),
-    password(outrecord),
+    username(string),
+    password(string),
     encrypted(encrypted),
     submit
   }

diff --git a/examples/crates/edwards-ui/src/output.rs b/examples/crates/edwards-ui/src/output.rs
@@ -31,14 +31,14 @@ impl StructObject for Output {
 
 /// Message captures is the message input value.
 #[derive(Debug, Default, Clone)]
-pub(crate) struct Message(Option<wurbo_types::Outrecord>);
+pub(crate) struct Message(Option<String>);
 
 impl StructObject for Message {
     fn get_field(&self, name: &str) -> Option<Value> {
         match name {
             "value" => Some(Value::from(
                 // Deref self and use value if is_Some, otherwise use ""
-                self.as_ref().map(|v| v.value.clone()).unwrap_or_default(),
+                self.as_ref().map(|v| v.clone()).unwrap_or_default(),
             )),
             _ => None,
         }
@@ -50,20 +50,20 @@ impl StructObject for Message {
     }
 }
 
-impl From<&wurbo_types::Outrecord> for Message {
-    fn from(context: &wurbo_types::Outrecord) -> Self {
+impl From<&String> for Message {
+    fn from(context: &String) -> Self {
         Message(Some(context.clone()))
     }
 }
 
-impl From<Option<wurbo_types::Outrecord>> for Message {
-    fn from(context: Option<wurbo_types::Outrecord>) -> Self {
+impl From<Option<String>> for Message {
+    fn from(context: Option<String>) -> Self {
         Message(context)
     }
 }
 
 impl Deref for Message {
-    type Target = Option<wurbo_types::Outrecord>;
+    type Target = Option<String>;
 
     fn deref(&self) -> &Self::Target {
         &self.0
@@ -80,7 +80,7 @@ impl Signature {
     pub(crate) fn sign(&mut self, msg: &Message) {
         let v = msg
             .as_ref()
-            .map(|v| v.value.clone())
+            .map(|v| v.clone())
             .unwrap_or_default()
             .into_bytes();
         if !v.is_empty() {

diff --git a/examples/crates/edwards-ui/wit/types.wit b/examples/crates/edwards-ui/wit/types.wit
@@ -17,19 +17,15 @@ interface wurbo-types {
     placeholder: string
   }
 
-  record outrecord {
-    value: string,
-  }
-
   record output {
     // the resulting value of the total outputs combined
     value: option<string>,
     // optional id string: None is intial render, Some for update value
     id: option<string>,
     // the output dest for the message changes
-    message: option<outrecord>,
+    message: option<string>,
     // the output dest for the signature changes
-    signature: option<outrecord>
+    signature: option<string>
   }
 
   // COntent for the entire page
@@ -42,8 +38,8 @@ interface wurbo-types {
   // Context variants
   variant context {
     all-content(content),
-    message(outrecord),
-    submit(outrecord),
+    message(string),
+    submit(string),
   }
 
 }
diff --git a/examples/sveltekit/src/routes/importables.js b/examples/sveltekit/src/routes/importables.js
@@ -10,12 +10,11 @@ export function buildCodeString(namespace) {
             e.preventDefault();
           }
 
-          let ctx = {
-            tag: e.target.name,
-            val: {
-              value: e.target.value,
-            }
-          };
+          let val = (e.target.dataset.contextValue && e.target.value)
+             ? { ctx: JSON.parse(e.target.dataset.contextValue), value: e.target.value }
+             : e.target.dataset.contextValue || e.target.value;
+          
+          let ctx = { tag: e.target.dataset.contextName || e.target.name, val };
 
           let el = e.target.closest('[data-slot]');
           if(el) {