refactor(rtl): Make sails-rtl crate self-sufficient (#251)

Cargo.toml

@@ -25,6 +25,7 @@ members = [
 
 [workspace.dependencies]
 anyhow = "1"
+const-format = { package = "const_format", version = "0.2" }
 convert-case = { package = "convert_case", version = "0.6" }
 futures = { version = "0.3", default-features = false }
 gear-core-errors = "1.4.1"

examples/puppeteer/app/Cargo.toml

@@ -7,7 +7,6 @@ edition = "2021"
 gstd = { workspace = true, features = ["debug"] }
 parity-scale-codec = { workspace = true, features = ["derive"] }
 sails-rtl.workspace = true
-sails-macros.workspace = true
 scale-info = { workspace = true, features = ["derive"] }
 
 [build-dependencies]

examples/puppeteer/app/src/lib.rs

@@ -5,9 +5,9 @@ pub mod puppet;
 use core::marker::PhantomData;
 use gstd::prelude::*;
 use puppet::traits::ThisThatSvc;
-use sails_macros::gservice;
 use sails_rtl::{
     calls::{Call, Remoting},
+    gstd::gservice,
     ActorId,
 };
 

examples/rmrk/catalog/app/Cargo.toml

@@ -5,6 +5,5 @@ edition = "2021"
 
 [dependencies]
 parity-scale-codec = { workspace = true, features = ["derive"] }
-sails-macros.workspace = true
 sails-rtl.workspace = true
 scale-info = { workspace = true, features = ["derive"] }

examples/rmrk/catalog/app/src/lib.rs

@@ -1,7 +1,6 @@
 #![no_std]
 
-use sails_macros::{gprogram, groute};
-use sails_rtl::gstd::GStdExecContext;
+use sails_rtl::gstd::{gprogram, groute, GStdExecContext};
 use services::Catalog;
 
 // Exposed publicly because of tests which use generated data

examples/rmrk/catalog/app/src/services/mod.rs

@@ -1,9 +1,8 @@
 use errors::Error;
 use parts::{CollectionId, Part, PartId, SlotPart};
-use sails_macros::gservice;
 use sails_rtl::{
     collections::{BTreeMap, BTreeSet},
-    gstd::ExecContext,
+    gstd::{gservice, ExecContext},
     prelude::*,
     Result as RtlResult,
 };

examples/rmrk/resource/app/Cargo.toml

@@ -6,7 +6,6 @@ edition = "2021"
 [dependencies]
 gstd.workspace = true
 parity-scale-codec = { workspace = true, features = ["derive"] }
-sails-macros.workspace = true
 sails-rtl.workspace = true
 scale-info = { workspace = true, features = ["derive"] }
 

examples/rmrk/resource/app/src/lib.rs

@@ -1,10 +1,9 @@
 #![no_std]
 
-use sails_macros::{gprogram, groute};
 use sails_rtl::gstd::{
     calls::{GStdArgs, GStdRemoting},
     events::GStdEventTrigger,
-    GStdExecContext,
+    gprogram, groute, GStdExecContext,
 };
 use services::{ResourceStorage, ResourceStorageEvent};
 

examples/rmrk/resource/app/src/services/mod.rs

@@ -1,12 +1,14 @@
 use crate::catalogs::traits::RmrkCatalog;
 use errors::{Error, Result};
 use resources::{ComposedResource, PartId, Resource, ResourceId};
-use sails_macros::gservice;
-use sails_rtl::calls::Call;
-use sails_rtl::gstd::calls::{GStdArgs, GStdRemoting};
 use sails_rtl::{
+    calls::Call,
     collections::HashMap,
-    gstd::{events::EventTrigger, ExecContext},
+    gstd::{
+        calls::{GStdArgs, GStdRemoting},
+        events::EventTrigger,
+        gservice, ExecContext,
+    },
     prelude::*,
     ActorId,
 };

examples/this-that-svc/app/Cargo.toml

@@ -5,8 +5,4 @@ edition = "2021"
 
 [dependencies]
 gstd = { workspace = true, features = ["debug"] }
-sails-macros.workspace = true
 sails-rtl.workspace = true
-parity-scale-codec = { workspace = true, features = ["derive"] }
-primitive-types.workspace = true
-scale-info = { workspace = true, features = ["derive"] }

examples/this-that-svc/app/src/lib.rs

@@ -1,8 +1,7 @@
 #![no_std]
 
 use gstd::{debug, prelude::*};
-use primitive_types::{H256, U256};
-use sails_macros::gservice;
+use sails_rtl::{gstd::gservice, H256, U256};
 
 #[derive(Default)]
 pub struct MyService;
@@ -47,16 +46,22 @@ impl MyService {
 
 #[allow(dead_code)]
 #[derive(Debug, Decode, TypeInfo)]
+#[codec(crate = sails_rtl::scale_codec)]
+#[scale_info(crate = sails_rtl::scale_info)]
 pub struct TupleStruct(bool);
 
 #[derive(Debug, Decode, TypeInfo)]
+#[codec(crate = sails_rtl::scale_codec)]
+#[scale_info(crate = sails_rtl::scale_info)]
 pub struct DoThatParam {
     pub p1: u32,
     pub p2: String,
     pub p3: ManyVariants,
 }
 
 #[derive(Debug, Decode, TypeInfo)]
+#[codec(crate = sails_rtl::scale_codec)]
+#[scale_info(crate = sails_rtl::scale_info)]
 pub enum ManyVariants {
     One,
     Two(u32),

macros/core/Cargo.toml

@@ -6,6 +6,7 @@ edition.workspace = true
 license.workspace = true
 
 [dependencies]
+const-format.workspace = true
 convert-case.workspace = true
 parity-scale-codec.workspace = true
 proc-macro-error.workspace = true

macros/core/src/lib.rs

@@ -24,5 +24,6 @@ pub use service::gservice;
 
 mod program;
 mod route;
+mod sails_paths;
 mod service;
 mod shared;

macros/core/src/program.rs

@@ -1,4 +1,7 @@
-use crate::shared::{self, Func, ImplType};
+use crate::{
+    sails_paths,
+    shared::{self, Func, ImplType},
+};
 use parity_scale_codec::Encode;
 use proc_macro2::{Span, TokenStream as TokenStream2};
 use proc_macro_error::abort;
@@ -82,6 +85,10 @@ pub fn gprogram(program_impl_tokens: TokenStream2) -> TokenStream2 {
         quote!(#ctor_route(#ctor_params_struct_ident))
     });
 
+    let scale_types_path = sails_paths::scale_types_path();
+    let scale_codec_path = sails_paths::scale_codec_path();
+    let scale_info_path = sails_paths::scale_info_path();
+
     quote!(
         #(#services_routes)*
 
@@ -99,15 +106,21 @@ pub fn gprogram(program_impl_tokens: TokenStream2) -> TokenStream2 {
             }
         }
 
-        use sails_rtl::prelude::Decode as __ProgramDecode;
-        use sails_rtl::prelude::TypeInfo as __ProgramTypeInfo;
+        use #scale_types_path ::Decode as __ProgramDecode;
+        use #scale_types_path ::TypeInfo as __ProgramTypeInfo;
 
-        #(#[derive(__ProgramDecode, __ProgramTypeInfo)] #ctors_params_structs )*
+        #(
+            #[derive(__ProgramDecode, __ProgramTypeInfo)]
+            #[codec(crate = #scale_codec_path )]
+            #[scale_info(crate = #scale_info_path )]
+            #ctors_params_structs
+        )*
 
         mod meta {
             use super::*;
 
             #[derive(__ProgramTypeInfo)]
+            #[scale_info(crate = #scale_info_path )]
             pub enum ConstructorsMeta {
                 #(#ctors_meta_variants),*
             }

macros/core/src/sails_paths.rs

@@ -0,0 +1,17 @@
+use const_format::concatcp;
+
+const SAILS: &str = "sails_rtl";
+const SAILS_SCALE_CODEC: &str = concatcp!(SAILS, "::scale_codec");
+const SAILS_SCALE_INFO: &str = concatcp!(SAILS, "::scale_info");
+
+pub(crate) fn scale_types_path() -> syn::Path {
+    syn::parse_str(SAILS).unwrap()
+}
+
+pub(crate) fn scale_codec_path() -> syn::Path {
+    syn::parse_str(SAILS_SCALE_CODEC).unwrap()
+}
+
+pub(crate) fn scale_info_path() -> syn::Path {
+    syn::parse_str(SAILS_SCALE_INFO).unwrap()
+}

macros/core/src/service.rs

@@ -18,7 +18,10 @@
 
 //! Supporting functions and structures for the `gservice` macro.
 
-use crate::shared::{self, Func, ImplType};
+use crate::{
+    sails_paths,
+    shared::{self, Func, ImplType},
+};
 use convert_case::{Case, Casing};
 use parity_scale_codec::Encode;
 use proc_macro2::{Span, TokenStream as TokenStream2};
@@ -121,6 +124,10 @@ pub fn gservice(service_impl_tokens: TokenStream2) -> TokenStream2 {
     let message_id_ident = Ident::new("message_id", Span::call_site());
     let route_ident = Ident::new("route", Span::call_site());
 
+    let scale_types_path = sails_paths::scale_types_path();
+    let scale_codec_path = sails_paths::scale_codec_path();
+    let scale_info_path = sails_paths::scale_info_path();
+
     quote!(
         #service_impl
 
@@ -161,35 +168,47 @@ pub fn gservice(service_impl_tokens: TokenStream2) -> TokenStream2 {
         }
 
         impl #service_type_args sails_rtl::meta::ServiceMeta for #service_type_path #service_type_constraints {
-            fn commands() -> scale_info::MetaType {
-                scale_info::MetaType::new::<meta::CommandsMeta>()
+            fn commands() -> #scale_info_path ::MetaType {
+                #scale_info_path ::MetaType::new::<meta::CommandsMeta>()
             }
 
-            fn queries() -> scale_info::MetaType {
-                scale_info::MetaType::new::<meta::QueriesMeta>()
+            fn queries() -> #scale_info_path ::MetaType {
+                #scale_info_path ::MetaType::new::<meta::QueriesMeta>()
             }
 
-            fn events() -> scale_info::MetaType {
-                scale_info::MetaType::new::<meta::EventsMeta>()
+            fn events() -> #scale_info_path ::MetaType {
+                #scale_info_path ::MetaType::new::<meta::EventsMeta>()
             }
         }
 
-        #(#[derive(Decode, TypeInfo)] #invocation_params_structs)*
+        use #scale_types_path ::Decode as __ServiceDecode;
+        use #scale_types_path ::Encode as __ServiceEncode;
+        use #scale_types_path ::TypeInfo as __ServiceTypeInfo;
+
+        #(
+            #[derive(__ServiceDecode, __ServiceTypeInfo)]
+            #[codec(crate = #scale_codec_path )]
+            #[scale_info(crate = #scale_info_path )]
+            #invocation_params_structs
+        )*
 
         mod meta {
             use super::*;
 
-            #[derive(TypeInfo)]
+            #[derive(__ServiceTypeInfo)]
+            #[scale_info(crate = #scale_info_path )]
             pub enum CommandsMeta {
                 #(#commands_meta_variants),*
             }
 
-            #[derive(TypeInfo)]
+            #[derive(__ServiceTypeInfo)]
+            #[scale_info(crate = #scale_info_path )]
             pub enum QueriesMeta {
                 #(#queries_meta_variants),*
             }
 
-            #[derive(TypeInfo)]
+            #[derive(__ServiceTypeInfo)]
+            #[scale_info(crate = #scale_info_path )]
             pub enum #no_events_type {}
 
             pub type EventsMeta = #events_type;

macros/core/tests/snapshots/program__gprogram_generates_handle_for_multiple_services_with_non_empty_routes.snap

@@ -59,11 +59,12 @@ impl sails_rtl::meta::ProgramMeta for MyProgram {
             .into_iter()
     }
 }
-use sails_rtl::prelude::Decode as __ProgramDecode;
-use sails_rtl::prelude::TypeInfo as __ProgramTypeInfo;
+use sails_rtl::Decode as __ProgramDecode;
+use sails_rtl::TypeInfo as __ProgramTypeInfo;
 mod meta {
     use super::*;
     #[derive(__ProgramTypeInfo)]
+    #[scale_info(crate = sails_rtl::scale_info)]
     pub enum ConstructorsMeta {}
 }
 #[cfg(target_arch = "wasm32")]

macros/core/tests/snapshots/program__gprogram_generates_handle_for_single_service_with_non_empty_route.snap

@@ -38,11 +38,12 @@ impl sails_rtl::meta::ProgramMeta for MyProgram {
         [("Service", sails_rtl::meta::AnyServiceMeta::new::<MyService>())].into_iter()
     }
 }
-use sails_rtl::prelude::Decode as __ProgramDecode;
-use sails_rtl::prelude::TypeInfo as __ProgramTypeInfo;
+use sails_rtl::Decode as __ProgramDecode;
+use sails_rtl::TypeInfo as __ProgramTypeInfo;
 mod meta {
     use super::*;
     #[derive(__ProgramTypeInfo)]
+    #[scale_info(crate = sails_rtl::scale_info)]
     pub enum ConstructorsMeta {}
 }
 #[cfg(target_arch = "wasm32")]