cx 25.5.0 → 25.5.2

package/src/ui/Widget.js

@@ -1,184 +1,184 @@
-import { Component } from "../util/Component";
-import { CSSHelper } from "./CSSHelper";
-import "./CSS";
-import { StructuredSelector } from "../data/StructuredSelector";
-import { parseStyle } from "../util/parseStyle";
-import { isString } from "../util/isString";
-import { isDefined } from "../util/isDefined";
-import { isArray } from "../util/isArray";
-import { Console } from "../util/Console";
-
-import { VDOM as vdom } from "./VDOM";
-export const VDOM = vdom;
-
-let widgetId = 100;
-
-export class Widget extends Component {
-   constructor(config) {
-      super(config);
-      this.widgetId = widgetId++;
-
-      if (isArray(this.jsxSpread)) {
-         if (!this.jsxAttributes) this.jsxAttributes = [];
-
-         this.jsxSpread.forEach((spread) => {
-            for (var key in spread) {
-               this[key] = spread[key];
-               this.jsxAttributes.push(key);
-            }
-         });
-      }
-   }
-
-   init() {
-      if (this.styles) this.style = this.styles;
-
-      if (this.styled) this.style = parseStyle(this.style);
-      else if (this.style) {
-         Console.warn(
-            "Components that allow use of the style attribute should set styled = true on their prototype. This will be an error in future versions.",
-         );
-         this.style = parseStyle(this.style);
-         this.styled = true;
-      }
-
-      if (typeof this.if !== "undefined") this.visible = this.if;
-
-      this.declareData();
-
-      if (this.outerLayout) {
-         if (isArray(this.outerLayout)) throw new Error("Only single element outer layout is supported.");
-         //TODO: better handle the case when outer layout is an array. How to get around circular dependency to PureContainer
-         this.outerLayout = Widget.create(this.outerLayout);
-      }
-
-      if (this.contentFor) this.putInto = this.contentFor;
-
-      if (this.putInto) this.isContent = true;
-
-      if (isString(this.CSS)) this.CSS = CSSHelper.get(this.CSS);
-
-      this.initHelpers();
-      this.initComponents();
-
-      this.initialized = true;
-   }
-
-   initComponents() {
-      if (arguments.length > 0) {
-         this.components = Object.assign(...arguments);
-         for (var k in this.components) if (!this.components[k]) delete this.components[k];
-      }
-   }
-
-   initHelpers() {
-      if (arguments.length > 0) {
-         this.helpers = Object.assign(...arguments);
-      }
-   }
-
-   declareData() {
-      let options = {};
-
-      if (this.styled) options.class = options.className = options.style = { structured: true };
-
-      var props = {
-         visible: undefined,
-         mod: {
-            structured: true,
-         },
-         ...options,
-      };
-
-      Object.assign(props, ...arguments);
-      this.selector = new StructuredSelector({ props: props, values: this });
-      this.nameMap = this.selector.nameMap;
-   }
-
-   prepareCSS(context, { data }) {
-      data.classNames = this.CSS.expand(
-         this.CSS.block(this.baseClass, data.mod, data.stateMods),
-         data.class,
-         data.className,
-      );
-      data.style = parseStyle(data.style);
-   }
-
-   prepareData(context, instance) {
-      if (this.styled) this.prepareCSS(context, instance);
-   }
-
-   initInstance(context, instance) {}
-
-   initState(context, instance) {}
-
-   checkVisible(context, instance, data) {
-      return data.visible;
-   }
-
-   explore(context, instance) {
-      if (this.components) instance.components = {};
-      for (let cmp in this.components) {
-         let ins = instance.getChild(context, this.components[cmp], "cmp-" + cmp, instance.store);
-         if (ins.scheduleExploreIfVisible(context)) instance.components[cmp] = ins;
-      }
-   }
-
-   render(context, instance, key) {
-      Console.log(this);
-      throw new Error(
-         'Widget\'s render method should be overridden. This error usually happens if with incorrect imports, i.e. import { TextField } from "cx/data". Please check the console for details about the component configuration.',
-      );
-   }
-
-   update() {
-      this.version = (this.version || 0) + 1;
-   }
-
-   applyParentStore(instance) {
-      instance.store = instance.parentStore;
-
-      // check when this is actually needed, perhaps this is needed only for tables and repeated elements
-      // if (instance.cached) delete instance.cached.rawData; // force prepareData to execute again
-   }
-
-   static resetCounter() {
-      widgetId = 100;
-   }
-}
-
-Widget.prototype.visible = true;
-Widget.prototype.memoize = true; //cache rendered content and use it if possible
-Widget.prototype.CSS = "cx";
-Widget.prototype.styled = false;
-
-Widget.namespace = "ui.";
-Widget.optimizePrepare = true;
-
-Widget.factory = (type, config, more) => {
-   throw new Error(`Invalid widget type: ${type}.`);
-};
-
-export function contentAppend(result, w, prependSpace) {
-   if (w == null || w === false) return false;
-   if (isArray(w)) w.forEach((c) => contentAppend(result, c));
-   else if (isDefined(w.content) && !w.atomic) return contentAppend(result, w.content);
-   else {
-      if (prependSpace) result.push(" ");
-      result.push(w);
-   }
-   return true;
-}
-
-export function getContentArray(x) {
-   let result = [];
-   contentAppend(result, x);
-   return result;
-}
-
-export function getContent(x) {
-   let result = getContentArray(x);
-   if (result.length == 0) return null;
-   if (result.length == 1) return result[0];
-   return result;
-}
+import { Component } from "../util/Component";
+import { CSSHelper } from "./CSSHelper";
+import "./CSS";
+import { StructuredSelector } from "../data/StructuredSelector";
+import { parseStyle } from "../util/parseStyle";
+import { isString } from "../util/isString";
+import { isDefined } from "../util/isDefined";
+import { isArray } from "../util/isArray";
+import { Console } from "../util/Console";
+
+import { VDOM as vdom } from "./VDOM";
+export const VDOM = vdom;
+
+let widgetId = 100;
+
+export class Widget extends Component {
+   constructor(config) {
+      super(config);
+      this.widgetId = widgetId++;
+
+      if (isArray(this.jsxSpread)) {
+         if (!this.jsxAttributes) this.jsxAttributes = [];
+
+         this.jsxSpread.forEach((spread) => {
+            for (var key in spread) {
+               this[key] = spread[key];
+               this.jsxAttributes.push(key);
+            }
+         });
+      }
+   }
+
+   init() {
+      if (this.styles) this.style = this.styles;
+
+      if (this.styled) this.style = parseStyle(this.style);
+      else if (this.style) {
+         Console.warn(
+            "Components that allow use of the style attribute should set styled = true on their prototype. This will be an error in future versions.",
+         );
+         this.style = parseStyle(this.style);
+         this.styled = true;
+      }
+
+      if (typeof this.if !== "undefined") this.visible = this.if;
+
+      this.declareData();
+
+      if (this.outerLayout) {
+         if (isArray(this.outerLayout)) throw new Error("Only single element outer layout is supported.");
+         //TODO: better handle the case when outer layout is an array. How to get around circular dependency to PureContainer
+         this.outerLayout = Widget.create(this.outerLayout);
+      }
+
+      if (this.contentFor) this.putInto = this.contentFor;
+
+      if (this.putInto) this.isContent = true;
+
+      if (isString(this.CSS)) this.CSS = CSSHelper.get(this.CSS);
+
+      this.initHelpers();
+      this.initComponents();
+
+      this.initialized = true;
+   }
+
+   initComponents() {
+      if (arguments.length > 0) {
+         this.components = Object.assign(...arguments);
+         for (var k in this.components) if (!this.components[k]) delete this.components[k];
+      }
+   }
+
+   initHelpers() {
+      if (arguments.length > 0) {
+         this.helpers = Object.assign(...arguments);
+      }
+   }
+
+   declareData() {
+      let options = {};
+
+      if (this.styled) options.class = options.className = options.style = { structured: true };
+
+      var props = {
+         visible: undefined,
+         mod: {
+            structured: true,
+         },
+         ...options,
+      };
+
+      Object.assign(props, ...arguments);
+      this.selector = new StructuredSelector({ props: props, values: this });
+      this.nameMap = this.selector.nameMap;
+   }
+
+   prepareCSS(context, { data }) {
+      data.classNames = this.CSS.expand(
+         this.CSS.block(this.baseClass, data.mod, data.stateMods),
+         data.class,
+         data.className,
+      );
+      data.style = parseStyle(data.style);
+   }
+
+   prepareData(context, instance) {
+      if (this.styled) this.prepareCSS(context, instance);
+   }
+
+   initInstance(context, instance) {}
+
+   initState(context, instance) {}
+
+   checkVisible(context, instance, data) {
+      return data.visible;
+   }
+
+   explore(context, instance) {
+      if (this.components) instance.components = {};
+      for (let cmp in this.components) {
+         let ins = instance.getChild(context, this.components[cmp], "cmp-" + cmp, instance.store);
+         if (ins.scheduleExploreIfVisible(context)) instance.components[cmp] = ins;
+      }
+   }
+
+   render(context, instance, key) {
+      Console.log(this);
+      throw new Error(
+         'Widget\'s render method should be overridden. This error usually happens if with incorrect imports, i.e. import { TextField } from "cx/data". Please check the console for details about the component configuration.',
+      );
+   }
+
+   update() {
+      this.version = (this.version || 0) + 1;
+   }
+
+   applyParentStore(instance) {
+      instance.store = instance.parentStore;
+
+      // check when this is actually needed, perhaps this is needed only for tables and repeated elements
+      // if (instance.cached) delete instance.cached.rawData; // force prepareData to execute again
+   }
+
+   static resetCounter() {
+      widgetId = 100;
+   }
+}
+
+Widget.prototype.visible = true;
+Widget.prototype.memoize = true; //cache rendered content and use it if possible
+Widget.prototype.CSS = "cx";
+Widget.prototype.styled = false;
+
+Widget.namespace = "ui.";
+Widget.optimizePrepare = true;
+
+Widget.factory = (type, config, more) => {
+   throw new Error(`Invalid widget type: ${type}.`);
+};
+
+export function contentAppend(result, w, prependSpace) {
+   if (w == null || w === false) return false;
+   if (isArray(w)) w.forEach((c) => contentAppend(result, c));
+   else if (isDefined(w.content) && !w.atomic) return contentAppend(result, w.content);
+   else {
+      if (prependSpace) result.push(" ");
+      result.push(w);
+   }
+   return true;
+}
+
+export function getContentArray(x) {
+   let result = [];
+   contentAppend(result, x);
+   return result;
+}
+
+export function getContent(x) {
+   let result = getContentArray(x);
+   if (result.length == 0) return null;
+   if (result.length == 1) return result[0];
+   return result;
+}

package/src/ui/adapter/ArrayAdapter.js

@@ -1,152 +1,152 @@
-import { DataAdapter } from "./DataAdapter";
-import { ReadOnlyDataView } from "../../data/ReadOnlyDataView";
-import { sorter } from "../../data/comparer";
-import { isArray } from "../../util/isArray";
-import { ArrayElementView } from "../../data/ArrayElementView";
-import { getAccessor } from "../../data/getAccessor";
-import { Culture } from "../Culture";
-import { isDefined } from "../../util";
-
-export class ArrayAdapter extends DataAdapter {
-   init() {
-      this.recordsAccessor = getAccessor(this.recordsBinding ? this.recordsBinding : this.recordsAccessor);
-
-      //resolve accessor chains
-      this.recordName = this.recordName.toString();
-      this.indexName = this.indexName.toString();
-   }
-
-   initInstance(context, instance) {
-      if (!instance.recordStoreCache) {
-         instance.recordStoreCache = new WeakMap();
-         instance.cacheByKey = {};
-      }
-
-      if (!instance.recordsAccessor && this.recordsAccessor) {
-         instance.recordsAccessor = this.recordsAccessor.bindInstance
-            ? this.recordsAccessor.bindInstance(instance)
-            : this.recordsAccessor;
-      }
-   }
-
-   getRecords(context, instance, records, parentStore) {
-      if (!instance.recordStoreCache) this.initInstance(context, instance);
-
-      return this.mapRecords(context, instance, records, parentStore, instance.recordsAccessor);
-   }
-
-   mapRecords(context, instance, records, parentStore, recordsAccessor) {
-      let result = [];
-
-      if (!instance.recordStoreCache) this.initInstance(context, instance);
-
-      if (isArray(records))
-         records.forEach((data, index) => {
-            if (this.filterFn && !this.filterFn(data)) return;
-
-            let record = this.mapRecord(context, instance, data, parentStore, recordsAccessor, index);
-
-            result.push(record);
-         });
-
-      if (this.sorter) result = this.sorter(result);
-
-      return result;
-   }
-
-   mapRecord(context, instance, data, parentStore, recordsAccessor, index) {
-      let key = this.cacheByKeyField && this.keyField ? data[this.keyField] : null;
-      let recordStore = key != null ? instance.cacheByKey[key] : instance.recordStoreCache.get(data);
-
-      if (recordsAccessor) {
-         if (!recordStore)
-            recordStore = new ArrayElementView({
-               store: parentStore,
-               arrayAccessor: recordsAccessor,
-               itemIndex: index,
-               recordAlias: this.recordName,
-               indexAlias: this.indexName,
-               immutable: this.immutable,
-               sealed: this.sealed,
-            });
-         else {
-            recordStore.setStore(parentStore);
-            recordStore.setIndex(index);
-         }
-      } else {
-         if (!recordStore)
-            recordStore = new ReadOnlyDataView({
-               store: parentStore,
-               data: {
-                  [this.recordName]: data,
-                  [this.indexName]: index,
-               },
-               immutable: this.immutable,
-               sealed: this.sealed,
-            });
-         else {
-            recordStore.setStore(parentStore);
-            recordStore.setData(data);
-         }
-      }
-
-      // cache by the key or by data reference
-      if (key != null) instance.cacheByKey[key] = recordStore;
-      else instance.recordStoreCache.set(data, recordStore);
-
-      return {
-         store: recordStore,
-         index: index,
-         data: data,
-         type: "data",
-         key: this.keyField ? data[this.keyField] : index,
-      };
-   }
-
-   setFilter(filterFn) {
-      this.filterFn = filterFn;
-   }
-
-   getComparer(sortOptions) {
-      return sortOptions ? Culture.getComparer(sortOptions) : null;
-   }
-
-   buildSorter(sorters) {
-      if (isArray(sorters) && sorters.length > 0) {
-         let fieldValueMapper;
-         let dataAccessor;
-
-         //if all sorters are based on record fields access data directly (faster)
-         if (sorters.every((x) => x.field && x.value == null)) {
-            dataAccessor = (x) => x.data;
-            fieldValueMapper = (x) => ({ bind: x.field });
-         } else {
-            dataAccessor = (x) => x.store.getData();
-            fieldValueMapper = (x) => ({ bind: this.recordName + "." + x.field });
-         }
-         this.sorter = sorter(
-            sorters.map((x) => {
-               let s = Object.assign({}, x);
-               if (s.field && s.value == null) s.value = fieldValueMapper(s);
-               if (!s.comparer)
-                  s.comparer = this.getComparer(isDefined(s.sortOptions) ? s.sortOptions : this.sortOptions);
-               return s;
-            }),
-            dataAccessor,
-         );
-      } else {
-         this.sorter = null;
-      }
-   }
-
-   sort(sorters) {
-      this.buildSorter(sorters);
-   }
-}
-
-ArrayAdapter.prototype.immutable = false;
-ArrayAdapter.prototype.sealed = false;
-ArrayAdapter.prototype.keyField = null;
-ArrayAdapter.prototype.cacheByKeyField = true;
-
-ArrayAdapter.autoInit = true;
+import { DataAdapter } from "./DataAdapter";
+import { ReadOnlyDataView } from "../../data/ReadOnlyDataView";
+import { sorter } from "../../data/comparer";
+import { isArray } from "../../util/isArray";
+import { ArrayElementView } from "../../data/ArrayElementView";
+import { getAccessor } from "../../data/getAccessor";
+import { Culture } from "../Culture";
+import { isDefined, isObject } from "../../util";
+
+export class ArrayAdapter extends DataAdapter {
+   init() {
+      this.recordsAccessor = getAccessor(this.recordsBinding ? this.recordsBinding : this.recordsAccessor);
+
+      //resolve accessor chains
+      this.recordName = this.recordName.toString();
+      this.indexName = this.indexName.toString();
+   }
+
+   initInstance(context, instance) {
+      if (!instance.recordStoreCache) {
+         instance.recordStoreCache = new WeakMap();
+         instance.cacheByKey = {};
+      }
+
+      if (!instance.recordsAccessor && this.recordsAccessor) {
+         instance.recordsAccessor = this.recordsAccessor.bindInstance
+            ? this.recordsAccessor.bindInstance(instance)
+            : this.recordsAccessor;
+      }
+   }
+
+   getRecords(context, instance, records, parentStore) {
+      if (!instance.recordStoreCache) this.initInstance(context, instance);
+
+      return this.mapRecords(context, instance, records, parentStore, instance.recordsAccessor);
+   }
+
+   mapRecords(context, instance, records, parentStore, recordsAccessor) {
+      let result = [];
+
+      if (!instance.recordStoreCache) this.initInstance(context, instance);
+
+      if (isArray(records))
+         records.forEach((data, index) => {
+            if (this.filterFn && !this.filterFn(data)) return;
+
+            let record = this.mapRecord(context, instance, data, parentStore, recordsAccessor, index);
+
+            result.push(record);
+         });
+
+      if (this.sorter) result = this.sorter(result);
+
+      return result;
+   }
+
+   mapRecord(context, instance, data, parentStore, recordsAccessor, index) {
+      let key = this.cacheByKeyField && this.keyField ? data[this.keyField] : null;
+      let recordStore = key != null ? instance.cacheByKey[key] : instance.recordStoreCache.get(data);
+
+      if (recordsAccessor) {
+         if (!recordStore)
+            recordStore = new ArrayElementView({
+               store: parentStore,
+               arrayAccessor: recordsAccessor,
+               itemIndex: index,
+               recordAlias: this.recordName,
+               indexAlias: this.indexName,
+               immutable: this.immutable,
+               sealed: this.sealed,
+            });
+         else {
+            recordStore.setStore(parentStore);
+            recordStore.setIndex(index);
+         }
+      } else {
+         if (!recordStore)
+            recordStore = new ReadOnlyDataView({
+               store: parentStore,
+               data: {
+                  [this.recordName]: data,
+                  [this.indexName]: index,
+               },
+               immutable: this.immutable,
+               sealed: this.sealed,
+            });
+         else {
+            recordStore.setStore(parentStore);
+            recordStore.setData(data);
+         }
+      }
+
+      // cache by the key or by data reference
+      if (key != null) instance.cacheByKey[key] = recordStore;
+      else if (isObject(data)) instance.recordStoreCache.set(data, recordStore);
+
+      return {
+         store: recordStore,
+         index: index,
+         data: data,
+         type: "data",
+         key: this.keyField ? data[this.keyField] : index,
+      };
+   }
+
+   setFilter(filterFn) {
+      this.filterFn = filterFn;
+   }
+
+   getComparer(sortOptions) {
+      return sortOptions ? Culture.getComparer(sortOptions) : null;
+   }
+
+   buildSorter(sorters) {
+      if (isArray(sorters) && sorters.length > 0) {
+         let fieldValueMapper;
+         let dataAccessor;
+
+         //if all sorters are based on record fields access data directly (faster)
+         if (sorters.every((x) => x.field && x.value == null)) {
+            dataAccessor = (x) => x.data;
+            fieldValueMapper = (x) => ({ bind: x.field });
+         } else {
+            dataAccessor = (x) => x.store.getData();
+            fieldValueMapper = (x) => ({ bind: this.recordName + "." + x.field });
+         }
+         this.sorter = sorter(
+            sorters.map((x) => {
+               let s = Object.assign({}, x);
+               if (s.field && s.value == null) s.value = fieldValueMapper(s);
+               if (!s.comparer)
+                  s.comparer = this.getComparer(isDefined(s.sortOptions) ? s.sortOptions : this.sortOptions);
+               return s;
+            }),
+            dataAccessor,
+         );
+      } else {
+         this.sorter = null;
+      }
+   }
+
+   sort(sorters) {
+      this.buildSorter(sorters);
+   }
+}
+
+ArrayAdapter.prototype.immutable = false;
+ArrayAdapter.prototype.sealed = false;
+ArrayAdapter.prototype.keyField = null;
+ArrayAdapter.prototype.cacheByKeyField = true;
+
+ArrayAdapter.autoInit = true;