ether-code 0.6.8 → 0.7.0

package/cli/ether.js

@@ -6,7 +6,7 @@ const http = require('http')
 const { EtherCompiler } = require('./compiler')
 const { Watcher } = require('./watcher')
 
-const VERSION = '0.6.8'
+const VERSION = '0.7.0'
 
 const COLORS = {
   reset: '\x1b[0m',
@@ -21,15 +21,15 @@ const COLORS = {
 }
 
 const MIME_TYPES = {
-  '.html': 'text/html',
-  '.css': 'text/css',
-  '.js': 'application/javascript',
-  '.json': 'application/json',
+  '.html': 'text/html; charset=utf-8',
+  '.css': 'text/css; charset=utf-8',
+  '.js': 'application/javascript; charset=utf-8',
+  '.json': 'application/json; charset=utf-8',
   '.png': 'image/png',
   '.jpg': 'image/jpeg',
   '.jpeg': 'image/jpeg',
   '.gif': 'image/gif',
-  '.svg': 'image/svg+xml',
+  '.svg': 'image/svg+xml; charset=utf-8',
   '.ico': 'image/x-icon',
   '.woff': 'font/woff',
   '.woff2': 'font/woff2',
@@ -496,7 +496,7 @@ function startServer(outDir, publicDir, port) {
     const ext = path.extname(filePath).toLowerCase()
     const mime = MIME_TYPES[ext] || 'application/octet-stream'
     
-    fs.readFile(filePath, function(err, content) {
+    fs.readFile(filePath, 'utf-8', function(err, content) {
       if (err) {
         res.writeHead(500)
         res.end('Erreur: ' + err.message)
@@ -504,17 +504,15 @@ function startServer(outDir, publicDir, port) {
       }
       
       if (ext === '.html') {
-        let html = content.toString()
-        if (html.indexOf('</body>') !== -1) {
-          html = html.replace('</body>', liveReloadScript + '</body>')
+        if (content.indexOf('</body>') !== -1) {
+          content = content.replace('</body>', liveReloadScript + '</body>')
         } else {
-          html = html + liveReloadScript
+          content = content + liveReloadScript
         }
-        content = html
       }
       
       res.writeHead(200, { 'Content-Type': mime })
-      res.end(content)
+      res.end(content, 'utf-8')
     })
   })
   
@@ -557,8 +555,8 @@ function cmdInit() {
   if (!fs.existsSync(imagesDir)) fs.mkdirSync(imagesDir, { recursive: true })
   if (!fs.existsSync(videosDir)) fs.mkdirSync(videosDir, { recursive: true })
   
-  fs.writeFileSync(path.join(imagesDir, 'logo.svg'), LOGO_SVG)
-  fs.writeFileSync(path.join(publicDir, 'favicon.svg'), FAVICON_SVG)
+  fs.writeFileSync(path.join(imagesDir, 'logo.svg'), LOGO_SVG, 'utf-8')
+  fs.writeFileSync(path.join(publicDir, 'favicon.svg'), FAVICON_SVG, 'utf-8')
   
   const configContent = 'module.exports = {\n  src: "src",\n  out: "dist",\n  public: "public",\n  port: 3000,\n  lang: "fr"\n}\n'
   
@@ -675,11 +673,11 @@ console.log("Ether v0.3.8 ready!")
 
   const packageContent = '{\n  "name": "mon-projet-ether",\n  "version": "1.0.0",\n  "scripts": {\n    "dev": "ether dev",\n    "build": "ether build"\n  }\n}\n'
 
-  fs.writeFileSync(path.join(projectDir, 'ether.config.js'), configContent)
-  fs.writeFileSync(path.join(srcDir, 'index.eth'), indexContent)
-  fs.writeFileSync(path.join(srcDir, 'styles.eth'), STYLES_ETH)
-  fs.writeFileSync(path.join(srcDir, 'app.eth'), appContent)
-  fs.writeFileSync(path.join(projectDir, 'package.json'), packageContent)
+  fs.writeFileSync(path.join(projectDir, 'ether.config.js'), configContent, 'utf-8')
+  fs.writeFileSync(path.join(srcDir, 'index.eth'), indexContent, 'utf-8')
+  fs.writeFileSync(path.join(srcDir, 'styles.eth'), STYLES_ETH, 'utf-8')
+  fs.writeFileSync(path.join(srcDir, 'app.eth'), appContent, 'utf-8')
+  fs.writeFileSync(path.join(projectDir, 'package.json'), packageContent, 'utf-8')
   
   logSuccess('Projet initialise!')
   console.log('')
@@ -745,7 +743,7 @@ function cmdBuild(options) {
             fs.mkdirSync(outDirPath, { recursive: true })
           }
           
-          fs.writeFileSync(outPath, output.content)
+          fs.writeFileSync(outPath, output.content, 'utf-8')
           
           if (options.verbose) {
             logSuccess(relativePath + ' -> ' + output.path)
@@ -825,7 +823,7 @@ function cmdDev(options) {
             fs.mkdirSync(outDirPath, { recursive: true })
           }
           
-          fs.writeFileSync(outPath, output.content)
+          fs.writeFileSync(outPath, output.content, 'utf-8')
           logSuccess('-> ' + output.path)
         }
       }

package/generators/js-generator.js

@@ -814,7 +814,7 @@ class JSGenerator {
            word
   }
 
-  translate(word) {
+  translate(word, isMethod = false) {
     const lower = word.toLowerCase()
     
     if (this.keywordMap[lower]) {
@@ -823,13 +823,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 +957,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 +1019,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 +1043,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 +1057,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 +1072,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 +1206,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 +1214,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 +1267,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 +1322,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 +1354,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 +1675,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.8",
+  "version": "0.7.0",
   "description": "Ether - Le langage intentionnel",
   "main": "cli/compiler.js",
   "bin": {