ether-code 0.5.3 → 0.5.4

package/cli/compiler.js

@@ -68,6 +68,7 @@ class EtherCompiler {
     
     this.generators = {}
     this.parser = null
+    this.resolvedIncludes = new Set()
     
     this.initGenerators()
     this.initParser()
@@ -110,10 +111,14 @@ class EtherCompiler {
   compileFile(filePath) {
     const content = fs.readFileSync(filePath, 'utf-8')
     const fileName = path.basename(filePath, '.eth')
+    const basePath = path.dirname(path.resolve(filePath))
     
     const target = this.detectTarget(content, filePath)
     const ast = this.parse(content, target)
-    const code = this.generate(ast, target)
+    
+    const resolvedAst = this.resolveIncludes(ast, basePath, target)
+    
+    const code = this.generate(resolvedAst, target)
     
     const extension = this.getExtension(target)
     const outputPath = fileName + extension
@@ -128,6 +133,86 @@ class EtherCompiler {
     }
   }
 
+  resolveIncludes(ast, basePath, targetLang) {
+    const self = this
+    
+    const visit = (node) => {
+      if (!node || typeof node !== 'object') return node
+      
+      if (node.type === 'Include' && node.path) {
+        let includePath = node.path
+        
+        if (!includePath.endsWith('.eth') && !includePath.endsWith('.ether')) {
+          includePath = includePath.replace(/\.(html|php|js|css)$/i, '.eth')
+          if (!includePath.endsWith('.eth')) {
+            includePath += '.eth'
+          }
+        }
+        
+        const fullPath = path.resolve(basePath, includePath)
+        
+        if (self.resolvedIncludes.has(fullPath)) {
+          console.warn(`Inclusion circulaire détectée: ${fullPath}`)
+          return null
+        }
+        
+        if (!fs.existsSync(fullPath)) {
+          console.warn(`Fichier inclus non trouvé: ${fullPath}`)
+          return {
+            type: 'Comment',
+            content: `Fichier non trouvé: ${node.path}`
+          }
+        }
+        
+        self.resolvedIncludes.add(fullPath)
+        
+        const includeSource = fs.readFileSync(fullPath, 'utf-8')
+        const includeDir = path.dirname(fullPath)
+        
+        const normalizedTarget = self.normalizeTarget(targetLang)
+        const includeAst = self.parser.parse(includeSource, normalizedTarget)
+        
+        const resolvedIncludeAst = self.resolveIncludes(includeAst, includeDir, targetLang)
+        
+        self.resolvedIncludes.delete(fullPath)
+        
+        if (resolvedIncludeAst.children && Array.isArray(resolvedIncludeAst.children)) {
+          return resolvedIncludeAst.children
+        }
+        
+        if (resolvedIncludeAst.body && Array.isArray(resolvedIncludeAst.body)) {
+          return resolvedIncludeAst.body
+        }
+        
+        return resolvedIncludeAst
+      }
+      
+      if (node.children && Array.isArray(node.children)) {
+        node.children = node.children.flatMap(child => {
+          const result = visit(child)
+          if (Array.isArray(result)) {
+            return result
+          }
+          return result ? [result] : []
+        })
+      }
+      
+      if (node.body && Array.isArray(node.body)) {
+        node.body = node.body.flatMap(child => {
+          const result = visit(child)
+          if (Array.isArray(result)) {
+            return result
+          }
+          return result ? [result] : []
+        })
+      }
+      
+      return node
+    }
+    
+    return visit(ast)
+  }
+
   parse(content, target) {
     const normalizedTarget = this.normalizeTarget(target)
     return this.parser.parse(content, normalizedTarget)

package/cli/ether.js

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

package/package.json

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