arrayOfPrimitive

Author: mbostock

src/index.mjs

@@ -1,3 +1,3 @@
 export {default as FileAttachments, AbstractFile} from "./fileAttachment.mjs";
 export {default as Library} from "./library.mjs";
-export {makeQueryTemplate, isDataArray, isDatabaseClient} from "./table.mjs";
+export {makeQueryTemplate, arrayIsPrimitive, isDataArray, isDatabaseClient} from "./table.mjs";

src/table.mjs

@@ -71,8 +71,8 @@ function isQueryResultSetColumns(columns) {
 
 // Returns true if the value represents an array of primitives (i.e., a
 // single-column table). This should only be passed values for which
-// canDisplayTable returns true.
-function arrayIsPrimitive(value) {
+// isDataArray returns true.
+export function arrayIsPrimitive(value) {
   return (
     isTypedArray(value) ||
     arrayContainsPrimitives(value) ||
@@ -373,9 +373,10 @@ function likeOperand(operand) {
 // This function applies table cell operations to an in-memory table (array of
 // objects); it should be equivalent to the corresponding SQL query.
 export function __table(source, operations) {
-  if (arrayIsPrimitive(source)) source = Array.from(source, (value) => ({value}));
   const input = source;
   let {schema, columns} = source;
+  let primitive = arrayIsPrimitive(source);
+  if (primitive) source = Array.from(source, (value) => ({value}));
   for (const {type, operands} of operations.filter) {
     const [{value: column}] = operands;
     const values = operands.slice(1).map(({value}) => value);
@@ -474,6 +475,7 @@ export function __table(source, operations) {
       Object.fromEntries(operations.select.columns.map((c) => [c, d[c]]))
     );
   }
+  if (primitive) source = source.map((d) => d.value);
   if (source !== input) {
     if (schema) source.schema = schema;
     if (columns) source.columns = columns;

test/table-test.mjs

@@ -277,6 +277,17 @@ describe("__table", () => {
     assert.deepStrictEqual(__table(source, operationsComparison), [{a: 2, b: 4, c: 6}]);
   });
 
+  it("__table filter primitive lte + gte", () => {
+    assert.deepStrictEqual(__table([1, 2, 3], {
+      ...EMPTY_TABLE_DATA.operations,
+      filter: [{type: "eq", operands: [{type: "column", value: "value"}, {type: "resolved", value: 1}]}]
+    }), [1]);
+    assert.deepStrictEqual(__table(Uint32Array.of(1, 2, 3), {
+      ...EMPTY_TABLE_DATA.operations,
+      filter: [{type: "eq", operands: [{type: "column", value: "value"}, {type: "resolved", value: 1}]}]
+    }), [1]);
+  });
+
   it("__table filter eq date", () => {
     const operationsEquals = {
       ...EMPTY_TABLE_DATA.operations,