moar typing

src/index.ts

@@ -1,5 +1,4 @@
-import bondage from './bondage';
+import { CommandResult, OptionsResult, TextResult } from './results';
 import YarnBound from './yarn-bound';
-const { OptionsResult, TextResult, CommandResult } = bondage;
 
 export { YarnBound, OptionsResult, TextResult, CommandResult };

src/runner.ts

@@ -7,7 +7,7 @@ import * as results from './results';
 
 const nodeTypes = types.types;
 
-class Runner {
+export class Runner {
   private readonly noEscape: boolean;
   private readonly yarnNodes: {};
   private variables: DefaultVariableStorage;
@@ -398,9 +398,3 @@ class Runner {
   }
 }
 
-export default {
-  Runner,
-  TextResult: results.TextResult,
-  CommandResult: results.CommandResult,
-  OptionsResult: results.OptionsResult,
-};

src/yarn-bound.ts

@@ -1,6 +1,6 @@
-import bondage from './bondage';
 import parseLine from './line-parser';
 import { CommandResult, OptionsResult, TextResult } from './results';
+import { Runner } from './runner';
 
 interface props {
   dialogue: string;
@@ -37,12 +37,11 @@ export default class YarnBound {
   }: props) {
     this.handleCommand = handleCommand;
     this.combineTextAndOptionsResults = combineTextAndOptionsResults;
-    this.bondage = bondage;
     this.bufferedNode = null;
     this.currentResult = null;
     this.history = [];
     this.locale = locale;
-    this.runner = new bondage.Runner();
+    this.runner = new Runner();
     this.runner.noEscape = true;
 
     this.runner.load(dialogue);
@@ -78,21 +77,21 @@ export default class YarnBound {
     // We either return the command as normal or, if a handler
     // is supplied, use that and don't bother the consuming app
     if (this.handleCommand) {
-      while (next instanceof bondage.CommandResult) {
+      while (next instanceof CommandResult) {
         this.handleCommand(next);
         next = this.generator.next().value;
       }
     }
 
     // Lookahead for combining text + options, and for end of dialogue.
     // Can't look ahead of option nodes (what would you look ahead at?)
-    if (!(next instanceof bondage.OptionsResult)) {
+    if (!(next instanceof OptionsResult)) {
       const upcoming = this.generator.next();
       buffered = upcoming.value;
       if (
-        next instanceof bondage.TextResult &&
+        next instanceof TextResult &&
         this.combineTextAndOptionsResults &&
-        buffered instanceof bondage.OptionsResult
+        buffered instanceof OptionsResult
       ) {
         next = Object.assign(buffered, next);
         buffered = null;
@@ -105,9 +104,9 @@ export default class YarnBound {
       this.history.push(this.currentResult);
     }
 
-    if (next instanceof bondage.TextResult) {
+    if (next instanceof TextResult) {
       parseLine(next, this.locale);
-    } else if (next instanceof bondage.OptionsResult) {
+    } else if (next instanceof OptionsResult) {
       // @ts-ignore
       if (next.text) {
         parseLine(next, this.locale);