@expressive/react 0.83.0 → 0.84.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/README.md +2 -2
- package/dist/adapter.d.ts +5 -4
- package/dist/adapter.js +24 -15
- package/dist/adapter.js.map +1 -1
- package/dist/{component-fEqgY0Wy.js → component-CjvlxQIG.js} +41 -50
- package/dist/component-CjvlxQIG.js.map +1 -0
- package/dist/{element-CLcyiJ09.js → element-B1zZlF4n.js} +3 -7
- package/dist/element-B1zZlF4n.js.map +1 -0
- package/dist/has.js +5 -10
- package/dist/has.js.map +1 -1
- package/dist/index.d.ts +4 -4
- package/dist/index.js +10 -10
- package/dist/index.js.map +1 -1
- package/dist/map.js +5 -10
- package/dist/map.js.map +1 -1
- package/package.json +3 -8
- package/dist/component-fEqgY0Wy.js.map +0 -1
- package/dist/element-CLcyiJ09.js.map +0 -1
package/README.md
CHANGED
|
@@ -14,11 +14,11 @@
|
|
|
14
14
|
The React adapter for [Expressive MVC](https://github.com/gabeklein/expressive-mvc). Define state as a class, use it in a component, and reads automatically subscribe - components re-render only when accessed values change.
|
|
15
15
|
|
|
16
16
|
```bash
|
|
17
|
-
npm install @expressive/react
|
|
17
|
+
npm install @expressive/react
|
|
18
18
|
```
|
|
19
19
|
|
|
20
20
|
```tsx
|
|
21
|
-
import
|
|
21
|
+
import State from '@expressive/react';
|
|
22
22
|
|
|
23
23
|
class Counter extends State {
|
|
24
24
|
count = 0;
|
package/dist/adapter.d.ts
CHANGED
|
@@ -175,7 +175,10 @@ declare const Runtime: {
|
|
|
175
175
|
useEffect(effect: () => (() => void) | void, deps?: any[]): void;
|
|
176
176
|
useRef<T>(initial: T): {
|
|
177
177
|
current: T;
|
|
178
|
-
};
|
|
178
|
+
};
|
|
179
|
+
/** Consumed for pre-commit revision validation; absent where commits
|
|
180
|
+
* cannot interleave with writes. */
|
|
181
|
+
useSyncExternalStore?(subscribe: (notify: () => void) => () => void, getSnapshot: () => number, getServerSnapshot?: () => number): number; /** Per-render-attempt lifecycle, set by each adapter (React stacks attempts; others no-op). */
|
|
179
182
|
dedupe(from: Component, context: Context$1): {
|
|
180
183
|
commit(): void;
|
|
181
184
|
remove(): void;
|
|
@@ -183,8 +186,6 @@ declare const Runtime: {
|
|
|
183
186
|
ErrorBoundary: unknown;
|
|
184
187
|
Suspense: any;
|
|
185
188
|
};
|
|
186
|
-
/** Subscribe to an existing observable instance within a component. */
|
|
187
|
-
declare function use<T extends object>(subject: T): T;
|
|
188
189
|
//#endregion
|
|
189
|
-
export { Consumer, Provider, Runtime, State$1 as State
|
|
190
|
+
export { Consumer, Provider, Runtime, State$1 as State };
|
|
190
191
|
//# sourceMappingURL=adapter.d.ts.map
|
package/dist/adapter.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { a as Runtime, c as
|
|
1
|
+
import { a as Runtime, c as useWatch, i as Provider, n as Consumer, o as useFactory, s as useHook } from "./component-CjvlxQIG.js";
|
|
2
2
|
import { Context, State, State as State$1 } from "@expressive/mvc";
|
|
3
3
|
import { observer, watch } from "@expressive/mvc/observable";
|
|
4
4
|
|
|
@@ -11,10 +11,15 @@ State$1.get = function get(argument) {
|
|
|
11
11
|
let mounted = false;
|
|
12
12
|
let pending = false;
|
|
13
13
|
let value;
|
|
14
|
+
let force;
|
|
14
15
|
function update() {
|
|
15
16
|
pending = false;
|
|
16
17
|
next((x) => x + 1);
|
|
17
18
|
}
|
|
19
|
+
function observed() {
|
|
20
|
+
if (mounted) update();
|
|
21
|
+
else pending = true;
|
|
22
|
+
}
|
|
18
23
|
function refresh(action) {
|
|
19
24
|
if (typeof action == "function") action = action();
|
|
20
25
|
update();
|
|
@@ -39,8 +44,11 @@ State$1.get = function get(argument) {
|
|
|
39
44
|
if (next === value) return;
|
|
40
45
|
value = next;
|
|
41
46
|
} else value = current;
|
|
42
|
-
if (!first)
|
|
47
|
+
if (!first) observed();
|
|
43
48
|
first = false;
|
|
49
|
+
return (update) => {
|
|
50
|
+
if (update === true) force();
|
|
51
|
+
};
|
|
44
52
|
}, argument === true);
|
|
45
53
|
if (mounted) {
|
|
46
54
|
pending = true;
|
|
@@ -70,9 +78,13 @@ State$1.get = function get(argument) {
|
|
|
70
78
|
}
|
|
71
79
|
return () => {
|
|
72
80
|
pending = false;
|
|
73
|
-
useHook((
|
|
74
|
-
|
|
75
|
-
return
|
|
81
|
+
useHook((_refresh, reset) => {
|
|
82
|
+
force = reset;
|
|
83
|
+
return () => {
|
|
84
|
+
mounted = true;
|
|
85
|
+
if (pending) update();
|
|
86
|
+
return release;
|
|
87
|
+
};
|
|
76
88
|
});
|
|
77
89
|
return value === void 0 ? null : value;
|
|
78
90
|
};
|
|
@@ -101,16 +113,13 @@ State$1.use = function use(...args) {
|
|
|
101
113
|
ready = true;
|
|
102
114
|
});
|
|
103
115
|
}
|
|
104
|
-
return
|
|
105
|
-
|
|
116
|
+
return useWatch(instance, () => {
|
|
117
|
+
ready = true;
|
|
118
|
+
const release = instance.mount?.();
|
|
106
119
|
return () => {
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
if (typeof release == "function") release();
|
|
111
|
-
context.pop();
|
|
112
|
-
instance.set(null);
|
|
113
|
-
};
|
|
120
|
+
if (typeof release == "function") release();
|
|
121
|
+
context.pop();
|
|
122
|
+
instance.set(null);
|
|
114
123
|
};
|
|
115
124
|
});
|
|
116
125
|
};
|
|
@@ -118,5 +127,5 @@ State$1.use = function use(...args) {
|
|
|
118
127
|
};
|
|
119
128
|
|
|
120
129
|
//#endregion
|
|
121
|
-
export { Consumer, Provider, Runtime, State
|
|
130
|
+
export { Consumer, Provider, Runtime, State };
|
|
122
131
|
//# sourceMappingURL=adapter.js.map
|
package/dist/adapter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","names":[],"sources":["../src/state.get.ts","../src/state.use.ts"],"sourcesContent":["import { State, Context } from '@expressive/mvc';\nimport { observer, watch } from '@expressive/mvc/observable';\nimport { Runtime, useFactory, useHook } from './runtime';\n\n/** Type may not be undefined - instead will be null. */\ntype NoVoid<T> = T extends undefined | void ? null : T;\n\ndeclare module '@expressive/mvc' {\n namespace State {\n type ForceRefresh = {\n /** Request a refresh for current component. */\n (): void;\n\n /**\n * Request a refresh and again after promise either resolves or rejects.\n *\n * @param waitFor Promise to wait for.\n * @returns Promise which resolves, after refresh, to same value as `waitFor`.\n */\n <T = void>(waitFor: Promise<T>): Promise<T>;\n\n /**\n * Request refresh before and after async function.\n * A refresh will occur both before and after the given function.\n *\n * **Note:** Any actions performed before first `await` will occur prior to refresh.\n *\n * @param invoke Async function to invoke.\n * @returns Promise which resolves returned value after refresh.\n */\n <T = void>(invoke: () => Promise<T>): Promise<T>;\n };\n\n type GetFactory<T extends State, R> = (\n this: T,\n current: T,\n refresh: ForceRefresh\n ) => R;\n\n type GetEffect<T extends State> = (\n this: T,\n current: T,\n refresh: ForceRefresh\n ) => null;\n\n /** Fetch instance of this class from context. */\n function get<T extends State>(this: State.Extends<T>): T;\n\n /** Fetch instance of this class optionally. */\n function get<T extends State>(\n this: State.Extends<T>,\n required: false\n ): T | undefined;\n\n /** Fetch instance of this class from context. */\n function get<T extends State>(\n this: State.Extends<T>,\n requireValues: true\n ): Required<T>;\n\n function get<T extends State, R>(\n this: State.Extends<T>,\n factory: GetFactory<T, Promise<R> | R>\n ): NoVoid<R>;\n\n function get<T extends State>(\n this: State.Extends<T>,\n factory: GetEffect<T>\n ): null;\n }\n}\n\nState.get = function get<T extends State>(\n this: State.Extends<T>,\n argument?: boolean | State.GetFactory<T, unknown>\n) {\n const next = Runtime.useState(0)[1];\n const local = Context.get();\n const render = useFactory(() => {\n let unwatch: (() => void) | undefined;\n let mounted = false;\n let pending = false;\n let value: any;\n\n function update() {\n pending = false;\n next((x) => x + 1);\n }\n\n function refresh<T>(action?: Promise<T> | (() => Promise<T>)): any {\n if (typeof action == 'function') action = action();\n update();\n if (action instanceof Promise) return action.finally(update);\n }\n\n function release() {\n unsubscribe();\n unwatch?.();\n unwatch = undefined;\n }\n\n function attach(next: T) {\n unwatch?.();\n\n if (observer(next) === null) {\n value = typeof argument === 'function'\n ? argument.call(next, next, refresh)\n : next;\n unwatch = () => {};\n return release;\n }\n\n let first = true;\n\n unwatch = watch(\n next,\n (current) => {\n if (typeof argument === 'function') {\n const next = argument.call(current, current, refresh);\n if (next === value) return;\n value = next;\n } else {\n value = current;\n }\n\n if (!first)
|
|
1
|
+
{"version":3,"file":"adapter.js","names":[],"sources":["../src/state.get.ts","../src/state.use.ts"],"sourcesContent":["import { State, Context } from '@expressive/mvc';\nimport { observer, watch } from '@expressive/mvc/observable';\nimport { Runtime, useFactory, useHook } from './runtime';\n\n/** Type may not be undefined - instead will be null. */\ntype NoVoid<T> = T extends undefined | void ? null : T;\n\ndeclare module '@expressive/mvc' {\n namespace State {\n type ForceRefresh = {\n /** Request a refresh for current component. */\n (): void;\n\n /**\n * Request a refresh and again after promise either resolves or rejects.\n *\n * @param waitFor Promise to wait for.\n * @returns Promise which resolves, after refresh, to same value as `waitFor`.\n */\n <T = void>(waitFor: Promise<T>): Promise<T>;\n\n /**\n * Request refresh before and after async function.\n * A refresh will occur both before and after the given function.\n *\n * **Note:** Any actions performed before first `await` will occur prior to refresh.\n *\n * @param invoke Async function to invoke.\n * @returns Promise which resolves returned value after refresh.\n */\n <T = void>(invoke: () => Promise<T>): Promise<T>;\n };\n\n type GetFactory<T extends State, R> = (\n this: T,\n current: T,\n refresh: ForceRefresh\n ) => R;\n\n type GetEffect<T extends State> = (\n this: T,\n current: T,\n refresh: ForceRefresh\n ) => null;\n\n /** Fetch instance of this class from context. */\n function get<T extends State>(this: State.Extends<T>): T;\n\n /** Fetch instance of this class optionally. */\n function get<T extends State>(\n this: State.Extends<T>,\n required: false\n ): T | undefined;\n\n /** Fetch instance of this class from context. */\n function get<T extends State>(\n this: State.Extends<T>,\n requireValues: true\n ): Required<T>;\n\n function get<T extends State, R>(\n this: State.Extends<T>,\n factory: GetFactory<T, Promise<R> | R>\n ): NoVoid<R>;\n\n function get<T extends State>(\n this: State.Extends<T>,\n factory: GetEffect<T>\n ): null;\n }\n}\n\nState.get = function get<T extends State>(\n this: State.Extends<T>,\n argument?: boolean | State.GetFactory<T, unknown>\n) {\n const next = Runtime.useState(0)[1];\n const local = Context.get();\n const render = useFactory(() => {\n let unwatch: (() => void) | undefined;\n let mounted = false;\n let pending = false;\n let value: any;\n let force!: () => void;\n\n function update() {\n pending = false;\n next((x) => x + 1);\n }\n\n function observed() {\n if (mounted) update();\n else pending = true;\n }\n\n function refresh<T>(action?: Promise<T> | (() => Promise<T>)): any {\n if (typeof action == 'function') action = action();\n update();\n if (action instanceof Promise) return action.finally(update);\n }\n\n function release() {\n unsubscribe();\n unwatch?.();\n unwatch = undefined;\n }\n\n function attach(next: T) {\n unwatch?.();\n\n if (observer(next) === null) {\n value = typeof argument === 'function'\n ? argument.call(next, next, refresh)\n : next;\n unwatch = () => {};\n return release;\n }\n\n let first = true;\n\n unwatch = watch(\n next,\n (current) => {\n if (typeof argument === 'function') {\n const next = argument.call(current, current, refresh);\n if (next === value) return;\n value = next;\n } else {\n value = current;\n }\n\n if (!first) observed();\n first = false;\n\n return (update) => {\n if (update === true) force();\n };\n },\n argument === true\n );\n\n if (mounted) {\n pending = true;\n queueMicrotask(() => pending && update());\n }\n\n return release;\n }\n\n const unsubscribe = local.get(this, attach);\n\n if (!unwatch) {\n unsubscribe();\n if (argument === false) return () => undefined;\n throw new Error(`Could not find ${this} in context.`);\n }\n\n if (value === null) {\n release();\n return () => null;\n }\n\n if (value instanceof Promise) {\n let error: Error | undefined;\n\n release();\n\n value\n .then(\n (x) => (value = x),\n (e) => (error = e)\n )\n .finally(update);\n\n value = null;\n\n return () => {\n if (error) throw error;\n return value === undefined ? null : value;\n };\n }\n\n return () => {\n pending = false;\n useHook((_refresh, reset) => {\n force = reset;\n\n return () => {\n mounted = true;\n if (pending) update();\n return release;\n };\n });\n return value === undefined ? null : value;\n };\n });\n\n return render();\n};\n","import { State, Context } from '@expressive/mvc';\nimport type { UseState } from '@expressive/mvc';\nimport { useFactory, useWatch } from './runtime';\n\ndeclare module '@expressive/mvc' {\n interface UseState extends State {\n /**\n * Optional hook called when State.use() is invoked within a React component.\n *\n * This is called *every render* of the component, and will intercept\n * arguments which would otherwise be passed into the State constructor.\n *\n * @param props Arguments passed to State.use().\n */\n use?(...props: any[]): Promise<void> | void;\n\n /**\n * Optional hook called once the host component commits. Return a function\n * to run when it unmounts.\n *\n * Not called during server render, nor for an instance merely observed or\n * placed: `.get()` and `{instance}` reach one a component does not own, and\n * `State.new()` has no component at all.\n *\n * Client-only effects belong here - setup which must accompany the instance\n * itself belongs in `new()`.\n */\n mount?(): (() => void) | void;\n }\n\n namespace State {\n type UseArgs<T extends State> = T extends {\n use(...props: infer P): any;\n }\n ? P\n : State.Args<T>;\n\n /**\n * Create and manage instance of this State within React component.\n *\n * @param args Arguments to pass to constructor or `use` method (if defined).\n * @returns Managed instance of this State.\n */\n function use<T extends UseState>(\n this: State.Type<T>,\n ...args: UseArgs<T>\n ): T;\n }\n}\n\nState.use = function use<T extends State>(\n this: State.Type<T>,\n ...args: State.UseArgs<T>\n) {\n const outer = Context.get();\n const render = useFactory(() => {\n const add = (arg: unknown) =>\n typeof arg == 'object' && instance.set(arg as State.Assign<T>);\n\n let use = (...args: State.Args<T>) => Promise.all(args.flat().map(add));\n\n const instance = new this((x) => {\n if ('use' in x && typeof x.use == 'function') {\n use = x.use.bind(x);\n use(...args);\n }\n else return args;\n });\n\n const context = outer.push(instance);\n\n let ready = false;\n\n return (args: State.Args<T>) => {\n if (ready) {\n ready = false;\n Promise.resolve(use(...args)).finally(() => {\n ready = true;\n });\n }\n\n return useWatch(instance, () => {\n ready = true;\n\n const release = (instance as UseState).mount?.();\n\n return () => {\n if (typeof release == 'function') release();\n context.pop();\n instance.set(null);\n };\n });\n };\n });\n\n return render(args);\n};\n"],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { Component, Context as Context$1, State, unbind } from "@expressive/mvc";
|
|
2
|
-
import {
|
|
2
|
+
import { watch } from "@expressive/mvc/observable";
|
|
3
3
|
|
|
4
4
|
//#region src/runtime.ts
|
|
5
5
|
const Runtime = {};
|
|
6
|
+
const noop = () => () => {};
|
|
6
7
|
function useFactory(factory) {
|
|
7
8
|
const ref = Runtime.useRef(null);
|
|
8
9
|
return ref.current || (ref.current = factory());
|
|
@@ -10,21 +11,30 @@ function useFactory(factory) {
|
|
|
10
11
|
/**
|
|
11
12
|
* Mount-effect with a refreshable return value, safe under React StrictMode.
|
|
12
13
|
*
|
|
13
|
-
* @param callback Setup handler, run on creation; receives a setter
|
|
14
|
-
*
|
|
15
|
-
*
|
|
14
|
+
* @param callback Setup handler, run on creation; receives a setter, plus a
|
|
15
|
+
* reset which invalidates the rendered value so in-flight render attempts
|
|
16
|
+
* revalidate, and returns a mount handler, which in turn returns a cleanup.
|
|
17
|
+
* All share this hook's render counter, so a StrictMode remount repeats
|
|
18
|
+
* none of them.
|
|
16
19
|
* @returns Latest value published via the setter (`undefined` until set).
|
|
17
20
|
*/
|
|
18
21
|
function useHook(callback) {
|
|
19
|
-
const { current } = Runtime.useRef({
|
|
22
|
+
const { current } = Runtime.useRef({
|
|
23
|
+
rendered: 0,
|
|
24
|
+
revision: 0
|
|
25
|
+
});
|
|
20
26
|
current.update = Runtime.useState(() => {
|
|
21
27
|
if (!current.rendered) current.commit = callback((next) => {
|
|
22
28
|
current.output = next;
|
|
23
29
|
if (current.mounted) current.update?.((x) => x + 1);
|
|
24
30
|
else if (current.update) current.pending = true;
|
|
31
|
+
}, () => {
|
|
32
|
+
current.revision++;
|
|
25
33
|
});
|
|
26
34
|
return current.rendered++;
|
|
27
35
|
})[1];
|
|
36
|
+
const getRevision = () => current.revision;
|
|
37
|
+
Runtime.useSyncExternalStore?.(noop, getRevision, getRevision);
|
|
28
38
|
Runtime.useEffect(() => {
|
|
29
39
|
current.mounted = true;
|
|
30
40
|
if (current.commit) {
|
|
@@ -41,35 +51,22 @@ function useHook(callback) {
|
|
|
41
51
|
}, []);
|
|
42
52
|
return current.output;
|
|
43
53
|
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
if (!status.ready) event(subject);
|
|
61
|
-
let init = true;
|
|
62
|
-
current.unwatch = watch(subject, (next, changed) => {
|
|
63
|
-
current.proxy = next;
|
|
64
|
-
if (changed.length && !init) update((x) => x + 1);
|
|
65
|
-
});
|
|
66
|
-
init = false;
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
Runtime.useEffect(() => () => {
|
|
70
|
-
if (--current.mounted < 1) current.unwatch?.();
|
|
71
|
-
}, []);
|
|
72
|
-
return current.proxy;
|
|
54
|
+
function useWatch(from, mount) {
|
|
55
|
+
return useHook((refresh, reset) => {
|
|
56
|
+
const release = watch(from, (current) => {
|
|
57
|
+
refresh(current);
|
|
58
|
+
return (update) => {
|
|
59
|
+
if (update === true) reset();
|
|
60
|
+
};
|
|
61
|
+
});
|
|
62
|
+
return () => {
|
|
63
|
+
const cleanup = mount?.();
|
|
64
|
+
return () => {
|
|
65
|
+
release();
|
|
66
|
+
cleanup?.();
|
|
67
|
+
};
|
|
68
|
+
};
|
|
69
|
+
}) ?? from;
|
|
73
70
|
}
|
|
74
71
|
|
|
75
72
|
//#endregion
|
|
@@ -232,18 +229,15 @@ function render(from, context) {
|
|
|
232
229
|
const content = from.render;
|
|
233
230
|
const Render = () => content.call(from, from.props);
|
|
234
231
|
const Component = () => {
|
|
235
|
-
from =
|
|
236
|
-
|
|
232
|
+
from = useWatch(from, () => {
|
|
233
|
+
const release = self.mount?.();
|
|
234
|
+
commit();
|
|
237
235
|
return () => {
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
if (typeof release == "function") release();
|
|
242
|
-
remove();
|
|
243
|
-
context.pop();
|
|
244
|
-
};
|
|
236
|
+
if (typeof release == "function") release();
|
|
237
|
+
remove();
|
|
238
|
+
context.pop();
|
|
245
239
|
};
|
|
246
|
-
})
|
|
240
|
+
});
|
|
247
241
|
return createFrame(from, context, createElement(Render));
|
|
248
242
|
};
|
|
249
243
|
return () => createElement(Component);
|
|
@@ -259,10 +253,7 @@ function subcomponents(target, configurable) {
|
|
|
259
253
|
get() {
|
|
260
254
|
const owner = this.is;
|
|
261
255
|
let render = unbind(value);
|
|
262
|
-
const Component = (props) => render.call(
|
|
263
|
-
const release = watch(owner, set);
|
|
264
|
-
return () => release;
|
|
265
|
-
}) || owner, props);
|
|
256
|
+
const Component = (props) => render.call(useWatch(owner), props);
|
|
266
257
|
Object.defineProperty(owner, key, {
|
|
267
258
|
configurable: true,
|
|
268
259
|
get: () => Component,
|
|
@@ -277,5 +268,5 @@ function subcomponents(target, configurable) {
|
|
|
277
268
|
}
|
|
278
269
|
|
|
279
270
|
//#endregion
|
|
280
|
-
export { Runtime as a,
|
|
281
|
-
//# sourceMappingURL=component-
|
|
271
|
+
export { Runtime as a, useWatch as c, Provider as i, Consumer as n, useFactory as o, Context$1 as r, useHook as s, createFrame as t };
|
|
272
|
+
//# sourceMappingURL=component-CjvlxQIG.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"component-CjvlxQIG.js","names":["Context"],"sources":["../src/runtime.ts","../src/context.ts","../src/component.ts"],"sourcesContent":["import type { Component } from '@expressive/mvc';\nimport { watch } from '@expressive/mvc/observable';\nimport type { Context } from './context';\n\nexport const Runtime = {} as {\n /** Host own-property keys to trap out of observed state; assigned by each adapter. */\n ignore: string[];\n createElement(type: any, props?: any, ...children: any[]): any;\n createContext<T>(value: T): any;\n useContext(context: any): any;\n useState<S>(initial: S | (() => S)): [S, (next: (previous: S) => S) => void];\n useEffect(effect: () => (() => void) | void, deps?: any[]): void;\n useRef<T>(initial: T): { current: T };\n /** Consumed for pre-commit revision validation; absent where commits\n * cannot interleave with writes. */\n useSyncExternalStore?(\n subscribe: (notify: () => void) => () => void,\n getSnapshot: () => number,\n getServerSnapshot?: () => number\n ): number;\n /** Per-render-attempt lifecycle, set by each adapter (React stacks attempts; others no-op). */\n dedupe(from: Component, context: Context): { commit(): void; remove(): void };\n /** Host error-boundary component, wrapping a Component whose `catch` is set. */\n ErrorBoundary: unknown;\n Suspense: any;\n};\n\nconst noop = () => () => {};\n\nexport function useFactory<T extends Function>(factory: () => T) {\n const ref = Runtime.useRef<T | null>(null);\n return ref.current || (ref.current = factory());\n}\n\n/**\n * Mount-effect with a refreshable return value, safe under React StrictMode.\n *\n * @param callback Setup handler, run on creation; receives a setter, plus a\n * reset which invalidates the rendered value so in-flight render attempts\n * revalidate, and returns a mount handler, which in turn returns a cleanup.\n * All share this hook's render counter, so a StrictMode remount repeats\n * none of them.\n * @returns Latest value published via the setter (`undefined` until set).\n */\nexport function useHook<T = void>(\n callback: (\n refresh: (next: T) => void,\n reset: () => void\n ) => () => (() => void) | void\n) {\n const { current } = Runtime.useRef(\n { rendered: 0, revision: 0 } as {\n rendered: number;\n revision: number;\n mounted?: boolean;\n pending?: boolean;\n commit?: () => (() => void) | void;\n release?: (() => void) | void;\n update?: (next: (previous: number) => number) => void;\n output: T;\n }\n );\n\n current.update = Runtime.useState(() => {\n if (!current.rendered)\n current.commit = callback(\n (next) => {\n current.output = next;\n if (current.mounted) current.update?.((x) => x + 1);\n else if (current.update) current.pending = true;\n },\n () => {\n current.revision++;\n }\n );\n\n return current.rendered++;\n })[1];\n\n const getRevision = () => current.revision;\n\n Runtime.useSyncExternalStore?.(noop, getRevision, getRevision);\n\n Runtime.useEffect(() => {\n current.mounted = true;\n\n if (current.commit) {\n current.release = current.commit();\n current.commit = undefined;\n }\n\n if (current.pending) {\n current.pending = false;\n current.update!((x) => x + 1);\n }\n\n return () => {\n if (--current.rendered <= 0) current.release?.();\n }\n }, []);\n\n return current.output;\n}\n\nexport function useWatch<T extends object>(\n from: T,\n mount?: () => (() => void) | void\n) {\n return useHook<T>((refresh, reset) => {\n const release = watch(from, (current) => {\n refresh(current);\n\n return (update) => {\n if (update === true) reset();\n };\n });\n\n return () => {\n const cleanup = mount?.();\n\n return () => {\n release();\n cleanup?.();\n };\n };\n }) ?? from;\n}\n","import { State, Context, Component } from '@expressive/mvc';\nimport type { UseState } from '@expressive/mvc';\nimport { Runtime, useHook } from './runtime';\n\nlet shared: any;\n\n/**\n * Lazily-created context carrying the active {@link Context} down the tree.\n * Lazy because the framework's `createContext` arrives via {@link Runtime},\n * which an adapter's entry populates at load - after this module evaluates.\n */\nfunction Layers() {\n return shared || (shared = Runtime.createContext(Context.root));\n}\n\n/** Read the ambient {@link Context} from the nearest Layers provider. */\nfunction useAmbient() {\n return Runtime.useContext(Layers());\n}\n\n/** Wrap `children` in a {@link Layers} provider carrying `context` down the tree. */\nfunction createProvider(context: Context, children: any) {\n return Runtime.createElement(Layers().Provider, { value: context, children });\n}\n\n// Class components consume the active Context through the host's `contextType`\nObject.defineProperty(Component, 'contextType', { configurable: true, get: Layers });\n\nconst _get = Context.get;\n\nContext.get = (state?: State) => {\n if (!state)\n try {\n return useAmbient();\n } catch { }\n\n return _get(state);\n};\n\ndeclare namespace Consumer {\n type Props<T extends State> = {\n /** Type of controller to fetch from context. */\n for: State.Extends<T>;\n\n /**\n * Render function, will receive instance of desired controller.\n *\n * Called every render of parent component.\n * Similar to `State.get()`, updates to properties accessed in\n * this function will cause a refresh when they change.\n */\n children: (value: T) => Component.Node | void;\n };\n}\n\nfunction Consumer<T extends State>(props: Consumer.Props<T>) {\n return props.for.get((i) => props.children(i));\n}\n\ndeclare namespace Provider {\n /**\n * Runs for each State registered by this Provider. Return value is ignored -\n * to run teardown with a State, use `state.set(null, callback)`.\n */\n type ForEach<T> = (state: T) => void;\n\n interface SharedProps {\n /**\n * Children to render within this Provider.\n */\n children?: Component.Node;\n\n /** A fallback tree to show when suspended. */\n fallback?: Component.Node;\n\n /**\n * A name for this Suspense boundary for instrumentation purposes.\n * The name will help identify this boundary in React DevTools.\n */\n name?: string | undefined;\n }\n\n type ForSingleProps<T extends State> = SharedProps & {\n for: T | State.Type<T>;\n is: (instance: T) => void;\n } & { [K in State.Field<T>]?: T[K] };\n\n type ForMultipleProps<T extends State> = SharedProps & {\n for: Context.Accept<T>;\n is?: ForEach<T>;\n };\n\n type Props<T extends State = State> = ForSingleProps<T> | ForMultipleProps<T>;\n}\n\ntype Digest<T extends State> = (props: Provider.Props<T>) => Context;\n\nfunction Provider<T extends State>({\n children,\n fallback,\n name,\n ...props\n}: Provider.Props<T>) {\n const ambient = useAmbient();\n const digest: Digest<T> = useHook((returns) => {\n const context = new Context(ambient);\n const fresh: State[] = [];\n\n let applied: Context.Accept<T> | undefined;\n let solo: State | undefined;\n\n returns(({ is, for: input, ...rest }) => {\n if (input !== applied) {\n const single = State.is(input) || input instanceof State;\n\n applied = input;\n solo = undefined;\n\n context.set(input, (state, owned) => {\n if (single) solo = state;\n if (owned) fresh.push(state);\n if (is) is(state);\n });\n }\n\n if (solo && Object.keys(rest).length) solo.set(rest);\n\n return context;\n });\n\n return () => {\n const release = fresh.map((state) => (state as UseState).mount?.());\n\n return () => {\n for (const done of release) if (typeof done == 'function') done();\n context.pop();\n };\n };\n });\n\n return createProvider(\n digest(props),\n fallback !== undefined\n ? Runtime.createElement(Runtime.Suspense, { fallback, name }, children)\n : children\n );\n}\n\nexport { Consumer, Provider, Context, createProvider };\n","import { Component, unbind } from '@expressive/mvc';\nimport { createProvider, type Context } from './context';\nimport { Runtime, useWatch } from './runtime';\n\ndeclare module '@expressive/mvc' {\n namespace Component {\n /**\n * Not available - a Component is rendered, not a hook.\n * Render it with `<Component />` or `{component}`.\n * For a bare instance use `Component.new()`.\n */\n const use: never;\n }\n\n interface Component {\n /**\n * Optional hook called once this Component commits. Return a function to\n * run when it unmounts.\n *\n * Not called during server render, nor for an instance placed as\n * `{component}` - a placement does not own what it renders. Client-only\n * effects belong here; setup which must accompany the instance itself\n * belongs in `new()`.\n */\n mount?(): (() => void) | void;\n\n /** @deprecated Only to satisfy host JSX. Use `this.get(State)` instead. */\n readonly context: Context;\n /** @deprecated Only to satisfy host JSX. Use `this.get()` instead. */\n readonly state: State.Values<this>;\n /** @deprecated Only to satisfy host JSX. Use `this.set({})` instead. */\n setState: (state: any, callback?: () => void) => void;\n /** @deprecated Only to satisfy host JSX. Use `this.set(key)` instead. */\n forceUpdate: (callback?: () => void) => void;\n }\n}\n\n// Host-agnostic seams: `state` is a read-only values bag; `context`'s setter\n// pushes a child context, registers the instance for teardown, and installs its\n// per-instance render host. Host-specific descriptors stay in each adapter.\nObject.defineProperties(Component.prototype, {\n state: {\n set() {},\n get: Component.prototype.get\n },\n context: {\n set: bootstrap\n }\n});\n\nObject.defineProperty(Component, 'use', {\n configurable: true,\n value() {\n throw new Error(\n `${this} is a Component - render as an element instead of calling use().`\n );\n }\n});\n\n/**\n * `State.on` handler that prepares a Component's prototype at bootstrap, before\n * mvc classifies its members:\n *\n * - On the root Component, host own-property keys are trapped so each lands as a\n * plain own property (out of observed state); each adapter assigns its own set.\n * - capitalized methods are rewritten into subcomponents as non-configurable\n * getters, so bootstrap skips them too.\n *\n * (Sealing `render` as the content-render seam is handled by core itself.)\n *\n * `before` covers the per-instance case: a capitalized function assigned as an\n * instance field (e.g. `Sidebar = Sidebar` to inject or override one), promoted\n * before `observe` so it is not mistaken for reactive state.\n */\nComponent.on({\n type(type) {\n if (type === Component)\n for (const key of Runtime.ignore)\n Object.defineProperty(Component.prototype, key, {\n set(value) {\n Object.defineProperty(this, key, { value, writable: true });\n }\n });\n\n // capitalized methods into subcomponents\n subcomponents(type.prototype);\n },\n before(self){\n // capitalized instance fields into subcomponents\n subcomponents(self, true);\n }\n});\n\nfunction bootstrap(this: Component, context: Context){\n context = context.push();\n context.set(this, () => () => this.set(null));\n\n Object.defineProperties(this, {\n context: {\n get: () => context,\n set() {}\n },\n render: {\n value: render(this, context)\n }\n });\n\n this.set(null, () => {\n Object.defineProperty(this, 'props', {\n value: this.props,\n writable: true\n });\n })\n}\n\n/**\n * Wrap a content element in its context provider, a Suspense boundary (unless\n * `fallback` is `false`) and, when `catch` is set, the host error boundary.\n */\nfunction createFrame(from: Component, context: Context, children: unknown) {\n const { createElement } = Runtime;\n\n if(from.fallback !== false)\n children = createElement(\n Runtime.Suspense,\n { fallback: from.fallback, name: String(from) },\n children\n )\n\n children = createProvider(context, children);\n\n return from.catch\n ? createElement(Runtime.ErrorBoundary, { self: from, children })\n : children;\n}\n\n/**\n * Ownership host for `<Component/>`: React owns the instance, so its render\n * threads the bootstrap-pushed context through `Runtime.dedupe` (React stacks\n * render attempts) and tears that context down - destroying the instance - on\n * unmount.\n */\nfunction render(from: Component, context: Context) {\n const { createElement } = Runtime;\n const { commit, remove } = Runtime.dedupe(from, context);\n\n const self = from;\n const content = from.render;\n const Render = () => content.call(from, from.props);\n const Component = () => {\n from = useWatch(from, () => {\n const release = self.mount?.();\n\n commit();\n\n return () => {\n if (typeof release == 'function') release();\n remove();\n context.pop();\n };\n });\n\n return createFrame(from, context, createElement(Render));\n };\n\n return () => createElement(Component);\n}\n\n/** Rewrite each own capitalized function on `target` into a subcomponent. */\nfunction subcomponents(target: object, configurable?: boolean) {\n for (const key of Object.getOwnPropertyNames(target)) {\n if (!/^[A-Z]/.test(key)) continue;\n const { value } = Object.getOwnPropertyDescriptor(target, key)!;\n if (typeof value != 'function') continue;\n Object.defineProperty(target, key, {\n configurable,\n get(this: Component) {\n const owner = this.is;\n let render = unbind(value);\n const Component = (props: unknown) =>\n render.call(useWatch(owner), props);\n\n Object.defineProperty(owner, key, {\n configurable: true,\n get: () => Component,\n set(fn: Function) {\n render = fn;\n }\n });\n\n return Component;\n }\n });\n }\n}\n\nexport { createFrame };\n"],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { a as Runtime, c as
|
|
1
|
+
import { a as Runtime, c as useWatch, o as useFactory, r as Context$1, t as createFrame } from "./component-CjvlxQIG.js";
|
|
2
2
|
import { Component } from "@expressive/mvc";
|
|
3
|
-
import { observer, watch } from "@expressive/mvc/observable";
|
|
4
3
|
|
|
5
4
|
//#region src/element.ts
|
|
6
5
|
let template;
|
|
@@ -35,10 +34,7 @@ function Element() {
|
|
|
35
34
|
const context = outer.push(this);
|
|
36
35
|
const Content = () => from.render(from.props);
|
|
37
36
|
return () => {
|
|
38
|
-
from =
|
|
39
|
-
if (observer(this) !== null) watch(this, refresh);
|
|
40
|
-
return () => () => context.pop();
|
|
41
|
-
}) || this;
|
|
37
|
+
from = useWatch(this, () => () => context.pop());
|
|
42
38
|
return createFrame(from, context, Runtime.createElement(Content));
|
|
43
39
|
};
|
|
44
40
|
})();
|
|
@@ -46,4 +42,4 @@ function Element() {
|
|
|
46
42
|
|
|
47
43
|
//#endregion
|
|
48
44
|
export { seam as t };
|
|
49
|
-
//# sourceMappingURL=element-
|
|
45
|
+
//# sourceMappingURL=element-B1zZlF4n.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"element-B1zZlF4n.js","names":["Context"],"sources":["../src/element.ts"],"sourcesContent":["import { Component } from '@expressive/mvc';\nimport { Context } from './context';\nimport { Runtime, useFactory, useWatch } from './runtime';\nimport { createFrame } from './component';\n\ndeclare module '@expressive/mvc' {\n interface Component {\n /** @deprecated Only to satisfy host JSX. */\n readonly type: typeof Component;\n }\n}\n\nlet template: any;\n\n/**\n * Borrow a host element's descriptors so `self` passes as a React element.\n * `props` false keeps the target's own `props` (Component supplies its own);\n * an object installs it as the element's props (collections have none).\n */\nexport function seam(\n self: object,\n props: object | false,\n type: Function,\n key: unknown\n) {\n if (!template) template = Runtime.createElement('template');\n\n const descriptors = Object.getOwnPropertyDescriptors(template);\n const store = descriptors._store?.value;\n\n if (props === false) delete (descriptors as any).props;\n\n if (store)\n descriptors._store.value = Object.create(\n Object.getPrototypeOf(store),\n Object.getOwnPropertyDescriptors(store)\n );\n\n Object.defineProperties(self, {\n ...descriptors,\n $$typeof: { value: template.$$typeof },\n ...(props ? { props: { value: props } } : undefined),\n key: { value: key },\n type: { value: type }\n });\n\n return template.$$typeof;\n}\n\nObject.defineProperty(Component.prototype, '$$typeof', {\n get(this: Component) {\n const self = this.is;\n return seam(self, false, Element.bind(self), self.key);\n }\n});\n\nfunction Element(this: Component){\n const outer = Context.get();\n const render = useFactory(() => {\n let from = this;\n const context = outer.push(this);\n const Content = () => from.render(from.props);\n\n return () => {\n from = useWatch(this, () => () => context.pop());\n\n return createFrame(from, context, Runtime.createElement(Content));\n };\n });\n\n return render();\n}\n"],"mappings":";;;;AAYA,IAAI;;;;;;AAOJ,SAAgB,KACd,MACA,OACA,MACA,KACA;AACA,KAAI,CAAC,SAAU,YAAW,QAAQ,cAAc,WAAW;CAE3D,MAAM,cAAc,OAAO,0BAA0B,SAAS;CAC9D,MAAM,QAAQ,YAAY,QAAQ;AAElC,KAAI,UAAU,MAAO,QAAQ,YAAoB;AAEjD,KAAI,MACF,aAAY,OAAO,QAAQ,OAAO,OAChC,OAAO,eAAe,MAAM,EAC5B,OAAO,0BAA0B,MAAM,CACxC;AAEH,QAAO,iBAAiB,MAAM;EAC5B,GAAG;EACH,UAAU,EAAE,OAAO,SAAS,UAAU;EACtC,GAAI,QAAQ,EAAE,OAAO,EAAE,OAAO,OAAO,EAAE,GAAG;EAC1C,KAAK,EAAE,OAAO,KAAK;EACnB,MAAM,EAAE,OAAO,MAAM;EACtB,CAAC;AAEF,QAAO,SAAS;;AAGlB,OAAO,eAAe,UAAU,WAAW,YAAY,EACrD,MAAqB;CACnB,MAAM,OAAO,KAAK;AAClB,QAAO,KAAK,MAAM,OAAO,QAAQ,KAAK,KAAK,EAAE,KAAK,IAAI;GAEzD,CAAC;AAEF,SAAS,UAAwB;CAC/B,MAAM,QAAQA,UAAQ,KAAK;AAa3B,QAZe,iBAAiB;EAC9B,IAAI,OAAO;EACX,MAAM,UAAU,MAAM,KAAK,KAAK;EAChC,MAAM,gBAAgB,KAAK,OAAO,KAAK,MAAM;AAE7C,eAAa;AACX,UAAO,SAAS,kBAAkB,QAAQ,KAAK,CAAC;AAEhD,UAAO,YAAY,MAAM,SAAS,QAAQ,cAAc,QAAQ,CAAC;;GAEnE,EAEa"}
|
package/dist/has.js
CHANGED
|
@@ -1,20 +1,15 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { t as seam } from "./element-
|
|
1
|
+
import { c as useWatch } from "./component-CjvlxQIG.js";
|
|
2
|
+
import { t as seam } from "./element-B1zZlF4n.js";
|
|
3
3
|
import { has } from "@expressive/mvc";
|
|
4
4
|
|
|
5
5
|
//#region src/has.ts
|
|
6
6
|
for (const Collection of [has.List, has.Pool]) Object.defineProperty(Collection.prototype, "$$typeof", { get() {
|
|
7
|
-
|
|
7
|
+
let self = this;
|
|
8
|
+
for (let proto = Object.getPrototypeOf(self); proto instanceof has.List || proto instanceof has.Pool; proto = Object.getPrototypeOf(self)) self = proto;
|
|
8
9
|
return seam(self, {}, Members.bind(self), null);
|
|
9
10
|
} });
|
|
10
11
|
function Members() {
|
|
11
|
-
return [...
|
|
12
|
-
}
|
|
13
|
-
/** Resolve a collection's canonical instance behind any subscriber proxies. */
|
|
14
|
-
function source(from) {
|
|
15
|
-
let self = from;
|
|
16
|
-
for (let proto = Object.getPrototypeOf(self); proto instanceof has.List || proto instanceof has.Pool; proto = Object.getPrototypeOf(self)) self = proto;
|
|
17
|
-
return self;
|
|
12
|
+
return [...useWatch(this)];
|
|
18
13
|
}
|
|
19
14
|
|
|
20
15
|
//#endregion
|
package/dist/has.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"has.js","names":[],"sources":["../src/has.ts"],"sourcesContent":["import { has } from '@expressive/mvc';\nimport {
|
|
1
|
+
{"version":3,"file":"has.js","names":[],"sources":["../src/has.ts"],"sourcesContent":["import { has } from '@expressive/mvc';\nimport { useWatch } from './runtime';\nimport { seam } from './element';\n\nfor (const Collection of [has.List, has.Pool])\n Object.defineProperty(Collection.prototype, '$$typeof', {\n get() {\n let self = this as has.List<unknown> | has.Pool<unknown>;\n\n for (\n let proto = Object.getPrototypeOf(self);\n proto instanceof has.List || proto instanceof has.Pool;\n proto = Object.getPrototypeOf(self)\n )\n self = proto;\n\n return seam(self, {}, Members.bind(self), null);\n }\n });\n\nfunction Members(this: has.List<unknown> | has.Pool<unknown>) {\n return [...useWatch(this)];\n}\n\nexport { has };\n"],"mappings":";;;;;AAIA,KAAK,MAAM,cAAc,CAAC,IAAI,MAAM,IAAI,KAAK,CAC3C,QAAO,eAAe,WAAW,WAAW,YAAY,EACtD,MAAM;CACJ,IAAI,OAAO;AAEX,MACE,IAAI,QAAQ,OAAO,eAAe,KAAK,EACvC,iBAAiB,IAAI,QAAQ,iBAAiB,IAAI,MAClD,QAAQ,OAAO,eAAe,KAAK,CAEnC,QAAO;AAET,QAAO,KAAK,MAAM,EAAE,EAAE,QAAQ,KAAK,KAAK,EAAE,KAAK;GAElD,CAAC;AAEJ,SAAS,UAAqD;AAC5D,QAAO,CAAC,GAAG,SAAS,KAAK,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { has } from "./has.js";
|
|
2
2
|
import { map } from "./map.js";
|
|
3
|
-
import { Component as Component$1, Context, def, get, ref, set } from "@expressive/mvc";
|
|
3
|
+
import { Component as Component$1, Context, def, get, ref, set, transition } from "@expressive/mvc";
|
|
4
4
|
import { JSX, ReactNode } from "react";
|
|
5
|
-
import { Consumer, Provider, State, State as adapter_default
|
|
5
|
+
import { Consumer, Provider, State, State as adapter_default } from "./adapter";
|
|
6
6
|
|
|
7
7
|
//#region src/element.d.ts
|
|
8
8
|
declare module '@expressive/mvc' {
|
|
@@ -18,12 +18,12 @@ declare module '@expressive/mvc' {
|
|
|
18
18
|
*/
|
|
19
19
|
//#endregion
|
|
20
20
|
//#region src/jsx-runtime.d.ts
|
|
21
|
-
declare module '@expressive/mvc/
|
|
21
|
+
declare module '@expressive/mvc/runtime' {
|
|
22
22
|
interface Host {
|
|
23
23
|
node: ReactNode;
|
|
24
24
|
intrinsics: JSX.IntrinsicElements;
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
//#endregion
|
|
28
|
-
export { Component$1 as Component, Consumer, Context, Provider, State, def, adapter_default as default, get, has, map, ref, set,
|
|
28
|
+
export { Component$1 as Component, Consumer, Context, Provider, State, def, adapter_default as default, get, has, map, ref, set, transition };
|
|
29
29
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.js
CHANGED
|
@@ -1,21 +1,20 @@
|
|
|
1
|
-
import "./component-
|
|
1
|
+
import "./component-CjvlxQIG.js";
|
|
2
2
|
import { has } from "./has.js";
|
|
3
3
|
import { map } from "./map.js";
|
|
4
|
-
import { Component, Component as Component$1, Context, def, get, ref, set } from "@expressive/mvc";
|
|
4
|
+
import { Component, Component as Component$1, Context, def, get, ref, set, transition } from "@expressive/mvc";
|
|
5
5
|
import React, { Children, Suspense, createContext, createElement, isValidElement, useContext, useEffect, useRef, useState } from "react";
|
|
6
6
|
import { Fragment, jsx, jsxs } from "react/jsx-runtime";
|
|
7
|
-
import { host } from "@expressive/mvc/
|
|
8
|
-
import { Consumer, Provider, Runtime, State, State as adapter_default
|
|
7
|
+
import { host } from "@expressive/mvc/runtime";
|
|
8
|
+
import { Consumer, Provider, Runtime, State, State as adapter_default } from "./adapter";
|
|
9
9
|
|
|
10
10
|
//#region src/jsx-runtime.ts
|
|
11
11
|
host({
|
|
12
12
|
jsx,
|
|
13
13
|
jsxs,
|
|
14
14
|
Fragment,
|
|
15
|
+
transition: React.startTransition,
|
|
15
16
|
isElement: isValidElement,
|
|
16
|
-
childrenOf
|
|
17
|
-
return Children.toArray(children);
|
|
18
|
-
},
|
|
17
|
+
childrenOf: Children.toArray,
|
|
19
18
|
typeOf(node) {
|
|
20
19
|
return isValidElement(node) ? node.type : void 0;
|
|
21
20
|
},
|
|
@@ -59,10 +58,10 @@ function dedupe(on, context) {
|
|
|
59
58
|
return entry;
|
|
60
59
|
}
|
|
61
60
|
var ErrorBoundary = class extends React.Component {
|
|
61
|
+
state = {};
|
|
62
|
+
recovering = false;
|
|
62
63
|
constructor(props) {
|
|
63
64
|
super(props);
|
|
64
|
-
this.state = {};
|
|
65
|
-
this.recovering = false;
|
|
66
65
|
}
|
|
67
66
|
static getDerivedStateFromError(error) {
|
|
68
67
|
return { error };
|
|
@@ -98,6 +97,7 @@ Object.assign(Runtime, {
|
|
|
98
97
|
useEffect,
|
|
99
98
|
useState,
|
|
100
99
|
useRef,
|
|
100
|
+
useSyncExternalStore: React.useSyncExternalStore,
|
|
101
101
|
Suspense,
|
|
102
102
|
ignore: [
|
|
103
103
|
"updater",
|
|
@@ -108,5 +108,5 @@ Object.assign(Runtime, {
|
|
|
108
108
|
});
|
|
109
109
|
|
|
110
110
|
//#endregion
|
|
111
|
-
export { Component, Consumer, Context, Provider, State, def, adapter_default as default, get, has, map, ref, set,
|
|
111
|
+
export { Component, Consumer, Context, Provider, State, def, adapter_default as default, get, has, map, ref, set, transition };
|
|
112
112
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":["Component"],"sources":["../src/jsx-runtime.ts","../src/boundary.ts","../src/index.ts"],"sourcesContent":["import { Children, isValidElement } from 'react';\nimport { Fragment, jsx, jsxs } from 'react/jsx-runtime';\nimport { host } from '@expressive/mvc/
|
|
1
|
+
{"version":3,"file":"index.js","names":["Component"],"sources":["../src/jsx-runtime.ts","../src/boundary.ts","../src/index.ts"],"sourcesContent":["import React, { Children, isValidElement } from 'react';\nimport { Fragment, jsx, jsxs } from 'react/jsx-runtime';\nimport { host } from '@expressive/mvc/runtime';\n\nimport type { JSX as ReactJSX, ReactNode } from 'react';\n\ndeclare module '@expressive/mvc/runtime' {\n interface Host {\n node: ReactNode;\n intrinsics: ReactJSX.IntrinsicElements;\n }\n}\n\nhost({\n jsx,\n jsxs,\n Fragment,\n transition: React.startTransition,\n isElement: isValidElement,\n childrenOf: Children.toArray,\n typeOf(node){\n return isValidElement(node) ? node.type : undefined;\n },\n propsOf(node){\n return isValidElement(node) ? node.props as Record<string, unknown> : {};\n }\n});\n","import { Component } from '@expressive/mvc';\nimport React from 'react';\nimport { Context } from './context';\n\ninterface Entry {\n committed?: boolean;\n context: Context;\n commit: () => void;\n remove: () => void;\n};\n\n/** In-flight render attempts by tree position, per ambient context.\n * When one commits, older uncommitted attempts at its slot are provably dead. */\nconst SLOTS = new WeakMap<Context, Map<string, Set<Entry>>>();\n\n/**\n * React's attempt lifecycle: fiber-keyed stacking so a superseded (uncommitted)\n * render attempt at a tree position is discarded when a later one commits.\n */\nexport function dedupe(on: Component, context: Context) {\n let slots = SLOTS.get(context.parent!);\n if (!slots) SLOTS.set(context.parent!, (slots = new Map()));\n\n // key/index path to root: stable across render attempts of this element\n let slot = '';\n for (let f = (on as any)._reactInternals; f; f = f.return)\n slot += (f.key ?? f.index) + '.';\n\n let list = slots.get(slot);\n if (!list) slots.set(slot, (list = new Set()));\n\n const entry: Entry = {\n context,\n commit() {\n entry.committed = true;\n\n for (const e of list) {\n if (e === entry) break;\n if (e.committed) continue;\n e.context.pop();\n list.delete(e);\n }\n },\n remove() {\n list.delete(entry);\n }\n };\n\n list.add(entry);\n return entry;\n};\n\nexport class ErrorBoundary extends React.Component<{\n self: Component;\n children: React.ReactNode;\n}> {\n state = {} as { error?: Error };\n recovering = false;\n\n constructor(props: ErrorBoundary['props']) {\n super(props);\n }\n\n static getDerivedStateFromError(error: Error) {\n return { error };\n }\n\n componentDidCatch(error: Error) {\n const { self } = this.props;\n const { fallback } = self;\n const reset = (error?: Error) => {\n this.recovering = true;\n this.setState({ error });\n };\n\n Promise.resolve(self.catch!(error))\n .then(() => reset(), reset)\n .finally(() => self.set({ fallback }, true));\n }\n\n componentDidUpdate() {\n this.recovering = false;\n }\n\n render() {\n if (!this.state.error) return this.props.children;\n if (this.recovering) throw this.state.error;\n return this.props.self.fallback;\n }\n};\n","import { Component } from '@expressive/mvc';\nimport React, {\n createContext,\n createElement,\n Suspense,\n useContext,\n useEffect,\n useRef,\n useState\n} from 'react';\n\nimport './element';\nimport './jsx-runtime';\n\nimport { Runtime } from './adapter';\nimport { ErrorBoundary, dedupe } from './boundary';\n\n// React detects class components by this brand (preact reads `prototype.render`).\nObject.defineProperty(Component.prototype, 'isReactComponent', {\n value: true\n});\n\nObject.assign(Runtime, {\n dedupe,\n ErrorBoundary,\n createElement,\n createContext,\n useContext,\n useEffect,\n useState,\n useRef,\n useSyncExternalStore: React.useSyncExternalStore,\n Suspense,\n ignore: [\n 'updater',\n 'refs',\n '_reactInternals',\n '_reactInternalInstance'\n ]\n});\n\nexport { State, State as default, Consumer, Provider } from './adapter';\nexport { Component, Context, def, get, ref, set, transition } from '@expressive/mvc';\nexport { has } from './has';\nexport { map } from './map';\n"],"mappings":";;;;;;;;;;AAaA,KAAK;CACH;CACA;CACA;CACA,YAAY,MAAM;CAClB,WAAW;CACX,YAAY,SAAS;CACrB,OAAO,MAAK;AACV,SAAO,eAAe,KAAK,GAAG,KAAK,OAAO;;CAE5C,QAAQ,MAAK;AACX,SAAO,eAAe,KAAK,GAAG,KAAK,QAAmC,EAAE;;CAE3E,CAAC;;;;;;ACbF,MAAM,wBAAQ,IAAI,SAA2C;;;;;AAM7D,SAAgB,OAAO,IAAe,SAAkB;CACtD,IAAI,QAAQ,MAAM,IAAI,QAAQ,OAAQ;AACtC,KAAI,CAAC,MAAO,OAAM,IAAI,QAAQ,QAAU,wBAAQ,IAAI,KAAK,CAAE;CAG3D,IAAI,OAAO;AACX,MAAK,IAAI,IAAK,GAAW,iBAAiB,GAAG,IAAI,EAAE,OACjD,UAAS,EAAE,OAAO,EAAE,SAAS;CAE/B,IAAI,OAAO,MAAM,IAAI,KAAK;AAC1B,KAAI,CAAC,KAAM,OAAM,IAAI,MAAO,uBAAO,IAAI,KAAK,CAAE;CAE9C,MAAM,QAAe;EACnB;EACA,SAAS;AACP,SAAM,YAAY;AAElB,QAAK,MAAM,KAAK,MAAM;AACpB,QAAI,MAAM,MAAO;AACjB,QAAI,EAAE,UAAW;AACjB,MAAE,QAAQ,KAAK;AACf,SAAK,OAAO,EAAE;;;EAGlB,SAAS;AACP,QAAK,OAAO,MAAM;;EAErB;AAED,MAAK,IAAI,MAAM;AACf,QAAO;;AAGT,IAAa,gBAAb,cAAmC,MAAM,UAGtC;CACD,QAAQ,EAAE;CACV,aAAa;CAEb,YAAY,OAA+B;AACzC,QAAM,MAAM;;CAGd,OAAO,yBAAyB,OAAc;AAC5C,SAAO,EAAE,OAAO;;CAGlB,kBAAkB,OAAc;EAC9B,MAAM,EAAE,SAAS,KAAK;EACtB,MAAM,EAAE,aAAa;EACrB,MAAM,SAAS,UAAkB;AAC/B,QAAK,aAAa;AAClB,QAAK,SAAS,EAAE,OAAO,CAAC;;AAG1B,UAAQ,QAAQ,KAAK,MAAO,MAAM,CAAC,CAChC,WAAW,OAAO,EAAE,MAAM,CAC1B,cAAc,KAAK,IAAI,EAAE,UAAU,EAAE,KAAK,CAAC;;CAGhD,qBAAqB;AACnB,OAAK,aAAa;;CAGpB,SAAS;AACP,MAAI,CAAC,KAAK,MAAM,MAAO,QAAO,KAAK,MAAM;AACzC,MAAI,KAAK,WAAY,OAAM,KAAK,MAAM;AACtC,SAAO,KAAK,MAAM,KAAK;;;;;;ACrE3B,OAAO,eAAeA,YAAU,WAAW,oBAAoB,EAC7D,OAAO,MACR,CAAC;AAEF,OAAO,OAAO,SAAS;CACrB;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA,sBAAsB,MAAM;CAC5B;CACA,QAAQ;EACN;EACA;EACA;EACA;EACD;CACF,CAAC"}
|
package/dist/map.js
CHANGED
|
@@ -1,20 +1,15 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { t as seam } from "./element-
|
|
1
|
+
import { c as useWatch } from "./component-CjvlxQIG.js";
|
|
2
|
+
import { t as seam } from "./element-B1zZlF4n.js";
|
|
3
3
|
import { map } from "@expressive/mvc";
|
|
4
4
|
|
|
5
5
|
//#region src/map.ts
|
|
6
6
|
Object.defineProperty(map.Managed.prototype, "$$typeof", { get() {
|
|
7
|
-
|
|
7
|
+
let self = this;
|
|
8
|
+
for (let proto = Object.getPrototypeOf(self); proto instanceof map.Managed; proto = Object.getPrototypeOf(self)) self = proto;
|
|
8
9
|
return seam(self, {}, Values.bind(self), null);
|
|
9
10
|
} });
|
|
10
11
|
function Values() {
|
|
11
|
-
return [...
|
|
12
|
-
}
|
|
13
|
-
/** Resolve a map's canonical instance behind any subscriber proxies. */
|
|
14
|
-
function source(from) {
|
|
15
|
-
let self = from;
|
|
16
|
-
for (let proto = Object.getPrototypeOf(self); proto instanceof map.Managed; proto = Object.getPrototypeOf(self)) self = proto;
|
|
17
|
-
return self;
|
|
12
|
+
return [...useWatch(this).values()];
|
|
18
13
|
}
|
|
19
14
|
|
|
20
15
|
//#endregion
|
package/dist/map.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map.js","names":[],"sources":["../src/map.ts"],"sourcesContent":["import { map } from '@expressive/mvc';\nimport {
|
|
1
|
+
{"version":3,"file":"map.js","names":[],"sources":["../src/map.ts"],"sourcesContent":["import { map } from '@expressive/mvc';\nimport { useWatch } from './runtime';\nimport { seam } from './element';\n\nObject.defineProperty(map.Managed.prototype, '$$typeof', {\n get() {\n let self = this as map.Managed<unknown, unknown>;\n\n for (\n let proto = Object.getPrototypeOf(self);\n proto instanceof map.Managed;\n proto = Object.getPrototypeOf(self)\n )\n self = proto;\n\n return seam(self, {}, Values.bind(self), null);\n }\n});\n\nfunction Values(this: map.Managed<unknown, unknown>) {\n const self = useWatch(this);\n\n return [...self.values()];\n}\n\nexport { map };\n"],"mappings":";;;;;AAIA,OAAO,eAAe,IAAI,QAAQ,WAAW,YAAY,EACvD,MAAM;CACJ,IAAI,OAAO;AAEX,MACE,IAAI,QAAQ,OAAO,eAAe,KAAK,EACvC,iBAAiB,IAAI,SACrB,QAAQ,OAAO,eAAe,KAAK,CAEnC,QAAO;AAET,QAAO,KAAK,MAAM,EAAE,EAAE,OAAO,KAAK,KAAK,EAAE,KAAK;GAEjD,CAAC;AAEF,SAAS,SAA4C;AAGnD,QAAO,CAAC,GAFK,SAAS,KAAK,CAEX,QAAQ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@expressive/react",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.84.0",
|
|
4
4
|
"description": "Class-based reactive state for React. Define models as plain classes; components update when the values they read change.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"expressive",
|
|
@@ -56,10 +56,10 @@
|
|
|
56
56
|
},
|
|
57
57
|
"scripts": {
|
|
58
58
|
"build": "tsdown",
|
|
59
|
-
"test": "tsc --noEmit &&
|
|
59
|
+
"test": "tsc --noEmit && vitest run --coverage"
|
|
60
60
|
},
|
|
61
61
|
"dependencies": {
|
|
62
|
-
"@expressive/mvc": "^0.
|
|
62
|
+
"@expressive/mvc": "^0.83.0"
|
|
63
63
|
},
|
|
64
64
|
"devDependencies": {
|
|
65
65
|
"@testing-library/react": "^16.3.0",
|
|
@@ -71,10 +71,5 @@
|
|
|
71
71
|
},
|
|
72
72
|
"peerDependencies": {
|
|
73
73
|
"react": ">=16.8.0 <20.0.0"
|
|
74
|
-
},
|
|
75
|
-
"peerDependenciesMeta": {
|
|
76
|
-
"react": {
|
|
77
|
-
"optional": true
|
|
78
|
-
}
|
|
79
74
|
}
|
|
80
75
|
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"component-fEqgY0Wy.js","names":["Context"],"sources":["../src/runtime.ts","../src/context.ts","../src/component.ts"],"sourcesContent":["import { event, watch, observer } from '@expressive/mvc/observable';\nimport type { Component } from '@expressive/mvc';\nimport type { Context } from './context';\n\nexport const Runtime = {} as {\n /** Host own-property keys to trap out of observed state; assigned by each adapter. */\n ignore: string[];\n createElement(type: any, props?: any, ...children: any[]): any;\n createContext<T>(value: T): any;\n useContext(context: any): any;\n useState<S>(initial: S | (() => S)): [S, (next: (previous: S) => S) => void];\n useEffect(effect: () => (() => void) | void, deps?: any[]): void;\n useRef<T>(initial: T): { current: T };\n /** Per-render-attempt lifecycle, set by each adapter (React stacks attempts; others no-op). */\n dedupe(from: Component, context: Context): { commit(): void; remove(): void };\n /** Host error-boundary component, wrapping a Component whose `catch` is set. */\n ErrorBoundary: unknown;\n Suspense: any;\n};\n\nexport function useFactory<T extends Function>(factory: () => T) {\n const ref = Runtime.useRef<T | null>(null);\n return ref.current || (ref.current = factory());\n}\n\n/**\n * Mount-effect with a refreshable return value, safe under React StrictMode.\n *\n * @param callback Setup handler, run on creation; receives a setter and returns\n * a mount handler, which in turn returns a cleanup. All three share this\n * hook's render counter, so a StrictMode remount repeats none of them.\n * @returns Latest value published via the setter (`undefined` until set).\n */\nexport function useHook<T = void>(\n callback: (refresh: (next: T) => void) => () => (() => void) | void\n) {\n const { current } = Runtime.useRef(\n { rendered: 0 } as {\n rendered: number;\n mounted?: boolean;\n pending?: boolean;\n commit?: () => (() => void) | void;\n release?: (() => void) | void;\n update?: (next: (previous: number) => number) => void;\n output: T;\n }\n );\n\n current.update = Runtime.useState(() => {\n if (!current.rendered)\n current.commit = callback((next) => {\n current.output = next;\n if (current.mounted) current.update?.((x) => x + 1);\n else if (current.update) current.pending = true;\n });\n\n return current.rendered++;\n })[1];\n\n Runtime.useEffect(() => {\n current.mounted = true;\n\n if (current.commit) {\n current.release = current.commit();\n current.commit = undefined;\n }\n\n if (current.pending) {\n current.pending = false;\n current.update!((x) => x + 1);\n }\n\n return () => {\n if (--current.rendered <= 0) current.release?.();\n }\n }, []);\n\n return current.output;\n}\n\n/** Subscribe to an existing observable instance within a component. */\nexport function use<T extends object>(subject: T) {\n const { current } = Runtime.useRef<{\n proxy: T;\n source?: T;\n mounted: number;\n unwatch?: () => void;\n }>({ mounted: 0, proxy: subject });\n\n const update = Runtime.useState(() => current.mounted++)[1];\n\n if (current.source !== subject) {\n const status = observer(subject);\n\n if (status === undefined)\n throw new Error('Provided object is not observable.');\n\n current.unwatch?.();\n current.source = subject;\n\n if (status === null) {\n current.unwatch = undefined;\n current.proxy = subject;\n } else {\n if (!status.ready) event(subject);\n\n let init = true;\n\n current.unwatch = watch(subject, (next, changed) => {\n current.proxy = next;\n if (changed.length && !init)\n update((x) => x + 1);\n });\n\n init = false;\n }\n }\n\n Runtime.useEffect(() => () => {\n if (--current.mounted < 1) current.unwatch?.();\n }, []);\n\n return current.proxy;\n}\n","import { State, Context, Component } from '@expressive/mvc';\nimport type { UseState } from '@expressive/mvc';\nimport { Runtime, useHook } from './runtime';\n\nlet shared: any;\n\n/**\n * Lazily-created context carrying the active {@link Context} down the tree.\n * Lazy because the framework's `createContext` arrives via {@link Runtime},\n * which an adapter's entry populates at load - after this module evaluates.\n */\nfunction Layers() {\n return shared || (shared = Runtime.createContext(Context.root));\n}\n\n/** Read the ambient {@link Context} from the nearest Layers provider. */\nfunction useAmbient() {\n return Runtime.useContext(Layers());\n}\n\n/** Wrap `children` in a {@link Layers} provider carrying `context` down the tree. */\nfunction createProvider(context: Context, children: any) {\n return Runtime.createElement(Layers().Provider, { value: context, children });\n}\n\n// Class components consume the active Context through the host's `contextType`\nObject.defineProperty(Component, 'contextType', { configurable: true, get: Layers });\n\nconst _get = Context.get;\n\nContext.get = (state?: State) => {\n if (!state)\n try {\n return useAmbient();\n } catch { }\n\n return _get(state);\n};\n\ndeclare namespace Consumer {\n type Props<T extends State> = {\n /** Type of controller to fetch from context. */\n for: State.Extends<T>;\n\n /**\n * Render function, will receive instance of desired controller.\n *\n * Called every render of parent component.\n * Similar to `State.get()`, updates to properties accessed in\n * this function will cause a refresh when they change.\n */\n children: (value: T) => Component.Node | void;\n };\n}\n\nfunction Consumer<T extends State>(props: Consumer.Props<T>) {\n return props.for.get((i) => props.children(i));\n}\n\ndeclare namespace Provider {\n /**\n * Runs for each State registered by this Provider. Return value is ignored -\n * to run teardown with a State, use `state.set(null, callback)`.\n */\n type ForEach<T> = (state: T) => void;\n\n interface SharedProps {\n /**\n * Children to render within this Provider.\n */\n children?: Component.Node;\n\n /** A fallback tree to show when suspended. */\n fallback?: Component.Node;\n\n /**\n * A name for this Suspense boundary for instrumentation purposes.\n * The name will help identify this boundary in React DevTools.\n */\n name?: string | undefined;\n }\n\n type ForSingleProps<T extends State> = SharedProps & {\n for: T | State.Type<T>;\n is: (instance: T) => void;\n } & { [K in State.Field<T>]?: T[K] };\n\n type ForMultipleProps<T extends State> = SharedProps & {\n for: Context.Accept<T>;\n is?: ForEach<T>;\n };\n\n type Props<T extends State = State> = ForSingleProps<T> | ForMultipleProps<T>;\n}\n\ntype Digest<T extends State> = (props: Provider.Props<T>) => Context;\n\nfunction Provider<T extends State>({\n children,\n fallback,\n name,\n ...props\n}: Provider.Props<T>) {\n const ambient = useAmbient();\n const digest: Digest<T> = useHook((returns) => {\n const context = new Context(ambient);\n const fresh: State[] = [];\n\n let applied: Context.Accept<T> | undefined;\n let solo: State | undefined;\n\n returns(({ is, for: input, ...rest }) => {\n if (input !== applied) {\n const single = State.is(input) || input instanceof State;\n\n applied = input;\n solo = undefined;\n\n context.set(input, (state, owned) => {\n if (single) solo = state;\n if (owned) fresh.push(state);\n if (is) is(state);\n });\n }\n\n if (solo && Object.keys(rest).length) solo.set(rest);\n\n return context;\n });\n\n return () => {\n const release = fresh.map((state) => (state as UseState).mount?.());\n\n return () => {\n for (const done of release) if (typeof done == 'function') done();\n context.pop();\n };\n };\n });\n\n return createProvider(\n digest(props),\n fallback !== undefined\n ? Runtime.createElement(Runtime.Suspense, { fallback, name }, children)\n : children\n );\n}\n\nexport { Consumer, Provider, Context, createProvider };\n","import { Component, unbind } from '@expressive/mvc';\nimport { watch, observer } from '@expressive/mvc/observable';\nimport { createProvider, type Context } from './context';\nimport { Runtime, useHook } from './runtime';\n\ndeclare module '@expressive/mvc' {\n namespace Component {\n /**\n * Not available - a Component is rendered, not a hook.\n * Render it with `<Component />` or `{component}`.\n * For a bare instance use `Component.new()`.\n */\n const use: never;\n }\n\n interface Component {\n /**\n * Optional hook called once this Component commits. Return a function to\n * run when it unmounts.\n *\n * Not called during server render, nor for an instance placed as\n * `{component}` - a placement does not own what it renders. Client-only\n * effects belong here; setup which must accompany the instance itself\n * belongs in `new()`.\n */\n mount?(): (() => void) | void;\n\n /** @deprecated Only to satisfy host JSX. Use `this.get(State)` instead. */\n readonly context: Context;\n /** @deprecated Only to satisfy host JSX. Use `this.get()` instead. */\n readonly state: State.Values<this>;\n /** @deprecated Only to satisfy host JSX. Use `this.set({})` instead. */\n setState: (state: any, callback?: () => void) => void;\n /** @deprecated Only to satisfy host JSX. Use `this.set(key)` instead. */\n forceUpdate: (callback?: () => void) => void;\n }\n}\n\n// Host-agnostic seams: `state` is a read-only values bag; `context`'s setter\n// pushes a child context, registers the instance for teardown, and installs its\n// per-instance render host. Host-specific descriptors stay in each adapter.\nObject.defineProperties(Component.prototype, {\n state: {\n set() {},\n get: Component.prototype.get\n },\n context: {\n set: bootstrap\n }\n});\n\nObject.defineProperty(Component, 'use', {\n configurable: true,\n value() {\n throw new Error(\n `${this} is a Component - render as an element instead of calling use().`\n );\n }\n});\n\n/**\n * `State.on` handler that prepares a Component's prototype at bootstrap, before\n * mvc classifies its members:\n *\n * - On the root Component, host own-property keys are trapped so each lands as a\n * plain own property (out of observed state); each adapter assigns its own set.\n * - capitalized methods are rewritten into subcomponents as non-configurable\n * getters, so bootstrap skips them too.\n *\n * (Sealing `render` as the content-render seam is handled by core itself.)\n *\n * `before` covers the per-instance case: a capitalized function assigned as an\n * instance field (e.g. `Sidebar = Sidebar` to inject or override one), promoted\n * before `observe` so it is not mistaken for reactive state.\n */\nComponent.on({\n type(type) {\n if (type === Component)\n for (const key of Runtime.ignore)\n Object.defineProperty(Component.prototype, key, {\n set(value) {\n Object.defineProperty(this, key, { value, writable: true });\n }\n });\n\n // capitalized methods into subcomponents\n subcomponents(type.prototype);\n },\n before(self){\n // capitalized instance fields into subcomponents\n subcomponents(self, true);\n }\n});\n\nfunction bootstrap(this: Component, context: Context){\n context = context.push();\n context.set(this, () => () => this.set(null));\n\n Object.defineProperties(this, {\n context: {\n get: () => context,\n set() {}\n },\n render: {\n value: render(this, context)\n }\n });\n\n this.set(null, () => {\n Object.defineProperty(this, 'props', {\n value: this.props,\n writable: true\n });\n })\n}\n\n/**\n * Wrap a content element in its context provider, a Suspense boundary (unless\n * `fallback` is `false`) and, when `catch` is set, the host error boundary.\n */\nfunction createFrame(from: Component, context: Context, children: unknown) {\n const { createElement } = Runtime;\n\n if(from.fallback !== false)\n children = createElement(\n Runtime.Suspense,\n { fallback: from.fallback, name: String(from) },\n children\n )\n\n children = createProvider(context, children);\n\n return from.catch\n ? createElement(Runtime.ErrorBoundary, { self: from, children })\n : children;\n}\n\n/**\n * Ownership host for `<Component/>`: React owns the instance, so its render\n * threads the bootstrap-pushed context through `Runtime.dedupe` (React stacks\n * render attempts) and tears that context down - destroying the instance - on\n * unmount.\n */\nfunction render(from: Component, context: Context) {\n const { createElement } = Runtime;\n const { commit, remove } = Runtime.dedupe(from, context);\n\n const self = from;\n const content = from.render;\n const Render = () => content.call(from, from.props);\n const Component = () => {\n from = useHook<Component>((refresh) => {\n if (observer(from) !== null) watch(from, refresh);\n\n return () => {\n const release = self.mount?.();\n\n commit();\n\n return () => {\n if (typeof release == 'function') release();\n remove();\n context.pop();\n };\n };\n }) || from;\n\n return createFrame(from, context, createElement(Render));\n };\n\n return () => createElement(Component);\n}\n\n/** Rewrite each own capitalized function on `target` into a subcomponent. */\nfunction subcomponents(target: object, configurable?: boolean) {\n for (const key of Object.getOwnPropertyNames(target)) {\n if (!/^[A-Z]/.test(key)) continue;\n const { value } = Object.getOwnPropertyDescriptor(target, key)!;\n if (typeof value != 'function') continue;\n Object.defineProperty(target, key, {\n configurable,\n get(this: Component) {\n const owner = this.is;\n let render = unbind(value);\n const Component = (props: unknown) =>\n render.call(\n useHook<Component>((set) => {\n const release = watch(owner, set);\n return () => release;\n }) || owner,\n props\n );\n\n Object.defineProperty(owner, key, {\n configurable: true,\n get: () => Component,\n set(fn: Function) {\n render = fn;\n }\n });\n\n return Component;\n }\n });\n }\n}\n\nexport { createFrame };\n"],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"element-CLcyiJ09.js","names":["Context"],"sources":["../src/element.ts"],"sourcesContent":["import { Component } from '@expressive/mvc';\nimport { watch, observer } from '@expressive/mvc/observable';\nimport { Context } from './context';\nimport { Runtime, useFactory, useHook } from './runtime';\nimport { createFrame } from './component';\n\ndeclare module '@expressive/mvc' {\n interface Component {\n /** @deprecated Only to satisfy host JSX. */\n readonly type: typeof Component;\n }\n}\n\nlet template: any;\n\n/**\n * Borrow a host element's descriptors so `self` passes as a React element.\n * `props` false keeps the target's own `props` (Component supplies its own);\n * an object installs it as the element's props (collections have none).\n */\nexport function seam(\n self: object,\n props: object | false,\n type: Function,\n key: unknown\n) {\n if (!template) template = Runtime.createElement('template');\n\n const descriptors = Object.getOwnPropertyDescriptors(template);\n const store = descriptors._store?.value;\n\n if (props === false) delete (descriptors as any).props;\n\n if (store)\n descriptors._store.value = Object.create(\n Object.getPrototypeOf(store),\n Object.getOwnPropertyDescriptors(store)\n );\n\n Object.defineProperties(self, {\n ...descriptors,\n $$typeof: { value: template.$$typeof },\n ...(props ? { props: { value: props } } : undefined),\n key: { value: key },\n type: { value: type }\n });\n\n return template.$$typeof;\n}\n\nObject.defineProperty(Component.prototype, '$$typeof', {\n get(this: Component) {\n const self = this.is;\n return seam(self, false, Element.bind(self), self.key);\n }\n});\n\nfunction Element(this: Component){\n const outer = Context.get();\n const render = useFactory(() => {\n let from = this;\n const context = outer.push(this);\n const Content = () => from.render(from.props);\n\n return () => {\n from = useHook<Component>((refresh) => {\n if (observer(this) !== null) watch(this, refresh);\n return () => () => context.pop();\n }) || this;\n\n return createFrame(from, context, Runtime.createElement(Content));\n };\n });\n\n return render();\n}\n"],"mappings":";;;;;AAaA,IAAI;;;;;;AAOJ,SAAgB,KACd,MACA,OACA,MACA,KACA;AACA,KAAI,CAAC,SAAU,YAAW,QAAQ,cAAc,WAAW;CAE3D,MAAM,cAAc,OAAO,0BAA0B,SAAS;CAC9D,MAAM,QAAQ,YAAY,QAAQ;AAElC,KAAI,UAAU,MAAO,QAAQ,YAAoB;AAEjD,KAAI,MACF,aAAY,OAAO,QAAQ,OAAO,OAChC,OAAO,eAAe,MAAM,EAC5B,OAAO,0BAA0B,MAAM,CACxC;AAEH,QAAO,iBAAiB,MAAM;EAC5B,GAAG;EACH,UAAU,EAAE,OAAO,SAAS,UAAU;EACtC,GAAI,QAAQ,EAAE,OAAO,EAAE,OAAO,OAAO,EAAE,GAAG;EAC1C,KAAK,EAAE,OAAO,KAAK;EACnB,MAAM,EAAE,OAAO,MAAM;EACtB,CAAC;AAEF,QAAO,SAAS;;AAGlB,OAAO,eAAe,UAAU,WAAW,YAAY,EACrD,MAAqB;CACnB,MAAM,OAAO,KAAK;AAClB,QAAO,KAAK,MAAM,OAAO,QAAQ,KAAK,KAAK,EAAE,KAAK,IAAI;GAEzD,CAAC;AAEF,SAAS,UAAwB;CAC/B,MAAM,QAAQA,UAAQ,KAAK;AAgB3B,QAfe,iBAAiB;EAC9B,IAAI,OAAO;EACX,MAAM,UAAU,MAAM,KAAK,KAAK;EAChC,MAAM,gBAAgB,KAAK,OAAO,KAAK,MAAM;AAE7C,eAAa;AACX,UAAO,SAAoB,YAAY;AACrC,QAAI,SAAS,KAAK,KAAK,KAAM,OAAM,MAAM,QAAQ;AACjD,uBAAmB,QAAQ,KAAK;KAChC,IAAI;AAEN,UAAO,YAAY,MAAM,SAAS,QAAQ,cAAc,QAAQ,CAAC;;GAEnE,EAEa"}
|