ether-code 0.5.7 → 0.5.9

package/cli/ether.js

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

package/ether-parser.js

@@ -719,7 +719,8 @@ class EtherParser {
       'filtre': ['fond'],
       'decoupe': ['fond'],
       'découpe': ['fond'],
-      'origine': ['transformation', 'perspective']
+      'origine': ['transformation', 'perspective'],
+      'liste': ['style', 'ordonnee', 'description']
     }
     
     let property = token.value

package/generators/css-generator.js

@@ -112,6 +112,13 @@ class CSSGenerator {
     const priorityMap = {
       'contenu': 'content',
       'contenus': 'content',
+      'transformer': 'transform',
+      'decalage-contour': 'outline-offset',
+      'décalage-contour': 'outline-offset',
+      'decalage contour': 'outline-offset',
+      'décalage contour': 'outline-offset',
+      'contour-decalage': 'outline-offset',
+      'contour-décalage': 'outline-offset',
       'famille-police': 'font-family',
       'famille police': 'font-family',
       'police-famille': 'font-family',
@@ -1166,6 +1173,12 @@ class CSSGenerator {
 
   translateSelector(selector) {
     let result = selector
+    
+    const preserved = []
+    result = result.replace(/([.#][a-zA-Z_\u00C0-\u024F][a-zA-Z0-9_\u00C0-\u024F-]*)/g, (match) => {
+      preserved.push(match)
+      return `__PRESERVED_${preserved.length - 1}__`
+    })
 
     result = result.replace(/:racine\b/gi, ':root')
     result = result.replace(/::avant\b/gi, '::before')
@@ -1217,21 +1230,6 @@ class CSSGenerator {
     result = result.replace(/\bvalide\b/gi, ':valid')
     result = result.replace(/\binvalide\b/gi, ':invalid')
 
-    result = result.replace(/\bcorps\b/gi, 'body')
-    result = result.replace(/\btête\b/gi, 'head')
-    result = result.replace(/\btete\b/gi, 'head')
-    result = result.replace(/\btitre1\b/gi, 'h1')
-    result = result.replace(/\btitre2\b/gi, 'h2')
-    result = result.replace(/\btitre3\b/gi, 'h3')
-    result = result.replace(/\btitre4\b/gi, 'h4')
-    result = result.replace(/\btitre5\b/gi, 'h5')
-    result = result.replace(/\btitre6\b/gi, 'h6')
-    result = result.replace(/\bparagraphe\b/gi, 'p')
-    result = result.replace(/\blien\b/gi, 'a')
-    result = result.replace(/\bimage\b/gi, 'img')
-    result = result.replace(/\bbouton\b/gi, 'button')
-    result = result.replace(/\bformulaire\b/gi, 'form')
-    result = result.replace(/\bchamp\b/gi, 'input')
     result = result.replace(/\bliste ordonnée\b/gi, 'ol')
     result = result.replace(/\bliste ordonnee\b/gi, 'ol')
     result = result.replace(/\bliste description\b/gi, 'dl')
@@ -1249,6 +1247,22 @@ class CSSGenerator {
     result = result.replace(/\bpied tableau\b/gi, 'tfoot')
     result = result.replace(/\blégende figure\b/gi, 'figcaption')
     result = result.replace(/\blegende figure\b/gi, 'figcaption')
+
+    result = result.replace(/\bcorps\b/gi, 'body')
+    result = result.replace(/\btête\b/gi, 'head')
+    result = result.replace(/\btete\b/gi, 'head')
+    result = result.replace(/\btitre1\b/gi, 'h1')
+    result = result.replace(/\btitre2\b/gi, 'h2')
+    result = result.replace(/\btitre3\b/gi, 'h3')
+    result = result.replace(/\btitre4\b/gi, 'h4')
+    result = result.replace(/\btitre5\b/gi, 'h5')
+    result = result.replace(/\btitre6\b/gi, 'h6')
+    result = result.replace(/\bparagraphe\b/gi, 'p')
+    result = result.replace(/\blien\b/gi, 'a')
+    result = result.replace(/\bimage\b/gi, 'img')
+    result = result.replace(/\bbouton\b/gi, 'button')
+    result = result.replace(/\bformulaire\b/gi, 'form')
+    result = result.replace(/\bchamp\b/gi, 'input')
     result = result.replace(/\bliste\b/gi, 'ul')
     result = result.replace(/\bliste-ordonnée\b/gi, 'ol')
     result = result.replace(/\bliste-ordonnee\b/gi, 'ol')
@@ -1287,6 +1301,10 @@ class CSSGenerator {
     result = result.replace(/\bfigure\b/gi, 'figure')
     result = result.replace(/\bligne\b/gi, 'tr')
 
+    for (let i = 0; i < preserved.length; i++) {
+      result = result.replace(`__PRESERVED_${i}__`, preserved[i])
+    }
+
     return result
   }
 
@@ -1398,23 +1416,26 @@ class CSSGenerator {
     const translatedSelectors = selectors.map(s => this.translateSelector(s))
     const isRoot = translatedSelectors.some(s => s === ':root')
 
-    this.writeLine(`${translatedSelectors.join(', ')} {`)
-    this.indent++
-
     const declarations = node.declarations || node.properties || []
-    for (const decl of declarations) {
-      this.generateDeclaration(decl, isRoot)
-    }
+    
+    if (declarations.length > 0 || node.children) {
+      this.writeLine(`${translatedSelectors.join(', ')} {`)
+      this.indent++
+
+      for (const decl of declarations) {
+        this.generateDeclaration(decl, isRoot)
+      }
 
-    if (node.children) {
-      for (const child of node.children) {
-        this.generateNode(child)
+      if (node.children) {
+        for (const child of node.children) {
+          this.generateNode(child)
+        }
       }
-    }
 
-    this.indent--
-    this.writeLine('}')
-    this.writeLine('')
+      this.indent--
+      this.writeLine('}')
+      this.writeLine('')
+    }
 
     if (node.nestedRules) {
       for (const nested of node.nestedRules) {

package/lexer/ether-lexer.js

@@ -688,7 +688,7 @@ class EtherLexer {
     const normalized = this.normalizeAccents(phrase)
     const compounds = [
       'en ligne', 'hors ligne', 'au survol', 'au clic', 'au focus',
-      'au double clic', 'au changement', 'a la soumission',
+      'au double clic', 'au changement', 'a la soumission', 
       'retour a la ligne', 'lecture seule', 'zone texte',
       'case a cocher', 'bouton radio', 'premiere lettre',
       'premiere ligne', 'inferieur ou egal',
@@ -698,12 +698,32 @@ class EtherLexer {
       'droite a gauche',
       'definir defaut', 'mettre a jour',
       'cle primaire', 'cle etrangere',
-      'non nul', 'par defaut',
+      'non nul', 'par defaut', 
       'au focus dans', 'pointeur bas', 'pointeur haut',
       'obtenir contenu', 'erreur type', 'erreur syntaxe',
       'nettoyer gauche', 'nettoyer droite', 'vers date',
-      'si null', 'creer role',
-      'a la reinitialisation'
+      'si null', 'creer role', 
+      'a la reinitialisation', 
+      'liste ordonnee', 'liste description',
+      'ligne horizontale', 'citation bloc',
+      'groupe champs', 'cellule entete',
+      'entete tableau', 'corps tableau', 'pied tableau',
+      'legende figure', 'decalage contour', 
+      'ombre boite', 'ombre texte',
+      'bordure rayon', 'largeur max', 'largeur min',
+      'hauteur max', 'hauteur min',
+      'taille police', 'poids police', 'style police',
+      'famille police', 'hauteur ligne',
+      'alignement texte', 'decoration texte', 'transformation texte',
+      'direction flex', 'enveloppe flex',
+      'justifier contenu', 'aligner elements',
+      'colonnes grille', 'lignes grille',
+      'style liste', 'type liste',
+      'couleur fond', 'image fond', 'position fond', 'taille fond',
+      'couleur bordure', 'style bordure', 'largeur bordure',
+      'espacement lettres', 'espacement mots',
+      'espace blanc', 'debordement texte', 
+      'flou fond', 'filtre fond'
     ]
     return compounds.includes(normalized)
   }

package/package.json

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