move code

Cargo.toml

@@ -41,7 +41,7 @@ default-members = [
    "packages/fuel-indexer-graphql",
    "packages/fuel-indexer-lib",
    "packages/fuel-indexer-macros",
-      "packages/fuel-indexer-metrics-macros",
+   "packages/fuel-indexer-metrics-macros",
    "packages/fuel-indexer-metrics",
    "packages/fuel-indexer-plugin",
    "packages/fuel-indexer-schema",

packages/fuel-indexer-lib/Cargo.toml

@@ -15,7 +15,6 @@ async-graphql-parser = { workspace = true }
 async-graphql-value = { workspace = true }
 bincode = { workspace = true }
 clap = { features = ["cargo", "derive", "env"], workspace = true }
-fuel-abi-types = "0.3"
 fuel-indexer-types = { workspace = true }
 http = { version = "0.2", default-features = false }
 lazy_static = { version = "1.4" }

packages/fuel-indexer-lib/src/lib.rs

@@ -7,7 +7,6 @@ pub mod config;
 pub mod constants;
 pub mod defaults;
 pub mod graphql;
-pub mod helpers;
 pub mod manifest;
 pub mod utils;
 

packages/fuel-indexer-macros/Cargo.toml

@@ -18,6 +18,7 @@ async-graphql-value = "5.0"
 fuel-abi-types = "0.3"
 fuel-indexer-database-types = { workspace = true }
 fuel-indexer-lib = { workspace = true, default-features = true }
+fuel-indexer-macro-utils = { workspace = true }
 fuel-indexer-schema = { workspace = true, default-features = false }
 fuel-indexer-types = { workspace = true }
 fuels = { workspace = true }

packages/fuel-indexer-macros/macro-utils/Cargo.toml

@@ -10,16 +10,7 @@ rust-version = { workspace = true }
 description = "Fuel Indexer Macro Utils"
 
 [dependencies]
-async-graphql-parser = "5.0"
-async-graphql-value = "5.0"
 fuel-abi-types = "0.3"
 fuel-indexer-lib = { workspace = true, default-features = true }
-fuels = { workspace = true }
 fuels-code-gen = { version = "0.46", default-features = false }
-lazy_static = "1.4"
-proc-macro-error = "1.0"
-proc-macro2 = "1.0"
-quote = "1.0"
 serde_json = { workspace = true }
-sha2 = "0.10"
-syn = { version = "2.0", features = ["full"] }

packages/fuel-indexer-macros/macro-utils/src/lib.rs

@@ -1 +1,3 @@
-pub mod schema;
+#![deny(unused_crate_dependencies)]
+pub mod helpers;
+pub mod schema;

packages/fuel-indexer-macros/macro-utils/src/schema.rs

@@ -1,8 +1,5 @@
 use fuel_abi_types::abi::program::{ProgramABI, TypeDeclaration};
-use fuel_indexer_lib::{
-    constants, graphql,
-    helpers::{is_unit_type, strip_callpath_from_type_field},
-};
+use fuel_indexer_lib::{constants, graphql};
 use std::collections::HashMap;
 
 // Given a `TypeDeclaration` for an ABI enum, generate a corresponding GraphQL
@@ -112,7 +109,7 @@ pub fn generate_schema(json_abi: &std::path::Path) -> String {
     let abi_types: Vec<TypeDeclaration> = abi
         .types
         .into_iter()
-        .map(strip_callpath_from_type_field)
+        .map(crate::helpers::strip_callpath_from_type_field)
         .collect();
 
     let mut output: Vec<String> = vec![];

packages/fuel-indexer-macros/src/indexer.rs

@@ -4,12 +4,12 @@ use crate::{
 };
 use fuel_abi_types::abi::program::TypeDeclaration;
 use fuel_indexer_lib::{
-    constants::*,
-    helpers::{is_non_decodable_type, is_tuple_type, strip_callpath_from_type_field},
-    manifest::ContractIds,
-    manifest::Manifest,
+    constants::*, manifest::ContractIds, manifest::Manifest,
     utils::workspace_manifest_prefix,
 };
+use fuel_indexer_macro_utils::helpers::{
+    is_non_decodable_type, is_tuple_type, strip_callpath_from_type_field,
+};
 use fuel_indexer_types::{type_id, FUEL_TYPES_NAMESPACE};
 use fuels::{core::codec::resolve_fn_selector, types::param_types::ParamType};
 use fuels_code_gen::{Abigen, AbigenTarget, ProgramType};

packages/fuel-indexer-macros/src/lib.rs

@@ -15,4 +15,4 @@ use proc_macro::TokenStream;
 #[proc_macro_attribute]
 pub fn indexer(attrs: TokenStream, item: TokenStream) -> TokenStream {
     process_indexer_module(attrs, item)
-}
+}