Salebarn
diff --git a/‎src/channels.js‎ ‎src/mark.js‎src/channels.js renamed to src/mark.js
Lines changed: 9 additions & 8 deletions b/‎src/channels.js‎ ‎src/mark.js‎src/channels.js renamed to src/mark.js
Lines changed: 9 additions & 8 deletions
diff --git a/‎src/marks/area.js‎
Lines changed: 1 addition & 1 deletion b/‎src/marks/area.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/marks/bar.js‎
Lines changed: 1 addition & 1 deletion b/‎src/marks/bar.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/marks/line.js‎
Lines changed: 1 addition & 1 deletion b/‎src/marks/line.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/marks/rect.js‎
Lines changed: 1 addition & 1 deletion b/‎src/marks/rect.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/marks/rule.js‎
Lines changed: 1 addition & 1 deletion b/‎src/marks/rule.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/plot.js‎
Lines changed: 9 additions & 1 deletion b/‎src/plot.js‎
Lines changed: 9 additions & 1 deletion
@@ -1,13 +1,14 @@
-import {group} from "d3-array";
-
-export function Channels(marks) {
-  return group(
-    marks.flatMap(m => Object.values(m.channels).filter(({scale}) => scale)),
-    ({scale}) => scale
-  );
+export class Mark {
+  constructor(data, channels) {
+    this.data = data;
+    this.channels = Object.fromEntries(Array.from(
+      Object.entries(channels).filter(([, channel]) => channel),
+      ([name, channel]) => [name, Channel(data, channel)]
+    ));
+  }
 }
 
-export function Channel(data, {scale = null, type, value, label}) {
+function Channel(data, {scale = null, type, value, label}) {
   if (typeof value === "string") label = value, value = Array.from(data, Field(value));
   else if (typeof value === "function") value = Array.from(data, value);
   else if (typeof value.length !== "number") value = Array.from(value);
 
@@ -1,7 +1,7 @@
 import {create} from "d3-selection";
 import {area} from "d3-shape";
 import {Curve} from "../curve.js";
-import {identity, indexOf, zero} from "../channels.js";
+import {identity, indexOf, zero} from "../mark.js";
 import {defined} from "../defined.js";
 import {Mark} from "../mark.js";
 
 
@@ -1,5 +1,5 @@
 import {create} from "d3-selection";
-import {identity, indexOf} from "../channels.js";
+import {identity, indexOf} from "../mark.js";
 import {defined} from "../defined.js";
 import {Mark} from "../mark.js";
 
 
@@ -1,7 +1,7 @@
 import {group} from "d3-array";
 import {create} from "d3-selection";
 import {line} from "d3-shape";
-import {indexOf, identity} from "../channels.js";
+import {indexOf, identity} from "../mark.js";
 import {Curve} from "../curve.js";
 import {defined} from "../defined.js";
 import {Mark} from "../mark.js";
 
@@ -1,5 +1,5 @@
 import {create} from "d3-selection";
-import {zero} from "../channels.js";
+import {zero} from "../mark.js";
 import {defined} from "../defined.js";
 import {Mark} from "../mark.js";
 
 
@@ -1,5 +1,5 @@
 import {create} from "d3-selection";
-import {identity} from "../channels.js";
+import {identity} from "../mark.js";
 import {Mark} from "../mark.js";
 
 export class RuleX extends Mark {
 
@@ -1,6 +1,7 @@
+import {group} from "d3-array";
 import {create} from "d3-selection";
 import {Axes, autoAxisTicks, autoAxisLabels} from "./axes.js";
-import {Channels, indexOf} from "./channels.js";
+import {indexOf} from "./mark.js";
 import {Scales, autoScaleRange} from "./scales.js";
 
 export function plot(options = {}) {
@@ -43,3 +44,10 @@ function Dimensions({y}, {x: xAxis, y: yAxis}, {
 } = {}) {
   return {width, height, marginTop, marginRight, marginBottom, marginLeft};
 }
+
+function Channels(marks) {
+  return group(
+    marks.flatMap(m => Object.values(m.channels).filter(({scale}) => scale)),
+    ({scale}) => scale
+  );
+}