@expressive/dom 0.6.0 → 0.8.0

package/dist/{chunk-hot-a8qgv3tf.js → chunk-hot-vusv_ouU.js}

@@ -1,5 +1,6 @@
 import { Model, pending, unbind } from "@expressive/mvc";
 import { watch } from "@expressive/mvc/observable";
+import { resolver } from "@expressive/mvc/jsx-runtime";
 
 //#region src/render/scheduler.ts
 const urgent = /* @__PURE__ */ new Set();
@@ -135,17 +136,21 @@ function unschedule(scope) {
 //#region src/render/adapter.ts
 let current;
 let collecting;
+let memo;
 function enter(scope, render) {
 	const parent = current;
 	const releases = collecting;
+	const cached = memo;
 	const next = [];
 	current = scope;
 	collecting = next;
+	memo = /* @__PURE__ */ new Map();
 	try {
 		return render();
 	} finally {
 		current = parent;
 		collecting = releases;
+		memo = cached;
 		scope.subscriptions.forEach((release) => release());
 		scope.subscriptions = next;
 	}
@@ -156,12 +161,8 @@ function dispose(scope) {
 	scope.subscriptions.forEach((release) => release());
 	scope.subscriptions = [];
 }
-function requireScope() {
-	if (!current) throw new Error("Model.get() may only run while @expressive/dom is rendering.");
-	return current;
-}
 function tracked(target, required) {
-	const scope = requireScope();
+	const scope = current;
 	let proxy = target;
 	let first = true;
 	const release = watch(target, (next) => {
@@ -172,19 +173,16 @@ function tracked(target, required) {
 	collecting.push(release);
 	return proxy;
 }
-Model.get = function get(argument) {
-	const scope = requireScope();
-	const instance = tracked(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;
-	const refresh = ((action) => {
-		if (typeof action == "function") action = action();
-		schedule(scope);
-		return action instanceof Promise ? action.finally(() => schedule(scope)) : void 0;
-	});
-	return argument.call(proxy, proxy, refresh) ?? null;
-};
+const normal = resolver((Type, compute) => {
+	if (!current) return normal(Type, compute);
+	const found = compute(Type ? cache(current.context) : current.context);
+	return found instanceof Model ? cache(found) : found;
+});
+function cache(target) {
+	let proxy = memo.get(target);
+	if (!proxy) memo.set(target, proxy = tracked(target, false));
+	return proxy;
+}
 const OWNERS = /* @__PURE__ */ new WeakMap();
 Model.on({ method(key, fn, owner) {
 	if (/^[A-Z]/.test(key)) OWNERS.set(fn, {
@@ -248,5 +246,5 @@ function hot(id, components) {
 }
 
 //#endregion
-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-a8qgv3tf.js.map
+export { untrack as a, enter as c, claim as d, release as f, transition as h, track as i, owner as l, settle as m, latest as n, call as o, schedule as p, same as r, dispose as s, hot as t, afterFlush as u };
+//# sourceMappingURL=chunk-hot-vusv_ouU.js.map

package/dist/chunk-hot-vusv_ouU.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk-hot-vusv_ouU.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';\nimport { resolver } from '@expressive/mvc/jsx-runtime';\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;\nlet memo: Map<object, object> | undefined;\n\nfunction enter<T>(scope: Scope, render: () => T): T {\n  const parent = current;\n  const releases = collecting;\n  const cached = memo;\n  const next: (() => void)[] = [];\n\n  current = scope;\n  collecting = next;\n  memo = new Map();\n\n  try {\n    return render();\n  } finally {\n    current = parent;\n    collecting = releases;\n    memo = cached;\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 tracked<T extends object>(target: T, required?: boolean): T {\n  const scope = current!;\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\nconst normal = resolver((Type, compute) => {\n  if (!current) return normal(Type, compute);\n\n  const found = compute(Type ? cache(current.context) : current.context);\n\n  return found instanceof Model ? cache(found) : found;\n});\n\nfunction cache<T extends object>(target: T): T {\n  let proxy = memo!.get(target);\n\n  if (!proxy) memo!.set(target, (proxy = tracked(target, false)));\n\n  return proxy as T;\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 { owner } from './adapter';\nimport { schedule } from './scheduler';\nimport type { Schedulable } from './scheduler';\n\ninterface Family {\n  current: Function;\n  scopes: Set<Schedulable>;\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: Schedulable) {\n  FAMILY.get(type)?.scopes.add(scope);\n}\n\nfunction untrack(type: Function, scope: Schedulable) {\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-CZ-53pyV.d.ts → chunk-loader-CX9ZDjHW.d.ts}

@@ -55,4 +55,4 @@ type Module<T extends ComponentType = ComponentType> = 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-CZ-53pyV.d.ts.map
+//# sourceMappingURL=chunk-loader-CX9ZDjHW.d.ts.map

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

@@ -3,13 +3,29 @@ import { Fragment } from "@expressive/mvc/jsx-runtime";
 //#region src/node/vnode.ts
 const VNODE = Symbol("@expressive/dom.vnode");
 const PORTAL = Symbol("@expressive/dom.portal");
+const authors = /* @__PURE__ */ new WeakMap();
+let author;
 function vnode(type, props, key) {
-	return {
+	const node = {
 		[VNODE]: true,
 		type,
 		props: props || {},
 		key
 	};
+	if (author) authors.set(node, author);
+	return node;
+}
+function authoring(fiber, run) {
+	const previous = author;
+	author = fiber;
+	try {
+		return run();
+	} finally {
+		author = previous;
+	}
+}
+function authorOf(value) {
+	return isVNode(value) ? authors.get(value) : void 0;
 }
 function createElement(type, props, ...children) {
 	const { key, ...rest } = props || {};
@@ -32,5 +48,5 @@ const Fragment$1 = Fragment;
 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-wpCWQ_Zg.js.map
+export { authoring as a, isVNode as c, authorOf as i, vnode as l, PORTAL as n, childrenOf as o, Portal as r, createElement as s, Fragment$1 as t };
+//# sourceMappingURL=chunk-vnode-BN2KOsCV.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"chunk-vnode-BN2KOsCV.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');\nconst authors = new WeakMap<object, object>();\nlet author: object | undefined;\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  const node: VNode<P> = {\n    [VNODE]: true,\n    type,\n    props: (props || {}) as VNode<P>['props'],\n    key: key as Key\n  };\n\n  if (author) authors.set(node, author);\n  return node;\n}\n\nfunction authoring<T>(fiber: object, run: () => T) {\n  const previous = author;\n  author = fiber;\n\n  try {\n    return run();\n  } finally {\n    author = previous;\n  }\n}\n\nfunction authorOf(value: unknown) {\n  return isVNode(value) ? authors.get(value) : undefined;\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  authoring,\n  authorOf,\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;AAC/C,MAAM,0BAAU,IAAI,SAAyB;AAC7C,IAAI;AA8BJ,SAAS,MAAS,MAAwB,OAAU,KAAyB;CAC3E,MAAM,OAAiB;GACpB,QAAQ;EACT;EACA,OAAQ,SAAS,EAAE;EACd;EACN;AAED,KAAI,OAAQ,SAAQ,IAAI,MAAM,OAAO;AACrC,QAAO;;AAGT,SAAS,UAAa,OAAe,KAAc;CACjD,MAAM,WAAW;AACjB,UAAS;AAET,KAAI;AACF,SAAO,KAAK;WACJ;AACR,WAAS;;;AAIb,SAAS,SAAS,OAAgB;AAChC,QAAO,QAAQ,MAAM,GAAG,QAAQ,IAAI,MAAM,GAAG;;AAG/C,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,18 +1,23 @@
-import { a as Portal, i as Node, r as Fragment, s as createElement } from "./chunk-loader-CZ-53pyV.js";
+import { a as Portal, i as Node, r as Fragment, s as createElement } from "./chunk-loader-CX9ZDjHW.js";
 import { JSX } from "./jsx-runtime.js";
-import { Component, Context } from "@expressive/mvc";
+import { Component, Context, Model } from "@expressive/mvc";
 
 //#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}`;
-type Argument<K extends keyof macro.Registry> = macro.Registry[K] extends ((value: infer A, ...rest: any[]) => any) ? A : never;
-declare namespace macro {
+type Key = style.Property | keyof macro$1.Registry | `--${string}` | `_${string}` | style.Condition;
+type Argument<K extends keyof macro$1.Registry> = macro$1.Registry[K] extends ((value: infer A, ...rest: any[]) => any) ? A : never;
+declare namespace macro$1 {
   /**
    * Macros visible to a style map. A pack augments this interface to declare
    * what it registers with `macro()`.
    */
   interface Registry {}
+  /**
+   * Registry entries for the macros in a pack, so one line declares them all:
+   * `interface Registry extends macro.From<typeof pack> {}`.
+   */
+  type From<T> = { [K in keyof T as K extends `_${string}` | `$${string}` | '*' ? never : K]: T[K] };
   /** Maps one argument to style, or to keys which resolve further. */
   type Fn = (value: any, key: string) => unknown;
   /**
@@ -25,42 +30,32 @@ declare namespace macro {
 declare namespace style {
   /** CSS property names, minus the CSSOM's own members. */
   type Property = Exclude<Settable, 'length' | 'parentRule' | 'cssText'>;
+  /**
+   * A state (`:hover`) or environment (`@media …`) key. Its body applies while
+   * the condition holds; the host decides how to honour it.
+   */
+  type Condition = `:${string}` | `@${string}`;
   /** What a declaration or macro argument may be; never a plain object. */
   type Value = string | number | boolean | null | undefined | readonly Value[];
   /**
    * Body of a `style()` map. Bare keys are declarations or macro calls,
-   * `_name` opens a rule or descendant scope, and `$name` is reserved.
+   * `_name` opens a rule or descendant scope, `:state` and `@media …` apply
+   * their body conditionally, and `$name` is reserved.
    */
-  type Map = { [K in Key]?: K extends `_${string}` ? Map : K extends keyof macro.Registry ? Argument<K> : Value };
+  type Map = { [K in Key]?: K extends `_${string}` | Condition ? Map : K extends keyof macro$1.Registry ? Argument<K> | (undefined extends Argument<K> ? true : never) : Value };
 }
-declare function style<T extends object>(type: T, rules: style.Map): T;
-declare function macro(rules: macro.Map): macro.Map;
+declare function style<T extends object>(type: T, ...maps: (style.Map | false | null | undefined)[]): T;
+declare function macro$1(rules: macro$1.Map): macro$1.Map;
 //#endregion
 //#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.
+ * numbers and the `size` shorthand.
  */
 declare const css: {
   '*': (value: unknown, key: string) => {
     [x: string]: unknown;
   };
-  mx: (value: style.Value) => {
-    marginLeft: style.Value;
-    marginRight: style.Value;
-  };
-  my: (value: style.Value) => {
-    marginTop: style.Value;
-    marginBottom: style.Value;
-  };
-  px: (value: style.Value) => {
-    paddingLeft: style.Value;
-    paddingRight: style.Value;
-  };
-  py: (value: style.Value) => {
-    paddingTop: style.Value;
-    paddingBottom: style.Value;
-  };
   size: (value: style.Value) => {
     width: any;
     height: any;
@@ -68,21 +63,34 @@ declare const css: {
 };
 declare module '@expressive/dom' {
   namespace macro {
-    interface Registry {
-      mx(value: style.Value): style.Map;
-      my(value: style.Value): style.Map;
-      px(value: style.Value): style.Map;
-      py(value: style.Value): style.Map;
-      size(value: style.Value): style.Map;
-    }
+    interface Registry extends macro.From<typeof css> {}
   }
 }
 //#endregion
+//#region src/style/units.d.ts
+declare const rem: (...values: number[]) => string;
+declare const em: (...values: number[]) => string;
+declare const px: (...values: number[]) => string;
+//#endregion
+//#region src/style/media.d.ts
+interface Query {
+  minWidth?: number | string;
+  maxWidth?: number | string;
+  minHeight?: number | string;
+  maxHeight?: number | string;
+  orientation?: 'portrait' | 'landscape';
+  hover?: 'hover' | 'none';
+  pointer?: 'fine' | 'coarse' | 'none';
+  prefersColorScheme?: 'light' | 'dark';
+  prefersReducedMotion?: 'reduce' | 'no-preference';
+}
+declare function media(query: Query): `@media ${string}`;
+//#endregion
 //#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 };
+export { Fragment, type JSX, Portal, createElement, css, em, macro$1 as macro, media, px, rem, render, style };
 //# sourceMappingURL=index.d.ts.map