@expressive/react 0.82.0 → 0.83.1

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/dist/adapter.d.ts CHANGED
@@ -51,6 +51,18 @@ declare module '@expressive/mvc' {
51
51
  * @param props Arguments passed to State.use().
52
52
  */
53
53
  use?(...props: any[]): Promise<void> | void;
54
+ /**
55
+ * Optional hook called once the host component commits. Return a function
56
+ * to run when it unmounts.
57
+ *
58
+ * Not called during server render, nor for an instance merely observed or
59
+ * placed: `.get()` and `{instance}` reach one a component does not own, and
60
+ * `State.new()` has no component at all.
61
+ *
62
+ * Client-only effects belong here - setup which must accompany the instance
63
+ * itself belongs in `new()`.
64
+ */
65
+ mount?(): (() => void) | void;
54
66
  }
55
67
  namespace State {
56
68
  type UseArgs<T extends State> = T extends {
@@ -82,7 +94,11 @@ declare namespace Consumer {
82
94
  }
83
95
  declare function Consumer<T extends State$2>(props: Consumer.Props<T>): string | number | bigint | boolean | react.ReactElement<unknown, string | react.JSXElementConstructor<any>> | Iterable<react.ReactNode> | react.ReactPortal | null;
84
96
  declare namespace Provider {
85
- type ForEach<T> = (state: T) => void | (() => void);
97
+ /**
98
+ * Runs for each State registered by this Provider. Return value is ignored -
99
+ * to run teardown with a State, use `state.set(null, callback)`.
100
+ */
101
+ type ForEach<T> = (state: T) => void;
86
102
  interface SharedProps {
87
103
  /**
88
104
  * Children to render within this Provider.
@@ -106,11 +122,34 @@ declare namespace Provider {
106
122
  };
107
123
  type Props<T extends State$2 = State$2> = ForSingleProps<T> | ForMultipleProps<T>;
108
124
  }
109
- declare function Provider<T extends State$2>(props: Provider.Props<T>): any;
125
+ declare function Provider<T extends State$2>({
126
+ children,
127
+ fallback,
128
+ name,
129
+ ...props
130
+ }: Provider.Props<T>): any;
110
131
  //#endregion
111
132
  //#region src/component.d.ts
112
133
  declare module '@expressive/mvc' {
134
+ namespace Component {
135
+ /**
136
+ * Not available - a Component is rendered, not a hook.
137
+ * Render it with `<Component />` or `{component}`.
138
+ * For a bare instance use `Component.new()`.
139
+ */
140
+ const use: never;
141
+ }
113
142
  interface Component {
143
+ /**
144
+ * Optional hook called once this Component commits. Return a function to
145
+ * run when it unmounts.
146
+ *
147
+ * Not called during server render, nor for an instance placed as
148
+ * `{component}` - a placement does not own what it renders. Client-only
149
+ * effects belong here; setup which must accompany the instance itself
150
+ * belongs in `new()`.
151
+ */
152
+ mount?(): (() => void) | void;
114
153
  /** @deprecated Only to satisfy host JSX. Use `this.get(State)` instead. */
115
154
  readonly context: Context$1;
116
155
  /** @deprecated Only to satisfy host JSX. Use `this.get()` instead. */
package/dist/adapter.js CHANGED
@@ -1,4 +1,4 @@
1
- import { a as Runtime, c as useHook, i as Provider, l as useReady, n as Consumer, o as use, s as useFactory } from "./component-BqiJWCy1.js";
1
+ import { a as Runtime, c as useHook, i as Provider, n as Consumer, o as use, s as useFactory } from "./component-fEqgY0Wy.js";
2
2
  import { Context, State, State as State$1 } from "@expressive/mvc";
3
3
  import { observer, watch } from "@expressive/mvc/observable";
4
4
 
@@ -15,6 +15,10 @@ State$1.get = function get(argument) {
15
15
  pending = false;
16
16
  next((x) => x + 1);
17
17
  }
18
+ function observed() {
19
+ if (mounted) update();
20
+ else pending = true;
21
+ }
18
22
  function refresh(action) {
19
23
  if (typeof action == "function") action = action();
20
24
  update();
@@ -39,7 +43,7 @@ State$1.get = function get(argument) {
39
43
  if (next === value) return;
40
44
  value = next;
41
45
  } else value = current;
42
- if (!first) update();
46
+ if (!first) observed();
43
47
  first = false;
44
48
  }, argument === true);
45
49
  if (mounted) {
@@ -70,8 +74,11 @@ State$1.get = function get(argument) {
70
74
  }
71
75
  return () => {
72
76
  pending = false;
73
- useReady(() => mounted = true);
74
- useHook(() => release);
77
+ useHook(() => () => {
78
+ mounted = true;
79
+ if (pending) update();
80
+ return release;
81
+ });
75
82
  return value === void 0 ? null : value;
76
83
  };
77
84
  })();
@@ -99,12 +106,16 @@ State$1.use = function use(...args) {
99
106
  ready = true;
100
107
  });
101
108
  }
102
- useReady(() => ready = true);
103
109
  return useHook((update) => {
104
110
  watch(instance, update);
105
111
  return () => {
106
- context.pop();
107
- instance.set(null);
112
+ ready = true;
113
+ const release = instance.mount?.();
114
+ return () => {
115
+ if (typeof release == "function") release();
116
+ context.pop();
117
+ instance.set(null);
118
+ };
108
119
  };
109
120
  });
110
121
  };
@@ -1 +1 @@
1
- {"version":3,"file":"adapter.js","names":[],"sources":["../src/state.get.ts","../src/state.use.ts"],"sourcesContent":["import { State, Context } from '@expressive/mvc';\nimport { observer, watch } from '@expressive/mvc/observable';\nimport { Runtime, useFactory, useHook, useReady } from './runtime';\n\n/** Type may not be undefined - instead will be null. */\ntype NoVoid<T> = T extends undefined | void ? null : T;\n\ndeclare module '@expressive/mvc' {\n namespace State {\n type ForceRefresh = {\n /** Request a refresh for current component. */\n (): void;\n\n /**\n * Request a refresh and again after promise either resolves or rejects.\n *\n * @param waitFor Promise to wait for.\n * @returns Promise which resolves, after refresh, to same value as `waitFor`.\n */\n <T = void>(waitFor: Promise<T>): Promise<T>;\n\n /**\n * Request refresh before and after async function.\n * A refresh will occur both before and after the given function.\n *\n * **Note:** Any actions performed before first `await` will occur prior to refresh.\n *\n * @param invoke Async function to invoke.\n * @returns Promise which resolves returned value after refresh.\n */\n <T = void>(invoke: () => Promise<T>): Promise<T>;\n };\n\n type GetFactory<T extends State, R> = (\n this: T,\n current: T,\n refresh: ForceRefresh\n ) => R;\n\n type GetEffect<T extends State> = (\n this: T,\n current: T,\n refresh: ForceRefresh\n ) => null;\n\n /** Fetch instance of this class from context. */\n function get<T extends State>(this: State.Extends<T>): T;\n\n /** Fetch instance of this class optionally. */\n function get<T extends State>(\n this: State.Extends<T>,\n required: false\n ): T | undefined;\n\n /** Fetch instance of this class from context. */\n function get<T extends State>(\n this: State.Extends<T>,\n requireValues: true\n ): Required<T>;\n\n function get<T extends State, R>(\n this: State.Extends<T>,\n factory: GetFactory<T, Promise<R> | R>\n ): NoVoid<R>;\n\n function get<T extends State>(\n this: State.Extends<T>,\n factory: GetEffect<T>\n ): null;\n }\n}\n\nState.get = function get<T extends State>(\n this: State.Extends<T>,\n argument?: boolean | State.GetFactory<T, unknown>\n) {\n const next = Runtime.useState(0)[1];\n const local = Context.get();\n const render = useFactory(() => {\n let unwatch: (() => void) | undefined;\n let mounted = false;\n let pending = false;\n let value: any;\n\n function update() {\n pending = false;\n next((x) => x + 1);\n }\n\n function refresh<T>(action?: Promise<T> | (() => Promise<T>)): any {\n if (typeof action == 'function') action = action();\n update();\n if (action instanceof Promise) return action.finally(update);\n }\n\n function release() {\n unsubscribe();\n unwatch?.();\n unwatch = undefined;\n }\n\n function attach(next: T) {\n unwatch?.();\n\n if (observer(next) === null) {\n value = typeof argument === 'function'\n ? argument.call(next, next, refresh)\n : next;\n unwatch = () => {};\n return release;\n }\n\n let first = true;\n\n unwatch = watch(\n next,\n (current) => {\n if (typeof argument === 'function') {\n const next = argument.call(current, current, refresh);\n if (next === value) return;\n value = next;\n } else {\n value = current;\n }\n\n if (!first) update();\n first = false;\n },\n argument === true\n );\n\n if (mounted) {\n pending = true;\n queueMicrotask(() => pending && update());\n }\n\n return release;\n }\n\n const unsubscribe = local.get(this, attach);\n\n if (!unwatch) {\n unsubscribe();\n if (argument === false) return () => undefined;\n throw new Error(`Could not find ${this} in context.`);\n }\n\n if (value === null) {\n release();\n return () => null;\n }\n\n if (value instanceof Promise) {\n let error: Error | undefined;\n\n release();\n\n value\n .then(\n (x) => (value = x),\n (e) => (error = e)\n )\n .finally(update);\n\n value = null;\n\n return () => {\n if (error) throw error;\n return value === undefined ? null : value;\n };\n }\n\n return () => {\n pending = false;\n useReady(() => mounted = true);\n useHook(() => release);\n return value === undefined ? null : value;\n };\n });\n\n return render();\n};\n","import { State, Context } from '@expressive/mvc';\nimport { watch } from '@expressive/mvc/observable';\nimport { useFactory, useHook, useReady } 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 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 useReady(() => ready = true);\n\n return useHook<T>((update) => {\n watch(instance, update);\n return () => {\n context.pop();\n instance.set(null);\n };\n });\n };\n });\n\n return render(args);\n};\n"],"mappings":";;;;;AAwEA,QAAM,MAAM,SAAS,IAEnB,UACA;CACA,MAAM,OAAO,QAAQ,SAAS,EAAE,CAAC;CACjC,MAAM,QAAQ,QAAQ,KAAK;AAuG3B,QAtGe,iBAAiB;EAC9B,IAAI;EACJ,IAAI,UAAU;EACd,IAAI,UAAU;EACd,IAAI;EAEJ,SAAS,SAAS;AAChB,aAAU;AACV,SAAM,MAAM,IAAI,EAAE;;EAGpB,SAAS,QAAW,QAA+C;AACjE,OAAI,OAAO,UAAU,WAAY,UAAS,QAAQ;AAClD,WAAQ;AACR,OAAI,kBAAkB,QAAS,QAAO,OAAO,QAAQ,OAAO;;EAG9D,SAAS,UAAU;AACjB,gBAAa;AACb,cAAW;AACX,aAAU;;EAGZ,SAAS,OAAO,MAAS;AACvB,cAAW;AAEX,OAAI,SAAS,KAAK,KAAK,MAAM;AAC3B,YAAQ,OAAO,aAAa,aACxB,SAAS,KAAK,MAAM,MAAM,QAAQ,GAClC;AACJ,oBAAgB;AAChB,WAAO;;GAGT,IAAI,QAAQ;AAEZ,aAAU,MACR,OACC,YAAY;AACX,QAAI,OAAO,aAAa,YAAY;KAClC,MAAM,OAAO,SAAS,KAAK,SAAS,SAAS,QAAQ;AACrD,SAAI,SAAS,MAAO;AACpB,aAAQ;UAER,SAAQ;AAGV,QAAI,CAAC,MAAO,SAAQ;AACpB,YAAQ;MAEV,aAAa,KACd;AAED,OAAI,SAAS;AACX,cAAU;AACV,yBAAqB,WAAW,QAAQ,CAAC;;AAG3C,UAAO;;EAGT,MAAM,cAAc,MAAM,IAAI,MAAM,OAAO;AAE3C,MAAI,CAAC,SAAS;AACZ,gBAAa;AACb,OAAI,aAAa,MAAO,cAAa;AACrC,SAAM,IAAI,MAAM,kBAAkB,KAAK,cAAc;;AAGvD,MAAI,UAAU,MAAM;AAClB,YAAS;AACT,gBAAa;;AAGf,MAAI,iBAAiB,SAAS;GAC5B,IAAI;AAEJ,YAAS;AAET,SACG,MACE,MAAO,QAAQ,IACf,MAAO,QAAQ,EACjB,CACA,QAAQ,OAAO;AAElB,WAAQ;AAER,gBAAa;AACX,QAAI,MAAO,OAAM;AACjB,WAAO,UAAU,SAAY,OAAO;;;AAIxC,eAAa;AACX,aAAU;AACV,kBAAe,UAAU,KAAK;AAC9B,iBAAc,QAAQ;AACtB,UAAO,UAAU,SAAY,OAAO;;GAEtC,EAEa;;;;;AC/IjB,QAAM,MAAM,SAAS,IAEnB,GAAG,MACH;CACA,MAAM,QAAQ,QAAQ,KAAK;AAuC3B,QAtCe,iBAAiB;EAC9B,MAAM,OAAO,QACX,OAAO,OAAO,YAAY,SAAS,IAAI,IAAuB;EAEhE,IAAI,OAAO,GAAG,SAAwB,QAAQ,IAAI,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC;EAEvE,MAAM,WAAW,IAAI,MAAM,MAAM;AAC/B,OAAI,SAAS,KAAK,OAAO,EAAE,OAAO,YAAY;AAC5C,UAAM,EAAE,IAAI,KAAK,EAAE;AACnB,QAAI,GAAG,KAAK;SAET,QAAO;IACZ;EAEF,MAAM,UAAU,MAAM,KAAK,SAAS;EAEpC,IAAI,QAAQ;AAEZ,UAAQ,SAAwB;AAC9B,OAAI,OAAO;AACT,YAAQ;AACR,YAAQ,QAAQ,IAAI,GAAG,KAAK,CAAC,CAAC,cAAc;AAC1C,aAAQ;MACR;;AAGJ,kBAAe,QAAQ,KAAK;AAE5B,UAAO,SAAY,WAAW;AAC5B,UAAM,UAAU,OAAO;AACvB,iBAAa;AACX,aAAQ,KAAK;AACb,cAAS,IAAI,KAAK;;KAEpB;;GAEJ,CAEY,KAAK"}
1
+ {"version":3,"file":"adapter.js","names":[],"sources":["../src/state.get.ts","../src/state.use.ts"],"sourcesContent":["import { State, Context } from '@expressive/mvc';\nimport { observer, watch } from '@expressive/mvc/observable';\nimport { Runtime, useFactory, useHook } from './runtime';\n\n/** Type may not be undefined - instead will be null. */\ntype NoVoid<T> = T extends undefined | void ? null : T;\n\ndeclare module '@expressive/mvc' {\n namespace State {\n type ForceRefresh = {\n /** Request a refresh for current component. */\n (): void;\n\n /**\n * Request a refresh and again after promise either resolves or rejects.\n *\n * @param waitFor Promise to wait for.\n * @returns Promise which resolves, after refresh, to same value as `waitFor`.\n */\n <T = void>(waitFor: Promise<T>): Promise<T>;\n\n /**\n * Request refresh before and after async function.\n * A refresh will occur both before and after the given function.\n *\n * **Note:** Any actions performed before first `await` will occur prior to refresh.\n *\n * @param invoke Async function to invoke.\n * @returns Promise which resolves returned value after refresh.\n */\n <T = void>(invoke: () => Promise<T>): Promise<T>;\n };\n\n type GetFactory<T extends State, R> = (\n this: T,\n current: T,\n refresh: ForceRefresh\n ) => R;\n\n type GetEffect<T extends State> = (\n this: T,\n current: T,\n refresh: ForceRefresh\n ) => null;\n\n /** Fetch instance of this class from context. */\n function get<T extends State>(this: State.Extends<T>): T;\n\n /** Fetch instance of this class optionally. */\n function get<T extends State>(\n this: State.Extends<T>,\n required: false\n ): T | undefined;\n\n /** Fetch instance of this class from context. */\n function get<T extends State>(\n this: State.Extends<T>,\n requireValues: true\n ): Required<T>;\n\n function get<T extends State, R>(\n this: State.Extends<T>,\n factory: GetFactory<T, Promise<R> | R>\n ): NoVoid<R>;\n\n function get<T extends State>(\n this: State.Extends<T>,\n factory: GetEffect<T>\n ): null;\n }\n}\n\nState.get = function get<T extends State>(\n this: State.Extends<T>,\n argument?: boolean | State.GetFactory<T, unknown>\n) {\n const next = Runtime.useState(0)[1];\n const local = Context.get();\n const render = useFactory(() => {\n let unwatch: (() => void) | undefined;\n let mounted = false;\n let pending = false;\n let value: any;\n\n function update() {\n pending = false;\n next((x) => x + 1);\n }\n\n function observed() {\n if (mounted) update();\n else pending = true;\n }\n\n function refresh<T>(action?: Promise<T> | (() => Promise<T>)): any {\n if (typeof action == 'function') action = action();\n update();\n if (action instanceof Promise) return action.finally(update);\n }\n\n function release() {\n unsubscribe();\n unwatch?.();\n unwatch = undefined;\n }\n\n function attach(next: T) {\n unwatch?.();\n\n if (observer(next) === null) {\n value = typeof argument === 'function'\n ? argument.call(next, next, refresh)\n : next;\n unwatch = () => {};\n return release;\n }\n\n let first = true;\n\n unwatch = watch(\n next,\n (current) => {\n if (typeof argument === 'function') {\n const next = argument.call(current, current, refresh);\n if (next === value) return;\n value = next;\n } else {\n value = current;\n }\n\n if (!first) observed();\n first = false;\n },\n argument === true\n );\n\n if (mounted) {\n pending = true;\n queueMicrotask(() => pending && update());\n }\n\n return release;\n }\n\n const unsubscribe = local.get(this, attach);\n\n if (!unwatch) {\n unsubscribe();\n if (argument === false) return () => undefined;\n throw new Error(`Could not find ${this} in context.`);\n }\n\n if (value === null) {\n release();\n return () => null;\n }\n\n if (value instanceof Promise) {\n let error: Error | undefined;\n\n release();\n\n value\n .then(\n (x) => (value = x),\n (e) => (error = e)\n )\n .finally(update);\n\n value = null;\n\n return () => {\n if (error) throw error;\n return value === undefined ? null : value;\n };\n }\n\n return () => {\n pending = false;\n useHook(() => () => {\n mounted = true;\n if (pending) update();\n return release;\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 { watch } from '@expressive/mvc/observable';\nimport { useFactory, useHook } 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 useHook<T>((update) => {\n watch(instance, update);\n\n return () => {\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\n return render(args);\n};\n"],"mappings":";;;;;AAwEA,QAAM,MAAM,SAAS,IAEnB,UACA;CACA,MAAM,OAAO,QAAQ,SAAS,EAAE,CAAC;CACjC,MAAM,QAAQ,QAAQ,KAAK;AA+G3B,QA9Ge,iBAAiB;EAC9B,IAAI;EACJ,IAAI,UAAU;EACd,IAAI,UAAU;EACd,IAAI;EAEJ,SAAS,SAAS;AAChB,aAAU;AACV,SAAM,MAAM,IAAI,EAAE;;EAGpB,SAAS,WAAW;AAClB,OAAI,QAAS,SAAQ;OAChB,WAAU;;EAGjB,SAAS,QAAW,QAA+C;AACjE,OAAI,OAAO,UAAU,WAAY,UAAS,QAAQ;AAClD,WAAQ;AACR,OAAI,kBAAkB,QAAS,QAAO,OAAO,QAAQ,OAAO;;EAG9D,SAAS,UAAU;AACjB,gBAAa;AACb,cAAW;AACX,aAAU;;EAGZ,SAAS,OAAO,MAAS;AACvB,cAAW;AAEX,OAAI,SAAS,KAAK,KAAK,MAAM;AAC3B,YAAQ,OAAO,aAAa,aACxB,SAAS,KAAK,MAAM,MAAM,QAAQ,GAClC;AACJ,oBAAgB;AAChB,WAAO;;GAGT,IAAI,QAAQ;AAEZ,aAAU,MACR,OACC,YAAY;AACX,QAAI,OAAO,aAAa,YAAY;KAClC,MAAM,OAAO,SAAS,KAAK,SAAS,SAAS,QAAQ;AACrD,SAAI,SAAS,MAAO;AACpB,aAAQ;UAER,SAAQ;AAGV,QAAI,CAAC,MAAO,WAAU;AACtB,YAAQ;MAEV,aAAa,KACd;AAED,OAAI,SAAS;AACX,cAAU;AACV,yBAAqB,WAAW,QAAQ,CAAC;;AAG3C,UAAO;;EAGT,MAAM,cAAc,MAAM,IAAI,MAAM,OAAO;AAE3C,MAAI,CAAC,SAAS;AACZ,gBAAa;AACb,OAAI,aAAa,MAAO,cAAa;AACrC,SAAM,IAAI,MAAM,kBAAkB,KAAK,cAAc;;AAGvD,MAAI,UAAU,MAAM;AAClB,YAAS;AACT,gBAAa;;AAGf,MAAI,iBAAiB,SAAS;GAC5B,IAAI;AAEJ,YAAS;AAET,SACG,MACE,MAAO,QAAQ,IACf,MAAO,QAAQ,EACjB,CACA,QAAQ,OAAO;AAElB,WAAQ;AAER,gBAAa;AACX,QAAI,MAAO,OAAM;AACjB,WAAO,UAAU,SAAY,OAAO;;;AAIxC,eAAa;AACX,aAAU;AACV,uBAAoB;AAClB,cAAU;AACV,QAAI,QAAS,SAAQ;AACrB,WAAO;KACP;AACF,UAAO,UAAU,SAAY,OAAO;;GAEtC,EAEa;;;;;ACzIjB,QAAM,MAAM,SAAS,IAEnB,GAAG,MACH;CACA,MAAM,QAAQ,QAAQ,KAAK;AA6C3B,QA5Ce,iBAAiB;EAC9B,MAAM,OAAO,QACX,OAAO,OAAO,YAAY,SAAS,IAAI,IAAuB;EAEhE,IAAI,OAAO,GAAG,SAAwB,QAAQ,IAAI,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC;EAEvE,MAAM,WAAW,IAAI,MAAM,MAAM;AAC/B,OAAI,SAAS,KAAK,OAAO,EAAE,OAAO,YAAY;AAC5C,UAAM,EAAE,IAAI,KAAK,EAAE;AACnB,QAAI,GAAG,KAAK;SAET,QAAO;IACZ;EAEF,MAAM,UAAU,MAAM,KAAK,SAAS;EAEpC,IAAI,QAAQ;AAEZ,UAAQ,SAAwB;AAC9B,OAAI,OAAO;AACT,YAAQ;AACR,YAAQ,QAAQ,IAAI,GAAG,KAAK,CAAC,CAAC,cAAc;AAC1C,aAAQ;MACR;;AAGJ,UAAO,SAAY,WAAW;AAC5B,UAAM,UAAU,OAAO;AAEvB,iBAAa;AACX,aAAQ;KAER,MAAM,UAAW,SAAsB,SAAS;AAEhD,kBAAa;AACX,UAAI,OAAO,WAAW,WAAY,UAAS;AAC3C,cAAQ,KAAK;AACb,eAAS,IAAI,KAAK;;;KAGtB;;GAEJ,CAEY,KAAK"}
@@ -7,19 +7,18 @@ function useFactory(factory) {
7
7
  const ref = Runtime.useRef(null);
8
8
  return ref.current || (ref.current = factory());
9
9
  }
10
- function useReady(callback) {
11
- return Runtime.useEffect(() => void callback(), []);
12
- }
13
10
  /**
14
11
  * Mount-effect with a refreshable return value, safe under React StrictMode.
15
12
  *
16
- * @param callback Setup handler; receives a setter, must return a cleanup.
13
+ * @param callback Setup handler, run on creation; receives a setter and returns
14
+ * a mount handler, which in turn returns a cleanup. All three share this
15
+ * hook's render counter, so a StrictMode remount repeats none of them.
17
16
  * @returns Latest value published via the setter (`undefined` until set).
18
17
  */
19
18
  function useHook(callback) {
20
19
  const { current } = Runtime.useRef({ rendered: 0 });
21
20
  current.update = Runtime.useState(() => {
22
- if (!current.rendered) current.unmount = callback((next) => {
21
+ if (!current.rendered) current.commit = callback((next) => {
23
22
  current.output = next;
24
23
  if (current.mounted) current.update?.((x) => x + 1);
25
24
  else if (current.update) current.pending = true;
@@ -28,12 +27,16 @@ function useHook(callback) {
28
27
  })[1];
29
28
  Runtime.useEffect(() => {
30
29
  current.mounted = true;
30
+ if (current.commit) {
31
+ current.release = current.commit();
32
+ current.commit = void 0;
33
+ }
31
34
  if (current.pending) {
32
35
  current.pending = false;
33
36
  current.update((x) => x + 1);
34
37
  }
35
38
  return () => {
36
- if (--current.rendered < 1) current.unmount();
39
+ if (--current.rendered <= 0) current.release?.();
37
40
  };
38
41
  }, []);
39
42
  return current.output;
@@ -85,7 +88,7 @@ function useAmbient() {
85
88
  return Runtime.useContext(Layers());
86
89
  }
87
90
  /** Wrap `children` in a {@link Layers} provider carrying `context` down the tree. */
88
- function provide(context, children) {
91
+ function createProvider(context, children) {
89
92
  return Runtime.createElement(Layers().Provider, {
90
93
  value: context,
91
94
  children
@@ -105,19 +108,35 @@ Context$1.get = (state) => {
105
108
  function Consumer(props) {
106
109
  return props.for.get((i) => props.children(i));
107
110
  }
108
- function Provider(props) {
109
- const { for: input, children, fallback, name, is, ...rest } = props;
111
+ function Provider({ children, fallback, name, ...props }) {
110
112
  const ambient = useAmbient();
111
- const context = useHook((set) => {
112
- set(new Context$1(ambient));
113
- return () => context.pop();
114
- });
115
- context.set(input, is);
116
- if (Object.keys(rest).length) {
117
- const i = State.is(input) ? context.get(input) : input;
118
- if (i instanceof State) i.set(rest);
119
- }
120
- return provide(context, fallback !== void 0 ? Runtime.createElement(Runtime.Suspense, {
113
+ return createProvider(useHook((returns) => {
114
+ const context = new Context$1(ambient);
115
+ const fresh = [];
116
+ let applied;
117
+ let solo;
118
+ returns(({ is, for: input, ...rest }) => {
119
+ if (input !== applied) {
120
+ const single = State.is(input) || input instanceof State;
121
+ applied = input;
122
+ solo = void 0;
123
+ context.set(input, (state, owned) => {
124
+ if (single) solo = state;
125
+ if (owned) fresh.push(state);
126
+ if (is) is(state);
127
+ });
128
+ }
129
+ if (solo && Object.keys(rest).length) solo.set(rest);
130
+ return context;
131
+ });
132
+ return () => {
133
+ const release = fresh.map((state) => state.mount?.());
134
+ return () => {
135
+ for (const done of release) if (typeof done == "function") done();
136
+ context.pop();
137
+ };
138
+ };
139
+ })(props), fallback !== void 0 ? Runtime.createElement(Runtime.Suspense, {
121
140
  fallback,
122
141
  name
123
142
  }, children) : children);
@@ -132,6 +151,12 @@ Object.defineProperties(Component.prototype, {
132
151
  },
133
152
  context: { set: bootstrap }
134
153
  });
154
+ Object.defineProperty(Component, "use", {
155
+ configurable: true,
156
+ value() {
157
+ throw new Error(`${this} is a Component - render as an element instead of calling use().`);
158
+ }
159
+ });
135
160
  /**
136
161
  * `State.on` handler that prepares a Component's prototype at bootstrap, before
137
162
  * mvc classifies its members:
@@ -182,14 +207,14 @@ function bootstrap(context) {
182
207
  * Wrap a content element in its context provider, a Suspense boundary (unless
183
208
  * `fallback` is `false`) and, when `catch` is set, the host error boundary.
184
209
  */
185
- function frame(from, context, children) {
186
- const { createElement: create } = Runtime;
187
- if (from.fallback !== false) children = create(Runtime.Suspense, {
210
+ function createFrame(from, context, children) {
211
+ const { createElement } = Runtime;
212
+ if (from.fallback !== false) children = createElement(Runtime.Suspense, {
188
213
  fallback: from.fallback,
189
214
  name: String(from)
190
215
  }, children);
191
- children = provide(context, children);
192
- return from.catch ? create(Runtime.ErrorBoundary, {
216
+ children = createProvider(context, children);
217
+ return from.catch ? createElement(Runtime.ErrorBoundary, {
193
218
  self: from,
194
219
  children
195
220
  }) : children;
@@ -201,22 +226,27 @@ function frame(from, context, children) {
201
226
  * unmount.
202
227
  */
203
228
  function render(from, context) {
204
- const { createElement: create } = Runtime;
229
+ const { createElement } = Runtime;
205
230
  const { commit, remove } = Runtime.dedupe(from, context);
231
+ const self = from;
206
232
  const content = from.render;
207
233
  const Render = () => content.call(from, from.props);
208
234
  const Component = () => {
209
235
  from = useHook((refresh) => {
210
236
  if (observer(from) !== null) watch(from, refresh);
211
237
  return () => {
212
- remove();
213
- context.pop();
238
+ const release = self.mount?.();
239
+ commit();
240
+ return () => {
241
+ if (typeof release == "function") release();
242
+ remove();
243
+ context.pop();
244
+ };
214
245
  };
215
246
  }) || from;
216
- useReady(commit);
217
- return frame(from, context, create(Render));
247
+ return createFrame(from, context, createElement(Render));
218
248
  };
219
- return () => create(Component);
249
+ return () => createElement(Component);
220
250
  }
221
251
  /** Rewrite each own capitalized function on `target` into a subcomponent. */
222
252
  function subcomponents(target, configurable) {
@@ -229,7 +259,10 @@ function subcomponents(target, configurable) {
229
259
  get() {
230
260
  const owner = this.is;
231
261
  let render = unbind(value);
232
- const Component = (props) => render.call(useHook((set) => watch(owner, set)) || owner, props);
262
+ const Component = (props) => render.call(useHook((set) => {
263
+ const release = watch(owner, set);
264
+ return () => release;
265
+ }) || owner, props);
233
266
  Object.defineProperty(owner, key, {
234
267
  configurable: true,
235
268
  get: () => Component,
@@ -244,5 +277,5 @@ function subcomponents(target, configurable) {
244
277
  }
245
278
 
246
279
  //#endregion
247
- export { Runtime as a, useHook as c, Provider as i, useReady as l, Consumer as n, use as o, Context$1 as r, useFactory as s, frame as t };
248
- //# sourceMappingURL=component-BqiJWCy1.js.map
280
+ export { Runtime as a, useHook as c, Provider as i, Consumer as n, use as o, Context$1 as r, useFactory as s, createFrame as t };
281
+ //# sourceMappingURL=component-fEqgY0Wy.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"component-fEqgY0Wy.js","names":["Context"],"sources":["../src/runtime.ts","../src/context.ts","../src/component.ts"],"sourcesContent":["import { event, watch, observer } from '@expressive/mvc/observable';\nimport type { Component } from '@expressive/mvc';\nimport type { Context } from './context';\n\nexport const Runtime = {} as {\n /** Host own-property keys to trap out of observed state; assigned by each adapter. */\n ignore: string[];\n createElement(type: any, props?: any, ...children: any[]): any;\n createContext<T>(value: T): any;\n useContext(context: any): any;\n useState<S>(initial: S | (() => S)): [S, (next: (previous: S) => S) => void];\n useEffect(effect: () => (() => void) | void, deps?: any[]): void;\n useRef<T>(initial: T): { current: T };\n /** Per-render-attempt lifecycle, set by each adapter (React stacks attempts; others no-op). */\n dedupe(from: Component, context: Context): { commit(): void; remove(): void };\n /** Host error-boundary component, wrapping a Component whose `catch` is set. */\n ErrorBoundary: unknown;\n Suspense: any;\n};\n\nexport function useFactory<T extends Function>(factory: () => T) {\n const ref = Runtime.useRef<T | null>(null);\n return ref.current || (ref.current = factory());\n}\n\n/**\n * Mount-effect with a refreshable return value, safe under React StrictMode.\n *\n * @param callback Setup handler, run on creation; receives a setter and returns\n * a mount handler, which in turn returns a cleanup. All three share this\n * hook's render counter, so a StrictMode remount repeats none of them.\n * @returns Latest value published via the setter (`undefined` until set).\n */\nexport function useHook<T = void>(\n callback: (refresh: (next: T) => void) => () => (() => void) | void\n) {\n const { current } = Runtime.useRef(\n { rendered: 0 } as {\n rendered: number;\n mounted?: boolean;\n pending?: boolean;\n commit?: () => (() => void) | void;\n release?: (() => void) | void;\n update?: (next: (previous: number) => number) => void;\n output: T;\n }\n );\n\n current.update = Runtime.useState(() => {\n if (!current.rendered)\n current.commit = callback((next) => {\n current.output = next;\n if (current.mounted) current.update?.((x) => x + 1);\n else if (current.update) current.pending = true;\n });\n\n return current.rendered++;\n })[1];\n\n Runtime.useEffect(() => {\n current.mounted = true;\n\n if (current.commit) {\n current.release = current.commit();\n current.commit = undefined;\n }\n\n if (current.pending) {\n current.pending = false;\n current.update!((x) => x + 1);\n }\n\n return () => {\n if (--current.rendered <= 0) current.release?.();\n }\n }, []);\n\n return current.output;\n}\n\n/** Subscribe to an existing observable instance within a component. */\nexport function use<T extends object>(subject: T) {\n const { current } = Runtime.useRef<{\n proxy: T;\n source?: T;\n mounted: number;\n unwatch?: () => void;\n }>({ mounted: 0, proxy: subject });\n\n const update = Runtime.useState(() => current.mounted++)[1];\n\n if (current.source !== subject) {\n const status = observer(subject);\n\n if (status === undefined)\n throw new Error('Provided object is not observable.');\n\n current.unwatch?.();\n current.source = subject;\n\n if (status === null) {\n current.unwatch = undefined;\n current.proxy = subject;\n } else {\n if (!status.ready) event(subject);\n\n let init = true;\n\n current.unwatch = watch(subject, (next, changed) => {\n current.proxy = next;\n if (changed.length && !init)\n update((x) => x + 1);\n });\n\n init = false;\n }\n }\n\n Runtime.useEffect(() => () => {\n if (--current.mounted < 1) current.unwatch?.();\n }, []);\n\n return current.proxy;\n}\n","import { State, Context, Component } from '@expressive/mvc';\nimport type { UseState } from '@expressive/mvc';\nimport { Runtime, useHook } from './runtime';\n\nlet shared: any;\n\n/**\n * Lazily-created context carrying the active {@link Context} down the tree.\n * Lazy because the framework's `createContext` arrives via {@link Runtime},\n * which an adapter's entry populates at load - after this module evaluates.\n */\nfunction Layers() {\n return shared || (shared = Runtime.createContext(Context.root));\n}\n\n/** Read the ambient {@link Context} from the nearest Layers provider. */\nfunction useAmbient() {\n return Runtime.useContext(Layers());\n}\n\n/** Wrap `children` in a {@link Layers} provider carrying `context` down the tree. */\nfunction createProvider(context: Context, children: any) {\n return Runtime.createElement(Layers().Provider, { value: context, children });\n}\n\n// Class components consume the active Context through the host's `contextType`\nObject.defineProperty(Component, 'contextType', { configurable: true, get: Layers });\n\nconst _get = Context.get;\n\nContext.get = (state?: State) => {\n if (!state)\n try {\n return useAmbient();\n } catch { }\n\n return _get(state);\n};\n\ndeclare namespace Consumer {\n type Props<T extends State> = {\n /** Type of controller to fetch from context. */\n for: State.Extends<T>;\n\n /**\n * Render function, will receive instance of desired controller.\n *\n * Called every render of parent component.\n * Similar to `State.get()`, updates to properties accessed in\n * this function will cause a refresh when they change.\n */\n children: (value: T) => Component.Node | void;\n };\n}\n\nfunction Consumer<T extends State>(props: Consumer.Props<T>) {\n return props.for.get((i) => props.children(i));\n}\n\ndeclare namespace Provider {\n /**\n * Runs for each State registered by this Provider. Return value is ignored -\n * to run teardown with a State, use `state.set(null, callback)`.\n */\n type ForEach<T> = (state: T) => void;\n\n interface SharedProps {\n /**\n * Children to render within this Provider.\n */\n children?: Component.Node;\n\n /** A fallback tree to show when suspended. */\n fallback?: Component.Node;\n\n /**\n * A name for this Suspense boundary for instrumentation purposes.\n * The name will help identify this boundary in React DevTools.\n */\n name?: string | undefined;\n }\n\n type ForSingleProps<T extends State> = SharedProps & {\n for: T | State.Type<T>;\n is: (instance: T) => void;\n } & { [K in State.Field<T>]?: T[K] };\n\n type ForMultipleProps<T extends State> = SharedProps & {\n for: Context.Accept<T>;\n is?: ForEach<T>;\n };\n\n type Props<T extends State = State> = ForSingleProps<T> | ForMultipleProps<T>;\n}\n\ntype Digest<T extends State> = (props: Provider.Props<T>) => Context;\n\nfunction Provider<T extends State>({\n children,\n fallback,\n name,\n ...props\n}: Provider.Props<T>) {\n const ambient = useAmbient();\n const digest: Digest<T> = useHook((returns) => {\n const context = new Context(ambient);\n const fresh: State[] = [];\n\n let applied: Context.Accept<T> | undefined;\n let solo: State | undefined;\n\n returns(({ is, for: input, ...rest }) => {\n if (input !== applied) {\n const single = State.is(input) || input instanceof State;\n\n applied = input;\n solo = undefined;\n\n context.set(input, (state, owned) => {\n if (single) solo = state;\n if (owned) fresh.push(state);\n if (is) is(state);\n });\n }\n\n if (solo && Object.keys(rest).length) solo.set(rest);\n\n return context;\n });\n\n return () => {\n const release = fresh.map((state) => (state as UseState).mount?.());\n\n return () => {\n for (const done of release) if (typeof done == 'function') done();\n context.pop();\n };\n };\n });\n\n return createProvider(\n digest(props),\n fallback !== undefined\n ? Runtime.createElement(Runtime.Suspense, { fallback, name }, children)\n : children\n );\n}\n\nexport { Consumer, Provider, Context, createProvider };\n","import { Component, unbind } from '@expressive/mvc';\nimport { watch, observer } from '@expressive/mvc/observable';\nimport { createProvider, type Context } from './context';\nimport { Runtime, useHook } from './runtime';\n\ndeclare module '@expressive/mvc' {\n namespace Component {\n /**\n * Not available - a Component is rendered, not a hook.\n * Render it with `<Component />` or `{component}`.\n * For a bare instance use `Component.new()`.\n */\n const use: never;\n }\n\n interface Component {\n /**\n * Optional hook called once this Component commits. Return a function to\n * run when it unmounts.\n *\n * Not called during server render, nor for an instance placed as\n * `{component}` - a placement does not own what it renders. Client-only\n * effects belong here; setup which must accompany the instance itself\n * belongs in `new()`.\n */\n mount?(): (() => void) | void;\n\n /** @deprecated Only to satisfy host JSX. Use `this.get(State)` instead. */\n readonly context: Context;\n /** @deprecated Only to satisfy host JSX. Use `this.get()` instead. */\n readonly state: State.Values<this>;\n /** @deprecated Only to satisfy host JSX. Use `this.set({})` instead. */\n setState: (state: any, callback?: () => void) => void;\n /** @deprecated Only to satisfy host JSX. Use `this.set(key)` instead. */\n forceUpdate: (callback?: () => void) => void;\n }\n}\n\n// Host-agnostic seams: `state` is a read-only values bag; `context`'s setter\n// pushes a child context, registers the instance for teardown, and installs its\n// per-instance render host. Host-specific descriptors stay in each adapter.\nObject.defineProperties(Component.prototype, {\n state: {\n set() {},\n get: Component.prototype.get\n },\n context: {\n set: bootstrap\n }\n});\n\nObject.defineProperty(Component, 'use', {\n configurable: true,\n value() {\n throw new Error(\n `${this} is a Component - render as an element instead of calling use().`\n );\n }\n});\n\n/**\n * `State.on` handler that prepares a Component's prototype at bootstrap, before\n * mvc classifies its members:\n *\n * - On the root Component, host own-property keys are trapped so each lands as a\n * plain own property (out of observed state); each adapter assigns its own set.\n * - capitalized methods are rewritten into subcomponents as non-configurable\n * getters, so bootstrap skips them too.\n *\n * (Sealing `render` as the content-render seam is handled by core itself.)\n *\n * `before` covers the per-instance case: a capitalized function assigned as an\n * instance field (e.g. `Sidebar = Sidebar` to inject or override one), promoted\n * before `observe` so it is not mistaken for reactive state.\n */\nComponent.on({\n type(type) {\n if (type === Component)\n for (const key of Runtime.ignore)\n Object.defineProperty(Component.prototype, key, {\n set(value) {\n Object.defineProperty(this, key, { value, writable: true });\n }\n });\n\n // capitalized methods into subcomponents\n subcomponents(type.prototype);\n },\n before(self){\n // capitalized instance fields into subcomponents\n subcomponents(self, true);\n }\n});\n\nfunction bootstrap(this: Component, context: Context){\n context = context.push();\n context.set(this, () => () => this.set(null));\n\n Object.defineProperties(this, {\n context: {\n get: () => context,\n set() {}\n },\n render: {\n value: render(this, context)\n }\n });\n\n this.set(null, () => {\n Object.defineProperty(this, 'props', {\n value: this.props,\n writable: true\n });\n })\n}\n\n/**\n * Wrap a content element in its context provider, a Suspense boundary (unless\n * `fallback` is `false`) and, when `catch` is set, the host error boundary.\n */\nfunction createFrame(from: Component, context: Context, children: unknown) {\n const { createElement } = Runtime;\n\n if(from.fallback !== false)\n children = createElement(\n Runtime.Suspense,\n { fallback: from.fallback, name: String(from) },\n children\n )\n\n children = createProvider(context, children);\n\n return from.catch\n ? createElement(Runtime.ErrorBoundary, { self: from, children })\n : children;\n}\n\n/**\n * Ownership host for `<Component/>`: React owns the instance, so its render\n * threads the bootstrap-pushed context through `Runtime.dedupe` (React stacks\n * render attempts) and tears that context down - destroying the instance - on\n * unmount.\n */\nfunction render(from: Component, context: Context) {\n const { createElement } = Runtime;\n const { commit, remove } = Runtime.dedupe(from, context);\n\n const self = from;\n const content = from.render;\n const Render = () => content.call(from, from.props);\n const Component = () => {\n from = useHook<Component>((refresh) => {\n if (observer(from) !== null) watch(from, refresh);\n\n return () => {\n const release = self.mount?.();\n\n commit();\n\n return () => {\n if (typeof release == 'function') release();\n remove();\n context.pop();\n };\n };\n }) || from;\n\n return createFrame(from, context, createElement(Render));\n };\n\n return () => createElement(Component);\n}\n\n/** Rewrite each own capitalized function on `target` into a subcomponent. */\nfunction subcomponents(target: object, configurable?: boolean) {\n for (const key of Object.getOwnPropertyNames(target)) {\n if (!/^[A-Z]/.test(key)) continue;\n const { value } = Object.getOwnPropertyDescriptor(target, key)!;\n if (typeof value != 'function') continue;\n Object.defineProperty(target, key, {\n configurable,\n get(this: Component) {\n const owner = this.is;\n let render = unbind(value);\n const Component = (props: unknown) =>\n render.call(\n useHook<Component>((set) => {\n const release = watch(owner, set);\n return () => release;\n }) || owner,\n props\n );\n\n Object.defineProperty(owner, key, {\n configurable: true,\n get: () => Component,\n set(fn: Function) {\n render = fn;\n }\n });\n\n return Component;\n }\n });\n }\n}\n\nexport { createFrame };\n"],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { a as Runtime, c as useHook, r as Context$1, s as useFactory, t as frame } from "./component-BqiJWCy1.js";
1
+ import { a as Runtime, c as useHook, r as Context$1, s as useFactory, t as createFrame } from "./component-fEqgY0Wy.js";
2
2
  import { Component } from "@expressive/mvc";
3
3
  import { observer, watch } from "@expressive/mvc/observable";
4
4
 
@@ -37,13 +37,13 @@ function Element() {
37
37
  return () => {
38
38
  from = useHook((refresh) => {
39
39
  if (observer(this) !== null) watch(this, refresh);
40
- return () => context.pop();
40
+ return () => () => context.pop();
41
41
  }) || this;
42
- return frame(from, context, Runtime.createElement(Content));
42
+ return createFrame(from, context, Runtime.createElement(Content));
43
43
  };
44
44
  })();
45
45
  }
46
46
 
47
47
  //#endregion
48
48
  export { seam as t };
49
- //# sourceMappingURL=element-Dqygmyg3.js.map
49
+ //# sourceMappingURL=element-CLcyiJ09.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"element-CLcyiJ09.js","names":["Context"],"sources":["../src/element.ts"],"sourcesContent":["import { Component } from '@expressive/mvc';\nimport { watch, observer } from '@expressive/mvc/observable';\nimport { Context } from './context';\nimport { Runtime, useFactory, useHook } from './runtime';\nimport { createFrame } from './component';\n\ndeclare module '@expressive/mvc' {\n interface Component {\n /** @deprecated Only to satisfy host JSX. */\n readonly type: typeof Component;\n }\n}\n\nlet template: any;\n\n/**\n * Borrow a host element's descriptors so `self` passes as a React element.\n * `props` false keeps the target's own `props` (Component supplies its own);\n * an object installs it as the element's props (collections have none).\n */\nexport function seam(\n self: object,\n props: object | false,\n type: Function,\n key: unknown\n) {\n if (!template) template = Runtime.createElement('template');\n\n const descriptors = Object.getOwnPropertyDescriptors(template);\n const store = descriptors._store?.value;\n\n if (props === false) delete (descriptors as any).props;\n\n if (store)\n descriptors._store.value = Object.create(\n Object.getPrototypeOf(store),\n Object.getOwnPropertyDescriptors(store)\n );\n\n Object.defineProperties(self, {\n ...descriptors,\n $$typeof: { value: template.$$typeof },\n ...(props ? { props: { value: props } } : undefined),\n key: { value: key },\n type: { value: type }\n });\n\n return template.$$typeof;\n}\n\nObject.defineProperty(Component.prototype, '$$typeof', {\n get(this: Component) {\n const self = this.is;\n return seam(self, false, Element.bind(self), self.key);\n }\n});\n\nfunction Element(this: Component){\n const outer = Context.get();\n const render = useFactory(() => {\n let from = this;\n const context = outer.push(this);\n const Content = () => from.render(from.props);\n\n return () => {\n from = useHook<Component>((refresh) => {\n if (observer(this) !== null) watch(this, refresh);\n return () => () => context.pop();\n }) || this;\n\n return createFrame(from, context, Runtime.createElement(Content));\n };\n });\n\n return render();\n}\n"],"mappings":";;;;;AAaA,IAAI;;;;;;AAOJ,SAAgB,KACd,MACA,OACA,MACA,KACA;AACA,KAAI,CAAC,SAAU,YAAW,QAAQ,cAAc,WAAW;CAE3D,MAAM,cAAc,OAAO,0BAA0B,SAAS;CAC9D,MAAM,QAAQ,YAAY,QAAQ;AAElC,KAAI,UAAU,MAAO,QAAQ,YAAoB;AAEjD,KAAI,MACF,aAAY,OAAO,QAAQ,OAAO,OAChC,OAAO,eAAe,MAAM,EAC5B,OAAO,0BAA0B,MAAM,CACxC;AAEH,QAAO,iBAAiB,MAAM;EAC5B,GAAG;EACH,UAAU,EAAE,OAAO,SAAS,UAAU;EACtC,GAAI,QAAQ,EAAE,OAAO,EAAE,OAAO,OAAO,EAAE,GAAG;EAC1C,KAAK,EAAE,OAAO,KAAK;EACnB,MAAM,EAAE,OAAO,MAAM;EACtB,CAAC;AAEF,QAAO,SAAS;;AAGlB,OAAO,eAAe,UAAU,WAAW,YAAY,EACrD,MAAqB;CACnB,MAAM,OAAO,KAAK;AAClB,QAAO,KAAK,MAAM,OAAO,QAAQ,KAAK,KAAK,EAAE,KAAK,IAAI;GAEzD,CAAC;AAEF,SAAS,UAAwB;CAC/B,MAAM,QAAQA,UAAQ,KAAK;AAgB3B,QAfe,iBAAiB;EAC9B,IAAI,OAAO;EACX,MAAM,UAAU,MAAM,KAAK,KAAK;EAChC,MAAM,gBAAgB,KAAK,OAAO,KAAK,MAAM;AAE7C,eAAa;AACX,UAAO,SAAoB,YAAY;AACrC,QAAI,SAAS,KAAK,KAAK,KAAM,OAAM,MAAM,QAAQ;AACjD,uBAAmB,QAAQ,KAAK;KAChC,IAAI;AAEN,UAAO,YAAY,MAAM,SAAS,QAAQ,cAAc,QAAQ,CAAC;;GAEnE,EAEa"}
package/dist/has.js CHANGED
@@ -1,5 +1,5 @@
1
- import { o as use } from "./component-BqiJWCy1.js";
2
- import { t as seam } from "./element-Dqygmyg3.js";
1
+ import { o as use } from "./component-fEqgY0Wy.js";
2
+ import { t as seam } from "./element-CLcyiJ09.js";
3
3
  import { has } from "@expressive/mvc";
4
4
 
5
5
  //#region src/has.ts
package/dist/index.js CHANGED
@@ -1,4 +1,4 @@
1
- import "./component-BqiJWCy1.js";
1
+ import "./component-fEqgY0Wy.js";
2
2
  import { has } from "./has.js";
3
3
  import { map } from "./map.js";
4
4
  import { Component, Component as Component$1, Context, def, get, ref, set } from "@expressive/mvc";
package/dist/map.js CHANGED
@@ -1,5 +1,5 @@
1
- import { o as use } from "./component-BqiJWCy1.js";
2
- import { t as seam } from "./element-Dqygmyg3.js";
1
+ import { o as use } from "./component-fEqgY0Wy.js";
2
+ import { t as seam } from "./element-CLcyiJ09.js";
3
3
  import { map } from "@expressive/mvc";
4
4
 
5
5
  //#region src/map.ts
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@expressive/react",
3
- "version": "0.82.0",
3
+ "version": "0.83.1",
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",
@@ -59,7 +59,7 @@
59
59
  "test": "tsc --noEmit && bun test --coverage --only-failures"
60
60
  },
61
61
  "dependencies": {
62
- "@expressive/mvc": "^0.81.0"
62
+ "@expressive/mvc": "^0.82.0"
63
63
  },
64
64
  "devDependencies": {
65
65
  "@testing-library/react": "^16.3.0",
@@ -1 +0,0 @@
1
- {"version":3,"file":"component-BqiJWCy1.js","names":["Context"],"sources":["../src/runtime.ts","../src/context.ts","../src/component.ts"],"sourcesContent":["import { event, watch, observer } from '@expressive/mvc/observable';\nimport type { Component } from '@expressive/mvc';\nimport type { Context } from './context';\n\nexport const Runtime = {} as {\n /** Host own-property keys to trap out of observed state; assigned by each adapter. */\n ignore: string[];\n createElement(type: any, props?: any, ...children: any[]): any;\n createContext<T>(value: T): any;\n useContext(context: any): any;\n useState<S>(initial: S | (() => S)): [S, (next: (previous: S) => S) => void];\n useEffect(effect: () => (() => void) | void, deps?: any[]): void;\n useRef<T>(initial: T): { current: T };\n /** Per-render-attempt lifecycle, set by each adapter (React stacks attempts; others no-op). */\n dedupe(from: Component, context: Context): { commit(): void; remove(): void };\n /** Host error-boundary component, wrapping a Component whose `catch` is set. */\n ErrorBoundary: unknown;\n Suspense: any;\n};\n\nexport function useFactory<T extends Function>(factory: () => T) {\n const ref = Runtime.useRef<T | null>(null);\n return ref.current || (ref.current = factory());\n}\n\nexport function useReady<T>(callback: () => void) {\n return Runtime.useEffect(() => void callback(), []);\n}\n\n/**\n * Mount-effect with a refreshable return value, safe under React StrictMode.\n *\n * @param callback Setup handler; receives a setter, must return a cleanup.\n * @returns Latest value published via the setter (`undefined` until set).\n */\nexport function useHook<T = void>(\n callback: (refresh: (next: T) => void) => () => void\n) {\n const { current } = Runtime.useRef(\n { rendered: 0 } as {\n rendered: number;\n mounted?: boolean;\n pending?: boolean;\n unmount: () => void;\n update?: (next: (previous: number) => number) => void;\n output: T;\n }\n );\n\n current.update = Runtime.useState(() => {\n if (!current.rendered)\n current.unmount = callback((next) => {\n current.output = next;\n if (current.mounted) current.update?.((x) => x + 1);\n else if (current.update) current.pending = true;\n });\n\n return current.rendered++;\n })[1];\n\n Runtime.useEffect(() => {\n current.mounted = true;\n if (current.pending) {\n current.pending = false;\n current.update!((x) => x + 1);\n }\n return () => {\n if (--current.rendered < 1) current.unmount();\n }\n }, []);\n\n return current.output;\n}\n\n/** Subscribe to an existing observable instance within a component. */\nexport function use<T extends object>(subject: T) {\n const { current } = Runtime.useRef<{\n proxy: T;\n source?: T;\n mounted: number;\n unwatch?: () => void;\n }>({ mounted: 0, proxy: subject });\n\n const update = Runtime.useState(() => current.mounted++)[1];\n\n if (current.source !== subject) {\n const status = observer(subject);\n\n if (status === undefined)\n throw new Error('Provided object is not observable.');\n\n current.unwatch?.();\n current.source = subject;\n\n if (status === null) {\n current.unwatch = undefined;\n current.proxy = subject;\n } else {\n if (!status.ready) event(subject);\n\n let init = true;\n\n current.unwatch = watch(subject, (next, changed) => {\n current.proxy = next;\n if (changed.length && !init)\n update((x) => x + 1);\n });\n\n init = false;\n }\n }\n\n Runtime.useEffect(() => () => {\n if (--current.mounted < 1) current.unwatch?.();\n }, []);\n\n return current.proxy;\n}\n","import { State, Context, Component } from '@expressive/mvc';\nimport { 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 provide(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 type ForEach<T> = (state: T) => void | (() => void);\n\n interface SharedProps {\n /**\n * Children to render within this Provider.\n */\n children?: Component.Node;\n\n /** A fallback tree to show when suspended. */\n fallback?: Component.Node;\n\n /**\n * A name for this Suspense boundary for instrumentation purposes.\n * The name will help identify this boundary in React DevTools.\n */\n name?: string | undefined;\n }\n\n type ForSingleProps<T extends State> = SharedProps & {\n for: T | State.Type<T>;\n is: (instance: T) => void;\n } & { [K in State.Field<T>]?: T[K] };\n\n type ForMultipleProps<T extends State> = SharedProps & {\n for: Context.Accept<T>;\n is?: ForEach<T>;\n };\n\n type Props<T extends State = State> = ForSingleProps<T> | ForMultipleProps<T>;\n}\n\nfunction Provider<T extends State>(props: Provider.Props<T>) {\n const {\n for: input,\n children,\n fallback,\n name,\n is,\n ...rest\n } = props as Provider.ForSingleProps<T> & Provider.ForMultipleProps<T>;\n\n const ambient = useAmbient();\n const context = useHook<Context>((set) => {\n set(new Context(ambient));\n return () => context.pop();\n });\n\n context.set(input, is);\n\n if (Object.keys(rest).length) {\n const i = State.is(input) ? context.get(input) : input;\n if (i instanceof State) i.set(rest);\n }\n\n return provide(context,\n fallback !== undefined\n ? Runtime.createElement(Runtime.Suspense, { fallback, name }, children)\n : children\n );\n}\n\nexport { Consumer, Provider, Context, provide };\n","import { Component, unbind } from '@expressive/mvc';\nimport { watch, observer } from '@expressive/mvc/observable';\nimport { provide, type Context } from './context';\nimport { Runtime, useHook, useReady } from './runtime';\n\ndeclare module '@expressive/mvc' {\n interface Component {\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\n/**\n * `State.on` handler that prepares a Component's prototype at bootstrap, before\n * mvc classifies its members:\n *\n * - On the root Component, host own-property keys are trapped so each lands as a\n * plain own property (out of observed state); each adapter assigns its own set.\n * - capitalized methods are rewritten into subcomponents as non-configurable\n * getters, so bootstrap skips them too.\n *\n * (Sealing `render` as the content-render seam is handled by core itself.)\n *\n * `before` covers the per-instance case: a capitalized function assigned as an\n * instance field (e.g. `Sidebar = Sidebar` to inject or override one), promoted\n * before `observe` so it is not mistaken for reactive state.\n */\nComponent.on({\n type(type) {\n if (type === Component)\n for (const key of Runtime.ignore)\n Object.defineProperty(Component.prototype, key, {\n set(value) {\n Object.defineProperty(this, key, { value, writable: true });\n }\n });\n\n // capitalized methods into subcomponents\n subcomponents(type.prototype);\n },\n before(self){\n // capitalized instance fields into subcomponents\n subcomponents(self, true);\n }\n});\n\nfunction bootstrap(this: Component, context: Context){\n context = context.push();\n context.set(this, () => () => this.set(null));\n\n Object.defineProperties(this, {\n context: {\n get: () => context,\n set() {}\n },\n render: {\n value: render(this, context)\n }\n });\n\n this.set(null, () => {\n Object.defineProperty(this, 'props', {\n value: this.props,\n writable: true\n });\n })\n}\n\n/**\n * Wrap a content element in its context provider, a Suspense boundary (unless\n * `fallback` is `false`) and, when `catch` is set, the host error boundary.\n */\nfunction frame(from: Component, context: Context, children: unknown) {\n const { createElement: create } = Runtime;\n\n if(from.fallback !== false)\n children = create(\n Runtime.Suspense,\n { fallback: from.fallback, name: String(from) },\n children\n )\n\n children = provide(context, children);\n\n return from.catch\n ? create(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: create } = Runtime;\n const { commit, remove } = Runtime.dedupe(from, context);\n\n const content = from.render;\n const Render = () => content.call(from, from.props);\n const Component = () => {\n from = useHook<Component>((refresh) => {\n if (observer(from) !== null) watch(from, refresh);\n\n return () => {\n remove();\n context.pop();\n };\n }) || from;\n\n useReady(commit);\n\n return frame(from, context, create(Render));\n };\n\n return () => create(Component);\n}\n\n/** Rewrite each own capitalized function on `target` into a subcomponent. */\nfunction subcomponents(target: object, configurable?: boolean) {\n for (const key of Object.getOwnPropertyNames(target)) {\n if (!/^[A-Z]/.test(key)) continue;\n const { value } = Object.getOwnPropertyDescriptor(target, key)!;\n if (typeof value != 'function') continue;\n Object.defineProperty(target, key, {\n configurable,\n get(this: Component) {\n const owner = this.is;\n let render = unbind(value);\n const Component = (props: unknown) =>\n render.call(\n useHook<Component>((set) => watch(owner, set)) || owner,\n props\n );\n\n Object.defineProperty(owner, key, {\n configurable: true,\n get: () => Component,\n set(fn: Function) {\n render = fn;\n }\n });\n\n return Component;\n }\n });\n }\n}\n\nexport { frame };\n"],"mappings":"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"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"element-Dqygmyg3.js","names":["Context"],"sources":["../src/element.ts"],"sourcesContent":["import { Component } from '@expressive/mvc';\nimport { watch, observer } from '@expressive/mvc/observable';\nimport { Context } from './context';\nimport { Runtime, useFactory, useHook } from './runtime';\nimport { frame } from './component';\n\ndeclare module '@expressive/mvc' {\n interface Component {\n /** @deprecated Only to satisfy host JSX. */\n readonly type: typeof Component;\n }\n}\n\nlet template: any;\n\n/**\n * Borrow a host element's descriptors so `self` passes as a React element.\n * `props` false keeps the target's own `props` (Component supplies its own);\n * an object installs it as the element's props (collections have none).\n */\nexport function seam(\n self: object,\n props: object | false,\n type: Function,\n key: unknown\n) {\n if (!template) template = Runtime.createElement('template');\n\n const descriptors = Object.getOwnPropertyDescriptors(template);\n const store = descriptors._store?.value;\n\n if (props === false) delete (descriptors as any).props;\n\n if (store)\n descriptors._store.value = Object.create(\n Object.getPrototypeOf(store),\n Object.getOwnPropertyDescriptors(store)\n );\n\n Object.defineProperties(self, {\n ...descriptors,\n $$typeof: { value: template.$$typeof },\n ...(props ? { props: { value: props } } : undefined),\n key: { value: key },\n type: { value: type }\n });\n\n return template.$$typeof;\n}\n\nObject.defineProperty(Component.prototype, '$$typeof', {\n get(this: Component) {\n const self = this.is;\n return seam(self, false, Element.bind(self), self.key);\n }\n});\n\nfunction Element(this: Component){\n const outer = Context.get();\n const render = useFactory(() => {\n let from = this;\n const context = outer.push(this);\n const Content = () => from.render(from.props);\n\n return () => {\n from = useHook<Component>((refresh) => {\n if (observer(this) !== null) watch(this, refresh);\n return () => context.pop();\n }) || this;\n\n return frame(from, context, Runtime.createElement(Content));\n };\n });\n\n return render();\n}\n"],"mappings":";;;;;AAaA,IAAI;;;;;;AAOJ,SAAgB,KACd,MACA,OACA,MACA,KACA;AACA,KAAI,CAAC,SAAU,YAAW,QAAQ,cAAc,WAAW;CAE3D,MAAM,cAAc,OAAO,0BAA0B,SAAS;CAC9D,MAAM,QAAQ,YAAY,QAAQ;AAElC,KAAI,UAAU,MAAO,QAAQ,YAAoB;AAEjD,KAAI,MACF,aAAY,OAAO,QAAQ,OAAO,OAChC,OAAO,eAAe,MAAM,EAC5B,OAAO,0BAA0B,MAAM,CACxC;AAEH,QAAO,iBAAiB,MAAM;EAC5B,GAAG;EACH,UAAU,EAAE,OAAO,SAAS,UAAU;EACtC,GAAI,QAAQ,EAAE,OAAO,EAAE,OAAO,OAAO,EAAE,GAAG;EAC1C,KAAK,EAAE,OAAO,KAAK;EACnB,MAAM,EAAE,OAAO,MAAM;EACtB,CAAC;AAEF,QAAO,SAAS;;AAGlB,OAAO,eAAe,UAAU,WAAW,YAAY,EACrD,MAAqB;CACnB,MAAM,OAAO,KAAK;AAClB,QAAO,KAAK,MAAM,OAAO,QAAQ,KAAK,KAAK,EAAE,KAAK,IAAI;GAEzD,CAAC;AAEF,SAAS,UAAwB;CAC/B,MAAM,QAAQA,UAAQ,KAAK;AAgB3B,QAfe,iBAAiB;EAC9B,IAAI,OAAO;EACX,MAAM,UAAU,MAAM,KAAK,KAAK;EAChC,MAAM,gBAAgB,KAAK,OAAO,KAAK,MAAM;AAE7C,eAAa;AACX,UAAO,SAAoB,YAAY;AACrC,QAAI,SAAS,KAAK,KAAK,KAAM,OAAM,MAAM,QAAQ;AACjD,iBAAa,QAAQ,KAAK;KAC1B,IAAI;AAEN,UAAO,MAAM,MAAM,SAAS,QAAQ,cAAc,QAAQ,CAAC;;GAE7D,EAEa"}