sigmx 0.1.0 → 0.2.0

package/README.md

@@ -1,21 +1,23 @@
 # sigmx
 
+[![CI](https://github.com/wrux/sigmx/actions/workflows/ci.yml/badge.svg)](https://github.com/wrux/sigmx/actions/workflows/ci.yml)
+
 **htmx on steroids, in a runtime smaller than htmx.**
 
 > **Status: an experiment.** sigmx is a personal exploration of what a hypermedia library looks like when it starts from a tiny, plugin-based core. It is inspired by [htmx](https://htmx.org) (the server sends HTML, the browser swaps it in), [Alpine.js](https://alpinejs.dev) (declarative `data-*` attributes with a little reactivity) and [Datastar](https://data-star.dev) (which fused the two and whose attribute syntax sigmx keeps for compatibility). The code is original, the APIs may still change, and it has not been used in production. Try it, break it, and open an issue with what you find.
 
 Your server renders HTML, as it always has. The browser asks for more of it with `@get` and `@post`, and sigmx merges the response into the page with a morph that keeps focus, typed input and scroll position. When you want live updates, the same request can return a stream of patches instead. Signals, two-way binding and reactive attributes cover the client-side state. You write `data-*` attributes and register only the plugins you use.
 
-- **Tiny.** 4.0 KB core, 8.9 KB with the essentials, 12.0 KB with all 52 plugins (brotli). Zero runtime dependencies.
+- **Tiny.** 4.5 KB core, 9.0 KB with the essentials, 11.5 KB with all 50 plugins (brotli). Zero runtime dependencies.
 - **Server-driven.** Return plain HTML from any endpoint and it is morphed into the page by id, or targeted with a header. Return JSON to merge signals, or an event stream to push many patches over one request, with `Last-Event-ID` reconnects.
 - **Reactive where it matters.** Signals declared in markup; `bind`, `show`, `class`, computed values and effects keep the page in step. No component model, no virtual DOM.
 - **Pay for what you use.** Every directive and function is an opt-in plugin, and auto mode scans your source to bundle exactly the set it finds.
-- **Batteries from the ecosystem.** The Alpine plugins (`collapse`, `mask`, `trap`, `teleport`, …) and htmx extensions (`boost`, `ws`, `remove-me`, …) people bolt on are built in as plugins.
+- **Batteries from the ecosystem.** The Alpine plugins (`collapse`, `mask`, `teleport`, …) and htmx extensions (`boost`, `ws`, `remove-me`, …) people bolt on are built in as plugins.
 - **Datastar-compatible markup.** Existing Datastar templates run unchanged.
 
 ```html
 <div data-signals="{ count: 0, name: '' }">
-  <input data-bind:name placeholder="Your name">
+  <input data-bind:name placeholder="Your name" />
   <p data-show="$name">Hello, <span data-text="$name"></span>!</p>
   <button data-on:click="$count++">Clicked <b data-text="$count"></b> times</button>
   <button data-on:click="@post('/save')" data-indicator:saving data-attr:disabled="$saving">Save</button>
@@ -29,10 +31,10 @@ npm install sigmx
 ```
 
 ```ts
-import { createSigmx } from 'sigmx'
-import { essentials } from 'sigmx/presets/essentials'
+import { createSigmx } from 'sigmx';
+import { essentials } from 'sigmx/presets/essentials';
 
-createSigmx({ plugins: essentials })
+createSigmx({ plugins: essentials });
 ```
 
 Or pick plugins by hand (`sigmx/plugins` is tree-shakeable), use `sigmx/presets/minimal` or `sigmx/presets/all`, let [auto mode](#auto-mode) choose, or drop in the script-tag build:
@@ -41,7 +43,7 @@ Or pick plugins by hand (`sigmx/plugins` is tree-shakeable), use `sigmx/presets/
 <script type="module" src="/sigmx.standalone.js"></script>
 ```
 
-Astro users: `npm install sigmx sigmx-astro` and add `sigmx()` to the integrations; see [sdks/astro](sdks/astro).
+Astro users: `npm install sigmx @sigmx/astro` and add `sigmx()` to the integrations; see [sdks/astro](sdks/astro). Hono users: `npm install sigmx @sigmx/hono`, then `app.use(sigmx())` gives every handler `c.var.sigmx`; see [sdks/hono](sdks/hono). Everyone else: `sigmx/server` has the same event builders, responses, streams and signal reading as plain Fetch-API code.
 
 ## How it works
 
@@ -50,17 +52,17 @@ Attributes are `data-<plugin>[:key][__modifier.arg]="expression"`. Expressions a
 ```html
 <button data-on:click__debounce.300ms="@get('/search')">Search</button>
 <li data-class:active="$page === 3"></li>
-<input data-bind:user.email>
-<p data-text="`${$items.length} items, ${@intl('number', $total, { style: 'currency', currency: 'EUR' })}`"></p>
+<input data-bind:user.email />
+<p data-text="`${$items.length} items, ${@intl('NumberFormat', $total, { style: 'currency', currency: 'EUR' })}`"></p>
 ```
 
 State is one JSON-like store addressed by dotted paths and patched with merge-patch semantics: objects merge, `null` removes, arrays notify on `push`. Requests send the store (minus `_`-prefixed paths) and apply whatever comes back, decided by the response's content type:
 
-| the server returns | sigmx does |
-|---|---|
-| `text/html` | morphs it into the page: top-level elements by `id`, or a target from the `sigmx-selector` and `sigmx-mode` headers |
-| `application/json` | merges it into the signals |
-| `text/event-stream` | applies each event as it arrives: `patch-elements`, `patch-signals`, or your own handlers |
+| the server returns  | sigmx does                                                                                                          |
+| ------------------- | ------------------------------------------------------------------------------------------------------------------- |
+| `text/html`         | morphs it into the page: top-level elements by `id`, or a target from the `sigmx-selector` and `sigmx-mode` headers |
+| `application/json`  | merges it into the signals                                                                                          |
+| `text/event-stream` | applies each event as it arrives: `patch-elements`, `patch-signals`, or your own handlers                           |
 
 The everyday case is the first row: render a partial with whatever templating you already use and return it. The morph keeps every element whose id appears on both sides, so a re-rendered form keeps what the user typed. Streams are there for progress, chat and dashboards, where one request should keep delivering:
 
@@ -76,14 +78,14 @@ data: elements <li>Validating…</li>
 
 ## Plugins
 
-| kind | plugins |
-|---|---|
-| state | `signals` `computed` `effect` `ref` `persist` `query-string` |
-| rendering | `text` `html` `show` `class` `style` `attr` `animate` `transition` `collapse` `view-transition` `cloak` |
-| forms | `bind` `custom-validity` `mask` |
-| events | `on` `init` `on-interval` `on-intersect` `on-resize` `on-raf` `on-signal-patch` `match-media` |
-| layout | `teleport` `trap` `scroll-into-view` `remove-me` |
-| server | `@get` `@post` `@put` `@patch` `@delete` `@ws` `boost` `indicator` `patch-elements` `patch-signals` |
+| kind      | plugins                                                                                                        |
+| --------- | -------------------------------------------------------------------------------------------------------------- |
+| state     | `signals` `computed` `effect` `ref` `persist` `query-string`                                                   |
+| rendering | `text` `html` `show` `class` `style` `attr` `animate` `transition` `collapse` `cloak`                          |
+| forms     | `bind` `custom-validity` `mask`                                                                                |
+| events    | `on` `init` `on-interval` `on-intersect` `on-resize` `on-raf` `on-signal-patch` `match-media`                  |
+| layout    | `teleport` `scroll-into-view` `remove-me`                                                                      |
+| server    | `@get` `@post` `@put` `@patch` `@delete` `@ws` `boost` `indicator` `patch-elements` `patch-signals`            |
 | utilities | `@peek` `@setAll` `@toggleAll` `@fit` `@clipboard` `@intl` `@dispatch` `@confirm` `json-signals` `replace-url` |
 
 Every plugin has a page in the docs with a live example and its measured size.
@@ -92,16 +94,16 @@ Every plugin has a page in the docs with a live example and its measured size.
 
 Brotli, measured from the real source by `npm run size` and `npm run compare` (nothing is quoted from memory):
 
-| | brotli |
-|---|---:|
-| sigmx core | 4.0 KB |
-| sigmx essentials (state, rendering, forms, requests, morph) | 8.9 KB |
-| sigmx everything, 52 plugins | 12.0 KB |
-| htmx 2.0.10 | 14.6 KB |
-| Datastar 1.0.3, free bundle (23 plugins) | 11.8 KB |
-| Alpine.js 3.17.1 | 17.6 KB |
+|                                                             |  brotli |
+| ----------------------------------------------------------- | ------: |
+| sigmx core                                                  |  4.5 KB |
+| sigmx essentials (state, rendering, forms, requests, morph) |  9.0 KB |
+| sigmx everything, 50 plugins                                | 11.5 KB |
+| htmx 2.0.10                                                 | 14.6 KB |
+| Datastar 1.0.3 (23 plugins)                                 | 11.8 KB |
+| Alpine.js 3.17.1                                            | 17.6 KB |
 
-Precompiling expressions at build time removes the runtime compiler and any use of `new Function`, taking the core to 3.6 KB and making strict CSP trivial.
+Precompiling expressions at build time removes the runtime compiler and any use of `new Function`, taking the core to 3.8 KB and making strict CSP trivial.
 
 ## Auto mode
 
@@ -109,14 +111,14 @@ Like a CSS framework scanning for class names, sigmx can scan your source for th
 
 ```js
 // vite.config.js
-import { sigmxAuto } from 'sigmx/vite'
-export default { plugins: [sigmxAuto({ always: ['signals'], custom: { upper: 'src/plugins/upper.ts' } })] }
+import { sigmxAuto } from 'sigmx/vite';
+export default { plugins: [sigmxAuto({ always: ['signals'], custom: { upper: 'src/plugins/upper.ts' } })] };
 ```
 
 ```ts
-import { createSigmx } from 'sigmx'
-import { plugins } from 'virtual:sigmx-plugins'
-createSigmx({ plugins })
+import { createSigmx } from 'sigmx';
+import { plugins } from 'virtual:sigmx-plugins';
+createSigmx({ plugins });
 ```
 
 Without Vite: `npx sigmx scan src --out src/sigmx-plugins.js`. In Astro: `sigmx({ plugins: 'auto' })`.
@@ -124,15 +126,17 @@ Without Vite: `npx sigmx scan src --out src/sigmx-plugins.js`. In Astro: `sigmx(
 ## Writing a plugin
 
 ```ts
-import { attribute } from 'sigmx'
+import { attribute } from 'sigmx';
 
 export const upper = attribute({
   name: 'upper',
   value: 'required',
   mount({ el, evaluate, effect }) {
-    effect(() => { el.textContent = String(evaluate()).toUpperCase() })
+    effect(() => {
+      el.textContent = String(evaluate()).toUpperCase();
+    });
   },
-})
+});
 ```
 
 Plugins are plain objects; nothing registers on import. The mount context gives you `evaluate`, `effect`, `listen`, `cleanup`, the store and the runtime, and everything registered through it is torn down when the attribute or element goes away. Functions (`@name()`) and server-event handlers work the same way with `action()` and `handler()`.
@@ -149,24 +153,31 @@ cd website && npm install && npm run dev
 
 ```
 src/kernel/        reactive graph, store, expression compiler, runtime (DOM-free core)
+src/server.ts      sigmx/server: event builders, sse/sseStream/html/json responses, readSignals
 src/plugins/       directives, functions, server-event handlers, the morph
 src/presets/       minimal, essentials, all
-sdks/astro/        sigmx-astro: integration, server helpers, auto mode, precompilation
+sdks/astro/        @sigmx/astro: integration, server helpers, auto mode, precompilation
+sdks/hono/         @sigmx/hono: middleware with signals(), html(), events(), stream(); serveClient()
+examples/          standalone Vite, Express, Hono and Astro projects using the published packages
 website/           documentation site
 scripts/           build, size and comparison measurements, dev server
-tests/             node:test suite for the core; browser suite under tests/browser
+tests/             unit (node:test), dom (happy-dom) and browser (Playwright) suites
 ```
 
 ```bash
 npm install
 npm run check    # type-check
-npm test         # build, then node:test over the DOM-free core
+npm run lint     # biome: formatting and lint rules
+npm run format   # biome: rewrite files in the house style
+npm test         # build, then unit tests and happy-dom tests for every plugin
+npm run test:browser  # Playwright: transitions, observers, WebSocket, the standalone build
+npm run test:all # everything above plus the SDK suites
 npm run dev      # dev server with SSE and WebSocket endpoints; open /tests/browser/index.html
 npm run size     # bundle sizes for representative plugin sets
 npm run compare  # sizes of htmx, Datastar and Alpine at pinned versions
 ```
 
-Contributions are welcome. Open an issue first for anything larger than a fix, keep plugins as small as their reference-page size table suggests, and run both test suites before a pull request.
+Contributions are welcome. Open an issue first for anything larger than a fix, keep plugins as small as their reference-page size table suggests, and run `npm run lint` and both test suites before a pull request.
 
 ## Licence
 

package/dist/cli.js

@@ -9,7 +9,9 @@ const opt = (name) => {
   return i < 0 ? void 0 : args.splice(i, 2)[1];
 };
 if (cmd !== "scan") {
-  console.log("usage: sigmx scan [dirs...] [--out src/sigmx-plugins.js] [--always signals,httpGet] [--custom upper=src/plugins/upper.ts] [--prefix data-,hx-]");
+  console.log(
+    "usage: sigmx scan [dirs...] [--out src/sigmx-plugins.js] [--always signals,httpGet] [--custom upper=src/plugins/upper.ts] [--prefix data-,hx-]"
+  );
   process.exit(cmd ? 1 : 0);
 }
 const out = opt("out");

package/dist/cli.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/cli.ts"],
-  "sourcesContent": ["#!/usr/bin/env node\n// `sigmx scan [dirs...] [--out file] [--always a,b] [--custom name=path,...] [--prefix data-,hx-]`\nimport { writeFileSync } from 'node:fs'\nimport { generatePluginsModule } from './kernel/scan.js'\nimport { scanProject } from './vite.js'\n\nconst args = process.argv.slice(2)\nconst cmd = args.shift()\nconst opt = (name: string) => {\n  const i = args.indexOf(`--${name}`)\n  return i < 0 ? undefined : args.splice(i, 2)[1]\n}\nif (cmd !== 'scan') {\n  console.log('usage: sigmx scan [dirs...] [--out src/sigmx-plugins.js] [--always signals,httpGet] [--custom upper=src/plugins/upper.ts] [--prefix data-,hx-]')\n  process.exit(cmd ? 1 : 0)\n}\nconst out = opt('out')\nconst always = opt('always')?.split(',').filter(Boolean)\nconst prefixes = opt('prefix')?.split(',').filter(Boolean)\nconst custom = Object.fromEntries((opt('custom')?.split(',') ?? []).map((pair) => pair.split('=') as [string, string]))\nconst sel = scanProject({ include: args.length ? args : undefined, always, prefixes, custom })\nconst code = generatePluginsModule(sel)\nif (out) {\n  writeFileSync(out, code)\n  console.log(`wrote ${out}: ${sel.plugins.length} plugins, ${sel.unused.length} unused`)\n} else process.stdout.write(code)\nfor (const [exp, why] of Object.entries(sel.reasons)) console.error(`  ${exp.padEnd(16)} ${why}`)\n"],
-  "mappings": ";AAEA,SAAS,qBAAqB;AAC9B,SAAS,6BAA6B;AACtC,SAAS,mBAAmB;AAE5B,MAAM,OAAO,QAAQ,KAAK,MAAM,CAAC;AACjC,MAAM,MAAM,KAAK,MAAM;AACvB,MAAM,MAAM,CAAC,SAAiB;AAC5B,QAAM,IAAI,KAAK,QAAQ,KAAK,IAAI,EAAE;AAClC,SAAO,IAAI,IAAI,SAAY,KAAK,OAAO,GAAG,CAAC,EAAE,CAAC;AAChD;AACA,IAAI,QAAQ,QAAQ;AAClB,UAAQ,IAAI,gJAAgJ;AAC5J,UAAQ,KAAK,MAAM,IAAI,CAAC;AAC1B;AACA,MAAM,MAAM,IAAI,KAAK;AACrB,MAAM,SAAS,IAAI,QAAQ,GAAG,MAAM,GAAG,EAAE,OAAO,OAAO;AACvD,MAAM,WAAW,IAAI,QAAQ,GAAG,MAAM,GAAG,EAAE,OAAO,OAAO;AACzD,MAAM,SAAS,OAAO,aAAa,IAAI,QAAQ,GAAG,MAAM,GAAG,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,KAAK,MAAM,GAAG,CAAqB,CAAC;AACtH,MAAM,MAAM,YAAY,EAAE,SAAS,KAAK,SAAS,OAAO,QAAW,QAAQ,UAAU,OAAO,CAAC;AAC7F,MAAM,OAAO,sBAAsB,GAAG;AACtC,IAAI,KAAK;AACP,gBAAc,KAAK,IAAI;AACvB,UAAQ,IAAI,SAAS,GAAG,KAAK,IAAI,QAAQ,MAAM,aAAa,IAAI,OAAO,MAAM,SAAS;AACxF,MAAO,SAAQ,OAAO,MAAM,IAAI;AAChC,WAAW,CAAC,KAAK,GAAG,KAAK,OAAO,QAAQ,IAAI,OAAO,EAAG,SAAQ,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC,IAAI,GAAG,EAAE;",
+  "sourcesContent": ["#!/usr/bin/env node\n// `sigmx scan [dirs...] [--out file] [--always a,b] [--custom name=path,...] [--prefix data-,hx-]`\nimport { writeFileSync } from 'node:fs';\nimport { generatePluginsModule } from './kernel/scan.js';\nimport { scanProject } from './vite.js';\n\nconst args = process.argv.slice(2);\nconst cmd = args.shift();\nconst opt = (name: string) => {\n  const i = args.indexOf(`--${name}`);\n  return i < 0 ? undefined : args.splice(i, 2)[1];\n};\nif (cmd !== 'scan') {\n  console.log(\n    'usage: sigmx scan [dirs...] [--out src/sigmx-plugins.js] [--always signals,httpGet] [--custom upper=src/plugins/upper.ts] [--prefix data-,hx-]',\n  );\n  process.exit(cmd ? 1 : 0);\n}\nconst out = opt('out');\nconst always = opt('always')?.split(',').filter(Boolean);\nconst prefixes = opt('prefix')?.split(',').filter(Boolean);\nconst custom = Object.fromEntries((opt('custom')?.split(',') ?? []).map((pair) => pair.split('=') as [string, string]));\nconst sel = scanProject({ include: args.length ? args : undefined, always, prefixes, custom });\nconst code = generatePluginsModule(sel);\nif (out) {\n  writeFileSync(out, code);\n  console.log(`wrote ${out}: ${sel.plugins.length} plugins, ${sel.unused.length} unused`);\n} else process.stdout.write(code);\nfor (const [exp, why] of Object.entries(sel.reasons)) console.error(`  ${exp.padEnd(16)} ${why}`);\n"],
+  "mappings": ";AAEA,SAAS,qBAAqB;AAC9B,SAAS,6BAA6B;AACtC,SAAS,mBAAmB;AAE5B,MAAM,OAAO,QAAQ,KAAK,MAAM,CAAC;AACjC,MAAM,MAAM,KAAK,MAAM;AACvB,MAAM,MAAM,CAAC,SAAiB;AAC5B,QAAM,IAAI,KAAK,QAAQ,KAAK,IAAI,EAAE;AAClC,SAAO,IAAI,IAAI,SAAY,KAAK,OAAO,GAAG,CAAC,EAAE,CAAC;AAChD;AACA,IAAI,QAAQ,QAAQ;AAClB,UAAQ;AAAA,IACN;AAAA,EACF;AACA,UAAQ,KAAK,MAAM,IAAI,CAAC;AAC1B;AACA,MAAM,MAAM,IAAI,KAAK;AACrB,MAAM,SAAS,IAAI,QAAQ,GAAG,MAAM,GAAG,EAAE,OAAO,OAAO;AACvD,MAAM,WAAW,IAAI,QAAQ,GAAG,MAAM,GAAG,EAAE,OAAO,OAAO;AACzD,MAAM,SAAS,OAAO,aAAa,IAAI,QAAQ,GAAG,MAAM,GAAG,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,KAAK,MAAM,GAAG,CAAqB,CAAC;AACtH,MAAM,MAAM,YAAY,EAAE,SAAS,KAAK,SAAS,OAAO,QAAW,QAAQ,UAAU,OAAO,CAAC;AAC7F,MAAM,OAAO,sBAAsB,GAAG;AACtC,IAAI,KAAK;AACP,gBAAc,KAAK,IAAI;AACvB,UAAQ,IAAI,SAAS,GAAG,KAAK,IAAI,QAAQ,MAAM,aAAa,IAAI,OAAO,MAAM,SAAS;AACxF,MAAO,SAAQ,OAAO,MAAM,IAAI;AAChC,WAAW,CAAC,KAAK,GAAG,KAAK,OAAO,QAAQ,IAAI,OAAO,EAAG,SAAQ,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC,IAAI,GAAG,EAAE;",
   "names": []
 }

package/dist/kernel/compile.d.ts

@@ -2,15 +2,14 @@ import type { ExpressionCompiler } from './contracts.js';
 export type Compiler = (params: string[], body: string) => (...args: any[]) => any;
 /** Default compiler: `new Function`. Not usable under a strict CSP; see `cspCompiler`. */
 export declare const functionCompiler: Compiler;
-/** Replace `@name(` with `__a.name(` outside strings and comments. */
-export declare const rewriteActions: (src: string) => string;
-/** Split on top-level semicolons. */
-export declare const splitStatements: (src: string) => string[];
+/** `$count + @fit($x)` → `$.count + __a.fit($.x)`; strings, template text, comments and regexes untouched. */
+export declare const transform: (src: string) => string;
 /**
- * Compile an expression to `(store, actions, ...params) => any`: the body runs inside
- * `with (store.scope)`, so `$name` resolves through the store. With `returns`, the value of the
- * last statement is returned, so `$a = 1; $a * 2` works. Compiled functions are cached by source.
+ * Compile `src` with `compiler` as `($, __a, ...params) => any`, returning the body that compiled
+ * together with the function. Shared by the runtime and the build-time precompiler.
  */
-export declare const compile: (compiler: Compiler, src: string, params: string[], returns: boolean) => ((...args: any[]) => any);
-/** The default pipeline: compile at runtime inside `with (scope)` using `compiler` (`new Function` or CSP). */
+export declare const compileBody: (compiler: Compiler, src: string, params: string[]) => [string, (...args: any[]) => any];
+/** Compile with a cache keyed by parameter names and source. */
+export declare const compile: (compiler: Compiler, src: string, params: string[]) => ((...args: any[]) => any);
+/** The default pipeline: compile at runtime with `compiler` (`new Function` or the CSP compiler). */
 export declare const runtimeExpressions: (compiler: Compiler) => ExpressionCompiler;

package/dist/kernel/compile.js

@@ -1,96 +1,131 @@
 const functionCompiler = (params, body) => Function(...params, body);
-const cache = /* @__PURE__ */ new Map();
-const isIdent = (c) => /[A-Za-z0-9_$]/.test(c);
-const scan = (src, onCode) => {
-  let i = 0;
+const START = /[A-Za-z_$]/;
+const IDENT = /[\w$]/;
+const BEFORE_REGEX = /(^|[(,=:[!&|?{};+\-*%<>~^]|\b(?:return|typeof|case|in|of|do|else|void|delete|throw|new))$/;
+const rewrite = (src, from, hole) => {
+  let out = "";
+  let i = from;
+  let depth = 0;
   const n = src.length;
+  const code = () => out.trimEnd();
   while (i < n) {
     const c = src[i];
-    const next = src[i + 1];
-    if (c === '"' || c === "'" || c === "`") {
+    const d = src[i + 1];
+    if (c === '"' || c === "'") {
       let j = i + 1;
       while (j < n && src[j] !== c) j += src[j] === "\\" ? 2 : 1;
-      onCode(src.slice(i, j + 1), i);
+      out += src.slice(i, j + 1);
       i = j + 1;
-    } else if (c === "/" && next === "/") {
+    } else if (c === "`") {
+      out += c;
+      i++;
+      while (i < n && src[i] !== "`") {
+        if (src[i] === "\\") {
+          out += src.slice(i, i + 2);
+          i += 2;
+        } else if (src[i] === "$" && src[i + 1] === "{") {
+          const [inner, j] = rewrite(src, i + 2, true);
+          out += `\${${inner}}`;
+          i = j;
+        } else out += src[i++];
+      }
+      out += "`";
+      i++;
+    } else if (c === "/" && d === "/") {
       const j = src.indexOf("\n", i);
       i = j < 0 ? n : j;
-    } else if (c === "/" && next === "*") {
+    } else if (c === "/" && d === "*") {
       const j = src.indexOf("*/", i + 2);
       i = j < 0 ? n : j + 2;
-    } else {
-      const skip = onCode(c, i);
-      i += skip || 1;
-    }
-  }
-};
-const rewriteActions = (src) => {
-  let out = "";
-  scan(src, (c, i) => {
-    if (c === "@") {
+    } else if (c === "/" && BEFORE_REGEX.test(code())) {
+      let j = i + 1;
+      let cls = false;
+      for (; j < n && (cls || src[j] !== "/"); j++) {
+        if (src[j] === "\\") j++;
+        else if (src[j] === "[") cls = true;
+        else if (src[j] === "]") cls = false;
+      }
+      for (j++; j < n && /[a-z]/i.test(src[j]); j++) ;
+      out += src.slice(i, j);
+      i = j;
+    } else if (hole && (c === "{" || c === "}")) {
+      if (c === "{") depth++;
+      else if (depth) depth--;
+      else return [out, i + 1];
+      out += c;
+      i++;
+    } else if (c === "$" && START.test(d ?? "") && d !== "$" && !IDENT.test(out.at(-1) ?? "")) {
+      const before = code();
+      if (before.endsWith(".") && !before.endsWith("...")) {
+        out += c;
+        i++;
+        continue;
+      }
+      let j = i + 1;
+      while (j < n && IDENT.test(src[j])) j++;
+      out += `$.${src.slice(i + 1, j)}`;
+      i = j;
+    } else if (c === "@" && START.test(d ?? "")) {
       let j = i + 1;
-      while (j < src.length && isIdent(src[j])) j++;
+      while (j < n && IDENT.test(src[j])) j++;
       let k = j;
-      while (k < src.length && /\s/.test(src[k])) k++;
-      if (j > i + 1 && src[k] === "(") {
+      while (k < n && /\s/.test(src[k])) k++;
+      if (src[k] === "(") {
         out += `__a.${src.slice(i + 1, j)}(`;
-        return k + 1 - i;
+        i = k + 1;
+      } else {
+        out += c;
+        i++;
       }
+    } else {
+      out += c;
+      i++;
     }
-    out += c;
-  });
-  return out;
+  }
+  return [out, i];
 };
-const splitStatements = (src) => {
-  const parts = [];
-  let depth = 0;
-  let start = 0;
-  scan(src, (c, i) => {
-    if (c.length > 1) return;
-    if ("([{".includes(c)) depth++;
-    else if (")]}".includes(c)) depth--;
-    else if (c === ";" && !depth) {
-      parts.push(src.slice(start, i));
-      start = i + 1;
-    }
-  });
-  parts.push(src.slice(start));
-  return parts.filter((p) => p.trim());
+const transform = (src) => rewrite(src, 0, false)[0];
+const candidates = (code) => {
+  const out = [`return(${code}
+)`];
+  for (let i = code.lastIndexOf(";"); i >= 0; i = code.lastIndexOf(";", i - 1))
+    out.push(`${code.slice(0, i)};return(${code.slice(i + 1)}
+)`);
+  out.push(code);
+  return out.map((b) => `"use strict";${b}`);
 };
-const compile = (compiler, src, params, returns) => {
-  const key = `${+returns}|${params.join()}|${src}`;
-  const hit = cache.get(key);
-  if (hit) return hit;
-  const code = rewriteActions(src.trim());
-  const make = (body) => compiler(["$", "__a", ...params], `with($.scope){${body}
-}`);
-  let fn;
-  if (!returns) {
-    fn = make(code);
-  } else {
+const compileBody = (compiler, src, params) => {
+  let error;
+  for (const body of candidates(transform(src.trim()))) {
     try {
-      fn = make(`return(${code}
-)`);
-    } catch {
-      const parts = splitStatements(code);
-      const last = parts.pop() ?? "";
-      try {
-        fn = make(`${parts.join(";")};return(${last}
-)`);
-      } catch {
-        fn = make(code);
-      }
+      return [body, compiler(["$", "__a", ...params], body)];
+    } catch (e) {
+      error = e;
     }
   }
-  cache.set(key, fn);
+  throw error;
+};
+const cache = /* @__PURE__ */ new Map();
+const CACHE_LIMIT = 2e3;
+const compile = (compiler, src, params) => {
+  const key = `${params.join()}|${src}`;
+  let fn = cache.get(key);
+  if (!fn) {
+    fn = compileBody(compiler, src, params)[1];
+    if (cache.size >= CACHE_LIMIT) cache.delete(cache.keys().next().value);
+    cache.set(key, fn);
+  }
   return fn;
 };
-const runtimeExpressions = (compiler) => (src, params, returns) => compile(compiler, src, params, returns);
+const runtimeExpressions = (compiler) => (src, params) => {
+  const fn = compile(compiler, src, params);
+  return (store, actions, ...rest) => fn(store.$, actions, ...rest);
+};
 export {
   compile,
+  compileBody,
   functionCompiler,
-  rewriteActions,
   runtimeExpressions,
-  splitStatements
+  transform
 };
 //# sourceMappingURL=compile.js.map

package/dist/kernel/compile.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/kernel/compile.ts"],
-  "sourcesContent": ["// Expression compiler. Signals need no rewriting: the body runs inside `with (scope)`, where\n// `$count`, `$user.name` and `$` resolve through the store's scope proxy. Only `@action(` is\n// rewritten, into a call on the per-evaluation actions object.\n\nimport type { ExpressionCompiler } from './contracts.js'\n\nexport type Compiler = (params: string[], body: string) => (...args: any[]) => any\n\n/** Default compiler: `new Function`. Not usable under a strict CSP; see `cspCompiler`. */\nexport const functionCompiler: Compiler = (params, body) => Function(...params, body) as (...args: any[]) => any\n\nconst cache = new Map<string, (...args: any[]) => any>()\n\nconst isIdent = (c: string): boolean => /[A-Za-z0-9_$]/.test(c)\n\n/** Walk source text, skipping string, template and comment contents; `emit` receives code chars. */\nconst scan = (src: string, onCode: (c: string, i: number) => number | void): void => {\n  let i = 0\n  const n = src.length\n  while (i < n) {\n    const c = src[i]\n    const next = src[i + 1]\n    if (c === '\"' || c === \"'\" || c === '`') {\n      let j = i + 1\n      while (j < n && src[j] !== c) j += src[j] === '\\\\' ? 2 : 1\n      onCode(src.slice(i, j + 1), i)\n      i = j + 1\n    } else if (c === '/' && next === '/') {\n      const j = src.indexOf('\\n', i)\n      i = j < 0 ? n : j\n    } else if (c === '/' && next === '*') {\n      const j = src.indexOf('*/', i + 2)\n      i = j < 0 ? n : j + 2\n    } else {\n      const skip = onCode(c, i)\n      i += skip || 1\n    }\n  }\n}\n\n/** Replace `@name(` with `__a.name(` outside strings and comments. */\nexport const rewriteActions = (src: string): string => {\n  let out = ''\n  scan(src, (c, i) => {\n    if (c === '@') {\n      let j = i + 1\n      while (j < src.length && isIdent(src[j])) j++\n      let k = j\n      while (k < src.length && /\\s/.test(src[k])) k++\n      if (j > i + 1 && src[k] === '(') {\n        out += `__a.${src.slice(i + 1, j)}(`\n        return k + 1 - i\n      }\n    }\n    out += c\n  })\n  return out\n}\n\n/** Split on top-level semicolons. */\nexport const splitStatements = (src: string): string[] => {\n  const parts: string[] = []\n  let depth = 0\n  let start = 0\n  scan(src, (c, i) => {\n    if (c.length > 1) return\n    if ('([{'.includes(c)) depth++\n    else if (')]}'.includes(c)) depth--\n    else if (c === ';' && !depth) {\n      parts.push(src.slice(start, i))\n      start = i + 1\n    }\n  })\n  parts.push(src.slice(start))\n  return parts.filter((p) => p.trim())\n}\n\n/**\n * Compile an expression to `(store, actions, ...params) => any`: the body runs inside\n * `with (store.scope)`, so `$name` resolves through the store. With `returns`, the value of the\n * last statement is returned, so `$a = 1; $a * 2` works. Compiled functions are cached by source.\n */\nexport const compile = (\n  compiler: Compiler,\n  src: string,\n  params: string[],\n  returns: boolean,\n): ((...args: any[]) => any) => {\n  const key = `${+returns}|${params.join()}|${src}`\n  const hit = cache.get(key)\n  if (hit) return hit\n  const code = rewriteActions(src.trim())\n  const make = (body: string) => compiler(['$', '__a', ...params], `with($.scope){${body}\\n}`)\n  let fn: (...args: any[]) => any\n  if (!returns) {\n    fn = make(code)\n  } else {\n    try {\n      fn = make(`return(${code}\\n)`)\n    } catch {\n      const parts = splitStatements(code)\n      const last = parts.pop() ?? ''\n      try {\n        fn = make(`${parts.join(';')};return(${last}\\n)`)\n      } catch {\n        fn = make(code)\n      }\n    }\n  }\n  cache.set(key, fn)\n  return fn\n}\n\n/** The default pipeline: compile at runtime inside `with (scope)` using `compiler` (`new Function` or CSP). */\nexport const runtimeExpressions =\n  (compiler: Compiler): ExpressionCompiler =>\n  (src, params, returns) =>\n    compile(compiler, src, params, returns)\n"],
-  "mappings": "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",
+  "sourcesContent": ["// Expression compiler. An attribute expression is rewritten once, `$name` \u2192 `$.name` and\n// `@name(` \u2192 `__a.name(`, then compiled as a strict-mode function of `($, __a, el, evt, ...args)`\n// where `$` is the store's root proxy. The build-time precompiler emits exactly the same bodies,\n// so precompiled and runtime expressions behave identically.\n\nimport type { ExpressionCompiler } from './contracts.js';\n\nexport type Compiler = (params: string[], body: string) => (...args: any[]) => any;\n\n/** Default compiler: `new Function`. Not usable under a strict CSP; see `cspCompiler`. */\nexport const functionCompiler: Compiler = (params, body) => Function(...params, body) as (...args: any[]) => any;\n\nconst START = /[A-Za-z_$]/;\nconst IDENT = /[\\w$]/;\n/** After these a `/` starts a regular expression rather than a division. */\nconst BEFORE_REGEX = /(^|[(,=:[!&|?{};+\\-*%<>~^]|\\b(?:return|typeof|case|in|of|do|else|void|delete|throw|new))$/;\n\n/**\n * Tokenizer-based rewrite. Copies string literals, template text, and regular expressions verbatim,\n * drops comments, recurses into `${\u2026}` holes, and rewrites signals and actions in code. In hole\n * mode it stops at the unmatched `}` and reports the index after it.\n */\nconst rewrite = (src: string, from: number, hole: boolean): [string, number] => {\n  let out = '';\n  let i = from;\n  let depth = 0;\n  const n = src.length;\n  const code = () => out.trimEnd();\n  while (i < n) {\n    const c = src[i];\n    const d = src[i + 1];\n    if (c === '\"' || c === \"'\") {\n      let j = i + 1;\n      while (j < n && src[j] !== c) j += src[j] === '\\\\' ? 2 : 1;\n      out += src.slice(i, j + 1);\n      i = j + 1;\n    } else if (c === '`') {\n      out += c;\n      i++;\n      while (i < n && src[i] !== '`') {\n        if (src[i] === '\\\\') {\n          out += src.slice(i, i + 2);\n          i += 2;\n        } else if (src[i] === '$' && src[i + 1] === '{') {\n          const [inner, j] = rewrite(src, i + 2, true);\n          out += `\\${${inner}}`;\n          i = j;\n        } else out += src[i++];\n      }\n      out += '`';\n      i++;\n    } else if (c === '/' && d === '/') {\n      const j = src.indexOf('\\n', i);\n      i = j < 0 ? n : j;\n    } else if (c === '/' && d === '*') {\n      const j = src.indexOf('*/', i + 2);\n      i = j < 0 ? n : j + 2;\n    } else if (c === '/' && BEFORE_REGEX.test(code())) {\n      let j = i + 1;\n      let cls = false;\n      for (; j < n && (cls || src[j] !== '/'); j++) {\n        if (src[j] === '\\\\') j++;\n        else if (src[j] === '[') cls = true;\n        else if (src[j] === ']') cls = false;\n      }\n      for (j++; j < n && /[a-z]/i.test(src[j]); j++);\n      out += src.slice(i, j);\n      i = j;\n    } else if (hole && (c === '{' || c === '}')) {\n      if (c === '{') depth++;\n      else if (depth) depth--;\n      else return [out, i + 1];\n      out += c;\n      i++;\n    } else if (c === '$' && START.test(d ?? '') && d !== '$' && !IDENT.test(out.at(-1) ?? '')) {\n      const before = code();\n      // `obj.$x` is a member access and stays; `...$x` is a spread and is a signal.\n      if (before.endsWith('.') && !before.endsWith('...')) {\n        out += c;\n        i++;\n        continue;\n      }\n      let j = i + 1;\n      while (j < n && IDENT.test(src[j])) j++;\n      out += `$.${src.slice(i + 1, j)}`;\n      i = j;\n    } else if (c === '@' && START.test(d ?? '')) {\n      let j = i + 1;\n      while (j < n && IDENT.test(src[j])) j++;\n      let k = j;\n      while (k < n && /\\s/.test(src[k])) k++;\n      if (src[k] === '(') {\n        out += `__a.${src.slice(i + 1, j)}(`;\n        i = k + 1;\n      } else {\n        out += c;\n        i++;\n      }\n    } else {\n      out += c;\n      i++;\n    }\n  }\n  return [out, i];\n};\n\n/** `$count + @fit($x)` \u2192 `$.count + __a.fit($.x)`; strings, template text, comments and regexes untouched. */\nexport const transform = (src: string): string => rewrite(src, 0, false)[0];\n\n/**\n * The strict-mode bodies to try, best first: the whole source as an expression, then each split at a\n * top-level-looking `;` from the end (statements followed by a returned value), then plain statements.\n * A split inside a string or bracket does not compile and the next candidate is tried.\n */\nconst candidates = (code: string): string[] => {\n  const out = [`return(${code}\\n)`];\n  for (let i = code.lastIndexOf(';'); i >= 0; i = code.lastIndexOf(';', i - 1))\n    out.push(`${code.slice(0, i)};return(${code.slice(i + 1)}\\n)`);\n  out.push(code);\n  return out.map((b) => `\"use strict\";${b}`);\n};\n\n/**\n * Compile `src` with `compiler` as `($, __a, ...params) => any`, returning the body that compiled\n * together with the function. Shared by the runtime and the build-time precompiler.\n */\nexport const compileBody = (compiler: Compiler, src: string, params: string[]): [string, (...args: any[]) => any] => {\n  let error: unknown;\n  for (const body of candidates(transform(src.trim()))) {\n    try {\n      return [body, compiler(['$', '__a', ...params], body)];\n    } catch (e) {\n      error = e;\n    }\n  }\n  throw error;\n};\n\nconst cache = new Map<string, (...args: any[]) => any>();\nconst CACHE_LIMIT = 2000; // a long-lived page streaming unique expressions must not grow without bound\n\n/** Compile with a cache keyed by parameter names and source. */\nexport const compile = (compiler: Compiler, src: string, params: string[]): ((...args: any[]) => any) => {\n  const key = `${params.join()}|${src}`;\n  let fn = cache.get(key);\n  if (!fn) {\n    fn = compileBody(compiler, src, params)[1];\n    if (cache.size >= CACHE_LIMIT) cache.delete(cache.keys().next().value as string);\n    cache.set(key, fn);\n  }\n  return fn;\n};\n\n/** The default pipeline: compile at runtime with `compiler` (`new Function` or the CSP compiler). */\nexport const runtimeExpressions =\n  (compiler: Compiler): ExpressionCompiler =>\n  (src, params) => {\n    const fn = compile(compiler, src, params);\n    return (store, actions, ...rest) => fn(store.$, actions, ...rest);\n  };\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/kernel/contracts.d.ts

@@ -1,12 +1,12 @@
+import type { CaseStyle } from '../lib/casing.js';
 import type { Compiler } from './compile.js';
 import type { Store } from './state.js';
-import type { CaseStyle } from '../lib/casing.js';
 export type El = HTMLElement | SVGElement | MathMLElement;
 export type Mods = Map<string, string[]>;
 /** A compiled attribute expression. `store` is the instance store; `actions` resolves `@name(...)`. */
 export type Evaluator = (store: Store, actions: any, el: El, evt: Event | undefined, ...args: any[]) => any;
 /** Turns expression source into an evaluator. The runtime compiler and the precompiled table both implement this. */
-export type ExpressionCompiler = (src: string, params: string[], returns: boolean) => Evaluator;
+export type ExpressionCompiler = (src: string, params: string[]) => Evaluator;
 export interface Runtime {
     /** Attribute prefixes being scanned; the first is primary. */
     readonly prefixes: readonly string[];
@@ -17,7 +17,6 @@ export interface Runtime {
     readonly compiler: Compiler;
     /** Dispatch a `sigmx-<type>` CustomEvent on `document`. */
     emit(type: string, detail?: unknown): void;
-    /** Call a registered action by name. */
     call(name: string, ctx: ActionCtx, args: any[]): any;
     /** Event-name prefixes accepted from servers; the first is what sigmx itself uses. */
     readonly eventPrefixes: readonly string[];
@@ -29,13 +28,10 @@ export interface Runtime {
 }
 export interface Ctx {
     el: El;
-    /** Plugin name, e.g. 'on'. */
     plugin: string;
     /** Full attribute name as written, e.g. 'data-on:click__debounce.300ms'. */
     attr: string;
-    /** The `:key` part, if any. */
     key: string | undefined;
-    /** Attribute value (the expression source). */
     value: string;
     mods: Mods;
     /** The key recased per `__case.<style>`, defaulting to `style`. */
@@ -46,8 +42,11 @@ export interface Ctx {
     effect(fn: () => void): void;
     /** addEventListener with automatic removal on cleanup. */
     listen(target: EventTarget, type: string, fn: (e: any) => void, options?: AddEventListenerOptions): void;
-    cleanup(fn: () => void): void;
+    /** Run `fn` when the attribute unmounts. Returns a function that unregisters it (for work that finished early). */
+    cleanup(fn: () => void): () => void;
     error(message: string, extra?: Record<string, unknown>): Error;
+    /** Route an error that happened later (a callback, a promise) to `onError` with this attribute's info. */
+    report(error: unknown): void;
     store: Store;
     runtime: Runtime;
 }
@@ -57,8 +56,10 @@ export interface ActionCtx {
     store: Store;
     runtime: Runtime;
     error(message: string, extra?: Record<string, unknown>): Error;
-    /** Run when the attribute that invoked the action is torn down. */
-    cleanup(fn: () => void): void;
+    /** Route an error that happened later (a callback, a promise) to `onError` with this attribute's info. */
+    report(error: unknown): void;
+    /** Run when the attribute that invoked the action is torn down. Returns a function that unregisters it. */
+    cleanup(fn: () => void): () => void;
 }
 export interface AttributePlugin {
     type: 'attribute';
@@ -66,7 +67,8 @@ export interface AttributePlugin {
     key?: 'required' | 'forbidden';
     value?: 'required' | 'forbidden';
     /** Whether the expression yields a value (default) or is a statement body. */
-    returns?: boolean;
+    /** The value is a literal (a mask, a selector, a delay) rather than an expression; `__dynamic` makes it one. */
+    literal?: boolean;
     /** Extra parameter names the expression can reference, in the order passed to `evaluate`. */
     args?: string[];
     mount(ctx: Ctx): void | (() => void);
@@ -76,7 +78,6 @@ export interface ActionPlugin {
     name: string;
     call(ctx: ActionCtx, ...args: any[]): any;
 }
-/** Handles a named server event (for example a streamed patch). */
 export interface HandlerPlugin {
     type: 'handler';
     name: string;
@@ -93,7 +94,6 @@ export interface RuntimeOptions {
     prefix?: string | string[];
     /** Server event-name prefixes to accept, add a second prefix while migrating from another library. Default 'sigmx-'. */
     eventPrefix?: string | string[];
-    /** Share a store between instances. */
     store?: Store;
     /** Called for any plugin or expression error. Default: console.error. */
     onError?: (error: unknown, info: {
@@ -113,7 +113,6 @@ export interface Sigmx {
     store: Store;
     /** Root namespace proxy for use from JavaScript: `sigmx.$.count++`. */
     $: any;
-    /** Mount plugins under `root` and observe it for changes. */
     apply(root?: El | ShadowRoot, observe?: boolean): void;
     /** Register more plugins; attribute plugins are applied to observed roots immediately. */
     use(...plugins: Plugin[]): void;