@expressive/react 0.88.0 → 0.89.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 CHANGED
@@ -17,7 +17,7 @@ The React adapter for [Expressive MVC](https://github.com/gabeklein/expressive-m
17
17
  npm install @expressive/mvc @expressive/react
18
18
  ```
19
19
 
20
- `@expressive/mvc` is a peer dependency: import `State`, `Component` and instructions from it, and import `@expressive/react` once from your entry so the host registers. `Provider` and `Consumer` come from the adapter. Its re-exports of the core are deprecated.
20
+ `@expressive/mvc` is a peer dependency: import `State`, `Component` and instructions from it, and import `@expressive/react` once from your entry so the host registers. Provide a State to a subtree with `<Component for={State}>` - `Provider` is deprecated and `Consumer` was removed. The adapter's re-exports of the core are deprecated.
21
21
 
22
22
  Works on React DOM, and on React Native and Expo - the adapter imports only `react` and `react/jsx-runtime`, so there is nothing renderer-specific to port. Exercised on an iOS simulator and an Android emulator in both Debug and Release builds, and gated per release on Metro resolution and a Hermes build (Expo SDK 57, React Native 0.86). Under Jest, add `@expressive` to `transformIgnorePatterns`.
23
23
 
@@ -48,7 +48,7 @@ function CounterWidget() {
48
48
  `Component` is a `State` that owns its own rendering - a persistent class instance with lifecycle, context, suspense, and error handling baked in. Reach for it when state is intrinsic to a rendered unit: form controls, layout shells, route controllers, media players.
49
49
 
50
50
  ```tsx
51
- import { Component } from '@expressive/react';
51
+ import { Component } from '@expressive/mvc';
52
52
 
53
53
  class Counter extends Component {
54
54
  count = 0;
@@ -124,7 +124,7 @@ The base owns behavior and structure; subclasses author only the rendering. Over
124
124
 
125
125
  ### Self-providing context
126
126
 
127
- A `Component` provides *itself* to context automatically - no `Provider` needed. Both its own render output and any `children` passed in can read it with `get()`.
127
+ A `Component` provides *itself* to context automatically - no provider element needed. Both its own render output and any `children` passed in can read it with `get()`.
128
128
 
129
129
  ```tsx
130
130
  class Tabs extends Component {
@@ -180,7 +180,7 @@ Every Component also accepts three special props:
180
180
  A value that isn't ready yet suspends the render; `fallback` shows in the meantime.
181
181
 
182
182
  ```tsx
183
- import { Component, set } from '@expressive/react';
183
+ import { Component, set } from '@expressive/mvc';
184
184
 
185
185
  class Profile extends Component {
186
186
  user = set<User>(); // undefined until set - suspends render
@@ -197,7 +197,7 @@ class Profile extends Component {
197
197
  Provide a model once; descendants read it with `State.get()` - no props, no selectors.
198
198
 
199
199
  ```tsx
200
- import { Provider } from '@expressive/react';
200
+ import { Component } from '@expressive/mvc';
201
201
 
202
202
  class Session extends State {
203
203
  user = 'guest';
@@ -205,9 +205,9 @@ class Session extends State {
205
205
 
206
206
  function App() {
207
207
  return (
208
- <Provider for={Session}>
208
+ <Component for={Session}>
209
209
  <Profile />
210
- </Provider>
210
+ </Component>
211
211
  );
212
212
  }
213
213
 
@@ -221,7 +221,7 @@ function Profile() {
221
221
 
222
222
  - **`State.use()`** - create an instance bound to a component's lifecycle.
223
223
  - **`State.get()`** - read shared state from context, no prop drilling.
224
- - **`Provider` / `Consumer`** - explicit hierarchical dependency injection.
224
+ - **`<Component for={State}>`** - explicit hierarchical dependency injection.
225
225
  - **`Component`** - smart controls and shells whose behavior lives in the tree.
226
226
  - **Suspense & error boundaries** - async values suspend; `catch()` handles child errors.
227
227
 
package/dist/adapter.d.ts CHANGED
@@ -1,3 +1,3 @@
1
- import { n as Consumer, r as Provider, t as Runtime } from "./chunk-runtime-Cn_ynxAT.js";
1
+ import { n as Provider, t as Runtime } from "./chunk-runtime-Ce3xLL1m.js";
2
2
  import { State } from "@expressive/mvc";
3
- export { Consumer, Provider, Runtime, State };
3
+ export { Provider, Runtime, State };
package/dist/adapter.js CHANGED
@@ -1,4 +1,4 @@
1
- import { a as Runtime, c as useSetup, i as Provider, l as useWatch, n as Consumer, o as useFactory, s as useSettle } from "./chunk-component-Bu6E8zDP.js";
1
+ import { a as useFactory, c as useWatch, i as Runtime, o as useSettle, r as Provider, s as useSetup } from "./chunk-component-BzRnGX4m.js";
2
2
  import { Context, State, State as State$1 } from "@expressive/mvc";
3
3
  import { observer, watch } from "@expressive/mvc/observable";
4
4
 
@@ -54,7 +54,7 @@ State$1.get = function get(argument) {
54
54
  return (update) => {
55
55
  if (update === true) force();
56
56
  };
57
- }, argument === true, Runtime.transition);
57
+ }, argument === true, Runtime.startTransition);
58
58
  if (mounted) {
59
59
  pending = true;
60
60
  queueMicrotask(() => pending && update());
@@ -132,5 +132,5 @@ State$1.use = function use(...args) {
132
132
  };
133
133
 
134
134
  //#endregion
135
- export { Consumer, Provider, Runtime, State };
135
+ export { Provider, Runtime, State };
136
136
  //# sourceMappingURL=adapter.js.map
@@ -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, useSettle, useSetup } 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 Type = this;\n const [tick, next] = Runtime.useState(0);\n const claim = useSettle(tick);\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) {\n claim();\n update();\n }\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 if (local.get(Type, false) !== next) return;\n\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 Runtime.transition\n );\n\n if (mounted) {\n pending = true;\n queueMicrotask(() => pending && update());\n }\n\n return release;\n }\n\n const unsubscribe = local.get(Type, attach);\n\n if (!unwatch) {\n unsubscribe();\n if (argument === false) return () => undefined;\n throw new Error(`Could not find ${Type} 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 useSetup((_self, 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
+ {"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, useSettle, useSetup } 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 Type = this;\n const [tick, next] = Runtime.useState(0);\n const claim = useSettle(tick);\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) {\n claim();\n update();\n }\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 if (local.get(Type, false) !== next) return;\n\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 Runtime.startTransition\n );\n\n if (mounted) {\n pending = true;\n queueMicrotask(() => pending && update());\n }\n\n return release;\n }\n\n const unsubscribe = local.get(Type, attach);\n\n if (!unwatch) {\n unsubscribe();\n if (argument === false) return () => undefined;\n throw new Error(`Could not find ${Type} 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 useSetup((_self, 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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"}
@@ -121,7 +121,7 @@ function useWatch(from, mount) {
121
121
  return (update) => {
122
122
  if (update === true) reset();
123
123
  };
124
- }, void 0, Runtime.transition);
124
+ }, void 0, Runtime.startTransition);
125
125
  return () => {
126
126
  const cleanup = mount?.();
127
127
  return () => {
@@ -165,9 +165,7 @@ Context$1.get = (state) => {
165
165
  } catch {}
166
166
  return _get(state);
167
167
  };
168
- function Consumer(props) {
169
- return props.for.get((i) => props.children(i));
170
- }
168
+ /** @deprecated Use `<Component for={…}>`: one State per element, compose a parent State for several. */
171
169
  function Provider({ children, fallback, name, ...props }) {
172
170
  const ambient = useAmbient();
173
171
  return createProvider(useHook((returns) => {
@@ -218,22 +216,16 @@ Object.defineProperty(Component, "use", {
218
216
  }
219
217
  });
220
218
  /**
221
- * `State.on` handler that prepares a Component's prototype at bootstrap, before
222
- * mvc classifies its members:
223
- *
224
- * - On the root Component, host own-property keys are trapped so each lands as a
225
- * plain own property (out of observed state); each adapter assigns its own set.
226
- * - capitalized methods are rewritten into subcomponents as get/set accessors,
227
- * so bootstrap skips them too.
228
- *
229
- * (Sealing `render` as the content-render seam is handled by core itself.)
230
- *
231
- * `before` covers the per-instance case: a capitalized function assigned as an
232
- * instance field (e.g. `Sidebar = Sidebar` to inject or override one), promoted
233
- * before `observe` so it is not mistaken for reactive state.
219
+ * On the root Component, host own-property keys are trapped so each lands as a
220
+ * plain own property (out of observed state); each adapter assigns its own set.
234
221
  */
235
222
  Component.on({
236
223
  type(type) {
224
+ const render = Object.getOwnPropertyDescriptor(type.prototype, "render");
225
+ if (typeof render?.value == "function") Object.defineProperty(type.prototype, "render", {
226
+ ...render,
227
+ configurable: false
228
+ });
237
229
  if (type === Component) for (const key of Runtime.ignore) Object.defineProperty(Component.prototype, key, { set(value) {
238
230
  Object.defineProperty(this, key, {
239
231
  value,
@@ -242,7 +234,7 @@ Component.on({
242
234
  } });
243
235
  subcomponents(type.prototype);
244
236
  },
245
- before(self) {
237
+ setup(self) {
246
238
  subcomponents(self);
247
239
  }
248
240
  });
@@ -274,7 +266,7 @@ function createFrame(from, context, children) {
274
266
  name: String(from)
275
267
  }, children);
276
268
  children = createProvider(context, children);
277
- return from.catch ? createElement(Runtime.ErrorBoundary, {
269
+ return from.props.catch || from.catch ? createElement(Runtime.ErrorBoundary, {
278
270
  self: from,
279
271
  children
280
272
  }) : children;
@@ -286,17 +278,17 @@ function createFrame(from, context, children) {
286
278
  * unmount.
287
279
  */
288
280
  function render(from, context) {
289
- const { createElement } = Runtime;
290
- const { commit, remove } = Runtime.dedupe(from, context);
281
+ const { createElement, dedupe } = Runtime;
282
+ const attempt = dedupe?.(from, context);
291
283
  const { is: owner, render } = from;
292
284
  const Render = () => render.call(from, from.props);
293
285
  const Component = () => {
294
286
  from = useWatch(from, () => {
295
287
  const release = owner.mount?.();
296
- commit();
288
+ attempt?.commit();
297
289
  return () => {
298
290
  if (typeof release == "function") release();
299
- remove();
291
+ attempt?.remove();
300
292
  context.pop();
301
293
  };
302
294
  });
@@ -339,5 +331,5 @@ function subcomponents(target) {
339
331
  }
340
332
 
341
333
  //#endregion
342
- export { Runtime as a, useSetup as c, Provider as i, useWatch as l, Consumer as n, useFactory as o, Context$1 as r, useSettle as s, createFrame as t };
343
- //# sourceMappingURL=chunk-component-Bu6E8zDP.js.map
334
+ export { useFactory as a, useWatch as c, Runtime as i, Context$1 as n, useSettle as o, Provider as r, useSetup as s, createFrame as t };
335
+ //# sourceMappingURL=chunk-component-BzRnGX4m.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"chunk-component-BzRnGX4m.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 { pending } from '@expressive/mvc';\nimport type { Context } from './context';\n\ninterface Settle {\n waiting?: (() => void)[];\n claim(): void;\n release(): void;\n}\n\ninterface Setup {\n rendered: number;\n revision: number;\n mounted?: boolean;\n fresh?: boolean;\n getRevision?: () => number;\n lapsed?: boolean;\n commit?: () => (() => void) | void;\n release?: (() => void) | void;\n}\n\ninterface Hook<T> extends Setup {\n queued?: boolean;\n update?: (next: (previous: number) => number) => void;\n output: T;\n}\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 /** Non-urgent bracket a subscriber replays through; absent where the host\n * cannot defer, which keeps normal timing. */\n startTransition?(work: () => void): void;\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; absent where render attempts do not stack. */\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 * Returns a claim on the update being replayed, held until this hook commits\n * carrying it - or until unmount, where it never will. Keyed on `tick` so an\n * urgent commit in the meantime, which leaves the deferred update queued, does\n * not release it.\n */\nexport function useSettle(tick: number) {\n const ref = Runtime.useRef<Settle | null>(null);\n const settle = ref.current || (ref.current = {\n claim() {\n const held = pending();\n\n if (held) (settle.waiting ||= []).push(held);\n },\n release() {\n const { waiting } = settle;\n\n if (!waiting) return;\n settle.waiting = undefined;\n\n for (const held of waiting) held();\n }\n });\n\n Runtime.useEffect(() => {\n settle.release();\n return settle.release;\n }, [tick]);\n\n return settle.claim;\n}\n\n/**\n * Run `init` once for the life of a hook and clean up when it unmounts, safe\n * under React StrictMode - a remount shares the render counter, so neither the\n * setup nor its cleanup repeats. A cleanup following a render not yet committed\n * - Fast Refresh re-running effects - defers a microtask, and is dropped if the\n * effect runs again. `reset` invalidates the rendered value so in-flight render\n * attempts revalidate.\n *\n * @returns The hook's own record, plus the render counter and its setter.\n */\nexport function useSetup<T extends Setup>(\n init: (self: T, reset: () => void) => () => (() => void) | void\n) {\n const { current } = Runtime.useRef({ rendered: 0, revision: 0 } as T);\n\n const [tick, update] = Runtime.useState(() => {\n if (!current.rendered)\n current.commit = init(current, () => {\n current.revision++;\n });\n\n return current.rendered++;\n });\n\n const getRevision = (current.getRevision ||= () => current.revision);\n\n current.fresh = true;\n\n Runtime.useSyncExternalStore?.(noop, getRevision, getRevision);\n\n Runtime.useEffect(() => {\n current.fresh = false;\n });\n\n Runtime.useEffect(() => {\n current.mounted = true;\n current.lapsed = false;\n\n if (current.commit) {\n current.release = current.commit();\n current.commit = undefined;\n }\n\n return () => {\n if (!current.fresh) {\n if (--current.rendered <= 0) current.release?.();\n return;\n }\n\n current.lapsed = true;\n\n queueMicrotask(() => {\n if (current.lapsed) current.release?.();\n });\n }\n }, []);\n\n return [current, tick, update] as const;\n}\n\n/**\n * Mount-effect with a refreshable return value. Publishing a value before mount\n * defers the update to it, and one published after claims the update being\n * replayed until this hook commits carrying it.\n *\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, tick, update] = useSetup<Hook<T>>((self, reset) => {\n const mount = callback((next) => {\n self.output = next;\n\n if (self.mounted) {\n claim();\n self.update?.((x) => x + 1);\n }\n else if (self.update) self.queued = true;\n }, reset);\n\n return () => {\n const cleanup = mount();\n\n if (self.queued) {\n self.queued = false;\n self.update!((x) => x + 1);\n }\n\n return cleanup;\n };\n });\n\n const claim = useSettle(tick);\n\n current.update = update;\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 }, undefined, Runtime.startTransition);\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 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.Property<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\n/** @deprecated Use `<Component for={…}>`: one State per element, compose a parent State for several. */\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 { 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: {};\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 * 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 */\nComponent.on({\n type(type) {\n const render = Object.getOwnPropertyDescriptor(type.prototype, 'render');\n\n if (typeof render?.value == 'function')\n Object.defineProperty(type.prototype, 'render', { ...render, configurable: false });\n\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 subcomponents(type.prototype);\n },\n setup(self) {\n subcomponents(self);\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.props.catch || 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, dedupe } = Runtime;\n const attempt = dedupe?.(from, context);\n const { is: owner, render } = from;\n\n const Render = () => render.call(from, from.props);\n const Component = () => {\n from = useWatch(from, () => {\n const release = owner.mount?.();\n\n attempt?.commit();\n\n return () => {\n if (typeof release == 'function') release();\n attempt?.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) {\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: true,\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 set(this: Component, value: unknown) {\n Object.defineProperty(this, key, {\n value,\n writable: true,\n enumerable: true,\n configurable: true\n });\n\n subcomponents(this);\n }\n });\n }\n}\n\nexport { createFrame };\n"],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { a as Runtime, l as useWatch, o as useFactory, r as Context$1, t as createFrame } from "./chunk-component-Bu6E8zDP.js";
1
+ import { a as useFactory, c as useWatch, i as Runtime, n as Context$1, t as createFrame } from "./chunk-component-BzRnGX4m.js";
2
2
  import { Component } from "@expressive/mvc";
3
3
 
4
4
  //#region src/element.ts
@@ -42,4 +42,4 @@ function Element() {
42
42
 
43
43
  //#endregion
44
44
  export { seam as t };
45
- //# sourceMappingURL=chunk-element-BwZN13A8.js.map
45
+ //# sourceMappingURL=chunk-element-KtBXBolE.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"chunk-element-BwZN13A8.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"}
1
+ {"version":3,"file":"chunk-element-KtBXBolE.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"}
@@ -1,5 +1,4 @@
1
1
  import { Component, Context as Context$1, State as State$1 } from "@expressive/mvc";
2
- import * as react from "react";
3
2
 
4
3
  //#region src/state.get.d.ts
5
4
  /** Type may not be undefined - instead will be null. */
@@ -79,20 +78,6 @@ declare module '@expressive/mvc' {
79
78
  }
80
79
  //#endregion
81
80
  //#region src/context.d.ts
82
- declare namespace Consumer {
83
- type Props<T extends State$1> = {
84
- /** Type of controller to fetch from context. */for: State$1.Extends<T>;
85
- /**
86
- * Render function, will receive instance of desired controller.
87
- *
88
- * Called every render of parent component.
89
- * Similar to `State.get()`, updates to properties accessed in
90
- * this function will cause a refresh when they change.
91
- */
92
- children: (value: T) => Component.Node | void;
93
- };
94
- }
95
- declare function Consumer<T extends State$1>(props: Consumer.Props<T>): string | number | bigint | boolean | react.ReactElement<unknown, string | react.JSXElementConstructor<any>> | Iterable<react.ReactNode> | react.ReactPortal | null;
96
81
  declare namespace Provider {
97
82
  /**
98
83
  * Runs for each State registered by this Provider. Return value is ignored -
@@ -122,6 +107,7 @@ declare namespace Provider {
122
107
  };
123
108
  type Props<T extends State$1 = State$1> = ForSingleProps<T> | ForMultipleProps<T>;
124
109
  }
110
+ /** @deprecated Use `<Component for={…}>`: one State per element, compose a parent State for several. */
125
111
  declare function Provider<T extends State$1>({
126
112
  children,
127
113
  fallback,
@@ -153,7 +139,7 @@ declare module '@expressive/mvc' {
153
139
  /** @deprecated Only to satisfy host JSX. Use `this.get(State)` instead. */
154
140
  readonly context: Context$1;
155
141
  /** @deprecated Only to satisfy host JSX. Use `this.get()` instead. */
156
- readonly state: State.Values<this>;
142
+ readonly state: {};
157
143
  /** @deprecated Only to satisfy host JSX. Use `this.set({})` instead. */
158
144
  setState: (state: any, callback?: () => void) => void;
159
145
  /** @deprecated Only to satisfy host JSX. Use `this.set(key)` instead. */
@@ -178,11 +164,11 @@ declare const Runtime: {
178
164
  };
179
165
  /** Non-urgent bracket a subscriber replays through; absent where the host
180
166
  * cannot defer, which keeps normal timing. */
181
- transition?(work: () => void): void;
167
+ startTransition?(work: () => void): void;
182
168
  /** Consumed for pre-commit revision validation; absent where commits
183
169
  * cannot interleave with writes. */
184
- useSyncExternalStore?(subscribe: (notify: () => void) => () => void, getSnapshot: () => number, getServerSnapshot?: () => number): number; /** Per-render-attempt lifecycle, set by each adapter (React stacks attempts; others no-op). */
185
- dedupe(from: Component, context: Context$1): {
170
+ useSyncExternalStore?(subscribe: (notify: () => void) => () => void, getSnapshot: () => number, getServerSnapshot?: () => number): number; /** Per-render-attempt lifecycle; absent where render attempts do not stack. */
171
+ dedupe?(from: Component, context: Context$1): {
186
172
  commit(): void;
187
173
  remove(): void;
188
174
  }; /** Host error-boundary component, wrapping a Component whose `catch` is set. */
@@ -190,5 +176,5 @@ declare const Runtime: {
190
176
  Suspense: any;
191
177
  };
192
178
  //#endregion
193
- export { Consumer as n, Provider as r, Runtime as t };
194
- //# sourceMappingURL=chunk-runtime-Cn_ynxAT.d.ts.map
179
+ export { Provider as n, Runtime as t };
180
+ //# sourceMappingURL=chunk-runtime-Ce3xLL1m.d.ts.map
package/dist/has.js CHANGED
@@ -1,5 +1,5 @@
1
- import { l as useWatch } from "./chunk-component-Bu6E8zDP.js";
2
- import { t as seam } from "./chunk-element-BwZN13A8.js";
1
+ import { c as useWatch } from "./chunk-component-BzRnGX4m.js";
2
+ import { t as seam } from "./chunk-element-KtBXBolE.js";
3
3
  import { has } from "@expressive/mvc";
4
4
 
5
5
  //#region src/has.ts
package/dist/index.d.ts CHANGED
@@ -1,9 +1,9 @@
1
- import { n as Consumer, r as Provider } from "./chunk-runtime-Cn_ynxAT.js";
1
+ import { n as Provider } from "./chunk-runtime-Ce3xLL1m.js";
2
2
  import { State } from "./adapter.js";
3
3
  import { has } from "./has.js";
4
4
  import { map } from "./map.js";
5
5
  import { Component as Component$1, Context, def, get, pending, ref, set } from "@expressive/mvc";
6
- import { JSX, ReactNode } from "react";
6
+ import { Component as Component$3, JSX, ReactNode } from "react";
7
7
 
8
8
  //#region src/element.d.ts
9
9
  declare module '@expressive/mvc' {
@@ -19,12 +19,13 @@ declare module '@expressive/mvc' {
19
19
  */
20
20
  //#endregion
21
21
  //#region src/jsx-runtime.d.ts
22
- declare module '@expressive/mvc/runtime' {
22
+ declare module '@expressive/mvc/jsx-runtime' {
23
23
  interface Host {
24
24
  node: ReactNode;
25
25
  intrinsics: JSX.IntrinsicElements;
26
+ elementClass: Component$3<any, any>;
26
27
  }
27
28
  }
28
29
  //#endregion
29
- export { Component$1 as Component, Consumer, Context, Provider, State, State as default, def, get, has, map, pending, ref, set };
30
+ export { Component$1 as Component, Context, Provider, State, State as default, def, get, has, map, pending, ref, set };
30
31
  //# sourceMappingURL=index.d.ts.map
package/dist/index.js CHANGED
@@ -1,12 +1,13 @@
1
- import { a as Runtime, i as Provider, n as Consumer } from "./chunk-component-Bu6E8zDP.js";
1
+ import { i as Runtime, r as Provider } from "./chunk-component-BzRnGX4m.js";
2
2
  import { State } from "./adapter.js";
3
- import "./chunk-element-BwZN13A8.js";
3
+ import "./chunk-element-KtBXBolE.js";
4
4
  import { has } from "./has.js";
5
5
  import { map } from "./map.js";
6
6
  import { Component, Component as Component$1, Context, def, get, pending, ref, set } from "@expressive/mvc";
7
- import React, { Children, Suspense, createContext, createElement, isValidElement, useContext, useEffect, useRef, useState } from "react";
7
+ import * as React$1 from "react";
8
+ import React, { Children, isValidElement } from "react";
8
9
  import { Fragment, jsx, jsxs } from "react/jsx-runtime";
9
- import { host } from "@expressive/mvc/runtime";
10
+ import { host } from "@expressive/mvc/jsx-runtime";
10
11
 
11
12
  //#region src/jsx-runtime.ts
12
13
  host({
@@ -73,7 +74,7 @@ var ErrorBoundary = class extends React.Component {
73
74
  this.recovering = true;
74
75
  this.setState({ error });
75
76
  };
76
- Promise.resolve(self.catch(error)).then(() => reset(), reset).finally(() => self.set({ fallback }, true));
77
+ Promise.resolve((self.props.catch || self.catch).call(self, error, self.is)).then(() => reset(), reset).finally(() => self.set({ fallback }, true));
77
78
  }
78
79
  componentDidUpdate() {
79
80
  this.recovering = false;
@@ -91,15 +92,15 @@ Object.defineProperty(Component$1.prototype, "isReactComponent", { value: true }
91
92
  Object.assign(Runtime, {
92
93
  dedupe,
93
94
  ErrorBoundary,
94
- createElement,
95
- createContext,
96
- useContext,
97
- useEffect,
98
- useState,
99
- useRef,
100
- useSyncExternalStore: React.useSyncExternalStore,
101
- transition: React.startTransition,
102
- Suspense,
95
+ createElement: React$1.createElement,
96
+ createContext: React$1.createContext,
97
+ useContext: React$1.useContext,
98
+ useEffect: React$1.useEffect,
99
+ useState: React$1.useState,
100
+ useRef: React$1.useRef,
101
+ useSyncExternalStore: React$1.useSyncExternalStore,
102
+ startTransition: React$1.startTransition,
103
+ Suspense: React$1.Suspense,
103
104
  ignore: [
104
105
  "updater",
105
106
  "refs",
@@ -111,5 +112,5 @@ Object.assign(Runtime, {
111
112
  var src_default = State;
112
113
 
113
114
  //#endregion
114
- export { Component, Consumer, Context, Provider, State, def, src_default as default, get, has, map, pending, ref, set };
115
+ export { Component, Context, Provider, State, def, src_default as default, get, has, map, pending, ref, set };
115
116
  //# 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/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 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 { State } from './adapter';\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 transition: React.startTransition,\n Suspense,\n ignore: [\n 'updater',\n 'refs',\n '_reactInternals',\n '_reactInternalInstance'\n ]\n});\n\nexport { Consumer, Provider } from './adapter';\n\n/** @deprecated Import `State` from `@expressive/mvc`. This re-export will be removed. */\nexport { State } from './adapter';\n\n/** @deprecated Import `{ State }` from `@expressive/mvc`. The default export will be removed. */\nexport default State;\n\n/** @deprecated Import from `@expressive/mvc`. These re-exports will be removed. */\nexport { Component, Context, def, get, ref, set, pending } from '@expressive/mvc';\n\n/** @deprecated Import `has` from `@expressive/mvc`. This re-export will be removed. */\nexport { has } from './has';\n\n/** @deprecated Import `map` from `@expressive/mvc`. This re-export will be removed. */\nexport { map } from './map';\n"],"mappings":";;;;;;;;;;;AAaA,KAAK;CACH;CACA;CACA;CACA,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;;;;;;ACZF,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;;;;;;ACpE3B,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,YAAY,MAAM;CAClB;CACA,QAAQ;EACN;EACA;EACA;EACA;EACD;CACF,CAAC;;AAQF,kBAAe"}
1
+ {"version":3,"file":"index.js","names":["Component","React"],"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/jsx-runtime';\n\nimport type { Component as ReactComponent, JSX as ReactJSX, ReactNode } from 'react';\n\ndeclare module '@expressive/mvc/jsx-runtime' {\n interface Host {\n node: ReactNode;\n intrinsics: ReactJSX.IntrinsicElements;\n elementClass: ReactComponent<any, any>;\n }\n}\n\nhost({\n jsx,\n jsxs,\n Fragment,\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.props.catch || self.catch)!.call(self, error, self.is))\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 { State } from './adapter';\nimport * as React 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: React.createElement,\n createContext: React.createContext,\n useContext: React.useContext,\n useEffect: React.useEffect,\n useState: React.useState,\n useRef: React.useRef,\n useSyncExternalStore: React.useSyncExternalStore,\n startTransition: React.startTransition,\n Suspense: React.Suspense,\n ignore: [\n 'updater',\n 'refs',\n '_reactInternals',\n '_reactInternalInstance'\n ]\n});\n\nexport { Provider } from './adapter';\n\n/** @deprecated Import `State` from `@expressive/mvc`. This re-export will be removed. */\nexport { State } from './adapter';\n\n/** @deprecated Import `{ State }` from `@expressive/mvc`. The default export will be removed. */\nexport default State;\n\n/** @deprecated Import from `@expressive/mvc`. These re-exports will be removed. */\nexport { Component, Context, def, get, ref, set, pending } from '@expressive/mvc';\n\n/** @deprecated Import `has` from `@expressive/mvc`. This re-export will be removed. */\nexport { has } from './has';\n\n/** @deprecated Import `map` from `@expressive/mvc`. This re-export will be removed. */\nexport { map } from './map';\n"],"mappings":";;;;;;;;;;;;AAcA,KAAK;CACH;CACA;CACA;CACA,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,SAAS,KAAK,MAAM,SAAS,KAAK,OAAQ,KAAK,MAAM,OAAO,KAAK,GAAG,CAAC,CAC1E,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;;;;;;AC5E3B,OAAO,eAAeA,YAAU,WAAW,oBAAoB,EAC7D,OAAO,MACR,CAAC;AAEF,OAAO,OAAO,SAAS;CACrB;CACA;CACA,eAAeC,QAAM;CACrB,eAAeA,QAAM;CACrB,YAAYA,QAAM;CAClB,WAAWA,QAAM;CACjB,UAAUA,QAAM;CAChB,QAAQA,QAAM;CACd,sBAAsBA,QAAM;CAC5B,iBAAiBA,QAAM;CACvB,UAAUA,QAAM;CAChB,QAAQ;EACN;EACA;EACA;EACA;EACD;CACF,CAAC;;AAQF,kBAAe"}
package/dist/map.js CHANGED
@@ -1,5 +1,5 @@
1
- import { l as useWatch } from "./chunk-component-Bu6E8zDP.js";
2
- import { t as seam } from "./chunk-element-BwZN13A8.js";
1
+ import { c as useWatch } from "./chunk-component-BzRnGX4m.js";
2
+ import { t as seam } from "./chunk-element-KtBXBolE.js";
3
3
  import { map } from "@expressive/mvc";
4
4
 
5
5
  //#region src/map.ts
package/dist/vite.js CHANGED
@@ -40,19 +40,8 @@ function scan(body) {
40
40
  exports
41
41
  };
42
42
  }
43
- /**
44
- * Bind a module's classes to `hot.accept`. A State class it could not patch
45
- * reloads the page; after an update, a changed component is left to React
46
- * Refresh and any other changed export invalidates importers.
47
- */
48
- function inject(id, body, ssr = false) {
49
- const { classes, hidden, exports } = scan(body);
50
- if (!classes.length) return "";
51
- const list = classes.join(", ");
52
- const record = Object.entries(exports).map(([name, local]) => `${JSON.stringify(name)}: ${local}`);
53
- const effect = ssr ? "replace it instead of patching" : "will trigger a full reload";
54
- const notes = hidden.map((name) => `${JSON.stringify(name)}: ${JSON.stringify(`[expressive] ${name} (${id}) declares #private members, so edits to its module ${effect}. Use _ properties instead to keep HMR.`)}`);
55
- const replace = ssr ? ` const __notes = { ${notes.join(", ")} };
43
+ const server = (notes, list) => `\
44
+ const __notes = ${JSON.stringify(notes)};
56
45
  const __before = import.meta.hot.data.expressive;
57
46
  const __classes = (import.meta.hot.data.expressive = { ${list} });
58
47
  const __warned = (import.meta.hot.data.warned ||= {});
@@ -60,9 +49,10 @@ function inject(id, body, ssr = false) {
60
49
  if (__before && __classes[key] !== __before[key] && !__warned[key]) {
61
50
  __warned[key] = true;
62
51
  console.warn(__notes[key]);
63
- }
64
- ` : ` const __notes = { ${notes.join(", ")} };
65
- const __flag = (key) => 'expressive:private:' + ${JSON.stringify(id)} + ':' + key;
52
+ }`;
53
+ const browser = (id, notes, list) => `\
54
+ const __notes = ${JSON.stringify(notes)};
55
+ const __flag = (key) => 'expressive:private:' + ${id} + ':' + key;
66
56
  for (const key in __notes)
67
57
  try {
68
58
  if (sessionStorage.getItem(__flag(key)) == 'due') {
@@ -81,20 +71,19 @@ function inject(id, body, ssr = false) {
81
71
  } catch {
82
72
  console.warn(note);
83
73
  }
84
- dispatchEvent(new CustomEvent('expressive:reload', { detail: { module: ${JSON.stringify(id)}, class: key, reason: note ? 'private members' : 'class changed shape' } }));
74
+ dispatchEvent(new CustomEvent('expressive:reload', { detail: { module: ${id}, class: key, reason: note ? 'private members' : 'class changed shape' } }));
85
75
  location.reload();
86
76
  break;
87
- }
88
- `;
89
- return `
90
- import { hot as __expressive } from '@expressive/mvc/runtime';
91
- import { State as __State } from '@expressive/mvc';
77
+ }`;
78
+ const patchClasses = (id, classes) => `\
92
79
  {
93
- const __hot = __expressive.accept(${JSON.stringify(id)}, { ${list} });
80
+ const __hot = __accept(${id}, { ${classes.join(", ")} });
94
81
  ${classes.map((name) => `${name} = __hot.${name};`).join("\n ")}
95
- }
82
+ }`;
83
+ const acceptUpdates = (replace, record) => `\
96
84
  if (import.meta.hot) {
97
- ${replace} const __exports = { ${record.join(", ")} };
85
+ ${replace}
86
+ const __exports = { ${record} };
98
87
  import.meta.hot.accept((next) => {
99
88
  if (!next) return;
100
89
  for (const key in __exports) {
@@ -103,8 +92,27 @@ ${replace} const __exports = { ${record.join(", ")} };
103
92
  return import.meta.hot.invalidate(\`"\${key}" export cannot be hot-patched.\`);
104
93
  }
105
94
  });
106
- }
107
- `;
95
+ }`;
96
+ /**
97
+ * Bind a module's classes to `hot.accept`. A State class it could not patch
98
+ * reloads the page; after an update, a changed component is left to React
99
+ * Refresh and any other changed export invalidates importers.
100
+ */
101
+ function inject(id, body, ssr = false) {
102
+ const { classes, hidden, exports } = scan(body);
103
+ if (!classes.length) return "";
104
+ const key = JSON.stringify(id);
105
+ const list = classes.join(", ");
106
+ const record = Object.entries(exports).map(([name, local]) => `${JSON.stringify(name)}: ${local}`);
107
+ const effect = ssr ? "replace it instead of patching" : "will trigger a full reload";
108
+ const notes = Object.fromEntries(hidden.map((name) => [name, `[expressive] ${name} (${id}) declares #private members, so edits to its module ${effect}. Use _ properties instead to keep HMR.`]));
109
+ const replace = ssr ? server(notes, list) : browser(key, notes, list);
110
+ return `\n${[
111
+ `import { State as __State } from '@expressive/mvc';`,
112
+ `import { accept as __accept } from '@expressive/mvc/hot';`,
113
+ patchClasses(key, classes),
114
+ acceptUpdates(replace, record.join(", "))
115
+ ].join("\n")}\n`;
108
116
  }
109
117
  /** Hot-patch State and Component classes in place during `vite` dev. */
110
118
  function expressive() {
@@ -120,7 +128,7 @@ function expressive() {
120
128
  async transform(code, id, options) {
121
129
  const [file] = id.split("?");
122
130
  if (!SOURCE.test(file) || file.includes("/node_modules/") || !code.includes("class")) return;
123
- runtime ||= this.resolve("@expressive/mvc/runtime").then((found) => found && dirname(found.id));
131
+ runtime ||= this.resolve("@expressive/mvc/hot").then((found) => found && dirname(found.id));
124
132
  const own = await runtime;
125
133
  if (own && file.startsWith(own)) return;
126
134
  const output = inject(file.startsWith(root + "/") ? file.slice(root.length) : file, this.parse(code).body, options?.ssr);
package/dist/vite.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"vite.js","names":[],"sources":["../src/vite.ts"],"sourcesContent":["import { dirname } from 'node:path';\nimport type { Plugin } from 'vite';\n\ntype Node = { type: string; [key: string]: any };\n\nconst SOURCE = /\\.[cm]?[jt]sx?$/;\n\n/**\n * Top-level classes a module can reassign, those declaring private members,\n * and its exports by local binding.\n */\nfunction scan(body: Node[]) {\n const classes: string[] = [];\n const hidden: string[] = [];\n const exports: Record<string, string> = {};\n\n function add(name: string, node: Node) {\n classes.push(name);\n\n if (node.body.body.some((member: Node) => member.key?.type == 'PrivateIdentifier')) hidden.push(name);\n }\n\n function collect(node: Node) {\n if (node.type == 'ClassDeclaration' && node.id) add(node.id.name, node);\n else if (node.type == 'VariableDeclaration' && node.kind != 'const')\n for (const { id, init } of node.declarations)\n if (id.type == 'Identifier' && init?.type == 'ClassExpression') add(id.name, init);\n }\n\n function names(node: Node): string[] {\n if (node.type == 'VariableDeclaration')\n return node.declarations.flatMap(({ id }: Node) => (id.type == 'Identifier' ? [id.name] : []));\n\n return [node.id.name];\n }\n\n for (const node of body) {\n if (node.type == 'ExportNamedDeclaration') {\n if (node.declaration) {\n collect(node.declaration);\n for (const name of names(node.declaration)) exports[name] = name;\n } else if (!node.source)\n for (const { local, exported } of node.specifiers)\n exports[exported.name ?? exported.value] = local.name;\n } else if (node.type == 'ExportDefaultDeclaration') {\n const { declaration } = node;\n\n collect(declaration);\n\n if (declaration.id) exports.default = declaration.id.name;\n } else collect(node);\n }\n\n return { classes, hidden, exports };\n}\n\n/**\n * Bind a module's classes to `hot.accept`. A State class it could not patch\n * reloads the page; after an update, a changed component is left to React\n * Refresh and any other changed export invalidates importers.\n */\nfunction inject(id: string, body: Node[], ssr = false) {\n const { classes, hidden, exports } = scan(body);\n\n if (!classes.length) return '';\n\n const list = classes.join(', ');\n const record = Object.entries(exports).map(([name, local]) => `${JSON.stringify(name)}: ${local}`);\n const effect = ssr ? 'replace it instead of patching' : 'will trigger a full reload';\n const notes = hidden.map(\n (name) =>\n `${JSON.stringify(name)}: ${JSON.stringify(`[expressive] ${name} (${id}) declares #private members, so edits to its module ${effect}. Use _ properties instead to keep HMR.`)}`\n );\n const replace = ssr\n ? ` const __notes = { ${notes.join(', ')} };\n const __before = import.meta.hot.data.expressive;\n const __classes = (import.meta.hot.data.expressive = { ${list} });\n const __warned = (import.meta.hot.data.warned ||= {});\n for (const key in __notes)\n if (__before && __classes[key] !== __before[key] && !__warned[key]) {\n __warned[key] = true;\n console.warn(__notes[key]);\n }\n`\n : ` const __notes = { ${notes.join(', ')} };\n const __flag = (key) => 'expressive:private:' + ${JSON.stringify(id)} + ':' + key;\n for (const key in __notes)\n try {\n if (sessionStorage.getItem(__flag(key)) == 'due') {\n console.warn(__notes[key]);\n sessionStorage.setItem(__flag(key), 'shown');\n }\n } catch {}\n const __before = import.meta.hot.data.expressive;\n const __classes = (import.meta.hot.data.expressive = { ${list} });\n for (const key in __before)\n if (__classes[key] !== __before[key] && __classes[key]?.prototype instanceof __State) {\n const note = __notes[key];\n if (note)\n try {\n if (!sessionStorage.getItem(__flag(key))) sessionStorage.setItem(__flag(key), 'due');\n } catch {\n console.warn(note);\n }\n dispatchEvent(new CustomEvent('expressive:reload', { detail: { module: ${JSON.stringify(id)}, class: key, reason: note ? 'private members' : 'class changed shape' } }));\n location.reload();\n break;\n }\n`;\n\n return `\nimport { hot as __expressive } from '@expressive/mvc/runtime';\nimport { State as __State } from '@expressive/mvc';\n{\n const __hot = __expressive.accept(${JSON.stringify(id)}, { ${list} });\n ${classes.map((name) => `${name} = __hot.${name};`).join('\\n ')}\n}\nif (import.meta.hot) {\n${replace} const __exports = { ${record.join(', ')} };\n import.meta.hot.accept((next) => {\n if (!next) return;\n for (const key in __exports) {\n const after = next[key];\n if (after !== __exports[key] && !(after?.prototype instanceof __State) && (typeof after != 'function' || !/^[A-Z]/.test(after.name)))\n return import.meta.hot.invalidate(\\`\"\\${key}\" export cannot be hot-patched.\\`);\n }\n });\n}\n`;\n}\n\n/** Hot-patch State and Component classes in place during `vite` dev. */\nexport default function expressive(): Plugin {\n let root = '';\n let runtime: Promise<string | null | undefined> | undefined;\n\n return {\n name: '@expressive/react:hot',\n apply: 'serve',\n enforce: 'post',\n configResolved(config) {\n root = config.root;\n },\n async transform(code, id, options) {\n const [file] = id.split('?');\n\n if (!SOURCE.test(file) || file.includes('/node_modules/') || !code.includes('class'))\n return;\n\n runtime ||= this.resolve('@expressive/mvc/runtime').then((found) => found && dirname(found.id));\n\n const own = await runtime;\n\n if (own && file.startsWith(own)) return;\n\n const output = inject(file.startsWith(root + '/') ? file.slice(root.length) : file, this.parse(code).body as Node[], options?.ssr);\n\n if (output) return { code: code + output, map: null };\n }\n };\n}\n"],"mappings":";;;AAKA,MAAM,SAAS;;;;;AAMf,SAAS,KAAK,MAAc;CAC1B,MAAM,UAAoB,EAAE;CAC5B,MAAM,SAAmB,EAAE;CAC3B,MAAM,UAAkC,EAAE;CAE1C,SAAS,IAAI,MAAc,MAAY;AACrC,UAAQ,KAAK,KAAK;AAElB,MAAI,KAAK,KAAK,KAAK,MAAM,WAAiB,OAAO,KAAK,QAAQ,oBAAoB,CAAE,QAAO,KAAK,KAAK;;CAGvG,SAAS,QAAQ,MAAY;AAC3B,MAAI,KAAK,QAAQ,sBAAsB,KAAK,GAAI,KAAI,KAAK,GAAG,MAAM,KAAK;WAC9D,KAAK,QAAQ,yBAAyB,KAAK,QAAQ,SAC1D;QAAK,MAAM,EAAE,IAAI,UAAU,KAAK,aAC9B,KAAI,GAAG,QAAQ,gBAAgB,MAAM,QAAQ,kBAAmB,KAAI,GAAG,MAAM,KAAK;;;CAGxF,SAAS,MAAM,MAAsB;AACnC,MAAI,KAAK,QAAQ,sBACf,QAAO,KAAK,aAAa,SAAS,EAAE,SAAgB,GAAG,QAAQ,eAAe,CAAC,GAAG,KAAK,GAAG,EAAE,CAAE;AAEhG,SAAO,CAAC,KAAK,GAAG,KAAK;;AAGvB,MAAK,MAAM,QAAQ,KACjB,KAAI,KAAK,QAAQ,0BACf;MAAI,KAAK,aAAa;AACpB,WAAQ,KAAK,YAAY;AACzB,QAAK,MAAM,QAAQ,MAAM,KAAK,YAAY,CAAE,SAAQ,QAAQ;aACnD,CAAC,KAAK,OACf,MAAK,MAAM,EAAE,OAAO,cAAc,KAAK,WACrC,SAAQ,SAAS,QAAQ,SAAS,SAAS,MAAM;YAC5C,KAAK,QAAQ,4BAA4B;EAClD,MAAM,EAAE,gBAAgB;AAExB,UAAQ,YAAY;AAEpB,MAAI,YAAY,GAAI,SAAQ,UAAU,YAAY,GAAG;OAChD,SAAQ,KAAK;AAGtB,QAAO;EAAE;EAAS;EAAQ;EAAS;;;;;;;AAQrC,SAAS,OAAO,IAAY,MAAc,MAAM,OAAO;CACrD,MAAM,EAAE,SAAS,QAAQ,YAAY,KAAK,KAAK;AAE/C,KAAI,CAAC,QAAQ,OAAQ,QAAO;CAE5B,MAAM,OAAO,QAAQ,KAAK,KAAK;CAC/B,MAAM,SAAS,OAAO,QAAQ,QAAQ,CAAC,KAAK,CAAC,MAAM,WAAW,GAAG,KAAK,UAAU,KAAK,CAAC,IAAI,QAAQ;CAClG,MAAM,SAAS,MAAM,mCAAmC;CACxD,MAAM,QAAQ,OAAO,KAClB,SACC,GAAG,KAAK,UAAU,KAAK,CAAC,IAAI,KAAK,UAAU,gBAAgB,KAAK,IAAI,GAAG,sDAAsD,OAAO,yCAAyC,GAChL;CACD,MAAM,UAAU,MACZ,uBAAuB,MAAM,KAAK,KAAK,CAAC;;2DAEa,KAAK;;;;;;;IAQ1D,uBAAuB,MAAM,KAAK,KAAK,CAAC;oDACM,KAAK,UAAU,GAAG,CAAC;;;;;;;;;2DASZ,KAAK;;;;;;;;;;+EAUe,KAAK,UAAU,GAAG,CAAC;;;;;AAMhG,QAAO;;;;sCAI6B,KAAK,UAAU,GAAG,CAAC,MAAM,KAAK;IAChE,QAAQ,KAAK,SAAS,GAAG,KAAK,WAAW,KAAK,GAAG,CAAC,KAAK,OAAO,CAAC;;;EAGjE,QAAQ,wBAAwB,OAAO,KAAK,KAAK,CAAC;;;;;;;;;;;;;AAcpD,SAAwB,aAAqB;CAC3C,IAAI,OAAO;CACX,IAAI;AAEJ,QAAO;EACL,MAAM;EACN,OAAO;EACP,SAAS;EACT,eAAe,QAAQ;AACrB,UAAO,OAAO;;EAEhB,MAAM,UAAU,MAAM,IAAI,SAAS;GACjC,MAAM,CAAC,QAAQ,GAAG,MAAM,IAAI;AAE5B,OAAI,CAAC,OAAO,KAAK,KAAK,IAAI,KAAK,SAAS,iBAAiB,IAAI,CAAC,KAAK,SAAS,QAAQ,CAClF;AAEF,eAAY,KAAK,QAAQ,0BAA0B,CAAC,MAAM,UAAU,SAAS,QAAQ,MAAM,GAAG,CAAC;GAE/F,MAAM,MAAM,MAAM;AAElB,OAAI,OAAO,KAAK,WAAW,IAAI,CAAE;GAEjC,MAAM,SAAS,OAAO,KAAK,WAAW,OAAO,IAAI,GAAG,KAAK,MAAM,KAAK,OAAO,GAAG,MAAM,KAAK,MAAM,KAAK,CAAC,MAAgB,SAAS,IAAI;AAElI,OAAI,OAAQ,QAAO;IAAE,MAAM,OAAO;IAAQ,KAAK;IAAM;;EAExD"}
1
+ {"version":3,"file":"vite.js","names":[],"sources":["../src/vite.ts"],"sourcesContent":["import { dirname } from 'node:path';\nimport type { Plugin } from 'vite';\n\ntype Node = { type: string; [key: string]: any };\n\nconst SOURCE = /\\.[cm]?[jt]sx?$/;\n\n/**\n * Top-level classes a module can reassign, those declaring private members,\n * and its exports by local binding.\n */\nfunction scan(body: Node[]) {\n const classes: string[] = [];\n const hidden: string[] = [];\n const exports: Record<string, string> = {};\n\n function add(name: string, node: Node) {\n classes.push(name);\n\n if (node.body.body.some((member: Node) => member.key?.type == 'PrivateIdentifier')) hidden.push(name);\n }\n\n function collect(node: Node) {\n if (node.type == 'ClassDeclaration' && node.id) add(node.id.name, node);\n else if (node.type == 'VariableDeclaration' && node.kind != 'const')\n for (const { id, init } of node.declarations)\n if (id.type == 'Identifier' && init?.type == 'ClassExpression') add(id.name, init);\n }\n\n function names(node: Node): string[] {\n if (node.type == 'VariableDeclaration')\n return node.declarations.flatMap(({ id }: Node) => (id.type == 'Identifier' ? [id.name] : []));\n\n return [node.id.name];\n }\n\n for (const node of body) {\n if (node.type == 'ExportNamedDeclaration') {\n if (node.declaration) {\n collect(node.declaration);\n for (const name of names(node.declaration)) exports[name] = name;\n } else if (!node.source)\n for (const { local, exported } of node.specifiers)\n exports[exported.name ?? exported.value] = local.name;\n } else if (node.type == 'ExportDefaultDeclaration') {\n const { declaration } = node;\n\n collect(declaration);\n\n if (declaration.id) exports.default = declaration.id.name;\n } else collect(node);\n }\n\n return { classes, hidden, exports };\n}\n\nconst server = (notes: Record<string, string>, list: string) => `\\\n const __notes = ${JSON.stringify(notes)};\n const __before = import.meta.hot.data.expressive;\n const __classes = (import.meta.hot.data.expressive = { ${list} });\n const __warned = (import.meta.hot.data.warned ||= {});\n for (const key in __notes)\n if (__before && __classes[key] !== __before[key] && !__warned[key]) {\n __warned[key] = true;\n console.warn(__notes[key]);\n }`;\n\nconst browser = (id: string, notes: Record<string, string>, list: string) => `\\\n const __notes = ${JSON.stringify(notes)};\n const __flag = (key) => 'expressive:private:' + ${id} + ':' + key;\n for (const key in __notes)\n try {\n if (sessionStorage.getItem(__flag(key)) == 'due') {\n console.warn(__notes[key]);\n sessionStorage.setItem(__flag(key), 'shown');\n }\n } catch {}\n const __before = import.meta.hot.data.expressive;\n const __classes = (import.meta.hot.data.expressive = { ${list} });\n for (const key in __before)\n if (__classes[key] !== __before[key] && __classes[key]?.prototype instanceof __State) {\n const note = __notes[key];\n if (note)\n try {\n if (!sessionStorage.getItem(__flag(key))) sessionStorage.setItem(__flag(key), 'due');\n } catch {\n console.warn(note);\n }\n dispatchEvent(new CustomEvent('expressive:reload', { detail: { module: ${id}, class: key, reason: note ? 'private members' : 'class changed shape' } }));\n location.reload();\n break;\n }`;\n\nconst patchClasses = (id: string, classes: string[]) => `\\\n{\n const __hot = __accept(${id}, { ${classes.join(', ')} });\n ${classes.map((name) => `${name} = __hot.${name};`).join('\\n ')}\n}`;\n\nconst acceptUpdates = (replace: string, record: string) => `\\\nif (import.meta.hot) {\n${replace}\n const __exports = { ${record} };\n import.meta.hot.accept((next) => {\n if (!next) return;\n for (const key in __exports) {\n const after = next[key];\n if (after !== __exports[key] && !(after?.prototype instanceof __State) && (typeof after != 'function' || !/^[A-Z]/.test(after.name)))\n return import.meta.hot.invalidate(\\`\"\\${key}\" export cannot be hot-patched.\\`);\n }\n });\n}`;\n\n/**\n * Bind a module's classes to `hot.accept`. A State class it could not patch\n * reloads the page; after an update, a changed component is left to React\n * Refresh and any other changed export invalidates importers.\n */\nfunction inject(id: string, body: Node[], ssr = false) {\n const { classes, hidden, exports } = scan(body);\n\n if (!classes.length) return '';\n\n const key = JSON.stringify(id);\n const list = classes.join(', ');\n const record = Object.entries(exports).map(([name, local]) => `${JSON.stringify(name)}: ${local}`);\n const effect = ssr ? 'replace it instead of patching' : 'will trigger a full reload';\n const notes = Object.fromEntries(\n hidden.map((name) => [name, `[expressive] ${name} (${id}) declares #private members, so edits to its module ${effect}. Use _ properties instead to keep HMR.`])\n );\n const replace = ssr ? server(notes, list) : browser(key, notes, list);\n\n const lines = [\n `import { State as __State } from '@expressive/mvc';`,\n `import { accept as __accept } from '@expressive/mvc/hot';`,\n patchClasses(key, classes),\n acceptUpdates(replace, record.join(', '))\n ];\n\n return `\\n${lines.join('\\n')}\\n`;\n}\n\n/** Hot-patch State and Component classes in place during `vite` dev. */\nexport default function expressive(): Plugin {\n let root = '';\n let runtime: Promise<string | null | undefined> | undefined;\n\n return {\n name: '@expressive/react:hot',\n apply: 'serve',\n enforce: 'post',\n configResolved(config) {\n root = config.root;\n },\n async transform(code, id, options) {\n const [file] = id.split('?');\n\n if (!SOURCE.test(file) || file.includes('/node_modules/') || !code.includes('class'))\n return;\n\n runtime ||= this.resolve('@expressive/mvc/hot').then((found) => found && dirname(found.id));\n\n const own = await runtime;\n\n if (own && file.startsWith(own)) return;\n\n const output = inject(file.startsWith(root + '/') ? file.slice(root.length) : file, this.parse(code).body as Node[], options?.ssr);\n\n if (output) return { code: code + output, map: null };\n }\n };\n}\n"],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@expressive/react",
3
- "version": "0.88.0",
3
+ "version": "0.89.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",
@@ -58,10 +58,12 @@
58
58
  },
59
59
  "scripts": {
60
60
  "build": "tsdown",
61
- "test": "tsc --noEmit && vitest run --coverage"
61
+ "typecheck": "tsc --noEmit --incremental",
62
+ "coverage": "vitest run --coverage",
63
+ "test": "bun run typecheck && bun run coverage"
62
64
  },
63
65
  "devDependencies": {
64
- "@expressive/mvc": "^0.87.0",
66
+ "@expressive/mvc": "^0.88.0",
65
67
  "@testing-library/react": "^16.3.0",
66
68
  "@types/react": "^19",
67
69
  "@types/react-dom": "^19",
@@ -73,7 +75,7 @@
73
75
  "vite": "^7.3.1"
74
76
  },
75
77
  "peerDependencies": {
76
- "@expressive/mvc": "^0.87.0",
78
+ "@expressive/mvc": "^0.88.0",
77
79
  "react": ">=16.14.0 <20.0.0",
78
80
  "vite": ">=5"
79
81
  },
@@ -1 +0,0 @@
1
- {"version":3,"file":"chunk-component-Bu6E8zDP.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 { pending } from '@expressive/mvc';\nimport type { Context } from './context';\n\ninterface Settle {\n waiting?: (() => void)[];\n claim(): void;\n release(): void;\n}\n\ninterface Setup {\n rendered: number;\n revision: number;\n mounted?: boolean;\n fresh?: boolean;\n getRevision?: () => number;\n lapsed?: boolean;\n commit?: () => (() => void) | void;\n release?: (() => void) | void;\n}\n\ninterface Hook<T> extends Setup {\n queued?: boolean;\n update?: (next: (previous: number) => number) => void;\n output: T;\n}\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 /** Non-urgent bracket a subscriber replays through; absent where the host\n * cannot defer, which keeps normal timing. */\n transition?(work: () => void): void;\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 * Returns a claim on the update being replayed, held until this hook commits\n * carrying it - or until unmount, where it never will. Keyed on `tick` so an\n * urgent commit in the meantime, which leaves the deferred update queued, does\n * not release it.\n */\nexport function useSettle(tick: number) {\n const ref = Runtime.useRef<Settle | null>(null);\n const settle = ref.current || (ref.current = {\n claim() {\n const held = pending();\n\n if (held) (settle.waiting ||= []).push(held);\n },\n release() {\n const { waiting } = settle;\n\n if (!waiting) return;\n settle.waiting = undefined;\n\n for (const held of waiting) held();\n }\n });\n\n Runtime.useEffect(() => {\n settle.release();\n return settle.release;\n }, [tick]);\n\n return settle.claim;\n}\n\n/**\n * Run `init` once for the life of a hook and clean up when it unmounts, safe\n * under React StrictMode - a remount shares the render counter, so neither the\n * setup nor its cleanup repeats. A cleanup following a render not yet committed\n * - Fast Refresh re-running effects - defers a microtask, and is dropped if the\n * effect runs again. `reset` invalidates the rendered value so in-flight render\n * attempts revalidate.\n *\n * @returns The hook's own record, plus the render counter and its setter.\n */\nexport function useSetup<T extends Setup>(\n init: (self: T, reset: () => void) => () => (() => void) | void\n) {\n const { current } = Runtime.useRef({ rendered: 0, revision: 0 } as T);\n\n const [tick, update] = Runtime.useState(() => {\n if (!current.rendered)\n current.commit = init(current, () => {\n current.revision++;\n });\n\n return current.rendered++;\n });\n\n const getRevision = (current.getRevision ||= () => current.revision);\n\n current.fresh = true;\n\n Runtime.useSyncExternalStore?.(noop, getRevision, getRevision);\n\n Runtime.useEffect(() => {\n current.fresh = false;\n });\n\n Runtime.useEffect(() => {\n current.mounted = true;\n current.lapsed = false;\n\n if (current.commit) {\n current.release = current.commit();\n current.commit = undefined;\n }\n\n return () => {\n if (!current.fresh) {\n if (--current.rendered <= 0) current.release?.();\n return;\n }\n\n current.lapsed = true;\n\n queueMicrotask(() => {\n if (current.lapsed) current.release?.();\n });\n }\n }, []);\n\n return [current, tick, update] as const;\n}\n\n/**\n * Mount-effect with a refreshable return value. Publishing a value before mount\n * defers the update to it, and one published after claims the update being\n * replayed until this hook commits carrying it.\n *\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, tick, update] = useSetup<Hook<T>>((self, reset) => {\n const mount = callback((next) => {\n self.output = next;\n\n if (self.mounted) {\n claim();\n self.update?.((x) => x + 1);\n }\n else if (self.update) self.queued = true;\n }, reset);\n\n return () => {\n const cleanup = mount();\n\n if (self.queued) {\n self.queued = false;\n self.update!((x) => x + 1);\n }\n\n return cleanup;\n };\n });\n\n const claim = useSettle(tick);\n\n current.update = update;\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 }, undefined, Runtime.transition);\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.Property<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 get/set accessors,\n * 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);\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 const { is: owner, render } = from;\n\n const Render = () => render.call(from, from.props);\n const Component = () => {\n from = useWatch(from, () => {\n const release = owner.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) {\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: true,\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 set(this: Component, value: unknown) {\n Object.defineProperty(this, key, {\n value,\n writable: true,\n enumerable: true,\n configurable: true\n });\n\n subcomponents(this);\n }\n });\n }\n}\n\nexport { createFrame };\n"],"mappings":";;;;AA4BA,MAAa,UAAU,EAAE;AA0BzB,MAAM,mBAAmB;AAEzB,SAAgB,WAA+B,SAAkB;CAC/D,MAAM,MAAM,QAAQ,OAAiB,KAAK;AAC1C,QAAO,IAAI,YAAY,IAAI,UAAU,SAAS;;;;;;;;AAShD,SAAgB,UAAU,MAAc;CACtC,MAAM,MAAM,QAAQ,OAAsB,KAAK;CAC/C,MAAM,SAAS,IAAI,YAAY,IAAI,UAAU;EAC3C,QAAQ;GACN,MAAM,OAAO,SAAS;AAEtB,OAAI,KAAM,EAAC,OAAO,YAAY,EAAE,EAAE,KAAK,KAAK;;EAE9C,UAAU;GACR,MAAM,EAAE,YAAY;AAEpB,OAAI,CAAC,QAAS;AACd,UAAO,UAAU;AAEjB,QAAK,MAAM,QAAQ,QAAS,OAAM;;EAErC;AAED,SAAQ,gBAAgB;AACtB,SAAO,SAAS;AAChB,SAAO,OAAO;IACb,CAAC,KAAK,CAAC;AAEV,QAAO,OAAO;;;;;;;;;;;;AAahB,SAAgB,SACd,MACA;CACA,MAAM,EAAE,YAAY,QAAQ,OAAO;EAAE,UAAU;EAAG,UAAU;EAAG,CAAM;CAErE,MAAM,CAAC,MAAM,UAAU,QAAQ,eAAe;AAC5C,MAAI,CAAC,QAAQ,SACX,SAAQ,SAAS,KAAK,eAAe;AACnC,WAAQ;IACR;AAEJ,SAAO,QAAQ;GACf;CAEF,MAAM,cAAe,QAAQ,sBAAsB,QAAQ;AAE3D,SAAQ,QAAQ;AAEhB,SAAQ,uBAAuB,MAAM,aAAa,YAAY;AAE9D,SAAQ,gBAAgB;AACtB,UAAQ,QAAQ;GAChB;AAEF,SAAQ,gBAAgB;AACtB,UAAQ,UAAU;AAClB,UAAQ,SAAS;AAEjB,MAAI,QAAQ,QAAQ;AAClB,WAAQ,UAAU,QAAQ,QAAQ;AAClC,WAAQ,SAAS;;AAGnB,eAAa;AACX,OAAI,CAAC,QAAQ,OAAO;AAClB,QAAI,EAAE,QAAQ,YAAY,EAAG,SAAQ,WAAW;AAChD;;AAGF,WAAQ,SAAS;AAEjB,wBAAqB;AACnB,QAAI,QAAQ,OAAQ,SAAQ,WAAW;KACvC;;IAEH,EAAE,CAAC;AAEN,QAAO;EAAC;EAAS;EAAM;EAAO;;;;;;;;;AAUhC,SAAgB,QACd,UAIA;CACA,MAAM,CAAC,SAAS,MAAM,UAAU,UAAmB,MAAM,UAAU;EACjE,MAAM,QAAQ,UAAU,SAAS;AAC/B,QAAK,SAAS;AAEd,OAAI,KAAK,SAAS;AAChB,WAAO;AACP,SAAK,UAAU,MAAM,IAAI,EAAE;cAEpB,KAAK,OAAQ,MAAK,SAAS;KACnC,MAAM;AAET,eAAa;GACX,MAAM,UAAU,OAAO;AAEvB,OAAI,KAAK,QAAQ;AACf,SAAK,SAAS;AACd,SAAK,QAAS,MAAM,IAAI,EAAE;;AAG5B,UAAO;;GAET;CAEF,MAAM,QAAQ,UAAU,KAAK;AAE7B,SAAQ,SAAS;AAEjB,QAAO,QAAQ;;AAGjB,SAAgB,SACd,MACA,OACA;AACA,QAAO,SAAY,SAAS,UAAU;EACpC,MAAM,UAAU,MAAM,OAAO,YAAY;AACvC,WAAQ,QAAQ;AAEhB,WAAQ,WAAW;AACjB,QAAI,WAAW,KAAM,QAAO;;KAE7B,QAAW,QAAQ,WAAW;AAEjC,eAAa;GACX,MAAM,UAAU,SAAS;AAEzB,gBAAa;AACX,aAAS;AACT,eAAW;;;GAGf,IAAI;;;;;ACrNR,IAAI;;;;;;AAOJ,SAAS,SAAS;AAChB,QAAO,WAAW,SAAS,QAAQ,cAAcA,UAAQ,KAAK;;;AAIhE,SAAS,aAAa;AACpB,QAAO,QAAQ,WAAW,QAAQ,CAAC;;;AAIrC,SAAS,eAAe,SAAkB,UAAe;AACvD,QAAO,QAAQ,cAAc,QAAQ,CAAC,UAAU;EAAE,OAAO;EAAS;EAAU,CAAC;;AAI/E,OAAO,eAAe,WAAW,eAAe;CAAE,cAAc;CAAM,KAAK;CAAQ,CAAC;AAEpF,MAAM,OAAOA,UAAQ;AAErB,UAAQ,OAAO,UAAkB;AAC/B,KAAI,CAAC,MACH,KAAI;AACF,SAAO,YAAY;SACb;AAEV,QAAO,KAAK,MAAM;;AAmBpB,SAAS,SAA0B,OAA0B;AAC3D,QAAO,MAAM,IAAI,KAAK,MAAM,MAAM,SAAS,EAAE,CAAC;;AAyChD,SAAS,SAA0B,EACjC,UACA,UACA,MACA,GAAG,SACiB;CACpB,MAAM,UAAU,YAAY;AAqC5B,QAAO,eApCmB,SAAS,YAAY;EAC7C,MAAM,UAAU,IAAIA,UAAQ,QAAQ;EACpC,MAAM,QAAiB,EAAE;EAEzB,IAAI;EACJ,IAAI;AAEJ,WAAS,EAAE,IAAI,KAAK,OAAO,GAAG,WAAW;AACvC,OAAI,UAAU,SAAS;IACrB,MAAM,SAAS,MAAM,GAAG,MAAM,IAAI,iBAAiB;AAEnD,cAAU;AACV,WAAO;AAEP,YAAQ,IAAI,QAAQ,OAAO,UAAU;AACnC,SAAI,OAAQ,QAAO;AACnB,SAAI,MAAO,OAAM,KAAK,MAAM;AAC5B,SAAI,GAAI,IAAG,MAAM;MACjB;;AAGJ,OAAI,QAAQ,OAAO,KAAK,KAAK,CAAC,OAAQ,MAAK,IAAI,KAAK;AAEpD,UAAO;IACP;AAEF,eAAa;GACX,MAAM,UAAU,MAAM,KAAK,UAAW,MAAmB,SAAS,CAAC;AAEnE,gBAAa;AACX,SAAK,MAAM,QAAQ,QAAS,KAAI,OAAO,QAAQ,WAAY,OAAM;AACjE,YAAQ,KAAK;;;GAGjB,CAGO,MAAM,EACb,aAAa,SACT,QAAQ,cAAc,QAAQ,UAAU;EAAE;EAAU;EAAM,EAAE,SAAS,GACrE,SACL;;;;;ACzGH,OAAO,iBAAiB,UAAU,WAAW;CAC3C,OAAO;EACL,MAAM;EACN,KAAK,UAAU,UAAU;EAC1B;CACD,SAAS,EACP,KAAK,WACN;CACF,CAAC;AAEF,OAAO,eAAe,WAAW,OAAO;CACtC,cAAc;CACd,QAAQ;AACN,QAAM,IAAI,MACR,GAAG,KAAK,kEACT;;CAEJ,CAAC;;;;;;;;;;;;;;;;AAiBF,UAAU,GAAG;CACX,KAAK,MAAM;AACT,MAAI,SAAS,UACX,MAAK,MAAM,OAAO,QAAQ,OACxB,QAAO,eAAe,UAAU,WAAW,KAAK,EAC9C,IAAI,OAAO;AACT,UAAO,eAAe,MAAM,KAAK;IAAE;IAAO,UAAU;IAAM,CAAC;KAE9D,CAAC;AAGN,gBAAc,KAAK,UAAU;;CAE/B,OAAO,MAAK;AAEV,gBAAc,KAAK;;CAEtB,CAAC;AAEF,SAAS,UAA2B,SAAiB;AACnD,WAAU,QAAQ,MAAM;AACxB,SAAQ,IAAI,kBAAkB,KAAK,IAAI,KAAK,CAAC;AAE7C,QAAO,iBAAiB,MAAM;EAC5B,SAAS;GACP,WAAW;GACX,MAAM;GACP;EACD,QAAQ,EACN,OAAO,OAAO,MAAM,QAAQ,EAC7B;EACF,CAAC;AAEF,MAAK,IAAI,YAAY;AACnB,SAAO,eAAe,MAAM,SAAS;GACnC,OAAO,KAAK;GACZ,UAAU;GACX,CAAC;GACF;;;;;;AAOJ,SAAS,YAAY,MAAiB,SAAkB,UAAmB;CACzE,MAAM,EAAE,kBAAkB;AAE1B,KAAG,KAAK,aAAa,MACnB,YAAW,cACT,QAAQ,UACR;EAAE,UAAU,KAAK;EAAU,MAAM,OAAO,KAAK;EAAE,EAC/C,SACD;AAEH,YAAW,eAAe,SAAS,SAAS;AAE5C,QAAO,KAAK,QACR,cAAc,QAAQ,eAAe;EAAE,MAAM;EAAM;EAAU,CAAC,GAC9D;;;;;;;;AASN,SAAS,OAAO,MAAiB,SAAkB;CACjD,MAAM,EAAE,kBAAkB;CAC1B,MAAM,EAAE,QAAQ,WAAW,QAAQ,OAAO,MAAM,QAAQ;CACxD,MAAM,EAAE,IAAI,OAAO,WAAW;CAE9B,MAAM,eAAe,OAAO,KAAK,MAAM,KAAK,MAAM;CAClD,MAAM,kBAAkB;AACtB,SAAO,SAAS,YAAY;GAC1B,MAAM,UAAU,MAAM,SAAS;AAE/B,WAAQ;AAER,gBAAa;AACX,QAAI,OAAO,WAAW,WAAY,UAAS;AAC3C,YAAQ;AACR,YAAQ,KAAK;;IAEf;AAEF,SAAO,YAAY,MAAM,SAAS,cAAc,OAAO,CAAC;;AAG1D,cAAa,cAAc,UAAU;;;AAIvC,SAAS,cAAc,QAAgB;AACrC,MAAK,MAAM,OAAO,OAAO,oBAAoB,OAAO,EAAE;AACpD,MAAI,CAAC,SAAS,KAAK,IAAI,CAAE;EACzB,MAAM,EAAE,UAAU,OAAO,yBAAyB,QAAQ,IAAI;AAC9D,MAAI,OAAO,SAAS,WAAY;AAChC,SAAO,eAAe,QAAQ,KAAK;GACjC,cAAc;GACd,MAAqB;IACnB,MAAM,QAAQ,KAAK;IACnB,IAAI,SAAS,OAAO,MAAM;IAC1B,MAAM,aAAa,UACjB,OAAO,KAAK,SAAS,MAAM,EAAE,MAAM;AAErC,WAAO,eAAe,OAAO,KAAK;KAChC,cAAc;KACd,WAAW;KACX,IAAI,IAAc;AAChB,eAAS;;KAEZ,CAAC;AAEF,WAAO;;GAET,IAAqB,OAAgB;AACnC,WAAO,eAAe,MAAM,KAAK;KAC/B;KACA,UAAU;KACV,YAAY;KACZ,cAAc;KACf,CAAC;AAEF,kBAAc,KAAK;;GAEtB,CAAC"}