ether-code 0.4.0 → 0.4.1

package/cli/ether.js

@@ -6,7 +6,7 @@ const http = require('http')
 const { EtherCompiler } = require('./compiler')
 const { Watcher } = require('./watcher')
 
-const VERSION = '0.4.0'
+const VERSION = '0.4.1'
 
 const COLORS = {
   reset: '\x1b[0m',

package/ether-parser.js

@@ -436,6 +436,7 @@ class EtherParser {
     }
     
     const valueParts = []
+    let lastType = null
     
     while (!this.isAtEnd()) {
       const current = this.current()
@@ -445,21 +446,31 @@ class EtherParser {
         break
       }
       
+      let needsSpace = valueParts.length > 0
+      
+      if (current.type === TokenType.LPAREN || current.type === TokenType.COMMA ||
+          current.type === TokenType.RPAREN || current.type === TokenType.PERCENT ||
+          lastType === TokenType.LPAREN || lastType === TokenType.MINUS ||
+          lastType === TokenType.HASH || lastType === TokenType.COLON) {
+        needsSpace = false
+      }
+      
       if (current.type === TokenType.IDENTIFIER) {
+        if (needsSpace) valueParts.push(' ')
         valueParts.push(current.value)
       } else if (current.type === TokenType.NUMBER || current.type === TokenType.INTEGER || 
                  current.type === TokenType.FLOAT) {
+        if (needsSpace && lastType !== TokenType.HASH) valueParts.push(' ')
         valueParts.push(current.value)
       } else if (current.type === TokenType.STRING) {
+        if (needsSpace) valueParts.push(' ')
+        valueParts.push('"' + current.value + '"')
+      } else if (current.type === TokenType.HEX) {
+        if (needsSpace) valueParts.push(' ')
         valueParts.push(current.value)
-      } else if (current.type === TokenType.HEX || current.type === TokenType.HASH) {
-        const next = this.peek(1)
-        if (next && (next.type === TokenType.IDENTIFIER || next.type === TokenType.NUMBER)) {
-          this.advance()
-          valueParts.push('#' + next.value)
-        } else {
-          valueParts.push('#')
-        }
+      } else if (current.type === TokenType.HASH) {
+        if (needsSpace) valueParts.push(' ')
+        valueParts.push('#')
       } else if (current.type === TokenType.COMMA) {
         valueParts.push(',')
       } else if (current.type === TokenType.LPAREN) {
@@ -469,25 +480,33 @@ class EtherParser {
       } else if (current.type === TokenType.PERCENT) {
         valueParts.push('%')
       } else if (current.type === TokenType.SLASH) {
+        if (needsSpace) valueParts.push(' ')
         valueParts.push('/')
       } else if (current.type === TokenType.MINUS) {
-        valueParts.push('-')
+        if (lastType === TokenType.LPAREN || lastType === TokenType.MINUS) {
+          valueParts.push('-')
+        } else if (needsSpace) {
+          valueParts.push(' -')
+        } else {
+          valueParts.push('-')
+        }
+      } else if (current.type === TokenType.COLON) {
+        valueParts.push(':')
+      } else if (current.type === TokenType.DOT) {
+        valueParts.push('.')
       } else {
         break
       }
       
+      lastType = current.type
       this.advance()
     }
     
     return {
       type: 'Declaration',
       property: property,
-      value: valueParts.join(' ')
-        .replace(/\(\s+/g, '(')
-        .replace(/\s+\)/g, ')')
-        .replace(/\s+,/g, ',')
-        .replace(/-\s+/g, '-')
-        .replace(/(\d+)\s+(%|px|em|rem|vh|vw|vmin|vmax|fr|s|ms|deg)/gi, '$1$2')
+      value: valueParts.join('')
+        .replace(/,\s*/g, ', ')
         .replace(/\s+/g, ' ')
         .trim()
     }

package/lexer/ether-lexer.js

@@ -221,6 +221,11 @@ class EtherLexer {
     }
 
     if (char === '#') {
+      const next = this.peek(1)
+      if (next && (this.isHexDigit(next) || this.isAlpha(next))) {
+        this.scanHashToken()
+        return
+      }
       this.scanComment()
       return
     }
@@ -319,6 +324,42 @@ class EtherLexer {
     }
   }
 
+  scanHashToken() {
+    const startLine = this.line
+    const startCol = this.column
+    
+    this.advance()
+    
+    let value = ''
+    let isHexColor = true
+    let charCount = 0
+    
+    while (!this.isAtEnd()) {
+      const char = this.peek()
+      if (this.isHexDigit(char)) {
+        value += this.advance()
+        charCount++
+      } else if (this.isAlpha(char) && !this.isHexDigit(char)) {
+        isHexColor = false
+        value += this.advance()
+      } else if (char === '-' || char === '_') {
+        isHexColor = false
+        value += this.advance()
+      } else {
+        break
+      }
+    }
+    
+    if (isHexColor && (charCount === 3 || charCount === 4 || charCount === 6 || charCount === 8)) {
+      this.tokens.push(new Token(TokenType.HEX, '#' + value, startLine, startCol, this.currentIndent))
+    } else {
+      this.tokens.push(new Token(TokenType.HASH, '#', startLine, startCol, this.currentIndent))
+      if (value) {
+        this.tokens.push(new Token(TokenType.IDENTIFIER, value, startLine, startCol + 1, this.currentIndent))
+      }
+    }
+  }
+
   scanBlockComment() {
     const startLine = this.line
     const startCol = this.column
@@ -521,10 +562,42 @@ class EtherLexer {
     }
 
     if (type === TokenType.FLOAT) {
-      this.tokens.push(new Token(type, parseFloat(value), startLine, startCol, this.currentIndent))
+      let numValue = String(parseFloat(value))
+      const unit = this.scanCSSUnit()
+      if (unit) numValue += unit
+      this.tokens.push(new Token(type, numValue, startLine, startCol, this.currentIndent))
     } else {
-      this.tokens.push(new Token(type, parseInt(value, 10), startLine, startCol, this.currentIndent))
+      let numValue = String(parseInt(value, 10))
+      const unit = this.scanCSSUnit()
+      if (unit) numValue += unit
+      this.tokens.push(new Token(type, numValue, startLine, startCol, this.currentIndent))
+    }
+  }
+
+  scanCSSUnit() {
+    const units = ['px', 'em', 'rem', 'vh', 'vw', 'vmin', 'vmax', '%', 'fr', 's', 'ms', 'deg', 'rad', 'turn', 'ch', 'ex', 'cm', 'mm', 'in', 'pt', 'pc', 'cqw', 'cqh']
+    
+    for (const unit of units) {
+      let matches = true
+      for (let i = 0; i < unit.length; i++) {
+        const char = this.peek(i)
+        if (!char || char.toLowerCase() !== unit[i].toLowerCase()) {
+          matches = false
+          break
+        }
+      }
+      if (matches) {
+        const afterUnit = this.peek(unit.length)
+        if (!afterUnit || !this.isAlpha(afterUnit)) {
+          let result = ''
+          for (let i = 0; i < unit.length; i++) {
+            result += this.advance()
+          }
+          return result
+        }
+      }
     }
+    return ''
   }
 
   scanIdentifier() {
@@ -693,7 +766,15 @@ class EtherLexer {
 
       case '-':
         if (this.match('-')) {
-          this.tokens.push(new Token(TokenType.MINUS, '--', startLine, startCol, this.currentIndent))
+          if (this.isAlpha(this.peek()) || this.peek() === '-') {
+            let varName = '--'
+            while (this.isAlphaNumeric(this.peek()) || this.peek() === '-' || this.peek() === '_') {
+              varName += this.advance()
+            }
+            this.tokens.push(new Token(TokenType.IDENTIFIER, varName, startLine, startCol, this.currentIndent))
+          } else {
+            this.tokens.push(new Token(TokenType.MINUS, '--', startLine, startCol, this.currentIndent))
+          }
         } else if (this.match('>')) {
           this.tokens.push(new Token(TokenType.ARROW, '->', startLine, startCol, this.currentIndent))
         } else if (this.match('=')) {
@@ -866,4 +947,4 @@ module.exports = {
   Token,
   TokenType,
   LANG_BLOCKS
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ether-code",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Ether - Le langage intentionnel",
   "main": "cli/compiler.js",
   "bin": {