ether-code 0.1.7 → 0.1.8

package/cli/compiler.js

@@ -2,6 +2,7 @@ const fs = require('fs')
 const path = require('path')
 
 const { EtherLexer } = require('../lexer/ether-lexer')
+const { EtherParser } = require('../ether-parser')
 
 const { CSSGenerator } = require('../generators/css-generator')
 const { HTMLGenerator } = require('../generators/html-generator')
@@ -67,9 +68,10 @@ class EtherCompiler {
     
     this.lexer = new EtherLexer()
     this.generators = {}
-    this.parsers = {}
+    this.parser = null
     
     this.initGenerators()
+    this.initParser()
   }
 
   initGenerators() {
@@ -86,6 +88,11 @@ class EtherCompiler {
     }
   }
 
+  initParser() {
+    const i18nDir = path.join(__dirname, '..', 'i18n')
+    this.parser = new EtherParser(i18nDir)
+  }
+
   normalizeTarget(target) {
     const mappings = {
       javascript: 'js',
@@ -127,58 +134,7 @@ class EtherCompiler {
 
   parse(content, target) {
     const normalizedTarget = this.normalizeTarget(target)
-    
-    if (normalizedTarget === 'html') {
-      return this.parseHTML(content)
-    }
-    
-    const lexer = new EtherLexer(content)
-    const tokens = lexer.tokenize()
-    
-    try {
-      const ParserClass = this.loadParser(normalizedTarget)
-      if (ParserClass) {
-        const parser = new ParserClass(tokens, this.config)
-        return parser.parse()
-      }
-    } catch (err) {
-    }
-    
-    return this.buildGenericAST(tokens, target)
-  }
-
-  parseHTML(content) {
-    const { HTMLParser } = require('../parsers/html-parser')
-    const i18nPath = path.join(__dirname, '..', 'i18n', 'i18n-html.json')
-    const parser = new HTMLParser(i18nPath)
-    return parser.parse(content)
-  }
-
-  loadParser(target) {
-    try {
-      const parserPath = path.join(__dirname, '..', 'parsers', `${target}-parser.js`)
-      if (fs.existsSync(parserPath)) {
-        const module = require(parserPath)
-        const className = `${target.charAt(0).toUpperCase()}${target.slice(1)}Parser`
-        return module[className] || module.default || Object.values(module)[0]
-      }
-    } catch (err) {
-    }
-    return null
-  }
-
-  buildGenericAST(tokens, target) {
-    return {
-      type: 'Program',
-      target,
-      body: tokens.map(token => ({
-        type: 'Token',
-        tokenType: token.type,
-        value: token.value,
-        line: token.line,
-        column: token.column
-      }))
-    }
+    return this.parser.parse(content, normalizedTarget)
   }
 
   generate(ast, target) {

package/cli/ether.js

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

package/package.json

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