@malloy-publisher/sdk 0.0.201 → 0.0.202

package/dist/index.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-BpoC5QHF.cjs.js"),o=require("./ServerProvider-BSyxB6sf.cjs.js");exports.AnalyzePackageButton=e.AnalyzePackageButton;exports.BrowserWorkbookStorage=e.BrowserWorkbookStorage;exports.ConnectionExplorer=e.ConnectionExplorer;exports.DimensionFilter=e.DimensionFilter;exports.EmbeddedQueryResult=e.EmbeddedQueryResult;exports.Environment=e.Environment;exports.Home=e.Home;exports.Loading=e.Loading;exports.Model=e.Model;exports.ModelExplorer=e.ModelExplorer;exports.ModelExplorerDialog=e.ModelExplorerDialog;exports.Notebook=e.Notebook;exports.Package=e.Package;exports.Packages=e.Packages;exports.QueryResult=e.QueryResult;exports.RenderedResult=e.RenderedResult;exports.ResultContainer=e.ResultContainer;exports.SourceExplorerComponent=e.SourceExplorerComponent;exports.SourcesExplorer=e.SourcesExplorer;exports.Workbook=e.Workbook;exports.WorkbookList=e.WorkbookList;exports.WorkbookManager=e.WorkbookManager;exports.WorkbookStorageProvider=e.WorkbookStorageProvider;exports.createEmbeddedQueryResult=e.createEmbeddedQueryResult;exports.encodeResourceUri=e.encodeResourceUri;exports.extractDimensionSpecs=e.extractDimensionSpecs;exports.extractSourceFromQuery=e.extractSourceFromQuery;exports.generateFilterClause=e.generateFilterClause;exports.getDimensionKey=e.getDimensionKey;exports.getJoinedSources=e.getJoinedSources;exports.injectWhereClause=e.injectWhereClause;exports.makeDimensionKey=e.makeDimensionKey;exports.parseAllSourceInfos=e.parseAllSourceInfos;exports.parseDimensionFilterAnnotation=e.parseDimensionFilterAnnotation;exports.parseNotebookFilterAnnotation=e.parseNotebookFilterAnnotation;exports.parseResourceUri=e.parseResourceUri;exports.useDimensionFilters=e.useDimensionFilters;exports.useDimensionFiltersFromSpec=e.useDimensionFiltersFromSpec;exports.useDimensionFiltersQuery=e.useDimensionFiltersQuery;exports.useDimensionalFilterRangeData=e.useDimensionalFilterRangeData;exports.useGivensForm=e.useGivensForm;exports.useModelData=e.useModelData;exports.useModelGivens=e.useModelGivens;exports.useRawQueryData=e.useRawQueryData;exports.useRouterClickHandler=e.useRouterClickHandler;exports.ServerProvider=o.ServerProvider;exports.useServer=o.useServer;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-C2OvwukW.cjs.js"),o=require("./ServerProvider-BSyxB6sf.cjs.js");exports.AnalyzePackageButton=e.AnalyzePackageButton;exports.BrowserWorkbookStorage=e.BrowserWorkbookStorage;exports.ConnectionExplorer=e.ConnectionExplorer;exports.DimensionFilter=e.DimensionFilter;exports.EmbeddedQueryResult=e.EmbeddedQueryResult;exports.Environment=e.Environment;exports.Home=e.Home;exports.Loading=e.Loading;exports.Model=e.Model;exports.ModelExplorer=e.ModelExplorer;exports.ModelExplorerDialog=e.ModelExplorerDialog;exports.Models=e.Models;exports.Notebook=e.Notebook;exports.Package=e.Package;exports.Packages=e.Packages;exports.QueryResult=e.QueryResult;exports.RenderedResult=e.RenderedResult;exports.ResultContainer=e.ResultContainer;exports.SourceExplorerComponent=e.SourceExplorerComponent;exports.SourcesExplorer=e.SourcesExplorer;exports.Workbook=e.Workbook;exports.WorkbookList=e.WorkbookList;exports.WorkbookManager=e.WorkbookManager;exports.WorkbookStorageProvider=e.WorkbookStorageProvider;exports.createEmbeddedQueryResult=e.createEmbeddedQueryResult;exports.encodeResourceUri=e.encodeResourceUri;exports.extractDimensionSpecs=e.extractDimensionSpecs;exports.extractSourceFromQuery=e.extractSourceFromQuery;exports.generateFilterClause=e.generateFilterClause;exports.getDimensionKey=e.getDimensionKey;exports.getJoinedSources=e.getJoinedSources;exports.injectWhereClause=e.injectWhereClause;exports.makeDimensionKey=e.makeDimensionKey;exports.parseAllSourceInfos=e.parseAllSourceInfos;exports.parseDimensionFilterAnnotation=e.parseDimensionFilterAnnotation;exports.parseNotebookFilterAnnotation=e.parseNotebookFilterAnnotation;exports.parseResourceUri=e.parseResourceUri;exports.useDimensionFilters=e.useDimensionFilters;exports.useDimensionFiltersFromSpec=e.useDimensionFiltersFromSpec;exports.useDimensionFiltersQuery=e.useDimensionFiltersQuery;exports.useDimensionalFilterRangeData=e.useDimensionalFilterRangeData;exports.useGivensForm=e.useGivensForm;exports.useModelData=e.useModelData;exports.useModelGivens=e.useModelGivens;exports.useRawQueryData=e.useRawQueryData;exports.useRouterClickHandler=e.useRouterClickHandler;exports.ServerProvider=o.ServerProvider;exports.useServer=o.useServer;

package/dist/index.es.js

@@ -1,5 +1,5 @@
-import { A as a, I as o, C as r, D as n, x as i, E as t, H as u, L as l, M as m, o as c, q as d, N as k, v as p, P as D, Q as g, R as S, B as F, r as R, S as x, W as y, F as b, J as E, G as v, y as C, $ as M, g as Q, i as W, j as P, V as A, k as f, l as B, X as G, p as H, m as K, n as L, _ as N, K as U, O as j, T as w, U as I, Z as J, t as h, Y as q, u as z, e as O } from "./index-uW-ZBpF2.es.js";
-import { S as V, u as X } from "./ServerProvider-DSnbMlP3.es.js";
+import { A as a, J as o, C as r, D as n, y as i, E as t, H as l, L as u, M as m, o as d, q as c, x as k, N as p, v as D, P as g, Q as S, R as F, F as R, r as x, S as y, W as b, G as E, K as v, I as M, B as C, a0 as Q, g as W, i as P, j as A, X as f, k as B, l as G, Y as H, p as K, m as L, n as N, $ as U, O as j, T as w, U as I, V as J, _ as h, t as q, Z as z, u as O, e as T } from "./index-B0i0wzpF.es.js";
+import { S as X, u as Y } from "./ServerProvider-DSnbMlP3.es.js";
 export {
   a as AnalyzePackageButton,
   o as BrowserWorkbookStorage,
@@ -7,45 +7,46 @@ export {
   n as DimensionFilter,
   i as EmbeddedQueryResult,
   t as Environment,
-  u as Home,
-  l as Loading,
+  l as Home,
+  u as Loading,
   m as Model,
-  c as ModelExplorer,
-  d as ModelExplorerDialog,
-  k as Notebook,
-  p as Package,
-  D as Packages,
-  g as QueryResult,
-  S as RenderedResult,
-  F as ResultContainer,
-  V as ServerProvider,
-  R as SourceExplorerComponent,
-  x as SourcesExplorer,
-  y as Workbook,
-  b as WorkbookList,
-  E as WorkbookManager,
-  v as WorkbookStorageProvider,
+  d as ModelExplorer,
+  c as ModelExplorerDialog,
+  k as Models,
+  p as Notebook,
+  D as Package,
+  g as Packages,
+  S as QueryResult,
+  F as RenderedResult,
+  R as ResultContainer,
+  X as ServerProvider,
+  x as SourceExplorerComponent,
+  y as SourcesExplorer,
+  b as Workbook,
+  E as WorkbookList,
+  v as WorkbookManager,
+  M as WorkbookStorageProvider,
   C as createEmbeddedQueryResult,
-  M as encodeResourceUri,
-  Q as extractDimensionSpecs,
-  W as extractSourceFromQuery,
-  P as generateFilterClause,
-  A as getDimensionKey,
-  f as getJoinedSources,
-  B as injectWhereClause,
-  G as makeDimensionKey,
-  H as parseAllSourceInfos,
-  K as parseDimensionFilterAnnotation,
-  L as parseNotebookFilterAnnotation,
-  N as parseResourceUri,
-  U as useDimensionFilters,
-  j as useDimensionFiltersFromSpec,
-  w as useDimensionFiltersQuery,
-  I as useDimensionalFilterRangeData,
-  J as useGivensForm,
-  h as useModelData,
-  q as useModelGivens,
-  z as useRawQueryData,
-  O as useRouterClickHandler,
-  X as useServer
+  Q as encodeResourceUri,
+  W as extractDimensionSpecs,
+  P as extractSourceFromQuery,
+  A as generateFilterClause,
+  f as getDimensionKey,
+  B as getJoinedSources,
+  G as injectWhereClause,
+  H as makeDimensionKey,
+  K as parseAllSourceInfos,
+  L as parseDimensionFilterAnnotation,
+  N as parseNotebookFilterAnnotation,
+  U as parseResourceUri,
+  j as useDimensionFilters,
+  w as useDimensionFiltersFromSpec,
+  I as useDimensionFiltersQuery,
+  J as useDimensionalFilterRangeData,
+  h as useGivensForm,
+  q as useModelData,
+  z as useModelGivens,
+  O as useRawQueryData,
+  T as useRouterClickHandler,
+  Y as useServer
 };

package/package.json

@@ -1,7 +1,7 @@
 {
    "name": "@malloy-publisher/sdk",
    "description": "Malloy Publisher SDK",
-   "version": "0.0.201",
+   "version": "0.0.202",
    "type": "module",
    "main": "dist/index.cjs.js",
    "module": "dist/index.es.js",

package/src/components/Package/FileTreeView.tsx

@@ -0,0 +1,241 @@
+import * as React from "react";
+import {
+   TreeItem2Content,
+   TreeItem2Label,
+   TreeItem2Root,
+   TreeItem2IconContainer,
+} from "@mui/x-tree-view/TreeItem2";
+import { RichTreeView } from "@mui/x-tree-view/RichTreeView";
+import { TreeItem2Provider } from "@mui/x-tree-view/TreeItem2Provider";
+import { TreeViewBaseItem } from "@mui/x-tree-view/models";
+import {
+   unstable_useTreeItem2 as useTreeItem2,
+   UseTreeItem2Parameters,
+} from "@mui/x-tree-view/useTreeItem2";
+import { TreeItem2Icon } from "@mui/x-tree-view/TreeItem2Icon";
+import FolderIcon from "@mui/icons-material/FolderOutlined";
+import ArticleIcon from "@mui/icons-material/ArticleOutlined";
+import ErrorIcon from "@mui/icons-material/ErrorOutlined";
+import { TransitionProps } from "@mui/material/transitions";
+import { animated, useSpring } from "@react-spring/web";
+import Collapse from "@mui/material/Collapse";
+import DnsIcon from "@mui/icons-material/DnsOutlined";
+import DataArrayIcon from "@mui/icons-material/DataArrayOutlined";
+import { Database, Model } from "../../client";
+import { Typography, Tooltip } from "@mui/material";
+
+interface FiieTreeViewProps {
+   items: Model[] | Database[];
+   defaultExpandedItems: string[];
+   onClickTreeNode?: (to: string, event?: React.MouseEvent) => void;
+}
+
+export function FileTreeView({
+   items,
+   defaultExpandedItems,
+   onClickTreeNode,
+}: FiieTreeViewProps) {
+   return (
+      <RichTreeView
+         items={getTreeView(items, onClickTreeNode)}
+         defaultExpandedItems={defaultExpandedItems}
+         slots={{ item: CustomTreeItem }}
+      />
+   );
+}
+
+const AnimatedCollapse = animated(Collapse);
+
+function TransitionComponent(props: TransitionProps) {
+   const style = useSpring({
+      to: {
+         opacity: props.in ? 1 : 0,
+         transform: `translate3d(0,${props.in ? 0 : 20}px,0)`,
+      },
+   });
+
+   return <AnimatedCollapse style={style} {...props} />;
+}
+
+type FileType = "directory" | "model" | "notebook" | "database" | "unknown";
+
+type ExtendedTreeItemProps = {
+   id: string;
+   label: string;
+   fileType: FileType;
+   selectable: boolean;
+   link: ((event?: React.MouseEvent) => void) | undefined;
+   error?: string;
+};
+
+interface CustomLabelProps {
+   item: ExtendedTreeItemProps;
+}
+
+function CustomTreeItem2Label({ item, ...other }: CustomLabelProps) {
+   const label = (
+      <TreeItem2Label
+         {...other}
+         sx={{
+            display: "flex",
+            alignItems: "center",
+            color: item.error ? "error.main" : "grey.600",
+         }}
+      >
+         {(item.fileType === "directory" && <FolderIcon />) ||
+            (item.fileType === "notebook" && <ArticleIcon />) ||
+            (item.fileType === "model" && <DataArrayIcon />) ||
+            (item.fileType == "database" && <DnsIcon />) || <ErrorIcon />}
+         <Typography
+            variant="body2"
+            sx={{ marginLeft: "5px" }}
+            color={
+               item.error
+                  ? "error.main"
+                  : item.link
+                    ? "primary.main"
+                    : "grey.600"
+            }
+         >
+            {item.label}
+         </Typography>
+      </TreeItem2Label>
+   );
+
+   return item.error ? (
+      <Tooltip title={item.error} placement="right">
+         {label}
+      </Tooltip>
+   ) : (
+      label
+   );
+}
+
+interface CustomTreeItemProps
+   extends Omit<UseTreeItem2Parameters, "rootRef">,
+      Omit<React.HTMLAttributes<HTMLLIElement>, "onFocus"> {}
+
+const CustomTreeItem = React.forwardRef(function CustomTreeItem(
+   props: CustomTreeItemProps,
+   ref: React.Ref<HTMLLIElement>,
+) {
+   const { id, itemId, label, children, disabled, ...other } = props;
+   const {
+      getRootProps,
+      getContentProps,
+      getLabelProps,
+      getIconContainerProps,
+      getGroupTransitionProps,
+      status,
+      publicAPI,
+   } = useTreeItem2({
+      id,
+      itemId,
+      children,
+      label,
+      disabled,
+      rootRef: ref,
+   });
+
+   const item = publicAPI.getItem(itemId);
+
+   // Disable select and focus. We want to either click through to a model or notebook or just exapnd
+   // collapse
+   status.selected = false;
+   status.focused = false;
+
+   return (
+      <TreeItem2Provider itemId={itemId}>
+         <TreeItem2Root {...getRootProps(other)}>
+            <TreeItem2Content
+               {...getContentProps()}
+               {...(item.link && {
+                  onClick: (event) => item.link(event),
+               })}
+               sx={{
+                  // If the item is not selectable, disable pointer events.
+                  pointerEvents: !item.selectable && "none",
+               }}
+            >
+               <TreeItem2IconContainer {...getIconContainerProps()}>
+                  <TreeItem2Icon status={status} />
+               </TreeItem2IconContainer>
+               <CustomTreeItem2Label
+                  {...getLabelProps({
+                     item,
+                  })}
+               />
+            </TreeItem2Content>
+            {children && <TransitionComponent {...getGroupTransitionProps()} />}
+         </TreeItem2Root>
+      </TreeItem2Provider>
+   );
+});
+
+function getTreeView(
+   metadataEntries: Model[] | Database[],
+   onClickTreeNode: (to: string, event?: React.MouseEvent) => void,
+): TreeViewBaseItem<ExtendedTreeItemProps>[] {
+   const tree = new Map<string, unknown>();
+   metadataEntries.map((entry: Model | Database) => {
+      let node = tree;
+      const pathParts = entry.path.split("/");
+      pathParts.forEach((part, index) => {
+         if (index === pathParts.length - 1) {
+            node.set(part, entry);
+         } else if (!node.has(part)) {
+            node.set(part, new Map<string, unknown>());
+            node = node.get(part) as Map<string, unknown>;
+         } else {
+            node = node.get(part) as Map<string, unknown>;
+         }
+      });
+   });
+   return getTreeViewRecursive(tree, "", onClickTreeNode);
+}
+
+function getTreeViewRecursive(
+   node: Map<string, unknown>,
+   path: string,
+   onClickNode: (to: string, event?: React.MouseEvent) => void,
+): TreeViewBaseItem<ExtendedTreeItemProps>[] {
+   const treeViewItems: TreeViewBaseItem<ExtendedTreeItemProps>[] = [];
+   node.forEach((value, key) => {
+      const fileType =
+         (key.endsWith(".malloy") && "model") ||
+         (key.endsWith(".malloynb") && "notebook") ||
+         (key.endsWith(".parquet") && "database") ||
+         "unknown";
+      if (fileType !== "unknown") {
+         // This is a model or database.
+         const entry = value as Model | Database;
+         treeViewItems.push({
+            id: path + key,
+            label: key,
+            fileType: fileType,
+            link:
+               fileType === "model" || fileType === "notebook"
+                  ? (event) => onClickNode(path + key, event)
+                  : undefined,
+            selectable: fileType === "model" || fileType === "notebook",
+            error: "error" in entry ? entry.error : undefined,
+         });
+      } else {
+         // This is a directory.
+         const childPath = path + key + "/";
+         treeViewItems.push({
+            id: childPath,
+            label: key,
+            fileType: "directory",
+            selectable: true,
+            link: undefined,
+            children: getTreeViewRecursive(
+               value as Map<string, unknown>,
+               childPath,
+               onClickNode,
+            ),
+         });
+      }
+   });
+   return treeViewItems;
+}

package/src/components/Package/Models.tsx

@@ -0,0 +1,68 @@
+import { Box, Typography } from "@mui/material";
+import { useQueryWithApiError } from "../../hooks/useQueryWithApiError";
+import { ApiErrorDisplay } from "../ApiErrorDisplay";
+import { Loading } from "../Loading";
+import {
+   PackageCard,
+   PackageCardContent,
+   PackageSectionTitle,
+} from "../styles";
+import { FileTreeView } from "./FileTreeView";
+import { parseResourceUri } from "../../utils/formatting";
+import { useServer } from "../ServerProvider";
+
+const DEFAULT_EXPANDED_FOLDERS = ["notebooks/", "models/"];
+
+interface ModelsProps {
+   onClickModelFile: (to: string, event?: React.MouseEvent) => void;
+   resourceUri: string;
+}
+
+export default function Models({ onClickModelFile, resourceUri }: ModelsProps) {
+   const {
+      environmentName: environmentName,
+      packageName: packageName,
+      versionId: versionId,
+   } = parseResourceUri(resourceUri);
+   const { apiClients } = useServer();
+
+   const { data, isError, error, isSuccess } = useQueryWithApiError({
+      queryKey: ["models", environmentName, packageName, versionId],
+      queryFn: () =>
+         apiClients.models.listModels(environmentName, packageName, versionId),
+   });
+
+   return (
+      <PackageCard>
+         <PackageCardContent>
+            <PackageSectionTitle>Semantic Models</PackageSectionTitle>
+            <Box
+               sx={{
+                  maxHeight: "200px",
+                  overflowY: "auto",
+               }}
+            >
+               {!isSuccess && !isError && <Loading text="Fetching Models..." />}
+               {isError && (
+                  <ApiErrorDisplay
+                     error={error}
+                     context={`${environmentName} > ${packageName} > Models`}
+                  />
+               )}
+               {isSuccess && data.data.length > 0 && (
+                  <FileTreeView
+                     items={data.data.sort((a, b) => {
+                        return a.path.localeCompare(b.path);
+                     })}
+                     onClickTreeNode={onClickModelFile}
+                     defaultExpandedItems={DEFAULT_EXPANDED_FOLDERS}
+                  />
+               )}
+               {isSuccess && data.data.length === 0 && (
+                  <Typography variant="body2">No models found</Typography>
+               )}
+            </Box>
+         </PackageCardContent>
+      </PackageCard>
+   );
+}

package/src/components/Package/index.ts

@@ -1 +1,2 @@
 export { default as Package } from "./Package";
+export { default as Models } from "./Models";