@kosatyi/ejs 0.0.14 → 0.0.16

package/dist/ejs.cjs

@@ -16,15 +16,14 @@ defaults.cache = true;
 defaults.path = 'views';
 defaults.resolver = null;
 defaults.extension = 'ejs';
+defaults.withObject = false;
 defaults.vars = {
-  EXTEND: '$$$',
+  SCOPE: 'ejs',
+  EXTEND: '$$e',
   BUFFER: '$$a',
-  OUTPUT: '$$i',
   LAYOUT: '$$l',
   BLOCKS: '$$b',
   MACRO: '$$m',
-  ERROR: '$$e',
-  SCOPE: '$$s',
   SAFE: '$$v'
 };
 defaults.token = {
@@ -216,6 +215,7 @@ var match = function match(regex, text, callback) {
  * @constructor
  */
 var Compiler = function Compiler(config) {
+  var withObject = config.withObject;
   var token = config.token;
   var vars = config.vars;
   var matches = [];
@@ -251,14 +251,15 @@ var Compiler = function Compiler(config) {
     });
     source += "');";
     source = "try{".concat(source, "}catch(e){console.info(e)}");
-    source = "with(".concat(SCOPE, "){").concat(source, "}");
+    if (withObject) {
+      source = "with(".concat(SCOPE, "){").concat(source, "}");
+    }
     source = "".concat(BUFFER, ".start();").concat(source, "return ").concat(BUFFER, ".end();");
     source += "\n//# sourceURL=".concat(path);
     var result = null;
     try {
       result = new Function(SCOPE, BUFFER, SAFE, source);
       result.source = "(function(".concat(SCOPE, ",").concat(BUFFER, ",").concat(SAFE, "){\n").concat(source, "\n})");
-      //result.source = result.toString()
     } catch (e) {
       console.log(e);
       e.filename = path;
@@ -374,158 +375,89 @@ var Buffer = function Buffer() {
 };
 
 var configure = function configure(config, methods) {
-  /**
-   *
-   */
   var _config$vars = config.vars,
     EXTEND = _config$vars.EXTEND,
     LAYOUT = _config$vars.LAYOUT,
     BLOCKS = _config$vars.BLOCKS,
     BUFFER = _config$vars.BUFFER,
     MACRO = _config$vars.MACRO;
-    _config$vars.SCOPE;
-  /**
-   * @memberOf global
-   * @name [SCOPE]
-   * @param data
-   * @constructor
-   */
   function Scope() {
     var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     this.initBlocks();
     this.initMacro();
     extend(this, data);
   }
-  /**
-   * @static
-   * @param methods
-   */
   Scope.helpers = function (methods) {
     extend(Scope.prototype, methods);
   };
-  /**
-   * @static
-   * @param name
-   * @param descriptor
-   */
   Scope.property = function (name, descriptor) {
     Object.defineProperty(Scope.prototype, name, descriptor);
   };
-  /**
-   * @static
-   * @param name
-   * @param method
-   */
   Scope.method = function (name, method) {
-    return Scope.property(name, {
+    Object.defineProperty(Scope.prototype, name, {
       value: method,
       writable: false,
       configurable: false,
       enumerable: false
     });
   };
-  /**
-   *
-   */
   Scope.property(BUFFER, {
     value: Buffer(),
     writable: false,
     configurable: false,
     enumerable: false
   });
-  /**
-   *
-   */
   Scope.property(BLOCKS, {
     value: {},
     writable: true,
     configurable: false,
     enumerable: false
   });
-  /**
-   *
-   */
   Scope.property(MACRO, {
     value: {},
     writable: true,
     configurable: false,
     enumerable: false
   });
-  /**
-   *
-   */
   Scope.property(LAYOUT, {
     value: false,
     writable: true,
     configurable: false,
     enumerable: false
   });
-  /**
-   *
-   */
   Scope.property(EXTEND, {
     value: false,
     writable: true,
     configurable: false,
     enumerable: false
   });
-  /**
-   *
-   */
   Scope.method('initBlocks', function () {
     this[BLOCKS] = {};
   });
-  /**
-   *
-   */
   Scope.method('initMacro', function () {
     this[MACRO] = {};
   });
-  /**
-   *
-   */
   Scope.method('getMacro', function () {
     return this[MACRO];
   });
-  /**
-   *
-   */
   Scope.method('getBuffer', function () {
     return this[BUFFER];
   });
-  /**
-   *
-   */
   Scope.method('getBlocks', function () {
     return this[BLOCKS];
   });
-  /**
-   *
-   */
   Scope.method('setExtend', function (value) {
     this[EXTEND] = value;
   });
-  /**
-   *
-   */
   Scope.method('getExtend', function () {
     return this[EXTEND];
   });
-  /**
-   *
-   */
   Scope.method('setLayout', function (layout) {
     this[LAYOUT] = layout;
   });
-  /**
-   *
-   */
   Scope.method('getLayout', function () {
     return this[LAYOUT];
   });
-  /**
-   *
-   */
   Scope.method('clone', function (exclude_blocks) {
     var filter = [LAYOUT, EXTEND, BUFFER];
     if (exclude_blocks === true) {
@@ -533,19 +465,10 @@ var configure = function configure(config, methods) {
     }
     return omit(this, filter);
   });
-  /**
-   * @methodOf global
-   * @function extend
-   * @param layout
-   */
   Scope.method('extend', function (layout) {
     this.setExtend(true);
     this.setLayout(layout);
   });
-  /**
-   * @memberOf global
-   * @function echo
-   */
   Scope.method('echo', function () {
     var buffer = this.getBuffer();
     var params = [].slice.call(arguments);
@@ -553,11 +476,6 @@ var configure = function configure(config, methods) {
       buffer(item);
     });
   });
-  /**
-   * @memberOf global
-   * @function fn
-   * @param callback
-   */
   Scope.method('fn', function (callback) {
     var buffer = this.getBuffer();
     var context = this;
@@ -569,24 +487,12 @@ var configure = function configure(config, methods) {
       return buffer.restore();
     };
   });
-  /**
-   * @memberOf global
-   * @function get
-   * @param name
-   * @param [defaults]
-   */
   Scope.method('get', function (name, defaults) {
     var path = getPath(this, name);
     var result = path.shift();
     var prop = path.pop();
     return hasProp(result, prop) ? result[prop] : defaults;
   });
-  /**
-   * @memberOf global
-   * @function set
-   * @param name
-   * @param value
-   */
   Scope.method('set', function (name, value) {
     var path = getPath(this, name);
     var result = path.shift();
@@ -596,12 +502,6 @@ var configure = function configure(config, methods) {
     }
     return result[prop] = value;
   });
-  /**
-   * @memberOf global
-   * @function macro
-   * @param name
-   * @param callback
-   */
   Scope.method('macro', function (name, callback) {
     var list = this.getMacro();
     var macro = this.fn(callback);
@@ -610,12 +510,6 @@ var configure = function configure(config, methods) {
       return context.echo(macro.apply(undefined, arguments));
     };
   });
-  /**
-   * @memberOf global
-   * @function call
-   * @param name
-   * @param {...*} args
-   */
   Scope.method('call', function (name) {
     var list = this.getMacro();
     var macro = list[name];
@@ -624,12 +518,6 @@ var configure = function configure(config, methods) {
       return macro.apply(macro, params);
     }
   });
-  /**
-   * @memberOf global
-   * @function block
-   * @param name
-   * @param callback
-   */
   Scope.method('block', function (name, callback) {
     var _this = this;
     var blocks = this.getBlocks();
@@ -652,25 +540,12 @@ var configure = function configure(config, methods) {
     };
     this.echo(current()(next()));
   });
-  /**
-   *  @memberOf global
-   *  @function include
-   *  @param path
-   *  @param [data]
-   *  @param [cx]
-   */
   Scope.method('include', function (path, data, cx) {
     var context = cx === false ? {} : this.clone(true);
     var params = extend(context, data || {});
     var promise = this.render(path, params);
     this.echo(promise);
   });
-  /**
-   * @memberOf global
-   * @function use
-   * @param path
-   * @param namespace
-   */
   Scope.method('use', function (path, namespace) {
     var promise = this.require(path);
     this.echo(resolve$1(promise, function (exports) {
@@ -680,45 +555,26 @@ var configure = function configure(config, methods) {
       });
     }, this));
   });
-  /**
-   *  @memberOf global
-   *  @function async
-   *  @param promise
-   *  @param callback
-   */
   Scope.method('async', function (promise, callback) {
     this.echo(resolve$1(promise, function (data) {
       return this.fn(callback)(data);
     }, this));
   });
-  Scope.helpers(methods);
-  Scope.helpers({
-    /**
-     * @memberOf global
-     * @param tag
-     * @param attr
-     * @param content
-     */
-    el: function el(tag, attr, content) {
-      if (isFunction(content)) {
-        content = this.fn(content)();
-      }
-      this.echo(resolve$1(content, function (content) {
-        return element(tag, attr, content);
-      }, this));
-    },
-    /**
-     * @memberOf global
-     * @param object
-     * @param callback
-     */
-    each: function each$1(object, callback) {
-      if (isString(object)) {
-        object = this.get(object, []);
-      }
-      each(object, callback);
+  Scope.method('el', function (tag, attr, content) {
+    if (isFunction(content)) {
+      content = this.fn(content)();
     }
+    this.echo(resolve$1(content, function (content) {
+      return element(tag, attr, content);
+    }, this));
   });
+  Scope.method('each', function (object, callback) {
+    if (isString(object)) {
+      object = this.get(object, []);
+    }
+    each(object, callback);
+  });
+  Scope.helpers(methods);
   return Scope;
 };
 

package/dist/ejs.js

@@ -12,15 +12,14 @@
     defaults.path = 'views';
     defaults.resolver = null;
     defaults.extension = 'ejs';
+    defaults.withObject = false;
     defaults.vars = {
-      EXTEND: '$$$',
+      SCOPE: 'ejs',
+      EXTEND: '$$e',
       BUFFER: '$$a',
-      OUTPUT: '$$i',
       LAYOUT: '$$l',
       BLOCKS: '$$b',
       MACRO: '$$m',
-      ERROR: '$$e',
-      SCOPE: '$$s',
       SAFE: '$$v'
     };
     defaults.token = {
@@ -212,6 +211,7 @@
      * @constructor
      */
     var Compiler = function Compiler(config) {
+      var withObject = config.withObject;
       var token = config.token;
       var vars = config.vars;
       var matches = [];
@@ -247,14 +247,15 @@
         });
         source += "');";
         source = "try{".concat(source, "}catch(e){console.info(e)}");
-        source = "with(".concat(SCOPE, "){").concat(source, "}");
+        if (withObject) {
+          source = "with(".concat(SCOPE, "){").concat(source, "}");
+        }
         source = "".concat(BUFFER, ".start();").concat(source, "return ").concat(BUFFER, ".end();");
         source += "\n//# sourceURL=".concat(path);
         var result = null;
         try {
           result = new Function(SCOPE, BUFFER, SAFE, source);
           result.source = "(function(".concat(SCOPE, ",").concat(BUFFER, ",").concat(SAFE, "){\n").concat(source, "\n})");
-          //result.source = result.toString()
         } catch (e) {
           console.log(e);
           e.filename = path;
@@ -370,158 +371,89 @@
     };
 
     var configure = function configure(config, methods) {
-      /**
-       *
-       */
       var _config$vars = config.vars,
         EXTEND = _config$vars.EXTEND,
         LAYOUT = _config$vars.LAYOUT,
         BLOCKS = _config$vars.BLOCKS,
         BUFFER = _config$vars.BUFFER,
         MACRO = _config$vars.MACRO;
-        _config$vars.SCOPE;
-      /**
-       * @memberOf global
-       * @name [SCOPE]
-       * @param data
-       * @constructor
-       */
       function Scope() {
         var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         this.initBlocks();
         this.initMacro();
         extend(this, data);
       }
-      /**
-       * @static
-       * @param methods
-       */
       Scope.helpers = function (methods) {
         extend(Scope.prototype, methods);
       };
-      /**
-       * @static
-       * @param name
-       * @param descriptor
-       */
       Scope.property = function (name, descriptor) {
         Object.defineProperty(Scope.prototype, name, descriptor);
       };
-      /**
-       * @static
-       * @param name
-       * @param method
-       */
       Scope.method = function (name, method) {
-        return Scope.property(name, {
+        Object.defineProperty(Scope.prototype, name, {
           value: method,
           writable: false,
           configurable: false,
           enumerable: false
         });
       };
-      /**
-       *
-       */
       Scope.property(BUFFER, {
         value: Buffer(),
         writable: false,
         configurable: false,
         enumerable: false
       });
-      /**
-       *
-       */
       Scope.property(BLOCKS, {
         value: {},
         writable: true,
         configurable: false,
         enumerable: false
       });
-      /**
-       *
-       */
       Scope.property(MACRO, {
         value: {},
         writable: true,
         configurable: false,
         enumerable: false
       });
-      /**
-       *
-       */
       Scope.property(LAYOUT, {
         value: false,
         writable: true,
         configurable: false,
         enumerable: false
       });
-      /**
-       *
-       */
       Scope.property(EXTEND, {
         value: false,
         writable: true,
         configurable: false,
         enumerable: false
       });
-      /**
-       *
-       */
       Scope.method('initBlocks', function () {
         this[BLOCKS] = {};
       });
-      /**
-       *
-       */
       Scope.method('initMacro', function () {
         this[MACRO] = {};
       });
-      /**
-       *
-       */
       Scope.method('getMacro', function () {
         return this[MACRO];
       });
-      /**
-       *
-       */
       Scope.method('getBuffer', function () {
         return this[BUFFER];
       });
-      /**
-       *
-       */
       Scope.method('getBlocks', function () {
         return this[BLOCKS];
       });
-      /**
-       *
-       */
       Scope.method('setExtend', function (value) {
         this[EXTEND] = value;
       });
-      /**
-       *
-       */
       Scope.method('getExtend', function () {
         return this[EXTEND];
       });
-      /**
-       *
-       */
       Scope.method('setLayout', function (layout) {
         this[LAYOUT] = layout;
       });
-      /**
-       *
-       */
       Scope.method('getLayout', function () {
         return this[LAYOUT];
       });
-      /**
-       *
-       */
       Scope.method('clone', function (exclude_blocks) {
         var filter = [LAYOUT, EXTEND, BUFFER];
         if (exclude_blocks === true) {
@@ -529,19 +461,10 @@
         }
         return omit(this, filter);
       });
-      /**
-       * @methodOf global
-       * @function extend
-       * @param layout
-       */
       Scope.method('extend', function (layout) {
         this.setExtend(true);
         this.setLayout(layout);
       });
-      /**
-       * @memberOf global
-       * @function echo
-       */
       Scope.method('echo', function () {
         var buffer = this.getBuffer();
         var params = [].slice.call(arguments);
@@ -549,11 +472,6 @@
           buffer(item);
         });
       });
-      /**
-       * @memberOf global
-       * @function fn
-       * @param callback
-       */
       Scope.method('fn', function (callback) {
         var buffer = this.getBuffer();
         var context = this;
@@ -565,24 +483,12 @@
           return buffer.restore();
         };
       });
-      /**
-       * @memberOf global
-       * @function get
-       * @param name
-       * @param [defaults]
-       */
       Scope.method('get', function (name, defaults) {
         var path = getPath(this, name);
         var result = path.shift();
         var prop = path.pop();
         return hasProp(result, prop) ? result[prop] : defaults;
       });
-      /**
-       * @memberOf global
-       * @function set
-       * @param name
-       * @param value
-       */
       Scope.method('set', function (name, value) {
         var path = getPath(this, name);
         var result = path.shift();
@@ -592,12 +498,6 @@
         }
         return result[prop] = value;
       });
-      /**
-       * @memberOf global
-       * @function macro
-       * @param name
-       * @param callback
-       */
       Scope.method('macro', function (name, callback) {
         var list = this.getMacro();
         var macro = this.fn(callback);
@@ -606,12 +506,6 @@
           return context.echo(macro.apply(undefined, arguments));
         };
       });
-      /**
-       * @memberOf global
-       * @function call
-       * @param name
-       * @param {...*} args
-       */
       Scope.method('call', function (name) {
         var list = this.getMacro();
         var macro = list[name];
@@ -620,12 +514,6 @@
           return macro.apply(macro, params);
         }
       });
-      /**
-       * @memberOf global
-       * @function block
-       * @param name
-       * @param callback
-       */
       Scope.method('block', function (name, callback) {
         var _this = this;
         var blocks = this.getBlocks();
@@ -648,25 +536,12 @@
         };
         this.echo(current()(next()));
       });
-      /**
-       *  @memberOf global
-       *  @function include
-       *  @param path
-       *  @param [data]
-       *  @param [cx]
-       */
       Scope.method('include', function (path, data, cx) {
         var context = cx === false ? {} : this.clone(true);
         var params = extend(context, data || {});
         var promise = this.render(path, params);
         this.echo(promise);
       });
-      /**
-       * @memberOf global
-       * @function use
-       * @param path
-       * @param namespace
-       */
       Scope.method('use', function (path, namespace) {
         var promise = this.require(path);
         this.echo(resolve$1(promise, function (exports) {
@@ -676,45 +551,26 @@
           });
         }, this));
       });
-      /**
-       *  @memberOf global
-       *  @function async
-       *  @param promise
-       *  @param callback
-       */
       Scope.method('async', function (promise, callback) {
         this.echo(resolve$1(promise, function (data) {
           return this.fn(callback)(data);
         }, this));
       });
-      Scope.helpers(methods);
-      Scope.helpers({
-        /**
-         * @memberOf global
-         * @param tag
-         * @param attr
-         * @param content
-         */
-        el: function el(tag, attr, content) {
-          if (isFunction(content)) {
-            content = this.fn(content)();
-          }
-          this.echo(resolve$1(content, function (content) {
-            return element(tag, attr, content);
-          }, this));
-        },
-        /**
-         * @memberOf global
-         * @param object
-         * @param callback
-         */
-        each: function each$1(object, callback) {
-          if (isString(object)) {
-            object = this.get(object, []);
-          }
-          each(object, callback);
+      Scope.method('el', function (tag, attr, content) {
+        if (isFunction(content)) {
+          content = this.fn(content)();
         }
+        this.echo(resolve$1(content, function (content) {
+          return element(tag, attr, content);
+        }, this));
       });
+      Scope.method('each', function (object, callback) {
+        if (isString(object)) {
+          object = this.get(object, []);
+        }
+        each(object, callback);
+      });
+      Scope.helpers(methods);
       return Scope;
     };
 

package/dist/ejs.min.js

@@ -1 +1 @@
-!function(n,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(n="undefined"!=typeof globalThis?globalThis:n||self).ejs=t()}(this,(function(){"use strict";var n={},t={export:"ejs.precompiled",cache:!0,path:"views",resolver:null,extension:"ejs",vars:{EXTEND:"$$$",BUFFER:"$$a",OUTPUT:"$$i",LAYOUT:"$$l",BLOCKS:"$$b",MACRO:"$$m",ERROR:"$$e",SCOPE:"$$s",SAFE:"$$v"},token:{start:"<%",end:"%>",regex:"([\\s\\S]+?)"}},e=function(){var n=[].slice.call(arguments),t=n.shift();return n.filter(t).pop()},r=function(n){return"function"==typeof n},o=function(n){return"string"==typeof n},i=function(n){return"boolean"==typeof n},c=new Function("try {return this===global;}catch(e){return false;}"),u={"'":"'","\\":"\\","\r":"r","\n":"n","\t":"t","\u2028":"u2028","\u2029":"u2029"},a={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;"},f=function(n){return new RegExp(["[",Object.keys(n).join(""),"]"].join(""),"g")},s=f(a),h=f(u),l=function(){var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return(""+n).replace(s,(function(n){return a[n]}))},p=function(n,t,e){return null==(e=n)?"":t?l(e):e},v=function(n,t){var e=n,r=t.split("."),o=r.pop();return r.forEach((function(n){e=e[n]=e[n]||{}})),[e,o]},d=function(){for(var n=arguments.length,t=new Array(n),e=0;e<n;e++)t[e]=arguments[e];var r=t.shift();return t.filter((function(n){return n})).reduce((function(n,t){return Object.assign(n,t)}),r)},m=function(){},g=function(n,t){var e;for(e in n)w(n,e)&&t(n[e],e,n)},b=function(n,t){return function(n,t,e){var r=n instanceof Array,o=r?[]:{};return g(n,(function(n,e,i){var c=t(n,e,i);void 0!==c&&(r?o.push(c):o[e]=c)})),o}(n,(function(n,e){if(-1===t.indexOf(e))return n}))},y=function(n,t,e){return Promise.resolve(n).then(t.bind(e))},w=function(n,t){return n&&n.hasOwnProperty(t)},x=["area","base","br","col","embed","hr","img","input","link","meta","param","source","track","wbr"],E=" ",j='"',$="/",O="<",k=">";function F(n,t,e){var r=[],o=-1===x.indexOf(n),i=function(n,t,e){var r=[];return g(n,(function(n,e,o){var i=t(n,e,o);void 0!==i&&r.push(i)})),r}(t,(function(n,t){if(null!=n)return[l(t),[j,l(n),j].join("")].join("=")})).join(E);return r.push([O,n,E,i,k].join("")),e&&r.push(e instanceof Array?e.join(""):e),o&&r.push([O,$,n,k].join("")),r.join("")}var B=[{symbol:"-",format:function(n){return"'+\n".concat(this.SAFE,"(").concat(n,",1)+\n'")}},{symbol:"=",format:function(n){return"'+\n".concat(this.SAFE,"(").concat(n,")+\n'")}},{symbol:"#",format:function(n){return"'+\n/**".concat(n,"**/+\n'")}},{symbol:"",format:function(n){return"')\n".concat(n,"\n").concat(this.BUFFER,"('")}}],R=function(n){var t=n.token,e=n.vars,r=[],o=[],i={match:"[ \\t]*",start:[t.start,"_"],end:["_",t.end]};B.forEach((function(n){r.push(t.start.concat(n.symbol).concat(t.regex).concat(t.end)),o.push(n.format.bind(e))}));var c=new RegExp(r.join("|").concat("|$"),"g"),a=new RegExp([i.match,i.start].join(""),"gm"),f=new RegExp([i.end,i.match].join(""),"gm");return function(n,t){var r=e.SCOPE,s=e.SAFE,l=e.BUFFER;n=(n=n.replace(/[\r\n]+/g,"\n").replace(/^\s+|\s+$/gm,"")).replace(a,i.start).replace(f,i.end);var p="".concat(l,"('");!function(n,t,e){var r=0;t.replace(n,(function(){var n=[].slice.call(arguments,0,-1),t=n.pop(),o=n.shift();return e(n,r,t),r=t+o.length,o}))}(c,n,(function(t,e,r){p+=(""+n.slice(e,r)).replace(h,(function(n){return"\\"+u[n]})),t.forEach((function(n,t){n&&(p+=o[t](n))}))})),p="try{".concat(p+="');","}catch(e){console.info(e)}"),p="with(".concat(r,"){").concat(p,"}"),p="".concat(l,".start();").concat(p,"return ").concat(l,".end();"),p+="\n//# sourceURL=".concat(t);var v=null;try{(v=new Function(r,l,s,p)).source="(function(".concat(r,",").concat(l,",").concat(s,"){\n").concat(p,"\n})")}catch(n){throw console.log(n),n.filename=t,n.source=p,n}return v}},S=function(n){return window.fetch(n).then((function(n){return n.text()}))},A=function(t){return new Promise((function(e,r){n.readFile(t,(function(n,t){n?r(n):e(t.toString())}))}))},P=function(t,e){return n.watch(".",{cwd:t}).on("change",(function(n){e.remove(n)})).on("error",(function(n){console.log("watcher error: "+n)}))},L=function(n,t,e){var o=n.path;n.token;var i=r(n.resolver)?n.resolver:c()?A:S,u=function(n){return i(function(n){return(n=[o,n].join("/")).replace(/\/\//g,"/")}(n))},a=function(n,e){return t.set(e,n),n};return n.watch&&c()&&P(o,t),function(n){if(t.exist(n))return t.resolve(n);var r=u(n).then((function(t){return a(e(t,n),n)}));return a(r,n)}},M=function(n){return Promise.all(n).then((function(n){return n.join("")}))},U=function(){var n=[],t=[];function e(n){t.push(n)}return e.start=function(){t=[]},e.backup=function(){n.push(t.concat()),t=[]},e.restore=function(){var e=t.concat();return t=n.pop(),M(e)},e.error=function(n){throw n},e.end=function(){return M(t)},e};var T,C,q,_,N,D=(C={},q={},_=function(n,t){var e=n.split(".").pop();return e!==t&&(n=[n,t].join(".")),n},N={element:F,output:function(n,t){return N.template(n).then((function(n){return n.call(t,t,t.getBuffer(),p)}))},render:function(n,t){var e=_(n,C.extension),r=new N.scope(t);return N.output(e,r).then((function(n){if(r.getExtend()){r.setExtend(!1);var t=r.getLayout(),e=r.clone();return N.render(t,e)}return n}))},require:function(n){var t=_(n,C.extension),e=new N.scope({});return N.output(t,e).then((function(){return e.getMacro()}))},helpers:function(n){d(q,n=n||{}),N.scope.helpers(n)},configure:function(n){return C.export=e(o,t.export,n.export),C.path=e(o,t.path,n.path),C.resolver=e(r,t.resolver,n.resolver),C.extension=e(o,t.extension,n.extension),C.token=d({},t.token,n.token),C.vars=d({},t.vars,n.vars),N.scope=function(n,t){var e=n.vars,i=e.EXTEND,c=e.LAYOUT,u=e.BLOCKS,a=e.BUFFER,f=e.MACRO;function s(){var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};this.initBlocks(),this.initMacro(),d(this,n)}return e.SCOPE,s.helpers=function(n){d(s.prototype,n)},s.property=function(n,t){Object.defineProperty(s.prototype,n,t)},s.method=function(n,t){return s.property(n,{value:t,writable:!1,configurable:!1,enumerable:!1})},s.property(a,{value:U(),writable:!1,configurable:!1,enumerable:!1}),s.property(u,{value:{},writable:!0,configurable:!1,enumerable:!1}),s.property(f,{value:{},writable:!0,configurable:!1,enumerable:!1}),s.property(c,{value:!1,writable:!0,configurable:!1,enumerable:!1}),s.property(i,{value:!1,writable:!0,configurable:!1,enumerable:!1}),s.method("initBlocks",(function(){this[u]={}})),s.method("initMacro",(function(){this[f]={}})),s.method("getMacro",(function(){return this[f]})),s.method("getBuffer",(function(){return this[a]})),s.method("getBlocks",(function(){return this[u]})),s.method("setExtend",(function(n){this[i]=n})),s.method("getExtend",(function(){return this[i]})),s.method("setLayout",(function(n){this[c]=n})),s.method("getLayout",(function(){return this[c]})),s.method("clone",(function(n){var t=[c,i,a];return!0===n&&t.push(u),b(this,t)})),s.method("extend",(function(n){this.setExtend(!0),this.setLayout(n)})),s.method("echo",(function(){var n=this.getBuffer();[].slice.call(arguments).forEach((function(t){n(t)}))})),s.method("fn",(function(n){var t=this.getBuffer(),e=this;return function(){return t.backup(),r(n)&&n.apply(e,arguments),t.restore()}})),s.method("get",(function(n,t){var e=v(this,n),r=e.shift(),o=e.pop();return w(r,o)?r[o]:t})),s.method("set",(function(n,t){var e=v(this,n),r=e.shift(),o=e.pop();return this.getExtend()&&w(r,o)?r[o]:r[o]=t})),s.method("macro",(function(n,t){var e=this.getMacro(),r=this.fn(t),o=this;e[n]=function(){return o.echo(r.apply(void 0,arguments))}})),s.method("call",(function(n){var t=this.getMacro()[n],e=[].slice.call(arguments,1);if(r(t))return t.apply(t,e)})),s.method("block",(function(n,t){var e=this,r=this.getBlocks();if(r[n]=r[n]||[],r[n].push(this.fn(t)),!this.getExtend()){var o=Object.assign([],r[n]),i=function(){return o.shift()};this.echo(i()(function n(){var t=i();return t?function(){e.echo(t(n()))}:m}()))}})),s.method("include",(function(n,t,e){var r=!1===e?{}:this.clone(!0),o=d(r,t||{}),i=this.render(n,o);this.echo(i)})),s.method("use",(function(n,t){var e=this.require(n);this.echo(y(e,(function(n){var e=this.getMacro();g(n,(function(n,r){e[[t,r].join(".")]=n}))}),this))})),s.method("async",(function(n,t){this.echo(y(n,(function(n){return this.fn(t)(n)}),this))})),s.helpers(t),s.helpers({el:function(n,t,e){r(e)&&(e=this.fn(e)()),this.echo(y(e,(function(e){return F(n,t,e)}),this))},each:function(n,t){o(n)&&(n=this.get(n,[])),g(n,t)}}),s}(C,q),N.compile=R(C),N.wrapper=function(n){var t=n.export;return function(n){var e="(function(o){\n";return n.forEach((function(n){e+="o["+JSON.stringify(n.name)+"]="+String(n.content)+"\n"})),e+='})(window["'+t+'"] = window["'+t+'"] || {});\n'}}(C),N.cache=function(n){var t=n.export,e={};return{preload:function(){return!1===c()&&this.load(window[t]),this},exist:function(n){return w(e,n)},get:function(n){return e[n]},remove:function(n){delete e[n]},resolve:function(n){return Promise.resolve(this.get(n))},set:function(n,t){return e[n]=t,this},load:function(n){return d(e,n),this}}.preload()}(C),N.template=L(C,N.cache,N.compile),N},__express:function(c,u,a){r(u)&&(a=u,u={});var f=d({},(u=u||{}).settings),s=e(o,f.views,t.path),h=e(i,f["view cache"],t.cache),l=d({},f["view options"]),p=n.relative(s,c);return l.path=s,l.cache=h,N.configure(l),N.render(p,u).then((function(n){a(null,n)})).catch((function(n){a(n)}))}},N.configure(T||{}),N.helpers({require:function(n){return N.require(n,this)},render:function(n,t){return N.render(n,t)}}),N);return D}));
+!function(n,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(n="undefined"!=typeof globalThis?globalThis:n||self).ejs=t()}(this,(function(){"use strict";var n={},t={export:"ejs.precompiled",cache:!0,path:"views",resolver:null,extension:"ejs",withObject:!1,vars:{SCOPE:"ejs",EXTEND:"$$e",BUFFER:"$$a",LAYOUT:"$$l",BLOCKS:"$$b",MACRO:"$$m",SAFE:"$$v"},token:{start:"<%",end:"%>",regex:"([\\s\\S]+?)"}},e=function(){var n=[].slice.call(arguments),t=n.shift();return n.filter(t).pop()},r=function(n){return"function"==typeof n},o=function(n){return"string"==typeof n},i=function(n){return"boolean"==typeof n},c=new Function("try {return this===global;}catch(e){return false;}"),u={"'":"'","\\":"\\","\r":"r","\n":"n","\t":"t","\u2028":"u2028","\u2029":"u2029"},a={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;"},f=function(n){return new RegExp(["[",Object.keys(n).join(""),"]"].join(""),"g")},s=f(a),h=f(u),l=function(){var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return(""+n).replace(s,(function(n){return a[n]}))},p=function(n,t,e){return null==(e=n)?"":t?l(e):e},v=function(n,t){var e=n,r=t.split("."),o=r.pop();return r.forEach((function(n){e=e[n]=e[n]||{}})),[e,o]},d=function(){for(var n=arguments.length,t=new Array(n),e=0;e<n;e++)t[e]=arguments[e];var r=t.shift();return t.filter((function(n){return n})).reduce((function(n,t){return Object.assign(n,t)}),r)},m=function(){},g=function(n,t){var e;for(e in n)y(n,e)&&t(n[e],e,n)},b=function(n,t){return function(n,t,e){var r=n instanceof Array,o=r?[]:{};return g(n,(function(n,e,i){var c=t(n,e,i);void 0!==c&&(r?o.push(c):o[e]=c)})),o}(n,(function(n,e){if(-1===t.indexOf(e))return n}))},w=function(n,t,e){return Promise.resolve(n).then(t.bind(e))},y=function(n,t){return n&&n.hasOwnProperty(t)},x=["area","base","br","col","embed","hr","img","input","link","meta","param","source","track","wbr"],E=" ",j='"',O="/",k="<",F=">";function B(n,t,e){var r=[],o=-1===x.indexOf(n),i=function(n,t,e){var r=[];return g(n,(function(n,e,o){var i=t(n,e,o);void 0!==i&&r.push(i)})),r}(t,(function(n,t){if(null!=n)return[l(t),[j,l(n),j].join("")].join("=")})).join(E);return r.push([k,n,E,i,F].join("")),e&&r.push(e instanceof Array?e.join(""):e),o&&r.push([k,O,n,F].join("")),r.join("")}var $=[{symbol:"-",format:function(n){return"'+\n".concat(this.SAFE,"(").concat(n,",1)+\n'")}},{symbol:"=",format:function(n){return"'+\n".concat(this.SAFE,"(").concat(n,")+\n'")}},{symbol:"#",format:function(n){return"'+\n/**".concat(n,"**/+\n'")}},{symbol:"",format:function(n){return"')\n".concat(n,"\n").concat(this.BUFFER,"('")}}],S=function(n){var t=n.withObject,e=n.token,r=n.vars,o=[],i=[],c={match:"[ \\t]*",start:[e.start,"_"],end:["_",e.end]};$.forEach((function(n){o.push(e.start.concat(n.symbol).concat(e.regex).concat(e.end)),i.push(n.format.bind(r))}));var a=new RegExp(o.join("|").concat("|$"),"g"),f=new RegExp([c.match,c.start].join(""),"gm"),s=new RegExp([c.end,c.match].join(""),"gm");return function(n,e){var o=r.SCOPE,l=r.SAFE,p=r.BUFFER;n=(n=n.replace(/[\r\n]+/g,"\n").replace(/^\s+|\s+$/gm,"")).replace(f,c.start).replace(s,c.end);var v="".concat(p,"('");!function(n,t,e){var r=0;t.replace(n,(function(){var n=[].slice.call(arguments,0,-1),t=n.pop(),o=n.shift();return e(n,r,t),r=t+o.length,o}))}(a,n,(function(t,e,r){v+=(""+n.slice(e,r)).replace(h,(function(n){return"\\"+u[n]})),t.forEach((function(n,t){n&&(v+=i[t](n))}))})),v="try{".concat(v+="');","}catch(e){console.info(e)}"),t&&(v="with(".concat(o,"){").concat(v,"}")),v="".concat(p,".start();").concat(v,"return ").concat(p,".end();"),v+="\n//# sourceURL=".concat(e);var d=null;try{(d=new Function(o,p,l,v)).source="(function(".concat(o,",").concat(p,",").concat(l,"){\n").concat(v,"\n})")}catch(n){throw console.log(n),n.filename=e,n.source=v,n}return d}},A=function(n){return window.fetch(n).then((function(n){return n.text()}))},R=function(t){return new Promise((function(e,r){n.readFile(t,(function(n,t){n?r(n):e(t.toString())}))}))},L=function(t,e){return n.watch(".",{cwd:t}).on("change",(function(n){e.remove(n)})).on("error",(function(n){console.log("watcher error: "+n)}))},M=function(n,t,e){var o=n.path;n.token;var i=r(n.resolver)?n.resolver:c()?R:A,u=function(n){return i(function(n){return(n=[o,n].join("/")).replace(/\/\//g,"/")}(n))},a=function(n,e){return t.set(e,n),n};return n.watch&&c()&&L(o,t),function(n){if(t.exist(n))return t.resolve(n);var r=u(n).then((function(t){return a(e(t,n),n)}));return a(r,n)}},P=function(n){return Promise.all(n).then((function(n){return n.join("")}))},U=function(){var n=[],t=[];function e(n){t.push(n)}return e.start=function(){t=[]},e.backup=function(){n.push(t.concat()),t=[]},e.restore=function(){var e=t.concat();return t=n.pop(),P(e)},e.error=function(n){throw n},e.end=function(){return P(t)},e};var C,T,q,_,N,D=(T={},q={},_=function(n,t){var e=n.split(".").pop();return e!==t&&(n=[n,t].join(".")),n},N={element:B,output:function(n,t){return N.template(n).then((function(n){return n.call(t,t,t.getBuffer(),p)}))},render:function(n,t){var e=_(n,T.extension),r=new N.scope(t);return N.output(e,r).then((function(n){if(r.getExtend()){r.setExtend(!1);var t=r.getLayout(),e=r.clone();return N.render(t,e)}return n}))},require:function(n){var t=_(n,T.extension),e=new N.scope({});return N.output(t,e).then((function(){return e.getMacro()}))},helpers:function(n){d(q,n=n||{}),N.scope.helpers(n)},configure:function(n){return T.export=e(o,t.export,n.export),T.path=e(o,t.path,n.path),T.resolver=e(r,t.resolver,n.resolver),T.extension=e(o,t.extension,n.extension),T.token=d({},t.token,n.token),T.vars=d({},t.vars,n.vars),N.scope=function(n,t){var e=n.vars,i=e.EXTEND,c=e.LAYOUT,u=e.BLOCKS,a=e.BUFFER,f=e.MACRO;function s(){var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};this.initBlocks(),this.initMacro(),d(this,n)}return s.helpers=function(n){d(s.prototype,n)},s.property=function(n,t){Object.defineProperty(s.prototype,n,t)},s.method=function(n,t){Object.defineProperty(s.prototype,n,{value:t,writable:!1,configurable:!1,enumerable:!1})},s.property(a,{value:U(),writable:!1,configurable:!1,enumerable:!1}),s.property(u,{value:{},writable:!0,configurable:!1,enumerable:!1}),s.property(f,{value:{},writable:!0,configurable:!1,enumerable:!1}),s.property(c,{value:!1,writable:!0,configurable:!1,enumerable:!1}),s.property(i,{value:!1,writable:!0,configurable:!1,enumerable:!1}),s.method("initBlocks",(function(){this[u]={}})),s.method("initMacro",(function(){this[f]={}})),s.method("getMacro",(function(){return this[f]})),s.method("getBuffer",(function(){return this[a]})),s.method("getBlocks",(function(){return this[u]})),s.method("setExtend",(function(n){this[i]=n})),s.method("getExtend",(function(){return this[i]})),s.method("setLayout",(function(n){this[c]=n})),s.method("getLayout",(function(){return this[c]})),s.method("clone",(function(n){var t=[c,i,a];return!0===n&&t.push(u),b(this,t)})),s.method("extend",(function(n){this.setExtend(!0),this.setLayout(n)})),s.method("echo",(function(){var n=this.getBuffer();[].slice.call(arguments).forEach((function(t){n(t)}))})),s.method("fn",(function(n){var t=this.getBuffer(),e=this;return function(){return t.backup(),r(n)&&n.apply(e,arguments),t.restore()}})),s.method("get",(function(n,t){var e=v(this,n),r=e.shift(),o=e.pop();return y(r,o)?r[o]:t})),s.method("set",(function(n,t){var e=v(this,n),r=e.shift(),o=e.pop();return this.getExtend()&&y(r,o)?r[o]:r[o]=t})),s.method("macro",(function(n,t){var e=this.getMacro(),r=this.fn(t),o=this;e[n]=function(){return o.echo(r.apply(void 0,arguments))}})),s.method("call",(function(n){var t=this.getMacro()[n],e=[].slice.call(arguments,1);if(r(t))return t.apply(t,e)})),s.method("block",(function(n,t){var e=this,r=this.getBlocks();if(r[n]=r[n]||[],r[n].push(this.fn(t)),!this.getExtend()){var o=Object.assign([],r[n]),i=function(){return o.shift()};this.echo(i()(function n(){var t=i();return t?function(){e.echo(t(n()))}:m}()))}})),s.method("include",(function(n,t,e){var r=!1===e?{}:this.clone(!0),o=d(r,t||{}),i=this.render(n,o);this.echo(i)})),s.method("use",(function(n,t){var e=this.require(n);this.echo(w(e,(function(n){var e=this.getMacro();g(n,(function(n,r){e[[t,r].join(".")]=n}))}),this))})),s.method("async",(function(n,t){this.echo(w(n,(function(n){return this.fn(t)(n)}),this))})),s.method("el",(function(n,t,e){r(e)&&(e=this.fn(e)()),this.echo(w(e,(function(e){return B(n,t,e)}),this))})),s.method("each",(function(n,t){o(n)&&(n=this.get(n,[])),g(n,t)})),s.helpers(t),s}(T,q),N.compile=S(T),N.wrapper=function(n){var t=n.export;return function(n){var e="(function(o){\n";return n.forEach((function(n){e+="o["+JSON.stringify(n.name)+"]="+String(n.content)+"\n"})),e+='})(window["'+t+'"] = window["'+t+'"] || {});\n'}}(T),N.cache=function(n){var t=n.export,e={};return{preload:function(){return!1===c()&&this.load(window[t]),this},exist:function(n){return y(e,n)},get:function(n){return e[n]},remove:function(n){delete e[n]},resolve:function(n){return Promise.resolve(this.get(n))},set:function(n,t){return e[n]=t,this},load:function(n){return d(e,n),this}}.preload()}(T),N.template=M(T,N.cache,N.compile),N},__express:function(c,u,a){r(u)&&(a=u,u={});var f=d({},(u=u||{}).settings),s=e(o,f.views,t.path),h=e(i,f["view cache"],t.cache),l=d({},f["view options"]),p=n.relative(s,c);return l.path=s,l.cache=h,N.configure(l),N.render(p,u).then((function(n){a(null,n)})).catch((function(n){a(n)}))}},N.configure(C||{}),N.helpers({require:function(n){return N.require(n,this)},render:function(n,t){return N.render(n,t)}}),N);return D}));

package/dist/ejs.mjs

@@ -14,15 +14,15 @@ defaults.resolver = null;
 
 defaults.extension = 'ejs';
 
+defaults.withObject = false;
+
 defaults.vars = {
-    EXTEND: '$$$',
+    SCOPE: 'ejs',
+    EXTEND: '$$e',
     BUFFER: '$$a',
-    OUTPUT: '$$i',
     LAYOUT: '$$l',
     BLOCKS: '$$b',
     MACRO: '$$m',
-    ERROR: '$$e',
-    SCOPE: '$$s',
     SAFE: '$$v',
 };
 
@@ -254,6 +254,7 @@ const match = (regex, text, callback) => {
  * @constructor
  */
 const Compiler = (config) => {
+    const withObject = config.withObject;
     const token = config.token;
     const vars = config.vars;
     const matches = [];
@@ -294,14 +295,15 @@ const Compiler = (config) => {
         });
         source += `');`;
         source = `try{${source}}catch(e){console.info(e)}`;
-        source = `with(${SCOPE}){${source}}`;
+        if(withObject) {
+            source = `with(${SCOPE}){${source}}`;
+        }
         source = `${BUFFER}.start();${source}return ${BUFFER}.end();`;
         source += `\n//# sourceURL=${path}`;
         let result = null;
         try {
             result = new Function(SCOPE, BUFFER, SAFE, source);
             result.source = `(function(${SCOPE},${BUFFER},${SAFE}){\n${source}\n})`;
-            //result.source = result.toString()
         } catch (e) {
             console.log(e);
             e.filename = path;
@@ -424,151 +426,83 @@ const Buffer = () => {
 };
 
 const configure = (config, methods) => {
-    /**
-     *
-     */
-    const { EXTEND, LAYOUT, BLOCKS, BUFFER, MACRO, SCOPE } = config.vars;
-    /**
-     * @memberOf global
-     * @name [SCOPE]
-     * @param data
-     * @constructor
-     */
+    const { EXTEND, LAYOUT, BLOCKS, BUFFER, MACRO } = config.vars;
     function Scope(data = {}) {
         this.initBlocks();
         this.initMacro();
         extend(this, data);
     }
-    /**
-     * @static
-     * @param methods
-     */
     Scope.helpers = (methods) => {
         extend(Scope.prototype, methods);
     };
-    /**
-     * @static
-     * @param name
-     * @param descriptor
-     */
     Scope.property = (name, descriptor) => {
         Object.defineProperty(Scope.prototype, name, descriptor);
     };
-    /**
-     * @static
-     * @param name
-     * @param method
-     */
     Scope.method = (name, method) => {
-        return Scope.property(name,{
+        Object.defineProperty(Scope.prototype, name, {
             value: method,
             writable: false,
             configurable: false,
             enumerable: false
-        })
+        });
     };
-    /**
-     *
-     */
     Scope.property(BUFFER, {
         value: Buffer(),
         writable: false,
         configurable: false,
         enumerable: false
     });
-    /**
-     *
-     */
     Scope.property(BLOCKS, {
         value: {},
         writable: true,
         configurable: false,
         enumerable: false
     });
-    /**
-     *
-     */
     Scope.property(MACRO, {
         value: {},
         writable: true,
         configurable: false,
         enumerable: false
     });
-    /**
-     *
-     */
     Scope.property(LAYOUT, {
         value: false,
         writable: true,
         configurable: false,
         enumerable: false
     });
-    /**
-     *
-     */
     Scope.property(EXTEND, {
         value: false,
         writable: true,
         configurable: false,
         enumerable: false
     });
-    /**
-     *
-     */
     Scope.method('initBlocks', function() {
         this[BLOCKS] = {};
     });
-    /**
-     *
-     */
     Scope.method('initMacro', function() {
         this[MACRO] = {};
     });
-    /**
-     *
-     */
     Scope.method('getMacro', function() {
         return this[MACRO]
     });
-    /**
-     *
-     */
     Scope.method('getBuffer', function() {
         return this[BUFFER]
     });
-    /**
-     *
-     */
     Scope.method('getBlocks', function() {
         return this[BLOCKS]
     });
-    /**
-     *
-     */
     Scope.method('setExtend', function(value) {
         this[EXTEND] = value;
     });
-    /**
-     *
-     */
     Scope.method('getExtend', function() {
         return this[EXTEND]
     });
-    /**
-     *
-     */
     Scope.method('setLayout', function(layout) {
         this[LAYOUT] = layout;
     });
-    /**
-     *
-     */
     Scope.method('getLayout', function() {
         return this[LAYOUT]
     });
-    /**
-     *
-     */
     Scope.method('clone', function(exclude_blocks) {
         const filter = [LAYOUT, EXTEND, BUFFER];
         if (exclude_blocks === true) {
@@ -576,19 +510,10 @@ const configure = (config, methods) => {
         }
         return omit(this, filter)
     });
-    /**
-     * @methodOf global
-     * @function extend
-     * @param layout
-     */
     Scope.method('extend', function(layout) {
         this.setExtend(true);
         this.setLayout(layout);
     });
-    /**
-     * @memberOf global
-     * @function echo
-     */
     Scope.method('echo', function() {
         const buffer = this.getBuffer();
         const params = [].slice.call(arguments);
@@ -596,11 +521,6 @@ const configure = (config, methods) => {
             buffer(item);
         });
     });
-    /**
-     * @memberOf global
-     * @function fn
-     * @param callback
-     */
     Scope.method('fn', function(callback) {
         const buffer = this.getBuffer();
         const context = this;
@@ -612,24 +532,12 @@ const configure = (config, methods) => {
             return buffer.restore()
         }
     });
-    /**
-     * @memberOf global
-     * @function get
-     * @param name
-     * @param [defaults]
-     */
     Scope.method('get', function(name,defaults) {
         const path = getPath(this, name);
         const result = path.shift();
         const prop = path.pop();
         return hasProp(result, prop) ? result[prop] : defaults
     });
-    /**
-     * @memberOf global
-     * @function set
-     * @param name
-     * @param value
-     */
     Scope.method('set', function(name,value) {
         const path = getPath(this, name);
         const result = path.shift();
@@ -639,12 +547,6 @@ const configure = (config, methods) => {
         }
         return result[prop] = value
     });
-    /**
-     * @memberOf global
-     * @function macro
-     * @param name
-     * @param callback
-     */
     Scope.method('macro', function(name, callback) {
         const list = this.getMacro();
         const macro = this.fn(callback);
@@ -653,12 +555,6 @@ const configure = (config, methods) => {
             return context.echo(macro.apply(undefined, arguments))
         };
     });
-    /**
-     * @memberOf global
-     * @function call
-     * @param name
-     * @param {...*} args
-     */
     Scope.method('call', function(name) {
         const list = this.getMacro();
         const macro = list[name];
@@ -667,12 +563,6 @@ const configure = (config, methods) => {
             return macro.apply(macro, params)
         }
     });
-    /**
-     * @memberOf global
-     * @function block
-     * @param name
-     * @param callback
-     */
     Scope.method('block',function(name,callback){
         const blocks = this.getBlocks();
         blocks[name] = blocks[name] || [];
@@ -694,25 +584,12 @@ const configure = (config, methods) => {
         };
         this.echo(current()(next()));
     });
-    /**
-     *  @memberOf global
-     *  @function include
-     *  @param path
-     *  @param [data]
-     *  @param [cx]
-     */
     Scope.method('include',function(path, data, cx){
         const context = cx === false ? {} : this.clone(true);
         const params = extend(context, data || {});
         const promise = this.render(path, params);
         this.echo(promise);
     });
-    /**
-     * @memberOf global
-     * @function use
-     * @param path
-     * @param namespace
-     */
     Scope.method('use',function(path, namespace){
         const promise = this.require(path);
         this.echo(resolve$1(promise,function(exports){
@@ -722,12 +599,6 @@ const configure = (config, methods) => {
             });
         },this));
     });
-    /**
-     *  @memberOf global
-     *  @function async
-     *  @param promise
-     *  @param callback
-     */
     Scope.method('async',function(promise,callback){
         this.echo(
             resolve$1(promise, function(data) {
@@ -735,36 +606,23 @@ const configure = (config, methods) => {
             }, this)
         );
     });
-    Scope.helpers(methods);
-    Scope.helpers({
-        /**
-         * @memberOf global
-         * @param tag
-         * @param attr
-         * @param content
-         */
-        el(tag, attr, content) {
-            if (isFunction(content)) {
-                content = this.fn(content)();
-            }
-            this.echo(
-                resolve$1(content, function(content) {
-                    return element(tag, attr, content)
-                }, this)
-            );
-        },
-        /**
-         * @memberOf global
-         * @param object
-         * @param callback
-         */
-        each(object, callback) {
-            if (isString(object)) {
-                object = this.get(object, []);
-            }
-            each(object, callback);
+    Scope.method('el',function(tag, attr, content){
+        if (isFunction(content)) {
+            content = this.fn(content)();
         }
+        this.echo(
+            resolve$1(content, function(content) {
+                return element(tag, attr, content)
+            }, this)
+        );
     });
+    Scope.method('each',function(object, callback){
+        if (isString(object)) {
+            object = this.get(object, []);
+        }
+        each(object, callback);
+    });
+    Scope.helpers(methods);
     return Scope
 };
 

package/ejs.d.ts

@@ -0,0 +1,26 @@
+declare namespace ejs {
+    // extend layout with blocks in current template file
+    function extend(layout: string);
+    // define block with custom **name** and callback
+    function block(name: string, callback );
+    // set property in current scope
+    function set(path: string, value: any);
+    // get property in current scope
+    function get(path: string, defaults: any );
+    // import macro from file **path** and set to current scope **name** property
+    function use(path: string, name: string);
+    // define macro function with custom **name**
+    function macro(name: string, callback );
+    // call macro function
+    function call(name: string, props?: object, callback?);
+    // asynchronous template execution
+    function async(promise: Promise<any>, callback?);
+    // asynchronous template execution
+    function fn(callback: Function);
+    // buffer output
+    function echo(...any);
+    // buffer output
+    function include();
+    // buffer output
+    function include();
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@kosatyi/ejs",
   "description": "EJS Templates",
   "homepage": "https://github.com/kosatyi/ejs",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "main": "dist/ejs.cjs",
   "module": "dist/ejs.mjs",
   "browser": "dist/ejs.js",
@@ -15,7 +15,8 @@
     "terser": "^5.16.1"
   },
   "files": [
-    "dist"
+    "dist",
+    "ejs.d.ts"
   ],
   "scripts": {
     "build": "rollup -c",