gen comments

Author: robert masen

crates/cli-support/src/js/mod.rs

@@ -35,13 +35,15 @@ pub struct Context<'a> {
 
 #[derive(Default)]
 pub struct ExportedClass {
+    comments: String,
     contents: String,
     typescript: String,
     constructor: Option<String>,
     fields: Vec<ClassField>,
 }
 
 struct ClassField {
+    comments: String,
     name: String,
     readonly: bool,
 }
@@ -52,9 +54,12 @@ pub struct SubContext<'a, 'b: 'a> {
 }
 
 impl<'a> Context<'a> {
-    fn export(&mut self, name: &str, contents: &str) {
+    fn export(&mut self, name: &str, contents: &str, comments: Option<String>) {
         let contents = deindent(contents);
         let contents = contents.trim();
+        if let Some(ref c) = comments {
+            self.globals.push_str(c);
+        }
         let global = if self.config.nodejs {
             if contents.starts_with("class") {
                 format!("{1}\nmodule.exports.{0} = {0};\n", name, contents)
@@ -396,7 +401,7 @@ impl<'a> Context<'a> {
             .with_context(|_| {
                 format!("failed to generate internal JS function `{}`", name)
             })?;
-        self.export(name, &contents);
+        self.export(name, &contents, None);
         Ok(())
     }
 
@@ -461,7 +466,7 @@ impl<'a> Context<'a> {
                 function(ptr) {{
                     return addHeapObject({}.__construct(ptr));
                 }}
-            ", name));
+            ", name), None);
         }
 
         for field in class.fields.iter() {
@@ -484,7 +489,7 @@ impl<'a> Context<'a> {
                 .method(true)
                 .ret(&Some(descriptor))?
                 .finish("", &format!("wasm.{}", wasm_getter));
-
+            dst.push_str(&field.comments);
             dst.push_str("get ");
             dst.push_str(&field.name);
             dst.push_str(&get);
@@ -510,7 +515,7 @@ impl<'a> Context<'a> {
         dst.push_str("}\n");
         ts_dst.push_str("}\n");
 
-        self.export(&name, &dst);
+        self.export(&name, &dst, Some(class.comments.clone()));
         self.typescript.push_str(&ts_dst);
 
         Ok(())
@@ -534,7 +539,7 @@ impl<'a> Context<'a> {
 
     fn rewrite_imports(&mut self, module_name: &str) {
         for (name, contents) in self._rewrite_imports(module_name) {
-            self.export(&name, &contents);
+            self.export(&name, &contents, None);
         }
     }
 
@@ -691,7 +696,7 @@ impl<'a> Context<'a> {
                         return;
                     throw new Error('stack is not currently empty');
                 }
-            ");
+            ", None);
         }
     }
 
@@ -715,7 +720,7 @@ impl<'a> Context<'a> {
                         throw new Error('slab is not currently empty');
                     }}
                 }}
-            ", initial_values.len()));
+            ", initial_values.len()), None);
         }
     }
 
@@ -1406,7 +1411,7 @@ impl<'a> Context<'a> {
 
         // Ensure a blank line between adjacent items, and ensure everything is
         // terminated with a newline.
-        while !self.globals.ends_with("\n\n\n") {
+        while !self.globals.ends_with("\n\n\n") && !self.globals.ends_with("*/\n") {
             self.globals.push_str("\n");
         }
         self.globals.push_str(s);
@@ -1452,14 +1457,16 @@ impl<'a, 'b> SubContext<'a, 'b> {
             self.generate_enum(e);
         }
         for s in self.program.structs.iter() {
-            self.cx.exported_classes
+            let mut class = self.cx.exported_classes
                 .entry(s.name.clone())
-                .or_insert_with(Default::default)
-                .fields
-                .extend(s.fields.iter().map(|s| {
+                .or_insert_with(Default::default);
+            class.comments = format_doc_comments(&s.comments);
+            class.fields
+                .extend(s.fields.iter().map(|f| {
                     ClassField {
-                        name: s.name.clone(),
-                        readonly: s.readonly,
+                        name: f.name.clone(),
+                        readonly: f.readonly,
+                        comments: format_doc_comments(&f.comments),
                     }
                 }));
         }
@@ -1477,7 +1484,7 @@ impl<'a, 'b> SubContext<'a, 'b> {
         let (js, ts) = Js2Rust::new(&export.function.name, self.cx)
             .process(descriptor.unwrap_function())?
             .finish("function", &format!("wasm.{}", export.function.name));
-        self.cx.export(&export.function.name, &js);
+        self.cx.export(&export.function.name, &js, Some(format_doc_comments(&export.comments)));
         self.cx.globals.push_str("\n");
         self.cx.typescript.push_str("export ");
         self.cx.typescript.push_str(&ts);
@@ -1593,7 +1600,7 @@ impl<'a, 'b> SubContext<'a, 'b> {
             function() {{
                 return addHeapObject({});
             }}
-        ", obj));
+        ", obj), None);
         Ok(())
     }
 
@@ -1688,7 +1695,7 @@ impl<'a, 'b> SubContext<'a, 'b> {
             .catch(import.catch)
             .process(descriptor.unwrap_function())?
             .finish(&target);
-        self.cx.export(&import.shim, &js);
+        self.cx.export(&import.shim, &js, None);
         Ok(())
     }
 
@@ -1698,7 +1705,7 @@ impl<'a, 'b> SubContext<'a, 'b> {
         for variant in enum_.variants.iter() {
             variants.push_str(&format!("{}:{},", variant.name, variant.value));
         }
-        self.cx.export(&enum_.name, &format!("Object.freeze({{ {} }})", variants));
+        self.cx.export(&enum_.name, &format!("Object.freeze({{ {} }})", variants), Some(format_doc_comments(&enum_.comments)));
         self.cx.typescript.push_str(&format!("export enum {} {{", enum_.name));
 
         variants.clear();
@@ -1764,3 +1771,9 @@ fn deindent(s: &str) -> String {
     }
     ret
 }
+
+
+fn format_doc_comments(comments: &Vec<String>) -> String {
+    let body: String = comments.iter().map(|c| format!("*{}\n", c.trim_matches('"'))).collect();
+    format!("/**\n{}*/\n", body)
+}