From 0a6baeddf4685ffe78300dfdd2a0b65c3fa2c14b Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 3 Aug 2022 11:21:30 -0500
Subject: [PATCH] Improve some support in `factc`: (#4580)

* Support CLI parameters for string encoding
* Fix `--skip-validate`
* Fix printing binary to stdout
---
 crates/environ/examples/factc.rs | 44 +++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/crates/environ/examples/factc.rs b/crates/environ/examples/factc.rs
index 763b0cdf0c..98e7c68682 100644
--- a/crates/environ/examples/factc.rs
+++ b/crates/environ/examples/factc.rs
@@ -1,7 +1,7 @@
 use anyhow::{bail, Context, Result};
 use clap::Parser;
+use std::io::Write;
 use std::path::PathBuf;
-use std::str;
 use wasmparser::{Payload, Validator, WasmFeatures};
 use wasmtime_environ::component::*;
 use wasmtime_environ::fact::Module;
@@ -55,10 +55,25 @@ struct Factc {
     #[clap(short, long)]
     text: bool,
 
+    #[clap(long, parse(try_from_str = parse_string_encoding), default_value = "utf8")]
+    lift_str: StringEncoding,
+
+    #[clap(long, parse(try_from_str = parse_string_encoding), default_value = "utf8")]
+    lower_str: StringEncoding,
+
     /// TODO
     input: PathBuf,
 }
 
+fn parse_string_encoding(name: &str) -> anyhow::Result<StringEncoding> {
+    Ok(match name {
+        "utf8" => StringEncoding::Utf8,
+        "utf16" => StringEncoding::Utf16,
+        "compact-utf16" => StringEncoding::CompactUtf16,
+        other => anyhow::bail!("invalid string encoding: `{other}`"),
+    })
+}
+
 fn main() -> Result<()> {
     Factc::parse().execute()
 }
@@ -129,7 +144,7 @@ impl Factc {
                     lower_ty: ty,
                     lower_options: AdapterOptions {
                         instance: RuntimeComponentInstanceIndex::from_u32(0),
-                        string_encoding: StringEncoding::Utf8,
+                        string_encoding: self.lower_str,
                         memory64: self.lower64,
                         // Pessimistically assume that memory/realloc are going to be
                         // required for this trampoline and provide it. Avoids doing
@@ -143,7 +158,7 @@ impl Factc {
                     },
                     lift_options: AdapterOptions {
                         instance: RuntimeComponentInstanceIndex::from_u32(1),
-                        string_encoding: StringEncoding::Utf8,
+                        string_encoding: self.lift_str,
                         memory64: self.lift64,
                         memory: Some(dummy_memory(self.lift64)),
                         realloc: Some(dummy_def()),
@@ -165,13 +180,6 @@ impl Factc {
             fact_module.adapt(&format!("adapter{i}"), adapter);
         }
         let wasm = fact_module.encode();
-        Validator::new_with_features(WasmFeatures {
-            multi_memory: true,
-            memory64: true,
-            ..WasmFeatures::default()
-        })
-        .validate_all(&wasm)
-        .context("failed to validate generated module")?;
 
         let output = if self.text {
             wasmprinter::print_bytes(&wasm)
@@ -180,12 +188,24 @@ impl Factc {
         } else if self.output.is_none() && atty::is(atty::Stream::Stdout) {
             bail!("cannot print binary wasm output to a terminal unless `-t` flag is passed")
         } else {
-            wasm
+            wasm.clone()
         };
 
         match &self.output {
             Some(file) => std::fs::write(file, output).context("failed to write output file")?,
-            None => println!("{}", str::from_utf8(&output).unwrap()),
+            None => std::io::stdout()
+                .write_all(&output)
+                .context("failed to write to stdout")?,
+        }
+
+        if !self.skip_validate {
+            Validator::new_with_features(WasmFeatures {
+                multi_memory: true,
+                memory64: true,
+                ..WasmFeatures::default()
+            })
+            .validate_all(&wasm)
+            .context("failed to validate generated module")?;
         }
 
         Ok(())