src/App.tsx

@@ -6,7 +6,8 @@ export const App = () => {
     <div className="main">
       <div id={Miscellaneous.MODAL_ID} className="modal">
         <div id={Miscellaneous.MODAL_CONTENT_ID} className="modal-content">
-          <hr></hr>
+          <span className="close">&times;</span>
+          <p>Some text in the Modal..</p>
         </div>
       </div>
 
@@ -21,11 +22,7 @@ export const App = () => {
       <div className="footer">
         <span>
           built by{" "}
-          <a
-            href="https://git.simponic.xyz/simponic"
-            target="_blank"
-            className="tf"
-          >
+          <a href="https://github.com/simponic" target="_blank" className="tf">
             simponic
           </a>{" "}
           | inspired by{" "}

src/components/GameCanvas.tsx

@@ -11,11 +11,7 @@ export interface GameCanvasProps {
 export const GameCanvas = ({ width, height }: GameCanvasProps) => {
   const canvasRef = useRef<HTMLCanvasElement>(null);
   const [game, setGame] = useState<TheAbstractionEngine>();
-  // TODO: go back to this after done
-  // const [ready, setReady] = useState(false);
-  const [ready, setReady] = useState(
-    document.location.hostname.includes("localhost"),
-  );
+  const [ready, setReady] = useState(false);
   const [loading, setLoading] = useState(true);
 
   useEffect(() => {

src/components/Title.tsx

@@ -17,10 +17,10 @@ export const Title = ({ setReady }: TitleProps) => {
         </a>
       </p>
       <br />
-      <h3 className="warning">
-        WASD/arrow keys to move. SPACE/ENTER to interact after highlighting with
-        the mouse.
-      </h3>
+      <p>
+        WASD/arrow keys to move, space/enter to interact after highlighting with
+        the mouse
+      </p>
 
       <br />
       <hr />

src/css/style.css

@@ -20,8 +20,7 @@ body {
   margin: 0;
   width: 100%;
   height: 100%;
-  background:
-    radial-gradient(ellipse at top, var(--bg), transparent),
+  background: radial-gradient(ellipse at top, var(--bg), transparent),
     radial-gradient(ellipse at left, var(--blue), transparent),
     radial-gradient(ellipse at right, var(--purple), transparent),
     radial-gradient(ellipse at bottom, var(--bg), transparent);

src/engine/TheAbstractionEngine.ts

@@ -11,8 +11,6 @@ import {
   Life,
   Music,
   Level,
-  Modal,
-  RadialObserve,
 } from "./systems";
 
 export class TheAbstractionEngine {
@@ -34,11 +32,8 @@ export class TheAbstractionEngine {
 
     const facingDirectionSystem = new FacingDirection(inputSystem);
 
-    const isDev = document.location.hostname.includes("localhost");
     [
-      new RadialObserve(),
-      new Modal(),
-      new Level(isDev ? LevelNames.CarCadr : LevelNames.LevelSelection),
+      new Level(LevelNames.LevelSelection),
       inputSystem,
       facingDirectionSystem,
       new Grid(

src/engine/components/ComponentNames.ts

@@ -8,10 +8,8 @@ export namespace ComponentNames {
   export const Interactable = "Interactable";
   export const Pushable = "Pushable";
   export const Colliding = "Colliding";
-  export const RadialObserve = "RadialObserve";
   export const GridSpawn = "GridSpawn";
   export const Text = "Text";
   export const LambdaTerm = "LambdaTerm";
   export const Life = "Life";
-  export const Modal = "Modal";
 }

src/engine/components/Control.ts

@@ -1,7 +1,11 @@
 import { Component, ComponentNames } from ".";
 
 export class Control extends Component {
-  constructor(public isControllable = true) {
+  public isControllable: boolean = true;
+
+  constructor(isControllable = true) {
     super(ComponentNames.Control);
+
+    this.isControllable = isControllable;
   }
 }

src/engine/components/LambdaTerm.ts

@@ -1,9 +1,7 @@
 import { Component, ComponentNames } from ".";
-import { DebrujinifiedLambdaTerm } from "../../interpreter";
 
 export class LambdaTerm extends Component {
   public code: string;
-  public last: null | { data?: DebrujinifiedLambdaTerm; error?: any } = null;
 
   constructor(code: string) {
     super(ComponentNames.LambdaTerm);

src/engine/components/Modal.ts

@@ -1,8 +0,0 @@
-import { Component, ComponentNames } from ".";
-import { ModalInitState } from "../systems";
-
-export class Modal extends Component {
-  constructor(public initState: ModalInitState) {
-    super(ComponentNames.Modal);
-  }
-}

src/engine/components/RadialObserve.ts

@@ -1,12 +0,0 @@
-import { Component, ComponentNames } from ".";
-import { Game } from "..";
-import { Entity } from "../entities";
-
-export class RadialObserve extends Component {
-  constructor(
-    public onObservation?: (game: Game, entity: Entity) => void,
-    public radius: number = 0,
-  ) {
-    super(ComponentNames.RadialObserve);
-  }
-}

src/engine/components/RadialObserver.ts

@@ -1,13 +0,0 @@
-import { Component, ComponentNames } from ".";
-import { Game } from "..";
-import { Entity } from "../entities";
-
-export class Colliding extends Component {
-  public onCollision?: (game: Game, entity: Entity) => void;
-
-  constructor(onCollision?: (game: Game, entity: Entity) => void) {
-    super(ComponentNames.RadialObserve);
-
-    this.onCollision = onCollision;
-  }
-}

src/engine/components/Sprite.ts

@@ -55,7 +55,7 @@ export class Sprite extends Component implements Renderable {
 
     ctx.save();
     ctx.translate(center.x, center.y);
-    if (typeof rotation !== "undefined" && rotation != 0) {
+    if (rotation != undefined && rotation != 0) {
       ctx.rotate(rotation * (Math.PI / 180));
     }
     ctx.translate(-center.x, -center.y);
@@ -64,12 +64,6 @@ export class Sprite extends Component implements Renderable {
       ctx.globalAlpha = opacity;
     }
 
-    ctx.drawImage(
-      this.sheet,
-      ...this.getSpriteArgs(),
-      ...this.getDrawArgs(drawArgs),
-    );
-
     if (backgroundText) {
       // draw text
       const { fillStyle, font, textAlign, text } = backgroundText;
@@ -81,6 +75,12 @@ export class Sprite extends Component implements Renderable {
       ctx.fillText(text, center.x, center.y + height / 2);
     }
 
+    ctx.drawImage(
+      this.sheet,
+      ...this.getSpriteArgs(),
+      ...this.getDrawArgs(drawArgs),
+    );
+
     if (tint) {
       ctx.globalAlpha = 0.5;
       ctx.globalCompositeOperation = "source-atop";

src/engine/components/index.ts

@@ -8,10 +8,8 @@ export * from "./Control";
 export * from "./Highlight";
 export * from "./Interactable";
 export * from "./Pushable";
-export * from "./RadialObserve";
 export * from "./Colliding";
 export * from "./GridSpawn";
 export * from "./Text";
 export * from "./LambdaTerm";
 export * from "./Life";
-export * from "./Modal";

src/engine/config/constants.ts

@@ -27,8 +27,6 @@ export namespace KeyConstants {
 
     " ": Action.INTERACT,
     enter: Action.INTERACT,
-
-    r: Action.RESET,
   };
 
   // value -> [key] from KeyActions

src/engine/config/sounds.ts

@@ -19,7 +19,7 @@ export const LambdaTransformSound: SoundSpec = {
   volume: 0.3,
 };
 
-export const EditorSave: SoundSpec = {
+export const LambdaSave: SoundSpec = {
   name: "lambdaSave",
   url: "/assets/sound/lambda_save.wav",
   volume: 0.3,
@@ -83,7 +83,7 @@ export const Music: SoundSpec = {
 export const SOUND_SPECS: SoundSpec[] = [
   MovingSound,
   LambdaTransformSound,
-  EditorSave,
+  LambdaSave,
   Failure,
   ModalOpen,
   ModalClose,

src/engine/entities/EntityNames.ts

@@ -11,5 +11,4 @@ export namespace EntityNames {
   export const Portal = "Portal";
   export const Grass = "Grass";
   export const Sign = "Sign";
-  export const Piston = "Piston";
 }

src/engine/entities/FunctionApplication.ts

@@ -1,13 +1,17 @@
-import { Entity, EntityNames, FunctionBox, Key, Particles } from ".";
+import {
+  Entity,
+  EntityNames,
+  FunctionBox,
+  Key,
+  Particles,
+  makeLambdaTermHighlightComponent,
+} from ".";
 import {
   BoundingBox,
   Colliding,
   ComponentNames,
   Grid,
-  Highlight,
-  Interactable,
   LambdaTerm,
-  Modal,
   Sprite,
 } from "../components";
 import {
@@ -22,20 +26,16 @@ import {
 import { Coord2D, Direction } from "../interfaces";
 import { Game } from "..";
 import { Grid as GridSystem, SystemNames } from "../systems";
-import { colors, tryWrap } from "../utils";
+import { colors } from "../utils";
 import {
-  InvalidLambdaTermError,
+  DebrujinifiedLambdaTerm,
   SymbolTable,
   emitNamed,
   interpret,
 } from "../../interpreter";
 
-const APPLICATION_RESULTS: Record<
-  string,
-  (gridPosition: Coord2D) => null | Entity
-> = {
+const APPLICATION_RESULTS: Record<string, (gridPosition: Coord2D) => Entity> = {
   _KEY: (gridPosition: Coord2D) => new Key(gridPosition),
-  _EMPTY: (_gridPosition: Coord2D) => null,
 };
 
 export class FunctionApplication extends Entity {
@@ -82,42 +82,7 @@ export class FunctionApplication extends Entity {
 
     this.addComponent(new Colliding(this.handleCollision.bind(this)));
 
-    this.addComponent(
-      new Highlight(this.onHighlight.bind(this), this.onUnhighlight.bind(this)),
-    );
-  }
-
-  private onHighlight(_direction: Direction) {
-    this.addComponent(new Interactable(this.interaction.bind(this)));
-  }
-
-  private interaction() {
-    const codeConsumer = (_code: string) => {
-      this.removeComponent(ComponentNames.Modal);
-      return { consumed: true };
-    };
-    const { last, code } = this.getComponent<LambdaTerm>(
-      ComponentNames.LambdaTerm,
-    );
-    this.addComponent(
-      new Modal({
-        type: "CODE_EDITOR",
-        codeInit: {
-          code,
-          codeConsumer,
-          readonly: true,
-          result: {
-            error: last?.error && `Error: ${last.error.message}`,
-            data: last?.data && `Last Result: ${emitNamed(last.data)}`,
-          },
-        },
-      }),
-    );
-  }
-
-  private onUnhighlight() {
-    this.removeComponent(ComponentNames.Modal);
-    this.removeComponent(ComponentNames.Interactable);
+    this.addComponent(makeLambdaTermHighlightComponent(this));
   }
 
   public handleCollision(game: Game, entity: Entity) {
@@ -151,39 +116,35 @@ export class FunctionApplication extends Entity {
     );
     const newCode = applicationTerm.code.replace("_INPUT", functionTerm.code);
 
-    const result = tryWrap(() => interpret(newCode, this.symbolTable, true));
-    applicationTerm.last = result;
-    if (result.error || !result.data) {
-      console.error(result.error);
+    let result: DebrujinifiedLambdaTerm | null = null;
+    try {
+      result = interpret(newCode, this.symbolTable, true);
+    } catch (e) {
+      console.error(e);
       fail();
       return;
     }
 
+    const { dimension } = gridSystem;
     const nextPosition = gridSystem.getNewGridPosition(
       grid.gridPosition,
       entityGrid.previousDirection,
     );
 
     let applicationResultingEntity: Entity | null = null; // this should be its own function
-    const { data } = result;
-    if ("application" in data) {
-      // if we get an application that means we didn't interpret correctly.
-      // this should "not" happen and should be fatal.
-      throw new InvalidLambdaTermError(
-        "produced term should not be an application",
-      );
-    }
-    if ("abstraction" in data) {
-      const code = emitNamed(data);
+    if ("abstraction" in result) {
+      const code = emitNamed(result);
+
       applicationResultingEntity = new FunctionBox(grid.gridPosition, code);
-    }
-    if ("name" in data) {
-      const { name } = data;
+    } else if ("name" in result) {
+      const { name } = result;
       const entityFactory = APPLICATION_RESULTS[name];
       if (entityFactory) {
-        const entity = entityFactory(nextPosition);
-        entity && game.addEntity(entity);
+        game.addEntity(entityFactory(nextPosition));
       }
+    } else {
+      fail();
+      return;
     }
 
     game.removeEntity(entity.id);
@@ -197,8 +158,7 @@ export class FunctionApplication extends Entity {
       game.addEntity(applicationResultingEntity);
     }
 
-    SOUNDS.get(LambdaTransformSound.name)!.play();
-    const { dimension } = gridSystem;
+    this.playTransformSound();
     const particles = new Particles({
       center: gridSystem.gridToScreenPosition(nextPosition),
       spawnerDimensions: {
@@ -223,4 +183,9 @@ export class FunctionApplication extends Entity {
     });
     game.addEntity(particles);
   }
+
+  private playTransformSound() {
+    const audio = SOUNDS.get(LambdaTransformSound.name)!;
+    audio.play();
+  }
 }

src/engine/entities/FunctionBox.ts

@@ -1,4 +1,13 @@
-import { IMAGES, SPRITE_SPECS, SpriteSpec, Sprites } from "../config";
+import {
+  IMAGES,
+  Miscellaneous,
+  ModalClose,
+  ModalOpen,
+  SOUNDS,
+  SPRITE_SPECS,
+  SpriteSpec,
+  Sprites,
+} from "../config";
 import { Entity, EntityNames } from ".";
 import {
   BoundingBox,
@@ -7,22 +16,18 @@ import {
   Highlight,
   Interactable,
   LambdaTerm,
-  Modal,
   Pushable,
-  RadialObserve,
   Sprite,
 } from "../components";
 import { Coord2D } from "../interfaces";
+import { openModal, closeModal } from "../utils";
 
 export class FunctionBox extends Entity {
   private static spriteSpec: SpriteSpec = SPRITE_SPECS.get(
     Sprites.FUNCTION_BOX,
   ) as SpriteSpec;
 
-  constructor(
-    gridPosition: Coord2D,
-    private readonly code: string,
-  ) {
+  constructor(gridPosition: Coord2D, code: string) {
     super(EntityNames.FunctionBox);
 
     this.addComponent(
@@ -41,8 +46,6 @@ export class FunctionBox extends Entity {
 
     this.addComponent(new Pushable());
 
-    this.addComponent(new RadialObserve());
-
     this.addComponent(new Grid(gridPosition));
 
     this.addComponent(
@@ -60,37 +63,50 @@ export class FunctionBox extends Entity {
 
     this.addComponent(new LambdaTerm(code));
 
-    this.addComponent(
-      new Highlight(this.onHighlight.bind(this), this.onUnhighlight.bind(this)),
-    );
-  }
-
-  private interaction() {
-    const codeConsumer = (_code: string) => {
-      this.removeComponent(ComponentNames.Modal);
-      return { consumed: true };
-    };
-    const { last } = this.getComponent<LambdaTerm>(ComponentNames.LambdaTerm);
-    this.addComponent(
-      new Modal({
-        type: "CODE_EDITOR",
-        codeInit: {
-          code: this.code,
-          codeConsumer,
-          readonly: true,
-          result: {
-            error: last?.error && `Error: ${last.error.message}`,
-          },
-        },
-      }),
-    );
-  }
-
-  public onHighlight() {
-    this.addComponent(new Interactable(this.interaction.bind(this)));
-  }
-
-  public onUnhighlight() {
-    this.removeComponent(ComponentNames.Interactable);
+    this.addComponent(makeLambdaTermHighlightComponent(this));
   }
 }
+
+export const makeLambdaTermHighlightComponent = (
+  entity: Entity,
+  text?: string,
+) => {
+  const onUnhighlight = () => {
+    closeModal();
+    entity.removeComponent(ComponentNames.Interactable);
+  };
+
+  const onHighlight = () => {
+    let modalOpen = false;
+    const doModalClose = () => {
+      SOUNDS.get(ModalClose.name)!.play();
+      modalOpen = false;
+      closeModal();
+    };
+
+    const interaction = () => {
+      if (modalOpen) {
+        doModalClose();
+        return;
+      }
+
+      const code =
+        text ??
+        entity.getComponent<LambdaTerm>(ComponentNames.LambdaTerm)!.code;
+      openModal(
+        `<div style="text-align:center"><p>${code}</p> <br> <button id="close">Close</button></div>`,
+      );
+      modalOpen = true;
+      SOUNDS.get(ModalOpen.name)!.play();
+
+      document.getElementById("close")!.addEventListener("click", () => {
+        doModalClose();
+        document.getElementById(Miscellaneous.CANVAS_ID)!.focus();
+      });
+    };
+
+    entity.addComponent(new Interactable(interaction));
+  };
+
+  return new Highlight(onHighlight, onUnhighlight);
+};

src/engine/entities/LambdaFactory.ts

@@ -1,7 +1,10 @@
 import {
   Failure,
   IMAGES,
+  LambdaSave,
   LambdaTransformSound,
+  Miscellaneous,
+  ModalOpen,
   SOUNDS,
   SPRITE_SPECS,
   SpriteSpec,
@@ -16,19 +19,66 @@ import {
   GridSpawn,
   Highlight,
   Interactable,
-  Modal,
   Sprite,
   Text,
 } from "../components";
 import { Coord2D, Direction } from "../interfaces";
-import { tryWrap } from "../utils";
+import { openModal, closeModal } from "../utils";
+import {
+  EditorState,
+  StateField,
+  StateEffect,
+  Range,
+  Extension,
+} from "@codemirror/state";
+import { Decoration, EditorView, keymap } from "@codemirror/view";
+import { defaultKeymap } from "@codemirror/commands";
+import rainbowBrackets from "rainbowbrackets";
+import { basicSetup } from "codemirror";
 import { parse } from "../../interpreter";
 
+interface CodeEditorState {
+  view: EditorView;
+  editorElement: HTMLElement;
+  syntaxError: HTMLElement;
+  canvas: HTMLCanvasElement;
+  closeButton: HTMLButtonElement;
+}
+
+const highlightEffect = StateEffect.define<Range<Decoration>[]>();
+const highlightExtension = StateField.define({
+  create() {
+    return Decoration.none;
+  },
+  update(value, transaction) {
+    value = value.map(transaction.changes);
+
+    for (let effect of transaction.effects) {
+      if (effect.is(highlightEffect))
+        value = value.update({ add: effect.value, sort: true });
+    }
+
+    return value;
+  },
+  provide: (f) => EditorView.decorations.from(f),
+});
+
+const FontSizeTheme = EditorView.theme({
+  $: {
+    fontSize: "16pt",
+  },
+});
+const FontSizeThemeExtension: Extension = [FontSizeTheme];
+const syntaxErrorDecoration = Decoration.mark({
+  class: "syntax-error",
+});
+
 export class LambdaFactory extends Entity {
   private static spriteSpec: SpriteSpec = SPRITE_SPECS.get(
     Sprites.LAMBDA_FACTORY,
   ) as SpriteSpec;
 
+  private codeEditorState: CodeEditorState | null;
   private spawns: number;
   private code: string;
 
@@ -37,6 +87,7 @@ export class LambdaFactory extends Entity {
 
     this.spawns = spawns;
     this.code = code;
+    this.codeEditorState = null;
 
     this.addComponent(
       new BoundingBox(
@@ -79,52 +130,22 @@ export class LambdaFactory extends Entity {
     );
 
     this.addComponent(
-      new Highlight(this.onHighlight.bind(this), this.onUnhighlight.bind(this)),
-    );
-  }
-
-  private codeConsumer(code: string) {
-    const parsed = tryWrap(() => parse(code));
-    if (parsed.error) {
-      return { error: parsed.error };
-    }
-    this.code = code;
-    this.removeComponent(ComponentNames.Modal);
-    return { consumed: true };
-  }
-
-  private onHighlight(direction: Direction) {
-    if (direction === Direction.LEFT || direction === Direction.RIGHT) {
-      this.addComponent(new Interactable(() => this.spawnNewLambda(direction)));
-      return;
-    }
-
-    this.addComponent(new Interactable(this.interaction.bind(this)));
-  }
-
-  private interaction() {
-    if (this.hasComponent(ComponentNames.Modal)) {
-      return;
-    }
-    this.addComponent(
-      new Modal({
-        type: "CODE_EDITOR",
-        codeInit: {
-          code: this.code,
-          codeConsumer: this.codeConsumer.bind(this),
-        },
-      }),
+      new Highlight(
+        (direction) => this.onHighlight(direction),
+        () => this.onUnhighlight(),
+      ),
     );
   }
 
   private onUnhighlight() {
-    this.removeComponent(ComponentNames.Modal);
+    closeModal();
     this.removeComponent(ComponentNames.Interactable);
   }
 
   private spawnNewLambda(direction: Direction) {
-    const parsed = tryWrap(() => parse(this.code));
-    if (parsed.error) {
+    try {
+      parse(this.code);
+    } catch (e: any) {
       SOUNDS.get(Failure.name)!.play();
       return;
     }
@@ -138,4 +159,132 @@ export class LambdaFactory extends Entity {
 
     SOUNDS.get(LambdaTransformSound.name)!.play();
   }
+
+  private openCodeEditor() {
+    const modalContent =
+      "<div class='code'><div id='code'></div><br><p id='syntax-error' class='error'></p><button id='close-modal'>Save</button></div>";
+    openModal(modalContent);
+
+    const startState = EditorState.create({
+      doc: this.code,
+      extensions: [
+        basicSetup,
+        keymap.of(defaultKeymap),
+        rainbowBrackets(),
+        highlightExtension,
+        FontSizeThemeExtension,
+      ],
+    });
+
+    const codeBox = document.getElementById("code")!;
+    const syntaxError = document.getElementById("syntax-error")!;
+    const canvas = document.getElementById(
+      Miscellaneous.CANVAS_ID,
+    ) as HTMLCanvasElement;
+    const closeButton = document.getElementById(
+      "close-modal",
+    ) as HTMLButtonElement;
+    closeButton.addEventListener("click", () => this.saveAndCloseCodeEditor());
+
+    const editorView = new EditorView({
+      state: startState,
+      parent: codeBox,
+    });
+    editorView.focus();
+
+    this.codeEditorState = {
+      view: editorView,
+      editorElement: codeBox,
+      syntaxError,
+      canvas,
+      closeButton,
+    };
+
+    SOUNDS.get(ModalOpen.name)!.play();
+  }
+
+  private refreshCodeEditorText(text: string) {
+    if (!this.codeEditorState) {
+      return;
+    }
+    const { view } = this.codeEditorState;
+
+    view.dispatch({
+      changes: {
+        from: 0,
+        to: text.length,
+        insert: "",
+      },
+    });
+    view.dispatch({
+      changes: {
+        from: 0,
+        to: 0,
+        insert: text,
+      },
+    });
+  }
+
+  private saveAndCloseCodeEditor() {
+    if (!this.codeEditorState) {
+      return;
+    }
+
+    const { canvas, view, editorElement, syntaxError } = this.codeEditorState;
+    const text = view.state.doc.toString();
+    this.refreshCodeEditorText(text);
+    syntaxError.innerText = "";
+
+    try {
+      parse(text);
+    } catch (e: any) {
+      if (!e.location) {
+        return;
+      }
+      const {
+        location: {
+          start: { offset: start },
+          end: { offset: end },
+        },
+      } = e;
+
+      view.dispatch({
+        effects: highlightEffect.of([
+          syntaxErrorDecoration.range(start === end ? start - 1 : start, end),
+        ]),
+      });
+
+      syntaxError.innerText = e.message;
+      SOUNDS.get(Failure.name)!.play();
+      return;
+    }
+
+    this.code = text;
+
+    view.destroy();
+    editorElement.innerHTML = "";
+    this.codeEditorState = null;
+    closeModal();
+
+    canvas.focus();
+    SOUNDS.get(LambdaSave.name)!.play();
+  }
+
+  private onHighlight(direction: Direction) {
+    if (direction === Direction.LEFT || direction === Direction.RIGHT) {
+      this.addComponent(new Interactable(() => this.spawnNewLambda(direction)));
+      return;
+    }
+
+    const interaction = () => {
+      if (this.codeEditorState) {
+        this.saveAndCloseCodeEditor();
+        return;
+      }
+
+      this.openCodeEditor();
+    };
+
+    this.addComponent(new Interactable(interaction));
+  }
 }

src/engine/entities/Piston.ts

@@ -1,61 +0,0 @@
-import { Entity, EntityNames } from ".";
-import {
-  Colliding,
-  ComponentNames,
-  FacingDirection,
-  Grid,
-  RadialObserve,
-} from "../components";
-import { Game } from "../Game";
-import { Coord2D, Direction } from "../interfaces";
-
-export class Piston extends Entity {
-  constructor(gridPosition: Coord2D, direction: Direction) {
-    super(EntityNames.Piston);
-
-    const radius = 1;
-    this.addComponent(new RadialObserve(this.onObservation.bind(this), radius));
-
-    this.addComponent(new FacingDirection(direction));
-
-    this.addComponent(new Grid(gridPosition));
-
-    this.addComponent(new Colliding());
-  }
-
-  private onObservation(_game: Game, entity: Entity) {
-    const facingDirection = this.getComponent<FacingDirection>(
-      ComponentNames.FacingDirection,
-    );
-
-    const myPosition = this.getComponent<Grid>(
-      ComponentNames.Grid,
-    ).gridPosition;
-    const observingGrid = entity.getComponent<Grid>(ComponentNames.Grid);
-    const observingPosition = observingGrid.gridPosition;
-
-    const [dx, dy] = [
-      myPosition.x - observingPosition.x,
-      myPosition.y - observingPosition.y,
-    ].map((x) => Math.round(x));
-    const v: Record<typeof dx, Record<typeof dy, Direction>> = {
-      [-1]: {
-        [dy]: Direction.RIGHT,
-      },
-      [1]: {
-        [dy]: Direction.LEFT,
-      },
-      [0]: {
-        [-1]: Direction.UP,
-        [1]: Direction.DOWN,
-      },
-    };
-
-    if (facingDirection.currentDirection !== v[dx][dy]) {
-      return;
-    }
-
-    observingGrid.movingDirection = facingDirection.currentDirection;
-    entity.addComponent(observingGrid);
-  }
-}

src/engine/entities/Sign.ts

@@ -1,14 +1,5 @@
-import { Entity, EntityNames } from ".";
-import {
-  BoundingBox,
-  Colliding,
-  ComponentNames,
-  Grid,
-  Highlight,
-  Interactable,
-  Modal,
-  Sprite,
-} from "../components";
+import { Entity, EntityNames, makeLambdaTermHighlightComponent } from ".";
+import { BoundingBox, Colliding, Grid, Sprite } from "../components";
 import { IMAGES, SPRITE_SPECS, SpriteSpec, Sprites } from "../config";
 import { Coord2D } from "../interfaces";
 
@@ -17,11 +8,11 @@ export class Sign extends Entity {
     Sprites.SIGN,
   ) as SpriteSpec;
 
-  constructor(
-    private readonly text: string,
-    gridPosition: Coord2D,
-  ) {
+  private text: string;
+
+  constructor(text: string, gridPosition: Coord2D) {
     super(EntityNames.Sign);
+    this.text = text;
 
     const dimension = {
       width: Sign.spriteSpec.width,
@@ -53,32 +44,6 @@ export class Sign extends Entity {
 
     this.addComponent(new Colliding());
 
-    this.addComponent(
-      new Highlight(this.onHighlight.bind(this), this.onUnhighlight.bind(this)),
-    );
-  }
-
-  private onHighlight() {
-    this.addComponent(new Interactable(this.interaction.bind(this)));
-  }
-
-  private onUnhighlight() {
-    this.removeComponent(ComponentNames.Modal);
-    this.removeComponent(ComponentNames.Interactable);
-  }
-
-  private interaction() {
-    if (this.hasComponent(ComponentNames.Modal)) {
-      this.removeComponent(ComponentNames.Modal);
-      return;
-    }
-    this.addComponent(
-      new Modal({
-        type: "CONTENT",
-        contentInit: {
-          content: `<p>${this.text}</p>`,
-        },
-      }),
-    );
+    this.addComponent(makeLambdaTermHighlightComponent(this, this.text));
   }
 }

src/engine/interfaces/Vec2.ts

@@ -2,8 +2,6 @@ export interface Coord2D {
   x: number;
   y: number;
 }
-export const cartesianDistance = (a: Coord2D, b: Coord2D) =>
-  Math.sqrt((b.y - a.y) ** 2 + (b.x - a.x) ** 2);
 
 export interface Dimension2D {
   width: number;
@@ -17,3 +15,11 @@ export interface Velocity2D {
   };
   dTheta: number;
 }
+
+export interface Force2D {
+  fCartesian: {
+    fx: number;
+    fy: number;
+  };
+  torque: number;
+}

src/engine/levels/CarCadr.ts

@@ -1,80 +0,0 @@
-import { Level, LevelNames } from ".";
-import { Game } from "..";
-import {
-  Curry,
-  FunctionApplication,
-  Grass,
-  LambdaFactory,
-  LockedDoor,
-  Player,
-  Wall,
-} from "../entities";
-import { Piston } from "../entities/Piston";
-import { Direction } from "../interfaces";
-import { Grid, SystemNames } from "../systems";
-import { normalRandom } from "../utils";
-
-export class CarCadr extends Level {
-  constructor() {
-    super(LevelNames.CarCadr);
-  }
-
-  public init(game: Game) {
-    const grid = game.getSystem<Grid>(SystemNames.Grid);
-    const dimensions = grid.getGridDimensions();
-
-    const grasses = Array.from({ length: dimensions.width })
-      .fill(0)
-      .map(() => {
-        // random grass
-        return new Grass({
-          x: Math.floor(
-            normalRandom(dimensions.width / 2, dimensions.width / 4, 1.5),
-          ),
-          y: Math.floor(
-            normalRandom(dimensions.height / 2, dimensions.height / 4, 1.5),
-          ),
-        });
-      });
-
-    const entities = [
-      ...grasses,
-      new Player({ x: 9, y: 5 }),
-      // Cadr
-      new Wall({ x: 2, y: 3 }),
-      new Wall({ x: 2, y: 4 }),
-      new Wall({ x: 5, y: 3 }),
-      new LambdaFactory({ x: 4, y: 4 }, "(\\ (x) . x)", 1),
-      new FunctionApplication({ x: 3, y: 5 }, "(_INPUT _KEY)"),
-      new Wall({ x: 2, y: 5 }),
-      new Wall({ x: 4, y: 5 }),
-      new FunctionApplication({ x: 2, y: 6 }, "(_INPUT _EMPTY)"),
-      new Wall({ x: 4, y: 7 }),
-      new Wall({ x: 3, y: 7 }),
-      new Wall({ x: 2, y: 7 }),
-      new Wall({ x: 9, y: 3 }),
-      // Car
-      new LambdaFactory({ x: 10, y: 4 }, "(\\ (x) . x)", 1),
-      new Wall({ x: 12, y: 4 }),
-      new FunctionApplication({ x: 11, y: 5 }, "(_INPUT _EMPTY)"),
-      new Wall({ x: 10, y: 5 }),
-      new Wall({ x: 12, y: 5 }),
-      new Wall({ x: 12, y: 3 }),
-      new FunctionApplication({ x: 12, y: 6 }, "(_INPUT _KEY)"),
-      new Wall({ x: 10, y: 7 }),
-      new Wall({ x: 11, y: 7 }),
-      new Wall({ x: 12, y: 7 }),
-      // solve!
-      new LockedDoor({ x: 7, y: 8 }),
-      new LockedDoor({ x: 7, y: 9 }),
-      new Curry({ x: 7, y: 10 }),
-      new Wall({ x: 6, y: 9 }),
-      new Wall({ x: 8, y: 9 }),
-      new Wall({ x: 6, y: 10 }),
-      new Wall({ x: 8, y: 10 }),
-      new Wall({ x: 7, y: 11 }),
-    ];
-
-    entities.forEach((entity) => game.addEntity(entity));
-  }
-}

src/engine/levels/LevelNames.ts

@@ -1,5 +1,4 @@
 export namespace LevelNames {
   export const Tutorial = "0";
-  export const CarCadr = "1";
   export const LevelSelection = "LevelSelection";
 }

src/engine/levels/LevelSelection.ts

@@ -1,12 +1,9 @@
 import { LEVELS, Level, LevelNames } from ".";
 import { Game } from "..";
-import { Grass, Player, Portal } from "../entities";
+import { Player, Portal } from "../entities";
 import { Grid, Level as LevelSystem, SystemNames } from "../systems";
-import { normalRandom } from "../utils";
 
 export class LevelSelection extends Level {
-  public static RADIUS = 5;
-
   constructor() {
     super(LevelNames.LevelSelection);
   }
@@ -14,43 +11,23 @@ export class LevelSelection extends Level {
   public init(game: Game): void {
     const gridSystem = game.getSystem<Grid>(SystemNames.Grid);
     const center = gridSystem.getCenterGrid();
-    const dimensions = gridSystem.getGridDimensions();
 
     const levelSystem = game.getSystem<LevelSystem>(SystemNames.Level);
     const unlocked = levelSystem.getUnlockedLevels();
 
-    const renderableLevels = LEVELS.filter(
-      ({ name }) => name !== LevelNames.LevelSelection,
-    );
-    const radiansPerLevel = (2 * Math.PI) / renderableLevels.length;
-    renderableLevels
-      .filter(({ name }) => unlocked.has(name))
-      .map((level, i) => {
-        const radians = i * radiansPerLevel;
-        const coords = {
-          x: Math.floor(Math.cos(radians) * LevelSelection.RADIUS + center.x),
-          y: Math.floor(Math.sin(radians) * LevelSelection.RADIUS + center.y),
-        };
-        return new Portal(level.name, coords);
-      })
-      .forEach((e) => game.addEntity(e));
+    LEVELS.forEach((level, i) => {
+      if (
+        !unlocked.has(level.name) ||
+        level.name === LevelNames.LevelSelection
+      ) {
+        return;
+      }
+
+      const portal = new Portal(level.name, { x: i, y: 7 });
+      game.addEntity(portal);
+    });
 
     const player = new Player(center);
     game.addEntity(player);
-
-    Array.from({ length: dimensions.width })
-      .fill(0)
-      .map(() => {
-        // random grass
-        return new Grass({
-          x: Math.floor(
-            normalRandom(dimensions.width / 2, dimensions.width / 4, 1.5),
-          ),
-          y: Math.floor(
-            normalRandom(dimensions.height / 2, dimensions.height / 4, 1.5),
-          ),
-        });
-      })
-      .forEach((e) => game.addEntity(e));
   }
 }

src/engine/levels/Tutorial.ts

@@ -43,7 +43,7 @@ export class Tutorial extends Level {
         { x: 4, y: 3 },
       ),
       new Sign(
-        "<div>this is a Term Application; interact to view its code<br><br>push the term ➡️ created by the factory any direction into the Application to produce a new one 💭<br><br>note that:<br><br>+ _INPUT is the term replaced by the pushed term<br><br>+ in this case _KEY is applied to the function to make a new KEY! 🔑</div>",
+        "this is a Term Application; interact to view its code<br><br>push the term ➡️ created by the factory any direction into the Application to produce a new one 💭<br><br>note that:<br><br>+ _INPUT is the term replaced by the pushed term<br><br>+ in this case _KEY is applied to the function to make a new KEY! 🔑",
         { x: 4, y: 6 },
       ),
       new Wall({ x: 10, y: 9 }),

src/engine/levels/index.ts

@@ -2,17 +2,11 @@ export * from "./LevelNames";
 export * from "./Level";
 export * from "./LevelSelection";
 export * from "./Tutorial";
-export * from "./CarCadr";
 
 import { LevelNames } from ".";
-import { CarCadr, LevelSelection, Tutorial, Level } from ".";
+import { LevelSelection, Tutorial, Level } from ".";
 
-export const LEVELS: Level[] = [
-  new LevelSelection(),
-  new Tutorial(),
-  new CarCadr(),
-];
+export const LEVELS: Level[] = [new LevelSelection(), new Tutorial()];
 export const LEVEL_PROGRESSION: Record<string, string[]> = {
   [LevelNames.LevelSelection]: [LevelNames.Tutorial],
-  [LevelNames.Tutorial]: [LevelNames.CarCadr],
 };

src/engine/systems/FacingDirection.ts

@@ -27,38 +27,34 @@ export class FacingDirection extends System {
     game.forEachEntityWithComponent(
       ComponentNames.FacingDirection,
       (entity) => {
-        const facingDirection = entity.getComponent<FacingDirectionComponent>(
-          ComponentNames.FacingDirection,
-        );
-        if (!entity.hasComponent(ComponentNames.Sprite)) {
+        if (!entity.hasComponent(ComponentNames.BoundingBox)) {
           return;
         }
 
-        if (entity.hasComponent(ComponentNames.Control)) {
-          const boundingBox = entity.getComponent<BoundingBox>(
-            ComponentNames.BoundingBox,
-          )!;
+        const boundingBox = entity.getComponent<BoundingBox>(
+          ComponentNames.BoundingBox,
+        )!;
+        const facingDirection = entity.getComponent<FacingDirectionComponent>(
+          ComponentNames.FacingDirection,
+        );
 
-          const { center } = boundingBox;
-          const angle = Math.atan2(
-            mousePosition.y - center.y,
-            mousePosition.x - center.x,
-          );
+        const { center } = boundingBox;
+        const angle = Math.atan2(
+          mousePosition.y - center.y,
+          mousePosition.x - center.x,
+        );
 
-          const mouseInBoundingBox =
-            boundingBox.isCollidingWith(mouseBoundingBox);
-          const direction = mouseInBoundingBox
-            ? Direction.NONE
-            : angleToDirection(angle);
+        const mouseInBoundingBox =
+          boundingBox.isCollidingWith(mouseBoundingBox);
+        const direction = mouseInBoundingBox
+          ? Direction.NONE
+          : angleToDirection(angle);
 
-          facingDirection.setDirection(direction);
-          entity.addComponent(facingDirection);
-        }
+        facingDirection.setDirection(direction);
+        entity.addComponent(facingDirection);
 
         const oldSprite = entity.getComponent<Sprite>(ComponentNames.Sprite);
-        const sprite = facingDirection.directionSprites.get(
-          facingDirection.currentDirection,
-        )!;
+        const sprite = facingDirection.directionSprites.get(direction)!;
         sprite.fillTimingsFromSprite(oldSprite);
 
         entity.addComponent(sprite);

src/engine/systems/Grid.ts

@@ -54,9 +54,6 @@ export class Grid extends System {
         if (!entity.hasComponent(ComponentNames.Grid)) {
           return;
         }
-        if (!entity.hasComponent(ComponentNames.Control)) {
-          return;
-        }
 
         const grid = entity.getComponent<GridComponent>(ComponentNames.Grid)!;
         const facingDirection = entity.getComponent<FacingDirection>(
@@ -142,17 +139,11 @@ export class Grid extends System {
         );
 
         if (collidingEntities.length > 0) {
-          // ensure everything that is a "pushable" or "colliding" which will collide with the entity
-          // can actually continue moving in the direction
+          // i.e. key going into a door or function going into an application
           const allEntitiesInPreviousCellCanCollide = Array.from(
             this.grid[currentPosition.y][currentPosition.x],
           )
             .map((id) => game.getEntity(id)!)
-            .filter(
-              (entity) =>
-                entity.hasComponent(ComponentNames.Colliding) ||
-                entity.hasComponent(ComponentNames.Pushable),
-            )
             .every((entity) =>
               collidingEntities.every((collidingEntity) =>
                 Collision.canCollide(entity.name, collidingEntity.name),

src/engine/systems/Input.ts

@@ -1,4 +1,4 @@
-import { Grid as GridSystem, SystemNames, System, Level } from ".";
+import { Grid as GridSystem, SystemNames, System } from ".";
 import { Game } from "..";
 import { ComponentNames, Grid, Interactable } from "../components";
 import { Control } from "../components/Control";
@@ -31,10 +31,6 @@ export class Input extends System {
   }
 
   public update(_dt: number, game: Game) {
-    if (this.hasSomeKey(KeyConstants.ActionKeys.get(Action.RESET))) {
-      game.getSystem<Level>(SystemNames.Level).reset(game);
-    }
-
     game.forEachEntityWithComponent(ComponentNames.Control, (entity) =>
       this.handleMovement(entity, game),
     );

src/engine/systems/Level.ts

@@ -3,9 +3,8 @@ import { Game } from "..";
 import { type Level as LevelType, LEVELS, LEVEL_PROGRESSION } from "../levels";
 
 export class Level extends System {
-  // TODO: read from localstorage
-  private unlockedLevels: Set<string> = new Set();
-  private currentLevel: LevelType | null = null;
+  private unlockedLevels: Set<string>;
+  private currentLevel: LevelType | null;
   private moveToLevel: string | null;
   private levelMap: Map<string, LevelType>;
 
@@ -17,18 +16,15 @@ export class Level extends System {
       this.levelMap.set(level.name, level);
     });
 
+    this.currentLevel = null;
     this.moveToLevel = initialLevel;
+    this.unlockedLevels = new Set();
   }
 
   public setLevel(level: string) {
     this.moveToLevel = level;
   }
 
-  public reset(game: Game) {
-    game.resetState();
-    this.currentLevel?.init(game);
-  }
-
   public update(_dt: number, game: Game) {
     if (this.moveToLevel === this.currentLevel?.name || !this.moveToLevel) {
       return;

src/engine/systems/Modal.ts

@@ -1,93 +0,0 @@
-import { Game } from "..";
-import { System, SystemNames } from ".";
-import { Miscellaneous, ModalClose, ModalOpen, SOUNDS } from "../config";
-import { ComponentNames, Modal as ModalComponent } from "../components";
-import { Entity } from "../entities";
-import {
-  CodeConsumer,
-  CodeEditorInstance,
-  CodeEditorSingleton,
-  ModalInstance,
-  ModalSingleton,
-} from "../utils";
-
-export interface ModalInitState {
-  type: "CONTENT" | "CODE_EDITOR";
-  contentInit?: {
-    content: string;
-  };
-  codeInit?: {
-    code: string;
-    codeConsumer: CodeConsumer;
-    readonly?: boolean;
-    result?: { data?: string; error?: string };
-  };
-}
-
-export class Modal extends System {
-  private openingEntity: null | Entity = null;
-  private modalInstance: ModalInstance = ModalSingleton;
-  private codeEditorInstance: CodeEditorInstance = CodeEditorSingleton;
-
-  constructor() {
-    super(SystemNames.Modal);
-  }
-
-  public update(_dt: number, game: Game) {
-    if (this.openingEntity) {
-      if (this.openingEntity.hasComponent(ComponentNames.Modal)) {
-        return;
-      }
-      this.closeCallback();
-    }
-
-    game.forEachEntityWithComponent(ComponentNames.Modal, (entity) => {
-      const modalComponent = entity.getComponent<ModalComponent>(
-        ComponentNames.Modal,
-      );
-      if (this.openingEntity) {
-        return;
-      }
-
-      this.openingEntity = entity;
-      SOUNDS.get(ModalOpen.name)!.play();
-
-      if (modalComponent.initState.type === "CONTENT") {
-        const content = `
-          <div style="text-align:center"> 
-            <div>${modalComponent.initState.contentInit!.content}</div>
-            <br> 
-            <button id="close">Close</button>
-          </div>`;
-        this.modalInstance.open(content);
-        document
-          .getElementById("close")
-          ?.addEventListener("click", this.closeCallback.bind(this));
-      }
-
-      if (modalComponent.initState.type === "CODE_EDITOR") {
-        this.codeEditorInstance.open(
-          modalComponent.initState.codeInit!.code,
-          (code) => {
-            const result =
-              modalComponent.initState.codeInit!.codeConsumer(code);
-            if (result.consumed) {
-              this.closeCallback();
-            }
-            return result;
-          },
-          !!modalComponent.initState.codeInit!.readonly,
-          modalComponent.initState.codeInit!.result,
-        );
-      }
-    });
-  }
-
-  private closeCallback() {
-    this.openingEntity = null;
-    this.modalInstance.vanish();
-    this.codeEditorInstance.close();
-    document.getElementById(Miscellaneous.CANVAS_ID)!.focus();
-    SOUNDS.get(ModalClose.name)!.play();
-  }
-}

src/engine/systems/RadialObserve.ts

@@ -1,65 +0,0 @@
-import { System, SystemNames } from ".";
-import {
-  ComponentNames,
-  Grid,
-  RadialObserve as RadialObserveComponent,
-} from "../components";
-import { Entity, EntityNames } from "../entities";
-import { Game } from "../Game";
-import { cartesianDistance } from "../interfaces";
-
-const radialObservations: Record<string, Set<string>> = {
-  [EntityNames.Piston]: new Set([EntityNames.FunctionBox]),
-};
-
-export class RadialObserve extends System {
-  constructor() {
-    super(SystemNames.RadialObserve);
-  }
-
-  public update(_dt: number, game: Game) {
-    game.forEachEntityWithComponent(ComponentNames.RadialObserve, (entity) => {
-      if (!(entity.name in radialObservations)) {
-        return;
-      }
-      const observable = radialObservations[entity.name];
-
-      const entityObserve = entity.getComponent<RadialObserveComponent>(
-        ComponentNames.RadialObserve,
-      );
-      if (!entityObserve.onObservation) {
-        return;
-      }
-
-      const entityPosition = entity.getComponent<Grid>(
-        ComponentNames.Grid,
-      ).gridPosition;
-
-      const observations: Entity[] = [];
-      game.forEachEntityWithComponent(ComponentNames.RadialObserve, (other) => {
-        if (entity === other) {
-          return;
-        }
-        if (!observable.has(other.name)) {
-          return;
-        }
-
-        const otherPosition = other.getComponent<Grid>(
-          ComponentNames.Grid,
-        ).gridPosition;
-        if (
-          cartesianDistance(entityPosition, otherPosition) >
-          entityObserve.radius
-        ) {
-          return;
-        }
-
-        observations.push(other);
-      });
-
-      for (const observation of observations) {
-        entityObserve.onObservation!(game, observation);
-      }
-    });
-  }
-}

src/engine/systems/SystemNames.ts

@@ -8,6 +8,4 @@ export namespace SystemNames {
   export const Life = "Life";
   export const Music = "Music";
   export const Level = "Level";
-  export const Modal = "Modal";
-  export const RadialObserve = "RadialObserve";
 }

src/engine/systems/index.ts

@@ -9,5 +9,3 @@ export * from "./Collision";
 export * from "./Life";
 export * from "./Music";
 export * from "./Level";
-export * from "./Modal";
-export * from "./RadialObserve";

src/engine/utils/CodeEditor.ts

@@ -1,202 +0,0 @@
-import {
-  EditorState,
-  StateField,
-  StateEffect,
-  Range,
-  Extension,
-} from "@codemirror/state";
-import { Decoration, EditorView, keymap } from "@codemirror/view";
-import { defaultKeymap } from "@codemirror/commands";
-import rainbowBrackets from "rainbowbrackets";
-import { basicSetup } from "codemirror";
-import { ModalInstance, ModalSingleton } from ".";
-import { EditorSave, Failure, SOUNDS } from "../config";
-
-export interface CodeEditorError extends Error {
-  location: {
-    start: { offset: number };
-    end: { offset: number };
-  };
-}
-
-export type CodeConsumer = (code: string) => {
-  consumed?: boolean;
-  error?: CodeEditorError;
-};
-
-interface CodeEditorState {
-  view: EditorView;
-  editorElement: HTMLElement;
-  errorElement: HTMLElement;
-  resultElement: HTMLElement;
-  closeButton: HTMLButtonElement;
-  codeConsumer: CodeConsumer;
-}
-
-export class CodeEditorInstance {
-  constructor(
-    private modalInstance: ModalInstance = ModalSingleton,
-    private codeEditorState: CodeEditorState | null = null,
-  ) {}
-
-  public close() {
-    if (!this.codeEditorState) {
-      return;
-    }
-
-    this.codeEditorState.view.destroy();
-    this.codeEditorState = null;
-
-    SOUNDS.get(EditorSave.name)!.play();
-  }
-
-  public open(
-    initCode: string,
-    codeConsumer: CodeEditorState["codeConsumer"],
-    readonly: boolean = false,
-    initResult: { data?: string; error?: string } = {},
-  ) {
-    if (this.codeEditorState) {
-      throw new Error("code editor instance is already owned.");
-    }
-    const modalContent = `
-      <div class='code'>
-        <div id='code'></div>
-        <br>
-        <p id='error' class='error'></p>
-        <p id='result' class='result'></p>
-        <button id='close-modal'>Done</button>
-      </div>
-    `;
-    this.modalInstance.open(modalContent);
-
-    const startState = EditorState.create({
-      doc: initCode,
-      extensions: [
-        basicSetup,
-        keymap.of(defaultKeymap),
-        rainbowBrackets(),
-        highlightExtension,
-        FontSizeThemeExtension,
-        EditorState.readOnly.of(readonly),
-      ],
-    });
-
-    const codeBox = document.getElementById("code")!;
-    const errorElement = document.getElementById("error")!;
-    const resultElement = document.getElementById("result")!;
-
-    const closeButton = document.getElementById(
-      "close-modal",
-    ) as HTMLButtonElement;
-    closeButton.addEventListener("click", () => this.onSave());
-
-    const editorView = new EditorView({
-      state: startState,
-      parent: codeBox,
-    });
-    editorView.focus();
-
-    this.codeEditorState = {
-      view: editorView,
-      editorElement: codeBox,
-      errorElement,
-      resultElement,
-      closeButton,
-      codeConsumer,
-    };
-    this.setResult(initResult);
-  }
-
-  private refreshCodeEditorText(text: string) {
-    if (!this.codeEditorState) {
-      return;
-    }
-    const { view } = this.codeEditorState;
-
-    view.dispatch({
-      changes: {
-        from: 0,
-        to: text.length,
-        insert: "",
-      },
-    });
-    view.dispatch({
-      changes: {
-        from: 0,
-        to: 0,
-        insert: text,
-      },
-    });
-  }
-
-  private onSave() {
-    if (!this.codeEditorState) {
-      throw new Error();
-    }
-
-    const { view } = this.codeEditorState;
-    const code = view.state.doc.toString();
-    this.refreshCodeEditorText(code);
-
-    const valid = this.codeEditorState.codeConsumer(code);
-    if (!valid.error) {
-      return;
-    }
-
-    const {
-      location: {
-        start: { offset: start },
-        end: { offset: end },
-      },
-      message,
-    } = valid.error;
-
-    view.dispatch({
-      effects: highlightEffect.of([
-        syntaxErrorDecoration.range(start === end ? start - 1 : start, end),
-      ]),
-    });
-
-    this.setResult({ error: message });
-    SOUNDS.get(Failure.name)!.play();
-  }
-
-  private setResult(result: { data?: string; error?: string }) {
-    if (!this.codeEditorState) {
-      return;
-    }
-    this.codeEditorState.resultElement.innerText = result.data ?? "";
-    this.codeEditorState.errorElement.innerText = result.error ?? "";
-  }
-}
-
-const highlightEffect = StateEffect.define<Range<Decoration>[]>();
-const highlightExtension = StateField.define({
-  create() {
-    return Decoration.none;
-  },
-  update(value, transaction) {
-    value = value.map(transaction.changes);
-
-    for (let effect of transaction.effects) {
-      if (effect.is(highlightEffect))
-        value = value.update({ add: effect.value, sort: true });
-    }
-
-    return value;
-  },
-  provide: (f) => EditorView.decorations.from(f),
-});
-
-const FontSizeTheme = EditorView.theme({
-  $: {
-    fontSize: "14pt",
-  },
-});
-const FontSizeThemeExtension: Extension = [FontSizeTheme];
-const syntaxErrorDecoration = Decoration.mark({
-  class: "syntax-error",
-});
-
-export const CodeEditorSingleton = new CodeEditorInstance();

src/engine/utils/Modal.ts

@@ -1,45 +0,0 @@
-import { Miscellaneous } from "../config";
-
-export class ModalInstance {
-  private modalOpen: boolean = false;
-  private elementId: string = Miscellaneous.MODAL_ID;
-  private contentId: string = Miscellaneous.MODAL_CONTENT_ID;
-
-  public open(content: string) {
-    const modal = document.getElementById(this.elementId);
-    const modalContent = document.getElementById(this.contentId);
-    if (!modal || this.modalOpen) {
-      return;
-    }
-
-    this.modalOpen = true;
-    modal.style.display = "flex";
-    modal.style.animation = "fadeIn 0.25s";
-
-    modalContent!.innerHTML = content;
-    modalContent!.style.animation = "scaleUp 0.25s";
-  }
-
-  public vanish(): Promise<void> {
-    const modal = document.getElementById(this.elementId);
-    const modalContent = document.getElementById(this.contentId);
-    return new Promise((res, _rej) => {
-      if (!(modal && this.modalOpen && modalContent)) {
-        res();
-        return;
-      }
-      modal.style.animation = "fadeOut 0.25s";
-      modalContent.style.animation = "scaleDown 0.25s";
-
-      setTimeout(() => {
-        modalContent.innerHTML = "";
-        modal.style.display = "none";
-
-        this.modalOpen = false;
-        res();
-      }, 200);
-    });
-  }
-}
-
-export const ModalSingleton = new ModalInstance();

src/engine/utils/index.ts

@@ -1,8 +1,6 @@
 export * from "./clamp";
 export * from "./dotProduct";
 export * from "./rotateVector";
+export * from "./modal";
 export * from "./colors";
 export * from "./random";
-export * from "./tryWrap";
-export * from "./Modal";
-export * from "./CodeEditor";

src/engine/utils/modal.ts

@@ -0,0 +1,41 @@
+import { Miscellaneous } from "../config";
+
+let modalOpen = false;
+
+export const openModal = (
+  content: string,
+  id = Miscellaneous.MODAL_ID,
+  contentId = Miscellaneous.MODAL_CONTENT_ID,
+) => {
+  const modal = document.getElementById(id);
+  const modalContent = document.getElementById(contentId);
+  if (modal && !modalOpen && modalContent) {
+    modal.style.display = "flex";
+    modal.style.animation = "fadeIn 0.25s";
+
+    modalContent.innerHTML = content;
+    modalContent.style.animation = "scaleUp 0.25s";
+
+    modalOpen = true;
+  }
+};
+
+export const closeModal = (
+  id = Miscellaneous.MODAL_ID,
+  contentId = Miscellaneous.MODAL_CONTENT_ID,
+) => {
+  const modal = document.getElementById(id);
+  const modalContent = document.getElementById(contentId);
+
+  if (modal && modalOpen && modalContent) {
+    modal.style.animation = "fadeOut 0.25s";
+    modalContent.style.animation = "scaleDown 0.25s";
+
+    setTimeout(() => {
+      modalContent.innerHTML = "";
+      modal.style.display = "none";
+
+      modalOpen = false;
+    }, 200);
+  }
+};

src/engine/utils/tryWrap.ts

@@ -1,7 +0,0 @@
-export const tryWrap = <T>(supplier: () => T): { data?: T; error?: any } => {
-  try {
-    return { data: supplier() };
-  } catch (error) {
-    return { error: error as any };
-  }
-};

src/interpreter/interpreter.ts

@@ -9,8 +9,6 @@ import {
 
 export class InvalidLambdaTermError extends Error {}
 
-export class MaxRecursionDepthError extends Error {}
-
 export type DebrujinAbstraction = {
   abstraction: {
     param: string;
@@ -154,11 +152,7 @@ export const adjustIndices = (
 
 export const betaReduce = (
   term: DebrujinifiedLambdaTerm,
-  maxDepth: number,
 ): DebrujinifiedLambdaTerm => {
-  if (maxDepth === 0) {
-    throw new MaxRecursionDepthError("max recursion depth identified");
-  }
   if ("index" in term) {
     return term;
   }
@@ -168,7 +162,7 @@ export const betaReduce = (
 
     return {
       abstraction: {
-        body: betaReduce(body, maxDepth - 1),
+        body: betaReduce(body),
         param,
       },
     };
@@ -176,9 +170,7 @@ export const betaReduce = (
 
   if ("application" in term) {
     const { left } = term.application;
-    const args = term.application.args.map((term) =>
-      betaReduce(term, maxDepth - 1),
-    );
+    const args = term.application.args.map(betaReduce);
 
     return args.reduce((acc: DebrujinifiedLambdaTerm, x) => {
       if ("abstraction" in acc) {
@@ -249,19 +241,18 @@ export const emitNamed = (term: DebrujinifiedLambdaTerm): string => {
 export const interpret = (
   term: string,
   symbolTable = new SymbolTable(),
-  allowUnderscores = false, // in our world, underscores should be internal to the game.
-  maxDepth = 15,
+  allowUnderscores = false,
 ): DebrujinifiedLambdaTerm => {
   const ast = parse(term, allowUnderscores);
   const debrujined = debrujinify(ast, symbolTable);
 
   let prev = debrujined;
-  let next = betaReduce(prev, maxDepth);
+  let next = betaReduce(prev);
 
   while (emitDebrujin(prev) !== emitDebrujin(next)) {
     // alpha equivalence
     prev = next;
-    next = betaReduce(prev, maxDepth);
+    next = betaReduce(prev);
   }
   return next;
 };