move mediawiki utils to wiki/util

src/Deputy.ts

@@ -3,14 +3,14 @@ import DeputyStorage from './DeputyStorage';
 import DeputyCommunications from './DeputyCommunications';
 import DeputySession from './session/DeputySession';
 import DeputyCasePage from './wiki/DeputyCasePage';
-import normalizeTitle from './util/normalizeTitle';
+import normalizeTitle from './wiki/util/normalizeTitle';
 import DeputyAPI from './api/DeputyAPI';
-import sectionHeadingName from './util/sectionHeadingName';
+import sectionHeadingName from './wiki/util/sectionHeadingName';
 import ContributionSurveyRow from './models/ContributionSurveyRow';
-import getPageContent from './util/getPageContent';
+import getPageContent from './wiki/util/getPageContent';
 import cloneRegex from './util/cloneRegex';
 import { DeputyPreferences } from './DeputyPreferences';
-import performHacks from './util/performHacks';
+import performHacks from './wiki/util/performHacks';
 import DeputyCase from './wiki/DeputyCase';
 import unwrapWidget from './util/unwrapWidget';
 import CopiedTemplateEditor from './modules/ante/CopiedTemplateEditor';

src/DeputyResources.ts

@@ -1,4 +1,4 @@
-import getPageContent from './util/getPageContent';
+import getPageContent from './wiki/util/getPageContent';
 
 interface WikiResourceRoot {
 	type: 'wiki';

src/modules/ante/models/TemplateFactory.ts

@@ -2,7 +2,7 @@ import CopiedTemplate from './templates/CopiedTemplate';
 import { CTEParsoidTransclusionTemplateNode } from './CTEParsoidTransclusionTemplateNode';
 import CTEParsoidDocument from './CTEParsoidDocument';
 import WikiAttributionNotices, { SupportedAttributionNoticeType } from './WikiAttributionNotices';
-import nsId from '../../../util/nsId';
+import nsId from '../../../wiki/util/nsId';
 import SplitArticleTemplate from './templates/SplitArticleTemplate';
 import MergedFromTemplate from './templates/MergedFromTemplate';
 import MergedToTemplate from './templates/MergedToTemplate';

src/modules/ante/models/WikiAttributionNotices.ts

@@ -1,6 +1,6 @@
-import nsId from '../../../util/nsId';
+import nsId from '../../../wiki/util/nsId';
 import getObjectValues from '../../../util/getObjectValues';
-import toRedirectsObject from '../../../util/toRedirectsObject';
+import toRedirectsObject from '../../../wiki/util/toRedirectsObject';
 import CopiedTemplate from './templates/CopiedTemplate';
 import MwApi from '../../../MwApi';
 import SplitArticleTemplate from './templates/SplitArticleTemplate';

src/modules/ante/ui/CopiedTemplateEditorDialog.tsx

@@ -1,10 +1,10 @@
 import '../../../types';
 import CopiedTemplatesEmptyPage from './pages/AttributionNoticesEmptyPage';
 import CTEParsoidDocument from '../models/CTEParsoidDocument';
-import errorToOO from '../../../util/errorToOO';
+import errorToOO from '../../../wiki/util/errorToOO';
 import { blockExit, unblockExit } from '../../../util/blockExit';
 import unwrapWidget from '../../../util/unwrapWidget';
-import decorateEditSummary from '../../../util/decorateEditSummary';
+import decorateEditSummary from '../../../wiki/util/decorateEditSummary';
 import { OOUIBookletLayout } from '../../../types';
 import type CopiedTemplateEditor from '../CopiedTemplateEditor';
 import getObjectValues from '../../../util/getObjectValues';

src/modules/ante/ui/pages/CopiedTemplateRowPage.tsx

@@ -10,7 +10,7 @@ import getObjectValues from '../../../../util/getObjectValues';
 import CopiedTemplateEditorDialog from '../CopiedTemplateEditorDialog';
 import { AttributionNoticePageLayout } from './AttributionNoticePageLayout';
 import yesNo from '../../../../util/yesNo';
-import normalizeTitle from '../../../../util/normalizeTitle';
+import normalizeTitle from '../../../../wiki/util/normalizeTitle';
 import equalTitle from '../../../../util/equalTitle';
 
 export interface CopiedTemplateRowPageData {

src/modules/ante/ui/pages/MergedFromTemplatePage.tsx

@@ -8,7 +8,7 @@ import { h } from 'tsx-dom';
 import unwrapWidget from '../../../../util/unwrapWidget';
 import { renderPreviewPanel } from '../RowPageShared';
 import getObjectValues from '../../../../util/getObjectValues';
-import nsId from '../../../../util/nsId';
+import nsId from '../../../../wiki/util/nsId';
 import yesNo from '../../../../util/yesNo';
 
 export interface MergedFromTemplatePageData {

src/modules/ia/models/CopyrightProblemsListing.ts

@@ -1,6 +1,6 @@
 import CopyrightProblemsPage from './CopyrightProblemsPage';
 import cloneRegex from '../../../util/cloneRegex';
-import normalizeTitle from '../../../util/normalizeTitle';
+import normalizeTitle from '../../../wiki/util/normalizeTitle';
 
 interface FullCopyrightProblemsListingData {
 	basic: false;

src/modules/ia/models/CopyrightProblemsPage.ts

@@ -1,5 +1,5 @@
-import normalizeTitle from '../../../util/normalizeTitle';
-import getPageContent from '../../../util/getPageContent';
+import normalizeTitle from '../../../wiki/util/normalizeTitle';
+import getPageContent from '../../../wiki/util/getPageContent';
 
 /**
  * A class that represents a `Wikipedia:Copyright problems` page, a page that lists

src/session/DeputyRootSession.ts

@@ -5,7 +5,7 @@ import removeElement from '../util/removeElement';
 import unwrapWidget from '../util/unwrapWidget';
 import swapElements from '../util/swapElements';
 import DeputyCCISessionTabActiveMessage from '../ui/root/DeputyCCISessionTabActiveMessage';
-import sectionHeadingName from '../util/sectionHeadingName';
+import sectionHeadingName from '../wiki/util/sectionHeadingName';
 import {
 	DeputyMessageEvent,
 	DeputySessionRequestMessage,

src/ui/page/DeputyPageToolbar.tsx

@@ -12,7 +12,7 @@ import {
 import generateId from '../../util/generateId';
 import DiffPage from '../../wiki/DiffPage';
 import swapElements from '../../util/swapElements';
-import normalizeTitle from '../../util/normalizeTitle';
+import normalizeTitle from '../../wiki/util/normalizeTitle';
 import EarwigCopyvioDetector from '../../wiki/EarwigCopyvioDetector';
 import DeputyPageMenu, { DeputyPageMenuOption } from './DeputyPageMenu';
 import deputyPageAnalysisOptions from './DeputyPageAnalysisOptions';

src/ui/root/DeputyCCISessionStartLink.tsx

@@ -1,6 +1,6 @@
 import { h } from 'tsx-dom';
 import DeputyCasePage, { ContributionSurveyHeading } from '../../wiki/DeputyCasePage';
-import sectionHeadingName from '../../util/sectionHeadingName';
+import sectionHeadingName from '../../wiki/util/sectionHeadingName';
 
 /**
  * The CCI session start link. Starts a CCI session when pressed.

src/ui/root/DeputyContributionSurveyRevision.tsx

@@ -1,11 +1,11 @@
 import { DeputyUIElement } from '../DeputyUIElement';
 import { ContributionSurveyRevision } from '../../models/ContributionSurveyRevision';
 import { h } from 'tsx-dom';
-import getRevisionDiffURL from '../../util/getRevisionDiffURL';
+import getRevisionDiffURL from '../../wiki/util/getRevisionDiffURL';
 import unwrapWidget from '../../util/unwrapWidget';
 import { DeputyMessageEvent, DeputyRevisionStatusUpdateMessage } from '../../DeputyCommunications';
 import type DeputyContributionSurveyRow from './DeputyContributionSurveyRow';
-import nsId from '../../util/nsId';
+import nsId from '../../wiki/util/nsId';
 
 /**
  * A specific revision for a section row.

src/ui/root/DeputyContributionSurveySection.tsx

@@ -7,11 +7,11 @@ import ContributionSurveyRow from '../../models/ContributionSurveyRow';
 import ContributionSurveySection from '../../models/ContributionSurveySection';
 import DeputyReviewDialog from './DeputyReviewDialog';
 import swapElements from '../../util/swapElements';
-import sectionHeadingName from '../../util/sectionHeadingName';
-import getSectionId from '../../util/getSectionId';
-import getSectionHTML from '../../util/getSectionHTML';
+import sectionHeadingName from '../../wiki/util/sectionHeadingName';
+import getSectionId from '../../wiki/util/getSectionId';
+import getSectionHTML from '../../wiki/util/getSectionHTML';
 import removeElement from '../../util/removeElement';
-import decorateEditSummary from '../../util/decorateEditSummary';
+import decorateEditSummary from '../../wiki/util/decorateEditSummary';
 import MwApi from '../../MwApi';
 
 /**

src/ui/root/DeputyFinishedContributionSurveyRow.tsx

@@ -1,8 +1,8 @@
 import { h } from 'tsx-dom';
 import '../../types';
 import ContributionSurveyRow from '../../models/ContributionSurveyRow';
-import guessAuthor from '../../util/guessAuthor';
-import nsId from '../../util/nsId';
+import guessAuthor from '../../wiki/util/guessAuthor';
+import nsId from '../../wiki/util/nsId';
 
 /**
  * Displayed when a ContributionSurveyRow has no remaining diffs. Deputy is not able

src/util/equalTitle.ts

@@ -1,4 +1,4 @@
-import normalizeTitle from './normalizeTitle';
+import normalizeTitle from '../wiki/util/normalizeTitle';
 
 /**
  * Checks if two MediaWiki page titles are equal.

src/wiki/DeputyCase.ts

@@ -1,5 +1,5 @@
-import getPageTitle from '../util/getPageTitle';
-import normalizeTitle from '../util/normalizeTitle';
+import getPageTitle from './util/getPageTitle';
+import normalizeTitle from './util/normalizeTitle';
 
 /**
  * Base class for Deputy cases. Extended into {@link DeputyCasePage} to refer to an

src/wiki/DeputyCasePage.ts

@@ -1,6 +1,6 @@
 import DeputyCasePageWikitext from './DeputyCasePageWikitext';
-import sectionHeadingName from '../util/sectionHeadingName';
-import getPageTitle from '../util/getPageTitle';
+import sectionHeadingName from './util/sectionHeadingName';
+import getPageTitle from './util/getPageTitle';
 import DeputyCase from './DeputyCase';
 
 export type ContributionSurveyHeading = HTMLHeadingElement;

src/wiki/DeputyCasePageWikitext.ts

@@ -1,5 +1,5 @@
 import DeputyCasePage from './DeputyCasePage';
-import getPageContent from '../util/getPageContent';
+import getPageContent from './util/getPageContent';
 
 /**
  * Used by DeputyCasePage to access the page's raw wikitext, make changes,

src/wiki/DiffPage.ts

@@ -1,4 +1,4 @@
-import getRevisionDiffURL from '../util/getRevisionDiffURL';
+import getRevisionDiffURL from './util/getRevisionDiffURL';
 import FakeDocument from '../models/FakeDocument';
 import swapElements from '../util/swapElements';
 

src/wiki/TalkPage.ts

@@ -1,6 +1,6 @@
-import normalizeTitle from '../util/normalizeTitle';
-import decorateEditSummary from '../util/decorateEditSummary';
-import nsId from '../util/nsId';
+import normalizeTitle from './util/normalizeTitle';
+import decorateEditSummary from './util/decorateEditSummary';
+import nsId from './util/nsId';
 import MwApi from '../MwApi';
 
 /**

src/util/decorateEditSummary.ts → src/wiki/util/decorateEditSummary.ts

@@ -1,4 +1,4 @@
-import deputyVersion from '../DeputyVersion';
+import deputyVersion from '../../DeputyVersion';
 
 /**
  * Appends extra information to an edit summary (also known as the "advert").

src/util/errorToOO.ts → src/wiki/util/errorToOO.ts

@@ -1,4 +1,4 @@
-import '../types';
+import '../../types';
 
 /**
  * Converts a normal error into an OO.ui.Error for ProcessDialogs.

src/util/getPageContent.ts → src/wiki/util/getPageContent.ts

@@ -1,5 +1,5 @@
 import normalizeTitle from './normalizeTitle';
-import MwApi from '../MwApi';
+import MwApi from '../../MwApi';
 
 /**
  * Get the content of a page on-wiki.

src/util/getPageTitle.ts → src/wiki/util/getPageTitle.ts

@@ -1,5 +1,5 @@
 import normalizeTitle from './normalizeTitle';
-import MwApi from '../MwApi';
+import MwApi from '../../MwApi';
 
 /**
  * Gets the page title of a given page ID.

src/util/getRevisionContent.ts → src/wiki/util/getRevisionContent.ts

@@ -1,4 +1,4 @@
-import MwApi from '../MwApi';
+import MwApi from '../../MwApi';
 
 /**
  * Get the content of a revision on-wiki.

src/util/getSectionHTML.ts → src/wiki/util/getSectionHTML.ts

@@ -1,6 +1,6 @@
 import normalizeTitle from './normalizeTitle';
 import getSectionId from './getSectionId';
-import MwApi from '../MwApi';
+import MwApi from '../../MwApi';
 
 /**
  * Get the parser output HTML of a specific page section.

src/util/getSectionId.ts → src/wiki/util/getSectionId.ts

@@ -1,5 +1,5 @@
 import normalizeTitle from './normalizeTitle';
-import MwApi from '../MwApi';
+import MwApi from '../../MwApi';
 
 /**
  * Get the ID of a section from its heading.