2.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "d3-selection",
-  "version": "1.4.2",
+  "version": "2.0.0-rc.5",
   "description": "Data-driven DOM manipulation: select elements and join them to data.",
   "keywords": [
     "d3",

src/array.js

@@ -0,0 +1,5 @@
+export default function(x) {
+  return typeof x === "object" && "length" in x
+    ? x // Array, TypedArray, NodeList, array-like
+    : Array.from(x); // Map, Set, iterable, string, or anything else
+}

src/create.js

@@ -1,5 +1,5 @@
-import creator from "./creator";
-import select from "./select";
+import creator from "./creator.js";
+import select from "./select.js";
 
 export default function(name) {
   return select(creator(name).call(document.documentElement));

src/creator.js

@@ -1,5 +1,5 @@
-import namespace from "./namespace";
-import {xhtml} from "./namespaces";
+import namespace from "./namespace.js";
+import {xhtml} from "./namespaces.js";
 
 function creatorInherit(name) {
   return function() {

src/index.js

@@ -1,18 +1,15 @@
-export {default as create} from "./create";
-export {default as creator} from "./creator";
-export {default as local} from "./local";
-export {default as matcher} from "./matcher";
-export {default as mouse} from "./mouse";
-export {default as namespace} from "./namespace";
-export {default as namespaces} from "./namespaces";
-export {default as clientPoint} from "./point";
-export {default as select} from "./select";
-export {default as selectAll} from "./selectAll";
-export {default as selection} from "./selection/index";
-export {default as selector} from "./selector";
-export {default as selectorAll} from "./selectorAll";
-export {styleValue as style} from "./selection/style";
-export {default as touch} from "./touch";
-export {default as touches} from "./touches";
-export {default as window} from "./window";
-export {event, customEvent} from "./selection/on";
+export {default as create} from "./create.js";
+export {default as creator} from "./creator.js";
+export {default as local} from "./local.js";
+export {default as matcher} from "./matcher.js";
+export {default as namespace} from "./namespace.js";
+export {default as namespaces} from "./namespaces.js";
+export {default as pointer} from "./pointer.js";
+export {default as pointers} from "./pointers.js";
+export {default as select} from "./select.js";
+export {default as selectAll} from "./selectAll.js";
+export {default as selection} from "./selection/index.js";
+export {default as selector} from "./selector.js";
+export {default as selectorAll} from "./selectorAll.js";
+export {styleValue as style} from "./selection/style.js";
+export {default as window} from "./window.js";

src/matcher.js

@@ -3,3 +3,10 @@ export default function(selector) {
     return this.matches(selector);
   };
 }
+
+export function childMatcher(selector) {
+  return function(node) {
+    return node.matches(selector);
+  };
+}
+

src/namespace.js

@@ -1,7 +1,7 @@
-import namespaces from "./namespaces";
+import namespaces from "./namespaces.js";
 
 export default function(name) {
   var prefix = name += "", i = prefix.indexOf(":");
   if (i >= 0 && (prefix = name.slice(0, i)) !== "xmlns") name = name.slice(i + 1);
-  return namespaces.hasOwnProperty(prefix) ? {space: namespaces[prefix], local: name} : name;
+  return namespaces.hasOwnProperty(prefix) ? {space: namespaces[prefix], local: name} : name; // eslint-disable-line no-prototype-builtins
 }

src/pointer.js

@@ -0,0 +1,20 @@
+import sourceEvent from "./sourceEvent.js";
+
+export default function(event, node) {
+  event = sourceEvent(event);
+  if (node === undefined) node = event.currentTarget;
+  if (node) {
+    var svg = node.ownerSVGElement || node;
+    if (svg.createSVGPoint) {
+      var point = svg.createSVGPoint();
+      point.x = event.clientX, point.y = event.clientY;
+      point = point.matrixTransform(node.getScreenCTM().inverse());
+      return [point.x, point.y];
+    }
+    if (node.getBoundingClientRect) {
+      var rect = node.getBoundingClientRect();
+      return [event.clientX - rect.left - node.clientLeft, event.clientY - rect.top - node.clientTop];
+    }
+  }
+  return [event.pageX, event.pageY];
+}

src/pointers.js

@@ -0,0 +1,11 @@
+import pointer from "./pointer.js";
+import sourceEvent from "./sourceEvent.js";
+
+export default function(events, node) {
+  if (events.target) { // i.e., instanceof Event, not TouchList or iterable
+    events = sourceEvent(events);
+    if (node === undefined) node = events.currentTarget;
+    events = events.touches || [events];
+  }
+  return Array.from(events, event => pointer(event, node));
+}

src/select.js

@@ -1,4 +1,4 @@
-import {Selection, root} from "./selection/index";
+import {Selection, root} from "./selection/index.js";
 
 export default function(selector) {
   return typeof selector === "string"

src/selectAll.js

@@ -1,7 +1,8 @@
-import {Selection, root} from "./selection/index";
+import array from "./array.js";
+import {Selection, root} from "./selection/index.js";
 
 export default function(selector) {
   return typeof selector === "string"
       ? new Selection([document.querySelectorAll(selector)], [document.documentElement])
-      : new Selection([selector == null ? [] : selector], root);
+      : new Selection([selector == null ? [] : array(selector)], root);
 }

src/selection/append.js

@@ -1,4 +1,4 @@
-import creator from "../creator";
+import creator from "../creator.js";
 
 export default function(name) {
   var create = typeof name === "function" ? name : creator(name);

src/selection/attr.js

@@ -1,4 +1,4 @@
-import namespace from "../namespace";
+import namespace from "../namespace.js";
 
 function attrRemove(name) {
   return function() {

src/selection/data.js

@@ -1,8 +1,7 @@
-import {Selection} from "./index";
-import {EnterNode} from "./enter";
-import constant from "../constant";
-
-var keyPrefix = "$"; // Protect against keys like “__proto__”.
+import {Selection} from "./index.js";
+import {EnterNode} from "./enter.js";
+import array from "../array.js";
+import constant from "../constant.js";
 
 function bindIndex(parent, group, enter, update, exit, data) {
   var i = 0,
@@ -33,7 +32,7 @@ function bindIndex(parent, group, enter, update, exit, data) {
 function bindKey(parent, group, enter, update, exit, data, key) {
   var i,
       node,
-      nodeByKeyValue = {},
+      nodeByKeyValue = new Map,
       groupLength = group.length,
       dataLength = data.length,
       keyValues = new Array(groupLength),
@@ -43,11 +42,11 @@ function bindKey(parent, group, enter, update, exit, data, key) {
   // If multiple nodes have the same key, the duplicates are added to exit.
   for (i = 0; i < groupLength; ++i) {
     if (node = group[i]) {
-      keyValues[i] = keyValue = keyPrefix + key.call(node, node.__data__, i, group);
-      if (keyValue in nodeByKeyValue) {
+      keyValues[i] = keyValue = key.call(node, node.__data__, i, group) + "";
+      if (nodeByKeyValue.has(keyValue)) {
         exit[i] = node;
       } else {
-        nodeByKeyValue[keyValue] = node;
+        nodeByKeyValue.set(keyValue, node);
       }
     }
   }
@@ -56,30 +55,30 @@ function bindKey(parent, group, enter, update, exit, data, key) {
   // If there a node associated with this key, join and add it to update.
   // If there is not (or the key is a duplicate), add it to enter.
   for (i = 0; i < dataLength; ++i) {
-    keyValue = keyPrefix + key.call(parent, data[i], i, data);
-    if (node = nodeByKeyValue[keyValue]) {
+    keyValue = key.call(parent, data[i], i, data) + "";
+    if (node = nodeByKeyValue.get(keyValue)) {
       update[i] = node;
       node.__data__ = data[i];
-      nodeByKeyValue[keyValue] = null;
+      nodeByKeyValue.delete(keyValue);
     } else {
       enter[i] = new EnterNode(parent, data[i]);
     }
   }
 
   // Add any remaining nodes that were not bound to data to exit.
   for (i = 0; i < groupLength; ++i) {
-    if ((node = group[i]) && (nodeByKeyValue[keyValues[i]] === node)) {
+    if ((node = group[i]) && (nodeByKeyValue.get(keyValues[i]) === node)) {
       exit[i] = node;
     }
   }
 }
 
+function datum(node) {
+  return node.__data__;
+}
+
 export default function(value, key) {
-  if (!value) {
-    data = new Array(this.size()), j = -1;
-    this.each(function(d) { data[++j] = d; });
-    return data;
-  }
+  if (!arguments.length) return Array.from(this, datum);
 
   var bind = key ? bindKey : bindIndex,
       parents = this._parents,
@@ -91,7 +90,7 @@ export default function(value, key) {
     var parent = parents[j],
         group = groups[j],
         groupLength = group.length,
-        data = value.call(parent, parent && parent.__data__, j, parents),
+        data = array(value.call(parent, parent && parent.__data__, j, parents)),
         dataLength = data.length,
         enterGroup = enter[j] = new Array(dataLength),
         updateGroup = update[j] = new Array(dataLength),

src/selection/dispatch.js

@@ -1,4 +1,4 @@
-import defaultView from "../window";
+import defaultView from "../window.js";
 
 function dispatchEvent(node, type, params) {
   var window = defaultView(node),

src/selection/enter.js

@@ -1,5 +1,5 @@
-import sparse from "./sparse";
-import {Selection} from "./index";
+import sparse from "./sparse.js";
+import {Selection} from "./index.js";
 
 export default function() {
   return new Selection(this._enter || this._groups.map(sparse), this._parents);

src/selection/exit.js

@@ -1,5 +1,5 @@
-import sparse from "./sparse";
-import {Selection} from "./index";
+import sparse from "./sparse.js";
+import {Selection} from "./index.js";
 
 export default function() {
   return new Selection(this._exit || this._groups.map(sparse), this._parents);

src/selection/filter.js

@@ -1,5 +1,5 @@
-import {Selection} from "./index";
-import matcher from "../matcher";
+import {Selection} from "./index.js";
+import matcher from "../matcher.js";
 
 export default function(match) {
   if (typeof match !== "function") match = matcher(match);

src/selection/index.js

@@ -1,34 +1,37 @@
-import selection_select from "./select";
-import selection_selectAll from "./selectAll";
-import selection_filter from "./filter";
-import selection_data from "./data";
-import selection_enter from "./enter";
-import selection_exit from "./exit";
-import selection_join from "./join";
-import selection_merge from "./merge";
-import selection_order from "./order";
-import selection_sort from "./sort";
-import selection_call from "./call";
-import selection_nodes from "./nodes";
-import selection_node from "./node";
-import selection_size from "./size";
-import selection_empty from "./empty";
-import selection_each from "./each";
-import selection_attr from "./attr";
-import selection_style from "./style";
-import selection_property from "./property";
-import selection_classed from "./classed";
-import selection_text from "./text";
-import selection_html from "./html";
-import selection_raise from "./raise";
-import selection_lower from "./lower";
-import selection_append from "./append";
-import selection_insert from "./insert";
-import selection_remove from "./remove";
-import selection_clone from "./clone";
-import selection_datum from "./datum";
-import selection_on from "./on";
-import selection_dispatch from "./dispatch";
+import selection_select from "./select.js";
+import selection_selectAll from "./selectAll.js";
+import selection_selectChild from "./selectChild.js";
+import selection_selectChildren from "./selectChildren.js";
+import selection_filter from "./filter.js";
+import selection_data from "./data.js";
+import selection_enter from "./enter.js";
+import selection_exit from "./exit.js";
+import selection_join from "./join.js";
+import selection_merge from "./merge.js";
+import selection_order from "./order.js";
+import selection_sort from "./sort.js";
+import selection_call from "./call.js";
+import selection_nodes from "./nodes.js";
+import selection_node from "./node.js";
+import selection_size from "./size.js";
+import selection_empty from "./empty.js";
+import selection_each from "./each.js";
+import selection_attr from "./attr.js";
+import selection_style from "./style.js";
+import selection_property from "./property.js";
+import selection_classed from "./classed.js";
+import selection_text from "./text.js";
+import selection_html from "./html.js";
+import selection_raise from "./raise.js";
+import selection_lower from "./lower.js";
+import selection_append from "./append.js";
+import selection_insert from "./insert.js";
+import selection_remove from "./remove.js";
+import selection_clone from "./clone.js";
+import selection_datum from "./datum.js";
+import selection_on from "./on.js";
+import selection_dispatch from "./dispatch.js";
+import selection_iterator from "./iterator.js";
 
 export var root = [null];
 
@@ -41,16 +44,23 @@ function selection() {
   return new Selection([[document.documentElement]], root);
 }
 
+function selection_selection() {
+  return this;
+}
+
 Selection.prototype = selection.prototype = {
   constructor: Selection,
   select: selection_select,
   selectAll: selection_selectAll,
+  selectChild: selection_selectChild,
+  selectChildren: selection_selectChildren,
   filter: selection_filter,
   data: selection_data,
   enter: selection_enter,
   exit: selection_exit,
   join: selection_join,
   merge: selection_merge,
+  selection: selection_selection,
   order: selection_order,
   sort: selection_sort,
   call: selection_call,
@@ -73,7 +83,8 @@ Selection.prototype = selection.prototype = {
   clone: selection_clone,
   datum: selection_datum,
   on: selection_on,
-  dispatch: selection_dispatch
+  dispatch: selection_dispatch,
+  [Symbol.iterator]: selection_iterator
 };
 
 export default selection;

src/selection/insert.js

@@ -1,5 +1,5 @@
-import creator from "../creator";
-import selector from "../selector";
+import creator from "../creator.js";
+import selector from "../selector.js";
 
 function constantNull() {
   return null;