Resolve nested scopes correctly by extracting correct template of… (#71)

Author: ezhlobo

Diff for: lib/util/getUsedVariablesInPug.js

@@ -91,6 +91,7 @@ const getUsedVariablesInPug = (template = '') => {
           codeStartsAt = relatedLine.indexOf(codeFragment)
         }
       }
+
       traverse(ast, {
         Identifier(path) {
           const loc = buildLocation(
@@ -115,6 +116,13 @@ const getUsedVariablesInPug = (template = '') => {
               loc,
               { isSpreadElement: true },
             ))
+          } else {
+            usedVariables.push(buildVariable(
+              path.node.name,
+              getFullName(path),
+              loc,
+              { isSpreadElement: false },
+            ))
           }
         },
 
@@ -138,11 +146,7 @@ const getUsedVariablesInPug = (template = '') => {
         },
       })
 
-      const lastAddedVariable = usedVariables[usedVariables.length - 1]
-
-      // If we define a scope with a variable connected to props in that definition,
-      // we also mark all vars in that scope as used
-      if (token.type === 'each' && lastAddedVariable) {
+      if (token.type === 'each') {
         const getLastTokenInScope = (all, start) => {
           const startIndex = all.findIndex(item => item === start)
           const lastToken = all.slice(startIndex).find(item => item.type === 'outdent' && item.loc.end.column <= start.loc.start.column)
@@ -154,7 +158,7 @@ const getUsedVariablesInPug = (template = '') => {
         const endToken = getLastTokenInScope(tokens, startToken)
 
         const bodyLines = [''].concat(lines.slice(startToken.loc.start.line, endToken.loc.end.line - 1))
-        const body = bodyLines.join('\n')
+        const body = bodyLines.concat('\n').join('\n')
 
         const variablesInScope = getUsedVariablesInPug(body)
           .filter(item => item.allNames.length > 1 || item.extra.isSpreadElement === true)
@@ -175,6 +179,8 @@ const getUsedVariablesInPug = (template = '') => {
               : item.allNames,
           }))
 
+        const lastAddedVariable = usedVariables[usedVariables.length - 1]
+
         variablesInScope.forEach((item) => {
           const allNames = item.allNames[0] === '__COMPUTED_PROP__' && item.allNames.length > 1
             ? lastAddedVariable.allNames.concat(item.allNames)

Diff for: tests/lib/rules/prop-types.js

@@ -603,6 +603,22 @@ const cases = [
           }
         `,
       },
+      {
+        code: `
+          function Component(props) {
+            return pug\`
+              each item in props.list
+                each inside in item
+                  = inside.a
+            \`
+          }
+          Component.propTypes = {
+            list: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.shape({
+              a: PropTypes.test,
+            })))
+          }
+        `,
+      },
     ],
     invalid: [
       {
@@ -727,6 +743,45 @@ const cases = [
           buildError([11, 25], [11, 41], buildUnusedMessage('list.*.anything')),
         ],
       },
+      {
+        code: `
+          function Component(props) {
+            return pug\`
+              each item in props.list
+                each inside in item
+                  each second in inside
+                    = second.a
+            \`
+          }
+          Component.propTypes = {
+            list: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.shape({}))))
+          }
+        `,
+        errors: [
+          buildError([7, 30], [7, 31], buildMissingMessage('list[][][].a')),
+        ],
+      },
+      {
+        code: `
+          function Component(props) {
+            return pug\`
+              each item in props.list
+                each inside in item
+                  each second in inside
+                    = second.a
+            \`
+          }
+          Component.propTypes = {
+            list: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.shape({
+              a: PropTypes.string,
+              b: PropTypes.string,
+            }))))
+          }
+        `,
+        errors: [
+          buildError([13, 18], [13, 34], buildUnusedMessage('list.*.*.*.b')),
+        ],
+      },
     ],
   },