vega-force - npm Package Compare versions

Comparing version 1.0.0 to 1.0.1

build/vega-force.js

@@ -56,3 +56,5 @@ (function (global, factory) {
     }
-    if (params) setup(sim, _);
+    if (params || pulse.changed(pulse.MOD)) {
+      setup(sim, _, 0, pulse);
+    }
   }
@@ -124,4 +126,4 @@
 
-function setup(sim, _, init) {
-  var f = vegaUtil.array(_.forces), i, n, p;
+function setup(sim, _, init, pulse) {
+  var f = vegaUtil.array(_.forces), i, n, p, name;
 
@@ -134,6 +136,9 @@ for (i=0, n=ForceParams.length; i<n; ++i) {
   for (i=0, n=f.length; i<n; ++i) {
-    if (init || _.modified(Forces, i)) {
-      sim.force(Forces + i, getForce(f[i]));
-    }
+    name = Forces + i;
+    p = init || _.modified(Forces, i) ? getForce(f[i])
+      : pulse && modified(f[i], pulse) ? sim.force(name)
+      : null;
+    if (p) sim.force(name, p);
   }
+
   for (n=(sim.numForces || 0); i<n; ++i) {
@@ -147,2 +152,11 @@ sim.force(Forces + i, null); // remove
 
+function modified(f, pulse) {
+  var k, v;
+  for (k in f) {
+    if (vegaUtil.isFunction(v = f[k]) && pulse.modified(vegaUtil.accessorFields(v)))
+      return 1;
+  }
+  return 0;
+}
+
 function getForce(_) {
@@ -149,0 +163,0 @@ var f, p;

build/vega-force.min.js

@@ -1,1 +0,1 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("vega-dataflow"),require("vega-util"),require("d3-force")):"function"==typeof define&&define.amd?define(["exports","vega-dataflow","vega-util","d3-force"],t):t(e.vega=e.vega||{},e.vega,e.vega,e.d3)}(this,function(e,t,a,r){"use strict";function n(e){t.Transform.call(this,null,e)}function o(e,t){return function(){e.touch(t).run()}}function i(e,t){var a=r.forceSimulation(e),n=!1,o=a.stop,i=a.restart;return a.stopped=function(){return n},a.restart=function(){return n=!1,i()},a.stop=function(){return n=!0,o()},f(a,t,!0).on("end",function(){n=!0})}function f(e,t,r){var n,o,i,f=a.array(t.forces);for(n=0,o=d.length;n<o;++n)(i=d[n])!==m&&t.modified(i)&&e[i](t[i]);for(n=0,o=f.length;n<o;++n)(r||t.modified(m,n))&&e.force(m+n,u(f[n]));for(o=e.numForces||0;n<o;++n)e.force(m+n,null);return e.numForces=f.length,e}function u(e){var t,r;s.hasOwnProperty(e.force)||a.error("Unrecognized force: "+e.force),t=s[e.force]();for(r in e)a.isFunction(t[r])&&t[r](e[r]);return t}var s={center:r.forceCenter,collide:r.forceCollide,nbody:r.forceManyBody,link:r.forceLink,x:r.forceX,y:r.forceY},m="forces",d=["alpha","alphaMin","alphaTarget","velocityDecay","forces"],c=["static","iterations"],l=["x","y","vx","vy"],p=a.inherits(n,t.Transform);p.transform=function(e,t){var a=this.value,r=t.changed(t.ADD_REM),n=e.modified(d),u=e.iterations||300;if(a?(r&&(t.modifies("index"),a.nodes(t.source)),n&&f(a,e)):(this.value=a=i(t.source,e),a.on("tick",o(t.dataflow,this)),e.static||(r=!0,a.tick()),t.modifies("index")),n||r||e.modified(c)||t.changed()&&e.restart)if(a.alpha(Math.max(a.alpha(),e.alpha||1)).alphaDecay(1-Math.pow(a.alphaMin(),1/u)),e.static)for(a.stop();--u>=0;)a.tick();else if(a.stopped()&&a.restart(),!r)return t.StopPropagation;return this.finish(e,t)},p.finish=function(e,t){for(var a,r=t.dataflow,n=this._argops,o=0,i=n.length;o<i;++o)if((a=n[o]).name===m&&"link"===a.op._argval.force)for(var f,u=a.op._argops,s=0,d=u.length;s<d;++s)if("links"===u[s].name&&(f=u[s].op.source)){r.pulse(f,r.changeset().reflow());break}return t.reflow(e.modified()).modifies(l)};var y={type:"Force",metadata:{modifies:!0},params:[{name:"static",type:"boolean",default:!1},{name:"restart",type:"boolean",default:!1},{name:"iterations",type:"number",default:300},{name:"alpha",type:"number",default:1},{name:"alphaMin",type:"number",default:.001},{name:"alphaTarget",type:"number",default:0},{name:"velocityDecay",type:"number",default:.4},{name:"forces",type:"param",array:!0,params:[{key:{force:"center"},params:[{name:"x",type:"number",default:0},{name:"y",type:"number",default:0}]},{key:{force:"collide"},params:[{name:"radius",type:"number",expr:!0},{name:"strength",type:"number",default:.7},{name:"iterations",type:"number",default:1}]},{key:{force:"nbody"},params:[{name:"strength",type:"number",default:-30},{name:"theta",type:"number",default:.9},{name:"distanceMin",type:"number",default:1},{name:"distanceMax",type:"number"}]},{key:{force:"link"},params:[{name:"links",type:"data"},{name:"id",type:"field"},{name:"distance",type:"number",default:30,expr:!0},{name:"strength",type:"number",expr:!0},{name:"iterations",type:"number",default:1}]},{key:{force:"x"},params:[{name:"strength",type:"number",default:.1},{name:"x",type:"field"}]},{key:{force:"y"},params:[{name:"strength",type:"number",default:.1},{name:"y",type:"field"}]}]},{name:"as",type:"string",array:!0,modify:!1,default:["x","y","vx","vy"]}]};t.register(y,n),e.transform=t.transform,e.definition=t.definition,Object.defineProperty(e,"__esModule",{value:!0})});
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("vega-dataflow"),require("vega-util"),require("d3-force")):"function"==typeof define&&define.amd?define(["exports","vega-dataflow","vega-util","d3-force"],t):t(e.vega=e.vega||{},e.vega,e.vega,e.d3)}(this,function(e,t,a,r){"use strict";function n(e){t.Transform.call(this,null,e)}function o(e,t){return function(){e.touch(t).run()}}function i(e,t){var a=r.forceSimulation(e),n=!1,o=a.stop,i=a.restart;return a.stopped=function(){return n},a.restart=function(){return n=!1,i()},a.stop=function(){return n=!0,o()},f(a,t,!0).on("end",function(){n=!0})}function f(e,t,r,n){var o,i,f,c,l=a.array(t.forces);for(o=0,i=m.length;o<i;++o)(f=m[o])!==d&&t.modified(f)&&e[f](t[f]);for(o=0,i=l.length;o<i;++o)c=d+o,(f=r||t.modified(d,o)?s(l[o]):n&&u(l[o],n)?e.force(c):null)&&e.force(c,f);for(i=e.numForces||0;o<i;++o)e.force(d+o,null);return e.numForces=l.length,e}function u(e,t){var r,n;for(r in e)if(a.isFunction(n=e[r])&&t.modified(a.accessorFields(n)))return 1;return 0}function s(e){var t,r;c.hasOwnProperty(e.force)||a.error("Unrecognized force: "+e.force),t=c[e.force]();for(r in e)a.isFunction(t[r])&&t[r](e[r]);return t}var c={center:r.forceCenter,collide:r.forceCollide,nbody:r.forceManyBody,link:r.forceLink,x:r.forceX,y:r.forceY},d="forces",m=["alpha","alphaMin","alphaTarget","velocityDecay","forces"],l=["static","iterations"],p=["x","y","vx","vy"],y=a.inherits(n,t.Transform);y.transform=function(e,t){var a=this.value,r=t.changed(t.ADD_REM),n=e.modified(m),u=e.iterations||300;if(a?(r&&(t.modifies("index"),a.nodes(t.source)),(n||t.changed(t.MOD))&&f(a,e,0,t)):(this.value=a=i(t.source,e),a.on("tick",o(t.dataflow,this)),e.static||(r=!0,a.tick()),t.modifies("index")),n||r||e.modified(l)||t.changed()&&e.restart)if(a.alpha(Math.max(a.alpha(),e.alpha||1)).alphaDecay(1-Math.pow(a.alphaMin(),1/u)),e.static)for(a.stop();--u>=0;)a.tick();else if(a.stopped()&&a.restart(),!r)return t.StopPropagation;return this.finish(e,t)},y.finish=function(e,t){for(var a,r=t.dataflow,n=this._argops,o=0,i=n.length;o<i;++o)if((a=n[o]).name===d&&"link"===a.op._argval.force)for(var f,u=a.op._argops,s=0,c=u.length;s<c;++s)if("links"===u[s].name&&(f=u[s].op.source)){r.pulse(f,r.changeset().reflow());break}return t.reflow(e.modified()).modifies(p)};var h={type:"Force",metadata:{modifies:!0},params:[{name:"static",type:"boolean",default:!1},{name:"restart",type:"boolean",default:!1},{name:"iterations",type:"number",default:300},{name:"alpha",type:"number",default:1},{name:"alphaMin",type:"number",default:.001},{name:"alphaTarget",type:"number",default:0},{name:"velocityDecay",type:"number",default:.4},{name:"forces",type:"param",array:!0,params:[{key:{force:"center"},params:[{name:"x",type:"number",default:0},{name:"y",type:"number",default:0}]},{key:{force:"collide"},params:[{name:"radius",type:"number",expr:!0},{name:"strength",type:"number",default:.7},{name:"iterations",type:"number",default:1}]},{key:{force:"nbody"},params:[{name:"strength",type:"number",default:-30},{name:"theta",type:"number",default:.9},{name:"distanceMin",type:"number",default:1},{name:"distanceMax",type:"number"}]},{key:{force:"link"},params:[{name:"links",type:"data"},{name:"id",type:"field"},{name:"distance",type:"number",default:30,expr:!0},{name:"strength",type:"number",expr:!0},{name:"iterations",type:"number",default:1}]},{key:{force:"x"},params:[{name:"strength",type:"number",default:.1},{name:"x",type:"field"}]},{key:{force:"y"},params:[{name:"strength",type:"number",default:.1},{name:"y",type:"field"}]}]},{name:"as",type:"string",array:!0,modify:!1,default:["x","y","vx","vy"]}]};t.register(h,n),e.transform=t.transform,e.definition=t.definition,Object.defineProperty(e,"__esModule",{value:!0})});

package.json

 {
   "name": "vega-force",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Force simulation transform for Vega dataflows.",
@@ -5,0 +5,0 @@ "keywords": [

src/Force.js

 import {Transform} from 'vega-dataflow';
-import {array, error, inherits, isFunction} from 'vega-util';
+import {accessorFields, array, error, inherits, isFunction} from 'vega-util';
 import {
@@ -57,3 +57,5 @@ forceSimulation, forceCenter, forceCollide,
     }
-    if (params) setup(sim, _);
+    if (params || pulse.changed(pulse.MOD)) {
+      setup(sim, _, 0, pulse);
+    }
   }
@@ -125,4 +127,4 @@
 
-function setup(sim, _, init) {
-  var f = array(_.forces), i, n, p;
+function setup(sim, _, init, pulse) {
+  var f = array(_.forces), i, n, p, name;
 
@@ -135,6 +137,9 @@ for (i=0, n=ForceParams.length; i<n; ++i) {
   for (i=0, n=f.length; i<n; ++i) {
-    if (init || _.modified(Forces, i)) {
-      sim.force(Forces + i, getForce(f[i]));
-    }
+    name = Forces + i;
+    p = init || _.modified(Forces, i) ? getForce(f[i])
+      : pulse && modified(f[i], pulse) ? sim.force(name)
+      : null;
+    if (p) sim.force(name, p);
   }
+
   for (n=(sim.numForces || 0); i<n; ++i) {
@@ -148,2 +153,11 @@ sim.force(Forces + i, null); // remove
 
+function modified(f, pulse) {
+  var k, v;
+  for (k in f) {
+    if (isFunction(v = f[k]) && pulse.modified(accessorFields(v)))
+      return 1;
+  }
+  return 0;
+}
+
 function getForce(_) {
@@ -150,0 +164,0 @@ var f, p;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

20661

increased by4.23%

Lines of code

440

increased by5.77%

No dependency changes