util: use util indices

Author: ChlodAlejandro

src/Deputy.ts

@@ -3,12 +3,8 @@ import DeputyStorage from './DeputyStorage';
 import DeputyCommunications from './DeputyCommunications';
 import DeputySession from './session/DeputySession';
 import DeputyCasePage from './wiki/DeputyCasePage';
-import normalizeTitle from './wiki/util/normalizeTitle';
 import DeputyDispatch from './api/DeputyDispatch';
-import sectionHeadingName from './wiki/util/sectionHeadingName';
 import ContributionSurveyRow from './models/ContributionSurveyRow';
-import getPageContent from './wiki/util/getPageContent';
-import cloneRegex from './util/cloneRegex';
 import { DeputyPreferences } from './DeputyPreferences';
 import performHacks from './wiki/util/performHacks';
 import DeputyCase from './wiki/DeputyCase';
@@ -26,7 +22,8 @@ import UserConfiguration from './config/UserConfiguration';
 import { attachConfigurationDialogPortletLink } from './ui/config/ConfigurationDialog';
 import WikiConfiguration from './config/WikiConfiguration';
 import Recents from './wiki/Recents';
-import msgEval from './wiki/util/msgEval';
+import util from './util';
+import wikiUtil from './wiki/util';
 
 /**
  * The main class for Deputy. Entry point for execution.
@@ -52,13 +49,8 @@ class Deputy {
 	readonly models = {
 		ContributionSurveyRow: ContributionSurveyRow
 	};
-	readonly util = {
-		cloneRegex: cloneRegex,
-		getPageContent: getPageContent,
-		normalizeTitle: normalizeTitle,
-		sectionHeadingName: sectionHeadingName,
-		msgEval: msgEval
-	};
+	readonly util = util;
+	readonly wikiUtil = wikiUtil;
 	readonly modules = {
 		CopiedTemplateEditor: CopiedTemplateEditor,
 		InfringementAssistant: InfringementAssistant

tests/unit/browser/UtilityUnitTests.ts

@@ -2,7 +2,7 @@ import '../../../src/types';
 import 'types-mediawiki';
 import BrowserHelper from '../../util/BrowserHelper';
 
-describe( 'Utility (on-browser) function tests', () => {
+describe( 'wikiUtility (on-browser) function tests', () => {
 
 	let page: BrowserHelper;
 
@@ -21,7 +21,7 @@ describe( 'Utility (on-browser) function tests', () => {
 			// Default test
 			expect(
 				page.evaluate( () => {
-					return { ...window.deputy.util.normalizeTitle() };
+					return { ...window.deputy.wikiUtil.normalizeTitle() };
 				} )
 			).resolves.toEqual( {
 				fragment: null, namespace: 4, title: 'Sandbox'
@@ -30,7 +30,7 @@ describe( 'Utility (on-browser) function tests', () => {
 			// String parse test (mainspace)
 			expect(
 				page.evaluate( () => {
-					return { ...window.deputy.util.normalizeTitle(
+					return { ...window.deputy.wikiUtil.normalizeTitle(
 						'Main Page'
 					) };
 				} )
@@ -41,7 +41,7 @@ describe( 'Utility (on-browser) function tests', () => {
 			// String parse test (project space)
 			expect(
 				page.evaluate( () => {
-					return { ...window.deputy.util.normalizeTitle(
+					return { ...window.deputy.wikiUtil.normalizeTitle(
 						'Wikipedia:Contributor copyright investigations'
 					) };
 				} )
@@ -52,7 +52,7 @@ describe( 'Utility (on-browser) function tests', () => {
 			// String parse test (subpage)
 			expect(
 				page.evaluate( () => {
-					return { ...window.deputy.util.normalizeTitle(
+					return { ...window.deputy.wikiUtil.normalizeTitle(
 						'Wikipedia:Contributor copyright investigations/Example'
 					) };
 				} )
@@ -63,7 +63,7 @@ describe( 'Utility (on-browser) function tests', () => {
 			// String parse test (fragment)
 			expect(
 				page.evaluate( () => {
-					return { ...window.deputy.util.normalizeTitle(
+					return { ...window.deputy.wikiUtil.normalizeTitle(
 						'Wikipedia:Contributor copyright investigations#Requests'
 					) };
 				} )
@@ -74,7 +74,7 @@ describe( 'Utility (on-browser) function tests', () => {
 			// mw.Title test
 			expect(
 				page.evaluate( () => {
-					return { ...window.deputy.util.normalizeTitle(
+					return { ...window.deputy.wikiUtil.normalizeTitle(
 						new mw.Title( 'Main Page' )
 					) };
 				} )