@xh/hoist 73.0.0-SNAPSHOT.1745689122610 → 73.0.0-SNAPSHOT.1745973083869

package/build/types/admin/tabs/activity/tracking/datafields/DataFieldsEditorModel.d.ts

@@ -0,0 +1,46 @@
+import { ActivityTrackingModel } from '@xh/hoist/admin/tabs/activity/tracking/ActivityTrackingModel';
+import { FormModel, SubformsFieldModel } from '@xh/hoist/cmp/form';
+import { HoistModel } from '@xh/hoist/core';
+import { AggregatorToken, FieldType } from '@xh/hoist/data';
+/**
+ * Slimmed down {@link CubeFieldSpec} for persisted specs of fields to be extracted from the `data`
+ * block of loaded track statements and promoted to top-level columns in the grids. These are the
+ * entities (stored on parent `ActivityTrackingModel`) that are edited by the this component.
+ */
+export interface ActivityTrackingDataFieldSpec {
+    /**
+     * Path to field data within the `data` block of each track log entry. Can be dot-delimited for
+     * nested data (e.g. `timings.preAuth`). See {@link ActivityTrackingModel.processRawTrackLog}.
+     */
+    path: string;
+    /**
+     * Normalized name for the field for use in Cube/Grid - adds `df_` prefix to avoid conflicts
+     * and strips out dot-delimiters. See {@link ActivityTrackingModel.setDataFields}.
+     */
+    name: string;
+    displayName?: string;
+    type?: FieldType;
+    isDimension?: boolean;
+    aggregator?: AggregatorToken;
+}
+export declare class DataFieldsEditorModel extends HoistModel {
+    showEditor: boolean;
+    formModel: FormModel;
+    private parentModel;
+    aggTokens: AggregatorToken[];
+    get dataFields(): SubformsFieldModel;
+    get appliedDataFieldCount(): number;
+    get hasAppliedDataFields(): boolean;
+    constructor(parentModel: ActivityTrackingModel);
+    show(): void;
+    applyAndClose(): void;
+    close(): void;
+    addField(): void;
+    cloneField(formModel: FormModel): void;
+    private syncFromParent;
+    /**
+     * Normalize field specs and set onto parent.
+     * Note, will de-dupe fields by name w/o any alert to user.
+     */
+    private syncToParent;
+}

package/build/types/admin/tabs/activity/tracking/detail/ActivityDetailModel.d.ts

@@ -6,11 +6,23 @@ export declare class ActivityDetailModel extends HoistModel {
     activityTrackingModel: ActivityTrackingModel;
     gridModel: GridModel;
     formModel: FormModel;
-    formattedData: any;
+    /**
+     * Optional dot-delimited path(s) to filter the displayed `data` payload down to a particular
+     * node or nodes, for easier browsing of records with a large data payload. Multiple paths
+     * can be separated with `|`.
+     */
+    formattedDataFilterPath: string;
+    /** Stringified, pretty-printed, optionally path-filtered `data` payload. */
+    formattedData: string;
     get hasSelection(): boolean;
     constructor();
     onLinked(): void;
     private showActivityEntriesAsync;
     private getAllLeafRows;
+    /** Extract data from a (detail) grid record and flush it into our form for display. */
     private showEntryDetail;
+    private updateFormattedData;
+    private createAndSetCoreModels;
+    private createGridModel;
+    private createSingleEntryFormModel;
 }

package/build/types/cmp/form/FormModel.d.ts

@@ -3,9 +3,7 @@ import { ValidationState } from '@xh/hoist/data';
 import { BaseFieldConfig, BaseFieldModel } from './field/BaseFieldModel';
 import { SubformsFieldConfig, SubformsFieldModel } from './field/SubformsFieldModel';
 export interface FormConfig {
-    /**
-     * FieldModels, or configurations to create them, for all data fields managed by this FormModel.
-     */
+    /** FieldModels, or configs to create them, for all data fields managed by the model. */
     fields?: Array<BaseFieldModel | BaseFieldConfig | SubformsFieldConfig | SubformsFieldModel>;
     /** Map of initial values for fields in this model. */
     initialValues?: PlainObject;
@@ -15,27 +13,27 @@ export interface FormConfig {
     xhImpl?: boolean;
 }
 /**
- * FormModel is the main entry point for Form specification. This Model's `fields` collection holds
- * multiple FieldModel instances, which in turn hold the state of user edited data and the
- * validation rules around editing that data.
+ * FormModel is the main entry point for Form specification. This Model's `fields` object references
+ * multiple {@link FieldModel} instances, keyed by name, which in turn hold the state of user-
+ * edited data and the validation rules around editing that data.
  *
  * A complete representation of all fields and data within a Form can be produced via this model's
- * `getData()` method, making it easy to harvest all values for e.g. submission to a server.
+ * {@link getData} method, making it easy to harvest all values for e.g. submission to a server.
  *
- * Individual field values are also available as observables via this model's `values` proxy. An
- * application model can setup a reaction to track changes to any value and execute app-specific
+ * Individual field values are also available as observables via this model's {@link values} proxy.
+ * An application model can setup a reaction to track changes to any value and execute app-specific
  * logic such as disabling one field based on the state of another, or setting up cascading options.
  *
  * This Model provides an overall validation state, determined by the current validation state of
  * its fields as per their configured rules and constraints.
  *
- * FormModels can be nested via SubformsFieldModels, a specialized type of FieldModel that itself
- * manages a collection of child FormModels. This allows use cases where Forms support editing of
+ * FormModels can be nested via {@link SubformsFieldModel}s, a specialized type of FieldModel that
+ * itself manages a collection of child FormModels. This enables forms to support editing of
  * dynamic collections of complex objects with their own internal validation rules (e.g. a FormModel
  * representing a market order might have multiple nested FormModels to represent execution splits,
  * where each split has its own internal fields for broker, quantity, and time).
  *
- * @see FieldModel for details on state and validation maintained at the individual field level.
+ * See {@link FieldModel} for details on state/validation maintained at the individual field level.
  */
 export declare class FormModel extends HoistModel {
     /** Container object for FieldModel instances, keyed by field name.*/
@@ -87,7 +85,6 @@ export declare class FormModel extends HoistModel {
     init(initialValues?: PlainObject): void;
     /**
      * Set the value of one or more fields on this form.
-     *
      * @param values - map of field name to value.
      */
     setValues(values: PlainObject): void;
@@ -95,16 +92,12 @@ export declare class FormModel extends HoistModel {
     get isDirty(): boolean;
     /**
      * The Field that is currently focused on this form.
-     *
-     * @see FieldModel.focus() for important information on this method
-     * and its limitations.
+     * See {@link FieldModel.focus} for important information on this method and its limitations.
      */
     get focusedField(): BaseFieldModel;
     /**
      * Focus a field on this form.
-     *
-     * @see FieldModel.focus() for important information on this method
-     * and its limitations.
+     * See {@link FieldModel.focus} for important information on this method and its limitations.
      */
     focusField(name: string): void;
     get validationState(): ValidationState;
@@ -114,17 +107,12 @@ export declare class FormModel extends HoistModel {
     get isValid(): boolean;
     /** List of all validation errors for this form. */
     get allErrors(): string[];
-    /**
-     * Recompute all validations and return true if the form is valid.
-     *
-     * @param opts - set 'display' to true to trigger the display of
-     *  validation errors (if any) by bound FormField components after validation
-     *  is complete.
-     */
+    /** Recompute all validations and return true if the form is valid. */
     validateAsync(opts?: {
+        /** True to trigger display of validation errors (if any) by bound `FormField`s after validation is complete. */
         display?: boolean;
     }): Promise<boolean>;
-    /** Trigger the display of validation errors (if any) by bound FormField components. */
+    /** Trigger the display of validation errors (if any) by bound `FormField`s. */
     displayValidation(): void;
     private createValuesProxy;
 }

package/build/types/cmp/form/field/SubformsFieldModel.d.ts

@@ -4,32 +4,37 @@ import { FormModel } from '../FormModel';
 import { BaseFieldModel, BaseFieldConfig } from './BaseFieldModel';
 import { FormConfig } from '../FormModel';
 export interface SubformsFieldConfig extends BaseFieldConfig {
-    /** Config for FormModel representing a subform. */
+    /**
+     * Config for a {@link FormModel} to be auto-created to manage and validate the data for each
+     *
+     */
     subforms: FormConfig;
     /**
-     * Initial value of this field.  If a function, will be
-     * executed dynamically when form is initialized to provide value.
+     * Initial value of this field. If a function, will be executed dynamically when form is
+     * initialized to provide value.
      */
     initialValue?: any[];
 }
 /**
- * A data field in a form whose value is a collection of FormModels (subforms).
+ * A data field in a form whose value is a collection of nested objects - all of the same shape, but
+ * with arbitrary internal complexity. A dedicated {@link FormModel} is auto-created to manage and
+ * validate each object independently.
  *
- * Applications should initialize this field with an array of objects.  These values will be
- * loaded into an array of managed FormModels which will form the value of this field.
+ * Applications should initialize this field with an array of objects. These values will be loaded
+ * into an array of managed FormModels which will form the value of this field.
  *
  * Applications should *not* modify the value property directly, unless they wish to reinitialize
- * all existing form contents to new values.  Use the methods add() or remove() to
- * adjust the contents of the collection while preserving existing form state.
+ * all existing form contents to new values. Call {@link add} or {@link remove} on one of these
+ * fields to adjust the contents of its collection while preserving existing state.
  *
- * Validation rules for the entire collection may be specified as for any field, but
- * validations on the subforms will also bubble up to this field, affecting its overall
- * validation state.
+ * Validation rules for the entire collection may be specified as for any field, but validations on
+ * the subforms will also bubble up to this field, affecting its overall validation state.
  */
 export declare class SubformsFieldModel extends BaseFieldModel {
+    /** (Sub)FormModels created by this model, tracked to support cleanup. */
     private createdModels;
     private formConfig;
-    private origInitialValues;
+    private readonly origInitialValues;
     constructor({ subforms, initialValue, ...rest }: SubformsFieldConfig);
     get hasFocus(): boolean;
     focus(): void;
@@ -49,14 +54,11 @@ export declare class SubformsFieldModel extends BaseFieldModel {
         display?: boolean;
     }): Promise<boolean>;
     protected deriveValidationState(): ValidationState;
-    /**
-     * Add a new record (subform) to this field.
-     *
-     * @param initialValues - object containing initial values for new record.
-     * @param index - index in collection where subform should be inserted.
-     */
+    /** Add a new object (subform) to this field's collection. */
     add(opts?: {
+        /** Initial values for the new object/subform. */
         initialValues?: PlainObject;
+        /** Index within the collection where the new subform should be inserted. */
         index?: number;
     }): void;
     remove(formModel: FormModel): void;

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

@@ -1,7 +1,7 @@
-import { PersistOptions, DebounceSpec, Some } from './';
 import { comparer } from '@xh/hoist/mobx';
 import { IAutorunOptions, IReactionOptions } from 'mobx/dist/api/autorun';
-import { IReactionDisposer, IEqualsComparer } from 'mobx/dist/internal';
+import { IEqualsComparer, IReactionDisposer } from 'mobx/dist/internal';
+import { DebounceSpec, PersistOptions, Some } from './';
 export interface HoistBaseClass {
     new (...args: any[]): HoistBase;
     isHoistBase: boolean;

package/build/types/data/cube/CubeField.d.ts

@@ -3,11 +3,8 @@ import { Aggregator, AverageAggregator, AverageStrictAggregator, ChildCountAggre
 export interface CubeFieldSpec extends FieldSpec {
     /** True to allow this field to be used for grouping.*/
     isDimension?: boolean;
-    /**
-     * Instance of a Hoist Cube Aggregator (from the aggregate package), or string alias for the
-     * same (e.g. 'MAX').
-     */
-    aggregator?: Aggregator | 'AVG' | 'AVG_STRICT' | 'CHILD_COUNT' | 'LEAF_COUNT' | 'MAX' | 'MIN' | 'NULL' | 'SINGLE' | 'SUM' | 'SUM_STRICT' | 'UNIQUE';
+    /** Instance of a Hoist Cube {@link Aggregator} or string token alias for one. */
+    aggregator?: Aggregator | AggregatorToken;
     /** Function to determine if aggregation should be performed at a given level of a query result. */
     canAggregateFn?: CanAggregateFn;
     /** True if any further groupings below this dimension would be derivative (have only one member). */
@@ -19,6 +16,8 @@ export interface CubeFieldSpec extends FieldSpec {
      */
     parentDimension?: string;
 }
+/** Convenient (and serializable) alias for one of Hoist's Cube {@link Aggregator} classes. */
+export type AggregatorToken = 'AVG' | 'AVG_STRICT' | 'CHILD_COUNT' | 'LEAF_COUNT' | 'MAX' | 'MIN' | 'NULL' | 'SINGLE' | 'SUM' | 'SUM_STRICT' | 'UNIQUE';
 /**
  * @param dimension - dimension of aggregation
  * @param value - value of record on dimension

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

@@ -86,7 +86,7 @@ export declare const autoRefreshAppOption: ({ formFieldProps, inputProps }?: Aut
         suppressContentEditableWarning?: boolean;
         suppressHydrationWarning?: boolean;
         accessKey?: string;
-        autoCapitalize?: "off" | "none" | "on" | "sentences" | "words" | "characters" | (string & {});
+        autoCapitalize?: "none" | "off" | "on" | "sentences" | "words" | "characters" | (string & {});
         autoFocus?: boolean;
         contentEditable?: "inherit" | (boolean | "true" | "false") | "plaintext-only";
         dir?: string;
@@ -121,7 +121,7 @@ export declare const autoRefreshAppOption: ({ formFieldProps, inputProps }?: Aut
         results?: number;
         security?: string;
         unselectable?: "off" | "on";
-        inputMode?: "search" | "text" | "none" | "tel" | "url" | "email" | "numeric" | "decimal";
+        inputMode?: "none" | "search" | "text" | "tel" | "url" | "email" | "numeric" | "decimal";
         is?: string;
         "aria-activedescendant"?: string;
         "aria-atomic"?: boolean | "true" | "false";
@@ -140,7 +140,7 @@ export declare const autoRefreshAppOption: ({ formFieldProps, inputProps }?: Aut
         "aria-description"?: string;
         "aria-details"?: string;
         "aria-disabled"?: boolean | "true" | "false";
-        "aria-dropeffect"?: "link" | "none" | "copy" | "execute" | "move" | "popup";
+        "aria-dropeffect"?: "none" | "link" | "copy" | "execute" | "move" | "popup";
         "aria-errormessage"?: string;
         "aria-expanded"?: boolean | "true" | "false";
         "aria-flowto"?: string;

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

@@ -84,7 +84,7 @@ export declare const themeAppOption: ({ formFieldProps, inputProps }?: ThemeAppO
         suppressContentEditableWarning?: boolean;
         suppressHydrationWarning?: boolean;
         accessKey?: string;
-        autoCapitalize?: "off" | "none" | "on" | "sentences" | "words" | "characters" | (string & {});
+        autoCapitalize?: "none" | "off" | "on" | "sentences" | "words" | "characters" | (string & {});
         autoFocus?: boolean;
         contentEditable?: "inherit" | (boolean | "true" | "false") | "plaintext-only";
         dir?: string;
@@ -119,7 +119,7 @@ export declare const themeAppOption: ({ formFieldProps, inputProps }?: ThemeAppO
         results?: number;
         security?: string;
         unselectable?: "off" | "on";
-        inputMode?: "search" | "text" | "none" | "tel" | "url" | "email" | "numeric" | "decimal";
+        inputMode?: "none" | "search" | "text" | "tel" | "url" | "email" | "numeric" | "decimal";
         is?: string;
         "aria-activedescendant"?: string;
         "aria-atomic"?: boolean | "true" | "false";
@@ -138,7 +138,7 @@ export declare const themeAppOption: ({ formFieldProps, inputProps }?: ThemeAppO
         "aria-description"?: string;
         "aria-details"?: string;
         "aria-disabled"?: boolean | "true" | "false";
-        "aria-dropeffect"?: "link" | "none" | "copy" | "execute" | "move" | "popup";
+        "aria-dropeffect"?: "none" | "link" | "copy" | "execute" | "move" | "popup";
         "aria-errormessage"?: string;
         "aria-expanded"?: boolean | "true" | "false";
         "aria-flowto"?: string;

package/cmp/error/ErrorBoundaryModel.ts

@@ -5,8 +5,8 @@
  * Copyright © 2025 Extremely Heavy Industries Inc.
  */
 import {ExceptionHandlerOptions, HoistModel, XH} from '@xh/hoist/core';
+import {action, makeObservable, observable} from '@xh/hoist/mobx';
 import {isFunction} from 'lodash';
-import {action, makeObservable, observable} from 'mobx';
 import {ReactNode} from 'react';
 
 export interface ErrorBoundaryConfig {

package/cmp/form/FormModel.ts

@@ -14,9 +14,7 @@ import {FieldModel} from './field/FieldModel';
 import {SubformsFieldConfig, SubformsFieldModel} from './field/SubformsFieldModel';
 
 export interface FormConfig {
-    /**
-     * FieldModels, or configurations to create them, for all data fields managed by this FormModel.
-     */
+    /** FieldModels, or configs to create them, for all data fields managed by the model. */
     fields?: Array<BaseFieldModel | BaseFieldConfig | SubformsFieldConfig | SubformsFieldModel>;
 
     /** Map of initial values for fields in this model. */
@@ -30,27 +28,27 @@ export interface FormConfig {
 }
 
 /**
- * FormModel is the main entry point for Form specification. This Model's `fields` collection holds
- * multiple FieldModel instances, which in turn hold the state of user edited data and the
- * validation rules around editing that data.
+ * FormModel is the main entry point for Form specification. This Model's `fields` object references
+ * multiple {@link FieldModel} instances, keyed by name, which in turn hold the state of user-
+ * edited data and the validation rules around editing that data.
  *
  * A complete representation of all fields and data within a Form can be produced via this model's
- * `getData()` method, making it easy to harvest all values for e.g. submission to a server.
+ * {@link getData} method, making it easy to harvest all values for e.g. submission to a server.
  *
- * Individual field values are also available as observables via this model's `values` proxy. An
- * application model can setup a reaction to track changes to any value and execute app-specific
+ * Individual field values are also available as observables via this model's {@link values} proxy.
+ * An application model can setup a reaction to track changes to any value and execute app-specific
  * logic such as disabling one field based on the state of another, or setting up cascading options.
  *
  * This Model provides an overall validation state, determined by the current validation state of
  * its fields as per their configured rules and constraints.
  *
- * FormModels can be nested via SubformsFieldModels, a specialized type of FieldModel that itself
- * manages a collection of child FormModels. This allows use cases where Forms support editing of
+ * FormModels can be nested via {@link SubformsFieldModel}s, a specialized type of FieldModel that
+ * itself manages a collection of child FormModels. This enables forms to support editing of
  * dynamic collections of complex objects with their own internal validation rules (e.g. a FormModel
  * representing a market order might have multiple nested FormModels to represent execution splits,
  * where each split has its own internal fields for broker, quantity, and time).
  *
- * @see FieldModel for details on state and validation maintained at the individual field level.
+ * See {@link FieldModel} for details on state/validation maintained at the individual field level.
  */
 export class FormModel extends HoistModel {
     /** Container object for FieldModel instances, keyed by field name.*/
@@ -164,7 +162,6 @@ export class FormModel extends HoistModel {
 
     /**
      * Set the value of one or more fields on this form.
-     *
      * @param values - map of field name to value.
      */
     @action
@@ -184,9 +181,7 @@ export class FormModel extends HoistModel {
     //-----------------------------------
     /**
      * The Field that is currently focused on this form.
-     *
-     * @see FieldModel.focus() for important information on this method
-     * and its limitations.
+     * See {@link FieldModel.focus} for important information on this method and its limitations.
      */
     @computed
     get focusedField(): BaseFieldModel {
@@ -195,9 +190,7 @@ export class FormModel extends HoistModel {
 
     /**
      * Focus a field on this form.
-     *
-     * @see FieldModel.focus() for important information on this method
-     * and its limitations.
+     * See {@link FieldModel.focus} for important information on this method and its limitations.
      */
     focusField(name: string) {
         this.getField(name)?.focus();
@@ -230,21 +223,18 @@ export class FormModel extends HoistModel {
         return flatMap(this.fields, s => s.allErrors);
     }
 
-    /**
-     * Recompute all validations and return true if the form is valid.
-     *
-     * @param opts - set 'display' to true to trigger the display of
-     *  validation errors (if any) by bound FormField components after validation
-     *  is complete.
-     */
-    async validateAsync(opts?: {display?: boolean}): Promise<boolean> {
+    /** Recompute all validations and return true if the form is valid. */
+    async validateAsync(opts?: {
+        /** True to trigger display of validation errors (if any) by bound `FormField`s after validation is complete. */
+        display?: boolean;
+    }): Promise<boolean> {
         const {display = true} = opts ?? {},
             promises = map(this.fields, m => m.validateAsync({display}));
         await Promise.all(promises);
         return this.isValid;
     }
 
-    /** Trigger the display of validation errors (if any) by bound FormField components. */
+    /** Trigger the display of validation errors (if any) by bound `FormField`s. */
     displayValidation() {
         forOwn(this.fields, m => m.displayValidation());
     }

package/cmp/form/field/SubformsFieldModel.ts

@@ -15,36 +15,40 @@ import {BaseFieldModel, BaseFieldConfig} from './BaseFieldModel';
 import {FormConfig} from '../FormModel';
 
 export interface SubformsFieldConfig extends BaseFieldConfig {
-    /** Config for FormModel representing a subform. */
+    /**
+     * Config for a {@link FormModel} to be auto-created to manage and validate the data for each
+     *
+     */
     subforms: FormConfig;
 
     /**
-     * Initial value of this field.  If a function, will be
-     * executed dynamically when form is initialized to provide value.
+     * Initial value of this field. If a function, will be executed dynamically when form is
+     * initialized to provide value.
      */
     initialValue?: any[];
 }
 
 /**
- * A data field in a form whose value is a collection of FormModels (subforms).
+ * A data field in a form whose value is a collection of nested objects - all of the same shape, but
+ * with arbitrary internal complexity. A dedicated {@link FormModel} is auto-created to manage and
+ * validate each object independently.
  *
- * Applications should initialize this field with an array of objects.  These values will be
- * loaded into an array of managed FormModels which will form the value of this field.
+ * Applications should initialize this field with an array of objects. These values will be loaded
+ * into an array of managed FormModels which will form the value of this field.
  *
  * Applications should *not* modify the value property directly, unless they wish to reinitialize
- * all existing form contents to new values.  Use the methods add() or remove() to
- * adjust the contents of the collection while preserving existing form state.
+ * all existing form contents to new values. Call {@link add} or {@link remove} on one of these
+ * fields to adjust the contents of its collection while preserving existing state.
  *
- * Validation rules for the entire collection may be specified as for any field, but
- * validations on the subforms will also bubble up to this field, affecting its overall
- * validation state.
+ * Validation rules for the entire collection may be specified as for any field, but validations on
+ * the subforms will also bubble up to this field, affecting its overall validation state.
  */
 export class SubformsFieldModel extends BaseFieldModel {
-    // (Sub)FormModels created by this model, tracked to support cleanup.
-    @managed
-    private createdModels: FormModel[] = [];
+    /** (Sub)FormModels created by this model, tracked to support cleanup. */
+    @managed private createdModels: FormModel[] = [];
+
     private formConfig: FormConfig = null;
-    private origInitialValues: any[];
+    private readonly origInitialValues: any[];
 
     constructor({subforms, initialValue = [], ...rest}: SubformsFieldConfig) {
         super(rest);
@@ -161,14 +165,16 @@ export class SubformsFieldModel extends BaseFieldModel {
     //-----------------------------
     // Collection management
     //-----------------------------
-    /**
-     * Add a new record (subform) to this field.
-     *
-     * @param initialValues - object containing initial values for new record.
-     * @param index - index in collection where subform should be inserted.
-     */
+    /** Add a new object (subform) to this field's collection. */
     @action
-    add(opts: {initialValues?: PlainObject; index?: number} = {}) {
+    add(
+        opts: {
+            /** Initial values for the new object/subform. */
+            initialValues?: PlainObject;
+            /** Index within the collection where the new subform should be inserted. */
+            index?: number;
+        } = {}
+    ) {
         const {initialValues = {}, index = this.value.length} = opts,
             newSubforms = this.parseValue([initialValues]),
             newValue = clone(this.value);

package/cmp/grid/impl/GridHScrollbar.ts

@@ -7,10 +7,9 @@
 import {GridLocalModel, GridModel} from '@xh/hoist/cmp/grid';
 import {div} from '@xh/hoist/cmp/layout';
 import {hoistCmp, HoistModel, HoistProps, useLocalModel} from '@xh/hoist/core';
-import {makeObservable} from '@xh/hoist/mobx';
+import {action, makeObservable, observable} from '@xh/hoist/mobx';
 import {observeResize} from '@xh/hoist/utils/js';
 import {sumBy} from 'lodash';
-import {action, observable} from 'mobx';
 import {createRef, RefObject} from 'react';
 
 /**

package/core/HoistBase.ts

@@ -4,15 +4,21 @@
  *
  * Copyright © 2025 Extremely Heavy Industries Inc.
  */
-import {runInAction} from 'mobx';
-import {XH, PersistenceProvider, PersistOptions, DebounceSpec, Some, PersistableState} from './';
 import {
-    throwIf,
+    action,
+    autorun as mobxAutorun,
+    comparer,
+    reaction as mobxReaction,
+    runInAction,
+    when as mobxWhen
+} from '@xh/hoist/mobx';
+import {
     getOrCreate,
-    logInfo,
     logDebug,
     logError,
+    logInfo,
     logWarn,
+    throwIf,
     withDebug,
     withInfo
 } from '@xh/hoist/utils/js';
@@ -25,15 +31,9 @@ import {
     isString,
     upperFirst
 } from 'lodash';
-import {
-    action,
-    comparer,
-    autorun as mobxAutorun,
-    reaction as mobxReaction,
-    when as mobxWhen
-} from '@xh/hoist/mobx';
 import {IAutorunOptions, IReactionOptions} from 'mobx/dist/api/autorun';
-import {IReactionDisposer, IEqualsComparer} from 'mobx/dist/internal';
+import {IEqualsComparer, IReactionDisposer} from 'mobx/dist/internal';
+import {DebounceSpec, PersistableState, PersistenceProvider, PersistOptions, Some, XH} from './';
 
 export interface HoistBaseClass {
     new (...args: any[]): HoistBase;

package/data/cube/CubeField.ts

@@ -28,23 +28,8 @@ export interface CubeFieldSpec extends FieldSpec {
     /** True to allow this field to be used for grouping.*/
     isDimension?: boolean;
 
-    /**
-     * Instance of a Hoist Cube Aggregator (from the aggregate package), or string alias for the
-     * same (e.g. 'MAX').
-     */
-    aggregator?:
-        | Aggregator
-        | 'AVG'
-        | 'AVG_STRICT'
-        | 'CHILD_COUNT'
-        | 'LEAF_COUNT'
-        | 'MAX'
-        | 'MIN'
-        | 'NULL'
-        | 'SINGLE'
-        | 'SUM'
-        | 'SUM_STRICT'
-        | 'UNIQUE';
+    /** Instance of a Hoist Cube {@link Aggregator} or string token alias for one. */
+    aggregator?: Aggregator | AggregatorToken;
 
     /** Function to determine if aggregation should be performed at a given level of a query result. */
     canAggregateFn?: CanAggregateFn;
@@ -60,6 +45,20 @@ export interface CubeFieldSpec extends FieldSpec {
     parentDimension?: string;
 }
 
+/** Convenient (and serializable) alias for one of Hoist's Cube {@link Aggregator} classes. */
+export type AggregatorToken =
+    | 'AVG'
+    | 'AVG_STRICT'
+    | 'CHILD_COUNT'
+    | 'LEAF_COUNT'
+    | 'MAX'
+    | 'MIN'
+    | 'NULL'
+    | 'SINGLE'
+    | 'SUM'
+    | 'SUM_STRICT'
+    | 'UNIQUE';
+
 /**
  * @param dimension - dimension of aggregation
  * @param value - value of record on dimension
@@ -114,7 +113,7 @@ export class CubeField extends Field {
     //------------------------
     // Implementation
     //------------------------
-    private parseAggregator(val: any): Aggregator {
+    private parseAggregator(val: Aggregator | AggregatorToken): Aggregator {
         if (isString(val)) {
             switch (val) {
                 case 'AVG':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xh/hoist",
-  "version": "73.0.0-SNAPSHOT.1745689122610",
+  "version": "73.0.0-SNAPSHOT.1745973083869",
   "description": "Hoist add-on for building and deploying React Applications.",
   "repository": "github:xh/hoist-react",
   "homepage": "https://xh.io",