@kosatyi/ejs 0.0.63 → 0.0.65

package/dist/cjs/index.js

@@ -3,16 +3,6 @@
 var path = require('path');
 var fs = require('fs');
 
-function _typeof(o) {
-  "@babel/helpers - typeof";
-
-  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);
-}
-
 var typeProp = function typeProp() {
   var args = [].slice.call(arguments);
   var callback = args.shift();
@@ -27,9 +17,6 @@ var isString = function isString(v) {
 var isBoolean = function isBoolean(v) {
   return typeof v === 'boolean';
 };
-var isObject = function isObject(v) {
-  return _typeof(v) === 'object';
-};
 var isUndefined = function isUndefined(v) {
   return typeof v === 'undefined';
 };
@@ -75,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;
@@ -165,7 +152,7 @@ var hasProp = function hasProp(object, prop) {
 
 var defaults = {};
 defaults["export"] = 'ejsPrecompiled';
-defaults.watch = false;
+defaults.cache = true;
 defaults.chokidar = null;
 defaults.path = 'views';
 defaults.resolver = null;
@@ -221,81 +208,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),
-    watch: typeProp(isBoolean, defaults.watch, config.watch, options.watch),
-    chokidar: typeProp(isObject, defaults["export"], config["export"], options["export"]),
+    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;
   };
-  var watcher = function watcher(config) {
-    if (template.watcher) {
-      template.watcher.unwatch('.');
+  this.get = function (key) {
+    if (cache.enabled) {
+      return cache.list[key];
     }
-    if (config.watch && config.chokidar && isNode()) {
-      return config.chokidar.watch('.', {
-        cwd: template.path
-      }).on('change', function (name) {
-        cache.remove(name);
-      });
+  };
+  this.set = function (key, value) {
+    if (cache.enabled) {
+      cache.list[key] = value;
     }
+    return this;
   };
-  this.configure = function (config) {
-    template.path = config.path;
-    template.chokidar = config.chokidar;
-    template.resolver = fileResolver(config.resolver);
-    template.watcher = watcher(config);
+  this.resolve = function (key) {
+    return Promise.resolve(this.get(key));
   };
-  this.get = function (template) {
-    if (cache.exist(template)) {
-      return cache.resolve(template);
-    }
-    return result(template, resolve(template).then(function (content) {
-      return result(template, compile(content, template));
-    }));
+  this.remove = function (key) {
+    delete cache.list[key];
+  };
+  this.exist = function (key) {
+    return hasProp(cache.list, key);
   };
-  this.configure(config);
 }
 
 var tagList = [{
@@ -393,38 +353,63 @@ 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 = {
-    list: {}
-  };
-  this.configure = function (config) {
-    cache.list = {};
-    if (isNode() === false) {
-      this.load(global[config["export"]]);
-    }
-  };
-  this.load = function (data) {
-    extend(cache.list, data || {});
-    return this;
-  };
-  this.get = function (key) {
-    return cache.list[key];
+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.set = function (key, value) {
-    cache.list[key] = value;
-    return this;
+  var resolve = function resolve(path) {
+    return template.resolver(template.path, path);
   };
-  this.resolve = function (key) {
-    return Promise.resolve(this.get(key));
+  var compile = function compile(content, template) {
+    if (isFunction(content)) {
+      return content;
+    } else {
+      return compiler.compile(content, template);
+    }
   };
-  this.remove = function (key) {
-    delete cache.list[key];
+  this.configure = function (config) {
+    template.path = config.path;
+    template.cache = config.cache;
+    template.resolver = fileResolver(config.resolver);
   };
-  this.exist = function (key) {
-    return hasProp(cache.list, key);
+  this.get = function (template) {
+    if (cache.exist(template)) {
+      return cache.resolve(template);
+    }
+    return result(template, resolve(template).then(function (content) {
+      return result(template, compile(content, template));
+    }));
   };
+  this.configure(config);
 }
 
 function resolve(list) {
@@ -720,7 +705,7 @@ var render = ejs.render,
   compile = ejs.compile,
   helpers = ejs.helpers,
   preload = ejs.preload,
-  configure$1 = ejs.configure,
+  configure = ejs.configure,
   create = ejs.create;
 
 function __express(name, options, callback) {
@@ -737,7 +722,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);
@@ -747,7 +732,7 @@ function __express(name, options, callback) {
 exports.EJS = EJS;
 exports.__express = __express;
 exports.compile = compile;
-exports.configure = configure$1;
+exports.configure = configure;
 exports.context = context;
 exports.create = create;
 exports.element = element;

package/dist/esm/index.js

@@ -9,7 +9,6 @@ const typeProp = function () {
 const isFunction = (v) => typeof v === 'function';
 const isString = (v) => typeof v === 'string';
 const isBoolean = (v) => typeof v === 'boolean';
-const isObject = (v) => typeof v === 'object';
 const isUndefined = (v) => typeof v === 'undefined';
 
 const isNodeEnv =
@@ -64,7 +63,7 @@ const safeValue = (value, escape) => {
 };
 
 const instanceOf = (object, instance) => {
-    return object instanceof instance
+    return Boolean(object instanceof instance)
 };
 
 const getPath = (context, name, strict) => {
@@ -161,23 +160,14 @@ const hasProp = (object, prop) => {
 };
 
 const defaults = {};
-
 defaults.export = 'ejsPrecompiled';
-
-defaults.watch = false;
-
+defaults.cache = true;
 defaults.chokidar = null;
-
 defaults.path = 'views';
-
 defaults.resolver = null;
-
 defaults.extension = 'ejs';
-
 defaults.rmWhitespace = true;
-
 defaults.withObject = true;
-
 defaults.vars = {
     SCOPE: 'ejs',
     COMPONENT: 'ui',
@@ -188,7 +178,6 @@ defaults.vars = {
     MACRO: '$$m',
     SAFE: '$$v',
 };
-
 defaults.token = {
     start: '<%',
     end: '%>',
@@ -273,99 +262,55 @@ const configSchema = (config, options) => {
             config.rmWhitespace,
             options.rmWhitespace
         ),
-        watch: typeProp(isBoolean, defaults.watch, config.watch, options.watch),
-        chokidar: typeProp(
-            isObject,
-            defaults.export,
-            config.export,
-            options.export
-        ),
+        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),
     });
 };
 
-const resolvePath = (path, template) => {
-    template = [path, template].join('/');
-    template = template.replace(/\/\//g, '/');
-    return template
-};
-
-const httpRequest = (path, template) => {
-    return fetch(resolvePath(path, template)).then((response) =>
-        response.text()
-    )
-};
-
-const fileSystem = (path, template) => {
-    return new Promise((resolve, reject) => {
-        fs.readFile(resolvePath(path, template), (error, data) => {
-            if (error) {
-                reject(error);
-            } else {
-                resolve(data.toString());
-            }
-        });
-    })
-};
-
-const 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)
-
-    const template = {};
+const global = typeof globalThis !== 'undefined' ? globalThis : window || self;
 
-    const result = function (template, content) {
-        cache.set(template, content);
-        return content
+function Cache(config) {
+    if (instanceOf(this, Cache) === false) return new Cache()
+    const cache = {
+        enabled: true,
+        list: {},
     };
-
-    const resolve = function (path) {
-        return template.resolver(template.path, path)
+    this.configure = function (config) {
+        cache.enabled = config.cache;
+        if (isNode() === false) {
+            this.load(global[config.export]);
+        }
     };
-
-    const compile = function (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
     };
-
-    const watcher = function (config) {
-        if (template.watcher) {
-            template.watcher.unwatch('.');
+    this.get = function (key) {
+        if (cache.enabled) {
+            return cache.list[key]
         }
-        if (config.watch && config.chokidar && isNode()) {
-            return config.chokidar
-                .watch('.', { cwd: template.path })
-                .on('change', (name) => {
-                    cache.remove(name);
-                })
+    };
+    this.set = function (key, value) {
+        if (cache.enabled) {
+            cache.list[key] = value;
         }
+        return this
     };
-    this.configure = function (config) {
-        template.path = config.path;
-        template.chokidar = config.chokidar;
-        template.resolver = fileResolver(config.resolver);
-        template.watcher = watcher(config);
+    this.resolve = function (key) {
+        return Promise.resolve(this.get(key))
     };
-    this.get = function (template) {
-        if (cache.exist(template)) {
-            return cache.resolve(template)
-        }
-        return result(
-            template,
-            resolve(template).then((content) =>
-                result(template, compile(content, template))
-            )
-        )
+    this.remove = function (key) {
+        delete cache.list[key];
+    };
+    this.exist = function (key) {
+        return hasProp(cache.list, key)
     };
-    this.configure(config);
 }
 
 const tagList = [
@@ -488,39 +433,73 @@ function Compiler(config) {
     this.configure(config);
 }
 
-const global = typeof globalThis !== 'undefined' ? globalThis : window || self;
+const resolvePath = (path, template) => {
+    template = [path, template].join('/');
+    template = template.replace(/\/\//g, '/');
+    return template
+};
 
-function Cache(config) {
-    if (instanceOf(this, Cache) === false) return new Cache()
-    const cache = {
-        list: {},
-    };
-    this.configure = function (config) {
-        cache.list = {};
-        if (isNode() === false) {
-            this.load(global[config.export]);
-        }
-    };
-    this.load = function (data) {
-        extend(cache.list, data || {});
-        return this
-    };
-    this.get = function (key) {
-        return cache.list[key]
+const httpRequest = (path, template) => {
+    return fetch(resolvePath(path, template)).then((response) =>
+        response.text()
+    )
+};
+
+const fileSystem = (path, template) => {
+    return new Promise((resolve, reject) => {
+        fs.readFile(resolvePath(path, template), (error, data) => {
+            if (error) {
+                reject(error);
+            } else {
+                resolve(data.toString());
+            }
+        });
+    })
+};
+
+const 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')
+    const template = {};
+    const result = function (template, content) {
+        cache.set(template, content);
+        return content
     };
-    this.set = function (key, value) {
-        cache.list[key] = value;
-        return this
+    const resolve = function (path) {
+        return template.resolver(template.path, path)
     };
-    this.resolve = function (key) {
-        return Promise.resolve(this.get(key))
+    const compile = function (content, template) {
+        if (isFunction(content)) {
+            return content
+        } else {
+            return compiler.compile(content, template)
+        }
     };
-    this.remove = function (key) {
-        delete cache.list[key];
+    this.configure = function (config) {
+        template.path = config.path;
+        template.cache = config.cache;
+        template.resolver = fileResolver(config.resolver);
     };
-    this.exist = function (key) {
-        return hasProp(cache.list, key)
+    this.get = function (template) {
+        if (cache.exist(template)) {
+            return cache.resolve(template)
+        }
+        return result(
+            template,
+            resolve(template).then((content) =>
+                result(template, compile(content, template))
+            )
+        )
     };
+    this.configure(config);
 }
 
 function resolve(list) {
@@ -790,17 +769,13 @@ function Context(config) {
 
 function EJS(options) {
     if (instanceOf(this, EJS) === false) return new EJS(options)
-
     const scope = {};
     const config = {};
-
     configSchema(config, options || {});
-
     const context = new Context(config);
     const compiler = new Compiler(config);
     const cache = new Cache();
     const template = new Template(config, cache, compiler);
-
     const output = function (path, scope) {
         return template.get(path).then(function (callback) {
             return callback.call(
@@ -812,7 +787,6 @@ function EJS(options) {
             )
         })
     };
-
     const require = function (name) {
         const filepath = ext(name, config.extension);
         const scope = context.create({});
@@ -874,7 +848,7 @@ function EJS(options) {
 
 const ejs = new EJS();
 
-const { render, context, compile, helpers, preload, configure: configure$1, create } =
+const { render, context, compile, helpers, preload, configure, create } =
     ejs;
 
 function __express(name, options, callback) {
@@ -895,7 +869,7 @@ function __express(name, options, callback) {
     viewOptions.path = viewPath;
     viewOptions.cache = viewCache;
     configure(viewOptions);
-    return this.render(filename, options)
+    return render(filename, options)
         .then((content) => {
             callback(null, content);
         })
@@ -904,4 +878,4 @@ function __express(name, options, callback) {
         })
 }
 
-export { EJS, __express, compile, configure$1 as configure, context, create, element, helpers, preload, render, safeValue };
+export { EJS, __express, compile, configure, context, create, element, helpers, preload, render, safeValue };