Filter out special reducers in generate cli

This updates filtering of `__init__` to exclude all special reducers, as well as moves the filtering to centralised place before calling language-specific generate command.

Author: RReverser

crates/cli/src/subcommands/generate/csharp.rs

@@ -1471,16 +1471,13 @@ pub fn autogen_csharp_reducer(ctx: &GenCtx, reducer: &ReducerDef, namespace: &st
 pub fn autogen_csharp_globals(items: &[GenItem], namespace: &str) -> Vec<Vec<(String, String)>> {
     let reducers: Vec<&ReducerDef> = items
         .iter()
-        .map(|i| {
+        .filter_map(|i| {
             if let GenItem::Reducer(reducer) = i {
                 Some(reducer)
             } else {
                 None
             }
         })
-        .filter(|r| r.is_some())
-        .flatten()
-        .filter(|r| r.name != "__init__")
         .collect();
     let reducer_names: Vec<String> = reducers
         .iter()

crates/cli/src/subcommands/generate/mod.rs

@@ -195,7 +195,10 @@ pub fn extract_from_moduledef(module: ModuleDef) -> (GenCtx, impl Iterator<Item
     let iter = itertools::chain!(
         misc_exports.into_iter().map(GenItem::from_misc_export),
         tables.into_iter().map(GenItem::Table),
-        reducers.into_iter().map(GenItem::Reducer),
+        reducers
+            .into_iter()
+            .filter(|r| !(r.name.starts_with("__") && r.name.ends_with("__")))
+            .map(GenItem::Reducer),
     );
     (ctx, iter)
 }
@@ -236,7 +239,6 @@ impl GenItem {
                 };
                 Some((rust::rust_type_file_name(name), code))
             }
-            GenItem::Reducer(reducer) if reducer.name == "__init__" => None,
             GenItem::Reducer(reducer) => {
                 let code = rust::autogen_rust_reducer(ctx, reducer);
                 Some((rust::rust_reducer_file_name(&reducer.name), code))
@@ -265,8 +267,6 @@ impl GenItem {
                 AlgebraicType::Builtin(_) => todo!(),
                 AlgebraicType::Ref(_) => todo!(),
             },
-            // I'm not sure exactly how this should work; when does init_database get called with csharp?
-            GenItem::Reducer(reducer) if reducer.name == "__init__" => None,
             GenItem::Reducer(reducer) => {
                 let code = python::autogen_python_reducer(ctx, reducer);
                 let name = reducer.name.to_case(Case::Snake);
@@ -296,8 +296,6 @@ impl GenItem {
                 AlgebraicType::Builtin(_) => todo!(),
                 AlgebraicType::Ref(_) => todo!(),
             },
-            // I'm not sure exactly how this should work; when does init_database get called with csharp?
-            GenItem::Reducer(reducer) if reducer.name == "__init__" => None,
             GenItem::Reducer(reducer) => {
                 let code = typescript::autogen_typescript_reducer(ctx, reducer);
                 let name = reducer.name.to_case(Case::Snake);
@@ -325,8 +323,6 @@ impl GenItem {
                 AlgebraicType::Builtin(_) => todo!(),
                 AlgebraicType::Ref(_) => todo!(),
             },
-            // I'm not sure exactly how this should work; when does init_database get called with csharp?
-            GenItem::Reducer(reducer) if reducer.name == "__init__" => None,
             GenItem::Reducer(reducer) => {
                 let code = csharp::autogen_csharp_reducer(ctx, reducer, namespace);
                 let pascalcase = reducer.name.to_case(Case::Pascal);

crates/cli/src/subcommands/generate/rust.rs

@@ -819,13 +819,9 @@ fn print_dispatch_imports(out: &mut Indenter) {
     print_lines(out, DISPATCH_IMPORTS);
 }
 
-fn is_init(reducer: &ReducerDef) -> bool {
-    reducer.name == "__init__"
-}
-
 fn iter_reducer_items(items: &[GenItem]) -> impl Iterator<Item = &ReducerDef> {
     items.iter().filter_map(|item| match item {
-        GenItem::Reducer(reducer) if !is_init(reducer) => Some(reducer),
+        GenItem::Reducer(reducer) => Some(reducer),
         _ => None,
     })
 }
@@ -838,10 +834,10 @@ fn iter_table_items(items: &[GenItem]) -> impl Iterator<Item = &TableDef> {
 }
 
 fn iter_module_names(items: &[GenItem]) -> impl Iterator<Item = String> + '_ {
-    items.iter().filter_map(|item| match item {
-        GenItem::Table(table) => Some(table.name.to_case(Case::Snake)),
-        GenItem::TypeAlias(ty) => Some(ty.name.to_case(Case::Snake)),
-        GenItem::Reducer(reducer) => (!is_init(reducer)).then_some(reducer_module_name(reducer)),
+    items.iter().map(|item| match item {
+        GenItem::Table(table) => table.name.to_case(Case::Snake),
+        GenItem::TypeAlias(ty) => ty.name.to_case(Case::Snake),
+        GenItem::Reducer(reducer) => reducer_module_name(reducer),
     })
 }
 
@@ -1067,19 +1063,15 @@ fn print_reducer_event_defn(out: &mut Indenter, items: &[GenItem]) {
     out.delimited_block(
         "pub enum ReducerEvent {",
         |out| {
-            for item in items {
-                if let GenItem::Reducer(reducer) = item {
-                    if !is_init(reducer) {
-                        writeln!(
-                            out,
-                            "{}({}::{}),",
-                            reducer_variant_name(reducer),
-                            reducer_module_name(reducer),
-                            reducer_type_name(reducer),
-                        )
-                        .unwrap();
-                    }
-                }
+            for reducer in iter_reducer_items(items) {
+                writeln!(
+                    out,
+                    "{}({}::{}),",
+                    reducer_variant_name(reducer),
+                    reducer_module_name(reducer),
+                    reducer_type_name(reducer),
+                )
+                .unwrap();
             }
         },
         "}\n",