Move away from using @ for partials

README.md

@@ -105,7 +105,15 @@ Display this instead
 ### Partials
 
 ```
-<% @includeFile('footer') %>
+<%~ E.include('mypartial') %>
+```
+
+```
+<%~ E.includeFile('./footer') %>
+```
+
+```
+<%~ E.include('users', {users: it.users}) %>
 ```
 
 ## ✔️ Tests

browser-tests/demo.html

@@ -173,7 +173,7 @@ <h4>Template</h4>
 <% } %>
 <% } %>
 
-Partial: <% @include("mypartial") %>
+Partial: <%~ E.include("mypartial") %>
 </textarea
         >
       </div>

dist/types/config.d.ts

@@ -10,7 +10,6 @@ export interface EtaConfig {
         interpolate: string;
         raw: string;
         exec: string;
-        special: string;
     };
     e: (str: string) => string;
     plugins: Array<{

dist/types/parse.d.ts

@@ -1,5 +1,5 @@
 import { EtaConfig } from './config';
-export declare type TagType = 'r' | 'e' | 'i' | 's' | '';
+export declare type TagType = 'r' | 'e' | 'i' | '';
 export interface TemplateObject {
     t: TagType;
     val: string;

examples/basic.ts

@@ -12,7 +12,7 @@ var template = `
 
 Partial
 -------
-<% @include('template1', {name: 'Ben'})%>
+<%~ E.include('template1', {name: 'Ben'})%>
 `
 
 Eta.templates.define('template1', Eta.compile('Hi <%=it.name%>'))

src/compile-string.ts

@@ -60,9 +60,6 @@ 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
       }
     }
   }

src/config.ts

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

src/parse.ts

@@ -5,7 +5,7 @@ import { trimWS } from './utils'
 
 import { EtaConfig } from './config'
 
-export type TagType = 'r' | 'e' | 'i' | 's' | ''
+export type TagType = 'r' | 'e' | 'i' | ''
 
 export interface TemplateObject {
   t: TagType
@@ -55,12 +55,7 @@ export default function parse (str: string, env: EtaConfig): Array<AstObject> {
     }
   }
 
-  var prefixes = (
-    parseOptions.exec +
-    parseOptions.interpolate +
-    parseOptions.special +
-    parseOptions.raw
-  )
+  var prefixes = (parseOptions.exec + parseOptions.interpolate + parseOptions.raw)
     .split('')
     .join('|')
 
@@ -99,8 +94,6 @@ export default function parse (str: string, env: EtaConfig): Array<AstObject> {
           currentType = 'r'
         } else if (prefix === parseOptions.interpolate) {
           currentType = 'i'
-        } else if (prefix === parseOptions.special) {
-          currentType = 's'
         }
 
         currentObj = { t: currentType, val: content }

test/file-helpers.spec.ts

@@ -9,7 +9,7 @@ templates.define('test-template', compile('HEY <%=it.name%>'))
 describe('include works', () => {
   it('simple parser works with "includeFile"', async () => {
     var renderedTemplate = render(
-      '<% @includeFile("simple", it) %>',
+      '<%~ E.includeFile("simple", it) %>',
       { name: 'Ben' },
       { filename: path.join(__dirname, 'templates/placeholder.eta') }
     )
@@ -19,7 +19,7 @@ describe('include works', () => {
 
   it('"includeFile" works with "views" array', async () => {
     var renderedTemplate = render(
-      '<% @includeFile("randomtemplate", it) %>',
+      '<%~ E.includeFile("randomtemplate", it) %>',
       { user: 'Ben' },
       {
         filename: path.join(__dirname, 'templates/placeholder.eta'),
@@ -31,15 +31,15 @@ describe('include works', () => {
   })
 
   it('simple parser works with "include"', async () => {
-    var renderedTemplate = render('<% @include("test-template", it) %>', { name: 'Ben' })
+    var renderedTemplate = render('<%~ E.include("test-template", it) %>', { name: 'Ben' })
 
     expect(renderedTemplate).toEqual('HEY Ben')
   })
 
   test('throws if helper "includeFile" cannot find template', () => {
     expect(() => {
       render(
-        '<% @includeFile("missing-template", it) %>',
+        '<%~ E.includeFile("missing-template", it) %>',
         {},
         {
           filename: path.join(__dirname, 'templates/placeholder.eta'),

test/helpers.spec.ts

@@ -30,7 +30,7 @@ The Daugherty's have 5 kids:
 
   test('throws if helper "include" cannot find template', () => {
     expect(() => {
-      render('<% @include("missing-template", it) %>', {})
+      render('<%~ E.include("missing-template", it) %>', {})
     }).toThrow(new Error('Could not fetch template "missing-template"'))
   })
 })

test/parse.spec.ts

@@ -63,7 +63,7 @@ describe('parse test', () => {
       { t: 'e', val: '}' },
       { t: 'e', val: '}' },
       '\\nThis is a partial: ',
-      { t: 's', val: 'include("mypartial")' }
+      { t: 'r', val: 'E.include("mypartial")' }
     ])
   })
 

test/templates/complex.eta

@@ -13,4 +13,4 @@ Value: <%= it.obj[key] %>, Key: <%= key %>
 <% } %>
 <% } %>
 
-This is a partial: <% @include("mypartial") %>
+This is a partial: <%~ E.include("mypartial") %>