ether-code 0.8.2 → 0.8.3

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.3'
 
 const COLORS = {
   reset: '\x1b[0m',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ether-code",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "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))
@@ -736,7 +742,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 +1053,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 +1132,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 +1224,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 +1378,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 +1390,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 +1638,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 +1651,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 +1765,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 +2215,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 +2229,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 +2291,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 }