universal-physics-tensor 8.0.0 → 10.0.0

package/dist/bridges/evaluator-inputs.js

@@ -10,9 +10,10 @@
  *
  * @module bridges/evaluator-inputs
  */
-import { unitConventionNotes, UnitError } from '../dimensional/units.js';
-import { resolveQuantityName, synonymGroup, SynonymDisagreementError, temperatureQuantityRole, } from '../dimensional/formula-names.js';
+import { affineReadingNote, unitConventionNotes, UnitError } from '../dimensional/units.js';
+import { resolveQuantityName, synonymGroup, synonymDisagreement, temperatureQuantityRole, } from '../dimensional/formula-names.js';
 import { readNamedBinding } from '../numerical/binding-value.js';
+import { DuplicateInputError, UnknownInputError } from './evaluation-errors.js';
 /** 15 significant digits: the value itself is passed unrounded. */
 const show = (v) => Number(v.toPrecision(15));
 /** Disclosures that a unit symbol does not carry by itself. */
@@ -30,27 +31,26 @@ function convert(p, raw, reading, siblings, givenName) {
     const read = readNamedBinding(givenName, raw, { reading, siblings, declaredUnit: p.unit });
     if (!read.dimensioned)
         return { value: read.value };
-    const celsius = /degC|°C/.test(raw);
-    const fahrenheit = /degF|°F/.test(raw);
-    const offset = celsius && reading === 'absolute'
-        ? ' (absolute: + 273.15)'
-        : celsius
-            ? ' (a difference: no offset)'
-            : fahrenheit && reading === 'absolute'
-                ? ' (absolute: (degF − 32) × 5/9 + 273.15)'
-                : fahrenheit
-                    ? ' (a difference: × 5/9, no offset)'
-                    : '';
-    const base = `${raw.trim()} → ${show(read.value)} ${p.unit || '(dimensionless)'}${offset}${unitAside(raw)}`;
-    const temperature = read.notes.find((note) => note.includes('k_B T'));
-    return { value: read.value, note: temperature === undefined ? base : `${base}. ${temperature}` };
+    // How an affine reading was applied comes from the unit table's own row (scale and ice point).
+    const offset = read.affine === undefined ? '' : ` (${affineReadingNote(read.affine, reading)})`;
+    // An angular input counts radians; a cycle-counting unit (the `cycles` flag on its row) takes 2π per cycle.
+    const turns = p.angular === true ? read.cycles : 0;
+    if (Number.isNaN(turns)) {
+        throw new UnitError(`'${raw.trim()}' adds a cycle rate to a plain rate, so its radians per second are not defined`);
+    }
+    const value = turns === 0 ? read.value : read.value * (2 * Math.PI) ** turns;
+    const turnsNote = turns === 0 ? '' : turns === 1 ? ' (cycles: × 2π)' : ` (cycles: × (2π)^${turns})`;
+    const base = `${raw.trim()} → ${show(value)} ${p.unit || '(dimensionless)'}${offset}${turnsNote}${unitAside(raw)}`;
+    return { value, note: read.temperatureNote === undefined ? base : `${base}. ${read.temperatureNote}` };
 }
 /**
- * Resolve `args` against `parameters`.
- * @throws UnitError on an unknown key, a repeated input, or a unit that does not fit.
+ * Resolve `args` against `parameters`. `id` names the evaluated id in an input error.
+ * @throws UnknownInputError on an unknown key.
+ * @throws DuplicateInputError on an input given twice.
+ * @throws UnitError on a unit that does not fit.
  * @internal
  */
-export function resolveEvaluatorInputs(parameters, args) {
+export function resolveEvaluatorInputs(parameters, args, id) {
     const inputs = {};
     const resolved = [];
     const known = parameters.flatMap((p) => [p.key, ...(p.alternates ?? []).map((a) => a.key)]);
@@ -67,9 +67,10 @@ export function resolveEvaluatorInputs(parameters, args) {
         const viaSynonym = viaName === null ? undefined : parameters.find((p) => p.key === viaName);
         const p = direct ?? viaAlt ?? viaSynonym;
         if (p === undefined)
-            throw new UnitError(`'${key}' is not an input here; the inputs are: ${known.join(', ')}`);
+            throw new UnknownInputError(id, key, known);
         const earlier = resolved.find((r) => r.key === p.key);
-        const c = convert(p, raw, temperatureQuantityRole(key), siblings, key);
+        const role = temperatureQuantityRole(p.quantity) === 'difference' ? 'difference' : temperatureQuantityRole(key);
+        const c = convert(p, raw, role, siblings, key);
         const alt = direct === undefined && viaAlt !== undefined ? p.alternates.find((a) => a.key === key) : undefined;
         const value = alt === undefined ? c.value : c.value * alt.toKey;
         if (earlier !== undefined) {
@@ -79,10 +80,9 @@ export function resolveEvaluatorInputs(parameters, args) {
             if (synonymRepeat && earlier.value === value)
                 continue;
             if (synonymRepeat) {
-                throw new SynonymDisagreementError(`${earlierName} and ${key} are one quantity and disagree (${earlierName}=${earlier.value}, ${key}=${value})`);
+                throw synonymDisagreement([earlierName, key], { [earlierName]: earlier.value, [key]: value });
             }
-            const throughAlternate = direct === undefined || earlier.via !== undefined;
-            throw new UnitError(`'${p.key}' is given twice${throughAlternate ? ' (once through an alternate)' : ''}`);
+            throw new DuplicateInputError(id, p.key, [earlierName, key]);
         }
         inputs[p.key] = value;
         resolved.push({

package/dist/bridges/evaluator-inputs.js.map

@@ -1 +1 @@
-{"version":3,"file":"evaluator-inputs.js","sourceRoot":"","sources":["../../src/bridges/evaluator-inputs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"evaluator-inputs.js","sourceRoot":"","sources":["../../src/bridges/evaluator-inputs.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * `key=value[unit]` arguments → an evaluator's numeric inputs, through the\n * evaluator's declared parameters.\n *\n * Every argument must name a declared input or a declared alternate: an\n * unrecognised key is refused rather than ignored, because an ignored\n * `radius_m=` beside a required `diameter_m` is exactly the silent mistake the\n * declarations exist to catch. A value may carry a unit; it is converted into\n * the declared unit only when the dimensions agree.\n *\n * @module bridges/evaluator-inputs\n */\nimport { affineReadingNote, unitConventionNotes, UnitError, type TemperatureReading } from '../dimensional/units.js';\nimport {\n  resolveQuantityName,\n  synonymGroup,\n  synonymDisagreement,\n  temperatureQuantityRole,\n} from '../dimensional/formula-names.js';\nimport { readNamedBinding, type NamedBindingSibling } from '../numerical/binding-value.js';\nimport type { EvaluatorParameter } from './evaluators.js';\nimport { DuplicateInputError, UnknownInputError } from './evaluation-errors.js';\n\n/** One input as it was given and as the evaluator receives it. @internal */\nexport interface ResolvedInput {\n  readonly key: string;\n  readonly value: number;\n  readonly unit: string;\n  readonly given: string;\n  /** The alternate key it was given under, when it was. */\n  readonly via?: string;\n  readonly note?: string;\n}\n\n/** 15 significant digits: the value itself is passed unrounded. */\nconst show = (v: number): number => Number(v.toPrecision(15));\n\n/** Disclosures that a unit symbol does not carry by itself. */\nfunction unitAside(given: string): string {\n  const notes = unitConventionNotes(given);\n  return notes.length === 0 ? '' : ` — ${notes.join('; ')}`;\n}\n\nconst splitArg = (a: string): [string, string] => {\n  const eq = a.indexOf('=');\n  if (eq <= 0) throw new UnitError(`'${a}' must be key=value (e.g. d_m=1um)`);\n  return [a.slice(0, eq), a.slice(eq + 1)];\n};\n\nfunction convert(\n  p: EvaluatorParameter,\n  raw: string,\n  reading: TemperatureReading,\n  siblings: readonly NamedBindingSibling[],\n  givenName: string,\n): { value: number; note?: string } {\n  const read = readNamedBinding(givenName, raw, { reading, siblings, declaredUnit: p.unit });\n  if (!read.dimensioned) return { value: read.value };\n  // How an affine reading was applied comes from the unit table's own row (scale and ice point).\n  const offset = read.affine === undefined ? '' : ` (${affineReadingNote(read.affine, reading)})`;\n  // An angular input counts radians; a cycle-counting unit (the `cycles` flag on its row) takes 2π per cycle.\n  const turns = p.angular === true ? read.cycles : 0;\n  if (Number.isNaN(turns)) {\n    throw new UnitError(`'${raw.trim()}' adds a cycle rate to a plain rate, so its radians per second are not defined`);\n  }\n  const value = turns === 0 ? read.value : read.value * (2 * Math.PI) ** turns;\n  const turnsNote = turns === 0 ? '' : turns === 1 ? ' (cycles: × 2π)' : ` (cycles: × (2π)^${turns})`;\n  const base = `${raw.trim()} → ${show(value)} ${p.unit || '(dimensionless)'}${offset}${turnsNote}${unitAside(raw)}`;\n  return { value, note: read.temperatureNote === undefined ? base : `${base}. ${read.temperatureNote}` };\n}\n\n/**\n * Resolve `args` against `parameters`. `id` names the evaluated id in an input error.\n * @throws UnknownInputError on an unknown key.\n * @throws DuplicateInputError on an input given twice.\n * @throws UnitError on a unit that does not fit.\n * @internal\n */\nexport function resolveEvaluatorInputs(\n  parameters: readonly EvaluatorParameter[],\n  args: readonly string[],\n  id?: string,\n): { inputs: Record<string, number>; resolved: ResolvedInput[] } {\n  const inputs: Record<string, number> = {};\n  const resolved: ResolvedInput[] = [];\n  const known = parameters.flatMap((p) => [p.key, ...(p.alternates ?? []).map((a) => a.key)]);\n  const parameterNames = new Set(parameters.map((p) => p.key));\n  const siblings: NamedBindingSibling[] = args.map((arg) => {\n    const [key, raw] = splitArg(arg);\n    return { name: key, raw };\n  });\n  for (const arg of args) {\n    const [key, raw] = splitArg(arg);\n    const direct = parameters.find((p) => p.key === key);\n    const viaAlt = parameters.find((p) => (p.alternates ?? []).some((a) => a.key === key));\n    const viaName = direct === undefined && viaAlt === undefined ? resolveQuantityName(key, parameterNames) : null;\n    const viaSynonym = viaName === null ? undefined : parameters.find((p) => p.key === viaName);\n    const p = direct ?? viaAlt ?? viaSynonym;\n    if (p === undefined) throw new UnknownInputError(id, key, known);\n    const earlier = resolved.find((r) => r.key === p.key);\n    const role = temperatureQuantityRole(p.quantity) === 'difference' ? 'difference' : temperatureQuantityRole(key);\n    const c = convert(p, raw, role, siblings, key);\n    const alt = direct === undefined && viaAlt !== undefined ? p.alternates!.find((a) => a.key === key)! : undefined;\n    const value = alt === undefined ? c.value : c.value * alt.toKey;\n    if (earlier !== undefined) {\n      const earlierName = earlier.via ?? earlier.key;\n      const group = synonymGroup(key);\n      const synonymRepeat =\n        group !== undefined && earlierName !== key && group.includes(earlierName) && group.includes(key);\n      if (synonymRepeat && earlier.value === value) continue;\n      if (synonymRepeat) {\n        throw synonymDisagreement([earlierName, key], { [earlierName]: earlier.value, [key]: value })!;\n      }\n      throw new DuplicateInputError(id, p.key, [earlierName, key]);\n    }\n    inputs[p.key] = value;\n    resolved.push({\n      key: p.key,\n      value,\n      unit: p.unit,\n      given: raw,\n      ...(alt !== undefined || viaSynonym !== undefined ? { via: key } : {}),\n      ...(alt !== undefined\n        ? { note: `${key}=${raw.trim()} is ${alt.meaning}; ${p.key} = ${alt.toKey} × ${show(c.value)} = ${show(value)} ${p.unit}` }\n        : c.note === undefined\n          ? {}\n          : { note: c.note }),\n    });\n  }\n  return { inputs, resolved };\n}\n"]}

package/dist/bridges/evaluators.d.ts

@@ -2,9 +2,15 @@
  * Closed-form evaluators projected from the catalog. `run` evaluates the
  * relation expression. It does not switch on a catalog id.
  *
+ * `run` is the one evaluation of a catalog closed form: `evaluateRelation`,
+ * the CLI and the uncertainty probes all call it. It checks the bindings
+ * against the evaluator's {@link InputContract} before the validity domain,
+ * so an absent input is a {@link MissingInputError}, never a domain failure.
+ *
  * @module bridges/evaluators
  */
-import type { CatalogRelation } from './catalog-types.js';
+import type { CatalogEvaluator, CatalogEvaluatorOutput } from './catalog-types.js';
+import { type EvaluationWant, type InputContract } from './input-contract.js';
 /** How a length input is read: radius, diameter, separation, impact parameter, or semi-major axis. @public */
 export type GeometryRole = 'radius' | 'diameter' | 'separation' | 'impact-parameter' | 'semi-major-axis';
 /** A second key that converts into the parameter's key. @public */
@@ -22,7 +28,12 @@ export interface EvaluatorParameter {
     readonly meaning: string;
     readonly geometry?: GeometryRole;
     readonly temperature?: 'absolute';
+    /** The sign this input must have; the catalog loader turns it into a validity clause. */
+    readonly sign?: 'positive' | 'nonnegative' | 'any';
+    /** An angular frequency in rad/s. A cycle unit (Hz, rpm) given to it is multiplied by 2π. */
+    readonly angular?: true;
     readonly alternates?: readonly ParameterAlternate[];
+    /** Derived: the parameter binds no relation source, so only an extra output reads it. */
     readonly optional?: true;
 }
 /** A callable bridge evaluator with its input contract. @public */
@@ -31,19 +42,48 @@ export interface EvaluatorSpec {
     readonly name: string;
     readonly inputKeys: readonly string[];
     readonly parameters: readonly EvaluatorParameter[];
-    run(inputs: Readonly<Record<string, number>>): unknown;
+    /** Further numbers `run` returns beside `value`, keyed by `name`. */
+    readonly outputs: readonly CatalogEvaluatorOutput[];
+    /** Every spelling that binds an input, and which inputs are required. `run` checks it first. */
+    readonly contract: InputContract;
+    /**
+     * Evaluate at `inputs`, keyed by parameter key, quantity, relation source,
+     * alias or alternate. Throws `UnknownInputError`, `InputTypeError`,
+     * `DuplicateInputError` or `MissingInputError` before any
+     * `DomainViolationError`. With `want` `'value'` it returns `{ value }`
+     * alone, and an input only an extra output reads is not required.
+     */
+    run(inputs: Readonly<Record<string, number>>, want?: EvaluationWant): Record<string, number>;
 }
-/** Map evaluator keys onto catalog quantity names. A named constant fills a source no parameter owns. */
-export declare function bindRelationInputs(relation: CatalogRelation, parameters: readonly EvaluatorParameter[], inputs: Readonly<Record<string, number>>): Record<string, number>;
+/**
+ * Keys of the parameters whose source does not appear in the relation's
+ * expression. They are checked against the validity domain and do not change
+ * the value, so a caller who varies one sees no effect.
+ */
+export declare function unusedInputKeys(spec: EvaluatorSpec): string[];
+/**
+ * The spec of one catalog evaluator row. A parameter that binds no relation
+ * source is read only by an extra output and is optional: the output is left
+ * out when it is not given. An output expression reads the scope by
+ * parameter key, so a key that names a registered constant (be-66's
+ * reflectance `R`) may bind the relation's source but may not be read by an
+ * output: building the spec refuses it.
+ * @internal
+ */
+export declare function buildEvaluatorSpec(row: CatalogEvaluator): EvaluatorSpec;
 /** Bridge id → evaluator. @internal */
 export declare const BRIDGE_EVALUATORS: ReadonlyMap<number, EvaluatorSpec>;
-/** What to say when an id is not in {@link BRIDGE_EVALUATORS}. @internal */
+/**
+ * What to say when an id is not in {@link BRIDGE_EVALUATORS}: an id outside
+ * the catalog and a catalog row with no evaluator are two different facts.
+ * @internal
+ */
 export declare function missingEvaluatorMessage(bridgeId: number): string;
 /**
- * Evaluate a catalog id with a numeric input record. Throws on an unknown id
- * or a missing required input.
+ * Evaluate a catalog id with a numeric input record: the evaluator's `run`,
+ * which checks the inputs first. Throws on an unknown id.
  *
  * @internal
  */
-export declare function evaluateBridge(bridgeId: number, inputs: Readonly<Record<string, number>>): unknown;
+export declare function evaluateBridge(bridgeId: number, inputs: Readonly<Record<string, number>>): Record<string, number>;
 //# sourceMappingURL=evaluators.d.ts.map

package/dist/bridges/evaluators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evaluators.d.ts","sourceRoot":"","sources":["../../src/bridges/evaluators.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAA6B,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrF,8GAA8G;AAC9G,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,UAAU,GAAG,YAAY,GAAG,kBAAkB,GAAG,iBAAiB,CAAC;AAEzG,mEAAmE;AACnE,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,+CAA+C;AAC/C,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC;IACjC,QAAQ,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC;IAClC,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACpD,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC;CAC1B;AAED,mEAAmE;AACnE,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,QAAQ,CAAC,UAAU,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACnD,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC;CACxD;AAkBD,yGAAyG;AACzG,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,eAAe,EACzB,UAAU,EAAE,SAAS,kBAAkB,EAAE,EACzC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAwBxB;AAsBD,uCAAuC;AACvC,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC,MAAM,EAAE,aAAa,CAKhE,CAAC;AAEF,4EAA4E;AAC5E,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEhE;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GACvC,OAAO,CAUT"}
+{"version":3,"file":"evaluators.d.ts","sourceRoot":"","sources":["../../src/bridges/evaluators.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAA8C,MAAM,oBAAoB,CAAC;AAK/H,OAAO,EAA8B,KAAK,cAAc,EAAE,KAAK,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AAE1H,8GAA8G;AAC9G,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,UAAU,GAAG,YAAY,GAAG,kBAAkB,GAAG,iBAAiB,CAAC;AAEzG,mEAAmE;AACnE,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,+CAA+C;AAC/C,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC;IACjC,QAAQ,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC;IAClC,yFAAyF;IACzF,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,GAAG,aAAa,GAAG,KAAK,CAAC;IACnD,6FAA6F;IAC7F,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC;IACxB,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACpD,yFAAyF;IACzF,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC;CAC1B;AAED,mEAAmE;AACnE,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,QAAQ,CAAC,UAAU,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACnD,qEAAqE;IACrE,QAAQ,CAAC,OAAO,EAAE,SAAS,sBAAsB,EAAE,CAAC;IACpD,gGAAgG;IAChG,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC;IACjC;;;;;;OAMG;IACH,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9F;AAoCD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,EAAE,CAc7D;AAsED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,gBAAgB,GAAG,aAAa,CAKvE;AAsDD,uCAAuC;AACvC,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC,MAAM,EAAE,aAAa,CAEhE,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAOhE;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAIxB"}

package/dist/bridges/evaluators.js

@@ -2,13 +2,20 @@
  * Closed-form evaluators projected from the catalog. `run` evaluates the
  * relation expression. It does not switch on a catalog id.
  *
+ * `run` is the one evaluation of a catalog closed form: `evaluateRelation`,
+ * the CLI and the uncertainty probes all call it. It checks the bindings
+ * against the evaluator's {@link InputContract} before the validity domain,
+ * so an absent input is a {@link MissingInputError}, never a domain failure.
+ *
  * @module bridges/evaluators
  */
 import { FORMULA_NAMED } from '../dimensional/formula-names.js';
-import { primaryRelation } from './catalog-load.js';
-import { catalogEvaluators } from './catalog-load.js';
+import { catalogEntries, catalogEntry, catalogEvaluators, primaryRelation } from './catalog-load.js';
+import { evaluateFormula, formulaVariables, parseCatalogExpression, reservedFormulaNames } from './expr-parse.js';
 import { evaluateCatalogRelation, relationHolds } from './relation-eval.js';
-function toParameter(row) {
+import { DomainViolationError } from './evaluation-errors.js';
+import { checkInputs, inputContract } from './input-contract.js';
+function toParameter(row, optional) {
     return {
         key: row.key,
         quantity: row.quantity,
@@ -17,72 +24,204 @@ function toParameter(row) {
         meaning: row.meaning,
         ...(row.geometry !== undefined ? { geometry: row.geometry } : {}),
         ...(row.temperature !== undefined ? { temperature: row.temperature } : {}),
+        ...(row.sign !== undefined ? { sign: row.sign } : {}),
+        ...(row.angular === true ? { angular: true } : {}),
         ...(row.alternates !== undefined ? { alternates: row.alternates } : {}),
-        ...(row.optional === true ? { optional: true } : {}),
+        ...(optional ? { optional: true } : {}),
     };
 }
 const NAMED_DEFAULT = new Map(FORMULA_NAMED.map((named) => [named.name, named.value]));
-/** Map evaluator keys onto catalog quantity names. A named constant fills a source no parameter owns. */
-export function bindRelationInputs(relation, parameters, inputs) {
-    const sourceOfKey = new Map();
+/** The relation source a parameter is the input for, or undefined when it owns none. */
+function sourceOfParameter(relation, parameter) {
     for (const source of relation.sources) {
-        sourceOfKey.set(source, source);
-        for (const alias of relation.aliases[source] ?? [])
-            sourceOfKey.set(alias, source);
+        if (source === parameter.key || (relation.aliases[source] ?? []).includes(parameter.key))
+            return source;
     }
+    return relation.sources.includes(parameter.quantity) ? parameter.quantity : undefined;
+}
+/** Every symbol name in an expression tree. */
+function symbolNames(node) {
+    if (node.kind === 'symbol')
+        return [node.name];
+    if (node.kind === 'op')
+        return node.args.flatMap(symbolNames);
+    if (node.kind === 'abs' || node.kind === 'transcendental')
+        return symbolNames(node.arg);
+    return [];
+}
+/**
+ * Keys of the parameters whose source does not appear in the relation's
+ * expression. They are checked against the validity domain and do not change
+ * the value, so a caller who varies one sees no effect.
+ */
+export function unusedInputKeys(spec) {
+    const relation = primaryRelation(spec.bridgeId);
+    if (relation === undefined)
+        return [];
+    const used = new Set(symbolNames(parseCatalogExpression(relation.expression)));
+    // An output reads the scope names its parsed expression names, the same parse `run` evaluates.
+    const outputReads = new Set(spec.outputs.flatMap((output) => formulaVariables(output.expression)));
+    const readByOutput = (key) => outputReads.has(key.replaceAll('-', '_'));
+    return spec.parameters
+        .filter((parameter) => {
+        const source = sourceOfParameter(relation, parameter);
+        // A parameter that owns no relation source is read only by an extra output.
+        return (source === undefined || !used.has(source)) && !readByOutput(parameter.key);
+    })
+        .map((parameter) => parameter.key);
+}
+/**
+ * The declared inputs of a catalog evaluator: one slot per parameter, spelled
+ * by its key, its relation source and that source's aliases, and its quantity
+ * when no other slot shares it; then one optional, unlisted slot per relation
+ * source no parameter owns, which a named constant fills when not given.
+ * Building it throws when one spelling would bind two slots.
+ */
+function evaluatorContract(catalogId, relation, parameters) {
+    const quantityCount = new Map();
+    for (const p of parameters)
+        quantityCount.set(p.quantity, (quantityCount.get(p.quantity) ?? 0) + 1);
+    const owned = new Set();
+    const slots = parameters.map((p) => {
+        const source = sourceOfParameter(relation, p);
+        if (source !== undefined)
+            owned.add(source);
+        const spellings = [
+            p.key,
+            ...(source === undefined ? [] : [source, ...(relation.aliases[source] ?? [])]),
+            ...(quantityCount.get(p.quantity) === 1 ? [p.quantity] : []),
+        ];
+        return {
+            key: p.key,
+            spellings: [...new Set(spellings)],
+            alternates: (p.alternates ?? []).map((alt) => ({ key: alt.key, toKey: alt.toKey })),
+            optional: p.optional === true,
+            readBy: source === undefined ? 'outputs' : 'value',
+            listed: true,
+        };
+    });
+    for (const source of relation.sources) {
+        if (owned.has(source))
+            continue;
+        slots.push({
+            key: source,
+            spellings: [source, ...(relation.aliases[source] ?? [])],
+            alternates: [],
+            optional: NAMED_DEFAULT.has(source.replaceAll('-', '_')),
+            readBy: 'value',
+            listed: false,
+        });
+    }
+    return inputContract(`be-${catalogId}`, slots);
+}
+/**
+ * Checked inputs (keyed by slot key) onto catalog source names. A source no
+ * parameter owns takes its given value, else its named constant.
+ */
+function bindRelationInputs(relation, parameters, inputs) {
     const bound = {};
     const owned = new Set();
     for (const parameter of parameters) {
-        const source = sourceOfKey.get(parameter.key) ??
-            (relation.sources.includes(parameter.quantity) ? parameter.quantity : undefined);
+        const source = sourceOfParameter(relation, parameter);
         if (source === undefined)
             continue;
         owned.add(source);
         const value = inputs[parameter.key];
-        if (value === undefined || !Number.isFinite(value))
-            continue;
-        bound[source] = value;
+        if (value !== undefined)
+            bound[source] = value;
     }
     for (const source of relation.sources) {
-        if (bound[source] !== undefined || owned.has(source))
+        if (owned.has(source))
             continue;
-        const value = NAMED_DEFAULT.get(source.replaceAll('-', '_'));
+        const value = inputs[source] ?? NAMED_DEFAULT.get(source.replaceAll('-', '_'));
         if (value !== undefined)
             bound[source] = value;
     }
     return bound;
 }
-function buildSpec(catalogId, name, parameters) {
+/**
+ * The spec of one catalog evaluator row. A parameter that binds no relation
+ * source is read only by an extra output and is optional: the output is left
+ * out when it is not given. An output expression reads the scope by
+ * parameter key, so a key that names a registered constant (be-66's
+ * reflectance `R`) may bind the relation's source but may not be read by an
+ * output: building the spec refuses it.
+ * @internal
+ */
+export function buildEvaluatorSpec(row) {
+    const relation = primaryRelation(row.catalogId);
+    if (relation === undefined)
+        throw new Error(missingEvaluatorMessage(row.catalogId));
+    const parameters = row.parameters.map((p) => toParameter(p, sourceOfParameter(relation, p) === undefined));
+    return buildSpec(row.catalogId, row.name, parameters, row.outputs ?? []);
+}
+function buildSpec(catalogId, name, parameters, outputs) {
+    const relation = primaryRelation(catalogId);
+    if (relation === undefined)
+        throw new Error(missingEvaluatorMessage(catalogId));
+    const contract = evaluatorContract(catalogId, relation, parameters);
+    const keys = parameters.map((parameter) => parameter.key);
+    const reserved = reservedFormulaNames();
+    for (const output of outputs) {
+        const shadowed = formulaVariables(output.expression).find((name) => reserved.has(name) && keys.includes(name));
+        if (shadowed !== undefined) {
+            throw new Error(`be-${catalogId}: output '${output.name}' reads '${shadowed}', which names a registered constant`);
+        }
+    }
+    // An output reads the parameter keys and `value`; a key that shadows a constant is refused above.
+    const outputScope = [...keys, 'value'];
+    // An output is computed when every parameter key it reads was given.
+    const reads = outputs.map((output) => formulaVariables(output.expression).filter((name) => keys.includes(name)));
     return {
         bridgeId: catalogId,
         name,
         inputKeys: parameters.filter((parameter) => parameter.optional !== true).map((parameter) => parameter.key),
         parameters,
-        run(inputs) {
-            const relation = primaryRelation(catalogId);
-            if (relation === undefined) {
-                throw new Error(missingEvaluatorMessage(catalogId));
-            }
-            const bound = bindRelationInputs(relation, parameters, inputs);
+        outputs,
+        contract,
+        run(inputs, want = 'all') {
+            const given = checkInputs(contract, inputs, want);
+            const bound = bindRelationInputs(relation, parameters, given);
             if (!relationHolds(relation, bound)) {
-                throw new Error(`${relation.id}: inputs violate validity domain (${relation.domain})`);
+                throw new DomainViolationError(`${relation.id}: inputs violate validity domain (${relation.domain})`);
+            }
+            for (const parameter of parameters) {
+                const value = given[parameter.key];
+                if (parameter.optional === true && parameter.sign === 'positive' && value !== undefined && !(value > 0)) {
+                    throw new DomainViolationError(`${relation.id}: ${parameter.key} must be > 0`);
+                }
             }
-            return { value: evaluateCatalogRelation(relation, bound) };
+            const value = evaluateCatalogRelation(relation, bound);
+            const result = { value };
+            if (want === 'value')
+                return result;
+            outputs.forEach((output, i) => {
+                if (reads[i].some((key) => given[key] === undefined))
+                    return;
+                result[output.name] = evaluateFormula(output.expression, { ...given, value }, outputScope);
+            });
+            return result;
         },
     };
 }
 /** Bridge id → evaluator. @internal */
-export const BRIDGE_EVALUATORS = new Map(catalogEvaluators().map((row) => {
-    const parameters = row.parameters.map(toParameter);
-    return [row.catalogId, buildSpec(row.catalogId, row.name, parameters)];
-}));
-/** What to say when an id is not in {@link BRIDGE_EVALUATORS}. @internal */
+export const BRIDGE_EVALUATORS = new Map(catalogEvaluators().map((row) => [row.catalogId, buildEvaluatorSpec(row)]));
+/**
+ * What to say when an id is not in {@link BRIDGE_EVALUATORS}: an id outside
+ * the catalog and a catalog row with no evaluator are two different facts.
+ * @internal
+ */
 export function missingEvaluatorMessage(bridgeId) {
-    return `evaluateBridge: catalog id ${bridgeId} has no evaluator`;
+    const entry = catalogEntry(bridgeId);
+    if (entry === undefined) {
+        const ids = catalogEntries().map((e) => e.id);
+        return `be-${bridgeId} is not a catalog id (the catalog holds be-${Math.min(...ids)} to be-${Math.max(...ids)})`;
+    }
+    return `be-${bridgeId} (${entry.name}) has no evaluator; \`upt atlas be-${bridgeId}\` prints its record, and \`upt evaluate\` with no id lists the evaluable ids`;
 }
 /**
- * Evaluate a catalog id with a numeric input record. Throws on an unknown id
- * or a missing required input.
+ * Evaluate a catalog id with a numeric input record: the evaluator's `run`,
+ * which checks the inputs first. Throws on an unknown id.
  *
  * @internal
  */
@@ -90,10 +229,6 @@ export function evaluateBridge(bridgeId, inputs) {
     const spec = BRIDGE_EVALUATORS.get(bridgeId);
     if (spec === undefined)
         throw new Error(missingEvaluatorMessage(bridgeId));
-    const missing = spec.inputKeys.filter((key) => !(key in inputs) || !Number.isFinite(inputs[key]));
-    if (missing.length > 0) {
-        throw new Error(`evaluateBridge: catalog id ${bridgeId} (${spec.name}) needs {${spec.inputKeys.join(', ')}}; missing/non-finite: ${missing.join(', ')}`);
-    }
     return spec.run(inputs);
 }
 //# sourceMappingURL=evaluators.js.map

package/dist/bridges/evaluators.js.map

@@ -1 +1 @@
-{"version":3,"file":"evaluators.js","sourceRoot":"","sources":["../../src/bridges/evaluators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"evaluators.js","sourceRoot":"","sources":["../../src/bridges/evaluators.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAErG,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAElH,OAAO,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,aAAa,EAA2D,MAAM,qBAAqB,CAAC;AAkD1H,SAAS,WAAW,CAAC,GAA8B,EAAE,QAAiB;IACpE,OAAO;QACL,GAAG,EAAE,GAAG,CAAC,GAAG;QACZ,QAAQ,EAAE,GAAG,CAAC,QAAQ;QACtB,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,GAAG,CAAC,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,GAAG,CAAC,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,GAAG,CAAC,GAAG,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3D,GAAG,CAAC,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjD,CAAC;AACJ,CAAC;AAED,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEvF,wFAAwF;AACxF,SAAS,iBAAiB,CAAC,QAAyB,EAAE,SAAuD;IAC3G,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QACtC,IAAI,MAAM,KAAK,SAAS,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC;YAAE,OAAO,MAAM,CAAC;IAC1G,CAAC;IACD,OAAO,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;AACxF,CAAC;AAED,+CAA+C;AAC/C,SAAS,WAAW,CAAC,IAAc;IACjC,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ;QAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9D,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB;QAAE,OAAO,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxF,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,IAAmB;IACjD,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChD,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IACtC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,sBAAsB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/E,+FAA+F;IAC/F,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACnG,MAAM,YAAY,GAAG,CAAC,GAAW,EAAW,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IACzF,OAAO,IAAI,CAAC,UAAU;SACnB,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;QACpB,MAAM,MAAM,GAAG,iBAAiB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QACtD,4EAA4E;QAC5E,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACrF,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AACvC,CAAC;AAED;;;;;;GAMG;AACH,SAAS,iBAAiB,CAAC,SAAiB,EAAE,QAAyB,EAAE,UAAyC;IAChH,MAAM,aAAa,GAAG,IAAI,GAAG,EAAkB,CAAC;IAChD,KAAK,MAAM,CAAC,IAAI,UAAU;QAAE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACpG,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,MAAM,KAAK,GAAgB,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC9C,MAAM,MAAM,GAAG,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC9C,IAAI,MAAM,KAAK,SAAS;YAAE,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,SAAS,GAAG;YAChB,CAAC,CAAC,GAAG;YACL,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YAC9E,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAC7D,CAAC;QACF,OAAO;YACL,GAAG,EAAE,CAAC,CAAC,GAAG;YACV,SAAS,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;YAClC,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;YACnF,QAAQ,EAAE,CAAC,CAAC,QAAQ,KAAK,IAAI;YAC7B,MAAM,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAE,SAAmB,CAAC,CAAC,CAAE,OAAiB;YACxE,MAAM,EAAE,IAAI;SACb,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QACtC,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC;YAAE,SAAS;QAChC,KAAK,CAAC,IAAI,CAAC;YACT,GAAG,EAAE,MAAM;YACX,SAAS,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YACxD,UAAU,EAAE,EAAE;YACd,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACxD,MAAM,EAAE,OAAO;YACf,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;IACL,CAAC;IACD,OAAO,aAAa,CAAC,MAAM,SAAS,EAAE,EAAE,KAAK,CAAC,CAAC;AACjD,CAAC;AAED;;;GAGG;AACH,SAAS,kBAAkB,CACzB,QAAyB,EACzB,UAAyC,EACzC,MAAwC;IAExC,MAAM,KAAK,GAA2B,EAAE,CAAC;IACzC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,iBAAiB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QACtD,IAAI,MAAM,KAAK,SAAS;YAAE,SAAS;QACnC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAClB,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,KAAK,KAAK,SAAS;YAAE,KAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;IACjD,CAAC;IACD,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QACtC,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC;YAAE,SAAS;QAChC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QAC/E,IAAI,KAAK,KAAK,SAAS;YAAE,KAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;IACjD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAAqB;IACtD,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAChD,IAAI,QAAQ,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IACpF,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC;IAC3G,OAAO,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;AAC3E,CAAC;AAED,SAAS,SAAS,CAChB,SAAiB,EACjB,IAAY,EACZ,UAAyC,EACzC,OAA0C;IAE1C,MAAM,QAAQ,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAC5C,IAAI,QAAQ,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC,CAAC;IAChF,MAAM,QAAQ,GAAG,iBAAiB,CAAC,SAAS,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;IACpE,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,oBAAoB,EAAE,CAAC;IACxC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/G,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,MAAM,SAAS,aAAa,MAAM,CAAC,IAAI,YAAY,QAAQ,sCAAsC,CAAC,CAAC;QACrH,CAAC;IACH,CAAC;IACD,kGAAkG;IAClG,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;IACvC,qEAAqE;IACrE,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjH,OAAO;QACL,QAAQ,EAAE,SAAS;QACnB,IAAI;QACJ,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC;QAC1G,UAAU;QACV,OAAO;QACP,QAAQ;QACR,GAAG,CAAC,MAAM,EAAE,IAAI,GAAG,KAAK;YACtB,MAAM,KAAK,GAAG,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YAClD,MAAM,KAAK,GAAG,kBAAkB,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;YAC9D,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC;gBACpC,MAAM,IAAI,oBAAoB,CAAC,GAAG,QAAQ,CAAC,EAAE,qCAAqC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;YACxG,CAAC;YACD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACnC,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnC,IAAI,SAAS,CAAC,QAAQ,KAAK,IAAI,IAAI,SAAS,CAAC,IAAI,KAAK,UAAU,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC;oBACxG,MAAM,IAAI,oBAAoB,CAAC,GAAG,QAAQ,CAAC,EAAE,KAAK,SAAS,CAAC,GAAG,cAAc,CAAC,CAAC;gBACjF,CAAC;YACH,CAAC;YACD,MAAM,KAAK,GAAG,uBAAuB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YACvD,MAAM,MAAM,GAA2B,EAAE,KAAK,EAAE,CAAC;YACjD,IAAI,IAAI,KAAK,OAAO;gBAAE,OAAO,MAAM,CAAC;YACpC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC5B,IAAI,KAAK,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC;oBAAE,OAAO;gBAC9D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,EAAE,WAAW,CAAC,CAAC;YAC7F,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;QAChB,CAAC;KACF,CAAC;AACJ,CAAC;AAED,uCAAuC;AACvC,MAAM,CAAC,MAAM,iBAAiB,GAAuC,IAAI,GAAG,CAC1E,iBAAiB,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAU,CAAC,CACpF,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,QAAgB;IACtD,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IACrC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC9C,OAAO,MAAM,QAAQ,8CAA8C,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,UAAU,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC;IACnH,CAAC;IACD,OAAO,MAAM,QAAQ,KAAK,KAAK,CAAC,IAAI,sCAAsC,QAAQ,+EAA+E,CAAC;AACpK,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAC5B,QAAgB,EAChB,MAAwC;IAExC,MAAM,IAAI,GAAG,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC7C,IAAI,IAAI,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3E,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAC1B,CAAC","sourcesContent":["/**\n * Closed-form evaluators projected from the catalog. `run` evaluates the\n * relation expression. It does not switch on a catalog id.\n *\n * `run` is the one evaluation of a catalog closed form: `evaluateRelation`,\n * the CLI and the uncertainty probes all call it. It checks the bindings\n * against the evaluator's {@link InputContract} before the validity domain,\n * so an absent input is a {@link MissingInputError}, never a domain failure.\n *\n * @module bridges/evaluators\n */\n\nimport { FORMULA_NAMED } from '../dimensional/formula-names.js';\nimport { catalogEntries, catalogEntry, catalogEvaluators, primaryRelation } from './catalog-load.js';\nimport type { CatalogEvaluator, CatalogEvaluatorOutput, CatalogEvaluatorParameter, CatalogRelation } from './catalog-types.js';\nimport { evaluateFormula, formulaVariables, parseCatalogExpression, reservedFormulaNames } from './expr-parse.js';\nimport type { ExprNode } from '../dimensional/ast-types.js';\nimport { evaluateCatalogRelation, relationHolds } from './relation-eval.js';\nimport { DomainViolationError } from './evaluation-errors.js';\nimport { checkInputs, inputContract, type EvaluationWant, type InputContract, type InputSlot } from './input-contract.js';\n\n/** How a length input is read: radius, diameter, separation, impact parameter, or semi-major axis. @public */\nexport type GeometryRole = 'radius' | 'diameter' | 'separation' | 'impact-parameter' | 'semi-major-axis';\n\n/** A second key that converts into the parameter's key. @public */\nexport interface ParameterAlternate {\n  readonly key: string;\n  readonly meaning: string;\n  readonly toKey: number;\n}\n\n/** One named input of an evaluator. @public */\nexport interface EvaluatorParameter {\n  readonly key: string;\n  readonly quantity: string;\n  readonly symbol: string;\n  readonly unit: string;\n  readonly meaning: string;\n  readonly geometry?: GeometryRole;\n  readonly temperature?: 'absolute';\n  /** The sign this input must have; the catalog loader turns it into a validity clause. */\n  readonly sign?: 'positive' | 'nonnegative' | 'any';\n  /** An angular frequency in rad/s. A cycle unit (Hz, rpm) given to it is multiplied by 2π. */\n  readonly angular?: true;\n  readonly alternates?: readonly ParameterAlternate[];\n  /** Derived: the parameter binds no relation source, so only an extra output reads it. */\n  readonly optional?: true;\n}\n\n/** A callable bridge evaluator with its input contract. @public */\nexport interface EvaluatorSpec {\n  readonly bridgeId: number;\n  readonly name: string;\n  readonly inputKeys: readonly string[];\n  readonly parameters: readonly EvaluatorParameter[];\n  /** Further numbers `run` returns beside `value`, keyed by `name`. */\n  readonly outputs: readonly CatalogEvaluatorOutput[];\n  /** Every spelling that binds an input, and which inputs are required. `run` checks it first. */\n  readonly contract: InputContract;\n  /**\n   * Evaluate at `inputs`, keyed by parameter key, quantity, relation source,\n   * alias or alternate. Throws `UnknownInputError`, `InputTypeError`,\n   * `DuplicateInputError` or `MissingInputError` before any\n   * `DomainViolationError`. With `want` `'value'` it returns `{ value }`\n   * alone, and an input only an extra output reads is not required.\n   */\n  run(inputs: Readonly<Record<string, number>>, want?: EvaluationWant): Record<string, number>;\n}\n\nfunction toParameter(row: CatalogEvaluatorParameter, optional: boolean): EvaluatorParameter {\n  return {\n    key: row.key,\n    quantity: row.quantity,\n    symbol: row.symbol,\n    unit: row.unit,\n    meaning: row.meaning,\n    ...(row.geometry !== undefined ? { geometry: row.geometry } : {}),\n    ...(row.temperature !== undefined ? { temperature: row.temperature } : {}),\n    ...(row.sign !== undefined ? { sign: row.sign } : {}),\n    ...(row.angular === true ? { angular: true as const } : {}),\n    ...(row.alternates !== undefined ? { alternates: row.alternates } : {}),\n    ...(optional ? { optional: true as const } : {}),\n  };\n}\n\nconst NAMED_DEFAULT = new Map(FORMULA_NAMED.map((named) => [named.name, named.value]));\n\n/** The relation source a parameter is the input for, or undefined when it owns none. */\nfunction sourceOfParameter(relation: CatalogRelation, parameter: Pick<EvaluatorParameter, 'key' | 'quantity'>): string | undefined {\n  for (const source of relation.sources) {\n    if (source === parameter.key || (relation.aliases[source] ?? []).includes(parameter.key)) return source;\n  }\n  return relation.sources.includes(parameter.quantity) ? parameter.quantity : undefined;\n}\n\n/** Every symbol name in an expression tree. */\nfunction symbolNames(node: ExprNode): string[] {\n  if (node.kind === 'symbol') return [node.name];\n  if (node.kind === 'op') return node.args.flatMap(symbolNames);\n  if (node.kind === 'abs' || node.kind === 'transcendental') return symbolNames(node.arg);\n  return [];\n}\n\n/**\n * Keys of the parameters whose source does not appear in the relation's\n * expression. They are checked against the validity domain and do not change\n * the value, so a caller who varies one sees no effect.\n */\nexport function unusedInputKeys(spec: EvaluatorSpec): string[] {\n  const relation = primaryRelation(spec.bridgeId);\n  if (relation === undefined) return [];\n  const used = new Set(symbolNames(parseCatalogExpression(relation.expression)));\n  // An output reads the scope names its parsed expression names, the same parse `run` evaluates.\n  const outputReads = new Set(spec.outputs.flatMap((output) => formulaVariables(output.expression)));\n  const readByOutput = (key: string): boolean => outputReads.has(key.replaceAll('-', '_'));\n  return spec.parameters\n    .filter((parameter) => {\n      const source = sourceOfParameter(relation, parameter);\n      // A parameter that owns no relation source is read only by an extra output.\n      return (source === undefined || !used.has(source)) && !readByOutput(parameter.key);\n    })\n    .map((parameter) => parameter.key);\n}\n\n/**\n * The declared inputs of a catalog evaluator: one slot per parameter, spelled\n * by its key, its relation source and that source's aliases, and its quantity\n * when no other slot shares it; then one optional, unlisted slot per relation\n * source no parameter owns, which a named constant fills when not given.\n * Building it throws when one spelling would bind two slots.\n */\nfunction evaluatorContract(catalogId: number, relation: CatalogRelation, parameters: readonly EvaluatorParameter[]): InputContract {\n  const quantityCount = new Map<string, number>();\n  for (const p of parameters) quantityCount.set(p.quantity, (quantityCount.get(p.quantity) ?? 0) + 1);\n  const owned = new Set<string>();\n  const slots: InputSlot[] = parameters.map((p) => {\n    const source = sourceOfParameter(relation, p);\n    if (source !== undefined) owned.add(source);\n    const spellings = [\n      p.key,\n      ...(source === undefined ? [] : [source, ...(relation.aliases[source] ?? [])]),\n      ...(quantityCount.get(p.quantity) === 1 ? [p.quantity] : []),\n    ];\n    return {\n      key: p.key,\n      spellings: [...new Set(spellings)],\n      alternates: (p.alternates ?? []).map((alt) => ({ key: alt.key, toKey: alt.toKey })),\n      optional: p.optional === true,\n      readBy: source === undefined ? ('outputs' as const) : ('value' as const),\n      listed: true,\n    };\n  });\n  for (const source of relation.sources) {\n    if (owned.has(source)) continue;\n    slots.push({\n      key: source,\n      spellings: [source, ...(relation.aliases[source] ?? [])],\n      alternates: [],\n      optional: NAMED_DEFAULT.has(source.replaceAll('-', '_')),\n      readBy: 'value',\n      listed: false,\n    });\n  }\n  return inputContract(`be-${catalogId}`, slots);\n}\n\n/**\n * Checked inputs (keyed by slot key) onto catalog source names. A source no\n * parameter owns takes its given value, else its named constant.\n */\nfunction bindRelationInputs(\n  relation: CatalogRelation,\n  parameters: readonly EvaluatorParameter[],\n  inputs: Readonly<Record<string, number>>,\n): Record<string, number> {\n  const bound: Record<string, number> = {};\n  const owned = new Set<string>();\n  for (const parameter of parameters) {\n    const source = sourceOfParameter(relation, parameter);\n    if (source === undefined) continue;\n    owned.add(source);\n    const value = inputs[parameter.key];\n    if (value !== undefined) bound[source] = value;\n  }\n  for (const source of relation.sources) {\n    if (owned.has(source)) continue;\n    const value = inputs[source] ?? NAMED_DEFAULT.get(source.replaceAll('-', '_'));\n    if (value !== undefined) bound[source] = value;\n  }\n  return bound;\n}\n\n/**\n * The spec of one catalog evaluator row. A parameter that binds no relation\n * source is read only by an extra output and is optional: the output is left\n * out when it is not given. An output expression reads the scope by\n * parameter key, so a key that names a registered constant (be-66's\n * reflectance `R`) may bind the relation's source but may not be read by an\n * output: building the spec refuses it.\n * @internal\n */\nexport function buildEvaluatorSpec(row: CatalogEvaluator): EvaluatorSpec {\n  const relation = primaryRelation(row.catalogId);\n  if (relation === undefined) throw new Error(missingEvaluatorMessage(row.catalogId));\n  const parameters = row.parameters.map((p) => toParameter(p, sourceOfParameter(relation, p) === undefined));\n  return buildSpec(row.catalogId, row.name, parameters, row.outputs ?? []);\n}\n\nfunction buildSpec(\n  catalogId: number,\n  name: string,\n  parameters: readonly EvaluatorParameter[],\n  outputs: readonly CatalogEvaluatorOutput[],\n): EvaluatorSpec {\n  const relation = primaryRelation(catalogId);\n  if (relation === undefined) throw new Error(missingEvaluatorMessage(catalogId));\n  const contract = evaluatorContract(catalogId, relation, parameters);\n  const keys = parameters.map((parameter) => parameter.key);\n  const reserved = reservedFormulaNames();\n  for (const output of outputs) {\n    const shadowed = formulaVariables(output.expression).find((name) => reserved.has(name) && keys.includes(name));\n    if (shadowed !== undefined) {\n      throw new Error(`be-${catalogId}: output '${output.name}' reads '${shadowed}', which names a registered constant`);\n    }\n  }\n  // An output reads the parameter keys and `value`; a key that shadows a constant is refused above.\n  const outputScope = [...keys, 'value'];\n  // An output is computed when every parameter key it reads was given.\n  const reads = outputs.map((output) => formulaVariables(output.expression).filter((name) => keys.includes(name)));\n  return {\n    bridgeId: catalogId,\n    name,\n    inputKeys: parameters.filter((parameter) => parameter.optional !== true).map((parameter) => parameter.key),\n    parameters,\n    outputs,\n    contract,\n    run(inputs, want = 'all') {\n      const given = checkInputs(contract, inputs, want);\n      const bound = bindRelationInputs(relation, parameters, given);\n      if (!relationHolds(relation, bound)) {\n        throw new DomainViolationError(`${relation.id}: inputs violate validity domain (${relation.domain})`);\n      }\n      for (const parameter of parameters) {\n        const value = given[parameter.key];\n        if (parameter.optional === true && parameter.sign === 'positive' && value !== undefined && !(value > 0)) {\n          throw new DomainViolationError(`${relation.id}: ${parameter.key} must be > 0`);\n        }\n      }\n      const value = evaluateCatalogRelation(relation, bound);\n      const result: Record<string, number> = { value };\n      if (want === 'value') return result;\n      outputs.forEach((output, i) => {\n        if (reads[i]!.some((key) => given[key] === undefined)) return;\n        result[output.name] = evaluateFormula(output.expression, { ...given, value }, outputScope);\n      });\n      return result;\n    },\n  };\n}\n\n/** Bridge id → evaluator. @internal */\nexport const BRIDGE_EVALUATORS: ReadonlyMap<number, EvaluatorSpec> = new Map(\n  catalogEvaluators().map((row) => [row.catalogId, buildEvaluatorSpec(row)] as const),\n);\n\n/**\n * What to say when an id is not in {@link BRIDGE_EVALUATORS}: an id outside\n * the catalog and a catalog row with no evaluator are two different facts.\n * @internal\n */\nexport function missingEvaluatorMessage(bridgeId: number): string {\n  const entry = catalogEntry(bridgeId);\n  if (entry === undefined) {\n    const ids = catalogEntries().map((e) => e.id);\n    return `be-${bridgeId} is not a catalog id (the catalog holds be-${Math.min(...ids)} to be-${Math.max(...ids)})`;\n  }\n  return `be-${bridgeId} (${entry.name}) has no evaluator; \\`upt atlas be-${bridgeId}\\` prints its record, and \\`upt evaluate\\` with no id lists the evaluable ids`;\n}\n\n/**\n * Evaluate a catalog id with a numeric input record: the evaluator's `run`,\n * which checks the inputs first. Throws on an unknown id.\n *\n * @internal\n */\nexport function evaluateBridge(\n  bridgeId: number,\n  inputs: Readonly<Record<string, number>>,\n): Record<string, number> {\n  const spec = BRIDGE_EVALUATORS.get(bridgeId);\n  if (spec === undefined) throw new Error(missingEvaluatorMessage(bridgeId));\n  return spec.run(inputs);\n}\n"]}

package/dist/bridges/expr-parse.d.ts

@@ -1,7 +1,9 @@
 /**
- * One expression parser for a catalog formula.
+ * One expression parser for a catalog formula: MathTS.
  *
- * Numeric evaluation is MathTS `parseFormula` on the hyphen-rewritten string.
+ * Numeric evaluation is MathTS `parseFormula` on the hyphen-rewritten string,
+ * and the dimensional `ExprNode` is built from the MathTS parse tree of the
+ * same string, so the number and the tree can never disagree on precedence.
  * The `ExprNode` keeps hyphenated quantity names and unary minus, so symbolic
  * composition and dimensional checks see the same formula.
  *
@@ -10,10 +12,39 @@
 import type { ExprNode } from '../dimensional/ast-types.js';
 /** Names a formula may mention: quantities, constants, and formula overlays. */
 export declare function formulaNames(): ReadonlySet<string>;
-/** Numeric scope: constants, formula overlays, and π. Caller inputs overwrite. */
-export declare function formulaScope(inputs?: Readonly<Record<string, number>>): Record<string, number>;
-/** Evaluate a catalog expression with MathTS. Inputs are quantity names. */
-export declare function evaluateFormula(expression: string, inputs: Readonly<Record<string, number>>): number;
-/** Parse a catalog expression into a sign-preserving `ExprNode`. */
+/** π, the registered constants and the formula overlays: names a caller may not bind. */
+export declare function reservedFormulaNames(): ReadonlySet<string>;
+/**
+ * Numeric scope: constants, formula overlays, and π, then the caller's inputs.
+ * An input whose name is reserved is refused with {@link ConstantInputError}
+ * unless `declared` names it: a relation's own source may carry a constant's
+ * name as a default the caller overrides (be-63's Lane-Emden ω₃).
+ * {@link evaluateFormula} first drops a reserved key its expression does not
+ * read; this builder refuses every undeclared one.
+ */
+export declare function formulaScope(inputs?: Readonly<Record<string, number>>, declared?: readonly string[]): Record<string, number>;
+/**
+ * The free variables of a catalog expression, read from the same MathTS parse
+ * {@link evaluateFormula} evaluates: the scope names it reads, a hyphenated
+ * quantity written with underscores.
+ */
+export declare function formulaVariables(expression: string): readonly string[];
+/**
+ * `inputs` without the reserved keys that `reads` does not name. A reserved
+ * key the formula reads and `declared` does not name is refused: the caller's
+ * number would replace the constant. One the formula does not read is not an
+ * input of this formula; it is dropped, as any other extra key is on the
+ * graph path (a composed edge forwards every input to each component).
+ */
+export declare function withoutUnreadConstants(inputs: Readonly<Record<string, number>>, reads: ReadonlySet<string>, declared: readonly string[]): Record<string, number>;
+/**
+ * Evaluate a catalog expression with MathTS. Inputs are quantity names.
+ * `declared` are the names the caller may bind although they are reserved
+ * (the relation's sources); a reserved key the expression reads and
+ * `declared` does not name is a {@link ConstantInputError}, and one it does
+ * not read is dropped ({@link withoutUnreadConstants}).
+ */
+export declare function evaluateFormula(expression: string, inputs: Readonly<Record<string, number>>, declared?: readonly string[]): number;
+/** Parse a catalog expression into a sign-preserving `ExprNode`, through the one MathTS parser. */
 export declare function parseCatalogExpression(expression: string): ExprNode;
 //# sourceMappingURL=expr-parse.d.ts.map

package/dist/bridges/expr-parse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expr-parse.d.ts","sourceRoot":"","sources":["../../src/bridges/expr-parse.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,QAAQ,EAAoB,MAAM,6BAA6B,CAAC;AA8B9E,gFAAgF;AAChF,wBAAgB,YAAY,IAAI,WAAW,CAAC,MAAM,CAAC,CAMlD;AAED,kFAAkF;AAClF,wBAAgB,YAAY,CAAC,MAAM,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAMlG;AAED,4EAA4E;AAC5E,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GACvC,MAAM,CAGR;AA4MD,oEAAoE;AACpE,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,CAGnE"}
+{"version":3,"file":"expr-parse.d.ts","sourceRoot":"","sources":["../../src/bridges/expr-parse.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,KAAK,EAAE,QAAQ,EAAoB,MAAM,6BAA6B,CAAC;AAgC9E,gFAAgF;AAChF,wBAAgB,YAAY,IAAI,WAAW,CAAC,MAAM,CAAC,CAMlD;AAID,yFAAyF;AACzF,wBAAgB,oBAAoB,IAAI,WAAW,CAAC,MAAM,CAAC,CAE1D;AAID;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,MAAM,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM,EAC7C,QAAQ,GAAE,SAAS,MAAM,EAAO,GAC/B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAWxB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAEtE;AAgBD;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACxC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,EAC1B,QAAQ,EAAE,SAAS,MAAM,EAAE,GAC1B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAYxB;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACxC,QAAQ,GAAE,SAAS,MAAM,EAAO,GAC/B,MAAM,CAUR;AA8FD,mGAAmG;AACnG,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,CAGnE"}