Fix build errors

nand2tetris · Jul 31, 2024 · fe7a17c · fe7a17c
1 parent 29b7da4
commit fe7a17c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/components/src/stores/chip.store.ts b/components/src/stores/chip.store.ts
@@ -26,7 +26,6 @@ import { assertExists } from "@davidsouther/jiffies/lib/esm/assert.js";
 import { FileSystem } from "@davidsouther/jiffies/lib/esm/fs.js";
 import { getBuiltinChip } from "@nand2tetris/simulator/chip/builtins/index.js";
 import { TST } from "@nand2tetris/simulator/languages/tst.js";
-import { Action } from "@nand2tetris/simulator/types.js";
 import { compare } from "../compare.js";
 import { RunSpeed } from "../runbar.js";
 import { BaseContext } from "./base.context.js";

diff --git a/simulator/src/chip/builder.test.ts b/simulator/src/chip/builder.test.ts
@@ -183,7 +183,7 @@ describe("Chip Builder", () => {
         Nand(a=in, b=myNand, out=myNand);
       }`),
       );
-      const foo = await build(chip);
+      const foo = await build({ parts: chip });
       expect(foo).toBeErr();
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any

diff --git a/simulator/src/chip/builtins/all.test.ts b/simulator/src/chip/builtins/all.test.ts
@@ -25,7 +25,7 @@ describe("All Projects", () => {
     )("Builtin %s", async (chipName) => {
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
-      const ChipProject = ChipProjects[project]?.CHIPS;
+      const ChipProject = ChipProjects[project]?.CHIPS[chipName];
       let hdlFile: string = ChipProject?.[`${chipName}.hdl`];
       const tstFile: string = ChipProject?.[`${chipName}.tst`];
       const cmpFile: string = ChipProject?.[`${chipName}.cmp`];

diff --git a/simulator/src/projects/all.test.ts b/simulator/src/projects/all.test.ts
@@ -51,8 +51,8 @@ describe("Chip Projects", () => {
           ...ChipProjectsSols[project]!,
         };
         const hdlFile = chipProject.SOLS[chipName]?.[`${chipName}.hdl`];
-        const tstFile = chipProject.CHIPS?.[`${chipName}.tst`];
-        const cmpFile = chipProject.CHIPS?.[`${chipName}.cmp`];
+        const tstFile = chipProject.CHIPS[chipName]?.[`${chipName}.tst`];
+        const cmpFile = chipProject.CHIPS[chipName]?.[`${chipName}.cmp`];
 
         expect(hdlFile).toBeDefined();
         expect(tstFile).toBeDefined();