@shwfed/config 3.0.13 → 3.0.15

package/dist/runtime/vendor/cel-js/CLAUDE.md

@@ -20,11 +20,13 @@ A `list.slice(number)` / `list.slice(number, number)` receiver pair has been add
 
 A `string.replace(string, string): string` / `string.replace(string, string, number): string` receiver pair has been added (in `functions.ts` beside `string.trim()`), matching the CEL strings-extension `replace`. The two-arg form delegates to JS `String.prototype.replaceAll` (so all non-overlapping occurrences are replaced; an empty `from` interleaves `to`). The three-arg form takes a limit and mirrors Go's `strings.Replace` via the `replaceLimited` helper: `limit < 0` replaces all, `0` replaces none, otherwise the first `limit` occurrences (`"foo".replace("", "_", 2) == "_f_oo"`).
 
+A `number.format(map): string` receiver method has been added (not from upstream, in `functions.ts` beside the `string(number)` conversion) — renders a number as a display string via `Intl.NumberFormat`. The map argument is passed through verbatim as the second (`options`) argument of `new Intl.NumberFormat('en-US', options)` — the same options object `Number.prototype.toLocaleString(locales, options)` accepts (`minimumFractionDigits`, `maximumFractionDigits`, `useGrouping`, `style`, `currency`, …); the locale is hardcoded to `'en-US'` so grouping renders as a comma and results are deterministic. Two precision-critical details: (1) the value is handed to `.format()` as a **string** (`Decimal.toString()`), not a JS number — `Intl` parses the decimal string at full precision, whereas the `.toNumber()` round-trip would clip past the safe-integer range (this matters for money); the `format` type only admits `number | bigint`, so the call is cast (`fmt.format as (value: string) => string`). (2) The option *values* arrive as `Decimal` (a CEL map literal's `2` is a `Decimal`) and must be unwrapped to JS numbers before `Intl` sees them — `intlOptionsFromMap` walks the map (plain object or host `Map`) and `.toNumber()`s any `Decimal`/`bigint` value, leaving strings/bools; these are small config knobs so their float round-trip is precision-safe. An impossible option combination (e.g. `maximumFractionDigits < minimumFractionDigits`) throws a `RangeError` from the `Intl` constructor, surfaced as `invalid_format_options`. A `dyn` receiver that is a number at runtime resolves too (overload resolution is by runtime type). Tested in `__tests__/number-format.test.ts`.
+
 `evaluate` now returns `Effect<T, ParseError | EvaluationError | TypeError>` instead of a plain value. The entire evaluation pipeline is Effect-based — every AST node's `evaluate` function returns an Effect, and sub-expressions are composed via `Effect.gen` / `yield*`. Promise-based async handling has been removed. User-registered functions may return `Effect` values, which are automatically flatMapped into the evaluation pipeline. Import `Effect` from `effect` and use `Effect.runSync` or `Effect.runPromise` to execute the returned Effect.
 
 The `homogeneousAggregateLiterals` and `enableOptionalTypes` environment options have been removed. Aggregate data structures (lists, maps) are always heterogeneous — mixed-type literals are inferred as `list<dyn>` or `map<dyn, dyn>`. Optional types (`.?`, `[?]`, `optional.*` helpers) are always enabled.
 
-The custom `Optional` class has been replaced with Effect's `Option` type (`import { Option } from 'effect'`). Internal helpers `optionalOf(value)` and `optionalValue(opt)` in `optional.js` handle the CEL-specific semantics (treating `undefined` as `None`, throwing `EvaluationError` on missing value access). The optional surface is `optional.of(A): optional<A>` (the lift / `pure` — `of(null)` is `Some(null)`), `optional.ofNullable(A): optional<A>` (the null-tolerant lift, Java-style — `null` becomes `None`), `optional.none()`, `optional.hasValue()`, `optional.value()`, `optional.or(optional)`, `optional.orValue(value)`, plus `optional<A>.flatMap(var, body): optional<B>` (monadic bind), `optional<A>.map(var, body): optional<B>` (the Functor `fmap`), `optional<A>.zip(other, x, y, body): optional<C>` (the applicative `liftA2` / `zipWith`), `optional<A>.filter(var, predicate): optional<A>` (Rust `Option::filter` / Haskell `mfilter`), and the folds `optional<A>.exists(var, predicate): bool` (predicate on `Some`, `false` on `None` — Rust `is_some_and`) and `optional<A>.all(var, predicate): bool` (predicate on `Some`, vacuously `true` on `None` — Scala `forall`) — all local additions (not from upstream). All are variable-binding macros (registered with `ast` arg types so the unbound args stay unevaluated): on `Some` they bind the value(s) and evaluate `body`; on `None` they short-circuit without touching `body`. `flatMap`'s body must itself yield an `optional`; `map`'s body is a plain value that gets re-wrapped in `Some`; `filter` / `exists` / `all` predicates must be `bool` (enforced at type-check when static, at runtime via `invalid_condition_type` otherwise). `map` is the derived `o.flatMap(v, optional.of(body))` promoted to a first-class macro. `zip` is the flattened `a.flatMap(x, b.map(y, body))`: it type-checks `other` in the outer ctx, binds `x` then `y` under two chained overlays, re-wraps the plain body in `Some`, and short-circuits to `None` if either side is `None` (a `None` receiver skips evaluating `other`). Because CEL has no tuple type the transform is fused (there is no useful `optional<pair>` to return), so `zip` is `zipWith`, not Rust/Scala's pair-building `Option.zip`. The short-circuit makes `zip` observationally monadic — harmless for `optional` (a `None` carries no payload) but it would not generalise to an error-accumulating applicative. An `optional.none()` receiver/argument carries a `param` element type; the shared `bindOptionalValueType` helper (exported from `optional.ts`) binds it as `dyn` so a boolean body still type-checks — every binding macro (`map` / `flatMap` / `zip` / `filter` / `exists` / `all`) goes through it (leaking the `param` into the iteration variable was a real bug in `map` / `flatMap`, regression-tested in `optional-extras.test.ts`). `zip` lives in `optional.ts` beside `flatMap`; the two-variable binding is why it is not folded into the shared `map` expander. NOTE: `map`, `filter`, `all`, and `exists` are **registered in `macros.ts`**, not here — the parser resolves a macro by name before types are known, so the optional variants and the list-comprehension variants must share one expander per name that dispatches on the receiver type at type-check (an `optional` receiver → optional semantics; `list`/`map` → comprehension; a `dyn` receiver is deferred to a runtime `Option.isOption` check). `exists_one` and `find` stay list-only.
+The custom `Optional` class has been replaced with Effect's `Option` type (`import { Option } from 'effect'`). Internal helpers `optionalOf(value)` and `optionalValue(opt)` in `optional.js` handle the CEL-specific semantics (treating `undefined` as `None`, throwing `EvaluationError` on missing value access). **Optional field access diverges from CEL**: `#getOptionalField` in `registry.ts` collapses a present-but-`null` field to `None`, where upstream (and cel-go) yield `Some(null)` — so `row.?foo` and `row.items[?0]` are absent-tolerant against backend JSON, in which `null` is overwhelmingly "absent" (without it `row.?foo.orValue([])` returns `null` and a downstream `size()` fails the overload check — a designer-facing footgun, since `.?` reads as the null-safe path). The collapse is **scoped to field access on purpose**: `optionalOf` itself keeps CEL semantics, so `optional.of(null)` is still `Some(null)` and `find` can still match a null element (its `Option` is the only channel for "did it match", so collapsing there would make a hit indistinguishable from a miss — unlike field access, where `has(row.foo)` and plain `row.foo` remain as escape hatches). `URL.query` is unaffected either way: it null-coalesces (`?? undefined`) before `optionalOf`. Pinned in `optional-extras.test.ts`. The optional surface is `optional.of(A): optional<A>` (the lift / `pure` — `of(null)` is `Some(null)`), `optional.ofNullable(A): optional<A>` (the null-tolerant lift, Java-style — `null` becomes `None`), `optional.none()`, `optional.hasValue()`, `optional.value()`, `optional.or(optional)`, `optional.orValue(value)`, plus `optional<A>.flatMap(var, body): optional<B>` (monadic bind), `optional<A>.map(var, body): optional<B>` (the Functor `fmap`), `optional<A>.zip(other, x, y, body): optional<C>` (the applicative `liftA2` / `zipWith`), `optional<A>.filter(var, predicate): optional<A>` (Rust `Option::filter` / Haskell `mfilter`), and the folds `optional<A>.exists(var, predicate): bool` (predicate on `Some`, `false` on `None` — Rust `is_some_and`) and `optional<A>.all(var, predicate): bool` (predicate on `Some`, vacuously `true` on `None` — Scala `forall`) — all local additions (not from upstream). All are variable-binding macros (registered with `ast` arg types so the unbound args stay unevaluated): on `Some` they bind the value(s) and evaluate `body`; on `None` they short-circuit without touching `body`. `flatMap`'s body must itself yield an `optional`; `map`'s body is a plain value that gets re-wrapped in `Some`; `filter` / `exists` / `all` predicates must be `bool` (enforced at type-check when static, at runtime via `invalid_condition_type` otherwise). `map` is the derived `o.flatMap(v, optional.of(body))` promoted to a first-class macro. `zip` is the flattened `a.flatMap(x, b.map(y, body))`: it type-checks `other` in the outer ctx, binds `x` then `y` under two chained overlays, re-wraps the plain body in `Some`, and short-circuits to `None` if either side is `None` (a `None` receiver skips evaluating `other`). Because CEL has no tuple type the transform is fused (there is no useful `optional<pair>` to return), so `zip` is `zipWith`, not Rust/Scala's pair-building `Option.zip`. The short-circuit makes `zip` observationally monadic — harmless for `optional` (a `None` carries no payload) but it would not generalise to an error-accumulating applicative. An `optional.none()` receiver/argument carries a `param` element type; the shared `bindOptionalValueType` helper (exported from `optional.ts`) binds it as `dyn` so a boolean body still type-checks — every binding macro (`map` / `flatMap` / `zip` / `filter` / `exists` / `all`) goes through it (leaking the `param` into the iteration variable was a real bug in `map` / `flatMap`, regression-tested in `optional-extras.test.ts`). `zip` lives in `optional.ts` beside `flatMap`; the two-variable binding is why it is not folded into the shared `map` expander. NOTE: `map`, `filter`, `all`, and `exists` are **registered in `macros.ts`**, not here — the parser resolves a macro by name before types are known, so the optional variants and the list-comprehension variants must share one expander per name that dispatches on the receiver type at type-check (an `optional` receiver → optional semantics; `list`/`map` → comprehension; a `dyn` receiver is deferred to a runtime `Option.isOption` check). `exists_one` and `find` stay list-only.
 
 A `list.filterMap(var, body): list<dyn>` macro has been added (not from upstream, in `macros.ts` beside `find`) — Rust's `Iterator::filter_map`. The body evaluates to an `optional<B>` per element; `Some` values are kept (unwrapped), `None`s dropped, yielding `list<B>`. It fuses the map-then-strip-absent pattern (which would otherwise need `.map(...)` to build a `list<optional>` plus a second pass to drop the `None`s) and is the optional-gated complement to the 3-arg `map(var, filter, transform)`, whose gate is a bool predicate. NOTE: it is **not** a comprehension desugar — the accu/ternary primitives gate on a bool, not on `Option` presence — so unlike the 2/3-arg `map` and `filter` it runs a manual fold like `find` (eval receiver → coerce Set/Map/object to an array → per-element `ev.eval(body)` → `ensureOptional` → push the `Some`s). Type-check: the receiver element type comes from list `valueType` / map `keyType` / `dyn` (same `invalid_comprehension_range` contract as `find`); the body must be `optional<B>` when statically typed (via `ensureOptionalType`), and a `dyn` body defers to the runtime `ensureOptional` (matching `flatMap`); the result is `registry.getListType(bindOptionalValueType(bodyType))`. Because the body already returns an `optional`, `filterMap` needs no receiver-type dispatch (there is no `optional<A>.filterMap` — that role is `flatMap`), so it is a single list-only expander. Tested in `__tests__/filter-map-macro.test.ts`.
 

package/dist/runtime/vendor/cel-js/PROMPT.md

@@ -91,8 +91,8 @@ time when statically known, at runtime when the source is `dyn`.
 ```cel
 obj.field                   // access field on map/object
 obj["field"]                // bracket access (equivalent)
-obj.?field                  // optional field access (returns optional)
-obj[?0]                     // optional index access (returns optional)
+obj.?field                  // optional field access (returns optional; null counts as absent)
+obj[?0]                     // optional index access (returns optional; null counts as absent)
 ```
 
 ## Built-in Functions
@@ -116,6 +116,26 @@ There is no `int()`, `uint()`, or `double()` — `number` is the only numeric
 type. To produce an integer, round explicitly with `math.trunc` / `math.floor`
 / `math.ceil` / `math.round`.
 
+`string(number)` renders a plain number (no grouping). For a **formatted**
+display string — thousands separators, fixed decimal places, currency, percent —
+use `number.format(options)`:
+```cel
+(1234567).format({})                                     // "1,234,567"  (comma grouping on by default)
+(1234567.5).format({"minimumFractionDigits": 2})         // "1,234,567.50"
+(3.14159).format({"maximumFractionDigits": 2})           // "3.14"
+(1234.5).format({"minimumFractionDigits": 2,
+                 "maximumFractionDigits": 2})             // "1,234.50"  (fixed 2 decimals)
+(1234567).format({"useGrouping": false})                 // "1234567"   (no separators)
+(1234.5).format({"style": "currency", "currency": "CNY"}) // "CN¥1,234.50"
+(0.42).format({"style": "percent"})                      // "42%"
+```
+The map is exactly the `options` object of JavaScript's
+`Number.prototype.toLocaleString(locales, options)` / `Intl.NumberFormat` — the
+locale is fixed to `en-US` (so grouping renders as a comma). The number is
+formatted at full precision (large integers past the float safe range keep every
+digit). An impossible combination (e.g. `minimumFractionDigits` above
+`maximumFractionDigits`) is an error.
+
 ### Math
 ```cel
 math.trunc(3.7)            // 3  — drop the fraction (toward zero)
@@ -414,12 +434,21 @@ An `optional<T>` is either present (`Some`) or absent (`None`). They come from
 (the lift — wraps a value as present), `optional.ofNullable(x)` (like `of`, but
 `null` lifts to absent), and `optional.none()`.
 
+`.?` / `[?]` treat a `null` field as absent, so `row.?foo` is `None` whether
+`foo` is missing, `null`, or `row` itself is `null` — reach for `orValue` and
+trust it. (This differs from standard CEL, where a null field is present.) Only
+`null` collapses; `""`, `0` and `false` are ordinary present values.
+
 ```cel
 optional.of(5)                          // present, holds 5
 optional.of(null)                       // present, holds null (of never inspects the value)
 optional.ofNullable(row.middleName)     // absent when the field is null
 optional.none()                         // absent
 
+row.?foo.orValue([])                    // [] when foo is missing OR null
+row.?foo.orValue("-")                   // "-" when absent; "" stays "" (only null collapses)
+has(row.foo)                            // true even when foo is null — tells null from missing
+
 o.hasValue()                            // bool — is it present?
 o.value()                               // unwrap — ERRORS if absent
 o.orValue(default)                      // unwrap, or `default` when absent

package/dist/runtime/vendor/cel-js/lib/functions.js

@@ -3,7 +3,7 @@ import { Decimal } from "./decimal.js";
 import { TYPES, Type } from "./registry.js";
 import { Option } from "effect";
 import { register as registerOptional, optionalOf } from "./optional.js";
-import { objKeys, arrayFrom } from "./globals.js";
+import { objKeys, arrayFrom, isArray } from "./globals.js";
 import { TZDate } from "@date-fns/tz";
 import { startOfMinute, startOfHour, startOfDay, startOfWeek, startOfMonth, startOfYear, endOfMinute, endOfHour, endOfDay, endOfWeek, endOfMonth, endOfYear, addMilliseconds, addSeconds, addMinutes, addHours, addDays, addWeeks, addMonths, addYears, setMilliseconds, setSeconds, setMinutes, setHours, setDate as setDayOfMonth, setMonth, setYear, format as formatDate, differenceInMilliseconds, differenceInSeconds, differenceInMinutes, differenceInHours, differenceInDays, differenceInWeeks, differenceInMonths, differenceInYears } from "date-fns";
 function toNum(v) {
@@ -87,6 +87,18 @@ export function registerFunctions(registry) {
   functionOverload("string(bool): string", (v) => `${v}`);
   functionOverload("string(number): string", (v) => Decimal.from(v).toString());
   functionOverload("string(bytes): string", (v) => ByteOpts.toUtf8(v));
+  functionOverload("number.format(map): string", (v, options) => {
+    const intlOptions = intlOptionsFromMap(options);
+    let fmt;
+    try {
+      fmt = new Intl.NumberFormat("en-US", intlOptions);
+    } catch (e) {
+      throw evaluationError("invalid_format_options", `number.format(): ${e.message}`);
+    }
+    return fmt.format(
+      Decimal.from(v).toString()
+    );
+  });
   functionOverload("string.startsWith(string): bool", (a, b) => a.startsWith(b));
   functionOverload("string.endsWith(string): bool", (a, b) => a.endsWith(b));
   functionOverload("string.contains(string): bool", (a, b) => a.includes(b));
@@ -440,6 +452,21 @@ export function registerFunctions(registry) {
   functionOverload("string(URL): string", (v) => v.href);
   registerOptional(registry);
 }
+function intlOptionsFromMap(m) {
+  const out = {};
+  const put = (k, val) => {
+    out[String(k)] = val instanceof Decimal ? val.toNumber() : typeof val === "bigint" ? Number(val) : val;
+  };
+  if (m instanceof Map) {
+    for (const [k, val] of m) put(k, val);
+  } else if (m !== null && typeof m === "object" && !isArray(m)) {
+    const obj = m;
+    for (const k of objKeys(obj)) put(k, obj[k]);
+  } else {
+    throw evaluationError("invalid_argument", "number.format(): options must be a map");
+  }
+  return out;
+}
 function stringSize(str) {
   let count = 0;
   for (const _ of str) count++;

package/dist/runtime/vendor/cel-js/lib/registry.js

@@ -180,7 +180,8 @@ export class TypeDeclaration {
     if (unwrapped === void 0) return Option.none();
     const type = ev.debugType(unwrapped);
     try {
-      return optionalOf(type.fieldLazy(unwrapped, key, ast, ev));
+      const value = type.fieldLazy(unwrapped, key, ast, ev);
+      return value === null ? Option.none() : optionalOf(value);
     } catch (e) {
       if (e instanceof EvaluationError) return Option.none();
       throw e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shwfed/config",
-  "version": "3.0.13",
+  "version": "3.0.15",
   "description": "Configurable UI for SHWFED",
   "type": "module",
   "publishConfig": {
@@ -57,6 +57,13 @@
     "@tailwindcss/vite": "^4.3.0",
     "@tanstack/vue-table": "^8.21.3",
     "@tanstack/vue-virtual": "^3.13.24",
+    "@tiptap/core": "3.28.0",
+    "@tiptap/extension-list": "3.28.0",
+    "@tiptap/extension-text-align": "3.28.0",
+    "@tiptap/extensions": "^3.28.0",
+    "@tiptap/pm": "^3.28.0",
+    "@tiptap/starter-kit": "^3.28.0",
+    "@tiptap/vue-3": "^3.28.0",
     "@unovis/ts": "^1.6.5",
     "@unovis/vue": "^1.6.5",
     "@vueuse/core": "^14.3.0",