@kosatyi/ejs 0.0.108 → 0.0.110

package/dist/umd/worker.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;
     };
@@ -150,12 +150,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;
@@ -171,11 +185,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') {
@@ -187,7 +201,9 @@
         }
       }
       get(template) {
-        return this.#resolve(template).then(content => this.compile(content, template));
+        return this.#resolve(template).then(content => {
+          return this.#compile(content, template);
+        });
       }
     }
 
@@ -203,9 +219,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);
@@ -262,7 +278,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}}`;
         }
@@ -284,7 +300,7 @@
       }
     }
 
-    class Cache {
+    class EjsCache {
       static exports = ['load', 'set', 'get', 'exist', 'clear', 'remove', 'resolve'];
       #cache = true;
       #precompiled;
@@ -358,31 +374,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 = [];
@@ -407,7 +405,7 @@
         array = store.pop();
         return resolve(result);
       };
-      EjsBuffer.error = (e, filename) => {
+      EjsBuffer.error = e => {
         return reject(e);
       };
       EjsBuffer.end = () => {
@@ -436,13 +434,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()
       });
@@ -467,36 +458,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])) {
@@ -508,51 +494,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];
@@ -562,32 +540,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();
@@ -598,7 +573,6 @@
             };
           }
         },
-        /** @type {function} */
         call: {
           value(name) {
             const list = this.getMacro();
@@ -609,35 +583,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);
@@ -646,7 +620,6 @@
             this.echo(promise);
           }
         },
-        /** @type {function} */
         use: {
           value(path, namespace) {
             this.echo(Promise.resolve(this.require(path)).then(exports$1 => {
@@ -657,13 +630,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);
@@ -672,7 +638,6 @@
             return hasProp(result, prop) ? result[prop] : defaults;
           }
         },
-        /** @type {function} */
         set: {
           value(name, value) {
             const path = getPath(this, name, false);
@@ -684,7 +649,6 @@
             return result[prop] = value;
           }
         },
-        /** @type {function} */
         each: {
           value(object, callback) {
             if (isString(object)) {
@@ -694,7 +658,6 @@
           },
           writable: true
         },
-        /** @type {function} */
         el: {
           value(tag, attr, content) {
             content = isFunction(content) ? this.fn(content)() : content;
@@ -702,15 +665,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) {
@@ -741,10 +710,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
@@ -791,7 +760,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);
@@ -826,12 +795,11 @@
     } = new EjsInstance({
       cache: false,
       strict: true,
-      async resolver(path, name) {
+      async resolver(path, name, error) {
         if (isFunction(templateCache[name])) {
           return templateCache[name];
-        } else {
-          throw new TemplateNotFound(`template ${name} not found`);
         }
+        error(404, `template ${name} not found`);
       }
     });
 
@@ -874,9 +842,6 @@
       };
     }
 
-    exports.TemplateError = TemplateError;
-    exports.TemplateNotFound = TemplateNotFound;
-    exports.TemplateSyntaxError = TemplateSyntaxError;
     exports.configure = configure;
     exports.createContext = createContext;
     exports.helpers = helpers;

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

package/package.json

@@ -3,7 +3,7 @@
     "description": "EJS Templates",
     "homepage": "https://github.com/kosatyi/ejs",
     "type": "module",
-    "version": "0.0.108",
+    "version": "0.0.110",
     "main": "dist/cjs/index.js",
     "module": "dist/esm/index.js",
     "browser": "dist/umd/browser.js",

package/types/browser.d.ts

@@ -5,6 +5,4 @@ export {
     configure,
     helpers,
     preload,
-} from './ejs'
-
-export { TemplateError, TemplateSyntaxError, TemplateNotFound } from './error'
+} from './ejs.js'

package/types/bundler.d.ts

@@ -1,5 +1,5 @@
 import type { Plugin } from 'rollup'
-import { EjsConfig } from './ejs'
+import { EjsConfig } from './ejs.js'
 
 export interface BundlerOptions {
     target: string[] | string

package/types/context.d.ts

@@ -67,12 +67,6 @@ export interface EjsContext {
      * @param callback
      */
     call(name: string, props?: object, callback?: any): any
-    /**
-     * asynchronous template execution
-     * @param promise
-     * @param callback
-     */
-    async(promise: Promise<any>, callback?: any): any
     /**
      * buffer output
      * @param args

package/types/ejs.d.ts

@@ -1,5 +1,5 @@
-import { EjsContext } from './context'
-import { TemplateError } from './error'
+import { EjsContext } from './context.js'
+import { EjsError, error } from './error.js'
 
 export declare type EjsConfigVars = {
     SCOPE: string
@@ -61,10 +61,7 @@ export declare type EjsConfig = {
      * - For client templates using window.fetch
      * - For worker templates using precompiled Map of templates
      */
-    resolver?: (
-        path: string,
-        template: string,
-    ) => Promise<string | TemplateError>
+    resolver?: (path: string, template: string, error: error) => Promise<string>
     /**
      * An array of local variables that are always destructured from helpers
      * available even in strict mode.

package/types/element.d.ts

@@ -1,4 +1,4 @@
-export function safeValue(value: string, escape?: boolean): string | any
+export function escapeValue(value: string, escape?: boolean): string | any
 
 export function element(
     tag: string,
@@ -7,3 +7,11 @@ export function element(
     },
     content?: string[] | string,
 ): string
+
+declare global {
+    export interface ejsElement extends Window {
+        element: typeof element
+        escapeValue: typeof escapeValue
+    }
+    const ejsElement: ejsElement
+}

package/types/error.d.ts

@@ -1,14 +1,11 @@
-export class TemplateError extends Error {
-    code
-    new(message: string): TemplateError
-    toString(): string
-    getCode(): number
+export interface EjsError<N, C> {
+    code: N
+    content: C;
+    (code: N, content: C): EjsError<N, C>
+    toString(): C
 }
 
-export class TemplateNotFound extends TemplateError {
-    code: 404
-}
-
-export class TemplateSyntaxError extends TemplateError {
-    code: 500
-}
+export type error = <N, C extends string | Error>(
+    code: N,
+    content: C,
+) => EjsError<N, C>

package/types/global.d.ts

@@ -1,5 +1,5 @@
-import type { EjsContext } from './context'
-import type { EjsInterface } from './ejs'
+import type { EjsContext } from './context.js'
+import type { EjsInterface } from './ejs.js'
 declare global {
     const ejs: EjsContext
     const ejsInstance: EjsInterface

package/types/index.d.ts

@@ -5,9 +5,7 @@ export {
     configure,
     helpers,
     preload,
-} from './ejs'
-
-export { TemplateError, TemplateSyntaxError, TemplateNotFound } from './error'
+} from './ejs.js'
 
 export const __express: (
     name: string,

package/types/worker.d.ts

@@ -5,9 +5,7 @@ export {
     configure,
     helpers,
     preload,
-} from './ejs'
-
-export { TemplateError, TemplateSyntaxError, TemplateNotFound } from './error'
+} from './ejs.js'
 
 export type HonoContext = {}