Fix lints and typechecking errors

package.json

@@ -27,7 +27,7 @@
   "scripts": {
     "build": "rollup -c",
     "dev": "rollup -c --watch",
-    "lint": "eslint \"./src/**.ts\"",
+    "lint": "eslint \"./src/**/*.ts\"",
     "prepare": "npm run build"
   },
   "devDependencies": {

src/Project.ts

@@ -133,10 +133,11 @@ export default class Project {
       let predicate;
       switch (trigger.trigger) {
         case Trigger.TIMER_GREATER_THAN:
-          predicate = this.timer > trigger.option("VALUE", target)!;
+          predicate = this.timer > (trigger.option("VALUE", target) as number);
           break;
         case Trigger.LOUDNESS_GREATER_THAN:
-          predicate = this.loudness > trigger.option("VALUE", target)!;
+          predicate =
+            this.loudness > (trigger.option("VALUE", target) as number);
           break;
         default:
           throw new Error(`Unimplemented trigger ${String(trigger.trigger)}`);

src/Renderer.ts

@@ -163,9 +163,7 @@ export default class Renderer {
   public _createFramebufferInfo(
     width: number,
     height: number,
-    filtering:
-      | WebGLRenderingContext["NEAREST"]
-      | WebGLRenderingContext["LINEAR"],
+    filtering: number,
     stencil = false
   ): FramebufferInfo {
     // Create an empty texture with this skin's dimensions.

src/Sprite.ts

@@ -97,10 +97,12 @@ type InitialConditions = {
 };
 
 abstract class SpriteBase {
-  protected _project!: Project;
+  // TODO: make this protected and pass it in via the constructor
+  public _project!: Project;
 
   protected _costumeNumber: number;
-  protected _layerOrder: number;
+  // TODO: remove this and just store the sprites in layer order, as Scratch does.
+  public _layerOrder: number;
   public triggers: Trigger[];
   public watchers: Partial<Record<string, Watcher>>;
   protected costumes: Costume[];
@@ -701,7 +703,7 @@ export class Sprite extends SpriteBase {
     } while (t < 1);
   }
 
-  ifOnEdgeBounce() {
+  public ifOnEdgeBounce(): void {
     const nearestEdge = this.nearestEdge();
     if (!nearestEdge) return;
     const rad = this.scratchToRad(this.direction);
@@ -725,7 +727,7 @@ export class Sprite extends SpriteBase {
     this.positionInFence();
   }
 
-  positionInFence() {
+  private positionInFence(): void {
     // https://github.com/LLK/scratch-vm/blob/develop/src/sprites/rendered-target.js#L949
     const fence = this.stage.fence;
     const bounds = this._project.renderer.getTightBoundingBox(this);
@@ -869,7 +871,7 @@ export class Sprite extends SpriteBase {
     }
   }
 
-  nearestEdge() {
+  private nearestEdge(): symbol | null {
     const bounds = this._project.renderer.getTightBoundingBox(this);
     const { width: stageWidth, height: stageHeight } = this.stage;
     const distLeft = Math.max(0, stageWidth / 2 + bounds.left);
@@ -953,7 +955,7 @@ export class Sprite extends SpriteBase {
     BOTTOM: Symbol("BOTTOM"),
     LEFT: Symbol("LEFT"),
     RIGHT: Symbol("RIGHT"),
-    TOP: Symbol("TOP")
+    TOP: Symbol("TOP"),
   });
 }
 
@@ -971,7 +973,7 @@ export class Stage extends SpriteBase {
     right: number;
     top: number;
     bottom: number;
-  }
+  };
 
   public constructor(initialConditions: StageInitialConditions, vars = {}) {
     super(initialConditions, vars);
@@ -993,7 +995,7 @@ export class Stage extends SpriteBase {
       left: -this.width / 2,
       right: this.width / 2,
       top: this.height / 2,
-      bottom: -this.height / 2
+      bottom: -this.height / 2,
     };
 
     // For obsolete counter blocks.

src/Watcher.ts

@@ -29,7 +29,7 @@ type WatcherOptions = {
 export default class Watcher {
   public value: () => WatcherValue;
   public setValue: (value: number) => void;
-  private _previousValue: unknown | symbol;
+  private _previousValue: unknown;
   private color: Color;
   private _label!: string;
   private _x!: number;

src/renderer/Drawable.ts

@@ -410,7 +410,9 @@ export default class Drawable {
   private _warnBadSize(description: string, treating: string): void {
     if (!this._warnedBadSize) {
       const { name } = this._sprite.constructor;
-      console.warn(`Expected a number, sprite ${name} size is ${description}. Treating as ${treating}.`);
+      console.warn(
+        `Expected a number, sprite ${name} size is ${description}. Treating as ${treating}.`
+      );
       this._warnedBadSize = true;
     }
   }

src/renderer/ShaderManager.ts

@@ -59,12 +59,7 @@ class ShaderManager {
   }
 
   // Creates and compiles a vertex or fragment shader from the given source code.
-  private _createShader(
-    source: string,
-    type:
-      | WebGLRenderingContext["FRAGMENT_SHADER"]
-      | WebGLRenderingContext["VERTEX_SHADER"]
-  ): WebGLShader {
+  private _createShader(source: string, type: number): WebGLShader {
     const gl = this.gl;
     const shader = gl.createShader(type);
     if (!shader) throw new Error("Could not create shader.");

src/renderer/Skin.ts

@@ -28,9 +28,7 @@ export default abstract class Skin {
   // Helper function to create a texture from an image and handle all the boilerplate.
   protected _makeTexture(
     image: HTMLImageElement | HTMLCanvasElement | null,
-    filtering:
-      | WebGLRenderingContext["NEAREST"]
-      | WebGLRenderingContext["LINEAR"]
+    filtering: number
   ): WebGLTexture {
     const gl = this.gl;
     const glTexture = gl.createTexture();