Fixes the overall score for related keyphrase and collection assessors

packages/yoastseo/package.json

@@ -31,7 +31,7 @@
     "clean": "rm -rf build types",
     "pretest": "grunt get-premium-configuration",
     "test": "jest",
-    "lint": "eslint . --max-warnings 26"
+    "lint": "eslint . --max-warnings 21"
   },
   "engines": {
     "node": ">=8.0.0"

packages/yoastseo/spec/scoring/scoreAggregators/SEOScoreAggregatorSpec.js

@@ -111,5 +111,17 @@ describe( "SEOScoreAggregator", () => {
 			const score = aggregator.aggregate( results );
 			expect( score ).toBe( 63 );
 		} );
+
+		it( "does not exclude assessments without score from aggregator", () => {
+			const results = [
+				new AssessmentResult( { score: 5 } ),
+				new AssessmentResult(),
+				new AssessmentResult( { score: 4 } ),
+				new AssessmentResult( { score: 8 } ),
+				new AssessmentResult(),
+			];
+			const score = aggregator.aggregate( results );
+			expect( score ).toBe( 38 );
+		} );
 	} );
 } );

packages/yoastseo/spec/scoring/scoreAggregators/ValidOnlyResultsScoreAggregatorSpec.js

@@ -0,0 +1,24 @@
+import { ValidOnlyResultsScoreAggregator } from "../../../src/scoring/scoreAggregators";
+import AssessmentResult from "../../../src/values/AssessmentResult";
+
+describe( "ValidOnlyResultsScoreAggregator", () => {
+	let aggregator;
+
+	beforeEach( () => {
+		aggregator = new ValidOnlyResultsScoreAggregator();
+	} );
+
+	describe( "aggregate", () => {
+		it( "excludes assessments without score from aggregator", () => {
+			const results = [
+				new AssessmentResult( { score: 5 } ),
+				new AssessmentResult(),
+				new AssessmentResult( { score: 4 } ),
+				new AssessmentResult( { score: 8 } ),
+				new AssessmentResult(),
+			];
+			const score = aggregator.aggregate( results );
+			expect( score ).toBe( 63 );
+		} );
+	} );
+} );

packages/yoastseo/spec/worker/AnalysisWebWorkerSpec.js

@@ -12,9 +12,6 @@ import { SEOScoreAggregator } from "../../src/scoring/scoreAggregators";
 import { TreeResearcher } from "../../src/parsedPaper/research";
 import AssessmentResult from "../../src/values/AssessmentResult.js";
 import Paper from "../../src/values/Paper.js";
-import InvalidTypeError from "../../src/errors/invalidType.js";
-import { StructuredNode } from "../../src/parsedPaper/structure/tree";
-
 
 // Full-length texts to test
 import testTexts from "../fullTextTests/testTexts";
@@ -1932,79 +1929,6 @@ describe( "AnalysisWebWorker", () => {
 		} );
 	} );
 
-	describe( "registerParser", () => {
-		/**
-		 * A mock parser.
-		 */
-		class MockParser {
-			/**
-			 * Checks if this parser is applicable.
-			 *
-			 * @returns {boolean} Whether the parser is applicable.
-			 */
-			isApplicable() {
-				return true;
-			}
-
-			/**
-			 * Parses the paper.
-			 *
-			 * @returns {module:parsedPaper/structure.StructuredNode} The tree structure.
-			 */
-			parse() {
-				return new StructuredNode( "some-tag" );
-			}
-		}
-
-		beforeEach( () => {
-			scope = createScope();
-			worker = new AnalysisWebWorker( scope, researcher );
-		} );
-
-		it( "can register a custom parser, if it is class-based and has the appropriate methods.", () => {
-			const mockParser = new MockParser();
-
-			worker.registerParser( mockParser );
-
-			expect( worker._registeredParsers ).toHaveLength( 1 );
-			expect( worker._registeredParsers[ 0 ] ).toEqual( mockParser );
-		} );
-
-		it( "can register a custom parser, if it has an `isApplicable` and a `parse` method.", () => {
-			const mockParser = {
-				isApplicable: () => true,
-				parse: () => new StructuredNode( "Hello!" ),
-			};
-
-			worker.registerParser( mockParser );
-
-			expect( worker._registeredParsers ).toHaveLength( 1 );
-			expect( worker._registeredParsers[ 0 ] ).toEqual( mockParser );
-		} );
-
-		it( "throws an error when registering a custom parser, if it does not have an `isApplicable` method.", () => {
-			const mockParser = {
-				parse: () => new StructuredNode( "Hello!" ),
-			};
-
-			expect( () => worker.registerParser( mockParser ) ).toThrow( InvalidTypeError );
-		} );
-
-		it( "throws an error when registering a custom parser, if it does not have a `parse` method.", () => {
-			const mockParser = {
-				isApplicable: () => true,
-			};
-
-			expect( () => worker.registerParser( mockParser ) ).toThrow( InvalidTypeError );
-		} );
-
-		it( "throws an error when registering a custom parser, if it neither has `isApplicable` method nor `parse` method.", () => {
-			const mockParser = {};
-
-			expect( () => worker.registerParser( mockParser ) ).toThrow( InvalidTypeError );
-		} );
-	} );
-
 	describe( "set assessors", () => {
 		const customAssessorOptions = { url: "url" };
 		beforeEach( () => {

packages/yoastseo/src/scoring/assessors/assessor.js

@@ -1,6 +1,6 @@
 // External dependencies.
 import { __, sprintf } from "@wordpress/i18n";
-import { filter, find, findIndex, isFunction, isUndefined, map } from "lodash";
+import { isFunction, isUndefined } from "lodash";
 
 // Internal dependencies.
 import AssessmentResult from "../../values/AssessmentResult.js";
@@ -25,9 +25,33 @@ class Assessor {
 	constructor( researcher, options ) {
 		this.type = "assessor";
 		this.setResearcher( researcher );
+
+		/**
+		 * The list of assessments.
+		 * @type {Assessment[]}
+		 * @private
+		 */
 		this._assessments = [];
 
+		/**
+		 * The list of results.
+		 * @type {AssessmentResult[]}
+		 */
+		this.results = [];
+
+		/**
+		 * The options.
+		 * @type {Object|{}}
+		 * @private
+		 */
 		this._options = options || {};
+
+		/**
+		 * The ScoreAggregator for this assessor.
+		 * @type {ScoreAggregator}
+		 * @private
+		 */
+		this._scoreAggregator = null;
 	}
 
 	/**
@@ -62,11 +86,7 @@ class Assessor {
 	 * @returns {boolean} Whether or not the Assessment is applicable.
 	 */
 	isApplicable( assessment, paper, researcher ) {
-		if ( assessment.hasOwnProperty( "isApplicable" ) || typeof assessment.isApplicable === "function" ) {
-			return assessment.isApplicable( paper, researcher );
-		}
-
-		return true;
+		return assessment.isApplicable( paper, researcher );
 	}
 
 	/**
@@ -76,7 +96,7 @@ class Assessor {
 	 * @returns {boolean} Whether or not the assessment has a marker.
 	 */
 	hasMarker( assessment ) {
-		return isFunction( this._options.marker ) && ( assessment.hasOwnProperty( "getMarks" ) || typeof assessment.getMarks === "function" );
+		return isFunction( this._options.marker ) && ( Object.hasOwn( assessment, "getMarks" ) || typeof assessment.getMarks === "function" );
 	}
 
 	/**
@@ -130,14 +150,11 @@ class Assessor {
 		paper.setTree( build( paper, languageProcessor, shortcodes ) );
 
 		let assessments = this.getAvailableAssessments();
-		this.results = [];
 
-		assessments = filter( assessments, function( assessment ) {
-			return this.isApplicable( assessment, paper, this._researcher );
-		}.bind( this ) );
+		assessments = assessments.filter( assessment => this.isApplicable( assessment, paper, this._researcher ) );
 
 		this.setHasMarkers( false );
-		this.results = map( assessments, this.executeAssessment.bind( this, paper, this._researcher ) );
+		this.results = assessments.map( assessment => this.executeAssessment( paper, this._researcher, assessment ) );
 
 		this._lastPaper = paper;
 	}
@@ -208,9 +225,7 @@ class Assessor {
 	 * @returns {AssessmentResult[]} The array with all the valid assessments.
 	 */
 	getValidResults() {
-		return filter( this.results, function( result ) {
-			return this.isValidResult( result );
-		}.bind( this ) );
+		return this.results.filter( result => this.isValidResult( result ) );
 	}
 
 	/**
@@ -245,7 +260,7 @@ class Assessor {
 	 * @returns {boolean} Whether registering the assessment was successful.
 	 */
 	addAssessment( name, assessment ) {
-		if ( ! assessment.hasOwnProperty( "identifier" ) ) {
+		if ( ! Object.hasOwn( assessment, "identifier" ) ) {
 			assessment.identifier = name;
 		}
 		// If the assessor already has the same assessment, remove it and replace it with the new assessment with the same identifier.
@@ -264,9 +279,9 @@ class Assessor {
 	 * @returns {void}
 	 */
 	removeAssessment( name ) {
-		const toDelete = findIndex( this._assessments, function( assessment ) {
-			return assessment.hasOwnProperty( "identifier" ) && name === assessment.identifier;
-		} );
+		const toDelete = this._assessments.findIndex( assessment =>
+			Object.hasOwn( assessment, "identifier" ) && name === assessment.identifier
+		);
 
 		if ( -1 !== toDelete ) {
 			this._assessments.splice( toDelete, 1 );
@@ -277,12 +292,12 @@ class Assessor {
 	 * Returns an assessment by identifier
 	 *
 	 * @param {string} identifier The identifier of the assessment.
-	 * @returns {undefined|Assessment} The object if found, otherwise undefined.
+	 * @returns {Assessment} The object if found, otherwise undefined.
 	 */
 	getAssessment( identifier ) {
-		return find( this._assessments, function( assessment ) {
-			return assessment.hasOwnProperty( "identifier" ) && identifier === assessment.identifier;
-		} );
+		return this._assessments.find( assessment =>
+			Object.hasOwn( assessment, "identifier" ) && identifier === assessment.identifier
+		);
 	}
 
 	/**
@@ -292,12 +307,16 @@ class Assessor {
 	 */
 	getApplicableAssessments() {
 		const availableAssessments = this.getAvailableAssessments();
-		return filter(
-			availableAssessments,
-			function( availableAssessment ) {
-				return this.isApplicable( availableAssessment, this.getPaper(), this._researcher );
-			}.bind( this )
-		);
+		return availableAssessments.filter( assessment => this.isApplicable( assessment, this.getPaper(), this._researcher ) );
+	}
+
+	/**
+	 * Returns the ScoreAggregator for this assessor.
+	 *
+	 * @returns {ScoreAggregator} The specific marker for this assessor.
+	 */
+	getScoreAggregator() {
+		return this._scoreAggregator;
 	}
 }
 

packages/yoastseo/src/scoring/assessors/collectionPages/cornerstone/seoAssessor.js

@@ -1,6 +1,7 @@
 import CollectionSEOAssessor from "../seoAssessor";
 import TextLengthAssessment from "../../../assessments/seo/TextLengthAssessment.js";
 import { createAnchorOpeningTag } from "../../../../helpers";
+import ValidOnlyResultsScoreAggregator from "../../../scoreAggregators/ValidOnlyResultsScoreAggregator";
 
 /**
  * The CollectionCornerstoneSEOAssessor class is used for the SEO analysis for cornerstone collections.
@@ -24,5 +25,7 @@ export default class CollectionCornerstoneSEOAssessor extends CollectionSEOAsses
 			cornerstoneContent: true,
 			customContentType: this.type,
 		} ) );
+
+		this._scoreAggregator = new ValidOnlyResultsScoreAggregator();
 	}
 }

packages/yoastseo/src/scoring/assessors/collectionPages/seoAssessor.js

@@ -11,6 +11,7 @@ import PageTitleWidthAssessment from "../../assessments/seo/PageTitleWidthAssess
 import SlugKeywordAssessment from "../../assessments/seo/UrlKeywordAssessment.js";
 import SingleH1Assessment from "../../assessments/seo/SingleH1Assessment.js";
 import { createAnchorOpeningTag } from "../../../helpers";
+import ValidOnlyResultsScoreAggregator from "../../scoreAggregators/ValidOnlyResultsScoreAggregator";
 
 /**
  * The CollectionSEOAssessor class is used for the SEO analysis for collections.
@@ -78,5 +79,7 @@ export default class CollectionSEOAssessor extends SEOAssessor {
 				urlCallToAction: createAnchorOpeningTag( "https://yoa.st/shopify55" ),
 			} ),
 		];
+
+		this._scoreAggregator = new ValidOnlyResultsScoreAggregator();
 	}
 }

packages/yoastseo/src/scoring/assessors/contentAssessor.js

@@ -8,6 +8,7 @@ import PassiveVoice from "../assessments/readability/PassiveVoiceAssessment.js";
 import SentenceBeginnings from "../assessments/readability/SentenceBeginningsAssessment.js";
 import TextPresence from "../assessments/readability/TextPresenceAssessment.js";
 import scoreToRating from "../interpreters/scoreToRating.js";
+import { ReadabilityScoreAggregator } from "../scoreAggregators";
 
 /**
  * The ContentAssessor class is used for the readability analysis.
@@ -31,6 +32,8 @@ export default class ContentAssessor extends Assessor {
 			new TextPresence(),
 			new SentenceBeginnings(),
 		];
+
+		this._scoreAggregator = new ReadabilityScoreAggregator();
 	}
 
 	/**

packages/yoastseo/src/scoring/assessors/relatedKeywordAssessor.js

@@ -6,6 +6,7 @@ import MetaDescriptionKeyword from "../assessments/seo/MetaDescriptionKeywordAss
 import TextCompetingLinks from "../assessments/seo/TextCompetingLinksAssessment.js";
 import FunctionWordsInKeyphrase from "../assessments/seo/FunctionWordsInKeyphraseAssessment";
 import ImageKeyphrase from "../assessments/seo/KeyphraseInImageTextAssessment";
+import ValidOnlyResultsScoreAggregator from "../scoreAggregators/ValidOnlyResultsScoreAggregator";
 
 /**
  * The relatedKeywordAssessor class is used for the related keyword analysis.
@@ -29,5 +30,7 @@ export default class RelatedKeywordAssessor extends Assessor {
 			new FunctionWordsInKeyphrase(),
 			new ImageKeyphrase(),
 		];
+
+		this._scoreAggregator = new ValidOnlyResultsScoreAggregator();
 	}
 }

packages/yoastseo/src/scoring/assessors/seoAssessor.js

@@ -16,6 +16,7 @@ import OutboundLinks from "../assessments/seo/OutboundLinksAssessment";
 import TitleWidth from "../assessments/seo/PageTitleWidthAssessment";
 import FunctionWordsInKeyphrase from "../assessments/seo/FunctionWordsInKeyphraseAssessment";
 import SingleH1Assessment from "../assessments/seo/SingleH1Assessment";
+import SEOScoreAggregator from "../scoreAggregators/SEOScoreAggregator";
 
 /**
  * The SEOAssessor class is used for the general SEO analysis.
@@ -53,5 +54,7 @@ export default class SEOAssessor extends Assessor {
 			new FunctionWordsInKeyphrase(),
 			new SingleH1Assessment(),
 		];
+
+		this._scoreAggregator = new SEOScoreAggregator();
 	}
 }

packages/yoastseo/src/scoring/assessors/taxonomyAssessor.js

@@ -11,6 +11,7 @@ import PageTitleWidthAssessment from "../assessments/seo/PageTitleWidthAssessmen
 import FunctionWordsInKeyphrase from "../assessments/seo/FunctionWordsInKeyphraseAssessment.js";
 import SingleH1Assessment from "../assessments/seo/SingleH1Assessment.js";
 import { createAnchorOpeningTag } from "../../helpers";
+import SEOScoreAggregator from "../scoreAggregators/SEOScoreAggregator";
 
 /**
  * Returns the text length assessment to use.
@@ -61,5 +62,7 @@ export default class TaxonomyAssessor extends Assessor {
 			new FunctionWordsInKeyphrase(),
 			new SingleH1Assessment(),
 		];
+
+		this._scoreAggregator = new SEOScoreAggregator();
 	}
 }