Split config

scripts/lib/buildExpressionContainers.ts

@@ -1,10 +1,14 @@
 import { ExpressionRunnerConfig } from 'scripts/lib/buildExpressionRunnerConfigFromShorthand'
 import { isContainerWithState } from 'src/lib/expressionContainerGuards'
 import stepExpressionContainer from 'src/lib/stepExpressionContainer'
-import { ExpressionContainer } from 'src/types/ExpressionContainerTypes'
+import {
+  ExpressionContainer,
+  SteppedExpressionContainer
+} from 'src/types/ExpressionContainerTypes'
+import * as lessonExpressions from 'src/lib/lessonExpressions'
 
 const buildExpressionContainers = ({
-  expressionContainer,
+  lessonExpressionsKey,
   initializeInstructions,
   showAllShowSteps,
   skipAlphaConvert,
@@ -14,7 +18,8 @@ const buildExpressionContainers = ({
   lastAllowedExpressionStateAfterIterations,
   hidePlayButton
 }: ExpressionRunnerConfig): readonly ExpressionContainer[] => {
-  let currentExpressionContainer = expressionContainer
+  let currentExpressionContainer: SteppedExpressionContainer =
+    lessonExpressions[lessonExpressionsKey]
   let results: ExpressionContainer[] = []
   const stepOptions = { showAllShowSteps, skipAlphaConvert }
 
@@ -92,13 +97,15 @@ const buildExpressionContainers = ({
     if (
       lastAllowedExpressionState &&
       lastAllowedExpressionState ===
-        expressionContainer.previouslyChangedExpressionState &&
+        currentExpressionContainer.previouslyChangedExpressionState &&
       (lastAllowedExpressionStateAfterIterations || 0) <= becameDefaultCount
     ) {
       break
     }
 
-    if (expressionContainer.previouslyChangedExpressionState === 'default') {
+    if (
+      currentExpressionContainer.previouslyChangedExpressionState === 'default'
+    ) {
       becameDefaultCount += 1
     }
   }

scripts/lib/buildExpressionRunnerConfigFromShorthand.ts

@@ -6,20 +6,18 @@ import {
   isExpressionRunnerSimpleConfig,
   isExpressionRunnerPlayButtonOnlyConfig
 } from 'scripts/lib/expressionRunnerShorthandConfig'
-import {
-  SteppedExpressionContainer,
-  ExpressionContainer
-} from 'src/types/ExpressionContainerTypes'
+import { ExpressionContainer } from 'src/types/ExpressionContainerTypes'
 import { allMaxWidths } from 'src/lib/theme/maxWidths'
 import {
   InitializeInstruction,
   ExpressionRunnerContextProps,
   expressionRunnerContextDefault
 } from 'src/types/ExpressionRunnerTypes'
 import { HProps } from 'src/types/HTypes'
+import * as lessonExpressions from 'src/lib/lessonExpressions'
 
 export interface ExpressionRunnerConfig {
-  expressionContainer: SteppedExpressionContainer
+  lessonExpressionsKey: keyof typeof lessonExpressions
   hidePriorities: ExpressionRunnerContextProps['hidePriorities']
   hideBottomRightBadges: ExpressionRunnerContextProps['hideBottomRightBadges']
   hideControls: boolean
@@ -131,13 +129,13 @@ function mergeWithDefault<
   return result as A & B
 }
 
-const convertConfig = (
+const buildExpressionRunnerConfigFromShorthand = (
   config: ExpressionRunnerShorthandConfig
 ): ExpressionRunnerConfig => {
   let runnerProps
   if (isExpressionRunnerSimpleConfig(config)) {
     const {
-      expressionContainer,
+      lessonExpressionsKey,
       initialState,
       isDone,
       skipAlphaConvert,
@@ -163,7 +161,7 @@ const convertConfig = (
     >(config, expressionRunnerSimpleConfigDefault)
 
     runnerProps = {
-      expressionContainer,
+      lessonExpressionsKey,
       hideControls: true,
       hidePriorities: !showPriorities,
       explanationsVisibility,
@@ -189,7 +187,7 @@ const convertConfig = (
     }
   } else if (isExpressionRunnerPlayButtonOnlyConfig(config)) {
     const {
-      expressionContainer,
+      lessonExpressionsKey,
       initialState,
       skipToTheEnd,
       hideFuncUnboundBadgeOnExplanation,
@@ -215,7 +213,7 @@ const convertConfig = (
     runnerProps = {
       speed,
       highlightNumber,
-      expressionContainer,
+      lessonExpressionsKey,
       hidePriorities: !showPriorities,
       highlightOverrides,
       showAllShowSteps,
@@ -237,7 +235,7 @@ const convertConfig = (
     }
   } else {
     const {
-      expressionContainer,
+      lessonExpressionsKey,
       initialState,
       finalState,
       hideFuncUnboundBadgeOnExplanation,
@@ -256,7 +254,7 @@ const convertConfig = (
     runnerProps = {
       variableSize,
       containerSize,
-      expressionContainer,
+      lessonExpressionsKey,
       hidePriorities: !showPriorities,
       hideFuncUnboundBadgeOnExplanation,
       hidePlayButton: true,
@@ -278,14 +276,4 @@ const convertConfig = (
   )
 }
 
-const buildExpressionRunnerConfigFromShorthand = (
-  shorthand: Record<string, ExpressionRunnerShorthandConfig>
-): Record<string, ExpressionRunnerConfig> => {
-  return Object.entries(shorthand)
-    .map(([key, config]) => ({
-      [key]: convertConfig(config)
-    }))
-    .reduce((acc, current) => ({ ...acc, ...current }), {})
-}
-
 export default buildExpressionRunnerConfigFromShorthand