ether-code 0.6.2 → 0.6.4

package/cli/compiler.js

@@ -70,20 +70,52 @@ class EtherCompiler {
     this.parser = null
     this.resolvedIncludes = new Set()
     
-    this.initGenerators()
     this.initParser()
+    this.initGenerators()
   }
 
   initGenerators() {
     const i18nDir = path.join(__dirname, '..', 'i18n')
     
+    const jsI18n = path.join(i18nDir, 'i18n-js.json')
+    if (fs.existsSync(jsI18n)) {
+      this.generators['js'] = new JSGenerator(jsI18n)
+    } else {
+      this.generators['js'] = new JSGenerator()
+    }
+    this.generators['javascript'] = this.generators['js']
+    
+    const cssI18n = path.join(i18nDir, 'i18n-css.json')
+    if (fs.existsSync(cssI18n)) {
+      this.generators['css'] = new CSSGenerator(cssI18n)
+    } else {
+      this.generators['css'] = new CSSGenerator()
+    }
+    
     for (const [target, GeneratorClass] of Object.entries(GENERATORS)) {
+      if (target === 'js' || target === 'javascript' || target === 'css') {
+        continue
+      }
+      
       const i18nFile = path.join(i18nDir, `i18n-${this.normalizeTarget(target)}.json`)
       
-      if (fs.existsSync(i18nFile)) {
-        this.generators[target] = new GeneratorClass(i18nFile)
+      if (target === 'html') {
+        const options = {
+          parser: this.parser,
+          jsGenerator: this.generators['js'],
+          cssGenerator: this.generators['css']
+        }
+        if (fs.existsSync(i18nFile)) {
+          this.generators[target] = new GeneratorClass(i18nFile, options)
+        } else {
+          this.generators[target] = new GeneratorClass(null, options)
+        }
       } else {
-        this.generators[target] = new GeneratorClass()
+        if (fs.existsSync(i18nFile)) {
+          this.generators[target] = new GeneratorClass(i18nFile)
+        } else {
+          this.generators[target] = new GeneratorClass()
+        }
       }
     }
   }

package/cli/ether.js

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

package/ether-parser.js

@@ -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()
   }
@@ -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()) {
@@ -1517,21 +1565,251 @@ class EtherParser {
       })
     }
     
+    const rawContentTags = ['script', 'style']
+    const isRawContent = rawContentTags.includes(tag)
+    const isScript = tag === 'script'
+    
     if (this.match(TokenType.INDENT)) {
-      while (!this.isAtEnd()) {
-        const current = this.current()
-        
-        if (current && current.type === TokenType.DEDENT) {
-          this.advance()
-          break
+      if (isRawContent) {
+        let rawText = []
+        while (!this.isAtEnd()) {
+          const current = this.current()
+          
+          if (current && current.type === TokenType.DEDENT) {
+            this.advance()
+            break
+          }
+          
+          if (current && current.type === TokenType.NEWLINE) {
+            rawText.push('\n')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.INDENT) {
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.STRING) {
+            if (isScript) {
+              rawText.push("'" + current.value.replace(/'/g, "\\'") + "'")
+            } else {
+              rawText.push(current.value)
+            }
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.LPAREN) {
+            rawText.push('(')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.RPAREN) {
+            rawText.push(')')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.LBRACKET) {
+            rawText.push('[')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.RBRACKET) {
+            rawText.push(']')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.LBRACE) {
+            rawText.push('{')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.RBRACE) {
+            rawText.push('}')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.DOT) {
+            rawText.push('.')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.COMMA) {
+            rawText.push(',')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.COLON) {
+            rawText.push(':')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.EQUALS) {
+            rawText.push('=')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.DOUBLE_EQUALS) {
+            rawText.push('==')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.NOT_EQUALS) {
+            rawText.push('!=')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.BANG) {
+            rawText.push('!')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.PLUS) {
+            rawText.push(current.value)
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.MINUS) {
+            rawText.push(current.value)
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.STAR) {
+            rawText.push(current.value)
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.SLASH) {
+            rawText.push('/')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.PERCENT) {
+            rawText.push('%')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.AMPERSAND) {
+            rawText.push('&')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.DOUBLE_AMPERSAND) {
+            rawText.push('&&')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.PIPE) {
+            rawText.push('|')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.DOUBLE_PIPE) {
+            rawText.push('||')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.LT) {
+            rawText.push('<')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.GT) {
+            rawText.push('>')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.LTE) {
+            rawText.push('<=')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.GTE) {
+            rawText.push('>=')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.QUESTION) {
+            rawText.push('?')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.FAT_ARROW) {
+            rawText.push('=>')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.ARROW) {
+            rawText.push('->')
+            this.advance()
+            continue
+          }
+          
+          if (current && current.type === TokenType.SEMICOLON) {
+            rawText.push(';')
+            this.advance()
+            continue
+          }
+          
+          if (current) {
+            rawText.push(String(current.value))
+            this.advance()
+          }
         }
         
-        const child = this.parseHTMLNode()
-        if (child) {
-          children.push(child)
+        const textContent = rawText.join('').trim()
+        if (textContent) {
+          children.push({
+            type: 'Text',
+            content: textContent
+          })
+        }
+      } else {
+        while (!this.isAtEnd()) {
+          const current = this.current()
+          
+          if (current && current.type === TokenType.DEDENT) {
+            this.advance()
+            break
+          }
+          
+          const child = this.parseHTMLNode()
+          if (child) {
+            children.push(child)
+          }
+          
+          this.skipNewlines()
         }
-        
-        this.skipNewlines()
       }
     }
     
@@ -1545,7 +1823,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,11 +1994,26 @@ 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'
     }
     
-    return translations[lower] || translations[withSpaces] || map[lower] || map[withSpaces] || tag
+    const result = translations[lower] || translations[withSpaces] || map[lower] || map[withSpaces] || tag
+    return result.replace(/^<!DOCTYPE\s+/i, '').replace(/^<|>$/g, '').trim() || 'div'
   }
 
   parseJS() {