cx 26.0.13 → 26.1.0

package/src/ui/Prop.ts

@@ -1,140 +1,140 @@
-import { Selector } from "../data/Selector";
-import { AccessorChain } from "../data/createAccessorModelProxy";
-
-export type Bind = {
-   bind: string;
-   defaultValue?: any;
-   throttle?: number;
-   debounce?: number;
-};
-
-export type Tpl = {
-   tpl: string;
-};
-
-export type Expr = {
-   expr: string;
-   set?: (value: any, instance?: any) => boolean;
-   throttle?: number;
-   debounce?: number;
-};
-
-export type Binding = Bind | Tpl | Expr;
-
-export type GetSet<T> = {
-   get: Selector<T>;
-   set?: (value: T, instance?: any) => boolean;
-   throttle?: number;
-   debounce?: number;
-};
-
-export interface StructuredSelector {
-   [prop: string]: Selector<any>;
-}
-
-export type Prop<T> = T | Binding | Selector<T> | AccessorChain<T> | GetSet<T>;
-
-export type WritableProp<T> = Bind | AccessorChain<T>;
-
-export interface DataRecord {
-   [prop: string]: any;
-}
-
-export interface Config {
-   [prop: string]: any;
-}
-
-export interface StructuredProp {
-   [prop: string]: Prop<any>;
-}
-
-/**
- * Utility type that extracts the resolved value type from a Prop<T>.
- * Used to derive the runtime type of structured props.
- */
-export type ResolveProp<P> =
-   P extends Selector<infer T>
-      ? T
-      : P extends AccessorChain<infer T>
-        ? T
-        : P extends GetSet<infer T>
-          ? T
-          : P extends Bind
-            ? any
-            : P extends Tpl
-              ? string
-              : P extends Expr
-                ? any
-                : P;
-
-/**
- * Utility type that resolves a structured prop object to its runtime value types.
- * Transforms { name: StringProp, count: NumberProp } to { name: string, count: number }
- */
-export type ResolveStructuredPropType<S> = {
-   [K in keyof S]: ResolveProp<S[K]>;
-};
-
-/**
- * Resolves the runtime value type from either a Prop<T> or a StructuredProp.
- * Use this for generic widgets like ContentResolver and Validator where the
- * input can be either a single prop or a structured object.
- *
- * - For Prop<T> (Selector, AccessorChain, GetSet), resolves to T
- * - For bindings (Bind, Tpl, Expr), resolves to any/string/any
- * - For structured objects, recursively resolves each property via ResolveStructuredProp
- * - For literal values, returns them as-is
- */
-export type ResolvePropType<P> =
-   P extends Selector<infer T>
-      ? T
-      : P extends AccessorChain<infer T>
-        ? T
-        : P extends GetSet<infer T>
-          ? T
-          : P extends Bind
-            ? any
-            : P extends Tpl
-              ? string
-              : P extends Expr
-                ? any
-                : P extends object
-                  ? ResolveStructuredPropType<P>
-                  : P;
-
-/**
- * Generic structured prop type that provides type safety for params and their resolved values.
- * Use with ContentResolver and similar widgets to type the onResolve callback params.
- */
-export type TypedStructuredProp<T extends Record<string, any>> = {
-   [K in keyof T]: Prop<T[K]>;
-};
-
-export type StringProp = Prop<string>;
-export type StyleProp = Prop<string | React.CSSProperties> | StructuredProp;
-export type NumberProp = Prop<number>;
-export type BooleanProp = Prop<boolean>;
-export type ClassProp = Prop<string> | StructuredProp;
-export type RecordsProp = Prop<DataRecord[]>;
-export type SortersProp = Prop<Sorter[]>;
-export type UnknownProp = Prop<unknown>;
-export type ModProp = StringProp | StructuredProp;
-
-export type RecordAlias = string | { toString(): string };
-
-export type SortDirection = "ASC" | "DESC";
-
-export interface Sorter {
-   field?: string;
-   value?: (record: DataRecord) => any;
-   direction: SortDirection;
-}
-
-export interface CollatorOptions {
-   localeMatcher?: "lookup" | "best fit";
-   usage?: "sort" | "search";
-   sensitivity?: "base" | "accent" | "case" | "variant";
-   ignorePunctuation?: boolean;
-   numeric?: boolean;
-   caseFirst?: "upper" | "lower" | "false";
-}
+import { Selector } from "../data/Selector";
+import { AccessorChain } from "../data/createAccessorModelProxy";
+
+export type Bind = {
+   bind: string;
+   defaultValue?: any;
+   throttle?: number;
+   debounce?: number;
+};
+
+export type Tpl = {
+   tpl: string;
+};
+
+export type Expr = {
+   expr: string;
+   set?: (value: any, instance?: any) => boolean;
+   throttle?: number;
+   debounce?: number;
+};
+
+export type Binding = Bind | Tpl | Expr;
+
+export type GetSet<T> = {
+   get: Selector<T>;
+   set?: (value: T, instance?: any) => boolean;
+   throttle?: number;
+   debounce?: number;
+};
+
+export interface StructuredSelector {
+   [prop: string]: Selector<any>;
+}
+
+export type Prop<T> = T | Binding | Selector<T> | AccessorChain<T> | GetSet<T>;
+
+export type WritableProp<T> = Bind | AccessorChain<T>;
+
+export interface DataRecord {
+   [prop: string]: any;
+}
+
+export interface Config {
+   [prop: string]: any;
+}
+
+export interface StructuredProp {
+   [prop: string]: Prop<any>;
+}
+
+/**
+ * Utility type that extracts the resolved value type from a Prop<T>.
+ * Used to derive the runtime type of structured props.
+ */
+export type ResolveProp<P> =
+   P extends Selector<infer T>
+      ? T
+      : P extends AccessorChain<infer T>
+        ? T
+        : P extends GetSet<infer T>
+          ? T
+          : P extends Bind
+            ? any
+            : P extends Tpl
+              ? string
+              : P extends Expr
+                ? any
+                : P;
+
+/**
+ * Utility type that resolves a structured prop object to its runtime value types.
+ * Transforms { name: StringProp, count: NumberProp } to { name: string, count: number }
+ */
+export type ResolveStructuredPropType<S> = {
+   [K in keyof S]: ResolveProp<S[K]>;
+};
+
+/**
+ * Resolves the runtime value type from either a Prop<T> or a StructuredProp.
+ * Use this for generic widgets like ContentResolver and Validator where the
+ * input can be either a single prop or a structured object.
+ *
+ * - For Prop<T> (Selector, AccessorChain, GetSet), resolves to T
+ * - For bindings (Bind, Tpl, Expr), resolves to any/string/any
+ * - For structured objects, recursively resolves each property via ResolveStructuredProp
+ * - For literal values, returns them as-is
+ */
+export type ResolvePropType<P> =
+   P extends Selector<infer T>
+      ? T
+      : P extends AccessorChain<infer T>
+        ? T
+        : P extends GetSet<infer T>
+          ? T
+          : P extends Bind
+            ? any
+            : P extends Tpl
+              ? string
+              : P extends Expr
+                ? any
+                : P extends object
+                  ? ResolveStructuredPropType<P>
+                  : P;
+
+/**
+ * Generic structured prop type that provides type safety for params and their resolved values.
+ * Use with ContentResolver and similar widgets to type the onResolve callback params.
+ */
+export type TypedStructuredProp<T extends Record<string, any>> = {
+   [K in keyof T]: Prop<T[K]>;
+};
+
+export type StringProp = Prop<string>;
+export type StyleProp = Prop<string | React.CSSProperties> | StructuredProp;
+export type NumberProp = Prop<number>;
+export type BooleanProp = Prop<boolean>;
+export type ClassProp = Prop<string> | StructuredProp;
+export type RecordsProp = Prop<DataRecord[]>;
+export type SortersProp = Prop<Sorter[]>;
+export type UnknownProp = Prop<unknown>;
+export type ModProp = StringProp | StructuredProp;
+
+export type RecordAlias = string | { toString(): string };
+
+export type SortDirection = "ASC" | "DESC";
+
+export interface Sorter {
+   field?: string;
+   value?: (record: DataRecord) => any;
+   direction: SortDirection;
+}
+
+export interface CollatorOptions {
+   localeMatcher?: "lookup" | "best fit";
+   usage?: "sort" | "search";
+   sensitivity?: "base" | "accent" | "case" | "variant";
+   ignorePunctuation?: boolean;
+   numeric?: boolean;
+   caseFirst?: "upper" | "lower" | "false";
+}

package/src/ui/RenderingContext.ts

@@ -1,99 +1,99 @@
-import { TraversalStack } from "../util/TraversalStack";
-import { reverseSlice } from "../util/reverseSlice";
-import { Widget } from "./Widget";
-
-export type CxChild = Record<string, any> | React.ReactElement | Widget | CxChild[] | null | undefined;
-
-export class RenderingContext {
-   options: any;
-   exploreStack: any;
-   prepareList: any[];
-   cleanupList: any[];
-   stacks: any;
-   renderList: any;
-
-   [key: string]: any;
-
-   constructor(options?: any) {
-      this.options = options || {};
-      this.exploreStack = new TraversalStack();
-      this.prepareList = [];
-      this.cleanupList = [];
-      this.stacks = {};
-      this.renderList = new LinkedListsNode();
-   }
-
-   getStack(key: string) {
-      let stack = this.stacks[key];
-      if (!stack) stack = this.stacks[key] = [];
-      return stack;
-   }
-
-   push(key: string, value: any) {
-      let stack = this.getStack(key);
-      stack.push(this[key]);
-      return (this[key] = value);
-   }
-
-   pop(key: string) {
-      let stack = this.getStack(key);
-      return (this[key] = stack.pop());
-   }
-
-   pushNamedValue(key: string, name: string, value: any) {
-      let stack = this.getStack(`${key}:${name}`);
-      if (!this[key]) this[key] = {};
-      stack.push(this[key][name]);
-      return (this[key][name] = value);
-   }
-
-   popNamedValue(key: string, name: string) {
-      let stack = this.getStack(`${key}:${name}`);
-      return (this[key][name] = stack.pop());
-   }
-
-   get(key: string) {
-      return this[key];
-   }
-
-   getRootRenderList() {
-      let rl = this.renderList;
-      while (rl.left) rl = rl.left;
-      return rl;
-   }
-}
-
-class LinkedListsNode {
-   left?: LinkedListsNode;
-   right?: LinkedListsNode;
-   data: any[];
-   reverseIndex?: number;
-
-   constructor(left?: LinkedListsNode, right?: LinkedListsNode) {
-      this.left = left;
-      this.right = right;
-      this.data = [];
-   }
-
-   insertLeft() {
-      let node = new LinkedListsNode(this.left, this);
-      if (this.left) this.left.right = node;
-      this.left = node;
-      return node;
-   }
-
-   insertRight() {
-      let node = new LinkedListsNode(this, this.right);
-      if (this.right) this.right.left = node;
-      this.right = node;
-      return node;
-   }
-
-   markReverseIndex() {
-      this.reverseIndex = this.data.length;
-   }
-
-   reverse() {
-      reverseSlice(this.data, this.reverseIndex!);
-   }
-}
+import { TraversalStack } from "../util/TraversalStack";
+import { reverseSlice } from "../util/reverseSlice";
+import { Widget } from "./Widget";
+
+export type CxChild = Record<string, any> | React.ReactElement | Widget | CxChild[] | null | undefined;
+
+export class RenderingContext {
+   options: any;
+   exploreStack: any;
+   prepareList: any[];
+   cleanupList: any[];
+   stacks: any;
+   renderList: any;
+
+   [key: string]: any;
+
+   constructor(options?: any) {
+      this.options = options || {};
+      this.exploreStack = new TraversalStack();
+      this.prepareList = [];
+      this.cleanupList = [];
+      this.stacks = {};
+      this.renderList = new LinkedListsNode();
+   }
+
+   getStack(key: string) {
+      let stack = this.stacks[key];
+      if (!stack) stack = this.stacks[key] = [];
+      return stack;
+   }
+
+   push(key: string, value: any) {
+      let stack = this.getStack(key);
+      stack.push(this[key]);
+      return (this[key] = value);
+   }
+
+   pop(key: string) {
+      let stack = this.getStack(key);
+      return (this[key] = stack.pop());
+   }
+
+   pushNamedValue(key: string, name: string, value: any) {
+      let stack = this.getStack(`${key}:${name}`);
+      if (!this[key]) this[key] = {};
+      stack.push(this[key][name]);
+      return (this[key][name] = value);
+   }
+
+   popNamedValue(key: string, name: string) {
+      let stack = this.getStack(`${key}:${name}`);
+      return (this[key][name] = stack.pop());
+   }
+
+   get(key: string) {
+      return this[key];
+   }
+
+   getRootRenderList() {
+      let rl = this.renderList;
+      while (rl.left) rl = rl.left;
+      return rl;
+   }
+}
+
+class LinkedListsNode {
+   left?: LinkedListsNode;
+   right?: LinkedListsNode;
+   data: any[];
+   reverseIndex?: number;
+
+   constructor(left?: LinkedListsNode, right?: LinkedListsNode) {
+      this.left = left;
+      this.right = right;
+      this.data = [];
+   }
+
+   insertLeft() {
+      let node = new LinkedListsNode(this.left, this);
+      if (this.left) this.left.right = node;
+      this.left = node;
+      return node;
+   }
+
+   insertRight() {
+      let node = new LinkedListsNode(this, this.right);
+      if (this.right) this.right.left = node;
+      this.right = node;
+      return node;
+   }
+
+   markReverseIndex() {
+      this.reverseIndex = this.data.length;
+   }
+
+   reverse() {
+      reverseSlice(this.data, this.reverseIndex!);
+   }
+}

package/src/ui/Rescope.ts

@@ -1,49 +1,49 @@
-import { Widget } from "./Widget";
-import { PureContainerBase, PureContainerConfig } from "./PureContainer";
-import { Binding } from "../data/Binding";
-import { ZoomIntoPropertyView } from "../data/ZoomIntoPropertyView";
-import { StructuredInstanceDataAccessor } from "./StructuredInstanceDataAccessor";
-import { isObject } from "../util/isObject";
-import { StructuredProp } from "./Prop";
-
-export interface RescopeConfig extends PureContainerConfig {
-   bind: string;
-   rootName?: string;
-   rootAlias?: string;
-   data?: StructuredProp;
-}
-
-export class Rescope extends PureContainerBase<RescopeConfig> {
-   declare bind: string;
-   declare binding: any;
-   declare rootAlias?: string;
-   declare rootName: string;
-   declare data?: any;
-
-   init() {
-      this.binding = Binding.get(this.bind);
-      if (this.rootAlias) this.rootName = this.rootAlias;
-      super.init();
-   }
-
-   initInstance(context: any, instance: any) {
-      instance.store = new ZoomIntoPropertyView({
-         store: instance.parentStore,
-         binding: this.binding,
-         rootName: this.rootName,
-         nestedData: isObject(this.data)
-            ? new StructuredInstanceDataAccessor({ instance, data: this.data, useParentStore: true })
-            : undefined,
-      });
-      super.initInstance(context, instance);
-   }
-
-   applyParentStore(instance: any) {
-      instance.store.setStore(instance.parentStore);
-   }
-}
-
-Rescope.prototype.bind = "$page";
-Rescope.prototype.rootName = "$root";
-
-Widget.alias("rescope", Rescope);
+import { Widget } from "./Widget";
+import { PureContainerBase, PureContainerConfig } from "./PureContainer";
+import { Binding } from "../data/Binding";
+import { ZoomIntoPropertyView } from "../data/ZoomIntoPropertyView";
+import { StructuredInstanceDataAccessor } from "./StructuredInstanceDataAccessor";
+import { isObject } from "../util/isObject";
+import { StructuredProp } from "./Prop";
+
+export interface RescopeConfig extends PureContainerConfig {
+   bind: string;
+   rootName?: string;
+   rootAlias?: string;
+   data?: StructuredProp;
+}
+
+export class Rescope extends PureContainerBase<RescopeConfig> {
+   declare bind: string;
+   declare binding: any;
+   declare rootAlias?: string;
+   declare rootName: string;
+   declare data?: any;
+
+   init() {
+      this.binding = Binding.get(this.bind);
+      if (this.rootAlias) this.rootName = this.rootAlias;
+      super.init();
+   }
+
+   initInstance(context: any, instance: any) {
+      instance.store = new ZoomIntoPropertyView({
+         store: instance.parentStore,
+         binding: this.binding,
+         rootName: this.rootName,
+         nestedData: isObject(this.data)
+            ? new StructuredInstanceDataAccessor({ instance, data: this.data, useParentStore: true })
+            : undefined,
+      });
+      super.initInstance(context, instance);
+   }
+
+   applyParentStore(instance: any) {
+      instance.store.setStore(instance.parentStore);
+   }
+}
+
+Rescope.prototype.bind = "$page";
+Rescope.prototype.rootName = "$root";
+
+Widget.alias("rescope", Rescope);

package/src/ui/StructuredInstanceDataAccessor.ts

@@ -1,32 +1,32 @@
-import { getSelector } from "../data/getSelector";
-import { StructuredDataAccessor } from "../data/NestedDataView";
-
-export class StructuredInstanceDataAccessor implements StructuredDataAccessor {
-   instance: any;
-   dataConfig: any;
-   useParentStore: any;
-   dataSelector: any;
-
-   constructor(config: any) {
-      this.instance = config.instance;
-      this.dataConfig = config.data;
-      this.useParentStore = config.useParentStore;
-      this.dataSelector = getSelector(config.data);
-      if (this.dataSelector.memoize) this.dataSelector = this.dataSelector.memoize();
-   }
-   getSelector() {
-      return this.dataSelector;
-   }
-   get() {
-      return this.dataSelector.get(this.instance.store.getData());
-   }
-   setItem(key: string, value: any): boolean {
-      return this.instance.nestedDataSet(key, value, this.dataConfig, this.useParentStore);
-   }
-   containsKey(key: string) {
-      return this.dataConfig.hasOwnProperty(key);
-   }
-   getKeys() {
-      return Object.keys(this.dataConfig);
-   }
-}
+import { getSelector } from "../data/getSelector";
+import { StructuredDataAccessor } from "../data/NestedDataView";
+
+export class StructuredInstanceDataAccessor implements StructuredDataAccessor {
+   instance: any;
+   dataConfig: any;
+   useParentStore: any;
+   dataSelector: any;
+
+   constructor(config: any) {
+      this.instance = config.instance;
+      this.dataConfig = config.data;
+      this.useParentStore = config.useParentStore;
+      this.dataSelector = getSelector(config.data);
+      if (this.dataSelector.memoize) this.dataSelector = this.dataSelector.memoize();
+   }
+   getSelector() {
+      return this.dataSelector;
+   }
+   get() {
+      return this.dataSelector.get(this.instance.store.getData());
+   }
+   setItem(key: string, value: any): boolean {
+      return this.instance.nestedDataSet(key, value, this.dataConfig, this.useParentStore);
+   }
+   containsKey(key: string) {
+      return this.dataConfig.hasOwnProperty(key);
+   }
+   getKeys() {
+      return Object.keys(this.dataConfig);
+   }
+}

package/src/ui/VDOM.ts

@@ -1,34 +1 @@
-// @ts-expect-error
-import { VDOM as vdom } from "cx-react";
-
-import type * as React from "react";
-import type { Component } from "react";
-import type {
-   unstable_batchedUpdates,
-   render,
-   findDOMNode,
-   createPortal,
-   unstable_renderSubtreeIntoContainer,
-   hydrate,
-   unmountComponentAtNode,
-} from "react-dom";
-import type { createRoot, hydrateRoot, Root } from "react-dom/client";
-
-export interface VDOMType extends Omit<typeof React, "default"> {
-   allowRenderOutputCaching?: boolean;
-   Component: typeof Component;
-
-   DOM: {
-      unstable_batchedUpdates: typeof unstable_batchedUpdates;
-      render: typeof render;
-      findDOMNode: typeof findDOMNode;
-      createPortal: typeof createPortal;
-      createRoot: typeof createRoot;
-      hydrateRoot: typeof hydrateRoot;
-      hydrate: typeof hydrate;
-      unmountComponentAtNode: typeof unmountComponentAtNode;
-      unstable_renderSubtreeIntoContainer: typeof unstable_renderSubtreeIntoContainer;
-   };
-}
-
-export const VDOM = vdom as VDOMType;
+export { VDOM } from "cx-react";