WIP: Revise 7

bin/clean_runners

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# TODO: Must manually remove from scripts/lib/runnerConfigs.ts
+for f in src/lib/runners/*.json
+do
+  RUNNER="$(cut -d'/' -f4 <<<$f)"
+  RUNNER="$(cut -d'.' -f1 <<<$RUNNER)"
+  if ! [[ $(rg -i "<R.${RUNNER}" src/contents) ]]; then
+    echo "Removing $RUNNER"
+    remove_runner $RUNNER
+  fi
+done

bin/remove_runner

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+find src/components/Runners/ -iname "$1.tsx" -exec rm {} \;
+rm -f src/lib/runners/$1.json
+sed -i "/$1/Id" src/components/Runners/index.ts

bin/unused_containers

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+rg -N -o "export const \w+" scripts/lib/initialExpressionContainers.ts | while read line ; do
+  CONTAINER="$(cut -d' ' -f3 <<<$line)"
+  if ! [[ $(rg -i "initialExpressionContainers.${CONTAINER}" scripts/lib/runnerConfigs.ts) ]]; then
+    echo "${CONTAINER}"
+  fi
+done

next.config.js

@@ -9,13 +9,6 @@ const config = {
       scripts: path.resolve(__dirname, 'scripts')
     })
 
-    config.module.rules.push({
-      test: /\.url.svg$/,
-      use: {
-        loader: 'url-loader'
-      }
-    })
-
     return config
   },
   env: {

package.json

@@ -22,8 +22,8 @@
     "scripts": "outDir/tsconfig.scripts.json/scripts"
   },
   "scripts": {
-    "jp": "IS_DEVELOPMENT=true DEV_LOCALE=jp next -p 9991",
-    "en": "IS_DEVELOPMENT=true DEV_LOCALE=en next -p 9990",
+    "jp": "IS_DEVELOPMENT=true DEV_LOCALE=jp NODE_OPTIONS=--max_old_space_size=4096 next -p 9991",
+    "en": "IS_DEVELOPMENT=true DEV_LOCALE=en NODE_OPTIONS=--max_old_space_size=4096 next -p 9990",
     "jp:production": "PRODUCTION=jp next -p 9993",
     "en:production": "PRODUCTION=en next -p 9992",
     "dev": "cp tsconfig.dev.json tsconfig.json && rm -f report.*.json && rm -f *.log && rm -rf .next && concurrently \"yarn jp\" \"yarn en\"",
@@ -46,7 +46,7 @@
     "@types/jest": "^24.0.18",
     "@types/luxon": "^1.15.2",
     "@types/material-ui": "^0.21.7",
-    "@types/node": "^12.7.12",
+    "@types/node": "^10.14.22",
     "@types/nprogress": "^0.2.0",
     "@types/prettier": "^1.18.3",
     "@types/react": "^16.9.5",
@@ -72,7 +72,6 @@
     "module-alias": "^2.2.2",
     "prettier": "^1.18.2",
     "ts-jest": "^24.0.2",
-    "typescript": "^3.7.0-beta",
-    "url-loader": "^2.2.0"
+    "typescript": "^3.7.0-beta"
   }
 }

scripts/copyUsedEmojis.ts

@@ -106,8 +106,7 @@ const allUsedEmojis = [
     '🧠',
     '📓',
     '😴',
-    '🚦',
-    '⏭'
+    '🚦'
   ])
 ]
 

scripts/lib/buildExpressionContainers.ts

@@ -18,7 +18,7 @@ const buildExpressionContainers = ({
   hideControls,
   lastAllowedExpressionState,
   lastAllowedExpressionStateAfterIterations,
-  hidePlayButton
+  hideRunButton
 }: ExpressionRunnerConfig): readonly ExpressionContainer[] => {
   if (initialExpressionContainer) {
     let currentExpressionContainer: SteppedExpressionContainer = initialExpressionContainer
@@ -96,7 +96,7 @@ const buildExpressionContainers = ({
       )
       results.push(currentExpressionContainer)
 
-      if (hidePlayButton) {
+      if (hideRunButton) {
         break
       }
 

scripts/lib/buildExpressionFromParams.ts

@@ -6,7 +6,6 @@ import {
   isVariableShorthandNumberParams,
   isConditionalParams,
   isVariableShorthandFuncParams,
-  isQuestionPlusOrMinusOneParams,
   isQuestionShorthandNumberAfterConvertParams,
   isRepeatExpressionParams
 } from 'scripts/lib/expressionParamGuards'
@@ -19,7 +18,6 @@ import {
   VariableShorthandNumberParams,
   ConditionalExpressionParams,
   RepeatExpressionParams,
-  QuestionPlusOrMinusOneParams,
   QuestionShorthandNumberAfterConvertParams,
   VariableShorthandFuncParams,
   BinaryExpressionParams
@@ -98,9 +96,6 @@ export default function buildExpressionFromParams(
 export default function buildExpressionFromParams(
   expressionParams: RepeatExpressionParams
 ): RepeatExpression
-export default function buildExpressionFromParams(
-  expressionParams: QuestionPlusOrMinusOneParams
-): StepVariable
 export default function buildExpressionFromParams(
   expressionParams: QuestionShorthandNumberAfterConvertParams
 ): StepVariable
@@ -143,15 +138,13 @@ export default function buildExpressionFromParams(
           'initialHighlighted'
         ),
         body: buildExpressionFromParams(expressionParams.body),
-        type: 'function',
-        meta: expressionParams.meta
+        type: 'function'
       }
     } else {
       return {
         arg: buildVariableExpression(expressionParams.arg, false, 'default'),
         body: buildExpressionFromParams(expressionParams.body),
-        type: 'function',
-        meta: expressionParams.meta
+        type: 'function'
       }
     }
   } else if (isVariableShorthandNumberParams(expressionParams)) {
@@ -183,12 +176,6 @@ export default function buildExpressionFromParams(
       ),
       shorthandFunc: expressionParams.shorthandFunc
     }
-  } else if (isQuestionPlusOrMinusOneParams(expressionParams)) {
-    return {
-      ...buildVariableExpression('blankNumber', true, 'default'),
-      shorthandNumberPlusOrMinusOne:
-        expressionParams.shorthandNumberPlusOrMinusOne
-    }
   } else if (isQuestionShorthandNumberAfterConvertParams(expressionParams)) {
     return {
       ...buildVariableExpression(

scripts/lib/buildExpressionRunnerConfigFromShorthand.ts

@@ -1,11 +1,11 @@
 import {
   ExpressionRunnerShorthandConfig,
   expressionRunnerSimpleConfigDefault,
-  expressionRunnerPlayButtonOnlyConfigDefault,
+  expressionRunnerRunButtonOnlyConfigDefault,
   expressionRunnerSingleStepConfigDefault,
   expressionRunnerPredefinedConfigDefault,
   isExpressionRunnerSimpleConfig,
-  isExpressionRunnerPlayButtonOnlyConfig,
+  isExpressionRunnerRunButtonOnlyConfig,
   isExpressionRunnerSingleStepConfig
 } from 'scripts/lib/expressionRunnerShorthandConfig'
 import { ExpressionContainer } from 'src/types/ExpressionContainerTypes'
@@ -27,7 +27,7 @@ export interface ExpressionRunnerConfig {
   initializeInstructions: readonly InitializeInstruction[]
   lastAllowedExpressionState?: ExpressionContainer['previouslyChangedExpressionState']
   lastAllowedExpressionStateAfterIterations?: number
-  hidePlayButton?: boolean
+  hideRunButton?: boolean
   speed: number
   showAllShowSteps?: boolean
   skipAlphaConvert?: boolean
@@ -51,7 +51,7 @@ const expressionRunnerDefaults = {
   explanationsVisibility: 'visible',
   initializeInstructions: [],
   skipToTheEnd: false,
-  hidePlayButton: false,
+  hideRunButton: false,
   speed: 1,
   hideFuncUnboundBadgeOnExplanation: false,
   highlightOverridesCallArgAndFuncUnboundOnly: false,
@@ -152,7 +152,7 @@ const buildExpressionRunnerConfigFromShorthand = (
       }),
       crossed
     }
-  } else if (isExpressionRunnerPlayButtonOnlyConfig(config)) {
+  } else if (isExpressionRunnerRunButtonOnlyConfig(config)) {
     const {
       initialExpressionContainer,
       initialState,
@@ -171,8 +171,8 @@ const buildExpressionRunnerConfigFromShorthand = (
       explanationsVisibility
     } = mergeWithDefault<
       typeof config,
-      typeof expressionRunnerPlayButtonOnlyConfigDefault
-    >(config, expressionRunnerPlayButtonOnlyConfigDefault)
+      typeof expressionRunnerRunButtonOnlyConfigDefault
+    >(config, expressionRunnerRunButtonOnlyConfigDefault)
 
     runnerProps = {
       speed,
@@ -215,7 +215,7 @@ const buildExpressionRunnerConfigFromShorthand = (
       initialExpressionContainer,
       hidePriorities: !showPriorities,
       hideFuncUnboundBadgeOnExplanation,
-      hidePlayButton: true,
+      hideRunButton: true,
       explanationsVisibility,
       lastAllowedExpressionState: finalState,
       lastAllowedExpressionStateAfterIterations: nextIterations,
@@ -246,7 +246,7 @@ const buildExpressionRunnerConfigFromShorthand = (
       initialExpressionContainers,
       hidePriorities: !showPriorities,
       hideFuncUnboundBadgeOnExplanation,
-      hidePlayButton: false,
+      hideRunButton: false,
       explanationsVisibility,
       lastAllowedExpressionStateAfterIterations: nextIterations,
       showAllShowSteps,

scripts/lib/churchEncodingParams.ts

@@ -28,16 +28,14 @@ const nest = (
 export const numberParams = (
   f: VariableNames | HighlightedVariableExpressionParams,
   x: VariableNames | HighlightedVariableExpressionParams,
-  n: number,
-  focused?: boolean
+  n: number
 ): FunctionExpressionParams => {
   return {
     arg: f,
     body: {
       arg: x,
       body: nest(f, x, n)
-    },
-    meta: focused ? 'focused' : undefined
+    }
   }
 }
 
@@ -72,9 +70,7 @@ export const numberParamsHighlightNonNumber = (
 export const succParams = (
   a: VariableNames | HighlightedVariableExpressionParams,
   b: VariableNames | HighlightedVariableExpressionParams,
-  c: VariableNames | HighlightedVariableExpressionParams,
-  focused?: boolean,
-  specialEffect?: boolean
+  c: VariableNames | HighlightedVariableExpressionParams
 ): FunctionExpressionParams => {
   return {
     arg: a,
@@ -84,8 +80,7 @@ export const succParams = (
         arg: c,
         body: [b, [a, b, c]]
       }
-    },
-    meta: specialEffect ? 'plusOneEffect' : focused ? 'focused' : undefined
+    }
   }
 }
 
@@ -116,11 +111,9 @@ export const predParams = (
   c: VariableNames | HighlightedVariableExpressionParams,
   d: VariableNames | HighlightedVariableExpressionParams,
   e: VariableNames | HighlightedVariableExpressionParams,
-  f: VariableNames | HighlightedVariableExpressionParams,
-  specialEffect?: boolean
+  f: VariableNames | HighlightedVariableExpressionParams
 ): FunctionExpressionParams => {
   return {
-    meta: specialEffect ? 'minusOneEffect' : undefined,
     arg: a,
     body: {
       arg: b,

scripts/lib/expressionParamGuards.ts

@@ -7,7 +7,6 @@ import {
   HighlightedVariableExpressionParams,
   ConditionalExpressionParams,
   VariableShorthandFuncParams,
-  QuestionPlusOrMinusOneParams,
   QuestionShorthandNumberAfterConvertParams,
   RepeatExpressionParams
 } from 'src/types/ExpressionParamTypes'
@@ -71,15 +70,6 @@ export function isConditionalParams(
   )
 }
 
-export function isQuestionPlusOrMinusOneParams(
-  expressionParams: ExpressionParams
-): expressionParams is QuestionPlusOrMinusOneParams {
-  return (
-    (expressionParams as QuestionPlusOrMinusOneParams)
-      .shorthandNumberPlusOrMinusOne !== undefined
-  )
-}
-
 export function isQuestionShorthandNumberAfterConvertParams(
   expressionParams: ExpressionParams
 ): expressionParams is QuestionShorthandNumberAfterConvertParams {

scripts/lib/expressionRunnerShorthandConfig.ts

@@ -36,7 +36,7 @@ export function isExpressionRunnerSimpleConfig(
   return c.runner === 'simple'
 }
 
-export const expressionRunnerPlayButtonOnlyConfigDefault = {
+export const expressionRunnerRunButtonOnlyConfigDefault = {
   initialState: 'default',
   skipToTheEnd: true,
   hideFuncUnboundBadgeOnExplanation: true,
@@ -46,14 +46,14 @@ export const expressionRunnerPlayButtonOnlyConfigDefault = {
   explanationsVisibility: 'hiddenInitialPausedOnly'
 }
 
-export function isExpressionRunnerPlayButtonOnlyConfig(
+export function isExpressionRunnerRunButtonOnlyConfig(
   c: ExpressionRunnerShorthandConfig
-): c is ExpressionRunnerPlayButtonOnlyConfig {
-  return c.runner === 'playButtonOnly'
+): c is ExpressionRunnerRunButtonOnlyConfig {
+  return c.runner === 'runButtonOnly'
 }
 
-interface ExpressionRunnerPlayButtonOnlyConfig {
-  runner: 'playButtonOnly'
+interface ExpressionRunnerRunButtonOnlyConfig {
+  runner: 'runButtonOnly'
   initialExpressionContainer: SteppedExpressionContainer
   initialState?: ExpressionContainer['previouslyChangedExpressionState']
   skipToTheEnd?: boolean
@@ -124,6 +124,6 @@ interface ExpressionRunnerPredefinedConfig {
 
 export type ExpressionRunnerShorthandConfig =
   | ExpressionRunnerSimpleConfig
-  | ExpressionRunnerPlayButtonOnlyConfig
+  | ExpressionRunnerRunButtonOnlyConfig
   | ExpressionRunnerSingleStepConfig
   | ExpressionRunnerPredefinedConfig