ether-code 0.6.1 → 0.6.3

package/cli/ether.js

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

package/ether-parser.js

@@ -17,16 +17,16 @@ class EtherParser {
   initCompoundTerms() {
     this.compoundOperators = {
       'strictement egal': '===',
-      'strictement égal': '===',
+      'strictement égal': '===',
       'strictement different': '!==',
-      'strictement différent': '!==',
+      'strictement différent': '!==',
       'superieur ou egal': '>=',
-      'supérieur ou égal': '>=',
+      'supérieur ou égal': '>=',
       'inferieur ou egal': '<=',
-      'inférieur ou égal': '<=',
+      'inférieur ou égal': '<=',
       'coalescence nulle': '??',
       'chainage optionnel': '?.',
-      'chaînage optionnel': '?.'
+      'chaînage optionnel': '?.'
     }
     
     this.compoundKeywords = {
@@ -36,7 +36,7 @@ class EtherParser {
       'fonction asynchrone': 'async function',
       'fonction async': 'async function',
       'fonction generatrice': 'function*',
-      'fonction génératrice': 'function*',
+      'fonction génératrice': 'function*',
       'variable globale': 'var'
     }
 
@@ -281,7 +281,7 @@ class EtherParser {
   expect(type) {
     const token = this.current()
     if (!token || token.type !== type) {
-      throw new Error(`Attendu ${type}, reçu ${token ? token.type : 'EOF'}`)
+      throw new Error(`Attendu ${type}, reçu ${token ? token.type : 'EOF'}`)
     }
     return this.advance()
   }
@@ -695,7 +695,7 @@ class EtherParser {
       'alignement': ['texte'],
       'decoration': ['texte'],
       'transformation': ['texte'],
-      'ombre': ['texte', 'boite', 'boîte'],
+      'ombre': ['texte', 'boite', 'boîte'],
       'espacement': ['lettres'],
       'bordure': ['haut', 'bas', 'gauche', 'droite', 'couleur', 'style', 'largeur', 'arrondi'],
       'couleur': ['bordure', 'fond', 'texte', 'remplissage'],
@@ -706,21 +706,21 @@ class EtherParser {
       'direction': ['flex'],
       'enveloppe': ['flex'],
       'justifier': ['contenu'],
-      'aligner': ['elements', 'éléments', 'contenu'],
+      'aligner': ['elements', 'éléments', 'contenu'],
       'colonnes': ['grille'],
       'lignes': ['grille'],
       'espace': ['ligne', 'colonne', 'blanc'],
-      'débordement': ['x', 'y'],
+      'débordement': ['x', 'y'],
       'debordement': ['x', 'y'],
-      'événements': ['pointeur'],
+      'événements': ['pointeur'],
       'evenements': ['pointeur'],
-      'modèle': ['boite', 'boîte'],
-      'modele': ['boite', 'boîte'],
+      'modèle': ['boite', 'boîte'],
+      'modele': ['boite', 'boîte'],
       'filtre': ['fond'],
       'decoupe': ['fond'],
-      'découpe': ['fond'],
+      'découpe': ['fond'],
       'origine': ['transformation', 'perspective'],
-      'liste': ['style', 'type', 'position', 'image', 'ordonnee', 'description']
+      'liste': ['style', 'type', 'position', 'image'],
     }
     
     let property = token.value
@@ -1177,7 +1177,7 @@ class EtherParser {
 
   parseHTMLElement() {
     const tagToken = this.current()
-    let tagName = tagToken.value.toLowerCase()
+    let tagName = this.normalizeAccents(tagToken.value)
     this.advance()
     
     const includeKeywords = ['inclure', 'requiert', 'include', 'require', 'importer']
@@ -1228,14 +1228,14 @@ class EtherParser {
     
     if ((tagName === 'liste' || tagName === 'list') && nextToken) {
       if (nextToken.type === TokenType.IDENTIFIER) {
-        const nextVal = nextToken.value.toLowerCase()
+        const nextVal = this.normalizeAccents(nextToken.value)
         if (nextVal === 'ordonnee' || nextVal === 'ordered') {
           tagName = 'liste ordonnee'
           this.advance()
         } else if (nextVal === 'non') {
           this.advance()
           const thirdToken = this.current()
-          if (thirdToken && thirdToken.type === TokenType.IDENTIFIER && thirdToken.value.toLowerCase() === 'ordonnee') {
+          if (thirdToken && thirdToken.type === TokenType.IDENTIFIER && this.normalizeAccents(thirdToken.value) === 'ordonnee') {
             tagName = 'liste non ordonnee'
             this.advance()
           }
@@ -1244,42 +1244,42 @@ class EtherParser {
     }
     
     if ((tagName === 'element' || tagName === 'item') && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      if (nextToken.value.toLowerCase() === 'liste' || nextToken.value.toLowerCase() === 'list') {
+      if (this.normalizeAccents(nextToken.value) === 'liste' || this.normalizeAccents(nextToken.value) === 'list') {
         tagName = 'element liste'
         this.advance()
       }
     }
     
     if ((tagName === 'zone' || tagName === 'area') && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      if (nextToken.value.toLowerCase() === 'texte' || nextToken.value.toLowerCase() === 'text') {
+      if (this.normalizeAccents(nextToken.value) === 'texte' || this.normalizeAccents(nextToken.value) === 'text') {
         tagName = 'zone texte'
         this.advance()
       }
     }
     
     if ((tagName === 'retour' || tagName === 'saut') && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      if (nextToken.value.toLowerCase() === 'ligne' || nextToken.value.toLowerCase() === 'line') {
+      if (this.normalizeAccents(nextToken.value) === 'ligne' || this.normalizeAccents(nextToken.value) === 'line') {
         tagName = 'retour ligne'
         this.advance()
       }
     }
     
     if (tagName === 'ligne' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      if (nextToken.value.toLowerCase() === 'horizontale') {
+      if (this.normalizeAccents(nextToken.value) === 'horizontale') {
         tagName = 'ligne horizontale'
         this.advance()
       }
     }
     
     if ((tagName === 'cellule' || tagName === 'cell') && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      if (nextToken.value.toLowerCase() === 'entete' || nextToken.value.toLowerCase() === 'header') {
+      if (this.normalizeAccents(nextToken.value) === 'entete' || this.normalizeAccents(nextToken.value) === 'header') {
         tagName = 'entete cellule'
         this.advance()
       }
     }
     
     if (tagName === 'groupe' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      const next = nextToken.value.toLowerCase()
+      const next = this.normalizeAccents(nextToken.value)
       if (next === 'titres') {
         tagName = 'groupe titres'
         this.advance()
@@ -1293,7 +1293,7 @@ class EtherParser {
     }
     
     if (tagName === 'entete' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      const next = nextToken.value.toLowerCase()
+      const next = this.normalizeAccents(nextToken.value)
       if (next === 'tableau' || next === 'table') {
         tagName = 'entete tableau'
         this.advance()
@@ -1301,7 +1301,7 @@ class EtherParser {
     }
     
     if (tagName === 'corps' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      const next = nextToken.value.toLowerCase()
+      const next = this.normalizeAccents(nextToken.value)
       if (next === 'tableau' || next === 'table') {
         tagName = 'corps tableau'
         this.advance()
@@ -1309,7 +1309,7 @@ class EtherParser {
     }
     
     if (tagName === 'pied' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      const next = nextToken.value.toLowerCase()
+      const next = this.normalizeAccents(nextToken.value)
       if (next === 'tableau' || next === 'table') {
         tagName = 'pied tableau'
         this.advance()
@@ -1317,7 +1317,7 @@ class EtherParser {
     }
     
     if (tagName === 'legende' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      const next = nextToken.value.toLowerCase()
+      const next = this.normalizeAccents(nextToken.value)
       if (next === 'tableau' || next === 'table') {
         tagName = 'legende tableau'
         this.advance()
@@ -1328,7 +1328,7 @@ class EtherParser {
     }
     
     if (tagName === 'ensemble' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      const next = nextToken.value.toLowerCase()
+      const next = this.normalizeAccents(nextToken.value)
       if (next === 'champs' || next === 'fields') {
         tagName = 'ensemble champs'
         this.advance()
@@ -1336,7 +1336,7 @@ class EtherParser {
     }
     
     if (tagName === 'liste' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      const next = nextToken.value.toLowerCase()
+      const next = this.normalizeAccents(nextToken.value)
       if (next === 'donnees' || next === 'data') {
         tagName = 'liste donnees'
         this.advance()
@@ -1347,7 +1347,7 @@ class EtherParser {
     }
     
     if (tagName === 'image' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      const next = nextToken.value.toLowerCase()
+      const next = this.normalizeAccents(nextToken.value)
       if (next === 'reactive' || next === 'responsive') {
         tagName = 'image reactive'
         this.advance()
@@ -1355,7 +1355,7 @@ class EtherParser {
     }
     
     if (tagName === 'cadre' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      const next = nextToken.value.toLowerCase()
+      const next = this.normalizeAccents(nextToken.value)
       if (next === 'en') {
         this.advance()
         const thirdToken = this.current()
@@ -1367,7 +1367,7 @@ class EtherParser {
     }
     
     if (tagName === 'citation' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      const next = nextToken.value.toLowerCase()
+      const next = this.normalizeAccents(nextToken.value)
       if (next === 'bloc' || next === 'block') {
         tagName = 'citation bloc'
         this.advance()
@@ -1375,7 +1375,7 @@ class EtherParser {
     }
     
     if (tagName === 'reference' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      const next = nextToken.value.toLowerCase()
+      const next = this.normalizeAccents(nextToken.value)
       if (next === 'citation') {
         tagName = 'reference citation'
         this.advance()
@@ -1383,15 +1383,55 @@ class EtherParser {
     }
     
     if (tagName === 'sans' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      const next = nextToken.value.toLowerCase()
+      const next = this.normalizeAccents(nextToken.value)
       if (next === 'script') {
         tagName = 'sans script'
         this.advance()
       }
     }
     
+    if (tagName === 'isolation' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
+      const next = this.normalizeAccents(nextToken.value)
+      if (next === 'bidi') {
+        tagName = 'isolation bidi'
+        this.advance()
+      }
+    }
+    
+    if (tagName === 'remplacement' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
+      const next = this.normalizeAccents(nextToken.value)
+      if (next === 'bidi') {
+        tagName = 'remplacement bidi'
+        this.advance()
+      }
+    }
+    
+    if (tagName === 'annotation' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
+      const next = this.normalizeAccents(nextToken.value)
+      if (next === 'ruby' || next === 'rubis') {
+        tagName = 'annotation ruby'
+        this.advance()
+      }
+    }
+    
+    if ((tagName === 'parentheses' || tagName === 'parenthèses') && nextToken && nextToken.type === TokenType.IDENTIFIER) {
+      const next = this.normalizeAccents(nextToken.value)
+      if (next === 'ruby' || next === 'rubis') {
+        tagName = 'parentheses ruby'
+        this.advance()
+      }
+    }
+    
+    if (tagName === 'carte' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
+      const next = this.normalizeAccents(nextToken.value)
+      if (next === 'image') {
+        tagName = 'carte image'
+        this.advance()
+      }
+    }
+    
     if ((tagName === 'texte' || tagName === 'text') && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      const next = nextToken.value.toLowerCase()
+      const next = this.normalizeAccents(nextToken.value)
       if (next === 'alternatif' || next === 'alt') {
         tagName = 'texte alternatif'
         this.advance()
@@ -1399,7 +1439,7 @@ class EtherParser {
     }
     
     if (tagName === 'entree' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      const next = nextToken.value.toLowerCase()
+      const next = this.normalizeAccents(nextToken.value)
       if (next === 'clavier') {
         tagName = 'entree clavier'
         this.advance()
@@ -1407,7 +1447,7 @@ class EtherParser {
     }
     
     if (tagName === 'sortie' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      const next = nextToken.value.toLowerCase()
+      const next = this.normalizeAccents(nextToken.value)
       if (next === 'exemple') {
         tagName = 'sortie exemple'
         this.advance()
@@ -1415,7 +1455,7 @@ class EtherParser {
     }
     
     if (tagName === 'definition' && nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      const next = nextToken.value.toLowerCase()
+      const next = this.normalizeAccents(nextToken.value)
       if (next === 'description') {
         tagName = 'definition description'
         this.advance()
@@ -1440,9 +1480,17 @@ class EtherParser {
       'encodage': ['formulaire'],
       'validation': ['formulaire', 'auto'],
       'cible': ['formulaire', 'popover'],
-      'lecture': ['seule'],
+      'lecture': ['seule', 'auto'],
       'nouvelle': ['fenetre'],
-      'a': ['popup']
+      'a': ['popup'],
+      'jeu': ['caracteres', 'caractères'],
+      'equivalent': ['http'],
+      'équivalent': ['http'],
+      'fusion': ['colonnes', 'lignes'],
+      'plein': ['ecran', 'écran'],
+      'bac': ['sable'],
+      'origine': ['croisee', 'croisée'],
+      'sources': ['reactives', 'réactives']
     }
     
     while (!this.isAtEnd()) {
@@ -1545,7 +1593,7 @@ class EtherParser {
 
   translateHTMLTag(tag) {
     const map = this.reverseMaps.html || {}
-    const lower = tag.toLowerCase()
+    const lower = this.normalizeAccents(tag)
     const withSpaces = lower.replace(/-/g, ' ')
     
     const translations = {
@@ -1716,6 +1764,20 @@ class EtherParser {
       'cesure': 'wbr',
       'noscript': 'noscript',
       'sans script': 'noscript',
+      'isolation bidi': 'bdi',
+      'remplacement bidi': 'bdo',
+      'annotation ruby': 'rt',
+      'annotation rubis': 'rt',
+      'parentheses ruby': 'rp',
+      'parenthèses ruby': 'rp',
+      'parentheses rubis': 'rp',
+      'terme': 'dt',
+      'menu': 'menu',
+      'recherche': 'search',
+      'objet': 'object',
+      'integrer': 'embed',
+      'svg': 'svg',
+      'math': 'math',
       
       'zone': 'area'
     }
@@ -2495,16 +2557,16 @@ class EtherParser {
     let left = this.parseComparison(lang)
     
     while (true) {
-      if (this.matchValue('strictement egal') || this.matchValue('strictement égal')) {
+      if (this.matchValue('strictement egal') || this.matchValue('strictement égal')) {
         const right = this.parseComparison(lang)
         left = { type: 'BinaryExpression', operator: '===', left, right }
-      } else if (this.matchValue('strictement different') || this.matchValue('strictement différent')) {
+      } else if (this.matchValue('strictement different') || this.matchValue('strictement différent')) {
         const right = this.parseComparison(lang)
         left = { type: 'BinaryExpression', operator: '!==', left, right }
-      } else if (this.match(TokenType.DOUBLE_EQUALS) || this.matchValue('egal') || this.matchValue('egale') || this.matchValue('égal')) {
+      } else if (this.match(TokenType.DOUBLE_EQUALS) || this.matchValue('egal') || this.matchValue('egale') || this.matchValue('égal')) {
         const right = this.parseComparison(lang)
         left = { type: 'BinaryExpression', operator: '===', left, right }
-      } else if (this.match(TokenType.NOT_EQUALS) || this.matchValue('different') || this.matchValue('différent')) {
+      } else if (this.match(TokenType.NOT_EQUALS) || this.matchValue('different') || this.matchValue('différent')) {
         const right = this.parseComparison(lang)
         left = { type: 'BinaryExpression', operator: '!==', left, right }
       } else {
@@ -2519,16 +2581,16 @@ class EtherParser {
     let left = this.parseAdditive(lang)
     
     while (true) {
-      if (this.matchValue('superieur ou egal') || this.matchValue('supérieur ou égal') || this.match(TokenType.GTE)) {
+      if (this.matchValue('superieur ou egal') || this.matchValue('supérieur ou égal') || this.match(TokenType.GTE)) {
         const right = this.parseAdditive(lang)
         left = { type: 'BinaryExpression', operator: '>=', left, right }
-      } else if (this.matchValue('inferieur ou egal') || this.matchValue('inférieur ou égal') || this.match(TokenType.LTE)) {
+      } else if (this.matchValue('inferieur ou egal') || this.matchValue('inférieur ou égal') || this.match(TokenType.LTE)) {
         const right = this.parseAdditive(lang)
         left = { type: 'BinaryExpression', operator: '<=', left, right }
-      } else if (this.match(TokenType.LT) || this.matchValue('inferieur') || this.matchValue('inférieur')) {
+      } else if (this.match(TokenType.LT) || this.matchValue('inferieur') || this.matchValue('inférieur')) {
         const right = this.parseAdditive(lang)
         left = { type: 'BinaryExpression', operator: '<', left, right }
-      } else if (this.match(TokenType.GT) || this.matchValue('superieur') || this.matchValue('supérieur')) {
+      } else if (this.match(TokenType.GT) || this.matchValue('superieur') || this.matchValue('supérieur')) {
         const right = this.parseAdditive(lang)
         left = { type: 'BinaryExpression', operator: '>', left, right }
       } else {