Merge pull request #200 from matrix-org/hs/minor-fixes

minor type fixes

changelog.d/200.bugfix

@@ -0,0 +1 @@
+Fixed some broken typings and defer failures

src/bridge.js

@@ -24,7 +24,7 @@ const AppService = require("matrix-appservice").AppService;
 const MatrixScheduler = require("matrix-js-sdk").MatrixScheduler;
 
 const BridgeContext = require("./components/bridge-context");
-const ClientFactory = require("./components/client-factory");
+const { ClientFactory } = require("./components/client-factory");
 const AppServiceBot = require("./components/app-service-bot");
 const RequestFactory = require("./components/request-factory").RequestFactory;
 const Intent = require("./components/intent").Intent;

src/components/cli.ts

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import * as fs from "fs";
-import * as path from "path";
+import path from "path";
 import * as yaml from "js-yaml";
 import nopt from "nopt";
 import { AppServiceRegistration } from "matrix-appservice";

src/components/request.ts

@@ -104,6 +104,6 @@ export class Request<T> {
      * request.
      */
     public outcomeFrom(promise: Promise<unknown>) {
-        return promise.then(this.resolve, this.reject);
+        return promise.then(this.resolve.bind(this), this.reject.bind(this));
     }
 }

src/index.ts

@@ -19,14 +19,14 @@ export * from "./components/request-factory";
 
 export * from "./components/client-factory";
 export * from "./components/intent";
-export * from "./components/state-lookup";
 
 /* eslint-disable @typescript-eslint/no-var-requires */
 
 module.exports.AppServiceBot = require("./components/app-service-bot");
+export * from "./components/state-lookup";
 
 // Config and CLI
-module.exports.Cli = require("./components/cli");
+export * from "./components/cli";
 module.exports.ConfigValidator = require("./components/config-validator");
 
 // Store
@@ -44,9 +44,8 @@ module.exports.StoredEvent = require("./models/events/event");
 
 module.exports.Bridge = require("./bridge");
 module.exports.BridgeContext = require("./components/bridge-context");
-module.exports.AppServiceRegistration = (
-    require("matrix-appservice").AppServiceRegistration
-);
+
+export * from "matrix-appservice";
 
 const jsSdk = require("matrix-js-sdk");