Allow typeshare annotation using cfg_attr

Author: darrell-roberts

app/cli/snapshot-tests/test_cfg_attr_typeshare/input.rs

@@ -0,0 +1,4 @@
+#[cfg_attr(feature = "typeshare-support", typeshare)]
+pub struct TestStruct1 {
+    field: String,
+}

app/cli/snapshot-tests/test_cfg_attr_typeshare/output.ts

@@ -0,0 +1,4 @@
+export interface TestStruct1 {
+	field: string;
+}
+

app/engine/src/driver.rs

@@ -3,6 +3,7 @@ use std::{collections::HashMap, io};
 use anyhow::Context as _;
 use clap::{CommandFactory as _, FromArgMatches as _};
 use clap_complete::generate as generate_completions;
+use flexi_logger::AdaptiveFormat;
 use ignore::{overrides::OverrideBuilder, types::TypesBuilder, WalkBuilder};
 use itertools::Itertools;
 use lazy_format::lazy_format;
@@ -184,6 +185,11 @@ pub fn main_body<Helper>(personalizations: args::PersonalizeClap) -> anyhow::Res
 where
     Helper: LanguageHelper,
 {
+    flexi_logger::Logger::try_with_env_or_str("info")?
+        .adaptive_format_for_stderr(AdaptiveFormat::Opt)
+        .adaptive_format_for_stdout(AdaptiveFormat::Opt)
+        .start()?;
+
     let language_metas = Helper::LanguageSet::compute_language_metas()?;
     let command = StandardArgs::command();
     let command = add_personalizations(command, personalizations);

app/engine/src/parser.rs

@@ -1,6 +1,7 @@
 //! Source file parsing.
 use ignore::Walk;
 use itertools::Itertools;
+use log::debug;
 use proc_macro2::{Delimiter, Group};
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
 use std::{
@@ -185,6 +186,7 @@ pub fn parse_input(
     inputs
         .into_par_iter()
         .map(|parser_input| {
+            debug!("Parsing file {:?}", parser_input.file_path);
             // Performance nit: we don't need to clone in the error case;
             // map_err is taking unconditional ownership unnecessarily
             let content = std::fs::read_to_string(&parser_input.file_path).map_err(|err| {
@@ -285,7 +287,8 @@ pub fn parse(
 ) -> Result<Option<ParsedData>, ParseErrorSet> {
     // We will only produce output for files that contain the `#[typeshare]`
     // attribute, so this is a quick and easy performance win
-    if !source_code.contains("#[typeshare") {
+    if !source_code.contains("typeshare") {
+        debug!("No typeshare found in file");
         return Ok(None);
     }
 
@@ -296,7 +299,6 @@ pub fn parse(
         .map_err(|err| ParseError::new(&err.span(), ParseErrorKind::SynError(err)))?;
 
     import_visitor.visit_file(&file_contents);
-
     import_visitor.parsed_data().map(Some)
 }
 
@@ -690,12 +692,16 @@ fn parse_const_expr(e: &Expr) -> Result<RustConstExpr, ParseError> {
 
 // Helpers
 
-/// Checks the given attrs for `#[typeshare]`
+/// Checks the given attrs for `#[typeshare]` or `#[cfg_attr(<cond>, typeshare)]`
 pub(crate) fn has_typeshare_annotation(attrs: &[syn::Attribute]) -> bool {
+    let check_cfg_attr = |attr| {
+        get_meta_items(attr, "cfg_attr").iter().any(|item| {
+            matches!(item, Meta::Path(path) if path.segments.iter().any(|segment| segment.ident == TYPESHARE))
+        })
+    };
     attrs
         .iter()
-        .flat_map(|attr| attr.path().segments.clone())
-        .any(|segment| segment.ident == TYPESHARE)
+        .any(|attr| attr.path().is_ident(TYPESHARE) || check_cfg_attr(attr))
 }
 
 pub(crate) fn serde_rename_all(attrs: &[syn::Attribute]) -> Option<String> {
@@ -1096,4 +1102,10 @@ mod test_get_decorators {
         );
         assert_eq!(decorators.type_override_for_lang("kotlin"), None);
     }
+
+    #[test]
+    fn test_cfg_attr() {
+        let attr = parse_attr(r#"#[cfg_attr(feature = "typeshare", typeshare)]"#);
+        assert!(has_typeshare_annotation(&attr));
+    }
 }