drop generator command for now

loco-rs · Jan 28, 2025 · 0a7df8c · 0a7df8c
1 parent 9107d3e
commit 0a7df8c
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 261 deletions.
diff --git a/loco-gen/src/controller.rs b/loco-gen/src/controller.rs
@@ -1,10 +1,8 @@
-use std::path::Path;
-
-use rrgen::RRgen;
-use serde_json::json;
-
 use super::{AppInfo, GenerateResults, Result};
 use crate as gen;
+use rrgen::RRgen;
+use serde_json::json;
+use std::path::Path;
 
 pub fn generate(
     rrgen: &RRgen,
@@ -38,8 +36,5 @@ pub fn generate(
             }
             Ok(gen_result)
         }
-        gen::ScaffoldKind::OpenApi => {
-            gen::render_template(rrgen, Path::new("controller/openapi"), &vars)
-        }
     }
 }
diff --git a/loco-gen/src/lib.rs b/loco-gen/src/lib.rs
@@ -226,7 +226,6 @@ pub enum ScaffoldKind {
     Api,
     Html,
     Htmx,
-    OpenApi,
 }
 
 #[derive(clap::ValueEnum, Debug, Clone)]

diff --git a/loco-gen/src/scaffold.rs b/loco-gen/src/scaffold.rs
@@ -79,11 +79,6 @@ pub fn generate(
             gen_result.rrgen.extend(res.rrgen);
             gen_result.local_templates.extend(res.local_templates);
         }
-        ScaffoldKind::OpenApi => {
-            let res = render_template(rrgen, Path::new("scaffold/openapi"), &vars)?;
-            gen_result.rrgen.extend(res.rrgen);
-            gen_result.local_templates.extend(res.local_templates);
-        }
     }
     Ok(gen_result)
 }
diff --git a/loco-gen/src/templates/controller/openapi/controller.t b/loco-gen/src/templates/controller/openapi/controller.t
diff --git a/loco-gen/src/templates/controller/openapi/test.t b/loco-gen/src/templates/controller/openapi/test.t
diff --git a/loco-gen/src/templates/scaffold/openapi/controller.t b/loco-gen/src/templates/scaffold/openapi/controller.t
diff --git a/loco-gen/src/templates/scaffold/openapi/test.t b/loco-gen/src/templates/scaffold/openapi/test.t
diff --git a/loco-gen/tests/templates/controller.rs b/loco-gen/tests/templates/controller.rs
@@ -9,7 +9,6 @@ use std::fs;
 #[case(ScaffoldKind::Api)]
 #[case(ScaffoldKind::Html)]
 #[case(ScaffoldKind::Htmx)]
-#[case(ScaffoldKind::OpenApi)]
 #[test]
 fn can_generate(#[case] kind: ScaffoldKind) {
     let actions = vec!["GET".to_string(), "POST".to_string()];
@@ -60,7 +59,7 @@ fn can_generate(#[case] kind: ScaffoldKind) {
             .expect("app.rs injection failed")
     );
 
-    if matches!(kind, ScaffoldKind::Api | ScaffoldKind::OpenApi) {
+    if matches!(kind, ScaffoldKind::Api) {
         let test_controllers_path = tree_fs.root.join("tests").join("requests");
         assert_snapshot!(
             "generate[tests_controller_mod_rs]",

diff --git a/loco-gen/tests/templates/scaffold.rs b/loco-gen/tests/templates/scaffold.rs
@@ -9,7 +9,6 @@ use std::fs;
 #[case(ScaffoldKind::Api)]
 #[case(ScaffoldKind::Html)]
 #[case(ScaffoldKind::Htmx)]
-#[case(ScaffoldKind::OpenApi)]
 #[test]
 fn can_generate(#[case] kind: ScaffoldKind) {
     std::env::set_var("SKIP_MIGRATION", "");
@@ -132,7 +131,6 @@ fn can_generate(#[case] kind: ScaffoldKind) {
                 );
             }
         }
-        ScaffoldKind::OpenApi => (),
     }
 }
 

diff --git a/src/cli.rs b/src/cli.rs
@@ -303,9 +303,6 @@ After running the migration, follow these steps to complete the process:
         /// Use API controller actions
         #[clap(long, group = "scaffold_kind_group")]
         api: bool,
-
-        #[clap(long, group = "scaffold_kind_group")]
-        openapi: bool,
     },
     /// Generate a Task based on the given name
     Task {
@@ -385,8 +382,7 @@ impl ComponentArg {
                     loco_gen::ScaffoldKind::Api
                 } else {
                     return Err(crate::Error::string(
-                        "Error: One of `kind`, `htmx`, `html`, `api`, or `openapi` must be \
-                         specified.",
+                        "Error: One of `kind`, `htmx`, `html`, or `api` must be specified.",
                     ));
                 };
 
@@ -399,7 +395,6 @@ impl ComponentArg {
                 htmx,
                 html,
                 api,
-                openapi,
             } => {
                 let kind = if let Some(kind) = kind {
                     kind
@@ -409,12 +404,9 @@ impl ComponentArg {
                     loco_gen::ScaffoldKind::Html
                 } else if api {
                     loco_gen::ScaffoldKind::Api
-                } else if openapi {
-                    loco_gen::ScaffoldKind::OpenApi
                 } else {
                     return Err(crate::Error::string(
-                        "Error: One of `kind`, `htmx`, `html`, `api`, or `openapi` must be \
-                         specified.",
+                        "Error: One of `kind`, `htmx`, `html`, or `api` must be specified.",
                     ));
                 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -226,7 +226,6 @@ pub enum ScaffoldKind { @@
         Api,
         Html,
         Htmx,
-        OpenApi,
     }
     #[derive(clap::ValueEnum, Debug, Clone)]
@@ Expand Down @@