change module to es2020 and fix formatting

Author: tsammeow

src/cse-machine/interpreter.ts

@@ -437,7 +437,7 @@ export function* generateCSEMachineStateStream(
       cmdEvaluators[command.instrType](command, context, control, stash, isPrelude)
     } else {
       // this is a scheme value
-      throw new Error("scheme removed")
+      throw new Error('scheme removed')
     }
 
     // Push undefined into the stack if both control and stash is empty
@@ -1048,9 +1048,9 @@ const cmdEvaluators: { [type: string]: CmdEvaluator } = {
       // as schemers like using the REPL, and that always assumes that the environment is reset
       // to the main environment.
       if (
-        (next &&
-          !(isInstr(next) && next.instrType === InstrType.ENVIRONMENT) &&
-          !control.canAvoidEnvInstr())
+        next &&
+        !(isInstr(next) && next.instrType === InstrType.ENVIRONMENT) &&
+        !control.canAvoidEnvInstr()
       ) {
         control.push(
           instr.envInstr(currentEnvironment(context), currentTransformers(context), command.srcNode)

src/evaluator.ts

@@ -1,41 +1,41 @@
-import { BasicEvaluator } from "conductor/dist/conductor/runner";
-import { IRunnerPlugin } from "conductor/dist/conductor/runner/types";
-import { initialise } from "conductor/dist/conductor/runner/util";
-import { Context, runInContext, createContext } from "./index";
-import { Value, Chapter, Variant } from "./types";
+import { BasicEvaluator } from 'conductor/dist/conductor/runner'
+import { IRunnerPlugin } from 'conductor/dist/conductor/runner/types'
+import { initialise } from 'conductor/dist/conductor/runner/util'
+import { Context, runInContext, createContext } from './index'
+import { Value, Chapter, Variant } from './types'
 
 class JsSlangEvaluator extends BasicEvaluator {
-    private ctx: Context;
+  private ctx: Context
 
-    async evaluateChunk(chunk: string): Promise<void> {
-        const res = await runInContext(chunk, this.ctx);
-        if (res.status === "error") {
-            console.error(res);
-        } else {
-            this.ctx = res.context;
-            if (res.status === "finished") return res.value;
-        }
+  async evaluateChunk(chunk: string): Promise<void> {
+    const res = await runInContext(chunk, this.ctx)
+    if (res.status === 'error') {
+      console.error(res)
+    } else {
+      this.ctx = res.context
+      if (res.status === 'finished') return res.value
     }
+  }
 
-    constructor(conductor: IRunnerPlugin) {
-        super(conductor);
+  constructor(conductor: IRunnerPlugin) {
+    super(conductor)
 
-        const rawDisplay = (value: Value, str: string, _externalContext: any) => {
-            this.conductor.sendOutput((str === undefined ? '' : str + ' ') + String(value));
-            return value;
-        };
+    const rawDisplay = (value: Value, str: string, _externalContext: any) => {
+      this.conductor.sendOutput((str === undefined ? '' : str + ' ') + String(value))
+      return value
+    }
 
-        this.ctx = createContext(Chapter.SOURCE_4, Variant.DEFAULT, undefined, [], undefined, {
-            rawDisplay: rawDisplay,
-            prompt: rawDisplay,
-            alert: rawDisplay,
-            visualiseList: (_v: Value) => {
-            throw new Error('List visualizer is not enabled')
-            }
-        });
+    this.ctx = createContext(Chapter.SOURCE_4, Variant.DEFAULT, undefined, [], undefined, {
+      rawDisplay: rawDisplay,
+      prompt: rawDisplay,
+      alert: rawDisplay,
+      visualiseList: (_v: Value) => {
+        throw new Error('List visualizer is not enabled')
+      }
+    })
 
-        console.log("Evaluator initialised!");
-    }
+    console.log('Evaluator initialised!')
+  }
 }
 
-initialise(JsSlangEvaluator);
+initialise(JsSlangEvaluator)

src/index.ts

@@ -222,10 +222,10 @@ export async function runFilesInContext(
   }
 
   let result: Result
-  
-  // FIXME: Clean up state management so that the `parseError` function is pure.
-  //        This is not a huge priority, but it would be good not to make use of
-  //        global state.
+
+    // FIXME: Clean up state management so that the `parseError` function is pure.
+    //        This is not a huge priority, but it would be good not to make use of
+    //        global state.
   ;({ result, verboseErrors } = await sourceFilesRunner(
     p => Promise.resolve(files[p]),
     entrypointFilePath,

src/runner/index.ts

@@ -46,9 +46,7 @@ async function sourceRunner(
   const theOptions = _.merge({ ...DEFAULT_SOURCE_OPTIONS }, options)
   context.variant = determineVariant(context, options)
 
-  if (
-    context.chapter === Chapter.FULL_JS
-  ) {
+  if (context.chapter === Chapter.FULL_JS) {
     return runners.fulljs(program, context, theOptions)
   }
 

tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "module": "ESNext",
+    "module": "es2020",
     "target": "es2020",
     "lib": [
       "es2021.string",