ether-code 0.8.5 → 0.8.7

package/cli/ether.js

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

package/generators/php-generator.js

@@ -228,22 +228,27 @@ class PHPGenerator {
         result += this.translate(p.visibility) + ' '
       }
       
-      if (p.type) {
-        result += this.translateType(p.type) + ' '
+      if (p.readonly) {
+        result += 'readonly '
+      }
+      
+      const typeHint = p.typeHint || p.type
+      if (typeHint) {
+        result += this.translateType(typeHint) + ' '
       }
       
       if (p.variadic) {
         result += '...'
       }
       
-      if (p.reference) {
+      if (p.byReference || p.reference) {
         result += '&'
       }
       
       const name = this.safeString(p.name || p.id?.name || p)
-      result += '$' + this.translate(name)
+      result += '$' + name
       
-      if (p.default !== undefined) {
+      if (p.default !== undefined && p.default !== null) {
         result += ' = ' + this.generateNode(p.default)
       }
       
@@ -263,7 +268,6 @@ class PHPGenerator {
     if (!type) return ''
     
     if (typeof type === 'string') {
-      const translated = this.translate(type)
       const typeMap = {
         'chaîne': 'string', 'chaine': 'string', 'string': 'string',
         'entier': 'int', 'integer': 'int', 'int': 'int',
@@ -278,19 +282,24 @@ class PHPGenerator {
         'itérable': 'iterable', 'iterable': 'iterable',
         'jamais': 'never', 'never': 'never'
       }
-      const lower = translated.toLowerCase()
-      return typeMap[lower] || typeMap[type.toLowerCase()] || type
+      const lower = type.toLowerCase()
+      return typeMap[lower] || type
     }
     
-    if (type.union) {
+    if (type.type === 'TypeHint' && type.types) {
+      const typeStr = type.types.join('|')
+      return (type.nullable ? '?' : '') + typeStr
+    }
+    
+    if (type.union && type.types) {
       return type.types.map(t => this.translateType(t)).join('|')
     }
     
-    if (type.intersection) {
+    if (type.intersection && type.types) {
       return type.types.map(t => this.translateType(t)).join('&')
     }
     
-    if (type.nullable) {
+    if (type.nullable && type.type) {
       return '?' + this.translateType(type.type)
     }
     
@@ -727,6 +736,9 @@ class PHPGenerator {
       callee = this.generateMemberExpression(node.callee)
     } else if (node.callee && node.callee.type === 'StaticMemberExpression') {
       callee = this.generateStaticMemberExpression(node.callee)
+    } else if (node.callee && node.callee.type === 'Identifier') {
+      const name = this.safeString(node.callee.name)
+      callee = this.translate(name)
     } else {
       callee = this.generateNode(node.callee)
     }
@@ -749,9 +761,11 @@ class PHPGenerator {
     let property
     
     if (typeof node.property === 'string') {
-      property = node.property
+      property = this.translateMethodName(node.property)
     } else if (node.property && node.property.name) {
-      property = node.property.name
+      property = this.translateMethodName(node.property.name)
+    } else if (node.property && node.property.type === 'Identifier') {
+      property = this.translateMethodName(node.property.name || node.property.value)
     } else {
       property = this.generateNode(node.property)
     }
@@ -768,6 +782,20 @@ class PHPGenerator {
     return `${object}->${property}`
   }
 
+  translateMethodName(name) {
+    if (!name) return name
+    const translated = this.translate(name)
+    if (translated.includes('->')) {
+      const parts = translated.split('->')
+      return parts[parts.length - 1].replace(/\(\)$/, '')
+    }
+    if (translated.includes('::')) {
+      const parts = translated.split('::')
+      return parts[parts.length - 1].replace(/\(\)$/, '')
+    }
+    return translated.replace(/\(\)$/, '')
+  }
+
   generateStaticMemberExpression(node) {
     const cls = this.generateNode(node.class)
     let member

package/package.json

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

package/parsers/ether-parser-php.js

@@ -1089,6 +1089,8 @@ class EtherParserPHP extends EtherParserBase {
       }
     }
 
+    this.match(TokenType.COLON)
+    this.skipNewlines()
     body = this.parseBlock(lang)
 
     return {
@@ -2139,12 +2141,12 @@ class EtherParserPHP extends EtherParserBase {
       return { type: 'UnaryExpression', operator: '!', operand }
     }
 
-    if (this.match(TokenType.MINUS)) {
+    if (this.match(TokenType.MINUS) && !this.check(TokenType.MINUS)) {
       const operand = this.parseUnary(lang)
       return { type: 'UnaryExpression', operator: '-', operand }
     }
 
-    if (this.match(TokenType.PLUS)) {
+    if (this.match(TokenType.PLUS) && !this.check(TokenType.PLUS)) {
       const operand = this.parseUnary(lang)
       return { type: 'UnaryExpression', operator: '+', operand }
     }
@@ -2159,12 +2161,15 @@ class EtherParserPHP extends EtherParserBase {
       return { type: 'UnaryExpression', operator: '~', operand }
     }
 
-    if (this.match(TokenType.DOUBLE_PLUS)) {
+    const current = this.current()
+    if (current && current.type === TokenType.PLUS && current.value === '++') {
+      this.advance()
       const operand = this.parseUnary(lang)
       return { type: 'UpdateExpression', operator: '++', prefix: true, operand }
     }
 
-    if (this.match(TokenType.DOUBLE_MINUS)) {
+    if (current && current.type === TokenType.MINUS && current.value === '--') {
+      this.advance()
       const operand = this.parseUnary(lang)
       return { type: 'UpdateExpression', operator: '--', prefix: true, operand }
     }
@@ -2276,11 +2281,14 @@ class EtherParserPHP extends EtherParserBase {
   parsePostfix(lang) {
     let expr = this.parseCall(lang)
 
-    if (this.match(TokenType.DOUBLE_PLUS)) {
+    const current = this.current()
+    if (current && current.type === TokenType.PLUS && current.value === '++') {
+      this.advance()
       return { type: 'UpdateExpression', operator: '++', prefix: false, operand: expr }
     }
 
-    if (this.match(TokenType.DOUBLE_MINUS)) {
+    if (current && current.type === TokenType.MINUS && current.value === '--') {
+      this.advance()
       return { type: 'UpdateExpression', operator: '--', prefix: false, operand: expr }
     }
 
@@ -2441,9 +2449,8 @@ class EtherParserPHP extends EtherParserBase {
         return { type: 'Variable', name: value.substring(1) }
       }
 
-      const translated = this.translatePHP(value)
       this.advance()
-      return { type: 'Identifier', name: translated || value }
+      return { type: 'Identifier', name: value }
     }
 
     if (token.type === TokenType.VARIABLE) {