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

package/cjs/index.js

@@ -141,26 +141,16 @@ module.exports = __toCommonJS(src_exports);
 var import_core = require("@salt-ds/core");
 
 // src/filter-input/useCodeMirrorEditor.ts
-var import_vuu_codemirror7 = require("@vuu-ui/vuu-codemirror");
+var import_vuu_codemirror6 = require("@vuu-ui/vuu-codemirror");
 var import_classnames = __toESM(require_classnames(), 1);
 var import_react2 = require("react");
 
-// src/filter-input/codemirror-basic-setup.ts
-var import_vuu_codemirror = require("@vuu-ui/vuu-codemirror");
-var minimalSetup = (() => [
-  (0, import_vuu_codemirror.highlightSpecialChars)(),
-  (0, import_vuu_codemirror.history)(),
-  (0, import_vuu_codemirror.drawSelection)(),
-  (0, import_vuu_codemirror.syntaxHighlighting)(import_vuu_codemirror.defaultHighlightStyle, { fallback: true }),
-  import_vuu_codemirror.keymap.of([...import_vuu_codemirror.defaultKeymap, ...import_vuu_codemirror.historyKeymap])
-])();
-
 // src/filter-input/filter-language-parser/FilterLanguage.ts
-var import_vuu_codemirror3 = require("@vuu-ui/vuu-codemirror");
+var import_vuu_codemirror2 = require("@vuu-ui/vuu-codemirror");
 
 // src/filter-input/filter-language-parser/generated/filter-parser.js
-var import_vuu_codemirror2 = require("@vuu-ui/vuu-codemirror");
-var parser = import_vuu_codemirror2.LRParser.deserialize({
+var import_vuu_codemirror = require("@vuu-ui/vuu-codemirror");
+var parser = import_vuu_codemirror.LRParser.deserialize({
   version: 14,
   states: "%QOVQPOOOOQO'#C_'#C_O_QQO'#C^OOQO'#DO'#DOOvQQO'#C|OOQO'#DR'#DROVQPO'#CuOOQO'#C}'#C}QOQPOOOOQO'#C`'#C`O!UQQO,58xO!dQPO,59VOVQPO,59]OVQPO,59_O!iQPO,59hO!nQQO,59aOOQO'#DQ'#DQOOQO1G.d1G.dO!UQQO1G.qO!yQQO1G.wOOQO1G.y1G.yOOQO'#Cw'#CwOOQO1G/S1G/SOOQO1G.{1G.{O#[QPO'#CnO#dQPO7+$]O!UQQO'#CxO#iQPO,59YOOQO<<Gw<<GwOOQO,59d,59dOOQO-E6v-E6v",
   stateData: "#q~OoOS~OsPOvUO~OTXOUXOVXOWXOXXOYXO`ZO~Of[Oh]Oj^OmpX~OZ`O[`O]`O^`O~OabO~OseO~Of[Oh]OwgO~Oh]Ofeijeimeiwei~OcjOdbX~OdlO~OcjOdba~O",
@@ -176,21 +166,21 @@ var parser = import_vuu_codemirror2.LRParser.deserialize({
 });
 
 // src/filter-input/filter-language-parser/FilterLanguage.ts
-var filterLanguage = import_vuu_codemirror3.LRLanguage.define({
+var filterLanguage = import_vuu_codemirror2.LRLanguage.define({
   name: "VuuFilterQuery",
   parser: parser.configure({
     props: [
-      (0, import_vuu_codemirror3.styleTags)({
-        Identifier: import_vuu_codemirror3.tags.variableName,
-        String: import_vuu_codemirror3.tags.string,
-        Or: import_vuu_codemirror3.tags.emphasis,
-        Operator: import_vuu_codemirror3.tags.operator
+      (0, import_vuu_codemirror2.styleTags)({
+        Identifier: import_vuu_codemirror2.tags.variableName,
+        String: import_vuu_codemirror2.tags.string,
+        Or: import_vuu_codemirror2.tags.emphasis,
+        Operator: import_vuu_codemirror2.tags.operator
       })
     ]
   })
 });
 var filterLanguageSupport = () => {
-  return new import_vuu_codemirror3.LanguageSupport(filterLanguage);
+  return new import_vuu_codemirror2.LanguageSupport(filterLanguage);
 };
 
 // src/filter-input/filter-language-parser/FilterTreeWalker.ts
@@ -309,16 +299,16 @@ var walkTree = (tree, source) => {
 };
 
 // src/filter-input/highlighting.ts
-var import_vuu_codemirror4 = require("@vuu-ui/vuu-codemirror");
-var myHighlightStyle = import_vuu_codemirror4.HighlightStyle.define([
-  { tag: import_vuu_codemirror4.tags.variableName, color: "var(--vuuFilterEditor-variableColor)" },
-  { tag: import_vuu_codemirror4.tags.comment, color: "green", fontStyle: "italic" }
+var import_vuu_codemirror3 = require("@vuu-ui/vuu-codemirror");
+var myHighlightStyle = import_vuu_codemirror3.HighlightStyle.define([
+  { tag: import_vuu_codemirror3.tags.variableName, color: "var(--vuuFilterEditor-variableColor)" },
+  { tag: import_vuu_codemirror3.tags.comment, color: "green", fontStyle: "italic" }
 ]);
-var vuuHighlighting = (0, import_vuu_codemirror4.syntaxHighlighting)(myHighlightStyle);
+var vuuHighlighting = (0, import_vuu_codemirror3.syntaxHighlighting)(myHighlightStyle);
 
 // src/filter-input/theme.ts
-var import_vuu_codemirror5 = require("@vuu-ui/vuu-codemirror");
-var vuuTheme = import_vuu_codemirror5.EditorView.theme(
+var import_vuu_codemirror4 = require("@vuu-ui/vuu-codemirror");
+var vuuTheme = import_vuu_codemirror4.EditorView.theme(
   {
     "&": {
       color: "var(--vuuFilterEditor-color)",
@@ -391,36 +381,21 @@ var vuuTheme = import_vuu_codemirror5.EditorView.theme(
 );
 
 // src/filter-input/useFilterAutoComplete.ts
-var import_vuu_codemirror6 = require("@vuu-ui/vuu-codemirror");
+var import_vuu_codemirror5 = require("@vuu-ui/vuu-codemirror");
 var import_react = require("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)) {
     maybeColumnNode = maybeColumnNode.prevSibling || maybeColumnNode.parent;
   }
   if ((maybeColumnNode == null ? void 0 : maybeColumnNode.name) === "In" || (maybeColumnNode == null ? void 0 : maybeColumnNode.name) === "Operator") {
-    return getValue(maybeColumnNode, state);
+    return (0, import_vuu_codemirror5.getValue)(maybeColumnNode, state);
   } else {
     return void 0;
   }
 };
 var getPartialOperator = (maybeOperatorNode, state, columnName) => {
-  const value = getValue(maybeOperatorNode, state);
+  const value = (0, import_vuu_codemirror5.getValue)(maybeOperatorNode, state);
   if (columnName === void 0 || value === columnName) {
     return;
   }
@@ -437,7 +412,7 @@ var getClauseOperator = (node, state) => {
   while (maybeTargetNode && maybeTargetNode.name === "\u26A0")
     maybeTargetNode = maybeTargetNode.prevSibling;
   if (maybeTargetNode && ["As", "Or", "And"].includes(maybeTargetNode.name)) {
-    return getValue(maybeTargetNode, state);
+    return (0, import_vuu_codemirror5.getValue)(maybeTargetNode, state);
   } else {
     return void 0;
   }
@@ -446,7 +421,7 @@ var getSetValues = (node, state) => {
   let maybeTargetNode = node.lastChild;
   const values = [];
   while (maybeTargetNode && maybeTargetNode.name !== "In") {
-    const value = getValue(maybeTargetNode, state);
+    const value = (0, import_vuu_codemirror5.getValue)(maybeTargetNode, state);
     if (value) {
       values.push(value);
     } else {
@@ -465,11 +440,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 ? [
     {
@@ -494,7 +464,7 @@ var makeSaveOrExtendSuggestions = (onSubmit, existingFilter, withJoinSuggestions
       boost: 6
     }
   ];
-  return withJoinSuggestions ? result.concat(joinSuggestions) : result;
+  return withJoinSuggestions ? result.concat(import_vuu_codemirror5.booleanJoinSuggestions).concat(import_vuu_codemirror5.asNameSuggestion) : result;
 };
 var promptToSaveOrExtend = (context, onSubmit, existingFilter) => ({
   from: context.pos,
@@ -525,7 +495,7 @@ var useAutoComplete = (suggestionProvider, onSubmit, existingFilter) => {
         to: 0,
         text: void 0
       };
-      const tree = (0, import_vuu_codemirror6.syntaxTree)(state);
+      const tree = (0, import_vuu_codemirror5.syntaxTree)(state);
       const nodeBefore = tree.resolveInner(pos, -1);
       console.log({ nodeBeforeName: nodeBefore.name });
       switch (nodeBefore.name) {
@@ -549,7 +519,7 @@ var useAutoComplete = (suggestionProvider, onSubmit, existingFilter) => {
         case "FilterName":
           return promptToSave(context, onSubmit.current, existingFilter);
         case "Column": {
-          const columnName = getValue(nodeBefore, state);
+          const columnName = (0, import_vuu_codemirror5.getValue)(nodeBefore, state);
           const isPartialMatch = await suggestionProvider.isPartialMatch(
             "column",
             void 0,
@@ -564,7 +534,7 @@ var useAutoComplete = (suggestionProvider, onSubmit, existingFilter) => {
           }
         }
         case "\u26A0": {
-          const columnName = getColumnName(nodeBefore, state);
+          const columnName = (0, import_vuu_codemirror5.getNodeByName)(nodeBefore, state);
           const operator = getOperator(nodeBefore, state);
           const partialOperator = operator ? void 0 : getPartialOperator(nodeBefore, state, columnName);
           if (partialOperator) {
@@ -599,7 +569,7 @@ var useAutoComplete = (suggestionProvider, onSubmit, existingFilter) => {
           break;
         case "ColumnSetExpression":
         case "Values": {
-          const columnName = getColumnName(nodeBefore, state);
+          const columnName = (0, import_vuu_codemirror5.getNodeByName)(nodeBefore, state);
           const selection = getSetValues(nodeBefore, state);
           return makeSuggestions(context, "columnValue", {
             columnName,
@@ -608,7 +578,7 @@ var useAutoComplete = (suggestionProvider, onSubmit, existingFilter) => {
         }
         case "Comma":
         case "LBrack": {
-          const columnName = getColumnName(nodeBefore, state);
+          const columnName = (0, import_vuu_codemirror5.getNodeByName)(nodeBefore, state);
           return makeSuggestions(context, "columnValue", { columnName });
         }
         case "ColumnValueExpression":
@@ -616,12 +586,12 @@ 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: (0, import_vuu_codemirror5.getNodeByName)(nodeBefore, state)
               });
             } else if ((lastToken == null ? void 0 : lastToken.name) === "Operator") {
               return makeSuggestions(context, "columnValue", {
-                columnName: getColumnName(lastToken, state),
-                operator: getValue(lastToken, state)
+                columnName: (0, import_vuu_codemirror5.getNodeByName)(lastToken, state),
+                operator: (0, import_vuu_codemirror5.getValue)(lastToken, state)
               });
             }
           }
@@ -634,7 +604,7 @@ var useAutoComplete = (suggestionProvider, onSubmit, existingFilter) => {
         }
         case "Eq": {
           return makeSuggestions(context, "columnValue", {
-            columnName: getColumnName(nodeBefore, state)
+            columnName: (0, import_vuu_codemirror5.getNodeByName)(nodeBefore, state)
           });
         }
         case "AndExpression":
@@ -686,7 +656,7 @@ var useCodeMirrorEditor = ({
     const parseFilter2 = () => {
       const view = getView(viewRef);
       const source = view.state.doc.toString();
-      const tree = (0, import_vuu_codemirror7.ensureSyntaxTree)(view.state, view.state.doc.length, 5e3);
+      const tree = (0, import_vuu_codemirror6.ensureSyntaxTree)(view.state, view.state.doc.length, 5e3);
       if (tree) {
         const filter = walkTree(tree, source);
         return [filter, stripName(source), filter.name];
@@ -703,7 +673,7 @@ var useCodeMirrorEditor = ({
       clearInput2();
     };
     const submitFilter = (key) => {
-      return import_vuu_codemirror7.keymap.of([
+      return import_vuu_codemirror6.keymap.of([
         {
           key,
           run() {
@@ -714,35 +684,35 @@ var useCodeMirrorEditor = ({
       ]);
     };
     const showSuggestions = (key) => {
-      return import_vuu_codemirror7.keymap.of([
+      return import_vuu_codemirror6.keymap.of([
         {
           key,
           run() {
-            (0, import_vuu_codemirror7.startCompletion)(getView(viewRef));
+            (0, import_vuu_codemirror6.startCompletion)(getView(viewRef));
             return true;
           }
         }
       ]);
     };
-    const createState2 = () => import_vuu_codemirror7.EditorState.create({
+    const createState2 = () => import_vuu_codemirror6.EditorState.create({
       doc: "",
       extensions: [
-        minimalSetup,
-        (0, import_vuu_codemirror7.autocompletion)({
+        import_vuu_codemirror6.minimalSetup,
+        (0, import_vuu_codemirror6.autocompletion)({
           override: [completionFn],
           optionClass: getOptionClass
         }),
         filterLanguageSupport(),
-        import_vuu_codemirror7.keymap.of(import_vuu_codemirror7.defaultKeymap),
+        import_vuu_codemirror6.keymap.of(import_vuu_codemirror6.defaultKeymap),
         submitFilter("Ctrl-Enter"),
         showSuggestions("ArrowDown"),
-        import_vuu_codemirror7.EditorView.updateListener.of((v) => {
+        import_vuu_codemirror6.EditorView.updateListener.of((v) => {
           const view = getView(viewRef);
           if (v.docChanged) {
-            (0, import_vuu_codemirror7.startCompletion)(view);
+            (0, import_vuu_codemirror6.startCompletion)(view);
           }
         }),
-        import_vuu_codemirror7.EditorState.transactionFilter.of(
+        import_vuu_codemirror6.EditorState.transactionFilter.of(
           (tr) => tr.newDoc.lines > 1 ? [] : tr
         ),
         vuuTheme,
@@ -761,7 +731,7 @@ var useCodeMirrorEditor = ({
     if (!editorRef.current) {
       throw Error("editor not in dom");
     }
-    viewRef.current = new import_vuu_codemirror7.EditorView({
+    viewRef.current = new import_vuu_codemirror6.EditorView({
       state: createState(),
       parent: editorRef.current
     });
@@ -803,6 +773,7 @@ var FilterInput = ({
 };
 
 // src/filter-input/useFilterSuggestionProvider.ts
+var import_vuu_codemirror7 = require("@vuu-ui/vuu-codemirror");
 var import_vuu_data = require("@vuu-ui/vuu-data");
 var import_react3 = require("react");
 
@@ -821,7 +792,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
@@ -837,39 +808,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,
@@ -878,23 +820,24 @@ var useFilterSuggestionProvider = ({
   const latestSuggestionsRef = (0, import_react3.useRef)();
   const getTypeaheadSuggestions = (0, import_vuu_data.useTypeaheadSuggestions)();
   const getSuggestions = (0, import_react3.useCallback)(
-    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) {
             case "string":
             case "char":
-              return withApplySpace(stringOperators, startsWith);
+              return withApplySpace(import_vuu_codemirror7.stringOperators, startsWith);
             case "int":
             case "long":
             case "double":
-              return withApplySpace(numericOperators);
+              return withApplySpace(import_vuu_codemirror7.numericOperators);
           }
         } 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(
@@ -904,15 +847,14 @@ var useFilterSuggestionProvider = ({
       if (columnName) {
         const column = columns.find((col) => col.name === columnName);
         const prefix = Array.isArray(selection) ? selection.length === 0 ? "[" : "," : "";
-        const params = getTypeaheadParams(table, columnName, startsWith);
+        const params = (0, import_vuu_data.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 = (0, import_vuu_codemirror7.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];
         }
@@ -1332,7 +1274,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)) {