@malloydata/malloy-explorer 0.0.294-dev250630221944 → 0.0.295-dev250710213205

package/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "malloy-samples"]
+	path = malloy-samples
+	url = git@github.com:malloydata/malloy-samples

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

@@ -1,5 +1,6 @@
 import { ReactNode } from "react";
 import * as Malloy from "@malloydata/malloy-interfaces";
+import type { DrillData } from "@malloydata/render";
 import { SearchValueMapResult } from "../contexts/QueryEditorContext";
 declare export interface MalloyExplorerProviderProps {
   source: Malloy.SourceInfo;
@@ -9,11 +10,7 @@ declare export interface MalloyExplorerProviderProps {
   onFocusedNestViewPathChange: (path: string[]) => void;
   children: ReactNode | ReactNode[];
   topValues?: SearchValueMapResult[];
-  onDrill?: ($$param0$: {
-    stableQuery: Malloy.Query | void,
-    stableDrillClauses: Malloy.DrillOperation[] | void,
-    ...
-  }) => void;
+  onDrill?: ($$param0$: DrillData) => void;
 }
 declare export function MalloyExplorerProvider(
   $$param0$: MalloyExplorerProviderProps,

package/README.md

@@ -1,5 +1,12 @@
 # Development directions
 
+- Initialize git sub-modules
+
+```
+git submodule init
+git submodule update
+```
+
 - Install required packages
 
 ```

package/dist/cjs/index.cjs

@@ -8010,16 +8010,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 +8046,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))
           })]
         })
       })
@@ -26307,19 +26303,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 QB.ASTFilterWithLiteralEquality ? /* @__PURE__ */ jsxRuntime.jsx(LiteralValue, {
+            value: drill.filter.value.node
+          }) : /* @__PURE__ */ jsxRuntime.jsx(Token, {
+            label: drill.filter.filterString
+          })]
+        }, key2) : null;
+      })
     })]
   });
 }
@@ -31993,17 +31992,21 @@ function Visualization$1({
   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,17 +32014,23 @@ 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());
@@ -32049,6 +32058,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,
@@ -32618,7 +32634,8 @@ function ValueList({
   fieldPath,
   ref,
   customStyle,
-  showPath = true
+  showPath = true,
+  hideNoMatchMessage = false
 }) {
   const {
     searchResults
@@ -32640,7 +32657,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 +32852,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, {
@@ -34394,24 +34412,39 @@ 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: [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 (operation.field.expression instanceof QB.ASTTimeTruncationExpression) operation.field.expression.truncation = granulation;
+            setQuery == null ? void 0 : setQuery(rootQuery.build());
+          },
+          items: granular.options
+        })]
+      }), hoverActions && /* @__PURE__ */ jsxRuntime.jsx("div", {
+        ...{
+          className: "mly2b4tyj mly2lah0s"
         },
-        items: granular.options
+        children: hoverActions
       })]
     }) : /* @__PURE__ */ jsxRuntime.jsx(FieldToken, {
       field: fieldInfo,
@@ -34769,29 +34802,33 @@ function SingleFilterOperation({
     }
     setQuery == null ? void 0 : setQuery(rootQuery.build());
   }, [filterOperation.filter, rootQuery, setQuery]);
-  if (!(filterOperation.filter instanceof QB.ASTFilterWithFilterString)) {
+  const {
+    filter
+  } = filterOperation;
+  if (!(filter instanceof QB.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 QB.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",
@@ -36702,17 +36739,14 @@ 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 {
+          stableQuery
+        } = drillData;
         const rootQuery = new QB.ASTQuery({
           query: stableQuery,
           source