util: split getSectionElements from CasePage

Author: ChlodAlejandro

src/wiki/DeputyCasePage.ts

@@ -5,6 +5,7 @@ import DeputyCase from './DeputyCase';
 import sectionHeadingId from './util/sectionHeadingId';
 import isWikiHeading from './util/isWikiHeading';
 import getWikiHeadingLevel from './util/getWikiHeadingLevel';
+import getSectionElements from './util/getSectionElements';
 
 export type ContributionSurveyHeading = HTMLHeadingElement;
 
@@ -254,27 +255,12 @@ export default class DeputyCasePage extends DeputyCase {
 		sectionHeading = this.normalizeSectionHeading( sectionHeading );
 		const sectionHeadingLevel = getWikiHeadingLevel( sectionHeading );
 
-		const sectionMembers: Node[] = [];
-
-		let nextSibling = sectionHeading.nextSibling;
-		while (
-			// Not the end of rendered page content and
-			nextSibling != null &&
-			// Next node is not...
-			!(
-				// An element
-				nextSibling instanceof Element &&
-				// A heading (of any level)
-				isWikiHeading( nextSibling ) &&
-				// Higher than the current heading level
-				sectionHeadingLevel >= getWikiHeadingLevel( nextSibling )
-			)
-		) {
-			sectionMembers.push( nextSibling );
-			nextSibling = nextSibling.nextSibling as HTMLElement;
-		}
-
-		return sectionMembers;
+		return getSectionElements(
+			this.normalizeSectionHeading( sectionHeading ),
+			( el ) =>
+				isWikiHeading( el ) &&
+				sectionHeadingLevel >= getWikiHeadingLevel( el )
+		);
 	}
 
 	/**

src/wiki/util/getSectionElements.ts

@@ -0,0 +1,23 @@
+import isWikiHeading from './isWikiHeading';
+
+/**
+ * Finds section elements from a given section heading (and optionally a predicate)
+ *
+ * @param sectionHeading
+ * @param sectionHeadingPredicate
+ * @return Section headings.
+ */
+export default function getSectionElements(
+	sectionHeading: HTMLElement,
+	sectionHeadingPredicate: ( el: HTMLElement ) => boolean = isWikiHeading
+): HTMLElement[] {
+	const sectionMembers: HTMLElement[] = [];
+
+	let nextSibling = sectionHeading.nextElementSibling as HTMLElement;
+	while ( nextSibling != null && !sectionHeadingPredicate( nextSibling ) ) {
+		sectionMembers.push( nextSibling );
+		nextSibling = nextSibling.nextElementSibling as HTMLElement;
+	}
+
+	return sectionMembers;
+}

src/wiki/util/index.ts

@@ -4,10 +4,12 @@ import errorToOO from './errorToOO';
 import getApiErrorText from './getApiErrorText';
 import getNativeRange from './getNativeRange';
 import getPageContent from './getPageContent';
+import getPageExists from './getPageExists';
 import getPageTitle from './getPageTitle';
 import getRevisionContent from './getRevisionContent';
 import getRevisionDiffURL from './getRevisionDiffURL';
 import getRevisionURL from './getRevisionURL';
+import getSectionElements from './getSectionElements';
 import getSectionHTML from './getSectionHTML';
 import getSectionId from './getSectionId';
 import getWikiHeadingLevel from './getWikiHeadingLevel';
@@ -33,10 +35,12 @@ export default {
 	getApiErrorText: getApiErrorText,
 	getNativeRange: getNativeRange,
 	getPageContent: getPageContent,
+	getPageExists: getPageExists,
 	getPageTitle: getPageTitle,
 	getRevisionContent: getRevisionContent,
 	getRevisionDiffURL: getRevisionDiffURL,
 	getRevisionURL: getRevisionURL,
+	getSectionElements: getSectionElements,
 	getSectionHTML: getSectionHTML,
 	getSectionId: getSectionId,
 	getWikiHeadingLevel: getWikiHeadingLevel,

src/wiki/util/normalizeTitle.ts

@@ -5,7 +5,7 @@ export type TitleLike = string | mw.Title | { namespace: number, title: string }
  * the current page.
  *
  * @param title The title to normalize. Default is current page.
- * @return {mw.Title} A mw.Title object.
+ * @return {mw.Title} A mw.Title object. `null` if not a valid title.
  * @private
  */
 export default function normalizeTitle( title?: TitleLike ): mw.Title {