ether-code 0.7.0 → 0.7.2

package/cli/ether.js

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

package/generators/js-generator.js

@@ -32,11 +32,15 @@ class JSGenerator {
       return
     }
 
+    const normalize = (str) => {
+      return str.toLowerCase().normalize('NFD').replace(/[\u0300-\u036f]/g, '')
+    }
+
     const addToMap = (map, section, prefix = '') => {
       if (!section) return
       for (const [key, translations] of Object.entries(section)) {
         if (translations && translations.fr && translations.en) {
-          const frKey = translations.fr.toLowerCase()
+          const frKey = normalize(translations.fr)
           const enValue = translations.en
           if (prefix) {
             if (!this.contextualMap[frKey]) {
@@ -266,7 +270,9 @@ class JSGenerator {
   }
 
   buildDefaultMaps() {
-    this.keywordMap = {
+    const norm = (str) => str.toLowerCase().normalize('NFD').replace(/[\u0300-\u036f]/g, '')
+    
+    const rawKeywords = {
       'variable': 'let',
       'constante': 'const',
       'variable globale': 'var',
@@ -377,7 +383,7 @@ class JSGenerator {
       'gabarit étiqueté': 'tagged template'
     }
 
-    this.operatorMap = {
+    const rawOperators = {
       'plus': '+',
       'moins': '-',
       'fois': '*',
@@ -414,7 +420,7 @@ class JSGenerator {
       'décomposition': '...'
     }
 
-    this.methodMap = {
+    const rawMethods = {
       'afficher': 'console.log',
       'journal': 'console.log',
       'erreur': 'console.error',
@@ -776,7 +782,23 @@ class JSGenerator {
       'décoder URI': 'decodeURI',
       'décoder composant URI': 'decodeURIComponent',
       'encoder URI': 'encodeURI',
-      'encoder composant URI': 'encodeURIComponent'
+      'encoder composant URI': 'encodeURIComponent',
+      'selecteur': 'querySelector',
+      'selecteurs': 'querySelectorAll'
+    }
+
+    this.keywordMap = {}
+    this.operatorMap = {}
+    this.methodMap = {}
+    
+    for (const [key, value] of Object.entries(rawKeywords)) {
+      this.keywordMap[norm(key)] = value
+    }
+    for (const [key, value] of Object.entries(rawOperators)) {
+      this.operatorMap[norm(key)] = value
+    }
+    for (const [key, value] of Object.entries(rawMethods)) {
+      this.methodMap[norm(key)] = value
     }
 
     this.buildConflictResolution()
@@ -795,7 +817,7 @@ class JSGenerator {
   }
 
   translateWithContext(word, explicitContext = null) {
-    const lower = word.toLowerCase()
+    const lower = this.normalize(word)
     const ctx = explicitContext || this.getCurrentContext()
     
     if (this.conflicts[lower] && ctx) {
@@ -814,8 +836,12 @@ class JSGenerator {
            word
   }
 
+  normalize(str) {
+    return str.toLowerCase().normalize('NFD').replace(/[\u0300-\u036f]/g, '')
+  }
+
   translate(word, isMethod = false) {
-    const lower = word.toLowerCase()
+    const lower = this.normalize(word)
     
     if (this.keywordMap[lower]) {
       return this.keywordMap[lower]
@@ -1060,16 +1086,17 @@ class JSGenerator {
     const name = node.name || (node.id ? (node.id.name || node.id) : '')
     const params = (node.params || []).map(p => this.generateParam(p)).join(', ')
 
-    let body = ''
     const savedOutput = this.output
+    const baseIndent = this.indent
     this.output = ''
-    this.indent++
+    this.indent = baseIndent + 1
     this.generateNode(node.body)
-    this.indent--
-    body = this.output.trim()
+    const body = this.output.trimEnd()
     this.output = savedOutput
+    this.indent = baseIndent
 
-    return `${async}function${generator} ${name}(${params}) {\n${body}\n${this.getIndent()}}`
+    const closingIndent = '  '.repeat(baseIndent)
+    return `${async}function${generator} ${name}(${params}) {\n${body}\n${closingIndent}}`
   }
 
   generateParam(param) {
@@ -1644,15 +1671,17 @@ class JSGenerator {
       : `(${params})`
 
     if (node.body?.type === 'BlockStatement') {
-      let body = ''
       const savedOutput = this.output
+      const baseIndent = this.indent
       this.output = ''
-      this.indent++
+      this.indent = baseIndent + 1
       this.generateNode(node.body)
-      this.indent--
-      body = this.output.trim()
+      const body = this.output.trimEnd()
       this.output = savedOutput
-      return `${async}${paramsStr} => {\n${body}\n${this.getIndent()}}`
+      this.indent = baseIndent
+
+      const closingIndent = '  '.repeat(baseIndent)
+      return `${async}${paramsStr} => {\n${body}\n${closingIndent}}`
     } else {
       const body = this.generateNode(node.body)
       return `${async}${paramsStr} => ${body}`
@@ -1716,7 +1745,7 @@ class JSGenerator {
     const left = this.generateNode(node.left)
     const right = this.generateNode(node.right)
     const op = this.translateOperator(node.operator)
-    return `(${left} ${op} ${right})`
+    return `${left} ${op} ${right}`
   }
 
   generateUnaryExpression(node) {

package/package.json

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