ether-code 0.9.9 → 0.10.0

package/cli/ether.js

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

package/generators/html-generator.js

@@ -660,25 +660,28 @@ class HTMLGenerator {
     this.indent++
 
     if (isRawContent) {
-      let rawContent = ''
       for (const child of children) {
-        if (typeof child === 'string') {
-          rawContent += child
+        if (child.type === 'EtherCSS') {
+          this.generateEtherCSS(child)
+        } else if (child.type === 'EtherJS') {
+          this.generateEtherJS(child)
+        } else if (typeof child === 'string') {
+          const generatedCode = this.compileEmbeddedCode(child.trim(), tag.toLowerCase())
+          const lines = generatedCode.split('\n')
+          for (const line of lines) {
+            this.writeLine(line)
+          }
         } else if (child.type === 'Text' || child.type === 'text') {
           const content = child.content || child.text || child.value || ''
           if (content.trim()) {
-            rawContent += content
+            const generatedCode = this.compileEmbeddedCode(content.trim(), tag.toLowerCase())
+            const lines = generatedCode.split('\n')
+            for (const line of lines) {
+              this.writeLine(line)
+            }
           }
         }
       }
-      
-      if (rawContent.trim()) {
-        const generatedCode = this.compileEmbeddedCode(rawContent.trim(), tag.toLowerCase())
-        const lines = generatedCode.split('\n')
-        for (const line of lines) {
-          this.writeLine(line)
-        }
-      }
     } else {
       for (const child of children) {
         if (typeof child === 'string') {
@@ -1080,14 +1083,14 @@ class HTMLGenerator {
     if (!node.source) return
     
     try {
-      const { EtherParserCSS } = require('./ether-parser-css')
+      const { EtherParserCSS } = require('../parsers/ether-parser-css')
       const { CSSGenerator } = require('./css-generator')
       
       const cssParser = new EtherParserCSS()
       const cssAst = cssParser.parse(node.source)
       
       const cssGenerator = new CSSGenerator()
-      cssGenerator.loadI18n('./i18n-css.json')
+      cssGenerator.loadI18n('../i18n/i18n-css.json')
       const cssOutput = cssGenerator.generate(cssAst)
       
       if (cssOutput) {
@@ -1106,14 +1109,14 @@ class HTMLGenerator {
     if (!node.source) return
     
     try {
-      const { EtherParserJS } = require('./ether-parser-js')
+      const { EtherParserJS } = require('../parsers/ether-parser-js')
       const { JSGenerator } = require('./js-generator')
       
       const jsParser = new EtherParserJS()
       const jsAst = jsParser.parse(node.source)
       
       const jsGenerator = new JSGenerator()
-      jsGenerator.loadI18n('./i18n-js.json')
+      jsGenerator.loadI18n('../i18n/i18n-js.json')
       const jsOutput = jsGenerator.generate(jsAst)
       
       if (jsOutput) {

package/package.json

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

package/parsers/ether-parser-base.js

@@ -1,5 +1,5 @@
 const fs = require('fs')
-const { EtherLexer, Token, TokenType } = require('../lexer/ether-lexer')
+const { EtherLexer, Token, TokenType } = require('./ether-lexer')
 
 class EtherParserBase {
   constructor(options = {}) {