cx 26.1.3 → 26.1.4

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/Url.ts

@@ -1,102 +1,102 @@
-export class Url {
-   static base: string;
-   static absoluteBase: string;
-
-   static resolve(path: string): string {
-      return path.replace("~/", this.base);
-   }
-
-   static absolute(path: string): string {
-      return path.replace("~/", this.absoluteBase);
-   }
-
-   static unresolve(path: string): string {
-      if (path.indexOf("~/") == 0) return path;
-
-      const absBase = this.absoluteBase || "";
-
-      //handle paths like /app and /app/
-      if (path.length == absBase.length - 1 && absBase == path + "/") return "~/";
-
-      if (path.indexOf(absBase) == 0) return "~/" + path.substring(absBase.length);
-
-      return "~/" + path.substring(this.base.length);
-   }
-
-   static getAbsoluteBase(): string {
-      return this.absoluteBase;
-   }
-
-   static isLocal(url: string): boolean {
-      const absBase = this.getAbsoluteBase();
-      return url.indexOf("~/") == 0 || url.indexOf(absBase) == 0 || url.indexOf(this.base) == 0;
-   }
-
-   static setBase(base: string): void {
-      if (!base || base[base.length - 1] != "/") base += "/";
-      this.base = base;
-      if (typeof window != "undefined")
-         this.absoluteBase = window.location.protocol + "//" + window.location.host + this.base;
-   }
-
-   static getOrigin(): string {
-      if (typeof window == "undefined") return "";
-      return (
-         window.location.protocol +
-         "//" +
-         window.location.hostname +
-         (window.location.port ? ":" + window.location.port : "")
-      );
-   }
-
-   static getBaseFromScriptSrc(src: string, scriptPath: string | RegExp): string | false {
-      if (!(scriptPath instanceof RegExp)) scriptPath = getBasePathRegex(scriptPath);
-
-      let index = src.search(scriptPath);
-      if (index == -1) return false;
-
-      let origin = this.getOrigin();
-      return src.substring(src.indexOf(origin) == 0 ? origin.length : 0, index);
-   }
-
-   static setBaseFromScript(scriptPath: string | RegExp): void {
-      const scripts = document.getElementsByTagName("script");
-      let base: string | false;
-
-      if (!(scriptPath instanceof RegExp)) scriptPath = getBasePathRegex(scriptPath);
-
-      for (let i = 0; i < scripts.length; i++) {
-         base = this.getBaseFromScriptSrc(scripts[i].src, scriptPath);
-         if (base) {
-            this.setBase(base);
-            return;
-         }
-      }
-
-      throw new Error(`Could not resolve url base from script matching '${scriptPath}'.`);
-   }
-}
-
-Url.setBase('/');
-
-function getBasePathRegex(str: string): RegExp {
-   let regex = "";
-   let start = 0;
-   if (str.indexOf("~/") == 0) start = 2;
-
-   for (let i = start; i < str.length; i++) {
-      switch (str[i]) {
-         case ".":
-            regex += "\\.";
-            break;
-
-         case "*":
-            regex += ".*";
-            break;
-
-         default:
-            regex += str[i];
-      }
-   }
-   return new RegExp(regex + "(\\?.*)?$", "i");
-}
+export class Url {
+   static base: string;
+   static absoluteBase: string;
+
+   static resolve(path: string): string {
+      return path.replace("~/", this.base);
+   }
+
+   static absolute(path: string): string {
+      return path.replace("~/", this.absoluteBase);
+   }
+
+   static unresolve(path: string): string {
+      if (path.indexOf("~/") == 0) return path;
+
+      const absBase = this.absoluteBase || "";
+
+      //handle paths like /app and /app/
+      if (path.length == absBase.length - 1 && absBase == path + "/") return "~/";
+
+      if (path.indexOf(absBase) == 0) return "~/" + path.substring(absBase.length);
+
+      return "~/" + path.substring(this.base.length);
+   }
+
+   static getAbsoluteBase(): string {
+      return this.absoluteBase;
+   }
+
+   static isLocal(url: string): boolean {
+      const absBase = this.getAbsoluteBase();
+      return url.indexOf("~/") == 0 || url.indexOf(absBase) == 0 || url.indexOf(this.base) == 0;
+   }
+
+   static setBase(base: string): void {
+      if (!base || base[base.length - 1] != "/") base += "/";
+      this.base = base;
+      if (typeof window != "undefined")
+         this.absoluteBase = window.location.protocol + "//" + window.location.host + this.base;
+   }
+
+   static getOrigin(): string {
+      if (typeof window == "undefined") return "";
+      return (
+         window.location.protocol +
+         "//" +
+         window.location.hostname +
+         (window.location.port ? ":" + window.location.port : "")
+      );
+   }
+
+   static getBaseFromScriptSrc(src: string, scriptPath: string | RegExp): string | false {
+      if (!(scriptPath instanceof RegExp)) scriptPath = getBasePathRegex(scriptPath);
+
+      let index = src.search(scriptPath);
+      if (index == -1) return false;
+
+      let origin = this.getOrigin();
+      return src.substring(src.indexOf(origin) == 0 ? origin.length : 0, index);
+   }
+
+   static setBaseFromScript(scriptPath: string | RegExp): void {
+      const scripts = document.getElementsByTagName("script");
+      let base: string | false;
+
+      if (!(scriptPath instanceof RegExp)) scriptPath = getBasePathRegex(scriptPath);
+
+      for (let i = 0; i < scripts.length; i++) {
+         base = this.getBaseFromScriptSrc(scripts[i].src, scriptPath);
+         if (base) {
+            this.setBase(base);
+            return;
+         }
+      }
+
+      throw new Error(`Could not resolve url base from script matching '${scriptPath}'.`);
+   }
+}
+
+Url.setBase('/');
+
+function getBasePathRegex(str: string): RegExp {
+   let regex = "";
+   let start = 0;
+   if (str.indexOf("~/") == 0) start = 2;
+
+   for (let i = start; i < str.length; i++) {
+      switch (str[i]) {
+         case ".":
+            regex += "\\.";
+            break;
+
+         case "*":
+            regex += ".*";
+            break;
+
+         default:
+            regex += str[i];
+      }
+   }
+   return new RegExp(regex + "(\\?.*)?$", "i");
+}

package/src/ui/app/index.ts

@@ -1,5 +1,5 @@
-export * from './startAppLoop';
-export * from './History';
-export * from './Url';
-export * from "./startHotAppLoop";
-
+export * from './startAppLoop';
+export * from './History';
+export * from './Url';
+export * from "./startHotAppLoop";
+

package/src/ui/app/startAppLoop.tsx

@@ -1,71 +1,71 @@
-/** @jsxImportSource react */
-
-import type { Root } from "cx-react";
-import { Widget, VDOM } 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;
-   removeParentDOMElement?: boolean;
-   [key: string]: any;
-}
-
-export function startAppLoop(
-   parentDOMElement: HTMLElement,
-   storeOrInstance?: Store | Instance,
-   widget?: Create<typeof Widget> | Create<typeof Widget>[],
-   options: StartAppLoopOptions = {},
-): () => void {
-   if (!parentDOMElement || parentDOMElement.nodeType !== 1)
-      throw new Error("First argument to startAppLoop should be a valid DOM element.");
-
-   let store: Store | undefined;
-   let instance: Instance | undefined;
-   let parentInstance: Instance | undefined;
-
-   if (!storeOrInstance) storeOrInstance = new Store();
-
-   if ((storeOrInstance as any).notify) store = storeOrInstance as Store;
-   else if ((storeOrInstance as any).getChild) {
-      if ((storeOrInstance as any).widget === widget) instance = storeOrInstance as Instance;
-      else parentInstance = storeOrInstance as Instance;
-   } else throw new Error("Second argument to startAppLoop should be either of type Store or Instance");
-
-   let content = (
-      <Cx
-         store={store}
-         widget={widget}
-         instance={instance}
-         parentInstance={parentInstance}
-         options={options}
-         subscribe
-      />
-   ) as any;
-
-   let root = VDOM.DOM.createRoot(parentDOMElement);
-   root.render(content);
-
-   let stopped = false;
-
-   return function () {
-      if (stopped) return;
-
-      stopped = true;
-
-      if (!options.destroyDelay) destroy(parentDOMElement, options, root);
-      else {
-         setTimeout(() => {
-            destroy(parentDOMElement, options, root);
-         }, options.destroyDelay);
-      }
-   };
-}
-
-function destroy(parentDOMElement: HTMLElement, options: StartAppLoopOptions, root: Root): void {
-   if (root) root.unmount();
-   if (options.removeParentDOMElement && parentDOMElement.parentNode)
-      parentDOMElement.parentNode.removeChild(parentDOMElement);
-}
+/** @jsxImportSource react */
+
+import type { Root } from "cx-react";
+import { Widget, VDOM } 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;
+   removeParentDOMElement?: boolean;
+   [key: string]: any;
+}
+
+export function startAppLoop(
+   parentDOMElement: HTMLElement,
+   storeOrInstance?: Store | Instance,
+   widget?: Create<typeof Widget> | Create<typeof Widget>[],
+   options: StartAppLoopOptions = {},
+): () => void {
+   if (!parentDOMElement || parentDOMElement.nodeType !== 1)
+      throw new Error("First argument to startAppLoop should be a valid DOM element.");
+
+   let store: Store | undefined;
+   let instance: Instance | undefined;
+   let parentInstance: Instance | undefined;
+
+   if (!storeOrInstance) storeOrInstance = new Store();
+
+   if ((storeOrInstance as any).notify) store = storeOrInstance as Store;
+   else if ((storeOrInstance as any).getChild) {
+      if ((storeOrInstance as any).widget === widget) instance = storeOrInstance as Instance;
+      else parentInstance = storeOrInstance as Instance;
+   } else throw new Error("Second argument to startAppLoop should be either of type Store or Instance");
+
+   let content = (
+      <Cx
+         store={store}
+         widget={widget}
+         instance={instance}
+         parentInstance={parentInstance}
+         options={options}
+         subscribe
+      />
+   ) as any;
+
+   let root = VDOM.DOM.createRoot(parentDOMElement);
+   root.render(content);
+
+   let stopped = false;
+
+   return function () {
+      if (stopped) return;
+
+      stopped = true;
+
+      if (!options.destroyDelay) destroy(parentDOMElement, options, root);
+      else {
+         setTimeout(() => {
+            destroy(parentDOMElement, options, root);
+         }, options.destroyDelay);
+      }
+   };
+}
+
+function destroy(parentDOMElement: HTMLElement, options: StartAppLoopOptions, root: Root): void {
+   if (root) root.unmount();
+   if (options.removeParentDOMElement && parentDOMElement.parentNode)
+      parentDOMElement.parentNode.removeChild(parentDOMElement);
+}

package/src/ui/app/startHotAppLoop.ts

@@ -1,41 +1,41 @@
-import { startAppLoop, StartAppLoopOptions } from "./startAppLoop";
-import { Widget, WidgetConfig } from "../Widget";
-import { Store } from "../../data/Store";
-import { Create } from "../../util/Component";
-
-export interface HotModule {
-   hot?: {
-      accept: () => void;
-      dispose: (callback: (data: any) => void) => void;
-      data?: any;
-   };
-}
-
-export function startHotAppLoop(
-   appModule: HotModule,
-   element: HTMLElement,
-   store: Store,
-   widgets: Create<typeof Widget> | Create<typeof Widget>[],
-   options: StartAppLoopOptions = {},
-): () => void {
-   let stop: (() => void) | undefined;
-   //webpack (HMR)
-   if (appModule.hot) {
-      // accept itself
-      appModule.hot.accept();
-
-      // remember data on dispose
-      appModule.hot.dispose(function (data: any) {
-         data.state = store.getData();
-         if (stop) stop();
-      });
-
-      //apply data on hot replace
-      if (appModule.hot.data?.state) store.load(appModule.hot.data.state);
-   }
-
-   Widget.resetCounter();
-
-   //app loop
-   return (stop = startAppLoop(element, store, widgets, options));
-}
+import { startAppLoop, StartAppLoopOptions } from "./startAppLoop";
+import { Widget, WidgetConfig } from "../Widget";
+import { Store } from "../../data/Store";
+import { Create } from "../../util/Component";
+
+export interface HotModule {
+   hot?: {
+      accept: () => void;
+      dispose: (callback: (data: any) => void) => void;
+      data?: any;
+   };
+}
+
+export function startHotAppLoop(
+   appModule: HotModule,
+   element: HTMLElement,
+   store: Store,
+   widgets: Create<typeof Widget> | Create<typeof Widget>[],
+   options: StartAppLoopOptions = {},
+): () => void {
+   let stop: (() => void) | undefined;
+   //webpack (HMR)
+   if (appModule.hot) {
+      // accept itself
+      appModule.hot.accept();
+
+      // remember data on dispose
+      appModule.hot.dispose(function (data: any) {
+         data.state = store.getData();
+         if (stop) stop();
+      });
+
+      //apply data on hot replace
+      if (appModule.hot.data?.state) store.load(appModule.hot.data.state);
+   }
+
+   Widget.resetCounter();
+
+   //app loop
+   return (stop = startAppLoop(element, store, widgets, options));
+}