Reorganize package

setup.py

@@ -1,10 +1,12 @@
 from __future__ import print_function
 
+import os
 import pipes
 import shutil
 import subprocess
 import sys
 import traceback
+
 from distutils import log
 from distutils.command.build import build  # type: ignore
 from distutils.command.sdist import sdist  # type: ignore
@@ -31,8 +33,6 @@ def list2cmdline(cmd_list):
 ROOT_DIR = Path(__file__).parent
 SRC_DIR = ROOT_DIR / "src"
 PKG_DIR = SRC_DIR / NAME
-JS_DIR = SRC_DIR / "idom-bokeh-extension"
-
 
 # -----------------------------------------------------------------------------
 # Package Definition
@@ -126,11 +126,13 @@ def list2cmdline(cmd_list):
 def build_javascript_first(cls, rebuild=False):
     class Command(cls):
         def run(self):
-            build_bokeh_extension(JS_DIR, rebuild=rebuild)
-            shutil.move(
-                str(JS_DIR / "dist" / f"{JS_DIR.name}.min.js"),
-                str(PKG_DIR / "bundle.js"),
-            )
+            build_bokeh_extension(PKG_DIR, rebuild=rebuild)
+            npm = "npm" if sys.platform != "win32" else "npm.bat"
+            os.chdir("src/idom_bokeh")
+            try:
+                self.spawn([npm, "run", "rollup"])
+            finally:
+                os.chdir("../..")
             super().run()
 
     return Command

src/idom_bokeh/_model.py

@@ -1,12 +1,19 @@
 from bokeh.core.properties import Any, Dict, Either, String, Null, Tuple
+from bokeh.events import ModelEvent
 from bokeh.models import HTMLBox
 
 
+class IDOMEvent(ModelEvent):
+
+    event_name = 'idom_event'
+
+    def __init__(self, model, data=None):
+        self.data = data
+        super().__init__(model=model)
+
+
 class IDOM(HTMLBox):
 
-    __implementation__ = "bundle.js"
     importSourceUrl = String()
 
     event = Tuple(Any, Any)
-
-    msg = Either(Dict(String, Any), Null)