Fix Rust enums, add dummy modules for other languages

CosmWasm · Oct 30, 2024 · f7f5672 · f7f5672
1 parent db942c0
commit f7f5672
Showing 12 changed files with 28 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/cw-schema-codegen/src/go/mod.rs b/packages/cw-schema-codegen/src/go/mod.rs
@@ -0,0 +1 @@
+pub mod template;
diff --git a/packages/cw-schema-codegen/src/go/template.rs b/packages/cw-schema-codegen/src/go/template.rs
@@ -0,0 +1,9 @@
+use askama::Template;
+
+#[derive(Template)]
+#[template(escape = "none", path = "go/enum.tpl.go")]
+pub struct EnumTemplate {}
+
+#[derive(Template)]
+#[template(escape = "none", path = "go/struct.tpl.go")]
+pub struct StructTemplate {}
diff --git a/packages/cw-schema-codegen/src/lib.rs b/packages/cw-schema-codegen/src/lib.rs
@@ -1 +1,3 @@
+pub mod go;
 pub mod rust;
+pub mod typescript;
diff --git a/packages/cw-schema-codegen/src/main.rs b/packages/cw-schema-codegen/src/main.rs
@@ -62,8 +62,11 @@ fn main() -> anyhow::Result<()> {
 
     ensure!(opts.file.exists(), "Schema file does not exist");
     ensure!(
-        opts.language == Language::Rust,
-        "Only Rust code generation is supported at the moment"
+        matches!(
+            opts.language,
+            Language::Rust | Language::Go | Language::Typescript
+        ),
+        "Only Rust, TypeScript, and Go code generation is supported at the moment"
     );
 
     let schema = fs::read_to_string(&opts.file)?;

diff --git a/packages/cw-schema-codegen/src/typescript/mod.rs b/packages/cw-schema-codegen/src/typescript/mod.rs
@@ -0,0 +1 @@
+pub mod template;
diff --git a/packages/cw-schema-codegen/src/typescript/template.rs b/packages/cw-schema-codegen/src/typescript/template.rs
@@ -0,0 +1,9 @@
+use askama::Template;
+
+#[derive(Template)]
+#[template(escape = "none", path = "typescript/enum.tpl.ts")]
+pub struct EnumTemplate {}
+
+#[derive(Template)]
+#[template(escape = "none", path = "typescript/struct.tpl.ts")]
+pub struct StructTemplate {}
diff --git a/packages/cw-schema-codegen/templates/go/enum.tpl.go b/packages/cw-schema-codegen/templates/go/enum.tpl.go
diff --git a/packages/cw-schema-codegen/templates/go/struct.tpl.go b/packages/cw-schema-codegen/templates/go/struct.tpl.go
diff --git a/packages/cw-schema-codegen/templates/typescript/enum.tpl.ts b/packages/cw-schema-codegen/templates/typescript/enum.tpl.ts
diff --git a/packages/cw-schema-codegen/templates/typescript/struct.tpl.ts b/packages/cw-schema-codegen/templates/typescript/struct.tpl.ts
diff --git a/packages/cw-schema/src/lib.rs b/packages/cw-schema/src/lib.rs
@@ -31,7 +31,6 @@ pub struct StructProperty {
 #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
 #[cfg_attr(feature = "std", derive(::schemars::JsonSchema))]
 #[serde(rename_all = "camelCase", untagged)]
-#[non_exhaustive]
 pub enum StructType {
     Unit,
     Named {
@@ -56,7 +55,6 @@ pub struct EnumCase {
 #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
 #[cfg_attr(feature = "std", derive(::schemars::JsonSchema))]
 #[serde(rename_all = "camelCase", tag = "type")]
-#[non_exhaustive]
 pub enum EnumValue {
     Unit,
     Named {
@@ -71,7 +69,6 @@ pub enum EnumValue {
 #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
 #[cfg_attr(feature = "std", derive(::schemars::JsonSchema))]
 #[serde(rename_all = "camelCase", tag = "type")]
-#[non_exhaustive]
 pub enum NodeType {
     // Floating point numbers
     Float,