Support option and result types

Author: jorge-vasquez-2301

src/codegen/interface.rs

@@ -124,6 +124,37 @@ 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/types/type_map.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use id_arena::Id;
-use wit_parser::{TypeDef, TypeDefKind, UnresolvedPackage};
+use wit_parser::{Result_, TypeDef, TypeDefKind, UnresolvedPackage};
 
 use super::{ConcreteName, Constructor, TypeName};
 
@@ -34,12 +34,31 @@ impl From<&UnresolvedPackage> for TypeMap {
  TypeDefKind::List(ty) => Some((
  id,
  TypeName::Constructor(Constructor::new(
- "List",
+ "js.Array",
  vec![ty],
  &TypeMap(hash_map1.clone()),
  )),
  )),
- _ => todo!("Support other kinds of types"),
+ TypeDefKind::Option(ty) => Some((
+ id,
+ TypeName::Constructor(Constructor::new(
+ "Optional",
+ vec![ty],
+ &TypeMap(hash_map1.clone()),
+ )),
+ )),
+ TypeDefKind::Result(Result_ {
+ ok: Some(ok),
+ err: Some(err),
+ }) => Some((
+ id,
+ TypeName::Constructor(Constructor::new(
+ "Result",
+ vec![ok, err],
+ &TypeMap(hash_map1.clone()),
+ )),
+ )),
+ _ => todo!("Support other kinds of constructors"),
  }
  } else {
  None

src/types/type_name.rs

@@ -44,7 +44,7 @@ pub struct Constructor {
 impl Constructor {
  pub fn new(name: &str, params: Vec<WitType>, type_map: &TypeMap) -> Self {
  Self {
- name: name.to_case(Case::UpperCamel),
+ name: name.to_owned(),
  params: params
  .into_iter()
  .map(|param| Type::from_wit(param, type_map).to_string())