cx 26.4.0 → 26.4.1

package/src/ui/app/History.ts

@@ -1,147 +1,147 @@
-import { Url } from "./Url";
-import { batchUpdatesAndNotify } from "../batchUpdates";
-import { SubscriberList } from "../../util/SubscriberList";
-import { View } from "../../data/View";
-
-interface Transition {
-   url: string;
-   state: any;
-   title: string | null;
-   replace: boolean;
-   completed?: boolean;
-}
-
-type NavigateConfirmationCallback = (state: any) => boolean | Promise<boolean>;
-
-let last = 0;
-let next = 1;
-let transitions: Record<number, Transition> = {};
-let subscribers: SubscriberList | null = null;
-let reload = false;
-let navigateConfirmationCallback: NavigateConfirmationCallback | null = null;
-let permanentNavigateConfirmation = false;
-
-export class History {
-   static store: View;
-   static urlBinding: string;
-   static hashBinding?: string;
-
-   static connect(store: View, urlBinding: string, hashBinding?: string): void {
-      this.store = store;
-      this.urlBinding = urlBinding;
-      this.hashBinding = hashBinding;
-      this.updateStore();
-      window.onpopstate = () => {
-         this.updateStore();
-      };
-   }
-
-   static pushState(state: any, title: string | null, url: string): boolean {
-      return this.confirmAndNavigate(state, title, url);
-   }
-
-   static replaceState(state: any, title: string | null, url: string): boolean {
-      return this.navigate(state, title, url, true);
-   }
-
-   static reloadOnNextChange(): void {
-      reload = true;
-   }
-
-   static addNavigateConfirmation(
-      callback: NavigateConfirmationCallback,
-      permanent = false,
-   ): void {
-      navigateConfirmationCallback = callback;
-      permanentNavigateConfirmation = permanent;
-   }
-
-   static confirm(continueCallback: () => boolean, state: any): boolean {
-      if (!navigateConfirmationCallback) return continueCallback();
-
-      let result = navigateConfirmationCallback(state);
-      Promise.resolve(result).then((value) => {
-         if (value) {
-            if (!permanentNavigateConfirmation)
-               navigateConfirmationCallback = null;
-            continueCallback();
-         }
-      });
-
-      return false;
-   }
-
-   static confirmAndNavigate(
-      state: any,
-      title: string | null,
-      url: string,
-      replace?: boolean,
-   ): boolean {
-      return this.confirm(() => this.navigate(state, title, url, replace), url);
-   }
-
-   static navigate(
-      state: any,
-      title: string | null,
-      url: string,
-      replace = false,
-   ): boolean {
-      url = Url.resolve(url);
-
-      if (!window.history.pushState || reload || !this.store) {
-         window.location[replace ? "replace" : "assign"](url);
-         return true;
-      }
-
-      let transition: Transition | undefined;
-      let changed = false;
-      batchUpdatesAndNotify(
-         () => {
-            changed = this.updateStore(url);
-            if (changed)
-               transitions[++last] = transition = {
-                  url,
-                  state,
-                  title,
-                  replace,
-               };
-         },
-         () => {
-            if (transition) transition.completed = true;
-
-            //update history once the page is rendered and the title is set
-            while (transitions[next] && transitions[next].completed) {
-               let tr = transitions[next];
-               delete transitions[next];
-               next++;
-               if (tr.replace) {
-                  window.history.replaceState(tr.state, tr.title ?? "", tr.url);
-                  if (subscribers) subscribers.notify(tr.url, "replaceState");
-               } else {
-                  window.history.pushState(tr.state, tr.title ?? "", tr.url);
-                  if (subscribers) subscribers.notify(tr.url, "pushState");
-               }
-            }
-         },
-      );
-
-      return changed;
-   }
-
-   static updateStore(href?: string): boolean {
-      let url = Url.unresolve(href ?? document?.location.href ?? "");
-      let hash: string | null = null;
-      let hashIndex = url.indexOf("#");
-      if (hashIndex !== -1) {
-         hash = url.substring(hashIndex);
-         url = url.substring(0, hashIndex);
-      }
-      if (this.hashBinding) this.store.set(this.hashBinding, hash);
-      return this.store.set(this.urlBinding, url);
-   }
-
-   static subscribe(callback: (url: string, op: string) => void): () => void {
-      if (!subscribers) subscribers = new SubscriberList();
-      return subscribers.subscribe(callback);
-   }
-}
+import { Url } from "./Url";
+import { batchUpdatesAndNotify } from "../batchUpdates";
+import { SubscriberList } from "../../util/SubscriberList";
+import { View } from "../../data/View";
+
+interface Transition {
+   url: string;
+   state: any;
+   title: string | null;
+   replace: boolean;
+   completed?: boolean;
+}
+
+type NavigateConfirmationCallback = (state: any) => boolean | Promise<boolean>;
+
+let last = 0;
+let next = 1;
+let transitions: Record<number, Transition> = {};
+let subscribers: SubscriberList | null = null;
+let reload = false;
+let navigateConfirmationCallback: NavigateConfirmationCallback | null = null;
+let permanentNavigateConfirmation = false;
+
+export class History {
+   static store: View;
+   static urlBinding: string;
+   static hashBinding?: string;
+
+   static connect(store: View, urlBinding: string, hashBinding?: string): void {
+      this.store = store;
+      this.urlBinding = urlBinding;
+      this.hashBinding = hashBinding;
+      this.updateStore();
+      window.onpopstate = () => {
+         this.updateStore();
+      };
+   }
+
+   static pushState(state: any, title: string | null, url: string): boolean {
+      return this.confirmAndNavigate(state, title, url);
+   }
+
+   static replaceState(state: any, title: string | null, url: string): boolean {
+      return this.navigate(state, title, url, true);
+   }
+
+   static reloadOnNextChange(): void {
+      reload = true;
+   }
+
+   static addNavigateConfirmation(
+      callback: NavigateConfirmationCallback,
+      permanent = false,
+   ): void {
+      navigateConfirmationCallback = callback;
+      permanentNavigateConfirmation = permanent;
+   }
+
+   static confirm(continueCallback: () => boolean, state: any): boolean {
+      if (!navigateConfirmationCallback) return continueCallback();
+
+      let result = navigateConfirmationCallback(state);
+      Promise.resolve(result).then((value) => {
+         if (value) {
+            if (!permanentNavigateConfirmation)
+               navigateConfirmationCallback = null;
+            continueCallback();
+         }
+      });
+
+      return false;
+   }
+
+   static confirmAndNavigate(
+      state: any,
+      title: string | null,
+      url: string,
+      replace?: boolean,
+   ): boolean {
+      return this.confirm(() => this.navigate(state, title, url, replace), url);
+   }
+
+   static navigate(
+      state: any,
+      title: string | null,
+      url: string,
+      replace = false,
+   ): boolean {
+      url = Url.resolve(url);
+
+      if (!window.history.pushState || reload || !this.store) {
+         window.location[replace ? "replace" : "assign"](url);
+         return true;
+      }
+
+      let transition: Transition | undefined;
+      let changed = false;
+      batchUpdatesAndNotify(
+         () => {
+            changed = this.updateStore(url);
+            if (changed)
+               transitions[++last] = transition = {
+                  url,
+                  state,
+                  title,
+                  replace,
+               };
+         },
+         () => {
+            if (transition) transition.completed = true;
+
+            //update history once the page is rendered and the title is set
+            while (transitions[next] && transitions[next].completed) {
+               let tr = transitions[next];
+               delete transitions[next];
+               next++;
+               if (tr.replace) {
+                  window.history.replaceState(tr.state, tr.title ?? "", tr.url);
+                  if (subscribers) subscribers.notify(tr.url, "replaceState");
+               } else {
+                  window.history.pushState(tr.state, tr.title ?? "", tr.url);
+                  if (subscribers) subscribers.notify(tr.url, "pushState");
+               }
+            }
+         },
+      );
+
+      return changed;
+   }
+
+   static updateStore(href?: string): boolean {
+      let url = Url.unresolve(href ?? document?.location.href ?? "");
+      let hash: string | null = null;
+      let hashIndex = url.indexOf("#");
+      if (hashIndex !== -1) {
+         hash = url.substring(hashIndex);
+         url = url.substring(0, hashIndex);
+      }
+      if (this.hashBinding) this.store.set(this.hashBinding, hash);
+      return this.store.set(this.urlBinding, url);
+   }
+
+   static subscribe(callback: (url: string, op: string) => void): () => void {
+      if (!subscribers) subscribers = new SubscriberList();
+      return subscribers.subscribe(callback);
+   }
+}

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

@@ -1,50 +1,50 @@
-import { Url } from "./Url";
-import Route from "route-parser-ts";
-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-ts";
+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";
+