ether-code 0.3.8 → 0.4.0

package/ether-parser.js

@@ -219,11 +219,15 @@ class EtherParser {
     this.skipNewlines()
     
     while (!this.isAtEnd()) {
+      const startPos = this.pos
       const rule = this.parseCSSRule()
       if (rule) {
         stylesheet.rules.push(rule)
       }
       this.skipNewlines()
+      if (this.pos === startPos && !this.isAtEnd()) {
+        this.advance()
+      }
     }
     
     return stylesheet
@@ -298,11 +302,27 @@ class EtherParser {
       const token = this.current()
       
       if (!token || token.type === TokenType.NEWLINE || token.type === TokenType.INDENT || 
-          token.type === TokenType.COLON || token.type === TokenType.EOF) {
+          token.type === TokenType.EOF) {
         break
       }
       
-      if (token.type === TokenType.DOT) {
+      if (token.type === TokenType.COLON) {
+        this.advance()
+        const next = this.current()
+        if (next && next.type === TokenType.COLON) {
+          this.advance()
+          const pseudoName = this.current()
+          if (pseudoName && pseudoName.type === TokenType.IDENTIFIER) {
+            parts.push('::' + pseudoName.value)
+            this.advance()
+          }
+        } else if (next && next.type === TokenType.IDENTIFIER) {
+          parts.push(':' + next.value)
+          this.advance()
+        } else {
+          break
+        }
+      } else if (token.type === TokenType.DOT) {
         this.advance()
         const name = this.current()
         if (name && name.type === TokenType.IDENTIFIER) {
@@ -334,12 +354,28 @@ class EtherParser {
       } else if (token.type === TokenType.TILDE) {
         parts.push('~')
         this.advance()
+      } else if (token.type === TokenType.LBRACKET) {
+        let attrSelector = '['
+        this.advance()
+        while (!this.isAtEnd()) {
+          const attrToken = this.current()
+          if (!attrToken || attrToken.type === TokenType.RBRACKET) {
+            attrSelector += ']'
+            this.advance()
+            break
+          }
+          attrSelector += attrToken.value
+          this.advance()
+        }
+        parts.push(attrSelector)
+      } else if (token.type === TokenType.EQUALS) {
+        break
       } else {
         break
       }
     }
     
-    return parts.join(' ').replace(/\s+([,>+~])\s+/g, ' $1 ').trim()
+    return parts.join(' ').replace(/\s+([,>+~])\s+/g, ' $1 ').replace(/\s+(::?)/g, '$1').trim()
   }
 
   translateCSSSelector(selector) {
@@ -3098,4 +3134,4 @@ class EtherParser {
 
 module.exports = {
   EtherParser
-}
+}