chore: apollo_parser upgrade init (#11)

#11
rishabh3112 · Dec 20, 2023 · b3701f6 · b3701f6
2 parents 1b4e266 + feaf7de
commit b3701f6
Show file tree

Hide file tree

Showing 19 changed files with 76 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphql-tag-swc-plugin",
-  "version": "0.1.7-0",
+  "version": "0.1.7-1",
   "description": "SWC plugin to expand gql tags at build time",
   "author": "rishabh3112 <rishabh31121999@gmail.com>",
   "license": "ISC",

diff --git a/tests/graphql_tag/dynamicSegments/input.js b/tests/graphql_tag/dynamicSegments/input.js
@@ -20,6 +20,16 @@ const QUERY_WITH_DYNAMIC_SEGMENT = gql`
   ${DYNAMIC_FRAGMENT}
 `;
 
+const QUERY_WITH_DYNAMIC_FRAGMENT_SPREAD = gql`
+  query testQuery {
+    getEntity {
+      ...${NAME}
+    }
+  }
+
+  ${DYNAMIC_FRAGMENT}
+`;
+
 const STATIC_QUERY = gql`
   query testQuery {
     getEntity {

diff --git a/tests/graphql_tag/dynamicSegments/output.js b/tests/graphql_tag/dynamicSegments/output.js
@@ -31,6 +31,15 @@ const QUERY_WITH_DYNAMIC_SEGMENT = gql`
 
   ${DYNAMIC_FRAGMENT}
 `;
+const QUERY_WITH_DYNAMIC_FRAGMENT_SPREAD = gql`
+  query testQuery {
+    getEntity {
+      ...${NAME}
+    }
+  }
+
+  ${DYNAMIC_FRAGMENT}
+`;
 const STATIC_QUERY = {
     "kind": "Document",
     "definitions": /*#__PURE__*/ unique(/*#__PURE__*/ [

diff --git a/tests/graphql_tag/dynamicSegments/strip-output.js b/tests/graphql_tag/dynamicSegments/strip-output.js
@@ -31,6 +31,15 @@ const QUERY_WITH_DYNAMIC_SEGMENT = gql`
 
   ${DYNAMIC_FRAGMENT}
 `;
+const QUERY_WITH_DYNAMIC_FRAGMENT_SPREAD = gql`
+  query testQuery {
+    getEntity {
+      ...${NAME}
+    }
+  }
+
+  ${DYNAMIC_FRAGMENT}
+`;
 const STATIC_QUERY = {
     "kind": "Document",
     "definitions": /*#__PURE__*/ unique(/*#__PURE__*/ [

diff --git a/transforms/graphql_tag/Cargo.toml b/transforms/graphql_tag/Cargo.toml
@@ -5,7 +5,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-apollo-parser = "0.2.10"
+apollo-parser = "0.7.5"
 swc_common = { version = "0.33.8", features = ["concurrent"] }
 swc_ecma_ast = "0.110.9"
 swc_ecma_visit = "0.96.9"

diff --git a/transforms/graphql_tag/src/lib.rs b/transforms/graphql_tag/src/lib.rs
@@ -132,7 +132,21 @@ where
                 let gql_raw_string = data.to_string();
 
                 let gql_text = if self.config.strip {
-                    strip_ignored_characters(gql_raw_string)
+                    let strip_result = strip_ignored_characters(gql_raw_string.clone());
+                    match strip_result {
+                        Ok(gql_strip_text) => gql_strip_text,
+                        Err(errors) => {
+                            for error in errors {
+                                println!(
+                                    "GraphQL Error: At index {}, {} got \"{}\" instead\n",
+                                    error.index(),
+                                    error.message(),
+                                    error.data()
+                                )
+                            }
+                            gql_raw_string
+                        }
+                    }
                 } else {
                     gql_raw_string
                 };

diff --git a/transforms/graphql_tag/src/parser/nodes/arguments/mod.rs b/transforms/graphql_tag/src/parser/nodes/arguments/mod.rs
@@ -1,5 +1,5 @@
 // libs
-use apollo_parser::ast::{Argument, Arguments};
+use apollo_parser::cst::{Argument, Arguments};
 use swc_common::Span;
 use swc_ecma_ast::*;
 

diff --git a/transforms/graphql_tag/src/parser/nodes/definitions/fragment.rs b/transforms/graphql_tag/src/parser/nodes/definitions/fragment.rs
@@ -1,5 +1,5 @@
 // libs
-use apollo_parser::ast::FragmentDefinition;
+use apollo_parser::cst::FragmentDefinition;
 use swc_common::Span;
 use swc_ecma_ast::*;
 

diff --git a/transforms/graphql_tag/src/parser/nodes/definitions/mod.rs b/transforms/graphql_tag/src/parser/nodes/definitions/mod.rs
@@ -1,5 +1,5 @@
 // libs
-use apollo_parser::ast::{AstChildren, Definition};
+use apollo_parser::cst::{CstChildren, Definition};
 use swc_common::Span;
 use swc_ecma_ast::*;
 
@@ -40,7 +40,7 @@ pub fn create_definition(definition: Definition, span: Span) -> Option<ExprOrSpr
     })
 }
 
-pub fn create_definitions(definitions: AstChildren<Definition>, span: Span) -> Expr {
+pub fn create_definitions(definitions: CstChildren<Definition>, span: Span) -> Expr {
     let mut all_definitions = vec![];
     for def in definitions {
         all_definitions.push(create_definition(def, span));

diff --git a/transforms/graphql_tag/src/parser/nodes/definitions/operation.rs b/transforms/graphql_tag/src/parser/nodes/definitions/operation.rs
@@ -1,5 +1,5 @@
 // libs
-use apollo_parser::ast::OperationDefinition;
+use apollo_parser::cst::OperationDefinition;
 use swc_common::Span;
 use swc_ecma_ast::*;
 

diff --git a/transforms/graphql_tag/src/parser/nodes/directive/mod.rs b/transforms/graphql_tag/src/parser/nodes/directive/mod.rs
@@ -1,5 +1,5 @@
 // libs
-use apollo_parser::ast::{Directive, Directives};
+use apollo_parser::cst::{Directive, Directives};
 use swc_common::Span;
 use swc_ecma_ast::*;
 

diff --git a/transforms/graphql_tag/src/parser/nodes/document/mod.rs b/transforms/graphql_tag/src/parser/nodes/document/mod.rs
@@ -2,7 +2,7 @@
 use std::collections::HashMap;
 
 // libs
-use apollo_parser::ast::Document;
+use apollo_parser::cst::Document;
 use swc_common::{comments::Comments, BytePos, Span};
 use swc_ecma_ast::*;
 

diff --git a/transforms/graphql_tag/src/parser/nodes/selection_set/mod.rs b/transforms/graphql_tag/src/parser/nodes/selection_set/mod.rs
@@ -1,5 +1,5 @@
 // libs
-use apollo_parser::ast::{AstChildren, Selection, SelectionSet};
+use apollo_parser::cst::{CstChildren, Selection, SelectionSet};
 use swc_common::Span;
 use swc_ecma_ast::*;
 
@@ -32,7 +32,7 @@ pub fn create_selection_set(selection_set: Option<SelectionSet>, span: Span) ->
     Expr::Object(sel_set)
 }
 
-fn create_selections(selections: AstChildren<Selection>, span: Span) -> Expr {
+fn create_selections(selections: CstChildren<Selection>, span: Span) -> Expr {
     let mut all_selections = vec![];
     for selection in selections {
         all_selections.push(create_selection(selection, span));

diff --git a/transforms/graphql_tag/src/parser/nodes/selection_set/selection.rs b/transforms/graphql_tag/src/parser/nodes/selection_set/selection.rs
@@ -1,5 +1,5 @@
 // libs
-use apollo_parser::ast::{Field, FragmentSpread, InlineFragment, Selection};
+use apollo_parser::cst::{Field, FragmentSpread, InlineFragment, Selection};
 use swc_common::Span;
 use swc_ecma_ast::*;
 

diff --git a/transforms/graphql_tag/src/parser/nodes/types/mod.rs b/transforms/graphql_tag/src/parser/nodes/types/mod.rs
@@ -1,5 +1,5 @@
 // libs
-use apollo_parser::ast::{ListType, NamedType, NonNullType, Type, TypeCondition};
+use apollo_parser::cst::{ListType, NamedType, NonNullType, Type, TypeCondition};
 use swc_common::Span;
 use swc_ecma_ast::*;
 

diff --git a/transforms/graphql_tag/src/parser/nodes/value/mod.rs b/transforms/graphql_tag/src/parser/nodes/value/mod.rs
@@ -1,6 +1,6 @@
 // libs
-use apollo_parser::ast::{
-    AstChildren, BooleanValue, EnumValue, FloatValue, IntValue, ListValue, NullValue, ObjectField,
+use apollo_parser::cst::{
+    BooleanValue, CstChildren, EnumValue, FloatValue, IntValue, ListValue, NullValue, ObjectField,
     ObjectValue, StringValue, Value,
 };
 use regex::Regex;
@@ -32,15 +32,12 @@ pub fn create_value(value: Option<Value>, span: Span) -> Expr {
 fn create_string_value(str: StringValue, span: Span) -> Expr {
     let kind = get_key_value_node("kind".into(), "StringValue".into());
 
-    let mut string_token = str.to_string();
+    let mut string_token: String = str.into();
     let re = Regex::new(r#""(?P<str>[^"]*)""#).unwrap();
     for cap in re.captures_iter(string_token.clone().as_str()) {
         string_token = cap[0].to_string();
     }
-    let value = get_key_value_node(
-        "value".into(),
-        string_token[1..string_token.len() - 1].into(),
-    );
+    let value = get_key_value_node("value".into(), string_token.into());
 
     let str_value = ObjectLit {
         span,
@@ -147,7 +144,7 @@ fn create_object_value(object: ObjectValue, span: Span) -> Expr {
     Expr::Object(object_val)
 }
 
-fn create_object_fields(object_fields: AstChildren<ObjectField>, span: Span) -> Expr {
+fn create_object_fields(object_fields: CstChildren<ObjectField>, span: Span) -> Expr {
     let mut all_fields = vec![];
     for field in object_fields.into_iter() {
         all_fields.push(Some(ExprOrSpread {
@@ -178,7 +175,7 @@ fn create_object_field(field: ObjectField, span: Span) -> Expr {
     Expr::Object(object_field_value)
 }
 
-fn create_list_value_values(values: AstChildren<Value>, span: Span) -> Expr {
+fn create_list_value_values(values: CstChildren<Value>, span: Span) -> Expr {
     let mut all_values = vec![];
     for value in values.into_iter() {
         all_values.push(Some(ExprOrSpread {

diff --git a/transforms/graphql_tag/src/parser/nodes/variables/mod.rs b/transforms/graphql_tag/src/parser/nodes/variables/mod.rs
@@ -1,5 +1,5 @@
 // libs
-use apollo_parser::ast::{DefaultValue, Variable, VariableDefinition, VariableDefinitions};
+use apollo_parser::cst::{DefaultValue, Variable, VariableDefinition, VariableDefinitions};
 use swc_common::Span;
 use swc_ecma_ast::*;
 

diff --git a/transforms/graphql_tag/src/parser/utils.rs b/transforms/graphql_tag/src/parser/utils.rs
@@ -1,4 +1,4 @@
-use apollo_parser::{ast::OperationType, Lexer, TokenKind};
+use apollo_parser::{cst::OperationType, Error, Lexer, TokenKind};
 
 use swc_ecma_ast::*;
 
@@ -49,13 +49,18 @@ fn is_punctuator_token_kind(kind: TokenKind) -> bool {
     }
 }
 
-pub fn strip_ignored_characters(source: String) -> String {
+pub fn strip_ignored_characters(source: String) -> Result<String, Vec<Error>> {
     let lexer = Lexer::new(source.as_str());
 
     let mut stripped_body = String::new();
     let mut was_last_added_token_non_punctuator = false;
+    let (tokens, errors) = lexer.lex();
 
-    for token in lexer.tokens() {
+    if errors.len() != 0 {
+        return Err(errors);
+    }
+
+    for token in tokens {
         let kind = token.kind();
         match kind {
             TokenKind::Whitespace | TokenKind::Comment | TokenKind::Eof => continue,
@@ -73,5 +78,5 @@ pub fn strip_ignored_characters(source: String) -> String {
         }
     }
 
-    stripped_body
+    Ok(stripped_body)
 }