@malloydata/malloy-explorer 0.0.278-dev250516210719 → 0.0.282-dev250527225235

package/@flowtypes/components/MalloyExplorerProvider.flow.js

@@ -4,7 +4,9 @@ import { SearchValueMapResult } from "../contexts/QueryEditorContext";
 declare export interface MalloyExplorerProviderProps {
   source: Malloy.SourceInfo;
   query?: Malloy.Query;
-  setQuery?: (query: Malloy.Query | void) => void;
+  onQueryChange?: (query: Malloy.Query | void) => void;
+  focusedNestViewPath: string[];
+  onFocusedNestViewPathChange: (path: string[]) => void;
   children: ReactNode | ReactNode[];
   topValues?: SearchValueMapResult[];
 }

package/dist/cjs/index.cjs

@@ -3342,29 +3342,105 @@ function useQueryBuilder(source, query) {
     }
   }, [source, query]);
 }
+const MalloyQueryFocusContext = /* @__PURE__ */ React__namespace.createContext({
+  focusMainView: () => {
+  },
+  isMainViewFocused: true,
+  focusNestView: () => {
+  },
+  isNestViewFocused: () => false,
+  focusedNestView: null
+});
+function MalloyQueryFocusProvider({
+  rootQuery,
+  focusedNestViewPath,
+  onFocusedNestViewPathChange,
+  children
+}) {
+  const focusedNestView = React__namespace.useMemo(() => {
+    if (focusedNestViewPath.length === 0) {
+      return null;
+    }
+    if (rootQuery) {
+      const queryDef = rootQuery.definition;
+      if (queryDef instanceof QB.ASTArrowQueryDefinition) {
+        return findNestView(queryDef.view, [...focusedNestViewPath].reverse());
+      }
+    }
+    return null;
+  }, [rootQuery, focusedNestViewPath]);
+  const focusMainView = React__namespace.useCallback(() => {
+    onFocusedNestViewPathChange([]);
+  }, [onFocusedNestViewPathChange]);
+  const focusNestView = React__namespace.useCallback((path) => {
+    onFocusedNestViewPathChange([...path]);
+  }, [onFocusedNestViewPathChange]);
+  const isNestViewFocused = React__namespace.useCallback((path) => {
+    return JSON.stringify(path) === JSON.stringify(focusedNestViewPath);
+  }, [focusedNestViewPath]);
+  const isMainViewFocused = focusedNestViewPath.length === 0;
+  return /* @__PURE__ */ jsxRuntime.jsx(MalloyQueryFocusContext.Provider, {
+    value: {
+      focusMainView,
+      isMainViewFocused,
+      focusNestView,
+      isNestViewFocused,
+      focusedNestView
+    },
+    children
+  });
+}
+function useQueryFocus() {
+  return React__namespace.useContext(MalloyQueryFocusContext);
+}
+const findNestView = (currentView, remainingPath) => {
+  if (remainingPath.length === 0) {
+    return null;
+  }
+  if (currentView instanceof QB.ASTArrowViewDefinition) {
+    return findNestView(currentView.view, remainingPath);
+  }
+  if (currentView instanceof QB.ASTSegmentViewDefinition) {
+    const currentNestName = remainingPath.pop();
+    const currentNestOperation = currentView.operations.items.find((operation) => operation instanceof QB.ASTNestViewOperation && operation.name === currentNestName);
+    if (currentNestOperation === void 0) {
+      remainingPath.push(currentNestName);
+      return null;
+    } else if (remainingPath.length === 0) {
+      return currentNestOperation.view;
+    } else {
+      return findNestView(currentNestOperation.view.definition, remainingPath);
+    }
+  }
+  if (currentView instanceof QB.ASTRefinementViewDefinition) {
+    return findNestView(currentView.refinement, remainingPath);
+  }
+  return null;
+};
 function MalloyExplorerProvider({
   source,
   query,
-  setQuery,
+  onQueryChange,
+  focusedNestViewPath,
+  onFocusedNestViewPathChange,
   children,
   topValues
 }) {
   const rootQuery = useQueryBuilder(source, query);
-  const [currentNestView, setCurrentNestView] = React__namespace.useState(null);
-  const [currentNestQueryPanel, setCurrentNestQueryPanel] = React__namespace.useState(null);
   return /* @__PURE__ */ jsxRuntime.jsx(TooltipProvider, {
-    children: /* @__PURE__ */ jsxRuntime.jsx(QueryEditorContext.Provider, {
-      value: {
-        source,
-        rootQuery,
-        setQuery,
-        topValues,
-        currentNestQueryPanel,
-        onCurrentNestQueryPanelChange: setCurrentNestQueryPanel,
-        currentNestView,
-        onCurrentNestViewChange: setCurrentNestView
-      },
-      children
+    children: /* @__PURE__ */ jsxRuntime.jsx(MalloyQueryFocusProvider, {
+      rootQuery,
+      focusedNestViewPath,
+      onFocusedNestViewPathChange,
+      children: /* @__PURE__ */ jsxRuntime.jsx(QueryEditorContext.Provider, {
+        value: {
+          source,
+          rootQuery,
+          setQuery: onQueryChange,
+          topValues
+        },
+        children
+      })
     })
   });
 }
@@ -25881,13 +25957,14 @@ function QueryActionBar({
   const {
     rootQuery,
     setQuery,
-    source,
-    onCurrentNestQueryPanelChange,
-    onCurrentNestViewChange
+    source
   } = React.useContext(QueryEditorContext);
   const {
     onCollapse
   } = React.useContext(ResizableCollapsiblePanelContext);
+  const {
+    focusMainView
+  } = useQueryFocus();
   const isQueryEmpty = !rootQuery || rootQuery.isEmpty();
   const isRunEnabled = rootQuery == null ? void 0 : rootQuery.isRunnable();
   const onRunQuery = () => {
@@ -25895,10 +25972,6 @@ function QueryActionBar({
       runQuery(source, rootQuery.build());
     }
   };
-  const focusMainQueryPanel = () => {
-    onCurrentNestViewChange == null ? void 0 : onCurrentNestViewChange(null);
-    onCurrentNestQueryPanelChange == null ? void 0 : onCurrentNestQueryPanelChange(null);
-  };
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
     ...{
       className: "mly78zum5 mly1qughib mly6s0dn4 mlye8ttls"
@@ -25919,7 +25992,7 @@ function QueryActionBar({
       },
       children: [/* @__PURE__ */ jsxRuntime.jsx(Button, {
         onClick: () => {
-          focusMainQueryPanel();
+          focusMainView();
           setQuery == null ? void 0 : setQuery(void 0);
         },
         isDisabled: !rootQuery || (rootQuery == null ? void 0 : rootQuery.isEmpty()),
@@ -32419,7 +32492,9 @@ function getOutputNameToInputNameMap(segment) {
   for (const operation of segment.operations.items) {
     if (operation instanceof QB.ASTGroupByViewOperation || operation instanceof QB.ASTAggregateViewOperation) {
       const reference = operation.field.getReference();
-      nameMap.set(operation.name, toFullName(reference.path, reference.name));
+      if (reference) {
+        nameMap.set(operation.name, toFullName(reference.path, reference.name));
+      }
     }
   }
   return nameMap;
@@ -32441,8 +32516,11 @@ function segmentHasFieldInOutputSpace(segment, path, name) {
   const match = segment.operations.items.find((operation) => {
     if (operation instanceof QB.ASTGroupByViewOperation || operation instanceof QB.ASTAggregateViewOperation) {
       const reference = operation.field.getReference();
-      const isEqual = areReferencesEqual(path, name, reference.path, reference.name);
-      return isEqual;
+      if (reference) {
+        return areReferencesEqual(path, name, reference.path, reference.name);
+      } else {
+        return false;
+      }
     }
     return false;
   });
@@ -33159,11 +33237,12 @@ function SortableOperation({
   operation,
   color
 }) {
+  var _a2;
   const {
     setQuery
   } = React.useContext(QueryEditorContext);
   const fieldInfo = operation.getFieldInfo();
-  const path = operation.field.getReference().path ?? NULL_PATH;
+  const path = ((_a2 = operation.field.getReference()) == null ? void 0 : _a2.path) ?? NULL_PATH;
   const {
     attributes,
     listeners,
@@ -33364,28 +33443,62 @@ const parsedToLabels = (parsed, filterString) => {
             value = stringClause.escaped_values.join(", ");
             break;
           case "=":
-            op = "is";
-            value = stringClause.values.join(", ");
+            {
+              const {
+                not,
+                values
+              } = stringClause;
+              op = not ? "is not" : "is";
+              value = values.join(", ");
+            }
             break;
           case "contains":
-            op = "contains";
-            value = stringClause.values.join(", ");
+            {
+              const {
+                not,
+                values
+              } = stringClause;
+              op = not ? "does not contain" : "contains";
+              value = values.join(", ");
+            }
             break;
           case "starts":
-            op = "starts with";
-            value = stringClause.values.join(", ");
+            {
+              const {
+                not,
+                values
+              } = stringClause;
+              op = not ? "does not start with" : "starts with";
+              value = values.join(", ");
+            }
             break;
           case "ends":
-            op = "is like";
-            value = stringClause.values.join(", ");
+            {
+              const {
+                not,
+                values
+              } = stringClause;
+              op = not ? "does not end with" : "ends with";
+              value = values.join(", ");
+            }
             break;
           case "empty":
-            op = "is empty";
-            value = "";
+            {
+              const {
+                not
+              } = stringClause;
+              op = not ? "is not empty" : "is empty";
+              value = "";
+            }
             break;
           case "null":
-            op = stringClause.not ? "is not" : "is";
-            value = "null";
+            {
+              const {
+                not
+              } = stringClause;
+              op = not ? "is not" : "is";
+              value = "null";
+            }
             break;
         }
       }
@@ -33549,22 +33662,27 @@ function SingleFilterOperation({
   rootQuery,
   filterOperation
 }) {
+  const {
+    setQuery
+  } = React.useContext(QueryEditorContext);
+  const setFilter = React.useCallback((filter2) => {
+    if (filterOperation.filter instanceof QB.ASTFilterWithFilterString) {
+      filterOperation.filter.setFilter(filter2);
+    }
+    setQuery == null ? void 0 : setQuery(rootQuery.build());
+  }, [filterOperation.filter, rootQuery, setQuery]);
+  if (!(filterOperation.filter instanceof QB.ASTFilterWithFilterString)) {
+    return null;
+  }
   const {
     fieldReference,
     filterString
   } = filterOperation.filter;
   const filter = filterOperation.filter.getFilter();
   const fieldInfo = fieldReference.getFieldInfo();
-  const {
-    setQuery
-  } = React.useContext(QueryEditorContext);
   if (fieldInfo.kind !== "dimension" && fieldInfo.kind !== "measure") {
     throw new Error(`Invalid filter field kind: ${fieldInfo.kind}`);
   }
-  const setFilter = React.useCallback((filter2) => {
-    filterOperation.filter.setFilter(filter2);
-    setQuery == null ? void 0 : setQuery(rootQuery.build());
-  }, [filterOperation.filter, rootQuery, setQuery]);
   const {
     op,
     value
@@ -34175,6 +34293,35 @@ const styles$d = {
     $$css: true
   }
 };
+const NestViewPathContext = /* @__PURE__ */ React.createContext([]);
+function FocusableView({
+  children,
+  nest
+}) {
+  const {
+    focusNestView,
+    focusMainView
+  } = useQueryFocus();
+  const parentNestViewPath = React.useContext(NestViewPathContext);
+  return /* @__PURE__ */ jsxRuntime.jsx("div", {
+    onPointerDown: (e) => {
+      e.stopPropagation();
+      if (nest) {
+        focusNestView([...parentNestViewPath, nest.name]);
+      } else {
+        focusMainView();
+      }
+    },
+    children: nest ? /* @__PURE__ */ jsxRuntime.jsx(NestViewPathContext.Provider, {
+      value: [...parentNestViewPath, nest.name],
+      children: /* @__PURE__ */ jsxRuntime.jsx("div", {
+        children
+      })
+    }) : /* @__PURE__ */ jsxRuntime.jsx("div", {
+      children
+    })
+  });
+}
 function NestOperations({
   rootQuery,
   view,
@@ -34198,31 +34345,14 @@ function NestOperation({
   nest
 }) {
   const {
-    setQuery,
-    currentNestQueryPanel,
-    onCurrentNestQueryPanelChange,
-    onCurrentNestViewChange
+    setQuery
   } = React.useContext(QueryEditorContext);
   const [renameOpen, setRenameOpen] = React.useState(false);
-  const panelRef = React__namespace.useRef(null);
-  const isCurrentNestQueryPanelFocused = currentNestQueryPanel !== null && panelRef.current == currentNestQueryPanel;
-  React__namespace.useEffect(() => {
-    if (isCurrentNestQueryPanelFocused) {
-      onCurrentNestViewChange == null ? void 0 : onCurrentNestViewChange(nest.view);
-    }
-  }, [nest, isCurrentNestQueryPanelFocused, onCurrentNestViewChange]);
-  const focusCurrentNestQueryPanel = () => {
-    onCurrentNestQueryPanelChange == null ? void 0 : onCurrentNestQueryPanelChange(panelRef.current);
-    onCurrentNestViewChange == null ? void 0 : onCurrentNestViewChange(nest.view);
-  };
-  const focusParentQueryPanel = () => {
-    const currentPanel = panelRef.current;
-    const parent = findParentNestQueryPanel(currentPanel);
-    onCurrentNestQueryPanelChange == null ? void 0 : onCurrentNestQueryPanelChange(parent);
-    if (parent === null) {
-      onCurrentNestViewChange == null ? void 0 : onCurrentNestViewChange(null);
-    }
-  };
+  const parentNestViewPath = React.useContext(NestViewPathContext);
+  const {
+    focusNestView,
+    isNestViewFocused
+  } = useQueryFocus();
   const getControls = (nest2) => /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [/* @__PURE__ */ jsxRuntime.jsxs(DropdownMenu, {
       trigger: /* @__PURE__ */ jsxRuntime.jsx(Button, {
@@ -34235,7 +34365,7 @@ function NestOperation({
         icon: "clear",
         label: "Delete Query",
         onClick: () => {
-          focusParentQueryPanel();
+          focusNestView([...parentNestViewPath]);
           nest2.delete();
           setQuery == null ? void 0 : setQuery(rootQuery.build());
         }
@@ -34250,21 +34380,19 @@ function NestOperation({
       view: nest2.view
     })]
   });
-  return /* @__PURE__ */ jsxRuntime.jsx("div", {
-    ...{
-      className: "mlyj3b58b mly1yf7rl7 mly1xmf6yo mlyh8yej3"
-    },
+  return /* @__PURE__ */ jsxRuntime.jsx(FocusableView, {
+    nest,
     children: /* @__PURE__ */ jsxRuntime.jsxs("div", {
-      ref: panelRef,
-      onPointerDownCapture: focusCurrentNestQueryPanel,
-      "data-nest-panel": true,
+      ...{
+        className: "mlyj3b58b mly1yf7rl7 mly1xmf6yo mlyh8yej3"
+      },
       children: [/* @__PURE__ */ jsxRuntime.jsx(CollapsiblePanel, {
         title: nest.name,
         icon: viewToVisualizationIcon(nest.view),
         defaultOpen: true,
         controls: getControls(nest),
         collapsedControls: getControls(nest),
-        isFocused: isCurrentNestQueryPanelFocused,
+        isFocused: isNestViewFocused([...parentNestViewPath, nest.name]),
         children: /* @__PURE__ */ jsxRuntime.jsx(View, {
           rootQuery,
           view: nest.view
@@ -34276,14 +34404,8 @@ function NestOperation({
         open: renameOpen,
         setOpen: setRenameOpen
       })]
-    })
-  }, nest.name);
-}
-function findParentNestQueryPanel(element2) {
-  if (!element2 || !element2.parentElement) return null;
-  const parentElement = element2.parentElement;
-  if (parentElement.dataset.nestPanel !== void 0) return parentElement;
-  return findParentNestQueryPanel(parentElement);
+    }, nest.name)
+  });
 }
 function Operations({
   rootQuery,
@@ -34313,7 +34435,8 @@ function Operations({
       orderBys.push(operation);
     } else if (operation instanceof QB.ASTNestViewOperation) {
       nests.push(operation);
-    } else {
+    } else if (operation instanceof QB.ASTDrillViewOperation) ;
+    else {
       limit = operation;
     }
   });
@@ -34452,19 +34575,13 @@ function Query({
   setQuery
 }) {
   const {
-    currentNestQueryPanel,
-    onCurrentNestQueryPanelChange,
-    onCurrentNestViewChange
-  } = React__namespace.useContext(QueryEditorContext);
-  const focusMainQueryPanel = () => {
-    onCurrentNestQueryPanelChange == null ? void 0 : onCurrentNestQueryPanelChange(null);
-    onCurrentNestViewChange == null ? void 0 : onCurrentNestViewChange(null);
-  };
-  return /* @__PURE__ */ jsxRuntime.jsx("div", {
-    onPointerDownCapture: focusMainQueryPanel,
+    focusMainView,
+    isMainViewFocused
+  } = useQueryFocus();
+  return /* @__PURE__ */ jsxRuntime.jsx(FocusableView, {
     children: /* @__PURE__ */ jsxRuntime.jsxs(CollapsiblePanel, {
       title: "Main query",
-      isFocused: !currentNestQueryPanel,
+      isFocused: isMainViewFocused,
       controls: /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
         children: [/* @__PURE__ */ jsxRuntime.jsx(DropdownMenu, {
           trigger: /* @__PURE__ */ jsxRuntime.jsx(Button, {
@@ -34478,7 +34595,7 @@ function Query({
               icon: "clear",
               label: "Clear query",
               onClick: () => {
-                focusMainQueryPanel();
+                focusMainView();
                 setQuery == null ? void 0 : setQuery(void 0);
               },
               disabled: rootQuery.isEmpty()
@@ -36060,10 +36177,12 @@ function FieldTokenWithActions({
 }) {
   const {
     rootQuery,
-    setQuery,
-    currentNestView
+    setQuery
   } = React.useContext(QueryEditorContext);
-  const view = currentNestView ?? viewDef;
+  const {
+    focusedNestView
+  } = useQueryFocus();
+  const view = focusedNestView ?? viewDef;
   const {
     groupByDisabledReason,
     aggregateDisabledReason,
@@ -36164,7 +36283,13 @@ function FieldTokenWithActions({
         onTooltipOpenChange: setIsTooltipOpen
       })]
     }) : null,
-    onClick: field.kind === "dimension" && !groupByDisabledReason ? () => handleAddOperationAction("groupBy") : field.kind === "measure" && !aggregateDisabledReason ? () => handleAddOperationAction("aggregate") : field.kind === "view" ? () => handleAddView() : void 0,
+    onClick: field.kind === "dimension" && !groupByDisabledReason ? () => handleAddOperationAction("groupBy") : field.kind === "measure" && !aggregateDisabledReason ? () => handleAddOperationAction("aggregate") : field.kind === "view" ? () => {
+      if (rootQuery == null ? void 0 : rootQuery.isEmpty()) {
+        handleSetView();
+      } else {
+        handleAddView();
+      }
+    } : void 0,
     hoverActionsVisible: isFilterPopoverOpen || isTooltipOpen,
     tooltip: /* @__PURE__ */ jsxRuntime.jsx(FieldHoverCard, {
       field,