Import Input/Output without passing through gc and drop gc.mode

gc.mode needs to be dropped to avoid recursion, but in any case,
it seems more sensible to just calculate it based on the currently
set modeName, rather than passing it around.

Author: reosarevok

root/static/scripts/edit/components/GuessCaseOptions.js

@@ -14,11 +14,12 @@ import bracketed from '../../common/utility/bracketed';
 import getBooleanCookie from '../../common/utility/getBooleanCookie';
 import setCookie from '../../common/utility/setCookie';
 import * as modes from '../../guess-case/modes';
+import type {GuessCaseModeNameT} from '../../guess-case/types';
 import gc from '../../guess-case/MB/GuessCase/Main';
 
 /* eslint-disable flowtype/sort-keys */
 export type ActionT =
-  | {+type: 'set-mode', +mode: string}
+  | {+type: 'set-mode', +modeName: GuessCaseModeNameT}
   | {+type: 'set-keep-upper-case', +enabled: boolean}
   | {+type: 'set-upper-case-roman', +enabled: boolean};
 /* eslint-enable flowtype/sort-keys */
@@ -27,7 +28,7 @@ export type DispatchT = (ActionT) => void;
 
 export type StateT = {
   +keepUpperCase: boolean,
-  +mode: string,
+  +modeName: GuessCaseModeNameT,
   +upperCaseRoman: boolean,
 };
 
@@ -43,7 +44,7 @@ export type PropsT = $ReadOnly<{
 export function createInitialState(): StateT {
   return {
     keepUpperCase: gc.CFG_KEEP_UPPERCASED,
-    mode: gc.modeName,
+    modeName: gc.modeName,
     upperCaseRoman: getBooleanCookie('guesscase_roman'),
   };
 }
@@ -54,12 +55,10 @@ export function runReducer(
 ): void {
   switch (action.type) {
     case 'set-mode': {
-      const modeName = action.mode;
+      const modeName = action.modeName;
       gc.modeName = modeName;
-      const mode = modes[modeName];
-      gc.mode = mode;
       setCookie('guesscase_mode', modeName);
-      state.mode = modeName;
+      state.modeName = modeName;
       break;
     }
     case 'set-keep-upper-case': {
@@ -81,14 +80,14 @@ export function runReducer(
 const GuessCaseOptions = ({
   dispatch,
   keepUpperCase,
-  mode: modeName,
+  modeName,
   upperCaseRoman,
 }: PropsT): React.Element<'div'> => {
   function handleModeChange(event) {
     const newModeName = event.target.value;
 
     if (newModeName !== gc.modeName) {
-      dispatch({mode: newModeName, type: 'set-mode'});
+      dispatch({modeName: newModeName, type: 'set-mode'});
     }
   }
 
@@ -122,7 +121,7 @@ const GuessCaseOptions = ({
         </a>,
       )}
       <p>
-        {expand2react(gc.mode?.description ?? '')}
+        {expand2react(modes[modeName].description ?? '')}
       </p>
       <label>
         <input

root/static/scripts/edit/components/GuessCaseOptionsPopover.js

@@ -30,7 +30,7 @@ const GuessCaseOptionsPopover = (React.memo(({
   dispatch,
   isOpen,
   keepUpperCase,
-  mode,
+  modeName,
   toggle,
   upperCaseRoman,
 }: Props): React.Element<typeof ButtonPopover> => {
@@ -48,7 +48,7 @@ const GuessCaseOptionsPopover = (React.memo(({
       <GuessCaseOptions
         dispatch={dispatch}
         keepUpperCase={keepUpperCase}
-        mode={mode}
+        modeName={modeName}
         upperCaseRoman={upperCaseRoman}
       />
       <div
@@ -72,7 +72,7 @@ const GuessCaseOptionsPopover = (React.memo(({
   ), [
     dispatch,
     keepUpperCase,
-    mode,
+    modeName,
     upperCaseRoman,
   ]);
 

root/static/scripts/guess-case/MB/Control/GuessCase.js

@@ -75,10 +75,9 @@ var mode = ko.computed({
 
     if (modeName !== gc.modeName) {
       gc.modeName = modeName;
-      gc.mode = modes[modeName];
       setCookie('guesscase_mode', modeName);
     }
-    return gc.mode;
+    return modes[modeName];
   },
   deferEvaluation: true,
 });

root/static/scripts/guess-case/MB/GuessCase/Handler/Area.js

@@ -8,6 +8,7 @@
 
 import MB from '../../../../common/MB';
 import * as flags from '../../../flags';
+import * as modes from '../../../modes';
 import * as utils from '../../../utils';
 
 MB.GuessCase = (MB.GuessCase) ? MB.GuessCase : {};
@@ -33,7 +34,7 @@ MB.GuessCase.Handler.Area = function (gc) {
     (
       self.doIgnoreWords() ||
       self.doFeaturingArtistStyle() ||
-      gc.mode.doWord() ||
+      modes[gc.modeName].doWord() ||
       self.doNormalWord()
     );
     flags.context.number = false;

root/static/scripts/guess-case/MB/GuessCase/Handler/Artist.js

@@ -10,6 +10,8 @@
 import MB from '../../../../common/MB';
 import * as flags from '../../../flags';
 import * as utils from '../../../utils';
+import input from '../Input';
+import output from '../Output';
 
 MB.GuessCase = (MB.GuessCase) ? MB.GuessCase : {};
 MB.GuessCase.Handler = (MB.GuessCase.Handler) ? MB.GuessCase.Handler : {};
@@ -61,9 +63,9 @@ MB.GuessCase.Handler.Artist = function (gc) {
    * in the common word handlers.
    */
   self.doWord = function () {
-    gc.output.appendSpaceIfNeeded();
-    gc.input.capitalizeCurrentWord();
-    gc.output.appendCurrentWord();
+    output.appendSpaceIfNeeded();
+    input.capitalizeCurrentWord();
+    output.appendCurrentWord();
 
     flags.resetContext();
     flags.context.number = false;