@vitessce/vit-s 3.6.7 → 3.6.9

package/dist-tsc/TitleInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TitleInfo.d.ts","sourceRoot":"","sources":["../src/TitleInfo.js"],"names":[],"mappings":"AA6JA,mDA6DC"}
+{"version":3,"file":"TitleInfo.d.ts","sourceRoot":"","sources":["../src/TitleInfo.js"],"names":[],"mappings":"AAmNA,mDAoEC"}

package/dist-tsc/TitleInfo.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useState, useMemo } from 'react';
 import clsx from 'clsx';
-import { makeStyles, MenuItem, IconButton, Link, CloudDownload as CloudDownloadIcon, ArrowDropDown as ArrowDropDownIcon, ArrowDropUp as ArrowDropUpIcon, Settings as SettingsIcon, Close as CloseIcon, Help as HelpIcon, } from '@vitessce/styles';
+import { makeStyles, MenuItem, IconButton, Link, List, Alert, CloudDownload as CloudDownloadIcon, ArrowDropDown as ArrowDropDownIcon, ArrowDropUp as ArrowDropUpIcon, Settings as SettingsIcon, Close as CloseIcon, Help as HelpIcon, Warning as WarningIcon, } from '@vitessce/styles';
 import { TOOLTIP_ANCESTOR } from './classNames.js';
 import LoadingIndicator from './LoadingIndicator.js';
 import { PopperMenu } from './shared-mui/components.js';
@@ -46,6 +46,18 @@ const useStyles = makeStyles()(theme => ({
         boxShadow: '0 0 10px rgba(0, 0, 0, 0.2)',
         border: '10px solid grey',
     },
+    errorList: {
+        width: '100%',
+        maxWidth: 300,
+        padding: '0 4px',
+    },
+    errorListAlert: {
+        marginTop: '2px',
+        marginBottom: '2px',
+    },
+    errorListItemText: {
+        fontSize: '12px',
+    },
 }));
 function SettingsIconWithArrow({ open }) {
     return (_jsxs(_Fragment, { children: [_jsx(SettingsIcon, {}), open ? _jsx(ArrowDropUpIcon, {}) : _jsx(ArrowDropDownIcon, {})] }));
@@ -55,7 +67,7 @@ function PlotOptions(props) {
     const [open, setOpen] = useState(false);
     const { classes } = useStyles();
     const buttonIcon = useMemo(() => (_jsx(SettingsIconWithArrow, { open: open })), [open]);
-    return (options ? (_jsx(PopperMenu, { open: open, setOpen: setOpen, buttonIcon: buttonIcon, buttonClassName: classes.iconButton, placement: "bottom-end", "aria-label": "Open plot options menu", children: options })) : null);
+    return (options ? (_jsx(PopperMenu, { open: open, setOpen: setOpen, buttonIcon: buttonIcon, buttonClassName: classes.iconButton, placement: "bottom-end", title: "Plot Options", "aria-label": "Open plot options menu", children: options })) : null);
 }
 function CloudDownloadIconWithArrow({ open }) {
     return (_jsxs(_Fragment, { children: [_jsx(CloudDownloadIcon, {}), open ? _jsx(ArrowDropUpIcon, {}) : _jsx(ArrowDropDownIcon, {})] }));
@@ -65,25 +77,34 @@ function DownloadOptions(props) {
     const [open, setOpen] = useState(false);
     const { classes } = useStyles();
     const buttonIcon = useMemo(() => (_jsx(CloudDownloadIconWithArrow, { open: open })), [open]);
-    return (urls && urls.length ? (_jsx(PopperMenu, { open: open, setOpen: setOpen, buttonIcon: buttonIcon, buttonClassName: classes.iconButton, placement: "bottom-end", "aria-label": "Open download options menu", children: urls.map(({ url, name }) => (_jsx(MenuItem, { dense: true, "aria-label": `Click to download ${name}`, children: _jsxs(Link, { underline: "always", href: url, target: "_blank", rel: "noopener", className: classes.downloadLink, children: ["Download ", name] }) }, `${url}_${name}`))) })) : null);
+    return (urls && urls.length ? (_jsx(PopperMenu, { open: open, setOpen: setOpen, buttonIcon: buttonIcon, buttonClassName: classes.iconButton, placement: "bottom-end", title: "Download Options", "aria-label": "Open download options menu", children: urls.map(({ url, name }) => (_jsx(MenuItem, { dense: true, "aria-label": `Click to download ${name}`, children: _jsxs(Link, { underline: "always", href: url, target: "_blank", rel: "noopener", className: classes.downloadLink, children: ["Download ", name] }) }, `${url}_${name}`))) })) : null);
 }
 function HelpButton(props) {
     const { helpText } = props;
     const [open, setOpen] = useState(false);
     const { classes } = useStyles();
-    return (_jsx(PopperMenu, { open: open, setOpen: setOpen, buttonIcon: _jsx(HelpIcon, {}), buttonClassName: classes.iconButton, placement: "bottom-end", "aria-label": "Open help info", withPaper: false, children: _jsx("span", { className: classes.helpTextSpan, children: helpText }) }));
+    return (_jsx(PopperMenu, { open: open, setOpen: setOpen, buttonIcon: _jsx(HelpIcon, {}), buttonClassName: classes.iconButton, placement: "bottom-end", title: "Help Info", "aria-label": "Open help info", withPaper: false, children: _jsx("span", { className: classes.helpTextSpan, children: helpText }) }));
+}
+function ErrorInfo(props) {
+    const { errors } = props;
+    const [open, setOpen] = useState(false);
+    const { classes } = useStyles();
+    return (_jsx(PopperMenu, { open: open, setOpen: setOpen, buttonIcon: _jsx(WarningIcon, { color: "error" }), buttonClassName: classes.iconButton, placement: "bottom-end", title: "View Errors", "aria-label": "Open error info", children: _jsx(List, { className: classes.errorList, children: errors.map((error, index) => (_jsxs(Alert
+            // eslint-disable-next-line react/no-array-index-key
+            , { severity: "error", className: classes.errorListAlert, slots: { message: 'span' }, slotProps: { message: { className: classes.errorListItemText } }, children: [error.name, ": ", error.message] }, `${index}-${error.name}-${error.message}`))) }) }));
 }
 function ClosePaneButton(props) {
     const { removeGridComponent } = props;
     const { classes } = useStyles();
-    return (_jsx(IconButton, { onClick: removeGridComponent, size: "small", className: classes.iconButton, title: "close", "aria-label": "Close panel button", children: _jsx(CloseIcon, {}) }));
+    return (_jsx(IconButton, { onClick: removeGridComponent, size: "small", className: classes.iconButton, title: "Close View", "aria-label": "Close panel button", children: _jsx(CloseIcon, {}) }));
 }
 export function TitleInfo(props) {
-    const { title, info, children, isScroll, isSpatial, removeGridComponent, urls, isReady, options, closeButtonVisible = true, downloadButtonVisible = true, helpText, withPadding = true, } = props;
+    const { title, info, children, isScroll, isSpatial, removeGridComponent, urls, isReady, options, closeButtonVisible = true, downloadButtonVisible = true, helpText, withPadding = true, errors: errorsProp, } = props;
+    const errors = errorsProp?.filter(Boolean);
     const { classes } = useTitleStyles();
     return (
     // d-flex without wrapping div is not always full height; I don't understand the root cause.
-    _jsxs(_Fragment, { children: [_jsxs("div", { className: classes.title, role: "banner", children: [_jsx("div", { className: classes.titleLeft, role: "heading", "aria-level": "1", children: title }), _jsx("div", { className: classes.titleInfo, title: info, role: "note", children: info }), _jsxs("div", { className: classes.titleButtons, role: "toolbar", "aria-label": "Plot options and controls", children: [_jsx(PlotOptions, { options: options }), downloadButtonVisible ? (_jsx(DownloadOptions, { urls: urls })) : null, helpText ? (_jsx(HelpButton, { helpText: helpText })) : null, closeButtonVisible && removeGridComponent ? (_jsx(ClosePaneButton, { removeGridComponent: removeGridComponent })) : null] })] }), _jsxs("div", { className: clsx(TOOLTIP_ANCESTOR, classes.card, {
+    _jsxs(_Fragment, { children: [_jsxs("div", { className: classes.title, role: "banner", children: [_jsx("div", { className: classes.titleLeft, role: "heading", "aria-level": "1", children: title }), _jsx("div", { className: classes.titleInfo, title: info, role: "note", children: info }), _jsxs("div", { className: classes.titleButtons, role: "toolbar", "aria-label": "Plot options and controls", children: [_jsx(PlotOptions, { options: options }), downloadButtonVisible ? (_jsx(DownloadOptions, { urls: urls })) : null, Array.isArray(errors) && errors.length > 0 ? (_jsx(ErrorInfo, { errors: errors })) : null, helpText ? (_jsx(HelpButton, { helpText: helpText })) : null, closeButtonVisible && removeGridComponent ? (_jsx(ClosePaneButton, { removeGridComponent: removeGridComponent })) : null] })] }), _jsxs("div", { className: clsx(TOOLTIP_ANCESTOR, classes.card, {
                     [classes.scrollCard]: isScroll,
                     [classes.spatialCard]: isSpatial,
                     [classes.noScrollCard]: !isScroll && !isSpatial,

package/dist-tsc/VitS.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VitS.d.ts","sourceRoot":"","sources":["../src/VitS.js"],"names":[],"mappings":"AAoCA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,4BApCG;IAAsB,MAAM,EAApB,MAAM;IAGkB,SAAS,EAAjC,SAAS,GAAC,MAAM;IACF,MAAM,EAApB,MAAM;IACQ,KAAK,EAAnB,MAAM;IAEU,MAAM;IACN,cAAc;IAEd,cAAc;IAEf,cAAc,EAA7B,OAAO;IAIQ,sBAAsB,EAArC,OAAO;IAGY,GAAG,EAAtB,IAAI,GAAC,MAAM;IAGW,cAAc,EAApC,SAAS,GAAC,IAAI;IAEC,kBAAkB,EAAjC,OAAO;IAEM,SAAS,EAAtB,KAAK;IACQ,SAAS,EAAtB,KAAK;IACQ,cAAc,EAA3B,KAAK;IACQ,iBAAiB,EAA9B,KAAK;IACc,OAAO,EAA1B,IAAI,GAAC,MAAM;IACI,QAAQ,EAAvB,OAAO;IACQ,SAAS,EAAxB,OAAO;IACY,QAAQ,EAA3B,IAAI,GAAC,MAAM;CAErB,eAiPA"}
+{"version":3,"file":"VitS.d.ts","sourceRoot":"","sources":["../src/VitS.js"],"names":[],"mappings":"AAqCA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,4BApCG;IAAsB,MAAM,EAApB,MAAM;IAGkB,SAAS,EAAjC,SAAS,GAAC,MAAM;IACF,MAAM,EAApB,MAAM;IACQ,KAAK,EAAnB,MAAM;IAEU,MAAM;IACN,cAAc;IAEd,cAAc;IAEf,cAAc,EAA7B,OAAO;IAIQ,sBAAsB,EAArC,OAAO;IAGY,GAAG,EAAtB,IAAI,GAAC,MAAM;IAGW,cAAc,EAApC,SAAS,GAAC,IAAI;IAEC,kBAAkB,EAAjC,OAAO;IAEM,SAAS,EAAtB,KAAK;IACQ,SAAS,EAAtB,KAAK;IACQ,cAAc,EAA3B,KAAK;IACQ,iBAAiB,EAA9B,KAAK;IACc,OAAO,EAA1B,IAAI,GAAC,MAAM;IACI,QAAQ,EAAvB,OAAO;IACQ,SAAS,EAAxB,OAAO;IACY,QAAQ,EAA3B,IAAI,GAAC,MAAM;CAErB,eA0PA"}

package/dist-tsc/VitS.js

@@ -1,10 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useState, useEffect, useMemo, useCallback, useLayoutEffect } from 'react';
 import { ThemeProvider, CacheProvider, createCache, } from '@vitessce/styles';
-import { QueryClient, QueryClientProvider, } from '@tanstack/react-query';
+import { QueryCache, QueryClient, QueryClientProvider, } from '@tanstack/react-query';
 import { isEqual } from 'lodash-es';
 import { buildConfigSchema, latestConfigSchema } from '@vitessce/schemas';
-import { setLogLevel, setDebugMode, DEFAULT_LOG_LEVEL, DEFAULT_DEBUG_MODE, } from '@vitessce/globals';
+import { log, setLogLevel, setDebugMode, DEFAULT_LOG_LEVEL, DEFAULT_DEBUG_MODE, } from '@vitessce/globals';
 import { muiTheme } from './shared-mui/styles.js';
 import { ViewConfigProvider, createViewConfigStore, AuxiliaryProvider, createAuxiliaryStore, } from './state/hooks.js';
 import VitessceGrid from './VitessceGrid.js';
@@ -140,6 +140,15 @@ export function VitS(props) {
                 retry: 2,
             },
         },
+        // Reference: https://tkdodo.eu/blog/react-query-error-handling#the-global-callbacks
+        queryCache: new QueryCache({
+            onError: (error) => {
+                log.error(error);
+                if (onWarn) {
+                    onWarn(error.message);
+                }
+            },
+        }),
         // TODO: should the queryClient be shared? Or have an option to be shared
         // (e.g., based on remountOnUidChange)?
     }), [configKey]);

package/dist-tsc/data-hook-utils.d.ts

@@ -1,9 +1,3 @@
-/**
- * Warn via publishing to the console
- * and to the global warning store.
- * @param {AbstractLoaderError} error An error instance.
- */
-export function warn(error: AbstractLoaderError, setWarning: any): void;
 /**
  * Initialize values in the coordination space.
  * @param {object} values Object where
@@ -34,7 +28,7 @@ export function dataQueryFn(ctx: any): Promise<any>;
  * @param {object} initialCoordinationValues Object where
  * keys are coordination type names with the prefix 'initialize',
  * values are initialization preferences as boolean values.
- * @returns {array} [data, status, urls] where
+ * @returns {array} [data, status, urls, error] where
  * cells is an object and cellsCount is the
  * number of items in the cells object.
  */
@@ -56,11 +50,11 @@ export function useDataType(dataType: any, loaders: object, dataset: string, isR
  * @param {object} initialCoordinationValues Object where
  * keys are coordination type names with the prefix 'initialize',
  * values are initialization preferences as boolean values.
- * @returns {array} [cells, cellsCount] where
- * cells is an object and cellsCount is the
- * number of items in the cells object.
+ * @param {object} matchOnObj Coordination values used to obtain a matching loader.
+ * @param {function} mergeCoordination Function to merge coordination values.
+ * @param {string} viewUid The view UID to use for merging coordination values.
+ * @returns {array} [data, status, urls, errors]
  */
-export function useDataTypeMulti(dataType: any, loaders: object, dataset: string, isRequired: boolean, coordinationSetters: object, initialCoordinationValues: object, matchOnObj: any, mergeCoordination: any, viewUid: any): array;
+export function useDataTypeMulti(dataType: any, loaders: object, dataset: string, isRequired: boolean, coordinationSetters: object, initialCoordinationValues: object, matchOnObj: object, mergeCoordination: Function, viewUid: string): array;
 export function useHasLoader(loaders: any, dataset: any, dataType: any, matchOn: any): boolean;
-import { AbstractLoaderError } from '@vitessce/abstract';
 //# sourceMappingURL=data-hook-utils.d.ts.map

package/dist-tsc/data-hook-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-hook-utils.d.ts","sourceRoot":"","sources":["../src/data-hook-utils.js"],"names":[],"mappings":"AAkBA;;;;GAIG;AACH,4BAFW,mBAAmB,yBAS7B;AAED;;;;;;;;;;GAUG;AACH,8CATW,MAAM,WAGN,MAAM,iBAGN,MAAM,QAiBhB;AAGD,oDAuBC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,oDAhBW,MAAM,WAEN,MAAM,cAEN,OAAO,uBAEP,MAAM,6BAGN,MAAM,iBAGJ,KAAK,CAiDjB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,yDAhBW,MAAM,WAEN,MAAM,cAEN,OAAO,uBAEP,MAAM,6BAGN,MAAM,0DAGJ,KAAK,CAsFjB;AAED,+FAGC;oCA1PM,oBAAoB"}
+{"version":3,"file":"data-hook-utils.d.ts","sourceRoot":"","sources":["../src/data-hook-utils.js"],"names":[],"mappings":"AAeA;;;;;;;;;;GAUG;AACH,8CATW,MAAM,WAGN,MAAM,iBAGN,MAAM,QAiBhB;AAGD,oDAuBC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,oDAhBW,MAAM,WAEN,MAAM,cAEN,OAAO,uBAEP,MAAM,6BAGN,MAAM,iBAGJ,KAAK,CAwCjB;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,yDAjBW,MAAM,WAEN,MAAM,cAEN,OAAO,uBAEP,MAAM,6BAGN,MAAM,cAGN,MAAM,wCAEN,MAAM,GACJ,KAAK,CA2EjB;AAED,+FAGC"}

package/dist-tsc/data-hook-utils.js

@@ -1,23 +1,9 @@
 import { useEffect, useMemo } from 'react';
 import { useQuery, useQueries } from '@tanstack/react-query';
 import { capitalize, getInitialCoordinationScopePrefix, } from '@vitessce/utils';
-import { log } from '@vitessce/globals';
 import { STATUS } from '@vitessce/constants-internal';
-import { AbstractLoaderError, LoaderNotFoundError, } from '@vitessce/abstract';
-import { getMatchingLoader, useMatchingLoader, useSetWarning, } from './state/hooks.js';
-/**
- * Warn via publishing to the console
- * and to the global warning store.
- * @param {AbstractLoaderError} error An error instance.
- */
-export function warn(error, setWarning) {
-    setWarning(error.message);
-    log.warn(error.message);
-    log.error(error.stack);
-    if (error instanceof AbstractLoaderError) {
-        error.warnInConsole();
-    }
-}
+import { LoaderNotFoundError, } from '@vitessce/error';
+import { getMatchingLoader, useMatchingLoader, } from './state/hooks.js';
 /**
  * Initialize values in the coordination space.
  * @param {object} values Object where
@@ -63,7 +49,7 @@ export async function dataQueryFn(ctx) {
     // No loader was found.
     if (isRequired) {
         // Status: error
-        throw new LoaderNotFoundError(loaders, dataset, dataType, matchOn);
+        throw new LoaderNotFoundError(`Loader not found for parameters: ${dataset}, ${dataType}, ${JSON.stringify(matchOn)}`);
     }
     else {
         // Status: success
@@ -87,12 +73,11 @@ export async function dataQueryFn(ctx) {
  * @param {object} initialCoordinationValues Object where
  * keys are coordination type names with the prefix 'initialize',
  * values are initialization preferences as boolean values.
- * @returns {array} [data, status, urls] where
+ * @returns {array} [data, status, urls, error] where
  * cells is an object and cellsCount is the
  * number of items in the cells object.
  */
 export function useDataType(dataType, loaders, dataset, isRequired, coordinationSetters, initialCoordinationValues, matchOn) {
-    const setWarning = useSetWarning();
     const placeholderObject = useMemo(() => ({}), []);
     const dataQuery = useQuery({
         // TODO: only enable when loaders has been initialized?
@@ -113,17 +98,11 @@ export function useDataType(dataType, loaders, dataset, isRequired, coordination
     const loadedData = data?.data || placeholderObject;
     const coordinationValues = data?.coordinationValues;
     const urls = data?.urls;
-    const requestInit = data?.requestInit;
     useEffect(() => {
         initCoordinationSpace(coordinationValues, coordinationSetters, initialCoordinationValues);
     }, [coordinationValues]);
-    useEffect(() => {
-        if (error) {
-            warn(error, setWarning);
-        }
-    }, [error, setWarning]);
     const dataStatus = isFetching ? STATUS.LOADING : status;
-    return [loadedData, dataStatus, urls, requestInit];
+    return [loadedData, dataStatus, urls, error];
 }
 /**
  * Get data from a cells data type loader,
@@ -142,13 +121,13 @@ export function useDataType(dataType, loaders, dataset, isRequired, coordination
  * @param {object} initialCoordinationValues Object where
  * keys are coordination type names with the prefix 'initialize',
  * values are initialization preferences as boolean values.
- * @returns {array} [cells, cellsCount] where
- * cells is an object and cellsCount is the
- * number of items in the cells object.
+ * @param {object} matchOnObj Coordination values used to obtain a matching loader.
+ * @param {function} mergeCoordination Function to merge coordination values.
+ * @param {string} viewUid The view UID to use for merging coordination values.
+ * @returns {array} [data, status, urls, errors]
  */
 export function useDataTypeMulti(dataType, loaders, dataset, isRequired, coordinationSetters, initialCoordinationValues, matchOnObj, mergeCoordination, viewUid) {
     const placeholderObject = useMemo(() => ({}), []);
-    const setWarning = useSetWarning();
     const matchOnEntries = matchOnObj ? Object.entries(matchOnObj) : [];
     const dataQueries = useQueries({
         // eslint-disable-next-line no-unused-vars
@@ -169,6 +148,7 @@ export function useDataTypeMulti(dataType, loaders, dataset, isRequired, coordin
     });
     const anyLoading = dataQueries.some(q => q.isFetching);
     const anyError = dataQueries.some(q => q.isError);
+    const errors = anyError ? dataQueries.filter(q => q.isError).map(q => q.error) : [];
     // eslint-disable-next-line no-nested-ternary
     const dataStatus = anyLoading ? STATUS.LOADING : (anyError ? STATUS.ERROR : STATUS.SUCCESS);
     const isSuccess = dataStatus === STATUS.SUCCESS;
@@ -189,18 +169,11 @@ export function useDataTypeMulti(dataType, loaders, dataset, isRequired, coordin
         // Deliberate dependency omissions: use indirect dependencies for efficiency.
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [isSuccess]);
-    useEffect(() => {
-        dataQueries.map(q => q.error).filter(e => Boolean(e)).forEach((error) => {
-            warn(error, setWarning);
-        });
-        // Deliberate dependency omissions: use indirect dependencies for efficiency.
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [anyError, setWarning]);
     // Convert data to object keyed by scopeKey.
     const data = useMemo(() => Object.fromEntries(matchOnEntries.map(([scopeKey], i) => ([scopeKey, dataQueries[i].data?.data]))), [matchOnObj, dataStatus]);
     // Convert data to object keyed by scopeKey.
     const urls = useMemo(() => Object.fromEntries(matchOnEntries.map(([scopeKey], i) => ([scopeKey, dataQueries[i].data?.urls]))), [dataQueries]);
-    return [data, dataStatus, urls];
+    return [data, dataStatus, urls, errors];
 }
 export function useHasLoader(loaders, dataset, dataType, matchOn) {
     const loader = useMatchingLoader(loaders, dataset, dataType, matchOn);

package/dist-tsc/data-hooks-multilevel-utils.d.ts

@@ -69,9 +69,55 @@ export function nestFeatureSelectionQueryResults(queryKeyScopeTuples: array, fla
  * @returns The nested object.
  */
 export function nestQueryResults(queryKeyScopeTuples: array, flatQueryResults: array): {};
-export function useFeatureSelectionMultiLevel(loaders: any, dataset: any, isRequired: any, matchOnObj: any, selections: any, depth: any): any[];
-export function useObsFeatureMatrixIndicesMultiLevel(loaders: any, dataset: any, isRequired: any, matchOnObj: any, depth: any): any[];
-export function useObsLocationsMultiLevel(loaders: any, dataset: any, isRequired: any, matchOnObj: any, depth: any): any[];
-export function useObsSetsMultiLevel(loaders: any, dataset: any, isRequired: any, matchOnObj: any, depth: any): any[];
-export function useObsLabelsMultiLevel(loaders: any, dataset: any, isRequired: any, matchOnObj: any, depth: any): any[];
+/**
+ * Get feature values for a multi-level feature selection.
+ * @param {object} loaders
+ * @param {string} dataset
+ * @param {boolean} isRequired
+ * @param {object} matchOnObj
+ * @param {array} selections
+ * @param {number} depth
+ * @returns [data, geneName, extents, normData, status, errors]
+ */
+export function useFeatureSelectionMultiLevel(loaders: object, dataset: string, isRequired: boolean, matchOnObj: object, selections: array, depth: number): any[];
+/**
+ * Get matrix indices for a multi-level coordination.
+ * @param {object} loaders
+ * @param {string} dataset
+ * @param {boolean} isRequired
+ * @param {object} matchOnObj
+ * @param {number} depth
+ * @returns [data, dataStatus, errors]
+ */
+export function useObsFeatureMatrixIndicesMultiLevel(loaders: object, dataset: string, isRequired: boolean, matchOnObj: object, depth: number): any[];
+/**
+ * Wrapper around useDataTypeMultiLevel.
+ * @param {object} loaders
+ * @param {string} dataset
+ * @param {boolean} isRequired
+ * @param {object} matchOnObj
+ * @param {number} depth
+ * @returns {array} [data, status, errors]
+ */
+export function useObsLocationsMultiLevel(loaders: object, dataset: string, isRequired: boolean, matchOnObj: object, depth: number): array;
+/**
+ * Wrapper around useDataTypeMultiLevel.
+ * @param {object} loaders
+ * @param {string} dataset
+ * @param {boolean} isRequired
+ * @param {object} matchOnObj
+ * @param {number} depth
+ * @returns {array} [data, status, errors]
+ */
+export function useObsSetsMultiLevel(loaders: object, dataset: string, isRequired: boolean, matchOnObj: object, depth: number): array;
+/**
+ * Wrapper around useDataTypeMultiLevel.
+ * @param {object} loaders
+ * @param {string} dataset
+ * @param {boolean} isRequired
+ * @param {object} matchOnObj
+ * @param {number} depth
+ * @returns {array} [data, status, errors]
+ */
+export function useObsLabelsMultiLevel(loaders: object, dataset: string, isRequired: boolean, matchOnObj: object, depth: number): array;
 //# sourceMappingURL=data-hooks-multilevel-utils.d.ts.map

package/dist-tsc/data-hooks-multilevel-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-hooks-multilevel-utils.d.ts","sourceRoot":"","sources":["../src/data-hooks-multilevel-utils.js"],"names":[],"mappings":"AA+CA;;;;;;;;;;;;;GAaG;AACH,mEAPW,MAAM,cACN,MAAM,SACN,MAAM,WACN,MAAM,YACN,MAAM,wBAmBhB;AA8BD;;;;;;;;;;;;GAYG;AACH,gEANW,MAAM,SACN,MAAM,WACN,MAAM,YACN,MAAM,wBAiBhB;AA+BD;;;;;;;;;;;;GAYG;AACH,mDANW,MAAM,SACN,MAAM,WACN,MAAM,YACN,MAAM,wBAiBhB;AAuBD;;;;;;;;;;GAUG;AACH,oDALW,MAAM,EAAE,WACR,MAAM,+BAOhB;AAED;;;;;;GAMG;AACH,sEALW,KAAK,oBACL,KAAK,MAcf;AAED;;;;;;GAMG;AACH,sDALW,KAAK,oBACL,KAAK,MAgBf;AA+DD,gJA6DC;AAuCD,sIAuDC;AAyDD,2HAQC;AAED,sHAQC;AAED,wHAQC"}
+{"version":3,"file":"data-hooks-multilevel-utils.d.ts","sourceRoot":"","sources":["../src/data-hooks-multilevel-utils.js"],"names":[],"mappings":"AA6CA;;;;;;;;;;;;;GAaG;AACH,mEAPW,MAAM,cACN,MAAM,SACN,MAAM,WACN,MAAM,YACN,MAAM,wBAmBhB;AA8BD;;;;;;;;;;;;GAYG;AACH,gEANW,MAAM,SACN,MAAM,WACN,MAAM,YACN,MAAM,wBAiBhB;AA+BD;;;;;;;;;;;;GAYG;AACH,mDANW,MAAM,SACN,MAAM,WACN,MAAM,YACN,MAAM,wBAiBhB;AAuBD;;;;;;;;;;GAUG;AACH,oDALW,MAAM,EAAE,WACR,MAAM,+BAOhB;AAED;;;;;;GAMG;AACH,sEALW,KAAK,oBACL,KAAK,MAcf;AAED;;;;;;GAMG;AACH,sDALW,KAAK,oBACL,KAAK,MAgBf;AA+DD;;;;;;;;;GASG;AACH,uDARW,MAAM,WACN,MAAM,cACN,OAAO,cACP,MAAM,cACN,KAAK,SACL,MAAM,SAoDhB;AAuCD;;;;;;;;GAQG;AACH,8DAPW,MAAM,WACN,MAAM,cACN,OAAO,cACP,MAAM,SACN,MAAM,SA8ChB;AAuDD;;;;;;;;GAQG;AACH,mDAPW,MAAM,WACN,MAAM,cACN,OAAO,cACP,MAAM,SACN,MAAM,GACJ,KAAK,CAUjB;AAED;;;;;;;;GAQG;AACH,8CAPW,MAAM,WACN,MAAM,cACN,OAAO,cACP,MAAM,SACN,MAAM,GACJ,KAAK,CAUjB;AAED;;;;;;;;GAQG;AACH,gDAPW,MAAM,WACN,MAAM,cACN,OAAO,cACP,MAAM,SACN,MAAM,GACJ,KAAK,CAUjB"}

package/dist-tsc/data-hooks-multilevel-utils.js

@@ -1,10 +1,10 @@
-import { useEffect, useMemo } from 'react';
+import { useMemo } from 'react';
 import { useQueries } from '@tanstack/react-query';
 import { extent } from 'd3-array';
 import { DataType, STATUS } from '@vitessce/constants-internal';
-import { LoaderNotFoundError, } from '@vitessce/abstract';
-import { getMatchingLoader, useSetWarning, } from './state/hooks.js';
-import { warn, dataQueryFn, } from './data-hook-utils.js';
+import { LoaderNotFoundError, } from '@vitessce/error';
+import { getMatchingLoader, } from './state/hooks.js';
+import { dataQueryFn, } from './data-hook-utils.js';
 function getFeatureSelectionQueryKeyScopeTuplesAux(allSelections, allMatchOnObj, depth, dataset, dataType, isRequired, prevLevelScopes, currSelection, currMatchOn) {
     // Base case
     if (depth === 0) {
@@ -230,14 +230,23 @@ async function featureSelectionQueryFn(ctx) {
     }
     // No loader was found.
     if (isRequired) {
-        throw new LoaderNotFoundError(loaders, dataset, dataType, matchOn);
+        throw new LoaderNotFoundError(`Loader not found for parameters: ${dataset}, ${dataType}, ${JSON.stringify(matchOn)}`);
     }
     else {
         return { data: null, dataKey: null };
     }
 }
+/**
+ * Get feature values for a multi-level feature selection.
+ * @param {object} loaders
+ * @param {string} dataset
+ * @param {boolean} isRequired
+ * @param {object} matchOnObj
+ * @param {array} selections
+ * @param {number} depth
+ * @returns [data, geneName, extents, normData, status, errors]
+ */
 export function useFeatureSelectionMultiLevel(loaders, dataset, isRequired, matchOnObj, selections, depth) {
-    const setWarning = useSetWarning();
     // Create a flat list of tuples (queryKey, scopeInfo).
     const queryKeyScopeTuples = useMemo(() => getFeatureSelectionQueryKeyScopeTuples(selections, matchOnObj, depth, dataset, DataType.OBS_FEATURE_MATRIX, isRequired), [selections, matchOnObj, depth, dataset]);
     const featureQueries = useQueries({
@@ -251,22 +260,13 @@ export function useFeatureSelectionMultiLevel(loaders, dataset, isRequired, matc
     });
     const anyLoading = featureQueries.some(q => q.isFetching);
     const anyError = featureQueries.some(q => q.isError);
+    const errors = anyError ? featureQueries.filter(q => q.isError).map(q => q.error) : [];
     // eslint-disable-next-line no-nested-ternary
     const dataStatus = anyLoading ? STATUS.LOADING : (anyError ? STATUS.ERROR : STATUS.SUCCESS);
     const flatGeneData = featureQueries.map(q => q.data?.data || null);
     const flatLoadedGeneName = featureQueries.map(q => q.data?.dataKey || null);
     const flatExtents = featureQueries.map(q => q.data?.dataExtent || null);
     const flatNormData = featureQueries.map(q => q.data?.normData || null);
-    useEffect(() => {
-        featureQueries
-            .map(q => q.error)
-            .filter(e => Boolean(e))
-            .forEach((error) => {
-            warn(error, setWarning);
-        });
-        // Deliberate dependency omissions: use indirect dependencies for efficiency.
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [anyError, setWarning]);
     // Need to re-nest the geneData and the loadedGeneName info.
     const [geneData, loadedGeneName, extents, normData] = useMemo(() => {
         const nestedGeneData = nestFeatureSelectionQueryResults(queryKeyScopeTuples, flatGeneData);
@@ -282,7 +282,7 @@ export function useFeatureSelectionMultiLevel(loaders, dataset, isRequired, matc
         // Reference: https://github.com/TanStack/query/issues/3049#issuecomment-1253201068
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [featureQueries.reduce((a, h) => a + h.dataUpdatedAt, 0), queryKeyScopeTuples]);
-    return [geneData, loadedGeneName, extents, normData, dataStatus];
+    return [geneData, loadedGeneName, extents, normData, dataStatus, errors];
 }
 async function matrixIndicesQueryFn(ctx) {
     // (copied from  useFeatureSelection queryFn)
@@ -317,14 +317,22 @@ async function matrixIndicesQueryFn(ctx) {
     }
     // No loader was found.
     if (isRequired) {
-        throw new LoaderNotFoundError(loaders, dataset, dataType, matchOn);
+        throw new LoaderNotFoundError(`Loader not found for parameters: ${dataset}, ${dataType}, ${JSON.stringify(matchOn)}`);
     }
     else {
         return { data: null, dataKey: null };
     }
 }
+/**
+ * Get matrix indices for a multi-level coordination.
+ * @param {object} loaders
+ * @param {string} dataset
+ * @param {boolean} isRequired
+ * @param {object} matchOnObj
+ * @param {number} depth
+ * @returns [data, dataStatus, errors]
+ */
 export function useObsFeatureMatrixIndicesMultiLevel(loaders, dataset, isRequired, matchOnObj, depth) {
-    const setWarning = useSetWarning();
     // Create a flat list of tuples (queryKey, scopeInfo).
     const queryKeyScopeTuples = useMemo(() => getMatrixIndicesQueryKeyScopeTuples(matchOnObj, depth, dataset, DataType.OBS_FEATURE_MATRIX, isRequired), [matchOnObj, depth, dataset]);
     const indicesQueries = useQueries({
@@ -338,19 +346,10 @@ export function useObsFeatureMatrixIndicesMultiLevel(loaders, dataset, isRequire
     });
     const anyLoading = indicesQueries.some(q => q.isFetching);
     const anyError = indicesQueries.some(q => q.isError);
+    const errors = anyError ? indicesQueries.filter(q => q.isError).map(q => q.error) : [];
     // eslint-disable-next-line no-nested-ternary
     const dataStatus = anyLoading ? STATUS.LOADING : (anyError ? STATUS.ERROR : STATUS.SUCCESS);
     const flatIndicesData = indicesQueries.map(q => q.data?.data || null);
-    useEffect(() => {
-        indicesQueries
-            .map(q => q.error)
-            .filter(e => Boolean(e))
-            .forEach((error) => {
-            warn(error, setWarning);
-        });
-        // Deliberate dependency omissions: use indirect dependencies for efficiency.
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [anyError, setWarning]);
     // Need to re-nest the geneData and the loadedGeneName info.
     const indicesData = useMemo(() => {
         const nestedIndicesData = nestQueryResults(queryKeyScopeTuples, flatIndicesData);
@@ -365,10 +364,19 @@ export function useObsFeatureMatrixIndicesMultiLevel(loaders, dataset, isRequire
         // so we also use queryKeyScopeTuples as a dependency.
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [indicesQueries.reduce((a, h) => a + h.dataUpdatedAt, 0), queryKeyScopeTuples]);
-    return [indicesData, dataStatus];
+    return [indicesData, dataStatus, errors];
 }
+/**
+ * Get data for multi-level coordination.
+ * @param {object} loaders
+ * @param {string} dataset
+ * @param {boolean} isRequired
+ * @param {object} matchOnObj
+ * @param {number} depth
+ * @param {string} dataType
+ * @returns {array} [data, status, errors]
+ */
 function useDataTypeMultiLevel(loaders, dataset, isRequired, matchOnObj, depth, dataType) {
-    const setWarning = useSetWarning();
     // Create a flat list of tuples (queryKey, scopeInfo).
     const queryKeyScopeTuples = useMemo(() => getQueryKeyScopeTuples(matchOnObj, depth, dataset, dataType, isRequired), [matchOnObj, depth, dataset]);
     const locationsQueries = useQueries({
@@ -382,19 +390,10 @@ function useDataTypeMultiLevel(loaders, dataset, isRequired, matchOnObj, depth,
     });
     const anyLoading = locationsQueries.some(q => q.isFetching);
     const anyError = locationsQueries.some(q => q.isError);
+    const errors = anyError ? locationsQueries.filter(q => q.isError).map(q => q.error) : [];
     // eslint-disable-next-line no-nested-ternary
     const dataStatus = anyLoading ? STATUS.LOADING : (anyError ? STATUS.ERROR : STATUS.SUCCESS);
     const flatIndicesData = locationsQueries.map(q => q.data?.data || null);
-    useEffect(() => {
-        locationsQueries
-            .map(q => q.error)
-            .filter(e => Boolean(e))
-            .forEach((error) => {
-            warn(error, setWarning);
-        });
-        // Deliberate dependency omissions: use indirect dependencies for efficiency.
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [anyError, setWarning]);
     // Need to re-nest the geneData and the loadedGeneName info.
     const locationsData = useMemo(() => {
         const nestedIndicesData = nestQueryResults(queryKeyScopeTuples, flatIndicesData);
@@ -407,14 +406,41 @@ function useDataTypeMultiLevel(loaders, dataset, isRequired, matchOnObj, depth,
         // Reference: https://github.com/TanStack/query/issues/3049#issuecomment-1253201068
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [locationsQueries.reduce((a, h) => a + h.dataUpdatedAt, 0), queryKeyScopeTuples]);
-    return [locationsData, dataStatus];
+    return [locationsData, dataStatus, errors];
 }
+/**
+ * Wrapper around useDataTypeMultiLevel.
+ * @param {object} loaders
+ * @param {string} dataset
+ * @param {boolean} isRequired
+ * @param {object} matchOnObj
+ * @param {number} depth
+ * @returns {array} [data, status, errors]
+ */
 export function useObsLocationsMultiLevel(loaders, dataset, isRequired, matchOnObj, depth) {
     return useDataTypeMultiLevel(loaders, dataset, isRequired, matchOnObj, depth, DataType.OBS_LOCATIONS);
 }
+/**
+ * Wrapper around useDataTypeMultiLevel.
+ * @param {object} loaders
+ * @param {string} dataset
+ * @param {boolean} isRequired
+ * @param {object} matchOnObj
+ * @param {number} depth
+ * @returns {array} [data, status, errors]
+ */
 export function useObsSetsMultiLevel(loaders, dataset, isRequired, matchOnObj, depth) {
     return useDataTypeMultiLevel(loaders, dataset, isRequired, matchOnObj, depth, DataType.OBS_SETS);
 }
+/**
+ * Wrapper around useDataTypeMultiLevel.
+ * @param {object} loaders
+ * @param {string} dataset
+ * @param {boolean} isRequired
+ * @param {object} matchOnObj
+ * @param {number} depth
+ * @returns {array} [data, status, errors]
+ */
 export function useObsLabelsMultiLevel(loaders, dataset, isRequired, matchOnObj, depth) {
     return useDataTypeMultiLevel(loaders, dataset, isRequired, matchOnObj, depth, DataType.OBS_LABELS);
 }

package/dist-tsc/data-hooks-multilevel.d.ts

@@ -1,8 +1,64 @@
-export function useSegmentationMultiFeatureSelection(coordinationScopes: any, coordinationScopesBy: any, loaders: any, dataset: any): any[];
-export function useSpotMultiFeatureSelection(coordinationScopes: any, coordinationScopesBy: any, loaders: any, dataset: any): any[];
-export function useSegmentationMultiObsFeatureMatrixIndices(coordinationScopes: any, coordinationScopesBy: any, loaders: any, dataset: any): any[];
-export function useSpotMultiObsFeatureMatrixIndices(coordinationScopes: any, coordinationScopesBy: any, loaders: any, dataset: any): any[];
-export function usePointMultiObsLabels(coordinationScopes: any, coordinationScopesBy: any, loaders: any, dataset: any): any[];
-export function useSegmentationMultiObsLocations(coordinationScopes: any, coordinationScopesBy: any, loaders: any, dataset: any): any[];
-export function useSegmentationMultiObsSets(coordinationScopes: any, coordinationScopesBy: any, loaders: any, dataset: any): any[];
+/**
+ * Wrapper around useFeatureSelectionMultiLevel.
+ * @param {object} coordinationScopes
+ * @param {object} coordinationScopesBy
+ * @param {object} loaders
+ * @param {string} dataset
+ * @returns {array} [featureData, loadedSelections, extents, normData, featureStatus, errors]
+ */
+export function useSegmentationMultiFeatureSelection(coordinationScopes: object, coordinationScopesBy: object, loaders: object, dataset: string): array;
+/**
+ * Wrapper around useFeatureSelectionMultiLevel.
+ * @param {object} coordinationScopes
+ * @param {object} coordinationScopesBy
+ * @param {object} loaders
+ * @param {string} dataset
+ * @returns {array} [featureData, loadedSelections, extents, normData, featureStatus, errors]
+ */
+export function useSpotMultiFeatureSelection(coordinationScopes: object, coordinationScopesBy: object, loaders: object, dataset: string): array;
+/**
+ * Wrapper around useObsFeatureMatrixIndicesMultiLevel.
+ * @param {object} coordinationScopes
+ * @param {object} coordinationScopesBy
+ * @param {object} loaders
+ * @param {string} dataset
+ * @returns {array} [indicesData, status, errors]
+ */
+export function useSegmentationMultiObsFeatureMatrixIndices(coordinationScopes: object, coordinationScopesBy: object, loaders: object, dataset: string): array;
+/**
+ * Wrapper around useObsFeatureMatrixIndicesMultiLevel.
+ * @param {object} coordinationScopes
+ * @param {object} coordinationScopesBy
+ * @param {object} loaders
+ * @param {string} dataset
+ * @returns {array} [indicesData, status, errors]
+ */
+export function useSpotMultiObsFeatureMatrixIndices(coordinationScopes: object, coordinationScopesBy: object, loaders: object, dataset: string): array;
+/**
+ * Wrapper around useObsLabelsMultiLevel.
+ * @param {object} coordinationScopes
+ * @param {object} coordinationScopesBy
+ * @param {object} loaders
+ * @param {string} dataset
+ * @returns {array} [data, status, errors]
+ */
+export function usePointMultiObsLabels(coordinationScopes: object, coordinationScopesBy: object, loaders: object, dataset: string): array;
+/**
+ * Wrapper around useObsLocationsMultiLevel.
+ * @param {object} coordinationScopes
+ * @param {object} coordinationScopesBy
+ * @param {object} loaders
+ * @param {string} dataset
+ * @returns {array} [data, status, errors]
+ */
+export function useSegmentationMultiObsLocations(coordinationScopes: object, coordinationScopesBy: object, loaders: object, dataset: string): array;
+/**
+ * Wrapper around useObsSetsMultiLevel.
+ * @param {object} coordinationScopes
+ * @param {object} coordinationScopesBy
+ * @param {object} loaders
+ * @param {string} dataset
+ * @returns {array} [data, status, errors]
+ */
+export function useSegmentationMultiObsSets(coordinationScopes: object, coordinationScopesBy: object, loaders: object, dataset: string): array;
 //# sourceMappingURL=data-hooks-multilevel.d.ts.map

package/dist-tsc/data-hooks-multilevel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-hooks-multilevel.d.ts","sourceRoot":"","sources":["../src/data-hooks-multilevel.js"],"names":[],"mappings":"AAeA,4IAoDC;AAED,oIA4CC;AAED,mJAuBC;AAED,2IAsBC;AAED,8HAqBC;AAED,wIAqBC;AAED,mIAqBC"}
+{"version":3,"file":"data-hooks-multilevel.d.ts","sourceRoot":"","sources":["../src/data-hooks-multilevel.js"],"names":[],"mappings":"AAeA;;;;;;;GAOG;AACH,yEANW,MAAM,wBACN,MAAM,WACN,MAAM,WACN,MAAM,GACJ,KAAK,CAsDjB;AAED;;;;;;;GAOG;AACH,iEANW,MAAM,wBACN,MAAM,WACN,MAAM,WACN,MAAM,GACJ,KAAK,CA8CjB;AAED;;;;;;;GAOG;AACH,gFANW,MAAM,wBACN,MAAM,WACN,MAAM,WACN,MAAM,GACJ,KAAK,CAyBjB;AAED;;;;;;;GAOG;AACH,wEANW,MAAM,wBACN,MAAM,WACN,MAAM,WACN,MAAM,GACJ,KAAK,CAwBjB;AAED;;;;;;;GAOG;AACH,2DANW,MAAM,wBACN,MAAM,WACN,MAAM,WACN,MAAM,GACJ,KAAK,CAuBjB;AAED;;;;;;;GAOG;AACH,qEANW,MAAM,wBACN,MAAM,WACN,MAAM,WACN,MAAM,GACJ,KAAK,CAuBjB;AAED;;;;;;;GAOG;AACH,gEANW,MAAM,wBACN,MAAM,WACN,MAAM,WACN,MAAM,GACJ,KAAK,CAuBjB"}