sigmx 0.1.0 → 0.2.0

package/dist/plugins/functions/range-map.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/plugins/functions/range-map.ts"],
-  "sourcesContent": ["import { action } from '../../kernel/index.js'\n\n/** Map `v` from [inMin, inMax] onto [outMin, outMax]; optionally clamp and round. */\nexport const fit = action({\n  name: 'fit',\n  call: (_, v: number, inMin: number, inMax: number, outMin: number, outMax: number, clamp = false, round = false) => {\n    let t = (v - inMin) / (inMax - inMin)\n    if (clamp) t = Math.min(1, Math.max(0, t))\n    const out = outMin + t * (outMax - outMin)\n    return round ? Math.round(out) : out\n  },\n})\n"],
-  "mappings": "AAAA,SAAS,cAAc;AAGhB,MAAM,MAAM,OAAO;AAAA,EACxB,MAAM;AAAA,EACN,MAAM,CAAC,GAAG,GAAW,OAAe,OAAe,QAAgB,QAAgB,QAAQ,OAAO,QAAQ,UAAU;AAClH,QAAI,KAAK,IAAI,UAAU,QAAQ;AAC/B,QAAI,MAAO,KAAI,KAAK,IAAI,GAAG,KAAK,IAAI,GAAG,CAAC,CAAC;AACzC,UAAM,MAAM,SAAS,KAAK,SAAS;AACnC,WAAO,QAAQ,KAAK,MAAM,GAAG,IAAI;AAAA,EACnC;AACF,CAAC;",
+  "sourcesContent": ["import { act } from '../def.js';\n\n/** Map `v` from [inMin, inMax] onto [outMin, outMax]; optionally clamp and round. */\nexport const fit = act(\n  'fit',\n  (_, v: number, inMin: number, inMax: number, outMin: number, outMax: number, clamp = false, round = false) => {\n    let t = inMax === inMin ? 0 : (v - inMin) / (inMax - inMin);\n    if (clamp) t = Math.min(1, Math.max(0, t));\n    const out = outMin + t * (outMax - outMin);\n    return round ? Math.round(out) : out;\n  },\n);\n"],
+  "mappings": "AAAA,SAAS,WAAW;AAGb,MAAM,MAAM;AAAA,EACjB;AAAA,EACA,CAAC,GAAG,GAAW,OAAe,OAAe,QAAgB,QAAgB,QAAQ,OAAO,QAAQ,UAAU;AAC5G,QAAI,IAAI,UAAU,QAAQ,KAAK,IAAI,UAAU,QAAQ;AACrD,QAAI,MAAO,KAAI,KAAK,IAAI,GAAG,KAAK,IAAI,GAAG,CAAC,CAAC;AACzC,UAAM,MAAM,SAAS,KAAK,SAAS;AACnC,WAAO,QAAQ,KAAK,MAAM,GAAG,IAAI;AAAA,EACnC;AACF;",
   "names": []
 }

package/dist/plugins/functions/request.d.ts

@@ -9,9 +9,7 @@ export type RequestOptions = {
     /** Explicit body instead of signals. */
     payload?: unknown;
     /** 'replace' (default) aborts an earlier request with the same method and URL; 'none' lets them overlap. */
-    abort?: 'replace' | 'none' | AbortController;
-    /** Keep the connection open while the tab is hidden. Default: true except for GET streams. */
-    openWhenHidden?: boolean;
+    abort?: 'replace' | 'none';
     /** Reconnect after a stream closes normally (long-lived event streams). */
     reconnect?: boolean;
     retry?: {
@@ -22,6 +20,12 @@ export type RequestOptions = {
         onStatusError?: boolean;
     };
 };
+/** What a request resolves with: the last response that was applied (undefined when nothing was sent). */
+export type RequestResult = {
+    url: string;
+    status: number;
+    redirected: boolean;
+} | undefined;
 /** `@get(url, options)`: signals travel in the `sigmx` query parameter. */
 export declare const httpGet: import("../../kernel/contracts.js").ActionPlugin;
 export declare const httpPost: import("../../kernel/contracts.js").ActionPlugin;

package/dist/plugins/functions/request.js

@@ -1,13 +1,21 @@
-import { action, untracked } from "../../kernel/index.js";
+import { untracked } from "../../kernel/index.js";
 import { camel } from "../../lib/casing.js";
 import { parseFields, readEvents } from "../../lib/sse.js";
+import { act } from "../def.js";
 const inflight = /* @__PURE__ */ new Map();
 let seq = 0;
 const sleep = (ms, signal) => new Promise((resolve) => {
+  if (signal.aborted) return resolve();
   const t = setTimeout(resolve, ms);
-  signal.addEventListener("abort", () => (clearTimeout(t), resolve()), { once: true });
+  signal.addEventListener(
+    "abort",
+    () => {
+      clearTimeout(t);
+      resolve();
+    },
+    { once: true }
+  );
 });
-const untilVisible = () => new Promise((resolve) => document.addEventListener("visibilitychange", () => !document.hidden && resolve(), { once: true }));
 const headerArgs = (res, names, data) => {
   for (const n of names) {
     const v = res.headers.get(`sigmx-${n}`);
@@ -15,128 +23,125 @@ const headerArgs = (res, names, data) => {
   }
   return data;
 };
-const runScript = (text) => {
-  const s = document.createElement("script");
-  s.text = text;
-  document.head.append(s);
-  s.remove();
-};
 const send = async (method, ctx, url, o = {}) => {
   const { el, evt, store, runtime, error } = ctx;
   if (!url) throw error(`@${method.toLowerCase()} needs a URL`);
-  const key = `${method} ${url}`;
-  const ac = o.abort instanceof AbortController ? o.abort : new AbortController();
+  const u = new URL(url, location.href);
+  const key = `${method} ${u.href}`;
+  const hasBody = method !== "GET" && method !== "DELETE";
+  const headers = new Headers({ Accept: "text/event-stream, text/html, application/json", "Sigmx-Request": "true" });
+  for (const [k, v] of new Headers(o.headers)) headers.set(k, v);
+  let body;
+  const contentType = (t) => {
+    if (hasBody && !headers.has("Content-Type")) headers.set("Content-Type", t);
+  };
+  if ((o.contentType ?? "json") === "json") {
+    const json = JSON.stringify(o.payload ?? untracked(() => store.snapshot(o.filter ?? { exclude: /(^|\.)_/ })));
+    if (hasBody) {
+      body = json;
+      contentType("application/json");
+    } else u.searchParams.set("sigmx", json);
+  } else {
+    const form = o.selector ? document.querySelector(o.selector) : el.closest("form");
+    if (!form) throw error("no form found", { selector: o.selector });
+    if (!form.noValidate && !form.checkValidity()) {
+      form.reportValidity();
+      return;
+    }
+    const submitter = evt instanceof SubmitEvent ? evt.submitter : el instanceof HTMLButtonElement && el.form === form && el.type === "submit" ? el : null;
+    const fd = new FormData(form, submitter);
+    const params = new URLSearchParams(fd);
+    if (!hasBody) for (const [k, v] of params) u.searchParams.append(k, v);
+    else if (form.enctype === "multipart/form-data") body = fd;
+    else {
+      body = params;
+      contentType("application/x-www-form-urlencoded");
+    }
+  }
+  const ac = new AbortController();
   if (o.abort !== "none") {
     inflight.get(key)?.abort();
     inflight.set(key, ac);
   }
-  ctx.cleanup(() => ac.abort());
+  const forget = ctx.cleanup(() => ac.abort());
   const rid = ++seq;
-  const emit = (type, extra = {}) => runtime.emit("fetch", { el, type, method, url, rid, ...extra });
-  const retry = { attempts: 5, interval: 1e3, factor: 2, max: 3e4, onStatusError: false, ...o.retry };
-  const pauseWhenHidden = !(o.openWhenHidden ?? method !== "GET");
-  const bodyAllowed = method !== "GET" && method !== "DELETE";
-  const build = () => {
-    const u = new URL(url, location.href);
-    const headers = {
-      Accept: "text/event-stream, text/html, application/json",
-      "Sigmx-Request": "true",
-      ...o.headers
-    };
-    let body;
-    if ((o.contentType ?? "json") === "json") {
-      const payload = o.payload ?? untracked(() => store.snapshot(o.filter ?? { exclude: /(^|\.)_/ }));
-      const json = JSON.stringify(payload);
-      if (bodyAllowed) {
-        body = json;
-        headers["Content-Type"] ??= "application/json";
-      } else u.searchParams.set("sigmx", json);
-    } else {
-      const form = o.selector ? document.querySelector(o.selector) : el.closest("form");
-      if (!form) throw error("no form found", { selector: o.selector });
-      if (!form.noValidate && !form.checkValidity()) {
-        form.reportValidity();
-        return;
-      }
-      const submitter = evt instanceof SubmitEvent ? evt.submitter : el instanceof HTMLButtonElement ? el : null;
-      const fd = new FormData(form, submitter);
-      const multipart = form.enctype === "multipart/form-data";
-      if (bodyAllowed) {
-        body = multipart ? fd : new URLSearchParams(fd);
-        if (!multipart) headers["Content-Type"] = "application/x-www-form-urlencoded";
-      } else {
-        for (const [k, v] of new URLSearchParams(fd)) u.searchParams.append(k, v);
-      }
-    }
-    return { url: u.toString(), init: { method, headers, body } };
-  };
-  const route = (event, data) => {
-    const fields = parseFields(data);
-    runtime.emit("server-event", { el, event, data: fields });
-    runtime.handle(event, fields);
-  };
+  const emit = (type, extra) => runtime.emit("fetch", { el, type, method, url, rid, ...extra });
+  const retry = { attempts: 5, interval: 1e3, factor: 2, max: 3e4, ...o.retry };
   let attempt = 0;
   let wait = retry.interval;
   let lastId;
+  let last;
+  let applyError;
+  const apply = (fn) => {
+    try {
+      fn();
+    } catch (e) {
+      applyError = e;
+      throw e;
+    }
+  };
   const backoff = async () => {
     if (attempt++ >= retry.attempts) throw new Error("retries exhausted");
-    emit("retrying", { attempt });
     await sleep(wait, ac.signal);
     wait = Math.min(wait * retry.factor, retry.max);
   };
   emit("started");
   try {
     while (!ac.signal.aborted) {
-      const req = build();
-      if (!req) return;
-      if (lastId) req.init.headers["Last-Event-ID"] = lastId;
-      const hide = new AbortController();
-      const onHide = () => document.hidden && hide.abort();
-      if (pauseWhenHidden) document.addEventListener("visibilitychange", onHide);
+      if (lastId) headers.set("Last-Event-ID", lastId);
       try {
-        const res = await fetch(req.url, { ...req.init, signal: AbortSignal.any([ac.signal, hide.signal]) });
+        const res = await fetch(u.href, { method, headers, body, signal: ac.signal });
+        last = { url: res.url, status: res.status, redirected: res.redirected };
         const ct = res.headers.get("content-type") ?? "";
-        if (res.status >= 400) {
+        if (!res.ok) {
           emit("error", { status: res.status });
-          if (!retry.onStatusError) return;
+          if (!retry.onStatusError) return last;
           await backoff();
           continue;
         }
-        if (res.status === 204 || res.status === 304 || !res.body) return;
+        if (!res.body) return last;
         if (ct.includes("text/event-stream")) {
           attempt = 0;
           wait = retry.interval;
           await readEvents(res.body, (e) => {
             if (e.id !== void 0) lastId = e.id;
             if (e.retry) wait = retry.interval = e.retry;
-            route(e.event, e.data);
+            const data = parseFields(e.data);
+            apply(() => {
+              runtime.emit("server-event", { el, event: e.event, data });
+              runtime.handle(e.event, data);
+            });
           });
-          if (!o.reconnect) return;
+          if (!o.reconnect) return last;
           await backoff();
           continue;
         }
         const text = await res.text();
-        if (ct.includes("text/html")) runtime.handle("patch-elements", headerArgs(res, ["selector", "mode", "use-view-transition"], { elements: text }));
-        else if (ct.includes("application/json")) runtime.handle("patch-signals", headerArgs(res, ["only-if-missing"], { signals: text }));
-        else if (ct.includes("javascript")) runScript(text);
-        return;
-      } catch {
-        if (ac.signal.aborted) return;
-        if (hide.signal.aborted) await untilVisible();
-        else await backoff();
-      } finally {
-        document.removeEventListener("visibilitychange", onHide);
+        apply(() => {
+          if (ct.includes("text/html"))
+            runtime.handle("patch-elements", headerArgs(res, ["selector", "mode"], { elements: text }));
+          else if (ct.includes("application/json"))
+            runtime.handle("patch-signals", headerArgs(res, ["only-if-missing"], { signals: text }));
+        });
+        return last;
+      } catch (e) {
+        if (ac.signal.aborted) return last;
+        if (applyError) throw e;
+        await backoff();
       }
     }
+    return last;
   } catch (e) {
     emit("error", { message: e?.message });
     throw error(`${method} ${url}: ${e?.message ?? e}`);
   } finally {
-    emit("finished");
+    ac.abort();
+    forget();
+    emit("finished", last);
     if (inflight.get(key) === ac) inflight.delete(key);
   }
 };
-const make = (name, method) => action({ name, call: (ctx, url, o) => send(method, ctx, url, o) });
+const make = (name, method) => act(name, (ctx, url, o) => send(method, ctx, url, o));
 const httpGet = make("get", "GET");
 const httpPost = make("post", "POST");
 const httpPut = make("put", "PUT");

package/dist/plugins/functions/request.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/plugins/functions/request.ts"],
-  "sourcesContent": ["import { action, untracked, type ActionCtx, type Filter } from '../../kernel/index.js'\nimport { camel } from '../../lib/casing.js'\nimport { parseFields, readEvents } from '../../lib/sse.js'\n\nexport type RequestOptions = {\n  headers?: Record<string, string>\n  /** 'json' (default) sends filtered signals; 'form' serialises the closest (or `selector`) form. */\n  contentType?: 'json' | 'form'\n  selector?: string\n  /** Which signals to send. Default: everything except paths starting with `_`. */\n  filter?: Filter\n  /** Explicit body instead of signals. */\n  payload?: unknown\n  /** 'replace' (default) aborts an earlier request with the same method and URL; 'none' lets them overlap. */\n  abort?: 'replace' | 'none' | AbortController\n  /** Keep the connection open while the tab is hidden. Default: true except for GET streams. */\n  openWhenHidden?: boolean\n  /** Reconnect after a stream closes normally (long-lived event streams). */\n  reconnect?: boolean\n  retry?: { attempts?: number; interval?: number; factor?: number; max?: number; onStatusError?: boolean }\n}\n\nconst inflight = new Map<string, AbortController>()\nlet seq = 0\nconst sleep = (ms: number, signal: AbortSignal) =>\n  new Promise<void>((resolve) => {\n    const t = setTimeout(resolve, ms)\n    signal.addEventListener('abort', () => (clearTimeout(t), resolve()), { once: true })\n  })\nconst untilVisible = () =>\n  new Promise<void>((resolve) => document.addEventListener('visibilitychange', () => !document.hidden && resolve(), { once: true }))\n\nconst headerArgs = (res: Response, names: string[], data: Record<string, string>) => {\n  for (const n of names) {\n    const v = res.headers.get(`sigmx-${n}`)\n    if (v) data[camel(n)] = v\n  }\n  return data\n}\n\nconst runScript = (text: string) => {\n  const s = document.createElement('script')\n  s.text = text\n  document.head.append(s)\n  s.remove()\n}\n\nconst send = async (method: string, ctx: ActionCtx, url: string, o: RequestOptions = {}): Promise<void> => {\n  const { el, evt, store, runtime, error } = ctx\n  if (!url) throw error(`@${method.toLowerCase()} needs a URL`)\n  const key = `${method} ${url}`\n  const ac = o.abort instanceof AbortController ? o.abort : new AbortController()\n  if (o.abort !== 'none') {\n    inflight.get(key)?.abort()\n    inflight.set(key, ac)\n  }\n  ctx.cleanup(() => ac.abort())\n  const rid = ++seq\n  const emit = (type: string, extra: Record<string, unknown> = {}) => runtime.emit('fetch', { el, type, method, url, rid, ...extra })\n  const retry = { attempts: 5, interval: 1000, factor: 2, max: 30_000, onStatusError: false, ...o.retry }\n  const pauseWhenHidden = !(o.openWhenHidden ?? method !== 'GET')\n  const bodyAllowed = method !== 'GET' && method !== 'DELETE'\n\n  const build = (): { url: string; init: RequestInit } | undefined => {\n    const u = new URL(url, location.href)\n    const headers: Record<string, string> = {\n      Accept: 'text/event-stream, text/html, application/json',\n      'Sigmx-Request': 'true',\n      ...o.headers,\n    }\n    let body: BodyInit | undefined\n    if ((o.contentType ?? 'json') === 'json') {\n      const payload = o.payload ?? untracked(() => store.snapshot(o.filter ?? { exclude: /(^|\\.)_/ }))\n      const json = JSON.stringify(payload)\n      if (bodyAllowed) {\n        body = json\n        headers['Content-Type'] ??= 'application/json'\n      } else u.searchParams.set('sigmx', json)\n    } else {\n      const form = (o.selector ? document.querySelector(o.selector) : el.closest('form')) as HTMLFormElement | null\n      if (!form) throw error('no form found', { selector: o.selector })\n      if (!form.noValidate && !form.checkValidity()) {\n        form.reportValidity()\n        return\n      }\n      const submitter = evt instanceof SubmitEvent ? evt.submitter : el instanceof HTMLButtonElement ? el : null\n      const fd = new FormData(form, submitter)\n      const multipart = form.enctype === 'multipart/form-data'\n      if (bodyAllowed) {\n        body = multipart ? fd : new URLSearchParams(fd as unknown as Record<string, string>)\n        if (!multipart) headers['Content-Type'] = 'application/x-www-form-urlencoded'\n      } else {\n        for (const [k, v] of new URLSearchParams(fd as unknown as Record<string, string>)) u.searchParams.append(k, v)\n      }\n    }\n    return { url: u.toString(), init: { method, headers, body } }\n  }\n\n  const route = (event: string, data: string) => {\n    const fields = parseFields(data)\n    runtime.emit('server-event', { el, event, data: fields })\n    runtime.handle(event, fields)\n  }\n\n  let attempt = 0\n  let wait = retry.interval\n  let lastId: string | undefined\n  const backoff = async () => {\n    if (attempt++ >= retry.attempts) throw new Error('retries exhausted')\n    emit('retrying', { attempt })\n    await sleep(wait, ac.signal)\n    wait = Math.min(wait * retry.factor, retry.max)\n  }\n\n  emit('started')\n  try {\n    while (!ac.signal.aborted) {\n      const req = build()\n      if (!req) return\n      if (lastId) (req.init.headers as Record<string, string>)['Last-Event-ID'] = lastId\n      const hide = new AbortController()\n      const onHide = () => document.hidden && hide.abort()\n      if (pauseWhenHidden) document.addEventListener('visibilitychange', onHide)\n      try {\n        const res = await fetch(req.url, { ...req.init, signal: AbortSignal.any([ac.signal, hide.signal]) })\n        const ct = res.headers.get('content-type') ?? ''\n        if (res.status >= 400) {\n          emit('error', { status: res.status })\n          if (!retry.onStatusError) return\n          await backoff()\n          continue\n        }\n        if (res.status === 204 || res.status === 304 || !res.body) return\n        if (ct.includes('text/event-stream')) {\n          attempt = 0\n          wait = retry.interval\n          await readEvents(res.body, (e) => {\n            if (e.id !== undefined) lastId = e.id\n            if (e.retry) wait = retry.interval = e.retry\n            route(e.event, e.data)\n          })\n          if (!o.reconnect) return\n          await backoff()\n          continue\n        }\n        const text = await res.text()\n        if (ct.includes('text/html')) runtime.handle('patch-elements', headerArgs(res, ['selector', 'mode', 'use-view-transition'], { elements: text }))\n        else if (ct.includes('application/json')) runtime.handle('patch-signals', headerArgs(res, ['only-if-missing'], { signals: text }))\n        else if (ct.includes('javascript')) runScript(text)\n        return\n      } catch {\n        if (ac.signal.aborted) return\n        if (hide.signal.aborted) await untilVisible()\n        else await backoff()\n      } finally {\n        document.removeEventListener('visibilitychange', onHide)\n      }\n    }\n  } catch (e: any) {\n    emit('error', { message: e?.message })\n    throw error(`${method} ${url}: ${e?.message ?? e}`)\n  } finally {\n    emit('finished')\n    if (inflight.get(key) === ac) inflight.delete(key)\n  }\n}\n\nconst make = (name: string, method: string) => action({ name, call: (ctx, url: string, o?: RequestOptions) => send(method, ctx, url, o) })\n\n/** `@get(url, options)`: signals travel in the `sigmx` query parameter. */\nexport const httpGet = make('get', 'GET')\nexport const httpPost = make('post', 'POST')\nexport const httpPut = make('put', 'PUT')\nexport const httpPatch = make('patch', 'PATCH')\nexport const httpDelete = make('delete', 'DELETE')\n"],
-  "mappings": "AAAA,SAAS,QAAQ,iBAA8C;AAC/D,SAAS,aAAa;AACtB,SAAS,aAAa,kBAAkB;AAoBxC,MAAM,WAAW,oBAAI,IAA6B;AAClD,IAAI,MAAM;AACV,MAAM,QAAQ,CAAC,IAAY,WACzB,IAAI,QAAc,CAAC,YAAY;AAC7B,QAAM,IAAI,WAAW,SAAS,EAAE;AAChC,SAAO,iBAAiB,SAAS,OAAO,aAAa,CAAC,GAAG,QAAQ,IAAI,EAAE,MAAM,KAAK,CAAC;AACrF,CAAC;AACH,MAAM,eAAe,MACnB,IAAI,QAAc,CAAC,YAAY,SAAS,iBAAiB,oBAAoB,MAAM,CAAC,SAAS,UAAU,QAAQ,GAAG,EAAE,MAAM,KAAK,CAAC,CAAC;AAEnI,MAAM,aAAa,CAAC,KAAe,OAAiB,SAAiC;AACnF,aAAW,KAAK,OAAO;AACrB,UAAM,IAAI,IAAI,QAAQ,IAAI,SAAS,CAAC,EAAE;AACtC,QAAI,EAAG,MAAK,MAAM,CAAC,CAAC,IAAI;AAAA,EAC1B;AACA,SAAO;AACT;AAEA,MAAM,YAAY,CAAC,SAAiB;AAClC,QAAM,IAAI,SAAS,cAAc,QAAQ;AACzC,IAAE,OAAO;AACT,WAAS,KAAK,OAAO,CAAC;AACtB,IAAE,OAAO;AACX;AAEA,MAAM,OAAO,OAAO,QAAgB,KAAgB,KAAa,IAAoB,CAAC,MAAqB;AACzG,QAAM,EAAE,IAAI,KAAK,OAAO,SAAS,MAAM,IAAI;AAC3C,MAAI,CAAC,IAAK,OAAM,MAAM,IAAI,OAAO,YAAY,CAAC,cAAc;AAC5D,QAAM,MAAM,GAAG,MAAM,IAAI,GAAG;AAC5B,QAAM,KAAK,EAAE,iBAAiB,kBAAkB,EAAE,QAAQ,IAAI,gBAAgB;AAC9E,MAAI,EAAE,UAAU,QAAQ;AACtB,aAAS,IAAI,GAAG,GAAG,MAAM;AACzB,aAAS,IAAI,KAAK,EAAE;AAAA,EACtB;AACA,MAAI,QAAQ,MAAM,GAAG,MAAM,CAAC;AAC5B,QAAM,MAAM,EAAE;AACd,QAAM,OAAO,CAAC,MAAc,QAAiC,CAAC,MAAM,QAAQ,KAAK,SAAS,EAAE,IAAI,MAAM,QAAQ,KAAK,KAAK,GAAG,MAAM,CAAC;AAClI,QAAM,QAAQ,EAAE,UAAU,GAAG,UAAU,KAAM,QAAQ,GAAG,KAAK,KAAQ,eAAe,OAAO,GAAG,EAAE,MAAM;AACtG,QAAM,kBAAkB,EAAE,EAAE,kBAAkB,WAAW;AACzD,QAAM,cAAc,WAAW,SAAS,WAAW;AAEnD,QAAM,QAAQ,MAAsD;AAClE,UAAM,IAAI,IAAI,IAAI,KAAK,SAAS,IAAI;AACpC,UAAM,UAAkC;AAAA,MACtC,QAAQ;AAAA,MACR,iBAAiB;AAAA,MACjB,GAAG,EAAE;AAAA,IACP;AACA,QAAI;AACJ,SAAK,EAAE,eAAe,YAAY,QAAQ;AACxC,YAAM,UAAU,EAAE,WAAW,UAAU,MAAM,MAAM,SAAS,EAAE,UAAU,EAAE,SAAS,UAAU,CAAC,CAAC;AAC/F,YAAM,OAAO,KAAK,UAAU,OAAO;AACnC,UAAI,aAAa;AACf,eAAO;AACP,gBAAQ,cAAc,MAAM;AAAA,MAC9B,MAAO,GAAE,aAAa,IAAI,SAAS,IAAI;AAAA,IACzC,OAAO;AACL,YAAM,OAAQ,EAAE,WAAW,SAAS,cAAc,EAAE,QAAQ,IAAI,GAAG,QAAQ,MAAM;AACjF,UAAI,CAAC,KAAM,OAAM,MAAM,iBAAiB,EAAE,UAAU,EAAE,SAAS,CAAC;AAChE,UAAI,CAAC,KAAK,cAAc,CAAC,KAAK,cAAc,GAAG;AAC7C,aAAK,eAAe;AACpB;AAAA,MACF;AACA,YAAM,YAAY,eAAe,cAAc,IAAI,YAAY,cAAc,oBAAoB,KAAK;AACtG,YAAM,KAAK,IAAI,SAAS,MAAM,SAAS;AACvC,YAAM,YAAY,KAAK,YAAY;AACnC,UAAI,aAAa;AACf,eAAO,YAAY,KAAK,IAAI,gBAAgB,EAAuC;AACnF,YAAI,CAAC,UAAW,SAAQ,cAAc,IAAI;AAAA,MAC5C,OAAO;AACL,mBAAW,CAAC,GAAG,CAAC,KAAK,IAAI,gBAAgB,EAAuC,EAAG,GAAE,aAAa,OAAO,GAAG,CAAC;AAAA,MAC/G;AAAA,IACF;AACA,WAAO,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE,QAAQ,SAAS,KAAK,EAAE;AAAA,EAC9D;AAEA,QAAM,QAAQ,CAAC,OAAe,SAAiB;AAC7C,UAAM,SAAS,YAAY,IAAI;AAC/B,YAAQ,KAAK,gBAAgB,EAAE,IAAI,OAAO,MAAM,OAAO,CAAC;AACxD,YAAQ,OAAO,OAAO,MAAM;AAAA,EAC9B;AAEA,MAAI,UAAU;AACd,MAAI,OAAO,MAAM;AACjB,MAAI;AACJ,QAAM,UAAU,YAAY;AAC1B,QAAI,aAAa,MAAM,SAAU,OAAM,IAAI,MAAM,mBAAmB;AACpE,SAAK,YAAY,EAAE,QAAQ,CAAC;AAC5B,UAAM,MAAM,MAAM,GAAG,MAAM;AAC3B,WAAO,KAAK,IAAI,OAAO,MAAM,QAAQ,MAAM,GAAG;AAAA,EAChD;AAEA,OAAK,SAAS;AACd,MAAI;AACF,WAAO,CAAC,GAAG,OAAO,SAAS;AACzB,YAAM,MAAM,MAAM;AAClB,UAAI,CAAC,IAAK;AACV,UAAI,OAAQ,CAAC,IAAI,KAAK,QAAmC,eAAe,IAAI;AAC5E,YAAM,OAAO,IAAI,gBAAgB;AACjC,YAAM,SAAS,MAAM,SAAS,UAAU,KAAK,MAAM;AACnD,UAAI,gBAAiB,UAAS,iBAAiB,oBAAoB,MAAM;AACzE,UAAI;AACF,cAAM,MAAM,MAAM,MAAM,IAAI,KAAK,EAAE,GAAG,IAAI,MAAM,QAAQ,YAAY,IAAI,CAAC,GAAG,QAAQ,KAAK,MAAM,CAAC,EAAE,CAAC;AACnG,cAAM,KAAK,IAAI,QAAQ,IAAI,cAAc,KAAK;AAC9C,YAAI,IAAI,UAAU,KAAK;AACrB,eAAK,SAAS,EAAE,QAAQ,IAAI,OAAO,CAAC;AACpC,cAAI,CAAC,MAAM,cAAe;AAC1B,gBAAM,QAAQ;AACd;AAAA,QACF;AACA,YAAI,IAAI,WAAW,OAAO,IAAI,WAAW,OAAO,CAAC,IAAI,KAAM;AAC3D,YAAI,GAAG,SAAS,mBAAmB,GAAG;AACpC,oBAAU;AACV,iBAAO,MAAM;AACb,gBAAM,WAAW,IAAI,MAAM,CAAC,MAAM;AAChC,gBAAI,EAAE,OAAO,OAAW,UAAS,EAAE;AACnC,gBAAI,EAAE,MAAO,QAAO,MAAM,WAAW,EAAE;AACvC,kBAAM,EAAE,OAAO,EAAE,IAAI;AAAA,UACvB,CAAC;AACD,cAAI,CAAC,EAAE,UAAW;AAClB,gBAAM,QAAQ;AACd;AAAA,QACF;AACA,cAAM,OAAO,MAAM,IAAI,KAAK;AAC5B,YAAI,GAAG,SAAS,WAAW,EAAG,SAAQ,OAAO,kBAAkB,WAAW,KAAK,CAAC,YAAY,QAAQ,qBAAqB,GAAG,EAAE,UAAU,KAAK,CAAC,CAAC;AAAA,iBACtI,GAAG,SAAS,kBAAkB,EAAG,SAAQ,OAAO,iBAAiB,WAAW,KAAK,CAAC,iBAAiB,GAAG,EAAE,SAAS,KAAK,CAAC,CAAC;AAAA,iBACxH,GAAG,SAAS,YAAY,EAAG,WAAU,IAAI;AAClD;AAAA,MACF,QAAQ;AACN,YAAI,GAAG,OAAO,QAAS;AACvB,YAAI,KAAK,OAAO,QAAS,OAAM,aAAa;AAAA,YACvC,OAAM,QAAQ;AAAA,MACrB,UAAE;AACA,iBAAS,oBAAoB,oBAAoB,MAAM;AAAA,MACzD;AAAA,IACF;AAAA,EACF,SAAS,GAAQ;AACf,SAAK,SAAS,EAAE,SAAS,GAAG,QAAQ,CAAC;AACrC,UAAM,MAAM,GAAG,MAAM,IAAI,GAAG,KAAK,GAAG,WAAW,CAAC,EAAE;AAAA,EACpD,UAAE;AACA,SAAK,UAAU;AACf,QAAI,SAAS,IAAI,GAAG,MAAM,GAAI,UAAS,OAAO,GAAG;AAAA,EACnD;AACF;AAEA,MAAM,OAAO,CAAC,MAAc,WAAmB,OAAO,EAAE,MAAM,MAAM,CAAC,KAAK,KAAa,MAAuB,KAAK,QAAQ,KAAK,KAAK,CAAC,EAAE,CAAC;AAGlI,MAAM,UAAU,KAAK,OAAO,KAAK;AACjC,MAAM,WAAW,KAAK,QAAQ,MAAM;AACpC,MAAM,UAAU,KAAK,OAAO,KAAK;AACjC,MAAM,YAAY,KAAK,SAAS,OAAO;AACvC,MAAM,aAAa,KAAK,UAAU,QAAQ;",
+  "sourcesContent": ["import { type ActionCtx, type Filter, untracked } from '../../kernel/index.js';\nimport { camel } from '../../lib/casing.js';\nimport { parseFields, readEvents } from '../../lib/sse.js';\nimport { act } from '../def.js';\n\nexport type RequestOptions = {\n  headers?: Record<string, string>;\n  /** 'json' (default) sends filtered signals; 'form' serialises the closest (or `selector`) form. */\n  contentType?: 'json' | 'form';\n  selector?: string;\n  /** Which signals to send. Default: everything except paths starting with `_`. */\n  filter?: Filter;\n  /** Explicit body instead of signals. */\n  payload?: unknown;\n  /** 'replace' (default) aborts an earlier request with the same method and URL; 'none' lets them overlap. */\n  abort?: 'replace' | 'none';\n  /** Reconnect after a stream closes normally (long-lived event streams). */\n  reconnect?: boolean;\n  retry?: { attempts?: number; interval?: number; factor?: number; max?: number; onStatusError?: boolean };\n};\n\n/** What a request resolves with: the last response that was applied (undefined when nothing was sent). */\nexport type RequestResult = { url: string; status: number; redirected: boolean } | undefined;\n\nconst inflight = new Map<string, AbortController>();\nlet seq = 0;\nconst sleep = (ms: number, signal: AbortSignal) =>\n  new Promise<void>((resolve) => {\n    if (signal.aborted) return resolve();\n    const t = setTimeout(resolve, ms);\n    signal.addEventListener(\n      'abort',\n      () => {\n        clearTimeout(t);\n        resolve();\n      },\n      { once: true },\n    );\n  });\n\n/** Response headers `sigmx-<name>` become camel-cased fields of `data`. */\nconst headerArgs = (res: Response, names: string[], data: Record<string, string>) => {\n  for (const n of names) {\n    const v = res.headers.get(`sigmx-${n}`);\n    if (v) data[camel(n)] = v;\n  }\n  return data;\n};\n\nconst send = async (method: string, ctx: ActionCtx, url: string, o: RequestOptions = {}): Promise<RequestResult> => {\n  const { el, evt, store, runtime, error } = ctx;\n  if (!url) throw error(`@${method.toLowerCase()} needs a URL`);\n  const u = new URL(url, location.href);\n  const key = `${method} ${u.href}`; // resolved, before any signals are appended\n  const hasBody = method !== 'GET' && method !== 'DELETE';\n  const headers = new Headers({ Accept: 'text/event-stream, text/html, application/json', 'Sigmx-Request': 'true' });\n  for (const [k, v] of new Headers(o.headers)) headers.set(k, v);\n  let body: BodyInit | undefined;\n  const contentType = (t: string) => {\n    if (hasBody && !headers.has('Content-Type')) headers.set('Content-Type', t);\n  };\n  if ((o.contentType ?? 'json') === 'json') {\n    const json = JSON.stringify(o.payload ?? untracked(() => store.snapshot(o.filter ?? { exclude: /(^|\\.)_/ })));\n    if (hasBody) {\n      body = json;\n      contentType('application/json');\n    } else u.searchParams.set('sigmx', json);\n  } else {\n    const form = (o.selector ? document.querySelector(o.selector) : el.closest('form')) as HTMLFormElement | null;\n    if (!form) throw error('no form found', { selector: o.selector });\n    if (!form.noValidate && !form.checkValidity()) {\n      form.reportValidity();\n      return;\n    }\n    // Only a real submit button may be the submitter; FormData throws for anything else.\n    const submitter =\n      evt instanceof SubmitEvent\n        ? evt.submitter\n        : el instanceof HTMLButtonElement && el.form === form && el.type === 'submit'\n          ? el\n          : null;\n    const fd = new FormData(form, submitter);\n    const params = new URLSearchParams(fd as unknown as Record<string, string>);\n    if (!hasBody) for (const [k, v] of params) u.searchParams.append(k, v);\n    else if (form.enctype === 'multipart/form-data') body = fd;\n    else {\n      body = params;\n      contentType('application/x-www-form-urlencoded');\n    }\n  }\n\n  const ac = new AbortController();\n  if (o.abort !== 'none') {\n    inflight.get(key)?.abort();\n    inflight.set(key, ac);\n  }\n  const forget = ctx.cleanup(() => ac.abort());\n  const rid = ++seq;\n  const emit = (type: string, extra?: object) => runtime.emit('fetch', { el, type, method, url, rid, ...extra });\n  const retry = { attempts: 5, interval: 1000, factor: 2, max: 30_000, ...o.retry };\n  let attempt = 0;\n  let wait = retry.interval;\n  let lastId: string | undefined;\n  let last: RequestResult;\n  // Exceptions thrown while applying a response are the page's problem, not the network's: no retry.\n  let applyError: unknown;\n  const apply = (fn: () => void) => {\n    try {\n      fn();\n    } catch (e) {\n      applyError = e;\n      throw e;\n    }\n  };\n  const backoff = async () => {\n    if (attempt++ >= retry.attempts) throw new Error('retries exhausted');\n    await sleep(wait, ac.signal);\n    wait = Math.min(wait * retry.factor, retry.max);\n  };\n\n  emit('started');\n  try {\n    while (!ac.signal.aborted) {\n      if (lastId) headers.set('Last-Event-ID', lastId);\n      try {\n        const res = await fetch(u.href, { method, headers, body, signal: ac.signal });\n        last = { url: res.url, status: res.status, redirected: res.redirected };\n        const ct = res.headers.get('content-type') ?? '';\n        if (!res.ok) {\n          emit('error', { status: res.status });\n          if (!retry.onStatusError) return last;\n          await backoff();\n          continue;\n        }\n        if (!res.body) return last;\n        if (ct.includes('text/event-stream')) {\n          attempt = 0;\n          wait = retry.interval;\n          await readEvents(res.body, (e) => {\n            if (e.id !== undefined) lastId = e.id;\n            if (e.retry) wait = retry.interval = e.retry;\n            const data = parseFields(e.data);\n            apply(() => {\n              runtime.emit('server-event', { el, event: e.event, data });\n              runtime.handle(e.event, data);\n            });\n          });\n          if (!o.reconnect) return last;\n          await backoff();\n          continue;\n        }\n        const text = await res.text();\n        apply(() => {\n          if (ct.includes('text/html'))\n            runtime.handle('patch-elements', headerArgs(res, ['selector', 'mode'], { elements: text }));\n          else if (ct.includes('application/json'))\n            runtime.handle('patch-signals', headerArgs(res, ['only-if-missing'], { signals: text }));\n        });\n        return last;\n      } catch (e) {\n        if (ac.signal.aborted) return last;\n        if (applyError) throw e;\n        await backoff();\n      }\n    }\n    return last;\n  } catch (e: any) {\n    emit('error', { message: e?.message });\n    throw error(`${method} ${url}: ${e?.message ?? e}`);\n  } finally {\n    ac.abort(); // releases a still-open body and any pending backoff\n    forget();\n    emit('finished', last);\n    if (inflight.get(key) === ac) inflight.delete(key);\n  }\n};\n\nconst make = (name: string, method: string) =>\n  act(name, (ctx, url: string, o?: RequestOptions) => send(method, ctx, url, o));\n\n/** `@get(url, options)`: signals travel in the `sigmx` query parameter. */\nexport const httpGet = make('get', 'GET');\nexport const httpPost = make('post', 'POST');\nexport const httpPut = make('put', 'PUT');\nexport const httpPatch = make('patch', 'PATCH');\nexport const httpDelete = make('delete', 'DELETE');\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/plugins/functions/untracked-read.js

@@ -1,5 +1,6 @@
-import { action, untracked } from "../../kernel/index.js";
-const peek = action({ name: "peek", call: (_, fn) => untracked(fn) });
+import { untracked } from "../../kernel/index.js";
+import { act } from "../def.js";
+const peek = act("peek", (_, fn) => typeof fn === "function" ? untracked(fn) : fn);
 export {
   peek
 };

package/dist/plugins/functions/untracked-read.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/plugins/functions/untracked-read.ts"],
-  "sourcesContent": ["import { action, untracked } from '../../kernel/index.js'\n\n/** `@peek(() => $x)` reads signals without subscribing the surrounding effect. */\nexport const peek = action({ name: 'peek', call: (_, fn: () => unknown) => untracked(fn) })\n"],
-  "mappings": "AAAA,SAAS,QAAQ,iBAAiB;AAG3B,MAAM,OAAO,OAAO,EAAE,MAAM,QAAQ,MAAM,CAAC,GAAG,OAAsB,UAAU,EAAE,EAAE,CAAC;",
+  "sourcesContent": ["import { untracked } from '../../kernel/index.js';\nimport { act } from '../def.js';\n\n/** `@peek(() => $x)` reads signals without subscribing the surrounding effect. */\nexport const peek = act('peek', (_, fn: unknown) => (typeof fn === 'function' ? untracked(fn as () => unknown) : fn));\n"],
+  "mappings": "AAAA,SAAS,iBAAiB;AAC1B,SAAS,WAAW;AAGb,MAAM,OAAO,IAAI,QAAQ,CAAC,GAAG,OAAiB,OAAO,OAAO,aAAa,UAAU,EAAmB,IAAI,EAAG;",
   "names": []
 }

package/dist/plugins/functions/websocket.d.ts

@@ -4,8 +4,8 @@ export type Socket = {
     readonly socket: WebSocket;
 };
 /**
- * `@ws('/live')` opens a WebSocket and routes incoming messages like a server event stream: text
- * blocks of `event: name` and `data: key value` lines, separated by blank lines. Returns
- * `{ send, close, socket }`; `send` JSON-encodes objects. The socket closes when the element unmounts.
+ * `@ws(url, { protocols })` opens a WebSocket whose messages use the server-event wire format
+ * (`event <name>` and `data <key> <value>` lines, blank-line separated) and routes them to the
+ * same handlers as fetched streams. Returns `{ send, close, socket }`; closed when the element unmounts.
  */
 export declare const websocket: import("../../kernel/contracts.js").ActionPlugin;

package/dist/plugins/functions/websocket.js

@@ -1,34 +1,27 @@
-import { action } from "../../kernel/index.js";
-const websocket = action({
-  name: "ws",
-  call({ el, runtime, cleanup }, url, o = {}) {
+import { parseBlock, parseFields } from "../../lib/sse.js";
+import { act } from "../def.js";
+const websocket = act(
+  "ws",
+  ({ el, runtime, cleanup }, url, o = {}) => {
     const socket = new WebSocket(new URL(url, location.href.replace(/^http/, "ws")), o.protocols);
     socket.onmessage = (m) => {
-      for (const block of String(m.data).split(/\n\n+/)) {
-        let event = "message";
-        const data = {};
-        for (const line of block.split("\n")) {
-          const i = line.indexOf(":");
-          if (i < 0) continue;
-          const field = line.slice(0, i);
-          const v = line.slice(i + 1).trimStart();
-          if (field === "event") event = v;
-          else if (field === "data") {
-            const j = v.indexOf(" ");
-            const k = j < 0 ? v : v.slice(0, j);
-            const val = j < 0 ? "" : v.slice(j + 1);
-            data[k] = k in data ? `${data[k]}
-${val}` : val;
-          }
-        }
-        runtime.emit("server-event", { el, event, data });
-        runtime.handle(event, data);
+      if (typeof m.data !== "string") return;
+      for (const block of m.data.split(/(?:\r?\n){2,}/)) {
+        const e = parseBlock(block);
+        if (!e) continue;
+        const data = parseFields(e.data);
+        runtime.emit("server-event", { el, event: e.event, data });
+        runtime.handle(e.event, data);
       }
     };
     cleanup(() => socket.close());
-    return { send: (d) => socket.send(typeof d === "string" ? d : JSON.stringify(d)), close: () => socket.close(), socket };
+    return {
+      send: (d) => socket.send(typeof d === "string" ? d : JSON.stringify(d)),
+      close: () => socket.close(),
+      socket
+    };
   }
-});
+);
 export {
   websocket
 };

package/dist/plugins/functions/websocket.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/plugins/functions/websocket.ts"],
-  "sourcesContent": ["import { action } from '../../kernel/index.js'\n\nexport type Socket = { send(data: unknown): void; close(): void; readonly socket: WebSocket }\n\n/**\n * `@ws('/live')` opens a WebSocket and routes incoming messages like a server event stream: text\n * blocks of `event: name` and `data: key value` lines, separated by blank lines. Returns\n * `{ send, close, socket }`; `send` JSON-encodes objects. The socket closes when the element unmounts.\n */\nexport const websocket = action({\n  name: 'ws',\n  call({ el, runtime, cleanup }, url: string, o: { protocols?: string | string[] } = {}): Socket {\n    const socket = new WebSocket(new URL(url, location.href.replace(/^http/, 'ws')), o.protocols)\n    socket.onmessage = (m) => {\n      for (const block of String(m.data).split(/\\n\\n+/)) {\n        let event = 'message'\n        const data: Record<string, string> = {}\n        for (const line of block.split('\\n')) {\n          const i = line.indexOf(':')\n          if (i < 0) continue\n          const field = line.slice(0, i)\n          const v = line.slice(i + 1).trimStart()\n          if (field === 'event') event = v\n          else if (field === 'data') {\n            const j = v.indexOf(' ')\n            const k = j < 0 ? v : v.slice(0, j)\n            const val = j < 0 ? '' : v.slice(j + 1)\n            data[k] = k in data ? `${data[k]}\\n${val}` : val\n          }\n        }\n        runtime.emit('server-event', { el, event, data })\n        runtime.handle(event, data)\n      }\n    }\n    cleanup(() => socket.close())\n    return { send: (d) => socket.send(typeof d === 'string' ? d : JSON.stringify(d)), close: () => socket.close(), socket }\n  },\n})\n"],
-  "mappings": "AAAA,SAAS,cAAc;AAShB,MAAM,YAAY,OAAO;AAAA,EAC9B,MAAM;AAAA,EACN,KAAK,EAAE,IAAI,SAAS,QAAQ,GAAG,KAAa,IAAuC,CAAC,GAAW;AAC7F,UAAM,SAAS,IAAI,UAAU,IAAI,IAAI,KAAK,SAAS,KAAK,QAAQ,SAAS,IAAI,CAAC,GAAG,EAAE,SAAS;AAC5F,WAAO,YAAY,CAAC,MAAM;AACxB,iBAAW,SAAS,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,GAAG;AACjD,YAAI,QAAQ;AACZ,cAAM,OAA+B,CAAC;AACtC,mBAAW,QAAQ,MAAM,MAAM,IAAI,GAAG;AACpC,gBAAM,IAAI,KAAK,QAAQ,GAAG;AAC1B,cAAI,IAAI,EAAG;AACX,gBAAM,QAAQ,KAAK,MAAM,GAAG,CAAC;AAC7B,gBAAM,IAAI,KAAK,MAAM,IAAI,CAAC,EAAE,UAAU;AACtC,cAAI,UAAU,QAAS,SAAQ;AAAA,mBACtB,UAAU,QAAQ;AACzB,kBAAM,IAAI,EAAE,QAAQ,GAAG;AACvB,kBAAM,IAAI,IAAI,IAAI,IAAI,EAAE,MAAM,GAAG,CAAC;AAClC,kBAAM,MAAM,IAAI,IAAI,KAAK,EAAE,MAAM,IAAI,CAAC;AACtC,iBAAK,CAAC,IAAI,KAAK,OAAO,GAAG,KAAK,CAAC,CAAC;AAAA,EAAK,GAAG,KAAK;AAAA,UAC/C;AAAA,QACF;AACA,gBAAQ,KAAK,gBAAgB,EAAE,IAAI,OAAO,KAAK,CAAC;AAChD,gBAAQ,OAAO,OAAO,IAAI;AAAA,MAC5B;AAAA,IACF;AACA,YAAQ,MAAM,OAAO,MAAM,CAAC;AAC5B,WAAO,EAAE,MAAM,CAAC,MAAM,OAAO,KAAK,OAAO,MAAM,WAAW,IAAI,KAAK,UAAU,CAAC,CAAC,GAAG,OAAO,MAAM,OAAO,MAAM,GAAG,OAAO;AAAA,EACxH;AACF,CAAC;",
+  "sourcesContent": ["import { parseBlock, parseFields } from '../../lib/sse.js';\nimport { act } from '../def.js';\n\nexport type Socket = { send(data: unknown): void; close(): void; readonly socket: WebSocket };\n\n/**\n * `@ws(url, { protocols })` opens a WebSocket whose messages use the server-event wire format\n * (`event <name>` and `data <key> <value>` lines, blank-line separated) and routes them to the\n * same handlers as fetched streams. Returns `{ send, close, socket }`; closed when the element unmounts.\n */\nexport const websocket = act(\n  'ws',\n  ({ el, runtime, cleanup }, url: string, o: { protocols?: string | string[] } = {}): Socket => {\n    const socket = new WebSocket(new URL(url, location.href.replace(/^http/, 'ws')), o.protocols);\n    socket.onmessage = (m) => {\n      if (typeof m.data !== 'string') return; // binary frames are not server events\n      for (const block of m.data.split(/(?:\\r?\\n){2,}/)) {\n        const e = parseBlock(block);\n        if (!e) continue;\n        const data = parseFields(e.data);\n        runtime.emit('server-event', { el, event: e.event, data });\n        runtime.handle(e.event, data);\n      }\n    };\n    cleanup(() => socket.close());\n    return {\n      send: (d) => socket.send(typeof d === 'string' ? d : JSON.stringify(d)),\n      close: () => socket.close(),\n      socket,\n    };\n  },\n);\n"],
+  "mappings": "AAAA,SAAS,YAAY,mBAAmB;AACxC,SAAS,WAAW;AASb,MAAM,YAAY;AAAA,EACvB;AAAA,EACA,CAAC,EAAE,IAAI,SAAS,QAAQ,GAAG,KAAa,IAAuC,CAAC,MAAc;AAC5F,UAAM,SAAS,IAAI,UAAU,IAAI,IAAI,KAAK,SAAS,KAAK,QAAQ,SAAS,IAAI,CAAC,GAAG,EAAE,SAAS;AAC5F,WAAO,YAAY,CAAC,MAAM;AACxB,UAAI,OAAO,EAAE,SAAS,SAAU;AAChC,iBAAW,SAAS,EAAE,KAAK,MAAM,eAAe,GAAG;AACjD,cAAM,IAAI,WAAW,KAAK;AAC1B,YAAI,CAAC,EAAG;AACR,cAAM,OAAO,YAAY,EAAE,IAAI;AAC/B,gBAAQ,KAAK,gBAAgB,EAAE,IAAI,OAAO,EAAE,OAAO,KAAK,CAAC;AACzD,gBAAQ,OAAO,EAAE,OAAO,IAAI;AAAA,MAC9B;AAAA,IACF;AACA,YAAQ,MAAM,OAAO,MAAM,CAAC;AAC5B,WAAO;AAAA,MACL,MAAM,CAAC,MAAM,OAAO,KAAK,OAAO,MAAM,WAAW,IAAI,KAAK,UAAU,CAAC,CAAC;AAAA,MACtE,OAAO,MAAM,OAAO,MAAM;AAAA,MAC1B;AAAA,IACF;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/plugins/index.d.ts

@@ -1,52 +1,50 @@
 export { attr } from './directives/attribute-sync.js';
-export { bind } from './directives/two-way-bind.js';
+export { boost } from './directives/boost.js';
+export { indicator } from './directives/busy-flag.js';
 export { className } from './directives/class-toggle.js';
+export { cloak } from './directives/cloak.js';
+export { collapse } from './directives/collapse.js';
+export { signals } from './directives/declare.js';
 export { computed } from './directives/derive.js';
-export { customValidity } from './directives/validity.js';
-export { effect } from './directives/watch.js';
-export { indicator } from './directives/busy-flag.js';
-export { init } from './directives/on-mount.js';
-export { jsonSignals } from './directives/state-dump.js';
-export { matchMedia } from './directives/media-query.js';
+export { ref } from './directives/element-ref.js';
 export { on } from './directives/event-listener.js';
-export { onIntersect } from './directives/viewport.js';
-export { onInterval } from './directives/timer.js';
 export { onRaf } from './directives/frame-loop.js';
-export { onResize } from './directives/size-watch.js';
+export { html } from './directives/html.js';
+export { style } from './directives/inline-style.js';
+export { applyMask, mask } from './directives/mask.js';
+export { matchMedia } from './directives/media-query.js';
+export { init } from './directives/on-mount.js';
 export { onSignalPatch } from './directives/patch-listener.js';
+export { removeMe } from './directives/remove-me.js';
+export { scrollIntoView } from './directives/scroll-to.js';
+export { onResize } from './directives/size-watch.js';
+export { jsonSignals } from './directives/state-dump.js';
 export { persist } from './directives/storage-sync.js';
+export { teleport } from './directives/teleport.js';
+export { text } from './directives/text-content.js';
+export { onInterval } from './directives/timer.js';
+export { transition } from './directives/transition.js';
+export { animate } from './directives/tween.js';
+export { bind } from './directives/two-way-bind.js';
 export { queryString } from './directives/url-params.js';
-export { ref } from './directives/element-ref.js';
 export { replaceUrl } from './directives/url-replace.js';
-export { scrollIntoView } from './directives/scroll-to.js';
+export { customValidity } from './directives/validity.js';
+export { onIntersect } from './directives/viewport.js';
 export { show } from './directives/visibility.js';
-export { signals } from './directives/declare.js';
-export { style } from './directives/inline-style.js';
-export { text } from './directives/text-content.js';
-export { viewTransition } from './directives/transition-name.js';
-export { clipboard } from './functions/copy-text.js';
-export { fit } from './functions/range-map.js';
-export { intl } from './functions/locale-format.js';
-export { peek } from './functions/untracked-read.js';
+export { effect } from './directives/watch.js';
 export { setAll } from './functions/bulk-set.js';
 export { toggleAll } from './functions/bulk-toggle.js';
-export { animate } from './directives/tween.js';
-export { httpDelete, httpGet, httpPatch, httpPost, httpPut } from './functions/request.js';
+export { confirm } from './functions/confirm.js';
+export { clipboard } from './functions/copy-text.js';
+export { dispatch } from './functions/dispatch.js';
+export { intl } from './functions/locale-format.js';
+export { fit } from './functions/range-map.js';
 export type { RequestOptions } from './functions/request.js';
+export { httpDelete, httpGet, httpPatch, httpPost, httpPut } from './functions/request.js';
+export { peek } from './functions/untracked-read.js';
+export type { Socket } from './functions/websocket.js';
+export { websocket } from './functions/websocket.js';
 export { applyElements } from './server-events/apply-elements.js';
 export { applyState } from './server-events/apply-state.js';
-export { activateScripts, morph, morphInner } from './server-events/morph.js';
 export type { MorphOptions } from './server-events/morph.js';
-export { boost } from './directives/boost.js';
-export { cloak } from './directives/cloak.js';
-export { collapse } from './directives/collapse.js';
-export { html } from './directives/html.js';
-export { applyMask, mask } from './directives/mask.js';
-export { removeMe } from './directives/remove-me.js';
-export { teleport } from './directives/teleport.js';
-export { transition } from './directives/transition.js';
-export { trap } from './directives/trap.js';
-export { confirm } from './functions/confirm.js';
-export { dispatch } from './functions/dispatch.js';
-export { websocket } from './functions/websocket.js';
-export type { Socket } from './functions/websocket.js';
+export { activateScripts, morph, morphInner } from './server-events/morph.js';