cx 24.3.7 → 24.3.9

package/src/ui/adapter/GroupAdapter.js

@@ -1,138 +1,141 @@
-import { ArrayAdapter } from "./ArrayAdapter";
-import { ReadOnlyDataView } from "../../data/ReadOnlyDataView";
-import { Grouper } from "../../data/Grouper";
-import { isArray } from "../../util/isArray";
-import { isDefined } from "../../util/isDefined";
-import { getComparer } from "../../data/comparer";
-import { Culture } from "../Culture";
-
-export class GroupAdapter extends ArrayAdapter {
-   init() {
-      super.init();
-
-      if (this.groupRecordsAlias) this.groupRecordsName = this.groupRecordsAlias;
-
-      if (this.groupings) this.groupBy(this.groupings);
-   }
-
-   getRecords(context, instance, records, parentStore) {
-      let result = super.getRecords(context, instance, records, parentStore);
-
-      if (this.groupings) {
-         let groupedResults = [];
-         this.processLevel([], result, groupedResults, parentStore);
-         result = groupedResults;
-      }
-
-      return result;
-   }
-
-   processLevel(keys, records, result, parentStore) {
-      let level = keys.length;
-      let inverseLevel = this.groupings.length - level;
-
-      if (inverseLevel == 0) {
-         for (let i = 0; i < records.length; i++) {
-            records[i].store.setStore(parentStore);
-            result.push(records[i]);
-         }
-         return;
-      }
-
-      let grouping = this.groupings[level];
-      let { grouper } = grouping;
-      grouper.reset();
-      grouper.processAll(records);
-      let results = grouper.getResults();
-      if (grouping.comparer) results.sort(grouping.comparer);
-
-      results.forEach((gr) => {
-         keys.push(gr.key);
-
-         let key = keys
-            .map((key) =>
-               Object.keys(key)
-                  .map((k) => key[k])
-                  .join(":")
-            )
-            .join("|");
-
-         let $group = {
-            ...gr.key,
-            ...gr.aggregates,
-            $name: gr.name,
-            $level: inverseLevel,
-            $records: gr.records || [],
-            $key: key,
-         };
-
-         let data = {
-            [this.recordName]: gr.records.length > 0 ? gr.records[0].data : null,
-            [this.groupName]: $group,
-         };
-
-         let groupStore = new ReadOnlyDataView({
-            store: parentStore,
-            data,
-            immutable: this.immutable,
-         });
-
-         let group = {
-            key,
-            data,
-            group: $group,
-            grouping,
-            store: groupStore,
-            level: inverseLevel,
-         };
-
-         if (grouping.includeHeader !== false)
-            result.push({
-               ...group,
-               type: "group-header",
-               key: "header:" + group.key,
-            });
-
-         this.processLevel(keys, gr.records, result, groupStore);
-
-         if (grouping.includeFooter !== false)
-            result.push({
-               ...group,
-               type: "group-footer",
-               key: "footer:" + group.key,
-            });
-
-         keys.pop();
-      });
-   }
-
-   groupBy(groupings) {
-      if (!groupings) this.groupings = null;
-      else if (isArray(groupings)) {
-         this.groupings = groupings;
-         this.groupings.forEach((g) => {
-            let groupSorters = [];
-            let key = {};
-            for (let name in g.key) {
-               if (!g.key[name] || !isDefined(g.key[name].direction) || !isDefined(g.key[name].value))
-                  g.key[name] = { value: g.key[name], direction: "ASC" };
-               key[name] = g.key[name].value;
-               groupSorters.push({
-                  field: name,
-                  direction: g.key[name].direction,
-               });
-            }
-            g.grouper = new Grouper(key, { ...this.aggregates, ...g.aggregates }, (r) => r.store.getData(), g.text);
-            g.comparer = null;
-            if (groupSorters.length > 0)
-               g.comparer = getComparer(
-                  groupSorters,
-                  (x) => x.key,
-                  this.sortOptions ? Culture.getComparer(this.sortOptions) : null
-               );
-         });
-      } else throw new Error("Invalid grouping provided.");
-   }
-}
-
-GroupAdapter.prototype.groupName = "$group";
+import { ArrayAdapter } from "./ArrayAdapter";
+import { ReadOnlyDataView } from "../../data/ReadOnlyDataView";
+import { Grouper } from "../../data/Grouper";
+import { isArray } from "../../util/isArray";
+import { isDefined } from "../../util/isDefined";
+import { getComparer } from "../../data/comparer";
+import { Culture } from "../Culture";
+import { isObject } from "../../util/isObject";
+
+export class GroupAdapter extends ArrayAdapter {
+   init() {
+      super.init();
+
+      if (this.groupRecordsAlias) this.groupRecordsName = this.groupRecordsAlias;
+
+      if (this.groupings) this.groupBy(this.groupings);
+   }
+
+   getRecords(context, instance, records, parentStore) {
+      let result = super.getRecords(context, instance, records, parentStore);
+
+      if (this.groupings) {
+         let groupedResults = [];
+         this.processLevel([], result, groupedResults, parentStore);
+         result = groupedResults;
+      }
+
+      return result;
+   }
+
+   processLevel(keys, records, result, parentStore) {
+      let level = keys.length;
+      let inverseLevel = this.groupings.length - level;
+
+      if (inverseLevel == 0) {
+         for (let i = 0; i < records.length; i++) {
+            records[i].store.setStore(parentStore);
+            result.push(records[i]);
+         }
+         return;
+      }
+
+      let grouping = this.groupings[level];
+      let { grouper } = grouping;
+      grouper.reset();
+      grouper.processAll(records);
+      let results = grouper.getResults();
+      if (grouping.comparer) results.sort(grouping.comparer);
+
+      results.forEach((gr) => {
+         keys.push(gr.key);
+
+         let key = keys.map(serializeKey).join("|");
+
+         let $group = {
+            ...gr.key,
+            ...gr.aggregates,
+            $name: gr.name,
+            $level: inverseLevel,
+            $records: gr.records || [],
+            $key: key,
+         };
+
+         let data = {
+            [this.recordName]: gr.records.length > 0 ? gr.records[0].data : null,
+            [this.groupName]: $group,
+         };
+
+         let groupStore = new ReadOnlyDataView({
+            store: parentStore,
+            data,
+            immutable: this.immutable,
+         });
+
+         let group = {
+            key,
+            data,
+            group: $group,
+            grouping,
+            store: groupStore,
+            level: inverseLevel,
+         };
+
+         if (grouping.includeHeader !== false)
+            result.push({
+               ...group,
+               type: "group-header",
+               key: "header:" + group.key,
+            });
+
+         this.processLevel(keys, gr.records, result, groupStore);
+
+         if (grouping.includeFooter !== false)
+            result.push({
+               ...group,
+               type: "group-footer",
+               key: "footer:" + group.key,
+            });
+
+         keys.pop();
+      });
+   }
+
+   groupBy(groupings) {
+      if (!groupings) this.groupings = null;
+      else if (isArray(groupings)) {
+         this.groupings = groupings;
+         this.groupings.forEach((g) => {
+            let groupSorters = [];
+            let key = {};
+            for (let name in g.key) {
+               if (!g.key[name] || !isDefined(g.key[name].direction) || !isDefined(g.key[name].value))
+                  g.key[name] = { value: g.key[name], direction: "ASC" };
+               key[name] = g.key[name].value;
+               groupSorters.push({
+                  field: name,
+                  direction: g.key[name].direction,
+               });
+            }
+            g.grouper = new Grouper(key, { ...this.aggregates, ...g.aggregates }, (r) => r.store.getData(), g.text);
+            g.comparer = null;
+            if (groupSorters.length > 0)
+               g.comparer = getComparer(
+                  groupSorters,
+                  (x) => x.key,
+                  this.sortOptions ? Culture.getComparer(this.sortOptions) : null,
+               );
+         });
+      } else throw new Error("Invalid grouping provided.");
+   }
+}
+
+GroupAdapter.prototype.groupName = "$group";
+
+function serializeKey(data) {
+   if (isObject(data))
+      return Object.keys(data)
+         .map((k) => serializeKey(data[k]))
+         .join(":");
+   return data?.toString() ?? "";
+}

package/src/ui/index.d.ts

@@ -1,42 +1,43 @@
-export * from "./Controller";
-export * from "./Widget";
-export * from "./Container";
-export * from "./PureContainer";
-export * from "./Repeater";
-export * from "./Rescope";
-export * from "./StaticText";
-export * from "./Text";
-export * from "./CSS";
-export * from "./CSSHelper";
-export * from "./FocusManager";
-export * from "./ResizeManager";
-export * from "./ZIndexManager";
-export * from "./Format";
-export * from "./Culture";
-export * from "./Localization";
-export * from "./Cx";
-export * from "./Instance";
-export * from "./RenderingContext";
-export * from "./ContentResolver";
-export * from "./batchUpdates";
-export * from "./IsolatedScope";
-export * from "./DetachedScope";
-export * from "./Restate";
-export * from "./DataProxy";
-export * from "./keyboardShortcuts";
-export * from "./createFunctionalComponent";
-export * from "./StructuredInstanceDataAccessor";
-export * from "./HoverSync";
-
-export * from "./selection/index";
-export * from "./layout/index";
-export * from "./app/index";
-export * from "./adapter/index";
-
-export * from "./bind";
-export * from "./tpl";
-export * from "./expr";
-
-//re-export computable here
-import { computable } from "../data/computable";
-export { computable };
+export * from "./Controller";
+export * from "./Widget";
+export * from "./Container";
+export * from "./PureContainer";
+export * from "./Repeater";
+export * from "./Rescope";
+export * from "./StaticText";
+export * from "./Text";
+export * from "./CSS";
+export * from "./CSSHelper";
+export * from "./FocusManager";
+export * from "./ResizeManager";
+export * from "./ZIndexManager";
+export * from "./Format";
+export * from "./Culture";
+export * from "./Localization";
+export * from "./Cx";
+export * from "./Instance";
+export * from "./RenderingContext";
+export * from "./ContentResolver";
+export * from "./batchUpdates";
+export * from "./IsolatedScope";
+export * from "./DetachedScope";
+export * from "./Restate";
+export * from "./DataProxy";
+export * from "./keyboardShortcuts";
+export * from "./createFunctionalComponent";
+export * from "./StructuredInstanceDataAccessor";
+export * from "./HoverSync";
+export * from "./CultureScope";
+
+export * from "./selection/index";
+export * from "./layout/index";
+export * from "./app/index";
+export * from "./adapter/index";
+
+export * from "./bind";
+export * from "./tpl";
+export * from "./expr";
+
+//re-export computable here
+import { computable } from "../data/computable";
+export { computable };

package/src/ui/index.js

@@ -1,44 +1,45 @@
-export * from './Controller';
-export * from './Widget';
-export * from './Container';
-export * from './PureContainer';
-export * from './Repeater';
-export * from './Rescope';
-export * from './StaticText';
-export * from './Text';
-export * from './CSS';
-export * from './CSSHelper';
-export * from './FocusManager';
-export * from './ResizeManager';
-export * from './ZIndexManager';
-export * from './Format';
-export * from './Culture';
-export * from './Localization';
-export * from './Cx';
-export * from './Instance';
-export * from './RenderingContext';
-export * from './ContentResolver';
-export * from './batchUpdates';
-export * from './IsolatedScope';
-export * from './DetachedScope';
-export * from './Restate';
-export * from './DataProxy';
-export * from './keyboardShortcuts';
-export * from "./StructuredInstanceDataAccessor";
-export * from "./HoverSync";
-
-export * from "./createFunctionalComponent";
-export * from "./flattenProps";
-
-export * from "./selection/index";
-export * from "./layout/index";
-export * from "./app/index";
-export * from "./adapter/index";
-
-export * from "./bind";
-export * from "./tpl";
-export * from "./expr";
-
-//re-export computable here
-import { computable } from "../data/computable";
-export { computable };
+export * from "./Controller";
+export * from "./Widget";
+export * from "./Container";
+export * from "./PureContainer";
+export * from "./Repeater";
+export * from "./Rescope";
+export * from "./StaticText";
+export * from "./Text";
+export * from "./CSS";
+export * from "./CSSHelper";
+export * from "./FocusManager";
+export * from "./ResizeManager";
+export * from "./ZIndexManager";
+export * from "./Format";
+export * from "./Culture";
+export * from "./Localization";
+export * from "./Cx";
+export * from "./Instance";
+export * from "./RenderingContext";
+export * from "./ContentResolver";
+export * from "./batchUpdates";
+export * from "./IsolatedScope";
+export * from "./DetachedScope";
+export * from "./Restate";
+export * from "./DataProxy";
+export * from "./keyboardShortcuts";
+export * from "./StructuredInstanceDataAccessor";
+export * from "./HoverSync";
+export * from "./CultureScope";
+
+export * from "./createFunctionalComponent";
+export * from "./flattenProps";
+
+export * from "./selection/index";
+export * from "./layout/index";
+export * from "./app/index";
+export * from "./adapter/index";
+
+export * from "./bind";
+export * from "./tpl";
+export * from "./expr";
+
+//re-export computable here
+import { computable } from "../data/computable";
+export { computable };

package/src/util/Format.d.ts

@@ -1,14 +1,18 @@
-declare type Formatter = (any) => string;
-
-export class Format {
-
-   static value(v: any, format: string): string;
-
-   static parse(format: string): Formatter;
-
-   static register(format: string | string[], formatter: Formatter): void;
-
-   static registerFactory(format: string | string[], factory: (...args) => Formatter): void;
-}
-
-export function resolveMinMaxFractionDigits(minimumFractionDigits, maximumFractionDigits);
+declare type Formatter = (any) => string;
+
+export class Format {
+   static value(v: any, format: string): string;
+
+   static parse(format: string): Formatter;
+
+   static register(format: string | string[], formatter: Formatter): void;
+
+   static registerFactory(format: string | string[], factory: (...args) => Formatter): void;
+}
+
+export function resolveMinMaxFractionDigits(
+   minimumFractionDigits: number,
+   maximumFractionDigits: number,
+): { minimumFractionDigits: number; maximumFractionDigits: number };
+
+export function setGetFormatCacheCallback(callback: () => {}): void;