@vuu-ui/vuu-filters 0.6.13-debug → 0.6.14-debug

package/esm/index.js

@@ -100,34 +100,16 @@ import { Button } from "@salt-ds/core";
 var import_classnames = __toESM(require_classnames(), 1);
 import {
   autocompletion,
-  defaultKeymap as defaultKeymap2,
-  ensureSyntaxTree,
+  defaultKeymap,
   EditorState as EditorState2,
   EditorView as EditorView2,
-  keymap as keymap2,
+  ensureSyntaxTree,
+  keymap,
+  minimalSetup,
   startCompletion
 } from "@vuu-ui/vuu-codemirror";
 import { useEffect, useMemo, useRef } from "react";
 
-// src/filter-input/codemirror-basic-setup.ts
-import {
-  defaultHighlightStyle,
-  defaultKeymap,
-  drawSelection,
-  highlightSpecialChars,
-  history,
-  historyKeymap,
-  keymap,
-  syntaxHighlighting
-} from "@vuu-ui/vuu-codemirror";
-var minimalSetup = (() => [
-  highlightSpecialChars(),
-  history(),
-  drawSelection(),
-  syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
-  keymap.of([...defaultKeymap, ...historyKeymap])
-])();
-
 // src/filter-input/filter-language-parser/FilterLanguage.ts
 import {
   LanguageSupport,
@@ -293,14 +275,14 @@ var walkTree = (tree, source) => {
 // src/filter-input/highlighting.ts
 import {
   HighlightStyle,
-  syntaxHighlighting as syntaxHighlighting2,
+  syntaxHighlighting,
   tags
 } from "@vuu-ui/vuu-codemirror";
 var myHighlightStyle = HighlightStyle.define([
   { tag: tags.variableName, color: "var(--vuuFilterEditor-variableColor)" },
   { tag: tags.comment, color: "green", fontStyle: "italic" }
 ]);
-var vuuHighlighting = syntaxHighlighting2(myHighlightStyle);
+var vuuHighlighting = syntaxHighlighting(myHighlightStyle);
 
 // src/filter-input/theme.ts
 import { EditorView } from "@vuu-ui/vuu-codemirror";
@@ -378,24 +360,13 @@ var vuuTheme = EditorView.theme(
 
 // src/filter-input/useFilterAutoComplete.ts
 import {
+  asNameSuggestion,
+  booleanJoinSuggestions,
+  getNodeByName,
+  getValue,
   syntaxTree
 } from "@vuu-ui/vuu-codemirror";
 import { useCallback } from "react";
-var getValue = (node, state) => state.doc.sliceString(node.from, node.to);
-var getColumnName = (node, state) => {
-  var _a;
-  if (((_a = node.firstChild) == null ? void 0 : _a.name) === "Column") {
-    return getValue(node.firstChild, state);
-  } else {
-    let maybeColumnNode = node.prevSibling || node.parent;
-    while (maybeColumnNode && maybeColumnNode.name !== "Column") {
-      maybeColumnNode = maybeColumnNode.prevSibling || maybeColumnNode.parent;
-    }
-    if (maybeColumnNode) {
-      return getValue(maybeColumnNode, state);
-    }
-  }
-};
 var getOperator = (node, state) => {
   let maybeColumnNode = node.prevSibling || node.parent;
   while (maybeColumnNode && !["Column", "Operator", "In"].includes(maybeColumnNode.name)) {
@@ -453,11 +424,6 @@ var promptForFilterName = (context) => ({
     }
   ]
 });
-var joinSuggestions = [
-  { label: "and", apply: "and ", boost: 5 },
-  { label: "or", apply: "or ", boost: 3 },
-  { label: "as", apply: "as ", boost: 1 }
-];
 var makeSaveOrExtendSuggestions = (onSubmit, existingFilter, withJoinSuggestions = true) => {
   const result = existingFilter ? [
     {
@@ -482,7 +448,7 @@ var makeSaveOrExtendSuggestions = (onSubmit, existingFilter, withJoinSuggestions
       boost: 6
     }
   ];
-  return withJoinSuggestions ? result.concat(joinSuggestions) : result;
+  return withJoinSuggestions ? result.concat(booleanJoinSuggestions).concat(asNameSuggestion) : result;
 };
 var promptToSaveOrExtend = (context, onSubmit, existingFilter) => ({
   from: context.pos,
@@ -552,7 +518,7 @@ var useAutoComplete = (suggestionProvider, onSubmit, existingFilter) => {
           }
         }
         case "\u26A0": {
-          const columnName = getColumnName(nodeBefore, state);
+          const columnName = getNodeByName(nodeBefore, state);
           const operator = getOperator(nodeBefore, state);
           const partialOperator = operator ? void 0 : getPartialOperator(nodeBefore, state, columnName);
           if (partialOperator) {
@@ -587,7 +553,7 @@ var useAutoComplete = (suggestionProvider, onSubmit, existingFilter) => {
           break;
         case "ColumnSetExpression":
         case "Values": {
-          const columnName = getColumnName(nodeBefore, state);
+          const columnName = getNodeByName(nodeBefore, state);
           const selection = getSetValues(nodeBefore, state);
           return makeSuggestions(context, "columnValue", {
             columnName,
@@ -596,7 +562,7 @@ var useAutoComplete = (suggestionProvider, onSubmit, existingFilter) => {
         }
         case "Comma":
         case "LBrack": {
-          const columnName = getColumnName(nodeBefore, state);
+          const columnName = getNodeByName(nodeBefore, state);
           return makeSuggestions(context, "columnValue", { columnName });
         }
         case "ColumnValueExpression":
@@ -604,11 +570,11 @@ var useAutoComplete = (suggestionProvider, onSubmit, existingFilter) => {
             const lastToken = (_b = nodeBefore.lastChild) == null ? void 0 : _b.prevSibling;
             if ((lastToken == null ? void 0 : lastToken.name) === "Column") {
               return makeSuggestions(context, "operator", {
-                columnName: getColumnName(nodeBefore, state)
+                columnName: getNodeByName(nodeBefore, state)
               });
             } else if ((lastToken == null ? void 0 : lastToken.name) === "Operator") {
               return makeSuggestions(context, "columnValue", {
-                columnName: getColumnName(lastToken, state),
+                columnName: getNodeByName(lastToken, state),
                 operator: getValue(lastToken, state)
               });
             }
@@ -622,7 +588,7 @@ var useAutoComplete = (suggestionProvider, onSubmit, existingFilter) => {
         }
         case "Eq": {
           return makeSuggestions(context, "columnValue", {
-            columnName: getColumnName(nodeBefore, state)
+            columnName: getNodeByName(nodeBefore, state)
           });
         }
         case "AndExpression":
@@ -691,7 +657,7 @@ var useCodeMirrorEditor = ({
       clearInput2();
     };
     const submitFilter = (key) => {
-      return keymap2.of([
+      return keymap.of([
         {
           key,
           run() {
@@ -702,7 +668,7 @@ var useCodeMirrorEditor = ({
       ]);
     };
     const showSuggestions = (key) => {
-      return keymap2.of([
+      return keymap.of([
         {
           key,
           run() {
@@ -721,7 +687,7 @@ var useCodeMirrorEditor = ({
           optionClass: getOptionClass
         }),
         filterLanguageSupport(),
-        keymap2.of(defaultKeymap2),
+        keymap.of(defaultKeymap),
         submitFilter("Ctrl-Enter"),
         showSuggestions("ArrowDown"),
         EditorView2.updateListener.of((v) => {
@@ -791,7 +757,12 @@ var FilterInput = ({
 };
 
 // src/filter-input/useFilterSuggestionProvider.ts
-import { useTypeaheadSuggestions } from "@vuu-ui/vuu-data";
+import {
+  numericOperators,
+  stringOperators,
+  toSuggestions
+} from "@vuu-ui/vuu-codemirror";
+import { getTypeaheadParams, useTypeaheadSuggestions } from "@vuu-ui/vuu-data";
 import { useCallback as useCallback2, useRef as useRef2 } from "react";
 
 // src/filter-input/filterInfo.ts
@@ -809,7 +780,7 @@ var filterInfo = (filterName, filterQuery) => {
 
 // src/filter-input/useFilterSuggestionProvider.ts
 var NO_NAMED_FILTERS = [];
-var NO_OPTIONS = {};
+var NONE = {};
 var suggestColumns = (columns) => columns.map((column) => ({
   boost: 5,
   label: column.name
@@ -825,39 +796,10 @@ var doneCommand = {
   type: "keyword",
   boost: 10
 };
-var equalityOperators = [
-  { label: "=", boost: 10 },
-  { label: "!=", boost: 9 }
-];
-var stringOperators = [
-  ...equalityOperators,
-  { label: "in", boost: 6 },
-  { label: "starts", boost: 5 },
-  { label: "ends", boost: 4 }
-];
-var numericOperators = [
-  ...equalityOperators,
-  { label: ">", boost: 8 },
-  { label: "<", boost: 7 }
-];
-var toSuggestions = (values, quoted = false, prefix = "", isIllustration = false) => {
-  const quote = quoted ? '"' : "";
-  return values.map((value) => ({
-    isIllustration,
-    label: value,
-    apply: isIllustration ? `${quote}${prefix}${quote}` : `${prefix}${quote}${value}${quote} `
-  }));
-};
 var withApplySpace = (suggestions, startsWith = "") => suggestions.filter((sugg) => startsWith === "" || sugg.label.startsWith(startsWith)).map((suggestion) => ({
   ...suggestion,
   apply: suggestion.label + " "
 }));
-var getTypeaheadParams = (table, column, text = "", selectedValues = []) => {
-  if (text !== "" && !selectedValues.includes(text.toLowerCase())) {
-    return [table, column, text];
-  }
-  return [table, column];
-};
 var useFilterSuggestionProvider = ({
   columns,
   namedFilters,
@@ -866,8 +808,9 @@ var useFilterSuggestionProvider = ({
   const latestSuggestionsRef = useRef2();
   const getTypeaheadSuggestions = useTypeaheadSuggestions();
   const getSuggestions = useCallback2(
-    async (valueType, { columnName, operator, startsWith, selection } = NO_OPTIONS) => {
-      if (valueType === "operator") {
+    async (suggestionType, options = NONE) => {
+      const { columnName, operator, startsWith, selection } = options;
+      if (suggestionType === "operator") {
         const column = columns.find((col) => col.name === columnName);
         if (column) {
           switch (column.serverDataType) {
@@ -882,7 +825,7 @@ var useFilterSuggestionProvider = ({
         } else {
           console.warn(`'${columnName}' does not match any column name`);
         }
-      } else if (valueType === "column") {
+      } else if (suggestionType === "column") {
         const columnSuggestions = await suggestColumns(columns);
         const filterSuggestions = await suggestNamedFilters(namedFilters);
         return (latestSuggestionsRef.current = withApplySpace(columnSuggestions)).concat(
@@ -895,12 +838,11 @@ var useFilterSuggestionProvider = ({
         const params = getTypeaheadParams(table, columnName, startsWith);
         const suggestions = await getTypeaheadSuggestions(params);
         const isIllustration = operator === "starts";
-        latestSuggestionsRef.current = toSuggestions(
-          suggestions,
-          (column == null ? void 0 : column.serverDataType) === "string",
-          isIllustration ? startsWith : prefix,
+        latestSuggestionsRef.current = toSuggestions(suggestions, {
+          quoted: (column == null ? void 0 : column.serverDataType) === "string",
+          prefix: isIllustration ? startsWith : prefix,
           isIllustration
-        );
+        });
         if (Array.isArray(selection) && (selection == null ? void 0 : selection.length) > 1) {
           return [doneCommand, ...latestSuggestionsRef.current];
         }
@@ -1320,7 +1262,7 @@ var includesNoValues = (filter) => {
   return isAndFilter(filter) && filter.filters.some((f) => includesNoValues(f));
 };
 var filterValue = (value) => typeof value === "string" ? `"${value}"` : value;
-var filterAsQuery = (f, namedFilters = {}) => {
+var filterAsQuery = (f) => {
   if (isMultiClauseFilter2(f)) {
     return f.filters.map((filter) => filterAsQuery(filter)).join(` ${f.op} `);
   } else if (isMultiValueFilter2(f)) {