gscan 4.41.0 → 4.42.0

package/lib/ast-linter/rules/mark-used-partials.js

@@ -1,5 +1,6 @@
 const Rule = require('./base');
 const {getPartialName} = require('../helpers');
+const {normalizePath} = require('../../utils');
 
 module.exports = class MarkUsedPartials extends Rule {
     _markUsedPartials(node) {
@@ -8,6 +9,7 @@ module.exports = class MarkUsedPartials extends Rule {
         if (nodeName) {
             this.scanner.context.partials.push({
                 node: nodeName,
+                normalizedName: normalizePath(nodeName),
                 type: node.type,
                 loc: node.loc,
                 parameters: node.params ? node.params.map(p => p.original) : null

package/lib/checker.js

@@ -22,7 +22,7 @@ const labsEnabledHelpers = {
  * @param {Object=} [options.labs] object containing boolean flags for enabled labs features
  * @returns {Promise<Object>}
  */
-const check = function checkAll(themePath, options = {}) {
+const check = async function checkAll(themePath, options = {}) {
     // Require checks late to avoid loading all until used
     const checks = requireDir('./checks');
     const passedVersion = _.get(options, 'checkVersion', versions.default);
@@ -44,27 +44,33 @@ const check = function checkAll(themePath, options = {}) {
 
     // Require readTheme late to avoid loading entire AST parser until used
     const readTheme = require('./read-theme');
-    return readTheme(themePath)
-        .then(function (theme) {
-            // set the major version to check
-            theme.checkedVersion = versions[version].major;
-
-            return Promise.all(_.values(checks).map(async (checkFunction) => {
-                const now = Date.now();
-                const result = await checkFunction(theme, options, themePath);
-                debug(checkFunction.name, 'took', Date.now() - now, 'ms');
-                return result;
-            })).then(() => theme);
-        })
-        .catch((error) => {
-            throw new errors.ValidationError({
-                message: 'Failed theme files check',
-                help: 'Your theme file structure is corrupted or contains errors',
-                errorDetails: error.message,
-                context: options.themeName,
-                err: error
-            });
+
+    try {
+        const theme = await readTheme(themePath);
+
+        // set the major version to check
+        theme.checkedVersion = versions[version].major;
+
+        const timeBeforeChecks = Date.now();
+
+        for (const checkName in checks) {
+            const now = Date.now();
+            await checks[checkName](theme, options, themePath);
+            debug(checkName, 'took', Date.now() - now, 'ms');
+        }
+
+        debug('All checks took', Date.now() - timeBeforeChecks, 'ms');
+
+        return theme;
+    } catch (err) {
+        throw new errors.ValidationError({
+            message: 'Failed theme files check',
+            help: 'Your theme file structure is corrupted or contains errors',
+            errorDetails: err.message,
+            context: options.themeName,
+            err
         });
+    }
 };
 
 const checkZip = async function checkZip(path, options) {

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

@@ -2,7 +2,6 @@ const _ = require('lodash');
 const spec = require('../specs');
 const versions = require('../utils').versions;
 const ASTLinter = require('../ast-linter');
-const {normalizePath} = require('../utils');
 
 function processFileFunction(files, failures, theme, partialsFound) {
     const processedFiles = [];
@@ -61,7 +60,8 @@ function processFileFunction(files, failures, theme, partialsFound) {
         linter.partials.forEach((partial) => {
             const partialName = partial.node;
             partialsFound[partialName] = true;
-            const file = files.find(f => normalizePath(f.file) === `partials/${normalizePath(partialName)}.hbs`);
+
+            const file = files.find(f => f.normalizedFile === `partials/${partial.normalizedName}.hbs`);
             if (file) {
                 // Find all inline partial declaration that were within the partial usage block
                 const childrenInlinePartials = [...parentInlinePartials];

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

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const spec = require('../specs');
-const {versions, normalizePath, getPackageJSON} = require('../utils');
+const {versions, getPackageJSON} = require('../utils');
 const ASTLinter = require('../ast-linter');
 
 function processFileFunction(files, failures, rules) {
@@ -30,8 +30,8 @@ function processFileFunction(files, failures, rules) {
             });
         }
 
-        linter.partials.forEach(({node: partial}) => {
-            const file = files.find(f => normalizePath(f.file) === `partials/${normalizePath(partial)}.hbs`);
+        linter.partials.forEach(({normalizedName}) => {
+            const file = files.find(f => f.normalizedFile === `partials/${normalizedName}.hbs`);
             if (file) {
                 processFile(linter, file);
             }

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

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const spec = require('../specs');
-const {versions, normalizePath} = require('../utils');
+const {versions} = require('../utils');
 const ASTLinter = require('../ast-linter');
 
 function getRules(id, options) {
@@ -103,8 +103,8 @@ function parseWithAST({theme, log, file, rules, callback}){
             callback(linter);
         }
 
-        linter.partials.forEach(({node: partial}) => {
-            const partialFile = theme.files.find(f => normalizePath(f.file) === `partials/${normalizePath(partial)}.hbs`);
+        linter.partials.forEach(({normalizedName}) => {
+            const partialFile = theme.files.find(f => f.normalizedFile === `partials/${normalizedName}.hbs`);
             if (partialFile) {
                 processFile(partialFile);
             }

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

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const spec = require('../specs');
-const {versions, normalizePath} = require('../utils');
+const {versions} = require('../utils');
 const ASTLinter = require('../ast-linter');
 
 function getRules(id, options) {
@@ -104,8 +104,8 @@ function parseWithAST({theme, log, file, rules, callback}) {
             callback(linter);
         }
 
-        linter.partials.forEach(({node: partial}) => {
-            const partialFile = theme.files.find(f => normalizePath(f.file) === `partials/${normalizePath(partial)}.hbs`);
+        linter.partials.forEach(({normalizedName}) => {
+            const partialFile = theme.files.find(f => f.normalizedFile === `partials/${normalizedName}.hbs`);
             if (partialFile) {
                 processFile(partialFile);
             }

package/lib/checks/120-no-unknown-globals.js

@@ -2,7 +2,6 @@ const _ = require('lodash');
 const spec = require('../specs');
 const versions = require('../utils').versions;
 const ASTLinter = require('../ast-linter');
-const {normalizePath} = require('../utils');
 
 function processFileFunction(files, failures, theme, partialsFound) {
     const processedFiles = [];
@@ -61,7 +60,7 @@ function processFileFunction(files, failures, theme, partialsFound) {
         linter.partials.forEach((partial) => {
             const partialName = partial.node;
             partialsFound[partialName] = true;
-            const file = files.find(f => normalizePath(f.file) === `partials/${normalizePath(partialName)}.hbs`);
+            const file = files.find(f => f.normalizedFile === `partials/${partial.normalizedName}.hbs`);
             if (file) {
                 // Find all inline partial declaration that were within the partial usage block
                 const childrenInlinePartials = [...parentInlinePartials];

package/lib/read-theme.js

@@ -3,6 +3,7 @@ const _ = require('lodash');
 const os = require('os');
 const path = require('path');
 const ASTLinter = require('./ast-linter');
+const {normalizePath} = require('./utils');
 
 const ignore = [
     'node_modules',
@@ -31,6 +32,7 @@ const readThemeStructure = function readThemeFiles(themePath, subPath, arr) {
     var makeResult = function makeResult(result, subFilePath, ext, symlink) {
         result.push({
             file: subFilePath,
+            normalizedFile: normalizePath(subFilePath),
             ext,
             symlink
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gscan",
-  "version": "4.41.0",
+  "version": "4.42.0",
   "description": "Scans Ghost themes looking for errors, deprecations, features and compatibility",
   "keywords": [
     "ghost",
@@ -13,6 +13,9 @@
     "type": "git",
     "url": "git@github.com:TryGhost/gscan.git"
   },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
   "engines": {
     "node": "^14.18.0 || ^16.13.0 || ^18.12.1"
   },