@kosatyi/ejs 0.0.13 → 0.0.15

package/dist/ejs.js

@@ -11,20 +11,15 @@
     defaults.cache = true;
     defaults.path = 'views';
     defaults.resolver = null;
-    defaults.extension = {
-      template: 'ejs',
-      module: 'mjs'
-    };
+    defaults.extension = 'ejs';
+    defaults.withObject = false;
     defaults.vars = {
-      EXTEND: '$$$',
+      SCOPE: 'ejs',
+      EXTEND: '$$e',
       BUFFER: '$$a',
-      OUTPUT: '$$i',
       LAYOUT: '$$l',
-      MACROS: '$$m',
-      PRINT: '$$j',
       BLOCKS: '$$b',
-      ERROR: '$$e',
-      SCOPE: '$$s',
+      MACRO: '$$m',
       SAFE: '$$v'
     };
     defaults.token = {
@@ -65,11 +60,9 @@
       '"': '"',
       "'": '''
     };
-
     var regexKeys = function regexKeys(obj) {
       return new RegExp(['[', Object.keys(obj).join(''), ']'].join(''), 'g');
     };
-
     var htmlEntitiesMatch = regexKeys(htmlEntities);
     var symbolEntitiesMatch = regexKeys(symbolEntities);
     var entities = function entities() {
@@ -99,7 +92,6 @@
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
-
       var target = args.shift();
       return args.filter(function (source) {
         return source;
@@ -107,9 +99,9 @@
         return Object.assign(target, source);
       }, target);
     };
+    var noop = function noop() {};
     var each = function each(object, callback) {
       var prop;
-
       for (prop in object) {
         if (hasProp(object, prop)) {
           callback(object[prop], prop, object);
@@ -120,7 +112,6 @@
       var result = [];
       each(object, function (value, key, object) {
         var item = callback(value, key, object);
-
         if (item !== undefined) {
           result.push(item);
         }
@@ -132,7 +123,6 @@
       var result = isArray ? [] : {};
       each(object, function (value, key, object) {
         var item = callback(value, key, object);
-
         if (item !== undefined) {
           if (isArray) {
             result.push(item);
@@ -150,6 +140,9 @@
         }
       });
     };
+    var resolve$1 = function resolve(value, callback, context) {
+      return Promise.resolve(value).then(callback.bind(context));
+    };
     var hasProp = function hasProp(object, prop) {
       return object && object.hasOwnProperty(prop);
     };
@@ -170,15 +163,12 @@
         }
       }).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('');
     }
 
@@ -203,7 +193,6 @@
         return "')\n".concat(value, "\n").concat(this.BUFFER, "('");
       }
     }];
-
     var match = function match(regex, text, callback) {
       var index = 0;
       text.replace(regex, function () {
@@ -217,16 +206,14 @@
     };
     /**
      *
-     * @param {Object} config
+     * @param {object} config
      * @return {function(*, *): Function}
      * @constructor
      */
-
-
     var Compiler = function Compiler(config) {
+      var withObject = config.withObject;
       var token = config.token;
       var vars = config.vars;
-      var module = config.extension.module;
       var matches = [];
       var formats = [];
       var slurp = {
@@ -242,22 +229,15 @@
       var slurpStart = new RegExp([slurp.match, slurp.start].join(''), 'gm');
       var slurpEnd = new RegExp([slurp.end, slurp.match].join(''), 'gm');
       /**
-       * @type Function
+       * @type function
        * @name Compile
        */
-
       return function (content, path) {
         var SCOPE = vars.SCOPE,
-            SAFE = vars.SAFE,
-            BUFFER = vars.BUFFER;
-        var extension = path.split('.').pop();
+          SAFE = vars.SAFE,
+          BUFFER = vars.BUFFER;
         content = content.replace(/[\r\n]+/g, '\n').replace(/^\s+|\s+$/gm, '');
         content = content.replace(slurpStart, slurp.start).replace(slurpEnd, slurp.end);
-
-        if (extension === module) {
-          content = [token.start, content, token.end].join('\n');
-        }
-
         var source = "".concat(BUFFER, "('");
         match(regex, content, function (params, index, offset) {
           source += symbols(content.slice(index, offset));
@@ -266,20 +246,22 @@
           });
         });
         source += "');";
-        source = "with(".concat(SCOPE, "){").concat(source, "}");
+        source = "try{".concat(source, "}catch(e){console.info(e)}");
+        if (withObject) {
+          source = "with(".concat(SCOPE, "){").concat(source, "}");
+        }
         source = "".concat(BUFFER, ".start();").concat(source, "return ").concat(BUFFER, ".end();");
         source += "\n//# sourceURL=".concat(path);
         var result = null;
-
         try {
           result = new Function(SCOPE, BUFFER, SAFE, source);
-          result.source = "(function(".concat(SCOPE, ",").concat(BUFFER, ",").concat(SAFE, "){\n").concat(source, "\n})"); //result.source = result.toString()
+          result.source = "(function(".concat(SCOPE, ",").concat(BUFFER, ",").concat(SAFE, "){\n").concat(source, "\n})");
         } catch (e) {
+          console.log(e);
           e.filename = path;
           e.source = source;
           throw e;
         }
-
         return result;
       };
     };
@@ -301,7 +283,6 @@
         return response.text();
       });
     };
-
     var FileSystem = function FileSystem(template) {
       return new Promise(function (resolve, reject) {
         path.readFile(template, function (error, data) {
@@ -313,7 +294,6 @@
         });
       });
     };
-
     var Watcher = function Watcher(path$1, cache) {
       return path.watch('.', {
         cwd: path$1
@@ -323,60 +303,37 @@
         console.log('watcher error: ' + error);
       });
     };
-
     var Template = function Template(config, cache, compile) {
       var path = config.path;
       config.token || {};
       var resolver = isFunction(config.resolver) ? config.resolver : isNode() ? FileSystem : HttpRequest;
-
       var normalize = function normalize(template) {
         template = [path, template].join('/');
         template = template.replace(/\/\//g, '/');
         return template;
       };
-
       var resolve = function resolve(template) {
         return resolver(normalize(template));
       };
-
       var result = function result(content, template) {
         cache.set(template, content);
         return content;
       };
-
       var get = function get(template) {
         if (cache.exist(template)) {
           return cache.resolve(template);
         }
-
         var content = resolve(template).then(function (content) {
           return result(compile(content, template), template);
         });
         return result(content, template);
       };
-
       if (config.watch && isNode()) {
         Watcher(path, cache);
       }
-
       return get;
     };
 
-    function _defineProperty(obj, key, value) {
-      if (key in obj) {
-        Object.defineProperty(obj, key, {
-          value: value,
-          enumerable: true,
-          configurable: true,
-          writable: true
-        });
-      } else {
-        obj[key] = value;
-      }
-
-      return obj;
-    }
-
     var resolve = function resolve(list) {
       return Promise.all(list).then(function (list) {
         return list.join('');
@@ -386,408 +343,249 @@
      *
      * @return {function}
      */
-
-
     var Buffer = function Buffer() {
       var store = [],
-          array = [];
-
+        array = [];
       function buffer(value) {
         array.push(value);
       }
-
       buffer.start = function () {
         array = [];
       };
-
       buffer.backup = function () {
         store.push(array.concat());
         array = [];
       };
-
       buffer.restore = function () {
         var result = array.concat();
         array = store.pop();
         return resolve(result);
       };
-
+      buffer.error = function (e) {
+        throw e;
+      };
       buffer.end = function () {
         return resolve(array);
       };
-
       return buffer;
     };
 
     /**
-     *
-     * @param {{}} instance
-     * @method create
+     * @memberOf global
+     * @class
+     * @alias ejs
+     * @param config
+     * @param methods
+     * @return {Scope}
      */
 
-    var Component = function Component(instance) {
-      var defaults = extend({}, instance.props);
-      var create = instance.create;
-      return {
-        element: element,
-        create: create,
-        render: function render(props) {
-          return this.create(extend({}, defaults, props));
-        }
-      };
-    };
-
-    var Scope = function Scope(config, methods) {
-      var _Object$definePropert;
-
-      /**
-       *
-       */
+    var configure = function configure(config, methods) {
       var _config$vars = config.vars,
-          EXTEND = _config$vars.EXTEND,
-          MACROS = _config$vars.MACROS,
-          LAYOUT = _config$vars.LAYOUT,
-          BLOCKS = _config$vars.BLOCKS,
-          BUFFER = _config$vars.BUFFER;
+        EXTEND = _config$vars.EXTEND,
+        LAYOUT = _config$vars.LAYOUT,
+        BLOCKS = _config$vars.BLOCKS,
+        BUFFER = _config$vars.BUFFER,
+        MACRO = _config$vars.MACRO;
+
       /**
        *
        * @param data
        * @constructor
        */
-
       function Scope() {
         var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        this.setBlocks({});
+        this.initBlocks();
+        this.initMacro();
         extend(this, data);
-        this.setLayout(false);
-        this.setExtend(false);
       }
-      /**
-       *
-       */
-
-
-      Object.defineProperties(Scope.prototype, (_Object$definePropert = {}, _defineProperty(_Object$definePropert, BUFFER, {
+      Scope.helpers = function (methods) {
+        extend(Scope.prototype, methods);
+      };
+      Scope.property = function (name, descriptor) {
+        Object.defineProperty(Scope.prototype, name, descriptor);
+      };
+      Scope.method = function (name, method) {
+        Object.defineProperty(Scope.prototype, name, {
+          value: method,
+          writable: false,
+          configurable: false,
+          enumerable: false
+        });
+      };
+      Scope.property(BUFFER, {
         value: Buffer(),
         writable: false,
         configurable: false,
         enumerable: false
-      }), _defineProperty(_Object$definePropert, "getBuffer", {
-        value: function value() {
-          return this[BUFFER];
-        },
-        writable: false,
-        configurable: false
-      }), _defineProperty(_Object$definePropert, "setBlocks", {
-        value: function value(_value) {
-          this[BLOCKS] = _value;
-        },
-        writable: false,
-        configurable: false
-      }), _defineProperty(_Object$definePropert, "getBlocks", {
-        value: function value() {
-          return this[BLOCKS];
-        },
-        writable: false,
-        configurable: false
-      }), _defineProperty(_Object$definePropert, "setExtend", {
-        value: function value(_value2) {
-          this[EXTEND] = _value2;
-        },
-        writable: false,
-        configurable: false
-      }), _defineProperty(_Object$definePropert, "getExtend", {
-        value: function value() {
-          return this[EXTEND];
-        },
-        writable: false,
-        configurable: false
-      }), _defineProperty(_Object$definePropert, "setLayout", {
-        value: function value(layout) {
-          this[LAYOUT] = layout;
-        },
-        writable: false,
-        configurable: false
-      }), _defineProperty(_Object$definePropert, "getLayout", {
-        value: function value() {
-          return this[LAYOUT];
-        },
-        writable: false,
-        configurable: false
-      }), _Object$definePropert));
-
-      Scope.helpers = function (methods) {
-        extend(Scope.prototype, methods);
-      };
-      /**
-       * @lends Scope.prototype
-       */
-
-
-      Scope.helpers(methods);
-      /**
-       * @lends Scope.prototype
-       */
-
-      Scope.helpers({
-        /**
-         * @return {*}
-         */
-        clone: function clone(exclude_blocks) {
-          var filter = [LAYOUT, EXTEND, MACROS, BUFFER];
-
-          if (exclude_blocks === true) {
-            filter.push(BLOCKS);
+      });
+      Scope.property(BLOCKS, {
+        value: {},
+        writable: true,
+        configurable: false,
+        enumerable: false
+      });
+      Scope.property(MACRO, {
+        value: {},
+        writable: true,
+        configurable: false,
+        enumerable: false
+      });
+      Scope.property(LAYOUT, {
+        value: false,
+        writable: true,
+        configurable: false,
+        enumerable: false
+      });
+      Scope.property(EXTEND, {
+        value: false,
+        writable: true,
+        configurable: false,
+        enumerable: false
+      });
+      Scope.method('initBlocks', function () {
+        this[BLOCKS] = {};
+      });
+      Scope.method('initMacro', function () {
+        this[MACRO] = {};
+      });
+      Scope.method('getMacro', function () {
+        return this[MACRO];
+      });
+      Scope.method('getBuffer', function () {
+        return this[BUFFER];
+      });
+      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(function (item) {
+          buffer(item);
+        });
+      });
+      Scope.method('fn', function (callback) {
+        var buffer = this.getBuffer();
+        var context = this;
+        return function () {
+          buffer.backup();
+          if (isFunction(callback)) {
+            callback.apply(context, arguments);
           }
-
-          return omit(this, filter);
-        },
-
-        /**
-         * Join values to output buffer
-         * @memberOf global
-         * @type Function
-         */
-        echo: function echo() {
-          var buffer = this.getBuffer();
-          var params = [].slice.call(arguments);
-          params.forEach(function (item) {
-            buffer(item);
+          return buffer.restore();
+        };
+      });
+      Scope.method('get', function (name, defaults) {
+        var path = getPath(this, name);
+        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);
+        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;
+          }
+        };
+        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) {
+          var list = this.getMacro();
+          each(exports, function (macro, name) {
+            list[[namespace, name].join('.')] = macro;
           });
-        },
-
-        /**
-         * Buffered output callback
-         * @type Function
-         * @param {Function} callback
-         * @param {Boolean} [echo]
-         * @return {Function}
-         */
-        macro: function macro(callback, echo) {
-          var buffer = this.getBuffer();
-
-          var macro = function () {
-            buffer.backup();
-
-            if (isFunction(callback)) {
-              callback.apply(this, arguments);
-            }
-
-            var result = buffer.restore();
-            return echo === true ? this.echo(result) : result;
-          }.bind(this);
-
-          macro.__context = this;
-          macro.__source = callback;
-          macro.__layout = this.getLayout();
-          return macro;
-        },
-
-        /**
-         * @memberOf global
-         * @param value
-         * @param callback
-         * @return {Promise<unknown>}
-         */
-        resolve: function resolve(value, callback) {
-          return Promise.resolve(value).then(callback.bind(this));
-        },
-
-        /**
-         * @memberOf global
-         */
-        async: function async(promise, callback) {
-          var _this = this;
-
-          this.echo(this.resolve(promise, function (data) {
-            return _this.macro(callback)(data);
-          }));
-        },
-
-        /**
-         * @memberOf global
-         */
-        node: element,
-
-        /**
-         * @memberOf global
-         */
-        element: function element$1(tag, attr, content) {
+        }, this));
+      });
+      Scope.method('async', function (promise, callback) {
+        this.echo(resolve$1(promise, function (data) {
+          return this.fn(callback)(data);
+        }, this));
+      });
+      Scope.helpers(methods);
+      Scope.helpers({
+        el: function el(tag, attr, content) {
           if (isFunction(content)) {
-            content = this.macro(content)();
+            content = this.fn(content)();
           }
-
-          this.echo(this.resolve(content, function (content) {
+          this.echo(resolve$1(content, function (content) {
             return element(tag, attr, content);
-          }));
-        },
-
-        /**
-         * @memberOf global
-         * @param {String} namespace
-         * @param {Object} instance
-         */
-        component: function component(namespace, instance) {
-          instance = Component(instance);
-          this.set(namespace, function (props) {
-            this.echo(instance.render(props));
-          }.bind(this));
-        },
-
-        /**
-         * @memberOf global
-         * @param name
-         * @param defaults
-         */
-        get: function get(name, defaults) {
-          var path = getPath(this, name);
-          var result = path.shift();
-          var prop = path.pop();
-          return hasProp(result, prop) ? result[prop] : defaults;
-        },
-
-        /**
-         * @memberOf global
-         * @param {String} name
-         * @param value
-         * @return
-         */
-        set: function set(name, value) {
-          var path = getPath(this, name);
-          var result = path.shift();
-          var prop = path.pop();
-
-          if (this.getExtend()) {
-            if (hasProp(result, prop)) {
-              return result[prop];
-            }
-          }
-
-          result[prop] = value;
-        },
-
-        /**
-         * @memberOf global
-         * @param name
-         */
-        call: function call(name) {
-          var params = [].slice.call(arguments, 1);
-          var path = getPath(this, name);
-          var result = path.shift();
-          var prop = path.pop();
-
-          if (isFunction(result[prop])) {
-            return result[prop].apply(result, params);
-          }
+          }, this));
         },
-
-        /**
-         * @memberOf global
-         * @param object
-         * @param callback
-         */
         each: function each$1(object, callback) {
           if (isString(object)) {
             object = this.get(object, []);
           }
-
           each(object, callback);
-        },
-
-        /**
-         * @memberOf global
-         * @param {String} layout
-         */
-        extend: function extend(layout) {
-          this.setExtend(true);
-          this.setLayout(layout);
-        },
-
-        /**
-         * @memberOf global
-         * @param name
-         * @param callback
-         * @return {*}
-         */
-        block: function block(name, callback) {
-          var blocks = this.getBlocks();
-          blocks[name] = blocks[name] || [];
-          blocks[name].push(this.macro(callback));
-          if (this.getExtend()) return;
-
-          var current = function current() {
-            return blocks[name].shift();
-          };
-
-          var next = function next() {
-            var parent = current();
-
-            if (parent) {
-              var context = parent.__context;
-              return function () {
-                context.echo(parent(next()));
-              };
-            } else {
-              return function () {};
-            }
-          };
-
-          this.echo(current()(next()));
-        },
-
-        /**
-         * @memberOf global
-         * @param {string} path
-         * @param {object} [data]
-         * @param {boolean} [cx]
-         */
-        include: function include(path, data, cx) {
-          var context = cx === false ? {} : this.clone(true);
-          var params = extend(context, data || {});
-          var promise = this.render(path, params);
-          this.echo(promise);
-        },
-
-        /**
-         * @memberOf global
-         * @param {string} path
-         */
-        use: function use(path) {
-          var scope = this;
-
-          var promise = this.require(path);
-
-          this.echo(promise);
-          return {
-            as: function as(namespace) {
-              promise.then(function (exports) {
-                scope.set(namespace, exports);
-              });
-              return this;
-            }
-          };
-        },
-
-        /**
-         * @memberOf global
-         * @param {string} path
-         */
-        from: function from(path) {
-          var scope = this;
-
-          var promise = this.require(path);
-
-          this.echo(promise);
-          return {
-            use: function use() {
-              var params = [].slice.call(arguments);
-              promise.then(function (exports) {
-                params.forEach(function (name) {
-                  scope.set(name, exports[name]);
-                });
-              });
-              return this;
-            }
-          };
         }
       });
       return Scope;
@@ -801,7 +599,6 @@
           if (isNode() === false) {
             this.load(window[namespace]);
           }
-
           return this;
         },
         exist: function exist(key) {
@@ -834,17 +631,13 @@
        */
       var config = {};
       var _helpers = {};
-
       var ext = function ext(path, defaults) {
         var ext = path.split('.').pop();
-
         if (ext !== defaults) {
           path = [path, defaults].join('.');
         }
-
         return path;
       };
-
       var view = {
         element: element,
         output: function output(path, scope) {
@@ -853,26 +646,23 @@
           });
         },
         render: function render(name, data) {
-          var filepath = ext(name, config.extension.template);
+          var filepath = ext(name, config.extension);
           var scope = new view.scope(data);
           return view.output(filepath, scope).then(function (content) {
             if (scope.getExtend()) {
               scope.setExtend(false);
               var layout = scope.getLayout();
-
               var _data = scope.clone();
-
               return view.render(layout, _data);
             }
-
             return content;
           });
         },
         require: function require(name) {
-          var filepath = ext(name, config.extension.module);
+          var filepath = ext(name, config.extension);
           var scope = new view.scope({});
           return view.output(filepath, scope).then(function () {
-            return scope.clone(true);
+            return scope.getMacro();
           });
         },
         helpers: function helpers(methods) {
@@ -880,14 +670,14 @@
           extend(_helpers, methods);
           view.scope.helpers(methods);
         },
-        configure: function configure(options) {
+        configure: function configure$1(options) {
           config["export"] = typeProp(isString, defaults["export"], options["export"]);
           config.path = typeProp(isString, defaults.path, options.path);
           config.resolver = typeProp(isFunction, defaults.resolver, options.resolver);
-          config.extension = extend({}, defaults.extension, options.extension);
+          config.extension = typeProp(isString, defaults.extension, options.extension);
           config.token = extend({}, defaults.token, options.token);
           config.vars = extend({}, defaults.vars, options.vars);
-          view.scope = Scope(config, _helpers);
+          view.scope = configure(config, _helpers);
           view.compile = Compiler(config);
           view.wrapper = Wrapper(config);
           view.cache = Cache(config);
@@ -899,7 +689,6 @@
             callback = options;
             options = {};
           }
-
           options = options || {};
           var settings = extend({}, options.settings);
           var viewPath = typeProp(isString, settings['views'], defaults.path);
@@ -919,12 +708,10 @@
       /**
        *
        */
-
       view.configure(options || {});
       /**
        *
        */
-
       view.helpers({
         require: function require(name) {
           return view.require(name, this);
@@ -935,7 +722,6 @@
       });
       return view;
     }
-
     var index = init();
 
     return index;