@kosatyi/ejs 0.0.98 → 0.0.100

package/dist/umd/browser.js

@@ -337,6 +337,7 @@
   defaults.vars = {
     SCOPE: 'ejs',
     COMPONENT: 'ui',
+    ELEMENT: 'el',
     EXTEND: '$$e',
     BUFFER: '$$a',
     LAYOUT: '$$l',
@@ -373,7 +374,6 @@
       _classCallCheck(this, Cache);
       _classPrivateFieldInitSpec(this, _enabled, true);
       _classPrivateFieldInitSpec(this, _list, {});
-      bindContext(this, ['configure']);
       this.configure(config);
     }
     return _createClass(Cache, [{
@@ -455,7 +455,6 @@
           return "')\n".concat(value.trim(), "\n").concat(this.BUFFER, "('");
         }
       }]);
-      bindContext(this, ['configure', 'compile']);
       this.configure(config);
     }
     return _createClass(Compiler, [{
@@ -490,7 +489,8 @@
           SCOPE = _classPrivateFieldGet2$1.SCOPE,
           SAFE = _classPrivateFieldGet2$1.SAFE,
           BUFFER = _classPrivateFieldGet2$1.BUFFER,
-          COMPONENT = _classPrivateFieldGet2$1.COMPONENT;
+          COMPONENT = _classPrivateFieldGet2$1.COMPONENT,
+          ELEMENT = _classPrivateFieldGet2$1.ELEMENT;
         var GLOBALS = _classPrivateFieldGet2(_config$1, this).globalHelpers;
         if (_classPrivateFieldGet2(_config$1, this).rmWhitespace) {
           content = String(content).replace(/[\r\n]+/g, '\n').replace(/^\s+|\s+$/gm, '');
@@ -513,7 +513,7 @@
         source = "".concat(BUFFER, ".start();").concat(source, "return ").concat(BUFFER, ".end();");
         source += "\n//# sourceURL=".concat(path);
         var result = null;
-        var params = [SCOPE, COMPONENT, BUFFER, SAFE].concat(GLOBALS);
+        var params = [SCOPE, BUFFER, SAFE, COMPONENT, ELEMENT].concat(GLOBALS);
         try {
           result = Function.apply(null, params.concat(source));
           result.source = "(function(".concat(params.join(','), "){\n").concat(source, "\n});");
@@ -544,7 +544,6 @@
       assertInstanceOf(compiler, Compiler);
       _classPrivateFieldSet2(_cache$1, this, cache);
       _classPrivateFieldSet2(_compiler$1, this, compiler);
-      bindContext(this, ['configure', 'get']);
       this.configure(config);
     }
     return _createClass(Template, [{
@@ -706,17 +705,17 @@
     return buffer;
   }
 
-  var createScope = function createScope(config, methods) {
-    var _Object$definePropert;
+  var createContextScope = function createContextScope(config, methods) {
     var _config$vars = config.vars,
       BLOCKS = _config$vars.BLOCKS,
       MACRO = _config$vars.MACRO,
       EXTEND = _config$vars.EXTEND,
       LAYOUT = _config$vars.LAYOUT,
       BUFFER = _config$vars.BUFFER,
-      COMPONENT = _config$vars.COMPONENT,
       SAFE = _config$vars.SAFE,
-      SCOPE = _config$vars.SCOPE;
+      SCOPE = _config$vars.SCOPE,
+      COMPONENT = _config$vars.COMPONENT,
+      ELEMENT = _config$vars.ELEMENT;
     /**
      * @name ContextScope
      * @param data
@@ -725,200 +724,267 @@
     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.defineProperties(ContextScope.prototype, (_Object$definePropert = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_Object$definePropert, BUFFER, {
+    Object.defineProperty(ContextScope.prototype, BUFFER, {
       value: createBuffer()
-    }), BLOCKS, {
+    });
+    Object.defineProperty(ContextScope.prototype, BLOCKS, {
       value: {},
       writable: true
-    }), MACRO, {
+    });
+    Object.defineProperty(ContextScope.prototype, MACRO, {
       value: {},
       writable: true
-    }), LAYOUT, {
+    });
+    Object.defineProperty(ContextScope.prototype, LAYOUT, {
       value: false,
       writable: true
-    }), EXTEND, {
+    });
+    Object.defineProperty(ContextScope.prototype, EXTEND, {
       value: false,
       writable: true
-    }), "getMacro", {
-      value: function value() {
-        return this[MACRO];
-      }
-    }), "getBuffer", {
-      value: function value() {
-        return this[BUFFER];
-      }
-    }), "getComponent", {
-      value: function value() {
-        var context = this;
-        if (COMPONENT in context) {
+    });
+    Object.defineProperties(ContextScope.prototype, {
+      /** @type {function} */
+      useSafeValue: {
+        get: function get() {
+          return safeValue;
+        }
+      },
+      /** @type {function} */
+      useComponent: {
+        get: function get() {
+          if (isFunction(this[COMPONENT])) {
+            return this[COMPONENT].bind(this);
+          } else {
+            return function () {
+              throw new Error("".concat(COMPONENT, " must be a function"));
+            };
+          }
+        }
+      },
+      /** @type {function} */
+      useElement: {
+        get: function get() {
+          if (isFunction(this[ELEMENT])) {
+            return this[ELEMENT].bind(this);
+          } else {
+            return function () {
+              throw new Error("".concat(ELEMENT, " must be a function"));
+            };
+          }
+        }
+      },
+      /** @type {()=>this[MACRO]} */
+      getMacro: {
+        value: function value() {
+          return this[MACRO];
+        }
+      },
+      /** @type {function} */
+      getBuffer: {
+        value: function value() {
+          return this[BUFFER];
+        }
+      },
+      /** @type {function} */
+      getBlocks: {
+        value: function value() {
+          return this[BLOCKS];
+        }
+      },
+      /** @type {function} */
+      setExtend: {
+        value: function value(_value) {
+          this[EXTEND] = _value;
+        }
+      },
+      /** @type {function} */
+      getExtend: {
+        value: function value() {
+          return this[EXTEND];
+        }
+      },
+      /** @type {function} */
+      setLayout: {
+        value: function value(layout) {
+          this[LAYOUT] = layout;
+        }
+      },
+      /** @type {function} */
+      getLayout: {
+        value: function value() {
+          return this[LAYOUT];
+        }
+      },
+      /** @type {function} */
+      clone: {
+        value: function value(exclude_blocks) {
+          var filter = [LAYOUT, EXTEND, BUFFER];
+          if (exclude_blocks === true) {
+            filter.push(BLOCKS);
+          }
+          return omit(this, filter);
+        }
+      },
+      /** @type {function} */
+      extend: {
+        value: function value(layout) {
+          this.setExtend(true);
+          this.setLayout(layout);
+        }
+      },
+      /** @type {function} */
+      echo: {
+        value: function value(layout) {
+          var buffer = this.getBuffer();
+          var params = [].slice.call(arguments);
+          params.forEach(buffer);
+        }
+      },
+      /** @type {function} */
+      fn: {
+        value: function value(callback) {
+          var buffer = this.getBuffer();
+          var context = this;
           return function () {
-            return context[COMPONENT].apply(context, arguments);
+            if (isFunction(callback)) {
+              buffer.backup();
+              buffer(callback.apply(context, arguments));
+              return buffer.restore();
+            }
           };
         }
-        return function () {
-          console.log('%s function not defined', COMPONENT);
-        };
-      }
-    }), "getBlocks", {
-      value: function value() {
-        return this[BLOCKS];
-      }
-    }), "setExtend", {
-      value: function value(_value) {
-        this[EXTEND] = _value;
-      }
-    }), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_Object$definePropert, "getExtend", {
-      value: function value() {
-        return this[EXTEND];
-      }
-    }), "setLayout", {
-      value: function value(layout) {
-        this[LAYOUT] = layout;
-      }
-    }), "getLayout", {
-      value: function value() {
-        return this[LAYOUT];
-      }
-    }), "clone", {
-      value: function value(exclude_blocks) {
-        var filter = [LAYOUT, EXTEND, BUFFER];
-        if (exclude_blocks === true) {
-          filter.push(BLOCKS);
+      },
+      /** @type {function} */
+      macro: {
+        value: function value(name, callback) {
+          var list = this.getMacro();
+          var macro = this.fn(callback);
+          var context = this;
+          list[name] = function () {
+            return context.echo(macro.apply(undefined, arguments));
+          };
         }
-        return omit(this, filter);
-      }
-    }), "extend", {
-      value: function value(layout) {
-        this.setExtend(true);
-        this.setLayout(layout);
-      }
-    }), "echo", {
-      value: function value(layout) {
-        var buffer = this.getBuffer();
-        var params = [].slice.call(arguments);
-        params.forEach(buffer);
-      }
-    }), "fn", {
-      value: function value(callback) {
-        var buffer = this.getBuffer();
-        var context = this;
-        return function () {
-          buffer.backup();
-          if (isFunction(callback)) {
-            callback.apply(context, arguments);
+      },
+      /** @type {function} */
+      call: {
+        value: function value(name) {
+          var list = this.getMacro();
+          var macro = list[name];
+          var params = [].slice.call(arguments, 1);
+          if (isFunction(macro)) {
+            return macro.apply(macro, params);
           }
-          return buffer.restore();
-        };
-      }
-    }), "get", {
-      value: function value(name, defaults) {
-        var path = getPath(this, name, true);
-        var result = path.shift();
-        var prop = path.pop();
-        return hasProp(result, prop) ? result[prop] : defaults;
-      }
-    }), "set", {
-      value: function value(name, _value2) {
-        var path = getPath(this, name, false);
-        var result = path.shift();
-        var prop = path.pop();
-        if (this.getExtend() && hasProp(result, prop)) {
-          return result[prop];
         }
-        return result[prop] = _value2;
-      }
-    }), "macro", {
-      value: function value(name, callback) {
-        var list = this.getMacro();
-        var macro = this.fn(callback);
-        var context = this;
-        list[name] = function () {
-          return context.echo(macro.apply(undefined, arguments));
-        };
-      }
-    }), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_Object$definePropert, "call", {
-      value: function value(name) {
-        var list = this.getMacro();
-        var macro = list[name];
-        var params = [].slice.call(arguments, 1);
-        if (isFunction(macro)) {
-          return macro.apply(macro, params);
+      },
+      /** @type {function} */
+      block: {
+        value: function value(name, callback) {
+          var _this = this;
+          var blocks = this.getBlocks();
+          blocks[name] = blocks[name] || [];
+          blocks[name].push(this.fn(callback));
+          if (this.getExtend()) return;
+          var list = Object.assign([], blocks[name]);
+          var current = function current() {
+            return list.shift();
+          };
+          var _next = function next() {
+            var parent = current();
+            if (parent) {
+              return function () {
+                _this.echo(parent(_next()));
+              };
+            } else {
+              return noop;
+            }
+          };
+          this.echo(current()(_next()));
         }
-      }
-    }), "block", {
-      value: function value(name, callback) {
-        var _this = this;
-        var blocks = this.getBlocks();
-        blocks[name] = blocks[name] || [];
-        blocks[name].push(this.fn(callback));
-        if (this.getExtend()) return;
-        var list = Object.assign([], blocks[name]);
-        var current = function current() {
-          return list.shift();
-        };
-        var _next = function next() {
-          var parent = current();
-          if (parent) {
-            return function () {
-              _this.echo(parent(_next()));
-            };
-          } else {
-            return noop;
+      },
+      /** @type {function} */
+      hasBlock: {
+        value: function value(name) {
+          return this.getBlocks().hasOwnProperty(name);
+        }
+      },
+      /** @type {function} */
+      include: {
+        value: function value(path, data, cx) {
+          var context = cx === false ? {} : this.clone(true);
+          var params = extend(context, data || {});
+          var promise = this.render(path, params);
+          this.echo(promise);
+        }
+      },
+      /** @type {function} */
+      use: {
+        value: function value(path, namespace) {
+          var _this2 = this;
+          this.echo(Promise.resolve(this.require(path)).then(function (exports) {
+            var list = _this2.getMacro();
+            each(exports, function (macro, name) {
+              list[[namespace, name].join('.')] = macro;
+            });
+          }));
+        }
+      },
+      /** @type {function} */
+      async: {
+        value: function value(promise, callback) {
+          this.echo(Promise.resolve(promise).then(callback));
+        }
+      },
+      /** @type {function} */
+      get: {
+        value: function value(name, defaults) {
+          var path = getPath(this, name, true);
+          var result = path.shift();
+          var prop = path.pop();
+          return hasProp(result, prop) ? result[prop] : defaults;
+        }
+      },
+      /** @type {function} */
+      set: {
+        value: function value(name, _value2) {
+          var path = getPath(this, name, false);
+          var result = path.shift();
+          var prop = path.pop();
+          if (this.getExtend() && hasProp(result, prop)) {
+            return result[prop];
           }
-        };
-        this.echo(current()(_next()));
-      }
-    }), "hasBlock", {
-      value: function value(name) {
-        return this.getBlocks().hasOwnProperty(name);
-      }
-    }), "include", {
-      value: function value(path, data, cx) {
-        var context = cx === false ? {} : this.clone(true);
-        var params = extend(context, data || {});
-        var promise = this.render(path, params);
-        this.echo(promise);
-      }
-    }), "promiseResolve", {
-      value: function value(_value3, callback) {
-        return Promise.resolve(isFunction(_value3) ? this.fn(_value3)() : _value3).then(callback.bind(this));
-      }
-    }), "use", {
-      value: function value(path, namespace) {
-        this.echo(this.promiseResolve(this.require(path), function (exports) {
-          var list = this.getMacro();
-          each(exports, function (macro, name) {
-            list[[namespace, name].join('.')] = macro;
-          });
-        }));
-      }
-    }), "async", {
-      value: function value(promise, callback) {
-        this.echo(this.promiseResolve(promise, function (data) {
-          return this.fn(callback)(data);
-        }));
-      }
-    }), "each", {
-      value: function value(object, callback) {
-        if (isString(object)) {
-          object = this.get(object, []);
+          return result[prop] = _value2;
         }
-        each(object, callback);
-      }
-    }), "element", {
-      value: function value(tag, attr, content) {
-        return element(tag, attr, content);
-      }
-    }), "el", {
-      value: function value(tag, attr, content) {
-        this.echo(this.promiseResolve(content, function (content) {
-          return this.element(tag, attr, content);
-        }));
+      },
+      /** @type {function} */
+      each: {
+        value: function value(object, callback) {
+          if (isString(object)) {
+            object = this.get(object, []);
+          }
+          each(object, callback);
+        },
+        writable: true
+      },
+      /** @type {function} */
+      el: {
+        value: function value(tag, attr, content) {
+          content = isFunction(content) ? this.fn(content)() : content;
+          this.echo(Promise.resolve(content).then(function (content) {
+            return element(tag, attr, content);
+          }));
+        },
+        writable: true
+      },
+      /** @type {function} */
+      ui: {
+        value: function value(layout) {},
+        writable: true
       }
-    })));
+    });
     return ContextScope;
   };
   var _scope = /*#__PURE__*/new WeakMap();
@@ -926,7 +992,6 @@
     function Context(config, methods) {
       _classCallCheck(this, Context);
       _classPrivateFieldInitSpec(this, _scope, void 0);
-      bindContext(this, ['create', 'helpers', 'configure']);
       this.configure(config, methods);
     }
     return _createClass(Context, [{
@@ -937,7 +1002,7 @@
     }, {
       key: "configure",
       value: function configure(config, methods) {
-        _classPrivateFieldSet2(_scope, this, createScope(config, methods));
+        _classPrivateFieldSet2(_scope, this, createContextScope(config, methods));
       }
     }, {
       key: "helpers",
@@ -970,10 +1035,10 @@
       _classPrivateFieldSet2(_cache, this, new Cache(_classPrivateFieldGet2(_config, this)));
       _classPrivateFieldSet2(_template, this, new Template(_classPrivateFieldGet2(_config, this), _classPrivateFieldGet2(_cache, this), _classPrivateFieldGet2(_compiler, this)));
       //
-      bindContext(this, ['configure', 'create', 'render', 'context', 'preload', 'compile', 'helpers']);
+      bindContext(this, ['configure', 'create', 'render', 'require', 'context', 'preload', 'compile', 'helpers']);
       //
       this.helpers({
-        require: _assertClassBrand(_EJS_brand, this, _require),
+        require: this.require,
         render: this.render
       });
     }
@@ -1028,163 +1093,21 @@
       value: function create(options) {
         return new this.constructor(options);
       }
+    }, {
+      key: "require",
+      value: function require(name) {
+        var filepath = ext(name, _classPrivateFieldGet2(_config, this).extension);
+        var scope = this.context({});
+        return _assertClassBrand(_EJS_brand, this, _output).call(this, filepath, scope).then(function () {
+          return 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 _output(path, scope) {
     var _classPrivateFieldGet2$1 = _classPrivateFieldGet2(_config, this),
       globalHelpers = _classPrivateFieldGet2$1.globalHelpers;
-    var params = [scope, scope.getComponent(), scope.getBuffer(), safeValue].concat(globalHelpers.filter(function (name) {
+    var params = [scope, scope.getBuffer(), scope.useSafeValue, scope.useComponent, scope.useElement].concat(globalHelpers.filter(function (name) {
       return isFunction(scope[name]);
     }).map(function (name) {
       return scope[name].bind(scope);
@@ -1193,13 +1116,6 @@
       return callback.apply(scope, params);
     });
   }
-  function _require(name) {
-    var filepath = ext(name, _classPrivateFieldGet2(_config, this).extension);
-    var scope = this.context({});
-    return _assertClassBrand(_EJS_brand, this, _output).call(this, filepath, scope).then(function () {
-      return scope.getMacro();
-    });
-  }
 
   var httpRequest = function httpRequest(path, template) {
     return fetch(joinPath(path, template)).then(function (response) {