@vuu-ui/vuu-filters 0.6.21-debug → 0.6.22-debug

package/esm/index.js

@@ -368,8 +368,6 @@ var vuuTheme = EditorView.theme(
 
 // src/filter-input/useFilterAutoComplete.ts
 import {
-  asNameSuggestion,
-  booleanJoinSuggestions,
   getNodeByName,
   getValue,
   syntaxTree
@@ -409,6 +407,26 @@ var getClauseOperator = (node, state) => {
     return void 0;
   }
 };
+var getFilterName = (node, state) => {
+  if (node.name === "FilterName") {
+    return getValue(node, state);
+  } else {
+    let maybeTargetNode = node.prevSibling || node.parent || node.lastChild;
+    while (maybeTargetNode && maybeTargetNode.name !== "FilterName")
+      maybeTargetNode = maybeTargetNode.prevSibling;
+    if (maybeTargetNode && maybeTargetNode.name === "FilterName") {
+      return getValue(node, state);
+    }
+  }
+};
+var getColumnName = (node, state) => {
+  const prevNode = node.prevSibling;
+  if ((prevNode == null ? void 0 : prevNode.name) === "Column") {
+    return getValue(prevNode, state);
+  } else if ((prevNode == null ? void 0 : prevNode.name) === "Operator") {
+    return getColumnName(prevNode, state);
+  }
+};
 var getSetValues = (node, state) => {
   let maybeTargetNode = node.lastChild;
   const values = [];
@@ -423,57 +441,14 @@ var getSetValues = (node, state) => {
   }
   return values;
 };
-var promptForFilterName = (context) => ({
-  from: context.pos,
-  options: [
-    {
-      label: "enter name for this filter",
-      boost: 5
-    }
-  ]
-});
-var makeSaveOrExtendSuggestions = (onSubmit, existingFilter, withJoinSuggestions = true) => {
-  const result = existingFilter ? [
-    {
-      label: "REPLACE existing filter",
-      apply: () => onSubmit("replace"),
-      boost: 8
-    },
-    {
-      label: "AND existing filter",
-      apply: () => onSubmit("and"),
-      boost: 7
-    },
-    {
-      label: "OR existing filter",
-      apply: () => onSubmit("or"),
-      boost: 7
-    }
-  ] : [
-    {
-      label: "Press ENTER to submit",
-      apply: () => onSubmit(),
-      boost: 6
-    }
-  ];
-  return withJoinSuggestions ? result.concat(booleanJoinSuggestions).concat(asNameSuggestion) : result;
-};
-var promptToSaveOrExtend = (context, onSubmit, existingFilter) => ({
-  from: context.pos,
-  options: makeSaveOrExtendSuggestions(onSubmit, existingFilter)
-});
-var promptToSave = (context, onSubmit, existingFilter) => ({
-  from: context.pos,
-  options: makeSaveOrExtendSuggestions(onSubmit, existingFilter, false)
-});
 var useAutoComplete = (suggestionProvider, onSubmit, existingFilter) => {
   const makeSuggestions = useCallback(
     async (context, suggestionType, optionalArgs = {}) => {
+      const { startsWith = "" } = optionalArgs;
       const options = await suggestionProvider.getSuggestions(
         suggestionType,
         optionalArgs
       );
-      const { startsWith = "" } = optionalArgs;
       return { from: context.pos - startsWith.length, options };
     },
     [suggestionProvider]
@@ -497,19 +472,45 @@ var useAutoComplete = (suggestionProvider, onSubmit, existingFilter) => {
           } else {
             const clauseOperator = getClauseOperator(nodeBefore, state);
             if (clauseOperator === "as") {
-              return promptForFilterName(context);
+              return makeSuggestions(context, "name");
             } else {
-              return promptToSaveOrExtend(
-                context,
-                onSubmit.current,
-                existingFilter
+              const filterName = getFilterName(nodeBefore, state);
+              return makeSuggestions(context, "save", {
+                onSubmit: onSubmit.current,
+                existingFilter,
+                filterName
+              });
+            }
+          }
+        case "String":
+          {
+            const operator = getOperator(nodeBefore, state);
+            const columnName = getColumnName(nodeBefore, state);
+            const { from, to } = nodeBefore;
+            if (to - from === 2 && context.pos === from + 1) {
+              if (columnName && operator) {
+                return makeSuggestions(context, "columnValue", {
+                  columnName,
+                  operator,
+                  quoted: true,
+                  startsWith: word.text
+                });
+              }
+            } else {
+              console.log(
+                `we have a string, column is ${columnName} ${from} ${to}`
               );
             }
           }
+          break;
         case "As":
-          return promptForFilterName(context);
+          return makeSuggestions(context, "name");
         case "FilterName":
-          return promptToSave(context, onSubmit.current, existingFilter);
+          return makeSuggestions(context, "save", {
+            onSubmit: onSubmit.current,
+            existingFilter,
+            filterName: getFilterName(nodeBefore, state)
+          });
         case "Column": {
           const columnName = getValue(nodeBefore, state);
           const isPartialMatch = await suggestionProvider.isPartialMatch(
@@ -766,6 +767,9 @@ var FilterInput = ({
 
 // src/filter-input/useFilterSuggestionProvider.ts
 import {
+  asNameSuggestion,
+  booleanJoinSuggestions,
+  getNamePrompt,
   numericOperators,
   stringOperators,
   toSuggestions
@@ -789,6 +793,55 @@ var filterInfo = (filterName, filterQuery) => {
 // src/filter-input/useFilterSuggestionProvider.ts
 var NO_NAMED_FILTERS = [];
 var NONE = {};
+var saveAsTab = (onSubmit) => [
+  {
+    label: "Press ENTER to create TAB",
+    apply: () => onSubmit("tab"),
+    boost: 6
+  }
+];
+var makeSaveOrExtendSuggestions = (onSubmit, existingFilter, withJoinSuggestions = true) => {
+  const result = existingFilter ? [
+    {
+      label: "REPLACE existing filter",
+      apply: () => onSubmit("replace"),
+      boost: 8
+    },
+    {
+      label: "AND existing filter",
+      apply: () => onSubmit("and"),
+      boost: 7
+    },
+    {
+      label: "OR existing filter",
+      apply: () => onSubmit("or"),
+      boost: 7
+    }
+  ] : [
+    {
+      label: "Press ENTER to submit",
+      apply: () => onSubmit(),
+      boost: 6
+    }
+  ];
+  return withJoinSuggestions ? result.concat(booleanJoinSuggestions).concat(asNameSuggestion) : result;
+};
+var promptToSaveOrExtend = (onSubmit, existingFilter) => makeSaveOrExtendSuggestions(onSubmit, existingFilter, true);
+var promptToSave = (onSubmit) => makeSaveOrExtendSuggestions(onSubmit, void 0);
+var getSaveSuggestions = ({
+  existingFilter,
+  filterName,
+  onSubmit,
+  saveOptions
+}) => {
+  const includeTabSuggestion = filterName && saveOptions.allowSaveAsTab;
+  const result = existingFilter ? promptToSaveOrExtend(onSubmit, existingFilter) : promptToSave(onSubmit);
+  if (includeTabSuggestion) {
+    return result.concat(saveAsTab(onSubmit));
+  } else {
+    return result;
+  }
+};
 var suggestColumns = (columns) => columns.map((column) => ({
   boost: 5,
   label: column.name
@@ -808,57 +861,101 @@ var withApplySpace = (suggestions, startsWith = "") => suggestions.filter((sugg)
   ...suggestion,
   apply: suggestion.label + " "
 }));
+var defaultSaveOptions = {
+  allowReplace: true
+};
 var useFilterSuggestionProvider = ({
   columns,
   namedFilters,
+  saveOptions = defaultSaveOptions,
   table
 }) => {
   const latestSuggestionsRef = useRef2();
   const getTypeaheadSuggestions = useTypeaheadSuggestions();
   const getSuggestions = useCallback2(
     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);
-            case "int":
-            case "long":
-            case "double":
-              return withApplySpace(numericOperators);
+      const {
+        columnName,
+        existingFilter,
+        filterName,
+        operator,
+        quoted: autoQuoted,
+        onSubmit,
+        startsWith,
+        selection
+      } = options;
+      switch (suggestionType) {
+        case "operator":
+          {
+            const column = columns.find((col) => col.name === columnName);
+            if (column) {
+              switch (column.serverDataType) {
+                case "string":
+                case "char":
+                  return withApplySpace(stringOperators, startsWith);
+                case "int":
+                case "long":
+                case "double":
+                  return withApplySpace(numericOperators);
+              }
+            } else {
+              console.warn(`'${columnName}' does not match any column name`);
+            }
           }
-        } else {
-          console.warn(`'${columnName}' does not match any column name`);
+          break;
+        case "column": {
+          const columnSuggestions = await suggestColumns(columns);
+          const filterSuggestions = await suggestNamedFilters(namedFilters);
+          return (latestSuggestionsRef.current = withApplySpace(columnSuggestions)).concat(
+            withApplySpace(filterSuggestions)
+          );
         }
-      } else if (suggestionType === "column") {
-        const columnSuggestions = await suggestColumns(columns);
-        const filterSuggestions = await suggestNamedFilters(namedFilters);
-        return (latestSuggestionsRef.current = withApplySpace(columnSuggestions)).concat(
-          withApplySpace(filterSuggestions)
-        );
-      }
-      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 suggestions = await getTypeaheadSuggestions(params);
-        const isIllustration = operator === "starts";
-        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];
+        case "columnValue":
+          {
+            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 suggestions = await getTypeaheadSuggestions(params);
+              const isIllustration = operator === "starts";
+              latestSuggestionsRef.current = toSuggestions(suggestions, {
+                moveCursorToEnd: autoQuoted,
+                quoted: (column == null ? void 0 : column.serverDataType) === "string" && !autoQuoted,
+                suffix: autoQuoted ? "" : " ",
+                prefix: isIllustration ? startsWith : prefix,
+                isIllustration
+              });
+              if (Array.isArray(selection) && (selection == null ? void 0 : selection.length) > 1) {
+                return [doneCommand, ...latestSuggestionsRef.current];
+              }
+              return latestSuggestionsRef.current;
+            }
+          }
+          break;
+        case "save": {
+          if (typeof onSubmit !== "function") {
+            throw Error(
+              "useFilterSuggestionProvider, onSubmit must be supplied for 'save' suggestions"
+            );
+          }
+          return await getSaveSuggestions({
+            existingFilter,
+            filterName,
+            onSubmit,
+            saveOptions
+          });
         }
-        return latestSuggestionsRef.current;
+        case "name":
+          return await getNamePrompt("filter");
+        default:
       }
       return [];
     },
-    [columns, getTypeaheadSuggestions, namedFilters, table]
+    [columns, getTypeaheadSuggestions, namedFilters, saveOptions, table]
   );
   const isPartialMatch = useCallback2(
     async (valueType, columnName, pattern) => {