ether-code 0.7.1 → 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.1'
+const VERSION = '0.7.2'
 
 const COLORS = {
   reset: '\x1b[0m',

package/generators/js-generator.js

@@ -1086,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) {
@@ -1670,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}`
@@ -1742,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.1",
+  "version": "0.7.2",
   "description": "Ether - Le langage intentionnel",
   "main": "cli/compiler.js",
   "bin": {