Switch to using @ for include, includeFile

eta-dev · Apr 3, 2020 · 6d5b449 · 6d5b449
1 parent 99e92b8
commit 6d5b449
Show file tree

Hide file tree

Showing 19 changed files with 96 additions and 38 deletions.
diff --git a/browser-tests/demo.html b/browser-tests/demo.html
@@ -173,7 +173,7 @@ <h4>Template</h4>
 <% } %>
 <% } %>
 
-This is a partial: <%= E.include("mypartial") %>
+Partial: <% @include("mypartial") %>
 </textarea
         >
       </div>

diff --git a/dist/browser/eta.dev.js b/dist/browser/eta.dev.js
diff --git a/dist/browser/eta.dev.js.map b/dist/browser/eta.dev.js.map
diff --git a/dist/browser/eta.min.js b/dist/browser/eta.min.js
diff --git a/dist/browser/eta.min.js.map b/dist/browser/eta.min.js.map
diff --git a/dist/eta.cjs.js b/dist/eta.cjs.js
diff --git a/dist/eta.cjs.js.map b/dist/eta.cjs.js.map
diff --git a/dist/eta.es.js b/dist/eta.es.js
diff --git a/dist/eta.es.js.map b/dist/eta.es.js.map
diff --git a/dist/types/config.d.ts b/dist/types/config.d.ts
@@ -10,6 +10,7 @@ export interface EtaConfig {
         interpolate: string;
         raw: string;
         exec: string;
+        special: string;
     };
     e: (str: string) => string;
     plugins: Array<{

diff --git a/dist/types/parse.d.ts b/dist/types/parse.d.ts
@@ -1,5 +1,5 @@
 import { EtaConfig } from './config';
-export declare type TagType = 'r' | 'e' | 'i' | '';
+export declare type TagType = 'r' | 'e' | 'i' | 's' | '';
 export interface TemplateObject {
     t: TagType;
     val: string;

diff --git a/examples/basic.ts b/examples/basic.ts
@@ -12,7 +12,7 @@ var template = `
 
 Partial
 -------
-<%=E.include('template1', {name: 'Ben'})%>
+<% @include('template1', {name: 'Ben'})%>
 `
 
 Eta.templates.define('template1', Eta.compile('Hi <%=it.name%>'))

diff --git a/src/compile-string.ts b/src/compile-string.ts
@@ -60,6 +60,9 @@ function compileScope (buff: Array<AstObject>, env: EtaConfig) {
       } else if (type === 'e') {
         // execute
         returnStr += content + '\n' // you need a \n in case you have <% } %>
+      } else if (type === 's') {
+        returnStr += 'tR+=E.' + content + ';'
+        // reference
       }
     }
   }

diff --git a/src/config.ts b/src/config.ts
@@ -18,6 +18,7 @@ export interface EtaConfig {
     interpolate: string
     raw: string
     exec: string
+    special: string
   }
   e: (str: string) => string
   plugins: Array<{ processFnString?: Function; processAST?: Function }>
@@ -55,6 +56,7 @@ var defaultConfig: EtaConfig = {
   parse: {
     interpolate: '=',
     raw: '~',
+    special: '@',
     exec: ''
   },
   async: false,