feat: Allow gprogram without exposed services (#242)

Cargo.toml

@@ -8,6 +8,8 @@ license = "GPL-3.0"
 resolver = "2"
 members = [
     "client-gen",
+    "examples/no-svcs-prog/app",
+    "examples/no-svcs-prog/wasm",
     "examples/puppeteer/app",
     "examples/puppeteer/wasm",
     "examples/rmrk/catalog/app",

examples/no-svcs-prog/README.md

@@ -0,0 +1,3 @@
+# no-svcs-prog
+
+Most basic program without services to get you started

examples/no-svcs-prog/app/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "no-svcs-prog-app"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+sails-rtl.workspace = true

examples/no-svcs-prog/app/src/lib.rs

@@ -0,0 +1,13 @@
+#![no_std]
+
+use sails_rtl::gstd::gprogram;
+
+#[derive(Default)]
+pub struct Program;
+
+#[gprogram]
+impl Program {
+    pub fn new() -> Self {
+        Self
+    }
+}

examples/no-svcs-prog/wasm/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "no-svcs-prog"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+no-svcs-prog-app = { path = "../app" }
+sails-rtl.workspace = true
+
+[build-dependencies]
+gwasm-builder.workspace = true
+no-svcs-prog-app = { path = "../app" }
+sails-idl-gen.workspace = true

examples/no-svcs-prog/wasm/build.rs

@@ -0,0 +1,15 @@
+use no_svcs_prog_app::Program;
+use sails_idl_gen::program;
+use std::{env, fs::File, path::PathBuf};
+
+fn main() {
+    gwasm_builder::build();
+
+    let manifest_dir_path = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
+
+    let idl_file_path = manifest_dir_path.join("no-svcs-prog.idl");
+
+    let idl_file = File::create(idl_file_path).unwrap();
+
+    program::generate_idl::<Program>(idl_file).unwrap();
+}

examples/no-svcs-prog/wasm/no-svcs-prog.idl

@@ -0,0 +1,4 @@
+constructor {
+  New : ();
+};
+

examples/no-svcs-prog/wasm/src/lib.rs

@@ -0,0 +1,4 @@
+#![no_std]
+
+#[cfg(target_arch = "wasm32")]
+pub use no_svcs_prog_app::wasm::*;

idl-gen/src/errors.rs

@@ -26,8 +26,6 @@ pub enum Error {
     FuncMetaIsInvalid(String),
     #[error("event meta is invalid: {0}")]
     EventMetaIsInvalid(String),
-    #[error("at least one service is required")]
-    ServiceIsMissing,
     #[error("type id `{0}` is not found in the type registry")]
     TypeIdIsUnknown(u32),
     #[error("type `{0}` is not supported")]

idl-gen/src/meta.rs

@@ -67,9 +67,6 @@ impl ExpandedProgramMeta {
                 )
             })
             .collect::<Vec<_>>();
-        if services_data.is_empty() {
-            return Err(Error::ServiceIsMissing);
-        }
         let registry = PortableRegistry::from(registry);
         let ctors = Self::ctor_funcs(&registry, ctors_type_id)?;
         let services = services_data

macros/core/src/program.rs

@@ -95,8 +95,8 @@ pub fn gprogram(program_impl_tokens: TokenStream2) -> TokenStream2 {
         #program_impl
 
         impl #program_type_args sails_rtl::meta::ProgramMeta for #program_type_path #program_type_constraints {
-            fn constructors() -> scale_info::MetaType {
-                scale_info::MetaType::new::<meta::ConstructorsMeta>()
+            fn constructors() -> #scale_info_path::MetaType {
+                #scale_info_path::MetaType::new::<meta::ConstructorsMeta>()
             }
 
             fn services() -> impl Iterator<Item = (&'static str, sails_rtl::meta::AnyServiceMeta)> {
@@ -306,7 +306,7 @@ fn generate_handle<'a>(
         #[gstd::async_main]
         async fn main() {
             let mut #input_ident: &[u8] = &gstd::msg::load_bytes().expect("Failed to read input");
-            let output = #(#invocation_dispatches)else*;
+            let output: Vec<u8> = #(#invocation_dispatches)else*;
             gstd::msg::reply_bytes(output, 0).expect("Failed to send output");
         }
     )

macros/core/tests/snapshots/program__gprogram_generates_handle_for_multiple_services_with_non_empty_routes.snap

@@ -46,8 +46,8 @@ impl MyProgram {
     }
 }
 impl sails_rtl::meta::ProgramMeta for MyProgram {
-    fn constructors() -> scale_info::MetaType {
-        scale_info::MetaType::new::<meta::ConstructorsMeta>()
+    fn constructors() -> sails_rtl::scale_info::MetaType {
+        sails_rtl::scale_info::MetaType::new::<meta::ConstructorsMeta>()
     }
     fn services() -> impl Iterator<
         Item = (&'static str, sails_rtl::meta::AnyServiceMeta),
@@ -99,7 +99,7 @@ pub mod wasm {
     #[gstd::async_main]
     async fn main() {
         let mut input: &[u8] = &gstd::msg::load_bytes().expect("Failed to read input");
-        let output = if input.starts_with(&__ROUTE_SERVICE2) {
+        let output: Vec<u8> = if input.starts_with(&__ROUTE_SERVICE2) {
             let program_ref = unsafe { PROGRAM.as_ref() }
                 .expect("Program not initialized");
             let mut service = program_ref.service2();

macros/core/tests/snapshots/program__gprogram_generates_handle_for_single_service_with_non_empty_route.snap

@@ -29,8 +29,8 @@ impl MyProgram {
     }
 }
 impl sails_rtl::meta::ProgramMeta for MyProgram {
-    fn constructors() -> scale_info::MetaType {
-        scale_info::MetaType::new::<meta::ConstructorsMeta>()
+    fn constructors() -> sails_rtl::scale_info::MetaType {
+        sails_rtl::scale_info::MetaType::new::<meta::ConstructorsMeta>()
     }
     fn services() -> impl Iterator<
         Item = (&'static str, sails_rtl::meta::AnyServiceMeta),
@@ -78,7 +78,7 @@ pub mod wasm {
     #[gstd::async_main]
     async fn main() {
         let mut input: &[u8] = &gstd::msg::load_bytes().expect("Failed to read input");
-        let output = if input.starts_with(&__ROUTE_SERVICE) {
+        let output: Vec<u8> = if input.starts_with(&__ROUTE_SERVICE) {
             let program_ref = unsafe { PROGRAM.as_ref() }
                 .expect("Program not initialized");
             let mut service = program_ref.service();

macros/core/tests/snapshots/program__gprogram_generates_init_for_multiple_ctors.snap

@@ -11,8 +11,8 @@ impl MyProgram {
     }
 }
 impl sails_rtl::meta::ProgramMeta for MyProgram {
-    fn constructors() -> scale_info::MetaType {
-        scale_info::MetaType::new::<meta::ConstructorsMeta>()
+    fn constructors() -> sails_rtl::scale_info::MetaType {
+        sails_rtl::scale_info::MetaType::new::<meta::ConstructorsMeta>()
     }
     fn services() -> impl Iterator<
         Item = (&'static str, sails_rtl::meta::AnyServiceMeta),
@@ -89,7 +89,7 @@ pub mod wasm {
     #[gstd::async_main]
     async fn main() {
         let mut input: &[u8] = &gstd::msg::load_bytes().expect("Failed to read input");
-        let output = {
+        let output: Vec<u8> = {
             let input = String::decode(&mut input)
                 .unwrap_or_else(|_| {
                     if input.len() <= 8 {

macros/core/tests/snapshots/program__gprogram_generates_init_for_no_ctor.snap

@@ -4,8 +4,8 @@ expression: result
 ---
 impl MyProgram {}
 impl sails_rtl::meta::ProgramMeta for MyProgram {
-    fn constructors() -> scale_info::MetaType {
-        scale_info::MetaType::new::<meta::ConstructorsMeta>()
+    fn constructors() -> sails_rtl::scale_info::MetaType {
+        sails_rtl::scale_info::MetaType::new::<meta::ConstructorsMeta>()
     }
     fn services() -> impl Iterator<
         Item = (&'static str, sails_rtl::meta::AnyServiceMeta),
@@ -53,7 +53,7 @@ pub mod wasm {
     #[gstd::async_main]
     async fn main() {
         let mut input: &[u8] = &gstd::msg::load_bytes().expect("Failed to read input");
-        let output = {
+        let output: Vec<u8> = {
             let input = String::decode(&mut input)
                 .unwrap_or_else(|_| {
                     if input.len() <= 8 {

macros/core/tests/snapshots/program__gprogram_generates_init_for_single_ctor.snap

@@ -8,8 +8,8 @@ impl MyProgram {
     }
 }
 impl sails_rtl::meta::ProgramMeta for MyProgram {
-    fn constructors() -> scale_info::MetaType {
-        scale_info::MetaType::new::<meta::ConstructorsMeta>()
+    fn constructors() -> sails_rtl::scale_info::MetaType {
+        sails_rtl::scale_info::MetaType::new::<meta::ConstructorsMeta>()
     }
     fn services() -> impl Iterator<
         Item = (&'static str, sails_rtl::meta::AnyServiceMeta),
@@ -72,7 +72,7 @@ pub mod wasm {
     #[gstd::async_main]
     async fn main() {
         let mut input: &[u8] = &gstd::msg::load_bytes().expect("Failed to read input");
-        let output = {
+        let output: Vec<u8> = {
             let input = String::decode(&mut input)
                 .unwrap_or_else(|_| {
                     if input.len() <= 8 {