@projectwallace/css-parser 0.4.0 → 0.5.0

package/dist/parse-selector.js

@@ -1,5 +1,5 @@
-import { K as CSSDataArena, d as NODE_SELECTOR, C as CSSNode } from './string-utils-tMt2O9RW.js';
-import { S as SelectorParser } from './selector-parser-Wo-1tJbU.js';
+import { K as CSSDataArena, m as NODE_SELECTOR_LIST, C as CSSNode } from './string-utils-tMt2O9RW.js';
+import { S as SelectorParser } from './selector-parser-C-u1epDB.js';
 
 function parse_selector(source) {
   const arena = new CSSDataArena(CSSDataArena.capacity_for_source(source.length));
@@ -7,7 +7,7 @@ function parse_selector(source) {
   const selector_index = selector_parser.parse_selector(0, source.length);
   if (selector_index === null) {
     const empty = arena.create_node();
-    arena.set_type(empty, NODE_SELECTOR);
+    arena.set_type(empty, NODE_SELECTOR_LIST);
     arena.set_start_offset(empty, 0);
     arena.set_length(empty, 0);
     arena.set_start_line(empty, 1);

package/dist/parse.js

@@ -1,6 +1,6 @@
 import { L as Lexer, y as TOKEN_EOF, q as TOKEN_COMMA, h as TOKEN_DELIM, a as TOKEN_FUNCTION, c as TOKEN_HASH, d as TOKEN_STRING, k as TOKEN_DIMENSION, j as TOKEN_PERCENTAGE, i as TOKEN_NUMBER, T as TOKEN_IDENT, t as TOKEN_LEFT_PAREN, u as TOKEN_RIGHT_PAREN, b as TOKEN_AT_KEYWORD, v as TOKEN_LEFT_BRACE, w as TOKEN_RIGHT_BRACE, o as TOKEN_COLON, p as TOKEN_SEMICOLON } from './lexer-DXablYMZ.js';
-import { J as is_whitespace, f as NODE_VALUE_KEYWORD, g as NODE_VALUE_NUMBER, h as NODE_VALUE_DIMENSION, i as NODE_VALUE_STRING, j as NODE_VALUE_COLOR, l as NODE_VALUE_OPERATOR, k as NODE_VALUE_FUNCTION, K as CSSDataArena, e as NODE_STYLESHEET, C as CSSNode, N as NODE_STYLE_RULE, L as FLAG_HAS_BLOCK, M as FLAG_HAS_DECLARATIONS, d as NODE_SELECTOR, c as NODE_DECLARATION, O as is_vendor_prefixed, P as FLAG_VENDOR_PREFIXED, Q as trim_boundaries, I as FLAG_IMPORTANT, a as NODE_AT_RULE } from './string-utils-tMt2O9RW.js';
-import { S as SelectorParser } from './selector-parser-Wo-1tJbU.js';
+import { J as is_whitespace, f as NODE_VALUE_KEYWORD, g as NODE_VALUE_NUMBER, h as NODE_VALUE_DIMENSION, i as NODE_VALUE_STRING, j as NODE_VALUE_COLOR, l as NODE_VALUE_OPERATOR, k as NODE_VALUE_FUNCTION, K as CSSDataArena, e as NODE_STYLESHEET, C as CSSNode, N as NODE_STYLE_RULE, L as FLAG_HAS_BLOCK, M as FLAG_HAS_DECLARATIONS, m as NODE_SELECTOR_LIST, c as NODE_DECLARATION, O as is_vendor_prefixed, P as FLAG_VENDOR_PREFIXED, Q as trim_boundaries, I as FLAG_IMPORTANT, a as NODE_AT_RULE } from './string-utils-tMt2O9RW.js';
+import { S as SelectorParser } from './selector-parser-C-u1epDB.js';
 import { A as AtRulePreludeParser } from './at-rule-prelude-parser-Cj8ecgQp.js';
 
 const CH_PLUS = 43;
@@ -325,7 +325,7 @@ class Parser {
       }
     }
     let selector = this.arena.create_node();
-    this.arena.set_type(selector, NODE_SELECTOR);
+    this.arena.set_type(selector, NODE_SELECTOR_LIST);
     this.arena.set_start_line(selector, selector_line);
     this.arena.set_start_column(selector, selector_column);
     this.arena.set_start_offset(selector, selector_start);

package/dist/{selector-parser-Wo-1tJbU.js → selector-parser-C-u1epDB.js}

@@ -1,5 +1,5 @@
 import { L as Lexer, q as TOKEN_COMMA, y as TOKEN_EOF, l as TOKEN_WHITESPACE, a as TOKEN_FUNCTION, o as TOKEN_COLON, r as TOKEN_LEFT_BRACKET, h as TOKEN_DELIM, c as TOKEN_HASH, T as TOKEN_IDENT, s as TOKEN_RIGHT_BRACKET, t as TOKEN_LEFT_PAREN, u as TOKEN_RIGHT_PAREN } from './lexer-DXablYMZ.js';
-import { d as NODE_SELECTOR, m as NODE_SELECTOR_LIST, J as is_whitespace, o as NODE_SELECTOR_CLASS, q as NODE_SELECTOR_ATTRIBUTE, Q as trim_boundaries, s as NODE_SELECTOR_PSEUDO_ELEMENT, r as NODE_SELECTOR_PSEUDO_CLASS, O as is_vendor_prefixed, P as FLAG_VENDOR_PREFIXED, n as NODE_SELECTOR_TYPE, p as NODE_SELECTOR_ID, u as NODE_SELECTOR_UNIVERSAL, v as NODE_SELECTOR_NESTING, t as NODE_SELECTOR_COMBINATOR } from './string-utils-tMt2O9RW.js';
+import { m as NODE_SELECTOR_LIST, J as is_whitespace, o as NODE_SELECTOR_CLASS, q as NODE_SELECTOR_ATTRIBUTE, Q as trim_boundaries, s as NODE_SELECTOR_PSEUDO_ELEMENT, r as NODE_SELECTOR_PSEUDO_CLASS, O as is_vendor_prefixed, P as FLAG_VENDOR_PREFIXED, n as NODE_SELECTOR_TYPE, p as NODE_SELECTOR_ID, u as NODE_SELECTOR_UNIVERSAL, v as NODE_SELECTOR_NESTING, t as NODE_SELECTOR_COMBINATOR } from './string-utils-tMt2O9RW.js';
 
 class SelectorParser {
   lexer;
@@ -13,30 +13,20 @@ class SelectorParser {
     this.selector_end = 0;
   }
   // Parse a selector range into selector nodes
-  // Always returns a NODE_SELECTOR wrapper with detailed selector nodes as children
+  // Always returns a NODE_SELECTOR_LIST with selector components as children
   parse_selector(start, end, line = 1, column = 1) {
     this.selector_end = end;
     this.lexer.pos = start;
     this.lexer.line = line;
     this.lexer.column = column;
-    let innerSelector = this.parse_selector_list();
-    if (innerSelector === null) {
-      return null;
-    }
-    let selectorWrapper = this.arena.create_node();
-    this.arena.set_type(selectorWrapper, NODE_SELECTOR);
-    this.arena.set_start_offset(selectorWrapper, start);
-    this.arena.set_length(selectorWrapper, end - start);
-    this.arena.set_start_line(selectorWrapper, line);
-    this.arena.set_start_column(selectorWrapper, column);
-    this.arena.set_first_child(selectorWrapper, innerSelector);
-    this.arena.set_last_child(selectorWrapper, innerSelector);
-    return selectorWrapper;
+    return this.parse_selector_list();
   }
   // Parse comma-separated selectors
   parse_selector_list() {
     let selectors = [];
     let list_start = this.lexer.pos;
+    let list_line = this.lexer.line;
+    let list_column = this.lexer.column;
     while (this.lexer.pos < this.selector_end) {
       let selector = this.parse_complex_selector();
       if (selector !== null) {
@@ -53,16 +43,13 @@ class SelectorParser {
         break;
       }
     }
-    if (selectors.length === 1) {
-      return selectors[0];
-    }
-    if (selectors.length > 1) {
+    if (selectors.length >= 1) {
       let list_node = this.arena.create_node();
       this.arena.set_type(list_node, NODE_SELECTOR_LIST);
       this.arena.set_start_offset(list_node, list_start);
       this.arena.set_length(list_node, this.lexer.pos - list_start);
-      this.arena.set_start_line(list_node, this.lexer.line);
-      this.arena.set_start_column(list_node, this.lexer.column);
+      this.arena.set_start_line(list_node, list_line);
+      this.arena.set_start_column(list_node, list_column);
       this.arena.set_first_child(list_node, selectors[0]);
       this.arena.set_last_child(list_node, selectors[selectors.length - 1]);
       for (let i = 0; i < selectors.length - 1; i++) {

package/package.json

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