ether-code 0.8.2 → 0.8.4

package/cli/ether.js

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

package/generators/php-generator.js

@@ -101,6 +101,8 @@ class PHPGenerator {
 
     const generators = {
       'Program': () => this.generateProgram(node),
+      'DeclareStatement': () => this.generateDeclareStatement(node),
+      'NamespaceDeclaration': () => this.generateNamespaceDeclaration(node),
       'FunctionDeclaration': () => this.generateFunctionDeclaration(node),
       'ClassDeclaration': () => this.generateClassDeclaration(node),
       'InterfaceDeclaration': () => this.generateInterfaceDeclaration(node),
@@ -110,6 +112,7 @@ class PHPGenerator {
       'PropertyDeclaration': () => this.generatePropertyDeclaration(node),
       'VariableDeclaration': () => this.generateVariableDeclaration(node),
       'ConstantDeclaration': () => this.generateConstantDeclaration(node),
+      'DefineDeclaration': () => this.generateDefineDeclaration(node),
       'IfStatement': () => this.generateIfStatement(node),
       'ForStatement': () => this.generateForStatement(node),
       'ForEachStatement': () => this.generateForEachStatement(node),
@@ -176,6 +179,33 @@ class PHPGenerator {
     }
   }
 
+  generateDeclareStatement(node) {
+    const directives = (node.directives || []).map(d => {
+      const name = this.safeString(d.name)
+      const value = this.generateNode(d.value)
+      return `${name}=${value}`
+    }).join(', ')
+    
+    this.writeLine(`declare(${directives});`)
+    this.writeLine('')
+  }
+
+  generateNamespaceDeclaration(node) {
+    const name = this.safeString(node.name)
+    this.writeLine(`namespace ${name};`)
+    this.writeLine('')
+    
+    if (node.body) {
+      this.generateNode(node.body)
+    }
+  }
+
+  generateDefineDeclaration(node) {
+    const name = this.safeString(node.name)
+    const value = this.generateNode(node.value)
+    this.writeLine(`define('${name}', ${value});`)
+  }
+
   generateFunctionDeclaration(node) {
     const name = this.safeString(node.name || node.id?.name || 'anonymous')
     const translatedName = this.translate(name)
@@ -465,7 +495,7 @@ class PHPGenerator {
   generateVariableDeclaration(node) {
     for (const decl of node.declarations || [node]) {
       const name = this.safeString(decl.name || decl.id?.name || decl.id)
-      const varName = '$' + this.translate(name)
+      const varName = '$' + name
       
       if (decl.init !== undefined) {
         const value = this.generateNode(decl.init)
@@ -640,7 +670,8 @@ class PHPGenerator {
   }
 
   generateEchoStatement(node) {
-    const args = (node.arguments || [node.argument]).filter(Boolean).map(a => this.generateNode(a)).join(', ')
+    const exprs = node.expressions || node.arguments || [node.argument]
+    const args = exprs.filter(Boolean).map(a => this.generateNode(a)).join(', ')
     this.writeLine(`echo ${args};`)
   }
 
@@ -656,10 +687,19 @@ class PHPGenerator {
   }
 
   generateUseStatement(node) {
-    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};`)
+    const typePrefix = node.useType === 'function' ? 'function ' : (node.useType === 'const' ? 'const ' : '')
+    
+    if (node.imports && node.imports.length > 0) {
+      for (const imp of node.imports) {
+        const path = this.safeString(imp.path)
+        const alias = imp.alias ? ' as ' + imp.alias : ''
+        this.writeLine(`use ${typePrefix}${path}${alias};`)
+      }
+    } else {
+      const name = this.safeString(node.name || node.source)
+      const alias = node.alias ? ' as ' + node.alias : ''
+      this.writeLine(`use ${typePrefix}${name}${alias};`)
+    }
   }
 
   generateIncludeStatement(node) {
@@ -878,43 +918,41 @@ class PHPGenerator {
     if (!node) return '$var'
     
     const name = this.safeString(node.name || node.id?.name || node)
-    const translated = this.translate(name)
-    const translatedStr = String(translated)
+    const nameStr = String(name)
     
-    if (translatedStr.startsWith('$')) return translatedStr
-    return '$' + translatedStr
+    if (nameStr.startsWith('$')) return nameStr
+    return '$' + nameStr
   }
 
   generateIdentifier(node) {
     if (!node) return '$var'
     
     const name = this.safeString(node.name || node.id?.name || node)
-    const translated = this.translate(name)
-    const translatedStr = String(translated)
+    const nameStr = String(name)
     
-    if (translatedStr.startsWith('$')) return translatedStr
+    if (nameStr.startsWith('$')) return nameStr
     
     const keywords = [
       'true', 'false', 'null', 
       'self', 'parent', 'static',
       'this', '$this'
     ]
-    if (keywords.includes(translatedStr.toLowerCase())) {
-      if (translatedStr.toLowerCase() === 'this') return '$this'
-      return translatedStr
+    if (keywords.includes(nameStr.toLowerCase())) {
+      if (nameStr.toLowerCase() === 'this') return '$this'
+      return nameStr
     }
     
-    if (/^[A-Z]/.test(translatedStr)) return translatedStr
+    if (/^[A-Z]/.test(nameStr)) return nameStr
     
-    if (translatedStr.includes('(') || translatedStr.includes('::')) return translatedStr
+    if (nameStr.includes('(') || nameStr.includes('::')) return nameStr
     
     const superglobals = ['_GET', '_POST', '_SERVER', '_SESSION', '_COOKIE', '_FILES', '_REQUEST', '_ENV', 'GLOBALS']
-    const upper = translatedStr.toUpperCase()
-    if (superglobals.includes(translatedStr) || superglobals.includes(upper)) {
+    const upper = nameStr.toUpperCase()
+    if (superglobals.includes(nameStr) || superglobals.includes(upper)) {
       return '$' + upper
     }
     
-    return '$' + translatedStr
+    return '$' + nameStr
   }
 
   generateLiteral(node) {

package/package.json

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

package/parsers/ether-parser-php.js

@@ -226,6 +226,12 @@ class EtherParserPHP extends EtherParserBase {
     this.phpModifiers = ['statique', 'static', 'final', 'finale', 'abstrait', 'abstraite', 'abstract', 'readonly', 'lecture seule']
   }
 
+  safeStr(val) {
+    if (typeof val === 'string') return val
+    if (val && typeof val === 'object') return String(val.name || val.value || '')
+    return String(val || '')
+  }
+
   translatePHP(word) {
     if (!word) return word
     const lower = this.normalizeAccents(String(word))
@@ -272,6 +278,10 @@ class EtherParserPHP extends EtherParserBase {
 
     const value = token.value != null ? this.normalizeAccents(String(token.value).toLowerCase()) : ''
 
+    if (this.isDeclare(value)) {
+      return this.parseDeclare(lang)
+    }
+
     if (this.isNamespace(value)) {
       return this.parseNamespace(lang)
     }
@@ -365,7 +375,17 @@ class EtherParserPHP extends EtherParserBase {
   }
 
   isNamespace(value) {
-    return ['namespace', 'espace de noms'].includes(value)
+    if (value === 'namespace') return true
+    if (value === 'espace') {
+      const next1 = this.peek(1)
+      const next2 = this.peek(2)
+      if (next1 && next2) {
+        const val1 = this.normalizeAccents(String(next1.value).toLowerCase())
+        const val2 = this.normalizeAccents(String(next2.value).toLowerCase())
+        if (val1 === 'de' && val2 === 'noms') return true
+      }
+    }
+    return false
   }
 
   isUse(value) {
@@ -463,8 +483,54 @@ class EtherParserPHP extends EtherParserBase {
     return value === 'match'
   }
 
-  parseNamespace(lang) {
+  isDeclare(value) {
+    return ['declare', 'declarer', 'déclarer'].includes(value)
+  }
+
+  parseDeclare(lang) {
     this.advance()
+    
+    const directives = []
+    
+    if (this.match(TokenType.LPAREN)) {
+      do {
+        const nameToken = this.current()
+        const name = nameToken ? this.safeStr(nameToken.value) : ''
+        this.advance()
+        
+        this.match(TokenType.EQUALS)
+        
+        const value = this.parseExpression(lang)
+        directives.push({ name, value })
+      } while (this.match(TokenType.COMMA))
+      
+      this.match(TokenType.RPAREN)
+    } else {
+      const nameToken = this.current()
+      const name = nameToken ? this.safeStr(nameToken.value) : ''
+      this.advance()
+      
+      this.match(TokenType.EQUALS)
+      
+      const value = this.parseExpression(lang)
+      directives.push({ name, value })
+    }
+    
+    return {
+      type: 'DeclareStatement',
+      directives: directives
+    }
+  }
+
+  parseNamespace(lang) {
+    const first = this.advance()
+    const firstVal = this.normalizeAccents(String(first.value).toLowerCase())
+    
+    if (firstVal === 'espace') {
+      this.advance()
+      this.advance()
+    }
+    
     const name = this.parseNamespacePath(lang)
     this.skipNewlines()
     
@@ -736,7 +802,7 @@ class EtherParserPHP extends EtherParserBase {
     }
 
     const nameToken = this.current()
-    let name = nameToken ? nameToken.value : 'property'
+    let name = this.safeStr(nameToken ? nameToken.value : 'property')
     
     if (name.startsWith('$')) {
       name = name.substring(1)
@@ -1047,7 +1113,7 @@ class EtherParserPHP extends EtherParserBase {
       }
       
       const varToken = this.current()
-      let varName = varToken ? varToken.value : ''
+      let varName = this.safeStr(varToken ? varToken.value : '')
       if (varName.startsWith('$')) {
         varName = varName.substring(1)
       }
@@ -1126,7 +1192,7 @@ class EtherParserPHP extends EtherParserBase {
     const nameToken = this.current()
     if (!nameToken) return null
     
-    let name = nameToken.value
+    let name = this.safeStr(nameToken.value)
     if (name.startsWith('$')) {
       name = name.substring(1)
     }
@@ -1218,7 +1284,7 @@ class EtherParserPHP extends EtherParserBase {
     }
 
     const nameToken = this.current()
-    let name = nameToken ? nameToken.value : 'variable'
+    let name = this.safeStr(nameToken ? nameToken.value : 'variable')
     if (name.startsWith('$')) {
       name = name.substring(1)
     }
@@ -1372,7 +1438,7 @@ class EtherParserPHP extends EtherParserBase {
       }
 
       const firstVar = this.current()
-      let firstName = firstVar ? firstVar.value : 'item'
+      let firstName = this.safeStr(firstVar ? firstVar.value : 'item')
       if (firstName.startsWith('$')) firstName = firstName.substring(1)
       this.advance()
 
@@ -1384,7 +1450,7 @@ class EtherParserPHP extends EtherParserBase {
         }
         
         const valueVar = this.current()
-        value = valueVar ? valueVar.value : 'value'
+        let value = this.safeStr(valueVar ? valueVar.value : 'value')
         if (value.startsWith('$')) value = value.substring(1)
         this.advance()
       } else {
@@ -1632,7 +1698,7 @@ class EtherParserPHP extends EtherParserBase {
         do {
           const typeToken = this.current()
           if (typeToken && typeToken.type === TokenType.IDENTIFIER) {
-            const typeName = typeToken.value
+            const typeName = this.safeStr(typeToken.value)
             if (typeName.startsWith('$')) {
               param = typeName.substring(1)
             } else {
@@ -1645,7 +1711,7 @@ class EtherParserPHP extends EtherParserBase {
         if (!param) {
           const paramToken = this.current()
           if (paramToken && paramToken.type === TokenType.IDENTIFIER) {
-            param = paramToken.value
+            param = this.safeStr(paramToken.value)
             if (param.startsWith('$')) param = param.substring(1)
             this.advance()
           }
@@ -1759,7 +1825,7 @@ class EtherParserPHP extends EtherParserBase {
     const variables = []
     do {
       const varToken = this.current()
-      let varName = varToken ? varToken.value : ''
+      let varName = this.safeStr(varToken ? varToken.value : '')
       if (varName.startsWith('$')) varName = varName.substring(1)
       this.advance()
       variables.push(varName)
@@ -2209,11 +2275,11 @@ class EtherParserPHP extends EtherParserBase {
 
     if (token.type === TokenType.STRING) {
       this.advance()
-      let value = token.value
+      let value = this.safeStr(token.value)
       if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
         value = value.slice(1, -1)
       }
-      const isDouble = token.value.startsWith('"')
+      const isDouble = value.startsWith('"') || this.safeStr(token.value).startsWith('"')
       return { type: 'StringLiteral', value, doubleQuoted: isDouble }
     }
 
@@ -2223,7 +2289,7 @@ class EtherParserPHP extends EtherParserBase {
     }
 
     if (token.type === TokenType.IDENTIFIER) {
-      const value = token.value
+      const value = this.safeStr(token.value)
       const valueLower = this.normalizeAccents(value.toLowerCase())
 
       if (valueLower === 'vrai' || valueLower === 'true') {
@@ -2285,7 +2351,7 @@ class EtherParserPHP extends EtherParserBase {
 
     if (token.type === TokenType.VARIABLE) {
       this.advance()
-      let name = token.value
+      let name = this.safeStr(token.value)
       if (name.startsWith('$')) name = name.substring(1)
       return { type: 'Variable', name }
     }

package/parsers/ether-parser.js

@@ -30,13 +30,23 @@ class EtherParser {
     if (!this.parsers[lang]) {
       switch (lang) {
         case 'js':
+          this.parsers[lang] = new EtherParserJS(this.options)
+          break
         case 'ts':
+          this.parsers[lang] = new EtherParserJS(this.options)
+          break
         case 'react':
+          this.parsers[lang] = new EtherParserJS(this.options)
+          break
         case 'node':
+          this.parsers[lang] = new EtherParserJS(this.options)
+          break
         case 'php':
           this.parsers[lang] = new EtherParserPHP(this.options)
           break
         case 'python':
+          this.parsers[lang] = new EtherParserJS(this.options)
+          break
         case 'ruby':
           this.parsers[lang] = new EtherParserJS(this.options)
           break
@@ -53,15 +63,13 @@ class EtherParser {
           this.parsers[lang] = new EtherParserGraphQL(this.options)
           break
         default:
-          this.parsers[lang] = new EtherParserJS(this.options)
+          this.parsers[lang] = new EtherParserHTML(this.options)
       }
     }
     return this.parsers[lang]
   }
 
   detectTargetLanguage(source) {
-    const lower = source.toLowerCase()
-    
     const targetMatch = source.match(/\/\/\s*cible\s*:\s*(\w+)/i)
     if (targetMatch) {
       const target = targetMatch[1].toLowerCase()
@@ -83,6 +91,8 @@ class EtherParser {
       }
     }
     
+    const lower = source.toLowerCase()
+    
     if (/^\s*(document|page|<!doctype|<html|tete|corps|entete|navigation|section|article)/m.test(lower)) {
       return 'html'
     }
@@ -133,7 +143,7 @@ class EtherParser {
       return 'js'
     }
     
-    return 'js'
+    return 'html'
   }
 
   parse(source, targetLang = null) {
@@ -145,4 +155,4 @@ class EtherParser {
   }
 }
 
-module.exports = { EtherParser, TokenType }
+module.exports = { EtherParser, TokenType }