@kosatyi/ejs 0.0.54 → 0.0.56

package/README.md

@@ -1,6 +1,6 @@
 # EJS 
 
-Embedded JavaScript templates
+Embedded JavaScript templates with extend/block
 
 [![npm](https://img.shields.io/npm/v/@kosatyi/ejs.svg)](https://www.npmjs.com/package/@kosatyi/ejs)
 [![github-issues](https://img.shields.io/github/issues/kosatyi/ejs.svg)](https://github.com/kosatyi/ejs/issues)

package/dist/cjs/index.js

@@ -1,40 +1,16 @@
 'use strict';
 
-var path = require('path');
 var fs = require('fs');
+var path = require('path');
 
-var defaults = {};
-defaults["export"] = 'ejsPrecompiled';
-defaults.watch = false;
-defaults.path = 'views';
-defaults.resolver = null;
-defaults.extension = 'ejs';
-defaults.rmWhitespace = true;
-defaults.withObject = true;
-defaults.vars = {
-  SCOPE: 'ejs',
-  COMPONENT: 'ui',
-  EXTEND: '$$e',
-  BUFFER: '$$a',
-  LAYOUT: '$$l',
-  BLOCKS: '$$b',
-  MACRO: '$$m',
-  SAFE: '$$v'
-};
-defaults.token = {
-  start: '<%',
-  end: '%>',
-  regex: '([\\s\\S]+?)'
-};
-
-function _typeof(obj) {
+function _typeof(o) {
   "@babel/helpers - typeof";
 
-  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
-    return typeof obj;
-  } : function (obj) {
-    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-  }, _typeof(obj);
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
+    return typeof o;
+  } : function (o) {
+    return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+  }, _typeof(o);
 }
 function _classCallCheck(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
@@ -156,6 +132,14 @@ var getPath = function getPath(context, name) {
   });
   return [data, prop];
 };
+var bindContext = function bindContext(object, context) {
+  var methods = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  methods.forEach(function (name) {
+    if (name in object) {
+      object[name] = object[name].bind(context);
+    }
+  });
+};
 var ext = function ext(path, defaults) {
   var ext = path.split('.').pop();
   if (ext !== defaults) {
@@ -222,31 +206,134 @@ var hasProp = function hasProp(object, prop) {
   return object && object.hasOwnProperty(prop);
 };
 
-var selfClosed = ['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr'];
-var space = ' ';
-var quote = '"';
-var equal = '=';
-var slash = '/';
-var lt = '<';
-var gt = '>';
-var element = function element(tag, attrs, content) {
-  var result = [];
-  var hasClosedTag = selfClosed.indexOf(tag) === -1;
-  var attributes = map(attrs, function (value, key) {
-    if (value !== null && value !== undefined) {
-      return [entities(key), [quote, entities(value), quote].join('')].join(equal);
-    }
-  }).join(space);
-  result.push([lt, tag, space, attributes, gt].join(''));
-  if (content) {
-    result.push(content instanceof Array ? content.join('') : content);
-  }
-  if (hasClosedTag) {
-    result.push([lt, slash, tag, gt].join(''));
-  }
-  return result.join('');
+var defaults = {};
+defaults["export"] = 'ejsPrecompiled';
+defaults.watch = false;
+defaults.chokidar = null;
+defaults.path = 'views';
+defaults.resolver = null;
+defaults.extension = 'ejs';
+defaults.rmWhitespace = true;
+defaults.withObject = true;
+defaults.vars = {
+  SCOPE: 'ejs',
+  COMPONENT: 'ui',
+  EXTEND: '$$e',
+  BUFFER: '$$a',
+  LAYOUT: '$$l',
+  BLOCKS: '$$b',
+  MACRO: '$$m',
+  SAFE: '$$v'
+};
+defaults.token = {
+  start: '<%',
+  end: '%>',
+  regex: '([\\s\\S]+?)'
 };
 
+var configSchema = function configSchema(config, options) {
+  extend(config, {
+    path: typeProp(isString, defaults.path, config.path, options.path),
+    "export": typeProp(isString, defaults["export"], config["export"], options["export"]),
+    resolver: typeProp(isFunction, defaults.resolver, config.resolver, options.resolver),
+    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),
+    watch: typeProp(isBoolean, defaults.watch, config.watch, options.watch),
+    chokidar: typeProp(isObject, defaults["export"], config["export"], options["export"]),
+    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 Template = /*#__PURE__*/function () {
+  function Template(config, cache, compiler) {
+    _classCallCheck(this, Template);
+    this.cache = cache;
+    this.watcher = {
+      unwatch: function unwatch() {},
+      on: function on() {}
+    };
+    this.compiler = compiler;
+    this.configure(config);
+  }
+  _createClass(Template, [{
+    key: "configure",
+    value: function configure(config) {
+      var _this = this;
+      this.path = config.path;
+      this.chokidar = config.chokidar;
+      this.resolver = isFunction(config.resolver) ? config.resolver : isNode() ? fileSystem : httpRequest;
+      if (config.watch && isNode()) {
+        if (this.watcher) {
+          this.watcher.unwatch('.');
+        }
+        if (this.chokidar) {
+          this.watcher = this.chokidar.watch('.', {
+            cwd: this.path
+          }).on('change', function (name) {
+            _this.cache.remove(name);
+          });
+        }
+      }
+    }
+  }, {
+    key: "resolve",
+    value: function resolve(template) {
+      return this.resolver(this.path, template);
+    }
+  }, {
+    key: "result",
+    value: function result(template, content) {
+      this.cache.set(template, content);
+      return content;
+    }
+  }, {
+    key: "compile",
+    value: function compile(content, template) {
+      if (isFunction(content)) {
+        return content;
+      } else {
+        return this.compiler.compile(content, template);
+      }
+    }
+  }, {
+    key: "get",
+    value: function get(template) {
+      var _this2 = this;
+      if (this.cache.exist(template)) {
+        return this.cache.resolve(template);
+      }
+      var content = this.resolve(template).then(function (content) {
+        return _this2.result(template, _this2.compile(content, template));
+      });
+      return this.result(template, content);
+    }
+  }]);
+  return Template;
+}();
+
 var tagList = [{
   symbol: '-',
   format: function format(value) {
@@ -356,91 +443,83 @@ var Compiler = /*#__PURE__*/function () {
   return Compiler;
 }();
 
-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 Template = /*#__PURE__*/function () {
-  function Template(config, cache, compiler) {
-    _classCallCheck(this, Template);
-    this.cache = cache;
-    this.watcher = null;
-    this.compiler = compiler;
+var global = typeof globalThis !== 'undefined' ? globalThis : window || self;
+var Cache = /*#__PURE__*/function () {
+  function Cache(config) {
+    _classCallCheck(this, Cache);
+    _defineProperty(this, "list", {});
     this.configure(config);
+    if (isNode() === false) {
+      this.load(global[this.namespace]);
+    }
   }
-  _createClass(Template, [{
+  _createClass(Cache, [{
     key: "configure",
     value: function configure(config) {
-      var _this = this;
-      this.path = config.path;
-      this.chokidar = config.chokidar;
-      this.resolver = isFunction(config.resolver) ? config.resolver : isNode() ? fileSystem : httpRequest;
-      if (config.watch && config.chokidar && isNode()) {
-        if (this.watcher) {
-          this.watcher.unwatch('.');
-        }
-        this.watcher = this.chokidar.watch('.', {
-          cwd: this.path
-        }).on('change', function (name) {
-          _this.cache.remove(name);
-        }).on('error', function (error) {
-          console.log('watcher error: ' + error);
-        });
-      }
+      this.list = {};
+      this.namespace = config["export"];
     }
   }, {
-    key: "resolve",
-    value: function resolve(template) {
-      return this.resolver(this.path, template);
+    key: "load",
+    value: function load(data) {
+      extend(this.list, data);
+      return this;
     }
   }, {
-    key: "result",
-    value: function result(template, content) {
-      this.cache.set(template, content);
-      return content;
+    key: "exist",
+    value: function exist(key) {
+      return hasProp(this.list, key);
     }
   }, {
-    key: "compile",
-    value: function compile(content, template) {
-      if (isFunction(content)) {
-        return content;
-      } else {
-        return this.compiler.compile(content, template);
-      }
+    key: "get",
+    value: function get(key) {
+      return this.list[key];
     }
   }, {
-    key: "get",
-    value: function get(template) {
-      var _this2 = this;
-      if (this.cache.exist(template)) {
-        return this.cache.resolve(template);
-      }
-      var content = this.resolve(template).then(function (content) {
-        return _this2.result(template, _this2.compile(content, template));
-      });
-      return this.result(template, content);
+    key: "remove",
+    value: function remove(key) {
+      delete this.list[key];
+    }
+  }, {
+    key: "resolve",
+    value: function resolve(key) {
+      return Promise.resolve(this.get(key));
+    }
+  }, {
+    key: "set",
+    value: function set(key, value) {
+      this.list[key] = value;
+      return this;
     }
   }]);
-  return Template;
+  return Cache;
 }();
 
+var selfClosed = ['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr'];
+var space = ' ';
+var quote = '"';
+var equal = '=';
+var slash = '/';
+var lt = '<';
+var gt = '>';
+var element = function element(tag, attrs, content) {
+  var result = [];
+  var hasClosedTag = selfClosed.indexOf(tag) === -1;
+  var attributes = map(attrs, function (value, key) {
+    if (value !== null && value !== undefined) {
+      return [entities(key), [quote, entities(value), quote].join('')].join(equal);
+    }
+  }).join(space);
+  result.push([lt, tag, space, attributes, gt].join(''));
+  if (content) {
+    result.push(content instanceof Array ? content.join('') : content);
+  }
+  if (hasClosedTag) {
+    result.push([lt, slash, tag, gt].join(''));
+  }
+  return result.join('');
+};
+
 var resolve = function resolve(list) {
   return Promise.all(list).then(function (list) {
     return list.join('');
@@ -681,166 +760,129 @@ var Context = /*#__PURE__*/function () {
   return Context;
 }();
 
-var global = typeof globalThis !== 'undefined' ? globalThis : window || self;
-var Cache = /*#__PURE__*/function () {
-  function Cache(config) {
-    _classCallCheck(this, Cache);
-    _defineProperty(this, "list", {});
-    this.configure(config);
-    if (isNode() === false) {
-      this.load(global[this.namespace]);
-    }
+var EJS = /*#__PURE__*/function () {
+  function EJS() {
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    _classCallCheck(this, EJS);
+    _defineProperty(this, "export", ['cache', 'render', 'require', 'helpers', 'configure', 'preload', 'compiler', '__express']);
+    this.config = {};
+    this.scope = {};
+    configSchema(this.config, options);
+    bindContext(this, this, this["export"]);
+    this.context = new Context(this.config);
+    this.compiler = new Compiler(this.config);
+    this.cache = new Cache(this.config);
+    this.template = new Template(this.config, this.cache, this.compiler);
+    this.helpers({
+      require: this.require,
+      render: this.render
+    });
   }
-  _createClass(Cache, [{
+  _createClass(EJS, [{
     key: "configure",
-    value: function configure(config) {
-      this.list = {};
-      this.namespace = config["export"];
+    value: function configure() {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      configSchema(this.config, options);
+      this.context.configure(this.config, this.scope);
+      this.compiler.configure(this.config);
+      this.cache.configure(this.config);
+      this.template.configure(this.config);
+      return this.config;
     }
   }, {
-    key: "load",
-    value: function load(data) {
-      extend(this.list, data);
-      return this;
+    key: "output",
+    value: function output(path, scope) {
+      return this.template.get(path).then(function (callback) {
+        return callback.call(scope, scope, scope.getComponent(), scope.getBuffer(), safeValue);
+      });
     }
   }, {
-    key: "exist",
-    value: function exist(key) {
-      return hasProp(this.list, key);
+    key: "render",
+    value: function render(name, data) {
+      var _this = this;
+      var filepath = ext(name, this.config.extension);
+      var scope = this.context.create(data);
+      return this.output(filepath, scope).then(function (content) {
+        if (scope.getExtend()) {
+          scope.setExtend(false);
+          var layout = scope.getLayout();
+          var _data = scope.clone();
+          return _this.render(layout, _data);
+        }
+        return content;
+      });
     }
   }, {
-    key: "get",
-    value: function get(key) {
-      return this.list[key];
+    key: "require",
+    value: function require(name) {
+      var filepath = ext(name, this.config.extension);
+      var scope = this.context.create({});
+      return this.output(filepath, scope).then(function () {
+        return scope.getMacro();
+      });
     }
   }, {
-    key: "remove",
-    value: function remove(key) {
-      delete this.list[key];
+    key: "create",
+    value: function create() {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      return new EJS(options);
     }
   }, {
-    key: "resolve",
-    value: function resolve(key) {
-      return Promise.resolve(this.get(key));
+    key: "helpers",
+    value: function helpers() {
+      var methods = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      this.context.helpers(extend(this.scope, methods));
     }
   }, {
-    key: "set",
-    value: function set(key, value) {
-      this.list[key] = value;
-      return this;
+    key: "preload",
+    value: function preload() {
+      var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      return this.cache.load(list);
+    }
+  }, {
+    key: "compile",
+    value: function compile(content, path) {
+      return this.compiler.compile(content, path);
+    }
+  }, {
+    key: "__express",
+    value: function __express(name, options, callback) {
+      if (isFunction(options)) {
+        callback = options;
+        options = {};
+      }
+      options = options || {};
+      var settings = extend({}, options.settings);
+      var viewPath = typeProp(isString, defaults.path, settings['views']);
+      var viewCache = typeProp(isBoolean, defaults.cache, settings['view cache']);
+      var viewOptions = extend({}, settings['view options']);
+      var filename = path.relative(viewPath, name);
+      viewOptions.path = viewPath;
+      viewOptions.cache = viewCache;
+      this.configure(viewOptions);
+      return this.render(filename, options).then(function (content) {
+        callback(null, content);
+      })["catch"](function (error) {
+        callback(error);
+      });
     }
   }]);
-  return Cache;
+  return EJS;
 }();
 
-var configSchema = function configSchema(config, options) {
-  extend(config, {
-    path: typeProp(isString, defaults.path, config.path, options.path),
-    "export": typeProp(isString, defaults["export"], config["export"], options["export"]),
-    resolver: typeProp(isFunction, defaults.resolver, config.resolver, options.resolver),
-    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),
-    watch: typeProp(isBoolean, defaults.watch, config.watch, options.watch),
-    chokidar: typeProp(isObject, defaults["export"], config["export"], options["export"]),
-    token: extend({}, defaults.token, config.token, options.token),
-    vars: extend({}, defaults.vars, config.vars, options.vars)
-  });
-};
-var create = function create(options) {
-  var config = {};
-  var scope = {};
-  configSchema(config, options || {});
-  var context = new Context(config);
-  var compiler = new Compiler(config);
-  var cache = new Cache(config);
-  var template = new Template(config, cache, compiler);
-  var configure = function configure(options) {
-    configSchema(config, options);
-    context.configure(config, scope);
-    compiler.configure(config);
-    cache.configure(config);
-    template.configure(config);
-    return config;
-  };
-  var output = function output(path, scope) {
-    return template.get(path).then(function (callback) {
-      return callback.call(scope, scope, scope.getComponent(), scope.getBuffer(), safeValue);
-    });
-  };
-  var require = function require(name) {
-    var filepath = ext(name, config.extension);
-    var scope = context.create({});
-    return output(filepath, scope).then(function () {
-      return scope.getMacro();
-    });
-  };
-  var render = function render(name, data) {
-    var filepath = ext(name, config.extension);
-    var scope = context.create(data);
-    return output(filepath, scope).then(function (content) {
-      if (scope.getExtend()) {
-        scope.setExtend(false);
-        var layout = scope.getLayout();
-        var _data = scope.clone();
-        return render(layout, _data);
-      }
-      return content;
-    });
-  };
-  var helpers = function helpers(methods) {
-    context.helpers(extend(scope, methods || {}));
-  };
-  var __express = function __express(name, options, callback) {
-    if (isFunction(options)) {
-      callback = options;
-      options = {};
-    }
-    options = options || {};
-    var settings = extend({}, options.settings);
-    var viewPath = typeProp(isString, defaults.path, settings['views']);
-    var viewCache = typeProp(isBoolean, defaults.cache, settings['view cache']);
-    var viewOptions = extend({}, settings['view options']);
-    var filename = path.relative(viewPath, name);
-    viewOptions.path = viewPath;
-    viewOptions.cache = viewCache;
-    configure(viewOptions);
-    return render(filename, options).then(function (content) {
-      callback(null, content);
-    })["catch"](function (error) {
-      callback(error);
-    });
-  };
-  var preload = function preload(list) {
-    return cache.load(list);
-  };
-  var compile = function compile(content, path) {
-    return compiler.compile(content, path);
-  };
-  helpers({
-    require: require,
-    render: render
-  });
-  return {
-    context: context,
-    render: render,
-    helpers: helpers,
-    configure: configure,
-    compile: compile,
-    create: create,
-    preload: preload,
-    __express: __express
-  };
-};
-var _create = create({}),
-  context = _create.context,
-  render = _create.render,
-  helpers = _create.helpers,
-  configure = _create.configure,
-  compile = _create.compile,
-  preload = _create.preload,
-  __express = _create.__express;
+var ejs = new EJS({
+  /** defaults options **/
+});
+var __express = ejs.__express,
+  render = ejs.render,
+  context = ejs.context,
+  compile = ejs.compile,
+  helpers = ejs.helpers,
+  preload = ejs.preload,
+  configure = ejs.configure,
+  create = ejs.create;
 
+exports.EJS = EJS;
 exports.__express = __express;
 exports.compile = compile;
 exports.configure = configure;