explicitly register all watchers

Author: shamrin

src/index.ts

@@ -1,3 +1,25 @@
+import {Watcher} from "./watchers/watcher";
+
+import system from "./watchers/system";
+import html from "./watchers/html";
+import svg from "./watchers/svg";
+import canvas from "./watchers/canvas";
+import ui from "./watchers/ui";
+import compiler from "./watchers/compiler";
+import shape from "./watchers/shape";
+import editor from "./watchers/editor";
+import tagBrowser from "./watchers/tag-browser";
+
+Watcher.register("system", system);
+Watcher.register("html", html);
+Watcher.register("svg", svg);
+Watcher.register("canvas", canvas);
+Watcher.register("ui", ui);
+Watcher.register("compiler", compiler);
+Watcher.register("shape", shape);
+Watcher.register("editor", editor);
+Watcher.register("tag browser", tagBrowser);
+
 export {Watcher, Program, appendAsEAVs, RawEAV, createId} from "./watchers/watcher";
 
 export var watcherPath = "./build/src/watchers";

src/runtime/dsl2.ts

@@ -1751,9 +1751,6 @@ export class Program {
   }
 
   attach(id:string) {
-    try {
-      require(`../watchers/${id}.js`); // allow webpack to find watcher modules
-    } catch (e) { }
     let WatcherConstructor = Watcher.get(id);
     if(!WatcherConstructor) throw new Error(`Unable to attach unknown watcher '${id}'.`);
     if(this.watchers[id]) return this.watchers[id];

src/watchers/canvas.ts

@@ -1,5 +1,5 @@
 import {Watcher, RawMap, RawValue, RawEAV, RawEAVC, maybeIntern} from "./watcher";
-import {HTMLWatcher} from "./html";
+import HTMLWatcher from "./html";
 import {v4 as uuid} from "node-uuid";
 
 function asValue(value:RawValue) {
@@ -40,7 +40,7 @@ export interface Operation {type: OperationType, args:any, paths:RawValue[]};
 // {fillStyle: "#000000", strokeStyle: "#000000", lineWidth: 1, lineCap: "butt", lineJoin: "miter"}
 export interface PathStyle {[key:string]: RawValue|undefined, fillStyle?:string, strokeStyle?:string, lineWidth?:number, lineCap?:string, lineJoin?: string };
 
-class CanvasWatcher extends Watcher {
+export default class CanvasWatcher extends Watcher {
   html:HTMLWatcher;
   canvases:RawMap<RawValue[]|undefined> = {};
   paths:RawMap<RawValue[]|undefined> = {};
@@ -393,8 +393,6 @@ class CanvasWatcher extends Watcher {
   }
 }
 
-Watcher.register("canvas", CanvasWatcher);
-
 /*
  * [#canvas/root width height children:
  *  [#canvas/rect x y width height fill? stroke?]]

src/watchers/compiler.ts

@@ -11,7 +11,7 @@ export interface CompilationContext {
   variables: {[id:string]: Reference},
 }
 
-export class CompilerWatcher extends Watcher {
+export default class CompilerWatcher extends Watcher {
 
   blocksToCompile:{[blockID:string]: boolean} = {};
   blocksToRemove:{[blockID:string]: boolean} = {};
@@ -461,5 +461,3 @@ export class CompilerWatcher extends Watcher {
 
   }
 }
-
-Watcher.register("compiler", CompilerWatcher);

src/watchers/editor.ts

@@ -3,9 +3,9 @@
 //--------------------------------------------------------------------
 
 import {Watcher, Program, RawMap, RawValue, RawEAV, forwardDiffs, appendAsEAVs, createId} from "../watchers/watcher";
-import {CompilerWatcher} from "../watchers/compiler";
+import CompilerWatcher from "../watchers/compiler";
 
-class EditorWatcher extends Watcher {
+export default class EditorWatcher extends Watcher {
   editor: Program;
   setup() {
     this.editor = this.createEditor();
@@ -1350,5 +1350,3 @@ class EditorWatcher extends Watcher {
       })
   }
 }
-
-Watcher.register("editor", EditorWatcher);

src/watchers/html.ts

@@ -5,7 +5,7 @@ import {v4 as uuid} from "node-uuid";
 
 export interface Instance extends HTMLElement {__element?: RawValue, __styles?: RawValue[], __sort?: RawValue, listeners?: {[event: string]: boolean}}
 
-export class HTMLWatcher extends DOMWatcher<Instance> {
+export default class HTMLWatcher extends DOMWatcher<Instance> {
   tagPrefix = "html";
 
   addExternalRoot(tag:string, element:HTMLElement) {
@@ -326,5 +326,3 @@ export class HTMLWatcher extends DOMWatcher<Instance> {
       .asObjects<{listener:string, elemId:ID, instanceId:RawValue}>((diffs) => this.exportListeners(diffs));
   }
 }
-
-Watcher.register("html", HTMLWatcher);

src/watchers/shape.ts

@@ -1,6 +1,6 @@
 import {Watcher, RawValue, RawEAV, RawEAVC} from "./watcher";
 
-class ShapeWatcher extends Watcher {
+export default class ShapeWatcher extends Watcher {
   setup() {
     this.program.attach("html");
     this.program.attach("canvas");
@@ -210,5 +210,3 @@ class ShapeWatcher extends Watcher {
     })
   }
 }
-
-Watcher.register("shape", ShapeWatcher);

src/watchers/svg.ts

@@ -1,10 +1,9 @@
 import {Watcher, RawValue, RawEAV, RawEAVC} from "./watcher";
 import {DOMWatcher, ElemInstance} from "./dom";
 
-interface Instance extends SVGElement {__element?: RawValue, __styles?: RawValue[], __sort?: RawValue}
+export interface Instance extends SVGElement {__element?: RawValue, __styles?: RawValue[], __sort?: RawValue}
 
-
-class SVGWatcher extends DOMWatcher<Instance> {
+export default class SVGWatcher extends DOMWatcher<Instance> {
   tagPrefix = "svg";
 
   createInstance(id:RawValue, element:RawValue, tagname:RawValue):Instance {
@@ -36,5 +35,3 @@ class SVGWatcher extends DOMWatcher<Instance> {
     super.setup();
   }
 }
-
-Watcher.register("svg", SVGWatcher);

src/watchers/system.ts

@@ -1,7 +1,7 @@
 import {Watcher} from "./watcher";
 import {ID} from "../runtime/runtime";
 
-class SystemWatcher extends Watcher {
+export default class SystemWatcher extends Watcher {
   timers:{[key:string]: {timer:any, prev:Date|undefined, frame:number}} = {};
 
   getTime(changes:any[], timer:ID, frame:number, date?:Date) {
@@ -50,5 +50,3 @@ class SystemWatcher extends Watcher {
     })
   }
 }
-
-Watcher.register("system", SystemWatcher);

src/watchers/tag-browser.ts

@@ -1,7 +1,7 @@
 import {Watcher, Program, RawMap, RawValue, RawEAVC} from "./watcher";
 import {v4 as uuid} from "node-uuid";
 
-import {UIWatcher} from "../watchers/ui";
+import UIWatcher from "../watchers/ui";
 
 interface Attrs extends RawMap<RawValue> {}
 
@@ -19,7 +19,7 @@ function collapse<T extends any[]>(...args:T[]):T {
   return all;
 }
 
-export class TagBrowserWatcher extends Watcher {
+export default class TagBrowserWatcher extends Watcher {
   browser:Program = this.createTagBrowser();
 
   setup() {
@@ -322,4 +322,3 @@ export class TagBrowserWatcher extends Watcher {
   }
 }
 
-Watcher.register("tag browser", TagBrowserWatcher);