Move enum parsing to the types file

Author: shepmaster

ui/frontend/.eslintrc.js

@@ -96,6 +96,7 @@ module.exports = {
         'reducers/selection.ts',
         'reducers/versions.ts',
         'reducers/websocket.ts',
+        'types.ts',
         'websocketActions.ts',
         'websocketMiddleware.ts',
       ],

ui/frontend/.prettierignore

@@ -47,5 +47,6 @@ node_modules
 !reducers/selection.ts
 !reducers/versions.ts
 !reducers/websocket.ts
+!types.ts
 !websocketActions.ts
 !websocketMiddleware.ts

ui/frontend/actions.ts

@@ -14,6 +14,9 @@ import {
   PrimaryAction,
   PrimaryActionAuto,
   PrimaryActionCore,
+  parseChannel,
+  parseEdition,
+  parseMode,
 } from './types';
 
 import { performCommonExecute, wsExecuteRequest } from './reducers/output/execute';
@@ -125,45 +128,6 @@ export const performCompileToNightlyHir =
 export const performCompileToWasm =
   performAndSwitchPrimaryAction(performCompileToCdylibWasmOnly, PrimaryActionCore.Wasm);
 
-function parseChannel(s?: string): Channel | null {
-  switch (s) {
-    case 'stable':
-      return Channel.Stable;
-    case 'beta':
-      return Channel.Beta;
-    case 'nightly':
-      return Channel.Nightly;
-    default:
-      return null;
-  }
-}
-
-function parseMode(s?: string): Mode | null {
-  switch (s) {
-    case 'debug':
-      return Mode.Debug;
-    case 'release':
-      return Mode.Release;
-    default:
-      return null;
-  }
-}
-
-function parseEdition(s?: string): Edition | null {
-  switch (s) {
-    case '2015':
-      return Edition.Rust2015;
-    case '2018':
-      return Edition.Rust2018;
-    case '2021':
-      return Edition.Rust2021;
-    case '2024':
-      return Edition.Rust2024;
-    default:
-      return null;
-  }
-}
-
 export function indexPageLoad({
   code,
   gist,

ui/frontend/types.ts

@@ -7,8 +7,10 @@ export interface Position {
   column: number;
 }
 
-export const makePosition = (line: string | number, column: string | number): Position =>
-  ({ line: +line, column: +column });
+export const makePosition = (line: string | number, column: string | number): Position => ({
+  line: +line,
+  column: +column,
+});
 
 export interface Selection {
   start?: Position;
@@ -104,18 +106,39 @@ export enum Channel {
   Nightly = 'nightly',
 }
 
+const ChannelEnum = z.nativeEnum(Channel);
+
+export function parseChannel(s?: string): Channel | null {
+  const p = ChannelEnum.safeParse(s);
+  return p.success ? p.data : null;
+}
+
 export enum Mode {
   Debug = 'debug',
   Release = 'release',
 }
 
+const ModeEnum = z.nativeEnum(Mode);
+
+export function parseMode(s?: string): Mode | null {
+  const p = ModeEnum.safeParse(s);
+  return p.success ? p.data : null;
+}
+
 export enum Edition {
   Rust2015 = '2015',
   Rust2018 = '2018',
   Rust2021 = '2021',
   Rust2024 = '2024',
 }
 
+const EditionEnum = z.nativeEnum(Edition);
+
+export function parseEdition(s?: string): Edition | null {
+  const p = EditionEnum.safeParse(s);
+  return p.success ? p.data : null;
+}
+
 export enum Backtrace {
   Disabled = 'disabled',
   Enabled = 'enabled',