@projectwallace/css-parser 0.12.0 → 0.12.1

package/dist/parse-selector.js

@@ -2,7 +2,7 @@ import { Lexer } from './tokenize.js';
 import { CSSDataArena, SELECTOR_LIST, SELECTOR, COMBINATOR, NESTING_SELECTOR, ID_SELECTOR, TYPE_SELECTOR, UNIVERSAL_SELECTOR, CLASS_SELECTOR, ATTRIBUTE_SELECTOR, ATTR_OPERATOR_NONE, ATTR_FLAG_NONE, ATTR_OPERATOR_EQUAL, ATTR_OPERATOR_TILDE_EQUAL, ATTR_OPERATOR_PIPE_EQUAL, ATTR_OPERATOR_CARET_EQUAL, ATTR_OPERATOR_DOLLAR_EQUAL, ATTR_OPERATOR_STAR_EQUAL, ATTR_FLAG_CASE_INSENSITIVE, ATTR_FLAG_CASE_SENSITIVE, PSEUDO_ELEMENT_SELECTOR, PSEUDO_CLASS_SELECTOR, FLAG_HAS_PARENS, LANG_SELECTOR, NTH_OF_SELECTOR } from './arena.js';
 import { TOKEN_COMMA, TOKEN_DELIM, TOKEN_EOF, TOKEN_WHITESPACE, TOKEN_FUNCTION, TOKEN_COLON, TOKEN_LEFT_BRACKET, TOKEN_HASH, TOKEN_IDENT, TOKEN_RIGHT_BRACKET, TOKEN_LEFT_PAREN, TOKEN_RIGHT_PAREN, TOKEN_STRING } from './token-types.js';
 import { skip_whitespace_and_comments_forward, skip_whitespace_and_comments_backward, skip_whitespace_forward } from './parse-utils.js';
-import { CHAR_GREATER_THAN, CHAR_PLUS, CHAR_TILDE, CHAR_PERIOD, CHAR_ASTERISK, CHAR_AMPERSAND, CHAR_PIPE, CHAR_SPACE, CHAR_TAB, CHAR_NEWLINE, CHAR_CARRIAGE_RETURN, CHAR_FORM_FEED, is_combinator, is_whitespace, CHAR_EQUALS, CHAR_CARET, CHAR_DOLLAR, CHAR_SINGLE_QUOTE, CHAR_DOUBLE_QUOTE, CHAR_COLON, str_equals, CHAR_FORWARD_SLASH } from './string-utils.js';
+import { CHAR_GREATER_THAN, CHAR_PLUS, CHAR_TILDE, CHAR_PERIOD, CHAR_ASTERISK, CHAR_AMPERSAND, CHAR_PIPE, is_combinator, is_whitespace, CHAR_EQUALS, CHAR_CARET, CHAR_DOLLAR, CHAR_SINGLE_QUOTE, CHAR_DOUBLE_QUOTE, CHAR_COLON, str_equals, CHAR_FORWARD_SLASH } from './string-utils.js';
 import { ANplusBParser } from './parse-anplusb.js';
 import { CSSNode } from './css-node.js';
 
@@ -38,7 +38,13 @@ class SelectorParser {
       let selector_column = this.lexer.column;
       let complex_selector = this.parse_complex_selector(allow_relative);
       if (complex_selector !== null) {
-        let selector_wrapper = this.arena.create_node(SELECTOR, selector_start, this.lexer.pos - selector_start, selector_line, selector_column);
+        let selector_wrapper = this.arena.create_node(
+          SELECTOR,
+          selector_start,
+          this.lexer.pos - selector_start,
+          selector_line,
+          selector_column
+        );
         this.arena.set_content_start_delta(selector_wrapper, 0);
         this.arena.set_content_length(selector_wrapper, this.lexer.pos - selector_start);
         let last_component = complex_selector;
@@ -81,7 +87,13 @@ class SelectorParser {
       if (token_type === TOKEN_DELIM) {
         let ch = this.source.charCodeAt(this.lexer.token_start);
         if (ch === CHAR_GREATER_THAN || ch === CHAR_PLUS || ch === CHAR_TILDE) {
-          let combinator = this.create_node_at(COMBINATOR, this.lexer.token_start, this.lexer.token_end, this.lexer.token_line, this.lexer.token_column);
+          let combinator = this.create_node_at(
+            COMBINATOR,
+            this.lexer.token_start,
+            this.lexer.token_end,
+            this.lexer.token_line,
+            this.lexer.token_column
+          );
           components.push(combinator);
           this.skip_whitespace();
         } else {
@@ -239,16 +251,9 @@ class SelectorParser {
     let whitespace_start = this.lexer.pos;
     let whitespace_start_line = this.lexer.line;
     let whitespace_start_column = this.lexer.column;
-    let has_whitespace = false;
-    while (this.lexer.pos < this.selector_end) {
-      let ch = this.source.charCodeAt(this.lexer.pos);
-      if (ch === CHAR_SPACE || ch === CHAR_TAB || ch === CHAR_NEWLINE || ch === CHAR_CARRIAGE_RETURN || ch === CHAR_FORM_FEED) {
-        has_whitespace = true;
-        this.lexer.advance();
-      } else {
-        break;
-      }
-    }
+    let has_whitespace = this.lexer.pos < this.selector_end;
+    this.skip_whitespace();
+    has_whitespace = has_whitespace && this.lexer.pos > whitespace_start;
     if (this.lexer.pos >= this.selector_end) {
       this.lexer.pos = whitespace_start;
       this.lexer.line = whitespace_start_line;
@@ -266,14 +271,7 @@ class SelectorParser {
       this.lexer.pos = whitespace_start;
       this.lexer.line = whitespace_start_line;
       this.lexer.column = whitespace_start_column;
-      while (this.lexer.pos < this.selector_end) {
-        let ch = this.source.charCodeAt(this.lexer.pos);
-        if (ch === CHAR_SPACE || ch === CHAR_TAB || ch === CHAR_NEWLINE || ch === CHAR_CARRIAGE_RETURN || ch === CHAR_FORM_FEED) {
-          this.lexer.advance();
-        } else {
-          break;
-        }
-      }
+      this.skip_whitespace();
       return this.create_node_at(COMBINATOR, whitespace_start, this.lexer.pos, whitespace_start_line, whitespace_start_column);
     }
     this.lexer.pos = whitespace_start;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@projectwallace/css-parser",
-	"version": "0.12.0",
+	"version": "0.12.1",
 	"description": "High-performance CSS lexer and parser, optimized for CSS inspection and analysis",
 	"author": "Bart Veneman <bart@projectwallace.com>",
 	"license": "MIT",