ether-code 0.6.9 → 0.7.1

package/cli/ether.js

@@ -6,7 +6,7 @@ const http = require('http')
 const { EtherCompiler } = require('./compiler')
 const { Watcher } = require('./watcher')
 
-const VERSION = '0.6.9'
+const VERSION = '0.7.1'
 
 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
   }
 
-  translate(word) {
-    const lower = word.toLowerCase()
+  normalize(str) {
+    return str.toLowerCase().normalize('NFD').replace(/[\u0300-\u036f]/g, '')
+  }
+
+  translate(word, isMethod = false) {
+    const lower = this.normalize(word)
     
     if (this.keywordMap[lower]) {
       return this.keywordMap[lower]
@@ -823,13 +849,17 @@ class JSGenerator {
     if (this.operatorMap[lower]) {
       return this.operatorMap[lower]
     }
-    if (this.methodMap[lower]) {
+    if (isMethod && this.methodMap[lower]) {
       return this.methodMap[lower]
     }
     
     return word
   }
 
+  translateMethod(word) {
+    return this.translate(word, true)
+  }
+
   translateOperator(op) {
     const lower = op.toLowerCase()
     return this.operatorMap[lower] || op
@@ -953,8 +983,10 @@ class JSGenerator {
         return this.generateSpreadElement(node)
       case 'RestElement':
         return this.generateRestElement(node)
+      case 'Parameter':
+        return this.generateParam(node)
       case 'Identifier':
-        return this.translate(node.name)
+        return node.name
       case 'PrivateIdentifier':
         return this.generatePrivateIdentifier(node)
       case 'Literal':
@@ -1013,12 +1045,20 @@ class JSGenerator {
     }
     kind = kindTranslations[kind.toLowerCase()] || this.translate(kind)
     
-    const declarations = node.declarations || []
-
-    for (const decl of declarations) {
-      const name = this.generateNode(decl.id || decl.name)
-      if (decl.init) {
-        const init = this.generateNode(decl.init)
+    if (node.declarations && node.declarations.length > 0) {
+      for (const decl of node.declarations) {
+        const name = this.generateNode(decl.id || decl.name)
+        if (decl.init) {
+          const init = this.generateNode(decl.init)
+          this.writeLine(`${kind} ${name} = ${init};`)
+        } else {
+          this.writeLine(`${kind} ${name};`)
+        }
+      }
+    } else if (node.name) {
+      const name = typeof node.name === 'string' ? node.name : this.generateNode(node.name)
+      if (node.init) {
+        const init = this.generateNode(node.init)
         this.writeLine(`${kind} ${name} = ${init};`)
       } else {
         this.writeLine(`${kind} ${name};`)
@@ -1029,8 +1069,8 @@ class JSGenerator {
   generateFunctionDeclaration(node) {
     const async = node.async ? 'async ' : ''
     const generator = node.generator ? '*' : ''
-    const name = node.id ? this.translate(node.id.name || node.id) : ''
-    const params = (node.params || []).map(p => this.generateNode(p)).join(', ')
+    const name = node.name || (node.id ? (node.id.name || node.id) : '')
+    const params = (node.params || []).map(p => this.generateParam(p)).join(', ')
 
     this.writeLine(`${async}function${generator} ${name}(${params}) {`)
     this.indent++
@@ -1043,8 +1083,8 @@ class JSGenerator {
   generateFunctionExpression(node) {
     const async = node.async ? 'async ' : ''
     const generator = node.generator ? '*' : ''
-    const name = node.id ? this.translate(node.id.name || node.id) : ''
-    const params = (node.params || []).map(p => this.generateNode(p)).join(', ')
+    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
@@ -1058,6 +1098,26 @@ class JSGenerator {
     return `${async}function${generator} ${name}(${params}) {\n${body}\n${this.getIndent()}}`
   }
 
+  generateParam(param) {
+    if (!param) return ''
+    if (typeof param === 'string') return param
+    if (param.type === 'Identifier') return param.name
+    if (param.type === 'Parameter') {
+      let result = param.name
+      if (param.default) {
+        result += ' = ' + this.generateNode(param.default)
+      }
+      return result
+    }
+    if (param.type === 'RestElement') {
+      return '...' + this.generateParam(param.argument)
+    }
+    if (param.type === 'AssignmentPattern') {
+      return this.generateNode(param.left) + ' = ' + this.generateNode(param.right)
+    }
+    return param.name || this.generateNode(param)
+  }
+
   generateClassDeclaration(node) {
     const name = node.id ? (node.id.name || node.id) : ''
     const extend = node.superClass ? ` extends ${this.generateNode(node.superClass)}` : ''
@@ -1172,7 +1232,7 @@ class JSGenerator {
   }
 
   generateIfStatement(node) {
-    const test = this.generateNode(node.test)
+    const test = this.generateNode(node.test || node.condition)
     this.writeLine(`if (${test}) {`)
     this.indent++
     this.generateNode(node.consequent)
@@ -1180,8 +1240,46 @@ class JSGenerator {
 
     if (node.alternate) {
       if (node.alternate.type === 'IfStatement') {
-        this.output = this.output.trimEnd() + ' else '
-        this.generateIfStatement(node.alternate)
+        const altTest = this.generateNode(node.alternate.test || node.alternate.condition)
+        this.writeLine(`} else if (${altTest}) {`)
+        this.indent++
+        this.generateNode(node.alternate.consequent)
+        this.indent--
+        if (node.alternate.alternate) {
+          if (node.alternate.alternate.type === 'IfStatement') {
+            this.generateElseIfChain(node.alternate.alternate)
+          } else {
+            this.writeLine('} else {')
+            this.indent++
+            this.generateNode(node.alternate.alternate)
+            this.indent--
+            this.writeLine('}')
+          }
+        } else {
+          this.writeLine('}')
+        }
+      } else {
+        this.writeLine('} else {')
+        this.indent++
+        this.generateNode(node.alternate)
+        this.indent--
+        this.writeLine('}')
+      }
+    } else {
+      this.writeLine('}')
+    }
+  }
+
+  generateElseIfChain(node) {
+    const test = this.generateNode(node.test || node.condition)
+    this.writeLine(`} else if (${test}) {`)
+    this.indent++
+    this.generateNode(node.consequent)
+    this.indent--
+    
+    if (node.alternate) {
+      if (node.alternate.type === 'IfStatement') {
+        this.generateElseIfChain(node.alternate)
       } else {
         this.writeLine('} else {')
         this.indent++
@@ -1195,15 +1293,44 @@ class JSGenerator {
   }
 
   generateForStatement(node) {
+    if (node.iterable || node.variable) {
+      const varName = node.variable || 'item'
+      const iterable = this.generateNode(node.iterable)
+      this.writeLine(`for (const ${varName} of ${iterable}) {`)
+      this.indent++
+      this.generateNode(node.body)
+      this.indent--
+      this.writeLine('}')
+      return
+    }
+    
+    if (node.start !== undefined && node.end !== undefined) {
+      const varName = node.variable || 'i'
+      const start = this.generateNode(node.start)
+      const end = this.generateNode(node.end)
+      const step = node.step ? this.generateNode(node.step) : '1'
+      this.writeLine(`for (let ${varName} = ${start}; ${varName} < ${end}; ${varName} += ${step}) {`)
+      this.indent++
+      this.generateNode(node.body)
+      this.indent--
+      this.writeLine('}')
+      return
+    }
+    
     let init = ''
     if (node.init) {
       if (node.init.type === 'VariableDeclaration') {
         const kind = this.translate(node.init.kind || 'let')
-        const decls = node.init.declarations.map(d => {
-          const name = this.generateNode(d.id)
-          return d.init ? `${name} = ${this.generateNode(d.init)}` : name
-        }).join(', ')
-        init = `${kind} ${decls}`
+        if (node.init.declarations && node.init.declarations.length > 0) {
+          const decls = node.init.declarations.map(d => {
+            const name = this.generateNode(d.id || d.name)
+            return d.init ? `${name} = ${this.generateNode(d.init)}` : name
+          }).join(', ')
+          init = `${kind} ${decls}`
+        } else if (node.init.name) {
+          const name = node.init.name
+          init = node.init.init ? `${kind} ${name} = ${this.generateNode(node.init.init)}` : `${kind} ${name}`
+        }
       } else {
         init = this.generateNode(node.init)
       }
@@ -1221,14 +1348,26 @@ class JSGenerator {
   generateForOfStatement(node) {
     this.pushContext('loop')
     let left
-    if (node.left.type === 'VariableDeclaration') {
-      const kind = this.translate(node.left.kind || 'const')
-      const name = this.generateNode(node.left.declarations[0].id)
-      left = `${kind} ${name}`
+    if (node.left) {
+      if (node.left.type === 'VariableDeclaration') {
+        const kind = this.translate(node.left.kind || 'const')
+        if (node.left.declarations && node.left.declarations.length > 0) {
+          const name = this.generateNode(node.left.declarations[0].id || node.left.declarations[0].name)
+          left = `${kind} ${name}`
+        } else if (node.left.name) {
+          left = `${kind} ${node.left.name}`
+        } else {
+          left = `${kind} item`
+        }
+      } else {
+        left = this.generateNode(node.left)
+      }
+    } else if (node.variable) {
+      left = `const ${node.variable}`
     } else {
-      left = this.generateNode(node.left)
+      left = 'const item'
     }
-    const right = this.generateNode(node.right)
+    const right = this.generateNode(node.right || node.iterable)
 
     this.writeLine(`for (${left} of ${right}) {`)
     this.indent++
@@ -1241,14 +1380,26 @@ class JSGenerator {
   generateForInStatement(node) {
     this.pushContext('loop')
     let left
-    if (node.left.type === 'VariableDeclaration') {
-      const kind = this.translate(node.left.kind || 'const')
-      const name = this.generateNode(node.left.declarations[0].id)
-      left = `${kind} ${name}`
+    if (node.left) {
+      if (node.left.type === 'VariableDeclaration') {
+        const kind = this.translate(node.left.kind || 'const')
+        if (node.left.declarations && node.left.declarations.length > 0) {
+          const name = this.generateNode(node.left.declarations[0].id || node.left.declarations[0].name)
+          left = `${kind} ${name}`
+        } else if (node.left.name) {
+          left = `${kind} ${node.left.name}`
+        } else {
+          left = `${kind} key`
+        }
+      } else {
+        left = this.generateNode(node.left)
+      }
+    } else if (node.variable) {
+      left = `const ${node.variable}`
     } else {
-      left = this.generateNode(node.left)
+      left = 'const key'
     }
-    const right = this.generateNode(node.right)
+    const right = this.generateNode(node.right || node.iterable)
 
     this.writeLine(`for (${left} in ${right}) {`)
     this.indent++
@@ -1550,7 +1701,7 @@ class JSGenerator {
       return `${object}[${property}]`
     }
     
-    const translatedProperty = this.translate(property)
+    const translatedProperty = this.translateMethod(property)
     
     if (translatedProperty.includes('.')) {
       const parts = translatedProperty.split('.')

package/package.json

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