@expressive/dom 0.3.0 → 0.5.0

package/README.md

@@ -6,7 +6,7 @@
 
 ---
 
-`@expressive/dom` renders Expressive MVC without React or Preact. Function components are renderer-stateless: they project props and MVC snapshots into DOM, while `State.get()` and `State.use()` supply dependency tracking and owned state.
+`@expressive/dom` renders Expressive MVC without React or Preact. Function components are renderer-stateless: they project props and MVC snapshots into DOM, while `Model.get()` supplies dependency tracking. Owned state lives on classes - a Component field or `<Component for>`.
 
 ```bash
 npm install @expressive/mvc @expressive/dom
@@ -22,10 +22,10 @@ npm install @expressive/mvc @expressive/dom
 ```
 
 ```tsx
-import { State, Component } from '@expressive/mvc';
+import { Model, Component } from '@expressive/mvc';
 import { render } from '@expressive/dom';
 
-class Counter extends State {
+class Counter extends Model {
   count = 0;
   increment() {
     this.count++;
@@ -33,11 +33,14 @@ class Counter extends State {
 }
 
 function Count() {
-  const { count, increment } = Counter.use();
+  const { count, increment } = Counter.get();
   return <button onClick={increment}>{count}</button>;
 }
 
-const unmount = render(<Count />, document.getElementById('app')!);
+const unmount = render(
+  <Component for={Counter}><Count /></Component>,
+  document.getElementById('app')!
+);
 ```
 
 `style` recursively composes conditional class tokens and inline declarations. Strings become classes; objects merge left-to-right and render inline. Use `className` for a browser-specific class outside the composition. The `class` attribute spelling and CSS declaration strings are not supported.
@@ -68,7 +71,7 @@ Global maps use `macro(map)` and can live in side-effect imports. Register macro
 
 Inline style always beats classes; among classes, a caller's rule beats the callee's, and a rule carried through more component `style` props wins - independent of render order. `false`, `null`, and `undefined` omit an entry; `0` remains a macro argument.
 
-`Component` retains the React adapter's model: fields read by `render()` are dependencies, owned instances mount and clean up with the DOM range, and an externally activated instance can be placed directly without transferring ownership.
+`Component` retains the React adapter's semantics: fields read by `render()` are dependencies, owned instances mount and clean up with the DOM range, and an externally activated instance can be placed directly without transferring ownership.
 
 The first release includes keyed reconciliation, native events, refs, SVG, `<Component for>` providers, direct `has` / `map` collection rendering, portals, lazy components, error and suspense fallbacks, generated component appearance rules, and retention of committed content while `pending()` work suspends. It deliberately excludes standalone hooks, synthetic events, memo wrappers, SSR, hydration, and build-time style extraction.
 

package/dist/chunk-adapter-BzKJ4wEj.d.ts

@@ -0,0 +1,22 @@
+import { Context, Model } from "@expressive/mvc";
+
+//#region src/render/adapter.d.ts
+type NoVoid<T> = T extends undefined | void ? null : T;
+declare module '@expressive/mvc' {
+  namespace Model {
+    type ForceRefresh = {
+      (): void;
+      <T = void>(waitFor: Promise<T>): Promise<T>;
+      <T = void>(invoke: () => Promise<T>): Promise<T>;
+    };
+    type GetFactory<T extends Model, R> = (this: T, current: T, refresh: ForceRefresh) => R;
+    function get<T extends Model>(this: Model.Extends<T>): T;
+    function get<T extends Model>(this: Model.Extends<T>, required: false): T | undefined;
+    function get<T extends Model>(this: Model.Extends<T>, required: true): Required<T>;
+    function get<T extends Model, R>(this: Model.Extends<T>, factory: GetFactory<T, R>): NoVoid<R>;
+  }
+  interface Component {
+    mount?(): (() => void) | void;
+  }
+}
+//# sourceMappingURL=chunk-adapter-BzKJ4wEj.d.ts.map

package/dist/{chunk-hot-BAqPvKEQ.js → chunk-hot-Bj-g5ynf.js}

@@ -1,7 +1,7 @@
-import { Component, State, pending, unbind } from "@expressive/mvc";
+import { Model, pending, unbind } from "@expressive/mvc";
 import { watch } from "@expressive/mvc/observable";
 
-//#region src/scheduler.ts
+//#region src/render/scheduler.ts
 const urgent = /* @__PURE__ */ new Set();
 const passive = /* @__PURE__ */ new Set();
 const after = [];
@@ -132,7 +132,7 @@ function unschedule(scope) {
 }
 
 //#endregion
-//#region src/adapter.ts
+//#region src/render/adapter.ts
 let current;
 let collecting;
 function enter(scope, render) {
@@ -141,17 +141,9 @@ function enter(scope, render) {
 	const next = [];
 	current = scope;
 	collecting = next;
-	scope.childContext = scope.context;
-	scope.useIndex = 0;
 	try {
-		const output = render();
-		if (scope.kind == "function" && scope.useIndex !== scope.uses.length) {
-			if (!scope.hot) throw new Error("State.use() calls must keep the same order on every function-component render.");
-			truncate(scope, scope.useIndex);
-		}
-		return output;
+		return render();
 	} finally {
-		scope.hot = void 0;
 		current = parent;
 		collecting = releases;
 		scope.subscriptions.forEach((release) => release());
@@ -163,27 +155,9 @@ function dispose(scope) {
 	unschedule(scope);
 	scope.subscriptions.forEach((release) => release());
 	scope.subscriptions = [];
-	truncate(scope, 0);
-}
-/** Destroy the `State.use()` slots of a scope from `index` on. */
-function truncate(scope, index) {
-	for (let i = scope.uses.length - 1; i >= index; i--) {
-		const slot = scope.uses[i];
-		slot.release();
-		if (typeof slot.cleanup == "function") slot.cleanup();
-		slot.context.pop();
-		slot.instance.set(null);
-	}
-	scope.uses.length = index;
-}
-function commit(scope) {
-	for (const slot of scope.uses) if (!slot.mounted) {
-		slot.mounted = true;
-		slot.cleanup = slot.instance.mount?.();
-	}
 }
 function requireScope() {
-	if (!current) throw new Error("State.get() and State.use() may only run while @expressive/dom is rendering.");
+	if (!current) throw new Error("Model.get() may only run while @expressive/dom is rendering.");
 	return current;
 }
 function tracked(target, required) {
@@ -198,9 +172,9 @@ function tracked(target, required) {
 	collecting.push(release);
 	return proxy;
 }
-State.get = function get(argument) {
+Model.get = function get(argument) {
 	const scope = requireScope();
-	const instance = scope.childContext.get(this, argument === false ? false : true);
+	const instance = scope.context.get(this, argument === false ? false : true);
 	if (!instance) return void 0;
 	const proxy = tracked(instance, argument === true);
 	if (typeof argument != "function") return proxy;
@@ -211,58 +185,8 @@ State.get = function get(argument) {
 	});
 	return argument.call(proxy, proxy, refresh) ?? null;
 };
-State.use = function use(...args) {
-	const scope = requireScope();
-	if (scope.kind != "function") throw new Error("State.use() is only available at the top level of a function component.");
-	const index = scope.useIndex++;
-	let slot = scope.uses[index];
-	if (slot && slot.Type !== this) {
-		if (!scope.hot) throw new Error("State.use() calls must keep the same order on every function-component render.");
-		truncate(scope, index);
-		slot = void 0;
-	}
-	if (!slot) {
-		let instance;
-		const assign = (value) => typeof value == "object" && value && instance.set(value);
-		let apply = (...values) => Promise.all(values.flat().map(assign));
-		instance = new this((self) => {
-			const own = self;
-			if (typeof own.use == "function") {
-				apply = own.use.bind(own);
-				apply(...args);
-				return;
-			}
-			return args;
-		});
-		const context = scope.childContext.push(instance);
-		slot = {
-			Type: this,
-			context,
-			instance,
-			proxy: instance,
-			release: void 0,
-			apply
-		};
-		let first = true;
-		slot.release = watch(instance, (proxy) => {
-			slot.proxy = proxy;
-			if (!first && scope.active) schedule(scope);
-			first = false;
-		}, void 0, transition);
-		slot.apply = apply;
-		scope.uses.push(slot);
-	} else slot.apply(...args);
-	scope.childContext = slot.context;
-	return slot.proxy;
-};
-Object.defineProperty(Component, "use", {
-	configurable: true,
-	value() {
-		throw new Error(`${this} is a Component - render it instead of calling use().`);
-	}
-});
 const OWNERS = /* @__PURE__ */ new WeakMap();
-State.on({ method(key, fn, owner) {
+Model.on({ method(key, fn, owner) {
 	if (/^[A-Z]/.test(key)) OWNERS.set(fn, {
 		owner,
 		key
@@ -279,7 +203,7 @@ function owner(type) {
 }
 
 //#endregion
-//#region src/hot.ts
+//#region src/render/hot.ts
 const FAMILIES = /* @__PURE__ */ new Map();
 const FAMILY = /* @__PURE__ */ new WeakMap();
 /** The latest implementation of a component registered for hot refresh. */
@@ -319,13 +243,10 @@ function hot(id, components) {
 		FAMILY.set(type, family);
 		if (family.current === type) continue;
 		family.current = type;
-		for (const scope of family.scopes) {
-			scope.hot = true;
-			schedule(scope);
-		}
+		for (const scope of family.scopes) schedule(scope);
 	}
 }
 
 //#endregion
-export { untrack as a, dispose as c, claim as d, release as f, transition as h, track as i, enter as l, settle as m, latest as n, call as o, schedule as p, same as r, commit as s, hot as t, afterFlush as u };
-//# sourceMappingURL=chunk-hot-BAqPvKEQ.js.map
+export { untrack as a, enter as c, release as d, schedule as f, track as i, afterFlush as l, transition as m, latest as n, call as o, settle as p, same as r, dispose as s, hot as t, claim as u };
+//# sourceMappingURL=chunk-hot-Bj-g5ynf.js.map

package/dist/chunk-hot-Bj-g5ynf.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk-hot-Bj-g5ynf.js","names":[],"sources":["../src/render/scheduler.ts","../src/render/adapter.ts","../src/render/hot.ts"],"sourcesContent":["import { pending } from '@expressive/mvc';\n\ninterface Schedulable {\n  queued?: 'urgent' | 'passive' | 'deferred';\n  holds?: (() => void)[];\n  probed?: { output: unknown };\n  blocking?: (() => void)[];\n  update(passive: boolean): PromiseLike<unknown> | void;\n  probe?(): PromiseLike<unknown> | void;\n  empty?(): boolean;\n}\n\nconst urgent = new Set<Schedulable>();\nconst passive = new Set<Schedulable>();\nconst after: (() => void)[] = [];\n\nlet depth = 0;\nlet urgentQueued = false;\nlet passiveQueued = false;\n\nfunction flush(scopes: Set<Schedulable>) {\n  for (const scope of scopes) {\n    scopes.delete(scope);\n    scope.queued = undefined;\n\n    let waiting: PromiseLike<unknown> | void = undefined;\n\n    try {\n      waiting = scope.update(false);\n    } catch (error) {\n      console.error(error);\n    }\n\n    settle(scope);\n    if (!waiting) unblock(scope);\n  }\n}\n\nfunction flushUrgent() {\n  urgentQueued = false;\n  flush(urgent);\n\n  for (const run of after.splice(0)) run();\n}\n\nfunction afterFlush(run: () => void) {\n  after.push(run);\n\n  if (!urgentQueued) {\n    urgentQueued = true;\n    queueMicrotask(flushUrgent);\n  }\n}\n\nfunction flushPassive() {\n  passiveQueued = false;\n\n  const batch = [...passive].filter((scope) => scope.queued === 'passive');\n  passive.clear();\n\n  for (const scope of batch) {\n    const waiting = scope.probe?.();\n    if (waiting) return defer(batch, waiting, scope);\n  }\n\n  batch.sort((a, b) => Number(!!b.empty?.()) - Number(!!a.empty?.()));\n\n  for (let index = 0; index < batch.length; index++) {\n    const scope = batch[index];\n\n    if (scope.queued !== 'passive') continue;\n\n    scope.queued = undefined;\n\n    let waiting: PromiseLike<unknown> | void = undefined;\n\n    try {\n      waiting = scope.update(true);\n    } catch (error) {\n      console.error(error);\n    }\n\n    settle(scope);\n\n    if (waiting) return defer(batch.slice(index + 1), waiting, scope);\n    unblock(scope);\n  }\n}\n\nfunction defer(scopes: Schedulable[], waiting: PromiseLike<unknown>, source: Schedulable) {\n  const held = scopes.filter((scope) => scope.queued === 'passive');\n\n  for (const scope of held) {\n    scope.queued = 'deferred';\n    scope.probed = undefined;\n  }\n\n  const resume = () => {\n    for (const scope of held)\n      if (scope.queued === 'deferred') {\n        scope.queued = undefined;\n        transition(() => schedule(scope));\n      }\n  };\n\n  (source.blocking ||= []).push(resume);\n  waiting.then(resume, resume);\n}\n\nfunction unblock(scope: Schedulable) {\n  const { blocking } = scope;\n\n  scope.blocking = undefined;\n  blocking?.forEach((resume) => resume());\n}\n\nfunction release(holds?: (() => void)[]) {\n  holds?.forEach((held) => held());\n}\n\nfunction settle(scope: Schedulable) {\n  const { holds } = scope;\n\n  scope.holds = undefined;\n  release(holds);\n}\n\nfunction schedule(scope: Schedulable) {\n  const held = pending();\n\n  if (held) (scope.holds ||= []).push(held);\n  scope.probed = undefined;\n\n  if (!depth) {\n    passive.delete(scope);\n    scope.queued = 'urgent';\n    urgent.add(scope);\n\n    if (!urgentQueued) {\n      urgentQueued = true;\n      queueMicrotask(flushUrgent);\n    }\n\n    return;\n  }\n\n  if (scope.queued && scope.queued !== 'deferred') return;\n\n  scope.queued = 'passive';\n  passive.add(scope);\n\n  if (!passiveQueued) {\n    passiveQueued = true;\n    setTimeout(flushPassive);\n  }\n}\n\nfunction transition(work: () => void) {\n  depth++;\n\n  try {\n    work();\n  } finally {\n    depth--;\n  }\n}\n\nfunction claim(scope: Schedulable) {\n  urgent.delete(scope);\n  passive.delete(scope);\n  scope.queued = undefined;\n  scope.probed = undefined;\n}\n\nfunction unschedule(scope: Schedulable) {\n  urgent.delete(scope);\n  passive.delete(scope);\n  scope.queued = undefined;\n  scope.probed = undefined;\n  settle(scope);\n  unblock(scope);\n}\n\nexport { afterFlush, claim, release, schedule, settle, transition, unschedule };\nexport type { Schedulable };\n","import { Context, Model, unbind } from '@expressive/mvc';\nimport { watch } from '@expressive/mvc/observable';\n\nimport { schedule, transition, unschedule } from './scheduler';\nimport type { Schedulable } from './scheduler';\n\ninterface Scope extends Schedulable {\n  active: boolean;\n  context: Context;\n  subscriptions: (() => void)[];\n}\n\nlet current: Scope | undefined;\nlet collecting: (() => void)[] | undefined;\n\nfunction enter<T>(scope: Scope, render: () => T): T {\n  const parent = current;\n  const releases = collecting;\n  const next: (() => void)[] = [];\n\n  current = scope;\n  collecting = next;\n\n  try {\n    return render();\n  } finally {\n    current = parent;\n    collecting = releases;\n    scope.subscriptions.forEach((release) => release());\n    scope.subscriptions = next;\n  }\n}\n\nfunction dispose(scope: Scope) {\n  scope.active = false;\n  unschedule(scope);\n  scope.subscriptions.forEach((release) => release());\n  scope.subscriptions = [];\n}\n\nfunction requireScope(): Scope {\n  if (!current)\n    throw new Error('Model.get() may only run while @expressive/dom is rendering.');\n\n  return current;\n}\n\nfunction tracked<T extends object>(target: T, required?: boolean): T {\n  const scope = requireScope();\n  let proxy = target;\n  let first = true;\n\n  const release = watch(\n    target,\n    (next) => {\n      proxy = next;\n      if (!first && scope.active) schedule(scope);\n      first = false;\n    },\n    required,\n    transition\n  );\n\n  collecting!.push(release);\n  return proxy;\n}\n\ntype NoVoid<T> = T extends undefined | void ? null : T;\n\ndeclare module '@expressive/mvc' {\n  namespace Model {\n    type ForceRefresh = {\n      (): void;\n      <T = void>(waitFor: Promise<T>): Promise<T>;\n      <T = void>(invoke: () => Promise<T>): Promise<T>;\n    };\n\n    type GetFactory<T extends Model, R> = (\n      this: T,\n      current: T,\n      refresh: ForceRefresh\n    ) => R;\n\n    function get<T extends Model>(this: Model.Extends<T>): T;\n    function get<T extends Model>(this: Model.Extends<T>, required: false): T | undefined;\n    function get<T extends Model>(this: Model.Extends<T>, required: true): Required<T>;\n    function get<T extends Model, R>(\n      this: Model.Extends<T>,\n      factory: GetFactory<T, R>\n    ): NoVoid<R>;\n  }\n\n  interface Component {\n    mount?(): (() => void) | void;\n  }\n}\n\n(Model as any).get = function get<T extends Model>(\n  this: Model.Extends<T>,\n  argument?: boolean | Model.GetFactory<T, unknown>\n) {\n  const scope = requireScope();\n  const instance = scope.context.get(this, argument === false ? false : true);\n\n  if (!instance) return undefined;\n\n  const proxy = tracked(instance, argument === true);\n\n  if (typeof argument != 'function') return proxy;\n\n  const refresh = ((action?: Promise<unknown> | (() => Promise<unknown>)) => {\n    if (typeof action == 'function') action = action();\n    schedule(scope);\n    return action instanceof Promise ? action.finally(() => schedule(scope)) : undefined;\n  }) as Model.ForceRefresh;\n\n  return argument.call(proxy, proxy, refresh) ?? null;\n};\n\nconst OWNERS = new WeakMap<Function, { owner: Model; key: string }>();\n\nModel.on({\n  method(key, fn, owner) {\n    if (/^[A-Z]/.test(key)) OWNERS.set(fn, { owner, key });\n  }\n});\n\nfunction call(type: Function, props: unknown) {\n  const sub = OWNERS.get(type);\n\n  if (!sub) return type(props);\n\n  const { owner, key } = sub;\n  return unbind((owner as any)[key]).call(tracked(owner), props);\n}\n\nfunction owner(type: unknown) {\n  return typeof type == 'function' ? OWNERS.get(type) : undefined;\n}\n\nexport { call, dispose, enter, owner };\nexport type { Scope };\n","import type { Scope } from './adapter';\nimport { owner } from './adapter';\nimport { schedule } from './scheduler';\n\ninterface Family {\n  current: Function;\n  scopes: Set<Scope>;\n}\n\nconst FAMILIES = new Map<string, Family>();\nconst FAMILY = new WeakMap<Function, Family>();\n\n/** The latest implementation of a component registered for hot refresh. */\nfunction latest(type: Function) {\n  return FAMILY.get(type)?.current || type;\n}\n\n/** Whether two element types are one component, across hot edits. */\nfunction same(a: unknown, b: unknown) {\n  if (a === b) return true;\n\n  const sub = owner(a);\n\n  if (sub) {\n    const other = owner(b);\n    return !!other && other.owner === sub.owner && other.key === sub.key;\n  }\n\n  const family = typeof a == 'function' && FAMILY.get(a);\n\n  return !!family && family === FAMILY.get(b as Function);\n}\n\nfunction track(type: Function, scope: Scope) {\n  FAMILY.get(type)?.scopes.add(scope);\n}\n\nfunction untrack(type: Function, scope: Scope) {\n  FAMILY.get(type)?.scopes.delete(scope);\n}\n\n/**\n * Register a module's function components under stable ids. A component seen\n * before takes its new implementation and re-renders where it is mounted.\n */\nfunction hot(id: string, components: Record<string, unknown>) {\n  for (const [name, type] of Object.entries(components)) {\n    if (typeof type != 'function') continue;\n\n    const key = `${id}#${name}`;\n    let family = FAMILIES.get(key);\n\n    if (!family) FAMILIES.set(key, (family = { current: type, scopes: new Set() }));\n\n    FAMILY.set(type, family);\n\n    if (family.current === type) continue;\n\n    family.current = type;\n\n    for (const scope of family.scopes) schedule(scope);\n  }\n}\n\nexport { hot, latest, same, track, untrack };\n"],"mappings":"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"}

package/dist/{chunk-loader-kjuM318E.d.ts → chunk-loader-CZ-53pyV.d.ts}

@@ -1,7 +1,7 @@
 import { JSX } from "./jsx-runtime.js";
 import { has, map } from "@expressive/mvc";
 
-//#region src/vnode.d.ts
+//#region src/node/vnode.d.ts
 declare const VNODE: unique symbol;
 type Key = string | number | null | undefined;
 type FunctionComponent<P = any> = (props: P) => Node;
@@ -48,11 +48,11 @@ declare const Portal: (props: {
   children?: Node;
 }) => Node;
 //#endregion
-//#region src/loader.d.ts
+//#region src/node/loader.d.ts
 type Module<T extends ComponentType = ComponentType> = T | {
   default: T;
 };
 type Attributes<T> = [T] extends [never] ? {} : T extends (abstract new (...args: any[]) => infer I) ? JSX.LibraryManagedAttributes<T, I> : T extends ((props: infer P) => any) ? P : never;
 //#endregion
 export { Portal as a, vnode as c, Node as i, Module as n, VNode as o, Fragment as r, createElement as s, Attributes as t };
-//# sourceMappingURL=chunk-loader-kjuM318E.d.ts.map
+//# sourceMappingURL=chunk-loader-CZ-53pyV.d.ts.map

package/dist/{chunk-vnode-BG1Cv8F9.js → chunk-vnode-wpCWQ_Zg.js}

@@ -1,6 +1,6 @@
 import { Fragment } from "@expressive/mvc/jsx-runtime";
 
-//#region src/vnode.ts
+//#region src/node/vnode.ts
 const VNODE = Symbol("@expressive/dom.vnode");
 const PORTAL = Symbol("@expressive/dom.portal");
 function vnode(type, props, key) {
@@ -33,4 +33,4 @@ const Portal = PORTAL;
 
 //#endregion
 export { createElement as a, childrenOf as i, PORTAL as n, isVNode as o, Portal as r, vnode as s, Fragment$1 as t };
-//# sourceMappingURL=chunk-vnode-BG1Cv8F9.js.map
+//# sourceMappingURL=chunk-vnode-wpCWQ_Zg.js.map

package/dist/chunk-vnode-wpCWQ_Zg.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk-vnode-wpCWQ_Zg.js","names":["Fragment","FRAGMENT"],"sources":["../src/node/vnode.ts"],"sourcesContent":["import { Fragment as FRAGMENT } from '@expressive/mvc/jsx-runtime';\nimport type { has, map } from '@expressive/mvc';\nimport type { JSX as Runtime } from '../jsx-runtime';\n\nconst VNODE = Symbol('@expressive/dom.vnode');\nconst PORTAL = Symbol('@expressive/dom.portal');\n\ntype Key = string | number | null | undefined;\ntype FunctionComponent<P = any> = (props: P) => Node;\ninterface ComponentInstance {\n  render(props?: any): Node;\n}\ntype ComponentType<P = any> = FunctionComponent<P> | (abstract new (...args: any[]) => object);\n\ntype Node =\n  | VNode\n  | ComponentInstance\n  | string\n  | number\n  | bigint\n  | boolean\n  | null\n  | undefined\n  | readonly Node[]\n  | has.List<Node>\n  | has.Pool<Node, any, any>\n  | map.Managed<unknown, Node>;\n\ninterface VNode<P = any> {\n  readonly [VNODE]: true;\n  readonly type: string | symbol | ComponentType<P>;\n  readonly props: P & { children?: Node };\n  readonly key?: Key;\n}\n\nfunction vnode<P>(type: VNode<P>['type'], props: P, key?: unknown): VNode<P> {\n  return {\n    [VNODE]: true,\n    type,\n    props: (props || {}) as VNode<P>['props'],\n    key: key as Key\n  };\n}\n\nfunction createElement(type: VNode['type'], props?: Record<string, unknown> | null, ...children: unknown[]): VNode {\n  const { key, ...rest } = props || {};\n\n  if (children.length) rest.children = children.length == 1 ? children[0] : children;\n\n  return vnode(type, rest, key);\n}\n\ntype JsxElement = Runtime.Element;\ntype JsxElementType = Runtime.ElementType;\ntype JsxElementClass = Runtime.ElementClass;\ntype JsxAttributesProperty = Runtime.ElementAttributesProperty;\ntype JsxManaged<C, P> = Runtime.LibraryManagedAttributes<C, P>;\ntype JsxChildrenAttribute = Runtime.ElementChildrenAttribute;\ntype JsxIntrinsicAttributes = Runtime.IntrinsicAttributes;\ntype JsxIntrinsicElements = Runtime.IntrinsicElements;\n\ndeclare namespace createElement {\n  namespace JSX {\n    type Element = JsxElement;\n    type ElementType = JsxElementType;\n    interface ElementClass extends JsxElementClass {}\n    interface ElementAttributesProperty extends JsxAttributesProperty {}\n    type LibraryManagedAttributes<C, P> = JsxManaged<C, P>;\n    interface ElementChildrenAttribute extends JsxChildrenAttribute {}\n    interface IntrinsicAttributes extends JsxIntrinsicAttributes {}\n    type IntrinsicElements = JsxIntrinsicElements;\n  }\n}\n\nfunction isVNode(value: unknown): value is VNode {\n  return !!value && typeof value == 'object' && (value as VNode)[VNODE] === true;\n}\n\nfunction childrenOf(value: unknown): Node[] {\n  const output: Node[] = [];\n\n  function add(child: unknown) {\n    if (Array.isArray(child)) child.forEach(add);\n    else if (child !== null && child !== undefined && typeof child != 'boolean')\n      output.push(child as Node);\n  }\n\n  add(value);\n  return output;\n}\n\nconst Fragment = FRAGMENT as unknown as (props: { children?: Node }) => Node;\nconst Portal = PORTAL as unknown as (props: { into: Element | DocumentFragment | string; children?: Node }) => Node;\n\nexport {\n  VNODE,\n  PORTAL,\n  childrenOf,\n  createElement,\n  Fragment,\n  Portal,\n  isVNode,\n  vnode\n};\n\nexport type { ComponentInstance, ComponentType, FunctionComponent, Key, Node, VNode };\n"],"mappings":";;;AAIA,MAAM,QAAQ,OAAO,wBAAwB;AAC7C,MAAM,SAAS,OAAO,yBAAyB;AA8B/C,SAAS,MAAS,MAAwB,OAAU,KAAyB;AAC3E,QAAO;GACJ,QAAQ;EACT;EACA,OAAQ,SAAS,EAAE;EACd;EACN;;AAGH,SAAS,cAAc,MAAqB,OAAwC,GAAG,UAA4B;CACjH,MAAM,EAAE,KAAK,GAAG,SAAS,SAAS,EAAE;AAEpC,KAAI,SAAS,OAAQ,MAAK,WAAW,SAAS,UAAU,IAAI,SAAS,KAAK;AAE1E,QAAO,MAAM,MAAM,MAAM,IAAI;;AAyB/B,SAAS,QAAQ,OAAgC;AAC/C,QAAO,CAAC,CAAC,SAAS,OAAO,SAAS,YAAa,MAAgB,WAAW;;AAG5E,SAAS,WAAW,OAAwB;CAC1C,MAAM,SAAiB,EAAE;CAEzB,SAAS,IAAI,OAAgB;AAC3B,MAAI,MAAM,QAAQ,MAAM,CAAE,OAAM,QAAQ,IAAI;WACnC,UAAU,QAAQ,UAAU,UAAa,OAAO,SAAS,UAChE,QAAO,KAAK,MAAc;;AAG9B,KAAI,MAAM;AACV,QAAO;;AAGT,MAAMA,aAAWC;AACjB,MAAM,SAAS"}

package/dist/index.d.ts

@@ -1,7 +1,8 @@
-import { a as Portal, i as Node, r as Fragment, s as createElement } from "./chunk-loader-kjuM318E.js";
+import { a as Portal, i as Node, r as Fragment, s as createElement } from "./chunk-loader-CZ-53pyV.js";
 import { JSX } from "./jsx-runtime.js";
+import { Component, Context } from "@expressive/mvc";
 
-//#region src/stylesheet.d.ts
+//#region src/style/stylesheet.d.ts
 type Member = Extract<keyof CSSStyleDeclaration, string>;
 type Settable = { [K in Member]-?: CSSStyleDeclaration[K] extends Function ? never : K }[Member];
 type Key = style.Property | keyof macro.Registry | `--${string}` | `_${string}`;
@@ -35,7 +36,7 @@ declare namespace style {
 declare function style<T extends object>(type: T, rules: style.Map): T;
 declare function macro(rules: macro.Map): macro.Map;
 //#endregion
-//#region src/css.d.ts
+//#region src/style/css.d.ts
 /**
  * Web macro pack. Register with `macro(css)` to opt into pixel units for
  * numbers and the axis shorthands CSS itself does not provide.
@@ -77,8 +78,10 @@ declare module '@expressive/dom' {
   }
 }
 //#endregion
-//#region src/render.d.ts
+//#region src/render/fiber.d.ts
 type Container = Element | DocumentFragment;
+//#endregion
+//#region src/render/render.d.ts
 declare function render(node: Node, container: Container): () => void;
 //#endregion
 export { Fragment, type JSX, Portal, createElement, css, macro, render, style };