@xh/hoist 77.0.0-SNAPSHOT.1761257771095 → 77.0.0-SNAPSHOT.1761690719868

package/data/Store.ts

@@ -44,7 +44,7 @@ export interface StoreConfig {
      * Default configs applied to `Field` instances constructed internally by this Store.
      * @see FieldSpec
      */
-    fieldDefaults?: any;
+    fieldDefaults?: Omit<FieldSpec, 'name'>;
 
     /**
      * Specification for producing an immutable unique id for each record. May be provided as
@@ -978,17 +978,20 @@ export class Store extends HoistBase {
         this.summaryRecords = null;
     }
 
-    private parseFields(fields: any[], defaults: any): Field[] {
+    private parseFields(
+        fields: Array<string | FieldSpec | Field>,
+        defaults: Omit<FieldSpec, 'name'>
+    ): Field[] {
         const ret = fields.map(f => {
             if (f instanceof Field) return f;
 
-            if (isString(f)) f = {name: f};
+            let fieldSpec: FieldSpec = isString(f) ? {name: f} : f;
 
             if (!isEmpty(defaults)) {
-                f = defaultsDeep({}, f, defaults);
+                fieldSpec = defaultsDeep({}, fieldSpec, defaults);
             }
 
-            return new this.defaultFieldClass(f);
+            return new this.defaultFieldClass(fieldSpec);
         });
 
         throwIf(
@@ -1041,26 +1044,36 @@ export class Store extends HoistBase {
         return ret;
     }
 
-    private createRecords(rawData: PlainObject[], parent: StoreRecord, recordMap = new Map()) {
+    private createRecords(
+        rawData: PlainObject[],
+        parent: StoreRecord,
+        recordMap: Map<StoreRecordId, StoreRecord> = new Map(),
+        summaryRecordIds: Set<StoreRecordId> = this.summaryRecordIds
+    ) {
         const {loadTreeData, loadTreeDataFrom} = this;
+
         rawData.forEach(raw => {
             const rec = this.createRecord(raw, parent),
                 {id} = rec;
 
             throwIf(
-                recordMap.has(id) || this.summaryRecords?.some(it => it.id === id),
+                recordMap.has(id) || summaryRecordIds.has(id),
                 `ID ${id} is not unique. Use the 'Store.idSpec' config to resolve a unique ID for each record.`
             );
 
             recordMap.set(id, rec);
 
             if (loadTreeData && raw[loadTreeDataFrom]) {
-                this.createRecords(raw[loadTreeDataFrom], rec, recordMap);
+                this.createRecords(raw[loadTreeDataFrom], rec, recordMap, summaryRecordIds);
             }
         });
         return recordMap;
     }
 
+    private get summaryRecordIds(): Set<StoreRecordId> {
+        return new Set(this.summaryRecords?.map(it => it.id) ?? []);
+    }
+
     private parseRaw(data: PlainObject): PlainObject {
         // a) create/prepare the data object
         const ret = Object.create(this._dataDefaults);

package/data/cube/Query.ts

@@ -109,7 +109,7 @@ export interface QueryConfig {
      *
      * This can be used to break selected aggregations into sub-groups dynamically, without having
      * to define another dimension in the Cube and have it apply to all aggregations. See the
-     * {@link BucketSpec} interface for additional information.
+     * {@link BucketSpecFn} type and {@link BucketSpec} interface for additional information.
      *
      * Defaults to {@link Cube.bucketSpecFn}.
      */

package/data/cube/ViewRowData.ts

@@ -19,6 +19,9 @@ export class ViewRowData {
     /** Unique id. */
     id: string;
 
+    /** Denotes a type for the row */
+    cubeRowType: 'leaf' | 'aggregate' | 'bucket';
+
     /**
      * Label of the row. The dimension value or, for leaf rows. the underlying cubeId.
      * Suitable for display, although apps will typically wish to customize leaf row rendering.

package/data/cube/row/AggregateRow.ts

@@ -38,6 +38,7 @@ export class AggregateRow extends BaseRow {
 
         this.dim = dim;
         this.dimName = dimName;
+        this.data.cubeRowType = 'aggregate';
         this.data.cubeLabel = strVal;
         this.data.cubeDimension = dimName;
 

package/data/cube/row/BucketRow.ts

@@ -35,6 +35,7 @@ export class BucketRow extends BaseRow {
         super(view, id);
 
         this.bucketSpec = bucketSpec;
+        this.data.cubeRowType = 'bucket';
         this.data.cubeLabel = bucketSpec.labelFn(bucketVal);
         this.data.cubeDimension = bucketSpec.name;
 

package/data/cube/row/LeafRow.ts

@@ -33,8 +33,8 @@ export class LeafRow extends BaseRow {
 
     constructor(view: View, id: string, rawRecord: StoreRecord) {
         super(view, id);
-
         this.cubeRecordId = rawRecord.id;
+        this.data.cubeRowType = 'leaf';
         this.data.cubeLabel = rawRecord.id.toString();
         this.data.cubeDimension = null;
 

package/format/FormatNumber.ts

@@ -397,13 +397,13 @@ function fmtNumberString(
         ret += sign;
     }
 
-    if (isString(prefix)) {
+    if (isString(prefix) && prefix.trim()) {
         ret += prefix;
     }
 
     ret += str;
 
-    if (isString(label)) {
+    if (isString(label) && label.trim()) {
         if (labelCls) {
             ret += fmtSpan(label, {className: labelCls, asHtml});
         } else {

package/kit/highcharts/index.ts

@@ -9,8 +9,8 @@ import {checkVersion, logError} from '@xh/hoist/utils/js';
 
 export let Highcharts = null;
 
-const MIN_VERSION = '12.4.0';
-const MAX_VERSION = '12.*.*';
+const MIN_VERSION = '11.1.0';
+const MAX_VERSION = '11.*.*';
 
 /**
  * Expose application versions of Highcharts to Hoist.

package/package.json

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

package/promise/Promise.ts

@@ -132,15 +132,15 @@ export function waitFor(
     condition: () => boolean,
     {interval = 50, timeout = 5 * SECONDS}: {interval?: number; timeout?: number} = {}
 ): Promise<void> {
-    if (!isNumber(interval) || interval <= 0) throw new Error('Invalid interval');
-    if (!isNumber(timeout) || timeout <= 0) throw new Error('Invalid timeout');
+    if (interval <= 0) throw new Error('Invalid interval');
+    if (timeout != null && timeout <= 0) throw new Error('Invalid timeout');
 
     const startTime = Date.now();
     return new Promise((resolve, reject) => {
         const resolveOnMet = () => {
             if (condition()) {
                 resolve();
-            } else if (olderThan(startTime, timeout)) {
+            } else if (timeout != null && olderThan(startTime, timeout)) {
                 reject(Exception.timeout({interval: Date.now() - startTime}));
             } else {
                 setTimeout(resolveOnMet, interval);