react-semaphor 0.1.420 → 0.1.422

package/dist/data-app-codegen-node/index.js

@@ -1,18 +1,18 @@
-import { S as In, a as Fn, i as bn, v as Vn } from "../chunks/analyze-result-contract-DdhEt99q.js";
-import { c as ke, G as fe, a as Re, b as Me } from "../chunks/update-policy-BzT2k4n6.js";
-import { C as Rn, e as Mn, R as xn, f as Nn, g as Cn, h as On, i as Gn, j as Kn, v as En, d as An } from "../chunks/update-policy-BzT2k4n6.js";
+import { S as Vn, a as Fn, i as bn, v as kn } from "../chunks/analyze-result-contract-D7pjjYPy.js";
+import { c as ke, G as fe, a as Re, b as Me } from "../chunks/update-policy-BCJc0oI5.js";
+import { C as Mn, e as Cn, R as On, f as xn, g as Gn, h as Nn, i as En, j as An, v as jn, d as vn } from "../chunks/update-policy-BCJc0oI5.js";
 import { createHash as ye } from "node:crypto";
-const hn = "src/semaphor/generated", H = `// Generated by Semaphor Agent Plugin. Do not hand-edit analytics wiring here.
+const wn = "src/semaphor/generated", v = `// Generated by Semaphor Agent Plugin. Do not hand-edit analytics wiring here.
 // Regenerate from the accepted semaphor_plan_data_app codegenSummary when the plan changes.
 `;
-function wn(e, n = {}) {
+function Sn(e, n = {}) {
   ke(e);
-  const r = xe(e);
+  const r = Ce(e);
   if (r.views.length === 0 && !n.allowEmpty)
     throw new Error(
       "Contract generation produced zero executable views. Stop and ask for a different domain/goal or semantic model improvement; pass --allow-empty only for an explicit model-gap report."
     );
-  const t = Ce(r), o = Oe({
+  const t = xe(r), o = Ge({
     contract: r,
     files: t,
     generatorName: n.generatorName || "react-semaphor/data-app-codegen/node",
@@ -27,7 +27,7 @@ function wn(e, n = {}) {
     files: a,
     manifest: o,
     contentHash: String(o.generatedContentHash || ""),
-    usageExample: Ee(r),
+    usageExample: je(r),
     warnings: r.warnings,
     stats: {
       inputCount: r.inputs.length,
@@ -38,32 +38,32 @@ function wn(e, n = {}) {
     }
   };
 }
-function xe(e) {
-  var u, d, c, i, p, S, g, $, F, R, b, M;
+function Ce(e) {
+  var d, p, m, i, l, g, h, I, $, M, b, C;
   const n = [], r = [];
   for (const s of e.inputs) {
-    h(r, s.fieldRef);
-    for (const I of s.bindings || [])
-      h(r, I.fieldRef);
-    h(r, (u = s.optionQuery) == null ? void 0 : u.valueFieldRef), h(r, (d = s.optionQuery) == null ? void 0 : d.labelFieldRef), h(r, (c = s.optionQuery) == null ? void 0 : c.filterFieldRef), Q(r, (i = s.optionQuery) == null ? void 0 : i.spec);
+    w(r, s.fieldRef);
+    for (const V of s.bindings || [])
+      w(r, V.fieldRef);
+    w(r, (d = s.optionQuery) == null ? void 0 : d.valueFieldRef), w(r, (p = s.optionQuery) == null ? void 0 : p.labelFieldRef), w(r, (m = s.optionQuery) == null ? void 0 : m.filterFieldRef), B(r, (i = s.optionQuery) == null ? void 0 : i.spec);
   }
   for (const s of e.filterContracts) {
-    h(r, s.fieldRef), h(r, (p = s.optionQuery) == null ? void 0 : p.valueFieldRef), h(r, (S = s.optionQuery) == null ? void 0 : S.labelFieldRef), h(r, (g = s.optionQuery) == null ? void 0 : g.filterFieldRef), Q(r, ($ = s.optionQuery) == null ? void 0 : $.spec);
-    for (const I of s.bindings || [])
-      h(r, I.fieldRef);
+    w(r, s.fieldRef), w(r, (l = s.optionQuery) == null ? void 0 : l.valueFieldRef), w(r, (g = s.optionQuery) == null ? void 0 : g.labelFieldRef), w(r, (h = s.optionQuery) == null ? void 0 : h.filterFieldRef), B(r, (I = s.optionQuery) == null ? void 0 : I.spec);
+    for (const V of s.bindings || [])
+      w(r, V.fieldRef);
   }
   for (const s of e.views) {
-    for (const I of s.fields || [])
-      h(r, I);
-    Q(r, (F = s.sdkSpec) == null ? void 0 : F.spec), Q(r, s.visualSpec);
+    for (const V of s.fields || [])
+      w(r, V);
+    B(r, ($ = s.sdkSpec) == null ? void 0 : $.spec), B(r, s.visualSpec);
   }
   const t = e.implementationChecklist || {};
   for (const s of Object.values(t.bindingsByView || {}))
-    for (const I of Array.isArray(s) ? s : [])
-      h(r, I.fieldRef), h(r, I.optionValueField), h(r, I.optionLabelField);
+    for (const V of Array.isArray(s) ? s : [])
+      w(r, V.fieldRef), w(r, V.optionValueField), w(r, V.optionLabelField);
   for (const s of t.requiredInputOptions || [])
-    h(r, s.visibleLabelField), h(r, s.optionValueField), h(r, s.runtimeFilterField);
-  const o = dn(
+    w(r, s.visibleLabelField), w(r, s.optionValueField), w(r, s.runtimeFilterField);
+  const o = pn(
     [
       ...e.sources.map((s) => ({
         raw: s,
@@ -71,128 +71,129 @@ function xe(e) {
         aliases: Ie(s),
         name: ""
       })),
-      ...r.map((s) => sn(s)).filter(K)
+      ...r.map((s) => an(s)).filter(E)
     ]
   );
-  v(o, (s) => {
-    const I = V(s.raw);
-    return q(
-      s.raw.label || (I == null ? void 0 : I.datasetName) || (I == null ? void 0 : I.datasetId) || (I == null ? void 0 : I.name) || s.raw.kind || "source"
+  P(o, (s) => {
+    const V = F(s.raw);
+    return K(
+      s.raw.label || (V == null ? void 0 : V.datasetName) || (V == null ? void 0 : V.datasetId) || (V == null ? void 0 : V.name) || s.raw.kind || "source"
     );
   });
-  const a = pn(o), l = X(
+  const a = ln(o), u = X(
     r.filter((s) => s.name).map((s) => ({
       raw: s,
-      key: L(s),
+      key: Z(s),
       name: ""
     })),
     (s) => s.key
   );
-  v(
-    l,
-    (s) => q([
-      s.raw.sourceKey ? fn(s.raw.sourceKey) : "",
+  P(
+    u,
+    (s) => K([
+      s.raw.sourceKey ? yn(s.raw.sourceKey) : "",
       s.raw.aggregate ? s.raw.aggregate.toLowerCase() : "",
       s.raw.name
     ].filter(Boolean).join("_"))
   );
-  const y = new Map(l.map((s) => [s.key, s.name])), w = e.inputs.map((s) => ({
+  const c = new Map(u.map((s) => [s.key, s.name])), S = e.inputs.map((s) => ({
     raw: s,
-    name: q(s.id || s.label || "input")
+    name: K(s.id || s.label || "input")
   }));
-  v(w, (s) => s.name);
-  const f = w.filter((s) => !!s.raw.optionQuery).map((s) => ({
+  P(S, (s) => s.name);
+  const f = S.filter((s) => !!s.raw.optionQuery).map((s) => ({
     input: s,
     name: `${s.name}Options`,
     raw: s.raw.optionQuery
   }));
-  v(f, (s) => s.name);
+  P(f, (s) => s.name);
   for (const s of f)
-    an(s.raw.labelFieldRef, s.raw.valueFieldRef) && un(s.raw.valueFieldRef) && n.push(
-      `Input option query ${((R = s.raw.spec) == null ? void 0 : R.inputId) || s.input.raw.id || s.name} uses identifier field ${s.raw.valueFieldRef.name} as both label and value. It can execute, but the UI will show key values unless the semantic model exposes a human-readable label through a modeled relationship.`
+    un(s.raw.labelFieldRef, s.raw.valueFieldRef) && dn(s.raw.valueFieldRef) && n.push(
+      `Input option query ${((M = s.raw.spec) == null ? void 0 : M.inputId) || s.input.raw.id || s.name} uses identifier field ${s.raw.valueFieldRef.name} as both label and value. It can execute, but the UI will show key values unless the semantic model exposes a human-readable label through a modeled relationship.`
     );
-  const m = e.views.filter(
+  const y = e.views.filter(
     (s) => {
-      var I, T;
-      return !!((I = s.sdkSpec) != null && I.builder && ((T = s.sdkSpec) != null && T.spec));
+      var V, T;
+      return !!((V = s.sdkSpec) != null && V.builder && ((T = s.sdkSpec) != null && T.spec));
     }
   ).map((s) => ({
     raw: s,
-    name: q(s.id || s.title || "query")
+    name: K(s.id || s.title || "query")
   }));
-  v(m, (s) => s.name);
-  const N = e.views.filter((s) => ce(s) && !("sdkSpec" in s)).map((s) => on(s));
+  P(y, (s) => s.name);
+  const O = e.views.filter((s) => ce(s) && !("sdkSpec" in s)).map((s) => sn(s));
   for (const s of e.views)
-    (!("sdkSpec" in s) || !((b = s.sdkSpec) != null && b.builder) || !((M = s.sdkSpec) != null && M.spec)) && !ce(s) && n.push(`Skipped view ${s.id || s.title || "unknown"} because it has no sdkSpec.`);
-  return Ne({
-    inputs: w,
-    views: m,
+    (!("sdkSpec" in s) || !((b = s.sdkSpec) != null && b.builder) || !((C = s.sdkSpec) != null && C.spec)) && !ce(s) && n.push(`Skipped view ${s.id || s.title || "unknown"} because it has no sdkSpec.`);
+  return Oe({
+    inputs: S,
+    views: y,
     filterContracts: e.filterContracts
   }), {
     summary: e,
     title: e.title || "Semaphor Data App",
     sources: o,
-    fields: l,
-    inputs: w,
+    fields: u,
+    inputs: S,
     optionQueries: f,
-    views: m,
-    presentationViews: N,
+    views: y,
+    presentationViews: O,
     filterContracts: e.filterContracts,
     checklist: t,
     sourceNameByKey: a,
-    fieldNameByKey: y,
+    fieldNameByKey: c,
     warnings: n
   };
 }
-function Ne({
+function Oe({
   inputs: e,
   views: n,
   filterContracts: r
 }) {
   const t = new Set(e.map((a) => a.raw.id).filter(Boolean)), o = new Set(n.map((a) => a.raw.id).filter(Boolean));
-  for (const [a, l] of r.entries()) {
-    if (!t.has(l.inputId))
+  for (const [a, u] of r.entries()) {
+    if (!t.has(u.inputId))
       throw new Error(`filterContracts.${a}.inputId must reference a generated input.`);
-    const y = new Set(l.appliesToViewIds || []), w = new Set(l.notAppliedToViewIds || []);
-    for (const [f, m] of (l.appliesToViewIds || []).entries())
-      if (!o.has(m))
+    const c = new Set(u.appliesToViewIds || []), S = new Set(u.notAppliedToViewIds || []);
+    for (const [f, y] of (u.appliesToViewIds || []).entries())
+      if (!o.has(y))
         throw new Error(
           `filterContracts.${a}.appliesToViewIds.${f} must reference an executable generated view.`
         );
-    for (const [f, m] of (l.notAppliedToViewIds || []).entries())
-      if (!o.has(m))
+    for (const [f, y] of (u.notAppliedToViewIds || []).entries())
+      if (!o.has(y))
         throw new Error(
           `filterContracts.${a}.notAppliedToViewIds.${f} must reference an executable generated view.`
         );
-    for (const [f, m] of (l.bindings || []).entries()) {
-      if (!o.has(m.viewId))
+    for (const [f, y] of (u.bindings || []).entries()) {
+      if (!o.has(y.viewId))
         throw new Error(
           `filterContracts.${a}.bindings.${f}.viewId must reference an executable generated view.`
         );
-      if (!y.has(m.viewId))
+      if (!c.has(y.viewId))
         throw new Error(
           `filterContracts.${a}.bindings.${f}.viewId must be included in appliesToViewIds.`
         );
-      if (w.has(m.viewId))
+      if (S.has(y.viewId))
         throw new Error(
           `filterContracts.${a}.bindings.${f}.viewId must not be listed in notAppliedToViewIds.`
         );
     }
   }
 }
-function Ce(e) {
+function xe(e) {
   return {
-    "sources.ts": ve(e),
-    "fields.ts": qe(e),
-    "inputs.ts": Te(e),
-    "queries.ts": _e(e),
+    "sources.ts": Ke(e),
+    "fields.ts": Te(e),
+    "inputs.ts": Qe(e),
+    "queries.ts": De(e),
     "bindings.ts": Le(e),
-    "accessors.ts": ze(e),
+    "accessors.ts": Ye(e),
     "metadata.ts": We(e),
-    "index.ts": Ze()
+    "index.ts": Xe(),
+    "USAGE.md": Ee(e)
   };
 }
-function Oe({
+function Ge({
   contract: e,
   files: n,
   generatorName: r,
@@ -205,19 +206,51 @@ function Oe({
       name: r,
       version: t
     },
-    generatedContentHash: Ge(n),
+    generatedContentHash: Ne(n),
     codegenSummaryValidatorVersion: Re,
-    codegenSummaryHash: Ke(e.summary),
+    codegenSummaryHash: Ae(e.summary),
     codegenSummary: e.summary
   };
 }
-function Ge(e) {
+function Ne(e) {
   const n = ye("sha256");
-  for (const r of Object.keys(e).sort())
+  for (const r of Object.keys(e).filter(
+    (t) => t.endsWith(".ts")
+  ).sort())
     n.update(r), n.update("\0"), n.update(e[r]), n.update("\0");
   return `sha256:${n.digest("hex")}`;
 }
-function Ke(e) {
+function Ee(e) {
+  const n = [
+    "# Semaphor Generated Data App Contract",
+    "",
+    "Generated files in this directory are governed Semaphor analytics wiring. Do not hand-edit them.",
+    "",
+    "Use the app-facing exports from `index.ts`:",
+    "",
+    "- `queries`: generated governed query factories.",
+    "- `queryOptionsForView`: active-input wiring for each generated view.",
+    "- `rowsForView`: table/records row readers.",
+    "- `rowValuesForView`: friendly row object readers for chart/table views.",
+    "- `metricValuesForView`: friendly metric-value readers.",
+    "- `kpiPropsForView`: KPI component props derived from runtime metric results.",
+    "- `roleValuesForView`: canonical dimension/measure/date/id role readers.",
+    "- `appInputSpecs`: generated input/filter specs.",
+    "- `inputOptionQueries`: option-list query factories for generated inputs.",
+    "- `semaphorGeneratedContractMetadata`: generated view/input metadata and presentation-only views.",
+    "",
+    "Start with these exports before opening large generated internals such as `metadata.ts`.",
+    ""
+  ];
+  return e.views.length > 0 && (n.push("Generated executable views:"), e.views.forEach((r) => {
+    n.push(`- \`${r.raw.id}\`: ${r.raw.title || r.name}`);
+  }), n.push("")), e.inputs.length > 0 && (n.push("Generated inputs:"), e.inputs.forEach((r) => {
+    n.push(`- \`${r.raw.id}\`: ${r.raw.label || r.name}`);
+  }), n.push("")), `${n.join(`
+`)}
+`;
+}
+function Ae(e) {
   return `sha256:${ye("sha256").update(ae(e)).digest("hex")}`;
 }
 function ae(e) {
@@ -228,9 +261,9 @@ function ae(e) {
   const n = e;
   return `{${Object.keys(n).sort().filter((t) => n[t] !== void 0).map((t) => `${JSON.stringify(t)}:${ae(n[t])}`).join(",")}}`;
 }
-function Ee(e) {
+function je(e) {
   const n = e.views.find(
-    (f) => E(f) && A(f)
+    (f) => A(f) && j(f)
   );
   if (n)
     return [
@@ -246,7 +279,7 @@ function Ee(e) {
     ].join(`
 `);
   const r = e.views.find(
-    (f) => E(f)
+    (f) => A(f)
   );
   if (r)
     return [
@@ -262,7 +295,7 @@ function Ee(e) {
     ].join(`
 `);
   const t = e.views.find(
-    (f) => W(f) && A(f)
+    (f) => z(f) && j(f)
   );
   if (t)
     return [
@@ -276,7 +309,7 @@ function Ee(e) {
     ].join(`
 `);
   const o = e.views.find(
-    (f) => ue(f) && A(f)
+    (f) => ue(f) && j(f)
   );
   if (o)
     return [
@@ -290,8 +323,8 @@ function Ee(e) {
     ].join(`
 `);
   const a = e.views.find((f) => {
-    var m;
-    return cn((m = f.raw.sdkSpec) == null ? void 0 : m.builder);
+    var y;
+    return mn((y = f.raw.sdkSpec) == null ? void 0 : y.builder);
   });
   if (a)
     return [
@@ -303,65 +336,65 @@ function Ee(e) {
       "const presentationViews = semaphorGeneratedContractMetadata.presentationViews;"
     ].join(`
 `);
-  const l = e.views.find((f) => Ae(f));
-  if (l)
+  const u = e.views.find((f) => ve(f));
+  if (u)
     return [
-      'import { appInputSpecs, createInputHandleMap, metricValuesForView, queries, queryOptionsForView, semaphorGeneratedContractMetadata } from "./semaphor/generated";',
+      'import { appInputSpecs, createInputHandleMap, kpiPropsForView, queries, queryOptionsForView, semaphorGeneratedContractMetadata } from "./semaphor/generated";',
       "const handles = useSemaphorInputs(appInputSpecs);",
       "const inputHandles = createInputHandleMap(handles);",
-      `const result = useSemaphorQuery(queries.${l.name}(), queryOptionsForView.${l.name}(inputHandles));`,
-      `const metrics = metricValuesForView.${l.name}(result);`,
+      `const result = useSemaphorQuery(queries.${u.name}(), queryOptionsForView.${u.name}(inputHandles));`,
+      `const kpiProps = kpiPropsForView.${u.name}(result);`,
       "const presentationViews = semaphorGeneratedContractMetadata.presentationViews;"
     ].join(`
 `);
-  const y = e.views[0];
+  const c = e.views[0];
   return [
     'import { appInputSpecs, createInputHandleMap, queries, queryOptionsForView, semaphorGeneratedContractMetadata } from "./semaphor/generated";',
     "const handles = useSemaphorInputs(appInputSpecs);",
     "const inputHandles = createInputHandleMap(handles);",
-    y ? `const result = useSemaphorQuery(queries.${y.name}(), queryOptionsForView.${y.name}(inputHandles));` : "const result = undefined;",
+    c ? `const result = useSemaphorQuery(queries.${c.name}(), queryOptionsForView.${c.name}(inputHandles));` : "const result = undefined;",
     "const presentationViews = semaphorGeneratedContractMetadata.presentationViews;"
   ].join(`
 `);
 }
-function W(e) {
+function z(e) {
   var n;
-  return B((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "records";
+  return q((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "records";
 }
-function Ae(e) {
+function ve(e) {
   var n;
-  return B((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "metric";
+  return q((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "metric";
 }
-function E(e) {
+function A(e) {
   var n, r, t;
-  return W(e) && ((t = (r = (n = e.raw.visualSpec) == null ? void 0 : n.tableBehavior) == null ? void 0 : r.sorting) == null ? void 0 : t.mode) === "server";
+  return z(e) && ((t = (r = (n = e.raw.visualSpec) == null ? void 0 : n.tableBehavior) == null ? void 0 : r.sorting) == null ? void 0 : t.mode) === "server";
 }
 function ue(e) {
   var n;
-  return B((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "sql";
+  return q((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "sql";
 }
-function A(e) {
+function j(e) {
   var n, r, t;
   return ((t = (r = (n = e.raw.visualSpec) == null ? void 0 : n.tableBehavior) == null ? void 0 : r.pagination) == null ? void 0 : t.mode) === "server";
 }
 function He(e) {
-  return W(e) && (A(e) || E(e)) || ue(e) && A(e);
+  return z(e) && (j(e) || A(e)) || ue(e) && j(e);
 }
-function ve(e) {
+function Ke(e) {
   const n = e.sources.map(({ name: t, raw: o }) => {
-    const a = je(o);
+    const a = qe(o);
     return `  ${t}: ${a},`;
   }).join(`
 `), r = e.sources.some((t) => t.raw.kind === "semantic") ? `import { semaphor } from "react-semaphor/data-app-sdk";
 
 ` : "";
-  return `${H}
+  return `${v}
 ${r}export const sources = {
 ${n}
 } as const;
 `;
 }
-function je(e) {
+function qe(e) {
   if (e.kind === "semantic") {
     const n = {
       domainId: e.domainId,
@@ -369,11 +402,11 @@ function je(e) {
       datasetName: e.datasetName,
       label: e.label
     };
-    return `semaphor.source.semantic(${k(G(n))})`;
+    return `semaphor.source.semantic(${k(N(n))})`;
   }
-  return `${k(G({ ...e, sourceKey: void 0 }))} as const`;
+  return `${k(N({ ...e, sourceKey: void 0 }))} as const`;
 }
-function qe(e) {
+function Te(e) {
   const n = e.fields.map(({ name: t, raw: o }) => {
     const a = Be(o, e);
     return `  ${t}: ${a},`;
@@ -381,7 +414,7 @@ function qe(e) {
 `), r = n.includes("sources.") ? `import { sources } from "./sources";
 
 ` : "";
-  return `${H}
+  return `${v}
 ${r}export const fields = {
 ${n}
 } as const;
@@ -394,95 +427,95 @@ function Be(e, n) {
     role: e.role,
     dataType: e.dataType,
     aggregate: e.aggregate
-  }, t = ln(e), o = t ? n.sourceNameByKey.get(t) : void 0;
+  }, t = cn(e), o = t ? n.sourceNameByKey.get(t) : void 0;
   if (t && !o)
     throw new Error(
       `Field ${e.name} references source ${t}, but that source is not renderable. Include the source in codegenSummary.sources or provide field.source.`
     );
-  const a = Object.entries(G(r)).map(([l, y]) => `${JSON.stringify(l)}: ${O(y, n)}`);
+  const a = Object.entries(N(r)).map(([u, c]) => `${JSON.stringify(u)}: ${G(c, n)}`);
   return o && a.push(`"source": sources.${o}`), `{ ${a.join(", ")} }`;
 }
-function Te(e) {
-  const n = e.inputs.map((c) => {
-    const i = x(c.raw.fieldRef, e), p = [
-      `id: ${JSON.stringify(c.raw.id)}`,
-      `label: ${JSON.stringify(c.raw.label || c.raw.id)}`,
-      `operator: ${JSON.stringify(mn(c.raw))}`
+function Qe(e) {
+  const n = e.inputs.map((m) => {
+    const i = R(m.raw.fieldRef, e), l = [
+      `id: ${JSON.stringify(m.raw.id)}`,
+      `label: ${JSON.stringify(m.raw.label || m.raw.id)}`,
+      `operator: ${JSON.stringify(fn(m.raw))}`
     ];
-    if (i && p.push(`field: fields.${i}`), c.raw.relationshipHint && p.push(`relationshipHint: ${k(c.raw.relationshipHint)}`), !i)
-      throw new Error(`Input ${c.raw.id || c.name} is missing a generated field reference.`);
-    return `  ${c.name}: semaphor.filter({ ${p.join(", ")} }),`;
+    if (i && l.push(`field: fields.${i}`), m.raw.relationshipHint && l.push(`relationshipHint: ${k(m.raw.relationshipHint)}`), !i)
+      throw new Error(`Input ${m.raw.id || m.name} is missing a generated field reference.`);
+    return `  ${m.name}: semaphor.filter({ ${l.join(", ")} }),`;
   }).join(`
-`), r = e.inputs.map((c) => `filterSpecs.${c.name}`).join(", "), t = e.inputs.map((c) => JSON.stringify(c.raw.id)).join(", "), o = e.optionQueries.map((c) => {
-    const i = c.input.raw, p = c.raw, S = V(p.spec) || {}, {
-      id: g,
-      inputId: $,
-      source: F,
-      sourceKey: R,
+`), r = e.inputs.map((m) => `filterSpecs.${m.name}`).join(", "), t = e.inputs.map((m) => JSON.stringify(m.raw.id)).join(", "), o = e.optionQueries.map((m) => {
+    const i = m.input.raw, l = m.raw, g = F(l.spec) || {}, {
+      id: h,
+      inputId: I,
+      source: $,
+      sourceKey: M,
       valueField: b,
-      labelField: M,
+      labelField: C,
       population: s,
-      dependencies: I,
+      dependencies: V,
       limit: T,
       ...ee
-    } = S, J = p.sourceKey ? { sourceKey: p.sourceKey } : p.source || F || (typeof R == "string" ? { sourceKey: R } : void 0), ne = Se(J, e), re = x(p.valueFieldRef, e), te = x(p.labelFieldRef, e), oe = ge(c), se = {
+    } = g, U = l.sourceKey ? { sourceKey: l.sourceKey } : l.source || $ || (typeof M == "string" ? { sourceKey: M } : void 0), ne = Se(U, e), re = R(l.valueFieldRef, e), te = R(l.labelFieldRef, e), oe = he(m), se = {
       ...ee,
-      id: p.id || S.id || `${i.id}-options`,
+      id: l.id || g.id || `${i.id}-options`,
       inputId: i.id,
-      source: J,
-      valueField: p.valueFieldRef,
-      labelField: p.labelFieldRef,
-      population: p.population || s,
+      source: U,
+      valueField: l.valueFieldRef,
+      labelField: l.labelFieldRef,
+      population: l.population || s,
       dependencies: oe,
-      limit: p.limit || T || 100
+      limit: l.limit || T || 100
     };
     if (!ne || !re || !te)
-      throw new Error(`Input option query ${p.id || `${i.id}-options`} is missing source, valueField, or labelField.`);
-    const Fe = Object.entries(G(se)).map(([be, Ve]) => `${JSON.stringify(be)}: ${O(Ve, e)}`);
-    return `  ${c.name}: semaphor.inputOptions({ ${Fe.join(", ")} }),`;
+      throw new Error(`Input option query ${l.id || `${i.id}-options`} is missing source, valueField, or labelField.`);
+    const Ve = Object.entries(N(se)).map(([Fe, be]) => `${JSON.stringify(Fe)}: ${G(be, e)}`);
+    return `  ${m.name}: semaphor.inputOptions({ ${Ve.join(", ")} }),`;
   }).join(`
-`), a = e.optionQueries.map((c) => {
-    const i = Qe(e, c), p = i.length > 0 ? "inputHandles" : "_inputHandles", S = i.map((g) => {
-      const $ = x(g.raw.fieldRef, e);
-      if (!$)
+`), a = e.optionQueries.map((m) => {
+    const i = Pe(e, m), l = i.length > 0 ? "inputHandles" : "_inputHandles", g = i.map((h) => {
+      const I = R(h.raw.fieldRef, e);
+      if (!I)
         throw new Error(
-          `Input option query ${c.raw.id || `${c.input.raw.id}-options`} references input ${g.raw.id} without a generated field reference.`
+          `Input option query ${m.raw.id || `${m.input.raw.id}-options`} references input ${h.raw.id} without a generated field reference.`
         );
-      const F = `inputHandles[${JSON.stringify(g.raw.id)}]`;
-      return `    if (${F}) {
-      inputs.push(semaphor.bindInput(${F}, { field: fields.${$} }));
+      const $ = `inputHandles[${JSON.stringify(h.raw.id)}]`;
+      return `    if (${$}) {
+      inputs.push(semaphor.bindInput(${$}, { field: fields.${I} }));
     }`;
     }).join(`
 `);
-    return `  ${c.name}(${p}: SemaphorGeneratedInputHandleMap): SemaphorInputReference[] {
+    return `  ${m.name}(${l}: SemaphorGeneratedInputHandleMap): SemaphorInputReference[] {
     const inputs: SemaphorInputReference[] = [];
-${S}
+${g}
     return inputs;
   },`;
   }).join(`
 
-`), l = e.optionQueries.map((c) => `  ${c.name}(inputHandles: SemaphorGeneratedInputHandleMap): SemaphorQueryRuntimeOptions {
+`), u = e.optionQueries.map((m) => `  ${m.name}(inputHandles: SemaphorGeneratedInputHandleMap): SemaphorQueryRuntimeOptions {
     return {
-      inputs: inputsForInputOptionQuery.${c.name}(inputHandles),
+      inputs: inputsForInputOptionQuery.${m.name}(inputHandles),
     };
   },`).join(`
 
-`), y = e.optionQueries.map((c) => `    case ${JSON.stringify(c.raw.id || `${c.input.raw.id}-options`)}:
-      return queryOptionsForInputOptionQuery.${c.name}(inputHandles);`).join(`
-`), w = e.inputs.length > 0, f = e.optionQueries.length > 0, m = f ? "inputOptionQueryId" : "_inputOptionQueryId", N = f ? "inputHandles" : "_inputHandles", u = [
+`), c = e.optionQueries.map((m) => `    case ${JSON.stringify(m.raw.id || `${m.input.raw.id}-options`)}:
+      return queryOptionsForInputOptionQuery.${m.name}(inputHandles);`).join(`
+`), S = e.inputs.length > 0, f = e.optionQueries.length > 0, y = f ? "inputOptionQueryId" : "_inputOptionQueryId", O = f ? "inputHandles" : "_inputHandles", d = [
     "SemaphorInputHandle",
     f ? "SemaphorInputReference" : void 0,
     "SemaphorQueryRuntimeOptions"
-  ].filter(K).join(", "), d = [
-    w || f ? 'import { semaphor } from "react-semaphor/data-app-sdk";' : void 0,
-    `import type { ${u} } from "react-semaphor/data-app-sdk";`,
-    w || f ? 'import { fields } from "./fields";' : void 0,
+  ].filter(E).join(", "), p = [
+    S || f ? 'import { semaphor } from "react-semaphor/data-app-sdk";' : void 0,
+    `import type { ${d} } from "react-semaphor/data-app-sdk";`,
+    S || f ? 'import { fields } from "./fields";' : void 0,
     f ? 'import { sources } from "./sources";' : void 0,
     'import type { SemaphorGeneratedInputId, SemaphorGeneratedInputOptionQueryId } from "./metadata";'
-  ].filter(K).join(`
+  ].filter(E).join(`
 `);
-  return `${H}
-${d}
+  return `${v}
+${p}
 
 export const filterSpecs = {
 ${n}
@@ -506,22 +539,22 @@ ${a}
 } as const;
 
 export const queryOptionsForInputOptionQuery = {
-${l}
+${u}
 } as const;
 
 export function queryOptionsForInputOptionQueryId(
-  ${m}: SemaphorGeneratedInputOptionQueryId,
-  ${N}: SemaphorGeneratedInputHandleMap,
+  ${y}: SemaphorGeneratedInputOptionQueryId,
+  ${O}: SemaphorGeneratedInputHandleMap,
 ): SemaphorQueryRuntimeOptions {
-  switch (${m}) {
-${y}
+  switch (${y}) {
+${c}
   }
-  throw new Error(\`Unknown generated Semaphor input option query id: \${${m}}\`);
+  throw new Error(\`Unknown generated Semaphor input option query id: \${${y}}\`);
 }
 `;
 }
-function Qe(e, n) {
-  const r = ge(n);
+function Pe(e, n) {
+  const r = he(n);
   if (!r || r.mode === "independent")
     return [];
   if (r.mode !== "explicit")
@@ -532,78 +565,78 @@ function Qe(e, n) {
   ]);
   return e.inputs.filter((a) => o.has(a.raw.id) ? !1 : t.has(a.raw.id));
 }
-function ge(e) {
+function he(e) {
   var n;
   return e.raw.dependencies || ((n = e.raw.spec) == null ? void 0 : n.dependencies);
 }
-function _e(e) {
-  const n = e.views.map((d) => {
-    var p, S, g, $, F, R;
-    const c = B(d.raw.sdkSpec.builder), i = Pe(d);
-    if (W(d) && He(d)) {
-      const b = (p = d.raw.visualSpec) == null ? void 0 : p.tableBehavior, M = V(i.pagination), s = A(d), I = E(d), T = ((S = b == null ? void 0 : b.pagination) == null ? void 0 : S.pageSize) || z(M == null ? void 0 : M.pageSize) || z(i.limit) || 100, ee = I ? Y(d, e) : [], J = I ? De({
-        view: d,
+function De(e) {
+  const n = e.views.map((p) => {
+    var l, g, h, I, $, M;
+    const m = q(p.raw.sdkSpec.builder), i = _e(p);
+    if (z(p) && He(p)) {
+      const b = (l = p.raw.visualSpec) == null ? void 0 : l.tableBehavior, C = F(i.pagination), s = j(p), V = A(p), T = ((g = b == null ? void 0 : b.pagination) == null ? void 0 : g.pageSize) || J(C == null ? void 0 : C.pageSize) || J(i.limit) || 100, ee = V ? L(p, e) : [], U = V ? Ue({
+        view: p,
         contract: e,
         sortFields: ee,
-        defaultField: (g = b == null ? void 0 : b.sorting) == null ? void 0 : g.defaultField
-      }) : void 0, ne = I ? ($ = b == null ? void 0 : b.sorting) == null ? void 0 : $.defaultDirection : void 0, re = Ue({
-        viewName: d.name,
+        defaultField: (h = b == null ? void 0 : b.sorting) == null ? void 0 : h.defaultField
+      }) : void 0, ne = V ? (I = b == null ? void 0 : b.sorting) == null ? void 0 : I.defaultDirection : void 0, re = Je({
+        viewName: p.name,
         supportsPagination: s,
-        supportsSort: I
-      }), te = I ? `    const orderBy = resolveRecordsOrderBy(
-      recordsSortFieldsForView.${d.name},
+        supportsSort: V
+      }), te = V ? `    const orderBy = resolveRecordsOrderBy(
+      recordsSortFieldsForView.${p.name},
       params.sort,
-      ${O(J, e)},
-      ${O(ne, e)},
+      ${G(U, e)},
+      ${G(ne, e)},
     );
-` : "", oe = I ? `      ...(orderBy ? { orderBy } : {}),
+` : "", oe = V ? `      ...(orderBy ? { orderBy } : {}),
 ` : "", se = s ? `      pagination: resolveServerTablePagination(params, ${JSON.stringify(T)}),
 ` : "";
-      return `  ${d.name}(
+      return `  ${p.name}(
     params: ${re} = {},
   ) {
-${te}    return semaphor.${c}({
-      ...${O(i, e)},
+${te}    return semaphor.${m}({
+      ...${G(i, e)},
 ${oe}${se}    });
   },`;
     }
-    if (ue(d) && A(d)) {
-      const b = (F = d.raw.visualSpec) == null ? void 0 : F.tableBehavior, M = V(i.pagination), s = ((R = b == null ? void 0 : b.pagination) == null ? void 0 : R.pageSize) || z(M == null ? void 0 : M.pageSize) || z(i.limit) || 100;
-      return `  ${d.name}(
+    if (ue(p) && j(p)) {
+      const b = ($ = p.raw.visualSpec) == null ? void 0 : $.tableBehavior, C = F(i.pagination), s = ((M = b == null ? void 0 : b.pagination) == null ? void 0 : M.pageSize) || J(C == null ? void 0 : C.pageSize) || J(i.limit) || 100;
+      return `  ${p.name}(
     params: SemaphorGeneratedServerPaginationParams = {},
   ) {
-    return semaphor.${c}({
-      ...${O(i, e)},
+    return semaphor.${m}({
+      ...${G(i, e)},
       pagination: resolveServerTablePagination(params, ${JSON.stringify(s)}),
     });
   },`;
     }
-    return `  ${d.name}: () => semaphor.${c}(${O(i, e)}),`;
+    return `  ${p.name}: () => semaphor.${m}(${G(i, e)}),`;
   }).join(`
-`), r = e.views.filter((d) => E(d)).map((d) => {
-    const i = Y(d, e).map((p) => `    ${JSON.stringify(p.key)}: fields.${p.fieldName},`).join(`
+`), r = e.views.filter((p) => A(p)).map((p) => {
+    const i = L(p, e).map((l) => `    ${JSON.stringify(l.key)}: fields.${l.fieldName},`).join(`
 `);
-    return `  ${d.name}: {
+    return `  ${p.name}: {
 ${i}
   },`;
   }).join(`
-`), t = e.views.filter((d) => E(d)).map((d) => {
-    const i = Y(d, e).map((p) => `    { key: ${JSON.stringify(p.key)}, label: ${JSON.stringify(p.label)}, field: fields.${p.fieldName} },`).join(`
+`), t = e.views.filter((p) => A(p)).map((p) => {
+    const i = L(p, e).map((l) => `    { key: ${JSON.stringify(l.key)}, label: ${JSON.stringify(l.label)}, field: fields.${l.fieldName} },`).join(`
 `);
-    return `  ${d.name}: [
+    return `  ${p.name}: [
 ${i}
   ],`;
   }).join(`
-`), o = e.views.some((d) => E(d)), a = e.views.some((d) => A(d)), l = [n, r, t].join(`
-`), y = [
+`), o = e.views.some((p) => A(p)), a = e.views.some((p) => j(p)), u = [n, r, t].join(`
+`), c = [
     n ? 'import { semaphor } from "react-semaphor/data-app-sdk";' : void 0,
     o ? 'import type { SemaphorFieldRef } from "react-semaphor/data-app-sdk";' : void 0,
-    l.includes("fields.") ? 'import { fields } from "./fields";' : void 0,
-    l.includes("sources.") ? 'import { sources } from "./sources";' : void 0
-  ].filter(K).join(`
+    u.includes("fields.") ? 'import { fields } from "./fields";' : void 0,
+    u.includes("sources.") ? 'import { sources } from "./sources";' : void 0
+  ].filter(E).join(`
 `);
-  return `${H}
-${y}
+  return `${v}
+${c}
 ${o ? `export type SemaphorGeneratedRecordsSortDirection = "asc" | "desc";
 
 export type SemaphorGeneratedRecordsSort<TSortKey extends string = string> = {
@@ -667,52 +700,52 @@ ${a ? `function resolveServerTablePagination(
 ` : ""}
 `;
 }
-function Pe(e) {
-  var a, l;
-  const n = V((a = e.raw.sdkSpec) == null ? void 0 : a.spec) || {}, { kind: r, id: t, ...o } = n;
+function _e(e) {
+  var a, u;
+  const n = F((a = e.raw.sdkSpec) == null ? void 0 : a.spec) || {}, { kind: r, id: t, ...o } = n;
   return {
     ...o,
     id: e.raw.id,
-    label: ((l = e.raw.visualSpec) == null ? void 0 : l.title) || e.raw.title || o.label
+    label: ((u = e.raw.visualSpec) == null ? void 0 : u.title) || e.raw.title || o.label
   };
 }
-function Y(e, n) {
-  var a, l;
-  const r = [], t = V((a = e.raw.sdkSpec) == null ? void 0 : a.spec) || {};
-  for (const y of j(t.fields)) h(r, y);
-  h(r, t.dateField), h(r, (l = V(t.orderBy)) == null ? void 0 : l.field);
-  for (const y of e.raw.fields || []) h(r, y);
+function L(e, n) {
+  var a, u;
+  const r = [], t = F((a = e.raw.sdkSpec) == null ? void 0 : a.spec) || {};
+  for (const c of H(t.fields)) w(r, c);
+  w(r, t.dateField), w(r, (u = F(t.orderBy)) == null ? void 0 : u.field);
+  for (const c of e.raw.fields || []) w(r, c);
   return X(
-    r.map((y) => {
-      const w = x(y, n);
-      if (!(!y.name || !w))
+    r.map((c) => {
+      const S = R(c, n);
+      if (!(!c.name || !S))
         return {
-          key: w,
-          fieldName: w,
-          rawName: y.name,
-          label: y.label || y.name
+          key: S,
+          fieldName: S,
+          rawName: c.name,
+          label: c.label || c.name
         };
-    }).filter(K),
-    (y) => y.key
+    }).filter(E),
+    (c) => c.key
   );
 }
-function De({
+function Ue({
   view: e,
   contract: n,
   sortFields: r,
   defaultField: t
 }) {
-  var w, f;
-  const o = new Set(r.map((m) => m.key));
+  var S, f;
+  const o = new Set(r.map((y) => y.key));
   if (t && o.has(t))
     return t;
-  const a = r.filter((m) => m.rawName === t);
+  const a = r.filter((y) => y.rawName === t);
   if (a.length === 1)
     return a[0].key;
-  const l = V((w = e.raw.sdkSpec) == null ? void 0 : w.spec), y = x((f = V(l == null ? void 0 : l.orderBy)) == null ? void 0 : f.field, n);
-  return y && o.has(y) ? y : void 0;
+  const u = F((S = e.raw.sdkSpec) == null ? void 0 : S.spec), c = R((f = F(u == null ? void 0 : u.orderBy)) == null ? void 0 : f.field, n);
+  return c && o.has(c) ? c : void 0;
 }
-function Ue({
+function Je({
   viewName: e,
   supportsPagination: n,
   supportsSort: r
@@ -720,58 +753,58 @@ function Ue({
   return n && r ? `SemaphorGeneratedRecordsQueryParams<Extract<keyof typeof recordsSortFieldsForView.${e}, string>>` : r ? `SemaphorGeneratedRecordsSortParams<Extract<keyof typeof recordsSortFieldsForView.${e}, string>>` : "SemaphorGeneratedServerPaginationParams";
 }
 function Le(e) {
-  const n = e.views.map((m) => {
-    const u = Je(e, m.raw.id).map((d) => {
-      const c = d.inputId, i = x(d.fieldRef, e);
-      if (!c || !i)
+  const n = e.views.map((y) => {
+    const d = ze(e, y.raw.id).map((p) => {
+      const m = p.inputId, i = R(p.fieldRef, e);
+      if (!m || !i)
         return "";
-      const p = [`field: fields.${i}`];
-      if (d.relationshipHint)
-        p.push(`relationshipHint: ${k(d.relationshipHint)}`);
-      else if (Array.isArray(d.relationshipsUsed) && d.relationshipsUsed.length > 0) {
-        const g = d.relationshipsUsed.map(($) => {
-          var F;
-          return (F = V($)) == null ? void 0 : F.id;
-        }).filter(($) => typeof $ == "string" && $.length > 0);
-        g.length > 0 && p.push(`relationshipHint: ${k({ relationshipIds: g })}`);
+      const l = [`field: fields.${i}`];
+      if (p.relationshipHint)
+        l.push(`relationshipHint: ${k(p.relationshipHint)}`);
+      else if (Array.isArray(p.relationshipsUsed) && p.relationshipsUsed.length > 0) {
+        const h = p.relationshipsUsed.map((I) => {
+          var $;
+          return ($ = F(I)) == null ? void 0 : $.id;
+        }).filter((I) => typeof I == "string" && I.length > 0);
+        h.length > 0 && l.push(`relationshipHint: ${k({ relationshipIds: h })}`);
       }
-      const S = `inputHandles[${JSON.stringify(c)}]`;
-      return `    if (${S}) {
-      inputs.push(semaphor.bindInput(${S}, { ${p.join(", ")} }));
+      const g = `inputHandles[${JSON.stringify(m)}]`;
+      return `    if (${g}) {
+      inputs.push(semaphor.bindInput(${g}, { ${l.join(", ")} }));
     }`;
     }).filter(Boolean).join(`
 `);
-    return { view: m, renderedBindings: u };
-  }), r = n.some((m) => m.renderedBindings.length > 0), t = n.map(({ view: m, renderedBindings: N }) => {
-    const u = N ? "inputHandles" : "_inputHandles";
-    return `  ${m.name}(${u}: SemaphorGeneratedInputHandleMap): SemaphorInputReference[] {
+    return { view: y, renderedBindings: d };
+  }), r = n.some((y) => y.renderedBindings.length > 0), t = n.map(({ view: y, renderedBindings: O }) => {
+    const d = O ? "inputHandles" : "_inputHandles";
+    return `  ${y.name}(${d}: SemaphorGeneratedInputHandleMap): SemaphorInputReference[] {
     const inputs: SemaphorInputReference[] = [];
-${N}
+${O}
     return inputs;
   },`;
   }).join(`
 
-`), o = e.views.map((m) => `  ${m.name}(inputHandles: SemaphorGeneratedInputHandleMap): SemaphorQueryRuntimeOptions {
+`), o = e.views.map((y) => `  ${y.name}(inputHandles: SemaphorGeneratedInputHandleMap): SemaphorQueryRuntimeOptions {
     return {
-      inputs: inputsForView.${m.name}(inputHandles),
-      debug: queryDebugForView.${m.name},
+      inputs: inputsForView.${y.name}(inputHandles),
+      debug: queryDebugForView.${y.name},
     };
   },`).join(`
 
-`), a = e.views.map((m) => `    case ${JSON.stringify(m.raw.id)}:
-      return inputsForView.${m.name}(inputHandles);`).join(`
-`), l = e.views.map((m) => `    case ${JSON.stringify(m.raw.id)}:
-      return queryOptionsForView.${m.name}(inputHandles);`).join(`
-`), y = e.views.length > 0, w = y ? "inputHandles" : "_inputHandles", f = [
+`), a = e.views.map((y) => `    case ${JSON.stringify(y.raw.id)}:
+      return inputsForView.${y.name}(inputHandles);`).join(`
+`), u = e.views.map((y) => `    case ${JSON.stringify(y.raw.id)}:
+      return queryOptionsForView.${y.name}(inputHandles);`).join(`
+`), c = e.views.length > 0, S = c ? "inputHandles" : "_inputHandles", f = [
     r ? 'import { semaphor } from "react-semaphor/data-app-sdk";' : void 0,
     'import type { SemaphorInputReference, SemaphorQueryRuntimeOptions } from "react-semaphor/data-app-sdk";',
     r ? 'import { fields } from "./fields";' : void 0,
     'import type { SemaphorGeneratedInputHandleMap } from "./inputs";',
-    y ? 'import { queryDebugForView } from "./metadata";' : void 0,
+    c ? 'import { queryDebugForView } from "./metadata";' : void 0,
     'import type { SemaphorGeneratedQueryViewId } from "./metadata";'
-  ].filter(K).join(`
+  ].filter(E).join(`
 `);
-  return `${H}
+  return `${v}
 ${f}
 
 export const inputsForView = {
@@ -784,7 +817,7 @@ ${o}
 
 export function inputsForViewId(
   viewId: SemaphorGeneratedQueryViewId,
-  ${w}: SemaphorGeneratedInputHandleMap,
+  ${S}: SemaphorGeneratedInputHandleMap,
 ): SemaphorInputReference[] {
   switch (viewId) {
 ${a}
@@ -794,16 +827,16 @@ ${a}
 
 export function queryOptionsForViewId(
   viewId: SemaphorGeneratedQueryViewId,
-  ${w}: SemaphorGeneratedInputHandleMap,
+  ${S}: SemaphorGeneratedInputHandleMap,
 ): SemaphorQueryRuntimeOptions {
   switch (viewId) {
-${l}
+${u}
   }
   throw new Error(\`Unknown generated Semaphor view id: \${viewId}\`);
 }
 `;
 }
-function Je(e, n) {
+function ze(e, n) {
   return e.filterContracts.flatMap(
     (r) => (r.bindings || []).filter((t) => t.viewId === n).map((t) => ({
       inputId: r.inputId,
@@ -813,140 +846,160 @@ function Je(e, n) {
     }))
   );
 }
-function ze(e) {
+function Ye(e) {
   const n = e.views.map((i) => {
-    const S = D(i, e).map((g) => {
-      const $ = x(g.raw, e);
-      return $ ? `    ${g.name}: fields.${$},` : "";
+    const g = D(i, e).map((h) => {
+      const I = R(h.raw, e);
+      return I ? `    ${h.name}: fields.${I},` : "";
     }).filter(Boolean).join(`
 `);
     return `  ${i.name}: {
-${S}
+${g}
   },`;
   }).join(`
 `), r = e.views.map((i) => {
-    const S = P(i, e).map((g) => {
-      const $ = x(g.raw, e);
-      return $ ? `    ${g.name}: fields.${$},` : "";
+    const g = Q(i, e).map((h) => {
+      const I = R(h.raw, e);
+      return I ? `    ${h.name}: fields.${I},` : "";
     }).filter(Boolean).join(`
 `);
     return `  ${i.name}: {
-${S}
+${g}
   },`;
   }).join(`
 `), t = e.views.map((i) => {
-    const p = P(i, e), S = rn(p), g = nn(p), $ = p.map((F) => {
-      const R = Array.from(
-        new Set(
-          he(F.raw).filter((b) => g.has(b))
-        )
-      );
-      return `    ${F.name}: metricKeysForField(metricFieldsForView.${i.name}.${F.name}, { allowNameFallback: ${S.has(F.raw.name) ? "false" : "true"}, excludedKeys: ${k(R)} }),`;
-    }).join(`
+    const g = Q(i, e).map((h, I) => `    ${h.name}: ${JSON.stringify(en(i, h, I))},`).join(`
 `);
     return `  ${i.name}: {
-${$}
+${g}
   },`;
   }).join(`
 `), o = e.views.map((i) => {
-    const S = P(i, e).map((g, $) => `    ${g.name}: ${JSON.stringify(Xe(i, g, $))},`).join(`
-`);
-    return `  ${i.name}: {
-${S}
-  },`;
-  }).join(`
-`), a = e.views.map((i) => {
-    const p = P(i, e);
-    if (p.length === 0)
+    const l = Q(i, e);
+    if (l.length === 0)
       return `  ${i.name}(): Record<keyof typeof metricFieldsForView.${i.name}, unknown> {
     return {};
   },`;
-    const S = en(i, p), g = p.map(($) => {
-      const F = `metricMeasureKeysForView.${i.name}.${$.name}`, R = `metricMeasureBindingKeysForView.${i.name}.${$.name}`, b = S.has($.name) ? `readMetricValueByBindingWithFallback(measures, measureBindings, ${R}, ${F}, primaryValue)` : `readMetricValueByBinding(measures, measureBindings, ${R}, ${F})`;
-      return `      ${$.name}: ${b},`;
+    const g = l.map((h) => {
+      const $ = `readMetricValueByBinding(measures, measureBindings, ${`metricMeasureBindingKeysForView.${i.name}.${h.name}`})`;
+      return `      ${h.name}: ${$},`;
     }).join(`
 `);
     return `  ${i.name}(result: SemaphorGeneratedMetricResult): Record<keyof typeof metricFieldsForView.${i.name}, unknown> {
     const measures = result?.measures;
     const measureBindings = result?.measureBindings;
-    const primaryValue = result?.primaryValue;
     return {
 ${g}
     };
   },`;
   }).join(`
 
-`), l = e.views.map((i) => {
-    const p = P(i, e);
-    if (p.length === 0)
+`), a = e.views.map((i) => {
+    const l = Q(i, e);
+    if (l.length === 0)
       return `  ${i.name}(): Array<keyof typeof metricFieldsForView.${i.name}> {
     return [];
   },`;
-    const S = p.map((g) => `    ...(missing.has(metricMeasureBindingKeysForView.${i.name}.${g.name}) ? [${JSON.stringify(g.name)} as keyof typeof metricFieldsForView.${i.name}] : []),`).join(`
+    const g = l.map((h, I) => {
+      const $ = `metricMeasureBindingKeysForView.${i.name}.${h.name}`, M = I === 0 ? `readMetricValueByBinding(measures, measureBindings, ${$}) === undefined && !hasOwnPrimaryMetricValue(result)` : `readMetricValueByBinding(measures, measureBindings, ${$}) === undefined`;
+      return `    ...(missing.has(${$}) || (${M}) ? [${JSON.stringify(h.name)} as keyof typeof metricFieldsForView.${i.name}] : []),`;
+    }).join(`
 `);
     return `  ${i.name}(result: SemaphorGeneratedMetricResult): Array<keyof typeof metricFieldsForView.${i.name}> {
     const missing = new Set(result?.missingMeasures || []);
+    const measures = result?.measures;
+    const measureBindings = result?.measureBindings;
     return [
-${S}
+${g}
     ];
   },`;
   }).join(`
 
-`), y = e.views.map((i) => {
-    const p = Ye(i, e);
-    return `  ${i.name}: ${k(p)},`;
+`), u = e.views.map((i) => {
+    const l = Q(i, e);
+    if (l.length === 0)
+      return "";
+    const g = l[0], h = l.map(($) => `{ key: ${JSON.stringify($.name)}, label: ${JSON.stringify($.raw.label || $.raw.name)} }`).join(", "), I = l.filter(($) => $.name !== g.name).map(($) => `    if (missing.includes(${JSON.stringify($.name)})) delete values.${$.name};`).join(`
+`);
+    return `  ${i.name}(result: SemaphorGeneratedMetricResult): SemaphorGeneratedKpiProps {
+    const values = mapMetricDisplayValues(metricValuesForView.${i.name}(result));
+    const missing = missingMetricMeasuresForView.${i.name}(result).map((key) => String(key));
+    const primaryMissing = missing.includes(${JSON.stringify(g.name)});
+    const boundPrimaryValue = values.${g.name};
+    const primaryValue = primaryMissing || boundPrimaryValue === undefined ? result?.primaryValue : boundPrimaryValue;
+    if (primaryMissing) values.${g.name} = metricDisplayValue(result?.primaryValue);
+${I}
+    return {
+      result: {
+        ...(result || {}),
+        primaryValue: metricDisplayValue(result?.primaryValue),
+        comparisonValue: metricDisplayValue(result?.comparisonValue),
+        measures: values,
+      },
+      title: ${JSON.stringify(i.raw.title || i.raw.id)},
+      label: ${JSON.stringify(g.raw.label || g.raw.name)},
+      value: metricDisplayValue(primaryValue),
+      measures: [${h}],
+      missingMeasures: missing,
+      showComparison: Boolean(result?.comparisonKind),
+    };
+  },`;
+  }).filter(Boolean).join(`
+
+`), c = e.views.map((i) => {
+    const l = Ze(i, e);
+    return `  ${i.name}: ${k(l)},`;
   }).join(`
-`), w = e.views.map((i) => {
-    const S = D(i, e).map((g) => `      ${g.name}: resolveColumnKey(columns, fieldsForView.${i.name}.${g.name}),`).join(`
+`), S = e.views.map((i) => {
+    const g = D(i, e).map((h) => `      ${h.name}: resolveColumnKey(columns, fieldsForView.${i.name}.${h.name}),`).join(`
 `);
     return `  ${i.name}(columns: SemaphorGeneratedColumns): Record<keyof typeof fieldsForView.${i.name}, string | undefined> {
     return {
-${S}
+${g}
     };
   },`;
   }).join(`
 
 `), f = e.views.map((i) => {
-    const S = D(i, e).map((g) => `      ${g.name}: readCell(row, columns, fieldsForView.${i.name}.${g.name}),`).join(`
+    const g = D(i, e).map((h) => `      ${h.name}: readCell(row, columns, fieldsForView.${i.name}.${h.name}),`).join(`
 `);
     return `  ${i.name}(row: SemaphorGeneratedRow, columns: SemaphorGeneratedColumns): Record<keyof typeof fieldsForView.${i.name}, unknown> {
     return {
-${S}
+${g}
     };
   },`;
   }).join(`
 
-`), m = e.views.map((i) => `  ${i.name}(result: SemaphorGeneratedRecordsResult): Array<Record<keyof typeof fieldsForView.${i.name}, unknown>> {
+`), y = e.views.map((i) => `  ${i.name}(result: SemaphorGeneratedRecordsResult): Array<Record<keyof typeof fieldsForView.${i.name}, unknown>> {
     return (result?.records || []).map((row) => rowValuesForView.${i.name}(row, result?.columns));
   },`).join(`
 
-`), N = e.views.map((i) => {
-    const p = D(i, e), S = p.filter((s) => s.raw.role === "dimension"), g = p.filter((s) => s.raw.role === "measure"), $ = S[0], F = S[1], R = g[0], b = g[1], M = [
-      $ ? `      primaryDimension: values.${$.name},` : "      primaryDimension: undefined,",
-      F ? `      secondaryDimension: values.${F.name},` : "      secondaryDimension: undefined,",
-      R ? `      primaryMeasure: values.${R.name},` : "      primaryMeasure: undefined,",
+`), O = e.views.map((i) => {
+    const l = D(i, e), g = l.filter((s) => s.raw.role === "dimension"), h = l.filter((s) => s.raw.role === "measure"), I = g[0], $ = g[1], M = h[0], b = h[1], C = [
+      I ? `      primaryDimension: values.${I.name},` : "      primaryDimension: undefined,",
+      $ ? `      secondaryDimension: values.${$.name},` : "      secondaryDimension: undefined,",
+      M ? `      primaryMeasure: values.${M.name},` : "      primaryMeasure: undefined,",
       b ? `      secondaryMeasure: values.${b.name},` : "      secondaryMeasure: undefined,"
     ].join(`
 `);
     return `  ${i.name}(row: SemaphorGeneratedRow, columns: SemaphorGeneratedColumns): SemaphorGeneratedRoleValues {
     const values = rowValuesForView.${i.name}(row, columns);
     return {
-${M}
+${C}
     };
   },`;
   }).join(`
 
-`), u = n.includes("fields.") || r.includes("fields."), c = [
+`), d = n.includes("fields.") || r.includes("fields."), m = [
     `import { ${[
       "type SemaphorFieldRef",
-      "type SemaphorResultColumn",
-      "semaphorMetricMeasureBindingKey"
-    ].filter(K).join(", ")} } from "react-semaphor/data-app-sdk";`,
-    u ? 'import { fields } from "./fields";' : void 0
-  ].filter(K).join(`
+      "type SemaphorResultColumn"
+    ].filter(E).join(", ")} } from "react-semaphor/data-app-sdk";`,
+    d ? 'import { fields } from "./fields";' : void 0
+  ].filter(E).join(`
 `);
-  return `${H}
-${c}
+  return `${v}
+${m}
 
 export type SemaphorGeneratedRow = Record<string, unknown>;
 export type SemaphorGeneratedColumns = readonly SemaphorResultColumn[] | null | undefined;
@@ -956,12 +1009,16 @@ export type SemaphorGeneratedRecordsResult = {
 } | null | undefined;
 export type SemaphorGeneratedMetricMeasures = Record<string, unknown> | null | undefined;
 export type SemaphorGeneratedMetricMeasureBindings = Record<string, string> | null | undefined;
+export type SemaphorGeneratedMetricValue = number | string | null;
 export type SemaphorGeneratedMetricResult = {
   readonly measures?: SemaphorGeneratedMetricMeasures;
   readonly measureBindings?: SemaphorGeneratedMetricMeasureBindings;
   readonly missingMeasures?: readonly string[];
   readonly primaryValue: unknown;
-  readonly value?: unknown;
+  readonly comparisonKind?: string;
+  readonly comparisonValue?: unknown;
+  readonly delta?: number | null;
+  readonly deltaPercent?: number | null;
 } | null | undefined;
 export type SemaphorGeneratedRoleValues = {
   readonly primaryDimension: unknown;
@@ -976,6 +1033,28 @@ export type SemaphorGeneratedTableColumn = {
   readonly sortable?: boolean;
   readonly sortKey?: string;
 };
+export type SemaphorGeneratedKpiResult<TValues extends Record<string, SemaphorGeneratedMetricValue> = Record<string, SemaphorGeneratedMetricValue>> =
+  Record<string, unknown> & {
+    readonly primaryValue?: SemaphorGeneratedMetricValue;
+    readonly comparisonValue?: SemaphorGeneratedMetricValue;
+    readonly comparisonKind?: string;
+    readonly delta?: number | null;
+    readonly deltaPercent?: number | null;
+    readonly measures: TValues;
+  };
+export type SemaphorGeneratedKpiMeasureConfig = {
+  key: string;
+  label: string;
+};
+export type SemaphorGeneratedKpiProps = {
+  readonly result: SemaphorGeneratedKpiResult;
+  readonly title: string;
+  readonly label: string;
+  readonly value: SemaphorGeneratedMetricValue;
+  readonly measures: SemaphorGeneratedKpiMeasureConfig[];
+  readonly missingMeasures: readonly string[];
+  readonly showComparison: boolean;
+};
 
 export const fieldsForView = {
 ${n}
@@ -985,20 +1064,16 @@ export const metricFieldsForView = {
 ${r}
 } as const;
 
-export const metricMeasureKeysForView = {
-${t}
-} as const;
-
 export const metricMeasureBindingKeysForView = {
-${o}
+${t}
 } as const;
 
 export const tableColumnsForView = {
-${y}
+${c}
 } as const;
 
 export const columnKeysForView = {
-${w}
+${S}
 } as const;
 
 export const rowValuesForView = {
@@ -1006,19 +1081,23 @@ ${f}
 } as const;
 
 export const rowsForView = {
-${m}
+${y}
 } as const;
 
 export const roleValuesForView = {
-${N}
+${O}
 } as const;
 
 export const metricValuesForView = {
-${a}
+${o}
 } as const;
 
 export const missingMetricMeasuresForView = {
-${l}
+${a}
+} as const;
+
+export const kpiPropsForView = {
+${u}
 } as const;
 
 export function resolveColumnKey(
@@ -1062,155 +1141,42 @@ export function readStringCell(
   return value === null || value === undefined ? "" : String(value);
 }
 
-export function readMetricValue(
-  measures: SemaphorGeneratedMetricMeasures,
-  field: SemaphorFieldRef,
-): unknown {
-  return readMetricValueByKeys(measures, metricKeysForField(field));
-}
-
-export function readMetricValueByKeys(
-  measures: SemaphorGeneratedMetricMeasures,
-  keys: readonly string[],
-): unknown {
-  if (!measures) {
-    return undefined;
-  }
-  for (const key of keys) {
-    if (Object.prototype.hasOwnProperty.call(measures, key)) {
-      return measures[key];
-    }
-  }
-  return undefined;
-}
-
 export function readMetricValueByBinding(
   measures: SemaphorGeneratedMetricMeasures,
   measureBindings: SemaphorGeneratedMetricMeasureBindings,
   bindingKey: string,
-  fallbackKeys: readonly string[],
 ): unknown {
   const resultKey = measureBindings?.[bindingKey];
   if (resultKey && measures && Object.prototype.hasOwnProperty.call(measures, resultKey)) {
     return measures[resultKey];
   }
-  return readMetricValueByKeys(measures, fallbackKeys);
-}
-
-export function readMetricValueByKeysWithFallback(
-  measures: SemaphorGeneratedMetricMeasures,
-  keys: readonly string[],
-  fallbackValue: unknown,
-): unknown {
-  const value = readMetricValueByKeys(measures, keys);
-  return value === undefined ? fallbackValue : value;
-}
-
-export function readMetricValueByBindingWithFallback(
-  measures: SemaphorGeneratedMetricMeasures,
-  measureBindings: SemaphorGeneratedMetricMeasureBindings,
-  bindingKey: string,
-  fallbackKeys: readonly string[],
-  fallbackValue: unknown,
-): unknown {
-  const value = readMetricValueByBinding(measures, measureBindings, bindingKey, fallbackKeys);
-  return value === undefined ? fallbackValue : value;
+  return undefined;
 }
 
-export function readNumberMetricValue(
-  measures: SemaphorGeneratedMetricMeasures,
-  field: SemaphorFieldRef,
-): number | null {
-  const value = readMetricValue(measures, field);
-  if (typeof value === "number") {
-    return Number.isFinite(value) ? value : null;
-  }
-  if (typeof value === "string" && value.trim().length > 0) {
-    const parsed = Number(value);
-    return Number.isFinite(parsed) ? parsed : null;
-  }
-  return null;
+export function hasOwnPrimaryMetricValue(
+  result: SemaphorGeneratedMetricResult,
+): boolean {
+  return Boolean(result && Object.prototype.hasOwnProperty.call(result, "primaryValue"));
 }
 
-export function readStringMetricValue(
-  measures: SemaphorGeneratedMetricMeasures,
-  field: SemaphorFieldRef,
-): string {
-  const value = readMetricValue(measures, field);
-  return value === null || value === undefined ? "" : String(value);
+export function mapMetricDisplayValues(
+  values: Record<string, unknown>,
+): Record<string, SemaphorGeneratedMetricValue> {
+  return Object.fromEntries(
+    Object.entries(values)
+      .map(([key, value]) => [key, metricDisplayValue(value)] as const)
+      .filter(([key]) => values[key] !== undefined),
+  );
 }
 
-export function metricKeysForField(
-  field: SemaphorFieldRef,
-  options: { allowNameFallback?: boolean; excludedKeys?: readonly string[] } = {},
-): string[] {
-  const prefixes = metricKeyPrefixesForSource(field.source);
-  const aggregate = metricAggregateForField(field);
-  const excludedKeys = new Set(options.excludedKeys || []);
-  return uniqueStrings([
-    metricQualifiedKeyForField(field),
-    ...prefixes.map((prefix) => \`\${prefix}.\${field.name}\`),
-    \`\${aggregate.toLowerCase()}_\${field.name}\`,
-    \`\${aggregate}_\${field.name}\`,
-    \`\${field.name}_\${aggregate.toLowerCase()}\`,
-    \`\${field.name}_\${aggregate}\`,
-    ...(options.allowNameFallback === false ? [] : [field.name]),
-  ]).filter((key) => !excludedKeys.has(key));
-}
-
-function metricQualifiedKeyForField(field: SemaphorFieldRef): string {
-  return semaphorMetricMeasureBindingKey(field);
-}
-
-function metricAggregateForField(field: SemaphorFieldRef): string {
-  return stringProperty(field as Record<string, unknown>, "aggregate")?.toUpperCase() || "SUM";
-}
-
-function metricKeyPrefixesForSource(
-  source: SemaphorFieldRef["source"] | undefined,
-): string[] {
-  if (!source) {
-    return [];
+export function metricDisplayValue(value: unknown): SemaphorGeneratedMetricValue {
+  if (value === null || value === undefined) {
+    return null;
   }
-  const sourceRecord = source as Record<string, unknown>;
-  if (source.kind === "semantic") {
-    const prefixes: string[] = [];
-    const datasetName = stringProperty(sourceRecord, "datasetName");
-    const datasetId = stringProperty(sourceRecord, "datasetId");
-    if (datasetName) {
-      prefixes.push(datasetName);
-    }
-    if (datasetId) {
-      prefixes.push(datasetId);
-    }
-    return uniqueStrings(prefixes);
+  if (typeof value === "number" || typeof value === "string") {
+    return value;
   }
-  if (source.kind === "physical") {
-    const prefixes: string[] = [];
-    const databaseName = stringProperty(sourceRecord, "databaseName");
-    const schemaName = stringProperty(sourceRecord, "schemaName");
-    const tableName = stringProperty(sourceRecord, "tableName");
-    if (tableName) {
-      prefixes.push(tableName);
-    }
-    if (schemaName && tableName) {
-      prefixes.push(\`\${schemaName}.\${tableName}\`);
-    }
-    if (databaseName && schemaName && tableName) {
-      prefixes.push(\`\${databaseName}.\${schemaName}.\${tableName}\`);
-    }
-    return uniqueStrings(prefixes);
-  }
-  return [];
-}
-
-function stringProperty(record: Record<string, unknown>, key: string): string | undefined {
-  const value = record[key];
-  return typeof value === "string" && value.length > 0 ? value : undefined;
-}
-
-function uniqueStrings(values: string[]): string[] {
-  return Array.from(new Set(values.filter((value) => value.length > 0)));
+  return String(value);
 }
 
 function resolveColumn(
@@ -1317,87 +1283,87 @@ function sourcesReferToSameDataset(
 }
 `;
 }
-function Ye(e, n) {
+function Ze(e, n) {
   const r = D(e, n), t = new Map(
-    (E(e) ? Y(e, n) : []).map((o) => [o.fieldName, o.key])
+    (A(e) ? L(e, n) : []).map((o) => [o.fieldName, o.key])
   );
   return r.map((o) => {
-    const a = x(o.raw, n), l = a ? t.get(a) : void 0;
-    return G({
+    const a = R(o.raw, n), u = a ? t.get(a) : void 0;
+    return N({
       key: o.name,
       label: o.raw.label || o.raw.name,
       dataType: o.raw.dataType,
-      sortable: !!l,
-      sortKey: l
+      sortable: !!u,
+      sortKey: u
     });
   });
 }
 function We(e) {
-  const n = e.checklist.filterScopeByInput || [], r = e.checklist.requiredDevtools || {}, t = e.summary.views.map((u) => u.id).filter(Boolean), o = e.views.map((u) => u.raw.id).filter(Boolean), a = e.inputs.map((u) => u.raw.id).filter(Boolean), l = e.optionQueries.map((u) => u.raw.id || `${u.input.raw.id}-options`).filter(Boolean), y = Object.fromEntries(o.map((u) => [
-    u,
+  const n = e.checklist.filterScopeByInput || [], r = e.checklist.requiredDevtools || {}, t = e.summary.views.map((d) => d.id).filter(Boolean), o = e.views.map((d) => d.raw.id).filter(Boolean), a = e.inputs.map((d) => d.raw.id).filter(Boolean), u = e.optionQueries.map((d) => d.raw.id || `${d.input.raw.id}-options`).filter(Boolean), c = Object.fromEntries(o.map((d) => [
+    d,
     e.filterContracts.filter(
-      (d) => Array.isArray(d.appliesToViewIds) && d.appliesToViewIds.includes(u)
-    ).map((d) => d.inputId)
-  ])), w = Object.fromEntries(e.views.map((u) => [
-    u.raw.id,
+      (p) => Array.isArray(p.appliesToViewIds) && p.appliesToViewIds.includes(d)
+    ).map((p) => p.inputId)
+  ])), S = Object.fromEntries(e.views.map((d) => [
+    d.raw.id,
     {
-      title: u.raw.title,
-      visual: u.raw.visual,
-      visualSpec: u.raw.visualSpec,
-      queryKind: u.raw.queryKind,
-      sdkBuilder: u.raw.sdkBuilder
+      title: d.raw.title,
+      visual: d.raw.visual,
+      visualSpec: d.raw.visualSpec,
+      queryKind: d.raw.queryKind,
+      sdkBuilder: d.raw.sdkBuilder
     }
-  ])), f = Object.fromEntries(e.views.map((u) => {
-    var d;
+  ])), f = Object.fromEntries(e.views.map((d) => {
+    var p;
     return [
-      u.raw.id,
-      G({
-        viewId: u.raw.id,
-        queryId: u.name,
-        title: u.raw.title,
-        visualType: ((d = u.raw.visualSpec) == null ? void 0 : d.visualType) || u.raw.visual,
-        suggestedComponentName: me(u.raw.title || u.raw.id || u.name),
+      d.raw.id,
+      N({
+        viewId: d.raw.id,
+        queryId: d.name,
+        title: d.raw.title,
+        visualType: ((p = d.raw.visualSpec) == null ? void 0 : p.visualType) || d.raw.visual,
+        suggestedComponentName: me(d.raw.title || d.raw.id || d.name),
         marker: {
           attribute: "data-semaphor-view-id",
-          value: u.raw.id
+          value: d.raw.id
         }
       })
     ];
-  })), m = Object.fromEntries(e.inputs.map((u) => {
-    var d;
+  })), y = Object.fromEntries(e.inputs.map((d) => {
+    var p;
     return [
-      u.raw.id,
-      G({
-        inputId: u.raw.id,
-        label: u.raw.label,
-        type: u.raw.type,
-        optionQueryId: ((d = u.raw.optionQuery) == null ? void 0 : d.id) || (u.raw.optionQuery ? `${u.raw.id}-options` : void 0),
-        suggestedComponentName: me(u.raw.label || u.raw.id || u.name),
+      d.raw.id,
+      N({
+        inputId: d.raw.id,
+        label: d.raw.label,
+        type: d.raw.type,
+        optionQueryId: ((p = d.raw.optionQuery) == null ? void 0 : p.id) || (d.raw.optionQuery ? `${d.raw.id}-options` : void 0),
+        suggestedComponentName: me(d.raw.label || d.raw.id || d.name),
         marker: {
           attribute: "data-semaphor-input-id",
-          value: u.raw.id
+          value: d.raw.id
         }
       })
     ];
-  })), N = Object.fromEntries(e.views.map((u) => {
-    var d, c, i;
+  })), O = Object.fromEntries(e.views.map((d) => {
+    var p, m, i;
     return [
-      u.name,
-      G({
-        viewId: u.raw.id,
-        viewTitle: ((d = u.raw.visualSpec) == null ? void 0 : d.title) || u.raw.title,
-        visualType: (c = u.raw.visualSpec) == null ? void 0 : c.visualType,
-        title: ((i = u.raw.visualSpec) == null ? void 0 : i.title) || u.raw.title
+      d.name,
+      N({
+        viewId: d.raw.id,
+        viewTitle: ((p = d.raw.visualSpec) == null ? void 0 : p.title) || d.raw.title,
+        visualType: (m = d.raw.visualSpec) == null ? void 0 : m.visualType,
+        title: ((i = d.raw.visualSpec) == null ? void 0 : i.title) || d.raw.title
       })
     ];
   }));
-  return `${H}
+  return `${v}
 export const generatedViewIds = ${k(t)} as const;
 export const generatedQueryViewIds = ${k(o)} as const;
 export const generatedInputIds = ${k(a)} as const;
-export const generatedInputOptionQueryIds = ${k(l)} as const;
+export const generatedInputOptionQueryIds = ${k(u)} as const;
 export const generatedViewAuthoring = ${k(f)} as const;
-export const generatedInputAuthoring = ${k(m)} as const;
+export const generatedInputAuthoring = ${k(y)} as const;
 
 export type SemaphorGeneratedViewId = typeof generatedViewIds[number];
 export type SemaphorGeneratedQueryViewId = typeof generatedQueryViewIds[number];
@@ -1416,7 +1382,7 @@ export type SemaphorGeneratedFilterContract = {
   readonly [key: string]: unknown;
 };
 
-export const generatedInputIdsForView = ${k(y)} as const;
+export const generatedInputIdsForView = ${k(c)} as const;
 export const generatedFilterContracts: readonly SemaphorGeneratedFilterContract[] = ${k(e.filterContracts)} as const;
 
 export function semaphorViewMarkerProps(viewId: SemaphorGeneratedViewId) {
@@ -1437,7 +1403,7 @@ export function filterContractsForView(viewId: SemaphorGeneratedQueryViewId) {
   );
 }
 
-export const queryDebugForView = ${k(N)} as const;
+export const queryDebugForView = ${k(O)} as const;
 
 export const semaphorGeneratedContractMetadata = ${k({
     schemaVersion: "semaphor-generated-data-app-contract/v1",
@@ -1448,17 +1414,17 @@ export const semaphorGeneratedContractMetadata = ${k({
     generatedViewIds: t,
     generatedQueryViewIds: o,
     generatedInputIds: a,
-    generatedInputOptionQueryIds: l,
-    generatedInputIdsForView: y,
+    generatedInputOptionQueryIds: u,
+    generatedInputIdsForView: c,
     generatedViewAuthoring: f,
-    generatedInputAuthoring: m,
-    visualSpecs: w,
+    generatedInputAuthoring: y,
+    visualSpecs: S,
     presentationViews: e.presentationViews
   })} as const;
 `;
 }
-function Ze() {
-  return `${H}
+function Xe() {
+  return `${v}
 export * from "./sources";
 export * from "./fields";
 export * from "./inputs";
@@ -1468,48 +1434,42 @@ export * from "./accessors";
 export * from "./metadata";
 `;
 }
-function Q(e, n) {
+function B(e, n) {
   if (!(!n || typeof n != "object")) {
     if (Array.isArray(n)) {
-      for (const r of n) Q(e, r);
+      for (const r of n) B(e, r);
       return;
     }
-    C(n) && h(e, U(n));
+    x(n) && w(e, Y(n));
     for (const r of Object.values(n))
-      Q(e, r);
+      B(e, r);
   }
 }
 function D(e, n) {
   const r = [];
-  if (tn(r, e.raw.sdkSpec), r.length === 0)
+  if (on(r, e.raw.sdkSpec), r.length === 0)
     for (const o of e.raw.fields || [])
-      h(r, o);
+      w(r, o);
   const t = X(
-    r.filter((o) => o.name && x(o, n)).map((o) => ({ raw: o, key: L(o), name: "" })),
+    r.filter((o) => o.name && R(o, n)).map((o) => ({ raw: o, key: Z(o), name: "" })),
     (o) => o.key
   );
-  return v(
-    t,
-    (o) => q(o.raw.label || o.raw.name || "field")
-  ), t;
+  return ge(t, n, "field"), t;
 }
-function P(e, n) {
-  if (B(e.raw.sdkSpec.builder) !== "metric")
+function Q(e, n) {
+  if (q(e.raw.sdkSpec.builder) !== "metric")
     return [];
-  const r = V(e.raw.sdkSpec.spec), t = [];
-  h(t, r == null ? void 0 : r.primaryMeasure);
-  for (const a of j(r == null ? void 0 : r.measures))
-    h(t, a);
+  const r = F(e.raw.sdkSpec.spec), t = [];
+  w(t, r == null ? void 0 : r.primaryMeasure);
+  for (const a of H(r == null ? void 0 : r.measures))
+    w(t, a);
   const o = X(
-    t.filter((a) => a.name && x(a, n)).map((a) => ({ raw: a, key: L(a), name: "" })),
+    t.filter((a) => a.name && R(a, n)).map((a) => ({ raw: a, key: Z(a), name: "" })),
     (a) => a.key
   );
-  return v(
-    o,
-    (a) => q(a.raw.label || a.raw.name || "metric")
-  ), o;
+  return ge(o, n, "metric"), o;
 }
-function Xe(e, n, r) {
+function en(e, n, r) {
   var o;
   const t = (o = e.raw.metricBindingKeys) == null ? void 0 : o[r];
   if (typeof t == "string" && t.trim())
@@ -1518,93 +1478,91 @@ function Xe(e, n, r) {
     `views.${e.raw.id}.metricBindingKeys must include a binding key for metric field ${n.raw.name}.`
   );
 }
-function en(e, n) {
-  if (n.length === 1)
-    return /* @__PURE__ */ new Set([n[0].name]);
-  const r = V(e.raw.sdkSpec.spec);
-  if (!C(r == null ? void 0 : r.primaryMeasure))
-    return /* @__PURE__ */ new Set();
-  const t = L(U(r.primaryMeasure)), o = n.find((a) => a.key === t);
-  return o ? /* @__PURE__ */ new Set([o.name]) : /* @__PURE__ */ new Set();
-}
-function nn(e) {
-  const n = /* @__PURE__ */ new Map();
-  for (const r of e)
-    for (const t of new Set(he(r.raw)))
-      n.set(t, (n.get(t) || 0) + 1);
-  return new Set(
-    Array.from(n.entries()).filter(([, r]) => r > 1).map(([r]) => r)
-  );
+function ge(e, n, r) {
+  const t = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map();
+  for (const u of e) {
+    const c = K(u.raw.name || u.raw.label || r) || r;
+    t.set(u.key, c), o.set(c, (o.get(c) || 0) + 1);
+  }
+  const a = /* @__PURE__ */ new Set();
+  for (const u of e) {
+    const c = t.get(u.key) || r, S = R(u.raw, n) || c, f = o.get(c) === 1 ? c : S;
+    u.name = nn(f, u.key, a);
+  }
 }
-function he(e) {
-  const n = (e.aggregate || "SUM").toUpperCase();
-  return _([
-    `${n.toLowerCase()}_${e.name}`,
-    `${n}_${e.name}`,
-    `${e.name}_${n.toLowerCase()}`,
-    `${e.name}_${n}`,
-    e.name
-  ]);
+function nn(e, n, r) {
+  const t = tn(e) ? e : K(e || "field") || "field";
+  if (!r.has(t))
+    return r.add(t), t;
+  const o = rn(n), a = `${t}${o}`;
+  if (!r.has(a))
+    return r.add(a), a;
+  let u = 2;
+  for (; r.has(`${a}${u}`); )
+    u += 1;
+  const c = `${a}${u}`;
+  return r.add(c), c;
 }
 function rn(e) {
-  const n = /* @__PURE__ */ new Map();
-  for (const r of e)
-    n.set(r.raw.name, (n.get(r.raw.name) || 0) + 1);
-  return new Set(
-    Array.from(n.entries()).filter(([, r]) => r > 1).map(([r]) => r)
-  );
+  let n = 0;
+  for (let r = 0; r < e.length; r += 1)
+    n = n * 31 + e.charCodeAt(r) >>> 0;
+  return n.toString(36).slice(0, 6).replace(/^[0-9]/, "x$&");
 }
-function tn(e, n) {
-  const r = V(n.spec);
+function tn(e) {
+  return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(e);
+}
+function on(e, n) {
+  const r = F(n.spec);
   if (!r)
     return;
-  const t = B(n.builder);
+  const t = q(n.builder);
   if (t === "records") {
-    for (const o of j(r.fields)) h(e, o);
+    for (const o of H(r.fields)) w(e, o);
     return;
   }
   if (t === "sql") {
-    for (const o of j(r.fields)) h(e, o);
+    for (const o of H(r.fields)) w(e, o);
     return;
   }
   if (t === "analysis" || t === "metric") {
-    h(e, r.primaryMeasure);
-    for (const o of j(r.measures)) h(e, o);
-    for (const o of j(r.dimensions)) h(e, o);
-    h(e, r.dateField);
+    w(e, r.primaryMeasure);
+    for (const o of H(r.measures)) w(e, o);
+    for (const o of H(r.dimensions)) w(e, o);
+    w(e, r.dateField);
     return;
   }
   if (t === "matrix") {
-    const o = pe(r.rows), a = pe(r.columns), l = j(r.values);
-    for (const y of o) le(e, y);
-    for (const y of a) le(e, y);
-    for (const y of l) {
-      const w = V(y);
-      h(e, w == null ? void 0 : w.field), h(e, w == null ? void 0 : w.measure);
+    const o = pe(r.rows), a = pe(r.columns), u = H(r.values);
+    for (const c of o) le(e, c);
+    for (const c of a) le(e, c);
+    for (const c of u) {
+      const S = F(c);
+      w(e, S == null ? void 0 : S.field), w(e, S == null ? void 0 : S.measure);
     }
   }
 }
 function pe(e) {
   if (Array.isArray(e))
     return e;
-  const n = V(e);
+  const n = F(e);
   return Array.isArray(n == null ? void 0 : n.levels) ? n.levels : [];
 }
 function le(e, n) {
   var r;
-  if (C(n)) {
-    h(e, n);
+  if (x(n)) {
+    w(e, n);
     return;
   }
-  h(e, (r = V(n)) == null ? void 0 : r.field);
+  w(e, (r = F(n)) == null ? void 0 : r.field);
 }
 function ce(e) {
   var n, r, t, o;
   return ((n = e == null ? void 0 : e.computation) == null ? void 0 : n.kind) === "presentation_only" || ((r = e == null ? void 0 : e.computation) == null ? void 0 : r.kind) === "derived" || ((t = e == null ? void 0 : e.computation) == null ? void 0 : t.kind) === "unsupported" || (e == null ? void 0 : e.visual) === "text_block" || ((o = e == null ? void 0 : e.visualSpec) == null ? void 0 : o.visualType) === "text_block";
 }
-function on(e) {
-  const n = V(e) || {};
-  return G({
+function sn(e) {
+  const n = F(e) || {};
+  return N({
     id: e.id,
     title: e.title,
     purpose: e.purpose,
@@ -1618,10 +1576,10 @@ function on(e) {
     description: n.description
   });
 }
-function h(e, n) {
-  C(n) && e.push(U(n));
+function w(e, n) {
+  x(n) && e.push(Y(n));
 }
-function U(e) {
+function Y(e) {
   return {
     name: e.name,
     label: e.label,
@@ -1632,7 +1590,7 @@ function U(e) {
     ...e.source ? { source: e.source } : {}
   };
 }
-function sn(e) {
+function an(e) {
   if (!e.source)
     return;
   const n = {
@@ -1647,48 +1605,48 @@ function sn(e) {
       name: ""
     };
 }
-function C(e) {
-  const n = V(e);
+function x(e) {
+  const n = F(e);
   return !!(n && typeof n.name == "string" && (typeof n.role == "string" || typeof n.dataType == "string" || typeof n.aggregate == "string" || n.source || n.sourceKey));
 }
 function we(e) {
-  const n = V(e);
+  const n = F(e);
   return !!(n && (typeof n.sourceKey == "string" || n.kind === "semantic" || typeof n.datasetName == "string" && typeof n.domainId == "string"));
 }
-function O(e, n) {
+function G(e, n) {
   if (e === void 0)
     return "undefined";
   if (e === null || typeof e == "number" || typeof e == "boolean" || typeof e == "string")
     return JSON.stringify(e);
   if (Array.isArray(e))
-    return `[${e.map((o) => O(o, n)).join(", ")}]`;
-  if (C(e)) {
-    const o = x(U(e), n);
+    return `[${e.map((o) => G(o, n)).join(", ")}]`;
+  if (x(e)) {
+    const o = R(Y(e), n);
     if (o) return `fields.${o}`;
   }
   if (we(e)) {
     const o = Se(e, n);
     if (o) return `sources.${o}`;
   }
-  const r = V(e);
-  return r ? `{ ${Object.entries(r).filter(([, o]) => o !== void 0).map(([o, a]) => `${JSON.stringify(o)}: ${O(a, n)}`).join(", ")} }` : JSON.stringify(e);
+  const r = F(e);
+  return r ? `{ ${Object.entries(r).filter(([, o]) => o !== void 0).map(([o, a]) => `${JSON.stringify(o)}: ${G(a, n)}`).join(", ")} }` : JSON.stringify(e);
 }
 function k(e) {
   return JSON.stringify(e, null, 2);
 }
-function x(e, n) {
-  if (C(e))
-    return n.fieldNameByKey.get(L(U(e)));
+function R(e, n) {
+  if (x(e))
+    return n.fieldNameByKey.get(Z(Y(e)));
 }
 function Se(e, n) {
   if (we(e))
-    for (const r of Z(e)) {
+    for (const r of W(e)) {
       const t = n.sourceNameByKey.get(r);
       if (t)
         return t;
     }
 }
-function L(e) {
+function Z(e) {
   return [
     e.sourceKey || "",
     e.name || "",
@@ -1696,29 +1654,29 @@ function L(e) {
     e.aggregate || ""
   ].join("|");
 }
-function an(e, n) {
-  return !C(e) || !C(n) || e.name !== n.name ? !1 : ie(e).some(
+function un(e, n) {
+  return !x(e) || !x(n) || e.name !== n.name ? !1 : ie(e).some(
     (r) => ie(n).includes(r)
   );
 }
-function un(e) {
-  return C(e) && e.role === "id";
-}
 function dn(e) {
+  return x(e) && e.role === "id";
+}
+function pn(e) {
   const n = [], r = /* @__PURE__ */ new Map();
   for (const t of e) {
-    const o = _(t.aliases.length ? t.aliases : [t.key]), a = o.map((l) => r.get(l)).find(K);
+    const o = _(t.aliases.length ? t.aliases : [t.key]), a = o.map((u) => r.get(u)).find(E);
     if (a) {
       a.aliases = _([...a.aliases, ...o]);
       continue;
     }
     t.aliases = o, n.push(t);
-    for (const l of o)
-      r.set(l, t);
+    for (const u of o)
+      r.set(u, t);
   }
   return n;
 }
-function pn(e) {
+function ln(e) {
   const n = /* @__PURE__ */ new Map();
   for (const r of e)
     for (const t of _([r.key, ...r.aliases])) {
@@ -1733,10 +1691,10 @@ function _(e) {
   return Array.from(new Set(e.filter(Boolean)));
 }
 function $e(e) {
-  return Z(e)[0] || de(e);
+  return W(e)[0] || de(e);
 }
-function Z(e) {
-  const n = V(e);
+function W(e) {
+  const n = F(e);
   if (!n)
     return [];
   const r = [];
@@ -1747,36 +1705,36 @@ function Z(e) {
   return r.length === 0 && r.push(de(e)), _(r);
 }
 function Ie(e) {
-  return Z(e);
+  return W(e);
 }
 function de(e) {
-  const n = V(e);
+  const n = F(e);
   return n ? typeof n.sourceKey == "string" ? n.sourceKey : JSON.stringify(n) : "";
 }
-function ln(e) {
-  return C(e) && ie(e)[0] || "";
+function cn(e) {
+  return x(e) && ie(e)[0] || "";
 }
 function ie(e) {
-  return C(e) ? _([
+  return x(e) ? _([
     ...typeof e.sourceKey == "string" ? [e.sourceKey] : [],
-    ...e.source ? Z(e.source) : []
+    ...e.source ? W(e.source) : []
   ]) : [];
 }
-function B(e) {
+function q(e) {
   const n = String(e || "").replace(/^semaphor\./, "");
   if (!["metric", "records", "analysis", "matrix", "sql"].includes(n))
     throw new Error(`Unsupported sdkSpec builder: ${e}`);
   return n;
 }
-function cn(e) {
-  const n = B(e);
+function mn(e) {
+  const n = q(e);
   return n === "records" || n === "sql";
 }
-function mn(e) {
-  const n = V(e);
+function fn(e) {
+  const n = F(e);
   return typeof (n == null ? void 0 : n.operator) == "string" ? n.operator : e.type === "date_range" ? "between" : e.type === "multi_select" || e.type === "select" ? "in" : "=";
 }
-function v(e, n) {
+function P(e, n) {
   const r = /* @__PURE__ */ new Map();
   for (const t of e) {
     const o = n(t) || "item", a = r.get(o) || 0;
@@ -1791,7 +1749,7 @@ function X(e, n) {
   }
   return t;
 }
-function q(e) {
+function K(e) {
   const n = String(e || "").replace(/[^A-Za-z0-9]+/g, " ").trim().split(/\s+/).filter(Boolean);
   if (n.length === 0)
     return "item";
@@ -1802,47 +1760,47 @@ function q(e) {
   return /^[A-Za-z_$]/.test(o) ? o : `item${o}`;
 }
 function me(e) {
-  const n = q(e);
+  const n = K(e);
   return n.charAt(0).toUpperCase() + n.slice(1);
 }
-function fn(e) {
+function yn(e) {
   const n = String(e).split(":");
   return n[n.length - 1] || String(e);
 }
-function G(e) {
+function N(e) {
   return Object.fromEntries(Object.entries(e).filter(([, n]) => n !== void 0));
 }
-function V(e) {
+function F(e) {
   return e && typeof e == "object" && !Array.isArray(e) ? e : void 0;
 }
-function j(e) {
+function H(e) {
   return Array.isArray(e) ? e : [];
 }
-function z(e) {
+function J(e) {
   return typeof e == "number" && Number.isFinite(e) ? e : void 0;
 }
-function K(e) {
+function E(e) {
   return e !== void 0;
 }
 export {
-  Rn as CODEGEN_SUMMARY_SCHEMA_VERSION,
+  Mn as CODEGEN_SUMMARY_SCHEMA_VERSION,
   Re as CODEGEN_SUMMARY_VALIDATOR_VERSION,
   Me as CONTRACT_MANIFEST_SCHEMA_VERSION,
-  hn as DEFAULT_GENERATED_CONTRACT_OUTPUT_DIR,
+  wn as DEFAULT_GENERATED_CONTRACT_OUTPUT_DIR,
   fe as GENERATED_CONTRACT_SCHEMA_VERSION,
-  Mn as GENERATED_CONTRACT_TYPESCRIPT_FILES,
-  xn as REQUIRED_GENERATED_CONTRACT_FILES,
-  In as SEMAPHOR_DATA_APP_CODEGEN_SUMMARY_SCHEMA_VERSION,
+  Cn as GENERATED_CONTRACT_TYPESCRIPT_FILES,
+  On as REQUIRED_GENERATED_CONTRACT_FILES,
+  Vn as SEMAPHOR_DATA_APP_CODEGEN_SUMMARY_SCHEMA_VERSION,
   Fn as SEMAPHOR_DATA_APP_CODEGEN_SUMMARY_VALIDATOR_VERSION,
   ke as assertValidCodegenSummary,
-  Nn as buildSemaphorGeneratedActiveInput,
-  Cn as buildSemaphorGeneratedInputOptionIntent,
-  On as buildSemaphorGeneratedViewExecutionRequest,
-  Gn as buildSemaphorGeneratedViewExecutionRequests,
-  Kn as evaluateSemaphorDataAppContractUpdatePolicy,
-  wn as generateSemaphorDataAppContract,
+  xn as buildSemaphorGeneratedActiveInput,
+  Gn as buildSemaphorGeneratedInputOptionIntent,
+  Nn as buildSemaphorGeneratedViewExecutionRequest,
+  En as buildSemaphorGeneratedViewExecutionRequests,
+  An as evaluateSemaphorDataAppContractUpdatePolicy,
+  Sn as generateSemaphorDataAppContract,
   bn as isSemaphorDataAppCodegenSummary,
-  En as validateCodegenSummary,
-  Vn as validateSemaphorDataAppCodegenSummary,
-  An as validateSemaphorGeneratedContract
+  jn as validateCodegenSummary,
+  kn as validateSemaphorDataAppCodegenSummary,
+  vn as validateSemaphorGeneratedContract
 };