@expressive/mvc 0.88.0 → 0.89.0

package/dist/hot.js

@@ -1,6 +1,5 @@
 import { event } from "./observable.js";
-import { GETTERS, LATEST, METHODS, SETUP, State, UNBIND, classify, compute } from "./state.js";
-import { rechain } from "./component.js";
+import { GETTERS, LATEST, METHODS, Model, SETUP, UNBIND, classify, compute } from "./state.js";
 
 //#region src/hot.ts
 const define = Object.defineProperty;
@@ -18,7 +17,7 @@ const PRIVATE = /(?:^|[\s;{}*])#[\w$]+(?=[\s=;(}])/;
 function track() {
 	if (LIVE) return;
 	LIVE = /* @__PURE__ */ new Set();
-	State.on({
+	Model.on({
 		type(type) {
 			const parent = Object.getPrototypeOf(type);
 			let children = SUBCLASSES.get(parent);
@@ -84,7 +83,7 @@ function patch(prev, next, own) {
 	if (keys) {
 		for (let T = prev;; T = Object.getPrototypeOf(T)) {
 			for (const handler of SETUP.get(T) || []) if (handler.type) handler.type(prev);
-			if (T === State) break;
+			if (T === Model) break;
 		}
 		classify(prev, keys, getters);
 	}
@@ -123,8 +122,8 @@ function patch(prev, next, own) {
 function handlers(type) {
 	return [...SETUP.get(type) || []];
 }
-function isState(value) {
-	return typeof value == "function" && value.prototype instanceof State;
+function isModel(value) {
+	return typeof value == "function" && value.prototype instanceof Model;
 }
 /** What a patch cannot carry: class source less its members, and member kinds. */
 function describe(type) {
@@ -154,7 +153,7 @@ function compatible(prev, next) {
 	return true;
 }
 /**
-* Keep a module's State classes stable across runs. A class seen before is
+* Keep a module's Model classes stable across runs. A class seen before is
 * patched with its replacement and returned in its place, refreshing live
 * instances; one whose shape or parent changed is returned as-is, and
 * reported to `replaced` listeners before `accept` returns.
@@ -165,10 +164,9 @@ function accept(id, classes) {
 	const output = { ...classes };
 	const refresh = /* @__PURE__ */ new Set();
 	const replace = [];
-	let patched = false;
 	track();
 	for (const [name, type] of Object.entries(classes)) {
-		if (!isState(type)) continue;
+		if (!isModel(type)) continue;
 		const prev = known[name];
 		if (prev?.type === type) continue;
 		const next = describe(type);
@@ -184,7 +182,6 @@ function accept(id, classes) {
 		}
 		try {
 			for (const state of patch(prev.type, type, prev.own)) refresh.add(state);
-			patched = true;
 			known[name] = {
 				...next,
 				type: prev.type
@@ -201,7 +198,6 @@ function accept(id, classes) {
 			known[name] = next;
 		}
 	}
-	if (patched) rechain();
 	for (const state of refresh) event(state, REFRESH);
 	for (const event of replace) for (const listener of LISTENERS) try {
 		listener(event);

package/dist/hot.js.map

@@ -1 +1 @@
-{"version":3,"file":"hot.js","names":[],"sources":["../src/hot.ts"],"sourcesContent":["import { rechain } from './component';\nimport { event } from './observable';\nimport {\n  State,\n  GETTERS,\n  LATEST,\n  METHODS,\n  SETUP,\n  UNBIND,\n  classify,\n  compute,\n  type Handler\n} from './state';\n\ninterface Entry {\n  type: Function;\n  shape: string;\n  kinds: Record<string, 'get' | 'accessor' | 'fn'>;\n  own: Handler[];\n}\n\ninterface Replaced {\n  /** Module id the class was accepted under. */\n  id: string;\n  /** Local declaration name of the class. */\n  name: string;\n  /** Class live instances belong to. */\n  prev: State.Extends;\n  /** Class that took its place. */\n  next: State.Extends;\n}\n\nconst define = Object.defineProperty;\n\n/** Method implementations replaced by a hot patch. */\nconst PAST = new WeakSet<Function>();\n\n/** Live instances, tracked once hot patching is enabled. */\nlet LIVE: Set<WeakRef<State>> | undefined;\n\n/** Bootstrapped subclasses of each class, tracked once hot patching is enabled. */\nconst SUBCLASSES = new WeakMap<Function, Set<State.Extends>>();\n\nconst MODULES = new Map<string, Record<string, Entry>>();\nconst LISTENERS = new Set<(event: Replaced) => void>();\nconst REFRESH = Symbol.for('@expressive/mvc.refresh');\nconst PRIVATE = /(?:^|[\\s;{}*])#[\\w$]+(?=[\\s=;(}])/;\n\n/** Begin tracking live instances, so a hot patch can reach them. */\nfunction track() {\n  if (LIVE) return;\n\n  LIVE = new Set();\n\n  State.on({\n    type(type) {\n      const parent = Object.getPrototypeOf(type);\n      let children = SUBCLASSES.get(parent);\n      if (!children) SUBCLASSES.set(parent, (children = new Set()));\n      children.add(type);\n    },\n    setup(state) {\n      const ref = new WeakRef(state);\n      LIVE!.add(ref);\n      return () => LIVE!.delete(ref);\n    }\n  });\n}\n\n/**\n * Move the members of `next` onto `prev`, which keeps its identity. Returns the\n * live instances of `prev`, each needing a refresh.\n */\nfunction patch(prev: State.Extends, next: State.Extends, own: Handler[]): State[] {\n  const proto = prev.prototype;\n  const incoming = Object.getOwnPropertyDescriptors(next.prototype);\n  const keys = METHODS.get(prev);\n  const getters = GETTERS.get(prev);\n  const methods = new Map<string, Function>();\n  const knownKeys = new Set(keys?.keys());\n  const knownGetters = new Set(getters?.keys());\n\n  let setup = SETUP.get(prev);\n\n  for (const handler of own) setup!.delete(handler);\n  for (const handler of handlers(next)) {\n    if (!setup) SETUP.set(prev, (setup = new Set()));\n    setup.add(handler);\n  }\n\n  for (const key of Reflect.ownKeys(next)) {\n    if (key == 'prototype' || key == 'length' || key == 'name') continue;\n    if (Object.getOwnPropertyDescriptor(prev, key)?.configurable !== false)\n      define(prev, key, Object.getOwnPropertyDescriptor(next, key)!);\n  }\n\n  const removed = new Set<string>();\n\n  for (const key of Object.getOwnPropertyNames(proto))\n    if (key != 'constructor' && !(key in incoming)) {\n      const bind = keys?.get(key);\n\n      if (bind && Object.getOwnPropertyDescriptor(proto, key)!.get === bind) {\n        PAST.add(UNBIND.get(bind));\n        keys!.delete(key);\n      }\n\n      removed.add(key);\n      Reflect.deleteProperty(proto, key);\n      getters?.delete(key);\n    }\n\n  for (const [key, desc] of Object.entries(incoming)) {\n    if (key == 'constructor') continue;\n\n    const current = Object.getOwnPropertyDescriptor(proto, key);\n\n    if (typeof desc.value == 'function') methods.set(key, desc.value);\n    if (current?.configurable === false) {\n      if (current.writable) (proto as any)[key] = desc.value;\n      continue;\n    }\n\n    if (current?.get && keys?.get(key) === current.get)\n      PAST.add(UNBIND.get(current.get));\n\n    const getter = getters?.get(key);\n\n    if (getter) LATEST.set(getter, desc.get!);\n\n    define(proto, key, { ...desc, configurable: true });\n  }\n\n  if (keys) {\n    for (let T: State.Extends = prev; ; T = Object.getPrototypeOf(T)) {\n      for (const handler of SETUP.get(T) || [])\n        if (handler.type) handler.type(prev);\n\n      if (T === State) break;\n    }\n\n    classify(prev, keys, getters!);\n  }\n\n  const live: State[] = [];\n\n  for (const ref of LIVE!) {\n    const state = ref.deref();\n\n    if (!state) LIVE!.delete(ref);\n    else if (state instanceof prev) live.push(state);\n  }\n\n  const descendants = new Set([prev, ...live.map((state) => state.constructor as State.Extends)]);\n\n  for (const type of descendants) for (const child of SUBCLASSES.get(type) || []) descendants.add(child);\n\n  descendants.delete(prev);\n\n  for (const type of descendants) {\n    const inherit = METHODS.get(type)!;\n    const computed = GETTERS.get(type)!;\n\n    for (const [key, bind] of keys!) if (!knownKeys.has(key) && !inherit.has(key)) inherit.set(key, bind);\n    for (const [key, get] of getters!) if (!knownGetters.has(key) && !computed.has(key)) computed.set(key, get);\n    for (const key of removed)\n      if (!(key in type.prototype)) {\n        inherit.delete(key);\n        computed.delete(key);\n      }\n  }\n\n  for (const state of live) {\n    for (const [key, value] of methods) {\n      const desc = Object.getOwnPropertyDescriptor(state, key);\n\n      if (!desc) continue;\n      if (desc.set) desc.set.call(state, value);\n      else if (PAST.has(UNBIND.get(desc.value))) delete (state as any)[key];\n    }\n\n    for (const key of removed)\n      if (PAST.has(UNBIND.get(Object.getOwnPropertyDescriptor(state, key)?.value))) delete (state as any)[key];\n\n    for (const [key, get] of GETTERS.get(state.constructor)!)\n      if (!knownGetters.has(key) && get === getters!.get(key)) compute.call(state, get, key);\n  }\n\n  return live;\n}\n\n/** Lifecycle handlers registered on a class itself. */\nfunction handlers(type: State.Extends): Handler[] {\n  return [...(SETUP.get(type) || [])];\n}\n\nfunction isState(value: unknown): value is State.Extends {\n  return typeof value == 'function' && value.prototype instanceof State;\n}\n\n/** What a patch cannot carry: class source less its members, and member kinds. */\nfunction describe(type: Function): Entry {\n  const text = Function.prototype.toString;\n  const kinds: Entry['kinds'] = {};\n  let shape = text.call(type);\n\n  for (const target of [type.prototype, type])\n    for (const [key, desc] of Object.entries(Object.getOwnPropertyDescriptors(target)))\n      for (const fn of [desc.value, desc.get, desc.set])\n        if (typeof fn == 'function' && fn !== type) {\n          shape = shape.replace(text.call(fn), '');\n          if (target !== type) kinds[key] = desc.set ? 'accessor' : desc.get ? 'get' : 'fn';\n        }\n\n  shape = shape.replace(/\\s+/g, ' ').replace(/__vite_ssr_import_\\d+__/g, '__vite_ssr_import__');\n\n  return { type, shape, kinds, own: handlers(type as State.Extends) };\n}\n\nfunction compatible(prev: Entry, next: Entry) {\n  if (prev.shape !== next.shape || PRIVATE.test(next.shape)) return false;\n  if (Object.getPrototypeOf(prev.type) !== Object.getPrototypeOf(next.type)) return false;\n\n  for (const key in next.kinds)\n    if (key in prev.kinds && prev.kinds[key] !== next.kinds[key]) return false;\n\n  return true;\n}\n\n/**\n * Keep a module's State classes stable across runs. A class seen before is\n * patched with its replacement and returned in its place, refreshing live\n * instances; one whose shape or parent changed is returned as-is, and\n * reported to `replaced` listeners before `accept` returns.\n */\nfunction accept<T extends Record<string, unknown>>(id: string, classes: T): T {\n  let known = MODULES.get(id);\n\n  if (!known) MODULES.set(id, (known = {}));\n\n  const output: Record<string, unknown> = { ...classes };\n  const refresh = new Set<State>();\n  const replace: Replaced[] = [];\n  let patched = false;\n\n  track();\n\n  for (const [name, type] of Object.entries(classes)) {\n    if (!isState(type)) continue;\n\n    const prev = known[name];\n\n    if (prev?.type === type) continue;\n\n    const next = describe(type);\n\n    if (!prev || !compatible(prev, next)) {\n      if (prev) replace.push({ id, name, prev: prev.type as State.Extends, next: type });\n      known[name] = next;\n      continue;\n    }\n\n    try {\n      for (const state of patch(prev.type as State.Extends, type, prev.own)) refresh.add(state);\n      patched = true;\n      known[name] = { ...next, type: prev.type };\n      output[name] = prev.type;\n    } catch (error) {\n      console.error(error);\n      replace.push({ id, name, prev: prev.type as State.Extends, next: type });\n      known[name] = next;\n    }\n  }\n\n  if (patched) rechain();\n\n  for (const state of refresh) event(state, REFRESH);\n\n  for (const event of replace)\n    for (const listener of LISTENERS)\n      try {\n        listener(event);\n      } catch (error) {\n        console.error(error);\n      }\n\n  return output as T;\n}\n\n/**\n * Observe classes `accept` replaced instead of patching. Fires synchronously\n * inside `accept`, while the module re-runs, so a host can retire instances of\n * `prev` before anything resolves the module again.\n */\nfunction replaced(listener: (event: Replaced) => void): () => void {\n  LISTENERS.add(listener);\n  return () => void LISTENERS.delete(listener);\n}\n\nexport { accept, replaced };\nexport type { Replaced };\n"],"mappings":"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"}
+{"version":3,"file":"hot.js","names":[],"sources":["../src/hot.ts"],"sourcesContent":["import { event } from './observable';\nimport {\n  Model,\n  GETTERS,\n  LATEST,\n  METHODS,\n  SETUP,\n  UNBIND,\n  classify,\n  compute,\n  type Handler\n} from './state';\n\ninterface Entry {\n  type: Function;\n  shape: string;\n  kinds: Record<string, 'get' | 'accessor' | 'fn'>;\n  own: Handler[];\n}\n\ninterface Replaced {\n  /** Module id the class was accepted under. */\n  id: string;\n  /** Local declaration name of the class. */\n  name: string;\n  /** Class live instances belong to. */\n  prev: Model.Extends;\n  /** Class that took its place. */\n  next: Model.Extends;\n}\n\nconst define = Object.defineProperty;\n\n/** Method implementations replaced by a hot patch. */\nconst PAST = new WeakSet<Function>();\n\n/** Live instances, tracked once hot patching is enabled. */\nlet LIVE: Set<WeakRef<Model>> | undefined;\n\n/** Bootstrapped subclasses of each class, tracked once hot patching is enabled. */\nconst SUBCLASSES = new WeakMap<Function, Set<Model.Extends>>();\n\nconst MODULES = new Map<string, Record<string, Entry>>();\nconst LISTENERS = new Set<(event: Replaced) => void>();\nconst REFRESH = Symbol.for('@expressive/mvc.refresh');\nconst PRIVATE = /(?:^|[\\s;{}*])#[\\w$]+(?=[\\s=;(}])/;\n\n/** Begin tracking live instances, so a hot patch can reach them. */\nfunction track() {\n  if (LIVE) return;\n\n  LIVE = new Set();\n\n  Model.on({\n    type(type) {\n      const parent = Object.getPrototypeOf(type);\n      let children = SUBCLASSES.get(parent);\n      if (!children) SUBCLASSES.set(parent, (children = new Set()));\n      children.add(type);\n    },\n    setup(state) {\n      const ref = new WeakRef(state);\n      LIVE!.add(ref);\n      return () => LIVE!.delete(ref);\n    }\n  });\n}\n\n/**\n * Move the members of `next` onto `prev`, which keeps its identity. Returns the\n * live instances of `prev`, each needing a refresh.\n */\nfunction patch(prev: Model.Extends, next: Model.Extends, own: Handler[]): Model[] {\n  const proto = prev.prototype;\n  const incoming = Object.getOwnPropertyDescriptors(next.prototype);\n  const keys = METHODS.get(prev);\n  const getters = GETTERS.get(prev);\n  const methods = new Map<string, Function>();\n  const knownKeys = new Set(keys?.keys());\n  const knownGetters = new Set(getters?.keys());\n\n  let setup = SETUP.get(prev);\n\n  for (const handler of own) setup!.delete(handler);\n  for (const handler of handlers(next)) {\n    if (!setup) SETUP.set(prev, (setup = new Set()));\n    setup.add(handler);\n  }\n\n  for (const key of Reflect.ownKeys(next)) {\n    if (key == 'prototype' || key == 'length' || key == 'name') continue;\n    if (Object.getOwnPropertyDescriptor(prev, key)?.configurable !== false)\n      define(prev, key, Object.getOwnPropertyDescriptor(next, key)!);\n  }\n\n  const removed = new Set<string>();\n\n  for (const key of Object.getOwnPropertyNames(proto))\n    if (key != 'constructor' && !(key in incoming)) {\n      const bind = keys?.get(key);\n\n      if (bind && Object.getOwnPropertyDescriptor(proto, key)!.get === bind) {\n        PAST.add(UNBIND.get(bind));\n        keys!.delete(key);\n      }\n\n      removed.add(key);\n      Reflect.deleteProperty(proto, key);\n      getters?.delete(key);\n    }\n\n  for (const [key, desc] of Object.entries(incoming)) {\n    if (key == 'constructor') continue;\n\n    const current = Object.getOwnPropertyDescriptor(proto, key);\n\n    if (typeof desc.value == 'function') methods.set(key, desc.value);\n    if (current?.configurable === false) {\n      if (current.writable) (proto as any)[key] = desc.value;\n      continue;\n    }\n\n    if (current?.get && keys?.get(key) === current.get)\n      PAST.add(UNBIND.get(current.get));\n\n    const getter = getters?.get(key);\n\n    if (getter) LATEST.set(getter, desc.get!);\n\n    define(proto, key, { ...desc, configurable: true });\n  }\n\n  if (keys) {\n    for (let T: Model.Extends = prev; ; T = Object.getPrototypeOf(T)) {\n      for (const handler of SETUP.get(T) || [])\n        if (handler.type) handler.type(prev);\n\n      if (T === Model) break;\n    }\n\n    classify(prev, keys, getters!);\n  }\n\n  const live: Model[] = [];\n\n  for (const ref of LIVE!) {\n    const state = ref.deref();\n\n    if (!state) LIVE!.delete(ref);\n    else if (state instanceof prev) live.push(state);\n  }\n\n  const descendants = new Set([prev, ...live.map((state) => state.constructor as Model.Extends)]);\n\n  for (const type of descendants) for (const child of SUBCLASSES.get(type) || []) descendants.add(child);\n\n  descendants.delete(prev);\n\n  for (const type of descendants) {\n    const inherit = METHODS.get(type)!;\n    const computed = GETTERS.get(type)!;\n\n    for (const [key, bind] of keys!) if (!knownKeys.has(key) && !inherit.has(key)) inherit.set(key, bind);\n    for (const [key, get] of getters!) if (!knownGetters.has(key) && !computed.has(key)) computed.set(key, get);\n    for (const key of removed)\n      if (!(key in type.prototype)) {\n        inherit.delete(key);\n        computed.delete(key);\n      }\n  }\n\n  for (const state of live) {\n    for (const [key, value] of methods) {\n      const desc = Object.getOwnPropertyDescriptor(state, key);\n\n      if (!desc) continue;\n      if (desc.set) desc.set.call(state, value);\n      else if (PAST.has(UNBIND.get(desc.value))) delete (state as any)[key];\n    }\n\n    for (const key of removed)\n      if (PAST.has(UNBIND.get(Object.getOwnPropertyDescriptor(state, key)?.value))) delete (state as any)[key];\n\n    for (const [key, get] of GETTERS.get(state.constructor)!)\n      if (!knownGetters.has(key) && get === getters!.get(key)) compute.call(state, get, key);\n  }\n\n  return live;\n}\n\n/** Lifecycle handlers registered on a class itself. */\nfunction handlers(type: Model.Extends): Handler[] {\n  return [...(SETUP.get(type) || [])];\n}\n\nfunction isModel(value: unknown): value is Model.Extends {\n  return typeof value == 'function' && value.prototype instanceof Model;\n}\n\n/** What a patch cannot carry: class source less its members, and member kinds. */\nfunction describe(type: Function): Entry {\n  const text = Function.prototype.toString;\n  const kinds: Entry['kinds'] = {};\n  let shape = text.call(type);\n\n  for (const target of [type.prototype, type])\n    for (const [key, desc] of Object.entries(Object.getOwnPropertyDescriptors(target)))\n      for (const fn of [desc.value, desc.get, desc.set])\n        if (typeof fn == 'function' && fn !== type) {\n          shape = shape.replace(text.call(fn), '');\n          if (target !== type) kinds[key] = desc.set ? 'accessor' : desc.get ? 'get' : 'fn';\n        }\n\n  shape = shape.replace(/\\s+/g, ' ').replace(/__vite_ssr_import_\\d+__/g, '__vite_ssr_import__');\n\n  return { type, shape, kinds, own: handlers(type as Model.Extends) };\n}\n\nfunction compatible(prev: Entry, next: Entry) {\n  if (prev.shape !== next.shape || PRIVATE.test(next.shape)) return false;\n  if (Object.getPrototypeOf(prev.type) !== Object.getPrototypeOf(next.type)) return false;\n\n  for (const key in next.kinds)\n    if (key in prev.kinds && prev.kinds[key] !== next.kinds[key]) return false;\n\n  return true;\n}\n\n/**\n * Keep a module's Model classes stable across runs. A class seen before is\n * patched with its replacement and returned in its place, refreshing live\n * instances; one whose shape or parent changed is returned as-is, and\n * reported to `replaced` listeners before `accept` returns.\n */\nfunction accept<T extends Record<string, unknown>>(id: string, classes: T): T {\n  let known = MODULES.get(id);\n\n  if (!known) MODULES.set(id, (known = {}));\n\n  const output: Record<string, unknown> = { ...classes };\n  const refresh = new Set<Model>();\n  const replace: Replaced[] = [];\n\n  track();\n\n  for (const [name, type] of Object.entries(classes)) {\n    if (!isModel(type)) continue;\n\n    const prev = known[name];\n\n    if (prev?.type === type) continue;\n\n    const next = describe(type);\n\n    if (!prev || !compatible(prev, next)) {\n      if (prev) replace.push({ id, name, prev: prev.type as Model.Extends, next: type });\n      known[name] = next;\n      continue;\n    }\n\n    try {\n      for (const state of patch(prev.type as Model.Extends, type, prev.own)) refresh.add(state);\n      known[name] = { ...next, type: prev.type };\n      output[name] = prev.type;\n    } catch (error) {\n      console.error(error);\n      replace.push({ id, name, prev: prev.type as Model.Extends, next: type });\n      known[name] = next;\n    }\n  }\n\n  for (const state of refresh) event(state, REFRESH);\n\n  for (const event of replace)\n    for (const listener of LISTENERS)\n      try {\n        listener(event);\n      } catch (error) {\n        console.error(error);\n      }\n\n  return output as T;\n}\n\n/**\n * Observe classes `accept` replaced instead of patching. Fires synchronously\n * inside `accept`, while the module re-runs, so a host can retire instances of\n * `prev` before anything resolves the module again.\n */\nfunction replaced(listener: (event: Replaced) => void): () => void {\n  LISTENERS.add(listener);\n  return () => void LISTENERS.delete(listener);\n}\n\nexport { accept, replaced };\nexport type { Replaced };\n"],"mappings":"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"}

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Context } from "./context.js";
-import { State, unbind } from "./state.js";
+import { Model, unbind } from "./state.js";
 import { Component } from "./component.js";
 import { pending } from "./dispatch.js";
 import { def } from "./field/def.js";
@@ -8,4 +8,4 @@ import { has } from "./field/has.js";
 import { map } from "./field/map.js";
 import { ref } from "./field/ref.js";
 import { set } from "./field/set.js";
-export { Component, Context, State, def, State as default, get, has, map, pending, ref, set, unbind };
+export { Component, Context, Model, Model as State, def, Model as default, get, has, map, pending, ref, set, unbind };

package/dist/index.js

@@ -1,5 +1,5 @@
 import { pending } from "./dispatch.js";
-import { State, unbind } from "./state.js";
+import { Model, unbind } from "./state.js";
 import { Context } from "./context.js";
 import { def } from "./field/def.js";
 import { set } from "./field/set.js";
@@ -10,9 +10,9 @@ import { map } from "./field/map.js";
 import { ref } from "./field/ref.js";
 
 //#region src/index.ts
-/** @deprecated Import `{ State }` as a named export. Adapter-augmented `State.*` types are not visible through the default alias. */
-var src_default = State;
+/** @deprecated Import `{ Model }` as a named export. Adapter-augmented `Model.*` types are not visible through the default alias. */
+var src_default = Model;
 
 //#endregion
-export { Component, Context, State, def, src_default as default, get, has, map, pending, ref, set, unbind };
+export { Component, Context, Model, Model as State, def, src_default as default, get, has, map, pending, ref, set, unbind };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../src/index.ts"],"sourcesContent":["export { def } from './field/def';\nexport { get } from './field/get';\nexport { has } from './field/has';\nexport { map } from './field/map';\nexport { set } from './field/set';\nexport { ref } from './field/ref';\n\nimport { State } from './state';\n\nexport { State, unbind } from './state';\n\n/** @deprecated Import `{ State }` as a named export. Adapter-augmented `State.*` types are not visible through the default alias. */\nexport default State;\nexport { Context } from './context';\nexport { Component } from './component';\nexport { pending } from './dispatch';\n"],"mappings":";;;;;;;;;;;;;AAYA,kBAAe"}
+{"version":3,"file":"index.js","names":[],"sources":["../src/index.ts"],"sourcesContent":["export { def } from './field/def';\nexport { get } from './field/get';\nexport { has } from './field/has';\nexport { map } from './field/map';\nexport { set } from './field/set';\nexport { ref } from './field/ref';\n\nimport { Model } from './state';\n\nexport { Model, unbind } from './state';\n\n/** @deprecated Renamed to `Model`. */\nexport { Model as State } from './state';\n\n/** @deprecated Import `{ Model }` as a named export. Adapter-augmented `Model.*` types are not visible through the default alias. */\nexport default Model;\nexport { Context } from './context';\nexport { Component } from './component';\nexport { pending } from './dispatch';\n"],"mappings":";;;;;;;;;;;;;AAeA,kBAAe"}

package/dist/jsx-runtime.d.ts

@@ -1,4 +1,4 @@
-import { Component, compose } from "./component.js";
+import { Component } from "./component.js";
 
 //#region src/jsx-runtime.d.ts
 /**
@@ -105,5 +105,5 @@ declare namespace JSX {
   } ? T : {};
 }
 //#endregion
-export { Fragment, Host, HostRuntime, JSX, childrenOf, compose, host, isElement, jsx, jsxDEV, jsxs, propsOf, typeOf };
+export { Fragment, Host, HostRuntime, JSX, childrenOf, host, isElement, jsx, jsxDEV, jsxs, propsOf, typeOf };
 //# sourceMappingURL=jsx-runtime.d.ts.map

package/dist/jsx-runtime.js

@@ -1,5 +1,3 @@
-import { compose } from "./component.js";
-
 //#region src/jsx-runtime.ts
 /**
 * Agnostic Fragment sentinel. The runtime entries translate it to the host's
@@ -66,5 +64,5 @@ function propsOf(node) {
 }
 
 //#endregion
-export { Fragment, childrenOf, compose, host, isElement, jsx, jsxDEV, jsxs, propsOf, typeOf };
+export { Fragment, childrenOf, host, isElement, jsx, jsxDEV, jsxs, propsOf, typeOf };
 //# sourceMappingURL=jsx-runtime.js.map

package/dist/jsx-runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"jsx-runtime.js","names":[],"sources":["../src/jsx-runtime.ts"],"sourcesContent":["import type { Component } from './component';\n\nexport { compose } from './component';\n\n/**\n * Per-adapter interpretation manifest. Each adapter augments this interface to\n * declare how it renders; the first member is `node` - the element type produced\n * by `Component.render` (surfaced as `Component.Node`) - alongside `intrinsics`,\n * the host's tag map (surfaced as `JSX.IntrinsicElements`), `elementClass`,\n * the instance a class must construct to render as an element, and optionally\n * `element`, further element types the host renders (joined into\n * `JSX.ElementType`).\n *\n * ```ts\n * declare module '@expressive/mvc/jsx-runtime' {\n *   interface Host {\n *     node: React.ReactNode;\n *     intrinsics: React.JSX.IntrinsicElements;\n *     elementClass: React.Component<any, any>;\n *   }\n * }\n * ```\n *\n * Only one adapter is expected per compilation; two augmenting the same member\n * with different types in the same build would conflict - by design.\n */\nexport interface Host { }\n\n/**\n * Host runtime, registered by an adapter (e.g. `@expressive/react`) as an\n * import side effect. One host per build - a second registration with a\n * different runtime throws.\n *\n * Members are ambient host capabilities: plain functions the host uniquely\n * owns, callable outside render - element mechanics always, plus optional\n * extras that fall back sanely when absent. Hook-shaped (render-resident)\n * capabilities do not belong here; those live with the adapter.\n */\nexport interface HostRuntime {\n  childrenOf(children: unknown): Component.Node[];\n  isElement(node: unknown): boolean;\n  jsx(type: unknown, props: object, key?: unknown): Component.Node;\n  jsxDEV?(type: unknown, props: object, key?: unknown, isStatic?: boolean, source?: object, self?: unknown): Component.Node;\n  jsxs(type: unknown, props: object, key?: unknown): Component.Node;\n  propsOf(node: unknown): Record<string, unknown>;\n  typeOf(node: unknown): unknown;\n  Fragment: unknown;\n}\n\n/**\n * Agnostic Fragment sentinel. The runtime entries translate it to the host's\n * Fragment on element creation; `typeOf` translates back, so identity checks\n * against this value hold for fragments from either pragma.\n */\nexport const Fragment = Symbol.for('@expressive/mvc.Fragment');\n\n/** Default for seams only a registered host can provide. */\nfunction absent(): never {\n  throw new Error(\n    'No JSX host is registered for @expressive/mvc. ' +\n    \"Import a host adapter (e.g. '@expressive/react') before anything renders - \" +\n    'typically as the first import of your application entry module.'\n  );\n}\n\nconst HOST: HostRuntime = {\n  childrenOf: absent,\n  isElement: absent,\n  jsx: absent,\n  jsxs: absent,\n  propsOf: absent,\n  typeOf: absent,\n  Fragment\n};\n\nlet registered: HostRuntime | undefined;\n\n/**\n * Register the host runtime. Idempotent for the same runtime - re-registering\n * picks up members added since (e.g. an optional dev seam). Element mechanics\n * the host leaves unset keep defaults that throw a setup-pointing error;\n * `jsxDEV` is routed around at the call site instead.\n */\nexport function host(runtime: HostRuntime) {\n  if (registered && registered !== runtime)\n    throw new Error(\n      'A different JSX host is already registered for @expressive/mvc. ' +\n      'Only one host adapter may be active per build.'\n    );\n\n  registered = runtime;\n  Object.assign(HOST, runtime);\n}\n\n/** Translate the agnostic Fragment sentinel to the host's Fragment. */\nfunction hostType(type: unknown): unknown {\n  return type === Fragment ? HOST.Fragment : type;\n}\n\nexport function jsx(type: unknown, props: object, key?: unknown): Component.Node {\n  return HOST.jsx(hostType(type), props, key);\n}\n\nexport function jsxs(type: unknown, props: object, key?: unknown): Component.Node {\n  return HOST.jsxs(hostType(type), props, key);\n}\n\n/** Dev-transpiled element creation. Hosts without a `jsxDEV` of their own fall\n * back to the production entries (prod-only host under a dev build). */\nexport function jsxDEV(\n  type: unknown,\n  props: object,\n  key?: unknown,\n  isStatic?: boolean,\n  source?: object,\n  self?: unknown\n): Component.Node {\n  return HOST.jsxDEV\n    ? HOST.jsxDEV(hostType(type), props, key, isStatic, source, self)\n    : isStatic\n      ? jsxs(type, props, key)\n      : jsx(type, props, key);\n}\n\n/** Flatten `children` to an array of nodes, per the host's semantics. */\nexport function childrenOf(children: unknown): Component.Node[] {\n  return HOST.childrenOf(children);\n}\n\n/** Is `node` a host element? */\nexport function isElement(node: unknown): boolean {\n  return HOST.isElement(node);\n}\n\n/** Element type of `node`; host Fragments surface as the agnostic `Fragment`. */\nexport function typeOf(node: unknown): unknown {\n  const type = HOST.typeOf(node);\n  return type === HOST.Fragment ? Fragment : type;\n}\n\n/** Props carried by element `node`. */\nexport function propsOf(node: unknown): Record<string, unknown> {\n  return HOST.propsOf(node);\n}\n\n\nexport declare namespace JSX {\n  type Element = Component.Node;\n  type ElementType =\n    | keyof IntrinsicElements\n    | ((props: any) => Component.Node)\n    | (new (...args: any[]) => Host extends { elementClass: infer I } ? I : ElementClass)\n    | (Host extends { element: infer T } ? T : never);\n  /**\n   * Class instance contract when no host declares `elementClass`. Gates on the\n   * `render` contract alone - requiring full\n   * `Component` assignability trips contravariance on `props` members (e.g.\n   * the `is` callback narrows per subclass), rejecting every subclass.\n   */\n  interface ElementClass { render(props?: any): Component.Node }\n  interface ElementAttributesProperty { props: {} }\n  interface ElementChildrenAttribute { children: {} }\n  interface IntrinsicAttributes { key?: string | number | null }\n  /**\n   * Host tag manifest, via the {@link Host} seam. Resolves to `{}` until an\n   * adapter augments `Host` with `intrinsics` - agnostic code is\n   * components-only by design, since it cannot know what tags a host renders.\n   */\n  type IntrinsicElements =\n    Host extends { intrinsics: infer T extends object } ? T : {};\n}\n"],"mappings":";;;;;;;;AAsDA,MAAa,WAAW,OAAO,IAAI,2BAA2B;;AAG9D,SAAS,SAAgB;AACvB,OAAM,IAAI,MACR,4LAGD;;AAGH,MAAM,OAAoB;CACxB,YAAY;CACZ,WAAW;CACX,KAAK;CACL,MAAM;CACN,SAAS;CACT,QAAQ;CACR;CACD;AAED,IAAI;;;;;;;AAQJ,SAAgB,KAAK,SAAsB;AACzC,KAAI,cAAc,eAAe,QAC/B,OAAM,IAAI,MACR,iHAED;AAEH,cAAa;AACb,QAAO,OAAO,MAAM,QAAQ;;;AAI9B,SAAS,SAAS,MAAwB;AACxC,QAAO,SAAS,WAAW,KAAK,WAAW;;AAG7C,SAAgB,IAAI,MAAe,OAAe,KAA+B;AAC/E,QAAO,KAAK,IAAI,SAAS,KAAK,EAAE,OAAO,IAAI;;AAG7C,SAAgB,KAAK,MAAe,OAAe,KAA+B;AAChF,QAAO,KAAK,KAAK,SAAS,KAAK,EAAE,OAAO,IAAI;;;;AAK9C,SAAgB,OACd,MACA,OACA,KACA,UACA,QACA,MACgB;AAChB,QAAO,KAAK,SACR,KAAK,OAAO,SAAS,KAAK,EAAE,OAAO,KAAK,UAAU,QAAQ,KAAK,GAC/D,WACE,KAAK,MAAM,OAAO,IAAI,GACtB,IAAI,MAAM,OAAO,IAAI;;;AAI7B,SAAgB,WAAW,UAAqC;AAC9D,QAAO,KAAK,WAAW,SAAS;;;AAIlC,SAAgB,UAAU,MAAwB;AAChD,QAAO,KAAK,UAAU,KAAK;;;AAI7B,SAAgB,OAAO,MAAwB;CAC7C,MAAM,OAAO,KAAK,OAAO,KAAK;AAC9B,QAAO,SAAS,KAAK,WAAW,WAAW;;;AAI7C,SAAgB,QAAQ,MAAwC;AAC9D,QAAO,KAAK,QAAQ,KAAK"}
+{"version":3,"file":"jsx-runtime.js","names":[],"sources":["../src/jsx-runtime.ts"],"sourcesContent":["import type { Component } from './component';\n\n/**\n * Per-adapter interpretation manifest. Each adapter augments this interface to\n * declare how it renders; the first member is `node` - the element type produced\n * by `Component.render` (surfaced as `Component.Node`) - alongside `intrinsics`,\n * the host's tag map (surfaced as `JSX.IntrinsicElements`), `elementClass`,\n * the instance a class must construct to render as an element, and optionally\n * `element`, further element types the host renders (joined into\n * `JSX.ElementType`).\n *\n * ```ts\n * declare module '@expressive/mvc/jsx-runtime' {\n *   interface Host {\n *     node: React.ReactNode;\n *     intrinsics: React.JSX.IntrinsicElements;\n *     elementClass: React.Component<any, any>;\n *   }\n * }\n * ```\n *\n * Only one adapter is expected per compilation; two augmenting the same member\n * with different types in the same build would conflict - by design.\n */\nexport interface Host { }\n\n/**\n * Host runtime, registered by an adapter (e.g. `@expressive/react`) as an\n * import side effect. One host per build - a second registration with a\n * different runtime throws.\n *\n * Members are ambient host capabilities: plain functions the host uniquely\n * owns, callable outside render - element mechanics always, plus optional\n * extras that fall back sanely when absent. Hook-shaped (render-resident)\n * capabilities do not belong here; those live with the adapter.\n */\nexport interface HostRuntime {\n  childrenOf(children: unknown): Component.Node[];\n  isElement(node: unknown): boolean;\n  jsx(type: unknown, props: object, key?: unknown): Component.Node;\n  jsxDEV?(type: unknown, props: object, key?: unknown, isStatic?: boolean, source?: object, self?: unknown): Component.Node;\n  jsxs(type: unknown, props: object, key?: unknown): Component.Node;\n  propsOf(node: unknown): Record<string, unknown>;\n  typeOf(node: unknown): unknown;\n  Fragment: unknown;\n}\n\n/**\n * Agnostic Fragment sentinel. The runtime entries translate it to the host's\n * Fragment on element creation; `typeOf` translates back, so identity checks\n * against this value hold for fragments from either pragma.\n */\nexport const Fragment = Symbol.for('@expressive/mvc.Fragment');\n\n/** Default for seams only a registered host can provide. */\nfunction absent(): never {\n  throw new Error(\n    'No JSX host is registered for @expressive/mvc. ' +\n    \"Import a host adapter (e.g. '@expressive/react') before anything renders - \" +\n    'typically as the first import of your application entry module.'\n  );\n}\n\nconst HOST: HostRuntime = {\n  childrenOf: absent,\n  isElement: absent,\n  jsx: absent,\n  jsxs: absent,\n  propsOf: absent,\n  typeOf: absent,\n  Fragment\n};\n\nlet registered: HostRuntime | undefined;\n\n/**\n * Register the host runtime. Idempotent for the same runtime - re-registering\n * picks up members added since (e.g. an optional dev seam). Element mechanics\n * the host leaves unset keep defaults that throw a setup-pointing error;\n * `jsxDEV` is routed around at the call site instead.\n */\nexport function host(runtime: HostRuntime) {\n  if (registered && registered !== runtime)\n    throw new Error(\n      'A different JSX host is already registered for @expressive/mvc. ' +\n      'Only one host adapter may be active per build.'\n    );\n\n  registered = runtime;\n  Object.assign(HOST, runtime);\n}\n\n/** Translate the agnostic Fragment sentinel to the host's Fragment. */\nfunction hostType(type: unknown): unknown {\n  return type === Fragment ? HOST.Fragment : type;\n}\n\nexport function jsx(type: unknown, props: object, key?: unknown): Component.Node {\n  return HOST.jsx(hostType(type), props, key);\n}\n\nexport function jsxs(type: unknown, props: object, key?: unknown): Component.Node {\n  return HOST.jsxs(hostType(type), props, key);\n}\n\n/** Dev-transpiled element creation. Hosts without a `jsxDEV` of their own fall\n * back to the production entries (prod-only host under a dev build). */\nexport function jsxDEV(\n  type: unknown,\n  props: object,\n  key?: unknown,\n  isStatic?: boolean,\n  source?: object,\n  self?: unknown\n): Component.Node {\n  return HOST.jsxDEV\n    ? HOST.jsxDEV(hostType(type), props, key, isStatic, source, self)\n    : isStatic\n      ? jsxs(type, props, key)\n      : jsx(type, props, key);\n}\n\n/** Flatten `children` to an array of nodes, per the host's semantics. */\nexport function childrenOf(children: unknown): Component.Node[] {\n  return HOST.childrenOf(children);\n}\n\n/** Is `node` a host element? */\nexport function isElement(node: unknown): boolean {\n  return HOST.isElement(node);\n}\n\n/** Element type of `node`; host Fragments surface as the agnostic `Fragment`. */\nexport function typeOf(node: unknown): unknown {\n  const type = HOST.typeOf(node);\n  return type === HOST.Fragment ? Fragment : type;\n}\n\n/** Props carried by element `node`. */\nexport function propsOf(node: unknown): Record<string, unknown> {\n  return HOST.propsOf(node);\n}\n\n\nexport declare namespace JSX {\n  type Element = Component.Node;\n  type ElementType =\n    | keyof IntrinsicElements\n    | ((props: any) => Component.Node)\n    | (new (...args: any[]) => Host extends { elementClass: infer I } ? I : ElementClass)\n    | (Host extends { element: infer T } ? T : never);\n  /**\n   * Class instance contract when no host declares `elementClass`. Gates on the\n   * `render` contract alone - requiring full\n   * `Component` assignability trips contravariance on `props` members (e.g.\n   * the `is` callback narrows per subclass), rejecting every subclass.\n   */\n  interface ElementClass { render(props?: any): Component.Node }\n  interface ElementAttributesProperty { props: {} }\n  interface ElementChildrenAttribute { children: {} }\n  interface IntrinsicAttributes { key?: string | number | null }\n  /**\n   * Host tag manifest, via the {@link Host} seam. Resolves to `{}` until an\n   * adapter augments `Host` with `intrinsics` - agnostic code is\n   * components-only by design, since it cannot know what tags a host renders.\n   */\n  type IntrinsicElements =\n    Host extends { intrinsics: infer T extends object } ? T : {};\n}\n"],"mappings":";;;;;;AAoDA,MAAa,WAAW,OAAO,IAAI,2BAA2B;;AAG9D,SAAS,SAAgB;AACvB,OAAM,IAAI,MACR,4LAGD;;AAGH,MAAM,OAAoB;CACxB,YAAY;CACZ,WAAW;CACX,KAAK;CACL,MAAM;CACN,SAAS;CACT,QAAQ;CACR;CACD;AAED,IAAI;;;;;;;AAQJ,SAAgB,KAAK,SAAsB;AACzC,KAAI,cAAc,eAAe,QAC/B,OAAM,IAAI,MACR,iHAED;AAEH,cAAa;AACb,QAAO,OAAO,MAAM,QAAQ;;;AAI9B,SAAS,SAAS,MAAwB;AACxC,QAAO,SAAS,WAAW,KAAK,WAAW;;AAG7C,SAAgB,IAAI,MAAe,OAAe,KAA+B;AAC/E,QAAO,KAAK,IAAI,SAAS,KAAK,EAAE,OAAO,IAAI;;AAG7C,SAAgB,KAAK,MAAe,OAAe,KAA+B;AAChF,QAAO,KAAK,KAAK,SAAS,KAAK,EAAE,OAAO,IAAI;;;;AAK9C,SAAgB,OACd,MACA,OACA,KACA,UACA,QACA,MACgB;AAChB,QAAO,KAAK,SACR,KAAK,OAAO,SAAS,KAAK,EAAE,OAAO,KAAK,UAAU,QAAQ,KAAK,GAC/D,WACE,KAAK,MAAM,OAAO,IAAI,GACtB,IAAI,MAAM,OAAO,IAAI;;;AAI7B,SAAgB,WAAW,UAAqC;AAC9D,QAAO,KAAK,WAAW,SAAS;;;AAIlC,SAAgB,UAAU,MAAwB;AAChD,QAAO,KAAK,UAAU,KAAK;;;AAI7B,SAAgB,OAAO,MAAwB;CAC7C,MAAM,OAAO,KAAK,OAAO,KAAK;AAC9B,QAAO,SAAS,KAAK,WAAW,WAAW;;;AAI7C,SAAgB,QAAQ,MAAwC;AAC9D,QAAO,KAAK,QAAQ,KAAK"}

package/dist/observable.d.ts

@@ -11,7 +11,10 @@ declare namespace Observer {
    */
   type Notify = (key: Signal) => (() => void) | null | void;
   type EffectCleanup = (update: boolean | null) => void;
-  type Effect<T extends object> = (this: T, proxy: T, changed: readonly Event[]) => EffectCleanup | Promise<void> | null | void;
+  type EffectOutput = EffectCleanup | null | void;
+  type Effect<T extends object, R = EffectOutput | Promise<void>> = (this: T, proxy: T, changed: readonly Event[]) => R;
+  /** Stops the effect when called; awaited, cancels it and yields its value. */
+  type Release<R> = (() => void) & PromiseLike<R>;
   type Event = number | string | symbol;
   type Signal = Event | true | false | null;
   type Callback = () => void | null;
@@ -46,12 +49,12 @@ declare function event(state: object, key?: Observer.Event | null, silent?: bool
  * Create a side-effect which will update whenever values accessed change.
  * Callback is called immediately and whenever values are stale.
  *
- * @param target - Instance of State to observe.
+ * @param target - Instance of Model to observe.
  * @param callback - Function to invoke when values change.
  * @param requireValues - If `true` will throw if accessing a value which is `undefined`.
  */
-declare function watch<T extends object>(target: T, callback: Observer.Effect<Required<T>>, requireValues: true, transition?: (work: () => void) => void): () => void;
-declare function watch<T extends object>(target: T, callback: Observer.Effect<T>, recursive?: boolean, transition?: (work: () => void) => void): () => void;
+declare function watch<T extends object, R = void>(target: T, callback: Observer.Effect<Required<T>, Observer.EffectOutput | Promise<R>>, requireValues: true, transition?: (work: () => void) => void): Observer.Release<R>;
+declare function watch<T extends object, R = void>(target: T, callback: Observer.Effect<T, Observer.EffectOutput | Promise<R>>, recursive?: boolean, transition?: (work: () => void) => void): Observer.Release<R>;
 declare function capture(scope: (release: (update?: boolean | null) => void) => void): void;
 //#endregion
 export { Observer, capture, event, listener, observer, queued, touch, watch };

package/dist/observable.js

@@ -1,4 +1,4 @@
-import { enqueue, hold } from "./dispatch.js";
+import { REPORT, enqueue, hold } from "./dispatch.js";
 
 //#region src/observable.ts
 const Observer = Symbol("Observer");
@@ -119,18 +119,61 @@ function watch(target, callback, argument, transition) {
 	let previous;
 	let latest;
 	let queued = false;
+	let pending = false;
 	let suspense;
-	function resume() {
+	let outcome;
+	let awaiting;
+	let settle;
+	function conclude(ok, value) {
+		outcome = {
+			ok,
+			value
+		};
+		if (!ok || !queued) finish();
+	}
+	function finish() {
+		const done = awaiting && settle;
+		if (!done) return;
+		settle = void 0;
+		done();
+		cleanup();
+	}
+	function fail(reason) {
+		if (!outcome) outcome = {
+			ok: false,
+			value: /* @__PURE__ */ new Error(`${target} ${reason}`)
+		};
+		finish();
+	}
+	function stop(key) {
+		if (unset) unset(key);
+		unset = void 0;
 		suspense?.();
 		suspense = void 0;
+		reset = null;
+		pending = queued = false;
+	}
+	function suspend(on) {
+		reset = void 0;
+		const suspended = suspense = hold(true, transition);
+		const replay = () => {
+			if (suspense !== suspended) return;
+			suspense = void 0;
+			suspended(invoke);
+		};
+		on.then(replay, replay);
 	}
 	function invoke() {
 		if (reset === null || observer(target) === null) return;
 		queued = false;
 		let ignore = true;
 		function onUpdate() {
-			events = [...o.events];
+			events = queued ? [...new Set([...events, ...o.events])] : [...o.events];
 			if (reset === null) return null;
+			if (pending) {
+				queued = true;
+				return;
+			}
 			if (ignore) {
 				if (queued) enqueue(invoke, transition, target);
 				return;
@@ -141,62 +184,86 @@ function watch(target, callback, argument, transition) {
 			unset = void 0;
 			enqueue(invoke, transition, target);
 		}
+		function apply(output, release) {
+			ignore = false;
+			reset = output === null ? null : invoke;
+			unset = (key) => {
+				if (typeof output == "function") output(key);
+				if (release) release(key);
+			};
+		}
 		function run(release) {
 			if (previous !== latest) unobserve(latest);
 			const proxy = observe(target, onUpdate, argument === true);
 			const current = latest = proxy[Observing];
 			const output = callback.call(proxy, proxy, events);
 			if (observer(target) === null) {
-				if (typeof output == "function") output(null);
 				if (release) release(null);
-				return;
+				if (output instanceof Promise) output.catch(() => {});
+				else if (typeof output == "function") output(null);
+				return fail("is destroyed.");
 			}
 			if (previous && argument === false && !current.watching.size) previous.callback = onUpdate;
 			else {
 				if (previous) unobserve(previous);
 				previous = current;
 			}
-			ignore = false;
-			reset = output === null ? null : invoke;
-			unset = (key) => {
-				if (typeof output == "function") output(key);
-				if (release) release(key);
-			};
 			events = [];
+			if (!(output instanceof Promise)) {
+				apply(output, release);
+				return conclude(true, void 0);
+			}
+			pending = true;
+			reset = invoke;
+			unset = release;
+			output.then((value) => {
+				pending = false;
+				if (reset === null) return;
+				apply(void 0, release);
+				conclude(true, value);
+				if (queued) onUpdate();
+			}, (err) => {
+				pending = false;
+				if (reset === null) return;
+				if (err instanceof Promise) return suspend(err);
+				queued = false;
+				conclude(false, err);
+				if (!awaiting) REPORT.as("effect", target, err);
+			});
 		}
 		try {
 			if (argument !== false) capture(run);
 			else run();
 		} catch (err) {
-			if (err instanceof Promise) {
-				reset = void 0;
-				const suspended = suspense = hold(true, transition);
-				const replay = () => {
-					if (suspense !== suspended) return;
-					suspense = void 0;
-					suspended(invoke);
-				};
-				err.then(replay, replay);
-			} else throw err;
+			if (err instanceof Promise) return suspend(err);
+			conclude(false, err);
+			if (!awaiting) throw err;
 		}
 	}
 	const unlisten = listener(target, (key) => {
 		if (key === true) invoke();
 		else if (key === null) {
-			if (unset) unset(null);
-			resume();
-			reset = null;
+			stop(null);
+			fail("is destroyed.");
 		} else if (!reset) {
 			suspense?.(false);
 			return reset;
 		}
 	});
 	function cleanup() {
-		if (unset) unset(false);
-		resume();
-		reset = null;
+		stop(false);
 		unlisten();
+		fail("effect was cancelled before it settled.");
 	}
+	cleanup.then = ((onFulfilled, onRejected) => {
+		if (!awaiting) {
+			awaiting = new Promise((resolve, reject) => {
+				settle = () => outcome.ok ? resolve(outcome.value) : reject(outcome.value);
+			});
+			if (outcome && !pending && !queued && !suspense) finish();
+		}
+		return awaiting.then(onFulfilled, onRejected);
+	});
 	if (EffectContext && argument !== false) EffectContext.add(cleanup);
 	return cleanup;
 }

package/dist/observable.js.map

@@ -1 +1 @@
-{"version":3,"file":"observable.js","names":[],"sources":["../src/observable.ts"],"sourcesContent":["import { enqueue, hold } from './dispatch';\n\ndeclare namespace Observer {\n  /**\n   * Update callback function.\n   *\n   * @param key -\n   *   - `string` - property which has updated.\n   *   - `false` - a normal update has completed.\n   *   - `true` - initial event; instance is ready.\n   *   - `null` - terminal event; instance is expired.\n   */\n  type Notify = (key: Signal) => (() => void) | null | void;\n\n  type EffectCleanup = (update: boolean | null) => void;\n\n  type Effect<T extends object> = (\n    this: T,\n    proxy: T,\n    changed: readonly Event[]\n  ) => EffectCleanup | Promise<void> | null | void;\n\n  type Event = number | string | symbol;\n\n  type Signal = Event | true | false | null;\n\n  type Callback = () => void | null;\n}\n\ninterface Observer {\n  /** Becomes `true` once the subject has emitted its initial event. */\n  ready?: true;\n  listeners: Map<Observer.Notify, Set<Observer.Signal> | undefined>;\n  /** Recursion guard for an in-progress emit pass. */\n  pending: Set<Observer.Signal>;\n  /** Accumulator drained by the next microtask. */\n  events: Set<Observer.Event>;\n}\n\ninterface Observing {\n  callback: Observer.Callback;\n  watching: Set<Observer.Signal>;\n  required?: boolean;\n  release: (() => void)[];\n}\n\nconst Observer: unique symbol = Symbol('Observer');\nconst Observing: unique symbol = Symbol('Observing');\n\n/** Event every observer treats as watched, to force a refresh. */\nconst REFRESH = Symbol.for('@expressive/mvc.refresh');\n\ninterface Observable { [Observer]?: Observer | null }\ninterface Observed { [Observing]?: Observing }\n\n/**\n * Fetch the dispatch bundle attached to an object.\n * - returns the bundle if active\n * - returns `null` if the subject has been terminated\n * - returns `undefined` if the subject was never observable\n *\n * With `create: true`, attaches a fresh bundle iff the slot is undefined.\n * A terminated (null) slot is not resurrected.\n */\nfunction observer(state: object, create: true): Observer;\nfunction observer(state: object, create?: boolean): Observer | undefined | null;\nfunction observer(state: object, create?: boolean) {\n  const o = (state as Observable)[Observer];\n\n  if (!o && create) {\n    if (o === null)\n      throw new Error(\n        `${state} was destroyed - cannot be rendered, watched or updated.`\n      );\n\n    const value: Observer = {\n      listeners: new Map(),\n      pending: new Set(),\n      events: new Set()\n    };\n    Object.defineProperty(state, Observer, { value, writable: true });\n    return value;\n  }\n\n  return o;\n}\n\nfunction observe<T extends object>(\n  object: T,\n  callback: Observer.Callback,\n  required?: boolean,\n  cleanup: (() => void)[] = []\n): T {\n  const watching = new Set<Observer.Signal>();\n  const observing: Observing = { callback, watching, required, release: cleanup };\n\n  const release = listener(object, (key) => {\n    if (watching.has(key) || key === REFRESH) return observing.callback();\n  });\n\n  cleanup.push(release);\n\n  if (EffectContext)\n    EffectContext.add((update) => {\n      if (update !== true) release();\n    });\n\n  const proxy = Object.create(object) as T;\n\n  if ('is' in object)\n    Object.defineProperty(proxy, 'is', {\n      value: (object as { is?: unknown }).is,\n      writable: true\n    });\n\n  return Object.defineProperty(proxy, Observing, { value: observing });\n}\n\nfunction touch(from: object, key: any): void;\nfunction touch<T>(from: object, key: any, value?: T): T;\nfunction touch(from: object, key: any, value?: any) {\n  const active = (from as Observed)[Observing];\n\n  if (active) {\n    if (value === undefined && arguments.length === 3 && active.required)\n      throw new Error(\n        `${Object.getPrototypeOf(from)}.${String(key)} is required in this context.`\n      );\n\n    active.watching.add(key);\n\n    if (value instanceof Object && observer(value))\n      return observe(\n        value,\n        () => active.callback(),\n        active.required,\n        active.release\n      );\n  }\n\n  return value;\n}\n\nfunction unobserve(observing: Observing) {\n  for (const release of observing.release) release();\n}\n\nfunction listener<T extends object>(\n  subject: T,\n  callback: Observer.Notify,\n  select?: Observer.Signal | Set<Observer.Signal>\n) {\n  const o = observer(subject, true);\n\n  if (select !== undefined && !(select instanceof Set))\n    select = new Set([select]);\n\n  if (o.ready && !select) callback(true);\n\n  o.listeners.set(callback, select);\n\n  return () => o.listeners.delete(callback);\n}\n\nconst EMPTY = Object.assign([], {\n  then: Promise.prototype.then.bind(Promise.resolve([]))\n} as PromiseLike<never[]>);\n\nfunction queued<K extends Observer.Event>(\n  state: object\n): K[] & PromiseLike<K[]> {\n  const o = observer(state);\n  if (!o?.events.size) return EMPTY;\n\n  const current = o.events as Set<K>;\n  const promise = new Promise<K[]>((res) => {\n    const callback: Observer.Notify = () => {\n      o.listeners.delete(callback);\n      return () => res([...current]);\n    };\n    o.listeners.set(callback, undefined);\n  });\n\n  return Object.assign([...current], {\n    then: promise.then.bind(promise)\n  });\n}\n\nfunction event(state: object, key?: Observer.Event | null, silent?: boolean) {\n  const o = observer(state, key === undefined);\n\n  if (!o) return;\n\n  if (key === null) {\n    if (!Object.getOwnPropertyDescriptor(state, Observer)) return;\n\n    (state as Observable)[Observer] = null;\n    return emit(o, key, state);\n  }\n\n  if (key === undefined) return emit(o, true, state);\n\n  if (!o.events.size && !silent)\n    enqueue(() => {\n      emit(o, false, state);\n      o.events = new Set();\n    }, undefined, state);\n\n  o.events.add(key);\n\n  if (!silent) emit(o, key, state);\n}\n\nfunction emit(o: Observer, key: Observer.Signal, subject: object): void {\n  const { listeners, pending, ready } = o;\n\n  if (key === ready) return;\n\n  if (pending.size) {\n    pending.add(key);\n    return;\n  }\n\n  if (!ready && key !== null) pending.add(true);\n\n  pending.add(key);\n\n  for (const k of pending)\n    for (const [callback, filter] of listeners)\n      if (!filter || filter.has(k)) {\n        const after = callback(k);\n        if (after === null) listeners.delete(callback);\n        else if (typeof after == 'function') enqueue(after, undefined, subject);\n      }\n\n  if (key === null) listeners.clear();\n  else if (key === true) o.ready = true;\n\n  pending.clear();\n}\n\n/**\n * Create a side-effect which will update whenever values accessed change.\n * Callback is called immediately and whenever values are stale.\n *\n * @param target - Instance of State to observe.\n * @param callback - Function to invoke when values change.\n * @param requireValues - If `true` will throw if accessing a value which is `undefined`.\n */\nfunction watch<T extends object>(\n  target: T,\n  callback: Observer.Effect<Required<T>>,\n  requireValues: true,\n  transition?: (work: () => void) => void\n): () => void;\n\nfunction watch<T extends object>(\n  target: T,\n  callback: Observer.Effect<T>,\n  recursive?: boolean,\n  transition?: (work: () => void) => void\n): () => void;\n\nfunction watch<T extends object>(\n  target: T,\n  callback: Observer.Effect<T>,\n  argument?: boolean,\n  transition?: (work: () => void) => void\n) {\n  const o = observer(target, true);\n  let events: readonly Observer.Event[] = [];\n  let unset: ((update: boolean | null) => void) | undefined;\n  let reset: (() => void) | null | undefined;\n  let previous: Observing | undefined;\n  let latest: Observing | undefined;\n  let queued = false;\n  let suspense: ReturnType<typeof hold>;\n\n  function resume() {\n    suspense?.();\n    suspense = undefined;\n  }\n\n  function invoke() {\n    if (reset === null || observer(target) === null) return;\n\n    queued = false;\n    let ignore: boolean = true;\n\n    function onUpdate() {\n      events = [...o.events];\n\n      if (reset === null) return null;\n      if (ignore) {\n        if (queued) enqueue(invoke, transition, target);\n        return;\n      }\n\n      ignore = true;\n      queued = true;\n\n      unset!(true);\n      unset = undefined;\n\n      enqueue(invoke, transition, target);\n    }\n\n    function run(release?: (update?: boolean | null) => void) {\n      if (previous !== latest) unobserve(latest!);\n\n      const proxy = observe(target, onUpdate, argument === true);\n      const current = latest = (proxy as Observed)[Observing]!;\n      const output = callback.call(proxy, proxy, events);\n\n      if (observer(target) === null) {\n        if (typeof output == 'function') output(null);\n        if (release) release(null);\n        return;\n      }\n\n      if (previous && argument === false && !current.watching.size)\n        previous.callback = onUpdate;\n      else {\n        if (previous) unobserve(previous);\n        previous = current;\n      }\n\n      ignore = false;\n      reset = output === null ? null : invoke;\n      unset = (key) => {\n        if (typeof output == 'function') output(key);\n        if (release) release(key);\n      };\n\n      events = [];\n    }\n\n    try {\n      if (argument !== false) capture(run);\n      else run();\n    } catch (err) {\n      if (err instanceof Promise) {\n        reset = undefined;\n        const suspended = suspense = hold(true, transition)!;\n        const replay = () => {\n          if (suspense !== suspended) return;\n          suspense = undefined;\n          suspended(invoke);\n        };\n        err.then(replay, replay);\n      } else {\n        throw err;\n      }\n    }\n  }\n\n  const unlisten = listener(target, (key) => {\n    if (key === true) invoke();\n    else if (key === null) {\n      if (unset) unset(null);\n      resume();\n      reset = null;\n    } else if (!reset) {\n      suspense?.(false);\n      return reset;\n    }\n  });\n\n  function cleanup() {\n    if (unset) unset(false);\n\n    resume();\n    reset = null;\n    unlisten();\n  }\n\n  if (EffectContext && argument !== false) EffectContext.add(cleanup);\n\n  return cleanup;\n}\n\nlet EffectContext: Set<(update?: boolean | null) => void> | undefined;\n\nfunction capture(scope: (release: (update?: boolean | null) => void) => void) {\n  const parent = EffectContext;\n  const context = (EffectContext = new Set());\n\n  try {\n    scope((update) => context.forEach((fn) => fn(update)));\n  } finally {\n    EffectContext = parent;\n  }\n}\n\nexport {\n  listener,\n  event,\n  Observer,\n  touch,\n  queued,\n  observer,\n  watch,\n  capture\n};\n"],"mappings":"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"}
+{"version":3,"file":"observable.js","names":[],"sources":["../src/observable.ts"],"sourcesContent":["import { enqueue, hold, REPORT } from './dispatch';\n\ndeclare namespace Observer {\n  /**\n   * Update callback function.\n   *\n   * @param key -\n   *   - `string` - property which has updated.\n   *   - `false` - a normal update has completed.\n   *   - `true` - initial event; instance is ready.\n   *   - `null` - terminal event; instance is expired.\n   */\n  type Notify = (key: Signal) => (() => void) | null | void;\n\n  type EffectCleanup = (update: boolean | null) => void;\n\n  type EffectOutput = EffectCleanup | null | void;\n\n  type Effect<T extends object, R = EffectOutput | Promise<void>> = (\n    this: T,\n    proxy: T,\n    changed: readonly Event[]\n  ) => R;\n\n  /** Stops the effect when called; awaited, cancels it and yields its value. */\n  type Release<R> = (() => void) & PromiseLike<R>;\n\n  type Event = number | string | symbol;\n\n  type Signal = Event | true | false | null;\n\n  type Callback = () => void | null;\n}\n\ninterface Observer {\n  /** Becomes `true` once the subject has emitted its initial event. */\n  ready?: true;\n  listeners: Map<Observer.Notify, Set<Observer.Signal> | undefined>;\n  /** Recursion guard for an in-progress emit pass. */\n  pending: Set<Observer.Signal>;\n  /** Accumulator drained by the next microtask. */\n  events: Set<Observer.Event>;\n}\n\ninterface Observing {\n  callback: Observer.Callback;\n  watching: Set<Observer.Signal>;\n  required?: boolean;\n  release: (() => void)[];\n}\n\nconst Observer: unique symbol = Symbol('Observer');\nconst Observing: unique symbol = Symbol('Observing');\n\n/** Event every observer treats as watched, to force a refresh. */\nconst REFRESH = Symbol.for('@expressive/mvc.refresh');\n\ninterface Observable { [Observer]?: Observer | null }\ninterface Observed { [Observing]?: Observing }\n\n/**\n * Fetch the dispatch bundle attached to an object.\n * - returns the bundle if active\n * - returns `null` if the subject has been terminated\n * - returns `undefined` if the subject was never observable\n *\n * With `create: true`, attaches a fresh bundle iff the slot is undefined.\n * A terminated (null) slot is not resurrected.\n */\nfunction observer(state: object, create: true): Observer;\nfunction observer(state: object, create?: boolean): Observer | undefined | null;\nfunction observer(state: object, create?: boolean) {\n  const o = (state as Observable)[Observer];\n\n  if (!o && create) {\n    if (o === null)\n      throw new Error(\n        `${state} was destroyed - cannot be rendered, watched or updated.`\n      );\n\n    const value: Observer = {\n      listeners: new Map(),\n      pending: new Set(),\n      events: new Set()\n    };\n    Object.defineProperty(state, Observer, { value, writable: true });\n    return value;\n  }\n\n  return o;\n}\n\nfunction observe<T extends object>(\n  object: T,\n  callback: Observer.Callback,\n  required?: boolean,\n  cleanup: (() => void)[] = []\n): T {\n  const watching = new Set<Observer.Signal>();\n  const observing: Observing = { callback, watching, required, release: cleanup };\n\n  const release = listener(object, (key) => {\n    if (watching.has(key) || key === REFRESH) return observing.callback();\n  });\n\n  cleanup.push(release);\n\n  if (EffectContext)\n    EffectContext.add((update) => {\n      if (update !== true) release();\n    });\n\n  const proxy = Object.create(object) as T;\n\n  if ('is' in object)\n    Object.defineProperty(proxy, 'is', {\n      value: (object as { is?: unknown }).is,\n      writable: true\n    });\n\n  return Object.defineProperty(proxy, Observing, { value: observing });\n}\n\nfunction touch(from: object, key: any): void;\nfunction touch<T>(from: object, key: any, value?: T): T;\nfunction touch(from: object, key: any, value?: any) {\n  const active = (from as Observed)[Observing];\n\n  if (active) {\n    if (value === undefined && arguments.length === 3 && active.required)\n      throw new Error(\n        `${Object.getPrototypeOf(from)}.${String(key)} is required in this context.`\n      );\n\n    active.watching.add(key);\n\n    if (value instanceof Object && observer(value))\n      return observe(\n        value,\n        () => active.callback(),\n        active.required,\n        active.release\n      );\n  }\n\n  return value;\n}\n\nfunction unobserve(observing: Observing) {\n  for (const release of observing.release) release();\n}\n\nfunction listener<T extends object>(\n  subject: T,\n  callback: Observer.Notify,\n  select?: Observer.Signal | Set<Observer.Signal>\n) {\n  const o = observer(subject, true);\n\n  if (select !== undefined && !(select instanceof Set))\n    select = new Set([select]);\n\n  if (o.ready && !select) callback(true);\n\n  o.listeners.set(callback, select);\n\n  return () => o.listeners.delete(callback);\n}\n\nconst EMPTY = Object.assign([], {\n  then: Promise.prototype.then.bind(Promise.resolve([]))\n} as PromiseLike<never[]>);\n\nfunction queued<K extends Observer.Event>(\n  state: object\n): K[] & PromiseLike<K[]> {\n  const o = observer(state);\n  if (!o?.events.size) return EMPTY;\n\n  const current = o.events as Set<K>;\n  const promise = new Promise<K[]>((res) => {\n    const callback: Observer.Notify = () => {\n      o.listeners.delete(callback);\n      return () => res([...current]);\n    };\n    o.listeners.set(callback, undefined);\n  });\n\n  return Object.assign([...current], {\n    then: promise.then.bind(promise)\n  });\n}\n\nfunction event(state: object, key?: Observer.Event | null, silent?: boolean) {\n  const o = observer(state, key === undefined);\n\n  if (!o) return;\n\n  if (key === null) {\n    if (!Object.getOwnPropertyDescriptor(state, Observer)) return;\n\n    (state as Observable)[Observer] = null;\n    return emit(o, key, state);\n  }\n\n  if (key === undefined) return emit(o, true, state);\n\n  if (!o.events.size && !silent)\n    enqueue(() => {\n      emit(o, false, state);\n      o.events = new Set();\n    }, undefined, state);\n\n  o.events.add(key);\n\n  if (!silent) emit(o, key, state);\n}\n\nfunction emit(o: Observer, key: Observer.Signal, subject: object): void {\n  const { listeners, pending, ready } = o;\n\n  if (key === ready) return;\n\n  if (pending.size) {\n    pending.add(key);\n    return;\n  }\n\n  if (!ready && key !== null) pending.add(true);\n\n  pending.add(key);\n\n  for (const k of pending)\n    for (const [callback, filter] of listeners)\n      if (!filter || filter.has(k)) {\n        const after = callback(k);\n        if (after === null) listeners.delete(callback);\n        else if (typeof after == 'function') enqueue(after, undefined, subject);\n      }\n\n  if (key === null) listeners.clear();\n  else if (key === true) o.ready = true;\n\n  pending.clear();\n}\n\n/**\n * Create a side-effect which will update whenever values accessed change.\n * Callback is called immediately and whenever values are stale.\n *\n * @param target - Instance of Model to observe.\n * @param callback - Function to invoke when values change.\n * @param requireValues - If `true` will throw if accessing a value which is `undefined`.\n */\nfunction watch<T extends object, R = void>(\n  target: T,\n  callback: Observer.Effect<Required<T>, Observer.EffectOutput | Promise<R>>,\n  requireValues: true,\n  transition?: (work: () => void) => void\n): Observer.Release<R>;\n\nfunction watch<T extends object, R = void>(\n  target: T,\n  callback: Observer.Effect<T, Observer.EffectOutput | Promise<R>>,\n  recursive?: boolean,\n  transition?: (work: () => void) => void\n): Observer.Release<R>;\n\nfunction watch<T extends object, R>(\n  target: T,\n  callback: Observer.Effect<T, unknown>,\n  argument?: boolean,\n  transition?: (work: () => void) => void\n): Observer.Release<R> {\n  const o = observer(target, true);\n  let events: readonly Observer.Event[] = [];\n  let unset: ((update: boolean | null) => void) | undefined;\n  let reset: (() => void) | null | undefined;\n  let previous: Observing | undefined;\n  let latest: Observing | undefined;\n  let queued = false;\n  let pending = false;\n  let suspense: ReturnType<typeof hold>;\n  let outcome: { ok: boolean; value: unknown } | undefined;\n  let awaiting: Promise<R> | undefined;\n  let settle: (() => void) | undefined;\n\n  function conclude(ok: boolean, value: unknown) {\n    outcome = { ok, value };\n    if (!ok || !queued) finish();\n  }\n\n  function finish() {\n    const done = awaiting && settle;\n\n    if (!done) return;\n\n    settle = undefined;\n    done();\n    cleanup();\n  }\n\n  function fail(reason: string) {\n    if (!outcome) outcome = { ok: false, value: new Error(`${target} ${reason}`) };\n    finish();\n  }\n\n  function stop(key: false | null) {\n    if (unset) unset(key);\n    unset = undefined;\n    suspense?.();\n    suspense = undefined;\n    reset = null;\n    pending = queued = false;\n  }\n\n  function suspend(on: Promise<unknown>) {\n    reset = undefined;\n    const suspended = suspense = hold(true, transition)!;\n    const replay = () => {\n      if (suspense !== suspended) return;\n      suspense = undefined;\n      suspended(invoke);\n    };\n    on.then(replay, replay);\n  }\n\n  function invoke() {\n    if (reset === null || observer(target) === null) return;\n\n    queued = false;\n    let ignore: boolean = true;\n\n    function onUpdate() {\n      events = queued ? [...new Set([...events, ...o.events])] : [...o.events];\n\n      if (reset === null) return null;\n      if (pending) {\n        queued = true;\n        return;\n      }\n      if (ignore) {\n        if (queued) enqueue(invoke, transition, target);\n        return;\n      }\n\n      ignore = true;\n      queued = true;\n\n      unset!(true);\n      unset = undefined;\n\n      enqueue(invoke, transition, target);\n    }\n\n    function apply(output: unknown, release?: (update?: boolean | null) => void) {\n      ignore = false;\n      reset = output === null ? null : invoke;\n      unset = (key) => {\n        if (typeof output == 'function') output(key);\n        if (release) release(key);\n      };\n    }\n\n    function run(release?: (update?: boolean | null) => void) {\n      if (previous !== latest) unobserve(latest!);\n\n      const proxy = observe(target, onUpdate, argument === true);\n      const current = latest = (proxy as Observed)[Observing]!;\n      const output = callback.call(proxy, proxy, events);\n\n      if (observer(target) === null) {\n        if (release) release(null);\n        if (output instanceof Promise) output.catch(() => {});\n        else if (typeof output == 'function') output(null);\n        return fail('is destroyed.');\n      }\n\n      if (previous && argument === false && !current.watching.size)\n        previous.callback = onUpdate;\n      else {\n        if (previous) unobserve(previous);\n        previous = current;\n      }\n\n      events = [];\n\n      if (!(output instanceof Promise)) {\n        apply(output, release);\n        return conclude(true, undefined);\n      }\n\n      pending = true;\n      reset = invoke;\n      unset = release;\n\n      output.then(\n        (value) => {\n          pending = false;\n\n          if (reset === null) return;\n\n          apply(undefined, release);\n          conclude(true, value);\n\n          if (queued) onUpdate();\n        },\n        (err) => {\n          pending = false;\n\n          if (reset === null) return;\n          if (err instanceof Promise) return suspend(err);\n\n          queued = false;\n          conclude(false, err);\n\n          if (!awaiting) REPORT.as('effect', target, err);\n        }\n      );\n    }\n\n    try {\n      if (argument !== false) capture(run);\n      else run();\n    } catch (err) {\n      if (err instanceof Promise) return suspend(err);\n\n      conclude(false, err);\n\n      if (!awaiting) throw err;\n    }\n  }\n\n  const unlisten = listener(target, (key) => {\n    if (key === true) invoke();\n    else if (key === null) {\n      stop(null);\n      fail('is destroyed.');\n    } else if (!reset) {\n      suspense?.(false);\n      return reset;\n    }\n  });\n\n  function cleanup() {\n    stop(false);\n    unlisten();\n\n    fail('effect was cancelled before it settled.');\n  }\n\n  cleanup.then = ((onFulfilled, onRejected) => {\n    if (!awaiting) {\n      awaiting = new Promise<R>((resolve, reject) => {\n        settle = () => (outcome!.ok ? resolve(outcome!.value as R) : reject(outcome!.value));\n      });\n\n      if (outcome && !pending && !queued && !suspense) finish();\n    }\n\n    return awaiting.then(onFulfilled, onRejected);\n  }) as PromiseLike<R>['then'];\n\n  if (EffectContext && argument !== false) EffectContext.add(cleanup);\n\n  return cleanup;\n}\n\nlet EffectContext: Set<(update?: boolean | null) => void> | undefined;\n\nfunction capture(scope: (release: (update?: boolean | null) => void) => void) {\n  const parent = EffectContext;\n  const context = (EffectContext = new Set());\n\n  try {\n    scope((update) => context.forEach((fn) => fn(update)));\n  } finally {\n    EffectContext = parent;\n  }\n}\n\nexport {\n  listener,\n  event,\n  Observer,\n  touch,\n  queued,\n  observer,\n  watch,\n  capture\n};\n"],"mappings":"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"}