@projectwallace/css-parser 0.8.6 → 0.8.8

package/dist/arena.d.ts

@@ -41,6 +41,7 @@ export declare const FLAG_HAS_BLOCK: number;
 export declare const FLAG_VENDOR_PREFIXED: number;
 export declare const FLAG_HAS_DECLARATIONS: number;
 export declare const FLAG_HAS_PARENS: number;
+export declare const FLAG_BROWSERHACK: number;
 export declare const ATTR_OPERATOR_NONE = 0;
 export declare const ATTR_OPERATOR_EQUAL = 1;
 export declare const ATTR_OPERATOR_TILDE_EQUAL = 2;

package/dist/arena.js

@@ -41,6 +41,7 @@ const FLAG_LENGTH_OVERFLOW = 1 << 2;
 const FLAG_HAS_BLOCK = 1 << 3;
 const FLAG_HAS_DECLARATIONS = 1 << 5;
 const FLAG_HAS_PARENS = 1 << 6;
+const FLAG_BROWSERHACK = 1 << 7;
 const ATTR_OPERATOR_NONE = 0;
 const ATTR_OPERATOR_EQUAL = 1;
 const ATTR_OPERATOR_TILDE_EQUAL = 2;
@@ -279,4 +280,4 @@ class CSSDataArena {
   }
 }
 
-export { ATTRIBUTE_SELECTOR, ATTR_FLAG_CASE_INSENSITIVE, ATTR_FLAG_CASE_SENSITIVE, ATTR_FLAG_NONE, ATTR_OPERATOR_CARET_EQUAL, ATTR_OPERATOR_DOLLAR_EQUAL, ATTR_OPERATOR_EQUAL, ATTR_OPERATOR_NONE, ATTR_OPERATOR_PIPE_EQUAL, ATTR_OPERATOR_STAR_EQUAL, ATTR_OPERATOR_TILDE_EQUAL, AT_RULE, BLOCK, CLASS_SELECTOR, COMBINATOR, COMMENT, CONTAINER_QUERY, CSSDataArena, DECLARATION, DIMENSION, FLAG_HAS_BLOCK, FLAG_HAS_DECLARATIONS, FLAG_HAS_ERROR, FLAG_HAS_PARENS, FLAG_IMPORTANT, FLAG_LENGTH_OVERFLOW, FUNCTION, HASH, IDENTIFIER, ID_SELECTOR, LANG_SELECTOR, LAYER_NAME, MEDIA_FEATURE, MEDIA_QUERY, MEDIA_TYPE, NESTING_SELECTOR, NTH_OF_SELECTOR, NTH_SELECTOR, NUMBER, OPERATOR, PARENTHESIS, PRELUDE_OPERATOR, PSEUDO_CLASS_SELECTOR, PSEUDO_ELEMENT_SELECTOR, SELECTOR, SELECTOR_LIST, STRING, STYLESHEET, STYLE_RULE, SUPPORTS_QUERY, TYPE_SELECTOR, UNIVERSAL_SELECTOR, URL };
+export { ATTRIBUTE_SELECTOR, ATTR_FLAG_CASE_INSENSITIVE, ATTR_FLAG_CASE_SENSITIVE, ATTR_FLAG_NONE, ATTR_OPERATOR_CARET_EQUAL, ATTR_OPERATOR_DOLLAR_EQUAL, ATTR_OPERATOR_EQUAL, ATTR_OPERATOR_NONE, ATTR_OPERATOR_PIPE_EQUAL, ATTR_OPERATOR_STAR_EQUAL, ATTR_OPERATOR_TILDE_EQUAL, AT_RULE, BLOCK, CLASS_SELECTOR, COMBINATOR, COMMENT, CONTAINER_QUERY, CSSDataArena, DECLARATION, DIMENSION, FLAG_BROWSERHACK, FLAG_HAS_BLOCK, FLAG_HAS_DECLARATIONS, FLAG_HAS_ERROR, FLAG_HAS_PARENS, FLAG_IMPORTANT, FLAG_LENGTH_OVERFLOW, FUNCTION, HASH, IDENTIFIER, ID_SELECTOR, LANG_SELECTOR, LAYER_NAME, MEDIA_FEATURE, MEDIA_QUERY, MEDIA_TYPE, NESTING_SELECTOR, NTH_OF_SELECTOR, NTH_SELECTOR, NUMBER, OPERATOR, PARENTHESIS, PRELUDE_OPERATOR, PSEUDO_CLASS_SELECTOR, PSEUDO_ELEMENT_SELECTOR, SELECTOR, SELECTOR_LIST, STRING, STYLESHEET, STYLE_RULE, SUPPORTS_QUERY, TYPE_SELECTOR, UNIVERSAL_SELECTOR, URL };

package/dist/css-node.d.ts

@@ -64,6 +64,7 @@ export type PlainCSSNode = {
     prelude?: string;
     is_important?: boolean;
     is_vendor_prefixed?: boolean;
+    is_browserhack?: boolean;
     has_error?: boolean;
     attr_operator?: number;
     attr_flags?: number;
@@ -124,6 +125,8 @@ export declare class CSSNode {
     get unit(): string | null;
     /** Check if this declaration has !important */
     get is_important(): boolean | null;
+    /** Check if this declaration has a browser hack prefix */
+    get is_browserhack(): boolean | null;
     /** Check if this has a vendor prefix (computed on-demand) */
     get is_vendor_prefixed(): boolean;
     /** Check if this node has an error */

package/dist/css-node.js

@@ -1,4 +1,4 @@
-import { DIMENSION, NUMBER, URL, STRING, DECLARATION, FLAG_IMPORTANT, IDENTIFIER, FUNCTION, AT_RULE, PSEUDO_ELEMENT_SELECTOR, PSEUDO_CLASS_SELECTOR, FLAG_HAS_ERROR, FLAG_HAS_BLOCK, FLAG_HAS_DECLARATIONS, STYLE_RULE, BLOCK, COMMENT, FLAG_HAS_PARENS, NTH_SELECTOR, NTH_OF_SELECTOR, SELECTOR_LIST, SELECTOR, COMBINATOR, ATTRIBUTE_SELECTOR, PRELUDE_OPERATOR, LAYER_NAME, SUPPORTS_QUERY, CONTAINER_QUERY, MEDIA_TYPE, MEDIA_FEATURE, MEDIA_QUERY, LANG_SELECTOR, NESTING_SELECTOR, UNIVERSAL_SELECTOR, ID_SELECTOR, CLASS_SELECTOR, TYPE_SELECTOR, PARENTHESIS, OPERATOR, HASH, STYLESHEET } from './arena.js';
+import { DIMENSION, NUMBER, URL, STRING, DECLARATION, FLAG_IMPORTANT, FLAG_BROWSERHACK, IDENTIFIER, FUNCTION, AT_RULE, PSEUDO_ELEMENT_SELECTOR, PSEUDO_CLASS_SELECTOR, FLAG_HAS_ERROR, FLAG_HAS_BLOCK, FLAG_HAS_DECLARATIONS, STYLE_RULE, BLOCK, COMMENT, FLAG_HAS_PARENS, NTH_SELECTOR, NTH_OF_SELECTOR, SELECTOR_LIST, SELECTOR, COMBINATOR, ATTRIBUTE_SELECTOR, PRELUDE_OPERATOR, LAYER_NAME, SUPPORTS_QUERY, CONTAINER_QUERY, MEDIA_TYPE, MEDIA_FEATURE, MEDIA_QUERY, LANG_SELECTOR, NESTING_SELECTOR, UNIVERSAL_SELECTOR, ID_SELECTOR, CLASS_SELECTOR, TYPE_SELECTOR, PARENTHESIS, OPERATOR, HASH, STYLESHEET } from './arena.js';
 import { str_starts_with, is_vendor_prefixed, is_whitespace, CHAR_MINUS_HYPHEN, CHAR_PLUS } from './string-utils.js';
 import { parse_dimension } from './parse-utils.js';
 
@@ -160,6 +160,11 @@ class CSSNode {
     if (this.type !== DECLARATION) return null;
     return this.arena.has_flag(this.index, FLAG_IMPORTANT);
   }
+  /** Check if this declaration has a browser hack prefix */
+  get is_browserhack() {
+    if (this.type !== DECLARATION) return null;
+    return this.arena.has_flag(this.index, FLAG_BROWSERHACK);
+  }
   /** Check if this has a vendor prefix (computed on-demand) */
   get is_vendor_prefixed() {
     switch (this.type) {
@@ -478,7 +483,10 @@ class CSSNode {
     if (this.type === AT_RULE && this.prelude) {
       plain.prelude = this.prelude;
     }
-    if (this.type === DECLARATION) plain.is_important = this.is_important;
+    if (this.type === DECLARATION) {
+      plain.is_important = this.is_important;
+      plain.is_browserhack = this.is_browserhack;
+    }
     plain.is_vendor_prefixed = this.is_vendor_prefixed;
     plain.has_error = this.has_error;
     if (this.type === ATTRIBUTE_SELECTOR) {

package/dist/parse-atrule-prelude.js

@@ -335,6 +335,8 @@ class AtRulePreludeParser {
           if (trimmed) {
             this.arena.set_content_start_delta(layer_node, trimmed[0] - layer_start);
             this.arena.set_content_length(layer_node, trimmed[1] - trimmed[0]);
+            this.arena.set_value_start_delta(layer_node, trimmed[0] - layer_start);
+            this.arena.set_value_length(layer_node, trimmed[1] - trimmed[0]);
           }
         }
         return layer_node;
@@ -351,8 +353,10 @@ class AtRulePreludeParser {
       let text = this.source.substring(this.lexer.token_start, this.lexer.token_end - 1);
       if (str_equals("supports", text)) {
         let supports_start = this.lexer.token_start;
+        let content_start = this.lexer.token_end;
         let paren_depth = 1;
         let supports_end = this.lexer.token_end;
+        let content_end = content_start;
         while (this.lexer.pos < this.prelude_end && paren_depth > 0) {
           let tokenType = this.next_token();
           if (tokenType === TOKEN_LEFT_PAREN || tokenType === TOKEN_FUNCTION) {
@@ -360,6 +364,7 @@ class AtRulePreludeParser {
           } else if (tokenType === TOKEN_RIGHT_PAREN) {
             paren_depth--;
             if (paren_depth === 0) {
+              content_end = this.lexer.token_start;
               supports_end = this.lexer.token_end;
             }
           } else if (tokenType === TOKEN_EOF) {
@@ -367,6 +372,11 @@ class AtRulePreludeParser {
           }
         }
         let supports_node = this.create_node(SUPPORTS_QUERY, supports_start, supports_end);
+        let trimmed = trim_boundaries(this.source, content_start, content_end);
+        if (trimmed) {
+          this.arena.set_value_start_delta(supports_node, trimmed[0] - supports_start);
+          this.arena.set_value_length(supports_node, trimmed[1] - trimmed[0]);
+        }
         return supports_node;
       }
     }

package/dist/parse-declaration.js

@@ -1,7 +1,8 @@
 import { Lexer } from './tokenize.js';
-import { CSSDataArena, DECLARATION, FLAG_IMPORTANT } from './arena.js';
+import { CSSDataArena, DECLARATION, FLAG_IMPORTANT, FLAG_BROWSERHACK } from './arena.js';
 import { ValueParser } from './parse-value.js';
-import { TOKEN_IDENT, TOKEN_COLON, TOKEN_EOF, TOKEN_SEMICOLON, TOKEN_RIGHT_BRACE, TOKEN_LEFT_BRACE, TOKEN_DELIM } from './token-types.js';
+import { is_vendor_prefixed } from './string-utils.js';
+import { TOKEN_AT_KEYWORD, TOKEN_HASH, TOKEN_IDENT, TOKEN_DELIM, TOKEN_LEFT_PAREN, TOKEN_RIGHT_PAREN, TOKEN_LEFT_BRACKET, TOKEN_RIGHT_BRACKET, TOKEN_COMMA, TOKEN_COLON, TOKEN_EOF, TOKEN_SEMICOLON, TOKEN_RIGHT_BRACE, TOKEN_LEFT_BRACE } from './token-types.js';
 import { trim_boundaries } from './parse-utils.js';
 import { CSSNode } from './css-node.js';
 
@@ -25,13 +26,54 @@ class DeclarationParser {
   }
   // Parse a declaration using a provided lexer (used by Parser to avoid re-tokenization)
   parse_declaration_with_lexer(lexer, end) {
-    if (lexer.token_type !== TOKEN_IDENT) {
+    let has_browser_hack = false;
+    let browser_hack_start = 0;
+    let browser_hack_line = 1;
+    let browser_hack_column = 1;
+    if (lexer.token_type === TOKEN_AT_KEYWORD || lexer.token_type === TOKEN_HASH) {
+      has_browser_hack = true;
+      browser_hack_start = lexer.token_start;
+      browser_hack_line = lexer.token_line;
+      browser_hack_column = lexer.token_column;
+    } else if (lexer.token_type === TOKEN_IDENT) {
+      const first_char = this.source.charCodeAt(lexer.token_start);
+      if (first_char === 95) {
+        has_browser_hack = true;
+        browser_hack_start = lexer.token_start;
+        browser_hack_line = lexer.token_line;
+        browser_hack_column = lexer.token_column;
+      } else if (first_char === 45) {
+        const second_char = this.source.charCodeAt(lexer.token_start + 1);
+        const is_custom_property = second_char === 45;
+        if (!is_custom_property && !is_vendor_prefixed(this.source, lexer.token_start, lexer.token_end)) {
+          has_browser_hack = true;
+          browser_hack_start = lexer.token_start;
+          browser_hack_line = lexer.token_line;
+          browser_hack_column = lexer.token_column;
+        }
+      }
+    } else {
+      const is_browser_hack_token = lexer.token_type === TOKEN_DELIM || lexer.token_type === TOKEN_LEFT_PAREN || lexer.token_type === TOKEN_RIGHT_PAREN || lexer.token_type === TOKEN_LEFT_BRACKET || lexer.token_type === TOKEN_RIGHT_BRACKET || lexer.token_type === TOKEN_COMMA || lexer.token_type === TOKEN_COLON;
+      if (is_browser_hack_token) {
+        const delim_saved = lexer.save_position();
+        browser_hack_start = lexer.token_start;
+        browser_hack_line = lexer.token_line;
+        browser_hack_column = lexer.token_column;
+        lexer.next_token_fast(true);
+        if (lexer.token_type === TOKEN_IDENT) {
+          has_browser_hack = true;
+        } else {
+          lexer.restore_position(delim_saved);
+        }
+      }
+    }
+    if (lexer.token_type !== TOKEN_IDENT && lexer.token_type !== TOKEN_AT_KEYWORD && lexer.token_type !== TOKEN_HASH) {
       return null;
     }
-    let prop_start = lexer.token_start;
+    let prop_start = has_browser_hack ? browser_hack_start : lexer.token_start;
     let prop_end = lexer.token_end;
-    let decl_line = lexer.token_line;
-    let decl_column = lexer.token_column;
+    let decl_line = has_browser_hack ? browser_hack_line : lexer.token_line;
+    let decl_column = has_browser_hack ? browser_hack_column : lexer.token_column;
     const saved = lexer.save_position();
     lexer.next_token_fast(true);
     if (lexer.token_type !== TOKEN_COLON) {
@@ -92,6 +134,9 @@ class DeclarationParser {
     if (has_important) {
       this.arena.set_flag(declaration, FLAG_IMPORTANT);
     }
+    if (has_browser_hack) {
+      this.arena.set_flag(declaration, FLAG_BROWSERHACK);
+    }
     if (lexer.token_type === TOKEN_SEMICOLON) {
       last_end = lexer.token_end;
       lexer.next_token_fast(true);

package/dist/parse.js

@@ -4,8 +4,9 @@ import { CSSNode } from './css-node.js';
 import { SelectorParser } from './parse-selector.js';
 import { AtRulePreludeParser } from './parse-atrule-prelude.js';
 import { DeclarationParser } from './parse-declaration.js';
-import { TOKEN_EOF, TOKEN_AT_KEYWORD, TOKEN_LEFT_BRACE, TOKEN_RIGHT_BRACE, TOKEN_IDENT, TOKEN_SEMICOLON } from './token-types.js';
+import { TOKEN_EOF, TOKEN_AT_KEYWORD, TOKEN_LEFT_BRACE, TOKEN_RIGHT_BRACE, TOKEN_IDENT, TOKEN_HASH, TOKEN_DELIM, TOKEN_LEFT_PAREN, TOKEN_RIGHT_PAREN, TOKEN_LEFT_BRACKET, TOKEN_RIGHT_BRACKET, TOKEN_COMMA, TOKEN_COLON, TOKEN_SEMICOLON } from './token-types.js';
 import { trim_boundaries } from './parse-utils.js';
+import { CHAR_PERIOD, CHAR_GREATER_THAN, CHAR_PLUS, CHAR_TILDE, CHAR_AMPERSAND } from './string-utils.js';
 
 let DECLARATION_AT_RULES = /* @__PURE__ */ new Set(["font-face", "font-feature-values", "page", "property", "counter-style"]);
 let CONDITIONAL_AT_RULES = /* @__PURE__ */ new Set(["media", "supports", "container", "layer", "nest"]);
@@ -176,10 +177,18 @@ class Parser {
   }
   // Parse a declaration: property: value;
   parse_declaration() {
-    if (this.peek_type() !== TOKEN_IDENT) {
-      return null;
+    const token_type = this.peek_type();
+    if (token_type === TOKEN_IDENT || token_type === TOKEN_AT_KEYWORD || token_type === TOKEN_HASH) {
+      return this.declaration_parser.parse_declaration_with_lexer(this.lexer, this.source.length);
+    }
+    if (token_type === TOKEN_DELIM || token_type === TOKEN_LEFT_PAREN || token_type === TOKEN_RIGHT_PAREN || token_type === TOKEN_LEFT_BRACKET || token_type === TOKEN_RIGHT_BRACKET || token_type === TOKEN_COMMA || token_type === TOKEN_COLON) {
+      const char_code = this.source.charCodeAt(this.lexer.token_start);
+      if (char_code === CHAR_PERIOD || char_code === CHAR_GREATER_THAN || char_code === CHAR_PLUS || char_code === CHAR_TILDE || char_code === CHAR_AMPERSAND) {
+        return null;
+      }
+      return this.declaration_parser.parse_declaration_with_lexer(this.lexer, this.source.length);
     }
-    return this.declaration_parser.parse_declaration_with_lexer(this.lexer, this.source.length);
+    return null;
   }
   // Parse an at-rule: @media, @import, @font-face, etc.
   parse_atrule() {

package/package.json

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