gscan 4.43.4 → 4.43.6

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

@@ -3,7 +3,7 @@ const spec = require('../specs');
 const {versions, getPackageJSON} = require('../utils');
 const ASTLinter = require('../ast-linter');
 
-function processFileFunction(files, failures, rules) {
+function processFileFunction(files, failures, rules, partialVerificationCache) {
     // This rule is needed to find partials
     // Partials are needed for a full parsing
     if (!rules['mark-used-partials']) {
@@ -16,6 +16,16 @@ function processFileFunction(files, failures, rules) {
             return;
         }
 
+        const fileName = themeFile.file;
+
+        // Check if the file is a partial
+        const isPartial = fileName.startsWith('partials/');
+
+        // Skip if already cached (for partials only)
+        if (isPartial && partialVerificationCache.has(fileName)) {
+            return;
+        }
+
         const astResults = linter.verify({
             parsed: themeFile.parsed,
             rules,
@@ -30,6 +40,11 @@ function processFileFunction(files, failures, rules) {
             });
         }
 
+        // Cache the result for this partial
+        if (isPartial) {
+            partialVerificationCache.set(fileName, astResults);
+        }
+
         linter.partials.forEach(({normalizedName}) => {
             const file = files.find(f => f.normalizedFile === `partials/${normalizedName}.hbs`);
             if (file) {
@@ -62,15 +77,16 @@ const checkTemplateSyntax = function checkTemplateSyntax(theme, options) {
     });
 
     _.each(rulesToCheck, function (check, ruleCode) {
+        const partialVerificationCache = new Map();
         const failures = [];
         const processFile = processFileFunction(
             theme.files,
             failures,
             {
                 [ruleCode]: require(`../ast-linter/rules`)[ruleCode]
-            }
+            },
+            partialVerificationCache
         );
-
         const linter = new ASTLinter({
             partials: theme.partials,
             inlinePartials: [],

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

@@ -36,7 +36,8 @@ function getLogger({theme, rule, file = null}) {
 }
 
 function applyRule(rule, theme) {
-    // The result variable is passed around to keep a state through the full rull lifecycle
+    const partialVerificationCache = new Map();
+    // The result variable is passed around to keep a state through the full lifecycle
     const result = {};
     try {
         // Check if the rule is enabled (optional)
@@ -56,7 +57,7 @@ function applyRule(rule, theme) {
         // Run the main function on each theme file (optional)
         if (typeof rule.eachFile === 'function') {
             _.each(theme.files , function (themeFile) {
-                rule.eachFile({file: themeFile, theme, log: getLogger({theme, rule}), result});
+                rule.eachFile({file: themeFile, theme, log: getLogger({theme, rule}), result, partialVerificationCache});
             });
         }
 
@@ -71,7 +72,7 @@ function applyRule(rule, theme) {
     }
 }
 
-function parseWithAST({theme, log, file, rules, callback}){
+function parseWithAST({theme, log, file, rules, callback, partialVerificationCache}){
     const linter = new ASTLinter();
 
     // This rule is needed to find partials
@@ -86,6 +87,14 @@ function parseWithAST({theme, log, file, rules, callback}){
             return;
         }
 
+        const fileName = themeFile.file;
+        // Check if the file is a partial
+        const isPartial = fileName.startsWith('partials/');
+        // Skip if already cached (for partials only)
+        if (isPartial && partialVerificationCache.has(fileName)) {
+            return;
+        }
+
         const astResults = linter.verify({
             parsed: themeFile.parsed,
             rules,
@@ -93,6 +102,11 @@ function parseWithAST({theme, log, file, rules, callback}){
             moduleId: themeFile.file
         });
 
+        // Cache the result for this partial
+        if (isPartial) {
+            partialVerificationCache.set(fileName, astResults);
+        }
+
         if (astResults.length) {
             log.failure({
                 message: astResults[0].message
@@ -122,13 +136,13 @@ const ruleImplementations = {
         init: ({result}) => {
             result.customThemeSettings = new Set();
         },
-        eachFile: ({file, theme, log, result}) => {
+        eachFile: ({file, theme, log, result, partialVerificationCache}) => {
             let templateTest = file.file.match(/(?<!partials\/.+?)\.hbs$/);
 
             if (templateTest) {
                 parseWithAST({file, theme, rules: {
                     'mark-used-custom-theme-setting': require(`../ast-linter/rules/mark-used-custom-theme-settings`)
-                }, log, callback: (linter) => {
+                }, log, partialVerificationCache, callback: (linter) => {
                     linter.customThemeSettings.forEach((variable) => {
                         result.customThemeSettings.add(variable);
                     });

package/lib/checks/110-page-builder-usage.js

@@ -36,6 +36,8 @@ function getLogger({theme, rule, file = null}) {
 }
 
 function applyRule(rule, theme) {
+    const partialVerificationCache = new Map();
+
     // The result variable is passed around to keep a state through the full lifecycle
     const result = {};
     try {
@@ -56,7 +58,7 @@ function applyRule(rule, theme) {
         // Run the main function on each theme file (optional)
         if (typeof rule.eachFile === 'function') {
             _.each(theme.files, function (themeFile) {
-                rule.eachFile({file: themeFile, theme, log: getLogger({theme, rule}), result});
+                rule.eachFile({file: themeFile, theme, log: getLogger({theme, rule}), result, partialVerificationCache});
             });
         }
 
@@ -71,11 +73,11 @@ function applyRule(rule, theme) {
     }
 }
 
-function parseWithAST({theme, log, file, rules, callback}) {
+function parseWithAST({theme, log, file, rules, callback, partialVerificationCache}) {
     const linter = new ASTLinter();
 
-    // // This rule is needed to find partials
-    // // Partials are needed for a full parsing
+    // This rule is needed to find partials
+    // Partials are needed for a full parsing
     if (!rules['mark-used-partials']) {
         rules['mark-used-partials'] = require(`../ast-linter/rules/mark-used-partials`);
     }
@@ -86,6 +88,14 @@ function parseWithAST({theme, log, file, rules, callback}) {
             return;
         }
 
+        const fileName = themeFile.file;
+        // Check if the file is a partial
+        const isPartial = fileName.startsWith('partials/');
+        // Skip if already cached (for partials only)
+        if (isPartial && partialVerificationCache.has(fileName)) {
+            return;
+        }
+
         const astResults = linter.verify({
             parsed: themeFile.parsed,
             rules,
@@ -93,6 +103,11 @@ function parseWithAST({theme, log, file, rules, callback}) {
             moduleId: themeFile.file
         });
 
+        // Cache the result for this partial
+        if (isPartial) {
+            partialVerificationCache.set(fileName, astResults);
+        }
+
         if (astResults.length) {
             log.failure({
                 message: astResults[0].message,
@@ -121,13 +136,13 @@ const ruleImplementations = {
         init: ({result}) => {
             result.pageBuilderProperties = new Set();
         },
-        eachFile: ({file, theme, log, result}) => {
+        eachFile: ({file, theme, log, result, partialVerificationCache}) => {
             const templateTest = file.file.match(/(?<!partials\/.+?)\.hbs$/);
 
             if (templateTest) {
                 parseWithAST({file, theme, rules: {
                     'mark-used-page-properties': require(`../ast-linter/rules/mark-used-page-properties`)
-                }, log, callback: (linter) => {
+                }, log, partialVerificationCache, callback: (linter) => {
                     linter.usedPageProperties.forEach((variable) => {
                         result.pageBuilderProperties.add(variable);
                     });
@@ -149,14 +164,14 @@ const ruleImplementations = {
     },
     'GS110-NO-UNKNOWN-PAGE-BUILDER-USAGE': {
         isEnabled: true,
-        eachFile: ({file, theme, log}) => {
+        eachFile: ({file, theme, log, partialVerificationCache}) => {
             const templateTest = file.file.match(/(?<!partials\/.+?)\.hbs$/);
 
             if (templateTest) {
                 parseWithAST({
                     file, theme, rules: {
                         'no-unknown-page-properties': require(`../ast-linter/rules/lint-no-unknown-page-properties`)
-                    }, log, callback: () => {}
+                    }, log, partialVerificationCache, callback: () => {}
                 });
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gscan",
-  "version": "4.43.4",
+  "version": "4.43.6",
   "description": "Scans Ghost themes looking for errors, deprecations, features and compatibility",
   "keywords": [
     "ghost",
@@ -77,7 +77,7 @@
     "nodemon": "2.0.7",
     "rewire": "6.0.0",
     "should": "13.2.3",
-    "sinon": "18.0.0"
+    "sinon": "19.0.2"
   },
   "files": [
     "lib",