Use dataserializers, make datawidgets optional

Author: vidartf

js/package.json

@@ -26,7 +26,7 @@
   "dependencies": {
     "@jupyter-widgets/base": "^1.0.0",
     "bluebird": "^3.4.3",
-    "jupyter-datawidgets": "^2.0.0",
+    "jupyter-dataserializers": "^1.0.0",
     "three": "^0.87.1",
     "underscore": "^1.8.3"
   }

js/scripts/prop-types.js

@@ -319,7 +319,7 @@ function ArrayBufferType(arrayType, shapeConstraint) {
     this.arrayType = arrayType;
     this.shapeConstraint = shapeConstraint;
     this.defaultValue = null;
-    this.serializer = 'datawidgets.data_union_serialization';
+    this.serializer = 'dataserializers.data_union_serialization';
 }
 _.extend(ArrayBufferType.prototype, BaseType.prototype, {
     getTraitlet: function() {

js/scripts/templates/js_wrapper.mustache

@@ -6,7 +6,7 @@
 var _ = require('underscore');
 var THREE = require('three');
 var widgets = require('@jupyter-widgets/base');
-var datawidgets = require('jupyter-datawidgets');
+var dataserializers = require('jupyter-dataserializers');
 
 var {{ superClass.modelName }} = require('{{ superClass.requirePath }}').{{ superClass.modelName }};
 

js/src/_base/Three.js

@@ -3,7 +3,7 @@ var widgets = require("@jupyter-widgets/base");
 var Promise = require('bluebird');
 var $ = require('jquery');
 var ndarray = require('ndarray');
-var datawidgets = require('jupyter-datawidgets');
+var dataserializers = require('jupyter-dataserializers');
 
 var THREE = require('three');
 
@@ -139,7 +139,7 @@ var ThreeModel = widgets.WidgetModel.extend({
 
         // Handle changes in data widgets/union properties
         this.datawidget_properties.forEach(function(propName) {
-            datawidgets.listenToUnion(this, propName, this.onChildChanged.bind(this), false);
+            dataserializers.listenToUnion(this, propName, this.onChildChanged.bind(this), false);
         }, this);
 
         this.on('change', this.onChange, this);

js/src/core/BufferAttribute.js

@@ -1,5 +1,5 @@
 var _ = require('underscore');
-var datawidgets = require('jupyter-datawidgets');
+var dataserializers = require('jupyter-dataserializers');
 var ndarray = require('ndarray');
 var THREE = require('three');
 var BufferAttributeAutogen = require('./BufferAttribute.autogen').BufferAttributeModel;
@@ -15,7 +15,7 @@ var BufferAttributeModel = BufferAttributeAutogen.extend({
     },
 
     decodeData() {
-        var rawData = datawidgets.getArrayFromUnion(this.get('array'));
+        var rawData = dataserializers.getArray(this.get('array'));
         var itemSize = rawData.dimension === 1 ? 1 : rawData.shape[rawData.dimension - 1];
 
         var data = this.convertArrayBufferModelToThree(rawData, 'array');
@@ -57,11 +57,8 @@ var BufferAttributeModel = BufferAttributeAutogen.extend({
         var modelNDArray = this.get('array');
         if (modelNDArray) {
             // 1. / 2.
-            if (modelNDArray instanceof datawidgets.NDArrayModel) {
-                modelNDArray.get('array').data.set(attributeData);
-            } else {
-                modelNDArray.data.set(attributeData);
-            }
+            var rawData = dataserializers.getArray(modelNDArray);
+            rawData.data.set(attributeData);
         } else {
             // 3. / 4.
             this.set('array', ndarray(attributeData, [this.obj.count, this.obj.itemSize]));

js/src/textures/DataTexture.js

@@ -1,5 +1,5 @@
 var _ = require('underscore');
-var datawidgets = require('jupyter-datawidgets');
+var dataserializers = require('jupyter-dataserializers');
 var ndarray = require('ndarray');
 var THREE = require('three');
 var DataTextureBase = require('./DataTexture.autogen').DataTextureModel;
@@ -15,7 +15,7 @@ var DataTextureModel = DataTextureBase.extend({
     },
 
     decodeData() {
-        var rawData = datawidgets.getArrayFromUnion(this.get('data'));
+        var rawData = dataserializers.getArray(this.get('data'));
         if (rawData.dimension < 2 || rawData.dimension > 3) {
             throw Error('DataTexture data dimensions need to be 2 or 3, got:', rawData.dimension)
         }
@@ -69,15 +69,16 @@ var DataTextureModel = DataTextureBase.extend({
         var imageRecord = this.obj.image;
         var modelNDArray = this.get('data');
         if (modelNDArray) {
-            modelNDArray.data.set(imageRecord.data);
+            var rawData = dataserializers.getArray(modelNDArray);
+            rawData.data.set(imageRecord.data);
         } else {
             this.set('data', ndarray(imageRecord.data, [imageRecord.width, imageRecord.height]));
         }
     },
 
 }, {
     serializers: _.extend({
-        data: datawidgets.data_union_serialization,
+        data: dataserializers.data_union_serialization,
     }, DataTextureBase.serializers),
 });
 

js/webpack.config.js

@@ -1,6 +1,6 @@
 const path = require('path');
 
-var externals = ['@jupyter-widgets/base', 'jupyter-datawidgets', 'three'];
+var externals = ['@jupyter-widgets/base', 'three'];
 
 module.exports = [
     {