ether-code 0.9.5 → 0.9.6

package/cli/ether.js

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

package/generators/php-generator.js

@@ -325,15 +325,30 @@ class PHPGenerator {
 
   extractTypeName(typeNode) {
     if (!typeNode) return ''
-    if (typeof typeNode === 'string') return this.translateKeyword(typeNode)
+    if (typeof typeNode === 'string') {
+      const translated = this.translateKeyword(typeNode)
+      return this.prefixGlobalClass(translated)
+    }
     if (typeNode.type === 'TypeHint') {
-      const types = (typeNode.types || []).map(t => this.translateKeyword(t))
+      const types = (typeNode.types || []).map(t => {
+        const translated = this.translateKeyword(t)
+        return this.prefixGlobalClass(translated)
+      })
       const result = types.join('|')
       return typeNode.nullable ? '?' + result : result
     }
-    if (typeNode.name) return this.translateKeyword(typeNode.name)
-    if (typeNode.type === 'Identifier') return this.translateKeyword(typeNode.name || typeNode.value || '')
-    if (typeNode.value) return this.translateKeyword(typeNode.value)
+    if (typeNode.name) {
+      const translated = this.translateKeyword(typeNode.name)
+      return this.prefixGlobalClass(translated)
+    }
+    if (typeNode.type === 'Identifier') {
+      const translated = this.translateKeyword(typeNode.name || typeNode.value || '')
+      return this.prefixGlobalClass(translated)
+    }
+    if (typeNode.value) {
+      const translated = this.translateKeyword(typeNode.value)
+      return this.prefixGlobalClass(translated)
+    }
     return ''
   }
 
@@ -664,7 +679,7 @@ class PHPGenerator {
   generateClassMember(node) {
     if (!node) return
 
-    if (node.type === 'UseTraitStatement') {
+    if (node.type === 'UseTraitStatement' || node.type === 'TraitUse') {
       this.writeLine(`use ${node.traits.join(', ')};`)
       return
     }
@@ -923,9 +938,9 @@ class PHPGenerator {
     const catches = node.catches || (node.handler ? [node.handler] : [])
     for (const catchClause of catches) {
       const types = catchClause.types || []
-      const exceptionType = types.length > 0 
-        ? types.join('|') 
-        : (catchClause.exceptionType || catchClause.type || 'Exception')
+      let exceptionType = types.length > 0 
+        ? types.map(t => this.prefixGlobalClass(t)).join('|') 
+        : this.prefixGlobalClass(catchClause.exceptionType || catchClause.type || 'Exception')
       const param = catchClause.param 
         ? this.generateVariable(catchClause.param) 
         : '$e'
@@ -947,6 +962,31 @@ class PHPGenerator {
     return ''
   }
 
+  prefixGlobalClass(name) {
+    const phpGlobalClasses = [
+      'Exception', 'Error', 'TypeError', 'ValueError', 'ArgumentCountError',
+      'ArithmeticError', 'DivisionByZeroError', 'ParseError', 'AssertionError',
+      'CompileError', 'UnhandledMatchError', 'FiberError',
+      'ErrorException', 'BadFunctionCallException', 'BadMethodCallException',
+      'DomainException', 'InvalidArgumentException', 'LengthException',
+      'LogicException', 'OutOfBoundsException', 'OutOfRangeException',
+      'OverflowException', 'RangeException', 'RuntimeException',
+      'UnderflowException', 'UnexpectedValueException',
+      'PDOException', 'JsonException', 'IntlException',
+      'Generator', 'Iterator', 'IteratorAggregate', 'Traversable',
+      'ArrayAccess', 'Countable', 'Serializable', 'Stringable',
+      'DateTime', 'DateTimeImmutable', 'DateTimeInterface', 'DateInterval', 'DatePeriod',
+      'PDO', 'PDOStatement', 'Closure', 'stdClass', 'WeakReference', 'WeakMap',
+      'SplFileInfo', 'SplFileObject', 'SplTempFileObject',
+      'ArrayObject', 'ArrayIterator', 'RecursiveArrayIterator',
+      'Fiber', 'ReflectionClass', 'ReflectionMethod', 'ReflectionProperty'
+    ]
+    if (phpGlobalClasses.includes(name) && !name.startsWith('\\')) {
+      return '\\' + name
+    }
+    return name
+  }
+
   generateReturnStatement(node) {
     if (node.argument) {
       const arg = this.generateNode(node.argument)
@@ -1241,9 +1281,9 @@ class PHPGenerator {
   generateNewExpression(node) {
     let callee
     if (typeof node.callee === 'string') {
-      callee = node.callee
+      callee = this.prefixGlobalClass(node.callee)
     } else if (node.callee.type === 'Identifier') {
-      callee = node.callee.name
+      callee = this.prefixGlobalClass(node.callee.name)
     } else {
       callee = this.generateNode(node.callee)
     }

package/package.json

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