Update eslint, fix issues

js/apple2.ts

@@ -78,7 +78,7 @@ export class Apple2 implements Restorable<State>, DebuggerContainer {
         renderedFrames: 0
     };
 
-    public ready: Promise<void>
+    public ready: Promise<void>;
 
     constructor(options: Apple2Options) {
         this.ready = this.init(options);

js/canvas.ts

@@ -122,9 +122,9 @@ export class LoresPage2D implements LoresPage {
     private _refreshing = false;
     private _blink = false;
 
-    private highColorTextMode = false
+    private highColorTextMode = false;
 
-    dirty: Region = {...notDirty}
+    dirty: Region = {...notDirty};
     imageData: ImageData;
 
     constructor(

js/cards/ramfactor.ts

@@ -27,9 +27,9 @@ const LOC = {
 } as const;
 
 export class RAMFactorState {
-    loc: number
+    loc: number;
-    firmware: byte
+    firmware: byte;
-    mem: memory
+    mem: memory;
 }
 
 export default class RAMFactor implements Card, Restorable<RAMFactorState> {

js/cpu6502.ts

@@ -174,7 +174,7 @@ export default class CPU6502 {
     /** Program counter */
     private pc: word = 0;
     /** Status register */
-    private sr: byte = flags.X
+    private sr: byte = flags.X;
     /** Accumulator */
     private ar: byte = 0;
     /** X index */
@@ -185,7 +185,7 @@ export default class CPU6502 {
     private sp: byte = 0xff;
 
     /** Current instruction */
-    private op: Instruction
+    private op: Instruction;
     /** Last accessed memory address */
     private addr: word = 0;
 
@@ -437,7 +437,7 @@ export default class CPU6502 {
 
     implied = () => {
         this.readByte(this.pc);
-    }
+    };
 
     /*
      * Read functions
@@ -446,17 +446,17 @@ export default class CPU6502 {
     // #$00
     readImmediate = (): byte => {
         return this.readBytePC();
-    }
+    };
 
     // $0000
     readAbsolute = (): byte => {
         return this.readByte(this.readWordPC());
-    }
+    };
 
     // $00
     readZeroPage = (): byte => {
         return this.readByte(this.readBytePC());
-    }
+    };
 
     // $0000,X
     readAbsoluteX = (): byte => {
@@ -465,7 +465,7 @@ export default class CPU6502 {
         const addrIdx = (addr + this.xr) & 0xffff;
         this.workCycleIndexedRead(pc, addr, addrIdx);
         return this.readByte(addrIdx);
-    }
+    };
 
     // $0000,Y
     readAbsoluteY = (): byte => {
@@ -474,21 +474,21 @@ export default class CPU6502 {
         const addrIdx = (addr + this.yr) & 0xffff;
         this.workCycleIndexedRead(pc, addr, addrIdx);
         return this.readByte(addrIdx);
-    }
+    };
 
     // $00,X
     readZeroPageX = (): byte => {
         const zpAddr = this.readBytePC();
         this.readByte(zpAddr);
         return this.readByte((zpAddr + this.xr) & 0xff);
-    }
+    };
 
     // $00,Y
     readZeroPageY = (): byte => {
         const zpAddr = this.readBytePC();
         this.readByte(zpAddr);
         return this.readByte((zpAddr + this.yr) & 0xff);
-    }
+    };
 
     // ($00,X)
     readZeroPageXIndirect = (): byte => {
@@ -496,7 +496,7 @@ export default class CPU6502 {
         this.readByte(zpAddr);
         const addr = this.readZPWord((zpAddr + this.xr) & 0xff);
         return this.readByte(addr);
-    }
+    };
 
     // ($00),Y
     readZeroPageIndirectY = (): byte => {
@@ -506,12 +506,12 @@ export default class CPU6502 {
         const addrIdx = (addr + this.yr) & 0xffff;
         this.workCycleIndexedRead(pc, addr, addrIdx);
         return this.readByte(addrIdx);
-    }
+    };
 
     // ($00) (65C02)
     readZeroPageIndirect = (): byte => {
         return this.readByte(this.readZPWord(this.readBytePC()));
-    }
+    };
 
     /*
      * Write Functions
@@ -520,12 +520,12 @@ export default class CPU6502 {
     // $0000
     writeAbsolute = (val: byte) => {
         this.writeByte(this.readWordPC(), val);
-    }
+    };
 
     // $00
     writeZeroPage = (val: byte) => {
         this.writeByte(this.readBytePC(), val);
-    }
+    };
 
     // $0000,X
     writeAbsoluteX = (val: byte) => {
@@ -534,7 +534,7 @@ export default class CPU6502 {
         const addrIdx = (addr + this.xr) & 0xffff;
         this.workCycleIndexedWrite(pc, addr, addrIdx);
         this.writeByte(addrIdx, val);
-    }
+    };
 
     // $0000,Y
     writeAbsoluteY = (val: byte) => {
@@ -543,21 +543,21 @@ export default class CPU6502 {
         const addrIdx = (addr + this.yr) & 0xffff;
         this.workCycleIndexedWrite(pc, addr, addrIdx);
         this.writeByte(addrIdx, val);
-    }
+    };
 
     // $00,X
     writeZeroPageX = (val: byte) => {
         const zpAddr = this.readBytePC();
         this.readByte(zpAddr);
         this.writeByte((zpAddr + this.xr) & 0xff, val);
-    }
+    };
 
     // $00,Y
     writeZeroPageY = (val: byte) => {
         const zpAddr = this.readBytePC();
         this.readByte(zpAddr);
         this.writeByte((zpAddr + this.yr) & 0xff, val);
-    }
+    };
 
     // ($00,X)
     writeZeroPageXIndirect = (val: byte) => {
@@ -565,7 +565,7 @@ export default class CPU6502 {
         this.readByte(zpAddr);
         const addr = this.readZPWord((zpAddr + this.xr) & 0xff);
         this.writeByte(addr, val);
-    }
+    };
 
     // ($00),Y
     writeZeroPageIndirectY = (val: byte) => {
@@ -575,29 +575,29 @@ export default class CPU6502 {
         const addrIdx = (addr + this.yr) & 0xffff;
         this.workCycleIndexedWrite(pc, addr, addrIdx);
         this.writeByte(addrIdx, val);
-    }
+    };
 
     // ($00) (65C02)
     writeZeroPageIndirect = (val: byte) => {
         this.writeByte(this.readZPWord(this.readBytePC()), val);
-    }
+    };
 
     // $00
     readAddrZeroPage = () => {
         return this.readBytePC();
-    }
+    };
 
     // $00,X
     readAddrZeroPageX = () => {
         const zpAddr = this.readBytePC();
         this.readByte(zpAddr);
         return (zpAddr + this.xr) & 0xff;
-    }
+    };
 
     // $0000 (65C02)
     readAddrAbsolute = (): word => {
         return this.readWordPC();
-    }
+    };
 
     // ($0000) (6502)
     readAddrAbsoluteIndirectBug = (): word => {
@@ -607,14 +607,14 @@ export default class CPU6502 {
         const lsb = this.readByte(addr);
         const msb = this.readByte(page | ((off + 0x01) & 0xff));
         return msb << 8 | lsb;
-    }
+    };
 
     // ($0000) (65C02)
     readAddrAbsoluteIndirect = (): word => {
         const addr = this.readWord(this.readWordPC());
         this.readByte(this.addr);
         return addr;
-    }
+    };
 
     // $0000,X
     readAddrAbsoluteX = (opts?: Opts): word => {
@@ -635,7 +635,7 @@ export default class CPU6502 {
             this.readByte(page | off);
         }
         return addr;
-    }
+    };
 
     // $(0000,X) (65C02)
     readAddrAbsoluteXIndirect = (): word => {
@@ -645,13 +645,13 @@ export default class CPU6502 {
         const addr = (((msb << 8) | lsb) + this.xr) & 0xffff;
         this.readByte(pc);
         return this.readWord(addr);
-    }
+    };
 
     // 5C, DC, FC NOP
     readNop = (): void => {
         this.readWordPC();
         this.readByte(this.addr);
-    }
+    };
 
     /* Break */
     brk = (readFn: ReadFn) => {
@@ -663,58 +663,58 @@ export default class CPU6502 {
         }
         this.setFlag(flags.I, true);
         this.pc = this.readWord(loc.BRK);
-    }
+    };
 
     /* Load Accumulator */
     lda = (readFn: ReadFn) => {
         this.ar = this.testNZ(readFn());
-    }
+    };
 
     /* Load X Register */
     ldx = (readFn: ReadFn) => {
         this.xr = this.testNZ(readFn());
-    }
+    };
 
     /* Load Y Register */
     ldy = (readFn: ReadFn) => {
         this.yr = this.testNZ(readFn());
-    }
+    };
 
     /* Store Accumulator */
     sta = (writeFn: WriteFn) => {
         writeFn(this.ar);
-    }
+    };
 
     /* Store X Register */
     stx = (writeFn: WriteFn) => {
         writeFn(this.xr);
-    }
+    };
 
     /* Store Y Register */
     sty = (writeFn: WriteFn) => {
         writeFn(this.yr);
-    }
+    };
 
     /* Store Zero */
     stz = (writeFn: WriteFn) => {
         writeFn(0);
-    }
+    };
 
     /* Add with Carry */
     adc = (readFn: ReadFn) => {
         this.ar = this.add(this.ar, readFn(), /* sub= */ false);
-    }
+    };
 
     /* Subtract with Carry */
     sbc = (readFn: ReadFn) => {
         this.ar = this.add(this.ar, readFn() ^ 0xff, /* sub= */ true);
-    }
+    };
 
     /* Increment Memory */
     incA = () => {
         this.readByte(this.pc);
         this.ar = this.increment(this.ar);
-    }
+    };
 
     inc = (readAddrFn: ReadAddrFn) => {
         const addr = readAddrFn({ inc: true });
@@ -722,25 +722,25 @@ export default class CPU6502 {
         this.workCycle(addr, oldVal);
         const val = this.increment(oldVal);
         this.writeByte(addr, val);
-    }
+    };
 
     /* Increment X */
     inx = () => {
         this.readByte(this.pc);
         this.xr = this.increment(this.xr);
-    }
+    };
 
     /* Increment Y */
     iny = () => {
         this.readByte(this.pc);
         this.yr = this.increment(this.yr);
-    }
+    };
 
     /* Decrement Memory */
     decA = () => {
         this.readByte(this.pc);
         this.ar = this.decrement(this.ar);
-    }
+    };
 
     dec = (readAddrFn: ReadAddrFn) => {
         const addr = readAddrFn({ inc: true});
@@ -748,30 +748,30 @@ export default class CPU6502 {
         this.workCycle(addr, oldVal);
         const val = this.decrement(oldVal);
         this.writeByte(addr, val);
-    }
+    };
 
     /* Decrement X */
     dex = () => {
         this.readByte(this.pc);
         this.xr = this.decrement(this.xr);
-    }
+    };
 
     /* Decrement Y */
     dey = () => {
         this.readByte(this.pc);
         this.yr = this.decrement(this.yr);
-    }
+    };
 
     shiftLeft = (val: byte) => {
         this.setFlag(flags.C, !!(val & 0x80));
         return this.testNZ((val << 1) & 0xff);
-    }
+    };
 
     /* Arithmetic Shift Left */
     aslA = () => {
         this.readByte(this.pc);
         this.ar = this.shiftLeft(this.ar);
-    }
+    };
 
     asl = (readAddrFn: ReadAddrFn) => {
         const addr = readAddrFn();
@@ -779,18 +779,18 @@ export default class CPU6502 {
         this.workCycle(addr, oldVal);
         const val = this.shiftLeft(oldVal);
         this.writeByte(addr, val);
-    }
+    };
 
     shiftRight = (val: byte) => {
         this.setFlag(flags.C, !!(val & 0x01));
         return this.testNZ(val >> 1);
-    }
+    };
 
     /* Logical Shift Right */
     lsrA = () => {
         this.readByte(this.pc);
         this.ar = this.shiftRight(this.ar);
-    }
+    };
 
     lsr = (readAddrFn: ReadAddrFn) => {
         const addr = readAddrFn();
@@ -798,19 +798,19 @@ export default class CPU6502 {
         this.workCycle(addr, oldVal);
         const val = this.shiftRight(oldVal);
         this.writeByte(addr, val);
-    }
+    };
 
     rotateLeft = (val: byte) => {
         const c = (this.sr & flags.C);
         this.setFlag(flags.C, !!(val & 0x80));
         return this.testNZ(((val << 1) | (c ? 0x01 : 0x00)) & 0xff);
-    }
+    };
 
     /* Rotate Left */
     rolA = () => {
         this.readByte(this.pc);
         this.ar = this.rotateLeft(this.ar);
-    }
+    };
 
     rol = (readAddrFn: ReadAddrFn) => {
         const addr = readAddrFn();
@@ -818,7 +818,7 @@ export default class CPU6502 {
         this.workCycle(addr, oldVal);
         const val = this.rotateLeft(oldVal);
         this.writeByte(addr, val);
-    }
+    };
 
     private rotateRight(a: byte) {
         const c = (this.sr & flags.C);
@@ -830,7 +830,7 @@ export default class CPU6502 {
     rorA = () => {
         this.readByte(this.pc);
         this.ar = this.rotateRight(this.ar);
-    }
+    };
 
     ror = (readAddrFn: ReadAddrFn) => {
         const addr = readAddrFn();
@@ -838,22 +838,22 @@ export default class CPU6502 {
         this.workCycle(addr, oldVal);
         const val = this.rotateRight(oldVal);
         this.writeByte(addr, val);
-    }
+    };
 
     /* Logical And Accumulator */
     and = (readFn: ReadFn) => {
         this.ar = this.testNZ(this.ar & readFn());
-    }
+    };
 
     /* Logical Or Accumulator */
     ora = (readFn: ReadFn) => {
         this.ar = this.testNZ(this.ar | readFn());
-    }
+    };
 
     /* Logical Exclusive Or Accumulator */
     eor = (readFn: ReadFn) => {
         this.ar = this.testNZ(this.ar ^ readFn());
-    }
+    };
 
     /* Reset Bit */
 
@@ -864,7 +864,7 @@ export default class CPU6502 {
         this.readByte(addr);
         val &= bit;
         this.writeByte(addr, val);
-    }
+    };
 
     /* Set Bit */
 
@@ -875,7 +875,7 @@ export default class CPU6502 {
         this.readByte(addr);
         val |= bit;
         this.writeByte(addr, val);
-    }
+    };
 
     /* Test and Reset Bits */
     trb = (readAddrFn: ReadAddrFn) => {
@@ -884,7 +884,7 @@ export default class CPU6502 {
         this.testZ(val & this.ar);
         this.readByte(addr);
         this.writeByte(addr, val & ~this.ar);
-    }
+    };
 
     /* Test and Set Bits */
     tsb = (readAddrFn: ReadAddrFn) => {
@@ -893,7 +893,7 @@ export default class CPU6502 {
         this.testZ(val & this.ar);
         this.readByte(addr);
         this.writeByte(addr, val | this.ar);
-    }
+    };
 
     /* Bit */
     bit = (readFn: ReadFn) => {
@@ -901,13 +901,13 @@ export default class CPU6502 {
         this.setFlag(flags.Z, (val & this.ar) === 0);
         this.setFlag(flags.N, !!(val & 0x80));
         this.setFlag(flags.V, !!(val & 0x40));
-    }
+    };
 
     /* Bit Immediate*/
     bitI = (readFn: ReadFn) => {
         const val = readFn();
         this.setFlag(flags.Z, (val & this.ar) === 0);
-    }
+    };
 
     private compare(a: byte, b: byte) {
         b = (b ^ 0xff);
@@ -918,15 +918,15 @@ export default class CPU6502 {
 
     cmp = (readFn: ReadFn) => {
         this.compare(this.ar, readFn());
-    }
+    };
 
     cpx = (readFn: ReadFn) => {
         this.compare(this.xr, readFn());
-    }
+    };
 
     cpy = (readFn: ReadFn) => {
         this.compare(this.yr, readFn());
-    }
+    };
 
     /* Branches */
     brs = (f: flag) => {
@@ -940,7 +940,7 @@ export default class CPU6502 {
             const newOff = this.pc & 0xff;
             if (newPage !== oldPage) this.readByte(oldPage | newOff);
         }
-    }
+    };
 
     brc = (f: flag|0) => {
         const off = this.readBytePC(); // changes pc
@@ -953,7 +953,7 @@ export default class CPU6502 {
             const newOff = this.pc & 0xff;
             if (newPage !== oldPage) this.readByte(oldPage | newOff);
         }
-    }
+    };
 
     /* WDC 65C02 branches */
 
@@ -972,7 +972,7 @@ export default class CPU6502 {
         if (((1 << b) & val) === 0) {
             this.pc = newPC;
         }
-    }
+    };
 
     bbs = (b: byte) => {
         const zpAddr = this.readBytePC();
@@ -989,41 +989,41 @@ export default class CPU6502 {
         if (((1 << b) & val) !== 0) {
             this.pc = newPC;
         }
-    }
+    };
 
     /* Transfers and stack */
-    tax = () => { this.readByte(this.pc); this.testNZ(this.xr = this.ar); }
+    tax = () => { this.readByte(this.pc); this.testNZ(this.xr = this.ar); };
 
-    txa = () => { this.readByte(this.pc); this.testNZ(this.ar = this.xr); }
+    txa = () => { this.readByte(this.pc); this.testNZ(this.ar = this.xr); };
 
-    tay = () => { this.readByte(this.pc); this.testNZ(this.yr = this.ar); }
+    tay = () => { this.readByte(this.pc); this.testNZ(this.yr = this.ar); };
 
-    tya = () => { this.readByte(this.pc); this.testNZ(this.ar = this.yr); }
+    tya = () => { this.readByte(this.pc); this.testNZ(this.ar = this.yr); };
 
-    tsx = () => { this.readByte(this.pc); this.testNZ(this.xr = this.sp); }
+    tsx = () => { this.readByte(this.pc); this.testNZ(this.xr = this.sp); };
 
-    txs = () => { this.readByte(this.pc); this.sp = this.xr; }
+    txs = () => { this.readByte(this.pc); this.sp = this.xr; };
 
-    pha = () => { this.readByte(this.pc); this.pushByte(this.ar); }
+    pha = () => { this.readByte(this.pc); this.pushByte(this.ar); };
 
-    pla = () => { this.readByte(this.pc); this.readByte(0x0100 | this.sp); this.testNZ(this.ar = this.pullByte()); }
+    pla = () => { this.readByte(this.pc); this.readByte(0x0100 | this.sp); this.testNZ(this.ar = this.pullByte()); };
 
-    phx = () => { this.readByte(this.pc); this.pushByte(this.xr); }
+    phx = () => { this.readByte(this.pc); this.pushByte(this.xr); };
 
-    plx = () => { this.readByte(this.pc); this.readByte(0x0100 | this.sp); this.testNZ(this.xr = this.pullByte()); }
+    plx = () => { this.readByte(this.pc); this.readByte(0x0100 | this.sp); this.testNZ(this.xr = this.pullByte()); };
 
-    phy = () => { this.readByte(this.pc); this.pushByte(this.yr); }
+    phy = () => { this.readByte(this.pc); this.pushByte(this.yr); };
 
-    ply = () => { this.readByte(this.pc); this.readByte(0x0100 | this.sp); this.testNZ(this.yr = this.pullByte()); }
+    ply = () => { this.readByte(this.pc); this.readByte(0x0100 | this.sp); this.testNZ(this.yr = this.pullByte()); };
 
-    php = () => { this.readByte(this.pc); this.pushByte(this.sr | flags.B); }
+    php = () => { this.readByte(this.pc); this.pushByte(this.sr | flags.B); };
 
-    plp = () => { this.readByte(this.pc); this.readByte(0x0100 | this.sp); this.sr = (this.pullByte() & ~flags.B) | flags.X; }
+    plp = () => { this.readByte(this.pc); this.readByte(0x0100 | this.sp); this.sr = (this.pullByte() & ~flags.B) | flags.X; };
 
     /* Jump */
     jmp = (readAddrFn: ReadAddrFn) => {
         this.pc = readAddrFn();
-    }
+    };
 
     /* Jump Subroutine */
     jsr = () => {
@@ -1032,7 +1032,7 @@ export default class CPU6502 {
         this.pushWord(this.pc);
         const msb = this.readBytePC();
         this.pc = (msb << 8 | lsb) & 0xffff;
-    }
+    };
 
     /* Return from Subroutine */
     rts = () => {
@@ -1041,7 +1041,7 @@ export default class CPU6502 {
         const addr = this.pullWordRaw();
         this.readByte(addr);
         this.pc = (addr + 1) & 0xffff;
-    }
+    };
 
     /* Return from Interrupt */
     rti = () => {
@@ -1049,23 +1049,23 @@ export default class CPU6502 {
         this.readByte(0x0100 | this.sp);
         this.sr = (this.pullByte() & ~flags.B) | flags.X;
         this.pc = this.pullWordRaw();
-    }
+    };
 
     /* Set and Clear */
     set = (flag: flag) => {
         this.readByte(this.pc);
         this.sr |= flag;
-    }
+    };
 
     clr = (flag: flag) => {
         this.readByte(this.pc);
         this.sr &= ~flag;
-    }
+    };
 
     /* No-Op */
     nop = (readFn: ImpliedFn | ReadFn) => {
         readFn();
-    }
+    };
 
     private unknown(b: byte) {
         let unk: StrictInstruction;
@@ -1663,5 +1663,5 @@ export default class CPU6502 {
         // TSB
         0x04: { name: 'TSB', op: this.tsb, modeFn: this.readAddrZeroPage, mode: 'zeroPage' },
         0x0C: { name: 'TSB', op: this.tsb, modeFn: this.readAddrAbsolute, mode: 'absolute' }
-    }
+    };
 }

js/debugger.ts

@@ -57,7 +57,7 @@ export default class Debugger {
 
     break = () => {
         this.container.stop();
-    }
+    };
 
     step = () => {
         this.cpu.step(() => {
@@ -65,45 +65,45 @@ export default class Debugger {
             debug(this.printDebugInfo(info));
             this.updateTrace(info);
         });
-    }
+    };
 
     continue = () => {
         this.container.run();
-    }
+    };
 
     setVerbose = (verbose: boolean) => {
         this.verbose = verbose;
-    }
+    };
 
     setMaxTrace = (maxTrace: number) => {
         this.maxTrace = maxTrace;
-    }
+    };
 
     getTrace = () => {
         return this.trace.map(this.printDebugInfo).join('\n');
-    }
+    };
 
     printTrace = () => {
         debug(this.getTrace());
-    }
+    };
 
     setBreakpoint = (addr: word, exp?: breakpointFn) => {
         this.breakpoints.set(addr, exp || alwaysBreak);
-    }
+    };
 
     clearBreakpoint = (addr: word) => {
         this.breakpoints.delete(addr);
-    }
+    };
 
     listBreakpoints = () => {
         for(const [addr, fn] of this.breakpoints.entries()) {
             debug(toHex(addr, 4), fn);
         }
-    }
+    };
 
     addSymbols = (symbols: symbols) => {
         this.symbols = { ...this.symbols, ...symbols };
-    }
+    };
 
     printDebugInfo = (info: DebugInfo) => {
         const { pc, cmd } = info;
@@ -118,7 +118,7 @@ export default class Debugger {
             ' ',
             this.dumpOp(pc, cmd)
         ].join('');
-    }
+    };
 
     dumpPC = (pc: word) => {
         const b = this.cpu.read(pc);
@@ -136,7 +136,7 @@ export default class Debugger {
         result += this.dumpRawOp(cmd) + ' ' + this.dumpOp(pc, cmd);
 
         return result;
-    }
+    };
 
     dumpRegisters = (debugInfo?: DebugInfo) => {
         if (debugInfo === undefined) {
@@ -152,7 +152,7 @@ export default class Debugger {
             ' ',
             dumpStatusRegister(sr),
         ].join('');
-    }
+    };
 
     dumpPage = (start: byte, end?: byte) => {
         let result = '';
@@ -179,7 +179,7 @@ export default class Debugger {
             }
         }
         return result;
-    }
+    };
 
     list = (pc: word) => {
         const results = [];
@@ -190,7 +190,7 @@ export default class Debugger {
             pc += sizes[op.mode];
         }
         return results;
-    }
+    };
 
     private updateTrace(info: DebugInfo) {
         this.trace.push(info);

js/formats/types.ts

@@ -97,13 +97,13 @@ export type DiskFormat = MemberOf<typeof DISK_FORMATS>;
  */
 
 export class JSONDiskBase {
-    type: DiskFormat
+    type: DiskFormat;
-    name: string
+    name: string;
-    disk?: string
+    disk?: string;
-    category?: string
+    category?: string;
-    volume?: byte
+    volume?: byte;
-    readOnly?: boolean
+    readOnly?: boolean;
-    gamepad?: GamepadConfiguration
+    gamepad?: GamepadConfiguration;
 }
 
 /**

js/formats/woz.ts

@@ -37,22 +37,22 @@ function stringFromBytes(data: DataView, start: number, end: number): string {
 }
 
 export class InfoChunk {
-    version: byte
+    version: byte;
 
     // Version 1
-    diskType: byte
+    diskType: byte;
-    writeProtected: byte
+    writeProtected: byte;
-    synchronized: byte
+    synchronized: byte;
-    cleaned: byte
+    cleaned: byte;
-    creator: string
+    creator: string;
 
     // Version 2
-    sides: byte = 0
+    sides: byte = 0;
-    bootSector: byte = 0
+    bootSector: byte = 0;
-    bitTiming: byte = 0
+    bitTiming: byte = 0;
-    compatibleHardware: word = 0
+    compatibleHardware: word = 0;
-    requiredRAM: word = 0
+    requiredRAM: word = 0;
-    largestTrack: word = 0
+    largestTrack: word = 0;
 
     constructor(data: DataView) {
         this.version = data.getUint8(0);
@@ -74,7 +74,7 @@ export class InfoChunk {
 }
 
 export class TMapChunk {
-    trackMap: byte[]
+    trackMap: byte[];
 
     constructor(data: DataView) {
         this.trackMap = [];
@@ -89,8 +89,8 @@ const WOZ_TRACK_SIZE = 6656;
 const WOZ_TRACK_INFO_BITS = 6648;
 
 export class TrksChunk {
-    rawTracks: Uint8Array[]
+    rawTracks: Uint8Array[];
-    tracks: Uint8Array[]
+    tracks: Uint8Array[];
 }
 
 export class TrksChunk1 extends TrksChunk {
@@ -135,7 +135,7 @@ export interface Trk {
 }
 
 export class TrksChunk2 extends TrksChunk {
-    trks: Trk[]
+    trks: Trk[];
 
     constructor (data: DataView) {
         super();
@@ -188,7 +188,7 @@ export class TrksChunk2 extends TrksChunk {
 }
 
 export class MetaChunk  {
-    values: Record<string, string>
+    values: Record<string, string>;
 
     constructor (data: DataView) {
         const infoStr = stringFromBytes(data, 0, data.byteLength);

js/gl.ts

@@ -51,7 +51,7 @@ export class LoresPageGL implements LoresPage {
     private _refreshing = false;
     private _blink = false;
 
-    dirty: Region = {...notDirty}
+    dirty: Region = {...notDirty};
     imageData: ImageData;
 
     constructor(
@@ -563,7 +563,7 @@ export class VideoModesGL implements VideoModes {
     private _refreshFlag: boolean = true;
     private _canvas: HTMLCanvasElement;
 
-    public ready: Promise<void>
+    public ready: Promise<void>;
 
     public textMode: boolean;
     public mixedMode: boolean;

js/ui/audio.ts

@@ -116,7 +116,7 @@ export class Audio implements OptionHandler {
                 console.warn('audio not started', error);
             });
         }
-    }
+    };
 
     start = () => {
         if (this.audioContext) {
@@ -125,11 +125,11 @@ export class Audio implements OptionHandler {
                 console.warn('audio not resumed', error);
             });
         }
-    }
+    };
 
     isEnabled = () => {
         return this.sound;
-    }
+    };
 
     getOptions() {
         return [
@@ -152,5 +152,5 @@ export class Audio implements OptionHandler {
             case SOUND_ENABLED_OPTION:
                 this.sound = value;
         }
-    }
+    };
 }

js/ui/audio_worker.ts

@@ -24,7 +24,7 @@ declare global {
 }
 
 export class AppleAudioProcessor extends AudioWorkletProcessor {
-    private samples: Float32Array[] = []
+    private samples: Float32Array[] = [];
 
     constructor() {
         super();

js/ui/joystick.ts

@@ -100,5 +100,5 @@ export class JoyStick implements OptionHandler {
 
         this.io.paddle(0, this.flipX ? 1 - x : x);
         this.io.paddle(1, this.flipY ? 1 - y : y);
-    }
+    };
 }

js/ui/keyboard.ts

@@ -548,7 +548,7 @@ export default class KeyBoard {
             }
         }
 
-    }
+    };
 
     private keyup = (evt: KeyboardEvent) => {
         if (!this.dialogOpen()) {
@@ -568,5 +568,5 @@ export default class KeyBoard {
                 this.optionKey(false);
             }
         }
-    }
+    };
 }

js/ui/options_modal.ts

@@ -34,9 +34,9 @@ export interface OptionHandler {
 
 export class OptionsModal {
     private prefs: Prefs = new Prefs();
-    private options: Record<string, Option> = {}
+    private options: Record<string, Option> = {};
-    private handlers: Record<string, OptionHandler> = {}
+    private handlers: Record<string, OptionHandler> = {};
-    private sections: OptionSection[] = []
+    private sections: OptionSection[] = [];
 
     addOptions(handler: OptionHandler) {
         const sections = handler.getOptions();

js/ui/screen.ts

@@ -42,7 +42,7 @@ export class Screen implements OptionHandler {
                 elem.mozRequestFullScreen();
             }
         }
-    }
+    };
 
     getOptions() {
         return [

package.json

@@ -31,12 +31,12 @@
     "@types/jest": "^27.0.2",
     "@types/jest-image-snapshot": "^4.3.1",
     "@types/micromodal": "^0.3.2",
-    "@typescript-eslint/eslint-plugin": "^4.28.2",
+    "@typescript-eslint/eslint-plugin": "^5.4.0",
-    "@typescript-eslint/parser": "^4.28.2",
+    "@typescript-eslint/parser": "^5.4.0",
     "ajv": "^6.12.0",
     "babel-jest": "^27.2.4",
     "canvas": "^2.7.0",
-    "eslint": "^7.22.0",
+    "eslint": "^8.3.0",
     "file-loader": "^6.0.0",
     "jest": "^27.2.4",
     "jest-image-snapshot": "^4.5.1",

test/roms/6502test.ts

@@ -5,7 +5,7 @@ import path from 'path';
 import { MemoryPages, byte } from '../../js/types';
 
 export default class Test6502 implements MemoryPages {
-    private data: Buffer
+    private data: Buffer;
 
     constructor() {
         this.data = fs.readFileSync(path.join(__dirname, '6502_functional_test.bin'));
@@ -13,17 +13,17 @@ export default class Test6502 implements MemoryPages {
 
     start = () => {
         return 0x00;
-    }
+    };
 
     end = () => {
         return 0xff;
-    }
+    };
 
     read = (page: byte, off: byte) => {
         return this.data[page << 8 | off];
-    }
+    };
 
     write = (page: byte, off: byte, val: byte) => {
         this.data[page << 8 | off] = val;
-    }
+    };
 }

test/roms/65C02test.ts

@@ -5,7 +5,7 @@ import path from 'path';
 import { MemoryPages, byte } from '../../js/types';
 
 export default class Test65C02 implements MemoryPages {
-    private data: Buffer
+    private data: Buffer;
 
     constructor() {
         this.data = fs.readFileSync(path.join(__dirname, '65C02_extended_opcodes_test.bin'));
@@ -13,17 +13,17 @@ export default class Test65C02 implements MemoryPages {
 
     start = () => {
         return 0x00;
-    }
+    };
 
     end = () => {
         return 0xff;
-    }
+    };
 
     read = (page: byte, off: byte) => {
         return this.data[page << 8 | off];
-    }
+    };
 
     write = (page: byte, off: byte, val: byte) => {
         this.data[page << 8 | off] = val;
-    }
+    };
 }