@kosatyi/ejs 0.0.108 → 0.0.110

package/dist/cjs/index.js

@@ -95,7 +95,7 @@ const entities = function () {
 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;
 };
@@ -154,12 +154,26 @@ const bindContext = function (object) {
   }
 };
 
-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;
@@ -175,11 +189,11 @@ class Template {
   #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') {
@@ -191,7 +205,9 @@ class Template {
     }
   }
   get(template) {
-    return this.#resolve(template).then(content => this.compile(content, template));
+    return this.#resolve(template).then(content => {
+      return this.#compile(content, template);
+    });
   }
 }
 
@@ -207,9 +223,9 @@ const tokensMatch = (regex, content, callback) => {
     return match;
   });
 };
-class Compiler {
+class EjsCompiler {
   #config = {};
-  static exports = ['compile'];
+  static exports = ['configure', 'compile'];
   constructor(options) {
     bindContext(this, this.constructor.exports);
     this.configure(options);
@@ -266,7 +282,7 @@ class Compiler {
       });
     });
     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}}`;
     }
@@ -288,7 +304,7 @@ class Compiler {
   }
 }
 
-class Cache {
+class EjsCache {
   static exports = ['load', 'set', 'get', 'exist', 'clear', 'remove', 'resolve'];
   #cache = true;
   #precompiled;
@@ -362,31 +378,13 @@ const element = (tag, attrs, content) => {
   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 = [];
@@ -411,7 +409,7 @@ const EjsBuffer = () => {
     array = store.pop();
     return resolve(result);
   };
-  EjsBuffer.error = (e, filename) => {
+  EjsBuffer.error = e => {
     return reject(e);
   };
   EjsBuffer.end = () => {
@@ -440,13 +438,6 @@ const createContext$1 = (config, methods) => {
     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()
   });
@@ -471,36 +462,31 @@ const createContext$1 = (config, methods) => {
     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])) {
@@ -512,51 +498,43 @@ const createContext$1 = (config, methods) => {
         }
       }
     },
-    /** @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];
@@ -566,32 +544,29 @@ const createContext$1 = (config, methods) => {
         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();
@@ -602,7 +577,6 @@ const createContext$1 = (config, methods) => {
         };
       }
     },
-    /** @type {function} */
     call: {
       value(name) {
         const list = this.getMacro();
@@ -613,35 +587,35 @@ const createContext$1 = (config, methods) => {
         }
       }
     },
-    /** @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);
@@ -650,7 +624,6 @@ const createContext$1 = (config, methods) => {
         this.echo(promise);
       }
     },
-    /** @type {function} */
     use: {
       value(path, namespace) {
         this.echo(Promise.resolve(this.require(path)).then(exports$1 => {
@@ -661,13 +634,6 @@ const createContext$1 = (config, methods) => {
         }));
       }
     },
-    /** @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);
@@ -676,7 +642,6 @@ const createContext$1 = (config, methods) => {
         return hasProp(result, prop) ? result[prop] : defaults;
       }
     },
-    /** @type {function} */
     set: {
       value(name, value) {
         const path = getPath(this, name, false);
@@ -688,7 +653,6 @@ const createContext$1 = (config, methods) => {
         return result[prop] = value;
       }
     },
-    /** @type {function} */
     each: {
       value(object, callback) {
         if (isString(object)) {
@@ -698,7 +662,6 @@ const createContext$1 = (config, methods) => {
       },
       writable: true
     },
-    /** @type {function} */
     el: {
       value(tag, attr, content) {
         content = isFunction(content) ? this.fn(content)() : content;
@@ -706,15 +669,21 @@ const createContext$1 = (config, methods) => {
       },
       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) {
@@ -745,10 +714,10 @@ class EjsInstance {
     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
@@ -795,7 +764,7 @@ class EjsInstance {
     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);
@@ -842,26 +811,29 @@ const expressRenderer = (configure, render) => {
   };
 };
 
-const readFile = (path, template) => {
-  return fs.readFile(joinPath(path, template)).then(contents => contents.toString()).then(text => String(text));
+const readFile = (path, template, error) => {
+  return fs.readFile(joinPath(path, template)).then(contents => contents.toString()).catch(reason => {
+    if (reason.code === 'ENOENT') {
+      error(404, `template ${template} not found`);
+    } else {
+      error(500, reason);
+    }
+  });
 };
 
 const {
   render,
-  createContext,
-  compile,
   helpers,
-  preload,
   configure,
-  create
+  create,
+  createContext,
+  compile,
+  preload
 } = new EjsInstance({
   resolver: readFile
 });
 const __express = expressRenderer(configure, render);
 
-exports.TemplateError = TemplateError;
-exports.TemplateNotFound = TemplateNotFound;
-exports.TemplateSyntaxError = TemplateSyntaxError;
 exports.__express = __express;
 exports.compile = compile;
 exports.configure = configure;