@kosatyi/ejs 0.0.68 → 0.0.70

package/dist/cjs/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var path = require('path');
 var fs = require('fs');
+var path = require('path');
 
 var typeProp = function typeProp() {
   var args = [].slice.call(arguments);
@@ -152,13 +152,20 @@ var resolve$1 = function resolve(value, callback, context) {
 var hasProp = function hasProp(object, prop) {
   return object && object.hasOwnProperty(prop);
 };
+var joinPath = function joinPath(path, template) {
+  template = [path, template].join('/');
+  template = template.replace(/\/\//g, '/');
+  return template;
+};
 
 var defaults = {};
 defaults["export"] = 'ejsPrecompiled';
 defaults.cache = true;
 defaults.chokidar = null;
 defaults.path = 'views';
-defaults.resolver = null;
+defaults.resolver = function (path, template) {
+  return Promise.resolve(['resolver is not defined', path, template].join(' '));
+};
 defaults.extension = 'ejs';
 defaults.rmWhitespace = true;
 defaults.withObject = true;
@@ -178,31 +185,6 @@ defaults.token = {
   regex: '([\\s\\S]+?)'
 };
 
-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 configSchema = function configSchema(config, options) {
   extend(config, {
     path: typeProp(isString, defaults.path, config.path, options.path),
@@ -356,30 +338,6 @@ function Compiler(config) {
   this.configure(config);
 }
 
-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');
@@ -402,15 +360,17 @@ function Template(config, cache, compiler) {
   this.configure = function (config) {
     template.path = config.path;
     template.cache = config.cache;
-    template.resolver = fileResolver(config.resolver);
+    if (isFunction(config.resolver)) {
+      template.resolver = config.resolver;
+    }
   };
   this.get = function (template) {
     if (cache.exist(template)) {
       return cache.resolve(template);
     }
-    return result(template, resolve(template).then(function (content) {
+    return resolve(template).then(function (content) {
       return result(template, compile(content, template));
-    }));
+    });
   };
   this.configure(config);
 }
@@ -444,6 +404,31 @@ function _toPropertyKey(arg) {
   return typeof key === "symbol" ? key : String(key);
 }
 
+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('');
+};
+
 function resolve(list) {
   return Promise.all(list || []).then(function (list) {
     return list.join('');
@@ -835,7 +820,49 @@ function EJS(options) {
   return this;
 }
 
-var ejs = new EJS();
+function readFile(path, template) {
+  return new Promise(function (resolve, reject) {
+    fs.readFile(joinPath(path, template), function (error, data) {
+      if (error) {
+        reject(error);
+      } else {
+        resolve(data.toString());
+      }
+    });
+  });
+}
+
+/**
+ *
+ * @param {EJS} ejs
+ * @return {function(name, options, callback): Promise<String>}
+ */
+function expressRenderer(ejs) {
+  return function (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;
+    ejs.configure(viewOptions);
+    return ejs.render(filename, options).then(function (content) {
+      callback(null, content);
+    })["catch"](function (error) {
+      callback(error);
+    });
+  };
+}
+
+var ejs = new EJS({
+  resolver: readFile
+});
 var render = ejs.render,
   context = ejs.context,
   compile = ejs.compile,
@@ -843,36 +870,13 @@ var render = ejs.render,
   preload = ejs.preload,
   configure = ejs.configure,
   create = ejs.create;
+var __express = expressRenderer(ejs);
 
-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);
-  });
-}
-
-exports.EJS = EJS;
 exports.__express = __express;
 exports.compile = compile;
 exports.configure = configure;
 exports.context = context;
 exports.create = create;
-exports.element = element;
 exports.helpers = helpers;
 exports.preload = preload;
 exports.render = render;
-exports.safeValue = safeValue;