@kosatyi/ejs 0.0.34 → 0.0.35

package/dist/ejs.cjs

@@ -22,6 +22,7 @@ defaults.rmWhitespace = true;
 defaults.withObject = false;
 defaults.vars = {
   SCOPE: 'ejs',
+  COMPONENT: 'ui',
   EXTEND: '$$e',
   BUFFER: '$$a',
   LAYOUT: '$$l',
@@ -49,6 +50,9 @@ var isString = function isString(v) {
 var isBoolean = function isBoolean(v) {
   return typeof v === 'boolean';
 };
+var isUndefined = function isUndefined(v) {
+  return typeof v === 'undefined';
+};
 
 var isNodeEnv = Object.prototype.toString.call(typeof process !== 'undefined' ? process : 0) === '[object process]';
 var isNode = function isNode() {
@@ -129,7 +133,7 @@ var map = function map(object, callback, context) {
   var result = [];
   each(object, function (value, key, object) {
     var item = callback(value, key, object);
-    if (item !== undefined) {
+    if (isUndefined(item) === false) {
       result.push(item);
     }
   });
@@ -140,7 +144,7 @@ var filter = function filter(object, callback, context) {
   var result = isArray ? [] : {};
   each(object, function (value, key, object) {
     var item = callback(value, key, object);
-    if (item !== undefined) {
+    if (isUndefined(item) === false) {
       if (isArray) {
         result.push(item);
       } else {
@@ -312,7 +316,8 @@ var Compiler = /*#__PURE__*/function () {
       var _this$vars = this.vars,
         SCOPE = _this$vars.SCOPE,
         SAFE = _this$vars.SAFE,
-        BUFFER = _this$vars.BUFFER;
+        BUFFER = _this$vars.BUFFER,
+        COMPONENT = _this$vars.COMPONENT;
       if (this.rmWhitespace) {
         content = content.replace(/[\r\n]+/g, '\n').replace(/^\s+|\s+$/gm, '');
       }
@@ -335,8 +340,8 @@ var Compiler = /*#__PURE__*/function () {
       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 = new Function(SCOPE, COMPONENT, BUFFER, SAFE, source);
+        result.source = "(function(".concat(SCOPE, ",").concat(COMPONENT, ",").concat(BUFFER, ",").concat(SAFE, "){\n").concat(source, "\n})");
       } catch (e) {
         e.filename = path;
         e.source = source;
@@ -482,7 +487,8 @@ var Context = /*#__PURE__*/function () {
         LAYOUT = _config$vars.LAYOUT,
         BLOCKS = _config$vars.BLOCKS,
         BUFFER = _config$vars.BUFFER,
-        MACRO = _config$vars.MACRO;
+        MACRO = _config$vars.MACRO,
+        COMPONENT = _config$vars.COMPONENT;
       this.create = function (data) {
         return new Scope(data);
       };
@@ -524,6 +530,9 @@ var Context = /*#__PURE__*/function () {
       Scope.method('getBuffer', function () {
         return this[BUFFER];
       });
+      Scope.method('getComponent', function () {
+        return this[COMPONENT];
+      });
       Scope.method('getBlocks', function () {
         return this[BLOCKS];
       });
@@ -656,6 +665,7 @@ var Context = /*#__PURE__*/function () {
         }
         each(object, callback);
       });
+      Scope.method(COMPONENT, function () {}, true);
     }
   }]);
   return Context;
@@ -747,7 +757,7 @@ var init = function init(options) {
   };
   var output = function output(path, scope) {
     return template.get(path).then(function (callback) {
-      return callback.call(scope, scope, scope.getBuffer(), safeValue);
+      return callback.call(scope, scope, scope.getComponent(), scope.getBuffer(), safeValue);
     });
   };
   var _require = function require(name) {

package/dist/ejs.js

@@ -16,6 +16,7 @@
     defaults.withObject = false;
     defaults.vars = {
       SCOPE: 'ejs',
+      COMPONENT: 'ui',
       EXTEND: '$$e',
       BUFFER: '$$a',
       LAYOUT: '$$l',
@@ -43,6 +44,9 @@
     var isBoolean = function isBoolean(v) {
       return typeof v === 'boolean';
     };
+    var isUndefined = function isUndefined(v) {
+      return typeof v === 'undefined';
+    };
 
     var isNodeEnv = Object.prototype.toString.call(typeof process !== 'undefined' ? process : 0) === '[object process]';
     var isNode = function isNode() {
@@ -123,7 +127,7 @@
       var result = [];
       each(object, function (value, key, object) {
         var item = callback(value, key, object);
-        if (item !== undefined) {
+        if (isUndefined(item) === false) {
           result.push(item);
         }
       });
@@ -134,7 +138,7 @@
       var result = isArray ? [] : {};
       each(object, function (value, key, object) {
         var item = callback(value, key, object);
-        if (item !== undefined) {
+        if (isUndefined(item) === false) {
           if (isArray) {
             result.push(item);
           } else {
@@ -306,7 +310,8 @@
           var _this$vars = this.vars,
             SCOPE = _this$vars.SCOPE,
             SAFE = _this$vars.SAFE,
-            BUFFER = _this$vars.BUFFER;
+            BUFFER = _this$vars.BUFFER,
+            COMPONENT = _this$vars.COMPONENT;
           if (this.rmWhitespace) {
             content = content.replace(/[\r\n]+/g, '\n').replace(/^\s+|\s+$/gm, '');
           }
@@ -329,8 +334,8 @@
           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 = new Function(SCOPE, COMPONENT, BUFFER, SAFE, source);
+            result.source = "(function(".concat(SCOPE, ",").concat(COMPONENT, ",").concat(BUFFER, ",").concat(SAFE, "){\n").concat(source, "\n})");
           } catch (e) {
             e.filename = path;
             e.source = source;
@@ -476,7 +481,8 @@
             LAYOUT = _config$vars.LAYOUT,
             BLOCKS = _config$vars.BLOCKS,
             BUFFER = _config$vars.BUFFER,
-            MACRO = _config$vars.MACRO;
+            MACRO = _config$vars.MACRO,
+            COMPONENT = _config$vars.COMPONENT;
           this.create = function (data) {
             return new Scope(data);
           };
@@ -518,6 +524,9 @@
           Scope.method('getBuffer', function () {
             return this[BUFFER];
           });
+          Scope.method('getComponent', function () {
+            return this[COMPONENT];
+          });
           Scope.method('getBlocks', function () {
             return this[BLOCKS];
           });
@@ -650,6 +659,7 @@
             }
             each(object, callback);
           });
+          Scope.method(COMPONENT, function () {}, true);
         }
       }]);
       return Context;
@@ -741,7 +751,7 @@
       };
       var output = function output(path, scope) {
         return template.get(path).then(function (callback) {
-          return callback.call(scope, scope, scope.getBuffer(), safeValue);
+          return callback.call(scope, scope, scope.getComponent(), scope.getBuffer(), safeValue);
         });
       };
       var _require = function require(name) {

package/dist/ejs.min.js

@@ -1 +1 @@
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).ejs={})}(this,(function(t){"use strict";var e={},n={export:"ejsPrecompiled",cache:!0,path:"views",resolver:null,extension:"ejs",rmWhitespace:!0,withObject:!1,vars:{SCOPE:"ejs",EXTEND:"$$e",BUFFER:"$$a",LAYOUT:"$$l",BLOCKS:"$$b",MACRO:"$$m",SAFE:"$$v"},token:{start:"<%",end:"%>",regex:"([\\s\\S]+?)"}},r=function(){var t=[].slice.call(arguments),e=t.shift();return t.filter(e).pop()},i=function(t){return"function"==typeof t},o=function(t){return"string"==typeof t},c=function(t){return"boolean"==typeof t},u="[object process]"===Object.prototype.toString.call("undefined"!=typeof process?process:0),s=function(){return u},a={"'":"'","\\":"\\","\r":"r","\n":"n","\t":"t","\u2028":"u2028","\u2029":"u2029"},h={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;"},f=function(t){return new RegExp(["[",Object.keys(t).join(""),"]"].join(""),"g")},l=f(h),p=f(a),v=function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return(""+t).replace(l,(function(t){return h[t]}))},d=function(t,e,n){return null==(n=t)?"":e?v(n):n},m=function(t,e){var n=t,r=e.split("."),i=r.pop();return r.forEach((function(t){n=n[t]=n[t]||{}})),[n,i]},g=function(t,e){var n=t.split(".").pop();return n!==e&&(t=[t,e].join(".")),t},y=function(){for(var t=arguments.length,e=new Array(t),n=0;n<t;n++)e[n]=arguments[n];var r=e.shift();return e.filter((function(t){return t})).reduce((function(t,e){return Object.assign(t,e)}),r)},b=function(){},w=function(t,e){var n;for(n in t)x(t,n)&&e(t[n],n,t)},j=function(t,e){return function(t,e,n){var r=t instanceof Array,i=r?[]:{};return w(t,(function(t,n,o){var c=e(t,n,o);void 0!==c&&(r?i.push(c):i[n]=c)})),i}(t,(function(t,n){if(-1===e.indexOf(n))return t}))},k=function(t,e,n){return Promise.resolve(t).then(e.bind(n))},x=function(t,e){return t&&t.hasOwnProperty(e)},E=["area","base","br","col","embed","hr","img","input","link","meta","param","source","track","wbr"],O=" ",F='"',P="/",B="<",R=">",S=function(t,e,n){var r=[],i=-1===E.indexOf(t),o=function(t,e,n){var r=[];return w(t,(function(t,n,i){var o=e(t,n,i);void 0!==o&&r.push(o)})),r}(e,(function(t,e){if(null!=t)return[v(e),[F,v(t),F].join("")].join("=")})).join(O);return r.push([B,t,O,o,R].join("")),n&&r.push(n instanceof Array?n.join(""):n),i&&r.push([B,P,t,R].join("")),r.join("")};function $(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function U(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,M(r.key),r)}}function A(t,e,n){return e&&U(t.prototype,e),n&&U(t,n),Object.defineProperty(t,"prototype",{writable:!1}),t}function M(t){var e=function(t,e){if("object"!=typeof t||null===t)return t;var n=t[Symbol.toPrimitive];if(void 0!==n){var r=n.call(t,e||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===e?String:Number)(t)}(t,"string");return"symbol"==typeof e?e:String(e)}var T=[{symbol:"-",format:function(t){return"')\n".concat(this.BUFFER,"(").concat(this.SAFE,"(").concat(t,",1))\n").concat(this.BUFFER,"('")}},{symbol:"=",format:function(t){return"')\n".concat(this.BUFFER,"(").concat(this.SAFE,"(").concat(t,"))\n").concat(this.BUFFER,"('")}},{symbol:"#",format:function(t){return"')\n/**".concat(t,"**/\n").concat(this.BUFFER,"('")}},{symbol:"",format:function(t){return"')\n".concat(t.trim(),"\n").concat(this.BUFFER,"('")}}],_=function(){function t(e){$(this,t),this.configure(e)}return A(t,[{key:"configure",value:function(t){var e=this;this.withObject=t.withObject,this.rmWhitespace=t.rmWhitespace,this.token=t.token,this.vars=t.vars,this.matches=[],this.formats=[],this.slurp={match:"[ \\t]*",start:[this.token.start,"_"],end:["_",this.token.end]},T.forEach((function(t){e.matches.push(e.token.start.concat(t.symbol).concat(e.token.regex).concat(e.token.end)),e.formats.push(t.format.bind(e.vars))})),this.regex=new RegExp(this.matches.join("|").concat("|$"),"g"),this.slurpStart=new RegExp([this.slurp.match,this.slurp.start.join("")].join(""),"gm"),this.slurpEnd=new RegExp([this.slurp.end.join(""),this.slurp.match].join(""),"gm")}},{key:"truncate",value:function(t){return t&&t.replace(/^(?:\r\n|\r|\n)/,"")}},{key:"compile",value:function(t,e){var n=this,r=this.vars,i=r.SCOPE,o=r.SAFE,c=r.BUFFER;this.rmWhitespace&&(t=t.replace(/[\r\n]+/g,"\n").replace(/^\s+|\s+$/gm,"")),t=t.replace(this.slurpStart,this.token.start).replace(this.slurpEnd,this.token.end);var u,s,h,f="".concat(c,"('");u=this.regex,s=function(e,r,i){f+=(""+t.slice(r,i)).replace(p,(function(t){return"\\"+a[t]})),e.forEach((function(t,e){t&&(f+=n.formats[e](t))}))},h=0,t.replace(u,(function(){var t=[].slice.call(arguments,0,-1),e=t.pop(),n=t.shift();return s(t,h,e),h=e+n.length,n})),f="try{".concat(f+="');","}catch(e){console.info(e)}"),this.withObject&&(f="with(".concat(i,"){").concat(f,"}")),f="".concat(c,".start();").concat(f,"return ").concat(c,".end();"),f+="\n//# sourceURL=".concat(e);var l=null;try{(l=new Function(i,c,o,f)).source="(function(".concat(i,",").concat(c,",").concat(o,"){\n").concat(f,"\n})")}catch(t){throw t.filename=e,t.source=f,t}return l}}]),t}(),L=function(t,e){return e=(e=[t,e].join("/")).replace(/\/\//g,"/")},W=function(t,e){return fetch(L(t,e)).then((function(t){return t.text()}))},C=function(t,n){return new Promise((function(r,i){e.readFile(L(t,n),(function(t,e){t?i(t):r(e.toString())}))}))},q=function(){function t(e,n,r){$(this,t),this.cache=n,this.watcher=null,this.compiler=r,this.configure(e)}return A(t,[{key:"configure",value:function(t){var n,r,o;this.path=t.path,this.resolver=i(t.resolver)?t.resolver:s()?C:W,(n=this.watcher)&&n.unwatch("."),t.watch&&s()&&(this.watcher=(r=this.cache,o=this.path,e.watch(".",{cwd:r}).on("change",(function(t){o.remove(t)})).on("error",(function(t){console.log("watcher error: "+t)}))))}},{key:"resolve",value:function(t){return this.resolver(this.path,t)}},{key:"result",value:function(t,e){return this.cache.set(t,e),e}},{key:"compile",value:function(t,e){return i(t)?t:this.compiler.compile(t,e)}},{key:"get",value:function(t){var e=this;if(this.cache.exist(t))return this.cache.resolve(t);var n=this.resolve(t).then((function(n){return e.result(t,e.compile(n,t))}));return this.result(t,n)}}]),t}(),N=function(t){return Promise.all(t).then((function(t){return t.join("")}))},D=function(){function t(e){$(this,t),this.configure(e)}return A(t,[{key:"configure",value:function(t,e){var n=t.vars,r=n.EXTEND,c=n.LAYOUT,u=n.BLOCKS,s=n.BUFFER,a=n.MACRO;function h(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};this.initBlocks(),this.initMacro(),y(this,t)}this.create=function(t){return new h(t)},this.helpers=function(t){y(h.prototype,t)},h.prototype=y({},e||{}),h.defineProp=h.method=function(t,e){var n=arguments.length>2&&void 0!==arguments[2]&&arguments[2],r=arguments.length>3&&void 0!==arguments[3]&&arguments[3],i=arguments.length>4&&void 0!==arguments[4]&&arguments[4];Object.defineProperty(h.prototype,t,{value:e,writable:n,configurable:r,enumerable:i})},h.defineProp(s,function(){var t=[],e=[];function n(t){e.push(t)}return n.start=function(){e=[]},n.backup=function(){t.push(e.concat()),e=[]},n.restore=function(){var n=e.concat();return e=t.pop(),N(n)},n.error=function(t){throw t},n.end=function(){return N(e)},n}()),h.defineProp(u,{},!0),h.defineProp(a,{},!0),h.defineProp(c,!1,!0),h.defineProp(r,!1,!0),h.method("initBlocks",(function(){this[u]={}})),h.method("initMacro",(function(){this[a]={}})),h.method("getMacro",(function(){return this[a]})),h.method("getBuffer",(function(){return this[s]})),h.method("getBlocks",(function(){return this[u]})),h.method("setExtend",(function(t){this[r]=t})),h.method("getExtend",(function(){return this[r]})),h.method("setLayout",(function(t){this[c]=t})),h.method("getLayout",(function(){return this[c]})),h.method("clone",(function(t){var e=[c,r,s];return!0===t&&e.push(u),j(this,e)})),h.method("extend",(function(t){this.setExtend(!0),this.setLayout(t)})),h.method("echo",(function(){var t=this.getBuffer(),e=[].slice.call(arguments);e.forEach(t)})),h.method("fn",(function(t){var e=this.getBuffer(),n=this;return function(){return e.backup(),i(t)&&t.apply(n,arguments),e.restore()}})),h.method("get",(function(t,e){var n=m(this,t),r=n.shift(),i=n.pop();return x(r,i)?r[i]:e})),h.method("set",(function(t,e){var n=m(this,t),r=n.shift(),i=n.pop();return this.getExtend()&&x(r,i)?r[i]:r[i]=e})),h.method("macro",(function(t,e){var n=this.getMacro(),r=this.fn(e),i=this;n[t]=function(){return i.echo(r.apply(void 0,arguments))}})),h.method("call",(function(t){var e=this.getMacro(),n=e[t],r=[].slice.call(arguments,1);if(i(n))return n.apply(n,r)})),h.method("block",(function(t,e){var n=this,r=this.getBlocks();if(r[t]=r[t]||[],r[t].push(this.fn(e)),!this.getExtend()){var i=Object.assign([],r[t]),o=function(){return i.shift()};this.echo(o()(function t(){var e=o();return e?function(){n.echo(e(t()))}:b}()))}})),h.method("include",(function(t,e,n){var r=!1===n?{}:this.clone(!0),i=y(r,e||{}),o=this.render(t,i);this.echo(o)})),h.method("use",(function(t,e){var n=this.require(t);this.echo(k(n,(function(t){var n=this.getMacro();w(t,(function(t,r){n[[e,r].join(".")]=t}))}),this))})),h.method("async",(function(t,e){this.echo(k(t,(function(t){return this.fn(e)(t)}),this))})),h.method("node",(function(t,e,n){return S(t,e,n)})),h.method("el",(function(t,e,n){i(n)&&(n=this.fn(n)()),this.echo(k(n,(function(n){return S(t,e,n)}),this))})),h.method("each",(function(t,e){o(t)&&(t=this.get(t,[])),w(t,e)}))}}]),t}(),K="undefined"!=typeof globalThis?globalThis:window||self,X=function(){function t(e){var n,r,i;$(this,t),n=this,i={},(r=M(r="list"))in n?Object.defineProperty(n,r,{value:i,enumerable:!0,configurable:!0,writable:!0}):n[r]=i,this.configure(e),!1===s()&&this.load(K[this.namespace])}return A(t,[{key:"configure",value:function(t){this.list={},this.namespace=t.export}},{key:"load",value:function(t){return y(this.list,t),this}},{key:"exist",value:function(t){return x(this.list,t)}},{key:"get",value:function(t){return this.list[t]}},{key:"remove",value:function(t){delete this.list[t]}},{key:"resolve",value:function(t){return Promise.resolve(this.get(t))}},{key:"set",value:function(t,e){return this.list[t]=e,this}}]),t}(),Y=function(t,e){y(t,{export:r(o,n.export,t.export,e.export),path:r(o,n.path,t.path,e.path),resolver:r(i,n.resolver,t.resolver,e.resolver),extension:r(o,n.extension,t.extension,e.extension),withObject:r(c,n.withObject,t.withObject,e.withObject),rmWhitespace:r(c,n.rmWhitespace,t.rmWhitespace,e.rmWhitespace),token:y({},n.token,t.token,e.token),vars:y({},n.vars,t.vars,e.vars)})},V=function t(u){var s={},a={};Y(s,u||{});var h=new D(s),f=new _(s),l=new X(s),p=new q(s,l,f),v=function(t){return Y(s,t),h.configure(s,a),f.configure(s),l.configure(s),p.configure(s),s},m=function(t,e){return p.get(t).then((function(t){return t.call(e,e,e.getBuffer(),d)}))},b=function(t,e){var n=g(t,s.extension),r=h.create(e);return m(n,r).then((function(t){if(r.getExtend()){r.setExtend(!1);var e=r.getLayout(),n=r.clone();return b(e,n)}return t}))},w=function(t){h.helpers(y(a,t||{}))};return w({require:function(t){return function(t){var e=g(t,s.extension),n=h.create({});return m(e,n).then((function(){return n.getMacro()}))}(t)},render:function(t,e){return b(t,e)}}),{render:b,helpers:w,configure:v,compile:function(t,e){return f.compile(t,e)},create:function(e){return t(e)},preload:function(t){return l.load(t)},__express:function(t,u,s){i(u)&&(s=u,u={});var a=y({},(u=u||{}).settings),h=r(o,n.path,a.views),f=r(c,n.cache,a["view cache"]),l=y({},a["view options"]),p=e.relative(h,t);return l.path=h,l.cache=f,v(l),b(p,u).then((function(t){s(null,t)})).catch((function(t){s(t)}))}}}({}),z=V.render,G=V.helpers,H=V.configure,I=V.wrapper,J=V.compile,Q=V.create,Z=V.preload,tt=V.__express;t.__express=tt,t.compile=J,t.configure=H,t.create=Q,t.element=S,t.helpers=G,t.preload=Z,t.render=z,t.safeValue=d,t.wrapper=I,Object.defineProperty(t,"__esModule",{value:!0})}));
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).ejs={})}(this,(function(t){"use strict";var e={},n={export:"ejsPrecompiled",cache:!0,path:"views",resolver:null,extension:"ejs",rmWhitespace:!0,withObject:!1,vars:{SCOPE:"ejs",COMPONENT:"ui",EXTEND:"$$e",BUFFER:"$$a",LAYOUT:"$$l",BLOCKS:"$$b",MACRO:"$$m",SAFE:"$$v"},token:{start:"<%",end:"%>",regex:"([\\s\\S]+?)"}},r=function(){var t=[].slice.call(arguments),e=t.shift();return t.filter(e).pop()},i=function(t){return"function"==typeof t},o=function(t){return"string"==typeof t},c=function(t){return"boolean"==typeof t},u=function(t){return void 0===t},s="[object process]"===Object.prototype.toString.call("undefined"!=typeof process?process:0),a=function(){return s},h={"'":"'","\\":"\\","\r":"r","\n":"n","\t":"t","\u2028":"u2028","\u2029":"u2029"},f={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;"},l=function(t){return new RegExp(["[",Object.keys(t).join(""),"]"].join(""),"g")},p=l(f),v=l(h),d=function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return(""+t).replace(p,(function(t){return f[t]}))},m=function(t,e,n){return null==(n=t)?"":e?d(n):n},g=function(t,e){var n=t,r=e.split("."),i=r.pop();return r.forEach((function(t){n=n[t]=n[t]||{}})),[n,i]},y=function(t,e){var n=t.split(".").pop();return n!==e&&(t=[t,e].join(".")),t},b=function(){for(var t=arguments.length,e=new Array(t),n=0;n<t;n++)e[n]=arguments[n];var r=e.shift();return e.filter((function(t){return t})).reduce((function(t,e){return Object.assign(t,e)}),r)},w=function(){},j=function(t,e){var n;for(n in t)E(t,n)&&e(t[n],n,t)},k=function(t,e){return function(t,e,n){var r=t instanceof Array,i=r?[]:{};return j(t,(function(t,n,o){var c=e(t,n,o);!1===u(c)&&(r?i.push(c):i[n]=c)})),i}(t,(function(t,n){if(-1===e.indexOf(n))return t}))},x=function(t,e,n){return Promise.resolve(t).then(e.bind(n))},E=function(t,e){return t&&t.hasOwnProperty(e)},O=["area","base","br","col","embed","hr","img","input","link","meta","param","source","track","wbr"],F=" ",P='"',B="/",R="<",S=">",$=function(t,e,n){var r=[],i=-1===O.indexOf(t),o=function(t,e,n){var r=[];return j(t,(function(t,n,i){var o=e(t,n,i);!1===u(o)&&r.push(o)})),r}(e,(function(t,e){if(null!=t)return[d(e),[P,d(t),P].join("")].join("=")})).join(F);return r.push([R,t,F,o,S].join("")),n&&r.push(n instanceof Array?n.join(""):n),i&&r.push([R,B,t,S].join("")),r.join("")};function M(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function T(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,U(r.key),r)}}function C(t,e,n){return e&&T(t.prototype,e),n&&T(t,n),Object.defineProperty(t,"prototype",{writable:!1}),t}function U(t){var e=function(t,e){if("object"!=typeof t||null===t)return t;var n=t[Symbol.toPrimitive];if(void 0!==n){var r=n.call(t,e||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===e?String:Number)(t)}(t,"string");return"symbol"==typeof e?e:String(e)}var A=[{symbol:"-",format:function(t){return"')\n".concat(this.BUFFER,"(").concat(this.SAFE,"(").concat(t,",1))\n").concat(this.BUFFER,"('")}},{symbol:"=",format:function(t){return"')\n".concat(this.BUFFER,"(").concat(this.SAFE,"(").concat(t,"))\n").concat(this.BUFFER,"('")}},{symbol:"#",format:function(t){return"')\n/**".concat(t,"**/\n").concat(this.BUFFER,"('")}},{symbol:"",format:function(t){return"')\n".concat(t.trim(),"\n").concat(this.BUFFER,"('")}}],_=function(){function t(e){M(this,t),this.configure(e)}return C(t,[{key:"configure",value:function(t){var e=this;this.withObject=t.withObject,this.rmWhitespace=t.rmWhitespace,this.token=t.token,this.vars=t.vars,this.matches=[],this.formats=[],this.slurp={match:"[ \\t]*",start:[this.token.start,"_"],end:["_",this.token.end]},A.forEach((function(t){e.matches.push(e.token.start.concat(t.symbol).concat(e.token.regex).concat(e.token.end)),e.formats.push(t.format.bind(e.vars))})),this.regex=new RegExp(this.matches.join("|").concat("|$"),"g"),this.slurpStart=new RegExp([this.slurp.match,this.slurp.start.join("")].join(""),"gm"),this.slurpEnd=new RegExp([this.slurp.end.join(""),this.slurp.match].join(""),"gm")}},{key:"truncate",value:function(t){return t&&t.replace(/^(?:\r\n|\r|\n)/,"")}},{key:"compile",value:function(t,e){var n=this,r=this.vars,i=r.SCOPE,o=r.SAFE,c=r.BUFFER,u=r.COMPONENT;this.rmWhitespace&&(t=t.replace(/[\r\n]+/g,"\n").replace(/^\s+|\s+$/gm,"")),t=t.replace(this.slurpStart,this.token.start).replace(this.slurpEnd,this.token.end);var s,a,f,l="".concat(c,"('");s=this.regex,a=function(e,r,i){l+=(""+t.slice(r,i)).replace(v,(function(t){return"\\"+h[t]})),e.forEach((function(t,e){t&&(l+=n.formats[e](t))}))},f=0,t.replace(s,(function(){var t=[].slice.call(arguments,0,-1),e=t.pop(),n=t.shift();return a(t,f,e),f=e+n.length,n})),l="try{".concat(l+="');","}catch(e){console.info(e)}"),this.withObject&&(l="with(".concat(i,"){").concat(l,"}")),l="".concat(c,".start();").concat(l,"return ").concat(c,".end();"),l+="\n//# sourceURL=".concat(e);var p=null;try{(p=new Function(i,u,c,o,l)).source="(function(".concat(i,",").concat(u,",").concat(c,",").concat(o,"){\n").concat(l,"\n})")}catch(t){throw t.filename=e,t.source=l,t}return p}}]),t}(),L=function(t,e){return e=(e=[t,e].join("/")).replace(/\/\//g,"/")},N=function(t,e){return fetch(L(t,e)).then((function(t){return t.text()}))},W=function(t,n){return new Promise((function(r,i){e.readFile(L(t,n),(function(t,e){t?i(t):r(e.toString())}))}))},q=function(){function t(e,n,r){M(this,t),this.cache=n,this.watcher=null,this.compiler=r,this.configure(e)}return C(t,[{key:"configure",value:function(t){var n,r,o;this.path=t.path,this.resolver=i(t.resolver)?t.resolver:a()?W:N,(n=this.watcher)&&n.unwatch("."),t.watch&&a()&&(this.watcher=(r=this.cache,o=this.path,e.watch(".",{cwd:r}).on("change",(function(t){o.remove(t)})).on("error",(function(t){console.log("watcher error: "+t)}))))}},{key:"resolve",value:function(t){return this.resolver(this.path,t)}},{key:"result",value:function(t,e){return this.cache.set(t,e),e}},{key:"compile",value:function(t,e){return i(t)?t:this.compiler.compile(t,e)}},{key:"get",value:function(t){var e=this;if(this.cache.exist(t))return this.cache.resolve(t);var n=this.resolve(t).then((function(n){return e.result(t,e.compile(n,t))}));return this.result(t,n)}}]),t}(),D=function(t){return Promise.all(t).then((function(t){return t.join("")}))},K=function(){function t(e){M(this,t),this.configure(e)}return C(t,[{key:"configure",value:function(t,e){var n=t.vars,r=n.EXTEND,c=n.LAYOUT,u=n.BLOCKS,s=n.BUFFER,a=n.MACRO,h=n.COMPONENT;function f(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};this.initBlocks(),this.initMacro(),b(this,t)}this.create=function(t){return new f(t)},this.helpers=function(t){b(f.prototype,t)},f.prototype=b({},e||{}),f.defineProp=f.method=function(t,e){var n=arguments.length>2&&void 0!==arguments[2]&&arguments[2],r=arguments.length>3&&void 0!==arguments[3]&&arguments[3],i=arguments.length>4&&void 0!==arguments[4]&&arguments[4];Object.defineProperty(f.prototype,t,{value:e,writable:n,configurable:r,enumerable:i})},f.defineProp(s,function(){var t=[],e=[];function n(t){e.push(t)}return n.start=function(){e=[]},n.backup=function(){t.push(e.concat()),e=[]},n.restore=function(){var n=e.concat();return e=t.pop(),D(n)},n.error=function(t){throw t},n.end=function(){return D(e)},n}()),f.defineProp(u,{},!0),f.defineProp(a,{},!0),f.defineProp(c,!1,!0),f.defineProp(r,!1,!0),f.method("initBlocks",(function(){this[u]={}})),f.method("initMacro",(function(){this[a]={}})),f.method("getMacro",(function(){return this[a]})),f.method("getBuffer",(function(){return this[s]})),f.method("getComponent",(function(){return this[h]})),f.method("getBlocks",(function(){return this[u]})),f.method("setExtend",(function(t){this[r]=t})),f.method("getExtend",(function(){return this[r]})),f.method("setLayout",(function(t){this[c]=t})),f.method("getLayout",(function(){return this[c]})),f.method("clone",(function(t){var e=[c,r,s];return!0===t&&e.push(u),k(this,e)})),f.method("extend",(function(t){this.setExtend(!0),this.setLayout(t)})),f.method("echo",(function(){var t=this.getBuffer(),e=[].slice.call(arguments);e.forEach(t)})),f.method("fn",(function(t){var e=this.getBuffer(),n=this;return function(){return e.backup(),i(t)&&t.apply(n,arguments),e.restore()}})),f.method("get",(function(t,e){var n=g(this,t),r=n.shift(),i=n.pop();return E(r,i)?r[i]:e})),f.method("set",(function(t,e){var n=g(this,t),r=n.shift(),i=n.pop();return this.getExtend()&&E(r,i)?r[i]:r[i]=e})),f.method("macro",(function(t,e){var n=this.getMacro(),r=this.fn(e),i=this;n[t]=function(){return i.echo(r.apply(void 0,arguments))}})),f.method("call",(function(t){var e=this.getMacro(),n=e[t],r=[].slice.call(arguments,1);if(i(n))return n.apply(n,r)})),f.method("block",(function(t,e){var n=this,r=this.getBlocks();if(r[t]=r[t]||[],r[t].push(this.fn(e)),!this.getExtend()){var i=Object.assign([],r[t]),o=function(){return i.shift()};this.echo(o()(function t(){var e=o();return e?function(){n.echo(e(t()))}:w}()))}})),f.method("include",(function(t,e,n){var r=!1===n?{}:this.clone(!0),i=b(r,e||{}),o=this.render(t,i);this.echo(o)})),f.method("use",(function(t,e){var n=this.require(t);this.echo(x(n,(function(t){var n=this.getMacro();j(t,(function(t,r){n[[e,r].join(".")]=t}))}),this))})),f.method("async",(function(t,e){this.echo(x(t,(function(t){return this.fn(e)(t)}),this))})),f.method("node",(function(t,e,n){return $(t,e,n)})),f.method("el",(function(t,e,n){i(n)&&(n=this.fn(n)()),this.echo(x(n,(function(n){return $(t,e,n)}),this))})),f.method("each",(function(t,e){o(t)&&(t=this.get(t,[])),j(t,e)})),f.method(h,(function(){}),!0)}}]),t}(),X="undefined"!=typeof globalThis?globalThis:window||self,Y=function(){function t(e){var n,r,i;M(this,t),n=this,i={},(r=U(r="list"))in n?Object.defineProperty(n,r,{value:i,enumerable:!0,configurable:!0,writable:!0}):n[r]=i,this.configure(e),!1===a()&&this.load(X[this.namespace])}return C(t,[{key:"configure",value:function(t){this.list={},this.namespace=t.export}},{key:"load",value:function(t){return b(this.list,t),this}},{key:"exist",value:function(t){return E(this.list,t)}},{key:"get",value:function(t){return this.list[t]}},{key:"remove",value:function(t){delete this.list[t]}},{key:"resolve",value:function(t){return Promise.resolve(this.get(t))}},{key:"set",value:function(t,e){return this.list[t]=e,this}}]),t}(),V=function(t,e){b(t,{export:r(o,n.export,t.export,e.export),path:r(o,n.path,t.path,e.path),resolver:r(i,n.resolver,t.resolver,e.resolver),extension:r(o,n.extension,t.extension,e.extension),withObject:r(c,n.withObject,t.withObject,e.withObject),rmWhitespace:r(c,n.rmWhitespace,t.rmWhitespace,e.rmWhitespace),token:b({},n.token,t.token,e.token),vars:b({},n.vars,t.vars,e.vars)})},z=function t(u){var s={},a={};V(s,u||{});var h=new K(s),f=new _(s),l=new Y(s),p=new q(s,l,f),v=function(t){return V(s,t),h.configure(s,a),f.configure(s),l.configure(s),p.configure(s),s},d=function(t,e){return p.get(t).then((function(t){return t.call(e,e,e.getComponent(),e.getBuffer(),m)}))},g=function(t,e){var n=y(t,s.extension),r=h.create(e);return d(n,r).then((function(t){if(r.getExtend()){r.setExtend(!1);var e=r.getLayout(),n=r.clone();return g(e,n)}return t}))},w=function(t){h.helpers(b(a,t||{}))};return w({require:function(t){return function(t){var e=y(t,s.extension),n=h.create({});return d(e,n).then((function(){return n.getMacro()}))}(t)},render:function(t,e){return g(t,e)}}),{render:g,helpers:w,configure:v,compile:function(t,e){return f.compile(t,e)},create:function(e){return t(e)},preload:function(t){return l.load(t)},__express:function(t,u,s){i(u)&&(s=u,u={});var a=b({},(u=u||{}).settings),h=r(o,n.path,a.views),f=r(c,n.cache,a["view cache"]),l=b({},a["view options"]),p=e.relative(h,t);return l.path=h,l.cache=f,v(l),g(p,u).then((function(t){s(null,t)})).catch((function(t){s(t)}))}}}({}),G=z.render,H=z.helpers,I=z.configure,J=z.wrapper,Q=z.compile,Z=z.create,tt=z.preload,et=z.__express;t.__express=et,t.compile=Q,t.configure=I,t.create=Z,t.element=$,t.helpers=H,t.preload=tt,t.render=G,t.safeValue=m,t.wrapper=J,Object.defineProperty(t,"__esModule",{value:!0})}));

package/dist/ejs.mjs

@@ -20,6 +20,7 @@ defaults.withObject = false;
 
 defaults.vars = {
     SCOPE: 'ejs',
+    COMPONENT: 'ui',
     EXTEND: '$$e',
     BUFFER: '$$a',
     LAYOUT: '$$l',
@@ -42,8 +43,12 @@ const typeProp = function () {
 const isFunction = (v) => typeof v === 'function';
 const isString = (v) => typeof v === 'string';
 const isBoolean = (v) => typeof v === 'boolean';
+const isUndefined = (v) => typeof v === 'undefined';
 
-const isNodeEnv = Object.prototype.toString.call(typeof process !== 'undefined' ? process : 0) === '[object process]';
+const isNodeEnv =
+    Object.prototype.toString.call(
+        typeof process !== 'undefined' ? process : 0
+    ) === '[object process]';
 
 const isNode = () => isNodeEnv;
 
@@ -134,7 +139,7 @@ const map = (object, callback, context) => {
         object,
         (value, key, object) => {
             let item = callback(value, key, object);
-            if (item !== undefined) {
+            if (isUndefined(item) === false) {
                 result.push(item);
             }
         });
@@ -148,7 +153,7 @@ const filter = (object, callback, context) => {
         object,
         (value, key, object) => {
             let item = callback(value, key, object);
-            if (item !== undefined) {
+            if (isUndefined(item) === false) {
                 if (isArray) {
                     result.push(item);
                 } else {
@@ -167,7 +172,7 @@ const omit = (object, list) => {
     })
 };
 
-const resolve$1 = (value,callback,context) =>
+const resolve$1 = (value, callback, context) =>
     Promise.resolve(value).then(callback.bind(context));
 
 const hasProp = (object, prop) => {
@@ -262,6 +267,7 @@ class Compiler {
     constructor(config) {
         this.configure(config);
     }
+
     configure(config) {
         this.withObject = config.withObject;
         this.rmWhitespace = config.rmWhitespace;
@@ -293,11 +299,13 @@ class Compiler {
             'gm'
         );
     }
+
     truncate(value) {
         return value && value.replace(/^(?:\r\n|\r|\n)/, '')
     }
+
     compile(content, path) {
-        const { SCOPE, SAFE, BUFFER } = this.vars;
+        const { SCOPE, SAFE, BUFFER, COMPONENT } = this.vars;
         if (this.rmWhitespace) {
             content = content
                 .replace(/[\r\n]+/g, '\n')
@@ -324,8 +332,8 @@ class Compiler {
         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 = new Function(SCOPE, COMPONENT, BUFFER, SAFE, source);
+            result.source = `(function(${SCOPE},${COMPONENT},${BUFFER},${SAFE}){\n${source}\n})`;
         } catch (e) {
             e.filename = path;
             e.source = source;
@@ -455,20 +463,26 @@ class Context {
     constructor(config) {
         this.configure(config);
     }
+
     configure(config, methods) {
-        const { EXTEND, LAYOUT, BLOCKS, BUFFER, MACRO } = config.vars;
+        const { EXTEND, LAYOUT, BLOCKS, BUFFER, MACRO, COMPONENT } = config.vars;
+
         this.create = (data) => {
             return new Scope(data)
         };
+
         this.helpers = (methods) => {
             extend(Scope.prototype, methods);
         };
+
         function Scope(data = {}) {
             this.initBlocks();
             this.initMacro();
             extend(this, data);
         }
+
         Scope.prototype = extend({}, methods || {});
+
         Scope.defineProp = Scope.method = (
             name,
             value,
@@ -483,38 +497,57 @@ class Context {
                 enumerable,
             });
         };
+
         Scope.defineProp(BUFFER, createBuffer());
+
         Scope.defineProp(BLOCKS, {}, true);
+
         Scope.defineProp(MACRO, {}, true);
+
         Scope.defineProp(LAYOUT, false, true);
+
         Scope.defineProp(EXTEND, false, true);
+
         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('getComponent', function () {
+            return this[COMPONENT]
+        });
+
         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) {
@@ -522,15 +555,18 @@ class Context {
             }
             return omit(this, filter)
         });
+
         Scope.method('extend', function (layout) {
             this.setExtend(true);
             this.setLayout(layout);
         });
+
         Scope.method('echo', function () {
             const buffer = this.getBuffer();
             const params = [].slice.call(arguments);
             params.forEach(buffer);
         });
+
         Scope.method('fn', function (callback) {
             const buffer = this.getBuffer();
             const context = this;
@@ -542,12 +578,14 @@ class Context {
                 return buffer.restore()
             }
         });
+
         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
         });
+
         Scope.method('set', function (name, value) {
             const path = getPath(this, name);
             const result = path.shift();
@@ -557,6 +595,7 @@ class Context {
             }
             return (result[prop] = value)
         });
+
         Scope.method('macro', function (name, callback) {
             const list = this.getMacro();
             const macro = this.fn(callback);
@@ -565,6 +604,7 @@ class Context {
                 return context.echo(macro.apply(undefined, arguments))
             };
         });
+
         Scope.method('call', function (name) {
             const list = this.getMacro();
             const macro = list[name];
@@ -573,6 +613,7 @@ class Context {
                 return macro.apply(macro, params)
             }
         });
+
         Scope.method('block', function (name, callback) {
             const blocks = this.getBlocks();
             blocks[name] = blocks[name] || [];
@@ -594,12 +635,14 @@ class Context {
             };
             this.echo(current()(next()));
         });
+
         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);
         });
+
         Scope.method('use', function (path, namespace) {
             const promise = this.require(path);
             this.echo(
@@ -615,6 +658,7 @@ class Context {
                 )
             );
         });
+
         Scope.method('async', function (promise, callback) {
             this.echo(
                 resolve$1(
@@ -626,9 +670,11 @@ class Context {
                 )
             );
         });
+
         Scope.method('node', function (tag, attr, content) {
             return element(tag, attr, content)
         });
+
         Scope.method('el', function (tag, attr, content) {
             if (isFunction(content)) {
                 content = this.fn(content)();
@@ -643,12 +689,15 @@ class Context {
                 )
             );
         });
+
         Scope.method('each', function (object, callback) {
             if (isString(object)) {
                 object = this.get(object, []);
             }
             each(object, callback);
         });
+
+        Scope.method(COMPONENT, function () {}, true);
     }
 }
 
@@ -752,7 +801,13 @@ const init = (options) => {
 
     const output = (path, scope) => {
         return template.get(path).then(function (callback) {
-            return callback.call(scope, scope, scope.getBuffer(), safeValue)
+            return callback.call(
+                scope,
+                scope,
+                scope.getComponent(),
+                scope.getBuffer(),
+                safeValue
+            )
         })
     };
 

package/global.d.ts

@@ -3,42 +3,42 @@ declare global {
      * extend layout with blocks in current template file
      * @param layout
      */
-    function extend(layout: string);
+    function extend(layout: string)
 
     /**
      * define block with custom **name** and callback
      * @param name
      * @param [callback]
      */
-    function block(name: string, callback?);
+    function block(name: string, callback?)
 
     /**
      * set property in current scope
      * @param path
      * @param value
      */
-    function set(path: string, value: any);
+    function set(path: string, value: any)
 
     /**
      * get property in current scope
      * @param path
      * @param defaults
      */
-    function get(path: string, defaults?: any);
+    function get(path: string, defaults?: any)
 
     /**
      * import macro from file **path** and set to current scope **name** property
      * @param path
      * @param name
      */
-    function use(path: string, name: string);
+    function use(path: string, name: string)
 
     /**
      * define macro function with custom **name**
      * @param name
      * @param callback
      */
-    function macro(name: string, callback);
+    function macro(name: string, callback)
 
     /**
      * call macro function
@@ -46,20 +46,20 @@ declare global {
      * @param props
      * @param callback
      */
-    function call(name: string, props?: object, callback?);
+    function call(name: string, props?: object, callback?)
 
     /**
      * asynchronous template execution
      * @param promise
      * @param callback
      */
-    function async(promise: Promise<any>, callback?);
+    function async(promise: Promise<any>, callback?)
 
     /**
      * asynchronous template execution
      * @param callback
      */
-    function fn(callback: Function);
+    function fn(callback: Function)
 
     /**
      *
@@ -67,13 +67,13 @@ declare global {
      * @param {object} attrs
      * @param {function} content
      */
-    function el(tag: string, attrs?: object, content?: any);
+    function el(tag: string, attrs?: object, content?: any)
 
     /**
      * buffer output
      * @param any
      */
-    function echo(...any);
+    function echo(...any)
 
     /**
      * append rendered template from file
@@ -81,16 +81,21 @@ declare global {
      * @param data
      * @param cx
      */
-    function include(path: string, data?: object, cx?: boolean);
+    function include(path: string, data?: object, cx?: boolean)
 
     /**
      *
      * @param value
      * @param callback
      */
-    function each(value:any,callback:Function);
+    function each(value: any, callback: Function)
 
+    /**
+     * define block with custom **name** and callback
+     * @param {string} name
+     * @param {object} [props]
+     */
+    function ui(name: string, props?)
 }
 
 export = global
-

package/package.json

@@ -2,7 +2,7 @@
   "name": "@kosatyi/ejs",
   "description": "EJS Templates",
   "homepage": "https://github.com/kosatyi/ejs",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "main": "dist/ejs.cjs",
   "module": "dist/ejs.mjs",
   "browser": "dist/ejs.js",
@@ -26,7 +26,8 @@
   "devDependencies": {
     "@babel/core": "^7.20.12",
     "@babel/preset-env": "^7.20.2",
-    "@kosatyi/ejs-bundle": "^1.0.6",
+    "@kosatyi/ejs-bundle": "^1.0.8",
+    "@kosatyi/ejs": "file:./",
     "@kosatyi/rollup": "^0.0.1"
   },
   "license": "MIT",