@kosatyi/ejs 0.0.108 → 0.0.110

package/dist/umd/browser.js

@@ -96,7 +96,7 @@
     const symbols = string => {
       return ('' + string).replace(symbolEntitiesMatch, match => '\\' + symbolEntities[match]);
     };
-    const safeValue = (value, escape) => {
+    const escapeValue = (value, escape) => {
       const check = value;
       return check == null ? '' : Boolean(escape) === true ? entities(check) : check;
     };
@@ -155,12 +155,26 @@
       }
     };
 
-    class Template {
+    class EjsError extends Error {
+      constructor(code, content) {
+        super(content);
+        this.code = code;
+        if (content instanceof Error) {
+          this.stack = content.stack;
+          this.message = content.message;
+        }
+      }
+    }
+    const error = (code, content) => {
+      throw new EjsError(code, content);
+    };
+
+    class EjsTemplate {
       #path;
       #resolver;
       #cache;
       #compiler;
-      static exports = ['configure', 'get', 'compile'];
+      static exports = ['configure', 'get'];
       constructor(options, cache, compiler) {
         bindContext(this, this.constructor.exports);
         this.#cache = cache;
@@ -176,11 +190,11 @@
       #resolve(template) {
         const cached = this.#cache.get(template);
         if (cached instanceof Promise) return cached;
-        const result = Promise.resolve(this.#resolver(this.#path, template));
+        const result = Promise.resolve(this.#resolver(this.#path, template, error));
         this.#cache.set(template, result);
         return result;
       }
-      compile(content, template) {
+      #compile(content, template) {
         const cached = this.#cache.get(template);
         if (typeof cached === 'function') return cached;
         if (typeof content === 'string') {
@@ -192,7 +206,9 @@
         }
       }
       get(template) {
-        return this.#resolve(template).then(content => this.compile(content, template));
+        return this.#resolve(template).then(content => {
+          return this.#compile(content, template);
+        });
       }
     }
 
@@ -208,9 +224,9 @@
         return match;
       });
     };
-    class Compiler {
+    class EjsCompiler {
       #config = {};
-      static exports = ['compile'];
+      static exports = ['configure', 'compile'];
       constructor(options) {
         bindContext(this, this.constructor.exports);
         this.configure(options);
@@ -267,7 +283,7 @@
           });
         });
         OUTPUT += `');`;
-        OUTPUT = `try{${OUTPUT}}catch(e){return ${BUFFER}.error(e,'${path}')}`;
+        OUTPUT = `try{${OUTPUT}}catch(e){return ${BUFFER}.error(e)}`;
         if (this.#config.strict === false) {
           OUTPUT = `with(${SCOPE}){${OUTPUT}}`;
         }
@@ -289,7 +305,7 @@
       }
     }
 
-    class Cache {
+    class EjsCache {
       static exports = ['load', 'set', 'get', 'exist', 'clear', 'remove', 'resolve'];
       #cache = true;
       #precompiled;
@@ -363,31 +379,13 @@
       return result.join('');
     };
 
-    class TemplateError extends Error {
-      name = 'TemplateError';
-      constructor(error) {
-        super(error);
-        if (error instanceof Error) {
-          this.stack = error.stack;
-          this.filename = error.filename;
-          this.lineno = error.lineno;
-        }
-      }
-    }
-    class TemplateNotFound extends TemplateError {
-      name = 'TemplateNotFound';
-      code = 404;
-    }
-    class TemplateSyntaxError extends TemplateError {
-      name = 'TemplateSyntaxError';
-      code = 500;
-    }
-
     const resolve = list => {
-      return Promise.all(list || []).then(list => list.join('')).catch(e => e);
+      return Promise.all(list || []).then(list => list.join('')).catch(e => {
+        return error(500, e);
+      });
     };
-    const reject = error => {
-      return Promise.reject(new TemplateSyntaxError(error));
+    const reject = e => {
+      return Promise.reject(error(500, e));
     };
     const EjsBuffer = () => {
       let store = [];
@@ -412,7 +410,7 @@
         array = store.pop();
         return resolve(result);
       };
-      EjsBuffer.error = (e, filename) => {
+      EjsBuffer.error = e => {
         return reject(e);
       };
       EjsBuffer.end = () => {
@@ -441,13 +439,6 @@
         this[MACRO] = {};
         Object.assign(this, omit(data, [SCOPE, BUFFER, SAFE, COMPONENT, ELEMENT]));
       }
-      Object.entries(methods).forEach(_ref => {
-        let [name, value] = _ref;
-        if (isFunction(value) && globals.includes(name)) {
-          value = value.bind(EjsContext.prototype);
-        }
-        EjsContext.prototype[name] = value;
-      });
       Object.defineProperty(EjsContext.prototype, BUFFER, {
         value: EjsBuffer()
       });
@@ -472,36 +463,31 @@
         writable: true
       });
       Object.defineProperties(EjsContext.prototype, {
-        /** @type {function} */
         setParentTemplate: {
           value(value) {
             this[PARENT] = value;
             return this;
           }
         },
-        /** @type {function} */
         getParentTemplate: {
           value() {
             return this[PARENT];
           }
         },
-        /** @type {function} */
-        useSafeValue: {
-          get: () => safeValue
+        useEscapeValue: {
+          get: () => escapeValue
         },
-        /** @type {function} */
         useComponent: {
           get() {
             if (isFunction(this[COMPONENT])) {
               return this[COMPONENT].bind(this);
             } else {
-              return () => {
+              return function () {
                 throw new Error(`${COMPONENT} must be a function`);
               };
             }
           }
         },
-        /** @type {function} */
         useElement: {
           get() {
             if (isFunction(this[ELEMENT])) {
@@ -513,51 +499,43 @@
             }
           }
         },
-        /** @type {function} */
         useBuffer: {
           get() {
             return this[BUFFER];
           }
         },
-        /** @type {function} */
         getMacro: {
           value() {
             return this[MACRO];
           }
         },
-        /** @type {function} */
         getBlocks: {
           value() {
             return this[BLOCKS];
           }
         },
-        /** @type {function} */
         setExtend: {
           value(value) {
             this[EXTEND] = value;
             return this;
           }
         },
-        /** @type {function} */
         getExtend: {
           value() {
             return this[EXTEND];
           }
         },
-        /** @type {function} */
         setLayout: {
           value(layout) {
             this[LAYOUT] = layout;
             return this;
           }
         },
-        /** @type {function} */
         getLayout: {
           value() {
             return this[LAYOUT];
           }
         },
-        /** @type {function} */
         clone: {
           value(exclude_blocks) {
             const filter = [LAYOUT, EXTEND, BUFFER];
@@ -567,32 +545,29 @@
             return omit(this, filter);
           }
         },
-        /** @type {function} */
         extend: {
           value(layout) {
             this.setExtend(true);
             this.setLayout(layout);
           }
         },
-        /** @type {function} */
         echo: {
           value() {
             return [].slice.call(arguments).forEach(this.useBuffer);
           }
         },
-        /** @type {function} */
         fn: {
           value(callback) {
-            return () => {
+            const context = this;
+            return function () {
               if (isFunction(callback)) {
-                this.useBuffer.backup();
-                this.useBuffer(callback.apply(this, arguments));
-                return this.useBuffer.restore();
+                context.useBuffer.backup();
+                context.useBuffer(callback.apply(context, arguments));
+                return context.useBuffer.restore();
               }
             };
           }
         },
-        /** @type {function} */
         macro: {
           value(name, callback) {
             const list = this.getMacro();
@@ -603,7 +578,6 @@
             };
           }
         },
-        /** @type {function} */
         call: {
           value(name) {
             const list = this.getMacro();
@@ -614,35 +588,35 @@
             }
           }
         },
-        /** @type {function} */
         block: {
           value(name, callback) {
             const blocks = this.getBlocks();
             blocks[name] = blocks[name] || [];
             blocks[name].push(this.fn(callback));
             if (this.getExtend()) return;
+            const context = this;
             const list = Object.assign([], blocks[name]);
-            const shift = () => list.shift();
-            const next = () => {
+            const shift = function () {
+              return list.shift();
+            };
+            const next = function () {
               const parent = shift();
               if (parent) {
-                return () => {
-                  this.echo(parent(next()));
+                return function () {
+                  context.echo(parent(next()));
                 };
               } else {
-                return () => {};
+                return function () {};
               }
             };
             this.echo(shift()(next()));
           }
         },
-        /** @type {function} */
         hasBlock: {
           value(name) {
             return this.getBlocks().hasOwnProperty(name);
           }
         },
-        /** @type {function} */
         include: {
           value(path, data, cx) {
             const context = cx === false ? {} : this.clone(true);
@@ -651,7 +625,6 @@
             this.echo(promise);
           }
         },
-        /** @type {function} */
         use: {
           value(path, namespace) {
             this.echo(Promise.resolve(this.require(path)).then(exports$1 => {
@@ -662,13 +635,6 @@
             }));
           }
         },
-        /** @type {function} */
-        async: {
-          value(promise, callback) {
-            this.echo(Promise.resolve(promise).then(callback));
-          }
-        },
-        /** @type {function} */
         get: {
           value(name, defaults) {
             const path = getPath(this, name, true);
@@ -677,7 +643,6 @@
             return hasProp(result, prop) ? result[prop] : defaults;
           }
         },
-        /** @type {function} */
         set: {
           value(name, value) {
             const path = getPath(this, name, false);
@@ -689,7 +654,6 @@
             return result[prop] = value;
           }
         },
-        /** @type {function} */
         each: {
           value(object, callback) {
             if (isString(object)) {
@@ -699,7 +663,6 @@
           },
           writable: true
         },
-        /** @type {function} */
         el: {
           value(tag, attr, content) {
             content = isFunction(content) ? this.fn(content)() : content;
@@ -707,15 +670,21 @@
           },
           writable: true
         },
-        /** @type {function} */
         ui: {
-          value(layout) {},
+          value() {},
           writable: true
         }
       });
+      Object.entries(methods).forEach(_ref => {
+        let [name, value] = _ref;
+        if (isFunction(value) && globals.includes(name)) {
+          value = value.bind(EjsContext.prototype);
+        }
+        EjsContext.prototype[name] = value;
+      });
       return EjsContext;
     };
-    class Context {
+    class EjsContext {
       #context;
       static exports = ['create', 'globals', 'helpers'];
       constructor(options, methods) {
@@ -746,10 +715,10 @@
         bindContext(this, this.constructor.exports);
         this.#methods = {};
         this.#config = configSchema({}, options);
-        this.#context = new Context(this.#config, this.#methods);
-        this.#compiler = new Compiler(this.#config);
-        this.#cache = new Cache(this.#config);
-        this.#template = new Template(this.#config, this.#cache, this.#compiler);
+        this.#context = new EjsContext(this.#config, this.#methods);
+        this.#compiler = new EjsCompiler(this.#config);
+        this.#cache = new EjsCache(this.#config);
+        this.#template = new EjsTemplate(this.#config, this.#cache, this.#compiler);
         this.helpers({
           render: this.render,
           require: this.require
@@ -796,7 +765,7 @@
         return name;
       }
       #output(path, data) {
-        return this.#template.get(path).then(callback => callback.apply(data, [data, data.useComponent, data.useElement, data.useBuffer, data.useSafeValue]));
+        return this.#template.get(path).then(callback => callback.apply(data, [data, data.useComponent, data.useElement, data.useBuffer, data.useEscapeValue]));
       }
       #renderLayout(name, params, parentTemplate) {
         const data = this.createContext(params);
@@ -814,30 +783,25 @@
       }
     }
 
-    const httpRequest = (path, template) => {
+    const httpRequest = (path, template, error) => {
       return fetch(joinPath(path, template)).then(response => {
         if (response.ok) return response.text();
-        throw new TemplateNotFound(`template ${path} / ${template} not found`);
-      }, reason => {
-        return new TemplateError(reason);
-      });
+        return error(404, `template ${template} not found`);
+      }, reason => error(500, reason));
     };
 
     const {
       render,
+      configure,
+      create,
+      helpers,
       createContext,
       compile,
-      helpers,
-      preload,
-      configure,
-      create
+      preload
     } = new EjsInstance({
       resolver: httpRequest
     });
 
-    exports.TemplateError = TemplateError;
-    exports.TemplateNotFound = TemplateNotFound;
-    exports.TemplateSyntaxError = TemplateSyntaxError;
     exports.compile = compile;
     exports.configure = configure;
     exports.create = create;

package/dist/umd/browser.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).ejsInstance={})}(this,(function(t){"use strict";const e="ejsPrecompiled",s=!0,r="views",i="ejs",o=!0,n=!0,c=(t,e)=>Promise.resolve(["resolver is not defined",t,e].join(" ")),h=[],a={SCOPE:"ejs",COMPONENT:"ui",ELEMENT:"el",EXTEND:"$$e",BUFFER:"$$a",LAYOUT:"$$l",BLOCKS:"$$b",MACRO:"$$m",SAFE:"$$v"},l={start:"<%",end:"%>",regex:"([\\s\\S]+?)"},u=/^[a-zA-Z_$][0-9a-zA-Z_$]*$/,p=function(){const t=[].slice.call(arguments),e=t.shift();return t.filter(e).pop()},f=t=>Array.isArray(t),g=t=>"function"==typeof t,m=t=>"string"==typeof t,d=t=>"boolean"==typeof t,v=(t,v)=>{return Object.assign(t,{path:p(m,r,t.path,v.path),precompiled:p(m,e,t.export,v.export),resolver:p(g,c,t.resolver,v.resolver),extension:p(m,i,t.extension,v.extension),strict:p(d,n,t.strict,v.strict),rmWhitespace:p(d,o,t.rmWhitespace,v.rmWhitespace),cache:p(d,s,t.cache,v.cache),globals:p(f,h,t.globals,(b=v.globals,!!f(b)&&b.filter((t=>{const e=u.test(t);return!1===e&&console.log(`ejsConfig.globals: expected '${t}' to be valid variable name --\x3e skipped`),e})))),token:Object.assign({},l,t.token,v.token),vars:Object.assign({},a,t.vars,v.vars)});var b},b={"'":"'","\\":"\\","\r":"r","\n":"n","\t":"t","\u2028":"u2028","\u2029":"u2029"},x={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;"},y=t=>new RegExp(["[",Object.keys(t).join(""),"]"].join(""),"g"),E=y(x),$=y(b),j=function(){return(""+(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"")).replace(E,(t=>x[t]))},O=(t,e)=>{const s=t;return null==s?"":!0===Boolean(e)?j(s):s},w=(t,e,s)=>{let r=t,i=String(e).split("."),o=i.pop();for(let t=0;t<i.length;t++){const e=i[t];if(g(r.toJSON)&&(r=r.toJSON()),s&&!1===r.hasOwnProperty(e)){r={};break}r=r[e]=r[e]||{}}return g(r.toJSON)&&(r=r.toJSON()),[r,o]},P=(t,e)=>{let s;for(s in t)C(t,s)&&e(t[s],s,t)},k=(t,e)=>{const s={...t};for(const t of e)delete s[t];return s},C=(t,e)=>t&&Object.hasOwn(t,e),S=function(t){let e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:[];for(let s=0,r=e.length;s<r;s++){const r=e[s];r in t&&(t[r]=t[r].bind(t))}};class T{#t;#e;#s;#r;static exports=["configure","get","compile"];constructor(t,e,s){S(this,this.constructor.exports),this.#s=e,this.#r=s,this.configure(t??{})}configure(t){this.#t=t.path,g(t.resolver)&&(this.#e=t.resolver)}#i(t){const e=this.#s.get(t);if(e instanceof Promise)return e;const s=Promise.resolve(this.#e(this.#t,t));return this.#s.set(t,s),s}compile(t,e){const s=this.#s.get(e);return"function"==typeof s?s:("string"==typeof t&&(t=this.#r.compile(t,e)),"function"==typeof t?(this.#s.set(e,t),t):void 0)}get(t){return this.#i(t).then((e=>this.compile(e,t)))}}const N=[["-",(t,e,s)=>`')\n${e}(${s}(${t},1))\n${e}('`],["=",(t,e,s)=>`')\n${e}(${s}(${t}))\n${e}('`],["#",(t,e)=>`')\n/**${t}**/\n${e}('`],["",(t,e)=>`')\n${t}\n${e}('`]];class B{#o={};static exports=["compile"];constructor(t){S(this,this.constructor.exports),this.configure(t)}configure(t){this.#o.strict=t.strict,this.#o.rmWhitespace=t.rmWhitespace,this.#o.token=t.token,this.#o.vars=t.vars,this.#o.globals=t.globals,this.#o.legacy=t.legacy??!0,this.#o.slurp={match:"[s\t\n]*",start:[this.#o.token.start,"_"],end:["_",this.#o.token.end]},this.#o.matches=[],this.#o.formats=[];for(const[t,e]of N)this.#o.matches.push(this.#o.token.start.concat(t).concat(this.#o.token.regex).concat(this.#o.token.end)),this.#o.formats.push(e);this.#o.regex=new RegExp(this.#o.matches.join("|").concat("|$"),"g"),this.#o.slurpStart=new RegExp([this.#o.slurp.match,this.#o.slurp.start.join("")].join(""),"gm"),this.#o.slurpEnd=new RegExp([this.#o.slurp.end.join(""),this.#o.slurp.match].join(""),"gm"),this.#o.globals.length&&(this.#o.legacy?this.#o.globalVariables=`const ${this.#o.globals.map((t=>`${t}=${this.#o.vars.SCOPE}.${t}`)).join(",")};`:this.#o.globalVariables=`const {${this.#o.globals.join(",")}} = ${this.#o.vars.SCOPE};`)}compile(t,e){const s=this.#o.globalVariables,{SCOPE:r,SAFE:i,BUFFER:o,COMPONENT:n,ELEMENT:c}=this.#o.vars;this.#o.rmWhitespace&&(t=String(t).replace(/[\r\n]+/g,"\n").replace(/^\s+|\s+$/gm,"")),t=String(t).replace(this.#o.slurpStart,this.#o.token.start).replace(this.#o.slurpEnd,this.#o.token.end);let h=`${o}('`;((t,e,s)=>{let r=0;e.replace(t,(function(){const t=[].slice.call(arguments,0,-1),e=t.pop(),i=t.shift();return s(t,r,e),r=e+i.length,i}))})(this.#o.regex,t,((e,s,r)=>{h+=(""+t.slice(s,r)).replace($,(t=>"\\"+b[t])),e.forEach(((t,e)=>{t&&(h+=this.#o.formats[e](t.trim(),o,i))}))})),h+="');",h=`try{${h}}catch(e){return ${o}.error(e,'${e}')}`,!1===this.#o.strict&&(h=`with(${r}){${h}}`),h=`${o}.start();${h}return ${o}.end();`,h+=`\n//# sourceURL=${e}`,s&&(h=`${s}\n${h}`);try{const t=[r,n,c,o,i],e=Function.apply(null,t.concat(h));return e.source=`(function(${t.join(",")}){\n${h}\n});`,e}catch(t){throw t.filename=e,t.source=h,t}}}class L{static exports=["load","set","get","exist","clear","remove","resolve"];#s=!0;#n;#c={};constructor(t){S(this,this.constructor.exports),this.configure(t)}get(t){if(this.#s)return this.#c[t]}set(t,e){this.#s&&(this.#c[t]=e)}exist(t){if(this.#s)return this.#c.hasOwnProperty(t)}clear(){Object.keys(this.#c).forEach(this.remove)}remove(t){delete this.#c[t]}resolve(t){return Promise.resolve(this.get(t))}load(t){this.#s&&Object.assign(this.#c,t||{})}configure(t){this.#s=t.cache,this.#n=t.precompiled,"object"==typeof window&&this.load(window[this.#n])}}const A=["area","base","br","col","embed","hr","img","input","link","meta","param","source","track","wbr"],M=" ",F='"',R="/",q="<",U=">",W=t=>{let[e,s]=t;if(null!=s)return[j(e),[F,j(s),F].join("")].join("=")};class V extends Error{name="TemplateError";constructor(t){super(t),t instanceof Error&&(this.stack=t.stack,this.filename=t.filename,this.lineno=t.lineno)}}class J extends V{name="TemplateNotFound";code=404}class _ extends V{name="TemplateSyntaxError";code=500}const z=t=>Promise.all(t||[]).then((t=>t.join(""))).catch((t=>t)),D=()=>{let t=[],e=[];const s=t=>{e.push(t)};return s.start=()=>{e=[]},s.backup=()=>{t.push(e.concat()),e=[]},s.restore=()=>{const s=e.concat();return e=t.pop(),z(s)},s.error=(t,e)=>{return s=t,Promise.reject(new _(s));var s},s.end=()=>z(e),s},K=Symbol("EjsContext.parentTemplate"),X=(t,e)=>{const{BLOCKS:s,MACRO:r,EXTEND:i,LAYOUT:o,BUFFER:n,SAFE:c,SCOPE:h,COMPONENT:a,ELEMENT:l}=t.vars,u=t.globals||[];function p(t){this[K]=null,this[s]={},this[r]={},Object.assign(this,k(t,[h,n,c,a,l]))}return Object.entries(e).forEach((t=>{let[e,s]=t;g(s)&&u.includes(e)&&(s=s.bind(p.prototype)),p.prototype[e]=s})),Object.defineProperty(p.prototype,n,{value:D()}),Object.defineProperty(p.prototype,s,{value:{},writable:!0}),Object.defineProperty(p.prototype,r,{value:{},writable:!0}),Object.defineProperty(p.prototype,o,{value:!1,writable:!0}),Object.defineProperty(p.prototype,i,{value:!1,writable:!0}),Object.defineProperty(p.prototype,K,{value:null,writable:!0}),Object.defineProperties(p.prototype,{setParentTemplate:{value(t){return this[K]=t,this}},getParentTemplate:{value(){return this[K]}},useSafeValue:{get:()=>O},useComponent:{get(){return g(this[a])?this[a].bind(this):()=>{throw new Error(`${a} must be a function`)}}},useElement:{get(){return g(this[l])?this[l].bind(this):()=>{throw new Error(`${l} must be a function`)}}},useBuffer:{get(){return this[n]}},getMacro:{value(){return this[r]}},getBlocks:{value(){return this[s]}},setExtend:{value(t){return this[i]=t,this}},getExtend:{value(){return this[i]}},setLayout:{value(t){return this[o]=t,this}},getLayout:{value(){return this[o]}},clone:{value(t){const e=[o,i,n];return!0===t&&e.push(s),k(this,e)}},extend:{value(t){this.setExtend(!0),this.setLayout(t)}},echo:{value(){return[].slice.call(arguments).forEach(this.useBuffer)}},fn:{value(t){return()=>{if(g(t))return this.useBuffer.backup(),this.useBuffer(t.apply(this,arguments)),this.useBuffer.restore()}}},macro:{value(t,e){const s=this.getMacro(),r=this.fn(e),i=this;s[t]=function(){return i.echo(r.apply(void 0,arguments))}}},call:{value(t){const e=this.getMacro()[t],s=[].slice.call(arguments,1);if(g(e))return e.apply(e,s)}},block:{value(t,e){const s=this.getBlocks();if(s[t]=s[t]||[],s[t].push(this.fn(e)),this.getExtend())return;const r=Object.assign([],s[t]),i=()=>r.shift(),o=()=>{const t=i();return t?()=>{this.echo(t(o()))}:()=>{}};this.echo(i()(o()))}},hasBlock:{value(t){return this.getBlocks().hasOwnProperty(t)}},include:{value(t,e,s){const r=!1===s?{}:this.clone(!0),i=Object.assign(r,e||{}),o=this.render(t,i);this.echo(o)}},use:{value(t,e){this.echo(Promise.resolve(this.require(t)).then((t=>{const s=this.getMacro();P(t,((t,r)=>{s[[e,r].join(".")]=t}))})))}},async:{value(t,e){this.echo(Promise.resolve(t).then(e))}},get:{value(t,e){const s=w(this,t,!0),r=s.shift(),i=s.pop();return C(r,i)?r[i]:e}},set:{value(t,e){const s=w(this,t,!1),r=s.shift(),i=s.pop();return this.getParentTemplate()&&C(r,i)?r[i]:r[i]=e}},each:{value(t,e){m(t)&&(t=this.get(t,[])),P(t,e)},writable:!0},el:{value(t,e,s){s=g(s)?this.fn(s)():s,this.echo(Promise.resolve(s).then((s=>((t,e,s)=>{const r=[],i=-1===A.indexOf(t),o=Object.entries(e??{}).map(W).filter((t=>t)).join(M);return r.push([q,t,M,o,U].join("")),s&&i&&r.push(Array.isArray(s)?s.join(""):s),i&&r.push([q,R,t,U].join("")),r.join("")})(t,e,s))))},writable:!0},ui:{value(t){},writable:!0}}),p};class Y{#h;static exports=["create","globals","helpers"];constructor(t,e){S(this,this.constructor.exports),this.configure(t,e)}create(t){return new this.#h(t)}helpers(t){Object.assign(this.#h.prototype,t)}configure(t,e){this.#h=X(t,e)}}const{render:Z,createContext:I,compile:G,helpers:H,preload:Q,configure:tt,create:et}=new class{#s;#h;#r;#a;#o={};#l={};static exports=["configure","create","createContext","render","require","preload","compile","helpers"];constructor(){let t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};S(this,this.constructor.exports),this.#l={},this.#o=v({},t),this.#h=new Y(this.#o,this.#l),this.#r=new B(this.#o),this.#s=new L(this.#o),this.#a=new T(this.#o,this.#s,this.#r),this.helpers({render:this.render,require:this.require})}create(t){return new this.constructor(t)}configure(t){return t&&(v(this.#o,t),this.#h.configure(this.#o,this.#l),this.#r.configure(this.#o),this.#s.configure(this.#o),this.#a.configure(this.#o)),this.#o}createContext(t){return this.#h.create(t)}preload(t){return this.#s.load(t||{})}compile(t,e){return this.#r.compile(t,e)}helpers(t){this.#h.helpers(Object.assign(this.#l,t))}async render(t,e){const s=this.createContext(e);return this.#u(this.#t(t),s).then(this.#p(t,s))}async require(t){const e=this.createContext({});return this.#u(this.#t(t),e).then((()=>e.getMacro()))}#t(t){return t.split(".").pop()!==this.#o.extension&&(t=[t,this.#o.extension].join(".")),t}#u(t,e){return this.#a.get(t).then((t=>t.apply(e,[e,e.useComponent,e.useElement,e.useBuffer,e.useSafeValue])))}#f(t,e,s){const r=this.createContext(e);return s&&r.setParentTemplate(s),this.#u(this.#t(t),r).then(this.#p(t,r))}#p(t,e){return s=>e.getExtend()?(e.setExtend(!1),this.#f(e.getLayout(),e,t)):s}}({resolver:(t,e)=>fetch(((t,e)=>(e=[t,e].join("/")).replace(/\/\//g,"/"))(t,e)).then((s=>{if(s.ok)return s.text();throw new J(`template ${t} / ${e} not found`)}),(t=>new V(t)))});t.TemplateError=V,t.TemplateNotFound=J,t.TemplateSyntaxError=_,t.compile=G,t.configure=tt,t.create=et,t.createContext=I,t.helpers=H,t.preload=Q,t.render=Z}));
+!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).ejsInstance={})}(this,(function(t){"use strict";const e="ejsPrecompiled",s=!0,i="views",o="ejs",r=!0,n=!0,c=(t,e)=>Promise.resolve(["resolver is not defined",t,e].join(" ")),h=[],a={SCOPE:"ejs",COMPONENT:"ui",ELEMENT:"el",EXTEND:"$$e",BUFFER:"$$a",LAYOUT:"$$l",BLOCKS:"$$b",MACRO:"$$m",SAFE:"$$v"},l={start:"<%",end:"%>",regex:"([\\s\\S]+?)"},u=/^[a-zA-Z_$][0-9a-zA-Z_$]*$/,p=function(){const t=[].slice.call(arguments),e=t.shift();return t.filter(e).pop()},f=t=>Array.isArray(t),g=t=>"function"==typeof t,m=t=>"string"==typeof t,d=t=>"boolean"==typeof t,v=(t,v)=>{return Object.assign(t,{path:p(m,i,t.path,v.path),precompiled:p(m,e,t.export,v.export),resolver:p(g,c,t.resolver,v.resolver),extension:p(m,o,t.extension,v.extension),strict:p(d,n,t.strict,v.strict),rmWhitespace:p(d,r,t.rmWhitespace,v.rmWhitespace),cache:p(d,s,t.cache,v.cache),globals:p(f,h,t.globals,(b=v.globals,!!f(b)&&b.filter((t=>{const e=u.test(t);return!1===e&&console.log(`ejsConfig.globals: expected '${t}' to be valid variable name --\x3e skipped`),e})))),token:Object.assign({},l,t.token,v.token),vars:Object.assign({},a,t.vars,v.vars)});var b},b={"'":"'","\\":"\\","\r":"r","\n":"n","\t":"t","\u2028":"u2028","\u2029":"u2029"},x={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;"},y=t=>new RegExp(["[",Object.keys(t).join(""),"]"].join(""),"g"),j=y(x),E=y(b),$=function(){return(""+(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"")).replace(j,(t=>x[t]))},O=(t,e)=>{const s=t;return null==s?"":!0===Boolean(e)?$(s):s},w=(t,e,s)=>{let i=t,o=String(e).split("."),r=o.pop();for(let t=0;t<o.length;t++){const e=o[t];if(g(i.toJSON)&&(i=i.toJSON()),s&&!1===i.hasOwnProperty(e)){i={};break}i=i[e]=i[e]||{}}return g(i.toJSON)&&(i=i.toJSON()),[i,r]},P=(t,e)=>{let s;for(s in t)C(t,s)&&e(t[s],s,t)},k=(t,e)=>{const s={...t};for(const t of e)delete s[t];return s},C=(t,e)=>t&&Object.hasOwn(t,e),S=function(t){let e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:[];for(let s=0,i=e.length;s<i;s++){const i=e[s];i in t&&(t[i]=t[i].bind(t))}};class T extends Error{constructor(t,e){super(e),this.code=t,e instanceof Error&&(this.stack=e.stack,this.message=e.message)}}const B=(t,e)=>{throw new T(t,e)};class N{#t;#e;#s;#i;static exports=["configure","get"];constructor(t,e,s){S(this,this.constructor.exports),this.#s=e,this.#i=s,this.configure(t??{})}configure(t){this.#t=t.path,g(t.resolver)&&(this.#e=t.resolver)}#o(t){const e=this.#s.get(t);if(e instanceof Promise)return e;const s=Promise.resolve(this.#e(this.#t,t,B));return this.#s.set(t,s),s}#r(t,e){const s=this.#s.get(e);return"function"==typeof s?s:("string"==typeof t&&(t=this.#i.compile(t,e)),"function"==typeof t?(this.#s.set(e,t),t):void 0)}get(t){return this.#o(t).then((e=>this.#r(e,t)))}}const L=[["-",(t,e,s)=>`')\n${e}(${s}(${t},1))\n${e}('`],["=",(t,e,s)=>`')\n${e}(${s}(${t}))\n${e}('`],["#",(t,e)=>`')\n/**${t}**/\n${e}('`],["",(t,e)=>`')\n${t}\n${e}('`]];class A{#n={};static exports=["configure","compile"];constructor(t){S(this,this.constructor.exports),this.configure(t)}configure(t){this.#n.strict=t.strict,this.#n.rmWhitespace=t.rmWhitespace,this.#n.token=t.token,this.#n.vars=t.vars,this.#n.globals=t.globals,this.#n.legacy=t.legacy??!0,this.#n.slurp={match:"[s\t\n]*",start:[this.#n.token.start,"_"],end:["_",this.#n.token.end]},this.#n.matches=[],this.#n.formats=[];for(const[t,e]of L)this.#n.matches.push(this.#n.token.start.concat(t).concat(this.#n.token.regex).concat(this.#n.token.end)),this.#n.formats.push(e);this.#n.regex=new RegExp(this.#n.matches.join("|").concat("|$"),"g"),this.#n.slurpStart=new RegExp([this.#n.slurp.match,this.#n.slurp.start.join("")].join(""),"gm"),this.#n.slurpEnd=new RegExp([this.#n.slurp.end.join(""),this.#n.slurp.match].join(""),"gm"),this.#n.globals.length&&(this.#n.legacy?this.#n.globalVariables=`const ${this.#n.globals.map((t=>`${t}=${this.#n.vars.SCOPE}.${t}`)).join(",")};`:this.#n.globalVariables=`const {${this.#n.globals.join(",")}} = ${this.#n.vars.SCOPE};`)}compile(t,e){const s=this.#n.globalVariables,{SCOPE:i,SAFE:o,BUFFER:r,COMPONENT:n,ELEMENT:c}=this.#n.vars;this.#n.rmWhitespace&&(t=String(t).replace(/[\r\n]+/g,"\n").replace(/^\s+|\s+$/gm,"")),t=String(t).replace(this.#n.slurpStart,this.#n.token.start).replace(this.#n.slurpEnd,this.#n.token.end);let h=`${r}('`;((t,e,s)=>{let i=0;e.replace(t,(function(){const t=[].slice.call(arguments,0,-1),e=t.pop(),o=t.shift();return s(t,i,e),i=e+o.length,o}))})(this.#n.regex,t,((e,s,i)=>{h+=(""+t.slice(s,i)).replace(E,(t=>"\\"+b[t])),e.forEach(((t,e)=>{t&&(h+=this.#n.formats[e](t.trim(),r,o))}))})),h+="');",h=`try{${h}}catch(e){return ${r}.error(e)}`,!1===this.#n.strict&&(h=`with(${i}){${h}}`),h=`${r}.start();${h}return ${r}.end();`,h+=`\n//# sourceURL=${e}`,s&&(h=`${s}\n${h}`);try{const t=[i,n,c,r,o],e=Function.apply(null,t.concat(h));return e.source=`(function(${t.join(",")}){\n${h}\n});`,e}catch(t){throw t.filename=e,t.source=h,t}}}class M{static exports=["load","set","get","exist","clear","remove","resolve"];#s=!0;#c;#h={};constructor(t){S(this,this.constructor.exports),this.configure(t)}get(t){if(this.#s)return this.#h[t]}set(t,e){this.#s&&(this.#h[t]=e)}exist(t){if(this.#s)return this.#h.hasOwnProperty(t)}clear(){Object.keys(this.#h).forEach(this.remove)}remove(t){delete this.#h[t]}resolve(t){return Promise.resolve(this.get(t))}load(t){this.#s&&Object.assign(this.#h,t||{})}configure(t){this.#s=t.cache,this.#c=t.precompiled,"object"==typeof window&&this.load(window[this.#c])}}const F=["area","base","br","col","embed","hr","img","input","link","meta","param","source","track","wbr"],R=" ",q='"',U="/",W="<",V=">",J=t=>{let[e,s]=t;if(null!=s)return[$(e),[q,$(s),q].join("")].join("=")},_=t=>Promise.all(t||[]).then((t=>t.join(""))).catch((t=>B(500,t))),z=()=>{let t=[],e=[];const s=t=>{e.push(t)};return s.start=()=>{e=[]},s.backup=()=>{t.push(e.concat()),e=[]},s.restore=()=>{const s=e.concat();return e=t.pop(),_(s)},s.error=t=>(t=>Promise.reject(B(500,t)))(t),s.end=()=>_(e),s},D=Symbol("EjsContext.parentTemplate"),K=(t,e)=>{const{BLOCKS:s,MACRO:i,EXTEND:o,LAYOUT:r,BUFFER:n,SAFE:c,SCOPE:h,COMPONENT:a,ELEMENT:l}=t.vars,u=t.globals||[];function p(t){this[D]=null,this[s]={},this[i]={},Object.assign(this,k(t,[h,n,c,a,l]))}return Object.defineProperty(p.prototype,n,{value:z()}),Object.defineProperty(p.prototype,s,{value:{},writable:!0}),Object.defineProperty(p.prototype,i,{value:{},writable:!0}),Object.defineProperty(p.prototype,r,{value:!1,writable:!0}),Object.defineProperty(p.prototype,o,{value:!1,writable:!0}),Object.defineProperty(p.prototype,D,{value:null,writable:!0}),Object.defineProperties(p.prototype,{setParentTemplate:{value(t){return this[D]=t,this}},getParentTemplate:{value(){return this[D]}},useEscapeValue:{get:()=>O},useComponent:{get(){return g(this[a])?this[a].bind(this):function(){throw new Error(`${a} must be a function`)}}},useElement:{get(){return g(this[l])?this[l].bind(this):()=>{throw new Error(`${l} must be a function`)}}},useBuffer:{get(){return this[n]}},getMacro:{value(){return this[i]}},getBlocks:{value(){return this[s]}},setExtend:{value(t){return this[o]=t,this}},getExtend:{value(){return this[o]}},setLayout:{value(t){return this[r]=t,this}},getLayout:{value(){return this[r]}},clone:{value(t){const e=[r,o,n];return!0===t&&e.push(s),k(this,e)}},extend:{value(t){this.setExtend(!0),this.setLayout(t)}},echo:{value(){return[].slice.call(arguments).forEach(this.useBuffer)}},fn:{value(t){const e=this;return function(){if(g(t))return e.useBuffer.backup(),e.useBuffer(t.apply(e,arguments)),e.useBuffer.restore()}}},macro:{value(t,e){const s=this.getMacro(),i=this.fn(e),o=this;s[t]=function(){return o.echo(i.apply(void 0,arguments))}}},call:{value(t){const e=this.getMacro()[t],s=[].slice.call(arguments,1);if(g(e))return e.apply(e,s)}},block:{value(t,e){const s=this.getBlocks();if(s[t]=s[t]||[],s[t].push(this.fn(e)),this.getExtend())return;const i=this,o=Object.assign([],s[t]),r=function(){return o.shift()},n=function(){const t=r();return t?function(){i.echo(t(n()))}:function(){}};this.echo(r()(n()))}},hasBlock:{value(t){return this.getBlocks().hasOwnProperty(t)}},include:{value(t,e,s){const i=!1===s?{}:this.clone(!0),o=Object.assign(i,e||{}),r=this.render(t,o);this.echo(r)}},use:{value(t,e){this.echo(Promise.resolve(this.require(t)).then((t=>{const s=this.getMacro();P(t,((t,i)=>{s[[e,i].join(".")]=t}))})))}},get:{value(t,e){const s=w(this,t,!0),i=s.shift(),o=s.pop();return C(i,o)?i[o]:e}},set:{value(t,e){const s=w(this,t,!1),i=s.shift(),o=s.pop();return this.getParentTemplate()&&C(i,o)?i[o]:i[o]=e}},each:{value(t,e){m(t)&&(t=this.get(t,[])),P(t,e)},writable:!0},el:{value(t,e,s){s=g(s)?this.fn(s)():s,this.echo(Promise.resolve(s).then((s=>((t,e,s)=>{const i=[],o=-1===F.indexOf(t),r=Object.entries(e??{}).map(J).filter((t=>t)).join(R);return i.push([W,t,R,r,V].join("")),s&&o&&i.push(Array.isArray(s)?s.join(""):s),o&&i.push([W,U,t,V].join("")),i.join("")})(t,e,s))))},writable:!0},ui:{value(){},writable:!0}}),Object.entries(e).forEach((t=>{let[e,s]=t;g(s)&&u.includes(e)&&(s=s.bind(p.prototype)),p.prototype[e]=s})),p};class X{#a;static exports=["create","globals","helpers"];constructor(t,e){S(this,this.constructor.exports),this.configure(t,e)}create(t){return new this.#a(t)}helpers(t){Object.assign(this.#a.prototype,t)}configure(t,e){this.#a=K(t,e)}}const{render:Y,configure:Z,create:I,helpers:G,createContext:H,compile:Q,preload:tt}=new class{#s;#a;#i;#l;#n={};#u={};static exports=["configure","create","createContext","render","require","preload","compile","helpers"];constructor(){let t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};S(this,this.constructor.exports),this.#u={},this.#n=v({},t),this.#a=new X(this.#n,this.#u),this.#i=new A(this.#n),this.#s=new M(this.#n),this.#l=new N(this.#n,this.#s,this.#i),this.helpers({render:this.render,require:this.require})}create(t){return new this.constructor(t)}configure(t){return t&&(v(this.#n,t),this.#a.configure(this.#n,this.#u),this.#i.configure(this.#n),this.#s.configure(this.#n),this.#l.configure(this.#n)),this.#n}createContext(t){return this.#a.create(t)}preload(t){return this.#s.load(t||{})}compile(t,e){return this.#i.compile(t,e)}helpers(t){this.#a.helpers(Object.assign(this.#u,t))}async render(t,e){const s=this.createContext(e);return this.#p(this.#t(t),s).then(this.#f(t,s))}async require(t){const e=this.createContext({});return this.#p(this.#t(t),e).then((()=>e.getMacro()))}#t(t){return t.split(".").pop()!==this.#n.extension&&(t=[t,this.#n.extension].join(".")),t}#p(t,e){return this.#l.get(t).then((t=>t.apply(e,[e,e.useComponent,e.useElement,e.useBuffer,e.useEscapeValue])))}#g(t,e,s){const i=this.createContext(e);return s&&i.setParentTemplate(s),this.#p(this.#t(t),i).then(this.#f(t,i))}#f(t,e){return s=>e.getExtend()?(e.setExtend(!1),this.#g(e.getLayout(),e,t)):s}}({resolver:(t,e,s)=>fetch(((t,e)=>(e=[t,e].join("/")).replace(/\/\//g,"/"))(t,e)).then((t=>t.ok?t.text():s(404,`template ${e} not found`)),(t=>s(500,t)))});t.compile=Q,t.configure=Z,t.create=I,t.createContext=H,t.helpers=G,t.preload=tt,t.render=Y}));

package/dist/umd/element.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
     typeof define === 'function' && define.amd ? define(['exports'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.element = {}));
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.ejsElement = {}));
 })(this, (function (exports) { 'use strict';
 
     const symbolEntities = {
@@ -27,7 +27,7 @@
       let string = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
       return ('' + string).replace(htmlEntitiesMatch, match => htmlEntities[match]);
     };
-    const safeValue = (value, escape) => {
+    const escapeValue = (value, escape) => {
       const check = value;
       return check == null ? '' : Boolean(escape) === true ? entities(check) : check;
     };
@@ -60,6 +60,6 @@
     };
 
     exports.element = element;
-    exports.safeValue = safeValue;
+    exports.escapeValue = escapeValue;
 
 }));

package/dist/umd/element.min.js

@@ -1 +1 @@
-!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports):"function"==typeof define&&define.amd?define(["exports"],n):n((e="undefined"!=typeof globalThis?globalThis:e||self).element={})}(this,(function(e){"use strict";const n={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;"},t=e=>new RegExp(["[",Object.keys(e).join(""),"]"].join(""),"g"),o=t(n);t({"'":"'","\\":"\\","\r":"r","\n":"n","\t":"t","\u2028":"u2028","\u2029":"u2029"});const i=function(){return(""+(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"")).replace(o,(e=>n[e]))},r=["area","base","br","col","embed","hr","img","input","link","meta","param","source","track","wbr"],u=" ",s='"',l="/",a="<",f=">",c=e=>{let[n,t]=e;if(null!=t)return[i(n),[s,i(t),s].join("")].join("=")};e.element=(e,n,t)=>{const o=[],i=-1===r.indexOf(e),s=Object.entries(n??{}).map(c).filter((e=>e)).join(u);return o.push([a,e,u,s,f].join("")),t&&i&&o.push(Array.isArray(t)?t.join(""):t),i&&o.push([a,l,e,f].join("")),o.join("")},e.safeValue=(e,n)=>{const t=e;return null==t?"":!0===Boolean(n)?i(t):t}}));
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports):"function"==typeof define&&define.amd?define(["exports"],n):n((e="undefined"!=typeof globalThis?globalThis:e||self).ejsElement={})}(this,(function(e){"use strict";const n={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;"},t=e=>new RegExp(["[",Object.keys(e).join(""),"]"].join(""),"g"),o=t(n);t({"'":"'","\\":"\\","\r":"r","\n":"n","\t":"t","\u2028":"u2028","\u2029":"u2029"});const i=function(){return(""+(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"")).replace(o,(e=>n[e]))},r=["area","base","br","col","embed","hr","img","input","link","meta","param","source","track","wbr"],u=" ",s='"',l="/",a="<",c=">",f=e=>{let[n,t]=e;if(null!=t)return[i(n),[s,i(t),s].join("")].join("=")};e.element=(e,n,t)=>{const o=[],i=-1===r.indexOf(e),s=Object.entries(n??{}).map(f).filter((e=>e)).join(u);return o.push([a,e,u,s,c].join("")),t&&i&&o.push(Array.isArray(t)?t.join(""):t),i&&o.push([a,l,e,c].join("")),o.join("")},e.escapeValue=(e,n)=>{const t=e;return null==t?"":!0===Boolean(n)?i(t):t}}));