cx 24.4.1 → 24.4.2

package/src/data/ops/updateArray.js

@@ -1,24 +1,24 @@
-export function updateArray(array, updateCallback, itemFilter, removeFilter) {
-   
-   if (!array)
-      return array;
-   
-   let newArray = [];
-   let dirty = false;
-   
-   for (let index = 0; index < array.length; index++) {
-      let item = array[index];
-      if (removeFilter && removeFilter(item, index)) {
-         dirty = true;
-         continue;
-      }
-      if (!itemFilter || itemFilter(item, index)) {
-         let newItem = updateCallback(item, index);
-         newArray.push(newItem);
-         if (newItem !== item)
-            dirty = true;
-      } else
-         newArray.push(item);
-   }
-   return dirty ? newArray : array;
-}
+export function updateArray(array, updateCallback, itemFilter, removeFilter) {
+   
+   if (!array)
+      return array;
+   
+   let newArray = [];
+   let dirty = false;
+   
+   for (let index = 0; index < array.length; index++) {
+      let item = array[index];
+      if (removeFilter && removeFilter(item, index)) {
+         dirty = true;
+         continue;
+      }
+      if (!itemFilter || itemFilter(item, index)) {
+         let newItem = updateCallback(item, index);
+         newArray.push(newItem);
+         if (newItem !== item)
+            dirty = true;
+      } else
+         newArray.push(item);
+   }
+   return dirty ? newArray : array;
+}

package/src/data/ops/updateArray.spec.js

@@ -1,38 +1,38 @@
-import {Store} from '../Store';
-import {updateArray} from './updateArray';
-import assert from 'assert';
-
-describe('updateArray', function() {
-   it('updates all elements that satisfy criteria', function () {
-      let store = new Store({
-         data: {array: [1, 2, 3, 4, 5, 6]}
-      });
-
-      assert(store.update('array', updateArray, x => x + 1, x => x > 3));
-      assert.deepEqual(store.get('array'), [1, 2, 3, 5, 6, 7]);
-   });
-
-   it('does not modify data if not necessary', function () {
-      let array = [1, 2, 3, 4, 5, 6];
-      let store = new Store({
-         data: {array}
-      });
-
-      assert(false === store.update('array', updateArray, x => x + 1, x => x > 10));
-      assert(store.get('array') === array);
-   });
-
-   it('works with null or undefined', function () {
-      let store = new Store();
-      assert(false === store.update('array', updateArray, x => x + 1, x => x > 0));
-   });
-
-   it('can remove elements given the criteria', function () {
-      let store = new Store({
-         data: {array: [1, 2, 3, 4, 5, 6]}
-      });
-
-      assert(store.update('array', updateArray, x => x + 1, x => x > 3, x => x <= 3));
-      assert.deepEqual(store.get('array'), [5, 6, 7]);
-   });
-});
+import {Store} from '../Store';
+import {updateArray} from './updateArray';
+import assert from 'assert';
+
+describe('updateArray', function() {
+   it('updates all elements that satisfy criteria', function () {
+      let store = new Store({
+         data: {array: [1, 2, 3, 4, 5, 6]}
+      });
+
+      assert(store.update('array', updateArray, x => x + 1, x => x > 3));
+      assert.deepEqual(store.get('array'), [1, 2, 3, 5, 6, 7]);
+   });
+
+   it('does not modify data if not necessary', function () {
+      let array = [1, 2, 3, 4, 5, 6];
+      let store = new Store({
+         data: {array}
+      });
+
+      assert(false === store.update('array', updateArray, x => x + 1, x => x > 10));
+      assert(store.get('array') === array);
+   });
+
+   it('works with null or undefined', function () {
+      let store = new Store();
+      assert(false === store.update('array', updateArray, x => x + 1, x => x > 0));
+   });
+
+   it('can remove elements given the criteria', function () {
+      let store = new Store({
+         data: {array: [1, 2, 3, 4, 5, 6]}
+      });
+
+      assert(store.update('array', updateArray, x => x + 1, x => x > 3, x => x <= 3));
+      assert.deepEqual(store.get('array'), [5, 6, 7]);
+   });
+});

package/src/data/ops/updateTree.d.ts

@@ -1,7 +1,7 @@
-export function updateTree<T = any>(
-   array: T[],
-   updateCallback: (item?: T, index?: number) => T,
-   itemFilter?: (item?: T, index?: number) => boolean,
-   childrenField?: string,
-   removeFilter?: (item?: T, index?: number) => boolean
-): T[];
+export function updateTree<T = any>(
+   array: T[],
+   updateCallback: (item?: T, index?: number) => T,
+   itemFilter?: (item?: T, index?: number) => boolean,
+   childrenField?: string,
+   removeFilter?: (item?: T, index?: number) => boolean
+): T[];

package/src/data/ops/updateTree.js

@@ -1,25 +1,25 @@
-import { updateArray } from './updateArray';
-
-export function updateTree(array, updateCallback, itemFilter, childrenField, removeFilter) {
-   return updateArray(array, item => {
-      if (!itemFilter || itemFilter(item))
-         item = updateCallback(item);
-
-      let children = item[childrenField];
-      if (!Array.isArray(children))
-         return item;
-
-      let updatedChildren = updateTree(
-         children,
-         updateCallback,
-         itemFilter,
-         childrenField,
-         removeFilter
-      );
-
-      if (updatedChildren != children)
-         return { ...item, [childrenField]: updatedChildren };
-
-      return item;
-   }, null, removeFilter);
-}
+import { updateArray } from './updateArray';
+
+export function updateTree(array, updateCallback, itemFilter, childrenField, removeFilter) {
+   return updateArray(array, item => {
+      if (!itemFilter || itemFilter(item))
+         item = updateCallback(item);
+
+      let children = item[childrenField];
+      if (!Array.isArray(children))
+         return item;
+
+      let updatedChildren = updateTree(
+         children,
+         updateCallback,
+         itemFilter,
+         childrenField,
+         removeFilter
+      );
+
+      if (updatedChildren != children)
+         return { ...item, [childrenField]: updatedChildren };
+
+      return item;
+   }, null, removeFilter);
+}

package/src/data/ops/updateTree.spec.js

@@ -1,36 +1,36 @@
-import { Store } from '../Store';
-import { updateTree } from './updateTree';
-import assert from 'assert';
-
-describe('updateTree', function () {
-   it('updates all nodes that satisfy criteria', function () {
-      let store = new Store({
-         data: {
-            array: [{
-               id: 'n1',
-               value: 1,
-               children: [{
-                  id: 'n11',
-                  value: 2
-               }, {
-                  id: 'n12',
-                  value: 3
-               }]
-            }]
-         }
-      });
-
-      assert(store.update('array', updateTree, x => ({ ...x, value: x.value + 1 }), x => x.value > 1, 'children'));
-      assert.deepEqual(store.get('array'), [{
-         id: 'n1',
-         value: 1,
-         children: [{
-            id: 'n11',
-            value: 3
-         }, {
-            id: 'n12',
-            value: 4
-         }]
-      }]);
-   });
-});
+import { Store } from '../Store';
+import { updateTree } from './updateTree';
+import assert from 'assert';
+
+describe('updateTree', function () {
+   it('updates all nodes that satisfy criteria', function () {
+      let store = new Store({
+         data: {
+            array: [{
+               id: 'n1',
+               value: 1,
+               children: [{
+                  id: 'n11',
+                  value: 2
+               }, {
+                  id: 'n12',
+                  value: 3
+               }]
+            }]
+         }
+      });
+
+      assert(store.update('array', updateTree, x => ({ ...x, value: x.value + 1 }), x => x.value > 1, 'children'));
+      assert.deepEqual(store.get('array'), [{
+         id: 'n1',
+         value: 1,
+         children: [{
+            id: 'n11',
+            value: 3
+         }, {
+            id: 'n12',
+            value: 4
+         }]
+      }]);
+   });
+});

package/src/global.scss

@@ -1,14 +1,14 @@
-
-$cx-include-global-rules: false !default;
-
-@mixin cx-global-rules() {
-   @each $tag, $styles in $cx-element-style-map {
-      #{$tag} {
-         @include cx-add-rules($styles)
-      }
-   }
-}
-
-@if ($cx-include-global-rules and cx-call-once('cx/globals')) {
-   @include cx-global-rules();
+
+$cx-include-global-rules: false !default;
+
+@mixin cx-global-rules() {
+   @each $tag, $styles in $cx-element-style-map {
+      #{$tag} {
+         @include cx-add-rules($styles)
+      }
+   }
+}
+
+@if ($cx-include-global-rules and cx-call-once('cx/globals')) {
+   @include cx-global-rules();
 }

package/src/hooks/createLocalStorageRef.d.ts

@@ -1,3 +1,3 @@
-import { Ref } from "../data";
-
+import { Ref } from "../data";
+
 export function createLoacalStorageRef(key: string): Ref<any>;

package/src/hooks/createLocalStorageRef.js

@@ -1,23 +1,23 @@
-import { useStore } from "./store";
-import { Ref } from "../data/Ref";
-
-export function createLoacalStorageRef(key) {
-   let store = useStore();
-
-   return new Ref({
-      get() {
-         let json = localStorage.getItem(key);
-         if (!json)
-            return localStorage.hasOwnProperty(key) ? null : undefined;
-         return JSON.parse(json);
-      },
-      set(value) {
-         if (value === undefined)
-            localStorage.removeItem(key);
-         else
-            localStorage.setItem(key, JSON.stringify(value));
-         store.meta.version++;
-         store.notify();
-      }
-   })
+import { useStore } from "./store";
+import { Ref } from "../data/Ref";
+
+export function createLoacalStorageRef(key) {
+   let store = useStore();
+
+   return new Ref({
+      get() {
+         let json = localStorage.getItem(key);
+         if (!json)
+            return localStorage.hasOwnProperty(key) ? null : undefined;
+         return JSON.parse(json);
+      },
+      set(value) {
+         if (value === undefined)
+            localStorage.removeItem(key);
+         else
+            localStorage.setItem(key, JSON.stringify(value));
+         store.meta.version++;
+         store.notify();
+      }
+   })
 }

package/src/hooks/index.d.ts

@@ -1,8 +1,8 @@
-export * from "./store";
-export * from "./useEffect";
-export * from "./useInterval";
-export * from "./useTrigger";
-export * from "./useState";
-export * from "./createLocalStorageRef";
-export * from "./resolveCallback";
-export * from "./invokeCallback";
+export * from "./store";
+export * from "./useEffect";
+export * from "./useInterval";
+export * from "./useTrigger";
+export * from "./useState";
+export * from "./createLocalStorageRef";
+export * from "./resolveCallback";
+export * from "./invokeCallback";

package/src/hooks/index.js

@@ -1,8 +1,8 @@
-export * from "./store";
-export * from "./useEffect";
-export * from "./useInterval";
-export * from "./useTrigger";
-export * from "./useState";
-export * from "./createLocalStorageRef";
-export * from "./resolveCallback";
+export * from "./store";
+export * from "./useEffect";
+export * from "./useInterval";
+export * from "./useTrigger";
+export * from "./useState";
+export * from "./createLocalStorageRef";
+export * from "./resolveCallback";
 export * from "./invokeCallback";

package/src/hooks/invokeCallback.d.ts

@@ -1,5 +1,5 @@
-import { Instance } from "./../ui/Instance.d";
-import { isFunction } from "../util/isFunction";
-import { isString } from "../util/isString";
-
-export function invokeCallback(instance: Instance, callback: string | ((...args: any) => any), ...args: any[]): any;
+import { Instance } from "./../ui/Instance.d";
+import { isFunction } from "../util/isFunction";
+import { isString } from "../util/isString";
+
+export function invokeCallback(instance: Instance, callback: string | ((...args: any) => any), ...args: any[]): any;

package/src/hooks/invokeCallback.js

@@ -1,7 +1,7 @@
-import { isFunction } from "../util/isFunction";
-import { isString } from "../util/isString";
-
-export function invokeCallback(instance, callback, ...args) {
-   if (isString(callback)) return instance.invokeControllerMethod(callback, ...args);
-   if (isFunction(callback)) return callback(...args);
+import { isFunction } from "../util/isFunction";
+import { isString } from "../util/isString";
+
+export function invokeCallback(instance, callback, ...args) {
+   if (isString(callback)) return instance.invokeControllerMethod(callback, ...args);
+   if (isFunction(callback)) return callback(...args);
 }

package/src/hooks/invokeCallback.spec.js

@@ -1,53 +1,53 @@
-import { useTrigger } from "./useTrigger";
-import { createFunctionalComponent } from "../ui/createFunctionalComponent";
-import { Store } from "../data/Store";
-import renderer from "react-test-renderer";
-import { HtmlElement } from "../widgets/HtmlElement";
-import { VDOM } from "../ui/VDOM";
-import { Cx } from "../ui/Cx";
-import assert from "assert";
-import { resolveCallback } from "./resolveCallback";
-import { invokeCallback } from "./invokeCallback";
-
-describe("invokeCallback", () => {
-   it("works with functions", () => {
-      const FComp = createFunctionalComponent(({ onTest }) => {
-         invokeCallback(null, onTest, "works");
-         return (
-            <cx>
-               <div />
-            </cx>
-         );
-      });
-
-      let store = new Store();
-      let value;
-      const component = renderer.create(<Cx widget={{ type: FComp, onTest: v => { value = v } }} store={store} subscribe immediate />);
-
-      component.toJSON();
-      assert.equal(value, "works");
-   });
-
-   it("works with controller methods", () => {
-      const FComp = createFunctionalComponent(({ onTest }) => {
-         return (
-            <cx>
-               <div onExplore={(context, instance) => { invokeCallback(instance, onTest, "works") }} />
-            </cx>
-         );
-      });
-
-      let store = new Store();
-      let value;
-      const component = renderer.create(<Cx widget={{
-         type: FComp,
-         onTest: "onTest",
-         controller: {
-            onTest(v) { value = v }
-         }
-      }} store={store} subscribe immediate />);
-
-      component.toJSON();
-      assert.equal(value, "works");
-   });
-});
+import { useTrigger } from "./useTrigger";
+import { createFunctionalComponent } from "../ui/createFunctionalComponent";
+import { Store } from "../data/Store";
+import renderer from "react-test-renderer";
+import { HtmlElement } from "../widgets/HtmlElement";
+import { VDOM } from "../ui/VDOM";
+import { Cx } from "../ui/Cx";
+import assert from "assert";
+import { resolveCallback } from "./resolveCallback";
+import { invokeCallback } from "./invokeCallback";
+
+describe("invokeCallback", () => {
+   it("works with functions", () => {
+      const FComp = createFunctionalComponent(({ onTest }) => {
+         invokeCallback(null, onTest, "works");
+         return (
+            <cx>
+               <div />
+            </cx>
+         );
+      });
+
+      let store = new Store();
+      let value;
+      const component = renderer.create(<Cx widget={{ type: FComp, onTest: v => { value = v } }} store={store} subscribe immediate />);
+
+      component.toJSON();
+      assert.equal(value, "works");
+   });
+
+   it("works with controller methods", () => {
+      const FComp = createFunctionalComponent(({ onTest }) => {
+         return (
+            <cx>
+               <div onExplore={(context, instance) => { invokeCallback(instance, onTest, "works") }} />
+            </cx>
+         );
+      });
+
+      let store = new Store();
+      let value;
+      const component = renderer.create(<Cx widget={{
+         type: FComp,
+         onTest: "onTest",
+         controller: {
+            onTest(v) { value = v }
+         }
+      }} store={store} subscribe immediate />);
+
+      component.toJSON();
+      assert.equal(value, "works");
+   });
+});

package/src/hooks/resolveCallback.d.ts

@@ -1,3 +1,3 @@
-import { Instance } from "./../ui/Instance.d";
-
-export function resolveCallback(callback: string | ((...args) => any), instance?: Instance): (...args) => any;
+import { Instance } from "./../ui/Instance.d";
+
+export function resolveCallback(callback: string | ((...args) => any), instance?: Instance): (...args) => any;

package/src/hooks/resolveCallback.js

@@ -1,12 +1,12 @@
-import { isFunction } from "../util/isFunction";
-import { isString } from "../util/isString";
-import { getCurrentInstance } from "../ui/createFunctionalComponent";
-
-export function resolveCallback(callback, instance) {
-   if (isFunction(callback))
-      return callback;
-   if (isString(callback)) {
-      if (!instance) instance = getCurrentInstance();
-      return (...args) => instance.invokeControllerMethod(callback, ...args);
-   }
+import { isFunction } from "../util/isFunction";
+import { isString } from "../util/isString";
+import { getCurrentInstance } from "../ui/createFunctionalComponent";
+
+export function resolveCallback(callback, instance) {
+   if (isFunction(callback))
+      return callback;
+   if (isString(callback)) {
+      if (!instance) instance = getCurrentInstance();
+      return (...args) => instance.invokeControllerMethod(callback, ...args);
+   }
 }

package/src/hooks/resolveCallback.spec.js

@@ -1,54 +1,54 @@
-import { useTrigger } from "./useTrigger";
-import { createFunctionalComponent } from "../ui/createFunctionalComponent";
-import { Store } from "../data/Store";
-import renderer from "react-test-renderer";
-import { HtmlElement } from "../widgets/HtmlElement";
-import { VDOM } from "../ui/VDOM";
-import { Cx } from "../ui/Cx";
-import assert from "assert";
-import { resolveCallback } from "./resolveCallback";
-
-describe("resolveCallback", () => {
-   it("works with functions", () => {
-      const FComp = createFunctionalComponent(({ onTest }) => {
-         let callback = resolveCallback(onTest);
-         callback("works");
-         return (
-            <cx>
-               <div />
-            </cx>
-         );
-      });
-
-      let store = new Store();
-      let value;
-      const component = renderer.create(<Cx widget={{ type: FComp, onTest: v => { value = v } }} store={store} subscribe immediate />);
-
-      component.toJSON();
-      assert.equal(value, "works");
-   });
-
-   it("works with controller methods", () => {
-      const FComp = createFunctionalComponent(({ onTest }) => {
-         let callback = resolveCallback(onTest);
-         return (
-            <cx>
-               <div onInit={() => { callback("works"); }} />
-            </cx>
-         );
-      });
-
-      let store = new Store();
-      let value;
-      const component = renderer.create(<Cx widget={{
-         type: FComp,
-         onTest: "onTest",
-         controller: {
-            onTest(v) { value = v }
-         }
-      }} store={store} subscribe immediate />);
-
-      component.toJSON();
-      assert.equal(value, "works");
-   });
-});
+import { useTrigger } from "./useTrigger";
+import { createFunctionalComponent } from "../ui/createFunctionalComponent";
+import { Store } from "../data/Store";
+import renderer from "react-test-renderer";
+import { HtmlElement } from "../widgets/HtmlElement";
+import { VDOM } from "../ui/VDOM";
+import { Cx } from "../ui/Cx";
+import assert from "assert";
+import { resolveCallback } from "./resolveCallback";
+
+describe("resolveCallback", () => {
+   it("works with functions", () => {
+      const FComp = createFunctionalComponent(({ onTest }) => {
+         let callback = resolveCallback(onTest);
+         callback("works");
+         return (
+            <cx>
+               <div />
+            </cx>
+         );
+      });
+
+      let store = new Store();
+      let value;
+      const component = renderer.create(<Cx widget={{ type: FComp, onTest: v => { value = v } }} store={store} subscribe immediate />);
+
+      component.toJSON();
+      assert.equal(value, "works");
+   });
+
+   it("works with controller methods", () => {
+      const FComp = createFunctionalComponent(({ onTest }) => {
+         let callback = resolveCallback(onTest);
+         return (
+            <cx>
+               <div onInit={() => { callback("works"); }} />
+            </cx>
+         );
+      });
+
+      let store = new Store();
+      let value;
+      const component = renderer.create(<Cx widget={{
+         type: FComp,
+         onTest: "onTest",
+         controller: {
+            onTest(v) { value = v }
+         }
+      }} store={store} subscribe immediate />);
+
+      component.toJSON();
+      assert.equal(value, "works");
+   });
+});