fixed: issue with object expressions scope

riot · Jan 6, 2019 · bba08ad · bba08ad
1 parent 9a0bb0d
commit bba08ad
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/generators/template/utils.js b/src/generators/template/utils.js
@@ -25,7 +25,7 @@ import {
   isBuiltinAPI,
   isExpressionStatement,
   isIdentifier,
-  isObjectExpression,
+  isRaw,
   isSequenceExpression,
   isThisExpression
 } from '../../utils/ast-nodes-checks'
@@ -80,7 +80,7 @@ export function createExpressionSourcemap(expression, sourceFile, sourceCode) {
  * @returns {boolean} true if it's a global api variable
  */
 export function isGlobal({ scope, node }) {
-  return isBuiltinAPI(node) || isBrowserAPI(node) || scope.lookup(getName(node))
+  return isRaw(node) || isBuiltinAPI(node) || isBrowserAPI(node) || scope.lookup(getName(node))
 }
 
 /**
@@ -118,14 +118,15 @@ function updateNodeScope(path) {
  * @param   { types.NodePath } path - containing the current node visited
  * @returns { boolean } return always false because we want to check only the first node object
  */
-function updateMemberExpressions(path) {
+function visitMemberExpression(path) {
   if (!isGlobal({ node: path.node.object, scope: path.scope })) {
     replacePathScope(path, isThisExpression(path.node.object) ? path.node.property : path.node)
   }
 
   return false
 }
 
+
 /**
  * Objects properties should be handled a bit differently from the Identifier
  * @param   { types.NodePath } path - containing the current node visited
@@ -136,7 +137,7 @@ function visitProperty(path) {
 
   if (isIdentifier(value)) {
     updateNodeScope(path.get('value'))
-  } else if (isObjectExpression(value)) {
+  } else {
     this.traverse(path.get('value'))
   }
 
@@ -163,7 +164,7 @@ export function updateNodesScope(ast) {
 
   types.visit(ast, {
     visitIdentifier: updateNodeScope,
-    visitMemberExpression: updateMemberExpressions,
+    visitMemberExpression,
     visitProperty,
     visitThisExpression,
     visitClassExpression: ignorePath

diff --git a/src/utils/ast-nodes-checks.js b/src/utils/ast-nodes-checks.js
@@ -13,4 +13,5 @@ export const isSequenceExpression = namedTypes.SequenceExpression.check
 export const isBinaryExpression = namedTypes.BinaryExpression.check
 
 export const isBrowserAPI = ({name}) => browserAPIs.includes(name)
-export const isBuiltinAPI = ({name}) => builtinAPIs.includes(name)
+export const isBuiltinAPI = ({name}) => builtinAPIs.includes(name)
+export const isRaw = (node) => node && node.raw
diff --git a/test/generators/template.spec.js b/test/generators/template.spec.js
@@ -88,6 +88,7 @@ describe('Generators - Template', () => {
 
       it('objects', () => {
         expect(renderExpr('{ foo: bar, buz: baz }')).to.be.equal('{ foo: scope.bar, buz: scope.baz }')
+        expect(renderExpr('{ foo: i%2 }')).to.be.equal('{ foo: scope.i%2 }')
         expect(renderExpr('{ foo: { foo: bar, buz: baz }, buz: baz }')).to.be.equal('{ foo: { foo: scope.bar, buz: scope.baz }, buz: scope.baz }')
       })