parselly 1.2.0 → 1.3.0

data/lib/parselly/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parselly
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/lib/parselly.rb

@@ -1,14 +1,48 @@
 # frozen_string_literal: true
 
 require 'strscan'
-
-require_relative 'parselly/lexer'
-require_relative 'parselly/node'
-require_relative 'parselly/parser'
-require_relative 'parselly/version'
+require 'set'
 
 module Parselly
-  ParseResult = Struct.new(:ast, :errors)
+  class ParseResult
+    attr_accessor :ast, :errors
+
+    def initialize(ast = nil, errors = nil, **keywords)
+      @ast = keywords.fetch(:ast, ast)
+      @errors = keywords.fetch(:errors, errors || [])
+    end
+
+    def success?
+      errors.empty? && !ast.nil?
+    end
+
+    def failure?
+      !success?
+    end
+
+    def empty?
+      ast.nil?
+    end
+
+    def first_error
+      errors.first
+    end
+
+    def to_a
+      [ast, errors]
+    end
+
+    def deconstruct
+      to_a
+    end
+
+    def deconstruct_keys(keys)
+      hash = { ast: ast, errors: errors }
+      return hash if keys.nil?
+
+      keys.each_with_object({}) { |key, result| result[key] = hash[key] if hash.key?(key) }
+    end
+  end
 
   class ParseError < StandardError
     attr_reader :error
@@ -19,8 +53,18 @@ module Parselly
     end
   end
 
-  def parse(selector, tolerant: false)
-    Parser.new.parse(selector, tolerant: tolerant)
+  class LexError < ParseError; end
+  class SyntaxError < ParseError; end
+end
+
+require_relative 'parselly/lexer'
+require_relative 'parselly/node'
+require_relative 'parselly/parser'
+require_relative 'parselly/version'
+
+module Parselly
+  def parse(selector, **options)
+    Parser.new.parse(selector, **options)
   end
 
   def sanitize(selector)
@@ -42,12 +86,15 @@ module Parselly
       elsif scanner.pos.zero? && scanner.scan(/\d/)
         result << escaped_hex(scanner.matched)
       # Second character is a digit and first is `-`
-      elsif scanner.pos == 1 && scanner.scan(/\d/) &&
-            scanner.pre_match == '-'
+      elsif scanner.pos == 1 && scanner.peek(1).match?(/\d/) &&
+            scanner.string.start_with?('-') && scanner.scan(/\d/)
         result << escaped_hex(scanner.matched)
       # Alphanumeric characters, `-`, `_`
       elsif scanner.scan(/[a-zA-Z0-9\-_]/)
         result << scanner.matched
+      # Non-ASCII characters are valid CSS identifier characters.
+      elsif scanner.scan(/[^\x00-\x7F]/)
+        result << scanner.matched
       # Any other characters, escape them
       elsif scanner.scan(/./)
         result << "\\#{scanner.matched}"