@kosatyi/ejs 0.0.98 → 0.0.99

package/dist/cjs/index.js

@@ -336,6 +336,7 @@ defaults.globalHelpers = [];
 defaults.vars = {
   SCOPE: 'ejs',
   COMPONENT: 'ui',
+  ELEMENT: 'el',
   EXTEND: '$$e',
   BUFFER: '$$a',
   LAYOUT: '$$l',
@@ -372,7 +373,6 @@ var Cache = /*#__PURE__*/function () {
     _classCallCheck(this, Cache);
     _classPrivateFieldInitSpec(this, _enabled, true);
     _classPrivateFieldInitSpec(this, _list, {});
-    bindContext(this, ['configure']);
     this.configure(config);
   }
   return _createClass(Cache, [{
@@ -454,7 +454,6 @@ var Compiler = /*#__PURE__*/function () {
         return "')\n".concat(value.trim(), "\n").concat(this.BUFFER, "('");
       }
     }]);
-    bindContext(this, ['configure', 'compile']);
     this.configure(config);
   }
   return _createClass(Compiler, [{
@@ -489,7 +488,8 @@ var Compiler = /*#__PURE__*/function () {
         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, '');
@@ -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, 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});");
@@ -543,7 +543,6 @@ var Template = /*#__PURE__*/function () {
     assertInstanceOf(compiler, Compiler);
     _classPrivateFieldSet2(_cache$1, this, cache);
     _classPrivateFieldSet2(_compiler$1, this, compiler);
-    bindContext(this, ['configure', 'get']);
     this.configure(config);
   }
   return _createClass(Template, [{
@@ -705,7 +704,7 @@ function createBuffer() {
   return buffer;
 }
 
-var createScope = function createScope(config, methods) {
+var createContextScope = function createContextScope(config, methods) {
   var _Object$definePropert;
   var _config$vars = config.vars,
     BLOCKS = _config$vars.BLOCKS,
@@ -713,9 +712,10 @@ var createScope = function createScope(config, methods) {
     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
@@ -724,7 +724,7 @@ var createScope = function 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.defineProperties(ContextScope.prototype, (_Object$definePropert = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_Object$definePropert, BUFFER, {
@@ -741,6 +741,30 @@ var createScope = function createScope(config, methods) {
   }), 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"));
+        };
+      }
+    }
+  }), "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"));
+        };
+      }
+    }
   }), "getMacro", {
     value: function value() {
       return this[MACRO];
@@ -749,19 +773,7 @@ var createScope = function createScope(config, methods) {
     value: function value() {
       return this[BUFFER];
     }
-  }), "getComponent", {
-    value: function value() {
-      var context = this;
-      if (COMPONENT in context) {
-        return function () {
-          return context[COMPONENT].apply(context, arguments);
-        };
-      }
-      return function () {
-        console.log('%s function not defined', COMPONENT);
-      };
-    }
-  }), "getBlocks", {
+  }), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_Object$definePropert, "getBlocks", {
     value: function value() {
       return this[BLOCKS];
     }
@@ -769,7 +781,7 @@ var createScope = function createScope(config, methods) {
     value: function value(_value) {
       this[EXTEND] = _value;
     }
-  }), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_Object$definePropert, "getExtend", {
+  }), "getExtend", {
     value: function value() {
       return this[EXTEND];
     }
@@ -805,30 +817,13 @@ var createScope = function createScope(config, methods) {
       var buffer = this.getBuffer();
       var 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();
       };
     }
-  }), "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();
@@ -881,14 +876,11 @@ var createScope = function createScope(config, methods) {
       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();
+      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;
         });
@@ -896,9 +888,24 @@ var createScope = function createScope(config, methods) {
     }
   }), "async", {
     value: function value(promise, callback) {
-      this.echo(this.promiseResolve(promise, function (data) {
-        return this.fn(callback)(data);
-      }));
+      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) {
@@ -906,17 +913,19 @@ var createScope = function createScope(config, methods) {
         object = this.get(object, []);
       }
       each(object, callback);
-    }
-  }), "element", {
-    value: function value(tag, attr, content) {
-      return element(tag, attr, content);
-    }
+    },
+    writable: true
   }), "el", {
     value: function value(tag, attr, content) {
-      this.echo(this.promiseResolve(content, function (content) {
-        return this.element(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
+  }), _defineProperty(_Object$definePropert, "ui", {
+    value: function value(layout) {},
+    writable: true
   })));
   return ContextScope;
 };
@@ -925,7 +934,6 @@ var Context = /*#__PURE__*/function () {
   function Context(config, methods) {
     _classCallCheck(this, Context);
     _classPrivateFieldInitSpec(this, _scope, void 0);
-    bindContext(this, ['create', 'helpers', 'configure']);
     this.configure(config, methods);
   }
   return _createClass(Context, [{
@@ -936,7 +944,7 @@ var Context = /*#__PURE__*/function () {
   }, {
     key: "configure",
     value: function configure(config, methods) {
-      _classPrivateFieldSet2(_scope, this, createScope(config, methods));
+      _classPrivateFieldSet2(_scope, this, createContextScope(config, methods));
     }
   }, {
     key: "helpers",
@@ -969,10 +977,10 @@ var EJS = /*#__PURE__*/function () {
     _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
     });
   }
@@ -1027,163 +1035,21 @@ 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();
+      });
+    }
   }]);
 }();
-
-// 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);
@@ -1192,13 +1058,6 @@ function _output(path, scope) {
     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();
-  });
-}
 
 function readFile(path, template) {
   return new Promise(function (resolve, reject) {