@kosatyi/ejs 0.0.64 → 0.0.66

package/dist/cjs/index.js

@@ -62,7 +62,7 @@ var safeValue = function safeValue(value, escape) {
   return check == null ? '' : escape === true ? entities(check) : check;
 };
 var instanceOf = function instanceOf(object, instance) {
-  return object instanceof instance;
+  return Boolean(object instanceof instance);
 };
 var getPath = function getPath(context, name, strict) {
   var data = context;
@@ -91,11 +91,14 @@ var ext = function ext(path, defaults) {
   }
   return path;
 };
-var extend = function extend() {
-  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-    args[_key] = arguments[_key];
+
+/**
+ * @type {<T extends {}, U, V, W,Y>(T,U,V,W,Y)=> T & U & V & W & Y}
+ */
+var extend = function extend(target) {
+  for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+    args[_key - 1] = arguments[_key];
   }
-  var target = args.shift();
   return args.filter(function (source) {
     return source;
   }).reduce(function (target, source) {
@@ -208,67 +211,54 @@ var configSchema = function configSchema(config, options) {
     extension: typeProp(isString, defaults.extension, config.extension, options.extension),
     withObject: typeProp(isBoolean, defaults.withObject, config.withObject, options.withObject),
     rmWhitespace: typeProp(isBoolean, defaults.rmWhitespace, config.rmWhitespace, options.rmWhitespace),
-    cache: typeProp(isBoolean, defaults.watch, config.watch, options.watch),
+    cache: typeProp(isBoolean, defaults.cache, config.cache, options.cache),
     token: extend({}, defaults.token, config.token, options.token),
     vars: extend({}, defaults.vars, config.vars, options.vars)
   });
 };
 
-var resolvePath = function resolvePath(path, template) {
-  template = [path, template].join('/');
-  template = template.replace(/\/\//g, '/');
-  return template;
-};
-var httpRequest = function httpRequest(path, template) {
-  return fetch(resolvePath(path, template)).then(function (response) {
-    return response.text();
-  });
-};
-var fileSystem = function fileSystem(path, template) {
-  return new Promise(function (resolve, reject) {
-    fs.readFile(resolvePath(path, template), function (error, data) {
-      if (error) {
-        reject(error);
-      } else {
-        resolve(data.toString());
-      }
-    });
-  });
-};
-var fileResolver = function fileResolver(resolver) {
-  return isFunction(resolver) ? resolver : isNode() ? fileSystem : httpRequest;
-};
-function Template(config, cache, compiler) {
-  if (instanceOf(this, Template) === false) return new Template(config, cache, compiler);
-  var template = {};
-  var result = function result(template, content) {
-    cache.set(template, content);
-    return content;
+var global = typeof globalThis !== 'undefined' ? globalThis : window || self;
+function Cache(config) {
+  if (instanceOf(this, Cache) === false) return new Cache();
+  var cache = {
+    enabled: true,
+    list: {}
   };
-  var resolve = function resolve(path) {
-    return template.resolver(template.path, path);
+  this.configure = function (config) {
+    cache.enabled = config.cache;
+    if (isNode() === false) {
+      this.load(global[config["export"]]);
+    }
   };
-  var compile = function compile(content, template) {
-    if (isFunction(content)) {
-      return content;
-    } else {
-      return compiler.compile(content, template);
+  this.clear = function () {
+    cache.list = {};
+  };
+  this.load = function (data) {
+    if (cache.enabled) {
+      extend(cache.list, data || {});
     }
+    return this;
   };
-  this.configure = function (config) {
-    template.path = config.path;
-    template.cache = config.cache;
-    template.resolver = fileResolver(config.resolver);
+  this.get = function (key) {
+    if (cache.enabled) {
+      return cache.list[key];
+    }
   };
-  this.get = function (template) {
-    if (cache.exist(template)) {
-      return cache.resolve(template);
+  this.set = function (key, value) {
+    if (cache.enabled) {
+      cache.list[key] = value;
     }
-    return result(template, resolve(template).then(function (content) {
-      return result(template, compile(content, template));
-    }));
+    return this;
+  };
+  this.resolve = function (key) {
+    return Promise.resolve(this.get(key));
+  };
+  this.remove = function (key) {
+    delete cache.list[key];
+  };
+  this.exist = function (key) {
+    return hasProp(cache.list, key);
   };
-  this.configure(config);
 }
 
 var tagList = [{
@@ -366,46 +356,92 @@ function Compiler(config) {
   this.configure(config);
 }
 
-var global = typeof globalThis !== 'undefined' ? globalThis : window || self;
-function Cache(config) {
-  if (instanceOf(this, Cache) === false) return new Cache();
-  var cache = {
-    enabled: true,
-    list: {}
+var resolvePath = function resolvePath(path, template) {
+  template = [path, template].join('/');
+  template = template.replace(/\/\//g, '/');
+  return template;
+};
+var httpRequest = function httpRequest(path, template) {
+  return fetch(resolvePath(path, template)).then(function (response) {
+    return response.text();
+  });
+};
+var fileSystem = function fileSystem(path, template) {
+  return new Promise(function (resolve, reject) {
+    fs.readFile(resolvePath(path, template), function (error, data) {
+      if (error) {
+        reject(error);
+      } else {
+        resolve(data.toString());
+      }
+    });
+  });
+};
+var fileResolver = function fileResolver(resolver) {
+  return isFunction(resolver) ? resolver : isNode() ? fileSystem : httpRequest;
+};
+function Template(config, cache, compiler) {
+  if (instanceOf(this, Template) === false) return new Template(config, cache, compiler);
+  if (instanceOf(cache, Cache) === false) throw new TypeError('cache is not instance of Cache');
+  if (instanceOf(compiler, Compiler) === false) throw new TypeError('compiler is not instance of Compiler');
+  var template = {};
+  var result = function result(template, content) {
+    cache.set(template, content);
+    return content;
   };
-  this.configure = function (config) {
-    cache.list = {};
-    cache.enabled = config.cache;
-    if (isNode() === false) {
-      this.load(global[config["export"]]);
-    }
+  var resolve = function resolve(path) {
+    return template.resolver(template.path, path);
   };
-  this.load = function (data) {
-    if (cache.enabled) {
-      extend(cache.list, data || {});
+  var compile = function compile(content, template) {
+    if (isFunction(content)) {
+      return content;
+    } else {
+      return compiler.compile(content, template);
     }
-    return this;
   };
-  this.get = function (key) {
-    if (cache.enabled) {
-      return cache.list[key];
-    }
+  this.configure = function (config) {
+    template.path = config.path;
+    template.cache = config.cache;
+    template.resolver = fileResolver(config.resolver);
   };
-  this.set = function (key, value) {
-    if (cache.enabled) {
-      cache.list[key] = value;
+  this.get = function (template) {
+    if (cache.exist(template)) {
+      return cache.resolve(template);
     }
-    return this;
-  };
-  this.resolve = function (key) {
-    return Promise.resolve(this.get(key));
-  };
-  this.remove = function (key) {
-    delete cache.list[key];
-  };
-  this.exist = function (key) {
-    return hasProp(cache.list, key);
+    return result(template, resolve(template).then(function (content) {
+      return result(template, compile(content, template));
+    }));
   };
+  this.configure(config);
+}
+
+function _defineProperty(obj, key, value) {
+  key = _toPropertyKey(key);
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+function _toPrimitive(input, hint) {
+  if (typeof input !== "object" || input === null) return input;
+  var prim = input[Symbol.toPrimitive];
+  if (prim !== undefined) {
+    var res = prim.call(input, hint || "default");
+    if (typeof res !== "object") return res;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return (hint === "string" ? String : Number)(input);
+}
+function _toPropertyKey(arg) {
+  var key = _toPrimitive(arg, "string");
+  return typeof key === "symbol" ? key : String(key);
 }
 
 function resolve(list) {
@@ -413,7 +449,7 @@ function resolve(list) {
     return list.join('');
   });
 }
-var createBuffer = function createBuffer() {
+function createBuffer() {
   var store = [],
     array = [];
   function buffer(value) {
@@ -438,11 +474,12 @@ var createBuffer = function createBuffer() {
     return resolve(array);
   };
   return buffer;
-};
+}
 
 function Context(config) {
   if (instanceOf(this, Context) === false) return new Context(config);
   this.configure = function (config, methods) {
+    var _Object$definePropert;
     var _config$vars = config.vars,
       BLOCKS = _config$vars.BLOCKS,
       MACRO = _config$vars.MACRO,
@@ -455,6 +492,7 @@ function Context(config) {
     };
     this.helpers = function (methods) {
       extend(Scope.prototype, methods || {});
+      console.log('helpers', Scope.prototype);
     };
     function Scope(data) {
       this[BLOCKS] = {};
@@ -462,168 +500,270 @@ function Context(config) {
       extend(this, data || {});
     }
     Scope.prototype = extend({}, methods || {});
-    Scope.method = Scope.define = function (name, value, writable, configurable, enumerable) {
-      Object.defineProperty(Scope.prototype, name, {
-        value: value,
-        writable: writable || false,
-        configurable: configurable || false,
-        enumerable: enumerable || false
-      });
-    };
-    Scope.define(BUFFER, createBuffer());
-    Scope.define(BLOCKS, {}, true);
-    Scope.define(MACRO, {}, true);
-    Scope.define(LAYOUT, false, true);
-    Scope.define(EXTEND, false, true);
-    Scope.method('getMacro', function () {
-      return this[MACRO];
-    });
-    Scope.method('getBuffer', function () {
-      return this[BUFFER];
-    });
-    Scope.method('getComponent', function () {
-      var context = this;
-      if (COMPONENT in context) {
+    Object.defineProperties(Scope.prototype, (_Object$definePropert = {}, _defineProperty(_Object$definePropert, BUFFER, {
+      value: createBuffer(),
+      writable: true,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, BLOCKS, {
+      value: {},
+      writable: true,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, MACRO, {
+      value: {},
+      writable: true,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, LAYOUT, {
+      value: false,
+      writable: true,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, EXTEND, {
+      value: false,
+      writable: true,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "getMacro", {
+      value: function value() {
+        return this[MACRO];
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "getBuffer", {
+      value: function value() {
+        return this[BUFFER];
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "getComponent", {
+      value: function value() {
+        var context = this;
+        if (COMPONENT in context) {
+          return function () {
+            return context[COMPONENT].apply(context, arguments);
+          };
+        }
         return function () {
-          return context[COMPONENT].apply(context, arguments);
+          console.log('%s function not defined', COMPONENT);
         };
-      }
-      return function () {
-        console.log('%s function not defined', COMPONENT);
-      };
-    });
-    Scope.method('getBlocks', function () {
-      return this[BLOCKS];
-    });
-    Scope.method('setExtend', function (value) {
-      this[EXTEND] = value;
-    });
-    Scope.method('getExtend', function () {
-      return this[EXTEND];
-    });
-    Scope.method('setLayout', function (layout) {
-      this[LAYOUT] = layout;
-    });
-    Scope.method('getLayout', function () {
-      return this[LAYOUT];
-    });
-    Scope.method('clone', function (exclude_blocks) {
-      var filter = [LAYOUT, EXTEND, BUFFER];
-      if (exclude_blocks === true) {
-        filter.push(BLOCKS);
-      }
-      return omit(this, filter);
-    });
-    Scope.method('extend', function (layout) {
-      this.setExtend(true);
-      this.setLayout(layout);
-    });
-    Scope.method('echo', function () {
-      var buffer = this.getBuffer();
-      var params = [].slice.call(arguments);
-      params.forEach(buffer);
-    });
-    Scope.method('fn', function (callback) {
-      var buffer = this.getBuffer();
-      var context = this;
-      return function () {
-        buffer.backup();
-        if (isFunction(callback)) {
-          callback.apply(context, arguments);
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "getBlocks", {
+      value: function value() {
+        return this[BLOCKS];
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "setExtend", {
+      value: function value(_value) {
+        this[EXTEND] = _value;
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "getExtend", {
+      value: function value() {
+        return this[EXTEND];
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "setLayout", {
+      value: function value(layout) {
+        this[LAYOUT] = layout;
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "getLayout", {
+      value: function value() {
+        return this[LAYOUT];
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "clone", {
+      value: function value(exclude_blocks) {
+        var filter = [LAYOUT, EXTEND, BUFFER];
+        if (exclude_blocks === true) {
+          filter.push(BLOCKS);
         }
-        return buffer.restore();
-      };
-    });
-    Scope.method('get', function (name, defaults) {
-      var path = getPath(this, name, true);
-      var result = path.shift();
-      var prop = path.pop();
-      return hasProp(result, prop) ? result[prop] : defaults;
-    });
-    Scope.method('set', function (name, value) {
-      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] = value;
-    });
-    Scope.method('macro', function (name, callback) {
-      var list = this.getMacro();
-      var macro = this.fn(callback);
-      var context = this;
-      list[name] = function () {
-        return context.echo(macro.apply(undefined, arguments));
-      };
-    });
-    Scope.method('call', function (name) {
-      var list = this.getMacro();
-      var macro = list[name];
-      var params = [].slice.call(arguments, 1);
-      if (isFunction(macro)) {
-        return macro.apply(macro, params);
-      }
-    });
-    Scope.method('block', function (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;
+        return omit(this, filter);
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "extend", {
+      value: function value(layout) {
+        this.setExtend(true);
+        this.setLayout(layout);
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "echo", {
+      value: function value(layout) {
+        var buffer = this.getBuffer();
+        var params = [].slice.call(arguments);
+        params.forEach(buffer);
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "fn", {
+      value: function value(callback) {
+        var buffer = this.getBuffer();
+        var context = this;
+        return function () {
+          buffer.backup();
+          if (isFunction(callback)) {
+            callback.apply(context, arguments);
+          }
+          return buffer.restore();
+        };
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "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;
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "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()));
-    });
-    Scope.method('include', function (path, data, cx) {
-      var context = cx === false ? {} : this.clone(true);
-      var params = extend(context, data || {});
-      var promise = this.render(path, params);
-      this.echo(promise);
-    });
-    Scope.method('use', function (path, namespace) {
-      var promise = this.require(path);
-      this.echo(resolve$1(promise, function (exports) {
+        return result[prop] = _value2;
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "macro", {
+      value: function value(name, callback) {
         var list = this.getMacro();
-        each(exports, function (macro, name) {
-          list[[namespace, name].join('.')] = macro;
-        });
-      }, this));
-    });
-    Scope.method('async', function (promise, callback) {
-      this.echo(resolve$1(promise, function (data) {
-        return this.fn(callback)(data);
-      }, this));
-    });
-    Scope.method('node', function (tag, attr, content) {
-      return element(tag, attr, content);
-    });
-    Scope.method('el', function (tag, attr, content) {
-      if (isFunction(content)) {
-        content = this.fn(content)();
-      }
-      this.echo(resolve$1(content, function (content) {
+        var macro = this.fn(callback);
+        var context = this;
+        list[name] = function () {
+          return context.echo(macro.apply(undefined, arguments));
+        };
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _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);
+        }
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "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()));
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "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);
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "use", {
+      value: function value(path, namespace) {
+        var promise = this.require(path);
+        this.echo(resolve$1(promise, function (exports) {
+          var list = this.getMacro();
+          each(exports, function (macro, name) {
+            list[[namespace, name].join('.')] = macro;
+          });
+        }, this));
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "async", {
+      value: function value(promise, callback) {
+        this.echo(resolve$1(promise, function (data) {
+          return this.fn(callback)(data);
+        }, this));
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "each", {
+      value: function value(object, callback) {
+        if (isString(object)) {
+          object = this.get(object, []);
+        }
+        each(object, callback);
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _defineProperty(_Object$definePropert, "element", {
+      value: function value(tag, attr, content) {
         return element(tag, attr, content);
-      }, this));
-    });
-    Scope.method('each', function (object, callback) {
-      if (isString(object)) {
-        object = this.get(object, []);
       }
-      each(object, callback);
-    });
+    }), _defineProperty(_Object$definePropert, "el", {
+      value: function value(tag, attr, content) {
+        if (isFunction(content)) {
+          content = this.fn(content)();
+        }
+        this.echo(resolve$1(content, function (content) {
+          return this.element(tag, attr, content);
+        }, this));
+      },
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }), _Object$definePropert));
   };
   this.configure(config);
 }
@@ -675,7 +815,7 @@ function EJS(options) {
     return render(name, data);
   };
   this.helpers = function (methods) {
-    context.helpers(Object.assign(scope, methods || {}));
+    context.helpers(extend(scope, methods));
   };
   this.preload = function (list) {
     return cache.load(list || {});
@@ -693,6 +833,7 @@ function EJS(options) {
     require: require,
     render: render
   });
+  return this;
 }
 
 var ejs = new EJS();
@@ -718,7 +859,7 @@ function __express(name, options, callback) {
   viewOptions.path = viewPath;
   viewOptions.cache = viewCache;
   configure(viewOptions);
-  return this.render(filename, options).then(function (content) {
+  return render(filename, options).then(function (content) {
     callback(null, content);
   })["catch"](function (error) {
     callback(error);