rename some interfaces

Author: toolness

lib/preview-frame-interface.ts

@@ -6,15 +6,15 @@
 // to be explicit about importing these interfaces so that the source
 // code is easier to understand.
 
-export interface PreviewFrameErrorReporter {
+export interface ErrorReporter {
   (message: string, line?: number): any
 }
 
 // Eventually we might want the preview frame to exist on a separate
 // origin for security, which means that we'd have to use postMessage()
 // to communicate with it. Thus this interface needs to be asynchronous.
-export interface PreviewFrame extends Window {
+export interface Runner extends Window {
   startSketch: (sketch: string, p5version: string, maxRunTime: number,
                 loopCheckFuncName: string, baseURL: string,
-                errorCb: PreviewFrameErrorReporter) => void
+                errorCb: ErrorReporter) => void
 }

lib/preview-frame.ts

@@ -1,9 +1,8 @@
-import { PreviewFrame,
-         PreviewFrameErrorReporter } from "./preview-frame-interface";
+import * as PreviewFrame from "./preview-frame-interface";
 
 require("../css/preview-frame.css");
 
-interface PreviewFrameWindow extends PreviewFrame {
+interface PreviewFrameWindow extends PreviewFrame.Runner {
   // This is exported by p5 when it's in global mode.
   noLoop: () => void;
 }
@@ -64,7 +63,7 @@ function setBaseURL(url: string) {
 
 function startSketch(sketch: string, p5version: string, maxRunTime: number,
                      loopCheckFuncName: string, baseURL: string,
-                     errorCb: PreviewFrameErrorReporter) {
+                     errorCb: PreviewFrame.ErrorReporter) {
   let sketchScript = document.createElement('script');
   let loopChecker = LoopChecker(sketch, loopCheckFuncName, maxRunTime);
 

lib/preview.tsx

@@ -4,8 +4,7 @@ import falafel from "./falafel";
 import LoopInserter from "./loop-inserter";
 import makeImplicitSketch from "./implicit-sketch";
 import PureComponent from "./pure-component";
-import { PreviewFrame,
-         PreviewFrameErrorReporter } from "./preview-frame-interface";
+import * as PreviewFrame from "./preview-frame-interface";
 
 const LOOP_CHECK_FUNC_NAME = '__loopCheck';
 
@@ -15,7 +14,7 @@ interface Props {
   content: string,
   baseSketchURL: string,
   timestamp: number,
-  onError: PreviewFrameErrorReporter
+  onError: PreviewFrame.ErrorReporter
 }
 
 interface State {
@@ -53,7 +52,7 @@ export default class Preview extends PureComponent<Props, State> {
       // Note that this should never be called if we're already unmounted,
       // since that means the iframe will have been removed from the DOM,
       // in which case it shouldn't be emitting events anymore.
-      let frame = iframe.contentWindow as PreviewFrame;
+      let frame = iframe.contentWindow as PreviewFrame.Runner;
       frame.startSketch(content, this.props.p5version, 1000,
                         LOOP_CHECK_FUNC_NAME,
                         this.props.baseSketchURL,