ether-code 0.8.1 → 0.8.2

package/cli/ether.js

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

package/generators/php-generator.js

@@ -46,7 +46,8 @@ class PHPGenerator {
   }
 
   translate(word) {
-    if (!word || typeof word !== 'string') return word
+    if (!word) return word
+    if (typeof word !== 'string') return String(word)
     
     const normalized = word.toLowerCase().trim()
     
@@ -63,6 +64,7 @@ class PHPGenerator {
   }
 
   removeAccents(str) {
+    if (typeof str !== 'string') return String(str)
     return str.normalize('NFD').replace(/[\u0300-\u036f]/g, '')
   }
 
@@ -140,12 +142,19 @@ class PHPGenerator {
       'ArrayExpression': () => this.generateArrayExpression(node),
       'ObjectExpression': () => this.generateObjectExpression(node),
       'ArrowFunction': () => this.generateArrowFunction(node),
+      'ArrowFunctionExpression': () => this.generateArrowFunction(node),
       'Closure': () => this.generateClosure(node),
+      'FunctionExpression': () => this.generateClosure(node),
       'Identifier': () => this.generateIdentifier(node),
+      'Variable': () => this.generateVariable(node),
       'Literal': () => this.generateLiteral(node),
+      'StringLiteral': () => this.generateStringLiteral(node),
       'NewExpression': () => this.generateNewExpression(node),
       'InstanceOf': () => this.generateInstanceOf(node),
       'BlockStatement': () => this.generateBlockStatement(node),
+      'ThisExpression': () => '$this',
+      'StaticMemberExpression': () => this.generateStaticMemberExpression(node),
+      'IndexExpression': () => this.generateIndexExpression(node),
       'EmptyStatement': () => '',
       'Comment': () => ''
     }
@@ -168,11 +177,12 @@ class PHPGenerator {
   }
 
   generateFunctionDeclaration(node) {
-    const name = this.translate(node.name || node.id?.name || 'anonymous')
+    const name = this.safeString(node.name || node.id?.name || 'anonymous')
+    const translatedName = this.translate(name)
     const params = this.generateParams(node.params || [])
     const returnType = node.returnType ? ': ' + this.translateType(node.returnType) : ''
     
-    this.writeLine(`function ${name}(${params})${returnType} {`)
+    this.writeLine(`function ${translatedName}(${params})${returnType} {`)
     this.indent++
     this.generateNode(node.body)
     this.indent--
@@ -200,8 +210,8 @@ class PHPGenerator {
         result += '&'
       }
       
-      const name = p.name || p.id?.name || p
-      result += '$' + this.translate(typeof name === 'string' ? name : name.name || 'param')
+      const name = this.safeString(p.name || p.id?.name || p)
+      result += '$' + this.translate(name)
       
       if (p.default !== undefined) {
         result += ' = ' + this.generateNode(p.default)
@@ -211,6 +221,14 @@ class PHPGenerator {
     }).join(', ')
   }
 
+  safeString(value) {
+    if (typeof value === 'string') return value
+    if (value && typeof value === 'object') {
+      return value.name || value.value || 'unknown'
+    }
+    return String(value || 'unknown')
+  }
+
   translateType(type) {
     if (!type) return ''
     
@@ -230,7 +248,8 @@ class PHPGenerator {
         'itérable': 'iterable', 'iterable': 'iterable',
         'jamais': 'never', 'never': 'never'
       }
-      return typeMap[translated.toLowerCase()] || typeMap[type.toLowerCase()] || type
+      const lower = translated.toLowerCase()
+      return typeMap[lower] || typeMap[type.toLowerCase()] || type
     }
     
     if (type.union) {
@@ -245,7 +264,11 @@ class PHPGenerator {
       return '?' + this.translateType(type.type)
     }
     
-    return type.name || type
+    if (type.name) {
+      return this.translateType(type.name)
+    }
+    
+    return String(type)
   }
 
   generateClassDeclaration(node) {
@@ -255,14 +278,15 @@ class PHPGenerator {
     if (node.final) declaration += 'final '
     if (node.readonly) declaration += 'readonly '
     
-    declaration += 'class ' + this.translate(node.name || node.id?.name)
+    const className = this.safeString(node.name || node.id?.name)
+    declaration += 'class ' + this.translate(className)
     
     if (node.extends) {
-      declaration += ' extends ' + this.translate(node.extends)
+      declaration += ' extends ' + this.translate(this.safeString(node.extends))
     }
     
     if (node.implements && node.implements.length > 0) {
-      declaration += ' implements ' + node.implements.map(i => this.translate(i)).join(', ')
+      declaration += ' implements ' + node.implements.map(i => this.translate(this.safeString(i))).join(', ')
     }
     
     this.writeLine(declaration + ' {')
@@ -278,10 +302,11 @@ class PHPGenerator {
   }
 
   generateInterfaceDeclaration(node) {
-    let declaration = 'interface ' + this.translate(node.name || node.id?.name)
+    const name = this.safeString(node.name || node.id?.name)
+    let declaration = 'interface ' + this.translate(name)
     
     if (node.extends && node.extends.length > 0) {
-      declaration += ' extends ' + node.extends.map(e => this.translate(e)).join(', ')
+      declaration += ' extends ' + node.extends.map(e => this.translate(this.safeString(e))).join(', ')
     }
     
     this.writeLine(declaration + ' {')
@@ -297,7 +322,8 @@ class PHPGenerator {
   }
 
   generateTraitDeclaration(node) {
-    this.writeLine('trait ' + this.translate(node.name || node.id?.name) + ' {')
+    const name = this.safeString(node.name || node.id?.name)
+    this.writeLine('trait ' + this.translate(name) + ' {')
     this.indent++
     
     for (const member of node.body || node.members || []) {
@@ -310,7 +336,8 @@ class PHPGenerator {
   }
 
   generateEnumDeclaration(node) {
-    let declaration = 'enum ' + this.translate(node.name || node.id?.name)
+    const name = this.safeString(node.name || node.id?.name)
+    let declaration = 'enum ' + this.translate(name)
     
     if (node.backingType) {
       declaration += ': ' + this.translateType(node.backingType)
@@ -346,7 +373,7 @@ class PHPGenerator {
     if (node.final) declaration += 'final '
     if (node.abstract) declaration += 'abstract '
     
-    const name = this.translateMethodName(node.name || node.key?.name)
+    const name = this.translateMethodName(this.safeString(node.name || node.key?.name))
     const params = this.generateParams(node.params || node.value?.params || [])
     const returnType = node.returnType ? ': ' + this.translateType(node.returnType) : ''
     
@@ -425,8 +452,8 @@ class PHPGenerator {
       declaration += this.translateType(node.type) + ' '
     }
     
-    const name = this.translate(node.name || node.key?.name)
-    declaration += '$' + name
+    const name = this.safeString(node.name || node.key?.name)
+    declaration += '$' + this.translate(name)
     
     if (node.value !== undefined) {
       declaration += ' = ' + this.generateNode(node.value)
@@ -437,8 +464,8 @@ class PHPGenerator {
 
   generateVariableDeclaration(node) {
     for (const decl of node.declarations || [node]) {
-      const name = decl.name || decl.id?.name || decl.id
-      const varName = '$' + this.translate(typeof name === 'string' ? name : name.name || 'var')
+      const name = this.safeString(decl.name || decl.id?.name || decl.id)
+      const varName = '$' + this.translate(name)
       
       if (decl.init !== undefined) {
         const value = this.generateNode(decl.init)
@@ -450,7 +477,7 @@ class PHPGenerator {
   }
 
   generateConstantDeclaration(node) {
-    const name = node.name || node.id?.name
+    const name = this.safeString(node.name || node.id?.name)
     const value = this.generateNode(node.value || node.init)
     
     if (node.classLevel) {
@@ -498,8 +525,8 @@ class PHPGenerator {
 
   generateForEachStatement(node) {
     const array = this.generateNode(node.array || node.right || node.iterable)
-    const value = this.generateIdentifier(node.value || node.left || node.valueVar)
-    const key = node.key || node.keyVar ? this.generateIdentifier(node.key || node.keyVar) + ' => ' : ''
+    const value = this.generateVariable(node.value || node.left || node.valueVar)
+    const key = node.key || node.keyVar ? this.generateVariable(node.key || node.keyVar) + ' => ' : ''
 
     this.writeLine(`foreach (${array} as ${key}${value}) {`)
     this.indent++
@@ -576,7 +603,7 @@ class PHPGenerator {
 
     for (const handler of node.handlers || (node.handler ? [node.handler] : [])) {
       const exceptionType = handler.type || handler.param?.type || 'Exception'
-      const param = handler.param ? this.generateIdentifier(handler.param) : '$e'
+      const param = handler.param ? this.generateVariable(handler.param) : '$e'
       this.writeLine(`} catch (${exceptionType} ${param}) {`)
       this.indent++
       this.generateNode(handler.body)
@@ -623,12 +650,13 @@ class PHPGenerator {
   }
 
   generateNamespace(node) {
-    this.writeLine(`namespace ${node.name};`)
+    const name = this.safeString(node.name)
+    this.writeLine(`namespace ${name};`)
     this.writeLine('')
   }
 
   generateUseStatement(node) {
-    const name = node.name || node.source
+    const name = this.safeString(node.name || node.source)
     const alias = node.alias ? ' as ' + node.alias : ''
     const type = node.type === 'function' ? 'function ' : (node.type === 'const' ? 'const ' : '')
     this.writeLine(`use ${type}${name}${alias};`)
@@ -655,17 +683,19 @@ class PHPGenerator {
     
     if (typeof node.callee === 'string') {
       callee = this.translate(node.callee)
-    } else if (node.callee.type === 'MemberExpression') {
+    } else if (node.callee && node.callee.type === 'MemberExpression') {
       callee = this.generateMemberExpression(node.callee)
+    } else if (node.callee && node.callee.type === 'StaticMemberExpression') {
+      callee = this.generateStaticMemberExpression(node.callee)
     } else {
       callee = this.generateNode(node.callee)
     }
     
     const args = (node.arguments || []).map(a => {
-      if (a.spread) {
+      if (a && a.type === 'SpreadElement') {
         return '...' + this.generateNode(a.argument || a)
       }
-      if (a.name && a.value) {
+      if (a && a.type === 'NamedArgument') {
         return `${a.name}: ${this.generateNode(a.value)}`
       }
       return this.generateNode(a)
@@ -676,9 +706,15 @@ class PHPGenerator {
 
   generateMemberExpression(node) {
     const object = this.generateNode(node.object)
-    const property = typeof node.property === 'string' 
-      ? node.property 
-      : this.generateNode(node.property)
+    let property
+    
+    if (typeof node.property === 'string') {
+      property = node.property
+    } else if (node.property && node.property.name) {
+      property = node.property.name
+    } else {
+      property = this.generateNode(node.property)
+    }
     
     if (node.static) {
       return `${object}::${property}`
@@ -686,12 +722,33 @@ class PHPGenerator {
     if (node.computed) {
       return `${object}[${property}]`
     }
-    if (node.nullSafe) {
+    if (node.nullsafe || node.operator === '?->') {
       return `${object}?->${property}`
     }
     return `${object}->${property}`
   }
 
+  generateStaticMemberExpression(node) {
+    const cls = this.generateNode(node.class)
+    let member
+    
+    if (typeof node.member === 'string') {
+      member = node.member
+    } else if (node.member && node.member.name) {
+      member = node.member.name
+    } else {
+      member = this.generateNode(node.member)
+    }
+    
+    return `${cls}::${member}`
+  }
+
+  generateIndexExpression(node) {
+    const object = this.generateNode(node.object)
+    const index = node.index ? this.generateNode(node.index) : ''
+    return `${object}[${index}]`
+  }
+
   generateBinaryExpression(node) {
     const left = this.generateNode(node.left)
     const right = this.generateNode(node.right)
@@ -708,14 +765,16 @@ class PHPGenerator {
       'fusion null': '??', 'null coalescing': '??'
     }
     
-    op = opMap[op?.toLowerCase()] || op
+    const opLower = op ? op.toLowerCase() : op
+    op = opMap[opLower] || op
 
     return `${left} ${op} ${right}`
   }
 
   generateUnaryExpression(node) {
     const argument = this.generateNode(node.argument)
-    const op = node.operator === 'non' || node.operator === 'not' ? '!' : node.operator
+    let op = node.operator
+    if (op === 'non' || op === 'not') op = '!'
     
     if (node.prefix) {
       return `${op}${argument}`
@@ -756,14 +815,22 @@ class PHPGenerator {
   generateArrayExpression(node) {
     const elements = (node.elements || []).map(e => {
       if (!e) return 'null'
-      if (e.key !== undefined) {
+      if (e.type === 'SpreadElement') {
+        return '...' + this.generateNode(e.argument || e)
+      }
+      if (e.type === 'ArrayElement') {
+        if (e.key !== null && e.key !== undefined) {
+          const key = this.generateNode(e.key)
+          const value = this.generateNode(e.value)
+          return `${key} => ${value}`
+        }
+        return this.generateNode(e.value)
+      }
+      if (e.key !== undefined && e.key !== null) {
         const key = this.generateNode(e.key)
         const value = this.generateNode(e.value || e)
         return `${key} => ${value}`
       }
-      if (e.spread) {
-        return '...' + this.generateNode(e.argument || e)
-      }
       return this.generateNode(e)
     })
     
@@ -786,19 +853,19 @@ class PHPGenerator {
 
   generateClosure(node) {
     const params = this.generateParams(node.params || [])
-    const useVars = node.use && node.use.length > 0 
-      ? ` use (${node.use.map(u => (u.byRef ? '&' : '') + '$' + this.translate(u.name || u)).join(', ')})` 
+    const useVars = node.uses && node.uses.length > 0 
+      ? ` use (${node.uses.map(u => (u.byRef ? '&' : '') + '$' + this.translate(this.safeString(u.name || u))).join(', ')})` 
       : ''
     const returnType = node.returnType ? ': ' + this.translateType(node.returnType) : ''
     
     let result = `function(${params})${useVars}${returnType} {\n`
     this.indent++
     
-    if (Array.isArray(node.body)) {
-      for (const stmt of node.body) {
+    if (node.body && Array.isArray(node.body.body)) {
+      for (const stmt of node.body.body) {
         result += this.getIndent() + this.generateNode(stmt)
       }
-    } else {
+    } else if (node.body) {
       result += this.getIndent() + 'return ' + this.generateNode(node.body) + ';\n'
     }
     
@@ -807,34 +874,47 @@ class PHPGenerator {
     return result
   }
 
+  generateVariable(node) {
+    if (!node) return '$var'
+    
+    const name = this.safeString(node.name || node.id?.name || node)
+    const translated = this.translate(name)
+    const translatedStr = String(translated)
+    
+    if (translatedStr.startsWith('$')) return translatedStr
+    return '$' + translatedStr
+  }
+
   generateIdentifier(node) {
-    const name = node.name || node.id?.name || node
-    if (typeof name !== 'string') return '$var'
+    if (!node) return '$var'
     
+    const name = this.safeString(node.name || node.id?.name || node)
     const translated = this.translate(name)
+    const translatedStr = String(translated)
     
-    if (translated.startsWith('$')) return translated
+    if (translatedStr.startsWith('$')) return translatedStr
     
     const keywords = [
       'true', 'false', 'null', 
       'self', 'parent', 'static',
       'this', '$this'
     ]
-    if (keywords.includes(translated.toLowerCase())) {
-      if (translated.toLowerCase() === 'this') return '$this'
-      return translated
+    if (keywords.includes(translatedStr.toLowerCase())) {
+      if (translatedStr.toLowerCase() === 'this') return '$this'
+      return translatedStr
     }
     
-    if (/^[A-Z]/.test(translated)) return translated
+    if (/^[A-Z]/.test(translatedStr)) return translatedStr
     
-    if (translated.includes('(') || translated.includes('::')) return translated
+    if (translatedStr.includes('(') || translatedStr.includes('::')) return translatedStr
     
     const superglobals = ['_GET', '_POST', '_SERVER', '_SESSION', '_COOKIE', '_FILES', '_REQUEST', '_ENV', 'GLOBALS']
-    if (superglobals.includes(translated) || superglobals.includes(translated.toUpperCase())) {
-      return '$' + translated.toUpperCase()
+    const upper = translatedStr.toUpperCase()
+    if (superglobals.includes(translatedStr) || superglobals.includes(upper)) {
+      return '$' + upper
     }
     
-    return '$' + translated
+    return '$' + translatedStr
   }
 
   generateLiteral(node) {
@@ -854,10 +934,26 @@ class PHPGenerator {
     return String(node.value)
   }
 
+  generateStringLiteral(node) {
+    const value = node.value || ''
+    const escaped = value
+      .replace(/\\/g, '\\\\')
+      .replace(/"/g, '\\"')
+      .replace(/\n/g, '\\n')
+      .replace(/\r/g, '\\r')
+      .replace(/\t/g, '\\t')
+    return node.doubleQuoted !== false ? `"${escaped}"` : `'${escaped}'`
+  }
+
   generateNewExpression(node) {
-    const callee = typeof node.callee === 'string'
-      ? this.translate(node.callee)
-      : this.generateNode(node.callee)
+    let callee
+    if (typeof node.callee === 'string') {
+      callee = this.translate(node.callee)
+    } else if (node.callee && node.callee.name) {
+      callee = this.translate(node.callee.name)
+    } else {
+      callee = this.generateNode(node.callee)
+    }
     const args = (node.arguments || []).map(a => this.generateNode(a)).join(', ')
     return `new ${callee}(${args})`
   }
@@ -887,6 +983,4 @@ class PHPGenerator {
   }
 }
 
-module.exports = { 
-  PHPGenerator 
-}
+module.exports = { PHPGenerator }

package/package.json

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