@kosatyi/ejs 0.0.108 → 0.0.110

package/dist/esm/index.js

@@ -152,7 +152,7 @@ const symbols = (string) => {
     )
 };
 
-const safeValue = (value, escape) => {
+const escapeValue = (value, escape) => {
     const check = value;
     return check == null
         ? ''
@@ -218,12 +218,27 @@ const bindContext = (object, methods = []) => {
     }
 };
 
-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;
@@ -239,11 +254,13 @@ 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') {
@@ -255,9 +272,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)
+        })
     }
 }
 
@@ -280,15 +297,13 @@ const tokensMatch = (regex, content, callback) => {
     });
 };
 
-class Compiler {
+class EjsCompiler {
     #config = {}
-    static exports = ['compile']
-
+    static exports = ['configure', 'compile']
     constructor(options) {
         bindContext(this, this.constructor.exports);
         this.configure(options);
     }
-
     configure(options) {
         this.#config.strict = options.strict;
         this.#config.rmWhitespace = options.rmWhitespace;
@@ -363,7 +378,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}}`;
         }
@@ -385,7 +400,7 @@ class Compiler {
     }
 }
 
-class Cache {
+class EjsCache {
     static exports = [
         'load',
         'set',
@@ -426,13 +441,11 @@ class Cache {
     resolve(key) {
         return Promise.resolve(this.get(key))
     }
-
     load(data) {
         if (this.#cache) {
             Object.assign(this.#list, data || {});
         }
     }
-
     configure(options) {
         this.#cache = options.cache;
         this.#precompiled = options.precompiled;
@@ -491,36 +504,16 @@ 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)
+        .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 = () => {
@@ -546,7 +539,7 @@ const EjsBuffer = () => {
         array = store.pop();
         return resolve(result)
     };
-    EjsBuffer.error = (e, filename) => {
+    EjsBuffer.error = (e) => {
         return reject(e)
     };
     EjsBuffer.end = () => {
@@ -579,12 +572,6 @@ const createContext$1 = (config, methods) => {
             omit(data, [SCOPE, BUFFER, SAFE, COMPONENT, ELEMENT]),
         );
     }
-    Object.entries(methods).forEach(([name, value]) => {
-        if (isFunction(value) && globals.includes(name)) {
-            value = value.bind(EjsContext.prototype);
-        }
-        EjsContext.prototype[name] = value;
-    });
     Object.defineProperty(EjsContext.prototype, BUFFER, {
         value: EjsBuffer(),
     });
@@ -609,36 +596,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])) {
@@ -650,51 +632,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];
@@ -704,32 +678,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();
@@ -740,7 +711,6 @@ const createContext$1 = (config, methods) => {
                 };
             },
         },
-        /** @type {function} */
         call: {
             value(name) {
                 const list = this.getMacro();
@@ -751,35 +721,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);
@@ -788,7 +758,6 @@ const createContext$1 = (config, methods) => {
                 this.echo(promise);
             },
         },
-        /** @type {function} */
         use: {
             value(path, namespace) {
                 this.echo(
@@ -801,13 +770,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);
@@ -816,7 +778,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);
@@ -828,7 +789,6 @@ const createContext$1 = (config, methods) => {
                 return (result[prop] = value)
             },
         },
-        /** @type {function} */
         each: {
             value(object, callback) {
                 if (isString(object)) {
@@ -838,7 +798,6 @@ const createContext$1 = (config, methods) => {
             },
             writable: true,
         },
-        /** @type {function} */
         el: {
             value(tag, attr, content) {
                 content = isFunction(content) ? this.fn(content)() : content;
@@ -850,16 +809,21 @@ const createContext$1 = (config, methods) => {
             },
             writable: true,
         },
-        /** @type {function} */
         ui: {
-            value(layout) {},
+            value() {},
             writable: true,
         },
     });
+    Object.entries(methods).forEach(([name, value]) => {
+        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) {
@@ -898,10 +862,14 @@ 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 });
     }
     create(options) {
@@ -955,7 +923,7 @@ class EjsInstance {
                     data.useComponent,
                     data.useElement,
                     data.useBuffer,
-                    data.useSafeValue,
+                    data.useEscapeValue,
                 ]),
             )
     }
@@ -1012,25 +980,31 @@ const expressRenderer = (configure, render) => {
     }
 };
 
-const readFile = (path, template) => {
+const readFile = (path, template, error) => {
     return fs
         .readFile(joinPath(path, template))
         .then((contents) => contents.toString())
-        .then((text) => String(text))
+        .catch((reason) => {
+            if (reason.code === 'ENOENT') {
+                error(404, `template ${template} not found`);
+            } else {
+                error(500, reason);
+            }
+        })
 };
 
 const {
     render,
-    createContext,
-    compile,
     helpers,
-    preload,
     configure,
     create,
+    createContext,
+    compile,
+    preload,
 } = new EjsInstance({
     resolver: readFile,
 });
 
 const __express = expressRenderer(configure, render);
 
-export { TemplateError, TemplateNotFound, TemplateSyntaxError, __express, compile, configure, create, createContext, helpers, preload, render };
+export { __express, compile, configure, create, createContext, helpers, preload, render };