warn about ignored indices

for #493 #536
observablehq · Nov 23, 2021 · a68685d · a68685d
1 parent 2da25ec
commit a68685d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/defined.js b/src/defined.js
@@ -17,8 +17,15 @@ export function nonempty(x) {
 }
 
 export function filter(index, ...channels) {
+  const ignored = [];
   for (const c of channels) {
-    if (c) index = index.filter(i => defined(c[i]));
+    if (c) {
+      const test = typeof c === "function" ? c : i => defined(c[i]);
+      index = index.filter(i => test(i) || (ignored.push(i), false));
+    }
+  }
+  if (ignored.length > 0) {
+    console.warn(`ignored indices:`, ignored);
   }
   return index;
 }

diff --git a/src/marks/dot.js b/src/marks/dot.js
@@ -33,8 +33,7 @@ export class Dot extends Mark {
   ) {
     const {x: X, y: Y, r: R} = channels;
     const {dx, dy} = this;
-    let index = filter(I, X, Y);
-    if (R) index = index.filter(i => positive(R[i]));
+    const index = filter(I, X, Y, R && (i => positive(R[i])));
     return create("svg:g")
         .call(applyIndirectStyles, this)
         .call(applyTransform, x, y, offset + dx, offset + dy)

diff --git a/src/marks/text.js b/src/marks/text.js
@@ -51,7 +51,7 @@ export class Text extends Mark {
     const {x: X, y: Y, rotate: R, text: T, fontSize: FS} = channels;
     const {width, height, marginTop, marginRight, marginBottom, marginLeft} = dimensions;
     const {rotate} = this;
-    const index = filter(I, X, Y, R).filter(i => nonempty(T[i]));
+    const index = filter(I, X, Y, R, i => nonempty(T[i]));
     const cx = (marginLeft + width - marginRight) / 2;
     const cy = (marginTop + height - marginBottom) / 2;
     return create("svg:g")