Merge pull request 1Password#187 from darrell-roberts/multiple-target-os-option

Allow multiple target-os

Author: charlespierce

Cargo.lock

@@ -13,10 +13,10 @@ ci = ["github"]
 installers = ["shell", "powershell"]
 # Target platforms to build apps for (Rust target-triple syntax)
 targets = [
-    "x86_64-unknown-linux-gnu",
-    "x86_64-apple-darwin",
-    "x86_64-pc-windows-msvc",
-    "aarch64-apple-darwin",
+  "x86_64-unknown-linux-gnu",
+  "x86_64-apple-darwin",
+  "x86_64-pc-windows-msvc",
+  "aarch64-apple-darwin",
 ]
 
 [profile.test]
@@ -32,3 +32,7 @@ incremental = true
 # The profile that 'cargo dist' will build with
 [profile.dist]
 inherits = "release"
+
+[workspace.dependencies]
+log = "0.4"
+flexi_logger = "0.28"

Cargo.toml

@@ -23,4 +23,6 @@ rayon = "1.10"
 serde = { version = "1", features = ["derive"] }
 toml = "0.8"
 typeshare-core = { path = "../core", version = "1.10.0-beta.7" }
+log.workspace = true
+flexi_logger.workspace = true
 anyhow = "1"

cli/Cargo.toml

@@ -150,9 +150,11 @@ pub(crate) fn build_command() -> Command<'static> {
                 .min_values(1),
         ).arg(
             Arg::new(ARG_TARGET_OS)
+                .short('t')
                 .long("target-os")
                 .help("Optional restrict to target_os")
                 .takes_value(true)
+                .multiple_values(true)
                 .required(false)
         )
 }

cli/src/args.rs

@@ -65,7 +65,7 @@ pub(crate) struct Config {
     #[cfg(feature = "go")]
     pub go: GoParams,
     #[serde(skip)]
-    pub target_os: Option<String>,
+    pub target_os: Vec<String>,
 }
 
 pub(crate) fn store_config(config: &Config, file_path: Option<&str>) -> anyhow::Result<()> {

cli/src/config.rs

@@ -10,6 +10,7 @@ use args::{
 use clap::ArgMatches;
 use config::Config;
 use ignore::{overrides::OverrideBuilder, types::TypesBuilder, WalkBuilder};
+use log::error;
 use parse::{all_types, parse_input, parser_inputs};
 use rayon::iter::ParallelBridge;
 use std::collections::{BTreeMap, HashMap};
@@ -30,6 +31,11 @@ mod parse;
 mod writer;
 
 fn main() -> anyhow::Result<()> {
+    flexi_logger::Logger::try_with_env()
+        .unwrap()
+        .start()
+        .unwrap();
+
     #[allow(unused_mut)]
     let mut command = build_command();
 
@@ -122,7 +128,7 @@ fn main() -> anyhow::Result<()> {
         parser_inputs(walker_builder, language_type, multi_file).par_bridge(),
         &ignored_types,
         multi_file,
-        target_os,
+        &target_os,
     )?;
 
     // Collect all the types into a map of the file name they
@@ -220,7 +226,10 @@ fn override_configuration(mut config: Config, options: &ArgMatches) -> Config {
         config.go.package = go_package.to_string();
     }
 
-    config.target_os = options.value_of(ARG_TARGET_OS).map(|s| s.to_string());
+    config.target_os = options
+        .get_many::<String>(ARG_TARGET_OS)
+        .map(|arg| arg.into_iter().map(ToString::to_string).collect::<Vec<_>>())
+        .unwrap_or_default();
     config
 }
 
@@ -233,7 +242,7 @@ fn check_parse_errors(parsed_crates: &BTreeMap<CrateName, ParsedData>) -> anyhow
     {
         errors_encountered = true;
         for error in &data.errors {
-            eprintln!(
+            error!(
                 "Parsing error: \"{}\" in crate \"{}\" for file \"{}\"",
                 error.error, error.crate_name, error.file_name
             );

cli/src/main.rs

@@ -91,7 +91,7 @@ pub fn parse_input(
     inputs: impl ParallelIterator<Item = ParserInput>,
     ignored_types: &[&str],
     multi_file: bool,
-    target_os: Option<String>,
+    target_os: &[String],
 ) -> anyhow::Result<BTreeMap<CrateName, ParsedData>> {
     inputs
         .into_par_iter()
@@ -111,7 +111,7 @@ pub fn parse_input(
                     file_path,
                     ignored_types,
                     multi_file,
-                    target_os.clone(),
+                    target_os,
                 )
                 .with_context(|| format!("Failed to parse: {file_name}"))?;
 

cli/src/parse.rs

@@ -2,6 +2,7 @@
 use crate::args::{ARG_OUTPUT_FILE, ARG_OUTPUT_FOLDER};
 use anyhow::Context;
 use clap::ArgMatches;
+use log::info;
 use std::{
     collections::{BTreeMap, HashMap},
     fs,
@@ -58,7 +59,7 @@ fn check_write_file(outfile: &PathBuf, output: Vec<u8>) -> anyhow::Result<()> {
             // avoid writing the file to leave the mtime intact
             // for tools which might use it to know when to
             // rebuild.
-            println!("Skipping writing to {outfile:?} no changes");
+            info!("Skipping writing to {outfile:?} no changes");
             return Ok(());
         }
         _ => {}

cli/src/writer.rs

@@ -14,10 +14,12 @@ thiserror = "1"
 itertools = "0.12"
 lazy_format = "2"
 joinery = "2"
+log.workspace = true
+flexi_logger.workspace = true
 
 [dev-dependencies]
-anyhow = "1"
 expect-test = "1.5"
 once_cell = "1"
 cool_asserts = "2"
 syn = { version = "2", features = ["full", "visit", "extra-traits"] }
+anyhow = "1"

core/Cargo.toml

@@ -4,6 +4,7 @@
 use std::collection::HashMap;
 
 #[typeshare]
+#[serde(tag = "type", content = "content")]
 pub enum TestEnum {
     Variant1,
     #[cfg(target_os = "ios")]
@@ -14,6 +15,17 @@ pub enum TestEnum {
     Variant4,
     #[cfg(target_os = "android")]
     Variant5,
+    #[cfg(target_os = "macos")]
+    Variant7 {
+        field1: String,
+    },
+    #[cfg(any(target_os = "android", target_os = "ios"))]
+    Variant8,
+    Variant9 {
+        #[cfg(not(target_os = "macos"))]
+        field1: String,
+        field2: String,
+    },
 }
 
 #[typeshare]
@@ -32,3 +44,39 @@ pub enum Test {}
 #[cfg(feature = "super")]
 #[cfg(target_os = "android")]
 pub enum SomeEnum {}
+
+#[typeshare]
+#[cfg(any(target_os = "ios", target_os = "android"))]
+pub struct ManyStruct;
+
+#[typeshare]
+#[cfg(any(target_os = "android", target_os = "ios"))]
+pub struct MultipleTargets;
+
+#[typeshare]
+#[cfg(not(any(target_os = "android", target_os = "ios")))]
+pub struct DefinedTwice {
+    field1: u64,
+}
+
+#[typeshare]
+#[cfg(any(target_os = "android", target_os = "ios"))]
+pub struct DefinedTwice {
+    field1: String,
+}
+
+#[typeshare]
+#[cfg(not(any(target_os = "wasm32", target_os = "ios")))]
+pub struct Excluded;
+
+#[typeshare]
+#[cfg(not(target_os = "wasm32"))]
+pub struct OtherExcluded;
+
+#[typeshare]
+#[cfg(not(target_os = "android"))]
+pub struct AndroidExcluded;
+
+#[typeshare]
+#[cfg(all(feature = "my-feature", not(target_os = "ios")))]
+pub struct NestedNotTarget1;