Enable noImplicitAny (#2895)

* Stash noImplicitAny work

* Enable noImplicitAny

* Update olm

* Fun

* Fix msgid stuff

* Fix tests

* Attempt to fix Browserify

Author: t3chguy

.github/workflows/static_analysis.yml

@@ -64,46 +64,11 @@ jobs:
 
       - name: Generate Docs
         run: "yarn run gendoc"
-        
+
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
           name: docs
           path: _docs
           # We'll only use this in a workflow_run, then we're done with it
           retention-days: 1
-
-  tsc-strict:
-    name: Typescript Strict Error Checker
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: read
-      checks: write
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Get diff lines
-        id: diff
-        uses: Equip-Collaboration/[email protected]
-        with:
-          include: '["\\.tsx?$"]'
-
-      - name: Detecting files changed
-        id: files
-        uses: futuratrepadeira/[email protected]
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          pattern: '^.*\.tsx?$'
-
-      - uses: t3chguy/typescript-check-action@main
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          use-check: false
-          check-fail-mode: added
-          output-behaviour: annotate
-          ts-extra-args: '--noImplicitAny'
-          files-changed: ${{ steps.files.outputs.files_updated }}
-          files-added: ${{ steps.files.outputs.files_created }}
-          files-deleted: ${{ steps.files.outputs.files_deleted }}
-          line-numbers: ${{ steps.diff.outputs.lineNumbers }}

package.json

@@ -14,7 +14,7 @@
     "build:dev": "yarn clean && git rev-parse HEAD > git-revision.txt && yarn build:compile && yarn build:types",
     "build:types": "tsc -p tsconfig-build.json --emitDeclarationOnly",
     "build:compile": "babel -d lib --verbose --extensions \".ts,.js\" src",
-    "build:compile-browser": "mkdirp dist && browserify -d src/browser-index.js -p [ tsify -p ./tsconfig-build.json ] -t [ babelify --sourceMaps=inline --presets [ @babel/preset-env @babel/preset-typescript ] ] | exorcist dist/browser-matrix.js.map > dist/browser-matrix.js",
+    "build:compile-browser": "mkdirp dist && browserify -d src/browser-index.ts -p [ tsify -p ./tsconfig-build.json ] -t [ babelify --sourceMaps=inline --presets [ @babel/preset-env @babel/preset-typescript ] ] | exorcist dist/browser-matrix.js.map > dist/browser-matrix.js",
     "build:minify-browser": "terser dist/browser-matrix.js --compress --mangle --source-map --output dist/browser-matrix.min.js",
     "gendoc": "typedoc",
     "lint": "yarn lint:types && yarn lint:js",
@@ -33,9 +33,9 @@
     "matrix-org"
   ],
   "main": "./src/index.ts",
-  "browser": "./lib/browser-index.js",
+  "browser": "./lib/browser-index.ts",
   "matrix_src_main": "./src/index.ts",
-  "matrix_src_browser": "./src/browser-index.js",
+  "matrix_src_browser": "./src/browser-index.ts",
   "matrix_lib_main": "./lib/index.js",
   "matrix_lib_typings": "./lib/index.d.ts",
   "author": "matrix.org",
@@ -80,7 +80,7 @@
     "@babel/preset-typescript": "^7.12.7",
     "@babel/register": "^7.12.10",
     "@casualbot/jest-sonar-reporter": "^2.2.5",
-    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.13.tgz",
+    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz",
     "@types/bs58": "^4.0.1",
     "@types/content-type": "^1.1.5",
     "@types/domexception": "^4.0.0",

spec/TestClient.ts

@@ -183,7 +183,7 @@ export class TestClient {
         this.httpBackend.when('POST', '/keys/query').respond<IDownloadKeyResult>(
             200, (_path, content) => {
                 Object.keys(response.device_keys).forEach((userId) => {
-                    expect(content.device_keys![userId]).toEqual([]);
+                    expect((content.device_keys! as Record<string, any>)[userId]).toEqual([]);
                 });
                 return response;
             });

spec/browserify/setupTests.ts

@@ -15,19 +15,7 @@ limitations under the License.
 */
 
 import "../../dist/browser-matrix"; // uses browser-matrix instead of the src
-import type { MatrixClient, ClientEvent } from "../../src";
-
-declare global {
-    // eslint-disable-next-line @typescript-eslint/no-namespace
-    namespace NodeJS {
-        interface Global {
-            matrixcs: {
-                MatrixClient: typeof MatrixClient;
-                ClientEvent: typeof ClientEvent;
-            };
-        }
-    }
-}
+import type { default as BrowserMatrix } from "../../src/browser-index";
 
 // stub for browser-matrix browserify tests
 // @ts-ignore
@@ -43,4 +31,4 @@ afterAll(() => {
 global.matrixcs = {
     ...global.matrixcs,
     timeoutSignal: () => new AbortController().signal,
-};
+} as typeof BrowserMatrix;

spec/browserify/sync-browserify.spec.ts

@@ -16,7 +16,7 @@ limitations under the License.
 
 import HttpBackend from "matrix-mock-request";
 
-import "./setupTests";// uses browser-matrix instead of the src
+import "./setupTests"; // uses browser-matrix instead of the src
 import type { MatrixClient } from "../../src";
 
 const USER_ID = "@user:test.server";
@@ -65,15 +65,16 @@ describe("Browserify Test", function() {
         const syncData = {
             next_batch: "batch1",
             rooms: {
-                join: {},
-            },
-        };
-        syncData.rooms.join[ROOM_ID] = {
-            timeline: {
-                events: [
-                    event,
-                ],
-                limited: false,
+                join: {
+                    [ROOM_ID]: {
+                        timeline: {
+                            events: [
+                                event,
+                            ],
+                            limited: false,
+                        },
+                    },
+                },
             },
         };
 

spec/integ/devicelist-integ.spec.ts

@@ -30,7 +30,7 @@ const ROOM_ID = "!room:id";
  *
  * @return {object} sync response
  */
-function getSyncResponse(roomMembers) {
+function getSyncResponse(roomMembers: string[]) {
     const stateEvents = [
         testUtils.mkEvent({
             type: 'm.room.encryption',
@@ -43,12 +43,10 @@ function getSyncResponse(roomMembers) {
 
     Array.prototype.push.apply(
         stateEvents,
-        roomMembers.map(
-            (m) => testUtils.mkMembership({
-                mship: 'join',
-                sender: m,
-            }),
-        ),
+        roomMembers.map((m) => testUtils.mkMembership({
+            mship: 'join',
+            sender: m,
+        })),
     );
 
     const syncResponse = {
@@ -73,8 +71,8 @@ describe("DeviceList management:", function() {
         return;
     }
 
-    let sessionStoreBackend;
-    let aliceTestClient;
+    let aliceTestClient: TestClient;
+    let sessionStoreBackend: Storage;
 
     async function createTestClient() {
         const testClient = new TestClient(
@@ -97,7 +95,10 @@ describe("DeviceList management:", function() {
     });
 
     it("Alice shouldn't do a second /query for non-e2e-capable devices", function() {
-        aliceTestClient.expectKeyQuery({ device_keys: { '@alice:localhost': {} } });
+        aliceTestClient.expectKeyQuery({
+            device_keys: { '@alice:localhost': {} },
+            failures: {},
+        });
         return aliceTestClient.start().then(function() {
             const syncResponse = getSyncResponse(['@bob:xyz']);
             aliceTestClient.httpBackend.when('GET', '/sync').respond(200, syncResponse);
@@ -138,7 +139,10 @@ describe("DeviceList management:", function() {
 
     it.skip("We should not get confused by out-of-order device query responses", () => {
         // https://github.com/vector-im/element-web/issues/3126
-        aliceTestClient.expectKeyQuery({ device_keys: { '@alice:localhost': {} } });
+        aliceTestClient.expectKeyQuery({
+            device_keys: { '@alice:localhost': {} },
+            failures: {},
+        });
         return aliceTestClient.start().then(() => {
             aliceTestClient.httpBackend.when('GET', '/sync').respond(
                 200, getSyncResponse(['@bob:xyz', '@chris:abc']));
@@ -164,11 +168,12 @@ describe("DeviceList management:", function() {
                 aliceTestClient.httpBackend.flush('/keys/query', 1).then(
                     () => aliceTestClient.httpBackend.flush('/send/', 1),
                 ),
-                aliceTestClient.client.crypto.deviceList.saveIfDirty(),
+                aliceTestClient.client.crypto!.deviceList.saveIfDirty(),
             ]);
         }).then(() => {
-            aliceTestClient.client.cryptoStore.getEndToEndDeviceData(null, (data) => {
-                expect(data.syncToken).toEqual(1);
+            // @ts-ignore accessing a protected field
+            aliceTestClient.client.cryptoStore!.getEndToEndDeviceData(null, (data) => {
+                expect(data!.syncToken).toEqual(1);
             });
 
             // invalidate bob's and chris's device lists in separate syncs
@@ -201,15 +206,16 @@ describe("DeviceList management:", function() {
             return aliceTestClient.httpBackend.flush('/keys/query', 1);
         }).then((flushed) => {
             expect(flushed).toEqual(0);
-            return aliceTestClient.client.crypto.deviceList.saveIfDirty();
+            return aliceTestClient.client.crypto!.deviceList.saveIfDirty();
         }).then(() => {
-            aliceTestClient.client.cryptoStore.getEndToEndDeviceData(null, (data) => {
-                const bobStat = data.trackingStatus['@bob:xyz'];
+            // @ts-ignore accessing a protected field
+            aliceTestClient.client.cryptoStore!.getEndToEndDeviceData(null, (data) => {
+                const bobStat = data!.trackingStatus['@bob:xyz'];
                 if (bobStat != 1 && bobStat != 2) {
                     throw new Error('Unexpected status for bob: wanted 1 or 2, got ' +
                         bobStat);
                 }
-                const chrisStat = data.trackingStatus['@chris:abc'];
+                const chrisStat = data!.trackingStatus['@chris:abc'];
                 if (chrisStat != 1 && chrisStat != 2) {
                     throw new Error(
                         'Unexpected status for chris: wanted 1 or 2, got ' + chrisStat,
@@ -234,12 +240,13 @@ describe("DeviceList management:", function() {
             // wait for the client to stop processing the response
             return aliceTestClient.client.downloadKeys(['@bob:xyz']);
         }).then(() => {
-            return aliceTestClient.client.crypto.deviceList.saveIfDirty();
+            return aliceTestClient.client.crypto!.deviceList.saveIfDirty();
         }).then(() => {
-            aliceTestClient.client.cryptoStore.getEndToEndDeviceData(null, (data) => {
-                const bobStat = data.trackingStatus['@bob:xyz'];
+            // @ts-ignore accessing a protected field
+            aliceTestClient.client.cryptoStore!.getEndToEndDeviceData(null, (data) => {
+                const bobStat = data!.trackingStatus['@bob:xyz'];
                 expect(bobStat).toEqual(3);
-                const chrisStat = data.trackingStatus['@chris:abc'];
+                const chrisStat = data!.trackingStatus['@chris:abc'];
                 if (chrisStat != 1 && chrisStat != 2) {
                     throw new Error(
                         'Unexpected status for chris: wanted 1 or 2, got ' + bobStat,
@@ -255,15 +262,16 @@ describe("DeviceList management:", function() {
             // wait for the client to stop processing the response
             return aliceTestClient.client.downloadKeys(['@chris:abc']);
         }).then(() => {
-            return aliceTestClient.client.crypto.deviceList.saveIfDirty();
+            return aliceTestClient.client.crypto!.deviceList.saveIfDirty();
         }).then(() => {
-            aliceTestClient.client.cryptoStore.getEndToEndDeviceData(null, (data) => {
-                const bobStat = data.trackingStatus['@bob:xyz'];
-                const chrisStat = data.trackingStatus['@bob:xyz'];
+            // @ts-ignore accessing a protected field
+            aliceTestClient.client.cryptoStore!.getEndToEndDeviceData(null, (data) => {
+                const bobStat = data!.trackingStatus['@bob:xyz'];
+                const chrisStat = data!.trackingStatus['@bob:xyz'];
 
                 expect(bobStat).toEqual(3);
                 expect(chrisStat).toEqual(3);
-                expect(data.syncToken).toEqual(3);
+                expect(data!.syncToken).toEqual(3);
             });
         });
     });
@@ -285,10 +293,11 @@ describe("DeviceList management:", function() {
                 },
             );
             await aliceTestClient.httpBackend.flush('/keys/query', 1);
-            await aliceTestClient.client.crypto.deviceList.saveIfDirty();
+            await aliceTestClient.client.crypto!.deviceList.saveIfDirty();
 
-            aliceTestClient.client.cryptoStore.getEndToEndDeviceData(null, (data) => {
-                const bobStat = data.trackingStatus['@bob:xyz'];
+            // @ts-ignore accessing a protected field
+            aliceTestClient.client.cryptoStore!.getEndToEndDeviceData(null, (data) => {
+                const bobStat = data!.trackingStatus['@bob:xyz'];
 
                 // Alice should be tracking bob's device list
                 expect(bobStat).toBeGreaterThan(
@@ -322,10 +331,11 @@ describe("DeviceList management:", function() {
             );
 
             await aliceTestClient.flushSync();
-            await aliceTestClient.client.crypto.deviceList.saveIfDirty();
+            await aliceTestClient.client.crypto!.deviceList.saveIfDirty();
 
-            aliceTestClient.client.cryptoStore.getEndToEndDeviceData(null, (data) => {
-                const bobStat = data.trackingStatus['@bob:xyz'];
+            // @ts-ignore accessing a protected field
+            aliceTestClient.client.cryptoStore!.getEndToEndDeviceData(null, (data) => {
+                const bobStat = data!.trackingStatus['@bob:xyz'];
 
                 // Alice should have marked bob's device list as untracked
                 expect(bobStat).toEqual(
@@ -359,15 +369,14 @@ describe("DeviceList management:", function() {
             );
 
             await aliceTestClient.flushSync();
-            await aliceTestClient.client.crypto.deviceList.saveIfDirty();
+            await aliceTestClient.client.crypto!.deviceList.saveIfDirty();
 
-            aliceTestClient.client.cryptoStore.getEndToEndDeviceData(null, (data) => {
-                const bobStat = data.trackingStatus['@bob:xyz'];
+            // @ts-ignore accessing a protected field
+            aliceTestClient.client.cryptoStore!.getEndToEndDeviceData(null, (data) => {
+                const bobStat = data!.trackingStatus['@bob:xyz'];
 
                 // Alice should have marked bob's device list as untracked
-                expect(bobStat).toEqual(
-                    0,
-                );
+                expect(bobStat).toEqual(0);
             });
         });
 
@@ -388,9 +397,7 @@ describe("DeviceList management:", function() {
                     const bobStat = data!.trackingStatus['@bob:xyz'];
 
                     // Alice should have marked bob's device list as untracked
-                    expect(bobStat).toEqual(
-                        0,
-                    );
+                    expect(bobStat).toEqual(0);
                 });
             } finally {
                 anotherTestClient.stop();