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

package/cmp/form/field/SubformsFieldModel.ts

@@ -15,40 +15,36 @@ import {BaseFieldModel, BaseFieldConfig} from './BaseFieldModel';
 import {FormConfig} from '../FormModel';
 
 export interface SubformsFieldConfig extends BaseFieldConfig {
-    /**
-     * Config for a {@link FormModel} to be auto-created to manage and validate the data for each
-     *
-     */
+    /** Config for FormModel representing a subform. */
     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 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.
+ * A data field in a form whose value is a collection of FormModels (subforms).
  *
- * 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. Call {@link add} or {@link remove} on one of these
- * fields to adjust the contents of its collection while preserving existing state.
+ * 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.
  *
- * 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 readonly origInitialValues: any[];
+    private origInitialValues: any[];
 
     constructor({subforms, initialValue = [], ...rest}: SubformsFieldConfig) {
         super(rest);
@@ -165,16 +161,14 @@ export class SubformsFieldModel extends BaseFieldModel {
     //-----------------------------
     // Collection management
     //-----------------------------
-    /** Add a new object (subform) to this field's collection. */
+    /**
+     * 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.
+     */
     @action
-    add(
-        opts: {
-            /** Initial values for the new object/subform. */
-            initialValues?: PlainObject;
-            /** Index within the collection where the new subform should be inserted. */
-            index?: number;
-        } = {}
-    ) {
+    add(opts: {initialValues?: PlainObject; index?: number} = {}) {
         const {initialValues = {}, index = this.value.length} = opts,
             newSubforms = this.parseValue([initialValues]),
             newValue = clone(this.value);

package/cmp/grid/impl/GridHScrollbar.ts

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

package/data/cube/CubeField.ts

@@ -28,8 +28,23 @@ export interface CubeFieldSpec extends FieldSpec {
     /** True to allow this field to be used for grouping.*/
     isDimension?: boolean;
 
-    /** Instance of a Hoist Cube {@link Aggregator} or string token alias for one. */
-    aggregator?: Aggregator | AggregatorToken;
+    /**
+     * 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';
 
     /** Function to determine if aggregation should be performed at a given level of a query result. */
     canAggregateFn?: CanAggregateFn;
@@ -45,20 +60,6 @@ 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
@@ -113,7 +114,7 @@ export class CubeField extends Field {
     //------------------------
     // Implementation
     //------------------------
-    private parseAggregator(val: Aggregator | AggregatorToken): Aggregator {
+    private parseAggregator(val: any): Aggregator {
         if (isString(val)) {
             switch (val) {
                 case 'AVG':

package/package.json

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

package/svc/TrackService.ts

@@ -119,6 +119,8 @@ export class TrackService extends HoistService {
             msg: stripTags(options.message),
             clientUsername: XH.getUsername(),
             appVersion: XH.getEnv('clientVersion'),
+            loadId: XH.loadId,
+            tabId: XH.tabId,
             url: window.location.href,
             timestamp: Date.now()
         };