ether-code 0.7.6 → 0.7.8

package/cli/compiler.js

@@ -2,7 +2,7 @@ const fs = require('fs')
 const path = require('path')
 
 const { EtherLexer } = require('../lexer/ether-lexer')
-const { EtherParser } = require('../ether-parser')
+const { EtherParser } = require('../parsers/ether-parser')
 
 const { CSSGenerator } = require('../generators/css-generator')
 const { HTMLGenerator } = require('../generators/html-generator')

package/cli/ether.js

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

package/ether-compiler.js

@@ -1,7 +1,7 @@
 const fs = require('fs')
 const path = require('path')
 const { EtherLexer, TokenType } = require('./lexer/ether-lexer')
-const { EtherParser } = require('./ether-parser')
+const { EtherParser } = require('./parsers/ether-parser')
 const { CSSGenerator } = require('./generators/css-generator')
 const { HTMLGenerator } = require('./generators/html-generator')
 const { JSGenerator } = require('./generators/js-generator')

package/generators/js-generator.js

@@ -1120,8 +1120,9 @@ class JSGenerator {
   }
 
   generateClassDeclaration(node) {
-    const name = node.id ? (node.id.name || node.id) : ''
-    const extend = node.superClass ? ` extends ${this.generateNode(node.superClass)}` : ''
+    const name = node.name || node.id?.name || node.id || ''
+    const superClass = node.extends || node.superClass
+    const extend = superClass ? ` extends ${typeof superClass === 'string' ? superClass : this.generateNode(superClass)}` : ''
 
     this.writeLine(`class ${name}${extend} {`)
     this.indent++

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ether-code",
-  "version": "0.7.6",
+  "version": "0.7.8",
   "description": "Ether - Le langage intentionnel",
   "main": "cli/compiler.js",
   "bin": {
@@ -38,7 +38,7 @@
     "generators/",
     "lexer/",
     "i18n/",
-    "ether-parser.js",
+    "parsers/ether-parser.js",
     "ether-compiler.js",
     "README.md",
     "LICENSE"

package/parsers/ether-parser.js

@@ -0,0 +1,145 @@
+const { EtherLexer, TokenType } = require('../lexer/ether-lexer')
+const { EtherParserJS } = require('./ether-parser-js')
+const { EtherParserCSS } = require('./ether-parser-css')
+const { EtherParserHTML } = require('./ether-parser-html')
+const { EtherParserSQL } = require('./ether-parser-sql')
+const { EtherParserGraphQL } = require('./ether-parser-graphql')
+
+class EtherParser {
+  constructor(options = {}) {
+    this.options = options
+    this.targetLang = options.targetLang || 'auto'
+    
+    this.parsers = {
+      js: null,
+      ts: null,
+      react: null,
+      node: null,
+      php: null,
+      css: null,
+      html: null,
+      sql: null,
+      graphql: null,
+      python: null,
+      ruby: null
+    }
+  }
+
+  getParser(lang) {
+    if (!this.parsers[lang]) {
+      switch (lang) {
+        case 'js':
+        case 'ts':
+        case 'react':
+        case 'node':
+        case 'php':
+        case 'python':
+        case 'ruby':
+          this.parsers[lang] = new EtherParserJS(this.options)
+          break
+        case 'css':
+          this.parsers[lang] = new EtherParserCSS(this.options)
+          break
+        case 'html':
+          this.parsers[lang] = new EtherParserHTML(this.options)
+          break
+        case 'sql':
+          this.parsers[lang] = new EtherParserSQL(this.options)
+          break
+        case 'graphql':
+          this.parsers[lang] = new EtherParserGraphQL(this.options)
+          break
+        default:
+          this.parsers[lang] = new EtherParserJS(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()
+      const langMap = {
+        'js': 'js', 'javascript': 'js',
+        'css': 'css', 'style': 'css',
+        'html': 'html', 'page': 'html',
+        'ts': 'ts', 'typescript': 'ts',
+        'react': 'react', 'jsx': 'react',
+        'php': 'php',
+        'python': 'python', 'py': 'python',
+        'ruby': 'ruby', 'rb': 'ruby',
+        'sql': 'sql',
+        'node': 'node', 'nodejs': 'node',
+        'graphql': 'graphql', 'gql': 'graphql'
+      }
+      if (langMap[target]) {
+        return langMap[target]
+      }
+    }
+    
+    if (/^\s*(document|page|<!doctype|<html|tete|corps|entete|navigation|section|article)/m.test(lower)) {
+      return 'html'
+    }
+    
+    if (/^\s*(\.|#|@media|@keyframes|corps|html|body|fond|marge|remplissage|largeur|hauteur)/m.test(lower)) {
+      if (!/fonction|si\s|pour\s|tant que/.test(lower)) {
+        return 'css'
+      }
+    }
+    
+    if (/^\s*(composant|etat|effet|memo|contexte|utiliser\s+(etat|effet|memo)|retourner\s*\(?\s*<)/m.test(lower)) {
+      return 'react'
+    }
+    
+    if (/<[a-z]+|jsx|tsx/i.test(lower) && /fonction|composant/.test(lower)) {
+      return 'react'
+    }
+    
+    if (/^\s*(creer table|inserer|selectionner|mettre a jour|supprimer|table|base de donnees)/m.test(lower)) {
+      return 'sql'
+    }
+    
+    if (/^\s*(type|interface|enum|generique|<[A-Z]\w*>)/m.test(lower)) {
+      return 'ts'
+    }
+    
+    if (/^\s*(schema|type\s+\w+\s*{|query|mutation|subscription|input\s+\w+)/m.test(lower)) {
+      return 'graphql'
+    }
+    
+    if (/^\s*(<\?php|\$\w+|echo|inclure|require)/m.test(lower)) {
+      return 'php'
+    }
+    
+    if (/^\s*(def\s+\w+|classe\s+\w+|importer\s|de\s+\w+\s+importer)/m.test(lower) && !/fin\s*$|faire\s*$/m.test(lower)) {
+      return 'python'
+    }
+    
+    if (/^\s*(classe\s+\w+|def\s+\w+|fin\s*$|faire\s*$|module\s+\w+)/m.test(lower)) {
+      return 'ruby'
+    }
+    
+    if (/^\s*(const\s+\w+\s*=\s*require|module\.exports|exporter\s+defaut)/m.test(lower)) {
+      return 'node'
+    }
+    
+    if (/fonction|variable|constante|si\s|pour\s|tant que|retourner/.test(lower)) {
+      return 'js'
+    }
+    
+    return 'js'
+  }
+
+  parse(source, targetLang = null) {
+    const detectedLang = targetLang || this.targetLang
+    const lang = detectedLang === 'auto' ? this.detectTargetLanguage(source) : detectedLang
+    
+    const parser = this.getParser(lang)
+    return parser.parse(source, lang)
+  }
+}
+
+module.exports = { EtherParser, TokenType }