gscan 4.21.1 → 4.22.0

package/lib/ast-linter/linter.js

@@ -143,7 +143,7 @@ class Linter {
         scanner.accept(options.parsed.ast);
 
         if (scanner.context.partials) {
-            this.partials = scanner.context.partials.map(p => p.node);
+            this.partials = scanner.context.partials;
         }
 
         if (scanner.context.helpers) {

package/lib/ast-linter/rules/base.js

@@ -150,6 +150,9 @@ module.exports = class BaseRule {
                     }
                 }
             }
+
+            // The default is that the usage is in scope of the declaration
+            return true;
         });
     }
 

package/lib/checks/005-template-compile.js

@@ -7,7 +7,7 @@ const {normalizePath} = require('../utils');
 function processFileFunction(files, failures, theme, partialsFound) {
     const processedFiles = [];
 
-    return function processFile(linter, themeFile) {
+    return function processFile(linter, themeFile, parentInlinePartials = []) {
         if (processedFiles.includes(themeFile.file)) {
             return;
         }
@@ -28,7 +28,8 @@ function processFileFunction(files, failures, theme, partialsFound) {
         });
 
         // Store the inline partials for the actual partial linting
-        linter.options.inlinePartials = linter.inlinePartials;
+        const inlinePartials = linter.inlinePartials;
+        linter.options.inlinePartials = [...inlinePartials, ...parentInlinePartials];
 
         const astResults = linter.verify({
             parsed: themeFile.parsed,
@@ -58,10 +59,28 @@ function processFileFunction(files, failures, theme, partialsFound) {
         });
 
         linter.partials.forEach((partial) => {
-            partialsFound[partial] = true;
-            const file = files.find(f => normalizePath(f.file) === `partials/${normalizePath(partial)}.hbs`);
+            const partialName = partial.node;
+            partialsFound[partialName] = true;
+            const file = files.find(f => normalizePath(f.file) === `partials/${normalizePath(partialName)}.hbs`);
             if (file) {
-                processFile(linter, file);
+                // Find all inline partial declaration that were within the partial usage block
+                const childrenInlinePartials = [...parentInlinePartials];
+                for (const inline of inlinePartials) {
+                    //Only partials that are in scope
+                    if (inline.parents.some(node => node.type === partial.type &&
+                        node.loc.source === partial.loc.source &&
+                        node.loc.start.line === partial.loc.start.line &&
+                        node.loc.start.column === partial.loc.start.column &&
+                        node.loc.end.line === partial.loc.end.line &&
+                        node.loc.end.column === partial.loc.end.column)) {
+                        // Override the `parents` attribute as the inline partials are in another context than the children file
+                        childrenInlinePartials.push({
+                            ...inline,
+                            parents: []
+                        });
+                    }
+                }
+                processFile(linter, file, childrenInlinePartials);
             }
         });
     };

package/lib/checks/090-template-syntax.js

@@ -30,7 +30,7 @@ function processFileFunction(files, failures, rules) {
             });
         }
 
-        linter.partials.forEach((partial) => {
+        linter.partials.forEach(({node: partial}) => {
             const file = files.find(f => normalizePath(f.file) === `partials/${normalizePath(partial)}.hbs`);
             if (file) {
                 processFile(linter, file);

package/lib/checks/100-custom-template-settings-usage.js

@@ -103,7 +103,7 @@ function parseWithAST({theme, log, file, rules, callback}){
             callback(linter);
         }
 
-        linter.partials.forEach((partial) => {
+        linter.partials.forEach(({node: partial}) => {
             const partialFile = theme.files.find(f => normalizePath(f.file) === `partials/${normalizePath(partial)}.hbs`);
             if (partialFile) {
                 processFile(partialFile);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gscan",
-  "version": "4.21.1",
+  "version": "4.22.0",
   "description": "Scans Ghost themes looking for errors, deprecations, features and compatibility",
   "keywords": [
     "ghost",