Merge pull request #21 from grozen/diversify

Support Cycle Diversity

Author: Widdershin

.gitignore

@@ -10,6 +10,9 @@ pids
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 
+# "Compiled" library file
+lib/
+
 # Coverage directory used by tools like istanbul
 coverage
 

examples/flappy-bird/index.js

@@ -1,4 +1,4 @@
-import {run} from '@cycle/core';
+import {run} from '@cycle/rx-run';
 import {makeCanvasDriver} from '../../src/canvas-driver';
 import {makeAnimationDriver} from 'cycle-animation-driver';
 import keycode from 'keycode';

package.json

@@ -35,9 +35,9 @@
   },
   "homepage": "https://github.com/Widdershin/cycle-canvas",
   "devDependencies": {
-    "@cycle/core": "^6.0.0-rc2",
     "@cycle/dom": "^9.0.1",
     "@cycle/isolate": "^1.2.0",
+    "@cycle/rx-run": "^7.0.1",
     "assert": "^1.3.0",
     "babel-cli": "^6.2.0",
     "babel-core": "^6.2.1",
@@ -55,5 +55,9 @@
     "mocha": "^2.4.5",
     "rx": "^4.0.7",
     "uglifyify": "^3.0.1"
+  },
+  "dependencies": {
+    "@cycle/xstream-adapter": "^3.0.3",
+    "xstream": "^6.2.0"
   }
 }

src/canvas-driver.js

@@ -1,3 +1,6 @@
+import XStreamAdapter from '@cycle/xstream-adapter';
+import xs from 'xstream'
+
 function flatten (array) {
   if (typeof array.reduce !== 'function') {
     return array;
@@ -337,28 +340,37 @@ export function makeCanvasDriver (selector, {width, height}) {
 
   const context = canvas.getContext('2d');
 
-  return function canvasDriver (sink$) {
-    return sink$.subscribe(rootElement => {
-      const defaults = {
-        kind: 'rect',
-        x: 0,
-        y: 0,
-        width: canvas.width,
-        height: canvas.height,
-        draw: [
+  let driver = function canvasDriver (sink$) {
+    sink$.addListener({
+      next: rootElement => {
+        const defaults = {
+          kind: 'rect',
+          x: 0,
+          y: 0,
+          width: canvas.width,
+          height: canvas.height,
+          draw: [
           {clear: true}
-        ]
-      };
+          ]
+        };
 
-      const rootElementWithDefaults = Object.assign(
-        {},
-        defaults,
-        rootElement
-      );
+        const rootElementWithDefaults = Object.assign(
+          {},
+          defaults,
+          rootElement
+          );
 
-      const instructions = translateVtreeToInstructions(rootElementWithDefaults);
+        const instructions = translateVtreeToInstructions(rootElementWithDefaults);
 
-      renderInstructionsToCanvas(instructions, context);
+        renderInstructionsToCanvas(instructions, context);
+      },
+      error: e => { throw e },
+      complete: () => null
     });
-  };
+
+    return xs.empty();
+  }
+
+  driver.streamAdapter = XStreamAdapter;
+  return driver;
 }