Fix variant render logic and drop Result/Optional

Author: jorge-vasquez-2301

src/codegen/interface.rs

@@ -122,37 +122,6 @@ impl Interface {
 
  import scala.scalajs.js
 
- sealed trait Optional[+A] extends js.Object {{
- val tag: String
- val `val`: js.UndefOr[js.Object] = js.undefined
- }}
- object Optional {{
- def some[A](value: A): Optional[A] = new Optional[A] {{
- val tag: String = \"some\"
- override val `val`: js.UndefOr[js.Object] = js.Object(value)
- }}
-
- def none: Optional[Nothing] = new Optional[Nothing] {{
- val tag: String = \"none\"
- }}
- }}
-
- sealed trait Result[+Ok, +Err] extends js.Object {{
- val tag: String
- val `val`: js.UndefOr[js.Object] = js.undefined
- }}
- object Result {{
- def ok[Ok](value: Ok): Result[Ok, Nothing] = new Result[Ok, Nothing] {{
- val tag: String = \"ok\"
- override val `val`: js.UndefOr[js.Object] = js.Object(value)
- }}
-
- def err[Err](value: Err): Result[Nothing, Err] = new Result[Nothing, Err] {{
- val tag: String = \"err\"
- override val `val`: js.UndefOr[js.Object] = js.Object(value)
- }}
- }}
-
  {records}
 
  {variants}

src/codegen/variant.rs

@@ -81,19 +81,22 @@ impl Render for Variant {
  name: case_name,
  ty,
  }| {
- let (def_or_val, param_list, val) = if let Some(ty) = ty {
+ let (def_or_val, param_list, val, type_tag) = if let Some(ty) = ty {
  (
  "def",
  format!("(value: {ty})"),
- "override val `val`: js.UndefOr[js.Object] = js.Object(value)",
+ "override val `val`: js.UndefOr[Type] = value",
+ format!("type Type = {ty}"),
  )
  } else {
- ("val", String::new(), "")
+ ("val", String::new(), "", "type Type = Nothing".to_owned())
  };
 
  format!(
  "
- {def_or_val} {case_name}{param_list}: {name} = new {name} {{
+ {def_or_val} {case_name}{param_list} = new {name} {{
+ {type_tag}
+ 
  val tag: String = \"{case_name}\"
  {val}
  }}
@@ -107,8 +110,10 @@ impl Render for Variant {
  Ok(format!(
  "
  sealed trait {name} extends js.Object {{ self =>
+ type Type
+
  val tag: String
- val `val`: js.UndefOr[js.Object] = js.undefined
+ val `val`: js.UndefOr[Type]
  }}
 
  object {name} {{