@malloydata/malloy-explorer 0.0.294-dev250630221944 → 0.0.299-dev250804170242

package/dist/cjs/index.cjs

@@ -17,7 +17,7 @@ var _a, _b, _captureMap, _compiled, _pattern, _nameMap, _strategy, __EmulatedReg
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
-const QB = require("@malloydata/malloy-query-builder");
+const malloyQueryBuilder = require("@malloydata/malloy-query-builder");
 const malloyTag = require("@malloydata/malloy-tag");
 const render = require("@malloydata/render");
 const malloyFilter = require("@malloydata/malloy-filter");
@@ -39,7 +39,6 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 const React__namespace = /* @__PURE__ */ _interopNamespaceDefault(React);
-const QB__namespace = /* @__PURE__ */ _interopNamespaceDefault(QB);
 const ReactDOM__namespace = /* @__PURE__ */ _interopNamespaceDefault(ReactDOM);
 function composeEventHandlers(originalEventHandler, ourEventHandler, { checkForDefaultPrevented = true } = {}) {
   return function handleEvent(event) {
@@ -3329,11 +3328,14 @@ var Root3$1 = Tooltip;
 var Trigger$4 = TooltipTrigger;
 var Portal$4 = TooltipPortal;
 var Content2$4 = TooltipContent;
-const QueryEditorContext = /* @__PURE__ */ React__namespace.createContext({});
+const QueryEditorContext = /* @__PURE__ */ React__namespace.createContext({
+  setQuery: () => {
+  }
+});
 function useQueryBuilder(source, query) {
   return React.useMemo(() => {
     if (source) {
-      return new QB__namespace.ASTQuery({
+      return new malloyQueryBuilder.ASTQuery({
         query,
         source
       });
@@ -3363,7 +3365,7 @@ function MalloyQueryFocusProvider({
     }
     if (rootQuery) {
       const queryDef = rootQuery.definition;
-      if (queryDef instanceof QB.ASTArrowQueryDefinition) {
+      if (queryDef instanceof malloyQueryBuilder.ASTArrowQueryDefinition) {
         return findNestView(queryDef.view, [...focusedNestViewPath].reverse());
       }
     }
@@ -3397,12 +3399,12 @@ const findNestView = (currentView, remainingPath) => {
   if (remainingPath.length === 0) {
     return null;
   }
-  if (currentView instanceof QB.ASTArrowViewDefinition) {
+  if (currentView instanceof malloyQueryBuilder.ASTArrowViewDefinition) {
     return findNestView(currentView.view, remainingPath);
   }
-  if (currentView instanceof QB.ASTSegmentViewDefinition) {
+  if (currentView instanceof malloyQueryBuilder.ASTSegmentViewDefinition) {
     const currentNestName = remainingPath.pop();
-    const currentNestOperation = currentView.operations.items.find((operation) => operation instanceof QB.ASTNestViewOperation && operation.name === currentNestName);
+    const currentNestOperation = currentView.operations.items.find((operation) => operation instanceof malloyQueryBuilder.ASTNestViewOperation && operation.name === currentNestName);
     if (currentNestOperation === void 0) {
       remainingPath.push(currentNestName);
       return null;
@@ -3412,15 +3414,34 @@ const findNestView = (currentView, remainingPath) => {
       return findNestView(currentNestOperation.view.definition, remainingPath);
     }
   }
-  if (currentView instanceof QB.ASTRefinementViewDefinition) {
+  if (currentView instanceof malloyQueryBuilder.ASTRefinementViewDefinition) {
     return findNestView(currentView.refinement, remainingPath);
   }
   return null;
 };
+const UpdateQueryContext = /* @__PURE__ */ React.createContext({
+  updateQuery: () => {
+    console.warn("Missing <MalloyExplorerProvider>");
+  }
+});
+function useUpdateQuery() {
+  const {
+    updateQuery
+  } = React.useContext(UpdateQueryContext);
+  return updateQuery;
+}
+const TopValuesContext = /* @__PURE__ */ React.createContext({});
+function useTopValues() {
+  const {
+    topValues
+  } = React.useContext(TopValuesContext);
+  return topValues;
+}
 function MalloyExplorerProvider({
   source,
   query,
-  onQueryChange,
+  onQueryChange = () => {
+  },
   focusedNestViewPath,
   onFocusedNestViewPathChange,
   children,
@@ -3428,20 +3449,32 @@ function MalloyExplorerProvider({
   onDrill
 }) {
   const rootQuery = useQueryBuilder(source, query);
+  const updateQuery = React.useCallback(() => {
+    onQueryChange == null ? void 0 : onQueryChange(rootQuery == null ? void 0 : rootQuery.build());
+  }, [onQueryChange, rootQuery]);
   return /* @__PURE__ */ jsxRuntime.jsx(TooltipProvider, {
     children: /* @__PURE__ */ jsxRuntime.jsx(MalloyQueryFocusProvider, {
       rootQuery,
       focusedNestViewPath,
       onFocusedNestViewPathChange,
-      children: /* @__PURE__ */ jsxRuntime.jsx(QueryEditorContext.Provider, {
+      children: /* @__PURE__ */ jsxRuntime.jsx(UpdateQueryContext.Provider, {
         value: {
-          source,
-          rootQuery,
-          setQuery: onQueryChange,
-          topValues,
-          onDrill
+          updateQuery
         },
-        children
+        children: /* @__PURE__ */ jsxRuntime.jsx(TopValuesContext.Provider, {
+          value: {
+            topValues
+          },
+          children: /* @__PURE__ */ jsxRuntime.jsx(QueryEditorContext.Provider, {
+            value: {
+              source,
+              rootQuery,
+              setQuery: onQueryChange,
+              onDrill
+            },
+            children
+          })
+        })
       })
     })
   });
@@ -8010,16 +8043,14 @@ function SelectorToken({
     onValueChange: handleValueChange,
     required: true,
     children: [/* @__PURE__ */ jsxRuntime.jsxs(Trigger$3, {
-      ..._stylex.props(tokenStyles.main, styles$H.selectTrigger, tokenColorVariants[color], tokenSizeVariants[size2], fontStyles.body, tokenStyles.label, customStyle),
+      ..._stylex.props(tokenStyles.main, styles$H.selectTrigger, tokenColorVariants[color], tokenSizeVariants[size2], customStyle),
       children: [icon && /* @__PURE__ */ jsxRuntime.jsx(Icon, {
         name: icon,
         customStyle: tokenStyles.icon
       }), /* @__PURE__ */ jsxRuntime.jsx(Value$1, {
         asChild: true,
         children: /* @__PURE__ */ jsxRuntime.jsx("div", {
-          ...{
-            className: "mlyb3r6kr mlylyipyv"
-          },
+          ..._stylex.props(fontStyles.body, tokenStyles.label),
           children: label
         })
       })]
@@ -8048,17 +8079,15 @@ function SelectorToken({
                 }, 10);
               }
             }
-          }), /* @__PURE__ */ jsxRuntime.jsx(ScrollableArea, {
-            children: /* @__PURE__ */ jsxRuntime.jsx(Group$1, {
-              ...{
-                className: "mly78zum5 mlydt5ytf mlyuyqlj2 mlyfawy5m mly195vfkc"
-              },
-              children: filteredItems.map((item) => /* @__PURE__ */ jsxRuntime.jsx(SelectItem, {
-                value: item.value,
-                selectedValue: value,
-                children: item.label
-              }, item.value))
-            })
+          }), /* @__PURE__ */ jsxRuntime.jsx(Group$1, {
+            ...{
+              className: "mly78zum5 mlydt5ytf mlyuyqlj2 mlyfawy5m mly195vfkc mlyysyzu8"
+            },
+            children: filteredItems.map((item) => /* @__PURE__ */ jsxRuntime.jsx(SelectItem, {
+              value: item.value,
+              selectedValue: value,
+              children: item.label
+            }, item.value))
           })]
         })
       })
@@ -26008,9 +26037,9 @@ function QueryActionBar({
       children: [/* @__PURE__ */ jsxRuntime.jsx(Button, {
         onClick: () => {
           focusMainView();
-          setQuery == null ? void 0 : setQuery(void 0);
+          setQuery(void 0);
         },
-        isDisabled: !rootQuery || (rootQuery == null ? void 0 : rootQuery.isEmpty()),
+        isDisabled: !rootQuery || rootQuery.isEmpty(),
         label: "Clear",
         variant: "flat",
         size: "compact"
@@ -26220,6 +26249,7 @@ function fieldToIcon(field) {
       break;
     case "dimension":
     case "measure":
+    case "calculate":
       icon = atomicTypeToIcon(field.type.kind);
       break;
     case "join":
@@ -26231,8 +26261,7 @@ function fieldToIcon(field) {
 function relationshipToIcon(relationship) {
   return relationshipMap[relationship];
 }
-function viewToVisualizationIcon(view) {
-  const currentTag = view.getTag();
+function tagToVisualization(currentTag) {
   const currentRenderer = tagToRenderer(currentTag) ?? "table";
   return `viz_${currentRenderer}`;
 }
@@ -26252,6 +26281,7 @@ const fieldKindMap = {
   view: "purple",
   dimension: "cyan",
   measure: "green",
+  calculate: "green",
   join: void 0
 };
 const relationshipMap = {
@@ -26261,6 +26291,7 @@ const relationshipMap = {
 };
 function FieldToken({
   field,
+  additionalSiblings,
   hoverActions,
   hoverActionsVisible,
   ...props2
@@ -26285,7 +26316,7 @@ function FieldToken({
       color: fieldKindToColor(field.kind),
       icon: fieldToIcon(field),
       ...props2
-    }), hoverActions && /* @__PURE__ */ jsxRuntime.jsx("div", {
+    }), additionalSiblings, hoverActions && /* @__PURE__ */ jsxRuntime.jsx("div", {
       ...{
         className: "mly1vsucm1 mly2lah0s"
       },
@@ -26307,19 +26338,22 @@ function DrillOperations({
       ...{
         className: "mly78zum5 mlydt5ytf mly1jnr06f"
       },
-      children: drills.map((drill, key2) => /* @__PURE__ */ jsxRuntime.jsxs(TokenGroup, {
-        color: "cyan",
-        customStyle: localStyles.tokenGroup,
-        children: [/* @__PURE__ */ jsxRuntime.jsx(FieldToken, {
-          field: drill.filter.fieldReference.getFieldInfo()
-        }), /* @__PURE__ */ jsxRuntime.jsx(Token, {
-          label: "="
-        }), drill.filter instanceof QB.ASTFilterWithLiteralEquality ? /* @__PURE__ */ jsxRuntime.jsx(LiteralValue, {
-          value: drill.filter.value.node
-        }) : /* @__PURE__ */ jsxRuntime.jsx(Token, {
-          label: drill.filter.filterString
-        })]
-      }, key2))
+      children: drills.map((drill, key2) => {
+        const field = drill.filter.expression.getFieldInfo();
+        return field ? /* @__PURE__ */ jsxRuntime.jsxs(TokenGroup, {
+          color: "cyan",
+          customStyle: localStyles.tokenGroup,
+          children: [/* @__PURE__ */ jsxRuntime.jsx(FieldToken, {
+            field
+          }), /* @__PURE__ */ jsxRuntime.jsx(Token, {
+            label: "="
+          }), drill.filter instanceof malloyQueryBuilder.ASTFilterWithLiteralEquality ? /* @__PURE__ */ jsxRuntime.jsx(LiteralValue, {
+            value: drill.filter.value.node
+          }) : /* @__PURE__ */ jsxRuntime.jsx(Token, {
+            label: drill.filter.filterString
+          })]
+        }, key2) : null;
+      })
     })]
   });
 }
@@ -30231,7 +30265,7 @@ function isIndexView(field) {
   return allFields.size === INDEX_FIELDS.length;
 }
 function getViewDefinition(parent) {
-  return parent instanceof QB.ASTArrowQueryDefinition ? parent.view : parent.definition;
+  return parent instanceof malloyQueryBuilder.ASTArrowQueryDefinition ? parent.view : parent.definition;
 }
 function getInputSchemaFromViewParent(parent) {
   if (!parent) {
@@ -30618,6 +30652,12 @@ const styles$s = {
     justifyContent: "mly1rfj78v",
     $$css: true
   },
+  nest: {
+    gridColumn: "mly623te4",
+    gridColumnStart: null,
+    gridColumnEnd: null,
+    $$css: true
+  },
   heading: {
     gridColumn: "mly623te4",
     gridColumnStart: null,
@@ -31130,6 +31170,20 @@ const colorVariants = {
     $$css: true
   }
 };
+function setAtPath(current, path, value) {
+  const newCurrent = {
+    ...current
+  };
+  let target = newCurrent;
+  for (let i2 = 0; i2 < path.length - 1; i2++) {
+    if (typeof target[path[i2]] !== "object") {
+      target[path[i2]] = {};
+    }
+    target = target[path[i2]];
+  }
+  target[path[path.length - 1]] = value;
+  return newCurrent;
+}
 function OneOfEditor({
   view,
   name,
@@ -31175,6 +31229,15 @@ function OneOfEditor({
             current,
             option: subOption
           }, key2);
+        case "object":
+          return /* @__PURE__ */ jsxRuntime.jsx(OneOfObjectEditor, {
+            view,
+            name,
+            path,
+            updateCurrent,
+            current,
+            option: subOption
+          }, key2);
       }
       return null;
     })]
@@ -31284,7 +31347,7 @@ function OneOfNumberEditor({
           valueAsNumber
         }
       }) => {
-        setValue(value);
+        setValue(valueAsNumber);
         updateCurrent(path, valueAsNumber);
       },
       ..._stylex.props(styles$s.input)
@@ -31323,6 +31386,48 @@ function OneOfArrayEditor({
     }), /* @__PURE__ */ jsxRuntime.jsx("div", {})]
   });
 }
+function OneOfObjectEditor({
+  path,
+  current,
+  option: option2,
+  updateCurrent,
+  view
+}) {
+  const isObject2 = current != null && typeof current === "object" && !Array.isArray(current);
+  const [objectValue, setObjectValue] = React.useState(isObject2 ? current : {});
+  return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
+    children: [/* @__PURE__ */ jsxRuntime.jsx("div", {
+      ..._stylex.props(styles$s.left),
+      children: /* @__PURE__ */ jsxRuntime.jsx("input", {
+        type: "radio",
+        checked: isObject2,
+        onChange: ({
+          target: {
+            checked
+          }
+        }) => {
+          if (checked) {
+            updateCurrent(path, objectValue);
+          }
+        }
+      })
+    }), /* @__PURE__ */ jsxRuntime.jsx("div", {
+      ..._stylex.props(styles$s.nest, styles$s.editorGrid),
+      children: /* @__PURE__ */ jsxRuntime.jsx(ObjectEditor, {
+        current: objectValue,
+        updateCurrent: (path2, value) => {
+          const [_2, ...subPath] = path2;
+          setObjectValue(setAtPath(objectValue, subPath, value));
+          updateCurrent(path2, value);
+        },
+        view,
+        name: "",
+        path,
+        option: option2
+      })
+    })]
+  });
+}
 function ArrayEditor({
   name,
   path,
@@ -31353,6 +31458,7 @@ function NumberEditor$1({
   option: option2,
   updateCurrent
 }) {
+  const [value, setValue] = React__namespace.useState(current ?? option2.minimum);
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [/* @__PURE__ */ jsxRuntime.jsx("div", {
       ..._stylex.props(styles$s.left, styles$s.label),
@@ -31360,7 +31466,7 @@ function NumberEditor$1({
         children: [option2.title ?? name, ":"]
       })
     }), /* @__PURE__ */ jsxRuntime.jsx("input", {
-      value: current,
+      value,
       type: "number",
       min: option2.minimum,
       max: option2.maximum,
@@ -31369,6 +31475,7 @@ function NumberEditor$1({
           valueAsNumber
         }
       }) => {
+        setValue(valueAsNumber);
         updateCurrent(path, valueAsNumber);
       },
       ..._stylex.props(styles$s.input)
@@ -31567,11 +31674,12 @@ function ObjectEditor({
   option: option2,
   updateCurrent
 }) {
-  const [isExpanded, setIsExpanded] = React.useState(path.length === 0);
+  const [isExpanded, setIsExpanded] = React.useState(path.length === 0 || !name);
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [name ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
       children: [/* @__PURE__ */ jsxRuntime.jsxs("div", {
         ..._stylex.props(styles$s.label, styles$s.heading),
+        onClick: () => setIsExpanded(!isExpanded),
         children: [/* @__PURE__ */ jsxRuntime.jsx("label", {
           children: option2.title ?? name
         }), option2.description ? /* @__PURE__ */ jsxRuntime.jsx(InfoHover, {
@@ -31663,31 +31771,20 @@ function ObjectEditor({
   });
 }
 function VizEditor({
-  rootQuery,
   view,
   plugin,
   setOpen
 }) {
-  const {
-    setQuery
-  } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   const [current, setCurrent] = React.useState(plugin.getSettings());
-  console.info("RendererEditor current settings:", current);
   const schema = plugin.getSchema();
   const updateCurrent = (path, value) => {
-    const newCurrent = {
-      ...current
-    };
-    let target = newCurrent;
-    for (let i2 = 0; i2 < path.length - 1; i2++) {
-      if (!(path[i2] in target)) {
-        target[path[i2]] = {};
-      }
-      target = target[path[i2]];
-    }
-    target[path[path.length - 1]] = value;
+    const newCurrent = setAtPath(current, path, value);
     setCurrent(newCurrent);
   };
+  React__namespace.useEffect(() => {
+    console.info("RendererEditor current settings:", current);
+  }, [current]);
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
     ..._stylex.props(styles$s.editor),
     children: [/* @__PURE__ */ jsxRuntime.jsx("div", {
@@ -31719,10 +31816,10 @@ function VizEditor({
           if (old) {
             annotations.remove(old);
           }
-          view.getOrAddAnnotations().add(new QB.ASTAnnotation({
+          view.getOrAddAnnotations().add(new malloyQueryBuilder.ASTAnnotation({
             value
           }));
-          setQuery == null ? void 0 : setQuery(rootQuery.build());
+          updateQuery();
           setOpen(false);
         },
         customStyle: styles$s.editorCell
@@ -31935,7 +32032,6 @@ const dialogStyles = {
   }
 };
 function VizEditorDialog({
-  rootQuery,
   plugin,
   view,
   customStyle,
@@ -31965,7 +32061,6 @@ function VizEditorDialog({
             ..._stylex.props(dialogStyles.displayNone),
             children: "Edit visualization parameters"
           }), /* @__PURE__ */ jsxRuntime.jsx(VizEditor, {
-            rootQuery,
             view,
             plugin,
             setOpen
@@ -31984,26 +32079,27 @@ const styles$p = {
   }
 };
 function Visualization$1({
-  rootQuery,
   view
 }) {
-  const {
-    setQuery
-  } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   const renderer = React.useMemo(() => new render.MalloyRenderer(), []);
   const [currentRenderer, setCurrentRenderer] = React.useState("table");
   const [plugin, setPlugin] = React.useState();
+  const [error, setError] = React.useState("");
   const [open, setOpen] = React.useState(false);
+  const tag = view.getTag().toString();
   React.useEffect(() => {
     var _a2;
+    setError("");
     const viz = renderer.createViz({
-      onError: (error) => {
-        console.error("Malloy render error", error);
+      onError: (error2) => {
+        console.error("Malloy render error", error2);
+        setError(error2.message);
       }
     });
     viz.setResult({
       schema: view.definition.getOutputSchema(),
-      annotations: view.getTag().toString().split("\n").map((value) => ({
+      annotations: tag.split("\n").map((value) => ({
         value
       })),
       connection_name: ""
@@ -32011,20 +32107,26 @@ function Visualization$1({
     const metadata = viz.getMetadata();
     if (metadata) {
       const plugin2 = viz.getActivePlugin(metadata.getRootField().key);
-      if (plugin2 && render.isCoreVizPluginInstance(plugin2)) {
-        setCurrentRenderer(plugin2.name);
-        setPlugin(plugin2);
+      if (plugin2) {
+        if (render.isCoreVizPluginInstance(plugin2)) {
+          setCurrentRenderer(plugin2.name);
+          setPlugin(plugin2);
+          return;
+        }
+        if (plugin2.name === "error") {
+          setError(plugin2.getMetadata().message);
+        }
       }
-    } else {
-      const currentTag = view.getTag();
-      const rendererTag = view.getTag(RENDERER_PREFIX);
-      const currentRenderer2 = ((_a2 = rendererTag.tag("viz")) == null ? void 0 : _a2.text()) ?? legacyToViz(tagToRenderer(currentTag) ?? "table");
-      setCurrentRenderer(currentRenderer2);
     }
-  }, [renderer, view]);
+    const currentTag = view.getTag();
+    const rendererTag = view.getTag(RENDERER_PREFIX);
+    const currentRenderer2 = ((_a2 = rendererTag.tag("viz")) == null ? void 0 : _a2.text()) ?? legacyToViz(tagToRenderer(currentTag) ?? "table");
+    setCurrentRenderer(currentRenderer2);
+    setPlugin(void 0);
+  }, [renderer, view, tag]);
   const updateViz = (renderer2) => {
     view.setTagProperty(["viz"], renderer2, RENDERER_PREFIX);
-    setQuery == null ? void 0 : setQuery(rootQuery.build());
+    updateQuery();
   };
   const items = VIZ_RENDERERS.map((viz) => ({
     icon: /* @__PURE__ */ jsxRuntime.jsx(Icon, {
@@ -32049,6 +32151,13 @@ function Visualization$1({
       tooltip: "Edit Settings..."
     }, "gear"));
   }
+  if (error) {
+    tokens2.push(/* @__PURE__ */ jsxRuntime.jsx(Token, {
+      icon: "warning",
+      tooltip: error,
+      customStyle: styles$o.trigger
+    }));
+  }
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [/* @__PURE__ */ jsxRuntime.jsx(TokenGroup, {
       customStyle: styles$o.group,
@@ -32056,7 +32165,6 @@ function Visualization$1({
     }), /* @__PURE__ */ jsxRuntime.jsx(VizEditorDialog, {
       open,
       setOpen,
-      rootQuery,
       plugin,
       view
     })]
@@ -32199,9 +32307,7 @@ function TopValuesTable({
   field,
   path
 }) {
-  const {
-    topValues
-  } = React.useContext(QueryEditorContext);
+  const topValues = useTopValues();
   const fieldPath = [...path, field.name].join(".");
   const fieldTopValues = topValues == null ? void 0 : topValues.find((entry) => entry.fieldName === fieldPath);
   if (!fieldTopValues) {
@@ -32574,9 +32680,7 @@ function BooleanFilterCore({
   });
 }
 function useSearch(searchTerm, fieldPath) {
-  const {
-    topValues
-  } = React.useContext(QueryEditorContext);
+  const topValues = useTopValues();
   if (topValues && searchTerm) {
     let searchValues = topValues;
     if (fieldPath) {
@@ -32618,7 +32722,8 @@ function ValueList({
   fieldPath,
   ref,
   customStyle,
-  showPath = true
+  showPath = true,
+  hideNoMatchMessage = false
 }) {
   const {
     searchResults
@@ -32640,7 +32745,7 @@ function ValueList({
         },
         children: value.fieldName
       }) : null]
-    }, value.fieldName + ":" + value.fieldValue)) : search ? /* @__PURE__ */ jsxRuntime.jsx("div", {
+    }, value.fieldName + ":" + value.fieldValue)) : search && !hideNoMatchMessage ? /* @__PURE__ */ jsxRuntime.jsx("div", {
       ..._stylex.props(addMenuStyles.item),
       "data-disabled": "true",
       children: "No matching values"
@@ -32835,7 +32940,8 @@ const StringFilterCore = ({
           },
           customStyle: styles$i.valueList,
           showPath: false,
-          filter: (value) => !currentFilter.values.includes(value)
+          filter: (value) => !currentFilter.values.includes(value),
+          hideNoMatchMessage: true
         })
       })]
     }) : currentFilter.operator === "~" ? /* @__PURE__ */ jsxRuntime.jsx(StringEditor, {
@@ -33976,19 +34082,55 @@ const styles$g = {
     $$css: true
   }
 };
+const getPrimaryAxis = (view) => {
+  const schema = view.getOutputSchema();
+  return getPrimaryAxisFromSchema(schema);
+};
+const getPrimaryAxisFromSchema = (schema) => {
+  let primaryAxisField = void 0;
+  primaryAxisField = findAxisFieldByAnnotation(schema.fields) || findAxisFieldByType(schema.fields) || findDefaultAxisField(schema.fields);
+  return primaryAxisField;
+};
+const findAxisFieldByAnnotation = (fields) => {
+  return fields.find((field) => {
+    if (field.kind === "dimension" && field.annotations && field.annotations.find((annotation) => annotation.value === "# x")) {
+      return true;
+    }
+    return false;
+  });
+};
+const findAxisFieldByType = (fields) => {
+  return fields.find((field) => {
+    if (field.kind === "dimension") {
+      const dimension = field;
+      if (dimension.type.kind === "date_type" || dimension.type.kind === "timestamp_type") {
+        return true;
+      }
+    }
+    return false;
+  });
+};
+const findDefaultAxisField = (fields) => {
+  return fields.find((field) => {
+    if (field.kind === "dimension") {
+      return true;
+    }
+    return false;
+  });
+};
 function toFullName(path, name) {
   return [...path || [], name].join(".");
 }
 function segmentHasLimit(segment) {
-  return segment.operations.items.find((operation) => operation instanceof QB.ASTLimitViewOperation) !== void 0;
+  return segment.operations.items.find((operation) => operation instanceof malloyQueryBuilder.ASTLimitViewOperation) !== void 0;
 }
 function segmentHasOrderBy(segment, name) {
-  return segment.operations.items.find((operation) => operation instanceof QB.ASTOrderByViewOperation && operation.name === name) !== void 0;
+  return segment.operations.items.find((operation) => operation instanceof malloyQueryBuilder.ASTOrderByViewOperation && operation.name === name) !== void 0;
 }
 function getOutputNameToInputNameMap(segment) {
   const nameMap = /* @__PURE__ */ new Map();
   for (const operation of segment.operations.items) {
-    if (operation instanceof QB.ASTGroupByViewOperation || operation instanceof QB.ASTAggregateViewOperation) {
+    if (operation instanceof malloyQueryBuilder.ASTGroupByViewOperation || operation instanceof malloyQueryBuilder.ASTAggregateViewOperation) {
       const reference = operation.field.getReference();
       if (reference) {
         nameMap.set(operation.name, toFullName(reference.path, reference.name));
@@ -34001,7 +34143,7 @@ function segmentHasOrderBySourceField(segment, path, name) {
   const nameMap = getOutputNameToInputNameMap(segment);
   const fullInputName = toFullName(path, name);
   return !!segment.operations.items.find((operation) => {
-    if (operation instanceof QB.ASTOrderByViewOperation && nameMap.has(operation.name)) {
+    if (operation instanceof malloyQueryBuilder.ASTOrderByViewOperation && nameMap.has(operation.name)) {
       return fullInputName === nameMap.get(operation.name);
     }
     return false;
@@ -34012,7 +34154,7 @@ function areReferencesEqual(path1, name1, path2, name2) {
 }
 function segmentHasFieldInOutputSpace(segment, path, name) {
   const match = segment.operations.items.find((operation) => {
-    if (operation instanceof QB.ASTGroupByViewOperation || operation instanceof QB.ASTAggregateViewOperation) {
+    if (operation instanceof malloyQueryBuilder.ASTGroupByViewOperation || operation instanceof malloyQueryBuilder.ASTAggregateViewOperation) {
       const reference = operation.field.getReference();
       if (reference) {
         return areReferencesEqual(path, name, reference.path, reference.name);
@@ -34026,7 +34168,7 @@ function segmentHasFieldInOutputSpace(segment, path, name) {
 }
 function segmentNestNo(segment, name) {
   return segment.operations.items.reduce((acc, operation) => {
-    if (operation instanceof QB.ASTNestViewOperation) {
+    if (operation instanceof malloyQueryBuilder.ASTNestViewOperation) {
       {
         if (operation.name === name) {
           do {
@@ -34054,6 +34196,34 @@ function addGroupBy(view, field, path) {
     segment.addTimestampGroupBy(field.name, path, "second");
   } else {
     segment.addGroupBy(field.name, path, rename);
+    recomputePartitionByAndPrimaryAxis(segment);
+  }
+}
+function recomputePartitionByAndPrimaryAxis(segment) {
+  var _a2;
+  const primaryAxis = getPrimaryAxisFromSchema(segment.getOutputSchema());
+  const groupBys = segment.operations.items.filter((op) => op.kind === "group_by");
+  const movingAverages = segment.operations.items.filter((op) => op.kind === "calculate" && op.expression.kind === "moving_average");
+  const canSmooth = primaryAxis !== null && (primaryAxis == null ? void 0 : primaryAxis.kind) === "dimension" && (primaryAxis.type.kind === "timestamp_type" || primaryAxis.type.kind === "date_type");
+  if (!canSmooth) {
+    movingAverages.forEach((operation) => {
+      operation.delete();
+      segment.addAggregate(operation.getFieldInfo().name);
+    });
+  } else {
+    const nonPrimaryGroupByNames = groupBys.filter((gb) => gb.name !== primaryAxis.name);
+    movingAverages.forEach((operation) => {
+      operation.expression.edit();
+      operation.expression.setPartitionFields(nonPrimaryGroupByNames.map((gb) => gb.field.getReference()).filter((ref) => !!ref));
+    });
+    const primaryTimeAxisOperation = groupBys.find((gb) => gb.name === primaryAxis.name);
+    if (primaryTimeAxisOperation) {
+      const expression = (_a2 = primaryTimeAxisOperation.field) == null ? void 0 : _a2.expression;
+      if (expression && expression.kind === "time_truncation") {
+        const truncationExpression = primaryTimeAxisOperation.field.expression;
+        truncationExpression.truncation = "day";
+      }
+    }
   }
 }
 function addAggregate(view, field, path) {
@@ -34108,10 +34278,10 @@ function getSegmentIfPresent(parent) {
     return void 0;
   }
   const definition = getViewDefinition(parent);
-  if (definition instanceof QB.ASTSegmentViewDefinition) {
+  if (definition instanceof malloyQueryBuilder.ASTSegmentViewDefinition) {
     return definition;
-  } else if (definition instanceof QB.ASTRefinementViewDefinition) {
-    if (definition.refinement instanceof QB.ASTSegmentViewDefinition) {
+  } else if (definition instanceof malloyQueryBuilder.ASTRefinementViewDefinition) {
+    if (definition.refinement instanceof malloyQueryBuilder.ASTSegmentViewDefinition) {
       return definition.refinement;
     }
   }
@@ -34165,16 +34335,13 @@ function OperationActionTitle({
   });
 }
 function RenameDialog({
-  rootQuery,
   view,
   target,
   open,
   setOpen
 }) {
   const [name, setName] = React.useState("");
-  const {
-    setQuery
-  } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   React.useEffect(() => {
     if (target) {
       setName(target.name);
@@ -34184,8 +34351,9 @@ function RenameDialog({
     return null;
   }
   const onRename = () => {
+    target.edit();
     target.name = name;
-    setQuery == null ? void 0 : setQuery(rootQuery == null ? void 0 : rootQuery.build());
+    updateQuery();
     setOpen(false);
   };
   const {
@@ -34248,15 +34416,12 @@ function RenameDialog({
   });
 }
 function SortableOperations({
-  rootQuery,
   segment,
   view,
   operations,
   kind
 }) {
-  const {
-    setQuery
-  } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   const sensors = useSensors(useSensor(PointerSensor));
   const items = React.useMemo(() => {
     return operations.map((operation) => ({
@@ -34268,7 +34433,7 @@ function SortableOperations({
     return null;
   }
   function handleDragEnd(event) {
-    const operations2 = segment.operations.items.filter((operation) => operation instanceof QB.ASTAggregateViewOperation || operation instanceof QB.ASTGroupByViewOperation || operation instanceof QB.ASTNestViewOperation);
+    const operations2 = segment.operations.items.filter((operation) => operation instanceof malloyQueryBuilder.ASTAggregateViewOperation || operation instanceof malloyQueryBuilder.ASTGroupByViewOperation || operation instanceof malloyQueryBuilder.ASTNestViewOperation);
     const names = operations2.map((operation) => operation.name);
     const {
       active,
@@ -34278,7 +34443,7 @@ function SortableOperations({
       const oldIndex = names.indexOf(active.id);
       const newIndex = names.indexOf(over.id);
       segment.reorderFields(arrayMove(names, oldIndex, newIndex));
-      setQuery == null ? void 0 : setQuery(rootQuery.build());
+      updateQuery();
     }
   }
   const {
@@ -34290,7 +34455,7 @@ function SortableOperations({
     types: ["dimension"],
     onClick: (field, path) => {
       addGroupBy(view, field, path);
-      setQuery == null ? void 0 : setQuery(rootQuery.build());
+      updateQuery();
     }
   } : {
     title: "aggregate",
@@ -34298,12 +34463,11 @@ function SortableOperations({
     types: ["measure"],
     onClick: (field, path) => {
       addAggregate(view, field, path);
-      setQuery == null ? void 0 : setQuery(rootQuery.build());
+      updateQuery();
     }
   };
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
     children: [/* @__PURE__ */ jsxRuntime.jsx(OperationActionTitle, {
-      rootQuery,
       view,
       fields,
       ...props2
@@ -34316,7 +34480,6 @@ function SortableOperations({
         children: /* @__PURE__ */ jsxRuntime.jsx(SortableContext, {
           items,
           children: items.map((item) => /* @__PURE__ */ jsxRuntime.jsx(SortableOperation, {
-            rootQuery,
             id: item.id,
             color: kind === "group_by" ? "cyan" : "green",
             view,
@@ -34329,18 +34492,16 @@ function SortableOperations({
 }
 const NULL_PATH = [];
 function SortableOperation({
-  rootQuery,
   id,
   view,
   operation,
   color
 }) {
   var _a2;
-  const {
-    setQuery
-  } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   const fieldInfo = operation.getFieldInfo();
-  const path = ((_a2 = operation.field.getReference()) == null ? void 0 : _a2.path) ?? NULL_PATH;
+  const field = operation instanceof malloyQueryBuilder.ASTCalculateViewOperation ? null : operation.field;
+  const path = operation instanceof malloyQueryBuilder.ASTCalculateViewOperation ? operation.expression.node.field_reference.path ?? NULL_PATH : ((_a2 = operation.field.getReference()) == null ? void 0 : _a2.path) ?? NULL_PATH;
   const {
     attributes,
     listeners,
@@ -34360,6 +34521,18 @@ function SortableOperation({
     transform: CSS$1.Transform.toString(transform2),
     transition
   };
+  const primaryAxis = React.useMemo(() => {
+    return getPrimaryAxis(view);
+  }, [view]);
+  const canSmooth = operation.kind === "aggregate" && primaryAxis !== null && (primaryAxis == null ? void 0 : primaryAxis.kind) === "dimension" && (primaryAxis.type.kind === "timestamp_type" || primaryAxis.type.kind === "date_type");
+  const enableSmoothing = React.useCallback((operation2) => {
+    if (!canSmooth) {
+      return;
+    }
+    operation2.convertToCalculateMovingAverage(operation2.name + "_smoothed", 7);
+    recomputePartitionByAndPrimaryAxis(view.getOrAddDefaultSegment());
+    updateQuery();
+  }, [canSmooth, updateQuery, view]);
   const hoverActions = React.useMemo(() => {
     return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
       children: [/* @__PURE__ */ jsxRuntime.jsx(DropdownMenu, {
@@ -34370,7 +34543,14 @@ function SortableOperation({
           tooltip: "More Actions"
         }),
         onOpenChange: setHoverActionsVisible,
-        children: [/* @__PURE__ */ jsxRuntime.jsx(DropdownMenuItem, {
+        children: [canSmooth ? /* @__PURE__ */ jsxRuntime.jsx(DropdownMenuItem, {
+          label: "Add smoothing",
+          onClick: () => {
+            if (operation instanceof malloyQueryBuilder.ASTAggregateViewOperation) {
+              enableSmoothing(operation);
+            }
+          }
+        }, "smoothing") : null, /* @__PURE__ */ jsxRuntime.jsx(DropdownMenuItem, {
           label: "Rename",
           onClick: () => {
             setRenameTarget(operation);
@@ -34380,12 +34560,21 @@ function SortableOperation({
       }, [...path, fieldInfo.name].join(".")), /* @__PURE__ */ jsxRuntime.jsx(ClearButton, {
         onClick: () => {
           operation.delete();
-          setQuery == null ? void 0 : setQuery(rootQuery == null ? void 0 : rootQuery.build());
+          recomputePartitionByAndPrimaryAxis(view.getOrAddDefaultSegment());
+          updateQuery();
         }
       })]
     });
-  }, [fieldInfo, operation, path, rootQuery, setQuery]);
-  const granular = granularityMenuItems(fieldInfo, operation.field);
+  }, [canSmooth, enableSmoothing, fieldInfo.name, operation, path, updateQuery, view]);
+  const hasSmoothedField = React.useMemo(() => {
+    return view.getOrAddDefaultSegment().operations.items.some((operation2) => {
+      return operation2.kind === "calculate";
+    });
+  }, [view]);
+  const granular = granularityMenuItems(fieldInfo, field);
+  if (hasSmoothedField && granular && operation.name === (primaryAxis == null ? void 0 : primaryAxis.name)) {
+    granular.options = granular.options.filter((option2) => option2.value === "day");
+  }
   let icon = "orderBy";
   if (fieldInfo.kind === "dimension" || fieldInfo.kind === "measure") {
     icon = atomicTypeToIcon(fieldInfo.type.kind);
@@ -34394,26 +34583,41 @@ function SortableOperation({
     id,
     ref: setNodeRef,
     style,
-    children: [granular ? /* @__PURE__ */ jsxRuntime.jsxs(TokenGroup, {
-      customStyle: customStyles.tokenGroup,
-      children: [/* @__PURE__ */ jsxRuntime.jsx(Token, {
-        color,
-        icon,
-        label: fieldInfo.name,
-        dragProps: {
-          attributes,
-          listeners
+    children: [field && granular ? /* @__PURE__ */ jsxRuntime.jsxs("div", {
+      ...{
+        0: {
+          className: "mly78zum5 mly6s0dn4 mly1nhvcw1 mly1jnr06f mly11ogjb6 mly1g9of4s"
+        },
+        1: {
+          className: "mly78zum5 mly6s0dn4 mly1nhvcw1 mly1jnr06f mly1ae5hkt"
         }
-      }), /* @__PURE__ */ jsxRuntime.jsx(SelectorToken, {
-        color,
-        value: granular.value,
-        onChange: (granulation) => {
-          if (operation.field.expression instanceof QB.ASTTimeTruncationExpression) operation.field.expression.truncation = granulation;
-          setQuery == null ? void 0 : setQuery(rootQuery.build());
+      }[!!hoverActionsVisible << 0],
+      children: [/* @__PURE__ */ jsxRuntime.jsxs(TokenGroup, {
+        customStyle: customStyles.tokenGroup,
+        children: [/* @__PURE__ */ jsxRuntime.jsx(Token, {
+          color,
+          icon,
+          label: fieldInfo.name,
+          dragProps: {
+            attributes,
+            listeners
+          }
+        }), /* @__PURE__ */ jsxRuntime.jsx(SelectorToken, {
+          color,
+          value: granular.value,
+          onChange: (granulation) => {
+            if (field.expression instanceof malloyQueryBuilder.ASTTimeTruncationExpression) field.expression.truncation = granulation;
+            updateQuery();
+          },
+          items: granular.options
+        })]
+      }), hoverActions && /* @__PURE__ */ jsxRuntime.jsx("div", {
+        ...{
+          className: "mly2b4tyj mly2lah0s"
         },
-        items: granular.options
+        children: hoverActions
       })]
-    }) : /* @__PURE__ */ jsxRuntime.jsx(FieldToken, {
+    }) : operation instanceof malloyQueryBuilder.ASTCalculateViewOperation ? /* @__PURE__ */ jsxRuntime.jsx(FieldToken, {
       field: fieldInfo,
       color,
       hoverActionsVisible,
@@ -34430,9 +34634,67 @@ function SortableOperation({
       dragProps: {
         attributes,
         listeners
-      }
+      },
+      additionalSiblings: /* @__PURE__ */ jsxRuntime.jsx(SelectorToken, {
+        color,
+        value: "" + (operation.expression.node.rows_preceding ?? 7),
+        onChange: (value) => {
+          if (value === "1") {
+            view.getOrAddDefaultSegment().operations.add(new malloyQueryBuilder.ASTAggregateViewOperation({
+              kind: "aggregate",
+              field: {
+                expression: {
+                  kind: "field_reference",
+                  name: operation.expression.node.field_reference.name
+                }
+              }
+            }));
+            operation.delete();
+            updateQuery();
+          } else {
+            operation.expression.edit();
+            operation.expression.rowsPreceding = parseInt(value, 10);
+            updateQuery();
+          }
+        },
+        items: [{
+          label: "7d",
+          value: "7"
+        }, {
+          label: "14d",
+          value: "14"
+        }, {
+          label: "28d",
+          value: "28"
+        }, {
+          label: "30d",
+          value: "30"
+        }, {
+          label: "Remove smoothing",
+          value: "1"
+        }]
+      })
+    }) : /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {
+      children: /* @__PURE__ */ jsxRuntime.jsx(FieldToken, {
+        field: fieldInfo,
+        color,
+        hoverActionsVisible,
+        hoverActions,
+        tooltip: /* @__PURE__ */ jsxRuntime.jsx(FieldHoverCard, {
+          field: fieldInfo,
+          path
+        }),
+        tooltipProps: {
+          side: "right",
+          align: "start",
+          alignOffset: 28
+        },
+        dragProps: {
+          attributes,
+          listeners
+        }
+      })
     }), /* @__PURE__ */ jsxRuntime.jsx(RenameDialog, {
-      rootQuery,
       view,
       target: renameTarget,
       open: renameOpen,
@@ -34443,7 +34705,7 @@ function SortableOperation({
 const DateGranulation = ["day", "week", "month", "quarter", "year"];
 const TimestampGranulation = ["second", "minute", "hour", "day", "week", "month", "quarter", "year"];
 function granularityMenuItems(fieldInfo, field) {
-  if (fieldInfo.kind !== "dimension" || !(field.expression instanceof QB.ASTTimeTruncationExpression)) {
+  if (!field || fieldInfo.kind !== "dimension" || !(field.expression instanceof malloyQueryBuilder.ASTTimeTruncationExpression)) {
     return null;
   }
   if (fieldInfo.type.kind === "timestamp_type") {
@@ -34473,13 +34735,11 @@ const customStyles = {
   }
 };
 function GroupByOperations({
-  rootQuery,
   segment,
   view,
   groupBys
 }) {
   return /* @__PURE__ */ jsxRuntime.jsx(SortableOperations, {
-    rootQuery,
     segment,
     view,
     operations: groupBys,
@@ -34722,12 +34982,9 @@ function displayTimeFromMoment(momentObj) {
   return momentObj.moment;
 }
 function FilterOperations({
-  rootQuery,
   filters
 }) {
-  const {
-    setQuery
-  } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   if (filters.length === 0) {
     return null;
   }
@@ -34743,13 +35000,12 @@ function FilterOperations({
             children: ["Invalid filter", /* @__PURE__ */ jsxRuntime.jsx(ClearButton, {
               onClick: () => {
                 filterOperation.delete();
-                setQuery == null ? void 0 : setQuery(rootQuery.build());
+                updateQuery();
               }
             })]
           }),
           children: /* @__PURE__ */ jsxRuntime.jsx(SingleFilterOperation, {
-            filterOperation,
-            rootQuery
+            filterOperation
           })
         }, key2);
       })
@@ -34757,41 +35013,42 @@ function FilterOperations({
   });
 }
 function SingleFilterOperation({
-  rootQuery,
   filterOperation
 }) {
-  const {
-    setQuery
-  } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   const setFilter = React.useCallback((filter2) => {
-    if (filterOperation.filter instanceof QB.ASTFilterWithFilterString) {
+    if (filterOperation.filter instanceof malloyQueryBuilder.ASTFilterWithFilterString) {
       filterOperation.filter.setFilter(filter2);
     }
-    setQuery == null ? void 0 : setQuery(rootQuery.build());
-  }, [filterOperation.filter, rootQuery, setQuery]);
-  if (!(filterOperation.filter instanceof QB.ASTFilterWithFilterString)) {
+    updateQuery();
+  }, [filterOperation.filter, updateQuery]);
+  const {
+    filter
+  } = filterOperation;
+  if (!(filter instanceof malloyQueryBuilder.ASTFilterWithFilterString)) {
     return null;
   }
   const {
-    fieldReference,
+    expression,
     filterString
-  } = filterOperation.filter;
-  const filter = filterOperation.filter.getFilter();
-  const fieldInfo = fieldReference.getFieldInfo();
-  if (fieldInfo.kind !== "dimension" && fieldInfo.kind !== "measure") {
-    throw new Error(`Invalid filter field kind: ${fieldInfo.kind}`);
+  } = filter;
+  if (!(expression instanceof malloyQueryBuilder.ASTReferenceExpression)) {
+    return null;
   }
+  const fieldInfo = filter.getFieldInfo();
+  const parsedFilter = filter.getFilter();
+  const path = expression.path ?? [];
   const {
     op,
     value
-  } = parsedToLabels(filter, filterString);
+  } = parsedToLabels(parsedFilter, filterString);
   const label = `${fieldInfo.name} ${op} ${value}`;
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
     ..._stylex.props(hoverStyles.main),
     children: [/* @__PURE__ */ jsxRuntime.jsx(FilterPopover, {
       fieldInfo,
-      path: fieldReference.path ?? [],
-      filter,
+      path,
+      filter: parsedFilter,
       setFilter,
       trigger: /* @__PURE__ */ jsxRuntime.jsx(Token, {
         icon: "filter",
@@ -34808,19 +35065,16 @@ function SingleFilterOperation({
       children: /* @__PURE__ */ jsxRuntime.jsx(ClearButton, {
         onClick: () => {
           filterOperation.delete();
-          setQuery == null ? void 0 : setQuery(rootQuery.build());
+          updateQuery();
         }
       })
     })]
   });
 }
 function LimitOperation({
-  rootQuery,
   limit
 }) {
-  const {
-    setQuery
-  } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   if (!limit) {
     return null;
   }
@@ -34835,7 +35089,7 @@ function LimitOperation({
         value: limit.limit,
         onChange: (value) => {
           limit.limit = value;
-          setQuery == null ? void 0 : setQuery(rootQuery.build());
+          updateQuery();
         },
         errorMessage: limit.limit < 0 ? "Limit must be positive" : void 0
       }), /* @__PURE__ */ jsxRuntime.jsx("div", {
@@ -34843,7 +35097,7 @@ function LimitOperation({
         children: /* @__PURE__ */ jsxRuntime.jsx(ClearButton, {
           onClick: () => {
             limit.delete();
-            setQuery == null ? void 0 : setQuery(rootQuery.build());
+            updateQuery();
           }
         })
       })]
@@ -34851,13 +35105,11 @@ function LimitOperation({
   });
 }
 function AggregateOperations({
-  rootQuery,
   segment,
   view,
   aggregates
 }) {
   return /* @__PURE__ */ jsxRuntime.jsx(SortableOperations, {
-    rootQuery,
     segment,
     view,
     operations: aggregates,
@@ -34865,12 +35117,9 @@ function AggregateOperations({
   });
 }
 function OrderByOperations({
-  rootQuery,
   orderBys
 }) {
-  const {
-    setQuery
-  } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   if (orderBys.length === 0) {
     return null;
   }
@@ -34910,7 +35159,7 @@ function OrderByOperations({
               value: orderBy.direction ?? "asc",
               onChange: (direction) => {
                 orderBy.direction = direction;
-                setQuery == null ? void 0 : setQuery(rootQuery.build());
+                updateQuery();
               }
             })]
           }), /* @__PURE__ */ jsxRuntime.jsx("div", {
@@ -34918,7 +35167,7 @@ function OrderByOperations({
             children: /* @__PURE__ */ jsxRuntime.jsx(ClearButton, {
               onClick: () => {
                 orderBy.delete();
-                setQuery == null ? void 0 : setQuery(rootQuery.build());
+                updateQuery();
               }
             })
           })]
@@ -34928,7 +35177,6 @@ function OrderByOperations({
   });
 }
 function View({
-  rootQuery,
   view
 }) {
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
@@ -34938,10 +35186,8 @@ function View({
       gap: 8
     },
     children: [/* @__PURE__ */ jsxRuntime.jsx(Visualization$1, {
-      rootQuery,
       view
     }), /* @__PURE__ */ jsxRuntime.jsx(ViewDefinition, {
-      rootQuery,
       view,
       viewDef: view.definition
     })]
@@ -35006,12 +35252,9 @@ const styles$f = {
   }
 };
 function AddLimit({
-  rootQuery,
   view
 }) {
-  const {
-    setQuery
-  } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   const segment = getSegmentIfPresent(view);
   const hasLimit = segment ? segmentHasLimit(segment) : false;
   return /* @__PURE__ */ jsxRuntime.jsx(AddItem, {
@@ -35023,17 +35266,14 @@ function AddLimit({
     onClick: () => {
       const segment2 = view.getOrAddDefaultSegment();
       segment2.setLimit(10);
-      setQuery == null ? void 0 : setQuery(rootQuery.build());
+      updateQuery();
     }
   });
 }
 function AddEmptyNest({
-  rootQuery,
   view
 }) {
-  const {
-    setQuery
-  } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   return /* @__PURE__ */ jsxRuntime.jsx(AddItem, {
     icon: /* @__PURE__ */ jsxRuntime.jsx(Icon, {
       name: "nest"
@@ -35043,7 +35283,7 @@ function AddEmptyNest({
       const segment = view.getOrAddDefaultSegment();
       const nestNo = segmentNestNo(segment, `Nest`);
       segment.addEmptyNest(nestNo > 1 ? `Nest ${nestNo}` : `Nest`);
-      setQuery == null ? void 0 : setQuery(rootQuery.build());
+      updateQuery();
     }
   });
 }
@@ -35075,13 +35315,10 @@ const styles$e = {
   }
 };
 function AddOrderBy({
-  rootQuery,
   view,
   search
 }) {
-  const {
-    setQuery
-  } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   const outputSchemaFields = view.getOutputSchema().fields;
   const segment = getSegmentIfPresent(view);
   const fields = React.useMemo(() => outputSchemaFields.filter((field) => field.kind === "dimension").filter((field) => ORDERABLE_TYPES$1.includes(field.type.kind)).filter((field) => segment ? !segmentHasOrderBy(segment, field.name) : true), [outputSchemaFields, segment]);
@@ -35093,7 +35330,7 @@ function AddOrderBy({
     types: ["dimension"],
     onAddOperation: (field) => {
       addOrderBy(view, field);
-      setQuery == null ? void 0 : setQuery(rootQuery.build());
+      updateQuery();
     },
     disabledMessage: "There must be at least one field in the output to order by.",
     search
@@ -35101,13 +35338,10 @@ function AddOrderBy({
 }
 const ORDERABLE_TYPES$1 = ["string_type", "number_type", "boolean_type", "date_type", "timestamp_type"];
 function AddGroupBy({
-  rootQuery,
   view,
   search
 }) {
-  const {
-    setQuery
-  } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   const {
     fields
   } = getInputSchemaFromViewParent(view);
@@ -35124,19 +35358,16 @@ function AddGroupBy({
     filter,
     onAddOperation: (field, path) => {
       addGroupBy(view, field, path);
-      setQuery == null ? void 0 : setQuery(rootQuery.build());
+      updateQuery();
     },
     search
   });
 }
 function AddAggregate({
-  rootQuery,
   view,
   search
 }) {
-  const {
-    setQuery
-  } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   const {
     fields
   } = getInputSchemaFromViewParent(view);
@@ -35153,7 +35384,7 @@ function AddAggregate({
     filter,
     onAddOperation: (field, path) => {
       addAggregate(view, field, path);
-      setQuery == null ? void 0 : setQuery(rootQuery.build());
+      updateQuery();
     },
     search
   });
@@ -35162,10 +35393,7 @@ function AddWhere({
   view,
   search
 }) {
-  const {
-    rootQuery,
-    setQuery
-  } = React__namespace.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   const {
     fields
   } = getInputSchemaFromViewParent(view);
@@ -35179,7 +35407,7 @@ function AddWhere({
     onAddOperation: (field, path, filter) => {
       if (filter && (field.kind === "dimension" || field.kind === "measure")) {
         addFilter(view, field, path, filter);
-        setQuery == null ? void 0 : setQuery(rootQuery == null ? void 0 : rootQuery.build());
+        updateQuery();
       }
     },
     isFilterOperation: true,
@@ -35188,15 +35416,18 @@ function AddWhere({
 }
 const FILTERABLE_TYPES$1 = /* @__PURE__ */ new Set(["string_type", "boolean_type", "number_type", "date_type", "timestamp_type"]);
 function AddView({
-  rootQuery,
   view,
   search
 }) {
   const {
-    setQuery
+    rootQuery
   } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   const allFields = getInputSchemaFromViewParent(view).fields;
   const fields = React.useMemo(() => allFields.filter((field) => field.kind === "view" && !isIndexView(field)), [allFields]);
+  if (!rootQuery) {
+    return null;
+  }
   return /* @__PURE__ */ jsxRuntime.jsx(AddFieldItem, {
     label: "Add view",
     icon: "view",
@@ -35210,20 +35441,17 @@ function AddView({
       } else {
         addNest(view, field);
       }
-      setQuery == null ? void 0 : setQuery(rootQuery.build());
+      updateQuery();
     },
     search
   });
 }
 function AddMenu({
-  rootQuery,
   view
 }) {
   const [open, setOpen] = React.useState(false);
   const [active, setActive] = React.useState("");
-  const {
-    setQuery
-  } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   const [search, setSearch] = React.useState("");
   const segment = getSegmentIfPresent(view);
   const toggleActive = (toggle) => {
@@ -35287,7 +35515,7 @@ function AddMenu({
                 } else {
                   addNest(view, field);
                 }
-                setQuery == null ? void 0 : setQuery(rootQuery.build());
+                updateQuery();
               },
               search
             }), /* @__PURE__ */ jsxRuntime.jsx(Divider, {}), /* @__PURE__ */ jsxRuntime.jsx(ValueList, {
@@ -35303,7 +35531,7 @@ function AddMenu({
                     values: [value.fieldValue ?? "∅"]
                   }
                 });
-                setQuery == null ? void 0 : setQuery(rootQuery.build());
+                updateQuery();
               }
             })]
           }) : /* @__PURE__ */ jsxRuntime.jsxs("div", {
@@ -35340,7 +35568,6 @@ function AddMenu({
               onClick: () => toggleActive("view"),
               open: active === "view"
             }), /* @__PURE__ */ jsxRuntime.jsx(Divider, {}), /* @__PURE__ */ jsxRuntime.jsx(AddLimit, {
-              rootQuery,
               view
             }), /* @__PURE__ */ jsxRuntime.jsx(AddItem, {
               icon: /* @__PURE__ */ jsxRuntime.jsx(Icon, {
@@ -35350,7 +35577,6 @@ function AddMenu({
               onClick: () => toggleActive("order_by"),
               open: active === "order_by"
             }), /* @__PURE__ */ jsxRuntime.jsx(AddEmptyNest, {
-              rootQuery,
               view
             })]
           }), /* @__PURE__ */ jsxRuntime.jsxs("div", {
@@ -35359,23 +35585,18 @@ function AddMenu({
               overflowY: "auto"
             },
             children: [active === "group_by" && /* @__PURE__ */ jsxRuntime.jsx(AddGroupBy, {
-              rootQuery,
               view,
               search
             }), active === "aggregate" && /* @__PURE__ */ jsxRuntime.jsx(AddAggregate, {
-              rootQuery,
               view,
               search
             }), active === "where" && /* @__PURE__ */ jsxRuntime.jsx(AddWhere, {
-              rootQuery,
               view,
               search
             }), active === "view" && /* @__PURE__ */ jsxRuntime.jsx(AddView, {
-              rootQuery,
               view,
               search
             }), active === "order_by" && /* @__PURE__ */ jsxRuntime.jsx(AddOrderBy, {
-              rootQuery,
               view,
               search
             })]
@@ -35421,7 +35642,6 @@ function FocusableView({
   });
 }
 function NestOperations({
-  rootQuery,
   view,
   nests
 }) {
@@ -35431,20 +35651,16 @@ function NestOperations({
   return /* @__PURE__ */ jsxRuntime.jsx("div", {
     ..._stylex.props(styles$u.tokenContainer),
     children: nests.map((nest) => /* @__PURE__ */ jsxRuntime.jsx(NestOperation, {
-      rootQuery,
       view,
       nest
     }, nest.name))
   });
 }
 function NestOperation({
-  rootQuery,
   view,
   nest
 }) {
-  const {
-    setQuery
-  } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   const [renameOpen, setRenameOpen] = React.useState(false);
   const parentNestViewPath = React.useContext(NestViewPathContext);
   const {
@@ -35465,7 +35681,7 @@ function NestOperation({
         onClick: () => {
           focusNestView([...parentNestViewPath]);
           nest2.delete();
-          setQuery == null ? void 0 : setQuery(rootQuery.build());
+          updateQuery();
         }
       }), /* @__PURE__ */ jsxRuntime.jsx(DropdownMenuItem, {
         label: "Rename",
@@ -35474,7 +35690,6 @@ function NestOperation({
         }
       })]
     }), /* @__PURE__ */ jsxRuntime.jsx(AddMenu, {
-      rootQuery,
       view: nest2.view
     })]
   });
@@ -35486,17 +35701,15 @@ function NestOperation({
       },
       children: [/* @__PURE__ */ jsxRuntime.jsx(CollapsiblePanel, {
         title: nest.name,
-        icon: viewToVisualizationIcon(nest.view),
+        icon: tagToVisualization(nest.view.getTag()),
         defaultOpen: true,
         controls: getControls(nest),
         collapsedControls: getControls(nest),
         isFocused: isNestViewFocused([...parentNestViewPath, nest.name]),
         children: /* @__PURE__ */ jsxRuntime.jsx(View, {
-          rootQuery,
           view: nest.view
         })
       }), /* @__PURE__ */ jsxRuntime.jsx(RenameDialog, {
-        rootQuery,
         view,
         target: nest,
         open: renameOpen,
@@ -35506,7 +35719,6 @@ function NestOperation({
   });
 }
 function Operations({
-  rootQuery,
   view,
   viewDef
 }) {
@@ -35517,24 +35729,24 @@ function Operations({
   const orderBys = [];
   const nests = [];
   let limit;
-  if (!(viewDef instanceof QB.ASTSegmentViewDefinition)) {
+  if (!(viewDef instanceof malloyQueryBuilder.ASTSegmentViewDefinition)) {
     return null;
   }
   const segment = viewDef;
   segment.operations.items.forEach((operation) => {
-    if (operation instanceof QB.ASTGroupByViewOperation) {
+    if (operation instanceof malloyQueryBuilder.ASTGroupByViewOperation) {
       groupBys.push(operation);
-    } else if (operation instanceof QB.ASTAggregateViewOperation) {
+    } else if (operation instanceof malloyQueryBuilder.ASTAggregateViewOperation || operation instanceof malloyQueryBuilder.ASTCalculateViewOperation) {
       aggregates.push(operation);
-    } else if (operation instanceof QB.ASTWhereViewOperation) {
+    } else if (operation instanceof malloyQueryBuilder.ASTWhereViewOperation) {
       filters.push(operation);
-    } else if (operation instanceof QB.ASTHavingViewOperation) {
+    } else if (operation instanceof malloyQueryBuilder.ASTHavingViewOperation) {
       filters.push(operation);
-    } else if (operation instanceof QB.ASTOrderByViewOperation) {
+    } else if (operation instanceof malloyQueryBuilder.ASTOrderByViewOperation) {
       orderBys.push(operation);
-    } else if (operation instanceof QB.ASTNestViewOperation) {
+    } else if (operation instanceof malloyQueryBuilder.ASTNestViewOperation) {
       nests.push(operation);
-    } else if (operation instanceof QB.ASTDrillViewOperation) {
+    } else if (operation instanceof malloyQueryBuilder.ASTDrillViewOperation) {
       drills.push(operation);
     } else {
       limit = operation;
@@ -35545,66 +35757,53 @@ function Operations({
       className: "mly1tpqehw mly10lvyaf"
     },
     children: [/* @__PURE__ */ jsxRuntime.jsx(GroupByOperations, {
-      rootQuery,
       segment,
       view,
       groupBys
     }), /* @__PURE__ */ jsxRuntime.jsx(AggregateOperations, {
-      rootQuery,
       segment,
       view,
       aggregates
     }), /* @__PURE__ */ jsxRuntime.jsx(DrillOperations, {
-      rootQuery,
       drills
     }), /* @__PURE__ */ jsxRuntime.jsx(FilterOperations, {
-      rootQuery,
       filters
     }), /* @__PURE__ */ jsxRuntime.jsx(OrderByOperations, {
-      rootQuery,
       orderBys
     }), /* @__PURE__ */ jsxRuntime.jsx(NestOperations, {
-      rootQuery,
       view,
       nests
     }), /* @__PURE__ */ jsxRuntime.jsx(LimitOperation, {
-      rootQuery,
       limit
     })]
   });
 }
 function ViewDefinition({
-  rootQuery,
   view,
   viewDef
 }) {
-  if (viewDef instanceof QB.ASTArrowViewDefinition) {
+  if (viewDef instanceof malloyQueryBuilder.ASTArrowViewDefinition) {
     return /* @__PURE__ */ jsxRuntime.jsx(ViewDefinition, {
-      rootQuery,
       view,
       viewDef: viewDef.view
     });
-  } else if (viewDef instanceof QB.ASTRefinementViewDefinition) {
+  } else if (viewDef instanceof malloyQueryBuilder.ASTRefinementViewDefinition) {
     return /* @__PURE__ */ jsxRuntime.jsxs("div", {
       children: [/* @__PURE__ */ jsxRuntime.jsx(ViewDefinition, {
-        rootQuery,
         view,
         viewDef: viewDef.base
       }), /* @__PURE__ */ jsxRuntime.jsx(ViewDefinition, {
-        rootQuery,
         view,
         viewDef: viewDef.refinement
       })]
     });
-  } else if (viewDef instanceof QB.ASTSegmentViewDefinition) {
+  } else if (viewDef instanceof malloyQueryBuilder.ASTSegmentViewDefinition) {
     return /* @__PURE__ */ jsxRuntime.jsx(Operations, {
-      rootQuery,
       view,
       viewDef
     });
   } else {
     return /* @__PURE__ */ jsxRuntime.jsx(CollapsingView, {
-      rootQuery,
       viewDef
     });
   }
@@ -35673,14 +35872,21 @@ const styles$c = {
   }
 };
 function Query({
-  rootQuery,
-  query,
-  setQuery
+  definition
 }) {
   const {
     focusMainView,
     isMainViewFocused
   } = useQueryFocus();
+  const {
+    rootQuery,
+    setQuery
+  } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
+  if (!rootQuery) {
+    return null;
+  }
+  const isEmpty = rootQuery.isEmpty();
   return /* @__PURE__ */ jsxRuntime.jsx(FocusableView, {
     children: /* @__PURE__ */ jsxRuntime.jsxs(CollapsiblePanel, {
       title: "Main query",
@@ -35699,44 +35905,41 @@ function Query({
               label: "Clear query",
               onClick: () => {
                 focusMainView();
-                setQuery == null ? void 0 : setQuery(void 0);
+                setQuery(void 0);
               },
-              disabled: rootQuery.isEmpty()
+              disabled: isEmpty
             }), /* @__PURE__ */ jsxRuntime.jsx(DropdownMenuItem, {
               icon: "nest",
               label: "Nest query",
               onClick: () => {
-                if (rootQuery.definition instanceof QB.ASTArrowQueryDefinition) {
-                  rootQuery.definition.view.convertToNest("Nest");
+                if (definition instanceof malloyQueryBuilder.ASTArrowQueryDefinition) {
+                  definition.view.convertToNest("Nest");
                 }
-                setQuery == null ? void 0 : setQuery(rootQuery.build());
+                updateQuery();
               },
-              disabled: rootQuery.isEmpty() || !(rootQuery.definition instanceof QB.ASTArrowQueryDefinition)
+              disabled: isEmpty || !(definition instanceof malloyQueryBuilder.ASTArrowQueryDefinition)
             })]
           }) : /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {})
-        }), query.definition instanceof QB.ASTArrowQueryDefinition ? /* @__PURE__ */ jsxRuntime.jsx(AddMenu, {
-          rootQuery,
-          view: query.definition
+        }), definition instanceof malloyQueryBuilder.ASTArrowQueryDefinition ? /* @__PURE__ */ jsxRuntime.jsx(AddMenu, {
+          view: definition
         }) : null]
       }),
       collapsedControls: /* @__PURE__ */ jsxRuntime.jsx(Icon, {
-        name: viewToVisualizationIcon(query)
+        name: tagToVisualization(rootQuery.getTag())
       }),
-      children: [query.definition instanceof QB.ASTArrowQueryDefinition ? /* @__PURE__ */ jsxRuntime.jsxs("div", {
+      children: [definition instanceof malloyQueryBuilder.ASTArrowQueryDefinition ? /* @__PURE__ */ jsxRuntime.jsxs("div", {
         style: {
           display: "flex",
           flexDirection: "column",
           gap: 8
         },
-        children: [!query.isEmpty() && /* @__PURE__ */ jsxRuntime.jsx(Visualization$1, {
-          rootQuery,
-          view: query
+        children: [!isEmpty && /* @__PURE__ */ jsxRuntime.jsx(Visualization$1, {
+          view: rootQuery
         }), /* @__PURE__ */ jsxRuntime.jsx(ViewDefinition, {
-          rootQuery,
-          view: query.definition,
-          viewDef: query.definition.view
+          view: definition,
+          viewDef: definition.view
         })]
-      }) : null, query.isEmpty() ? /* @__PURE__ */ jsxRuntime.jsx("div", {
+      }) : null, isEmpty ? /* @__PURE__ */ jsxRuntime.jsx("div", {
         ...{
           className: "mly78zum5 mlyl56j7k mly6s0dn4 mlyng8ra"
         },
@@ -35758,9 +35961,9 @@ function Query({
   });
 }
 function Source({
-  rootQuery
+  definition
 }) {
-  if (rootQuery.definition instanceof QB.ASTArrowQueryDefinition) {
+  if (definition instanceof malloyQueryBuilder.ASTArrowQueryDefinition) {
     return /* @__PURE__ */ jsxRuntime.jsx("div", {
       ..._stylex.props(styles$u.queryCard, styles$b.content),
       children: /* @__PURE__ */ jsxRuntime.jsxs("div", {
@@ -35771,7 +35974,7 @@ function Source({
           ...{
             className: "mlyb3r6kr mlylyipyv mly117nqv4"
           },
-          children: rootQuery.definition.as.ArrowQueryDefinition().source.as.ReferenceQueryArrowSource().name
+          children: definition.source.getSourceInfo().name
         })]
       })
     });
@@ -36108,13 +36311,13 @@ function LiteralValueEditor({
   }
 }
 function Parameters({
-  rootQuery
+  definition
 }) {
-  const {
-    setQuery
-  } = React.useContext(QueryEditorContext);
-  if (rootQuery.definition instanceof QB.ASTArrowQueryDefinition) {
-    const source = rootQuery.definition.as.ArrowQueryDefinition().source.as.ReferenceQueryArrowSource();
+  const updateQuery = useUpdateQuery();
+  if (definition instanceof malloyQueryBuilder.ASTArrowQueryDefinition && definition.source instanceof malloyQueryBuilder.ASTReferenceQueryArrowSource) {
+    const {
+      source
+    } = definition;
     const sourceParameters = source.getSourceParameters();
     if (!sourceParameters || sourceParameters.length === 0) {
       return null;
@@ -36137,7 +36340,7 @@ function Parameters({
               value: ((_a2 = source.tryGetParameter(parameter.name)) == null ? void 0 : _a2.parameter.value) ?? parameter.default_value,
               setValue: (value) => {
                 source.setParameter(parameter.name, value);
-                setQuery == null ? void 0 : setQuery(rootQuery.build());
+                updateQuery();
               }
             })]
           }, parameter.name);
@@ -36155,23 +36358,23 @@ const styles$9 = {
 };
 function QueryEditor() {
   const {
-    rootQuery,
-    setQuery
+    rootQuery
   } = React.useContext(QueryEditorContext);
   if (!rootQuery) {
     console.error("Missing <MalloyExplorerProvider>");
     return null;
   }
+  const {
+    definition
+  } = rootQuery;
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
     ..._stylex.props(fontStyles.body, styles$8.main),
     children: [/* @__PURE__ */ jsxRuntime.jsx(Source, {
-      rootQuery
+      definition
     }), /* @__PURE__ */ jsxRuntime.jsx(Parameters, {
-      rootQuery
+      definition
     }), /* @__PURE__ */ jsxRuntime.jsx(Query, {
-      rootQuery,
-      query: rootQuery,
-      setQuery
+      definition
     })]
   });
 }
@@ -36702,22 +36905,19 @@ function RenderedResult({
   const viz = React.useMemo(() => {
     const renderer = new render.MalloyRenderer();
     const viz2 = renderer.createViz({
-      onDrill: ({
-        stableQuery,
-        stableDrillClauses
-      }) => {
+      onDrill: (drillData) => {
         if (onDrill) {
-          onDrill({
-            stableQuery,
-            stableDrillClauses
-          });
+          onDrill(drillData);
           return;
         }
-        const rootQuery = new QB.ASTQuery({
+        const {
+          stableQuery
+        } = drillData;
+        const rootQuery = new malloyQueryBuilder.ASTQuery({
           query: stableQuery,
           source
         });
-        setQuery == null ? void 0 : setQuery(rootQuery.build());
+        setQuery(rootQuery.build());
       },
       tableConfig: {
         enableDrill: true
@@ -37298,27 +37498,21 @@ function useOperations(view, field, path) {
     return "";
   }, [matchingFieldItem, view, path, field.name, fullName]);
   return {
-    isGroupByAllowed: !groupByDisabledReason,
     groupByDisabledReason,
-    isAggregateAllowed: !aggregateDisabledReason,
     aggregateDisabledReason,
-    isFilterAllowed: !filterDisabledReason,
     filterDisabledReason,
-    isOrderByAllowed: !orderByDisabledReason,
     orderByDisabledReason
   };
 }
 const FILTERABLE_TYPES = ["string_type", "boolean_type", "number_type", "date_type", "timestamp_type"];
 const ORDERABLE_TYPES = ["string_type", "number_type", "boolean_type", "date_type", "timestamp_type"];
 function FieldTokenWithActions({
+  rootQuery,
   field,
   path,
   viewDef
 }) {
-  const {
-    rootQuery,
-    setQuery
-  } = React.useContext(QueryEditorContext);
+  const updateQuery = useUpdateQuery();
   const {
     focusedNestView
   } = useQueryFocus();
@@ -37342,19 +37536,19 @@ function FieldTokenWithActions({
       } else if (operation === "filter" && !filterDisabledReason && filter) {
         addFilter(view, field, path, filter);
       }
-      setQuery == null ? void 0 : setQuery(rootQuery == null ? void 0 : rootQuery.build());
+      updateQuery();
     }
   };
   const handleSetView = () => {
-    if (field.kind === "view" && (rootQuery == null ? void 0 : rootQuery.isEmpty())) {
-      rootQuery == null ? void 0 : rootQuery.setView(field.name);
-      setQuery == null ? void 0 : setQuery(rootQuery == null ? void 0 : rootQuery.build());
+    if (field.kind === "view" && rootQuery.isEmpty()) {
+      rootQuery.setView(field.name);
+      updateQuery();
     }
   };
   const handleAddView = () => {
     if (field.kind === "view") {
       addNest(view, field);
-      setQuery == null ? void 0 : setQuery(rootQuery == null ? void 0 : rootQuery.build());
+      updateQuery();
     }
   };
   return /* @__PURE__ */ jsxRuntime.jsx(FieldToken, {
@@ -37362,9 +37556,9 @@ function FieldTokenWithActions({
     hoverActions: field.kind === "view" ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
       children: [/* @__PURE__ */ jsxRuntime.jsx(ActionButton, {
         icon: "insert",
-        disabled: !(rootQuery == null ? void 0 : rootQuery.isEmpty()),
+        disabled: !rootQuery.isEmpty(),
         onClick: handleSetView,
-        tooltip: !(rootQuery == null ? void 0 : rootQuery.isEmpty()) ? "Can only add a view to an empty query." : "Add view",
+        tooltip: !rootQuery.isEmpty() ? "Can only add a view to an empty query." : "Add view",
         onTooltipOpenChange: setIsTooltipOpen
       }), /* @__PURE__ */ jsxRuntime.jsx(ActionButton, {
         icon: "nest",
@@ -37430,7 +37624,7 @@ function FieldTokenWithActions({
       })]
     }) : null,
     onClick: field.kind === "dimension" && !groupByDisabledReason ? () => handleAddOperationAction("groupBy") : field.kind === "measure" && !aggregateDisabledReason ? () => handleAddOperationAction("aggregate") : field.kind === "view" ? () => {
-      if (rootQuery == null ? void 0 : rootQuery.isEmpty()) {
+      if (rootQuery.isEmpty()) {
         handleSetView();
       } else {
         handleAddView();
@@ -37474,6 +37668,7 @@ function ActionButton({
 }
 const FIELD_KIND_ORDER = ["dimension", "measure", "view"];
 function SearchResultList({
+  rootQuery,
   source,
   items
 }) {
@@ -37483,11 +37678,8 @@ function SearchResultList({
       items: groupFieldItemsByPath(source, group.items)
     }));
   }, [source, items]);
-  const {
-    rootQuery
-  } = React__namespace.useContext(QueryEditorContext);
-  const viewDef = rootQuery == null ? void 0 : rootQuery.definition;
-  if (!(viewDef instanceof QB.ASTArrowQueryDefinition)) {
+  const viewDef = rootQuery.definition;
+  if (!(viewDef instanceof malloyQueryBuilder.ASTArrowQueryDefinition)) {
     return null;
   }
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
@@ -37523,6 +37715,7 @@ function SearchResultList({
           field,
           path
         }) => /* @__PURE__ */ jsxRuntime.jsx(FieldTokenWithActions, {
+          rootQuery,
           field,
           path,
           viewDef
@@ -37549,6 +37742,7 @@ const getSublabelFromPath = (source, path) => {
   return path.length > 0 ? `joined to ${[...path.slice(0, -1), source.name].join(" > ")}` : void 0;
 };
 function FieldGroupList({
+  rootQuery,
   source,
   fieldItems,
   fieldGroupType
@@ -37568,11 +37762,8 @@ function FieldGroupList({
       group
     }) => group === fieldGroupType)) == null ? void 0 : _a2.items) ?? [];
   }, [fieldGroupsByKindByPath, fieldGroupType]);
-  const {
-    rootQuery
-  } = React__namespace.useContext(QueryEditorContext);
-  const viewDef = rootQuery == null ? void 0 : rootQuery.definition;
-  if (!(viewDef instanceof QB.ASTArrowQueryDefinition)) {
+  const viewDef = rootQuery.definition;
+  if (!(viewDef instanceof malloyQueryBuilder.ASTArrowQueryDefinition)) {
     return null;
   }
   return /* @__PURE__ */ jsxRuntime.jsx("div", {
@@ -37588,6 +37779,7 @@ function FieldGroupList({
           field,
           path
         }) => /* @__PURE__ */ jsxRuntime.jsx(FieldTokenWithActions, {
+          rootQuery,
           field,
           path,
           viewDef
@@ -37600,7 +37792,8 @@ function SourcePanel({
   onRefresh
 }) {
   const {
-    source
+    source,
+    rootQuery
   } = React__namespace.useContext(QueryEditorContext);
   const [searchQuery, setSearchQuery] = React__namespace.useState("");
   const {
@@ -37623,7 +37816,7 @@ function SourcePanel({
     return [];
   }, [fieldItems, searchQuery]);
   const isSearchActive = !!searchQuery;
-  if (!source) {
+  if (!source || !rootQuery) {
     return null;
   }
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
@@ -37678,6 +37871,7 @@ function SourcePanel({
         className: "mly78zum5 mlydt5ytf mlyysyzu8 mly1iyjqo2"
       },
       children: isSearchActive ? /* @__PURE__ */ jsxRuntime.jsx(SearchResultList, {
+        rootQuery,
         source,
         items: searchResultItems
       }) : /* @__PURE__ */ jsxRuntime.jsxs(AccordionList, {
@@ -37694,6 +37888,7 @@ function SourcePanel({
             color: "cyan"
           }),
           children: /* @__PURE__ */ jsxRuntime.jsx(FieldGroupList, {
+            rootQuery,
             source,
             fieldItems,
             fieldGroupType: "dimension"
@@ -37710,6 +37905,7 @@ function SourcePanel({
             color: "green"
           }),
           children: /* @__PURE__ */ jsxRuntime.jsx(FieldGroupList, {
+            rootQuery,
             source,
             fieldItems,
             fieldGroupType: "measure"
@@ -37726,6 +37922,7 @@ function SourcePanel({
             color: "purple"
           }),
           children: /* @__PURE__ */ jsxRuntime.jsx(FieldGroupList, {
+            rootQuery,
             source,
             fieldItems,
             fieldGroupType: "view"