Rename lesson expressions

scripts/lib/buildExpressionContainers.ts

@@ -5,11 +5,10 @@ import {
   ExpressionContainer,
   SteppedExpressionContainer
 } from 'src/types/ExpressionContainerTypes'
-import * as lessonExpressions from 'scripts/lib/lessonExpressions'
 
 const buildExpressionContainers = ({
-  lessonExpressionsKey,
-  predefinedExpressionsKeys,
+  initialExpressionContainer,
+  initialExpressionContainers,
   initializeInstructions,
   showAllShowSteps,
   skipAlphaConvert,
@@ -19,9 +18,8 @@ const buildExpressionContainers = ({
   lastAllowedExpressionStateAfterIterations,
   hidePlayButton
 }: ExpressionRunnerConfig): readonly ExpressionContainer[] => {
-  if (lessonExpressionsKey) {
-    let currentExpressionContainer: SteppedExpressionContainer =
-      lessonExpressions[lessonExpressionsKey]
+  if (initialExpressionContainer) {
+    let currentExpressionContainer: SteppedExpressionContainer = initialExpressionContainer
     let results: ExpressionContainer[] = []
     const stepOptions = { showAllShowSteps, skipAlphaConvert }
 
@@ -114,8 +112,8 @@ const buildExpressionContainers = ({
     }
 
     return results
-  } else if (predefinedExpressionsKeys) {
-    return predefinedExpressionsKeys.map(key => lessonExpressions[key])
+  } else if (initialExpressionContainers) {
+    return initialExpressionContainers
   } else {
     throw new Error()
   }

scripts/lib/buildExpressionRunnerConfigFromShorthand.ts

@@ -16,11 +16,11 @@ import {
   expressionRunnerContextDefault
 } from 'src/types/ExpressionRunnerTypes'
 import { HProps } from 'src/types/HTypes'
-import * as lessonExpressions from 'scripts/lib/lessonExpressions'
+import { SteppedExpressionContainer } from 'src/types/ExpressionContainerTypes'
 
 export interface ExpressionRunnerConfig {
-  lessonExpressionsKey?: keyof typeof lessonExpressions
-  predefinedExpressionsKeys?: readonly (keyof typeof lessonExpressions)[]
+  initialExpressionContainer?: SteppedExpressionContainer
+  initialExpressionContainers?: SteppedExpressionContainer[]
   hidePriorities: ExpressionRunnerContextProps['hidePriorities']
   hideBottomRightBadges: ExpressionRunnerContextProps['hideBottomRightBadges']
   hideControls: boolean
@@ -138,7 +138,7 @@ const buildExpressionRunnerConfigFromShorthand = (
   let runnerProps
   if (isExpressionRunnerSimpleConfig(config)) {
     const {
-      lessonExpressionsKey,
+      initialExpressionContainer,
       initialState,
       isDone,
       skipAlphaConvert,
@@ -164,7 +164,7 @@ const buildExpressionRunnerConfigFromShorthand = (
     >(config, expressionRunnerSimpleConfigDefault)
 
     runnerProps = {
-      lessonExpressionsKey,
+      initialExpressionContainer,
       hideControls: true,
       hidePriorities: !showPriorities,
       explanationsVisibility,
@@ -190,7 +190,7 @@ const buildExpressionRunnerConfigFromShorthand = (
     }
   } else if (isExpressionRunnerPlayButtonOnlyConfig(config)) {
     const {
-      lessonExpressionsKey,
+      initialExpressionContainer,
       initialState,
       skipToTheEnd,
       hideFuncUnboundBadgeOnExplanation,
@@ -216,7 +216,7 @@ const buildExpressionRunnerConfigFromShorthand = (
     runnerProps = {
       speed,
       highlightNumber,
-      lessonExpressionsKey,
+      initialExpressionContainer,
       hidePriorities: !showPriorities,
       highlightOverrides,
       showAllShowSteps,
@@ -238,7 +238,7 @@ const buildExpressionRunnerConfigFromShorthand = (
     }
   } else if (isExpressionRunnerSingleStepConfig(config)) {
     const {
-      lessonExpressionsKey,
+      initialExpressionContainer,
       initialState,
       finalState,
       hideFuncUnboundBadgeOnExplanation,
@@ -257,7 +257,7 @@ const buildExpressionRunnerConfigFromShorthand = (
     runnerProps = {
       variableSize,
       containerSize,
-      lessonExpressionsKey,
+      initialExpressionContainer,
       hidePriorities: !showPriorities,
       hideFuncUnboundBadgeOnExplanation,
       hidePlayButton: true,
@@ -273,7 +273,7 @@ const buildExpressionRunnerConfigFromShorthand = (
     }
   } else {
     const {
-      predefinedExpressionsKeys,
+      initialExpressionContainers,
       hideFuncUnboundBadgeOnExplanation,
       showPriorities,
       explanationsVisibility,
@@ -288,7 +288,7 @@ const buildExpressionRunnerConfigFromShorthand = (
     >(config, expressionRunnerPredefinedConfigDefault)
 
     runnerProps = {
-      predefinedExpressionsKeys,
+      initialExpressionContainers,
       variableSize,
       containerSize,
       hidePriorities: !showPriorities,

scripts/lib/expressionRunnerShorthandConfig.ts

@@ -1,7 +1,7 @@
-import * as lessonExpressions from 'scripts/lib/lessonExpressions'
 import { ExpressionContainer } from 'src/types/ExpressionContainerTypes'
 import { ExpressionRunnerProps } from 'src/types/ExpressionRunnerTypes'
 import { HProps } from 'src/types/HTypes'
+import { SteppedExpressionContainer } from 'src/types/ExpressionContainerTypes'
 
 export const expressionRunnerSimpleConfigDefault = {
   isDone: false,
@@ -14,7 +14,7 @@ export const expressionRunnerSimpleConfigDefault = {
 
 interface ExpressionRunnerSimpleConfig {
   runner: 'simple'
-  lessonExpressionsKey: keyof typeof lessonExpressions
+  initialExpressionContainer: SteppedExpressionContainer
   initialState?: ExpressionContainer['previouslyChangedExpressionState']
   isDone?: boolean
   skipAlphaConvert?: boolean
@@ -61,7 +61,7 @@ export function isExpressionRunnerPlayButtonOnlyConfig(
 
 interface ExpressionRunnerPlayButtonOnlyConfig {
   runner: 'playButtonOnly'
-  lessonExpressionsKey: keyof typeof lessonExpressions
+  initialExpressionContainer: SteppedExpressionContainer
   initialState?: ExpressionContainer['previouslyChangedExpressionState']
   skipToTheEnd?: boolean
   hideFuncUnboundBadgeOnExplanation?: boolean
@@ -96,7 +96,7 @@ export function isExpressionRunnerSingleStepConfig(
 
 interface ExpressionRunnerSingleStepConfig {
   runner: 'singleStep'
-  lessonExpressionsKey: keyof typeof lessonExpressions
+  initialExpressionContainer: SteppedExpressionContainer
   initialState: ExpressionContainer['previouslyChangedExpressionState']
   finalState: ExpressionContainer['previouslyChangedExpressionState']
   hideFuncUnboundBadgeOnExplanation?: boolean
@@ -125,7 +125,7 @@ export const expressionRunnerPredefinedConfigDefault = {
 
 interface ExpressionRunnerPredefinedConfig {
   runner: 'predefined'
-  predefinedExpressionsKeys: readonly (keyof typeof lessonExpressions)[]
+  initialExpressionContainers: SteppedExpressionContainer[]
   hideFuncUnboundBadgeOnExplanation?: boolean
   showPriorities?: boolean
   nextIteration?: boolean