@kosatyi/ejs 0.0.13 → 0.0.14

package/dist/ejs.cjs

@@ -15,18 +15,14 @@ defaults["export"] = 'ejs.precompiled';
 defaults.cache = true;
 defaults.path = 'views';
 defaults.resolver = null;
-defaults.extension = {
-  template: 'ejs',
-  module: 'mjs'
-};
+defaults.extension = 'ejs';
 defaults.vars = {
   EXTEND: '$$$',
   BUFFER: '$$a',
   OUTPUT: '$$i',
   LAYOUT: '$$l',
-  MACROS: '$$m',
-  PRINT: '$$j',
   BLOCKS: '$$b',
+  MACRO: '$$m',
   ERROR: '$$e',
   SCOPE: '$$s',
   SAFE: '$$v'
@@ -69,11 +65,9 @@ var htmlEntities = {
   '"': '"',
   "'": '''
 };
-
 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() {
@@ -103,7 +97,6 @@ var extend = function extend() {
   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;
@@ -111,9 +104,9 @@ var extend = function extend() {
     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);
@@ -124,7 +117,6 @@ var map = function map(object, callback, context) {
   var result = [];
   each(object, function (value, key, object) {
     var item = callback(value, key, object);
-
     if (item !== undefined) {
       result.push(item);
     }
@@ -136,7 +128,6 @@ var filter = function filter(object, callback, context) {
   var result = isArray ? [] : {};
   each(object, function (value, key, object) {
     var item = callback(value, key, object);
-
     if (item !== undefined) {
       if (isArray) {
         result.push(item);
@@ -154,6 +145,9 @@ var omit = function omit(object, list) {
     }
   });
 };
+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);
 };
@@ -174,15 +168,12 @@ function element(tag, attrs, content) {
     }
   }).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('');
 }
 
@@ -207,7 +198,6 @@ var tags = [{
     return "')\n".concat(value, "\n").concat(this.BUFFER, "('");
   }
 }];
-
 var match = function match(regex, text, callback) {
   var index = 0;
   text.replace(regex, function () {
@@ -221,16 +211,13 @@ var match = function match(regex, text, callback) {
 };
 /**
  *
- * @param {Object} config
+ * @param {object} config
  * @return {function(*, *): Function}
  * @constructor
  */
-
-
 var Compiler = function Compiler(config) {
   var token = config.token;
   var vars = config.vars;
-  var module = config.extension.module;
   var matches = [];
   var formats = [];
   var slurp = {
@@ -246,22 +233,15 @@ var Compiler = function Compiler(config) {
   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));
@@ -270,20 +250,21 @@ var Compiler = function Compiler(config) {
       });
     });
     source += "');";
+    source = "try{".concat(source, "}catch(e){console.info(e)}");
     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})");
+      //result.source = result.toString()
     } catch (e) {
+      console.log(e);
       e.filename = path;
       e.source = source;
       throw e;
     }
-
     return result;
   };
 };
@@ -305,7 +286,6 @@ var HttpRequest = function HttpRequest(template) {
     return response.text();
   });
 };
-
 var FileSystem = function FileSystem(template) {
   return new Promise(function (resolve, reject) {
     fs__default["default"].readFile(template, function (error, data) {
@@ -317,7 +297,6 @@ var FileSystem = function FileSystem(template) {
     });
   });
 };
-
 var Watcher = function Watcher(path, cache) {
   return chokidar__default["default"].watch('.', {
     cwd: path
@@ -327,60 +306,37 @@ var Watcher = function Watcher(path, cache) {
     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('');
@@ -390,300 +346,367 @@ var resolve = function resolve(list) {
  *
  * @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
- */
-
-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;
+    _config$vars.SCOPE;
   /**
-   *
+   * @memberOf global
+   * @name [SCOPE]
    * @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);
   }
+  /**
+   * @static
+   * @param methods
+   */
+  Scope.helpers = function (methods) {
+    extend(Scope.prototype, methods);
+  };
+  /**
+   * @static
+   * @param name
+   * @param descriptor
+   */
+  Scope.property = function (name, descriptor) {
+    Object.defineProperty(Scope.prototype, name, descriptor);
+  };
+  /**
+   * @static
+   * @param name
+   * @param method
+   */
+  Scope.method = function (name, method) {
+    return Scope.property(name, {
+      value: method,
+      writable: false,
+      configurable: false,
+      enumerable: false
+    });
+  };
   /**
    *
    */
-
-
-  Object.defineProperties(Scope.prototype, (_Object$definePropert = {}, _defineProperty(_Object$definePropert, BUFFER, {
+  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);
+  Scope.property(BLOCKS, {
+    value: {},
+    writable: true,
+    configurable: false,
+    enumerable: false
+  });
   /**
-   * @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(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);
+  });
+  /**
+   * @methodOf global
+   * @function extend
+   * @param layout
+   */
+  Scope.method('extend', function (layout) {
+    this.setExtend(true);
+    this.setLayout(layout);
+  });
+  /**
+   * @memberOf global
+   * @function echo
+   */
+  Scope.method('echo', function () {
+    var buffer = this.getBuffer();
+    var params = [].slice.call(arguments);
+    params.forEach(function (item) {
+      buffer(item);
+    });
+  });
+  /**
+   * @memberOf global
+   * @function fn
+   * @param callback
+   */
+  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();
+    };
+  });
+  /**
+   * @memberOf global
+   * @function get
+   * @param name
+   * @param [defaults]
+   */
+  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;
+  });
+  /**
+   * @memberOf global
+   * @function set
+   * @param name
+   * @param value
+   */
+  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;
+  });
+  /**
+   * @memberOf global
+   * @function macro
+   * @param name
+   * @param callback
+   */
+  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));
+    };
+  });
+  /**
+   * @memberOf global
+   * @function call
+   * @param name
+   * @param {...*} args
+   */
+  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);
+    }
+  });
+  /**
+   * @memberOf global
+   * @function block
+   * @param name
+   * @param callback
+   */
+  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()));
+  });
+  /**
+   *  @memberOf global
+   *  @function include
+   *  @param path
+   *  @param [data]
+   *  @param [cx]
+   */
+  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);
+  });
+  /**
+   * @memberOf global
+   * @function use
+   * @param path
+   * @param namespace
+   */
+  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,
-
+    }, this));
+  });
+  /**
+   *  @memberOf global
+   *  @function async
+   *  @param promise
+   *  @param callback
+   */
+  Scope.method('async', function (promise, callback) {
+    this.echo(resolve$1(promise, function (data) {
+      return this.fn(callback)(data);
+    }, this));
+  });
+  Scope.helpers(methods);
+  Scope.helpers({
     /**
      * @memberOf global
+     * @param tag
+     * @param attr
+     * @param content
      */
-    element: function element$1(tag, attr, content) {
+    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);
-      }));
+      }, this));
     },
-
-    /**
-     * @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);
-      }
-    },
-
     /**
      * @memberOf global
      * @param object
@@ -693,105 +716,7 @@ var Scope = function Scope(config, methods) {
       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;
@@ -805,7 +730,6 @@ function Cache(config) {
       if (isNode() === false) {
         this.load(window[namespace]);
       }
-
       return this;
     },
     exist: function exist(key) {
@@ -838,17 +762,13 @@ function init(options) {
    */
   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) {
@@ -857,26 +777,23 @@ function init(options) {
       });
     },
     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) {
@@ -884,14 +801,14 @@ function init(options) {
       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);
@@ -903,7 +820,6 @@ function init(options) {
         callback = options;
         options = {};
       }
-
       options = options || {};
       var settings = extend({}, options.settings);
       var viewPath = typeProp(isString, settings['views'], defaults.path);
@@ -923,12 +839,10 @@ function init(options) {
   /**
    *
    */
-
   view.configure(options || {});
   /**
    *
    */
-
   view.helpers({
     require: function require(name) {
       return view.require(name, this);
@@ -939,7 +853,6 @@ function init(options) {
   });
   return view;
 }
-
 var index = init();
 
 module.exports = index;