gscan 4.8.0 → 4.9.2

package/lib/ast-linter/rules/lint-no-unknown-custom-theme-select-value-in-match.js

@@ -17,8 +17,16 @@ function getCustomSettingValue(node) {
 module.exports = class NoUnknownCustomThemeSelectValueInMatch extends Rule {
     _checkForCustomThemeSelectValueInMatch(node) {
         if (node.path.original === 'match' && node.params.length === 3) {
-            const setting = getCustomSettingName(node.params[0]) || getCustomSettingName(node.params[2]);
-            const value = getCustomSettingValue(node.params[0]) || getCustomSettingValue(node.params[2]);
+            if (node.params.length < 2 || node.params.length > 3) {
+                return;
+            }
+
+            let indexSecondParameter = 1; // Case {{match @custom.example "123"}}
+            if (node.params.length === 3) {
+                indexSecondParameter = 2; // Case {{match @custom.example "!=" "123"}}
+            }
+            const setting = getCustomSettingName(node.params[0]) || getCustomSettingName(node.params[indexSecondParameter]);
+            const value = getCustomSettingValue(node.params[0]) || getCustomSettingValue(node.params[indexSecondParameter]);
 
             if (!setting || !value || !this.isSelectCustomTheme(setting)) {
                 return;

package/lib/checks/010-package-json.js

@@ -50,6 +50,7 @@ const canaryPackageJSONValidationRules = _.extend({},
     {missingCustomThemeSettingsSelectDefault: 'GS010-PJ-CUST-THEME-SETTINGS-SELECT-DEFAULT'},
     {invalidCustomThemeSetingBooleanDefault: 'GS010-PJ-CUST-THEME-SETTINGS-BOOLEAN-DEFAULT'},
     {invalidCustomThemeSetingColorDefault: 'GS010-PJ-CUST-THEME-SETTINGS-COLOR-DEFAULT'},
+    {invalidCustomThemeSetingImageDefault: 'GS010-PJ-CUST-THEME-SETTINGS-IMAGE-DEFAULT'},
     canaryPackageJSONConditionalRules
 );
 
@@ -173,6 +174,11 @@ _private.validatePackageJSONFields = function validatePackageJSONFields(packageJ
                     markFailed('invalidCustomThemeSetingColorDefault');
                 }
                 break;
+            case 'image':
+                if (entry.default) {
+                    markFailed('invalidCustomThemeSetingImageDefault');
+                }
+                break;
             default:
                 //do nothing here
             }

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

@@ -4,6 +4,12 @@ const {versions, normalizePath} = require('../utils');
 const ASTLinter = require('../ast-linter');
 
 function processFileFunction(files, failures, rules) {
+    // 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`);
+    }
+
     return function processFile(linter, themeFile) {
         if (themeFile.parsed.error) {
             // Ignore parsing errors, they are handled in 005

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

@@ -74,6 +74,12 @@ function applyRule(rule, theme) {
 function parseWithAST({theme, log, file, rules, callback}){
     const linter = new ASTLinter();
 
+    // 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`);
+    }
+
     function processFile(themeFile) {
         if (themeFile.parsed.error) {
             // Ignore parsing errors, they are handled in 005

package/lib/read-theme.js

@@ -106,7 +106,7 @@ const readFiles = function readFiles(theme, options = {}) {
                 const packageJsonMatch = themeFile.file.match(/^package\.json/);
                 if (packageJsonMatch) {
                     const packageJson = JSON.parse(themeFile.content);
-                    if (packageJson.config.custom) {
+                    if (packageJson.config && packageJson.config.custom) {
                         theme.customSettings = packageJson.config.custom;
                     }
                 }

package/lib/specs/canary.js

@@ -84,6 +84,12 @@ let rules = {
         details: oneLineTrim`Please make sure the <code>"default"</code> property is either <code>null</code>, an empty string <code>''</code> or a valid 6-hexadecimal-digit color code like <code>#15171a</code>.<br>
         Check the <a href="${docsBaseUrl}packagejson/" target=_blank><code>package.json</code> documentation</a> for further information.`
     },
+    'GS010-PJ-CUST-THEME-SETTINGS-IMAGE-DEFAULT': {
+        level: 'error',
+        rule: '<code>package.json</code> objects defined in <code>"config.custom"</code> of type <code>"image"</code> can\'t have a <code>"default"</code> value.',
+        details: oneLineTrim`Make sure the <code>"default"</code> property is either <code>null</code>, an empty string <code>''</code> or isn't present.<br>
+        Check the <a href="${docsBaseUrl}packagejson/" target=_blank><code>package.json</code> documentation</a> for further information.`
+    },
     'GS001-DEPR-LABS-MEMBERS': {
         level: 'warning',
         rule: 'The <code>{{@labs.members}}</code> helper should not be used.',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gscan",
-  "version": "4.8.0",
+  "version": "4.9.2",
   "description": "Scans Ghost themes looking for errors, deprecations, features and compatibility",
   "keywords": [
     "ghost",
@@ -41,8 +41,8 @@
   },
   "dependencies": {
     "@sentry/node": "6.13.3",
-    "@tryghost/pretty-cli": "1.2.21",
-    "@tryghost/zip": "1.1.17",
+    "@tryghost/pretty-cli": "1.2.22",
+    "@tryghost/zip": "1.1.18",
     "bluebird": "3.7.2",
     "chalk": "4.1.2",
     "common-tags": "1.8.0",