graphql-c_parser 1.1.0 → 1.1.2

data/lib/graphql/c_parser/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module CParser
-    VERSION = "1.1.0"
+    VERSION = "1.1.2"
   end
 end

data/lib/graphql/c_parser.rb

@@ -6,8 +6,8 @@ require "graphql/graphql_c_parser_ext"
 
 module GraphQL
   module CParser
-    def self.parse(query_str, filename: nil, trace: GraphQL::Tracing::NullTrace)
-      Parser.parse(query_str, filename: filename, trace: trace)
+    def self.parse(query_str, filename: nil, trace: GraphQL::Tracing::NullTrace, max_tokens: nil)
+      Parser.parse(query_str, filename: filename, trace: trace, max_tokens: max_tokens)
     end
 
     def self.parse_file(filename)
@@ -16,12 +16,15 @@ module GraphQL
     end
 
     def self.tokenize_with_c(str)
-      tokenize_with_c_internal(str, false)
+      reject_numbers_followed_by_names = GraphQL.respond_to?(:reject_numbers_followed_by_names) && GraphQL.reject_numbers_followed_by_names
+      tokenize_with_c_internal(str, false, reject_numbers_followed_by_names)
     end
 
     def self.prepare_parse_error(message, parser)
+      query_str = parser.query_string
+      filename = parser.filename
       if message.start_with?("memory exhausted")
-        return GraphQL::ParseError.new("This query is too large to execute.", nil, nil, parser.query_string, filename: parser.filename)
+        return GraphQL::ParseError.new("This query is too large to execute.", nil, nil, query_str, filename: filename)
       end
       token = parser.tokens[parser.next_token_index - 1]
       if token
@@ -40,7 +43,11 @@ module GraphQL
         end
       end
 
-      GraphQL::ParseError.new(message, line, col, parser.query_string, filename: parser.filename)
+      GraphQL::ParseError.new(message, line, col, query_str, filename: filename)
+    end
+
+    def self.prepare_number_name_parse_error(line, col, query_str, number_part, name_part)
+      raise GraphQL::ParseError.new("Name after number is not allowed (in `#{number_part}#{name_part}`)", line, col, query_str)
     end
 
     def self.prepare_bad_unicode_error(parser)
@@ -57,7 +64,7 @@ module GraphQL
     end
 
     module Lexer
-      def self.tokenize(graphql_string, intern_identifiers: false)
+      def self.tokenize(graphql_string, intern_identifiers: false, max_tokens: nil)
         if !(graphql_string.encoding == Encoding::UTF_8 || graphql_string.ascii_only?)
           graphql_string = graphql_string.dup.force_encoding(Encoding::UTF_8)
         end
@@ -68,18 +75,20 @@ module GraphQL
               1,
               1,
               graphql_string,
-              nil, # prev token
               241 # BAD_UNICODE_ESCAPE in lexer.rl
             ]
           ]
         end
-        tokenize_with_c_internal(graphql_string, intern_identifiers)
+        reject_numbers_followed_by_names = GraphQL.respond_to?(:reject_numbers_followed_by_names) && GraphQL.reject_numbers_followed_by_names
+        # -1 indicates that there is no limit
+        lexer_max_tokens = max_tokens.nil? ? -1 : max_tokens
+        tokenize_with_c_internal(graphql_string, intern_identifiers, reject_numbers_followed_by_names, lexer_max_tokens)
       end
     end
 
     class Parser
-      def self.parse(query_str, filename: nil, trace: GraphQL::Tracing::NullTrace)
-        self.new(query_str, filename, trace).result
+      def self.parse(query_str, filename: nil, trace: GraphQL::Tracing::NullTrace, max_tokens: nil)
+        self.new(query_str, filename, trace, max_tokens).result
       end
 
       def self.parse_file(filename)
@@ -87,7 +96,7 @@ module GraphQL
         parse(contents, filename: filename)
       end
 
-      def initialize(query_string, filename, trace)
+      def initialize(query_string, filename, trace, max_tokens)
         if query_string.nil?
           raise GraphQL::ParseError.new("No query string was present", nil, nil, query_string)
         end
@@ -98,12 +107,13 @@ module GraphQL
         @result = nil
         @trace = trace
         @intern_identifiers = false
+        @max_tokens = max_tokens
       end
 
       def result
         if @result.nil?
           @tokens = @trace.lex(query_string: @query_string) do
-            GraphQL::CParser::Lexer.tokenize(@query_string, intern_identifiers: @intern_identifiers)
+            GraphQL::CParser::Lexer.tokenize(@query_string, intern_identifiers: @intern_identifiers, max_tokens: @max_tokens)
           end
           @trace.parse(query_string: @query_string) do
             c_parse
@@ -113,6 +123,11 @@ module GraphQL
         @result
       end
 
+      def tokens_count
+        result
+        @tokens.length
+      end
+
       attr_reader :tokens, :next_token_index, :query_string, :filename
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-c_parser
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-15 00:00:00.000000000 Z
+date: 2024-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.12
 signing_key:
 specification_version: 4
 summary: A parser for GraphQL, implemented as a C extension