gscan 4.26.1 → 4.29.0

package/bin/cli.js

@@ -131,12 +131,17 @@ function outputResult(result, options) {
     if (result.failures && result.failures.length) {
         if (options.verbose) {
             ui.log(''); // extra line-break
-            ui.log(`${chalk.bold('Files:')}`);
+            ui.log(`${chalk.bold('Affected Files:')}`);
             result.failures.forEach((failure) => {
-                ui.log(`${failure.ref} - ${failure.message}`);
+                let message = failure.ref;
+
+                if (failure.message) {
+                    message += `- ${failure.message}`;
+                }
+                ui.log(message);
             });
         } else {
-            ui.log(`${chalk.bold('Files:')} ${_.map(result.failures, 'ref')}`);
+            ui.log(`${chalk.bold('Affected Files:')} ${_.map(result.failures, 'ref')}`);
         }
     }
 

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

@@ -6,6 +6,8 @@ module.exports = {
     'GS090-NO-PRODUCTS-HELPER': require('./lint-no-products-helper'),
     'GS090-NO-PRODUCT-DATA-HELPER': require('./lint-no-product-data-helper'),
     'GS090-NO-PRODUCTS-DATA-HELPER': require('./lint-no-products-data-helper'),
+    'GS090-NO-MEMBER-PRODUCTS-DATA-HELPER': require('./lint-no-member-products-data-helper'),
+    'GS090-NO-PRICE-DATA-HELPER': require('./lint-no-price-data-helper'),
     'no-multi-param-conditionals': require('./lint-no-multi-param-conditionals'),
     'no-nested-async-helpers': require('./lint-no-nested-async-helpers'),
     'no-prev-next-post-outside-post-context': require('./lint-no-prev-next-post-outside-post-context'),

package/lib/ast-linter/rules/lint-no-member-products-data-helper.js

@@ -0,0 +1,24 @@
+const Rule = require('./base');
+const {getNodeName, logNode} = require('../helpers');
+
+module.exports = class NoMemberProductsHelper extends Rule {
+    _checkForHelperName(node) {
+        const nodeName = getNodeName(node);
+        const isMatchingHelper = (nodeName === '@member.products');
+
+        if (isMatchingHelper) {
+            this.log({
+                message: `${logNode(node)} should not be used`,
+                line: node.loc && node.loc.start.line,
+                column: node.loc && node.loc.start.column,
+                source: this.sourceForNode(node)
+            });
+        }
+    }
+
+    visitor() {
+        return {
+            MustacheStatement: this._checkForHelperName.bind(this)
+        };
+    }
+};

package/lib/ast-linter/rules/lint-no-price-data-helper.js

@@ -0,0 +1,24 @@
+const Rule = require('./base');
+const {getNodeName, logNode} = require('../helpers');
+
+module.exports = class NoPriceDataHelper extends Rule {
+    _checkForHelperName(node) {
+        const nodeName = getNodeName(node);
+        const isMatchingHelper = (nodeName.startsWith('@price.'));
+
+        if (isMatchingHelper) {
+            this.log({
+                message: `${logNode(node)} should not be used`,
+                line: node.loc && node.loc.start.line,
+                column: node.loc && node.loc.start.column,
+                source: this.sourceForNode(node)
+            });
+        }
+    }
+
+    visitor() {
+        return {
+            MustacheStatement: this._checkForHelperName.bind(this)
+        };
+    }
+};

package/lib/ast-linter/rules/lint-no-product-data-helper.js

@@ -2,7 +2,7 @@ const Rule = require('./base');
 const {getNodeName, logNode} = require('../helpers');
 
 module.exports = class NoProductsHelper extends Rule {
-    _checkForHelerInPostContext(node) {
+    _checkForHelperName(node) {
         const nodeName = getNodeName(node);
         const isProductsHelper = (nodeName === '@product');
 
@@ -18,7 +18,7 @@ module.exports = class NoProductsHelper extends Rule {
 
     visitor() {
         return {
-            MustacheStatement: this._checkForHelerInPostContext.bind(this)
+            MustacheStatement: this._checkForHelperName.bind(this)
         };
     }
 };

package/lib/ast-linter/rules/lint-no-products-data-helper.js

@@ -2,7 +2,7 @@ const Rule = require('./base');
 const {getNodeName, logNode} = require('../helpers');
 
 module.exports = class NoProductsHelper extends Rule {
-    _checkForHelerInPostContext(node) {
+    _checkForHelperName(node) {
         const nodeName = getNodeName(node);
         const isProductsHelper = (nodeName === '@products');
 
@@ -18,7 +18,7 @@ module.exports = class NoProductsHelper extends Rule {
 
     visitor() {
         return {
-            MustacheStatement: this._checkForHelerInPostContext.bind(this)
+            MustacheStatement: this._checkForHelperName.bind(this)
         };
     }
 };

package/lib/ast-linter/rules/lint-no-products-helper.js

@@ -2,7 +2,7 @@ const Rule = require('./base');
 const {getNodeName, logNode} = require('../helpers');
 
 module.exports = class NoProductsHelper extends Rule {
-    _checkForHelerInPostContext(node) {
+    _checkForHelperName(node) {
         const nodeName = getNodeName(node);
         const isProductsHelper = (nodeName === 'products');
 
@@ -18,7 +18,7 @@ module.exports = class NoProductsHelper extends Rule {
 
     visitor() {
         return {
-            MustacheStatement: this._checkForHelerInPostContext.bind(this)
+            MustacheStatement: this._checkForHelperName.bind(this)
         };
     }
 };

package/lib/checks/050-koenig-css-classes.js

@@ -12,7 +12,7 @@ const checkKoenigCssClasses = function checkKoenigCssClasses(theme, options) {
 
     // Following the introduction of card assets, we disable certain rules
     // when it's enabled by the theme.
-    const packageJson = getPackageJSON(theme);
+    const packageJson = getPackageJSON(theme, ruleSet.defaultPackageJSON);
     const cardAssetsEnabled = packageJson
         && packageJson.config
         && packageJson.config.card_assets === true;