@aetherframework/template-engine 1.0.2 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aetherframework/template-engine",
-  "version": "1.0.2",
+  "version": "1.0.6",
   "description": "A lightweight, high-performance template engine with SSR support and custom syntax",
   "main": "index.js",
   "type": "module",

package/src/core/ModeManager.js

@@ -63,7 +63,6 @@ class ModeManager {
     }
     
     this.currentMode = mode;
-    console.log(`🔄 Mode changed to: ${mode}`);
     return this;
   }
 
@@ -154,7 +153,6 @@ class ModeManager {
     }
     
     this.modes.get(mode).renderer = renderer;
-    console.log(`✅ Renderer registered for mode: ${mode}`);
     return this;
   }
 
@@ -181,7 +179,6 @@ class ModeManager {
       if (this.modes.has(mode)) {
         const modeInfo = this.modes.get(mode);
         modeInfo.adapter = adapter;
-        console.log(`✅ Adapter "${adapter.name}" registered for mode: ${mode}`);
       }
     });
     

package/src/core/TemplateEngineFactory.js

@@ -46,8 +46,6 @@ class TemplateEngineFactory {
     
     // Track initialization state
     this.initialized = false;
-    
-    console.log(`🚀 Template Engine Factory created in ${this.config.mode} mode`);
   }
   
   /**
@@ -65,7 +63,6 @@ class TemplateEngineFactory {
       await this.initializeEngines();
       
       this.initialized = true;
-      console.log(`✅ Template Engine Factory initialized in ${this.config.mode} mode`);
       
       return this;
     } catch (error) {
@@ -83,17 +80,14 @@ class TemplateEngineFactory {
       // Import and register Aether Engine (your custom syntax)
       const { default: AetherEngine } = await import('./../engines/AetherEngine.js');
       this.registerEngine('aether', new AetherEngine(this.config));
-      console.log('✅ Aether engine registered');
       
       // Import and register SSR Mode Engine
       const { default: SSRModeEngine } = await import('./../engines/SSRModeEngine.js');
       this.registerEngine('ssr-mode', new SSRModeEngine(this.config));
-      console.log('✅ SSR Mode engine registered');
       
       // Import and register Template Mode Engine
       const { default: TemplateModeEngine } = await import('./../engines/TemplateModeEngine.js');
       this.registerEngine('template-mode', new TemplateModeEngine(this.config));
-      console.log('✅ Template Mode engine registered');
       
     } catch (error) {
       console.error('❌ Engine initialization failed:', error.message);
@@ -174,7 +168,6 @@ createRenderer(engineName = this.config.defaultEngine, options = {}) {
       if (cacheKey && cacheManager.has(cacheKey)) {
         const cached = cacheManager.get(cacheKey);
         if (Date.now() - cached.timestamp < config.cacheTTL) {
-          console.log(`📦 Cache hit for key: ${cacheKey.substring(0, 50)}...`);
           return cached.html;
         }
       }
@@ -208,7 +201,6 @@ createRenderer(engineName = this.config.defaultEngine, options = {}) {
             engine: engineName,
             renderTime: Date.now() - startTime
           });
-          console.log(`💾 Cached result for key: ${cacheKey.substring(0, 50)}...`);
         }
         
         return html;
@@ -266,7 +258,6 @@ createRenderer(engineName = this.config.defaultEngine, options = {}) {
       throw new Error(`Invalid mode: ${mode}. Must be 'ssr' or 'template'`);
     }
     this.config.mode = mode;
-    console.log(`🔄 Rendering mode changed to: ${mode}`);
     return this;
   }
   
@@ -350,7 +341,6 @@ createRenderer(engineName = this.config.defaultEngine, options = {}) {
   clearAllCaches() {
     this.cacheManager.clear();
     this.registry.clearCaches();
-    console.log('🗑️ All caches cleared');
   }
   
   /**

package/src/engines/AetherEngine.js

@@ -16,91 +16,77 @@ import crypto from 'crypto';
 import CompressionEngine from './CompressionEngine.js';
 
 class AetherEngine {
-constructor(options = {}) {
-  this.name = 'aether';
-  this.version = '1.3.0';
-  this.initialized = false;
-  
-  this.options = {
-    templateDir: options.templateDir || './templates',
-    cacheEnabled: options.cacheEnabled !== false,
-    cacheTTL: options.cacheTTL || 3600,
-    compileCache: new Map(),
-    templateCache: new Map(),
-    debug: options.debug || false,
-    csrfToken: options.csrfToken || '',
+  constructor(options = {}) {
+    this.name = 'aether';
+    this.version = '1.3.0';
+    this.initialized = false;
     
-    // Compression options
-    compressionEnabled: options.compressionEnabled !== false,
-    minifyHTML: options.minifyHTML !== false,
-    minifyCSS: options.minifyCSS !== false,
-    minifyJS: options.minifyJS !== false,
-    mangleJS: options.mangleJS || false,
-    removeComments: options.removeComments || false,
-    collapseWhitespace: options.collapseWhitespace || true,
-    cacheCompressed: options.cacheCompressed !== false,
-    ...options
-  };
-  
-  // Initialize compression engine
-  this.compressionEngine = new CompressionEngine(this.options);
-  
-  this.filters = new Map();
-  this.functions = new Map();
-  this.layouts = new Map();
-  this.routes = {};
-  
-  this.ensureTemplateDir();
-  this.registerDefaultFilters();
-  this.registerDefaultFunctions();
-}
+    this.options = {
+      templateDir: options.templateDir || './templates',
+      cacheEnabled: options.cacheEnabled !== false,
+      cacheTTL: options.cacheTTL || 3600,
+      compileCache: new Map(),
+      templateCache: new Map(),
+      debug: options.debug || false,
+      csrfToken: options.csrfToken || '',
+      
+      // Compression options
+      compressionEnabled: options.compressionEnabled !== false,
+      minifyHTML: options.minifyHTML !== false,
+      minifyCSS: options.minifyCSS !== false,
+      minifyJS: options.minifyJS !== false,
+      mangleJS: options.mangleJS || false,
+      removeComments: options.removeComments || false,
+      collapseWhitespace: options.collapseWhitespace || true,
+      cacheCompressed: options.cacheCompressed !== false,
+      ...options
+    };
+    
+    // Initialize compression engine
+    this.compressionEngine = new CompressionEngine(this.options);
+    
+    this.filters = new Map();
+    this.functions = new Map();
+    this.layouts = new Map();
+    this.routes = {};
+    
+    this.ensureTemplateDir();
+    this.registerDefaultFilters();
+    this.registerDefaultFunctions();
+  }
   
   initialize() {
     if (this.initialized) return;
-    console.log(`Aether Engine initialized (v${this.version})`);
     this.initialized = true;
   }
+
   /**
- * Process content with compression based on options
- * @param {string} content - Content to process
- * @param {Object} options - Processing options
- * @returns {string} Processed content
- */
-processWithCompression(content, options = {}) {
-  if (!this.options.compressionEnabled) {
-    return content;
+   * Process content with compression based on options
+   */
+  processWithCompression(content, options = {}) {
+    if (!this.options.compressionEnabled) return content;
+    
+    const processOptions = {
+      minifyHTML: this.options.minifyHTML,
+      minifyCSS: this.options.minifyCSS,
+      minifyJS: this.options.minifyJS,
+      mangleJS: this.options.mangleJS,
+      removeComments: this.options.removeComments,
+      collapseWhitespace: this.options.collapseWhitespace,
+      cacheCompressed: this.options.cacheCompressed,
+      ...options
+    };
+    
+    return this.compressionEngine.processHTML(content, processOptions);
   }
-  
-  const processOptions = {
-    minifyHTML: this.options.minifyHTML,
-    minifyCSS: this.options.minifyCSS,
-    minifyJS: this.options.minifyJS,
-    mangleJS: this.options.mangleJS,
-    removeComments: this.options.removeComments,
-    collapseWhitespace: this.options.collapseWhitespace,
-    cacheCompressed: this.options.cacheCompressed,
-    ...options
-  };
-  
-  return this.compressionEngine.processHTML(content, processOptions);
-}
 
-/**
- * Clear compression cache
- */
-clearCompressionCache() {
-  if (this.compressionEngine) {
-    this.compressionEngine.clearCompressionCache();
+  clearCompressionCache() {
+    if (this.compressionEngine) this.compressionEngine.clearCompressionCache();
   }
-}
 
-/**
- * Get compression statistics
- * @returns {Object} Compression statistics
- */
-getCompressionStats() {
-  return this.compressionEngine ? this.compressionEngine.getStats() : null;
-}
+  getCompressionStats() {
+    return this.compressionEngine ? this.compressionEngine.getStats() : null;
+  }
 
   ensureTemplateDir() {
     const dirs = [
@@ -144,9 +130,7 @@ getCompressionStats() {
     });
 
     this.function('class', (classes) => {
-      if (Array.isArray(classes)) {
-        return classes.filter(c => typeof c === 'string').join(' ');
-      }
+      if (Array.isArray(classes)) return classes.filter(c => typeof c === 'string').join(' ');
       return '';
     });
 
@@ -368,12 +352,10 @@ getCompressionStats() {
           inSectionBlock = false; currentSectionName = ''; sectionContent = '';
         }
       }
-      // FIX: Enhance @include syntax to support passing data parameters
       else if (token.startsWith('@include')) {
         const includeMatch = token.match(/@include\s*\(\s*'([^']+)'\s*(?:,\s*([\s\S]*?))?\s*\)/);
         if (includeMatch) {
           const viewName = includeMatch[1];
-          // Default to empty object if no params; otherwise evaluate as JS expression
           const dataExpr = includeMatch[2] ? includeMatch[2].trim() : '{}';
           
           if (inSectionBlock) sectionContent += token;
@@ -422,17 +404,22 @@ getCompressionStats() {
         return value;
       }
       
-      // FIX: Fully implement __include to support synchronous loading, compiling, and rendering of sub-templates from disk
+      // [CRITICAL FIX] Preserve prototype chain to prevent losing root data variables (like langUrls, t, etc.)
+      // Object.assign only copies own enumerable properties, ignoring the prototype chain where 
+      // the original 'data' object properties reside.
       function __include(name, includeData = {}) {
-        // 1. Merge current scope with passed include data
-        const mergedScope = Object.assign({}, __scope, includeData);
+        // 1. Create a new scope that inherits from the current scope's prototype (the original data)
+        const mergedScope = Object.create(Object.getPrototypeOf(__scope));
+        
+        // 2. Copy own properties from current scope (e.g., loop variables) and includeData
+        Object.assign(mergedScope, __scope, includeData);
         
-        // 2. Prioritize pre-compiled includes (passed via render options)
+        // 3. Prioritize pre-compiled includes (passed via render options)
         if (helpers.includes && helpers.includes[name]) {
             return helpers.includes[name](mergedScope, helpers);
         }
         
-        // 3. Synchronously load and compile template from disk
+        // 4. Synchronously load and compile template from disk
         if (helpers.engine) {
             try {
                 const content = helpers.engine.loadTemplateSync(name);
@@ -544,8 +531,6 @@ getCompressionStats() {
     let jsCode = '';
     try {
       jsCode = this.enhancedConvertToJsCode(templateContent);
-      if (this.options.debug) console.log('\n--- Generated JS Code ---\n' + jsCode + '\n-------------------------\n');
-
       const renderFunc = new Function('data', 'helpers', `
         const __output = [];
         const __sections = {};
@@ -567,94 +552,81 @@ getCompressionStats() {
     }
   }
 
- async render(templateName, data = {}, options = {}) {
-  if (!this.initialized) this.initialize();
-  let templateContent = templateName;
-  
-  const isFilePath = typeof templateName === 'string' && !templateName.includes('\n') && !templateName.includes('<') && (templateName.endsWith('.aether') || templateName.endsWith('.html') || templateName.includes('/') || templateName.includes('\\'));
-  if (isFilePath) templateContent = await this.loadTemplate(templateName);
-  
-  // 【修复1】：恢复正确的正则表达式 \(\)
-  const extendsMatch = templateContent.match(/@extends\s*\(\s*'([^']+)'\s*\)/);
-  if (extendsMatch) {
-    // 【修复2】：恢复正确的匹配组索引 [1]
-    const layoutName = extendsMatch[1]; 
-    try {
-      const layoutContent = await this.loadTemplate(layoutName);
-      const sections = {};
-      
-      // 【修复1】：恢复正确的正则表达式
-      const sectionRegex = /@section\s*\(\s*'([^']+)'\s*\)([\s\S]*?)@endsection/g;
-      let sectionMatch;
-      while ((sectionMatch = sectionRegex.exec(templateContent)) !== null) {
-        // 【修复2】：恢复正确的匹配组索引 [1] 和 [2]
-        sections[sectionMatch[1]] = sectionMatch[2].trim(); 
-      }
-      
-      // 【修复1】：恢复正确的正则表达式
-      const inlineSectionRegex = /@section\s*\(\s*'([^']+)'\s*,\s*'([^']*)'\s*\)/g;
-      let inlineMatch;
-      while ((inlineMatch = inlineSectionRegex.exec(templateContent)) !== null) {
-        // 【修复2】：恢复正确的匹配组索引 [1] 和 [2]
-        sections[inlineMatch[1]] = inlineMatch[2]; 
+  async render(templateName, data = {}, options = {}) {
+    if (!this.initialized) this.initialize();
+    let templateContent = templateName;
+    
+    const isFilePath = typeof templateName === 'string' && !templateName.includes('\n') && !templateName.includes('<') && (templateName.endsWith('.aether') || templateName.endsWith('.html') || templateName.includes('/') || templateName.includes('\\'));
+    if (isFilePath) templateContent = await this.loadTemplate(templateName);
+    
+    // [FIX] Correct regex and match groups for layout inheritance
+    const extendsMatch = templateContent.match(/@extends\s*\(\s*'([^']+)'\s*\)/);
+    if (extendsMatch) {
+      const layoutName = extendsMatch[1]; 
+      try {
+        const layoutContent = await this.loadTemplate(layoutName);
+        const sections = {};
+        
+        const sectionRegex = /@section\s*\(\s*'([^']+)'\s*\)([\s\S]*?)@endsection/g;
+        let sectionMatch;
+        while ((sectionMatch = sectionRegex.exec(templateContent)) !== null) {
+          sections[sectionMatch[1]] = sectionMatch[2].trim(); 
+        }
+        
+        const inlineSectionRegex = /@section\s*\(\s*'([^']+)'\s*,\s*'([^']*)'\s*\)/g;
+        let inlineMatch;
+        while ((inlineMatch = inlineSectionRegex.exec(templateContent)) !== null) {
+          sections[inlineMatch[1]] = inlineMatch[2]; 
+        }
+        
+        const yieldRegex = /@yield\s*\(\s*'([^']+)'(?:\s*,\s*'([^']*)')?\s*\)/g;
+        templateContent = layoutContent.replace(yieldRegex, (match, name, defaultValue) => 
+          sections[name] !== undefined ? sections[name] : (defaultValue || '')
+        );
+      } catch (error) { 
+        console.warn(`Warning: Could not load layout '${layoutName}':`, error.message); 
       }
-      
-      // 【修复1】：恢复正确的正则表达式
-      const yieldRegex = /@yield\s*\(\s*'([^']+)'(?:\s*,\s*'([^']*)')?\s*\)/g;
-      templateContent = layoutContent.replace(yieldRegex, (match, name, defaultValue) => 
-        sections[name] !== undefined ? sections[name] : (defaultValue || '')
-      );
-    } catch (error) { 
-      console.warn(`Warning: Could not load layout '${layoutName}':`, error.message); 
     }
-  }
-  
-  const renderFunc = this.compile(templateContent);
-  
-  // 【关键修复】: 保存渲染结果到变量，而不是直接 return，以便后续进行压缩处理
-  const renderedContent = renderFunc(data, { 
-    filters: this.filters, 
-    functions: this.functions, 
-    includes: options.includes || {},
-    engine: this 
-  });
-  
-  // Apply compression if enabled
-  if (this.options.compressionEnabled) {
-    const compressionOptions = {
-      minifyHTML: this.options.minifyHTML,
-      minifyCSS: this.options.minifyCSS,
-      minifyJS: this.options.minifyJS,
-      mangleJS: this.options.mangleJS,
-      removeComments: this.options.removeComments,
-      collapseWhitespace: this.options.collapseWhitespace,
-      removeAttributeQuotes: this.options.removeAttributeQuotes,
-      removeEmptyAttributes: this.options.removeEmptyAttributes,
-      cacheCompressed: this.options.cacheCompressed,
-      ...options.compression // Allow per-render override
-    };
     
-    // Use the compression engine to process the rendered content
-    if (this.compressionEngine) {
-      const compressedContent = this.compressionEngine.processHTML(renderedContent, compressionOptions);
+    const renderFunc = this.compile(templateContent);
+    
+    const renderedContent = renderFunc(data, { 
+      filters: this.filters, 
+      functions: this.functions, 
+      includes: options.includes || {},
+      engine: this 
+    });
+    
+    if (this.options.compressionEnabled) {
+      const compressionOptions = {
+        minifyHTML: this.options.minifyHTML,
+        minifyCSS: this.options.minifyCSS,
+        minifyJS: this.options.minifyJS,
+        mangleJS: this.options.mangleJS,
+        removeComments: this.options.removeComments,
+        collapseWhitespace: this.options.collapseWhitespace,
+        removeAttributeQuotes: this.options.removeAttributeQuotes,
+        removeEmptyAttributes: this.options.removeEmptyAttributes,
+        cacheCompressed: this.options.cacheCompressed,
+        ...options.compression 
+      };
       
-      // Log compression statistics in debug mode
-      if (this.options.debug) {
-        const originalSize = renderedContent.length;
-        const compressedSize = compressedContent.length;
-        const reduction = ((originalSize - compressedSize) / originalSize * 100).toFixed(2);
-        console.log(`[AetherEngine] Compression applied: ${originalSize} → ${compressedSize} bytes (${reduction}% reduction)`);
+      if (this.compressionEngine) {
+        const compressedContent = this.compressionEngine.processHTML(renderedContent, compressionOptions);
+        
+        if (this.options.debug) {
+          const originalSize = renderedContent.length;
+          const compressedSize = compressedContent.length;
+          const reduction = ((originalSize - compressedSize) / originalSize * 100).toFixed(2);
+        }
+        
+        return compressedContent;
       }
-      
-      return compressedContent;
     }
+    
+    return renderedContent;
   }
-  
-  return renderedContent;
-}
-
 
-  // FIX: Extract unified path resolution logic, supporting dot notation (e.g., 'partials.header')
   _getTemplatePaths(templateName) {
     const paths = [
       path.join(this.options.templateDir, 'partials', `${templateName}.aether`),
@@ -665,7 +637,6 @@ getCompressionStats() {
       templateName 
     ];
     
-    // Support dot notation resolution: 'partials.header' -> 'partials/header.aether'
     if (templateName.includes('.')) {
       const dotPath = templateName.replace(/\./g, path.sep) + '.aether';
       paths.unshift(path.join(this.options.templateDir, dotPath));
@@ -688,34 +659,27 @@ getCompressionStats() {
     throw new Error(`Template not found: ${templateName}`);
   }
   
-  // FIX: Add synchronous loading method specifically for runtime @include usage
+  /**
+   * [FIX] Synchronously load template from disk for runtime @include usage
+   */
   loadTemplateSync(templateName) {
     if (this.options.cacheEnabled && this.options.templateCache.has(templateName)) {
-        return this.options.templateCache.get(templateName);
+      return this.options.templateCache.get(templateName);
     }
     
     const possiblePaths = this._getTemplatePaths(templateName);
     for (const templatePath of possiblePaths) {
       try {
-        if (fs.existsSync(templatePath)) {
-            const content = fs.readFileSync(templatePath, 'utf-8');
-            if (this.options.cacheEnabled) this.options.templateCache.set(templateName, content);
-            return content;
-        }
-      } catch (error) {}
+        // Use readFileSync for synchronous loading required by __include
+        const content = fs.readFileSync(templatePath, 'utf-8');
+        if (this.options.cacheEnabled) this.options.templateCache.set(templateName, content);
+        return content;
+      } catch (error) {
+        // Ignore and try next path
+      }
     }
     throw new Error(`Template not found: ${templateName}`);
   }
-  
-  clearCache() { this.options.compileCache.clear(); this.options.templateCache.clear(); }
-  
-  getMetadata() {
-    return {
-      name: this.name, version: this.version, initialized: this.initialized,
-      filters: Array.from(this.filters.keys()), functions: Array.from(this.functions.keys()),
-      layouts: Array.from(this.layouts.keys()), cacheEnabled: this.options.cacheEnabled, templateDir: this.options.templateDir
-    };
-  }
 }
 
 export default AetherEngine;

package/src/engines/TemplateModeEngine.js

@@ -49,7 +49,6 @@ class TemplateModeEngine extends AetherEngine {
     // Load default layout if exists
     await this.loadDefaultLayout();
     
-    console.log(`✅ Template Mode Engine initialized (v${this.version})`);
     this.initialized = true;
     return this;
   }
@@ -66,7 +65,6 @@ class TemplateModeEngine extends AetherEngine {
       if (await fs.pathExists(defaultLayoutPath)) {
         const layoutContent = await fs.readFile(defaultLayoutPath, 'utf-8');
         this.registerLayout('default', layoutContent);
-        console.log('📄 Default layout loaded from file');
       } else {
         // Create default layout based on user's template
         const defaultLayout = `<!DOCTYPE html>
@@ -92,7 +90,6 @@ class TemplateModeEngine extends AetherEngine {
         // Save to file for future use
         await fs.ensureDir(`${this.options.templateDir}/layouts`);
         await fs.writeFile(defaultLayoutPath, defaultLayout, 'utf-8');
-        console.log('📄 Default layout created and saved');
       }
     } catch (error) {
       console.warn('⚠️ Could not load default layout:', error.message);
@@ -269,7 +266,6 @@ class TemplateModeEngine extends AetherEngine {
 
 @section('scripts')
 <script>
-    console.log('${name} page loaded');
     // Add your JavaScript here
 </script>
 @endsection`;