cx 26.0.14 → 26.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/ui/VDOM.d.ts +1 -20
- package/build/ui/VDOM.js +1 -3
- package/build/ui/Widget.d.ts +1 -1
- package/build/ui/app/startAppLoop.js +2 -10
- package/build/widgets/form/Checkbox.d.ts +0 -1
- package/build/widgets/form/Checkbox.js +1 -0
- package/build/widgets/form/ColorField.d.ts +0 -1
- package/build/widgets/form/ColorField.js +2 -2
- package/build/widgets/form/DateTimeField.d.ts +0 -2
- package/build/widgets/form/DateTimeField.js +1 -0
- package/build/widgets/form/DateTimePicker.d.ts +0 -2
- package/build/widgets/form/DateTimePicker.js +1 -0
- package/build/widgets/form/Radio.d.ts +0 -1
- package/build/widgets/form/Slider.js +9 -1
- package/build/widgets/form/Switch.d.ts +0 -1
- package/build/widgets/form/Switch.js +1 -1
- package/build/widgets/form/Wheel.d.ts +0 -1
- package/build/widgets/grid/Grid.d.ts +0 -2
- package/build/widgets/grid/GridCellEditor.js +3 -1
- package/build/widgets/overlay/Overlay.d.ts +3 -0
- package/build/widgets/overlay/Overlay.js +3 -2
- package/dist/manifest.js +816 -816
- package/dist/ui.js +3 -10
- package/dist/widgets.js +18 -6
- package/package.json +9 -8
- package/src/charts/Chart.ts +108 -108
- package/src/data/ArrayElementView.ts +90 -90
- package/src/data/AugmentedViewBase.ts +88 -88
- package/src/data/Binding.ts +104 -104
- package/src/data/ExposedRecordView.ts +95 -95
- package/src/data/ExposedValueView.ts +89 -89
- package/src/data/Expression.spec.ts +229 -229
- package/src/data/Expression.ts +233 -233
- package/src/data/Grouper.spec.ts +57 -57
- package/src/data/Grouper.ts +158 -158
- package/src/data/NestedDataView.ts +43 -43
- package/src/data/ReadOnlyDataView.ts +39 -39
- package/src/data/Ref.ts +104 -104
- package/src/data/Selector.ts +10 -10
- package/src/data/Store.ts +52 -52
- package/src/data/StoreProxy.ts +19 -19
- package/src/data/StoreRef.ts +66 -66
- package/src/data/StringTemplate.spec.ts +132 -132
- package/src/data/StringTemplate.ts +93 -93
- package/src/data/StructuredSelector.spec.ts +113 -113
- package/src/data/StructuredSelector.ts +146 -146
- package/src/data/SubscribableView.ts +63 -63
- package/src/data/ZoomIntoPropertyView.spec.ts +64 -64
- package/src/data/ZoomIntoPropertyView.ts +45 -45
- package/src/data/computable.spec.ts +87 -87
- package/src/data/createStructuredSelector.ts +62 -62
- package/src/data/getAccessor.spec.ts +11 -11
- package/src/data/getAccessor.ts +74 -74
- package/src/data/getSelector.spec.ts +43 -43
- package/src/data/getSelector.ts +66 -66
- package/src/data/ops/filter.spec.ts +35 -35
- package/src/data/ops/filter.ts +9 -9
- package/src/data/ops/merge.ts +13 -13
- package/src/data/ops/removeTreeNodes.spec.ts +37 -37
- package/src/data/ops/updateArray.spec.ts +69 -69
- package/src/data/test-types.ts +7 -7
- package/src/hooks/useTrigger.ts +26 -26
- package/src/index.scss +6 -6
- package/src/jsx-dev-runtime.ts +4 -4
- package/src/svg/BoundedObject.ts +101 -101
- package/src/svg/util/Rect.ts +105 -105
- package/src/ui/CSSHelper.ts +17 -17
- package/src/ui/Culture.ts +159 -159
- package/src/ui/DataProxy.ts +55 -55
- package/src/ui/FocusManager.ts +171 -171
- package/src/ui/Instance.ts +866 -866
- package/src/ui/Prop.ts +140 -140
- package/src/ui/RenderingContext.ts +99 -99
- package/src/ui/Rescope.ts +49 -49
- package/src/ui/StructuredInstanceDataAccessor.ts +32 -32
- package/src/ui/VDOM.ts +1 -34
- package/src/ui/adapter/ArrayAdapter.spec.ts +55 -55
- package/src/ui/adapter/TreeAdapter.spec.ts +76 -76
- package/src/ui/adapter/TreeAdapter.ts +185 -185
- package/src/ui/app/History.ts +133 -133
- package/src/ui/app/Url.spec.ts +50 -50
- package/src/ui/app/startAppLoop.tsx +5 -9
- package/src/ui/app/startHotAppLoop.ts +41 -41
- package/src/ui/layout/Content.ts +30 -30
- package/src/ui/layout/FirstVisibleChildLayout.ts +60 -60
- package/src/util/Console.ts +13 -13
- package/src/util/Format.spec.ts +69 -69
- package/src/util/Format.ts +267 -267
- package/src/util/addEventListenerWithOptions.ts +41 -41
- package/src/util/browserSupportsPassiveEventHandlers.ts +20 -20
- package/src/util/color/rgbToHsl.ts +35 -35
- package/src/util/getActiveElement.ts +4 -4
- package/src/util/hasKey.ts +18 -18
- package/src/util/index.ts +55 -55
- package/src/util/innerTextTrim.ts +10 -10
- package/src/util/isArray.ts +3 -3
- package/src/util/isDataRecord.ts +5 -5
- package/src/util/isDefined.ts +3 -3
- package/src/util/isString.ts +3 -3
- package/src/widgets/DocumentTitle.ts +95 -95
- package/src/widgets/Sandbox.ts +103 -103
- package/src/widgets/autoFocus.ts +9 -9
- package/src/widgets/cx.ts +63 -63
- package/src/widgets/form/Checkbox.tsx +0 -1
- package/src/widgets/form/ColorField.tsx +15 -12
- package/src/widgets/form/DateTimeField.tsx +0 -2
- package/src/widgets/form/DateTimePicker.tsx +0 -2
- package/src/widgets/form/Radio.tsx +0 -1
- package/src/widgets/form/Slider.tsx +12 -4
- package/src/widgets/form/Switch.tsx +2 -3
- package/src/widgets/form/Wheel.tsx +0 -1
- package/src/widgets/grid/Grid.tsx +0 -1
- package/src/widgets/grid/GridCell.ts +143 -143
- package/src/widgets/grid/GridCellEditor.tsx +7 -1
- package/src/widgets/icons/calendar.tsx +17 -17
- package/src/widgets/icons/check.tsx +13 -13
- package/src/widgets/icons/clear.tsx +15 -15
- package/src/widgets/icons/close.tsx +20 -20
- package/src/widgets/icons/cx.tsx +38 -38
- package/src/widgets/icons/drop-down.tsx +15 -15
- package/src/widgets/icons/file.tsx +13 -13
- package/src/widgets/icons/folder-open.tsx +15 -15
- package/src/widgets/icons/folder.tsx +13 -13
- package/src/widgets/icons/forward.tsx +22 -22
- package/src/widgets/icons/loading.tsx +24 -24
- package/src/widgets/icons/menu.tsx +17 -17
- package/src/widgets/icons/pixel-picker.tsx +18 -18
- package/src/widgets/icons/search.tsx +13 -13
- package/src/widgets/icons/sort-asc.tsx +14 -14
- package/src/widgets/icons/square.tsx +18 -18
- package/src/widgets/nav/Route.ts +142 -142
- package/src/widgets/overlay/Dropdown.tsx +762 -762
- package/src/widgets/overlay/MsgBox.tsx +141 -141
- package/src/widgets/overlay/Overlay.tsx +5 -1
- package/src/widgets/overlay/Toast.ts +111 -111
- package/src/widgets/overlay/Window.tsx +299 -299
- package/src/widgets/overlay/alerts.ts +46 -46
- package/src/widgets/overlay/captureMouse.ts +195 -195
- package/src/widgets/overlay/createHotPromiseWindowFactory.ts +71 -71
- package/src/widgets/overlay/index.d.ts +11 -11
- package/src/widgets/overlay/index.ts +11 -11
- package/src/widgets/overlay/tooltip-ops.ts +173 -173
- package/build/data/ArrayElementView.spec.d.ts +0 -1
- package/build/data/ArrayElementView.spec.js +0 -81
- package/build/data/Binding.spec.d.ts +0 -1
- package/build/data/Binding.spec.js +0 -61
- package/build/data/Expression.spec.d.ts +0 -1
- package/build/data/Expression.spec.js +0 -196
- package/build/data/Grouper.spec.d.ts +0 -1
- package/build/data/Grouper.spec.js +0 -48
- package/build/data/Ref.spec.d.ts +0 -1
- package/build/data/Ref.spec.js +0 -72
- package/build/data/Store.spec.d.ts +0 -1
- package/build/data/Store.spec.js +0 -19
- package/build/data/StoreRef.spec.d.ts +0 -1
- package/build/data/StoreRef.spec.js +0 -22
- package/build/data/StringTemplate.spec.d.ts +0 -1
- package/build/data/StringTemplate.spec.js +0 -112
- package/build/data/StructuredSelector.spec.d.ts +0 -1
- package/build/data/StructuredSelector.spec.js +0 -102
- package/build/data/View.spec.d.ts +0 -1
- package/build/data/View.spec.js +0 -44
- package/build/data/ZoomIntoPropertyView.spec.d.ts +0 -1
- package/build/data/ZoomIntoPropertyView.spec.js +0 -54
- package/build/data/comparer.spec.d.ts +0 -1
- package/build/data/comparer.spec.js +0 -50
- package/build/data/computable.spec.d.ts +0 -1
- package/build/data/computable.spec.js +0 -56
- package/build/data/createAccessorModelProxy.spec.d.ts +0 -1
- package/build/data/createAccessorModelProxy.spec.js +0 -30
- package/build/data/createStructuredSelector.spec.d.ts +0 -1
- package/build/data/createStructuredSelector.spec.js +0 -42
- package/build/data/diff/diffs.spec.d.ts +0 -1
- package/build/data/diff/diffs.spec.js +0 -45
- package/build/data/getAccessor.spec.d.ts +0 -1
- package/build/data/getAccessor.spec.js +0 -10
- package/build/data/getSelector.spec.d.ts +0 -1
- package/build/data/getSelector.spec.js +0 -36
- package/build/data/ops/append.spec.d.ts +0 -1
- package/build/data/ops/append.spec.js +0 -24
- package/build/data/ops/filter.spec.d.ts +0 -1
- package/build/data/ops/filter.spec.js +0 -25
- package/build/data/ops/findTreeNode.spec.d.ts +0 -1
- package/build/data/ops/findTreeNode.spec.js +0 -20
- package/build/data/ops/merge.spec.d.ts +0 -1
- package/build/data/ops/merge.spec.js +0 -23
- package/build/data/ops/removeTreeNodes.spec.d.ts +0 -1
- package/build/data/ops/removeTreeNodes.spec.js +0 -35
- package/build/data/ops/updateArray.spec.d.ts +0 -1
- package/build/data/ops/updateArray.spec.js +0 -33
- package/build/data/ops/updateTree.spec.d.ts +0 -1
- package/build/data/ops/updateTree.spec.js +0 -44
- package/build/hooks/invokeCallback.spec.d.ts +0 -1
- package/build/hooks/invokeCallback.spec.js +0 -44
- package/build/hooks/resolveCallback.spec.d.ts +0 -1
- package/build/hooks/resolveCallback.spec.js +0 -35
- package/build/hooks/store.spec.d.ts +0 -1
- package/build/hooks/store.spec.js +0 -48
- package/build/hooks/useTrigger.spec.d.ts +0 -1
- package/build/hooks/useTrigger.spec.js +0 -59
- package/build/ui/Controller.spec.d.ts +0 -1
- package/build/ui/Controller.spec.js +0 -247
- package/build/ui/Cx.spec.d.ts +0 -1
- package/build/ui/Cx.spec.js +0 -153
- package/build/ui/DataProxy.spec.d.ts +0 -1
- package/build/ui/DataProxy.spec.js +0 -208
- package/build/ui/IsolatedScope.spec.d.ts +0 -1
- package/build/ui/IsolatedScope.spec.js +0 -42
- package/build/ui/PureContainer.spec.d.ts +0 -1
- package/build/ui/PureContainer.spec.js +0 -149
- package/build/ui/Repeater.spec.d.ts +0 -1
- package/build/ui/Repeater.spec.js +0 -109
- package/build/ui/Rescope.spec.d.ts +0 -1
- package/build/ui/Rescope.spec.js +0 -134
- package/build/ui/Restate.spec.d.ts +0 -1
- package/build/ui/Restate.spec.js +0 -257
- package/build/ui/adapter/ArrayAdapter.spec.d.ts +0 -1
- package/build/ui/adapter/ArrayAdapter.spec.js +0 -44
- package/build/ui/adapter/TreeAdapter.spec.d.ts +0 -1
- package/build/ui/adapter/TreeAdapter.spec.js +0 -71
- package/build/ui/app/Url.spec.d.ts +0 -1
- package/build/ui/app/Url.spec.js +0 -43
- package/build/ui/createFunctionalComponent.spec.d.ts +0 -1
- package/build/ui/createFunctionalComponent.spec.js +0 -272
- package/build/ui/layout/ContentPlaceholder.spec.d.ts +0 -1
- package/build/ui/layout/ContentPlaceholder.spec.js +0 -333
- package/build/ui/layout/FirstVisibleChildLayout.spec.d.ts +0 -1
- package/build/ui/layout/FirstVisibleChildLayout.spec.js +0 -101
- package/build/util/Format.spec.d.ts +0 -1
- package/build/util/Format.spec.js +0 -58
- package/build/util/TraversalStack.spec.d.ts +0 -1
- package/build/util/TraversalStack.spec.js +0 -43
- package/build/util/date/upperBoundCheck.spec.d.ts +0 -1
- package/build/util/date/upperBoundCheck.spec.js +0 -22
- package/build/util/getSearchQueryPredicate.spec.d.ts +0 -1
- package/build/util/getSearchQueryPredicate.spec.js +0 -33
- package/build/util/isValidIdentifierName.spec.d.ts +0 -1
- package/build/util/isValidIdentifierName.spec.js +0 -28
- package/build/util/routeAppend.spec.d.ts +0 -1
- package/build/util/routeAppend.spec.js +0 -14
- package/build/widgets/AccessorBindings.spec.d.ts +0 -1
- package/build/widgets/AccessorBindings.spec.js +0 -40
- package/build/widgets/HtmlElement.spec.d.ts +0 -1
- package/build/widgets/HtmlElement.spec.js +0 -38
- package/build/widgets/form/ValidationGroup.spec.d.ts +0 -1
- package/build/widgets/form/ValidationGroup.spec.js +0 -62
- package/build/widgets/nav/Route.spec.d.ts +0 -1
- package/build/widgets/nav/Route.spec.js +0 -15
- package/dist/manifest.d.ts +0 -1443
|
@@ -1,87 +1,87 @@
|
|
|
1
|
-
import { computable } from "./computable";
|
|
2
|
-
import assert from "assert";
|
|
3
|
-
import { createAccessorModelProxy } from "./createAccessorModelProxy";
|
|
4
|
-
|
|
5
|
-
describe("computable", function () {
|
|
6
|
-
it("creates a selector", function () {
|
|
7
|
-
let state = { person: { name: "Joe" } };
|
|
8
|
-
let nameLength = computable("person.name", (name: string) => name.length);
|
|
9
|
-
assert.equal(nameLength(state), 3);
|
|
10
|
-
});
|
|
11
|
-
|
|
12
|
-
it("fires every time if not memoized", function () {
|
|
13
|
-
let state = { person: { name: "Joe" } };
|
|
14
|
-
let fired = 0;
|
|
15
|
-
let nameLength = computable("person.name", (name: string) => {
|
|
16
|
-
fired++;
|
|
17
|
-
return name.length;
|
|
18
|
-
});
|
|
19
|
-
assert.equal(nameLength(state), 3);
|
|
20
|
-
assert.equal(nameLength(state), 3);
|
|
21
|
-
assert.equal(fired, 2);
|
|
22
|
-
});
|
|
23
|
-
|
|
24
|
-
it("fires once if memoized and data has not changed", function () {
|
|
25
|
-
let state = { person: { name: "Joe" } };
|
|
26
|
-
let fired = 0;
|
|
27
|
-
let nameLength = computable("person.name", (name: string) => {
|
|
28
|
-
fired++;
|
|
29
|
-
return name.length;
|
|
30
|
-
}).memoize();
|
|
31
|
-
assert.equal(nameLength(state), 3);
|
|
32
|
-
assert.equal(nameLength(state), 3);
|
|
33
|
-
assert.equal(fired, 1);
|
|
34
|
-
});
|
|
35
|
-
|
|
36
|
-
//weird but that's how triggers work and
|
|
37
|
-
it("memoize with warmup data will not call compute", function () {
|
|
38
|
-
let state = { person: { name: "Joe" } };
|
|
39
|
-
let fired = 0;
|
|
40
|
-
let nameLength = computable("person.name", (name: string) => {
|
|
41
|
-
fired++;
|
|
42
|
-
return name.length;
|
|
43
|
-
}).memoize(state);
|
|
44
|
-
assert.equal(nameLength(state), undefined);
|
|
45
|
-
assert.equal(nameLength(state), undefined);
|
|
46
|
-
assert.equal(fired, 0);
|
|
47
|
-
});
|
|
48
|
-
|
|
49
|
-
it("works with accessors", function () {
|
|
50
|
-
var m = createAccessorModelProxy<{ person: { name: string } }>();
|
|
51
|
-
let state = { person: { name: "Joe" } };
|
|
52
|
-
let nameLength = computable(m.person.name, (name) => {
|
|
53
|
-
// name should be inferred as string
|
|
54
|
-
const typedName: string = name;
|
|
55
|
-
// @ts-expect-error - name should not be number
|
|
56
|
-
const wrongType: number = name;
|
|
57
|
-
return typedName.length;
|
|
58
|
-
});
|
|
59
|
-
assert.equal(nameLength(state), 3);
|
|
60
|
-
});
|
|
61
|
-
|
|
62
|
-
it("works with array length accessor", function () {
|
|
63
|
-
var m = createAccessorModelProxy<{ items: string[] }>();
|
|
64
|
-
let state = { items: ["a", "b", "c"] };
|
|
65
|
-
let itemCount = computable(m.items.length, (length) => {
|
|
66
|
-
// length should be inferred as number
|
|
67
|
-
const typedLength: number = length;
|
|
68
|
-
// @ts-expect-error - length should not be string
|
|
69
|
-
const wrongType: string = length;
|
|
70
|
-
return typedLength;
|
|
71
|
-
});
|
|
72
|
-
assert.equal(itemCount(state), 3);
|
|
73
|
-
});
|
|
74
|
-
|
|
75
|
-
it("resolves AccessorChain<any> and nested properties to any", function () {
|
|
76
|
-
var m = createAccessorModelProxy<{ data: any }>();
|
|
77
|
-
let state = { data: { nested: { value: 42 } } };
|
|
78
|
-
let result = computable(m.data.nested.value, (value) => {
|
|
79
|
-
// value should be any, so all assignments should work
|
|
80
|
-
const asString: string = value;
|
|
81
|
-
const asNumber: number = value;
|
|
82
|
-
const asBoolean: boolean = value;
|
|
83
|
-
return value;
|
|
84
|
-
});
|
|
85
|
-
assert.equal(result(state), 42);
|
|
86
|
-
});
|
|
87
|
-
});
|
|
1
|
+
import { computable } from "./computable";
|
|
2
|
+
import assert from "assert";
|
|
3
|
+
import { createAccessorModelProxy } from "./createAccessorModelProxy";
|
|
4
|
+
|
|
5
|
+
describe("computable", function () {
|
|
6
|
+
it("creates a selector", function () {
|
|
7
|
+
let state = { person: { name: "Joe" } };
|
|
8
|
+
let nameLength = computable("person.name", (name: string) => name.length);
|
|
9
|
+
assert.equal(nameLength(state), 3);
|
|
10
|
+
});
|
|
11
|
+
|
|
12
|
+
it("fires every time if not memoized", function () {
|
|
13
|
+
let state = { person: { name: "Joe" } };
|
|
14
|
+
let fired = 0;
|
|
15
|
+
let nameLength = computable("person.name", (name: string) => {
|
|
16
|
+
fired++;
|
|
17
|
+
return name.length;
|
|
18
|
+
});
|
|
19
|
+
assert.equal(nameLength(state), 3);
|
|
20
|
+
assert.equal(nameLength(state), 3);
|
|
21
|
+
assert.equal(fired, 2);
|
|
22
|
+
});
|
|
23
|
+
|
|
24
|
+
it("fires once if memoized and data has not changed", function () {
|
|
25
|
+
let state = { person: { name: "Joe" } };
|
|
26
|
+
let fired = 0;
|
|
27
|
+
let nameLength = computable("person.name", (name: string) => {
|
|
28
|
+
fired++;
|
|
29
|
+
return name.length;
|
|
30
|
+
}).memoize();
|
|
31
|
+
assert.equal(nameLength(state), 3);
|
|
32
|
+
assert.equal(nameLength(state), 3);
|
|
33
|
+
assert.equal(fired, 1);
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
//weird but that's how triggers work and
|
|
37
|
+
it("memoize with warmup data will not call compute", function () {
|
|
38
|
+
let state = { person: { name: "Joe" } };
|
|
39
|
+
let fired = 0;
|
|
40
|
+
let nameLength = computable("person.name", (name: string) => {
|
|
41
|
+
fired++;
|
|
42
|
+
return name.length;
|
|
43
|
+
}).memoize(state);
|
|
44
|
+
assert.equal(nameLength(state), undefined);
|
|
45
|
+
assert.equal(nameLength(state), undefined);
|
|
46
|
+
assert.equal(fired, 0);
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
it("works with accessors", function () {
|
|
50
|
+
var m = createAccessorModelProxy<{ person: { name: string } }>();
|
|
51
|
+
let state = { person: { name: "Joe" } };
|
|
52
|
+
let nameLength = computable(m.person.name, (name) => {
|
|
53
|
+
// name should be inferred as string
|
|
54
|
+
const typedName: string = name;
|
|
55
|
+
// @ts-expect-error - name should not be number
|
|
56
|
+
const wrongType: number = name;
|
|
57
|
+
return typedName.length;
|
|
58
|
+
});
|
|
59
|
+
assert.equal(nameLength(state), 3);
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
it("works with array length accessor", function () {
|
|
63
|
+
var m = createAccessorModelProxy<{ items: string[] }>();
|
|
64
|
+
let state = { items: ["a", "b", "c"] };
|
|
65
|
+
let itemCount = computable(m.items.length, (length) => {
|
|
66
|
+
// length should be inferred as number
|
|
67
|
+
const typedLength: number = length;
|
|
68
|
+
// @ts-expect-error - length should not be string
|
|
69
|
+
const wrongType: string = length;
|
|
70
|
+
return typedLength;
|
|
71
|
+
});
|
|
72
|
+
assert.equal(itemCount(state), 3);
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
it("resolves AccessorChain<any> and nested properties to any", function () {
|
|
76
|
+
var m = createAccessorModelProxy<{ data: any }>();
|
|
77
|
+
let state = { data: { nested: { value: 42 } } };
|
|
78
|
+
let result = computable(m.data.nested.value, (value) => {
|
|
79
|
+
// value should be any, so all assignments should work
|
|
80
|
+
const asString: string = value;
|
|
81
|
+
const asNumber: number = value;
|
|
82
|
+
const asBoolean: boolean = value;
|
|
83
|
+
return value;
|
|
84
|
+
});
|
|
85
|
+
assert.equal(result(state), 42);
|
|
86
|
+
});
|
|
87
|
+
});
|
|
@@ -1,62 +1,62 @@
|
|
|
1
|
-
import { MemoSelector, Selector } from "./Selector";
|
|
2
|
-
|
|
3
|
-
export interface StructuredSelectorConfig {
|
|
4
|
-
[prop: string]: Selector;
|
|
5
|
-
}
|
|
6
|
-
|
|
7
|
-
// Helper type to infer result type from selector config
|
|
8
|
-
type InferStructuredSelectorResult<T extends StructuredSelectorConfig, C = {}> = {
|
|
9
|
-
[K in keyof T]: T[K] extends Selector<infer R> ? R : any;
|
|
10
|
-
} & C;
|
|
11
|
-
|
|
12
|
-
export function createStructuredSelector<S extends StructuredSelectorConfig, C extends Record<string, any> = {}>(
|
|
13
|
-
selector: S,
|
|
14
|
-
constants?: C,
|
|
15
|
-
): MemoSelector<InferStructuredSelectorResult<S, C>> {
|
|
16
|
-
let keys = Object.keys(selector);
|
|
17
|
-
constants = constants ?? ({} as C);
|
|
18
|
-
if (keys.length == 0) {
|
|
19
|
-
let result: Selector = () => constants;
|
|
20
|
-
result.memoize = () => result;
|
|
21
|
-
return result as MemoSelector<InferStructuredSelectorResult<S, C>>;
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
function memoize() {
|
|
25
|
-
let lastResult: Record<string, any> = Object.assign({}, constants);
|
|
26
|
-
|
|
27
|
-
let memoizedSelectors: Record<string, Selector> = {};
|
|
28
|
-
|
|
29
|
-
keys.forEach((key) => {
|
|
30
|
-
memoizedSelectors[key] = selector[key].memoize ? selector[key].memoize() : selector[key];
|
|
31
|
-
lastResult[key] = undefined;
|
|
32
|
-
});
|
|
33
|
-
|
|
34
|
-
return function (data: any) {
|
|
35
|
-
let result = lastResult,
|
|
36
|
-
k,
|
|
37
|
-
v,
|
|
38
|
-
i;
|
|
39
|
-
for (i = 0; i < keys.length; i++) {
|
|
40
|
-
k = keys[i];
|
|
41
|
-
v = memoizedSelectors[k](data);
|
|
42
|
-
if (result === lastResult) {
|
|
43
|
-
if (v === lastResult[k]) continue;
|
|
44
|
-
result = Object.assign({}, lastResult);
|
|
45
|
-
}
|
|
46
|
-
result[k] = v;
|
|
47
|
-
}
|
|
48
|
-
return (lastResult = result);
|
|
49
|
-
};
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
let result: Selector = function evaluate(data: any) {
|
|
53
|
-
let result: Record<string, any> = Object.assign({}, constants);
|
|
54
|
-
for (let i = 0; i < keys.length; i++) {
|
|
55
|
-
result[keys[i]] = selector[keys[i]](data);
|
|
56
|
-
}
|
|
57
|
-
return result;
|
|
58
|
-
};
|
|
59
|
-
|
|
60
|
-
result.memoize = memoize;
|
|
61
|
-
return result as MemoSelector<InferStructuredSelectorResult<S, C>>;
|
|
62
|
-
}
|
|
1
|
+
import { MemoSelector, Selector } from "./Selector";
|
|
2
|
+
|
|
3
|
+
export interface StructuredSelectorConfig {
|
|
4
|
+
[prop: string]: Selector;
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
// Helper type to infer result type from selector config
|
|
8
|
+
type InferStructuredSelectorResult<T extends StructuredSelectorConfig, C = {}> = {
|
|
9
|
+
[K in keyof T]: T[K] extends Selector<infer R> ? R : any;
|
|
10
|
+
} & C;
|
|
11
|
+
|
|
12
|
+
export function createStructuredSelector<S extends StructuredSelectorConfig, C extends Record<string, any> = {}>(
|
|
13
|
+
selector: S,
|
|
14
|
+
constants?: C,
|
|
15
|
+
): MemoSelector<InferStructuredSelectorResult<S, C>> {
|
|
16
|
+
let keys = Object.keys(selector);
|
|
17
|
+
constants = constants ?? ({} as C);
|
|
18
|
+
if (keys.length == 0) {
|
|
19
|
+
let result: Selector = () => constants;
|
|
20
|
+
result.memoize = () => result;
|
|
21
|
+
return result as MemoSelector<InferStructuredSelectorResult<S, C>>;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
function memoize() {
|
|
25
|
+
let lastResult: Record<string, any> = Object.assign({}, constants);
|
|
26
|
+
|
|
27
|
+
let memoizedSelectors: Record<string, Selector> = {};
|
|
28
|
+
|
|
29
|
+
keys.forEach((key) => {
|
|
30
|
+
memoizedSelectors[key] = selector[key].memoize ? selector[key].memoize() : selector[key];
|
|
31
|
+
lastResult[key] = undefined;
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
return function (data: any) {
|
|
35
|
+
let result = lastResult,
|
|
36
|
+
k,
|
|
37
|
+
v,
|
|
38
|
+
i;
|
|
39
|
+
for (i = 0; i < keys.length; i++) {
|
|
40
|
+
k = keys[i];
|
|
41
|
+
v = memoizedSelectors[k](data);
|
|
42
|
+
if (result === lastResult) {
|
|
43
|
+
if (v === lastResult[k]) continue;
|
|
44
|
+
result = Object.assign({}, lastResult);
|
|
45
|
+
}
|
|
46
|
+
result[k] = v;
|
|
47
|
+
}
|
|
48
|
+
return (lastResult = result);
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
let result: Selector = function evaluate(data: any) {
|
|
53
|
+
let result: Record<string, any> = Object.assign({}, constants);
|
|
54
|
+
for (let i = 0; i < keys.length; i++) {
|
|
55
|
+
result[keys[i]] = selector[keys[i]](data);
|
|
56
|
+
}
|
|
57
|
+
return result;
|
|
58
|
+
};
|
|
59
|
+
|
|
60
|
+
result.memoize = memoize;
|
|
61
|
+
return result as MemoSelector<InferStructuredSelectorResult<S, C>>;
|
|
62
|
+
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import assert from "assert";
|
|
2
|
-
import { createAccessorModelProxy } from "./createAccessorModelProxy";
|
|
3
|
-
import { getAccessor } from "./getAccessor";
|
|
4
|
-
|
|
5
|
-
describe("getAccessor", function () {
|
|
6
|
-
it("works with accessor chains", function () {
|
|
7
|
-
let m = createAccessorModelProxy<{ a: { b: any } }>();
|
|
8
|
-
let accessor = getAccessor(m.a.b);
|
|
9
|
-
assert(typeof accessor.set == "function");
|
|
10
|
-
});
|
|
11
|
-
});
|
|
1
|
+
import assert from "assert";
|
|
2
|
+
import { createAccessorModelProxy } from "./createAccessorModelProxy";
|
|
3
|
+
import { getAccessor } from "./getAccessor";
|
|
4
|
+
|
|
5
|
+
describe("getAccessor", function () {
|
|
6
|
+
it("works with accessor chains", function () {
|
|
7
|
+
let m = createAccessorModelProxy<{ a: { b: any } }>();
|
|
8
|
+
let accessor = getAccessor(m.a.b);
|
|
9
|
+
assert(typeof accessor.set == "function");
|
|
10
|
+
});
|
|
11
|
+
});
|
package/src/data/getAccessor.ts
CHANGED
|
@@ -1,74 +1,74 @@
|
|
|
1
|
-
import { Binding, isBinding } from "./Binding";
|
|
2
|
-
import { isSelector } from "./isSelector";
|
|
3
|
-
import { getSelector } from "./getSelector";
|
|
4
|
-
import { isObject } from "../util/isObject";
|
|
5
|
-
import { AccessorChain, isAccessorChain } from "./createAccessorModelProxy";
|
|
6
|
-
import { Prop } from "../ui/Prop";
|
|
7
|
-
import { View } from "./View";
|
|
8
|
-
|
|
9
|
-
/*
|
|
10
|
-
Accessor provides a common ground between refs and bindings.
|
|
11
|
-
Refs offer simplicity, bindings have better performance with more arguments.
|
|
12
|
-
Accessor works as a common interface which works with both patterns.
|
|
13
|
-
*/
|
|
14
|
-
|
|
15
|
-
export interface Accessor<T = any> {
|
|
16
|
-
get: (data: any) => T;
|
|
17
|
-
set?: (value: T, store: View) => boolean;
|
|
18
|
-
bindInstance?(instance: any): Accessor;
|
|
19
|
-
isAccessor?: boolean;
|
|
20
|
-
isRef?: boolean;
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
export function getAccessor<T = any>(accessor: Prop<T>): Accessor;
|
|
24
|
-
export function getAccessor(accessor: Accessor): Accessor;
|
|
25
|
-
|
|
26
|
-
export function getAccessor(accessor: any): Accessor | undefined {
|
|
27
|
-
if (accessor == null) return undefined;
|
|
28
|
-
|
|
29
|
-
if (isObject(accessor)) {
|
|
30
|
-
if ("isAccessor" in accessor || "isRef" in accessor) return accessor as Accessor;
|
|
31
|
-
if (isBinding(accessor)) {
|
|
32
|
-
let binding = Binding.get(accessor);
|
|
33
|
-
return {
|
|
34
|
-
get: binding.value,
|
|
35
|
-
set: (v, store) => store.set(binding.path, v),
|
|
36
|
-
isAccessor: true,
|
|
37
|
-
};
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
if (isAccessorChain(accessor)) {
|
|
42
|
-
let binding = Binding.get(accessor);
|
|
43
|
-
return {
|
|
44
|
-
get: binding.value,
|
|
45
|
-
set: (v, store) => store.set(binding.path, v),
|
|
46
|
-
isAccessor: true,
|
|
47
|
-
};
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
if (isSelector(accessor)) {
|
|
51
|
-
let selector = getSelector(accessor);
|
|
52
|
-
if (accessor && accessor.set)
|
|
53
|
-
return {
|
|
54
|
-
get: selector,
|
|
55
|
-
isAccessor: true,
|
|
56
|
-
bindInstance(instance) {
|
|
57
|
-
return {
|
|
58
|
-
get: selector,
|
|
59
|
-
set: (value) => accessor.set(value, instance),
|
|
60
|
-
isAccessor: true,
|
|
61
|
-
};
|
|
62
|
-
},
|
|
63
|
-
};
|
|
64
|
-
|
|
65
|
-
return {
|
|
66
|
-
get: selector,
|
|
67
|
-
isAccessor: true,
|
|
68
|
-
};
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
return {
|
|
72
|
-
get: () => accessor,
|
|
73
|
-
};
|
|
74
|
-
}
|
|
1
|
+
import { Binding, isBinding } from "./Binding";
|
|
2
|
+
import { isSelector } from "./isSelector";
|
|
3
|
+
import { getSelector } from "./getSelector";
|
|
4
|
+
import { isObject } from "../util/isObject";
|
|
5
|
+
import { AccessorChain, isAccessorChain } from "./createAccessorModelProxy";
|
|
6
|
+
import { Prop } from "../ui/Prop";
|
|
7
|
+
import { View } from "./View";
|
|
8
|
+
|
|
9
|
+
/*
|
|
10
|
+
Accessor provides a common ground between refs and bindings.
|
|
11
|
+
Refs offer simplicity, bindings have better performance with more arguments.
|
|
12
|
+
Accessor works as a common interface which works with both patterns.
|
|
13
|
+
*/
|
|
14
|
+
|
|
15
|
+
export interface Accessor<T = any> {
|
|
16
|
+
get: (data: any) => T;
|
|
17
|
+
set?: (value: T, store: View) => boolean;
|
|
18
|
+
bindInstance?(instance: any): Accessor;
|
|
19
|
+
isAccessor?: boolean;
|
|
20
|
+
isRef?: boolean;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
export function getAccessor<T = any>(accessor: Prop<T>): Accessor;
|
|
24
|
+
export function getAccessor(accessor: Accessor): Accessor;
|
|
25
|
+
|
|
26
|
+
export function getAccessor(accessor: any): Accessor | undefined {
|
|
27
|
+
if (accessor == null) return undefined;
|
|
28
|
+
|
|
29
|
+
if (isObject(accessor)) {
|
|
30
|
+
if ("isAccessor" in accessor || "isRef" in accessor) return accessor as Accessor;
|
|
31
|
+
if (isBinding(accessor)) {
|
|
32
|
+
let binding = Binding.get(accessor);
|
|
33
|
+
return {
|
|
34
|
+
get: binding.value,
|
|
35
|
+
set: (v, store) => store.set(binding.path, v),
|
|
36
|
+
isAccessor: true,
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
if (isAccessorChain(accessor)) {
|
|
42
|
+
let binding = Binding.get(accessor);
|
|
43
|
+
return {
|
|
44
|
+
get: binding.value,
|
|
45
|
+
set: (v, store) => store.set(binding.path, v),
|
|
46
|
+
isAccessor: true,
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
if (isSelector(accessor)) {
|
|
51
|
+
let selector = getSelector(accessor);
|
|
52
|
+
if (accessor && accessor.set)
|
|
53
|
+
return {
|
|
54
|
+
get: selector,
|
|
55
|
+
isAccessor: true,
|
|
56
|
+
bindInstance(instance) {
|
|
57
|
+
return {
|
|
58
|
+
get: selector,
|
|
59
|
+
set: (value) => accessor.set(value, instance),
|
|
60
|
+
isAccessor: true,
|
|
61
|
+
};
|
|
62
|
+
},
|
|
63
|
+
};
|
|
64
|
+
|
|
65
|
+
return {
|
|
66
|
+
get: selector,
|
|
67
|
+
isAccessor: true,
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
return {
|
|
72
|
+
get: () => accessor,
|
|
73
|
+
};
|
|
74
|
+
}
|
|
@@ -1,43 +1,43 @@
|
|
|
1
|
-
import { getSelector } from "./getSelector";
|
|
2
|
-
import assert from "assert";
|
|
3
|
-
import { createAccessorModelProxy } from "./createAccessorModelProxy";
|
|
4
|
-
|
|
5
|
-
describe("getSelector", function () {
|
|
6
|
-
it("array of selectors converts each element into a selector", function () {
|
|
7
|
-
let arraySelector = [{ bind: "name" }, { expr: "{name}" }];
|
|
8
|
-
let state = { name: "Joe" };
|
|
9
|
-
let selector = getSelector(arraySelector);
|
|
10
|
-
assert.deepEqual(selector(state), ["Joe", "Joe"]);
|
|
11
|
-
});
|
|
12
|
-
|
|
13
|
-
it("get can be used for selectors that have set defined too ", function () {
|
|
14
|
-
let selector = getSelector({ get: (data: any) => data.name, set: () => {} });
|
|
15
|
-
assert.deepEqual(selector({ name: "Jack" }), "Jack");
|
|
16
|
-
});
|
|
17
|
-
|
|
18
|
-
it("0 is a valid selector", function () {
|
|
19
|
-
let selector = getSelector(0);
|
|
20
|
-
assert.deepEqual(selector({}), 0);
|
|
21
|
-
});
|
|
22
|
-
|
|
23
|
-
it("false is a valid selector", function () {
|
|
24
|
-
let selector = getSelector(false);
|
|
25
|
-
assert.deepEqual(selector({}), false);
|
|
26
|
-
});
|
|
27
|
-
|
|
28
|
-
it("undefined is a valid selector", function () {
|
|
29
|
-
let selector = getSelector(undefined);
|
|
30
|
-
assert(selector({}) === undefined);
|
|
31
|
-
});
|
|
32
|
-
|
|
33
|
-
it("null is a valid selector", function () {
|
|
34
|
-
let selector = getSelector(null);
|
|
35
|
-
assert(selector({}) === null);
|
|
36
|
-
});
|
|
37
|
-
|
|
38
|
-
it("works with accessor chains", function () {
|
|
39
|
-
let m = createAccessorModelProxy<{ a: { b: any } }>();
|
|
40
|
-
let selector = getSelector(m.a.b);
|
|
41
|
-
assert(selector({ a: { b: 1 } }) === 1);
|
|
42
|
-
});
|
|
43
|
-
});
|
|
1
|
+
import { getSelector } from "./getSelector";
|
|
2
|
+
import assert from "assert";
|
|
3
|
+
import { createAccessorModelProxy } from "./createAccessorModelProxy";
|
|
4
|
+
|
|
5
|
+
describe("getSelector", function () {
|
|
6
|
+
it("array of selectors converts each element into a selector", function () {
|
|
7
|
+
let arraySelector = [{ bind: "name" }, { expr: "{name}" }];
|
|
8
|
+
let state = { name: "Joe" };
|
|
9
|
+
let selector = getSelector(arraySelector);
|
|
10
|
+
assert.deepEqual(selector(state), ["Joe", "Joe"]);
|
|
11
|
+
});
|
|
12
|
+
|
|
13
|
+
it("get can be used for selectors that have set defined too ", function () {
|
|
14
|
+
let selector = getSelector({ get: (data: any) => data.name, set: () => {} });
|
|
15
|
+
assert.deepEqual(selector({ name: "Jack" }), "Jack");
|
|
16
|
+
});
|
|
17
|
+
|
|
18
|
+
it("0 is a valid selector", function () {
|
|
19
|
+
let selector = getSelector(0);
|
|
20
|
+
assert.deepEqual(selector({}), 0);
|
|
21
|
+
});
|
|
22
|
+
|
|
23
|
+
it("false is a valid selector", function () {
|
|
24
|
+
let selector = getSelector(false);
|
|
25
|
+
assert.deepEqual(selector({}), false);
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
it("undefined is a valid selector", function () {
|
|
29
|
+
let selector = getSelector(undefined);
|
|
30
|
+
assert(selector({}) === undefined);
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
it("null is a valid selector", function () {
|
|
34
|
+
let selector = getSelector(null);
|
|
35
|
+
assert(selector({}) === null);
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
it("works with accessor chains", function () {
|
|
39
|
+
let m = createAccessorModelProxy<{ a: { b: any } }>();
|
|
40
|
+
let selector = getSelector(m.a.b);
|
|
41
|
+
assert(selector({ a: { b: 1 } }) === 1);
|
|
42
|
+
});
|
|
43
|
+
});
|