ether-code 0.8.6 → 0.8.8

package/cli/ether.js

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

package/generators/php-generator.js

@@ -31,14 +31,35 @@ class PHPGenerator {
         if (!section[lang]) continue
         
         for (const [etherWord, phpCode] of Object.entries(section[lang])) {
-          const normalizedKey = etherWord.toLowerCase().trim()
+          const fixed = this.normalizeUTF8(etherWord)
+          const normalizedKey = fixed.toLowerCase().trim()
           const cleanPhp = this.cleanPhpValue(phpCode)
           this.translationMap[normalizedKey] = cleanPhp
+          
+          const withoutAccents = this.removeAccents(normalizedKey)
+          if (withoutAccents !== normalizedKey) {
+            this.translationMap[withoutAccents] = cleanPhp
+          }
         }
       }
     }
   }
 
+  normalizeUTF8(str) {
+    if (typeof str !== 'string') return String(str)
+    
+    try {
+      const bytes = new Uint8Array(str.length)
+      for (let i = 0; i < str.length; i++) {
+        bytes[i] = str.charCodeAt(i)
+      }
+      const decoder = new TextDecoder('utf-8')
+      return decoder.decode(bytes)
+    } catch (e) {
+      return str
+    }
+  }
+
   cleanPhpValue(value) {
     if (typeof value !== 'string') return value
     let cleaned = value.replace(/\(\)$/, '')
@@ -60,6 +81,36 @@ class PHPGenerator {
       return this.translationMap[withoutAccents]
     }
     
+    if (normalized.includes(' ')) {
+      const words = normalized.split(' ')
+      
+      for (let i = words.length - 1; i >= 1; i--) {
+        const partial = words.slice(0, i + 1).join(' ')
+        if (this.translationMap[partial]) {
+          return this.translationMap[partial]
+        }
+        const partialNoAccent = this.removeAccents(partial)
+        if (this.translationMap[partialNoAccent]) {
+          return this.translationMap[partialNoAccent]
+        }
+      }
+      
+      const firstWord = words[0]
+      if (this.translationMap[firstWord]) {
+        const result = this.translationMap[firstWord]
+        if (!result.startsWith('__') && !result.startsWith('$')) {
+          return result
+        }
+      }
+      const firstWordNoAccent = this.removeAccents(firstWord)
+      if (this.translationMap[firstWordNoAccent]) {
+        const result = this.translationMap[firstWordNoAccent]
+        if (!result.startsWith('__') && !result.startsWith('$')) {
+          return result
+        }
+      }
+    }
+    
     return word
   }
 
@@ -158,6 +209,7 @@ class PHPGenerator {
       'ThisExpression': () => '$this',
       'StaticMemberExpression': () => this.generateStaticMemberExpression(node),
       'IndexExpression': () => this.generateIndexExpression(node),
+      'YieldExpression': () => this.generateYieldExpression(node),
       'EmptyStatement': () => '',
       'Comment': () => ''
     }
@@ -232,8 +284,8 @@ class PHPGenerator {
         result += 'readonly '
       }
       
-      const typeHint = p.typeHint || p.type
-      if (typeHint) {
+      const typeHint = p.typeHint || (p.type !== 'Parameter' ? p.type : null)
+      if (typeHint && typeHint !== 'Parameter') {
         result += this.translateType(typeHint) + ' '
       }
       
@@ -761,9 +813,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)
     }
@@ -780,6 +834,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
@@ -801,6 +869,14 @@ class PHPGenerator {
     return `${object}[${index}]`
   }
 
+  generateYieldExpression(node) {
+    const argument = node.argument ? this.generateNode(node.argument) : ''
+    if (node.delegate) {
+      return `yield from ${argument}`
+    }
+    return argument ? `yield ${argument}` : 'yield'
+  }
+
   generateBinaryExpression(node) {
     const left = this.generateNode(node.left)
     const right = this.generateNode(node.right)