Marginally improve type checkability of code

extensions/0832/rxFS.js

@@ -216,7 +216,6 @@
 
     search({ STR }) {
       Search = "";
-      i = 0;
       str = btoa(unescape(encodeURIComponent(STR)));
       for (var i in rxFSsy) {
         if (!(rxFSsy[i].indexOf(str) == undefined)) {
@@ -228,7 +227,6 @@
 
     list({ STR }) {
       Search = "";
-      i = 0;
       str = btoa(unescape(encodeURIComponent(STR)));
       for (var i in rxFSsy) {
         if (rxFSsy[i].slice(0, str.length) == str) {

extensions/0832/rxFS2.js

@@ -241,7 +241,6 @@
 
     search({ STR }) {
       Search = "";
-      i = 0;
       str = encodeURIComponent(STR);
       for (var i in rxFSsy) {
         if (!(rxFSsy[i].indexOf(str) == undefined)) {
@@ -253,7 +252,6 @@
 
     list({ STR }) {
       Search = "";
-      i = 0;
       str = encodeURIComponent(STR);
       for (var i in rxFSsy) {
         if (rxFSsy[i].slice(0, str.length) == str) {

extensions/CubesterYT/WindowControls.js

@@ -559,7 +559,6 @@
         default:
           "Are you sure you want to close this window?\n\n(This message will not appear when the project is packaged)",
       });
-      // @ts-expect-error
       if (typeof ScratchBlocks === "undefined" || confirm(editorConfirmation)) {
         window.close();
       }

extensions/DT/cameracontrols.js

@@ -74,7 +74,7 @@
   // tell resize to update camera as well
   vm.runtime.on("STAGE_SIZE_CHANGED", (_) => updateCamera());
 
-  vm.runtime.on("RUNTIME_DISPOSED", (_) => {
+  vm.runtime.on("RUNTIME_DISPOSED", () => {
     cameraX = 0;
     cameraY = 0;
     cameraZoom = 100;

extensions/Lily/ClonesPlus.js

@@ -708,13 +708,12 @@
     }
 
     getVariables() {
-      // @ts-expect-error - Blockly not typed yet
       const variables =
         typeof Blockly === "undefined"
           ? []
           : Blockly.getMainWorkspace()
               .getVariableMap()
               .getVariablesOfType("")
               .filter((model) => model.isLocal)
               .map((model) => ({
                 text: model.name,

extensions/TheShovel/ShovelUtils.js

@@ -208,13 +208,13 @@
         .then((r) => r.arrayBuffer())
         .then((arrayBuffer) => {
           const storage = vm.runtime.storage;
           vm.addCostume(NAME + ".PNG", {
             name: NAME + "",
             asset: new storage.Asset(
               storage.AssetType.ImageBitmap,
               null, // asset id, doesn't need to be set here because of `true` at the end will make Scratch generate it for you
               storage.DataFormat.PNG,
               new Uint8Array(arrayBuffer),
               true
             ),
           });
@@ -238,7 +238,6 @@
       if (!target || target.isStage) {
         return;
       }
-      // @ts-expect-error
       if (typeof ScratchBlocks !== "undefined") {
         if (
           !confirm(
@@ -260,10 +259,10 @@
             storage.AssetType.Sound,
             null,
             storage.DataFormat.MP3,
             new Uint8Array(arrayBuffer),
             true
           );
           vm.addSound({
             md5: asset.assetId + "." + asset.dataFormat,
             asset: asset,
             name: NAME + "",
@@ -272,7 +271,6 @@
     }
 
     importProject({ TEXT }) {
-      // @ts-ignore
       if (typeof ScratchBlocks !== "undefined") {
         // We are in the editor. Ask before loading a new project to avoid unrecoverable data loss.
         if (

globals.d.ts

@@ -0,0 +1,103 @@
+/**
+ * @fileoverview
+ * Defines extra APIs that exist in real web browsers but that are missing from TypeScript's default types.
+ */
+
+interface Element {
+  /**
+   * requestFullscreen() but available in Safari.
+   */
+  webkitRequestFullscreen?(): unknown;
+}
+
+interface Document {
+  /**
+   * exitFullscreen() but available in Safari.
+   */
+  webkitExitFullscreen?(): unknown;
+  /**
+   * fullscreenElement but available in Safari.
+   */
+  webkitFullscreenElement?: Element;
+}
+
+/**
+ * https://developer.mozilla.org/en-US/docs/Web/API/NDEFReader
+ */
+declare class NDEFReader extends EventTarget {
+  constructor();
+  scan(options?: { signal?: AbortSignal }): Promise<void>;
+  onreading?(event: Event & { message: NDEFMessage }): void;
+  onreadingerror?(event: Event): void;
+}
+
+type TypedArray =
+  | Uint8Array
+  | Int8Array
+  | Uint16Array
+  | Int16Array
+  | Uint32Array
+  | Int32Array
+  | BigUint64Array
+  | BigInt64Array;
+
+/**
+ * https://developer.mozilla.org/en-US/docs/Web/API/NDEFMessage/NDEFMessage
+ */
+declare class NDEFMessage {
+  constructor(
+    records: Array<{
+      data?: string | ArrayBuffer | TypedArray | DataView | NDEFRecord[];
+      encoding?: string;
+      id?: string;
+      lang?: string;
+      mediaType?: string;
+      recordType?: string;
+    }>
+  );
+  readonly records: NDEFRecord[];
+}
+
+/**
+ * https://developer.mozilla.org/en-US/docs/Web/API/NDEFRecord
+ */
+declare class NDEFRecord {
+  constructor();
+  readonly recordType: string;
+  readonly mediaType: string;
+  readonly id: string;
+  readonly data: DataView;
+  readonly encoding: string | null;
+  readonly lang: string | null;
+  toRecords(): NDEFRecord[];
+}
+
+interface NetworkInformation {
+  downlink: number;
+  downlinkMax: number;
+  effectiveType: string;
+  rtt: number;
+  saveData: boolean;
+  type:
+    | "bluetooth"
+    | "cellular"
+    | "ethernet"
+    | "none"
+    | "wifi"
+    | "wimax"
+    | "other"
+    | "unknown";
+}
+
+interface Navigator {
+  connection?: NetworkInformation;
+}
+
+declare namespace Scratch.extensions {
+  /**
+   * Most extensions fail the type checking of @turbowarp/types-tw's default register().
+   * That error generally isn't very useful - so for now we'll just add this overload so
+   * that those errors don't appear.
+   */
+  function register(extensionObj: any): void;
+}

tsconfig.json

@@ -19,6 +19,7 @@
   "include": [
     "node_modules/@turbowarp/types/types/scratch-vm-extension.d.ts",
     "node_modules/@turbowarp/types/types/scratchx-extension.d.ts",
+    "globals.d.ts",
     "extensions/**/*",
     "website/**/*"
   ]