Allow simplified usage of include, includeFile

README.md

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

browser-tests/demo.html

@@ -154,7 +154,7 @@ <h2>
             <input id="strip" type="checkbox" checked="checked" />
             <label for="strip">Strip whitespaces</label>
         </div> -->
-      <div style="clear:both;height:10px"></div>
+      <div style="clear: both; height: 10px"></div>
       <div class="templategroup">
         <h4>Template</h4>
         <textarea autocomplete="off" id="template">
@@ -173,15 +173,15 @@ <h4>Template</h4>
 <% } %>
 <% } %>
 
-Partial: <%~ E.include("mypartial") %>
+Partial: <%~ include("mypartial") %>
 </textarea
         >
       </div>
       <div class="functiongroup">
         <h4>Eta.compile()</h4>
         <div id="function"></div>
       </div>
-      <div style="clear:both"></div>
+      <div style="clear: both"></div>
       <div class="datagroup">
         <h4>Data</h4>
         <textarea autocomplete="off" id="data">
@@ -204,18 +204,18 @@ <h4>Result</h4>
       window.onload = function () {
         Eta.templates.define('mypartial', Eta.compile('This is a partial'))
 
-        function escape (str) {
+        function escape(str) {
           // To handle escaping for the function result
           var escMap = {
             '&': '&amp;',
             '<': '&lt;',
             '>': '&gt;',
             '"': '&quot;',
             "'": '&#39;',
-            '/': '&#x2F;'
+            '/': '&#x2F;',
           }
 
-          function replaceChar (s) {
+          function replaceChar(s) {
             return escMap[s]
           }
           var newStr = String(str)
@@ -226,7 +226,7 @@ <h4>Result</h4>
           }
         }
 
-        function render () {
+        function render() {
           console.clear()
           var options = JSON.parse('{' + document.getElementById('data').value + '}')
           console.log(JSON.stringify(options))

deno_dist/README.md

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

deno_dist/compile-string.ts

@@ -14,14 +14,17 @@ import { AstObject } from "./parse.ts";
  *
  * ```js
  * compileToString("Hi <%= it.user %>", eta.config)
- * // "var tR='';tR+='Hi ';tR+=E.e(it.user);if(cb){cb(null,tR)} return tR"
+ * // "var tR='',include=E.include.bind(E),includeFile=E.includeFile.bind(E);tR+='Hi ';tR+=E.e(it.user);if(cb){cb(null,tR)} return tR"
  * ```
  */
 
 export default function compileToString(str: string, config: EtaConfig) {
   var buffer: Array<AstObject> = Parse(str, config);
 
-  var res = "var tR=''\n" +
+  var res = "var tR=''" +
+    (config.include ? ",include=E.include.bind(E)" : "") +
+    (config.includeFile ? ",includeFile=E.includeFile.bind(E)" : "") +
+    "\n" +
     (config.useWith ? "with(" + config.varName + "||{}){" : "") +
     compileScope(buffer, config) +
     "if(cb){cb(null,tR)} return tR" +

deno_dist/compile.ts

@@ -27,7 +27,7 @@ export type TemplateFunction = (
  * let compiledFn = eta.compile("Hi <%= it.user %>")
  * // function anonymous()
  * let compiledFnStr = compiledFn.toString()
- * // "function anonymous(it,E,cb\n) {\nvar tR='';tR+='Hi ';tR+=E.e(it.user);if(cb){cb(null,tR)} return tR\n}"
+ * // "function anonymous(it,E,cb\n) {\nvar tR='',include=E.include.bind(E),includeFile=E.includeFile.bind(E);tR+='Hi ';tR+=E.e(it.user);if(cb){cb(null,tR)} return tR\n}"
  * ```
  */
 

deno_dist/config.ts

@@ -50,6 +50,10 @@ export interface EtaConfig {
   "view cache"?: boolean;
   /** Make data available on the global object instead of varName */
   useWith?: boolean;
+  /** Function to include templates by name */
+  include?: Function;
+  /** Function to include templates by filepath */
+  includeFile?: Function;
   [index: string]: any; // eslint-disable-line @typescript-eslint/no-explicit-any
 }
 
@@ -64,7 +68,7 @@ export type PartialConfig = Partial<EtaConfig>;
 /**
  * Include a template based on its name (or filepath, if it's already been cached).
  *
- * Called like `E.include(templateNameOrPath, data)`
+ * Called like `include(templateNameOrPath, data)`
  */
 
 function includeHelper(

deno_dist/file-helpers.ts

@@ -11,7 +11,7 @@ interface GenericData {
 /* END TYPES */
 
 /**
- * Called with `E.includeFile(path, data)`
+ * Called with `includeFile(path, data)`
  */
 
 export function includeFileHelper(