cx 26.3.10 → 26.4.0

package/src/svg/util/Rect.ts

@@ -1,105 +1,105 @@
-import { isNumber } from "../../util/isNumber";
-import { isArray } from "../../util/isArray";
-
-type RectMargin = string | Rect | Array<string | number>;
-
-export interface IRect {
-   l: number;
-   r: number;
-   t: number;
-   b: number;
-}
-
-export class Rect implements IRect {
-   isRect: boolean = true;
-   l: number = 0; //left;
-   r: number = 0; //right
-   t: number = 0; //top
-   b: number = 0; //bottom
-
-   constructor(config?: { t?: number; r?: number; b?: number; l?: number }) {
-      Object.assign(this, config);
-   }
-
-   width(): number {
-      return this.r - this.l;
-   }
-
-   height(): number {
-      return this.b - this.t;
-   }
-
-   valid(): boolean {
-      return this.r > this.l && this.b > this.t;
-   }
-
-   makeValid(): Rect {
-      return new Rect({
-         l: Math.min(this.l, this.r),
-         r: Math.max(this.l, this.r),
-         t: Math.min(this.t, this.b),
-         b: Math.max(this.t, this.b),
-      });
-   }
-
-   isEqual(r?: Rect): boolean {
-      if (!r || !r.isRect) return false;
-
-      return r.l == this.l && r.r == this.r && r.t == this.t && r.b == this.b;
-   }
-
-   static add(a: Rect, b: Rect): Rect {
-      return new Rect({
-         l: a.l + b.l,
-         t: a.t + b.t,
-         r: a.r + b.r,
-         b: a.b + b.b,
-      });
-   }
-
-   static multiply(a: Rect, b: Rect): Rect {
-      return new Rect({
-         l: a.l + (a.r - a.l) * b.l,
-         r: a.l + (a.r - a.l) * b.r,
-         t: a.t + (a.b - a.t) * b.t,
-         b: a.t + (a.b - a.t) * b.b,
-      });
-   }
-
-   static margin(r: Rect, m?: RectMargin): Rect {
-      var mr = Rect.convertMargin(m);
-      return Rect.add(r, mr);
-   }
-
-   static convertMargin(m?: RectMargin): Rect {
-      if (!m) return new Rect();
-
-      if ((m as any).isRect) return m as Rect;
-
-      if (isNumber(m)) return new Rect({ l: m as number, t: m as number, r: -(m as number), b: -(m as number) });
-
-      var mr = Rect.convert(m);
-      mr.b = -mr.b;
-      mr.r = -mr.r;
-      return mr;
-   }
-
-   static convert(r?: RectMargin | number): Rect {
-      if (!r) return new Rect({ l: 0, r: 0, t: 0, b: 0 });
-
-      if ((r as any).isRect) return r as Rect;
-
-      if (typeof r === "string") r = r.split(" ");
-
-      if (isArray(r)) {
-         return new Rect({
-            t: parseFloat(r[0] as any),
-            r: parseFloat(r[1] as any),
-            b: parseFloat(r[2] as any),
-            l: parseFloat(r[3] as any),
-         });
-      }
-
-      return new Rect(r as any);
-   }
-}
+import { isNumber } from "../../util/isNumber";
+import { isArray } from "../../util/isArray";
+
+type RectMargin = string | Rect | Array<string | number>;
+
+export interface IRect {
+   l: number;
+   r: number;
+   t: number;
+   b: number;
+}
+
+export class Rect implements IRect {
+   isRect: boolean = true;
+   l: number = 0; //left;
+   r: number = 0; //right
+   t: number = 0; //top
+   b: number = 0; //bottom
+
+   constructor(config?: { t?: number; r?: number; b?: number; l?: number }) {
+      Object.assign(this, config);
+   }
+
+   width(): number {
+      return this.r - this.l;
+   }
+
+   height(): number {
+      return this.b - this.t;
+   }
+
+   valid(): boolean {
+      return this.r > this.l && this.b > this.t;
+   }
+
+   makeValid(): Rect {
+      return new Rect({
+         l: Math.min(this.l, this.r),
+         r: Math.max(this.l, this.r),
+         t: Math.min(this.t, this.b),
+         b: Math.max(this.t, this.b),
+      });
+   }
+
+   isEqual(r?: Rect): boolean {
+      if (!r || !r.isRect) return false;
+
+      return r.l == this.l && r.r == this.r && r.t == this.t && r.b == this.b;
+   }
+
+   static add(a: Rect, b: Rect): Rect {
+      return new Rect({
+         l: a.l + b.l,
+         t: a.t + b.t,
+         r: a.r + b.r,
+         b: a.b + b.b,
+      });
+   }
+
+   static multiply(a: Rect, b: Rect): Rect {
+      return new Rect({
+         l: a.l + (a.r - a.l) * b.l,
+         r: a.l + (a.r - a.l) * b.r,
+         t: a.t + (a.b - a.t) * b.t,
+         b: a.t + (a.b - a.t) * b.b,
+      });
+   }
+
+   static margin(r: Rect, m?: RectMargin): Rect {
+      var mr = Rect.convertMargin(m);
+      return Rect.add(r, mr);
+   }
+
+   static convertMargin(m?: RectMargin): Rect {
+      if (!m) return new Rect();
+
+      if ((m as any).isRect) return m as Rect;
+
+      if (isNumber(m)) return new Rect({ l: m as number, t: m as number, r: -(m as number), b: -(m as number) });
+
+      var mr = Rect.convert(m);
+      mr.b = -mr.b;
+      mr.r = -mr.r;
+      return mr;
+   }
+
+   static convert(r?: RectMargin | number): Rect {
+      if (!r) return new Rect({ l: 0, r: 0, t: 0, b: 0 });
+
+      if ((r as any).isRect) return r as Rect;
+
+      if (typeof r === "string") r = r.split(" ");
+
+      if (isArray(r)) {
+         return new Rect({
+            t: parseFloat(r[0] as any),
+            r: parseFloat(r[1] as any),
+            b: parseFloat(r[2] as any),
+            l: parseFloat(r[3] as any),
+         });
+      }
+
+      return new Rect(r as any);
+   }
+}

package/src/ui/CSS.ts

@@ -1,87 +1,87 @@
-import { CSSHelper } from "./CSSHelper";
-import { parseStyle } from "../util/parseStyle";
-import { isArray } from "../util/isArray";
-
-function push(list: any[] | undefined, item: any): any[] {
-   if (!item) return list || [];
-   if (!list) list = [];
-   list.push(item);
-   return list;
-}
-
-function pushMore(list: any[] | undefined, itemArray: any[]): any[] {
-   if (!itemArray || itemArray.length == 0) return list || [];
-   if (!list) list = [];
-   list.push.apply(list, itemArray);
-   return list;
-}
-
-function pushMap(list: any[] | undefined, itemArray: any[] | undefined, mapF: (item: any) => any): any[] | undefined {
-   return itemArray ? pushMore(list, itemArray.map(mapF)) : list;
-}
-
-function join(list: any[] | undefined): string | undefined {
-   return list ? list.join(" ") : undefined;
-}
-
-export class CSS {
-   public static classPrefix: string;
-
-   static resolve(...args: any[]): any[] {
-      let list: any[] | undefined = undefined,
-         type: string,
-         arg: any,
-         i: number,
-         key: string;
-
-      for (i = 0; i < args.length; i++) {
-         arg = args[i];
-         if (arg) {
-            type = typeof arg;
-            if (type == "string") list = push(list, arg);
-            else if (type == "object") {
-               if (isArray(arg)) list = pushMore(list, this.resolve(...arg));
-               else for (key in arg) if (arg[key]) list = push(list, key);
-            }
-         }
-      }
-      return list || [];
-   }
-
-   static block(baseClass: string, styleModifiers?: any, stateModifiers?: any): string;
-   static block(baseClass?: string, styleModifiers?: any, stateModifiers?: any): string | undefined {
-      let list: any[] | undefined;
-      if (baseClass) list = push(list, this.classPrefix + "b-" + baseClass);
-      list = pushMap(list, this.resolve(styleModifiers), (m) => this.classPrefix + "m-" + m);
-      list = pushMap(list, this.resolve(stateModifiers), (m) => this.classPrefix + "s-" + m);
-      return join(list);
-   }
-
-   static element(baseClass: string, elementClass: string, stateModifiers?: any): string;
-   static element(baseClass?: string, elementClass?: string, stateModifiers?: any): string | undefined {
-      let list: any[] | undefined;
-      if (baseClass && elementClass) list = push(list, this.classPrefix + "e-" + baseClass + "-" + elementClass);
-      list = pushMap(list, this.resolve(stateModifiers), (m) => this.classPrefix + "s-" + m);
-      return join(list);
-   }
-
-   static state(stateModifiers: any): string | undefined {
-      return join(pushMap(undefined, this.resolve(stateModifiers), (m) => this.classPrefix + "s-" + m));
-   }
-
-   static mod(mods: any): string | undefined {
-      return join(pushMap(undefined, this.resolve(mods), (m) => this.classPrefix + "m-" + m));
-   }
-
-   static expand(...args: any[]): string | undefined {
-      return join(this.resolve(...args));
-   }
-
-   static parseStyle(str: any): any {
-      return parseStyle(str);
-   }
-}
-
-CSS.classPrefix = "cx";
-
-CSSHelper.alias("cx", CSS);
+import { CSSHelper } from "./CSSHelper";
+import { parseStyle } from "../util/parseStyle";
+import { isArray } from "../util/isArray";
+
+function push(list: any[] | undefined, item: any): any[] {
+   if (!item) return list || [];
+   if (!list) list = [];
+   list.push(item);
+   return list;
+}
+
+function pushMore(list: any[] | undefined, itemArray: any[]): any[] {
+   if (!itemArray || itemArray.length == 0) return list || [];
+   if (!list) list = [];
+   list.push.apply(list, itemArray);
+   return list;
+}
+
+function pushMap(list: any[] | undefined, itemArray: any[] | undefined, mapF: (item: any) => any): any[] | undefined {
+   return itemArray ? pushMore(list, itemArray.map(mapF)) : list;
+}
+
+function join(list: any[] | undefined): string | undefined {
+   return list ? list.join(" ") : undefined;
+}
+
+export class CSS {
+   public static classPrefix: string;
+
+   static resolve(...args: any[]): any[] {
+      let list: any[] | undefined = undefined,
+         type: string,
+         arg: any,
+         i: number,
+         key: string;
+
+      for (i = 0; i < args.length; i++) {
+         arg = args[i];
+         if (arg) {
+            type = typeof arg;
+            if (type == "string") list = push(list, arg);
+            else if (type == "object") {
+               if (isArray(arg)) list = pushMore(list, this.resolve(...arg));
+               else for (key in arg) if (arg[key]) list = push(list, key);
+            }
+         }
+      }
+      return list || [];
+   }
+
+   static block(baseClass: string, styleModifiers?: any, stateModifiers?: any): string;
+   static block(baseClass?: string, styleModifiers?: any, stateModifiers?: any): string | undefined {
+      let list: any[] | undefined;
+      if (baseClass) list = push(list, this.classPrefix + "b-" + baseClass);
+      list = pushMap(list, this.resolve(styleModifiers), (m) => this.classPrefix + "m-" + m);
+      list = pushMap(list, this.resolve(stateModifiers), (m) => this.classPrefix + "s-" + m);
+      return join(list);
+   }
+
+   static element(baseClass: string, elementClass: string, stateModifiers?: any): string;
+   static element(baseClass?: string, elementClass?: string, stateModifiers?: any): string | undefined {
+      let list: any[] | undefined;
+      if (baseClass && elementClass) list = push(list, this.classPrefix + "e-" + baseClass + "-" + elementClass);
+      list = pushMap(list, this.resolve(stateModifiers), (m) => this.classPrefix + "s-" + m);
+      return join(list);
+   }
+
+   static state(stateModifiers: any): string | undefined {
+      return join(pushMap(undefined, this.resolve(stateModifiers), (m) => this.classPrefix + "s-" + m));
+   }
+
+   static mod(mods: any): string | undefined {
+      return join(pushMap(undefined, this.resolve(mods), (m) => this.classPrefix + "m-" + m));
+   }
+
+   static expand(...args: any[]): string | undefined {
+      return join(this.resolve(...args));
+   }
+
+   static parseStyle(str: any): any {
+      return parseStyle(str);
+   }
+}
+
+CSS.classPrefix = "cx";
+
+CSSHelper.alias("cx", CSS);

package/src/ui/CSSHelper.ts

@@ -1,17 +1,17 @@
-var cssHelperCache: { [key: string]: any } = {};
-
-export class CSSHelper {
-   static get(code: string): any {
-      var helper = cssHelperCache[code];
-      if (!helper) throw new Error(`Unknown CSS helper '${code}'.`);
-      return helper;
-   }
-
-   static register(code: string, helper: any): void {
-      cssHelperCache[code] = helper;
-   }
-
-   static alias(code: string, helper: any): void {
-      cssHelperCache[code] = helper;
-   }
-}
+var cssHelperCache: { [key: string]: any } = {};
+
+export class CSSHelper {
+   static get(code: string): any {
+      var helper = cssHelperCache[code];
+      if (!helper) throw new Error(`Unknown CSS helper '${code}'.`);
+      return helper;
+   }
+
+   static register(code: string, helper: any): void {
+      cssHelperCache[code] = helper;
+   }
+
+   static alias(code: string, helper: any): void {
+      cssHelperCache[code] = helper;
+   }
+}

package/src/ui/Container.spec.ts

@@ -1,87 +1,87 @@
-import assert from "assert";
-import { ContainerBase, ContainerConfig } from "./Container";
-import { Store } from "../data";
-import { Instance } from "./Instance";
-import { RenderingContext } from "./RenderingContext";
-import { HtmlElement } from "../widgets/HtmlElement";
-import { Widget } from "./Widget";
-
-function collectKeys(obj: any, path = "", result: Record<string, boolean> = {}, seen = new WeakSet()): Record<string, boolean> {
-   if (!obj || typeof obj !== "object" || seen.has(obj)) return result;
-   seen.add(obj);
-   for (const key of Object.keys(obj)) {
-      const fullPath = path ? `${path}.${key}` : key;
-      result[fullPath] = true;
-      collectKeys(obj[key], fullPath, result, seen);
-   }
-   return result;
-}
-
-describe("Container", function () {
-   it("should not mutate config during init", function () {
-      const config = {
-         type: HtmlElement,
-         tag: "div",
-         children: [
-            { type: HtmlElement, tag: "span", text: "Hello" },
-            { type: HtmlElement, tag: "span", text: "World" },
-         ],
-      };
-
-      const keysBefore = collectKeys(config);
-
-      const widget = Widget.create(config);
-      const store = new Store();
-      const context = new RenderingContext();
-      const instance = new Instance(widget, "1", null as any, store);
-      instance.init(context);
-
-      const keysAfter = collectKeys(config);
-      const newKeys = Object.keys(keysAfter).filter((k) => !keysBefore[k]);
-
-      assert.deepStrictEqual(newKeys, [], `Config was mutated. New keys: ${newKeys.join(", ")}`);
-   });
-
-   it("should not use the same children array instance as config", function () {
-      const configChildren = [
-         { type: HtmlElement, tag: "span", text: "Hello" },
-         { type: HtmlElement, tag: "span", text: "World" },
-      ];
-      const config = {
-         type: HtmlElement,
-         tag: "div",
-         children: configChildren,
-      };
-
-      const widget = Widget.create(config) as HtmlElement;
-      widget.init();
-
-      assert.notStrictEqual(widget.items, configChildren, "Widget should not use the same children array instance as config");
-   });
-});
-
-describe("ContainerConfig", function () {
-   describe("reserved props cannot be introduced by subclasses", function () {
-      it("rejects add in extended config interface", function () {
-         // @ts-expect-error - add is reserved and cannot be added to extended config
-         interface BadConfig extends ContainerConfig {
-            add: string;
-         }
-      });
-
-      it("rejects clear in extended config interface", function () {
-         // @ts-expect-error - clear is reserved and cannot be added to extended config
-         interface BadConfig extends ContainerConfig {
-            clear: string;
-         }
-      });
-
-      it("allows valid properties in extended config", function () {
-         interface GoodConfig extends ContainerConfig {
-            customProp?: string;
-         }
-         const config: GoodConfig = { customProp: "test" };
-         assert.ok(config);
-      });
-   });
-});
+import assert from "assert";
+import { ContainerBase, ContainerConfig } from "./Container";
+import { Store } from "../data";
+import { Instance } from "./Instance";
+import { RenderingContext } from "./RenderingContext";
+import { HtmlElement } from "../widgets/HtmlElement";
+import { Widget } from "./Widget";
+
+function collectKeys(obj: any, path = "", result: Record<string, boolean> = {}, seen = new WeakSet()): Record<string, boolean> {
+   if (!obj || typeof obj !== "object" || seen.has(obj)) return result;
+   seen.add(obj);
+   for (const key of Object.keys(obj)) {
+      const fullPath = path ? `${path}.${key}` : key;
+      result[fullPath] = true;
+      collectKeys(obj[key], fullPath, result, seen);
+   }
+   return result;
+}
+
+describe("Container", function () {
+   it("should not mutate config during init", function () {
+      const config = {
+         type: HtmlElement,
+         tag: "div",
+         children: [
+            { type: HtmlElement, tag: "span", text: "Hello" },
+            { type: HtmlElement, tag: "span", text: "World" },
+         ],
+      };
+
+      const keysBefore = collectKeys(config);
+
+      const widget = Widget.create(config);
+      const store = new Store();
+      const context = new RenderingContext();
+      const instance = new Instance(widget, "1", null as any, store);
+      instance.init(context);
+
+      const keysAfter = collectKeys(config);
+      const newKeys = Object.keys(keysAfter).filter((k) => !keysBefore[k]);
+
+      assert.deepStrictEqual(newKeys, [], `Config was mutated. New keys: ${newKeys.join(", ")}`);
+   });
+
+   it("should not use the same children array instance as config", function () {
+      const configChildren = [
+         { type: HtmlElement, tag: "span", text: "Hello" },
+         { type: HtmlElement, tag: "span", text: "World" },
+      ];
+      const config = {
+         type: HtmlElement,
+         tag: "div",
+         children: configChildren,
+      };
+
+      const widget = Widget.create(config) as HtmlElement;
+      widget.init();
+
+      assert.notStrictEqual(widget.items, configChildren, "Widget should not use the same children array instance as config");
+   });
+});
+
+describe("ContainerConfig", function () {
+   describe("reserved props cannot be introduced by subclasses", function () {
+      it("rejects add in extended config interface", function () {
+         // @ts-expect-error - add is reserved and cannot be added to extended config
+         interface BadConfig extends ContainerConfig {
+            add: string;
+         }
+      });
+
+      it("rejects clear in extended config interface", function () {
+         // @ts-expect-error - clear is reserved and cannot be added to extended config
+         interface BadConfig extends ContainerConfig {
+            clear: string;
+         }
+      });
+
+      it("allows valid properties in extended config", function () {
+         interface GoodConfig extends ContainerConfig {
+            customProp?: string;
+         }
+         const config: GoodConfig = { customProp: "test" };
+         assert.ok(config);
+      });
+   });
+});