chore(2649): drop tag from config (tailcallhq#2650)

beelchester · Aug 11, 2024 · f32434c · f32434c · github-actions · Aug 11, 2024
1 parent 560473d
commit f32434c
Show file tree

Hide file tree

Showing 26 changed files with 90 additions and 346 deletions.
diff --git a/generated/.tailcallrc.graphql b/generated/.tailcallrc.graphql
@@ -315,17 +315,6 @@ directive @server(
   workers: Int
 ) on SCHEMA
 
-"""
-Used to represent an identifier for a type. Typically used via only by the configuration 
-generators to provide additional information about the type.
-"""
-directive @tag(
-  """
-  A unique identifier for the type.
-  """
-  id: String!
-) on OBJECT
-
 """
 The @telemetry directive facilitates seamless integration with OpenTelemetry, enhancing 
 the observability of your GraphQL services powered by Tailcall.  By leveraging this 

diff --git a/generated/.tailcallrc.schema.json b/generated/.tailcallrc.schema.json
@@ -1145,20 +1145,6 @@
         }
       }
     },
-    "Tag": {
-      "description": "Used to represent an identifier for a type. Typically used via only by the configuration generators to provide additional information about the type.",
-      "type": "object",
-      "required": [
-        "id"
-      ],
-      "properties": {
-        "id": {
-          "description": "A unique identifier for the type.",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false
-    },
     "Telemetry": {
       "description": "The @telemetry directive facilitates seamless integration with OpenTelemetry, enhancing the observability of your GraphQL services powered by Tailcall.  By leveraging this directive, developers gain access to valuable insights into the performance and behavior of their applications.",
       "type": "object",
@@ -1293,17 +1279,6 @@
               "type": "null"
             }
           ]
-        },
-        "tag": {
-          "description": "Contains source information for the type.",
-          "anyOf": [
-            {
-              "$ref": "#/definitions/Tag"
-            },
-            {
-              "type": "null"
-            }
-          ]
         }
       }
     },

diff --git a/...or_spec__src__cli__generator__tests__fixtures__generator__json_proto_mix_config.json.snap b/...or_spec__src__cli__generator__tests__fixtures__generator__json_proto_mix_config.json.snap
@@ -6,15 +6,15 @@ schema @server @upstream(baseURL: "https://jsonplaceholder.typicode.com") {
   query: Query
 }
 
-input Id @tag(id: "news.NewsId") {
+input Id {
   id: Int
 }
 
-input news__MultipleNewsId @tag(id: "news.MultipleNewsId") {
+input news__MultipleNewsId {
   ids: [Id]
 }
 
-input news__NewsInput @tag(id: "news.News") {
+input news__NewsInput {
   body: String
   id: Int
   postImage: String
@@ -47,15 +47,15 @@ type Geo {
   lng: String
 }
 
-type News @tag(id: "news.News") {
+type News {
   body: String
   id: Int
   postImage: String
   status: news__Status
   title: String
 }
 
-type NewsNewsServiceGetMultipleNew @tag(id: "news.NewsList") {
+type NewsNewsServiceGetMultipleNew {
   news: [News]
 }
 

diff --git a/src/cli/llm/snapshots/tailcall__cli__llm__infer_type_name__test__valid_conversion.snap b/src/cli/llm/snapshots/tailcall__cli__llm__infer_type_name__test__valid_conversion.snap
diff --git a/src/core/config/config.rs b/src/core/config/config.rs
@@ -113,10 +113,6 @@ pub struct Type {
     /// Marks field as protected by auth providers
     #[serde(default)]
     pub protected: Option<Protected>,
-    #[serde(default, skip_serializing_if = "is_default")]
-    ///
-    /// Contains source information for the type.
-    pub tag: Option<Tag>,
 }
 
 impl Display for Type {
@@ -145,27 +141,6 @@ impl Type {
     }
 }
 
-#[derive(
-    Clone,
-    Debug,
-    Default,
-    PartialEq,
-    Deserialize,
-    Serialize,
-    Eq,
-    schemars::JsonSchema,
-    MergeRight,
-    DirectiveDefinition,
-)]
-#[directive_definition(locations = "Object")]
-#[serde(deny_unknown_fields)]
-/// Used to represent an identifier for a type. Typically used via only by the
-/// configuration generators to provide additional information about the type.
-pub struct Tag {
-    /// A unique identifier for the type.
-    pub id: String,
-}
-
 #[derive(
     Clone,
     Debug,
@@ -1050,7 +1025,6 @@ impl Config {
             .add_directive(Omit::directive_definition(generated_types))
             .add_directive(Protected::directive_definition(generated_types))
             .add_directive(Server::directive_definition(generated_types))
-            .add_directive(Tag::directive_definition(generated_types))
             .add_directive(Telemetry::directive_definition(generated_types))
             .add_directive(Upstream::directive_definition(generated_types))
             .add_input(GraphQL::input_definition())

diff --git a/src/core/config/from_document.rs b/src/core/config/from_document.rs
@@ -10,7 +10,7 @@ use async_graphql::Name;
 use async_graphql_value::ConstValue;
 
 use super::telemetry::Telemetry;
-use super::{Alias, Tag, JS};
+use super::{Alias, JS};
 use crate::core::config::{
     self, Cache, Call, Config, Enum, GraphQL, Grpc, Link, Modify, Omit, Protected, RootSchema,
     Server, Union, Upstream, Variant,
@@ -242,12 +242,11 @@ where
     Cache::from_directives(directives.iter())
         .fuse(to_fields(fields))
         .fuse(Protected::from_directives(directives.iter()))
-        .fuse(Tag::from_directives(directives.iter()))
-        .map(|(cache, fields, protected, tag)| {
+        .map(|(cache, fields, protected)| {
             let doc = description.to_owned().map(|pos| pos.node);
             let implements = implements.iter().map(|pos| pos.node.to_string()).collect();
             let added_fields = to_add_fields_from_directives(directives);
-            config::Type { fields, added_fields, doc, implements, cache, protected, tag }
+            config::Type { fields, added_fields, doc, implements, cache, protected }
         })
 }
 fn to_input_object(

diff --git a/src/core/config/into_document.rs b/src/core/config/into_document.rs
@@ -215,7 +215,6 @@ fn config_document(config: &Config) -> ServiceDocument {
                         .as_ref()
                         .map(|protected| pos(protected.to_directive())),
                 )
-                .chain(type_def.tag.as_ref().map(|tag| pos(tag.to_directive())))
                 .collect::<Vec<_>>(),
             kind,
         })));

diff --git a/...call__core__config__transformer__ambiguous_type__tests__resolve_ambiguous_news_types.snap b/...call__core__config__transformer__ambiguous_type__tests__resolve_ambiguous_news_types.snap
@@ -6,15 +6,15 @@ schema @server @upstream {
   query: Query
 }
 
-input news__MultipleNewsId @tag(id: "news.MultipleNewsId") {
+input news__MultipleNewsId {
   ids: [news__NewsId]
 }
 
-input news__NewsId @tag(id: "news.NewsId") {
+input news__NewsId {
   id: Int
 }
 
-input news__NewsInput @tag(id: "news.News") {
+input news__NewsInput {
   body: String
   id: Int
   postImage: String
@@ -37,14 +37,14 @@ type Query {
   news__NewsService__GetNews(newsId: news__NewsId!): news__News! @grpc(body: "{{.args.newsId}}", method: "news.NewsService.GetNews")
 }
 
-type news__News @tag(id: "news.News") {
+type news__News {
   body: String
   id: Int
   postImage: String
   status: news__Status
   title: String
 }
 
-type news__NewsList @tag(id: "news.NewsList") {
+type news__NewsList {
   news: [news__News]
 }
diff --git a/src/core/generator/from_proto.rs b/src/core/generator/from_proto.rs
@@ -13,7 +13,7 @@ use super::proto::comments_builder::CommentsBuilder;
 use super::proto::path_builder::PathBuilder;
 use super::proto::path_field::PathField;
 use crate::core::config::transformer::{AmbiguousType, TreeShake};
-use crate::core::config::{Arg, Config, Enum, Field, Grpc, Tag, Type, Union, Variant};
+use crate::core::config::{Arg, Config, Enum, Field, Grpc, Type, Union, Variant};
 use crate::core::transform::{Transform, TransformerOps};
 use crate::core::valid::Validator;
 
@@ -308,8 +308,6 @@ impl Context {
                 }
             }
 
-            ty.tag = Some(Tag { id: msg_type.id() });
-
             if message.oneof_decl.is_empty() {
                 self = self.insert_type(msg_type.to_string(), ty);
             } else {

diff --git a/src/core/generator/snapshots/tailcall__core__generator__from_proto__test__from_proto.snap b/src/core/generator/snapshots/tailcall__core__generator__from_proto__test__from_proto.snap
@@ -6,26 +6,26 @@ schema @server @upstream {
   query: Query
 }
 
-input greetings__HelloRequest @tag(id: "greetings.HelloRequest") {
+input greetings__HelloRequest {
   name: String
 }
 
 """
 The request message containing the user's name.
 """
-input greetings_a__b__HelloRequest @tag(id: "greetings_a.b.HelloRequest") {
+input greetings_a__b__HelloRequest {
   name: String
 }
 
-input news__MultipleNewsId @tag(id: "news.MultipleNewsId") {
+input news__MultipleNewsId {
   ids: [news__NewsId]
 }
 
-input news__NewsId @tag(id: "news.NewsId") {
+input news__NewsId {
   id: Int
 }
 
-input news__NewsInput @tag(id: "news.News") {
+input news__NewsInput {
   body: String
   id: Int
   postImage: String
@@ -56,25 +56,25 @@ type Query {
   news__NewsService__GetNews(newsId: news__NewsId!): news__News! @grpc(body: "{{.args.newsId}}", method: "news.NewsService.GetNews")
 }
 
-type greetings__HelloReply @tag(id: "greetings.HelloReply") {
+type greetings__HelloReply {
   message: String
 }
 
   """
   The response message containing the greetings
   """
-type greetings_a__b__HelloReply @tag(id: "greetings_a.b.HelloReply") {
+type greetings_a__b__HelloReply {
   message: String
 }
 
-type news__News @tag(id: "news.News") {
+type news__News {
   body: String
   id: Int
   postImage: String
   status: news__Status
   title: String
 }
 
-type news__NewsList @tag(id: "news.NewsList") {
+type news__NewsList {
   news: [news__News]
 }
diff --git a/...erator/snapshots/tailcall__core__generator__from_proto__test__from_proto_no_pkg_file.snap b/...erator/snapshots/tailcall__core__generator__from_proto__test__from_proto_no_pkg_file.snap
@@ -6,14 +6,14 @@ schema @server @upstream {
   query: Query
 }
 
-type News @tag(id: "News") {
+type News {
   body: String
   id: Int
   postImage: String
   title: String
 }
 
-type NewsList @tag(id: "NewsList") {
+type NewsList {
   news: [News]
 }
 

diff --git a/...enerator/snapshots/tailcall__core__generator__from_proto__test__greetings_proto_file.snap b/...enerator/snapshots/tailcall__core__generator__from_proto__test__greetings_proto_file.snap
@@ -6,14 +6,14 @@ schema @server @upstream {
   query: Query
 }
 
-input greetings__HelloRequest @tag(id: "greetings.HelloRequest") {
+input greetings__HelloRequest {
   name: String
 }
 
 type Query {
   greetings__Greeter__SayHello(helloRequest: greetings__HelloRequest!): greetings__HelloReply! @grpc(body: "{{.args.helloRequest}}", method: "greetings.Greeter.SayHello")
 }
 
-type greetings__HelloReply @tag(id: "greetings.HelloReply") {
+type greetings__HelloReply {
   message: String
 }