@kosatyi/ejs 0.0.99 → 0.0.101

package/dist/cjs/browser.js

@@ -701,8 +701,8 @@ function createBuffer() {
   return buffer;
 }
 
+var PARENT = Symbol('ContextScope.parentTemplate');
 var createContextScope = function createContextScope(config, methods) {
-  var _Object$definePropert;
   var _config$vars = config.vars,
     BLOCKS = _config$vars.BLOCKS,
     MACRO = _config$vars.MACRO,
@@ -713,217 +713,300 @@ var createContextScope = function createContextScope(config, methods) {
     SCOPE = _config$vars.SCOPE,
     COMPONENT = _config$vars.COMPONENT,
     ELEMENT = _config$vars.ELEMENT;
+  /**
+   *
+   * @type {symbol}
+   */
+
   /**
    * @name ContextScope
    * @param data
    * @constructor
    */
   function ContextScope(data) {
+    this[PARENT] = null;
     this[BLOCKS] = {};
     this[MACRO] = {};
     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
-  }), "useSafeValue", {
-    get: function get() {
-      return safeValue;
-    }
-  }), "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"));
-        };
+  });
+  Object.defineProperty(ContextScope.prototype, PARENT, {
+    value: null,
+    writable: true
+  });
+  Object.defineProperties(ContextScope.prototype, {
+    /** @type {function} */
+    setParentTemplate: {
+      value: function value(_value) {
+        this[PARENT] = _value;
+        return this;
       }
-    }
-  }), "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 {function} */
+    getParentTemplate: {
+      value: function value() {
+        return this[PARENT];
       }
-    }
-  }), "getMacro", {
-    value: function value() {
-      return this[MACRO];
-    }
-  }), "getBuffer", {
-    value: function value() {
-      return this[BUFFER];
-    }
-  }), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_Object$definePropert, "getBlocks", {
-    value: function value() {
-      return this[BLOCKS];
-    }
-  }), "setExtend", {
-    value: function value(_value) {
-      this[EXTEND] = _value;
-    }
-  }), "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} */
+    useSafeValue: {
+      get: function get() {
+        return safeValue;
       }
-      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 () {
-        if (isFunction(callback)) {
-          buffer.backup();
-          buffer(callback.apply(context, arguments));
-          return buffer.restore();
+    },
+    /** @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"));
+          };
         }
-      };
-    }
-  }), "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);
       }
-    }
-  }), "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) {
+    },
+    /** @type {function} */
+    useElement: {
+      get: function get() {
+        if (isFunction(this[ELEMENT])) {
+          return this[ELEMENT].bind(this);
+        } else {
           return function () {
-            _this.echo(parent(_next()));
+            throw new Error("".concat(ELEMENT, " must be a function"));
           };
-        } else {
-          return noop;
         }
-      };
-      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);
-    }
-  }), "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;
-        });
-      }));
-    }
-  }), "async", {
-    value: function value(promise, callback) {
-      this.echo(Promise.resolve(promise).then(callback));
-    }
-  }), "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;
-    }
-  }), "each", {
-    value: function value(object, callback) {
-      if (isString(object)) {
-        object = this.get(object, []);
+    },
+    /** @type {()=>this[MACRO]} */
+    getMacro: {
+      value: function value() {
+        return this[MACRO];
       }
-      each(object, callback);
     },
-    writable: true
-  }), "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);
-      }));
+    /** @type {function} */
+    getBuffer: {
+      value: function value() {
+        return this[BUFFER];
+      }
     },
-    writable: true
-  }), _defineProperty(_Object$definePropert, "ui", {
-    value: function value(layout) {},
-    writable: true
-  })));
+    /** @type {function} */
+    getBlocks: {
+      value: function value() {
+        return this[BLOCKS];
+      }
+    },
+    /** @type {function} */
+    setExtend: {
+      value: function value(_value2) {
+        this[EXTEND] = _value2;
+        return this;
+      }
+    },
+    /** @type {function} */
+    getExtend: {
+      value: function value() {
+        return this[EXTEND];
+      }
+    },
+    /** @type {function} */
+    setLayout: {
+      value: function value(layout) {
+        this[LAYOUT] = layout;
+        return this;
+      }
+    },
+    /** @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 () {
+          if (isFunction(callback)) {
+            buffer.backup();
+            buffer(callback.apply(context, arguments));
+            return buffer.restore();
+          }
+        };
+      }
+    },
+    /** @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));
+        };
+      }
+    },
+    /** @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);
+        }
+      }
+    },
+    /** @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()));
+      }
+    },
+    /** @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, _value3) {
+        var path = getPath(this, name, false);
+        var result = path.shift();
+        var prop = path.pop();
+        if (this.getParentTemplate() && hasProp(result, prop)) {
+          return result[prop];
+        }
+        return result[prop] = _value3;
+      }
+    },
+    /** @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();
@@ -991,21 +1074,43 @@ var EJS = /*#__PURE__*/function () {
       _classPrivateFieldGet2(_template, this).configure(_classPrivateFieldGet2(_config, this));
       return _classPrivateFieldGet2(_config, this);
     }
+  }, {
+    key: "filePath",
+    value: function filePath(name) {
+      return ext(name, _classPrivateFieldGet2(_config, this).extension);
+    }
+  }, {
+    key: "require",
+    value: function require(name) {
+      var scope = this.context({});
+      return _assertClassBrand(_EJS_brand, this, _output).call(this, this.filePath(name), scope).then(function () {
+        return scope.getMacro();
+      });
+    }
   }, {
     key: "render",
     value: function render(name, data) {
-      var _this = this;
-      var filepath = ext(name, _classPrivateFieldGet2(_config, this).extension);
       var scope = this.context(data);
-      return _assertClassBrand(_EJS_brand, this, _output).call(this, filepath, scope).then(function (content) {
+      return _assertClassBrand(_EJS_brand, this, _output).call(this, this.filePath(name), scope).then(this.outputContent(name, scope));
+    }
+  }, {
+    key: "outputContent",
+    value: function outputContent(name, scope) {
+      var _this = this;
+      return function (content) {
         if (scope.getExtend()) {
           scope.setExtend(false);
-          var layout = scope.getLayout();
-          var _data = scope.clone();
-          return _this.render(layout, _data);
+          return _this.renderLayout(scope.getLayout(), scope, name);
         }
         return content;
-      });
+      };
+    }
+  }, {
+    key: "renderLayout",
+    value: function renderLayout(name, data, parent) {
+      var scope = this.context(data);
+      if (parent) scope.setParentTemplate(parent);
+      return _assertClassBrand(_EJS_brand, this, _output).call(this, this.filePath(name), scope).then(this.outputContent(name, scope));
     }
   }, {
     key: "helpers",
@@ -1032,15 +1137,6 @@ var EJS = /*#__PURE__*/function () {
     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();
-      });
-    }
   }]);
 }();
 function _output(path, scope) {