new features & code modernization

.gitignore

@@ -0,0 +1 @@
+*.iml

lib/constants.js

@@ -6,8 +6,8 @@ exports.TOKEN_MAPPING = {
     TOKEN_TEXT: 'Text',
     TOKEN_VAR: 'Var',
     TOKEN_BLOCK: 'Block',
-    TOKEN_COMMENT: 'Comment',
-}
+    TOKEN_COMMENT: 'Comment'
+};
 
 // template syntax constants
 exports.FILTER_SEPARATOR = '|';
@@ -23,18 +23,17 @@ exports.COMMENT_TAG_END = '#}';
 exports.SINGLE_BRACE_START = '{';
 exports.SINGLE_BRACE_END = '}';
 
-exports.ALLOWED_VARIABLE_CHARS = 'abcdefghijklmnopqrstuvwxyz' +
-                         'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.';
+exports.ALLOWED_VARIABLE_CHARS = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.';
 
 // match a variable or block tag and capture the entire tag, including start/end
 // delimiters
 
-var rEsc = exports.regexEscape = function(str) {
-   return str.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
-}
+const rEsc = exports.regexEscape = (str) => {
+    return str.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+};
 
 exports.tagRe = new RegExp('(' + rEsc(exports.BLOCK_TAG_START) + '.*?' + rEsc(exports.BLOCK_TAG_END) + '|' +
-      rEsc(exports.VARIABLE_TAG_START) + '.*?' + rEsc(exports.VARIABLE_TAG_END) + '|' +
-      rEsc(exports.COMMENT_TAG_START) + '.*?' + rEsc(exports.COMMENT_TAG_END) + ')', 'g');
+        rEsc(exports.VARIABLE_TAG_START) + '.*?' + rEsc(exports.VARIABLE_TAG_END) + '|' +
+        rEsc(exports.COMMENT_TAG_START) + '.*?' + rEsc(exports.COMMENT_TAG_END) + ')', 'g');
 
 exports.TEMPLATE_STRING_IF_INVALID = '';

lib/context.js

@@ -1,84 +1,95 @@
-var $o = require('ringo/utils/objects');
-var {escape} = require('./utils/html');
-var {isSafe, isMarkedForEscaping} = require('./utils');
+const html = require('./utils/html');
+const {isSafe, isMarkedForEscaping} = require('./utils');
 
-var Context = exports.Context = function Context(dict, autoescape) {
-   this.autoescape = autoescape === false ? false : true;
-   this.dicts = dict ? [dict] : [{}]
-   this.renderContext = new RenderContext();
-   return this;
-}
+const Context = exports.Context = function(dict, autoescape) {
+    Object.defineProperties(this, {
+        autoescape: {value: autoescape !== false, writable: true, enumerable: true},
+        dicts: {value: dict ? [dict] : [{}], enumerable: true},
+        renderContext: {value: new RenderContext(), enumerable: true},
+        environment: {value: null, writable: true, enumerable: true}
+    });
+    return this;
+};
 
 Context.prototype.push = function() {
-   var d = {};
-   this.dicts.push(d);
-   return d;
-}
+    const dict = {};
+    this.dicts.push(dict);
+    return dict;
+};
 
 Context.prototype.pop = function() {
-   if (this.dicts.length == 1) {
-      throw new Error('pop() more often called then push()');
-   }
-   return this.dicts.pop();
-}
+    if (this.dicts.length === 1) {
+        throw new Error('pop() more often called then push()');
+    }
+    return this.dicts.pop();
+};
 
 /**
-Get a variable's value, starting at the current context and going upward
-*/
+ Get a variable's value, starting at the current context and going upward
+ */
 Context.prototype.get = function(key, otherwise) {
-   for (var i = this.dicts.length-1; i >= 0; i--) {
-      if (key in this.dicts[i]) {
-         return this.dicts[i][key];
-      }
-   }
-   return otherwise;
-}
+    for (let i = this.dicts.length - 1; i >= 0; i--) {
+        let dict = this.dicts[i];
+        if (dict.hasOwnProperty(key)) {
+            return dict[key];
+        }
+    }
+    return otherwise;
+};
 
 Context.prototype.set = function(key, value) {
-   this.dicts[this.dicts.length-1][key] = value;
-}
+    this.dicts[this.dicts.length - 1][key] = value;
+};
 
 Context.prototype.has = function(key) {
-   return this.get(key) !== undefined;
-}
+    return this.get(key) !== undefined;
+};
 
-Context.prototype.update = function(obj) {
-   this.dicts.push(obj);
-}
+Context.prototype.update = function(dict) {
+    this.dicts.push(dict);
+};
 
 Context.prototype.new = function(dict) {
-   return new Context(dict, this.autoescape);
-}
+    return new Context(dict, this.autoescape);
+};
+
 /**
  * Converts any value to a string to become part of a rendered template. This
  * means escaping, if required, and conversion to a unicode object. If value
  * is a string, it is expected to have already been translated.
-*/
+ */
 Context.prototype.renderValue = function(value) {
-   // @@ TODO
-   //value = template_localtime(value, use_tz=context.use_tz)
-   //value = localize(value, use_l10n=context.use_l10n)
-   if ((this.autoescape === true && isSafe(value) === false) || isMarkedForEscaping(value)) {
-      return escape(value);
-   }
-   return value;
-}
+    // @@ TODO
+    //value = template_localtime(value, use_tz=context.use_tz)
+    //value = localize(value, use_l10n=context.use_l10n)
+    if ((this.autoescape === true && isSafe(value) === false)
+            || isMarkedForEscaping(value)) {
+        return html.escape(value);
+    }
+    return value;
+};
 
 /**
  *
  */
-var RenderContext = exports.RenderContext = function RenderContext(dict) {
-   this.dicts = dict ? [dict] : [{}];
-   return this;
-}
+const RenderContext = exports.RenderContext = function(dict) {
+    Object.defineProperties(this, {
+        dicts: {
+            value: dict ? [dict] : [{}],
+            enumerable: true
+        }
+    });
+    return this;
+};
+
 RenderContext.prototype.push = Context.prototype.push;
 RenderContext.prototype.pop = Context.prototype.pop;
 RenderContext.prototype.set = Context.prototype.set;
 RenderContext.prototype.has = Context.prototype.has;
 RenderContext.prototype.get = function(key, otherwise) {
-   var d = this.dicts[this.dicts.length-1];
-   if (key in d) {
-      return d[key];
-   }
-   return otherwise;
-}
+    const dict = this.dicts[this.dicts.length - 1];
+    if (dict.hasOwnProperty(key)) {
+        return dict[key];
+    }
+    return otherwise;
+};