@xh/hoist 72.0.0 → 72.2.0

package/admin/tabs/userData/jsonblob/JsonBlobPanel.ts

@@ -5,10 +5,15 @@
  * Copyright © 2025 Extremely Heavy Industries Inc.
  */
 
-import {fragment} from '@xh/hoist/cmp/layout';
+import * as Col from '@xh/hoist/admin/columns/Rest';
+import * as AdminCol from '@xh/hoist/admin/columns';
+import {hframe} from '@xh/hoist/cmp/layout';
 import {creates, hoistCmp} from '@xh/hoist/core';
 import {button} from '@xh/hoist/desktop/cmp/button';
+import {jsonSearchButton} from '@xh/hoist/admin/jsonsearch/JsonSearch';
+import {panel} from '@xh/hoist/desktop/cmp/panel';
 import {restGrid} from '@xh/hoist/desktop/cmp/rest';
+import {toolbarSep} from '@xh/hoist/desktop/cmp/toolbar';
 import {Icon} from '@xh/hoist/icon';
 import {differ} from '../../../differ/Differ';
 import {JsonBlobModel} from './JsonBlobModel';
@@ -17,15 +22,47 @@ export const jsonBlobPanel = hoistCmp.factory({
     model: creates(JsonBlobModel),
 
     render({model}) {
-        return fragment(
-            restGrid({
-                extraToolbarItems: () => {
-                    return button({
-                        icon: Icon.diff(),
-                        text: 'Compare w/ Remote',
-                        onClick: () => model.openDiffer()
-                    });
-                }
+        return hframe(
+            panel({
+                item: restGrid({
+                    extraToolbarItems: () => [
+                        button({
+                            icon: Icon.diff(),
+                            text: 'Compare w/ Remote',
+                            onClick: () => model.openDiffer()
+                        }),
+                        toolbarSep(),
+                        jsonSearchButton({
+                            subjectName: 'JSON Blob',
+                            docSearchUrl: 'jsonSearch/searchBlobs',
+                            gridModelConfig: {
+                                sortBy: ['type', 'name', 'owner'],
+                                columns: [
+                                    {
+                                        field: {name: 'token', type: 'string'},
+                                        hidden: true,
+                                        width: 100
+                                    },
+                                    {
+                                        field: {name: 'type', type: 'string'},
+                                        width: 200
+                                    },
+                                    {
+                                        field: {name: 'owner', type: 'string'},
+                                        width: 200
+                                    },
+                                    {...AdminCol.name},
+                                    {
+                                        field: {name: 'json', type: 'string'},
+                                        hidden: true
+                                    },
+                                    {...Col.lastUpdated}
+                                ]
+                            },
+                            groupByOptions: ['owner', 'type', 'name']
+                        })
+                    ]
+                })
             }),
             differ({omit: !model.differModel})
         );

package/admin/tabs/userData/prefs/UserPreferencePanel.ts

@@ -4,32 +4,62 @@
  *
  * Copyright © 2025 Extremely Heavy Industries Inc.
  */
+
+import * as Col from '@xh/hoist/admin/columns/Rest';
+import * as AdminCol from '@xh/hoist/admin/columns';
 import {prefEditorDialog} from '@xh/hoist/admin/tabs/userData/prefs/editor/PrefEditorDialog';
 import {UserPreferenceModel} from '@xh/hoist/admin/tabs/userData/prefs/UserPreferenceModel';
+import {hframe} from '@xh/hoist/cmp/layout';
 import {creates, hoistCmp} from '@xh/hoist/core';
 import {button} from '@xh/hoist/desktop/cmp/button';
+import {jsonSearchButton} from '@xh/hoist/admin/jsonsearch/JsonSearch';
 import {panel} from '@xh/hoist/desktop/cmp/panel';
 import {restGrid} from '@xh/hoist/desktop/cmp/rest';
+import {toolbarSep} from '@xh/hoist/desktop/cmp/toolbar';
 import {Icon} from '@xh/hoist/icon';
 
 export const userPreferencePanel = hoistCmp.factory({
     model: creates(UserPreferenceModel),
 
     render({model}) {
-        return panel({
-            items: [
-                restGrid({
-                    extraToolbarItems: () => {
-                        return button({
-                            icon: Icon.gear(),
-                            text: 'Configure',
-                            onClick: () => (model.showEditorDialog = true)
-                        });
-                    }
-                }),
-                prefEditorDialog()
-            ],
-            mask: 'onLoad'
-        });
+        return hframe(
+            panel({
+                items: [
+                    restGrid({
+                        extraToolbarItems: () => [
+                            button({
+                                icon: Icon.gear(),
+                                text: 'Configure',
+                                onClick: () => (model.showEditorDialog = true)
+                            }),
+                            toolbarSep(),
+                            jsonSearchButton({
+                                subjectName: 'User Preference',
+                                docSearchUrl: 'jsonSearch/searchUserPreferences',
+                                gridModelConfig: {
+                                    sortBy: ['groupName', 'name', 'owner'],
+                                    columns: [
+                                        {
+                                            field: {name: 'owner', type: 'string'},
+                                            width: 200
+                                        },
+                                        {...AdminCol.groupName},
+                                        {...AdminCol.name},
+                                        {
+                                            field: {name: 'json', type: 'string'},
+                                            hidden: true
+                                        },
+                                        {...Col.lastUpdated}
+                                    ]
+                                },
+                                groupByOptions: ['owner', 'groupName', 'name']
+                            })
+                        ]
+                    }),
+                    prefEditorDialog()
+                ],
+                mask: 'onLoad'
+            })
+        );
     }
 });

package/admin/tabs/userData/roles/RoleModel.ts

@@ -80,7 +80,7 @@ export class RoleModel extends HoistModel {
             runInAction(() => {
                 this.allRoles = this.processRolesFromServer(data);
             });
-            this.displayRoles();
+            this.displayRoles(loadSpec.isRefresh);
             await this.gridModel.preSelectFirstAsync();
         } catch (e) {
             if (loadSpec.isStale) return;
@@ -212,13 +212,13 @@ export class RoleModel extends HoistModel {
     //------------------
     // Implementation
     //------------------
-    private displayRoles() {
+    private displayRoles(isRefresh?: boolean) {
         const {gridModel} = this,
             gridData = this.showInGroups
                 ? this.processRolesForTreeGrid(this.allRoles)
                 : this.allRoles;
         gridModel.loadData(gridData);
-        gridModel.expandAll();
+        if (!isRefresh) gridModel.expandAll();
         gridModel.autosizeAsync({includeCollapsedChildren: true});
     }
 

package/admin/tabs/userData/roles/details/RoleDetailsModel.ts

@@ -44,7 +44,7 @@ export class RoleDetailsModel extends HoistModel {
                 );
 
                 this.setTabTitle('users', 'Users', role?.effectiveUsers);
-                this.setTabTitle('directories', 'Directories', role?.effectiveDirectoryGroups);
+                this.setTabTitle('directories', 'Dir. Groups', role?.effectiveDirectoryGroups);
                 this.setTabTitle('effectiveRoles', 'Granted To', role?.effectiveRoles);
                 this.setTabTitle('inheritedRoles', 'Inheriting From', role?.inheritedRoles);
             },
@@ -77,6 +77,7 @@ export class RoleDetailsModel extends HoistModel {
                 },
                 {
                     id: 'directories',
+                    title: 'Dir. Groups',
                     omit: !this.roleModel.moduleConfig.directoryGroupsSupported,
                     content: directoryMembers
                 },

package/admin/tabs/userData/roles/editor/form/RoleFormModel.ts

@@ -46,9 +46,9 @@ export class RoleFormModel extends HoistModel {
     @computed
     get hasDirtyMembers(): boolean {
         return (
-            this.usersGridModel.store.isModified ||
-            this.directoryGroupsGridModel.store.isModified ||
-            this.rolesGridModel.store.isModified
+            this.usersGridModel.store.isDirty ||
+            this.directoryGroupsGridModel.store.isDirty ||
+            this.rolesGridModel.store.isDirty
         );
     }
 

package/admin/tabs/userData/roles/recategorize/RecategorizeDialogModel.ts

@@ -65,8 +65,8 @@ export class RecategorizeDialogModel extends HoistModel {
                     }
                 })
                 .linkTo(this.savingTask);
-            await this.parent.refreshAsync();
             this.close();
+            await this.parent.refreshAsync();
         } catch (e) {
             XH.handleException(e);
         }

package/build/types/admin/jsonsearch/JsonSearch.d.ts

@@ -0,0 +1,17 @@
+import { GridConfig } from '@xh/hoist/cmp/grid';
+import { HoistProps, SelectOption } from '@xh/hoist/core';
+export interface JsonSearchButtonProps extends HoistProps {
+    /** Descriptive label for the type of records being searched - will be auto-pluralized. */
+    subjectName: string;
+    /** Endpoint to search and return matches - Hoist `JsonSearchController` action expected. */
+    docSearchUrl: string;
+    /** Config for GridModel used to display search results. */
+    gridModelConfig: GridConfig;
+    /** Field names on returned results to enable for grouping in the search results grid. */
+    groupByOptions: Array<SelectOption | any>;
+}
+/**
+ * Main entry point component for the JSON search feature. Supported out-of-the-box for a limited
+ * set of Hoist artifacts that hold JSON values: JSONBlob, Configs, and User Preferences.
+ */
+export declare const jsonSearchButton: import("@xh/hoist/core").ElementFactory<JsonSearchButtonProps>;

package/build/types/admin/jsonsearch/impl/JsonSearchImplModel.d.ts

@@ -0,0 +1,32 @@
+import { GridConfig, GridModel } from '@xh/hoist/cmp/grid';
+import { HoistModel, TaskObserver } from '@xh/hoist/core';
+/**
+ * @internal
+ */
+export declare class JsonSearchImplModel extends HoistModel {
+    xhImpl: boolean;
+    private matchingNodesUrl;
+    gridModel: GridModel;
+    docLoadTask: TaskObserver;
+    nodeLoadTask: TaskObserver;
+    groupBy: string;
+    isOpen: boolean;
+    error: any;
+    path: string;
+    readerContentType: 'document' | 'matches';
+    pathFormat: 'XPath' | 'JSONPath';
+    readerContent: string;
+    matchingNodeCount: number;
+    get subjectName(): string;
+    get docSearchUrl(): string;
+    get gridModelConfig(): GridConfig;
+    get selectedRecord(): import("../../../data").StoreRecord;
+    get groupByOptions(): any[];
+    toggleSearchIsOpen(): void;
+    constructor();
+    onLinked(): void;
+    loadMatchingDocsAsync(): Promise<void>;
+    private loadReaderContentAsync;
+    private convertToXPath;
+    private setGroupBy;
+}

package/build/types/cmp/tab/TabContainerModel.d.ts

@@ -68,7 +68,7 @@ export declare class TabContainerModel extends HoistModel implements Persistable
     refreshMode: RefreshMode;
     emptyText: ReactNode;
     refreshContextModel: RefreshContextModel;
-    private lastActiveTabId;
+    protected lastActiveTabId: string;
     constructor({ tabs, defaultTabId, route, switcher, track, renderMode, refreshMode, persistWith, emptyText, xhImpl }: TabContainerConfig);
     /** Set/replace all tabs within the container. */
     setTabs(tabs: Array<TabModel | TabConfig>): void;
@@ -110,10 +110,10 @@ export declare class TabContainerModel extends HoistModel implements Persistable
     setPersistableState(state: PersistableState<{
         activeTabId: string;
     }>): void;
-    private setActiveTabIdInternal;
-    private syncWithRouter;
-    private forwardRouterToTab;
-    private calculateActiveTabId;
+    protected setActiveTabIdInternal(id: any): void;
+    protected syncWithRouter(): void;
+    protected forwardRouterToTab(id: any): void;
+    protected calculateActiveTabId(tabs: any): any;
 }
 export interface AddTabOptions {
     /** Index in tab collection where tab is to be added. */

package/build/types/core/HoistProps.d.ts

@@ -95,6 +95,7 @@ export interface LayoutProps {
     flexGrow?: string | number;
     flexShrink?: string | number;
     flexWrap?: Property.FlexWrap;
+    gap?: string | number;
     alignItems?: string;
     alignSelf?: string;
     alignContent?: string;

package/build/types/core/XH.d.ts

@@ -9,9 +9,9 @@ import { AppContainerModel } from '../appcontainer/AppContainerModel';
 import { BannerModel } from '../appcontainer/BannerModel';
 import { ToastModel } from '../appcontainer/ToastModel';
 import '../styles/XH.scss';
-import { AppSpec, AppState, AppSuspendData, BannerSpec, ExceptionHandler, ExceptionHandlerOptions, HoistAppModel, HoistException, HoistService, HoistServiceClass, HoistUser, MessageSpec, PageState, PlainObject, SizingMode, TaskObserver, Theme, ToastSpec, TrackOptions } from './';
+import { AppSpec, AppState, AppSuspendData, BannerSpec, ExceptionHandler, ExceptionHandlerOptions, HoistAppModel, HoistException, HoistService, HoistServiceClass, HoistUser, MessageSpec, PageState, PlainObject, ReloadAppOptions, SizingMode, TaskObserver, Theme, ToastSpec, TrackOptions } from './';
 import { HoistModel, ModelSelector, RefreshContextModel } from './model';
-export declare const MIN_HOIST_CORE_VERSION = "21.0";
+export declare const MIN_HOIST_CORE_VERSION = "28.0";
 /**
  * Top-level Singleton model for Hoist. This is the main entry point for the API.
  *
@@ -193,13 +193,13 @@ export declare class XHApi {
     /**
      * Trigger a full reload of the current application.
      *
-     * @param path - relative path to reload (e.g. 'mobile/').  Defaults to the
-     * existing location pathname.
+     * @param opts - options to govern reload. To support legacy usages, a provided
+     *       string will be treated as `ReloadAppOptions.path`.
      *
      * This method will reload the entire application document in the browser - to trigger a
      * refresh of the loadable content within the app, use {@link refreshAppAsync} instead.
      */
-    reloadApp(path?: string): void;
+    reloadApp(opts?: ReloadAppOptions | string): void;
     /**
      * Refresh the current application.
      *

package/build/types/core/persist/PersistenceProvider.d.ts

@@ -41,6 +41,10 @@ export declare abstract class PersistenceProvider<S = any> {
      * target without thrashing.
      */
     static create<S>(cfg: PersistenceProviderConfig<S>): PersistenceProvider<S>;
+    /**
+     * Merge PersistOptions, respecting provider types, with later options overriding earlier ones.
+     */
+    static mergePersistOptions(defaults: PersistOptions, ...overrides: PersistOptions[]): PersistOptions;
     /** Read persisted state at this provider's path. */
     read(): PersistableState<S>;
     /** Persist JSON-serializable state to this provider's path. */

package/build/types/core/types/Interfaces.d.ts

@@ -19,6 +19,15 @@ export interface HoistUser {
     hasRole(s: string): boolean;
     hasGate(s: string): boolean;
 }
+/**
+ * Options governing XH.reloadApp().
+ */
+export interface ReloadAppOptions {
+    /** Relative path to reload (e.g. 'mobile/').  Defaults to the existing location pathname. */
+    path?: string;
+    /** Should the query parameters be removed from the url before reload.  Default false. */
+    removeQueryParams?: boolean;
+}
 /**
  * Options for showing a "toast" notification that appears and then automatically dismisses.
  */

package/build/types/data/Store.d.ts

@@ -275,6 +275,8 @@ export declare class Store extends HoistBase {
     /** Records removed locally which have not been committed.*/
     get removedRecords(): StoreRecord[];
     /** Records modified locally since they were last loaded. */
+    get dirtyRecords(): StoreRecord[];
+    /** Alias for {@link Store.dirtyRecords} */
     get modifiedRecords(): StoreRecord[];
     /**
      * Root records in this store, respecting any filter (if applied).
@@ -292,6 +294,8 @@ export declare class Store extends HoistBase {
      */
     get summaryRecord(): StoreRecord;
     /** True if the store has changes which need to be committed. */
+    get isDirty(): boolean;
+    /** Alias for {@link Store.isDirty} */
     get isModified(): boolean;
     /**
      * Set a filter on this store.

package/build/types/data/StoreRecord.d.ts

@@ -51,6 +51,8 @@ export declare class StoreRecord {
     /** True if the StoreRecord has never been committed. */
     get isAdd(): boolean;
     /** True if the StoreRecord has been modified since it was last committed. */
+    get isDirty(): boolean;
+    /** Alias for {@link StoreRecord.isDirty} */
     get isModified(): boolean;
     /** False if the StoreRecord has been added or modified. */
     get isCommitted(): boolean;

package/build/types/desktop/cmp/appOption/AutoRefreshAppOption.d.ts

@@ -61,6 +61,7 @@ export declare const autoRefreshAppOption: ({ formFieldProps, inputProps }?: Aut
         flexGrow?: string | number;
         flexShrink?: string | number;
         flexWrap?: import("csstype").Property.FlexWrap;
+        gap?: string | number;
         alignItems?: string;
         alignSelf?: string;
         alignContent?: string;

package/build/types/desktop/cmp/appOption/ThemeAppOption.d.ts

@@ -59,6 +59,7 @@ export declare const themeAppOption: ({ formFieldProps, inputProps }?: ThemeAppO
         flexGrow?: string | number;
         flexShrink?: string | number;
         flexWrap?: import("csstype").Property.FlexWrap;
+        gap?: string | number;
         alignItems?: string;
         alignSelf?: string;
         alignContent?: string;

package/build/types/kit/blueprint/Wrappers.d.ts

@@ -2,5 +2,5 @@
 import { Alert, Button, ButtonGroup, Callout, Card, Checkbox, ControlGroup, Dialog, Drawer, EditableText, FileInput, FormGroup, Hotkey, Hotkeys, InputGroup, Label, Menu, MenuDivider, MenuItem, Navbar, NavbarDivider, NavbarGroup, NavbarHeading, NumericInput, OverflowList, Overlay2 as Overlay, Popover, Radio, RadioGroup, RangeSlider, Slider, Switch, Tab, Tabs, Tag, TagInput, Text, TextArea, Tooltip, Tree } from '@blueprintjs/core';
 import { DatePicker3 as DatePicker } from '@blueprintjs/datetime2';
 export { Alert, Button, ButtonGroup, Callout, Card, Checkbox, ControlGroup, DatePicker, Dialog, Drawer, EditableText, FileInput, FormGroup, Hotkeys, Hotkey, InputGroup, Label, Menu, MenuItem, MenuDivider, Navbar, NavbarDivider, NavbarGroup, NavbarHeading, NumericInput, OverflowList, Overlay, Popover, Radio, RadioGroup, RangeSlider, Slider, Switch, Tab, Tabs, Tag, TagInput, TextArea, Text, Tooltip, Tree };
-export declare const alert: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").AlertProps>, button: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").ButtonProps>, controlGroup: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").ControlGroupProps>, checkbox: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").CheckboxProps>, dialog: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").DialogProps>, datePicker: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/datetime2").DatePicker3Props>, menuDivider: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").MenuDividerProps>, menuItem: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").MenuItemProps>, navbarDivider: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").NavbarDividerProps>, numericInput: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").HTMLInputProps & import("@blueprintjs/core").NumericInputProps>, overflowList: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").OverflowListProps<any>>, popover: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").PopoverProps<import("@blueprintjs/core").DefaultPopoverTargetHTMLProps>>, radio: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").ControlProps>, rangeSlider: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").RangeSliderProps>, slider: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").SliderProps>, switchControl: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").SwitchProps>, textArea: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TextAreaProps>, tree: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TreeProps<unknown>>, tagInput: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TagInputProps>, fileInput: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").FileInputProps>, overlay: import("@xh/hoist/core").ElementFactory<Pick<import("@blueprintjs/core").Overlay2Props, "lazy" | "className" | "onClose" | "children" | "key" | "autoFocus" | "transitionDuration" | "canEscapeKeyClose" | "enforceFocus" | "shouldReturnFocusOnClose" | "usePortal" | "portalClassName" | "portalContainer" | "portalStopPropagationEvents" | "isOpen" | "transitionName" | "onClosing" | "onClosed" | "onOpening" | "onOpened" | "backdropClassName" | "backdropProps" | "canOutsideClickClose" | "hasBackdrop" | "childRef" | "childRefs"> & import("react").RefAttributes<import("@blueprintjs/core").OverlayInstance>>, tooltip: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TooltipProps<import("@blueprintjs/core").DefaultPopoverTargetHTMLProps>>;
+export declare const alert: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").AlertProps>, button: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").ButtonProps>, controlGroup: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").ControlGroupProps>, checkbox: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").CheckboxProps>, dialog: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").DialogProps>, datePicker: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/datetime2").DatePicker3Props>, menuDivider: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").MenuDividerProps>, menuItem: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").MenuItemProps>, navbarDivider: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").NavbarDividerProps>, numericInput: import("@xh/hoist/core").ElementFactory<Omit<import("@blueprintjs/core").HTMLInputProps, "size"> & import("@blueprintjs/core").NumericInputProps>, overflowList: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").OverflowListProps<any>>, popover: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").PopoverProps<import("@blueprintjs/core").DefaultPopoverTargetHTMLProps>>, radio: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").ControlProps>, rangeSlider: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").RangeSliderProps>, slider: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").SliderProps>, switchControl: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").SwitchProps>, textArea: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TextAreaProps>, tree: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TreeProps<unknown>>, tagInput: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TagInputProps>, fileInput: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").FileInputProps>, overlay: import("@xh/hoist/core").ElementFactory<Omit<import("@blueprintjs/core").Overlay2Props, "ref"> & import("react").RefAttributes<import("@blueprintjs/core").OverlayInstance>>, tooltip: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TooltipProps<import("@blueprintjs/core").DefaultPopoverTargetHTMLProps>>;
 export declare const buttonGroup: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").ButtonGroupProps>, callout: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").CalloutProps>, card: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").CardProps>, drawer: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").DrawerProps>, editableText: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").EditableTextProps>, formGroup: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").FormGroupProps>, hotkey: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").HotkeyProps>, hotkeys: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").HotkeysProps>, inputGroup: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").InputGroupProps>, label: import("@xh/hoist/core").ElementFactory<import("react").AllHTMLAttributes<HTMLLabelElement> & import("react").RefAttributes<HTMLLabelElement>>, menu: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").MenuProps>, navbar: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").NavbarProps>, navbarHeading: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").NavbarHeadingProps>, navbarGroup: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").NavbarGroupProps>, radioGroup: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").RadioGroupProps>, tabs: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TabsProps>, tab: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TabProps>, tag: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TagProps>, text: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TextProps>;

package/build/types/kit/swiper/index.d.ts

@@ -13,13 +13,10 @@ export declare const swiper: import("@xh/hoist/core").ElementFactory<import("rea
     onAutoplayResume?: (swiper: import("swiper/types/swiper-class").default) => void;
     onAutoplayTimeLeft?: (swiper: import("swiper/types/swiper-class").default, timeLeft: number, percentage: number) => void;
     onAutoplay?: (swiper: import("swiper/types/swiper-class").default) => void;
+    onKeyPress?: (swiper: import("swiper/types/swiper-class").default, keyCode: string) => void;
     onHashChange?: (swiper: import("swiper/types/swiper-class").default) => void;
     onHashSet?: (swiper: import("swiper/types/swiper-class").default) => void;
-    onKeyPress?: (swiper: import("swiper/types/swiper-class").default, keyCode: string) => void;
     onScroll?: (swiper: import("swiper/types/swiper-class").default, event: WheelEvent) => void;
-    onScrollbarDragStart?: (swiper: import("swiper/types/swiper-class").default, event: MouseEvent | PointerEvent | TouchEvent) => void;
-    onScrollbarDragMove?: (swiper: import("swiper/types/swiper-class").default, event: MouseEvent | PointerEvent | TouchEvent) => void;
-    onScrollbarDragEnd?: (swiper: import("swiper/types/swiper-class").default, event: MouseEvent | PointerEvent | TouchEvent) => void;
     onNavigationHide?: (swiper: import("swiper/types/swiper-class").default) => void;
     onNavigationShow?: (swiper: import("swiper/types/swiper-class").default) => void;
     onNavigationPrev?: (swiper: import("swiper/types/swiper-class").default) => void;
@@ -28,6 +25,9 @@ export declare const swiper: import("@xh/hoist/core").ElementFactory<import("rea
     onPaginationUpdate?: (swiper: import("swiper/types/swiper-class").default, paginationEl: HTMLElement) => void;
     onPaginationHide?: (swiper: import("swiper/types/swiper-class").default) => void;
     onPaginationShow?: (swiper: import("swiper/types/swiper-class").default) => void;
+    onScrollbarDragStart?: (swiper: import("swiper/types/swiper-class").default, event: MouseEvent | PointerEvent | TouchEvent) => void;
+    onScrollbarDragMove?: (swiper: import("swiper/types/swiper-class").default, event: MouseEvent | PointerEvent | TouchEvent) => void;
+    onScrollbarDragEnd?: (swiper: import("swiper/types/swiper-class").default, event: MouseEvent | PointerEvent | TouchEvent) => void;
     onZoomChange?: (swiper: import("swiper/types/swiper-class").default, scale: number, imageEl: HTMLElement, slideEl: HTMLElement) => void;
     onInit?: (swiper: import("swiper/types/swiper-class").default) => any;
     onBeforeDestroy?: (swiper: import("swiper/types/swiper-class").default) => void;

package/build/types/security/BaseOAuthClient.d.ts

@@ -1,7 +1,8 @@
 import { HoistBase } from '@xh/hoist/core';
-import { Token, TokenMap } from '@xh/hoist/security/Token';
+import { Token } from '@xh/hoist/security/Token';
+import { AccessTokenSpec, TokenMap } from './Types';
 export type LoginMethod = 'REDIRECT' | 'POPUP';
-export interface BaseOAuthClientConfig<S> {
+export interface BaseOAuthClientConfig<S extends AccessTokenSpec> {
     /** Client ID (GUID) of your app registered with your Oauth provider. */
     clientId: string;
     /**
@@ -23,24 +24,16 @@ export interface BaseOAuthClientConfig<S> {
      * Governs an optional refresh timer that will work to keep the tokens fresh.
      *
      * A typical refresh will use the underlying provider cache, and should not result in
-     * network activity. However, if any token lifetime falls below`autoRefreshSkipCacheSecs`,
+     * network activity. However, if any token would expire before the next autoRefresh,
      * this client will force a call to the underlying provider to get the token.
      *
      * In order to allow aging tokens to be replaced in a timely manner, this value should be
      * significantly shorter than both the minimum token lifetime that will be
-     * returned by the underlying API and `autoRefreshSkipCacheSecs`.
+     * returned by the underlying API.
      *
      * Default is -1, disabling this behavior.
      */
     autoRefreshSecs?: number;
-    /**
-     * During auto-refresh, if the remaining lifetime for any token is below this threshold,
-     * force the provider to skip the local cache and go directly to the underlying provider for
-     * new tokens and refresh tokens.
-     *
-     * Default is -1, disabling this behavior.
-     */
-    autoRefreshSkipCacheSecs?: number;
     /**
      * Scopes to request - if any - beyond the core `['openid', 'email']` scopes, which
      * this client will always request.
@@ -63,13 +56,12 @@ export interface BaseOAuthClientConfig<S> {
  * suitable concrete implementation to power a client-side OauthService. See `MsalClient` and
  * `AuthZeroClient`
  *
- * Initialize such a service and this client within the `preAuthInitAsync()` lifecycle method of
- * `AppModel` to use the tokens it acquires to authenticate with the Hoist server. (Note this
- * requires a suitable server-side `AuthenticationService` implementation to validate the token and
- * actually resolve the user.) On init, the client implementation will initiate a pop-up or redirect
- * flow as necessary.
+ * Initialize such a service and this client within an app's primary {@link HoistAuthModel} to use
+ * the tokens it acquires to authenticate with the Hoist server. (Note this requires a suitable
+ * server-side `AuthenticationService` implementation to validate the token and actually resolve
+ * the user.) On init, the client impl will initiate a pop-up or redirect flow as necessary.
  */
-export declare abstract class BaseOAuthClient<C extends BaseOAuthClientConfig<S>, S> extends HoistBase {
+export declare abstract class BaseOAuthClient<C extends BaseOAuthClientConfig<S>, S extends AccessTokenSpec> extends HoistBase {
     /** Config loaded from UI server + init method. */
     protected config: C;
     /** ID Scopes */
@@ -101,9 +93,12 @@ export declare abstract class BaseOAuthClient<C extends BaseOAuthClientConfig<S>
      */
     getAccessTokenAsync(key: string): Promise<Token>;
     /**
-     * Get all available tokens.
+     * Get all configured tokens.
      */
-    getAllTokensAsync(): Promise<TokenMap>;
+    getAllTokensAsync(opts?: {
+        eagerOnly?: boolean;
+        useCache?: boolean;
+    }): Promise<TokenMap>;
     /**
      * The last authenticated OAuth username.
      *
@@ -144,7 +139,10 @@ export declare abstract class BaseOAuthClient<C extends BaseOAuthClientConfig<S>
     protected restoreRedirectState(key: string): void;
     /** Call after requesting the provider library redirect the user away for auth. */
     protected maskAfterRedirectAsync(): Promise<void>;
-    protected fetchAllTokensAsync(useCache?: boolean): Promise<TokenMap>;
+    protected fetchAllTokensAsync(opts?: {
+        eagerOnly?: boolean;
+        useCache?: boolean;
+    }): Promise<TokenMap>;
     protected getLocalStorage(key: string, defaultValue?: any): any;
     protected setLocalStorage(key: string, value: any): void;
     private fetchIdTokenSafeAsync;

package/build/types/security/Token.d.ts

@@ -1,5 +1,4 @@
 import { PlainObject } from '@xh/hoist/core';
-export type TokenMap = Record<string, Token>;
 export declare class Token {
     readonly value: string;
     readonly decoded: PlainObject;

package/build/types/security/Types.d.ts

@@ -0,0 +1,12 @@
+import { Token } from './Token';
+export type TokenMap = Record<string, Token>;
+export interface AccessTokenSpec {
+    /**
+     * Mode governing when the access token should be requested from provider.
+     *      eager (default) - initiate lookup on initialization, but do not block on failure.
+     *      lazy - lookup when requested by client.
+     */
+    fetchMode: 'eager' | 'lazy';
+    /** Scopes for the desired access token.*/
+    scopes: string[];
+}

package/build/types/security/authzero/AuthZeroClient.d.ts

@@ -1,5 +1,6 @@
 import type { Auth0ClientOptions } from '@auth0/auth0-spa-js';
-import { Token, TokenMap } from '@xh/hoist/security/Token';
+import { Token } from '@xh/hoist/security/Token';
+import { AccessTokenSpec, TokenMap } from '../Types';
 import { BaseOAuthClient, BaseOAuthClientConfig } from '../BaseOAuthClient';
 export interface AuthZeroClientConfig extends BaseOAuthClientConfig<AuthZeroTokenSpec> {
     /** Domain of your app registered with Auth0.  */
@@ -24,9 +25,7 @@ export interface AuthZeroClientConfig extends BaseOAuthClientConfig<AuthZeroToke
      */
     authZeroClientOptions?: Partial<Auth0ClientOptions>;
 }
-export interface AuthZeroTokenSpec {
-    /** Scopes for the desired access token.*/
-    scopes: string[];
+export interface AuthZeroTokenSpec extends AccessTokenSpec {
     /**
      * Audience (i.e. API) identifier for AccessToken.  Must be registered with Auth0.
      * Note that this is required to ensure that issued token is a JWT and not an opaque string.

package/build/types/security/msal/MsalClient.d.ts

@@ -1,6 +1,7 @@
 import * as msal from '@azure/msal-browser';
 import { LogLevel } from '@azure/msal-browser';
-import { Token, TokenMap } from '@xh/hoist/security/Token';
+import { Token } from '@xh/hoist/security/Token';
+import { AccessTokenSpec, TokenMap } from '../Types';
 import { BaseOAuthClient, BaseOAuthClientConfig } from '../BaseOAuthClient';
 export interface MsalClientConfig extends BaseOAuthClientConfig<MsalTokenSpec> {
     /**
@@ -44,9 +45,7 @@ export interface MsalClientConfig extends BaseOAuthClientConfig<MsalTokenSpec> {
      */
     msalClientOptions?: Partial<msal.Configuration>;
 }
-export interface MsalTokenSpec {
-    /** Scopes for the desired access token. */
-    scopes: string[];
+export interface MsalTokenSpec extends AccessTokenSpec {
     /**
      * Scopes to be added to the scopes requested during interactive and SSO logins.
      * See the `scopes` property on  `PopupRequest`, `RedirectRequest`, and `SSORequest`

package/cmp/filter/FilterChooserModel.ts

@@ -415,7 +415,9 @@ export class FilterChooserModel extends HoistModel {
     }: FilterChooserPersistOptions) {
         if (persistValue) {
             const status = {initialized: false},
-                persistWith = isObject(persistValue) ? persistValue : rootPersistWith;
+                persistWith = isObject(persistValue)
+                    ? PersistenceProvider.mergePersistOptions(rootPersistWith, persistValue)
+                    : rootPersistWith;
             PersistenceProvider.create({
                 persistOptions: {
                     path: `${path}.value`,
@@ -432,7 +434,9 @@ export class FilterChooserModel extends HoistModel {
         }
 
         if (persistFavorites) {
-            const persistWith = isObject(persistFavorites) ? persistFavorites : rootPersistWith,
+            const persistWith = isObject(persistFavorites)
+                    ? PersistenceProvider.mergePersistOptions(rootPersistWith, persistFavorites)
+                    : rootPersistWith,
                 provider = PersistenceProvider.create({
                     persistOptions: {
                         path: `${path}.favorites`,