@kosatyi/ejs 0.0.98 → 0.0.100

package/dist/esm/index.js

@@ -218,6 +218,7 @@ defaults.globalHelpers = [];
 defaults.vars = {
     SCOPE: 'ejs',
     COMPONENT: 'ui',
+    ELEMENT: 'el',
     EXTEND: '$$e',
     BUFFER: '$$a',
     LAYOUT: '$$l',
@@ -282,7 +283,6 @@ class Cache {
     #enabled = true
     #list = {}
     constructor(config) {
-        bindContext(this, ['configure']);
         this.configure(config);
     }
     load(data) {
@@ -349,7 +349,6 @@ class Compiler {
         },
     ]
     constructor(config) {
-        bindContext(this, ['configure', 'compile']);
         this.configure(config);
     }
     configure(config) {
@@ -392,7 +391,7 @@ class Compiler {
         );
     }
     compile(content, path) {
-        const { SCOPE, SAFE, BUFFER, COMPONENT } = this.#config.vars;
+        const { SCOPE, SAFE, BUFFER, COMPONENT, ELEMENT } = this.#config.vars;
         const GLOBALS = this.#config.globalHelpers;
         if (this.#config.rmWhitespace) {
             content = String(content)
@@ -419,7 +418,7 @@ class Compiler {
         source = `${BUFFER}.start();${source}return ${BUFFER}.end();`;
         source += `\n//# sourceURL=${path}`;
         let result = null;
-        let params = [SCOPE, COMPONENT, BUFFER, SAFE].concat(GLOBALS);
+        let params = [SCOPE, BUFFER, SAFE, COMPONENT, ELEMENT].concat(GLOBALS);
         try {
             result = Function.apply(null, params.concat(source));
             result.source = `(function(${params.join(',')}){\n${source}\n});`;
@@ -442,7 +441,6 @@ class Template {
         assertInstanceOf(compiler, Compiler);
         this.#cache = cache;
         this.#compiler = compiler;
-        bindContext(this, ['configure', 'get']);
         this.configure(config);
     }
     #resolve(path) {
@@ -588,9 +586,18 @@ function createBuffer() {
     return buffer
 }
 
-const createScope = (config, methods) => {
-    const { BLOCKS, MACRO, EXTEND, LAYOUT, BUFFER, COMPONENT, SAFE, SCOPE } =
-        config.vars;
+const createContextScope = (config, methods) => {
+    const {
+        BLOCKS,
+        MACRO,
+        EXTEND,
+        LAYOUT,
+        BUFFER,
+        SAFE,
+        SCOPE,
+        COMPONENT,
+        ELEMENT,
+    } = config.vars;
     /**
      * @name ContextScope
      * @param data
@@ -599,29 +606,59 @@ const createScope = (config, methods) => {
     function ContextScope(data) {
         this[BLOCKS] = {};
         this[MACRO] = {};
-        Object.assign(this, omit(data, [SCOPE, BUFFER, SAFE, COMPONENT]));
+        Object.assign(
+            this,
+            omit(data, [SCOPE, BUFFER, SAFE, COMPONENT, ELEMENT])
+        );
     }
-
     Object.assign(ContextScope.prototype, methods);
+    Object.defineProperty(ContextScope.prototype, BUFFER, {
+        value: createBuffer(),
+    });
+    Object.defineProperty(ContextScope.prototype, BLOCKS, {
+        value: {},
+        writable: true,
+    });
+    Object.defineProperty(ContextScope.prototype, MACRO, {
+        value: {},
+        writable: true,
+    });
+    Object.defineProperty(ContextScope.prototype, LAYOUT, {
+        value: false,
+        writable: true,
+    });
+    Object.defineProperty(ContextScope.prototype, EXTEND, {
+        value: false,
+        writable: true,
+    });
     Object.defineProperties(ContextScope.prototype, {
-        [BUFFER]: {
-            value: createBuffer(),
-        },
-        [BLOCKS]: {
-            value: {},
-            writable: true,
-        },
-        [MACRO]: {
-            value: {},
-            writable: true,
+        /** @type {function} */
+        useSafeValue: {
+            get: () => safeValue,
         },
-        [LAYOUT]: {
-            value: false,
-            writable: true,
+        /** @type {function} */
+        useComponent: {
+            get() {
+                if (isFunction(this[COMPONENT])) {
+                    return this[COMPONENT].bind(this)
+                } else {
+                    return () => {
+                        throw new Error(`${COMPONENT} must be a function`)
+                    }
+                }
+            },
         },
-        [EXTEND]: {
-            value: false,
-            writable: true,
+        /** @type {function} */
+        useElement: {
+            get() {
+                if (isFunction(this[ELEMENT])) {
+                    return this[ELEMENT].bind(this)
+                } else {
+                    return () => {
+                        throw new Error(`${ELEMENT} must be a function`)
+                    }
+                }
+            },
         },
         /** @type {()=>this[MACRO]} */
         getMacro: {
@@ -636,20 +673,6 @@ const createScope = (config, methods) => {
             },
         },
         /** @type {function} */
-        getComponent: {
-            value() {
-                const context = this;
-                if (COMPONENT in context) {
-                    return function () {
-                        return context[COMPONENT].apply(context, arguments)
-                    }
-                }
-                return function () {
-                    console.log('%s function not defined', COMPONENT);
-                }
-            },
-        },
-        /** @type {function} */
         getBlocks: {
             value() {
                 return this[BLOCKS]
@@ -710,33 +733,12 @@ const createScope = (config, methods) => {
                 const buffer = this.getBuffer();
                 const context = this;
                 return function () {
-                    buffer.backup();
                     if (isFunction(callback)) {
-                        callback.apply(context, arguments);
+                        buffer.backup();
+                        buffer(callback.apply(context, arguments));
+                        return buffer.restore()
                     }
-                    return buffer.restore()
-                }
-            },
-        },
-        /** @type {function} */
-        get: {
-            value(name, defaults) {
-                const path = getPath(this, name, true);
-                const result = path.shift();
-                const prop = path.pop();
-                return hasProp(result, prop) ? result[prop] : defaults
-            },
-        },
-        /** @type {function} */
-        set: {
-            value(name, value) {
-                const path = getPath(this, name, false);
-                const result = path.shift();
-                const prop = path.pop();
-                if (this.getExtend() && hasProp(result, prop)) {
-                    return result[prop]
                 }
-                return (result[prop] = value)
             },
         },
         /** @type {function} */
@@ -769,7 +771,7 @@ const createScope = (config, methods) => {
                 blocks[name].push(this.fn(callback));
                 if (this.getExtend()) return
                 const list = Object.assign([], blocks[name]);
-                const current = function () {
+                const current = () => {
                     return list.shift()
                 };
                 const next = () => {
@@ -801,18 +803,10 @@ const createScope = (config, methods) => {
             },
         },
         /** @type {function} */
-        promiseResolve: {
-            value(value, callback) {
-                return Promise.resolve(
-                    isFunction(value) ? this.fn(value)() : value
-                ).then(callback.bind(this))
-            },
-        },
-        /** @type {function} */
         use: {
             value(path, namespace) {
                 this.echo(
-                    this.promiseResolve(this.require(path), function (exports) {
+                    Promise.resolve(this.require(path)).then((exports) => {
                         const list = this.getMacro();
                         each(exports, function (macro, name) {
                             list[[namespace, name].join('.')] = macro;
@@ -824,11 +818,28 @@ const createScope = (config, methods) => {
         /** @type {function} */
         async: {
             value(promise, callback) {
-                this.echo(
-                    this.promiseResolve(promise, function (data) {
-                        return this.fn(callback)(data)
-                    })
-                );
+                this.echo(Promise.resolve(promise).then(callback));
+            },
+        },
+        /** @type {function} */
+        get: {
+            value(name, defaults) {
+                const path = getPath(this, name, true);
+                const result = path.shift();
+                const prop = path.pop();
+                return hasProp(result, prop) ? result[prop] : defaults
+            },
+        },
+        /** @type {function} */
+        set: {
+            value(name, value) {
+                const path = getPath(this, name, false);
+                const result = path.shift();
+                const prop = path.pop();
+                if (this.getExtend() && hasProp(result, prop)) {
+                    return result[prop]
+                }
+                return (result[prop] = value)
             },
         },
         /** @type {function} */
@@ -839,22 +850,24 @@ const createScope = (config, methods) => {
                 }
                 each(object, callback);
             },
-        },
-        /** @type {function} */
-        element: {
-            value(tag, attr, content) {
-                return element(tag, attr, content)
-            },
+            writable: true,
         },
         /** @type {function} */
         el: {
             value(tag, attr, content) {
+                content = isFunction(content) ? this.fn(content)() : content;
                 this.echo(
-                    this.promiseResolve(content, function (content) {
-                        return this.element(tag, attr, content)
-                    })
+                    Promise.resolve(content).then((content) =>
+                        element(tag, attr, content)
+                    )
                 );
             },
+            writable: true,
+        },
+        /** @type {function} */
+        ui: {
+            value(layout) {},
+            writable: true,
         },
     });
     return ContextScope
@@ -862,20 +875,15 @@ const createScope = (config, methods) => {
 
 class Context {
     #scope
-
     constructor(config, methods) {
-        bindContext(this, ['create', 'helpers', 'configure']);
         this.configure(config, methods);
     }
-
     create(data) {
         return new this.#scope(data)
     }
-
     configure(config, methods) {
-        this.#scope = createScope(config, methods);
+        this.#scope = createContextScope(config, methods);
     }
-
     helpers(methods) {
         extend(this.#scope.prototype, methods || {});
     }
@@ -899,13 +907,14 @@ class EJS {
             'configure',
             'create',
             'render',
+            'require',
             'context',
             'preload',
             'compile',
             'helpers',
         ]);
         //
-        this.helpers({ require: this.#require, render: this.render });
+        this.helpers({ require: this.require, render: this.render });
     }
     configure(options) {
         configSchema(this.#config, options || {});
@@ -943,13 +952,19 @@ class EJS {
     create(options) {
         return new this.constructor(options)
     }
+    require(name) {
+        const filepath = ext(name, this.#config.extension);
+        const scope = this.context({});
+        return this.#output(filepath, scope).then(() => scope.getMacro())
+    }
     #output(path, scope) {
         const { globalHelpers } = this.#config;
         const params = [
             scope,
-            scope.getComponent(),
             scope.getBuffer(),
-            safeValue,
+            scope.useSafeValue,
+            scope.useComponent,
+            scope.useElement,
         ].concat(
             globalHelpers
                 .filter((name) => isFunction(scope[name]))
@@ -959,164 +974,8 @@ class EJS {
             .get(path)
             .then((callback) => callback.apply(scope, params))
     }
-    #require(name) {
-        const filepath = ext(name, this.#config.extension);
-        const scope = this.context({});
-        return this.#output(filepath, scope).then(() => scope.getMacro())
-    }
 }
 
-// export function EJS2(options) {
-//     const self = {
-//         config: {},
-//         helpers: {},
-//         /**
-//          * @type {Context}
-//          */
-//         context: null,
-//         /**
-//          * @type {Compiler}
-//          */
-//         compiler: null,
-//         /**
-//          * @type {Template}
-//          */
-//         template: null,
-//         /**
-//          * @type {Cache}
-//          */
-//         cache: null,
-//     }
-//     /**
-//      *
-//      */
-//     configSchema(self.config, options || {})
-//     self.context = useContext(self.config, self.helpers)
-//     self.compiler = useCompiler(self.config)
-//     self.cache = useCache(self.config)
-//     self.template = useTemplate(self.config, self.cache, self.compiler)
-//     /**
-//      *
-//      * @param {string} path
-//      * @param {ContextScope} scope
-//      * @return {Promise<string>}
-//      */
-//     const output = (path, scope) => {
-//         const { globalHelpers } = self.config
-//         const params = [
-//             scope,
-//             scope.getComponent(),
-//             scope.getBuffer(),
-//             safeValue,
-//         ].concat(
-//             globalHelpers
-//                 .filter((name) => isFunction(scope[name]))
-//                 .map((name) => scope[name].bind(scope))
-//         )
-//         return self.template
-//             .get(path)
-//             .then((callback) => callback.apply(scope, params))
-//     }
-//     /**
-//      *
-//      * @param name
-//      * @return {Promise<string>}
-//      */
-//     const require = (name) => {
-//         const filepath = ext(name, self.config.extension)
-//         const scope = context({})
-//         return output(filepath, scope).then(() => scope.getMacro())
-//     }
-//     /**
-//      *
-//      * @param {string} name
-//      * @param {{}} [data]
-//      * @return {Promise<string>}
-//      */
-//     const render = (name, data) => {
-//         const filepath = ext(name, self.config.extension)
-//         const scope = context(data)
-//         return output(filepath, scope).then((content) => {
-//             if (scope.getExtend()) {
-//                 scope.setExtend(false)
-//                 const layout = scope.getLayout()
-//                 const data = scope.clone()
-//                 return render(layout, data)
-//             }
-//             return content
-//         })
-//     }
-//     /**
-//      *
-//      * @param options
-//      * @return {{}}
-//      */
-//     const configure = (options = {}) => {
-//         configSchema(self.config, options || {})
-//         self.context.configure(self.config, self.helpers)
-//         self.compiler.configure(self.config)
-//         self.cache.configure(self.config)
-//         self.template.configure(self.config)
-//         return self.config
-//     }
-//     /**
-//      *
-//      * @param methods
-//      */
-//     const helpers = (methods) => {
-//         self.context.helpers(extend(self.helpers, methods))
-//     }
-//     /**
-//      *
-//      * @param list
-//      * @return {*}
-//      */
-//     const preload = (list) => {
-//         return self.cache.load(list || {})
-//     }
-//     /**
-//      *
-//      * @param options
-//      * @return {any}
-//      */
-//     const create = (options) => {
-//         return EJS(options)
-//     }
-//     /**
-//      *
-//      * @param content
-//      * @param path
-//      * @return {Function}
-//      */
-//     const compile = (content, path) => {
-//         return self.compiler.compile(content, path)
-//     }
-//     /**
-//      *
-//      * @param data
-//      * @return {ContextScope}
-//      */
-//     const context = (data = {}) => {
-//         return self.context.create(data)
-//     }
-//     /**
-//      *
-//      */
-//     helpers({ require, render })
-//     /**
-//      *
-//      */
-//     return {
-//         configure,
-//         helpers,
-//         preload,
-//         context,
-//         compile,
-//         create,
-//         render,
-//     }
-// }
-
 function readFile(path, template) {
     return new Promise((resolve, reject) => {
         fs.readFile(joinPath(path, template), (error, data) => {