cx 24.4.2 → 24.4.3

package/src/ui/app/Url.js

@@ -1,103 +1,103 @@
-export class Url {
-   static resolve(path) {
-      return path.replace('~/', this.base);
-   }
-
-   static absolute(path) {
-      return path.replace('~/', this.absoluteBase);
-   }
-
-   static unresolve(path) {
-      if (path.indexOf('~/') == 0)
-         return path;
-
-      var 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() {
-      return this.absoluteBase;
-   }
-
-   static isLocal(url) {
-      var absBase = this.getAbsoluteBase();
-      return url.indexOf('~/') == 0 || url.indexOf(absBase) == 0 || url.indexOf(this.base) == 0;
-   }
-
-   static setBase(base) {
-      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() {
-      if (typeof window == 'undefined')
-         return '';
-      return window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port : '');
-   }
-
-   static getBaseFromScriptSrc(src, scriptPath) {
-      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) {
-      var scripts = document.getElementsByTagName('script'),
-         base;
-
-      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) {
-   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 resolve(path) {
+      return path.replace('~/', this.base);
+   }
+
+   static absolute(path) {
+      return path.replace('~/', this.absoluteBase);
+   }
+
+   static unresolve(path) {
+      if (path.indexOf('~/') == 0)
+         return path;
+
+      var 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() {
+      return this.absoluteBase;
+   }
+
+   static isLocal(url) {
+      var absBase = this.getAbsoluteBase();
+      return url.indexOf('~/') == 0 || url.indexOf(absBase) == 0 || url.indexOf(this.base) == 0;
+   }
+
+   static setBase(base) {
+      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() {
+      if (typeof window == 'undefined')
+         return '';
+      return window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port : '');
+   }
+
+   static getBaseFromScriptSrc(src, scriptPath) {
+      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) {
+      var scripts = document.getElementsByTagName('script'),
+         base;
+
+      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) {
+   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/Url.spec.js

@@ -1,51 +1,51 @@
-import { Url } from "./Url";
-import Route from "route-parser";
-
-var assert = require("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);
-      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";
+
+var assert = require("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);
+      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/index.d.ts

@@ -1,4 +1,4 @@
-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/index.js

@@ -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.d.ts

@@ -1,4 +1,4 @@
-import { View } from '../../data/View';
-import { Instance } from '../Instance';
-
+import { View } from '../../data/View';
+import { Instance } from '../Instance';
+
 export function startAppLoop(parentDOMElement: Element, storeOrInstance: View | Instance, widget?: any, options?: any);

package/src/ui/app/startAppLoop.js

@@ -1,58 +1,58 @@
-import { Widget, VDOM } from '../Widget';
-import { Store } from '../../data/Store';
-import { Cx } from '../Cx';
-
-export function startAppLoop(parentDOMElement, storeOrInstance, widget, options = {}) {
-
-   if (!parentDOMElement || parentDOMElement.nodeType !== 1)
-      throw new Error('First argument to startAppLoop should be a valid DOM element.');
-
-   let store, instance, parentInstance;
-
-   if (!storeOrInstance)
-      storeOrInstance = new Store();
-
-   if (storeOrInstance.notify)
-      store = storeOrInstance;
-   else if (storeOrInstance.getChild) {
-      if (storeOrInstance.widget === widget)
-         instance = storeOrInstance;
-      else
-         parentInstance = storeOrInstance;
-   }
-   else
-      throw new Error('Second argument to startAppLoop should be either of type Store or Instance');
-
-   let root = <Cx
-      store={store}
-      widget={widget}
-      instance={instance}
-      parentInstance={parentInstance}
-      options={options}
-      subscribe
-   />;
-
-   VDOM.DOM.render(root, parentDOMElement);
-   let stopped = false;
-
-   return function () {
-      if (stopped)
-         return;
-
-      stopped = true;
-
-      if (!options.destroyDelay)
-         destroy(parentDOMElement, options);
-      else {
-         setTimeout(() => {
-            destroy(parentDOMElement, options);
-         }, options.destroyDelay)
-      }
-   }
-}
-
-function destroy(parentDOMElement, options) {
-   VDOM.DOM.unmountComponentAtNode(parentDOMElement);
-   if (options.removeParentDOMElement && parentDOMElement.parentNode)
-      parentDOMElement.parentNode.removeChild(parentDOMElement);
+import { Widget, VDOM } from '../Widget';
+import { Store } from '../../data/Store';
+import { Cx } from '../Cx';
+
+export function startAppLoop(parentDOMElement, storeOrInstance, widget, options = {}) {
+
+   if (!parentDOMElement || parentDOMElement.nodeType !== 1)
+      throw new Error('First argument to startAppLoop should be a valid DOM element.');
+
+   let store, instance, parentInstance;
+
+   if (!storeOrInstance)
+      storeOrInstance = new Store();
+
+   if (storeOrInstance.notify)
+      store = storeOrInstance;
+   else if (storeOrInstance.getChild) {
+      if (storeOrInstance.widget === widget)
+         instance = storeOrInstance;
+      else
+         parentInstance = storeOrInstance;
+   }
+   else
+      throw new Error('Second argument to startAppLoop should be either of type Store or Instance');
+
+   let root = <Cx
+      store={store}
+      widget={widget}
+      instance={instance}
+      parentInstance={parentInstance}
+      options={options}
+      subscribe
+   />;
+
+   VDOM.DOM.render(root, parentDOMElement);
+   let stopped = false;
+
+   return function () {
+      if (stopped)
+         return;
+
+      stopped = true;
+
+      if (!options.destroyDelay)
+         destroy(parentDOMElement, options);
+      else {
+         setTimeout(() => {
+            destroy(parentDOMElement, options);
+         }, options.destroyDelay)
+      }
+   }
+}
+
+function destroy(parentDOMElement, options) {
+   VDOM.DOM.unmountComponentAtNode(parentDOMElement);
+   if (options.removeParentDOMElement && parentDOMElement.parentNode)
+      parentDOMElement.parentNode.removeChild(parentDOMElement);
 }

package/src/ui/app/startHotAppLoop.d.ts

@@ -1,7 +1,7 @@
-import { View } from '../../data/View';
-import { Instance } from '../Instance';
-
-/**
-   Starts the app loop with hot module reloading. Whenever the given module is updated, the app state is preserved.
- */
+import { View } from '../../data/View';
+import { Instance } from '../Instance';
+
+/**
+   Starts the app loop with hot module reloading. Whenever the given module is updated, the app state is preserved.
+ */
 export function startHotAppLoop(appModule: any, parentDOMElement: Element, storeOrInstance: View | Instance, widget?: any, options?: any);

package/src/ui/app/startHotAppLoop.js

@@ -1,25 +1,25 @@
-import { startAppLoop } from "./startAppLoop";
-import { Widget } from "../Widget";
-
-export function startHotAppLoop(appModule, element, store, widgets, options) {
-   let stop;
-   //webpack (HMR)
-   if (appModule.hot) {
-      // accept itself
-      appModule.hot.accept();
-
-      // remember data on dispose
-      appModule.hot.dispose(function (data) {
-         data.state = store.getData();
-         if (stop) stop();
-      });
-
-      //apply data on hot replace
-      if (appModule.hot.data) store.load(appModule.hot.data.state);
-   }
-
-   Widget.resetCounter();
-
-   //app loop
-   return (stop = startAppLoop(element, store, widgets, options));
-}
+import { startAppLoop } from "./startAppLoop";
+import { Widget } from "../Widget";
+
+export function startHotAppLoop(appModule, element, store, widgets, options) {
+   let stop;
+   //webpack (HMR)
+   if (appModule.hot) {
+      // accept itself
+      appModule.hot.accept();
+
+      // remember data on dispose
+      appModule.hot.dispose(function (data) {
+         data.state = store.getData();
+         if (stop) stop();
+      });
+
+      //apply data on hot replace
+      if (appModule.hot.data) store.load(appModule.hot.data.state);
+   }
+
+   Widget.resetCounter();
+
+   //app loop
+   return (stop = startAppLoop(element, store, widgets, options));
+}

package/src/ui/batchUpdates.d.ts

@@ -1,11 +1,11 @@
-import * as Cx from '../core';
-
-export function batchUpdates(callback: () => void) : void;
-
-export function isBatchingUpdates() : boolean;
-
-export function notifyBatchedUpdateStarting() : void;
-
-export function notifyBatchedUpdateCompleted() : void;
-
+import * as Cx from '../core';
+
+export function batchUpdates(callback: () => void) : void;
+
+export function isBatchingUpdates() : boolean;
+
+export function notifyBatchedUpdateStarting() : void;
+
+export function notifyBatchedUpdateCompleted() : void;
+
 export function batchUpdatesAndNotify(callback: () => void, notifyCallback: () => void, timeout?: number) : void;