ether-code 0.5.6 → 0.5.8

package/cli/ether.js

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

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',
@@ -901,6 +908,8 @@ class CSSGenerator {
       'en cours': 'running',
       'ombre': 'box-shadow',
       'transformation': 'transform',
+      'souligner': 'underline',
+      'transformer': 'transform',
       'fond': 'background',
       'couleur': 'color',
       'opacite': 'opacity',
@@ -1164,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')
@@ -1215,6 +1230,24 @@ class CSSGenerator {
     result = result.replace(/\bvalide\b/gi, ':valid')
     result = result.replace(/\binvalide\b/gi, ':invalid')
 
+    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')
+    result = result.replace(/\bélément liste\b/gi, 'li')
+    result = result.replace(/\belement liste\b/gi, 'li')
+    result = result.replace(/\bligne horizontale\b/gi, 'hr')
+    result = result.replace(/\bcitation bloc\b/gi, 'blockquote')
+    result = result.replace(/\bgroupe champs\b/gi, 'fieldset')
+    result = result.replace(/\bzone texte\b/gi, 'textarea')
+    result = result.replace(/\bcellule entête\b/gi, 'th')
+    result = result.replace(/\bcellule entete\b/gi, 'th')
+    result = result.replace(/\bentête tableau\b/gi, 'thead')
+    result = result.replace(/\bentete tableau\b/gi, 'thead')
+    result = result.replace(/\bcorps tableau\b/gi, 'tbody')
+    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')
@@ -1250,6 +1283,27 @@ class CSSGenerator {
     result = result.replace(/\bdivision\b/gi, 'div')
     result = result.replace(/\bportée\b/gi, 'span')
     result = result.replace(/\bportee\b/gi, 'span')
+    result = result.replace(/\bpréformaté\b/gi, 'pre')
+    result = result.replace(/\bpreformate\b/gi, 'pre')
+    result = result.replace(/\bétiquette\b/gi, 'label')
+    result = result.replace(/\betiquette\b/gi, 'label')
+    result = result.replace(/\bsélection\b/gi, 'select')
+    result = result.replace(/\bselection\b/gi, 'select')
+    result = result.replace(/\bterme\b/gi, 'dt')
+    result = result.replace(/\bdéfinition\b/gi, 'dd')
+    result = result.replace(/\bdefinition\b/gi, 'dd')
+    result = result.replace(/\brésumé\b/gi, 'summary')
+    result = result.replace(/\bresume\b/gi, 'summary')
+    result = result.replace(/\bpetit\b/gi, 'small')
+    result = result.replace(/\badresse\b/gi, 'address')
+    result = result.replace(/\blégende\b/gi, 'legend')
+    result = result.replace(/\blegende\b/gi, 'legend')
+    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
   }

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.6",
+  "version": "0.5.8",
   "description": "Ether - Le langage intentionnel",
   "main": "cli/compiler.js",
   "bin": {