cx 26.0.14 → 26.1.1

package/src/ui/Controller.spec.tsx

@@ -1,6 +1,6 @@
 import { Store } from "../data/Store";
 import { Controller, ControllerConfig } from "./Controller";
-import { createTestRenderer } from "../util/test/createTestRenderer";
+import { createTestRenderer, act } from "../util/test/createTestRenderer";
 import { VDOM, Widget, WidgetConfig } from "./Widget";
 import { Instance } from "./Instance";
 import { bind } from "./bind";
@@ -8,7 +8,7 @@ import assert from "assert";
 import { RenderingContext } from "./RenderingContext";
 
 describe("Controller", () => {
-   it("invokes lifetime methods", () => {
+   it("invokes lifetime methods", async () => {
       let init = 0,
          prepare = 0,
          explore = 0,
@@ -34,7 +34,7 @@ describe("Controller", () => {
 
       let store = new Store();
 
-      const component = createTestRenderer(
+      const component = await createTestRenderer(
          store,
          <cx>
             <div controller={TestController} />
@@ -48,7 +48,7 @@ describe("Controller", () => {
       assert.equal(cleanup, 1);
    });
 
-   it("widgets invoke controller methods specified as strings", () => {
+   it("widgets invoke controller methods specified as strings", async () => {
       let callback = 0;
 
       class TestController extends Controller {
@@ -70,7 +70,7 @@ describe("Controller", () => {
 
       let store = new Store();
 
-      const component = createTestRenderer(
+      const component = await createTestRenderer(
          store,
          <cx>
             <Cmp controller={TestController} onTest="callback" />
@@ -81,7 +81,7 @@ describe("Controller", () => {
       assert.equal(callback, 1);
    });
 
-   it("widgets can access controller methods specified in ancestor controllers", () => {
+   it("widgets can access controller methods specified in ancestor controllers", async () => {
       let callback1 = 0;
       let callback2 = 0;
 
@@ -110,7 +110,7 @@ describe("Controller", () => {
 
       let store = new Store();
 
-      const component = createTestRenderer(
+      const component = await createTestRenderer(
          store,
          <cx>
             <div controller={TestController1}>
@@ -124,7 +124,7 @@ describe("Controller", () => {
       assert.equal(callback2, 0);
    });
 
-   it("ancestor controllers are initialized first", () => {
+   it("ancestor controllers are initialized first", async () => {
       let order: string[] = [];
 
       class TestController1 extends Controller {
@@ -141,7 +141,7 @@ describe("Controller", () => {
 
       let store = new Store();
 
-      const component = createTestRenderer(
+      const component = await createTestRenderer(
          store,
          <cx>
             <div controller={TestController1}>
@@ -154,7 +154,7 @@ describe("Controller", () => {
       assert.deepEqual(order, ["1", "2"]);
    });
 
-   it("controllers on invisible elements are not initialized", () => {
+   it("controllers on invisible elements are not initialized", async () => {
       let order: string[] = [];
 
       class TestController1 extends Controller {
@@ -171,7 +171,7 @@ describe("Controller", () => {
 
       let store = new Store();
 
-      const component = createTestRenderer(
+      const component = await createTestRenderer(
          store,
          <cx>
             <div controller={TestController1}>
@@ -184,7 +184,7 @@ describe("Controller", () => {
       assert.deepEqual(order, ["1"]);
    });
 
-   it("invokes triggers and computables in order of definition", () => {
+   it("invokes triggers and computables in order of definition", async () => {
       let log: string[] = [];
 
       class TestController extends Controller {
@@ -216,7 +216,7 @@ describe("Controller", () => {
 
       let store = new Store();
 
-      const component = createTestRenderer(
+      const component = await createTestRenderer(
          store,
          <cx>
             <div controller={TestController} />
@@ -227,7 +227,7 @@ describe("Controller", () => {
       assert.deepEqual(log, ["t1", "c1", "t2"]);
    });
 
-   it("is recreated if a component is hidden and shown", () => {
+   it("is recreated if a component is hidden and shown", async () => {
       let initCount = 0;
 
       class TestController extends Controller {
@@ -239,7 +239,7 @@ describe("Controller", () => {
       let store = new Store();
       store.set("visible", true);
 
-      const component = createTestRenderer(
+      const component = await createTestRenderer(
          store,
          <cx>
             <div visible={bind("visible")} controller={TestController} />
@@ -249,11 +249,15 @@ describe("Controller", () => {
       let tree1 = component.toJSON();
       assert.equal(initCount, 1);
 
-      store.set("visible", false);
+      await act(async () => {
+         store.set("visible", false);
+      });
       let tree2 = component.toJSON();
       assert.equal(tree2, null);
 
-      store.set("visible", true);
+      await act(async () => {
+         store.set("visible", true);
+      });
       let tree3 = component.toJSON();
       assert.equal(initCount, 2);
    });
@@ -275,7 +279,7 @@ describe("Controller", () => {
       assert.equal(store.get("x"), 1);
    });
 
-   it("lifetime methods of a functional controller are properly invoked", () => {
+   it("lifetime methods of a functional controller are properly invoked", async () => {
       let initCount = 0,
          destroyCount = 0;
 
@@ -292,7 +296,7 @@ describe("Controller", () => {
       let store = new Store();
       store.set("visible", true);
 
-      const component = createTestRenderer(
+      const component = await createTestRenderer(
          store,
          <cx>
             <div visible={bind("visible")} controller={testController} />
@@ -302,19 +306,23 @@ describe("Controller", () => {
       let tree1 = component.toJSON();
       assert.equal(initCount, 1);
 
-      store.set("visible", false);
+      await act(async () => {
+         store.set("visible", false);
+      });
       let tree2 = component.toJSON();
       assert.equal(destroyCount, 1);
 
-      store.set("visible", true);
+      await act(async () => {
+         store.set("visible", true);
+      });
       let tree3 = component.toJSON();
       assert.equal(initCount, 2);
    });
 
-   it("widgets can easily define controller methods", () => {
+   it("widgets can easily define controller methods", async () => {
       let store = new Store({ data: { x: 0 } });
 
-      const component = createTestRenderer(
+      const component = await createTestRenderer(
          store,
          <cx>
             <div
@@ -339,10 +347,10 @@ describe("Controller", () => {
       assert.equal(store.get("x"), 1);
    });
 
-   it("functional controllers get store methods through configuration", () => {
+   it("functional controllers get store methods through configuration", async () => {
       let store = new Store({ data: { x: 0 } });
 
-      const component = createTestRenderer(
+      const component = await createTestRenderer(
          store,
          <cx>
             <div
@@ -367,10 +375,10 @@ describe("Controller", () => {
       assert.equal(store.get("x"), 1);
    });
 
-   it("addComputable accepts refs", () => {
+   it("addComputable accepts refs", async () => {
       let store = new Store({ data: { x: 0 } });
 
-      const component = createTestRenderer(
+      const component = await createTestRenderer(
          store,
          <cx>
             <div
@@ -390,7 +398,7 @@ describe("Controller", () => {
       assert.equal(store.get("y"), 1);
    });
 
-   it("invokeParentMethod is invoked on parent instance", () => {
+   it("invokeParentMethod is invoked on parent instance", async () => {
       let testValid: number[] = [];
 
       class TestController1 extends Controller {
@@ -411,7 +419,7 @@ describe("Controller", () => {
 
       let store = new Store();
 
-      const component = createTestRenderer(
+      const component = await createTestRenderer(
          store,
          <cx>
             <div controller={TestController2}>
@@ -446,10 +454,10 @@ describe("Controller types", () => {
       }
    }
 
-   it("accepts Controller class directly", () => {
+   it("accepts Controller class directly", async () => {
       let store = new Store();
 
-      const component = createTestRenderer(
+      const component = await createTestRenderer(
          store,
          <cx>
             <div controller={MyController} />
@@ -460,7 +468,7 @@ describe("Controller types", () => {
       assert.ok(tree);
    });
 
-   it("accepts config with type property", () => {
+   it("accepts config with type property", async () => {
       let store = new Store();
       let initCalled = false;
 
@@ -477,7 +485,7 @@ describe("Controller types", () => {
          }
       }
 
-      const component = createTestRenderer(
+      const component = await createTestRenderer(
          store,
          <cx>
             <div controller={{ type: TypedController, customValue: 42 }} />
@@ -489,10 +497,10 @@ describe("Controller types", () => {
       assert.equal(initCalled, true);
    });
 
-   it("accepts inline config object with ThisType", () => {
+   it("accepts inline config object with ThisType", async () => {
       let store = new Store({ data: { count: 0 } });
 
-      const component = createTestRenderer(
+      const component = await createTestRenderer(
          store,
          <cx>
             <div
@@ -510,10 +518,10 @@ describe("Controller types", () => {
       assert.equal(store.get("count"), 1);
    });
 
-   it("accepts factory function", () => {
+   it("accepts factory function", async () => {
       let store = new Store({ data: { count: 0 } });
 
-      const component = createTestRenderer(
+      const component = await createTestRenderer(
          store,
          <cx>
             <div
@@ -530,7 +538,7 @@ describe("Controller types", () => {
       assert.equal(store.get("count"), 5);
    });
 
-   it("accepts CreateConfig with type and required properties", () => {
+   it("accepts CreateConfig with type and required properties", async () => {
       let store = new Store({ data: { result: 0 } });
 
       interface RequiredPropControllerConfig extends ControllerConfig {
@@ -549,7 +557,7 @@ describe("Controller types", () => {
          }
       }
 
-      const component = createTestRenderer(
+      const component = await createTestRenderer(
          store,
          <cx>
             <div

package/src/ui/Culture.ts

@@ -1,159 +1,159 @@
-// @ts-expect-error
-import { NumberCulture, DateTimeCulture } from "intl-io";
-import { Localization } from "./Localization";
-import { GlobalCacheIdentifier } from "../util/GlobalCacheIdentifier";
-import { invalidateExpressionCache } from "../data/Expression";
-import { invalidateStringTemplateCache } from "../data/StringTemplate";
-import { defaultCompare } from "../data/defaultCompare";
-import { Console } from "../util/Console";
-
-export interface CultureInfo {
-   culture?: string;
-   numberCulture?: string | null;
-   dateTimeCulture?: string | null;
-   defaultCurrency?: string;
-   dateEncoding?: (date: Date) => string;
-   timezone?: string | null;
-}
-
-export interface ResolvedCultureInfo {
-   culture: string;
-   numberCulture?: string | null;
-   dateTimeCulture?: string | null;
-   cache: any;
-   defaultCurrency: string;
-   dateEncoding: (date: Date) => string;
-   timezone?: string | null;
-}
-
-let stack: ResolvedCultureInfo[] = [
-   {
-      culture: "en",
-      numberCulture: null,
-      dateTimeCulture: null,
-      cache: {},
-      defaultCurrency: "USD",
-      dateEncoding: (date: Date) => date.toISOString(),
-      timezone: null,
-   },
-];
-
-export function getDefaultCulture(): ResolvedCultureInfo {
-   return stack[0];
-}
-
-export function getCurrentCulture(): ResolvedCultureInfo {
-   return stack[stack.length - 1];
-}
-
-export function getCurrentCultureCache(): any {
-   return getCurrentCulture().cache;
-}
-
-export function pushCulture(cultureInfo: ResolvedCultureInfo): void {
-   stack.push(cultureInfo);
-}
-
-export function createCulture(cultureSpecs: Partial<CultureInfo>): ResolvedCultureInfo {
-   let current = getCurrentCulture();
-   let info: ResolvedCultureInfo = {
-      culture: current.culture,
-      dateEncoding: current.dateEncoding,
-      defaultCurrency: current.defaultCurrency,
-      cache: {},
-   };
-   for (let key in cultureSpecs) {
-      if (!(cultureSpecs as any)[key]) continue;
-      (info as any)[key] = (cultureSpecs as any)[key];
-   }
-   return info;
-}
-
-export function popCulture(cultureSpecs?: CultureInfo): CultureInfo | undefined {
-   if (stack.length == 1) throw new Error("Cannot pop the last culture object.");
-   if (cultureSpecs && stack[stack.length - 1] !== cultureSpecs) {
-      Console.warn("Popped culture object does not match the current one.");
-   }
-   return stack.pop();
-}
-
-export class Culture {
-   static setCulture(cultureCode: string): void {
-      let cultureSpecs = getDefaultCulture();
-      cultureSpecs.culture = cultureCode;
-      cultureSpecs.cache = {};
-      Localization.setCulture(cultureCode);
-      this.invalidateCache();
-   }
-
-   static setNumberCulture(cultureCode: string): void {
-      let cultureSpecs = getDefaultCulture();
-      cultureSpecs.numberCulture = cultureCode;
-      delete cultureSpecs.cache.numberCulture;
-      this.invalidateCache();
-   }
-
-   static setDateTimeCulture(cultureCode: string): void {
-      let cultureSpecs = getDefaultCulture();
-      cultureSpecs.dateTimeCulture = cultureCode;
-      delete cultureSpecs.cache.dateTimeCulture;
-      this.invalidateCache();
-   }
-
-   static setDefaultCurrency(currencyCode: string): void {
-      let cultureSpecs = getDefaultCulture();
-      cultureSpecs.defaultCurrency = currencyCode;
-      this.invalidateCache();
-   }
-
-   static setDefaultTimezone(timezone: string): void {
-      let cultureSpecs = getDefaultCulture();
-      cultureSpecs.timezone = timezone;
-      this.invalidateCache();
-   }
-
-   static setDefaultDateEncoding(encoding: (date: Date) => string): void {
-      let cultureSpecs = getDefaultCulture();
-      cultureSpecs.dateEncoding = encoding;
-      this.invalidateCache();
-   }
-
-   static invalidateCache(): void {
-      GlobalCacheIdentifier.change();
-      invalidateExpressionCache();
-      invalidateStringTemplateCache();
-   }
-
-   static get defaultCurrency(): string | undefined {
-      return getCurrentCulture().defaultCurrency;
-   }
-
-   static get culture(): string | undefined {
-      return getCurrentCulture().culture;
-   }
-
-   static getNumberCulture(): NumberCulture {
-      let { cache, numberCulture, culture } = getCurrentCulture();
-      if (!cache!.numberCulture) cache!.numberCulture = new NumberCulture(numberCulture ?? culture);
-      return cache!.numberCulture;
-   }
-
-   static getDateTimeCulture(): DateTimeCulture {
-      let { cache, dateTimeCulture, culture, timezone } = getCurrentCulture();
-      if (!cache!.dateTimeCulture)
-         cache!.dateTimeCulture = new DateTimeCulture(dateTimeCulture ?? culture, {
-            defaultTimezone: timezone,
-         });
-      return cache!.dateTimeCulture;
-   }
-
-   static getDefaultDateEncoding(): (date: Date) => string {
-      return getCurrentCulture().dateEncoding;
-   }
-
-   static getComparer(options?: Intl.CollatorOptions): (a: any, b: any) => number {
-      let { culture } = getCurrentCulture();
-      if (typeof Intl.Collator != "undefined") return new Intl.Collator(culture, options).compare;
-      return defaultCompare;
-   }
-}
+// @ts-expect-error
+import { NumberCulture, DateTimeCulture } from "intl-io";
+import { Localization } from "./Localization";
+import { GlobalCacheIdentifier } from "../util/GlobalCacheIdentifier";
+import { invalidateExpressionCache } from "../data/Expression";
+import { invalidateStringTemplateCache } from "../data/StringTemplate";
+import { defaultCompare } from "../data/defaultCompare";
+import { Console } from "../util/Console";
+
+export interface CultureInfo {
+   culture?: string;
+   numberCulture?: string | null;
+   dateTimeCulture?: string | null;
+   defaultCurrency?: string;
+   dateEncoding?: (date: Date) => string;
+   timezone?: string | null;
+}
+
+export interface ResolvedCultureInfo {
+   culture: string;
+   numberCulture?: string | null;
+   dateTimeCulture?: string | null;
+   cache: any;
+   defaultCurrency: string;
+   dateEncoding: (date: Date) => string;
+   timezone?: string | null;
+}
+
+let stack: ResolvedCultureInfo[] = [
+   {
+      culture: "en",
+      numberCulture: null,
+      dateTimeCulture: null,
+      cache: {},
+      defaultCurrency: "USD",
+      dateEncoding: (date: Date) => date.toISOString(),
+      timezone: null,
+   },
+];
+
+export function getDefaultCulture(): ResolvedCultureInfo {
+   return stack[0];
+}
+
+export function getCurrentCulture(): ResolvedCultureInfo {
+   return stack[stack.length - 1];
+}
+
+export function getCurrentCultureCache(): any {
+   return getCurrentCulture().cache;
+}
+
+export function pushCulture(cultureInfo: ResolvedCultureInfo): void {
+   stack.push(cultureInfo);
+}
+
+export function createCulture(cultureSpecs: Partial<CultureInfo>): ResolvedCultureInfo {
+   let current = getCurrentCulture();
+   let info: ResolvedCultureInfo = {
+      culture: current.culture,
+      dateEncoding: current.dateEncoding,
+      defaultCurrency: current.defaultCurrency,
+      cache: {},
+   };
+   for (let key in cultureSpecs) {
+      if (!(cultureSpecs as any)[key]) continue;
+      (info as any)[key] = (cultureSpecs as any)[key];
+   }
+   return info;
+}
+
+export function popCulture(cultureSpecs?: CultureInfo): CultureInfo | undefined {
+   if (stack.length == 1) throw new Error("Cannot pop the last culture object.");
+   if (cultureSpecs && stack[stack.length - 1] !== cultureSpecs) {
+      Console.warn("Popped culture object does not match the current one.");
+   }
+   return stack.pop();
+}
+
+export class Culture {
+   static setCulture(cultureCode: string): void {
+      let cultureSpecs = getDefaultCulture();
+      cultureSpecs.culture = cultureCode;
+      cultureSpecs.cache = {};
+      Localization.setCulture(cultureCode);
+      this.invalidateCache();
+   }
+
+   static setNumberCulture(cultureCode: string): void {
+      let cultureSpecs = getDefaultCulture();
+      cultureSpecs.numberCulture = cultureCode;
+      delete cultureSpecs.cache.numberCulture;
+      this.invalidateCache();
+   }
+
+   static setDateTimeCulture(cultureCode: string): void {
+      let cultureSpecs = getDefaultCulture();
+      cultureSpecs.dateTimeCulture = cultureCode;
+      delete cultureSpecs.cache.dateTimeCulture;
+      this.invalidateCache();
+   }
+
+   static setDefaultCurrency(currencyCode: string): void {
+      let cultureSpecs = getDefaultCulture();
+      cultureSpecs.defaultCurrency = currencyCode;
+      this.invalidateCache();
+   }
+
+   static setDefaultTimezone(timezone: string): void {
+      let cultureSpecs = getDefaultCulture();
+      cultureSpecs.timezone = timezone;
+      this.invalidateCache();
+   }
+
+   static setDefaultDateEncoding(encoding: (date: Date) => string): void {
+      let cultureSpecs = getDefaultCulture();
+      cultureSpecs.dateEncoding = encoding;
+      this.invalidateCache();
+   }
+
+   static invalidateCache(): void {
+      GlobalCacheIdentifier.change();
+      invalidateExpressionCache();
+      invalidateStringTemplateCache();
+   }
+
+   static get defaultCurrency(): string | undefined {
+      return getCurrentCulture().defaultCurrency;
+   }
+
+   static get culture(): string | undefined {
+      return getCurrentCulture().culture;
+   }
+
+   static getNumberCulture(): NumberCulture {
+      let { cache, numberCulture, culture } = getCurrentCulture();
+      if (!cache!.numberCulture) cache!.numberCulture = new NumberCulture(numberCulture ?? culture);
+      return cache!.numberCulture;
+   }
+
+   static getDateTimeCulture(): DateTimeCulture {
+      let { cache, dateTimeCulture, culture, timezone } = getCurrentCulture();
+      if (!cache!.dateTimeCulture)
+         cache!.dateTimeCulture = new DateTimeCulture(dateTimeCulture ?? culture, {
+            defaultTimezone: timezone,
+         });
+      return cache!.dateTimeCulture;
+   }
+
+   static getDefaultDateEncoding(): (date: Date) => string {
+      return getCurrentCulture().dateEncoding;
+   }
+
+   static getComparer(options?: Intl.CollatorOptions): (a: any, b: any) => number {
+      let { culture } = getCurrentCulture();
+      if (typeof Intl.Collator != "undefined") return new Intl.Collator(culture, options).compare;
+      return defaultCompare;
+   }
+}