feat: rewrite to support layout and include well

Author: vvenv

.vscode/settings.json

@@ -1,6 +1,11 @@
 {
   "cSpell.words": [
     "elif",
+    "endassign",
+    "endcall",
+    "endcomment",
+    "endmacro",
+    "endwith",
     "groupby",
     "jianjia",
     "liquidjs",
@@ -54,5 +59,8 @@
     "scss",
     "pcss",
     "postcss"
-  ]
+  ],
+  "[javascript]": {
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+  }
 }

README-zh-CN.md

@@ -27,6 +27,7 @@
 const engine = new Engine()
 const { render } = await engine.compile('{{= name }} 苍苍，白露为霜')
 const html = await render({ name: '蒹葭' })
+
 document.body.innerHTML = html
 ```
 

README.md

@@ -27,6 +27,7 @@
 const engine = new Engine()
 const { render } = await engine.compile('Hello, {{= name }}！')
 const html = await render({ name: 'World' })
+
 document.body.innerHTML = html
 ```
 

benchmark/engines/jianjia.js

@@ -6,6 +6,6 @@ export default {
   ext: 'jianjia',
   render: async function (templatePath, data) {
     const template = fs.readFileSync(templatePath, 'utf-8');
-    return (await(await(await new Engine().initialize(template)).parse()).compile()).render(data);
+    return (await new Engine().compile(template)).render(data);
   },
 };

benchmark/readme.md

@@ -2,11 +2,11 @@
 
 | Template \ Engine | ejs | eta | handlebars | jianjia | liquidjs |
 |-------------------|:--------:|:--------:|:--------:|:--------:|:--------:|
-| **friends** | 🟡 1.26 | 🟢 0.18 | 🟡 0.81 | 🟡 1.16 | ⚫ 5.26 |
-| **if-expression** | 🟡 0.06 | 🟢 0.04 | - | 🟠 0.13 | ⚫ 0.23 |
-| **projects-escaped** | 🟡 0.06 | 🟢 0.04 | ⚫ 0.24 | 🟠 0.11 | 🔴 0.21 |
-| **projects-unescaped** | 🟡 0.06 | 🟢 0.04 | ⚫ 0.22 | 🟠 0.11 | ⚫ 0.21 |
-| **search-results** | 🟡 0.18 | 🟢 0.06 | 🟠 0.37 | 🟡 0.23 | ⚫ 0.67 |
-| **simple-0** | 🟢 0.02 | 🟡 0.03 | 🟠 0.06 | 🟡 0.04 | ⚫ 0.11 |
-| **simple-1** | 🟡 0.06 | 🟢 0.04 | ⚫ 0.23 | 🟠 0.13 | 🔴 0.21 |
-| **simple-2** | 🟡 0.05 | 🟢 0.04 | ⚫ 0.22 | 🟠 0.10 | 🔴 0.20 |
+| **friends** | 🟡 0.81 | 🟢 0.14 | 🟡 0.66 | 🟡 0.53 | ⚫ 4.32 |
+| **if-expression** | 🟡 0.05 | 🟢 0.03 | - | 🟡 0.05 | ⚫ 0.16 |
+| **projects-escaped** | 🟡 0.06 | 🟢 0.04 | ⚫ 0.19 | 🟡 0.05 | 🔴 0.15 |
+| **projects-unescaped** | 🟡 0.06 | 🟢 0.05 | ⚫ 0.17 | 🟢 0.05 | 🔴 0.15 |
+| **search-results** | 🟡 0.14 | 🟢 0.05 | 🟠 0.29 | 🟡 0.10 | ⚫ 0.49 |
+| **simple-0** | 🟢 0.02 | 🟢 0.02 | 🟠 0.05 | 🟡 0.03 | ⚫ 0.07 |
+| **simple-1** | 🟡 0.05 | 🟢 0.03 | ⚫ 0.18 | 🟡 0.05 | 🔴 0.15 |
+| **simple-2** | 🟡 0.04 | 🟢 0.03 | ⚫ 0.18 | 🟡 0.05 | 🔴 0.13 |

documentation-zh-CN.md

@@ -8,10 +8,10 @@
 {{ #if condition }}内容{{ elif other }}内容{{ else }}内容{{ /if }}
 ```
 
-### **for / else**：循环遍历
+### **for**：循环遍历
 
 ```jianjia
-{{ #for item in items }}{{ item }}{{ else }}无数据{{ /for }}
+{{ #for item in items }}{{= item }}{{ /for }}
 ```
 
 ### **assign**：变量赋值
@@ -48,27 +48,13 @@
 {{ continue }}
 ```
 
-### **with**：上下文变量赋值
-
-```jianjia
-{{ #with obj }}
-{{= key }}
-{{ /with }}
-```
-
 ### **comment**：注释
 
 ```jianjia
 {{! 这是注释 }}
 {{ #comment }}多行注释{{ /comment }}
 ```
 
-### **raw**：原文输出（不解析内容）
-
-```jianjia
-{{ #raw }}{{ #if x }}foo{{ /if }}{{ /raw }}
-```
-
 ### **expression（=）**：表达式输出
 
 ```jianjia
@@ -99,14 +85,15 @@ const myTag = {
   parse({ ast, base }) {
     // 解析逻辑
     ast.start({ ...base, name: 'my_tag' })
-    ast.end({ ...base, startIndex: base.endIndex, name: 'end_my_tag' })
+    ast.end({ ...base, start: base.end, name: 'end_my_tag' })
   },
   async compile({ template, tag, context, out }, compileContent) {
     // 编译逻辑
     out.pushStr('自定义标签内容')
-  }
+  },
 }
 const engine = new Engine()
+
 engine.registerTags([myTag])
 ```
 
@@ -120,10 +107,11 @@ engine.registerTags([myTag])
 
 ```javascript
 const engine = new Engine()
+
 engine.registerFilters({
   my_filter(value) {
     return `自定义：${value}`
-  }
+  },
 })
 ```
 

documentation.md

@@ -8,10 +8,10 @@
 {{ #if condition }}Content{{ elif other }}Content{{ else }}Content{{ /if }}
 ```
 
-### **for / else**: Looping
+### **for**: Looping
 
 ```jianjia
-{{ #for item in items }}{{ item }}{{ else }}No data{{ /for }}
+{{ #for item in items }}{{= item }}{{ /for }}
 ```
 
 ### **assign**: Variable Assignment
@@ -48,27 +48,13 @@
 {{ continue }}
 ```
 
-### **with**: Contextual Variable Assignment
-
-```jianjia
-{{ #with obj }}
-{{= key }}
-{{ /with }}
-```
-
 ### **comment**: Comments
 
 ```jianjia
 {{! This is a comment }}
 {{ #comment }}Multi-line comment{{ /comment }}
 ```
 
-### **raw**: Raw Output (No Parsing)
-
-```jianjia
-{{ #raw }}{{ #if x }}foo{{ /if }}{{ /raw }}
-```
-
 ### **expression (=)**: Expression Output
 
 ```jianjia
@@ -99,14 +85,15 @@ const myTag = {
   parse({ ast, base }) {
     // Parsing logic
     ast.start({ ...base, name: 'my_tag' })
-    ast.end({ ...base, startIndex: base.endIndex, name: 'end_my_tag' })
+    ast.end({ ...base, start: base.end, name: 'end_my_tag' })
   },
   async compile({ template, tag, context, out }, compileContent) {
     // Compilation logic
     out.pushStr('Custom tag content')
-  }
+  },
 }
 const engine = new Engine()
+
 engine.registerTags([myTag])
 ```
 
@@ -120,10 +107,11 @@ Usage in template:
 
 ```javascript
 const engine = new Engine()
+
 engine.registerFilters({
   my_filter(value) {
     return `Custom: ${value}`
-  }
+  },
 })
 ```
 

eslint.config.mjs

@@ -4,4 +4,11 @@ export default antfu(
   {
     ignores: ['**/benchmark/**', '**/coverage/**', '**/dist/**'],
   },
+  {
+    rules: {
+      'no-cond-assign': 'off',
+      'unicorn/consistent-function-scoping': 'off',
+      'antfu/consistent-chaining': 'error',
+    },
+  },
 )

package.json

@@ -21,10 +21,10 @@
   },
   "devDependencies": {
     "@antfu/eslint-config": "^5.4.1",
-    "@types/node": "^24.5.0",
+    "@types/node": "^24.6.0",
     "eslint": "^9.36.0",
     "husky": "^9.1.7",
-    "oxlint": "^1.15.0",
+    "oxlint": "^1.19.0",
     "typescript": "^5.9.2"
   }
 }

packages/template/package.json

@@ -24,7 +24,7 @@
     "tinyrainbow": "^3.0.3"
   },
   "devDependencies": {
-    "@types/node": "^24.5.0",
+    "@types/node": "^24.6.0",
     "@vitest/coverage-v8": "3.2.4",
     "@vitest/ui": "3.2.4",
     "typescript": "^5.9.2",