cx 26.0.4 → 26.0.6

package/src/ui/app/Url.spec.ts

@@ -1,50 +1,50 @@
-import { Url } from "./Url";
-import Route from "route-parser";
-import assert from "assert";
-describe("Url", function () {
-   describe(".unresolve", function () {
-      it("preserves query parameters", function () {
-         Url.absoluteBase = "https://cxjs.io/docs/";
-         assert.equal("~/?state=1", Url.unresolve("https://cxjs.io/docs/?state=1"));
-      });
-
-      it("doesn't touch unresolved urls", function () {
-         assert.equal("~/test", Url.unresolve("~/test"));
-      });
-   });
-
-   describe(".getBaseFromScriptSrc", () => {
-      it("ignores query strings", function () {
-         assert.equal(Url.getBaseFromScriptSrc("/vendor.js?qs=1", "~/vendor.js"), "/");
-      });
-
-      it("allows wildcards", function () {
-         assert.equal(Url.getBaseFromScriptSrc("/vendor.123.js?qs=1", "~/vendor.*.js"), "/");
-      });
-
-      it("works for an application folder", function () {
-         assert.equal(Url.getBaseFromScriptSrc("/datasync/vendor.124c82.js", "~/vendor.*.js"), "/datasync/");
-      });
-   });
-});
-
-describe("Route", function () {
-   it("matches query param", function () {
-      let route = new Route("~/?state=:state");
-      let result = route.match("~/?state=1");
-      assert(result !== false);
-      assert.equal(result.state, "1");
-   });
-
-   it("matches routes with extra query params", function () {
-      let route = new Route("~/?state=:state");
-      let result = route.match("~/?state=1&more=2");
-      assert(result);
-   });
-
-   it.skip("matches query params in any order", function () {
-      let route = new Route("~/?a=:a&b=:b");
-      let result = route.match("~/?b=1&a=2");
-      assert(result);
-   });
-});
+import { Url } from "./Url";
+import Route from "route-parser";
+import assert from "assert";
+describe("Url", function () {
+   describe(".unresolve", function () {
+      it("preserves query parameters", function () {
+         Url.absoluteBase = "https://cxjs.io/docs/";
+         assert.equal("~/?state=1", Url.unresolve("https://cxjs.io/docs/?state=1"));
+      });
+
+      it("doesn't touch unresolved urls", function () {
+         assert.equal("~/test", Url.unresolve("~/test"));
+      });
+   });
+
+   describe(".getBaseFromScriptSrc", () => {
+      it("ignores query strings", function () {
+         assert.equal(Url.getBaseFromScriptSrc("/vendor.js?qs=1", "~/vendor.js"), "/");
+      });
+
+      it("allows wildcards", function () {
+         assert.equal(Url.getBaseFromScriptSrc("/vendor.123.js?qs=1", "~/vendor.*.js"), "/");
+      });
+
+      it("works for an application folder", function () {
+         assert.equal(Url.getBaseFromScriptSrc("/datasync/vendor.124c82.js", "~/vendor.*.js"), "/datasync/");
+      });
+   });
+});
+
+describe("Route", function () {
+   it("matches query param", function () {
+      let route = new Route("~/?state=:state");
+      let result = route.match("~/?state=1");
+      assert(result !== false);
+      assert.equal(result.state, "1");
+   });
+
+   it("matches routes with extra query params", function () {
+      let route = new Route("~/?state=:state");
+      let result = route.match("~/?state=1&more=2");
+      assert(result);
+   });
+
+   it.skip("matches query params in any order", function () {
+      let route = new Route("~/?a=:a&b=:b");
+      let result = route.match("~/?b=1&a=2");
+      assert(result);
+   });
+});

package/src/ui/app/startAppLoop.tsx

@@ -4,6 +4,7 @@ import { Widget, VDOM, WidgetConfig } from "../Widget";
 import { Store } from "../../data/Store";
 import { Cx } from "../Cx";
 import { Instance } from "../Instance";
+import { Create } from "../../util/Component";
 
 export interface StartAppLoopOptions {
    destroyDelay?: number;
@@ -14,7 +15,7 @@ export interface StartAppLoopOptions {
 export function startAppLoop(
    parentDOMElement: HTMLElement,
    storeOrInstance?: Store | Instance,
-   widget?: Widget | WidgetConfig,
+   widget?: Create<typeof Widget> | Create<typeof Widget>[],
    options: StartAppLoopOptions = {},
 ): () => void {
    if (!parentDOMElement || parentDOMElement.nodeType !== 1)

package/src/ui/app/startHotAppLoop.ts

@@ -1,6 +1,7 @@
 import { startAppLoop, StartAppLoopOptions } from "./startAppLoop";
 import { Widget, WidgetConfig } from "../Widget";
 import { Store } from "../../data/Store";
+import { Create } from "../../util/Component";
 
 export interface HotModule {
    hot?: {
@@ -14,7 +15,7 @@ export function startHotAppLoop(
    appModule: HotModule,
    element: HTMLElement,
    store: Store,
-   widgets: Widget | WidgetConfig,
+   widgets: Create<typeof Widget> | Create<typeof Widget>[],
    options: StartAppLoopOptions = {},
 ): () => void {
    let stop: (() => void) | undefined;

package/src/ui/createFunctionalComponent.ts

@@ -1,65 +1,65 @@
-import { createComponentFactory, isComponentFactory } from "../util/Component";
-import { flattenProps } from "../ui/flattenProps";
-import { PureContainer } from "./PureContainer";
-import { UseParentLayout } from "./layout/UseParentLayout";
-import { isDefined } from "../util/isDefined";
-
-let currentInstance: any = null;
-
-class FunctionalComponent extends PureContainer {
-   declare childrenFactory: (props: any) => any;
-   declare props: any;
-
-   initInstance(context: any, instance: any) {
-      instance.store = instance.parentStore;
-      this.clear();
-      currentInstance = instance;
-      this.add(this.childrenFactory(this.props));
-      instance.content = this.layout ? this.layout.items : this.items;
-      this.clear();
-      currentInstance = null;
-   }
-
-   explore(context: any, instance: any) {
-      if (this.layout) this.layout.items = instance.content;
-      else this.items = instance.content;
-      this.exploreItems(context, instance, instance.content);
-      if (instance.computables) {
-         instance.computables.forEach((cb: any) => cb(instance.store.getData()));
-      }
-   }
-}
-
-export function createFunctionalComponent(factory: any) {
-   if (isComponentFactory(factory)) return factory;
-
-   return createComponentFactory(factory, (props: any = {}) => {
-      let innerProps = flattenProps(props);
-      delete innerProps.visible;
-      delete innerProps.if;
-      delete innerProps.controller;
-      delete innerProps.layout;
-      delete innerProps.outerLayout;
-      delete innerProps.putInto;
-      delete innerProps.contentFor;
-      delete innerProps.jsxAttributes;
-      delete innerProps.$type;
-      delete innerProps.vdomKey;
-
-      return {
-         type: FunctionalComponent,
-         visible: isDefined(props.if) ? props.if : isDefined(props.visible) ? props.visible : true,
-         layout: props.layout || UseParentLayout,
-         controller: props.controller,
-         outerLayout: props.outerLayout,
-         putInto: props.contentFor || props.putInto,
-         vdomKey: props.vdomKey,
-         childrenFactory: factory,
-         props: innerProps,
-      };
-   });
-}
-
-export function getCurrentInstance() {
-   return currentInstance;
-}
+import { createComponentFactory, isComponentFactory } from "../util/Component";
+import { flattenProps } from "../ui/flattenProps";
+import { PureContainer } from "./PureContainer";
+import { UseParentLayout } from "./layout/UseParentLayout";
+import { isDefined } from "../util/isDefined";
+
+let currentInstance: any = null;
+
+class FunctionalComponent extends PureContainer {
+   declare childrenFactory: (props: any) => any;
+   declare props: any;
+
+   initInstance(context: any, instance: any) {
+      instance.store = instance.parentStore;
+      this.clear();
+      currentInstance = instance;
+      this.add(this.childrenFactory(this.props));
+      instance.content = this.layout ? this.layout.items : this.items;
+      this.clear();
+      currentInstance = null;
+   }
+
+   explore(context: any, instance: any) {
+      if (this.layout) this.layout.items = instance.content;
+      else this.items = instance.content;
+      this.exploreItems(context, instance, instance.content);
+      if (instance.computables) {
+         instance.computables.forEach((cb: any) => cb(instance.store.getData()));
+      }
+   }
+}
+
+export function createFunctionalComponent(factory: any) {
+   if (isComponentFactory(factory)) return factory;
+
+   return createComponentFactory(factory, (props: any = {}) => {
+      let innerProps = flattenProps(props);
+      delete innerProps.visible;
+      delete innerProps.if;
+      delete innerProps.controller;
+      delete innerProps.layout;
+      delete innerProps.outerLayout;
+      delete innerProps.putInto;
+      delete innerProps.contentFor;
+      delete innerProps.jsxAttributes;
+      delete innerProps.$type;
+      delete innerProps.vdomKey;
+
+      return {
+         type: FunctionalComponent,
+         visible: isDefined(props.if) ? props.if : isDefined(props.visible) ? props.visible : true,
+         layout: props.layout || UseParentLayout,
+         controller: props.controller,
+         outerLayout: props.outerLayout,
+         putInto: props.contentFor || props.putInto,
+         vdomKey: props.vdomKey,
+         childrenFactory: factory,
+         props: innerProps,
+      };
+   });
+}
+
+export function getCurrentInstance() {
+   return currentInstance;
+}

package/src/ui/index.ts

@@ -1,45 +1,45 @@
-export * from "./Prop";
-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 "./Prop";
+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 };

package/src/ui/layout/Content.ts

@@ -1,30 +1,30 @@
-import { Widget } from "../Widget";
-import { PureContainerBase, PureContainerConfig } from "../PureContainer";
-import { Instance } from "../Instance";
-
-export interface ContentConfig extends PureContainerConfig {
-   /** Placeholder name where the content is rendered. */
-   name?: string;
-
-   /** Placeholder name where the content is rendered. */
-   for?: string;
-}
-
-export class Content extends PureContainerBase<ContentConfig, Instance> {
-   declare name?: string;
-   declare for?: string;
-
-   constructor(config?: ContentConfig) {
-      super(config);
-   }
-
-   init(): void {
-      super.init();
-      if (!this.putInto) this.putInto = this.for || this.name;
-   }
-}
-
-Content.prototype.name = "body";
-Content.prototype.isContent = true;
-
-Widget.alias("content", Content);
+import { Widget } from "../Widget";
+import { PureContainerBase, PureContainerConfig } from "../PureContainer";
+import { Instance } from "../Instance";
+
+export interface ContentConfig extends PureContainerConfig {
+   /** Placeholder name where the content is rendered. */
+   name?: string;
+
+   /** Placeholder name where the content is rendered. */
+   for?: string;
+}
+
+export class Content extends PureContainerBase<ContentConfig, Instance> {
+   declare name?: string;
+   declare for?: string;
+
+   constructor(config?: ContentConfig) {
+      super(config);
+   }
+
+   init(): void {
+      super.init();
+      if (!this.putInto) this.putInto = this.for || this.name;
+   }
+}
+
+Content.prototype.name = "body";
+Content.prototype.isContent = true;
+
+Widget.alias("content", Content);

package/src/ui/layout/FirstVisibleChildLayout.ts

@@ -1,60 +1,60 @@
-import { PureContainerConfig } from "./../PureContainer";
-import { Instance } from "../Instance";
-import { PureContainer } from "../PureContainer";
-import { RenderingContext } from "../RenderingContext";
-
-function isVisibleDeep(instance: Instance): boolean {
-   if (instance.visible && (!instance.widget.isPureContainer || !instance.widget.useParentLayout)) return true;
-   if (instance.children) {
-      for (let i = 0; i < instance.children.length; i++) if (isVisibleDeep(instance.children[i])) return true;
-   }
-   return false;
-}
-
-class FirstVisibleChildItem extends PureContainer {
-   constructor(config: PureContainerConfig) {
-      super(config);
-   }
-
-   checkVisible(context: RenderingContext, instance: any, data: any): boolean {
-      if (instance.parent.firstVisibleChild) return false;
-      return super.checkVisible(context, instance, data);
-   }
-
-   explore(context: RenderingContext, instance: any): void {
-      if (instance.parent.firstVisibleChild) return;
-      super.explore(context, instance);
-   }
-
-   exploreCleanup(context: RenderingContext, instance: any): void {
-      if (instance.parent.firstVisibleChild) return;
-      if (isVisibleDeep(instance)) instance.parent.firstVisibleChild = instance;
-   }
-
-   render(context: RenderingContext, instance: any, key: any): any {
-      if (instance.parent.firstVisibleChild != instance) return null;
-      return super.render(context, instance, key);
-   }
-}
-
-FirstVisibleChildItem.prototype.useParentLayout = true;
-
-export class FirstVisibleChildLayout extends PureContainer {
-   explore(context: RenderingContext, instance: any): void {
-      instance.firstVisibleChild = null;
-      super.explore(context, instance);
-   }
-
-   exploreCleanup(context: RenderingContext, instance: any): void {
-      let { children, firstVisibleChild } = instance;
-      if (children) {
-         for (let i = 0; i < children.length; i++) if (children[i] != firstVisibleChild) children[i].destroy();
-      }
-      instance.children = [];
-      if (firstVisibleChild) instance.children.push(firstVisibleChild);
-   }
-
-   wrapItem(item: any): any {
-      return item instanceof FirstVisibleChildItem ? item : FirstVisibleChildItem.create({ items: item });
-   }
-}
+import { PureContainerConfig } from "./../PureContainer";
+import { Instance } from "../Instance";
+import { PureContainer } from "../PureContainer";
+import { RenderingContext } from "../RenderingContext";
+
+function isVisibleDeep(instance: Instance): boolean {
+   if (instance.visible && (!instance.widget.isPureContainer || !instance.widget.useParentLayout)) return true;
+   if (instance.children) {
+      for (let i = 0; i < instance.children.length; i++) if (isVisibleDeep(instance.children[i])) return true;
+   }
+   return false;
+}
+
+class FirstVisibleChildItem extends PureContainer {
+   constructor(config: PureContainerConfig) {
+      super(config);
+   }
+
+   checkVisible(context: RenderingContext, instance: any, data: any): boolean {
+      if (instance.parent.firstVisibleChild) return false;
+      return super.checkVisible(context, instance, data);
+   }
+
+   explore(context: RenderingContext, instance: any): void {
+      if (instance.parent.firstVisibleChild) return;
+      super.explore(context, instance);
+   }
+
+   exploreCleanup(context: RenderingContext, instance: any): void {
+      if (instance.parent.firstVisibleChild) return;
+      if (isVisibleDeep(instance)) instance.parent.firstVisibleChild = instance;
+   }
+
+   render(context: RenderingContext, instance: any, key: any): any {
+      if (instance.parent.firstVisibleChild != instance) return null;
+      return super.render(context, instance, key);
+   }
+}
+
+FirstVisibleChildItem.prototype.useParentLayout = true;
+
+export class FirstVisibleChildLayout extends PureContainer {
+   explore(context: RenderingContext, instance: any): void {
+      instance.firstVisibleChild = null;
+      super.explore(context, instance);
+   }
+
+   exploreCleanup(context: RenderingContext, instance: any): void {
+      let { children, firstVisibleChild } = instance;
+      if (children) {
+         for (let i = 0; i < children.length; i++) if (children[i] != firstVisibleChild) children[i].destroy();
+      }
+      instance.children = [];
+      if (firstVisibleChild) instance.children.push(firstVisibleChild);
+   }
+
+   wrapItem(item: any): any {
+      return item instanceof FirstVisibleChildItem ? item : FirstVisibleChildItem.create({ items: item });
+   }
+}