@kosatyi/ejs 0.0.100 → 0.0.102

package/dist/cjs/browser.js

@@ -509,7 +509,7 @@ var Compiler = /*#__PURE__*/function () {
       source = "".concat(BUFFER, ".start();").concat(source, "return ").concat(BUFFER, ".end();");
       source += "\n//# sourceURL=".concat(path);
       var result = null;
-      var params = [SCOPE, BUFFER, SAFE, COMPONENT, ELEMENT].concat(GLOBALS);
+      var params = [SCOPE, COMPONENT, ELEMENT, BUFFER, SAFE].concat(GLOBALS);
       try {
         result = Function.apply(null, params.concat(source));
         result.source = "(function(".concat(params.join(','), "){\n").concat(source, "\n});");
@@ -701,6 +701,7 @@ function createBuffer() {
   return buffer;
 }
 
+var PARENT = Symbol('ContextScope.parentTemplate');
 var createContextScope = function createContextScope(config, methods) {
   var _config$vars = config.vars,
     BLOCKS = _config$vars.BLOCKS,
@@ -712,12 +713,18 @@ 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]));
@@ -742,7 +749,24 @@ var createContextScope = function createContextScope(config, methods) {
     value: false,
     writable: true
   });
+  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;
+      }
+    },
+    /** @type {function} */
+    getParentTemplate: {
+      value: function value() {
+        return this[PARENT];
+      }
+    },
     /** @type {function} */
     useSafeValue: {
       get: function get() {
@@ -793,8 +817,9 @@ var createContextScope = function createContextScope(config, methods) {
     },
     /** @type {function} */
     setExtend: {
-      value: function value(_value) {
-        this[EXTEND] = _value;
+      value: function value(_value2) {
+        this[EXTEND] = _value2;
+        return this;
       }
     },
     /** @type {function} */
@@ -807,6 +832,7 @@ var createContextScope = function createContextScope(config, methods) {
     setLayout: {
       value: function value(layout) {
         this[LAYOUT] = layout;
+        return this;
       }
     },
     /** @type {function} */
@@ -945,14 +971,14 @@ var createContextScope = function createContextScope(config, methods) {
     },
     /** @type {function} */
     set: {
-      value: function value(name, _value2) {
+      value: function value(name, _value3) {
         var path = getPath(this, name, false);
         var result = path.shift();
         var prop = path.pop();
-        if (this.getExtend() && hasProp(result, prop)) {
+        if (this.getParentTemplate() && hasProp(result, prop)) {
           return result[prop];
         }
-        return result[prop] = _value2;
+        return result[prop] = _value3;
       }
     },
     /** @type {function} */
@@ -1048,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",
@@ -1089,27 +1137,19 @@ 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) {
   var _classPrivateFieldGet2$1 = _classPrivateFieldGet2(_config, this),
     globalHelpers = _classPrivateFieldGet2$1.globalHelpers;
-  var params = [scope, scope.getBuffer(), scope.useSafeValue, scope.useComponent, scope.useElement].concat(globalHelpers.filter(function (name) {
+  var params = [scope, scope.useComponent, scope.useElement, scope.getBuffer(), scope.useSafeValue];
+  var globals = globalHelpers.filter(function (name) {
     return isFunction(scope[name]);
   }).map(function (name) {
     return scope[name].bind(scope);
-  }));
+  });
   return _classPrivateFieldGet2(_template, this).get(path).then(function (callback) {
-    return callback.apply(scope, params);
+    return callback.apply(scope, params.concat(globals));
   });
 }
 

package/dist/cjs/index.js

@@ -512,7 +512,7 @@ var Compiler = /*#__PURE__*/function () {
       source = "".concat(BUFFER, ".start();").concat(source, "return ").concat(BUFFER, ".end();");
       source += "\n//# sourceURL=".concat(path);
       var result = null;
-      var params = [SCOPE, BUFFER, SAFE, COMPONENT, ELEMENT].concat(GLOBALS);
+      var params = [SCOPE, COMPONENT, ELEMENT, BUFFER, SAFE].concat(GLOBALS);
       try {
         result = Function.apply(null, params.concat(source));
         result.source = "(function(".concat(params.join(','), "){\n").concat(source, "\n});");
@@ -704,6 +704,7 @@ function createBuffer() {
   return buffer;
 }
 
+var PARENT = Symbol('ContextScope.parentTemplate');
 var createContextScope = function createContextScope(config, methods) {
   var _config$vars = config.vars,
     BLOCKS = _config$vars.BLOCKS,
@@ -715,12 +716,18 @@ 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]));
@@ -745,7 +752,24 @@ var createContextScope = function createContextScope(config, methods) {
     value: false,
     writable: true
   });
+  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;
+      }
+    },
+    /** @type {function} */
+    getParentTemplate: {
+      value: function value() {
+        return this[PARENT];
+      }
+    },
     /** @type {function} */
     useSafeValue: {
       get: function get() {
@@ -796,8 +820,9 @@ var createContextScope = function createContextScope(config, methods) {
     },
     /** @type {function} */
     setExtend: {
-      value: function value(_value) {
-        this[EXTEND] = _value;
+      value: function value(_value2) {
+        this[EXTEND] = _value2;
+        return this;
       }
     },
     /** @type {function} */
@@ -810,6 +835,7 @@ var createContextScope = function createContextScope(config, methods) {
     setLayout: {
       value: function value(layout) {
         this[LAYOUT] = layout;
+        return this;
       }
     },
     /** @type {function} */
@@ -948,14 +974,14 @@ var createContextScope = function createContextScope(config, methods) {
     },
     /** @type {function} */
     set: {
-      value: function value(name, _value2) {
+      value: function value(name, _value3) {
         var path = getPath(this, name, false);
         var result = path.shift();
         var prop = path.pop();
-        if (this.getExtend() && hasProp(result, prop)) {
+        if (this.getParentTemplate() && hasProp(result, prop)) {
           return result[prop];
         }
-        return result[prop] = _value2;
+        return result[prop] = _value3;
       }
     },
     /** @type {function} */
@@ -1051,21 +1077,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",
@@ -1092,27 +1140,19 @@ 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) {
   var _classPrivateFieldGet2$1 = _classPrivateFieldGet2(_config, this),
     globalHelpers = _classPrivateFieldGet2$1.globalHelpers;
-  var params = [scope, scope.getBuffer(), scope.useSafeValue, scope.useComponent, scope.useElement].concat(globalHelpers.filter(function (name) {
+  var params = [scope, scope.useComponent, scope.useElement, scope.getBuffer(), scope.useSafeValue];
+  var globals = globalHelpers.filter(function (name) {
     return isFunction(scope[name]);
   }).map(function (name) {
     return scope[name].bind(scope);
-  }));
+  });
   return _classPrivateFieldGet2(_template, this).get(path).then(function (callback) {
-    return callback.apply(scope, params);
+    return callback.apply(scope, params.concat(globals));
   });
 }
 

package/dist/cjs/worker.js

@@ -830,7 +830,7 @@ var Compiler = /*#__PURE__*/function () {
       source = "".concat(BUFFER, ".start();").concat(source, "return ").concat(BUFFER, ".end();");
       source += "\n//# sourceURL=".concat(path);
       var result = null;
-      var params = [SCOPE, BUFFER, SAFE, COMPONENT, ELEMENT].concat(GLOBALS);
+      var params = [SCOPE, COMPONENT, ELEMENT, BUFFER, SAFE].concat(GLOBALS);
       try {
         result = Function.apply(null, params.concat(source));
         result.source = "(function(".concat(params.join(','), "){\n").concat(source, "\n});");
@@ -1022,6 +1022,7 @@ function createBuffer() {
   return buffer;
 }
 
+var PARENT = Symbol('ContextScope.parentTemplate');
 var createContextScope = function createContextScope(config, methods) {
   var _config$vars = config.vars,
     BLOCKS = _config$vars.BLOCKS,
@@ -1033,12 +1034,18 @@ 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]));
@@ -1063,7 +1070,24 @@ var createContextScope = function createContextScope(config, methods) {
     value: false,
     writable: true
   });
+  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;
+      }
+    },
+    /** @type {function} */
+    getParentTemplate: {
+      value: function value() {
+        return this[PARENT];
+      }
+    },
     /** @type {function} */
     useSafeValue: {
       get: function get() {
@@ -1114,8 +1138,9 @@ var createContextScope = function createContextScope(config, methods) {
     },
     /** @type {function} */
     setExtend: {
-      value: function value(_value) {
-        this[EXTEND] = _value;
+      value: function value(_value2) {
+        this[EXTEND] = _value2;
+        return this;
       }
     },
     /** @type {function} */
@@ -1128,6 +1153,7 @@ var createContextScope = function createContextScope(config, methods) {
     setLayout: {
       value: function value(layout) {
         this[LAYOUT] = layout;
+        return this;
       }
     },
     /** @type {function} */
@@ -1266,14 +1292,14 @@ var createContextScope = function createContextScope(config, methods) {
     },
     /** @type {function} */
     set: {
-      value: function value(name, _value2) {
+      value: function value(name, _value3) {
         var path = getPath(this, name, false);
         var result = path.shift();
         var prop = path.pop();
-        if (this.getExtend() && hasProp(result, prop)) {
+        if (this.getParentTemplate() && hasProp(result, prop)) {
           return result[prop];
         }
-        return result[prop] = _value2;
+        return result[prop] = _value3;
       }
     },
     /** @type {function} */
@@ -1369,21 +1395,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",
@@ -1410,27 +1458,19 @@ 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) {
   var _classPrivateFieldGet2$1 = _classPrivateFieldGet2(_config, this),
     globalHelpers = _classPrivateFieldGet2$1.globalHelpers;
-  var params = [scope, scope.getBuffer(), scope.useSafeValue, scope.useComponent, scope.useElement].concat(globalHelpers.filter(function (name) {
+  var params = [scope, scope.useComponent, scope.useElement, scope.getBuffer(), scope.useSafeValue];
+  var globals = globalHelpers.filter(function (name) {
     return isFunction(scope[name]);
   }).map(function (name) {
     return scope[name].bind(scope);
-  }));
+  });
   return _classPrivateFieldGet2(_template, this).get(path).then(function (callback) {
-    return callback.apply(scope, params);
+    return callback.apply(scope, params.concat(globals));
   });
 }