@vuu-ui/vuu-filters 0.8.4-debug → 0.8.5-debug

package/esm/index.js

@@ -93,1057 +93,329 @@ var require_classnames = __commonJS({
   }
 });
 
-// src/column-filter/ColumnFilter.tsx
-import {
-  Dropdown,
-  Toolbar,
-  ToolbarButton,
-  ToolbarField as ToolbarField2
-} from "@heswell/salt-lab";
-import { Text } from "@salt-ds/core";
-
-// ../../node_modules/@salt-ds/icons/dist-es/packages/icons/src/icon/Icon.js
-import { jsx } from "react/jsx-runtime";
-import { forwardRef } from "react";
+// src/filter-input/FilterInput.tsx
+import { Button } from "@salt-ds/core";
 
-// ../../node_modules/clsx/dist/clsx.m.js
-function r(e) {
-  var t, f, n = "";
-  if ("string" == typeof e || "number" == typeof e)
-    n += e;
-  else if ("object" == typeof e)
-    if (Array.isArray(e))
-      for (t = 0; t < e.length; t++)
-        e[t] && (f = r(e[t])) && (n && (n += " "), n += f);
-    else
-      for (t in e)
-        e[t] && (n && (n += " "), n += t);
-  return n;
-}
-function clsx() {
-  for (var e, t, f = 0, n = ""; f < arguments.length; )
-    (e = arguments[f++]) && (t = r(e)) && (n && (n += " "), n += t);
-  return n;
-}
+// src/filter-input/useCodeMirrorEditor.ts
+import {
+  autocompletion,
+  defaultKeymap,
+  EditorState as EditorState2,
+  EditorView as EditorView2,
+  ensureSyntaxTree,
+  keymap,
+  minimalSetup,
+  startCompletion
+} from "@vuu-ui/vuu-codemirror";
 
-// ../../node_modules/@salt-ds/icons/dist-es/node_modules/style-inject/dist/style-inject.es.js
-function styleInject(css, ref) {
-  if (ref === void 0)
-    ref = {};
-  var insertAt = ref.insertAt;
-  if (!css || typeof document === "undefined") {
-    return;
-  }
-  var head = document.head || document.getElementsByTagName("head")[0];
-  var style = document.createElement("style");
-  style.type = "text/css";
-  if (insertAt === "top") {
-    if (head.firstChild) {
-      head.insertBefore(style, head.firstChild);
-    } else {
-      head.appendChild(style);
-    }
-  } else {
-    head.appendChild(style);
-  }
-  if (style.styleSheet) {
-    style.styleSheet.cssText = css;
-  } else {
-    style.appendChild(document.createTextNode(css));
+// ../../node_modules/@lezer/common/dist/index.js
+var DefaultBufferLength = 1024;
+var nextPropID = 0;
+var Range = class {
+  constructor(from, to) {
+    this.from = from;
+    this.to = to;
   }
-}
-
-// ../../node_modules/@salt-ds/icons/dist-es/packages/icons/src/icon/Icon.css.js
-var css_248z = "/* Style applied to the root element */\n.saltIcon {\n  --icon-color: var(--saltIcon-color, var(--salt-text-secondary-foreground));\n  --icon-size-multiplier: var(--saltIcon-size-multiplier, 1);\n  --icon-base-size: var(--salt-size-icon-base, 12px);\n  /**\n   * Icon size will be the multiplier (an integer from the size prop) * the base size (set by the theme per density)\n   * Icons should never be smaller than 12px for readability so we've added a max() to enforce this\n  */\n  --icon-size: max(calc(var(--icon-base-size) * var(--icon-size-multiplier)), 12px);\n}\n\n.saltIcon {\n  fill: var(--saltIcon-color, var(--icon-color));\n  display: inline-block;\n  margin: var(--saltIcon-margin, 0);\n  position: relative;\n  width: var(--icon-size);\n  height: var(--icon-size);\n  min-width: var(--icon-size);\n  min-height: var(--icon-size);\n}\n\n.saltIcon:hover {\n  --icon-color: var(--saltIcon-color-hover, var(--salt-text-secondary-foreground));\n}\n\n.saltIcon:active {\n  --icon-color: var(--saltIcon-color-active, var(--salt-text-secondary-foreground));\n}\n";
-styleInject(css_248z);
-
-// ../../node_modules/@salt-ds/icons/dist-es/packages/icons/src/icon/Icon.js
-var makePrefixer = (prefix) => (...names) => [prefix, ...names].join("-");
-var withBaseName = makePrefixer("saltIcon");
-var DEFAULT_ICON_SIZE = 1;
-var Icon = forwardRef(function Icon2({ children, className, size = DEFAULT_ICON_SIZE, style: styleProp, ...rest }, ref) {
-  const style = {
-    ...styleProp,
-    "--saltIcon-size-multiplier": `${size}`
-  };
-  return /* @__PURE__ */ jsx("svg", {
-    className: clsx(withBaseName(), className),
-    style,
-    role: "img",
-    ...rest,
-    ref,
-    children: /* @__PURE__ */ jsx("g", {
-      "aria-hidden": true,
-      children
-    })
-  });
-});
-
-// ../../node_modules/@salt-ds/icons/dist-es/packages/icons/src/components/Delete.js
-import { jsxs, jsx as jsx2 } from "react/jsx-runtime";
-import { forwardRef as forwardRef2 } from "react";
-var DeleteIcon = forwardRef2(
-  function DeleteIcon2(props, ref) {
-    return /* @__PURE__ */ jsxs(Icon, {
-      "data-testid": "DeleteIcon",
-      "aria-label": "delete",
-      viewBox: "0 0 12 12",
-      ref,
-      ...props,
-      children: [
-        /* @__PURE__ */ jsx2("path", {
-          d: "M5 4v6H4V4h1Zm2 0v6H6V4h1Z"
-        }),
-        /* @__PURE__ */ jsx2("path", {
-          fillRule: "evenodd",
-          d: "M4 0a1 1 0 0 0-1 1v1H0v1h1v7a2 2 0 0 0 2 2h5.25A1.75 1.75 0 0 0 10 10.25V3h1V2H8V1a1 1 0 0 0-1-1H4Zm5 3H2v7a1 1 0 0 0 1 1h5.25a.75.75 0 0 0 .75-.75V3ZM7 2H4v-.5a.5.5 0 0 1 .5-.5h2a.5.5 0 0 1 .5.5V2Z",
-          clipRule: "evenodd"
-        })
-      ]
+};
+var NodeProp = class {
+  /// Create a new node prop type.
+  constructor(config = {}) {
+    this.id = nextPropID++;
+    this.perNode = !!config.perNode;
+    this.deserialize = config.deserialize || (() => {
+      throw new Error("This node type doesn't define a deserialize function");
     });
   }
-);
-
-// src/column-filter/RangeFilter.tsx
-import { Input, ToolbarField } from "@heswell/salt-lab";
-
-// src/filter-utils.ts
-import {
-  extractFilterForColumn,
-  isAndFilter,
-  isInFilter,
-  isMultiClauseFilter,
-  isMultiValueFilter,
-  isOrFilter,
-  isSingleValueFilter,
-  partition
-} from "@vuu-ui/vuu-utils";
-var AND = "and";
-var EQUALS = "=";
-var GREATER_THAN = ">";
-var LESS_THAN = "<";
-var OR = "or";
-var STARTS_WITH = "starts";
-var ENDS_WITH = "ends";
-var IN = "in";
-var filterClauses = (filter, clauses = []) => {
-  if (filter) {
-    if (isMultiClauseFilter(filter)) {
-      filter.filters.forEach((f) => clauses.push(...filterClauses(f)));
-    } else {
-      clauses.push(filter);
-    }
+  /// This is meant to be used with
+  /// [`NodeSet.extend`](#common.NodeSet.extend) or
+  /// [`LRParser.configure`](#lr.ParserConfig.props) to compute
+  /// prop values for each node type in the set. Takes a [match
+  /// object](#common.NodeType^match) or function that returns undefined
+  /// if the node type doesn't get this prop, and the prop's value if
+  /// it does.
+  add(match) {
+    if (this.perNode)
+      throw new RangeError("Can't add per-node props to node types");
+    if (typeof match != "function")
+      match = NodeType.match(match);
+    return (type) => {
+      let result = match(type);
+      return result === void 0 ? null : [this, result];
+    };
   }
-  return clauses;
-};
-var DEFAULT_ADD_FILTER_OPTS = {
-  combineWith: "and"
 };
-var addFilter = (existingFilter, filter, { combineWith = AND } = DEFAULT_ADD_FILTER_OPTS) => {
-  var _a;
-  if (includesNoValues(filter)) {
-    if (isMultiClauseFilter(filter)) {
-    } else {
-      existingFilter = removeFilterForColumn(existingFilter, {
-        name: filter.column
-      });
-    }
-  } else if (includesAllValues(filter)) {
-    if (isMultiClauseFilter(filter)) {
-    }
-    return removeFilterForColumn(existingFilter, { name: (_a = filter.column) != null ? _a : "" });
-  }
-  if (!existingFilter) {
-    return filter;
+NodeProp.closedBy = new NodeProp({ deserialize: (str) => str.split(" ") });
+NodeProp.openedBy = new NodeProp({ deserialize: (str) => str.split(" ") });
+NodeProp.group = new NodeProp({ deserialize: (str) => str.split(" ") });
+NodeProp.contextHash = new NodeProp({ perNode: true });
+NodeProp.lookAhead = new NodeProp({ perNode: true });
+NodeProp.mounted = new NodeProp({ perNode: true });
+var noProps = /* @__PURE__ */ Object.create(null);
+var NodeType = class {
+  /// @internal
+  constructor(name, props, id, flags = 0) {
+    this.name = name;
+    this.props = props;
+    this.id = id;
+    this.flags = flags;
   }
-  if (!filter) {
-    return existingFilter;
+  /// Define a node type.
+  static define(spec) {
+    let props = spec.props && spec.props.length ? /* @__PURE__ */ Object.create(null) : noProps;
+    let flags = (spec.top ? 1 : 0) | (spec.skipped ? 2 : 0) | (spec.error ? 4 : 0) | (spec.name == null ? 8 : 0);
+    let type = new NodeType(spec.name || "", props, spec.id, flags);
+    if (spec.props)
+      for (let src of spec.props) {
+        if (!Array.isArray(src))
+          src = src(type);
+        if (src) {
+          if (src[0].perNode)
+            throw new RangeError("Can't store a per-node prop on a node type");
+          props[src[0].id] = src[1];
+        }
+      }
+    return type;
   }
-  if (existingFilter.op === AND && filter.op === AND) {
-    return {
-      op: AND,
-      filters: combine(existingFilter.filters, filter.filters)
-    };
+  /// Retrieves a node prop for this type. Will return `undefined` if
+  /// the prop isn't present on this node.
+  prop(prop) {
+    return this.props[prop.id];
   }
-  if (existingFilter.op === AND) {
-    const filters = replaceOrInsert(existingFilter.filters, filter);
-    return filters.length > 1 ? { op: AND, filters } : filters[0];
+  /// True when this is the top node of a grammar.
+  get isTop() {
+    return (this.flags & 1) > 0;
   }
-  if (filter.op === AND) {
-    return { op: AND, filters: filter.filters.concat(existingFilter) };
+  /// True when this node is produced by a skip rule.
+  get isSkipped() {
+    return (this.flags & 2) > 0;
   }
-  if (filterEquals(existingFilter, filter, true)) {
-    return filter;
+  /// Indicates whether this is an error node.
+  get isError() {
+    return (this.flags & 4) > 0;
   }
-  if (canMerge(existingFilter, filter)) {
-    return merge(existingFilter, filter);
+  /// When true, this node type doesn't correspond to a user-declared
+  /// named node, for example because it is used to cache repetition.
+  get isAnonymous() {
+    return (this.flags & 8) > 0;
   }
-  return { op: combineWith, filters: [existingFilter, filter] };
-};
-var includesNoValues = (filter) => {
-  if (!filter) {
-    return false;
+  /// Returns true when this node's name or one of its
+  /// [groups](#common.NodeProp^group) matches the given string.
+  is(name) {
+    if (typeof name == "string") {
+      if (this.name == name)
+        return true;
+      let group = this.prop(NodeProp.group);
+      return group ? group.indexOf(name) > -1 : false;
+    }
+    return this.id == name;
   }
-  if (isInFilter(filter) && filter.values.length === 0) {
-    return true;
+  /// Create a function from node types to arbitrary values by
+  /// specifying an object whose property names are node or
+  /// [group](#common.NodeProp^group) names. Often useful with
+  /// [`NodeProp.add`](#common.NodeProp.add). You can put multiple
+  /// names, separated by spaces, in a single property name to map
+  /// multiple node names to a single value.
+  static match(map) {
+    let direct = /* @__PURE__ */ Object.create(null);
+    for (let prop in map)
+      for (let name of prop.split(" "))
+        direct[name] = map[prop];
+    return (node) => {
+      for (let groups = node.prop(NodeProp.group), i = -1; i < (groups ? groups.length : 0); i++) {
+        let found = direct[i < 0 ? node.name : groups[i]];
+        if (found)
+          return found;
+      }
+    };
   }
-  return isAndFilter(filter) && filter.filters.some((f) => includesNoValues(f));
 };
-var includesAllValues = (filter) => {
-  if (!filter) {
-    return false;
+NodeType.none = new NodeType(
+  "",
+  /* @__PURE__ */ Object.create(null),
+  0,
+  8
+  /* NodeFlag.Anonymous */
+);
+var NodeSet = class {
+  /// Create a set with the given types. The `id` property of each
+  /// type should correspond to its position within the array.
+  constructor(types) {
+    this.types = types;
+    for (let i = 0; i < types.length; i++)
+      if (types[i].id != i)
+        throw new RangeError("Node type ids should correspond to array positions when creating a node set");
   }
-  if (filter.op === STARTS_WITH && filter.value === "") {
-    return true;
+  /// Create a copy of this set with some node properties added. The
+  /// arguments to this method can be created with
+  /// [`NodeProp.add`](#common.NodeProp.add).
+  extend(...props) {
+    let newTypes = [];
+    for (let type of this.types) {
+      let newProps = null;
+      for (let source of props) {
+        let add = source(type);
+        if (add) {
+          if (!newProps)
+            newProps = Object.assign({}, type.props);
+          newProps[add[0].id] = add[1];
+        }
+      }
+      newTypes.push(newProps ? new NodeType(type.name, newProps, type.id, type.flags) : type);
+    }
+    return new NodeSet(newTypes);
   }
-  return filter.op === STARTS_WITH && filter.value === "";
 };
-var replaceOrInsert = (filters, filter) => {
-  return filters.concat(filter);
-};
-var merge = (f1, f2) => {
-  if (includesNoValues(f2)) {
-    return f2;
-  }
-  if (isInFilter(f1) && isInFilter(f2)) {
-    return {
-      ...f1,
-      values: [
-        ...f1.values,
-        ...f2.values.filter(
-          (v) => !f1.values.includes(v)
-        )
-      ]
-    };
-  } else if (isInFilter(f1) && f2.op === EQUALS) {
-    return {
-      ...f1,
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
-      values: f1.values.concat([f2.value])
-    };
-  } else if (f1.op === EQUALS && f2.op === EQUALS) {
-    return {
-      column: f1.column,
-      op: IN,
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
-      values: [f1.value, f2.value]
-    };
+var CachedNode = /* @__PURE__ */ new WeakMap();
+var CachedInnerNode = /* @__PURE__ */ new WeakMap();
+var IterMode;
+(function(IterMode2) {
+  IterMode2[IterMode2["ExcludeBuffers"] = 1] = "ExcludeBuffers";
+  IterMode2[IterMode2["IncludeAnonymous"] = 2] = "IncludeAnonymous";
+  IterMode2[IterMode2["IgnoreMounts"] = 4] = "IgnoreMounts";
+  IterMode2[IterMode2["IgnoreOverlays"] = 8] = "IgnoreOverlays";
+})(IterMode || (IterMode = {}));
+var Tree = class {
+  /// Construct a new tree. See also [`Tree.build`](#common.Tree^build).
+  constructor(type, children, positions, length, props) {
+    this.type = type;
+    this.children = children;
+    this.positions = positions;
+    this.length = length;
+    this.props = null;
+    if (props && props.length) {
+      this.props = /* @__PURE__ */ Object.create(null);
+      for (let [prop, value] of props)
+        this.props[typeof prop == "number" ? prop : prop.id] = value;
+    }
   }
-  return f2;
-};
-var combine = (existingFilters, replacementFilters) => {
-  const equivalentType = ({ op: t1 }, { op: t2 }) => {
-    return t1 === t2 || t1[0] === t2[0];
-  };
-  const replaces = (existingFilter, replacementFilter) => {
-    return existingFilter.column === replacementFilter.column && equivalentType(existingFilter, replacementFilter);
-  };
-  const stillApplicable = (existingFilter) => replacementFilters.some(
-    (replacementFilter) => replaces(existingFilter, replacementFilter)
-  ) === false;
-  return existingFilters.filter(stillApplicable).concat(replacementFilters);
-};
-var removeFilter = (sourceFilter, filterToRemove) => {
-  if (filterEquals(sourceFilter, filterToRemove, true)) {
-    return null;
+  /// @internal
+  toString() {
+    let mounted = this.prop(NodeProp.mounted);
+    if (mounted && !mounted.overlay)
+      return mounted.tree.toString();
+    let children = "";
+    for (let ch of this.children) {
+      let str = ch.toString();
+      if (str) {
+        if (children)
+          children += ",";
+        children += str;
+      }
+    }
+    return !this.type.name ? children : (/\W/.test(this.type.name) && !this.type.isError ? JSON.stringify(this.type.name) : this.type.name) + (children.length ? "(" + children + ")" : "");
   }
-  if (sourceFilter.op !== AND) {
-    throw Error(
-      `removeFilter cannot remove ${JSON.stringify(
-        filterToRemove
-      )} from ${JSON.stringify(sourceFilter)}`
-    );
+  /// Get a [tree cursor](#common.TreeCursor) positioned at the top of
+  /// the tree. Mode can be used to [control](#common.IterMode) which
+  /// nodes the cursor visits.
+  cursor(mode = 0) {
+    return new TreeCursor(this.topNode, mode);
   }
-  const filters = sourceFilter.filters.filter(
-    (f) => !filterEquals(f, filterToRemove)
-  );
-  return filters.length > 0 ? { type: AND, filters } : null;
-};
-var splitFilterOnColumn = (columnName, filter) => {
-  if (!filter) {
-    return [void 0, void 0];
+  /// Get a [tree cursor](#common.TreeCursor) pointing into this tree
+  /// at the given position and side (see
+  /// [`moveTo`](#common.TreeCursor.moveTo).
+  cursorAt(pos, side = 0, mode = 0) {
+    let scope = CachedNode.get(this) || this.topNode;
+    let cursor = new TreeCursor(scope);
+    cursor.moveTo(pos, side);
+    CachedNode.set(this, cursor._tree);
+    return cursor;
   }
-  if (filter.column === columnName) {
-    return [filter, void 0];
+  /// Get a [syntax node](#common.SyntaxNode) object for the top of the
+  /// tree.
+  get topNode() {
+    return new TreeNode(this, 0, 0, null);
   }
-  if (filter.op !== AND) {
-    return [void 0, filter];
+  /// Get the [syntax node](#common.SyntaxNode) at the given position.
+  /// If `side` is -1, this will move into nodes that end at the
+  /// position. If 1, it'll move into nodes that start at the
+  /// position. With 0, it'll only enter nodes that cover the position
+  /// from both sides.
+  ///
+  /// Note that this will not enter
+  /// [overlays](#common.MountedTree.overlay), and you often want
+  /// [`resolveInner`](#common.Tree.resolveInner) instead.
+  resolve(pos, side = 0) {
+    let node = resolveNode(CachedNode.get(this) || this.topNode, pos, side, false);
+    CachedNode.set(this, node);
+    return node;
   }
-  const [[columnFilter = void 0], filters] = partition(
-    filter.filters,
-    (f) => f.column === columnName
-  );
-  return filters.length === 1 ? [columnFilter, filters[0]] : [columnFilter, { op: AND, filters }];
-};
-var overrideColName = (filter, column) => {
-  if (isMultiClauseFilter(filter)) {
-    return {
-      op: filter.op,
-      filters: filter.filters.map((f) => overrideColName(f, column))
-    };
+  /// Like [`resolve`](#common.Tree.resolve), but will enter
+  /// [overlaid](#common.MountedTree.overlay) nodes, producing a syntax node
+  /// pointing into the innermost overlaid tree at the given position
+  /// (with parent links going through all parent structure, including
+  /// the host trees).
+  resolveInner(pos, side = 0) {
+    let node = resolveNode(CachedInnerNode.get(this) || this.topNode, pos, side, true);
+    CachedInnerNode.set(this, node);
+    return node;
   }
-  return { ...filter, column };
-};
-var filterIncludesColumn = (filter, column) => {
-  if (!filter) {
-    return false;
+  /// Iterate over the tree and its children, calling `enter` for any
+  /// node that touches the `from`/`to` region (if given) before
+  /// running over such a node's children, and `leave` (if given) when
+  /// leaving the node. When `enter` returns `false`, that node will
+  /// not have its children iterated over (or `leave` called).
+  iterate(spec) {
+    let { enter, leave, from = 0, to = this.length } = spec;
+    let mode = spec.mode || 0, anon = (mode & IterMode.IncludeAnonymous) > 0;
+    for (let c = this.cursor(mode | IterMode.IncludeAnonymous); ; ) {
+      let entered = false;
+      if (c.from <= to && c.to >= from && (!anon && c.type.isAnonymous || enter(c) !== false)) {
+        if (c.firstChild())
+          continue;
+        entered = true;
+      }
+      for (; ; ) {
+        if (entered && leave && (anon || !c.type.isAnonymous))
+          leave(c);
+        if (c.nextSibling())
+          break;
+        if (!c.parent())
+          return;
+        entered = true;
+      }
+    }
   }
-  const { op, column: filterColName } = filter;
-  switch (op) {
-    case AND:
-    case OR:
-      return filter.filters != null && filter.filters.some((f) => filterIncludesColumn(f, column));
-    default:
-      return filterColName === column.name;
+  /// Get the value of the given [node prop](#common.NodeProp) for this
+  /// node. Works with both per-node and per-type props.
+  prop(prop) {
+    return !prop.perNode ? this.type.prop(prop) : this.props ? this.props[prop.id] : void 0;
   }
-};
-var removeFilterForColumn = (sourceFilter, column) => {
-  const colName = column.name;
-  if (!sourceFilter) {
-    return void 0;
+  /// Returns the node's [per-node props](#common.NodeProp.perNode) in a
+  /// format that can be passed to the [`Tree`](#common.Tree)
+  /// constructor.
+  get propValues() {
+    let result = [];
+    if (this.props)
+      for (let id in this.props)
+        result.push([+id, this.props[id]]);
+    return result;
   }
-  if (sourceFilter.column === colName) {
-    return void 0;
+  /// Balance the direct children of this tree, producing a copy of
+  /// which may have children grouped into subtrees with type
+  /// [`NodeType.none`](#common.NodeType^none).
+  balance(config = {}) {
+    return this.children.length <= 8 ? this : balanceRange(NodeType.none, this.children, this.positions, 0, this.children.length, 0, this.length, (children, positions, length) => new Tree(this.type, children, positions, length, this.propValues), config.makeTree || ((children, positions, length) => new Tree(NodeType.none, children, positions, length)));
   }
-  if (isAndFilter(sourceFilter) || isOrFilter(sourceFilter)) {
-    const { op } = sourceFilter;
-    const filters = sourceFilter.filters;
-    const otherColFilters = filters.filter((f) => f.column !== colName);
-    switch (otherColFilters.length) {
-      case 0:
-        return void 0;
-      case 1:
-        return otherColFilters[0];
-      default:
-        return { op, filters: otherColFilters };
-    }
+  /// Build a tree from a postfix-ordered buffer of node information,
+  /// or a cursor over such a buffer.
+  static build(data) {
+    return buildTree(data);
   }
-  return sourceFilter;
 };
-var canMerge = (f1, f2) => f1.column === f2.column && (f1.op === "=" || f1.op === "in") && (f2.op === "=" || f2.op === "in");
-var sameValues = (arr1, arr2) => {
-  if (arr1 === arr2) {
-    return true;
+Tree.empty = new Tree(NodeType.none, [], [], 0);
+var FlatBufferCursor = class {
+  constructor(buffer, index) {
+    this.buffer = buffer;
+    this.index = index;
   }
-  if (arr1.length === arr2.length) {
-    const a = arr1.slice().sort();
-    const b = arr2.slice().sort();
-    return a.join("|") === b.join("|");
+  get id() {
+    return this.buffer[this.index - 4];
   }
-  return false;
-};
-var filterEquals = (f1, f2, strict = false) => {
-  if (!strict) {
-    return true;
+  get start() {
+    return this.buffer[this.index - 3];
   }
-  if (f1 && f2 && canMerge(f1, f2)) {
-    return f1.op === f2.op && (isSingleValueFilter(f1) && isSingleValueFilter(f2) && f1.value === f2.value || isMultiValueFilter(f1) && isMultiValueFilter(f2) && sameValues(f1.values, f2.values));
-  }
-  return false;
-};
-var updateFilter = (filter, newFilter, mode) => {
-  if (filter && newFilter) {
-    if (mode === "replace") {
-      return newFilter;
-    }
-    if (filter.op === "and") {
-      return {
-        ...filter,
-        filters: filter.filters.concat(newFilter)
-      };
-    }
-    const { column: columnName } = newFilter;
-    if (columnName) {
-      const existingClause = newFilter.column ? extractFilterForColumn(filter, columnName) : void 0;
-      if (existingClause && columnName) {
-        const result = removeFilterForColumn(filter, { name: columnName });
-        return updateFilter(result, newFilter, "add");
-      }
-    }
-    return {
-      op: "and",
-      filters: [filter, newFilter]
-    };
-  }
-  if (newFilter) {
-    return newFilter;
-  }
-  return filter;
-};
-
-// src/column-filter/utils.ts
-var isStartsWithValue = (value) => /\.\.\.$/.test(value);
-var getTypeaheadFilter = (column, filterValues, isStartsWithFilter) => {
-  if (filterValues.length === 0) {
-    return void 0;
-  }
-  if (isStartsWithFilter) {
-    const startsWith = filterValues[0].substring(0, filterValues[0].length - 3);
-    return {
-      column,
-      op: "starts",
-      value: `"${startsWith}"`
-    };
-  }
-  return {
-    column,
-    op: "in",
-    values: filterValues.map((value) => `"${value}"`)
-  };
-};
-var getRangeFilter = (column, startValue, endValue) => {
-  const startFilter = startValue === void 0 ? void 0 : { column, op: ">", value: startValue - 1 };
-  const endFilter = endValue === void 0 ? void 0 : { column, op: "<", value: endValue + 1 };
-  if (endFilter === void 0)
-    return startFilter;
-  return addFilter(startFilter, endFilter, { combineWith: "and" });
-};
-
-// src/column-filter/RangeFilter.tsx
-import { jsx as jsx3, jsxs as jsxs2 } from "react/jsx-runtime";
-var RangeFilter = ({
-  defaultTypeaheadParams,
-  filterValues,
-  onChange
-}) => {
-  var _a, _b;
-  const columnName = defaultTypeaheadParams[1];
-  const startChangeHandler = (e) => {
-    const value = parseFloat(e.target.value);
-    const newRange = {
-      start: isNaN(value) ? void 0 : value,
-      end: filterValues == null ? void 0 : filterValues.end
-    };
-    const filter = getRangeFilter(columnName, newRange.start, newRange.end);
-    onChange(newRange, filter);
-  };
-  const endChangeHandler = (e) => {
-    const value = parseFloat(e.target.value);
-    const newRange = {
-      start: filterValues == null ? void 0 : filterValues.start,
-      end: isNaN(value) ? void 0 : value
-    };
-    const filter = getRangeFilter(columnName, newRange.start, newRange.end);
-    onChange(newRange, filter);
-  };
-  return /* @__PURE__ */ jsxs2("div", { style: { display: "flex", flexDirection: "row" }, children: [
-    /* @__PURE__ */ jsx3(ToolbarField, { label: "From", children: /* @__PURE__ */ jsx3(
-      Input,
-      {
-        onChange: startChangeHandler,
-        value: ((_a = filterValues == null ? void 0 : filterValues.start) == null ? void 0 : _a.toString()) || "",
-        type: "number"
-      }
-    ) }),
-    /* @__PURE__ */ jsx3(ToolbarField, { label: "To", children: /* @__PURE__ */ jsx3(
-      Input,
-      {
-        onChange: endChangeHandler,
-        value: ((_b = filterValues == null ? void 0 : filterValues.end) == null ? void 0 : _b.toString()) || "",
-        type: "number"
-      }
-    ) })
-  ] });
-};
-
-// src/column-filter/TypeaheadFilter.tsx
-import { useTypeaheadSuggestions } from "@vuu-ui/vuu-data-react";
-import { ComboBoxDeprecated } from "@heswell/salt-lab";
-import { useCallback, useEffect, useState } from "react";
-import { jsx as jsx4 } from "react/jsx-runtime";
-var TypeaheadFilter = ({
-  defaultTypeaheadParams,
-  filterValues = [],
-  onChange: onFilterChange
-}) => {
-  const [tableName, columnName] = defaultTypeaheadParams;
-  const [searchValue, setSearchValue] = useState("");
-  const [typeaheadValues, setTypeaheadValues] = useState([]);
-  const getSuggestions = useTypeaheadSuggestions();
-  useEffect(() => {
-    const params = searchValue ? [tableName, columnName, searchValue] : defaultTypeaheadParams;
-    let isSubscribed = true;
-    getSuggestions(params).then((options) => {
-      if (!isSubscribed) {
-        return;
-      }
-      if (isStartsWithValue(filterValues[0])) {
-        options.unshift(filterValues[0]);
-      }
-      if (searchValue) {
-        options.unshift(`${searchValue}...`);
-      }
-      options.concat(filterValues);
-      setTypeaheadValues(options);
-    });
-    return () => {
-      isSubscribed = false;
-    };
-  }, [
-    filterValues,
-    searchValue,
-    columnName,
-    tableName,
-    getSuggestions,
-    defaultTypeaheadParams
-  ]);
-  const onInputChange = useCallback(
-    (evt) => {
-      const value = evt.target.value;
-      setSearchValue(value);
-    },
-    []
-  );
-  const onSelectionChange = useCallback(
-    (_evt, selected) => {
-      setSearchValue("");
-      if (selected === null)
-        return;
-      if (selected.some(isStartsWithValue)) {
-        selected = selected.filter(isStartsWithValue).slice(-1);
-      }
-      const filter = getTypeaheadFilter(
-        columnName,
-        selected,
-        isStartsWithValue(selected[0])
-      );
-      onFilterChange(selected, filter);
-    },
-    [columnName, onFilterChange]
-  );
-  return /* @__PURE__ */ jsx4(
-    ComboBoxDeprecated,
-    {
-      multiSelect: true,
-      onInputChange,
-      onChange: onSelectionChange,
-      source: typeaheadValues,
-      style: { minWidth: 200 },
-      inputValue: searchValue,
-      selectedItem: filterValues
-    },
-    columnName
-  );
-};
-
-// src/column-filter/ColumnListItem.tsx
-import { memo } from "react";
-import {
-  Highlighter,
-  ListItem
-} from "@heswell/salt-lab";
-import { jsx as jsx5 } from "react/jsx-runtime";
-var ColumnListItem = (props) => {
-  return /* @__PURE__ */ jsx5(MemoColumnItem, { ...props });
-};
-var MemoColumnItem = memo(function MemoizedItem({
-  item,
-  itemTextHighlightPattern,
-  ...restProps
-}) {
-  return /* @__PURE__ */ jsx5(ListItem, { ...restProps, children: /* @__PURE__ */ jsx5("span", { style: { marginLeft: 10 }, children: /* @__PURE__ */ jsx5(
-    Highlighter,
-    {
-      matchPattern: itemTextHighlightPattern,
-      text: item == null ? void 0 : item.name
-    }
-  ) }) });
-});
-
-// src/column-filter/useColumnFilterStore.ts
-import { filterAsQuery as filterAsQuery2 } from "@vuu-ui/vuu-utils";
-import { useCallback as useCallback2, useState as useState2 } from "react";
-var addOrReplace = (array, newValue, key) => array.filter((oldValue) => oldValue[key] !== newValue[key]).concat(newValue);
-var useColumnFilterStore = (onFilterSubmit) => {
-  var _a, _b;
-  const [selectedColumnName, setSelectedColumnName] = useState2("");
-  const [savedFilters, setSavedFilters] = useState2([]);
-  const [rangeValues, setRangeValues] = useState2([]);
-  const [typeaheadValues, setTypeaheadValues] = useState2([]);
-  const clear = () => {
-    setSelectedColumnName("");
-    setRangeValues([]);
-    setTypeaheadValues([]);
-    setSavedFilters([]);
-    onFilterSubmit({ filter: "" });
-  };
-  const updateFilters = useCallback2(
-    (newFilter) => {
-      const newSavedFilters = addOrReplace(
-        savedFilters,
-        { column: selectedColumnName, filter: newFilter },
-        "column"
-      );
-      setSavedFilters(newSavedFilters);
-      const combinedFilter = newSavedFilters.map((x) => x.filter).reduce((prev, filter) => {
-        if (filter === void 0)
-          return prev;
-        return addFilter(prev, filter, { combineWith: AND });
-      }, void 0);
-      const query = combinedFilter === void 0 ? "" : filterAsQuery2(combinedFilter);
-      onFilterSubmit({ filter: query, filterStruct: combinedFilter });
-    },
-    [selectedColumnName, onFilterSubmit, savedFilters]
-  );
-  const onTypeaheadChange = useCallback2(
-    (newValues, newFilter) => {
-      setTypeaheadValues(
-        addOrReplace(
-          typeaheadValues,
-          { column: selectedColumnName, value: newValues },
-          "column"
-        )
-      );
-      updateFilters(newFilter);
-    },
-    [selectedColumnName, typeaheadValues, updateFilters]
-  );
-  const onRangeChange = useCallback2(
-    (newValues, newFilter) => {
-      setRangeValues(
-        addOrReplace(
-          rangeValues,
-          { column: selectedColumnName, value: newValues },
-          "column"
-        )
-      );
-      updateFilters(newFilter);
-    },
-    [selectedColumnName, rangeValues, updateFilters]
-  );
-  const onSelectedColumnChange = useCallback2(
-    (column) => setSelectedColumnName((column == null ? void 0 : column.name) || ""),
-    []
-  );
-  const rangeValue = (_a = rangeValues.filter(
-    (v) => v.column === selectedColumnName
-  )[0]) == null ? void 0 : _a.value;
-  const typeaheadValue = (_b = typeaheadValues.filter(
-    (v) => v.column === selectedColumnName
-  )[0]) == null ? void 0 : _b.value;
-  return {
-    clear,
-    selectedColumnName,
-    rangeValue,
-    typeaheadValue,
-    onSelectedColumnChange,
-    onRangeChange,
-    onTypeaheadChange
-  };
-};
-
-// src/column-filter/ColumnFilter.tsx
-import { jsx as jsx6, jsxs as jsxs3 } from "react/jsx-runtime";
-var ColumnFilter = ({
-  className,
-  table,
-  columns,
-  onFilterSubmit,
-  ...htmlAttributes
-}) => {
-  const {
-    clear,
-    onTypeaheadChange,
-    onRangeChange,
-    onSelectedColumnChange,
-    selectedColumnName,
-    rangeValue,
-    typeaheadValue
-  } = useColumnFilterStore(onFilterSubmit);
-  const getFilterComponent = () => {
-    var _a;
-    const defaultTypeaheadParams = [table, selectedColumnName];
-    const selectedColumnType = (_a = columns.find(
-      (column) => column.name === selectedColumnName
-    )) == null ? void 0 : _a.serverDataType;
-    switch (selectedColumnType) {
-      case "string":
-      case "char":
-        return /* @__PURE__ */ jsx6(
-          ToolbarField2,
-          {
-            label: "Start typing to select a filter",
-            labelPlacement: "top",
-            children: /* @__PURE__ */ jsx6(
-              TypeaheadFilter,
-              {
-                defaultTypeaheadParams,
-                filterValues: typeaheadValue,
-                onChange: onTypeaheadChange
-              }
-            )
-          }
-        );
-      case "int":
-      case "long":
-      case "double":
-        return /* @__PURE__ */ jsx6(ToolbarField2, { label: "Select a range", labelPlacement: "top", children: /* @__PURE__ */ jsx6(
-          RangeFilter,
-          {
-            defaultTypeaheadParams,
-            filterValues: rangeValue,
-            onChange: onRangeChange
-          }
-        ) });
-      default:
-        return /* @__PURE__ */ jsx6(ToolbarField2, { children: /* @__PURE__ */ jsx6(Text, { children: "Data type unsupported" }) });
-    }
-  };
-  return /* @__PURE__ */ jsxs3(
-    Toolbar,
-    {
-      ...htmlAttributes,
-      style: { alignItems: "center", height: "36px" },
-      children: [
-        /* @__PURE__ */ jsx6(
-          ToolbarField2,
-          {
-            label: "Select a column to filter",
-            labelPlacement: "top",
-            style: { width: 180 },
-            children: /* @__PURE__ */ jsx6(
-              Dropdown,
-              {
-                source: columns,
-                ListItem: ColumnListItem,
-                itemToString: (column) => column.name,
-                onSelectionChange: (_evt, column) => onSelectedColumnChange(column)
-              }
-            )
-          }
-        ),
-        selectedColumnName && getFilterComponent(),
-        /* @__PURE__ */ jsx6(ToolbarButton, { onClick: clear, children: /* @__PURE__ */ jsx6(DeleteIcon, {}) })
-      ]
-    }
-  );
-};
-
-// src/filter-input/FilterInput.tsx
-import { Button } from "@salt-ds/core";
-
-// src/filter-input/useCodeMirrorEditor.ts
-import {
-  autocompletion,
-  defaultKeymap,
-  EditorState as EditorState2,
-  EditorView as EditorView2,
-  ensureSyntaxTree,
-  keymap,
-  minimalSetup,
-  startCompletion
-} from "@vuu-ui/vuu-codemirror";
-
-// ../../node_modules/@lezer/common/dist/index.js
-var DefaultBufferLength = 1024;
-var nextPropID = 0;
-var Range = class {
-  constructor(from, to) {
-    this.from = from;
-    this.to = to;
-  }
-};
-var NodeProp = class {
-  /// Create a new node prop type.
-  constructor(config = {}) {
-    this.id = nextPropID++;
-    this.perNode = !!config.perNode;
-    this.deserialize = config.deserialize || (() => {
-      throw new Error("This node type doesn't define a deserialize function");
-    });
-  }
-  /// This is meant to be used with
-  /// [`NodeSet.extend`](#common.NodeSet.extend) or
-  /// [`LRParser.configure`](#lr.ParserConfig.props) to compute
-  /// prop values for each node type in the set. Takes a [match
-  /// object](#common.NodeType^match) or function that returns undefined
-  /// if the node type doesn't get this prop, and the prop's value if
-  /// it does.
-  add(match) {
-    if (this.perNode)
-      throw new RangeError("Can't add per-node props to node types");
-    if (typeof match != "function")
-      match = NodeType.match(match);
-    return (type) => {
-      let result = match(type);
-      return result === void 0 ? null : [this, result];
-    };
-  }
-};
-NodeProp.closedBy = new NodeProp({ deserialize: (str) => str.split(" ") });
-NodeProp.openedBy = new NodeProp({ deserialize: (str) => str.split(" ") });
-NodeProp.group = new NodeProp({ deserialize: (str) => str.split(" ") });
-NodeProp.contextHash = new NodeProp({ perNode: true });
-NodeProp.lookAhead = new NodeProp({ perNode: true });
-NodeProp.mounted = new NodeProp({ perNode: true });
-var noProps = /* @__PURE__ */ Object.create(null);
-var NodeType = class {
-  /// @internal
-  constructor(name, props, id, flags = 0) {
-    this.name = name;
-    this.props = props;
-    this.id = id;
-    this.flags = flags;
-  }
-  /// Define a node type.
-  static define(spec) {
-    let props = spec.props && spec.props.length ? /* @__PURE__ */ Object.create(null) : noProps;
-    let flags = (spec.top ? 1 : 0) | (spec.skipped ? 2 : 0) | (spec.error ? 4 : 0) | (spec.name == null ? 8 : 0);
-    let type = new NodeType(spec.name || "", props, spec.id, flags);
-    if (spec.props)
-      for (let src of spec.props) {
-        if (!Array.isArray(src))
-          src = src(type);
-        if (src) {
-          if (src[0].perNode)
-            throw new RangeError("Can't store a per-node prop on a node type");
-          props[src[0].id] = src[1];
-        }
-      }
-    return type;
-  }
-  /// Retrieves a node prop for this type. Will return `undefined` if
-  /// the prop isn't present on this node.
-  prop(prop) {
-    return this.props[prop.id];
-  }
-  /// True when this is the top node of a grammar.
-  get isTop() {
-    return (this.flags & 1) > 0;
-  }
-  /// True when this node is produced by a skip rule.
-  get isSkipped() {
-    return (this.flags & 2) > 0;
-  }
-  /// Indicates whether this is an error node.
-  get isError() {
-    return (this.flags & 4) > 0;
-  }
-  /// When true, this node type doesn't correspond to a user-declared
-  /// named node, for example because it is used to cache repetition.
-  get isAnonymous() {
-    return (this.flags & 8) > 0;
-  }
-  /// Returns true when this node's name or one of its
-  /// [groups](#common.NodeProp^group) matches the given string.
-  is(name) {
-    if (typeof name == "string") {
-      if (this.name == name)
-        return true;
-      let group = this.prop(NodeProp.group);
-      return group ? group.indexOf(name) > -1 : false;
-    }
-    return this.id == name;
-  }
-  /// Create a function from node types to arbitrary values by
-  /// specifying an object whose property names are node or
-  /// [group](#common.NodeProp^group) names. Often useful with
-  /// [`NodeProp.add`](#common.NodeProp.add). You can put multiple
-  /// names, separated by spaces, in a single property name to map
-  /// multiple node names to a single value.
-  static match(map) {
-    let direct = /* @__PURE__ */ Object.create(null);
-    for (let prop in map)
-      for (let name of prop.split(" "))
-        direct[name] = map[prop];
-    return (node) => {
-      for (let groups = node.prop(NodeProp.group), i = -1; i < (groups ? groups.length : 0); i++) {
-        let found = direct[i < 0 ? node.name : groups[i]];
-        if (found)
-          return found;
-      }
-    };
-  }
-};
-NodeType.none = new NodeType(
-  "",
-  /* @__PURE__ */ Object.create(null),
-  0,
-  8
-  /* NodeFlag.Anonymous */
-);
-var NodeSet = class {
-  /// Create a set with the given types. The `id` property of each
-  /// type should correspond to its position within the array.
-  constructor(types) {
-    this.types = types;
-    for (let i = 0; i < types.length; i++)
-      if (types[i].id != i)
-        throw new RangeError("Node type ids should correspond to array positions when creating a node set");
-  }
-  /// Create a copy of this set with some node properties added. The
-  /// arguments to this method can be created with
-  /// [`NodeProp.add`](#common.NodeProp.add).
-  extend(...props) {
-    let newTypes = [];
-    for (let type of this.types) {
-      let newProps = null;
-      for (let source of props) {
-        let add = source(type);
-        if (add) {
-          if (!newProps)
-            newProps = Object.assign({}, type.props);
-          newProps[add[0].id] = add[1];
-        }
-      }
-      newTypes.push(newProps ? new NodeType(type.name, newProps, type.id, type.flags) : type);
-    }
-    return new NodeSet(newTypes);
-  }
-};
-var CachedNode = /* @__PURE__ */ new WeakMap();
-var CachedInnerNode = /* @__PURE__ */ new WeakMap();
-var IterMode;
-(function(IterMode2) {
-  IterMode2[IterMode2["ExcludeBuffers"] = 1] = "ExcludeBuffers";
-  IterMode2[IterMode2["IncludeAnonymous"] = 2] = "IncludeAnonymous";
-  IterMode2[IterMode2["IgnoreMounts"] = 4] = "IgnoreMounts";
-  IterMode2[IterMode2["IgnoreOverlays"] = 8] = "IgnoreOverlays";
-})(IterMode || (IterMode = {}));
-var Tree = class {
-  /// Construct a new tree. See also [`Tree.build`](#common.Tree^build).
-  constructor(type, children, positions, length, props) {
-    this.type = type;
-    this.children = children;
-    this.positions = positions;
-    this.length = length;
-    this.props = null;
-    if (props && props.length) {
-      this.props = /* @__PURE__ */ Object.create(null);
-      for (let [prop, value] of props)
-        this.props[typeof prop == "number" ? prop : prop.id] = value;
-    }
-  }
-  /// @internal
-  toString() {
-    let mounted = this.prop(NodeProp.mounted);
-    if (mounted && !mounted.overlay)
-      return mounted.tree.toString();
-    let children = "";
-    for (let ch of this.children) {
-      let str = ch.toString();
-      if (str) {
-        if (children)
-          children += ",";
-        children += str;
-      }
-    }
-    return !this.type.name ? children : (/\W/.test(this.type.name) && !this.type.isError ? JSON.stringify(this.type.name) : this.type.name) + (children.length ? "(" + children + ")" : "");
-  }
-  /// Get a [tree cursor](#common.TreeCursor) positioned at the top of
-  /// the tree. Mode can be used to [control](#common.IterMode) which
-  /// nodes the cursor visits.
-  cursor(mode = 0) {
-    return new TreeCursor(this.topNode, mode);
-  }
-  /// Get a [tree cursor](#common.TreeCursor) pointing into this tree
-  /// at the given position and side (see
-  /// [`moveTo`](#common.TreeCursor.moveTo).
-  cursorAt(pos, side = 0, mode = 0) {
-    let scope = CachedNode.get(this) || this.topNode;
-    let cursor = new TreeCursor(scope);
-    cursor.moveTo(pos, side);
-    CachedNode.set(this, cursor._tree);
-    return cursor;
-  }
-  /// Get a [syntax node](#common.SyntaxNode) object for the top of the
-  /// tree.
-  get topNode() {
-    return new TreeNode(this, 0, 0, null);
-  }
-  /// Get the [syntax node](#common.SyntaxNode) at the given position.
-  /// If `side` is -1, this will move into nodes that end at the
-  /// position. If 1, it'll move into nodes that start at the
-  /// position. With 0, it'll only enter nodes that cover the position
-  /// from both sides.
-  ///
-  /// Note that this will not enter
-  /// [overlays](#common.MountedTree.overlay), and you often want
-  /// [`resolveInner`](#common.Tree.resolveInner) instead.
-  resolve(pos, side = 0) {
-    let node = resolveNode(CachedNode.get(this) || this.topNode, pos, side, false);
-    CachedNode.set(this, node);
-    return node;
-  }
-  /// Like [`resolve`](#common.Tree.resolve), but will enter
-  /// [overlaid](#common.MountedTree.overlay) nodes, producing a syntax node
-  /// pointing into the innermost overlaid tree at the given position
-  /// (with parent links going through all parent structure, including
-  /// the host trees).
-  resolveInner(pos, side = 0) {
-    let node = resolveNode(CachedInnerNode.get(this) || this.topNode, pos, side, true);
-    CachedInnerNode.set(this, node);
-    return node;
-  }
-  /// Iterate over the tree and its children, calling `enter` for any
-  /// node that touches the `from`/`to` region (if given) before
-  /// running over such a node's children, and `leave` (if given) when
-  /// leaving the node. When `enter` returns `false`, that node will
-  /// not have its children iterated over (or `leave` called).
-  iterate(spec) {
-    let { enter, leave, from = 0, to = this.length } = spec;
-    let mode = spec.mode || 0, anon = (mode & IterMode.IncludeAnonymous) > 0;
-    for (let c = this.cursor(mode | IterMode.IncludeAnonymous); ; ) {
-      let entered = false;
-      if (c.from <= to && c.to >= from && (!anon && c.type.isAnonymous || enter(c) !== false)) {
-        if (c.firstChild())
-          continue;
-        entered = true;
-      }
-      for (; ; ) {
-        if (entered && leave && (anon || !c.type.isAnonymous))
-          leave(c);
-        if (c.nextSibling())
-          break;
-        if (!c.parent())
-          return;
-        entered = true;
-      }
-    }
-  }
-  /// Get the value of the given [node prop](#common.NodeProp) for this
-  /// node. Works with both per-node and per-type props.
-  prop(prop) {
-    return !prop.perNode ? this.type.prop(prop) : this.props ? this.props[prop.id] : void 0;
-  }
-  /// Returns the node's [per-node props](#common.NodeProp.perNode) in a
-  /// format that can be passed to the [`Tree`](#common.Tree)
-  /// constructor.
-  get propValues() {
-    let result = [];
-    if (this.props)
-      for (let id in this.props)
-        result.push([+id, this.props[id]]);
-    return result;
-  }
-  /// Balance the direct children of this tree, producing a copy of
-  /// which may have children grouped into subtrees with type
-  /// [`NodeType.none`](#common.NodeType^none).
-  balance(config = {}) {
-    return this.children.length <= 8 ? this : balanceRange(NodeType.none, this.children, this.positions, 0, this.children.length, 0, this.length, (children, positions, length) => new Tree(this.type, children, positions, length, this.propValues), config.makeTree || ((children, positions, length) => new Tree(NodeType.none, children, positions, length)));
-  }
-  /// Build a tree from a postfix-ordered buffer of node information,
-  /// or a cursor over such a buffer.
-  static build(data) {
-    return buildTree(data);
-  }
-};
-Tree.empty = new Tree(NodeType.none, [], [], 0);
-var FlatBufferCursor = class {
-  constructor(buffer, index) {
-    this.buffer = buffer;
-    this.index = index;
-  }
-  get id() {
-    return this.buffer[this.index - 4];
-  }
-  get start() {
-    return this.buffer[this.index - 3];
-  }
-  get end() {
-    return this.buffer[this.index - 2];
+  get end() {
+    return this.buffer[this.index - 2];
   }
   get size() {
     return this.buffer[this.index - 1];
@@ -1412,8 +684,8 @@ var TreeNode = class {
     return enterUnfinishedNodesBefore(this, pos);
   }
   getChild(type, before = null, after = null) {
-    let r2 = getChildren(this, type, before, after);
-    return r2.length ? r2[0] : null;
+    let r = getChildren(this, type, before, after);
+    return r.length ? r[0] : null;
   }
   getChildren(type, before = null, after = null) {
     return getChildren(this, type, before, after);
@@ -1591,8 +863,8 @@ var BufferNode = class {
     return this.context.buffer.childString(this.index);
   }
   getChild(type, before = null, after = null) {
-    let r2 = getChildren(this, type, before, after);
-    return r2.length ? r2[0] : null;
+    let r = getChildren(this, type, before, after);
+    return r.length ? r[0] : null;
   }
   getChildren(type, before = null, after = null) {
     return getChildren(this, type, before, after);
@@ -2141,7 +1413,7 @@ var Parser = class {
   startParse(input, fragments, ranges) {
     if (typeof input == "string")
       input = new StringInput(input);
-    ranges = !ranges ? [new Range(0, input.length)] : ranges.length ? ranges.map((r2) => new Range(r2.from, r2.to)) : [new Range(0, 0)];
+    ranges = !ranges ? [new Range(0, input.length)] : ranges.length ? ranges.map((r) => new Range(r.from, r.to)) : [new Range(0, 0)];
     return this.createParse(input, fragments || [], ranges);
   }
   /// Run a full parse, returning the resulting tree.
@@ -2890,11 +2162,11 @@ var InputStream = class {
     if (from >= this.range.from && to <= this.range.to)
       return this.input.read(from, to);
     let result = "";
-    for (let r2 of this.ranges) {
-      if (r2.from >= to)
+    for (let r of this.ranges) {
+      if (r.from >= to)
         break;
-      if (r2.to > from)
-        result += this.input.read(Math.max(r2.from, from), Math.min(r2.to, to));
+      if (r.to > from)
+        result += this.input.read(Math.max(r.from, from), Math.min(r.to, to));
     }
     return result;
   }
@@ -3525,7 +2797,7 @@ var LRParser = class extends Parser {
     this.minRepeatTerm = nodeNames.length;
     for (let i = 0; i < spec.repeatNodeCount; i++)
       nodeNames.push("");
-    let topTerms = Object.keys(spec.topRules).map((r2) => spec.topRules[r2][1]);
+    let topTerms = Object.keys(spec.topRules).map((r) => spec.topRules[r][1]);
     let nodeProps = [];
     for (let i = 0; i < nodeNames.length; i++)
       nodeProps.push([]);
@@ -3705,13 +2977,13 @@ var LRParser = class extends Parser {
     }
     if (config.tokenizers)
       copy.tokenizers = this.tokenizers.map((t) => {
-        let found = config.tokenizers.find((r2) => r2.from == t);
+        let found = config.tokenizers.find((r) => r.from == t);
         return found ? found.to : t;
       });
     if (config.specializers) {
       copy.specializers = this.specializers.slice();
       copy.specializerSpecs = this.specializerSpecs.map((s, i) => {
-        let found = config.specializers.find((r2) => r2.from == s.external);
+        let found = config.specializers.find((r) => r.from == s.external);
         if (!found)
           return s;
         let spec = Object.assign(Object.assign({}, s), { external: found.to });
@@ -3822,9 +3094,9 @@ var parser = LRParser.deserialize({
 
 // ../vuu-filter-parser/src/FilterTreeWalker.ts
 import {
-  isMultiClauseFilter as isMultiClauseFilter2,
-  isMultiValueFilter as isMultiValueFilter2,
-  isSingleValueFilter as isSingleValueFilter2
+  isMultiClauseFilter,
+  isMultiValueFilter,
+  isSingleValueFilter
 } from "@vuu-ui/vuu-utils";
 var _filter;
 var FilterExpression = class {
@@ -3832,7 +3104,7 @@ var FilterExpression = class {
     __privateAdd(this, _filter, void 0);
   }
   setFilterCombinatorOp(op, filter = __privateGet(this, _filter)) {
-    if (isMultiClauseFilter2(filter) && filter.op === op) {
+    if (isMultiClauseFilter(filter) && filter.op === op) {
       return;
     } else {
       __privateSet(this, _filter, {
@@ -3844,14 +3116,14 @@ var FilterExpression = class {
   add(filter) {
     if (__privateGet(this, _filter) === void 0) {
       __privateSet(this, _filter, filter);
-    } else if (isMultiClauseFilter2(__privateGet(this, _filter))) {
+    } else if (isMultiClauseFilter(__privateGet(this, _filter))) {
       __privateGet(this, _filter).filters.push(filter);
     } else {
       throw Error(`Invalid filter passed to FilterExpression`);
     }
   }
   setColumn(column, filter = __privateGet(this, _filter)) {
-    if (isMultiClauseFilter2(filter)) {
+    if (isMultiClauseFilter(filter)) {
       const target = filter.filters.at(-1);
       if (target) {
         this.setColumn(column, target);
@@ -3861,7 +3133,7 @@ var FilterExpression = class {
     }
   }
   setOp(value, filter = __privateGet(this, _filter)) {
-    if (isMultiClauseFilter2(filter)) {
+    if (isMultiClauseFilter(filter)) {
       const target = filter.filters.at(-1);
       if (target) {
         this.setOp(value, target);
@@ -3872,15 +3144,15 @@ var FilterExpression = class {
   }
   setValue(value, filter = __privateGet(this, _filter)) {
     var _a;
-    if (isMultiClauseFilter2(filter)) {
+    if (isMultiClauseFilter(filter)) {
       const target = filter.filters.at(-1);
       if (target) {
         this.setValue(value, target);
       }
-    } else if (isMultiValueFilter2(filter)) {
+    } else if (isMultiValueFilter(filter)) {
       (_a = filter.values) != null ? _a : filter.values = [];
       filter.values.push(value);
-    } else if (isSingleValueFilter2(filter)) {
+    } else if (isSingleValueFilter(filter)) {
       filter.value = value;
     }
   }
@@ -3944,7 +3216,7 @@ var strictParser = parser.configure({ strict: true });
 
 // src/filter-input/useCodeMirrorEditor.ts
 var import_classnames = __toESM(require_classnames(), 1);
-import { useEffect as useEffect2, useMemo, useRef } from "react";
+import { useEffect, useMemo, useRef } from "react";
 
 // src/filter-input/FilterLanguage.ts
 import {
@@ -4062,7 +3334,7 @@ import {
   getValue,
   syntaxTree
 } from "@vuu-ui/vuu-codemirror";
-import { useCallback as useCallback3 } from "react";
+import { useCallback } from "react";
 var getOperator = (node, state) => {
   let maybeColumnNode = node.prevSibling || node.parent;
   while (maybeColumnNode && !["Column", "Operator", "In"].includes(maybeColumnNode.name)) {
@@ -4132,7 +3404,7 @@ var getSetValues = (node, state) => {
   return values;
 };
 var useAutoComplete = (suggestionProvider, onSubmit, existingFilter) => {
-  const makeSuggestions = useCallback3(
+  const makeSuggestions = useCallback(
     async (context, suggestionType, optionalArgs = {}) => {
       const { startsWith = "" } = optionalArgs;
       const options = await suggestionProvider.getSuggestions(
@@ -4143,7 +3415,7 @@ var useAutoComplete = (suggestionProvider, onSubmit, existingFilter) => {
     },
     [suggestionProvider]
   );
-  return useCallback3(
+  return useCallback(
     async (context) => {
       var _a, _b;
       const { state, pos } = context;
@@ -4410,7 +3682,7 @@ var useCodeMirrorEditor = ({
     };
     return [createState2, clearInput2];
   }, [completionFn, onSubmitFilter]);
-  useEffect2(() => {
+  useEffect(() => {
     if (!editorRef.current) {
       throw Error("editor not in dom");
     }
@@ -4427,7 +3699,7 @@ var useCodeMirrorEditor = ({
 };
 
 // src/filter-input/FilterInput.tsx
-import { jsx as jsx7, jsxs as jsxs4 } from "react/jsx-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
 var classBase = "vuuFilterInput";
 var FilterInput = ({
   existingFilter,
@@ -4442,8 +3714,8 @@ var FilterInput = ({
     onSubmitFilter,
     suggestionProvider
   });
-  return /* @__PURE__ */ jsxs4("div", { ...props, className: classBase, children: [
-    /* @__PURE__ */ jsx7(
+  return /* @__PURE__ */ jsxs("div", { ...props, className: classBase, children: [
+    /* @__PURE__ */ jsx(
       Button,
       {
         className: `${classBase}-FilterButton`,
@@ -4451,8 +3723,8 @@ var FilterInput = ({
         tabIndex: -1
       }
     ),
-    /* @__PURE__ */ jsx7("div", { className: `${classBase}-Editor`, ref: editorRef }),
-    /* @__PURE__ */ jsx7(
+    /* @__PURE__ */ jsx("div", { className: `${classBase}-Editor`, ref: editorRef }),
+    /* @__PURE__ */ jsx(
       Button,
       {
         className: `${classBase}-ClearButton`,
@@ -4474,9 +3746,9 @@ import {
 } from "@vuu-ui/vuu-codemirror";
 import {
   getTypeaheadParams,
-  useTypeaheadSuggestions as useTypeaheadSuggestions2
+  useTypeaheadSuggestions
 } from "@vuu-ui/vuu-data-react";
-import { useCallback as useCallback4, useRef as useRef2 } from "react";
+import { useCallback as useCallback2, useRef as useRef2 } from "react";
 
 // src/filter-input/filterInfo.ts
 import { createEl } from "@vuu-ui/vuu-utils";
@@ -4570,11 +3842,11 @@ var useFilterSuggestionProvider = ({
   namedFilters,
   saveOptions = defaultSaveOptions,
   table,
-  typeaheadHook: useTypeahead = useTypeaheadSuggestions2
+  typeaheadHook: useTypeahead = useTypeaheadSuggestions
 }) => {
   const latestSuggestionsRef = useRef2();
   const getTypeaheadSuggestions = useTypeahead();
-  const getSuggestions = useCallback4(
+  const getSuggestions = useCallback2(
     async (suggestionType, options = NONE) => {
       const {
         columnName,
@@ -4664,7 +3936,7 @@ var useFilterSuggestionProvider = ({
     },
     [columns, getTypeaheadSuggestions, namedFilters, saveOptions, table]
   );
-  const isPartialMatch = useCallback4(
+  const isPartialMatch = useCallback2(
     async (valueType, columnName, pattern) => {
       const suggestions = (
         // latestSuggestions && latestSuggestions.length > 0
@@ -4680,216 +3952,506 @@ var useFilterSuggestionProvider = ({
           }
         }
       }
-      return false;
+      return false;
+    },
+    [getSuggestions]
+  );
+  return {
+    getSuggestions,
+    isPartialMatch
+  };
+};
+
+// src/filter-toolbar/FilterToolbar.tsx
+var import_classnames2 = __toESM(require_classnames(), 1);
+import { Toolbar } from "@heswell/salt-lab";
+
+// src/filter-toolbar/useFilterToolbar.tsx
+import {
+  isMultiValueFilter as isMultiValueFilter2,
+  isNamedFilter,
+  isSingleValueFilter as isSingleValueFilter2
+} from "@vuu-ui/vuu-utils";
+import { ToggleButton, ToolbarField } from "@heswell/salt-lab";
+
+// src/filter-toolbar/FilterDropdown.tsx
+import { Dropdown } from "@heswell/salt-lab";
+import { useCallback as useCallback3, useState } from "react";
+import { jsx as jsx2 } from "react/jsx-runtime";
+var isString = (s) => typeof s === "string";
+var stripQuotes = (selected) => {
+  if (isString(selected)) {
+    if (selected.startsWith('"') && selected.endsWith('"')) {
+      return selected.slice(1, -1);
+    } else {
+      return selected;
+    }
+  } else {
+    return selected.map(stripQuotes);
+  }
+};
+var FilterDropdown = ({
+  column,
+  selected: selectedProp,
+  suggestionProvider,
+  ...props
+}) => {
+  const selected = selectedProp != null ? stripQuotes(selectedProp) : void 0;
+  const initialValues = Array.isArray(selected) ? selected : selected != null ? [selected] : [];
+  const [values, setValues] = useState(initialValues);
+  console.log({ initialValues });
+  const handleOpenChange = useCallback3(
+    async (isOpen) => {
+      if (isOpen) {
+        const values2 = await suggestionProvider.getSuggestions("columnValue", {
+          columnName: column
+        });
+        console.log({ values: values2 });
+        setValues(values2.map((suggestion) => suggestion.label));
+      }
+    },
+    [column, suggestionProvider]
+  );
+  return /* @__PURE__ */ jsx2(
+    Dropdown,
+    {
+      ...props,
+      onOpenChange: handleOpenChange,
+      selected,
+      source: values
+    }
+  );
+};
+
+// src/filter-toolbar/FilterDropdownMultiSelect.tsx
+import { Dropdown as Dropdown2 } from "@heswell/salt-lab";
+import { useCallback as useCallback4, useState as useState2 } from "react";
+import { jsx as jsx3 } from "react/jsx-runtime";
+var isString2 = (s) => typeof s === "string";
+var stripQuotes2 = (selected) => {
+  if (selected === void 0) {
+    return void 0;
+  } else if (isString2(selected)) {
+    if (selected.startsWith('"') && selected.endsWith('"')) {
+      return selected.slice(1, -1);
+    } else {
+      return selected;
+    }
+  } else {
+    return selected.map(stripQuotes2);
+  }
+};
+var FilterDropdownMultiSelect = ({
+  column,
+  selected: selectedProp,
+  suggestionProvider,
+  ...props
+}) => {
+  const selected = stripQuotes2(selectedProp);
+  const initialValues = Array.isArray(selected) ? selected : selected != null ? [selected] : [];
+  const [values, setValues] = useState2(initialValues);
+  const handleOpenChange = useCallback4(
+    async (isOpen) => {
+      if (isOpen) {
+        const values2 = await suggestionProvider.getSuggestions("columnValue", {
+          columnName: column
+        });
+        console.log({ values: values2 });
+        setValues(values2.map((suggestion) => suggestion.label));
+      }
     },
-    [getSuggestions]
+    [column, suggestionProvider]
   );
-  return {
-    getSuggestions,
-    isPartialMatch
-  };
+  return /* @__PURE__ */ jsx3(
+    Dropdown2,
+    {
+      ...props,
+      onOpenChange: handleOpenChange,
+      selected,
+      selectionStrategy: "multiple",
+      source: values
+    }
+  );
+};
+
+// src/filter-toolbar/useFilterToolbar.tsx
+import { jsx as jsx4 } from "react/jsx-runtime";
+var filterToControl = (filter, suggestionProvider) => {
+  if (isNamedFilter(filter)) {
+    return /* @__PURE__ */ jsx4(
+      ToggleButton,
+      {
+        className: "vuuToggleButton",
+        toggled: true,
+        variant: "secondary",
+        children: filter.name
+      }
+    );
+  }
+  if (isSingleValueFilter2(filter)) {
+    const { column, value } = filter;
+    return /* @__PURE__ */ jsx4(
+      ToolbarField,
+      {
+        className: "vuuFilterDropdown",
+        label: column,
+        labelPlacement: "top",
+        children: /* @__PURE__ */ jsx4(
+          FilterDropdown,
+          {
+            column,
+            selected: value.toString(),
+            selectionStrategy: "default",
+            source: [value.toString()],
+            suggestionProvider,
+            style: { width: 100 }
+          }
+        )
+      },
+      column
+    );
+  }
+  if (isMultiValueFilter2(filter)) {
+    const values = filter.values.map((v) => v.toString());
+    return /* @__PURE__ */ jsx4(
+      ToolbarField,
+      {
+        className: "vuuFilterDropdown",
+        label: filter.column,
+        labelPlacement: "top",
+        children: /* @__PURE__ */ jsx4(
+          FilterDropdownMultiSelect,
+          {
+            column: filter.column,
+            selected: values,
+            source: values,
+            suggestionProvider,
+            style: { width: 100 }
+          }
+        )
+      },
+      filter.column
+    );
+  }
+  return filter.filters.map(
+    (filter2) => filterToControl(filter2, suggestionProvider)
+  );
+};
+var useFilterToolbar = ({
+  filter,
+  suggestionProvider
+}) => {
+  if (filter) {
+    return filterToControl(filter, suggestionProvider);
+  }
+  return [];
 };
 
 // src/filter-toolbar/FilterToolbar.tsx
-var import_classnames2 = __toESM(require_classnames(), 1);
-import { Toolbar as Toolbar2 } from "@heswell/salt-lab";
+import { jsx as jsx5 } from "react/jsx-runtime";
+var FilterToolbar = ({
+  className,
+  filter,
+  suggestionProvider,
+  ...props
+}) => {
+  console.log(`FilterToolbar ${JSON.stringify(filter, null, 2)}`);
+  const toolbarItems = useFilterToolbar({ filter, suggestionProvider });
+  return /* @__PURE__ */ jsx5(Toolbar, { className: (0, import_classnames2.default)("vuuFilterToolbar", className), ...props, children: toolbarItems });
+};
 
-// src/filter-toolbar/useFilterToolbar.tsx
+// src/filter-utils.ts
 import {
+  extractFilterForColumn,
+  isAndFilter,
+  isInFilter,
+  isMultiClauseFilter as isMultiClauseFilter2,
   isMultiValueFilter as isMultiValueFilter3,
-  isNamedFilter,
-  isSingleValueFilter as isSingleValueFilter3
+  isOrFilter,
+  isSingleValueFilter as isSingleValueFilter3,
+  partition
 } from "@vuu-ui/vuu-utils";
-import { ToggleButton, ToolbarField as ToolbarField3 } from "@heswell/salt-lab";
-
-// src/filter-toolbar/FilterDropdown.tsx
-import { Dropdown as Dropdown2 } from "@heswell/salt-lab";
-import { useCallback as useCallback5, useState as useState3 } from "react";
-import { jsx as jsx8 } from "react/jsx-runtime";
-var isString = (s) => typeof s === "string";
-var stripQuotes = (selected) => {
-  if (isString(selected)) {
-    if (selected.startsWith('"') && selected.endsWith('"')) {
-      return selected.slice(1, -1);
+var AND = "and";
+var EQUALS = "=";
+var GREATER_THAN = ">";
+var LESS_THAN = "<";
+var OR = "or";
+var STARTS_WITH = "starts";
+var ENDS_WITH = "ends";
+var IN = "in";
+var filterClauses = (filter, clauses = []) => {
+  if (filter) {
+    if (isMultiClauseFilter2(filter)) {
+      filter.filters.forEach((f) => clauses.push(...filterClauses(f)));
     } else {
-      return selected;
+      clauses.push(filter);
     }
-  } else {
-    return selected.map(stripQuotes);
   }
-};
-var FilterDropdown = ({
-  column,
-  selected: selectedProp,
-  suggestionProvider,
-  ...props
-}) => {
-  const selected = selectedProp != null ? stripQuotes(selectedProp) : void 0;
-  const initialValues = Array.isArray(selected) ? selected : selected != null ? [selected] : [];
-  const [values, setValues] = useState3(initialValues);
-  console.log({ initialValues });
-  const handleOpenChange = useCallback5(
-    async (isOpen) => {
-      if (isOpen) {
-        const values2 = await suggestionProvider.getSuggestions("columnValue", {
-          columnName: column
-        });
-        console.log({ values: values2 });
-        setValues(values2.map((suggestion) => suggestion.label));
-      }
-    },
-    [column, suggestionProvider]
+  return clauses;
+};
+var DEFAULT_ADD_FILTER_OPTS = {
+  combineWith: "and"
+};
+var addFilter = (existingFilter, filter, { combineWith = AND } = DEFAULT_ADD_FILTER_OPTS) => {
+  var _a;
+  if (includesNoValues(filter)) {
+    if (isMultiClauseFilter2(filter)) {
+    } else {
+      existingFilter = removeFilterForColumn(existingFilter, {
+        name: filter.column
+      });
+    }
+  } else if (includesAllValues(filter)) {
+    if (isMultiClauseFilter2(filter)) {
+    }
+    return removeFilterForColumn(existingFilter, { name: (_a = filter.column) != null ? _a : "" });
+  }
+  if (!existingFilter) {
+    return filter;
+  }
+  if (!filter) {
+    return existingFilter;
+  }
+  if (existingFilter.op === AND && filter.op === AND) {
+    return {
+      op: AND,
+      filters: combine(existingFilter.filters, filter.filters)
+    };
+  }
+  if (existingFilter.op === AND) {
+    const filters = replaceOrInsert(existingFilter.filters, filter);
+    return filters.length > 1 ? { op: AND, filters } : filters[0];
+  }
+  if (filter.op === AND) {
+    return { op: AND, filters: filter.filters.concat(existingFilter) };
+  }
+  if (filterEquals(existingFilter, filter, true)) {
+    return filter;
+  }
+  if (canMerge(existingFilter, filter)) {
+    return merge(existingFilter, filter);
+  }
+  return { op: combineWith, filters: [existingFilter, filter] };
+};
+var includesNoValues = (filter) => {
+  if (!filter) {
+    return false;
+  }
+  if (isInFilter(filter) && filter.values.length === 0) {
+    return true;
+  }
+  return isAndFilter(filter) && filter.filters.some((f) => includesNoValues(f));
+};
+var includesAllValues = (filter) => {
+  if (!filter) {
+    return false;
+  }
+  if (filter.op === STARTS_WITH && filter.value === "") {
+    return true;
+  }
+  return filter.op === STARTS_WITH && filter.value === "";
+};
+var replaceOrInsert = (filters, filter) => {
+  return filters.concat(filter);
+};
+var merge = (f1, f2) => {
+  if (includesNoValues(f2)) {
+    return f2;
+  }
+  if (isInFilter(f1) && isInFilter(f2)) {
+    return {
+      ...f1,
+      values: [
+        ...f1.values,
+        ...f2.values.filter(
+          (v) => !f1.values.includes(v)
+        )
+      ]
+    };
+  } else if (isInFilter(f1) && f2.op === EQUALS) {
+    return {
+      ...f1,
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      values: f1.values.concat([f2.value])
+    };
+  } else if (f1.op === EQUALS && f2.op === EQUALS) {
+    return {
+      column: f1.column,
+      op: IN,
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      values: [f1.value, f2.value]
+    };
+  }
+  return f2;
+};
+var combine = (existingFilters, replacementFilters) => {
+  const equivalentType = ({ op: t1 }, { op: t2 }) => {
+    return t1 === t2 || t1[0] === t2[0];
+  };
+  const replaces = (existingFilter, replacementFilter) => {
+    return existingFilter.column === replacementFilter.column && equivalentType(existingFilter, replacementFilter);
+  };
+  const stillApplicable = (existingFilter) => replacementFilters.some(
+    (replacementFilter) => replaces(existingFilter, replacementFilter)
+  ) === false;
+  return existingFilters.filter(stillApplicable).concat(replacementFilters);
+};
+var removeFilter = (sourceFilter, filterToRemove) => {
+  if (filterEquals(sourceFilter, filterToRemove, true)) {
+    return null;
+  }
+  if (sourceFilter.op !== AND) {
+    throw Error(
+      `removeFilter cannot remove ${JSON.stringify(
+        filterToRemove
+      )} from ${JSON.stringify(sourceFilter)}`
+    );
+  }
+  const filters = sourceFilter.filters.filter(
+    (f) => !filterEquals(f, filterToRemove)
   );
-  return /* @__PURE__ */ jsx8(
-    Dropdown2,
-    {
-      ...props,
-      onOpenChange: handleOpenChange,
-      selected,
-      source: values
-    }
+  return filters.length > 0 ? { type: AND, filters } : null;
+};
+var splitFilterOnColumn = (columnName, filter) => {
+  if (!filter) {
+    return [void 0, void 0];
+  }
+  if (filter.column === columnName) {
+    return [filter, void 0];
+  }
+  if (filter.op !== AND) {
+    return [void 0, filter];
+  }
+  const [[columnFilter = void 0], filters] = partition(
+    filter.filters,
+    (f) => f.column === columnName
   );
+  return filters.length === 1 ? [columnFilter, filters[0]] : [columnFilter, { op: AND, filters }];
 };
-
-// src/filter-toolbar/FilterDropdownMultiSelect.tsx
-import { Dropdown as Dropdown3 } from "@heswell/salt-lab";
-import { useCallback as useCallback6, useState as useState4 } from "react";
-import { jsx as jsx9 } from "react/jsx-runtime";
-var isString2 = (s) => typeof s === "string";
-var stripQuotes2 = (selected) => {
-  if (selected === void 0) {
+var overrideColName = (filter, column) => {
+  if (isMultiClauseFilter2(filter)) {
+    return {
+      op: filter.op,
+      filters: filter.filters.map((f) => overrideColName(f, column))
+    };
+  }
+  return { ...filter, column };
+};
+var filterIncludesColumn = (filter, column) => {
+  if (!filter) {
+    return false;
+  }
+  const { op, column: filterColName } = filter;
+  switch (op) {
+    case AND:
+    case OR:
+      return filter.filters != null && filter.filters.some((f) => filterIncludesColumn(f, column));
+    default:
+      return filterColName === column.name;
+  }
+};
+var removeFilterForColumn = (sourceFilter, column) => {
+  const colName = column.name;
+  if (!sourceFilter) {
     return void 0;
-  } else if (isString2(selected)) {
-    if (selected.startsWith('"') && selected.endsWith('"')) {
-      return selected.slice(1, -1);
-    } else {
-      return selected;
+  }
+  if (sourceFilter.column === colName) {
+    return void 0;
+  }
+  if (isAndFilter(sourceFilter) || isOrFilter(sourceFilter)) {
+    const { op } = sourceFilter;
+    const filters = sourceFilter.filters;
+    const otherColFilters = filters.filter((f) => f.column !== colName);
+    switch (otherColFilters.length) {
+      case 0:
+        return void 0;
+      case 1:
+        return otherColFilters[0];
+      default:
+        return { op, filters: otherColFilters };
     }
-  } else {
-    return selected.map(stripQuotes2);
   }
+  return sourceFilter;
 };
-var FilterDropdownMultiSelect = ({
-  column,
-  selected: selectedProp,
-  suggestionProvider,
-  ...props
-}) => {
-  const selected = stripQuotes2(selectedProp);
-  const initialValues = Array.isArray(selected) ? selected : selected != null ? [selected] : [];
-  const [values, setValues] = useState4(initialValues);
-  const handleOpenChange = useCallback6(
-    async (isOpen) => {
-      if (isOpen) {
-        const values2 = await suggestionProvider.getSuggestions("columnValue", {
-          columnName: column
-        });
-        console.log({ values: values2 });
-        setValues(values2.map((suggestion) => suggestion.label));
-      }
-    },
-    [column, suggestionProvider]
-  );
-  return /* @__PURE__ */ jsx9(
-    Dropdown3,
-    {
-      ...props,
-      onOpenChange: handleOpenChange,
-      selected,
-      selectionStrategy: "multiple",
-      source: values
-    }
-  );
+var canMerge = (f1, f2) => f1.column === f2.column && (f1.op === "=" || f1.op === "in") && (f2.op === "=" || f2.op === "in");
+var sameValues = (arr1, arr2) => {
+  if (arr1 === arr2) {
+    return true;
+  }
+  if (arr1.length === arr2.length) {
+    const a = arr1.slice().sort();
+    const b = arr2.slice().sort();
+    return a.join("|") === b.join("|");
+  }
+  return false;
 };
-
-// src/filter-toolbar/useFilterToolbar.tsx
-import { jsx as jsx10 } from "react/jsx-runtime";
-var filterToControl = (filter, suggestionProvider) => {
-  if (isNamedFilter(filter)) {
-    return /* @__PURE__ */ jsx10(
-      ToggleButton,
-      {
-        className: "vuuToggleButton",
-        toggled: true,
-        variant: "secondary",
-        children: filter.name
-      }
-    );
+var filterEquals = (f1, f2, strict = false) => {
+  if (!strict) {
+    return true;
   }
-  if (isSingleValueFilter3(filter)) {
-    const { column, value } = filter;
-    return /* @__PURE__ */ jsx10(
-      ToolbarField3,
-      {
-        className: "vuuFilterDropdown",
-        label: column,
-        labelPlacement: "top",
-        children: /* @__PURE__ */ jsx10(
-          FilterDropdown,
-          {
-            column,
-            selected: value.toString(),
-            selectionStrategy: "default",
-            source: [value.toString()],
-            suggestionProvider,
-            style: { width: 100 }
-          }
-        )
-      },
-      column
-    );
+  if (f1 && f2 && canMerge(f1, f2)) {
+    return f1.op === f2.op && (isSingleValueFilter3(f1) && isSingleValueFilter3(f2) && f1.value === f2.value || isMultiValueFilter3(f1) && isMultiValueFilter3(f2) && sameValues(f1.values, f2.values));
   }
-  if (isMultiValueFilter3(filter)) {
-    const values = filter.values.map((v) => v.toString());
-    return /* @__PURE__ */ jsx10(
-      ToolbarField3,
-      {
-        className: "vuuFilterDropdown",
-        label: filter.column,
-        labelPlacement: "top",
-        children: /* @__PURE__ */ jsx10(
-          FilterDropdownMultiSelect,
-          {
-            column: filter.column,
-            selected: values,
-            source: values,
-            suggestionProvider,
-            style: { width: 100 }
-          }
-        )
-      },
-      filter.column
-    );
+  return false;
+};
+var updateFilter = (filter, newFilter, mode) => {
+  if (filter && newFilter) {
+    if (mode === "replace") {
+      return newFilter;
+    }
+    if (filter.op === "and") {
+      return {
+        ...filter,
+        filters: filter.filters.concat(newFilter)
+      };
+    }
+    const { column: columnName } = newFilter;
+    if (columnName) {
+      const existingClause = newFilter.column ? extractFilterForColumn(filter, columnName) : void 0;
+      if (existingClause && columnName) {
+        const result = removeFilterForColumn(filter, { name: columnName });
+        return updateFilter(result, newFilter, "add");
+      }
+    }
+    return {
+      op: "and",
+      filters: [filter, newFilter]
+    };
   }
-  return filter.filters.map(
-    (filter2) => filterToControl(filter2, suggestionProvider)
-  );
+  if (newFilter) {
+    return newFilter;
+  }
+  return filter;
 };
-var useFilterToolbar = ({
-  filter,
-  suggestionProvider
-}) => {
-  if (filter) {
-    return filterToControl(filter, suggestionProvider);
+var getTypeaheadFilter = (column, filterValues, isStartsWithFilter) => {
+  if (filterValues.length === 0) {
+    return void 0;
   }
-  return [];
+  if (isStartsWithFilter) {
+    const startsWith = filterValues[0].substring(0, filterValues[0].length - 3);
+    return {
+      column,
+      op: "starts",
+      value: `"${startsWith}"`
+    };
+  }
+  return {
+    column,
+    op: "in",
+    values: filterValues.map((value) => `"${value}"`)
+  };
 };
-
-// src/filter-toolbar/FilterToolbar.tsx
-import { jsx as jsx11 } from "react/jsx-runtime";
-var FilterToolbar = ({
-  className,
-  filter,
-  suggestionProvider,
-  ...props
-}) => {
-  console.log(`FilterToolbar ${JSON.stringify(filter, null, 2)}`);
-  const toolbarItems = useFilterToolbar({ filter, suggestionProvider });
-  return /* @__PURE__ */ jsx11(Toolbar2, { className: (0, import_classnames2.default)("vuuFilterToolbar", className), ...props, children: toolbarItems });
+var getNumericFilter = (column, operator, value) => {
+  if (operator === void 0)
+    return void 0;
+  if (value === void 0 || isNaN(value))
+    return void 0;
+  return { column, op: operator, value };
 };
 export {
   AND,
-  ColumnFilter,
   ENDS_WITH,
   EQUALS,
   FilterInput,
@@ -4903,6 +4465,8 @@ export {
   filterClauses,
   filterEquals,
   filterIncludesColumn,
+  getNumericFilter,
+  getTypeaheadFilter,
   overrideColName,
   removeFilter,
   splitFilterOnColumn,