feature: variable lookup respects to to_liquid, #81

src/scope.js

@@ -58,12 +58,17 @@ var Scope = {
   },
   readProperty: function (obj, key) {
     let val
-    if (key === 'size' && (_.isArray(obj) || _.isString(obj))) {
-      val = obj.length
-    } else if (_.isNil(obj)) {
+    if (_.isNil(obj)) {
       val = undefined
     } else {
-      val = obj[key]
+      if (typeof obj.to_liquid === 'function') {
+        obj = obj.to_liquid()
+      }
+      if (key === 'size' && (_.isArray(obj) || _.isString(obj))) {
+        val = obj.length
+      } else {
+        val = obj[key]
+      }
     }
     if (_.isNil(val) && this.opts.strict_variables) {
       throw new TypeError(`undefined variable: ${key}`)

src/util/underscore.js

@@ -1,3 +1,4 @@
+'use strict'
 const toStr = Object.prototype.toString
 
 /*
@@ -10,12 +11,12 @@ function isString (value) {
 }
 
 function stringify (value) {
+  if (value && typeof value.to_liquid === 'function') {
+    return stringify(value.to_liquid())
+  }
   if (isString(value)) {
     return value
   }
-  if (value && typeof value.to_liquid === 'function') {
-    return value.to_liquid()
-  }
 
   let cache = []
   return JSON.stringify(value, (key, value) => {