@projectwallace/css-parser 0.13.0 → 0.13.2

package/dist/parse-declaration.js

@@ -2,7 +2,7 @@ import { Lexer } from './tokenize.js';
 import { CSSDataArena, DECLARATION, FLAG_IMPORTANT, FLAG_BROWSERHACK } from './arena.js';
 import { ValueParser } from './parse-value.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 { 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, TOKEN_FUNCTION } from './token-types.js';
 import { trim_boundaries } from './parse-utils.js';
 import { CSSNode } from './css-node.js';
 
@@ -97,10 +97,16 @@ class DeclarationParser {
     let value_end = value_start;
     let has_important = false;
     let last_end = lexer.token_end;
+    let paren_depth = 0;
     while (lexer.token_type !== TOKEN_EOF && lexer.token_start < end) {
       let token_type = lexer.token_type;
-      if (token_type === TOKEN_SEMICOLON) break;
-      if (token_type === TOKEN_RIGHT_BRACE) break;
+      if (token_type === TOKEN_LEFT_PAREN || token_type === TOKEN_FUNCTION) {
+        paren_depth++;
+      } else if (token_type === TOKEN_RIGHT_PAREN) {
+        paren_depth--;
+      }
+      if (token_type === TOKEN_SEMICOLON && paren_depth === 0) break;
+      if (token_type === TOKEN_RIGHT_BRACE && paren_depth === 0) break;
       if (token_type === TOKEN_LEFT_BRACE) {
         lexer.restore_position(saved);
         return null;

package/dist/parse.js

@@ -4,7 +4,7 @@ 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_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 { 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, TOKEN_FUNCTION } 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';
 
@@ -213,9 +213,16 @@ class Parser {
     this.arena.set_content_length(at_rule, name_length);
     let prelude_start = this.lexer.token_start;
     let prelude_end = prelude_start;
+    let paren_depth = 0;
     while (!this.is_eof()) {
       let token_type = this.peek_type();
-      if (token_type === TOKEN_LEFT_BRACE || token_type === TOKEN_SEMICOLON) break;
+      if (token_type === TOKEN_LEFT_PAREN || token_type === TOKEN_FUNCTION) {
+        paren_depth++;
+      } else if (token_type === TOKEN_RIGHT_PAREN) {
+        paren_depth--;
+      }
+      if (token_type === TOKEN_LEFT_BRACE && paren_depth === 0) break;
+      if (token_type === TOKEN_SEMICOLON && paren_depth === 0) break;
       prelude_end = this.lexer.token_end;
       this.next_token();
     }

package/package.json

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