react-semaphor 0.1.421 → 0.1.422

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

@@ -1,70 +1,69 @@
-import { b as ke } from "../chunks/analyze-result-contract-sWcmvBOA.js";
-import { S as Vr, a as br, i as kr, v as Mr } from "../chunks/analyze-result-contract-sWcmvBOA.js";
-import { c as Me, G as fe, a as Re, b as xe } from "../chunks/update-policy-2MZ-Vf7v.js";
-import { C as xr, e as Nr, R as Cr, f as Gr, g as Or, h as vr, i as Kr, j as Er, v as Ar, d as jr } from "../chunks/update-policy-2MZ-Vf7v.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 Sr = "src/semaphor/generated", A = `// 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 $r(e, r = {}) {
-  Me(e);
-  const n = Ne(e);
-  if (n.views.length === 0 && !r.allowEmpty)
+function Sn(e, n = {}) {
+  ke(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 = Ge(n), o = Oe({
-    contract: n,
+  const t = xe(r), o = Ge({
+    contract: r,
     files: t,
-    generatorName: r.generatorName || "react-semaphor/data-app-codegen/node",
-    generatorVersion: r.generatorVersion || "unknown"
-  }), i = {
+    generatorName: n.generatorName || "react-semaphor/data-app-codegen/node",
+    generatorVersion: n.generatorVersion || "unknown"
+  }), a = {
     ...t,
     "contract.manifest.json": `${JSON.stringify(o, null, 2)}
 `
   };
   return {
     schemaVersion: fe,
-    files: i,
+    files: a,
     manifest: o,
     contentHash: String(o.generatedContentHash || ""),
-    usageExample: Ae(n),
-    warnings: n.warnings,
+    usageExample: je(r),
+    warnings: r.warnings,
     stats: {
-      inputCount: n.inputs.length,
-      executableViewCount: n.views.length,
-      presentationViewCount: n.presentationViews.length,
-      queryCount: n.views.length,
-      optionQueryCount: n.optionQueries.length
+      inputCount: r.inputs.length,
+      executableViewCount: r.views.length,
+      presentationViewCount: r.presentationViews.length,
+      queryCount: r.views.length,
+      optionQueryCount: r.optionQueries.length
     }
   };
 }
-function Ne(e) {
-  var u, d, p, $, a, g, h, y, I, V, b, M;
-  const r = [], n = [];
+function Ce(e) {
+  var d, p, m, i, l, g, h, I, $, M, b, C;
+  const n = [], r = [];
   for (const s of e.inputs) {
-    w(n, s.fieldRef);
-    for (const S of s.bindings || [])
-      w(n, S.fieldRef);
-    w(n, (u = s.optionQuery) == null ? void 0 : u.valueFieldRef), w(n, (d = s.optionQuery) == null ? void 0 : d.labelFieldRef), w(n, (p = s.optionQuery) == null ? void 0 : p.filterFieldRef), Q(n, ($ = s.optionQuery) == null ? void 0 : $.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) {
-    w(n, s.fieldRef), w(n, (a = s.optionQuery) == null ? void 0 : a.valueFieldRef), w(n, (g = s.optionQuery) == null ? void 0 : g.labelFieldRef), w(n, (h = s.optionQuery) == null ? void 0 : h.filterFieldRef), Q(n, (y = s.optionQuery) == null ? void 0 : y.spec);
-    for (const S of s.bindings || [])
-      w(n, S.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 S of s.fields || [])
-      w(n, S);
-    Q(n, (I = s.sdkSpec) == null ? void 0 : I.spec), Q(n, 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 S of Array.isArray(s) ? s : [])
-      w(n, S.fieldRef), w(n, S.optionValueField), w(n, S.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 || [])
-    w(n, s.visibleLabelField), w(n, s.optionValueField), w(n, s.runtimeFilterField);
-  const o = lr(
+    w(r, s.visibleLabelField), w(r, s.optionValueField), w(r, s.runtimeFilterField);
+  const o = pn(
     [
       ...e.sources.map((s) => ({
         raw: s,
@@ -72,157 +71,157 @@ function Ne(e) {
         aliases: Ie(s),
         name: ""
       })),
-      ...n.map((s) => ir(s)).filter(v)
+      ...r.map((s) => an(s)).filter(E)
     ]
   );
-  j(o, (s) => {
-    const S = k(s.raw);
-    return q(
-      s.raw.label || (S == null ? void 0 : S.datasetName) || (S == null ? void 0 : S.datasetId) || (S == null ? void 0 : S.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 i = pr(o), l = X(
-    n.filter((s) => s.name).map((s) => ({
+  const a = ln(o), u = X(
+    r.filter((s) => s.name).map((s) => ({
       raw: s,
-      key: J(s),
+      key: Z(s),
       name: ""
     })),
     (s) => s.key
   );
-  j(
-    l,
-    (s) => q([
-      s.raw.sourceKey ? yr(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 f = new Map(l.map((s) => [s.key, s.name])), F = 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")
   }));
-  j(F, (s) => s.name);
-  const m = F.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
   }));
-  j(m, (s) => s.name);
-  for (const s of m)
-    ur(s.raw.labelFieldRef, s.raw.valueFieldRef) && dr(s.raw.valueFieldRef) && r.push(
-      `Input option query ${((V = s.raw.spec) == null ? void 0 : V.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.`
+  P(f, (s) => s.name);
+  for (const s of f)
+    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 c = e.views.filter(
+  const y = e.views.filter(
     (s) => {
-      var S, P;
-      return !!((S = s.sdkSpec) != null && S.builder && ((P = s.sdkSpec) != null && P.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")
   }));
-  j(c, (s) => s.name);
-  const N = e.views.filter((s) => ce(s) && !("sdkSpec" in s)).map((s) => ar(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) && r.push(`Skipped view ${s.id || s.title || "unknown"} because it has no sdkSpec.`);
-  return Ce({
-    inputs: F,
-    views: c,
+    (!("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: F,
-    optionQueries: m,
-    views: c,
-    presentationViews: N,
+    fields: u,
+    inputs: S,
+    optionQueries: f,
+    views: y,
+    presentationViews: O,
     filterContracts: e.filterContracts,
     checklist: t,
-    sourceNameByKey: i,
-    fieldNameByKey: f,
-    warnings: r
+    sourceNameByKey: a,
+    fieldNameByKey: c,
+    warnings: n
   };
 }
-function Ce({
+function Oe({
   inputs: e,
-  views: r,
-  filterContracts: n
+  views: n,
+  filterContracts: r
 }) {
-  const t = new Set(e.map((i) => i.raw.id).filter(Boolean)), o = new Set(r.map((i) => i.raw.id).filter(Boolean));
-  for (const [i, l] of n.entries()) {
-    if (!t.has(l.inputId))
-      throw new Error(`filterContracts.${i}.inputId must reference a generated input.`);
-    const f = new Set(l.appliesToViewIds || []), F = new Set(l.notAppliedToViewIds || []);
-    for (const [m, c] of (l.appliesToViewIds || []).entries())
-      if (!o.has(c))
+  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, u] of r.entries()) {
+    if (!t.has(u.inputId))
+      throw new Error(`filterContracts.${a}.inputId must reference a generated input.`);
+    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.${i}.appliesToViewIds.${m} must reference an executable generated view.`
+          `filterContracts.${a}.appliesToViewIds.${f} must reference an executable generated view.`
         );
-    for (const [m, c] of (l.notAppliedToViewIds || []).entries())
-      if (!o.has(c))
+    for (const [f, y] of (u.notAppliedToViewIds || []).entries())
+      if (!o.has(y))
         throw new Error(
-          `filterContracts.${i}.notAppliedToViewIds.${m} must reference an executable generated view.`
+          `filterContracts.${a}.notAppliedToViewIds.${f} must reference an executable generated view.`
         );
-    for (const [m, c] of (l.bindings || []).entries()) {
-      if (!o.has(c.viewId))
+    for (const [f, y] of (u.bindings || []).entries()) {
+      if (!o.has(y.viewId))
         throw new Error(
-          `filterContracts.${i}.bindings.${m}.viewId must reference an executable generated view.`
+          `filterContracts.${a}.bindings.${f}.viewId must reference an executable generated view.`
         );
-      if (!f.has(c.viewId))
+      if (!c.has(y.viewId))
         throw new Error(
-          `filterContracts.${i}.bindings.${m}.viewId must be included in appliesToViewIds.`
+          `filterContracts.${a}.bindings.${f}.viewId must be included in appliesToViewIds.`
         );
-      if (F.has(c.viewId))
+      if (S.has(y.viewId))
         throw new Error(
-          `filterContracts.${i}.bindings.${m}.viewId must not be listed in notAppliedToViewIds.`
+          `filterContracts.${a}.bindings.${f}.viewId must not be listed in notAppliedToViewIds.`
         );
     }
   }
 }
-function Ge(e) {
+function xe(e) {
   return {
-    "sources.ts": qe(e),
-    "fields.ts": Pe(e),
+    "sources.ts": Ke(e),
+    "fields.ts": Te(e),
     "inputs.ts": Qe(e),
     "queries.ts": De(e),
-    "bindings.ts": ze(e),
-    "accessors.ts": We(e),
-    "metadata.ts": Xe(e),
-    "index.ts": er(),
-    "USAGE.md": Ke(e)
+    "bindings.ts": Le(e),
+    "accessors.ts": Ye(e),
+    "metadata.ts": We(e),
+    "index.ts": Xe(),
+    "USAGE.md": Ee(e)
   };
 }
-function Oe({
+function Ge({
   contract: e,
-  files: r,
-  generatorName: n,
+  files: n,
+  generatorName: r,
   generatorVersion: t
 }) {
   return {
-    schemaVersion: xe,
+    schemaVersion: Me,
     generatedContractSchemaVersion: fe,
     generator: {
-      name: n,
+      name: r,
       version: t
     },
-    generatedContentHash: ve(r),
+    generatedContentHash: Ne(n),
     codegenSummaryValidatorVersion: Re,
-    codegenSummaryHash: Ee(e.summary),
+    codegenSummaryHash: Ae(e.summary),
     codegenSummary: e.summary
   };
 }
-function ve(e) {
-  const r = ye("sha256");
-  for (const n of Object.keys(e).filter(
+function Ne(e) {
+  const n = ye("sha256");
+  for (const r of Object.keys(e).filter(
     (t) => t.endsWith(".ts")
   ).sort())
-    r.update(n), r.update("\0"), r.update(e[n]), r.update("\0");
-  return `sha256:${r.digest("hex")}`;
+    n.update(r), n.update("\0"), n.update(e[r]), n.update("\0");
+  return `sha256:${n.digest("hex")}`;
 }
-function Ke(e) {
-  const r = [
+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.",
@@ -243,15 +242,15 @@ function Ke(e) {
     "Start with these exports before opening large generated internals such as `metadata.ts`.",
     ""
   ];
-  return e.views.length > 0 && (r.push("Generated executable views:"), e.views.forEach((n) => {
-    r.push(`- \`${n.raw.id}\`: ${n.raw.title || n.name}`);
-  }), r.push("")), e.inputs.length > 0 && (r.push("Generated inputs:"), e.inputs.forEach((n) => {
-    r.push(`- \`${n.raw.id}\`: ${n.raw.label || n.name}`);
-  }), r.push("")), `${r.join(`
+  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 Ee(e) {
+function Ae(e) {
   return `sha256:${ye("sha256").update(ae(e)).digest("hex")}`;
 }
 function ae(e) {
@@ -259,44 +258,44 @@ function ae(e) {
     return JSON.stringify(e);
   if (Array.isArray(e))
     return `[${e.map((t) => ae(t)).join(",")}]`;
-  const r = e;
-  return `{${Object.keys(r).sort().filter((t) => r[t] !== void 0).map((t) => `${JSON.stringify(t)}:${ae(r[t])}`).join(",")}}`;
+  const n = e;
+  return `{${Object.keys(n).sort().filter((t) => n[t] !== void 0).map((t) => `${JSON.stringify(t)}:${ae(n[t])}`).join(",")}}`;
 }
-function Ae(e) {
-  const r = e.views.find(
-    (m) => K(m) && E(m)
+function je(e) {
+  const n = e.views.find(
+    (f) => A(f) && j(f)
   );
-  if (r)
+  if (n)
     return [
       'import { appInputSpecs, createInputHandleMap, queries, queryOptionsForView, recordsSortOptionsForView, rowsForView, semaphorGeneratedContractMetadata } from "./semaphor/generated";',
       "const handles = useSemaphorInputs(appInputSpecs);",
       "const inputHandles = createInputHandleMap(handles);",
-      `const sortOption = recordsSortOptionsForView.${r.name}[0];`,
+      `const sortOption = recordsSortOptionsForView.${n.name}[0];`,
       'const sort = sortOption ? { key: sortOption.key, direction: "asc" as const } : undefined;',
-      `const query = queries.${r.name}({ page, pageSize, sort });`,
-      `const result = useSemaphorQuery(query, queryOptionsForView.${r.name}(inputHandles));`,
-      `const rows = rowsForView.${r.name}(result);`,
+      `const query = queries.${n.name}({ page, pageSize, sort });`,
+      `const result = useSemaphorQuery(query, queryOptionsForView.${n.name}(inputHandles));`,
+      `const rows = rowsForView.${n.name}(result);`,
       "const presentationViews = semaphorGeneratedContractMetadata.presentationViews;"
     ].join(`
 `);
-  const n = e.views.find(
-    (m) => K(m)
+  const r = e.views.find(
+    (f) => A(f)
   );
-  if (n)
+  if (r)
     return [
       'import { appInputSpecs, createInputHandleMap, queries, queryOptionsForView, recordsSortOptionsForView, rowsForView, semaphorGeneratedContractMetadata } from "./semaphor/generated";',
       "const handles = useSemaphorInputs(appInputSpecs);",
       "const inputHandles = createInputHandleMap(handles);",
-      `const sortOption = recordsSortOptionsForView.${n.name}[0];`,
+      `const sortOption = recordsSortOptionsForView.${r.name}[0];`,
       'const sort = sortOption ? { key: sortOption.key, direction: "asc" as const } : undefined;',
-      `const query = queries.${n.name}({ sort });`,
-      `const result = useSemaphorQuery(query, queryOptionsForView.${n.name}(inputHandles));`,
-      `const rows = rowsForView.${n.name}(result);`,
+      `const query = queries.${r.name}({ sort });`,
+      `const result = useSemaphorQuery(query, queryOptionsForView.${r.name}(inputHandles));`,
+      `const rows = rowsForView.${r.name}(result);`,
       "const presentationViews = semaphorGeneratedContractMetadata.presentationViews;"
     ].join(`
 `);
   const t = e.views.find(
-    (m) => W(m) && E(m)
+    (f) => z(f) && j(f)
   );
   if (t)
     return [
@@ -310,7 +309,7 @@ function Ae(e) {
     ].join(`
 `);
   const o = e.views.find(
-    (m) => ue(m) && E(m)
+    (f) => ue(f) && j(f)
   );
   if (o)
     return [
@@ -323,206 +322,206 @@ function Ae(e) {
       "const presentationViews = semaphorGeneratedContractMetadata.presentationViews;"
     ].join(`
 `);
-  const i = e.views.find((m) => {
-    var c;
-    return mr((c = m.raw.sdkSpec) == null ? void 0 : c.builder);
+  const a = e.views.find((f) => {
+    var y;
+    return mn((y = f.raw.sdkSpec) == null ? void 0 : y.builder);
   });
-  if (i)
+  if (a)
     return [
       'import { appInputSpecs, createInputHandleMap, queries, queryOptionsForView, rowsForView, semaphorGeneratedContractMetadata } from "./semaphor/generated";',
       "const handles = useSemaphorInputs(appInputSpecs);",
       "const inputHandles = createInputHandleMap(handles);",
-      `const result = useSemaphorQuery(queries.${i.name}(), queryOptionsForView.${i.name}(inputHandles));`,
-      `const rows = rowsForView.${i.name}(result);`,
+      `const result = useSemaphorQuery(queries.${a.name}(), queryOptionsForView.${a.name}(inputHandles));`,
+      `const rows = rowsForView.${a.name}(result);`,
       "const presentationViews = semaphorGeneratedContractMetadata.presentationViews;"
     ].join(`
 `);
-  const l = e.views.find((m) => je(m));
-  if (l)
+  const u = e.views.find((f) => ve(f));
+  if (u)
     return [
       '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 kpiProps = kpiPropsForView.${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 f = 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);",
-    f ? `const result = useSemaphorQuery(queries.${f.name}(), queryOptionsForView.${f.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) {
-  var r;
-  return B((r = e.raw.sdkSpec) == null ? void 0 : r.builder) === "records";
+function z(e) {
+  var n;
+  return q((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "records";
 }
-function je(e) {
-  var r;
-  return B((r = e.raw.sdkSpec) == null ? void 0 : r.builder) === "metric";
+function ve(e) {
+  var n;
+  return q((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "metric";
 }
-function K(e) {
-  var r, n, t;
-  return W(e) && ((t = (n = (r = e.raw.visualSpec) == null ? void 0 : r.tableBehavior) == null ? void 0 : n.sorting) == null ? void 0 : t.mode) === "server";
+function A(e) {
+  var n, r, t;
+  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 r;
-  return B((r = e.raw.sdkSpec) == null ? void 0 : r.builder) === "sql";
+  var n;
+  return q((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "sql";
 }
-function E(e) {
-  var r, n, t;
-  return ((t = (n = (r = e.raw.visualSpec) == null ? void 0 : r.tableBehavior) == null ? void 0 : n.pagination) == null ? void 0 : t.mode) === "server";
+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) && (E(e) || K(e)) || ue(e) && E(e);
+  return z(e) && (j(e) || A(e)) || ue(e) && j(e);
 }
-function qe(e) {
-  const r = e.sources.map(({ name: t, raw: o }) => {
-    const i = Be(o);
-    return `  ${t}: ${i},`;
+function Ke(e) {
+  const n = e.sources.map(({ name: t, raw: o }) => {
+    const a = qe(o);
+    return `  ${t}: ${a},`;
   }).join(`
-`), n = e.sources.some((t) => t.raw.kind === "semantic") ? `import { semaphor } from "react-semaphor/data-app-sdk";
+`), r = e.sources.some((t) => t.raw.kind === "semantic") ? `import { semaphor } from "react-semaphor/data-app-sdk";
 
 ` : "";
-  return `${A}
-${n}export const sources = {
-${r}
+  return `${v}
+${r}export const sources = {
+${n}
 } as const;
 `;
 }
-function Be(e) {
+function qe(e) {
   if (e.kind === "semantic") {
-    const r = {
+    const n = {
       domainId: e.domainId,
       datasetId: e.datasetId,
       datasetName: e.datasetName,
       label: e.label
     };
-    return `semaphor.source.semantic(${R(O(r))})`;
+    return `semaphor.source.semantic(${k(N(n))})`;
   }
-  return `${R(O({ ...e, sourceKey: void 0 }))} as const`;
+  return `${k(N({ ...e, sourceKey: void 0 }))} as const`;
 }
-function Pe(e) {
-  const r = e.fields.map(({ name: t, raw: o }) => {
-    const i = Te(o, e);
-    return `  ${t}: ${i},`;
+function Te(e) {
+  const n = e.fields.map(({ name: t, raw: o }) => {
+    const a = Be(o, e);
+    return `  ${t}: ${a},`;
   }).join(`
-`), n = r.includes("sources.") ? `import { sources } from "./sources";
+`), r = n.includes("sources.") ? `import { sources } from "./sources";
 
 ` : "";
-  return `${A}
-${n}export const fields = {
-${r}
+  return `${v}
+${r}export const fields = {
+${n}
 } as const;
 `;
 }
-function Te(e, r) {
-  const n = {
+function Be(e, n) {
+  const r = {
     name: e.name,
     label: e.label,
     role: e.role,
     dataType: e.dataType,
     aggregate: e.aggregate
-  }, t = cr(e), o = t ? r.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 i = Object.entries(O(n)).map(([l, f]) => `${JSON.stringify(l)}: ${G(f, r)}`);
-  return o && i.push(`"source": sources.${o}`), `{ ${i.join(", ")} }`;
+  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 Qe(e) {
-  const r = e.inputs.map((p) => {
-    const $ = x(p.raw.fieldRef, e), a = [
-      `id: ${JSON.stringify(p.raw.id)}`,
-      `label: ${JSON.stringify(p.raw.label || p.raw.id)}`,
-      `operator: ${JSON.stringify(fr(p.raw))}`
+  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 ($ && a.push(`field: fields.${$}`), p.raw.relationshipHint && a.push(`relationshipHint: ${R(p.raw.relationshipHint)}`), !$)
-      throw new Error(`Input ${p.raw.id || p.name} is missing a generated field reference.`);
-    return `  ${p.name}: semaphor.filter({ ${a.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(`
-`), n = e.inputs.map((p) => `filterSpecs.${p.name}`).join(", "), t = e.inputs.map((p) => JSON.stringify(p.raw.id)).join(", "), o = e.optionQueries.map((p) => {
-    const $ = p.input.raw, a = p.raw, g = k(a.spec) || {}, {
+`), 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: y,
-      source: I,
-      sourceKey: V,
+      inputId: I,
+      source: $,
+      sourceKey: M,
       valueField: b,
-      labelField: M,
+      labelField: C,
       population: s,
-      dependencies: S,
-      limit: P,
+      dependencies: V,
+      limit: T,
       ...ee
-    } = g, L = a.sourceKey ? { sourceKey: a.sourceKey } : a.source || I || (typeof V == "string" ? { sourceKey: V } : void 0), re = Se(L, e), ne = x(a.valueFieldRef, e), te = x(a.labelFieldRef, e), oe = ge(p), 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: a.id || g.id || `${$.id}-options`,
-      inputId: $.id,
-      source: L,
-      valueField: a.valueFieldRef,
-      labelField: a.labelFieldRef,
-      population: a.population || s,
+      id: l.id || g.id || `${i.id}-options`,
+      inputId: i.id,
+      source: U,
+      valueField: l.valueFieldRef,
+      labelField: l.labelFieldRef,
+      population: l.population || s,
       dependencies: oe,
-      limit: a.limit || P || 100
+      limit: l.limit || T || 100
     };
-    if (!re || !ne || !te)
-      throw new Error(`Input option query ${a.id || `${$.id}-options`} is missing source, valueField, or labelField.`);
-    const Fe = Object.entries(O(se)).map(([Ve, be]) => `${JSON.stringify(Ve)}: ${G(be, e)}`);
-    return `  ${p.name}: semaphor.inputOptions({ ${Fe.join(", ")} }),`;
+    if (!ne || !re || !te)
+      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(`
-`), i = e.optionQueries.map((p) => {
-    const $ = _e(e, p), a = $.length > 0 ? "inputHandles" : "_inputHandles", g = $.map((h) => {
-      const y = x(h.raw.fieldRef, e);
-      if (!y)
+`), 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 ${p.raw.id || `${p.input.raw.id}-options`} references input ${h.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 I = `inputHandles[${JSON.stringify(h.raw.id)}]`;
-      return `    if (${I}) {
-      inputs.push(semaphor.bindInput(${I}, { field: fields.${y} }));
+      const $ = `inputHandles[${JSON.stringify(h.raw.id)}]`;
+      return `    if (${$}) {
+      inputs.push(semaphor.bindInput(${$}, { field: fields.${I} }));
     }`;
     }).join(`
 `);
-    return `  ${p.name}(${a}: SemaphorGeneratedInputHandleMap): SemaphorInputReference[] {
+    return `  ${m.name}(${l}: SemaphorGeneratedInputHandleMap): SemaphorInputReference[] {
     const inputs: SemaphorInputReference[] = [];
 ${g}
     return inputs;
   },`;
   }).join(`
 
-`), l = e.optionQueries.map((p) => `  ${p.name}(inputHandles: SemaphorGeneratedInputHandleMap): SemaphorQueryRuntimeOptions {
+`), u = e.optionQueries.map((m) => `  ${m.name}(inputHandles: SemaphorGeneratedInputHandleMap): SemaphorQueryRuntimeOptions {
     return {
-      inputs: inputsForInputOptionQuery.${p.name}(inputHandles),
+      inputs: inputsForInputOptionQuery.${m.name}(inputHandles),
     };
   },`).join(`
 
-`), f = e.optionQueries.map((p) => `    case ${JSON.stringify(p.raw.id || `${p.input.raw.id}-options`)}:
-      return queryOptionsForInputOptionQuery.${p.name}(inputHandles);`).join(`
-`), F = e.inputs.length > 0, m = e.optionQueries.length > 0, c = m ? "inputOptionQueryId" : "_inputOptionQueryId", N = m ? "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",
-    m ? "SemaphorInputReference" : void 0,
+    f ? "SemaphorInputReference" : void 0,
     "SemaphorQueryRuntimeOptions"
-  ].filter(v).join(", "), d = [
-    F || m ? 'import { semaphor } from "react-semaphor/data-app-sdk";' : void 0,
-    `import type { ${u} } from "react-semaphor/data-app-sdk";`,
-    F || m ? 'import { fields } from "./fields";' : void 0,
-    m ? 'import { sources } from "./sources";' : 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(v).join(`
+  ].filter(E).join(`
 `);
-  return `${A}
-${d}
+  return `${v}
+${p}
 
 export const filterSpecs = {
-${r}
+${n}
 } as const;
 
-export const appInputSpecs = [${n}] as const;
+export const appInputSpecs = [${r}] as const;
 export const appInputIds = [${t}] as const;
 
 export type SemaphorGeneratedInputHandleMap = Partial<Record<SemaphorGeneratedInputId, SemaphorInputHandle>>;
@@ -536,108 +535,108 @@ ${o}
 } as const;
 
 export const inputsForInputOptionQuery = {
-${i}
+${a}
 } as const;
 
 export const queryOptionsForInputOptionQuery = {
-${l}
+${u}
 } as const;
 
 export function queryOptionsForInputOptionQueryId(
-  ${c}: SemaphorGeneratedInputOptionQueryId,
-  ${N}: SemaphorGeneratedInputHandleMap,
+  ${y}: SemaphorGeneratedInputOptionQueryId,
+  ${O}: SemaphorGeneratedInputHandleMap,
 ): SemaphorQueryRuntimeOptions {
-  switch (${c}) {
-${f}
+  switch (${y}) {
+${c}
   }
-  throw new Error(\`Unknown generated Semaphor input option query id: \${${c}}\`);
+  throw new Error(\`Unknown generated Semaphor input option query id: \${${y}}\`);
 }
 `;
 }
-function _e(e, r) {
-  const n = ge(r);
-  if (!n || n.mode === "independent")
+function Pe(e, n) {
+  const r = he(n);
+  if (!r || r.mode === "independent")
     return [];
-  if (n.mode !== "explicit")
+  if (r.mode !== "explicit")
     return [];
-  const t = new Set(n.includeInputIds || []), o = /* @__PURE__ */ new Set([
-    r.input.raw.id,
-    ...n.excludeInputIds || []
+  const t = new Set(r.includeInputIds || []), o = /* @__PURE__ */ new Set([
+    n.input.raw.id,
+    ...r.excludeInputIds || []
   ]);
-  return e.inputs.filter((i) => o.has(i.raw.id) ? !1 : t.has(i.raw.id));
+  return e.inputs.filter((a) => o.has(a.raw.id) ? !1 : t.has(a.raw.id));
 }
-function ge(e) {
-  var r;
-  return e.raw.dependencies || ((r = e.raw.spec) == null ? void 0 : r.dependencies);
+function he(e) {
+  var n;
+  return e.raw.dependencies || ((n = e.raw.spec) == null ? void 0 : n.dependencies);
 }
 function De(e) {
-  const r = e.views.map((d) => {
-    var a, g, h, y, I, V;
-    const p = B(d.raw.sdkSpec.builder), $ = Ue(d);
-    if (W(d) && He(d)) {
-      const b = (a = d.raw.visualSpec) == null ? void 0 : a.tableBehavior, M = k($.pagination), s = E(d), S = K(d), P = ((g = b == null ? void 0 : b.pagination) == null ? void 0 : g.pageSize) || z(M == null ? void 0 : M.pageSize) || z($.limit) || 100, ee = S ? Y(d, e) : [], L = S ? Je({
-        view: d,
+  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: (h = b == null ? void 0 : b.sorting) == null ? void 0 : h.defaultField
-      }) : void 0, re = S ? (y = b == null ? void 0 : b.sorting) == null ? void 0 : y.defaultDirection : void 0, ne = Le({
-        viewName: d.name,
+      }) : 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: S
-      }), te = S ? `    const orderBy = resolveRecordsOrderBy(
-      recordsSortFieldsForView.${d.name},
+        supportsSort: V
+      }), te = V ? `    const orderBy = resolveRecordsOrderBy(
+      recordsSortFieldsForView.${p.name},
       params.sort,
-      ${G(L, e)},
-      ${G(re, e)},
+      ${G(U, e)},
+      ${G(ne, e)},
     );
-` : "", oe = S ? `      ...(orderBy ? { orderBy } : {}),
-` : "", se = s ? `      pagination: resolveServerTablePagination(params, ${JSON.stringify(P)}),
+` : "", oe = V ? `      ...(orderBy ? { orderBy } : {}),
+` : "", se = s ? `      pagination: resolveServerTablePagination(params, ${JSON.stringify(T)}),
 ` : "";
-      return `  ${d.name}(
-    params: ${ne} = {},
+      return `  ${p.name}(
+    params: ${re} = {},
   ) {
-${te}    return semaphor.${p}({
-      ...${G($, e)},
+${te}    return semaphor.${m}({
+      ...${G(i, e)},
 ${oe}${se}    });
   },`;
     }
-    if (ue(d) && E(d)) {
-      const b = (I = d.raw.visualSpec) == null ? void 0 : I.tableBehavior, M = k($.pagination), s = ((V = b == null ? void 0 : b.pagination) == null ? void 0 : V.pageSize) || z(M == null ? void 0 : M.pageSize) || z($.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.${p}({
-      ...${G($, e)},
+    return semaphor.${m}({
+      ...${G(i, e)},
       pagination: resolveServerTablePagination(params, ${JSON.stringify(s)}),
     });
   },`;
     }
-    return `  ${d.name}: () => semaphor.${p}(${G($, e)}),`;
+    return `  ${p.name}: () => semaphor.${m}(${G(i, e)}),`;
   }).join(`
-`), n = e.views.filter((d) => K(d)).map((d) => {
-    const $ = Y(d, e).map((a) => `    ${JSON.stringify(a.key)}: fields.${a.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) => K(d)).map((d) => {
-    const $ = Y(d, e).map((a) => `    { key: ${JSON.stringify(a.key)}, label: ${JSON.stringify(a.label)}, field: fields.${a.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) => K(d)), i = e.views.some((d) => E(d)), l = [r, n, t].join(`
-`), f = [
-    r ? 'import { semaphor } from "react-semaphor/data-app-sdk";' : void 0,
+`), 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(v).join(`
+    u.includes("fields.") ? 'import { fields } from "./fields";' : void 0,
+    u.includes("sources.") ? 'import { sources } from "./sources";' : void 0
+  ].filter(E).join(`
 `);
-  return `${A}
-${f}
+  return `${v}
+${c}
 ${o ? `export type SemaphorGeneratedRecordsSortDirection = "asc" | "desc";
 
 export type SemaphorGeneratedRecordsSort<TSortKey extends string = string> = {
@@ -648,17 +647,17 @@ export type SemaphorGeneratedRecordsSort<TSortKey extends string = string> = {
 export type SemaphorGeneratedRecordsSortParams<TSortKey extends string = string> = {
   sort?: SemaphorGeneratedRecordsSort<TSortKey> | null;
 };
-` : ""}${i ? `export type SemaphorGeneratedServerPaginationParams = {
+` : ""}${a ? `export type SemaphorGeneratedServerPaginationParams = {
   page?: number;
   pageSize?: number;
 };
-` : ""}${o && i ? `export type SemaphorGeneratedRecordsQueryParams<TSortKey extends string = string> =
+` : ""}${o && a ? `export type SemaphorGeneratedRecordsQueryParams<TSortKey extends string = string> =
   SemaphorGeneratedServerPaginationParams &
   SemaphorGeneratedRecordsSortParams<TSortKey>;
 ` : ""}
 
 export const recordsSortFieldsForView = {
-${n}
+${r}
 } as const;
 
 export const recordsSortOptionsForView = {
@@ -666,7 +665,7 @@ ${t}
 } as const;
 
 export const queries = {
-${r}
+${n}
 } as const;
 
 ${o ? `function resolveRecordsOrderBy<TSortKey extends string>(
@@ -689,7 +688,7 @@ ${o ? `function resolveRecordsOrderBy<TSortKey extends string>(
   };
 }
 ` : ""}
-${i ? `function resolveServerTablePagination(
+${a ? `function resolveServerTablePagination(
   params: SemaphorGeneratedServerPaginationParams,
   defaultPageSize: number,
 ) {
@@ -701,112 +700,112 @@ ${i ? `function resolveServerTablePagination(
 ` : ""}
 `;
 }
-function Ue(e) {
-  var i, l;
-  const r = k((i = e.raw.sdkSpec) == null ? void 0 : i.spec) || {}, { kind: n, id: t, ...o } = r;
+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, r) {
-  var i, l;
-  const n = [], t = k((i = e.raw.sdkSpec) == null ? void 0 : i.spec) || {};
-  for (const f of H(t.fields)) w(n, f);
-  w(n, t.dateField), w(n, (l = k(t.orderBy)) == null ? void 0 : l.field);
-  for (const f of e.raw.fields || []) w(n, f);
+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(
-    n.map((f) => {
-      const F = x(f, r);
-      if (!(!f.name || !F))
+    r.map((c) => {
+      const S = R(c, n);
+      if (!(!c.name || !S))
         return {
-          key: F,
-          fieldName: F,
-          rawName: f.name,
-          label: f.label || f.name
+          key: S,
+          fieldName: S,
+          rawName: c.name,
+          label: c.label || c.name
         };
-    }).filter(v),
-    (f) => f.key
+    }).filter(E),
+    (c) => c.key
   );
 }
-function Je({
+function Ue({
   view: e,
-  contract: r,
-  sortFields: n,
+  contract: n,
+  sortFields: r,
   defaultField: t
 }) {
-  var F, m;
-  const o = new Set(n.map((c) => c.key));
+  var S, f;
+  const o = new Set(r.map((y) => y.key));
   if (t && o.has(t))
     return t;
-  const i = n.filter((c) => c.rawName === t);
-  if (i.length === 1)
-    return i[0].key;
-  const l = k((F = e.raw.sdkSpec) == null ? void 0 : F.spec), f = x((m = k(l == null ? void 0 : l.orderBy)) == null ? void 0 : m.field, r);
-  return f && o.has(f) ? f : void 0;
+  const a = r.filter((y) => y.rawName === t);
+  if (a.length === 1)
+    return a[0].key;
+  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 Le({
+function Je({
   viewName: e,
-  supportsPagination: r,
-  supportsSort: n
+  supportsPagination: n,
+  supportsSort: r
 }) {
-  return r && n ? `SemaphorGeneratedRecordsQueryParams<Extract<keyof typeof recordsSortFieldsForView.${e}, string>>` : n ? `SemaphorGeneratedRecordsSortParams<Extract<keyof typeof recordsSortFieldsForView.${e}, string>>` : "SemaphorGeneratedServerPaginationParams";
+  return n && r ? `SemaphorGeneratedRecordsQueryParams<Extract<keyof typeof recordsSortFieldsForView.${e}, string>>` : r ? `SemaphorGeneratedRecordsSortParams<Extract<keyof typeof recordsSortFieldsForView.${e}, string>>` : "SemaphorGeneratedServerPaginationParams";
 }
-function ze(e) {
-  const r = e.views.map((c) => {
-    const u = Ye(e, c.raw.id).map((d) => {
-      const p = d.inputId, $ = x(d.fieldRef, e);
-      if (!p || !$)
+function Le(e) {
+  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 a = [`field: fields.${$}`];
-      if (d.relationshipHint)
-        a.push(`relationshipHint: ${R(d.relationshipHint)}`);
-      else if (Array.isArray(d.relationshipsUsed) && d.relationshipsUsed.length > 0) {
-        const h = d.relationshipsUsed.map((y) => {
-          var I;
-          return (I = k(y)) == null ? void 0 : I.id;
-        }).filter((y) => typeof y == "string" && y.length > 0);
-        h.length > 0 && a.push(`relationshipHint: ${R({ relationshipIds: h })}`);
+      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 g = `inputHandles[${JSON.stringify(p)}]`;
+      const g = `inputHandles[${JSON.stringify(m)}]`;
       return `    if (${g}) {
-      inputs.push(semaphor.bindInput(${g}, { ${a.join(", ")} }));
+      inputs.push(semaphor.bindInput(${g}, { ${l.join(", ")} }));
     }`;
     }).filter(Boolean).join(`
 `);
-    return { view: c, renderedBindings: u };
-  }), n = r.some((c) => c.renderedBindings.length > 0), t = r.map(({ view: c, renderedBindings: N }) => {
-    const u = N ? "inputHandles" : "_inputHandles";
-    return `  ${c.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((c) => `  ${c.name}(inputHandles: SemaphorGeneratedInputHandleMap): SemaphorQueryRuntimeOptions {
+`), o = e.views.map((y) => `  ${y.name}(inputHandles: SemaphorGeneratedInputHandleMap): SemaphorQueryRuntimeOptions {
     return {
-      inputs: inputsForView.${c.name}(inputHandles),
-      debug: queryDebugForView.${c.name},
+      inputs: inputsForView.${y.name}(inputHandles),
+      debug: queryDebugForView.${y.name},
     };
   },`).join(`
 
-`), i = e.views.map((c) => `    case ${JSON.stringify(c.raw.id)}:
-      return inputsForView.${c.name}(inputHandles);`).join(`
-`), l = e.views.map((c) => `    case ${JSON.stringify(c.raw.id)}:
-      return queryOptionsForView.${c.name}(inputHandles);`).join(`
-`), f = e.views.length > 0, F = f ? "inputHandles" : "_inputHandles", m = [
-    n ? 'import { semaphor } from "react-semaphor/data-app-sdk";' : void 0,
+`), 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";',
-    n ? 'import { fields } from "./fields";' : void 0,
+    r ? 'import { fields } from "./fields";' : void 0,
     'import type { SemaphorGeneratedInputHandleMap } from "./inputs";',
-    f ? 'import { queryDebugForView } from "./metadata";' : void 0,
+    c ? 'import { queryDebugForView } from "./metadata";' : void 0,
     'import type { SemaphorGeneratedQueryViewId } from "./metadata";'
-  ].filter(v).join(`
+  ].filter(E).join(`
 `);
-  return `${A}
-${m}
+  return `${v}
+${f}
 
 export const inputsForView = {
 ${t}
@@ -818,199 +817,189 @@ ${o}
 
 export function inputsForViewId(
   viewId: SemaphorGeneratedQueryViewId,
-  ${F}: SemaphorGeneratedInputHandleMap,
+  ${S}: SemaphorGeneratedInputHandleMap,
 ): SemaphorInputReference[] {
   switch (viewId) {
-${i}
+${a}
   }
   throw new Error(\`Unknown generated Semaphor view id: \${viewId}\`);
 }
 
 export function queryOptionsForViewId(
   viewId: SemaphorGeneratedQueryViewId,
-  ${F}: SemaphorGeneratedInputHandleMap,
+  ${S}: SemaphorGeneratedInputHandleMap,
 ): SemaphorQueryRuntimeOptions {
   switch (viewId) {
-${l}
+${u}
   }
   throw new Error(\`Unknown generated Semaphor view id: \${viewId}\`);
 }
 `;
 }
-function Ye(e, r) {
+function ze(e, n) {
   return e.filterContracts.flatMap(
-    (n) => (n.bindings || []).filter((t) => t.viewId === r).map((t) => ({
-      inputId: n.inputId,
+    (r) => (r.bindings || []).filter((t) => t.viewId === n).map((t) => ({
+      inputId: r.inputId,
       fieldRef: t.fieldRef,
       relationshipHint: t.relationshipHint,
       relationshipsUsed: t.relationshipsUsed
     }))
   );
 }
-function We(e) {
-  const r = e.views.map((a) => {
-    const h = D(a, e).map((y) => {
-      const I = x(y.raw, e);
-      return I ? `    ${y.name}: fields.${I},` : "";
+function Ye(e) {
+  const n = e.views.map((i) => {
+    const g = D(i, e).map((h) => {
+      const I = R(h.raw, e);
+      return I ? `    ${h.name}: fields.${I},` : "";
     }).filter(Boolean).join(`
 `);
-    return `  ${a.name}: {
-${h}
+    return `  ${i.name}: {
+${g}
   },`;
   }).join(`
-`), n = e.views.map((a) => {
-    const h = T(a, e).map((y) => {
-      const I = x(y.raw, e);
-      return I ? `    ${y.name}: fields.${I},` : "";
+`), r = e.views.map((i) => {
+    const g = Q(i, e).map((h) => {
+      const I = R(h.raw, e);
+      return I ? `    ${h.name}: fields.${I},` : "";
     }).filter(Boolean).join(`
 `);
-    return `  ${a.name}: {
-${h}
-  },`;
-  }).join(`
-`), t = e.views.map((a) => {
-    const g = T(a, e), h = or(g), y = tr(g), I = g.map((V) => {
-      const b = Array.from(
-        new Set(
-          he(V.raw).filter((M) => y.has(M))
-        )
-      );
-      return `    ${V.name}: metricKeysForField(metricFieldsForView.${a.name}.${V.name}, { allowNameFallback: ${h.has(V.raw.name) ? "false" : "true"}, excludedKeys: ${R(b)} }),`;
-    }).join(`
-`);
-    return `  ${a.name}: {
-${I}
+    return `  ${i.name}: {
+${g}
   },`;
   }).join(`
-`), o = e.views.map((a) => {
-    const h = T(a, e).map((y, I) => `    ${y.name}: ${JSON.stringify(rr(a, y, I))},`).join(`
+`), t = e.views.map((i) => {
+    const g = Q(i, e).map((h, I) => `    ${h.name}: ${JSON.stringify(en(i, h, I))},`).join(`
 `);
-    return `  ${a.name}: {
-${h}
+    return `  ${i.name}: {
+${g}
   },`;
   }).join(`
-`), i = e.views.map((a) => {
-    const g = T(a, e);
-    if (g.length === 0)
-      return `  ${a.name}(): Record<keyof typeof metricFieldsForView.${a.name}, unknown> {
+`), o = e.views.map((i) => {
+    const l = Q(i, e);
+    if (l.length === 0)
+      return `  ${i.name}(): Record<keyof typeof metricFieldsForView.${i.name}, unknown> {
     return {};
   },`;
-    const h = nr(a, g), y = g.map((I) => {
-      const V = `metricMeasureKeysForView.${a.name}.${I.name}`, b = `metricMeasureBindingKeysForView.${a.name}.${I.name}`, M = h.has(I.name) ? `readMetricValueByBindingWithFallback(measures, measureBindings, ${b}, ${V}, primaryValue)` : `readMetricValueByBinding(measures, measureBindings, ${b}, ${V})`;
-      return `      ${I.name}: ${M},`;
+    const g = l.map((h) => {
+      const $ = `readMetricValueByBinding(measures, measureBindings, ${`metricMeasureBindingKeysForView.${i.name}.${h.name}`})`;
+      return `      ${h.name}: ${$},`;
     }).join(`
 `);
-    return `  ${a.name}(result: SemaphorGeneratedMetricResult): Record<keyof typeof metricFieldsForView.${a.name}, unknown> {
+    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 {
-${y}
+${g}
     };
   },`;
   }).join(`
 
-`), l = e.views.map((a) => {
-    const g = T(a, e);
-    if (g.length === 0)
-      return `  ${a.name}(): Array<keyof typeof metricFieldsForView.${a.name}> {
+`), 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 h = g.map((y) => `    ...(missing.has(metricMeasureBindingKeysForView.${a.name}.${y.name}) ? [${JSON.stringify(y.name)} as keyof typeof metricFieldsForView.${a.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 `  ${a.name}(result: SemaphorGeneratedMetricResult): Array<keyof typeof metricFieldsForView.${a.name}> {
+    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 [
-${h}
+${g}
     ];
   },`;
   }).join(`
 
-`), f = e.views.map((a) => {
-    const g = T(a, e);
-    if (g.length === 0)
+`), u = e.views.map((i) => {
+    const l = Q(i, e);
+    if (l.length === 0)
       return "";
-    const h = g[0], y = g.map((V) => `{ key: ${JSON.stringify(V.name)}, label: ${JSON.stringify(V.raw.label || V.raw.name)} }`).join(", "), I = g.filter((V) => V.name !== h.name).map((V) => `    if (missing.includes(${JSON.stringify(V.name)})) delete values.${V.name};`).join(`
+    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 `  ${a.name}(result: SemaphorGeneratedMetricResult): SemaphorGeneratedKpiProps {
-    const values = mapMetricDisplayValues(metricValuesForView.${a.name}(result));
-    const missing = missingMetricMeasuresForView.${a.name}(result).map((key) => String(key));
-    const primaryMissing = missing.includes(${JSON.stringify(h.name)});
-    const primaryValue = primaryMissing ? result?.primaryValue : values.${h.name};
-    if (primaryMissing) values.${h.name} = metricDisplayValue(result?.primaryValue);
+    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 || {}),
-        value: metricDisplayValue(result?.value),
         primaryValue: metricDisplayValue(result?.primaryValue),
         comparisonValue: metricDisplayValue(result?.comparisonValue),
         measures: values,
       },
-      title: ${JSON.stringify(a.raw.title || a.raw.id)},
-      label: ${JSON.stringify(h.raw.label || h.raw.name)},
+      title: ${JSON.stringify(i.raw.title || i.raw.id)},
+      label: ${JSON.stringify(g.raw.label || g.raw.name)},
       value: metricDisplayValue(primaryValue),
-      measures: [${y}],
+      measures: [${h}],
       missingMeasures: missing,
       showComparison: Boolean(result?.comparisonKind),
     };
   },`;
   }).filter(Boolean).join(`
 
-`), F = e.views.map((a) => {
-    const g = Ze(a, e);
-    return `  ${a.name}: ${R(g)},`;
+`), c = e.views.map((i) => {
+    const l = Ze(i, e);
+    return `  ${i.name}: ${k(l)},`;
   }).join(`
-`), m = e.views.map((a) => {
-    const h = D(a, e).map((y) => `      ${y.name}: resolveColumnKey(columns, fieldsForView.${a.name}.${y.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 `  ${a.name}(columns: SemaphorGeneratedColumns): Record<keyof typeof fieldsForView.${a.name}, string | undefined> {
+    return `  ${i.name}(columns: SemaphorGeneratedColumns): Record<keyof typeof fieldsForView.${i.name}, string | undefined> {
     return {
-${h}
+${g}
     };
   },`;
   }).join(`
 
-`), c = e.views.map((a) => {
-    const h = D(a, e).map((y) => `      ${y.name}: readCell(row, columns, fieldsForView.${a.name}.${y.name}),`).join(`
+`), f = e.views.map((i) => {
+    const g = D(i, e).map((h) => `      ${h.name}: readCell(row, columns, fieldsForView.${i.name}.${h.name}),`).join(`
 `);
-    return `  ${a.name}(row: SemaphorGeneratedRow, columns: SemaphorGeneratedColumns): Record<keyof typeof fieldsForView.${a.name}, unknown> {
+    return `  ${i.name}(row: SemaphorGeneratedRow, columns: SemaphorGeneratedColumns): Record<keyof typeof fieldsForView.${i.name}, unknown> {
     return {
-${h}
+${g}
     };
   },`;
   }).join(`
 
-`), N = e.views.map((a) => `  ${a.name}(result: SemaphorGeneratedRecordsResult): Array<Record<keyof typeof fieldsForView.${a.name}, unknown>> {
-    return (result?.records || []).map((row) => rowValuesForView.${a.name}(row, result?.columns));
+`), 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(`
 
-`), u = e.views.map((a) => {
-    const g = D(a, e), h = g.filter((S) => S.raw.role === "dimension"), y = g.filter((S) => S.raw.role === "measure"), I = h[0], V = h[1], b = y[0], M = y[1], s = [
+`), 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,",
-      V ? `      secondaryDimension: values.${V.name},` : "      secondaryDimension: undefined,",
-      b ? `      primaryMeasure: values.${b.name},` : "      primaryMeasure: undefined,",
-      M ? `      secondaryMeasure: values.${M.name},` : "      secondaryMeasure: undefined,"
+      $ ? `      secondaryDimension: values.${$.name},` : "      secondaryDimension: undefined,",
+      M ? `      primaryMeasure: values.${M.name},` : "      primaryMeasure: undefined,",
+      b ? `      secondaryMeasure: values.${b.name},` : "      secondaryMeasure: undefined,"
     ].join(`
 `);
-    return `  ${a.name}(row: SemaphorGeneratedRow, columns: SemaphorGeneratedColumns): SemaphorGeneratedRoleValues {
-    const values = rowValuesForView.${a.name}(row, columns);
+    return `  ${i.name}(row: SemaphorGeneratedRow, columns: SemaphorGeneratedColumns): SemaphorGeneratedRoleValues {
+    const values = rowValuesForView.${i.name}(row, columns);
     return {
-${s}
+${C}
     };
   },`;
   }).join(`
 
-`), d = r.includes("fields.") || n.includes("fields."), $ = [
+`), d = n.includes("fields.") || r.includes("fields."), m = [
     `import { ${[
       "type SemaphorFieldRef",
       "type SemaphorResultColumn"
-    ].filter(v).join(", ")} } from "react-semaphor/data-app-sdk";`,
+    ].filter(E).join(", ")} } from "react-semaphor/data-app-sdk";`,
     d ? 'import { fields } from "./fields";' : void 0
-  ].filter(v).join(`
+  ].filter(E).join(`
 `);
-  return `${A}
-${$}
+  return `${v}
+${m}
 
 export type SemaphorGeneratedRow = Record<string, unknown>;
 export type SemaphorGeneratedColumns = readonly SemaphorResultColumn[] | null | undefined;
@@ -1026,7 +1015,6 @@ export type SemaphorGeneratedMetricResult = {
   readonly measureBindings?: SemaphorGeneratedMetricMeasureBindings;
   readonly missingMeasures?: readonly string[];
   readonly primaryValue: unknown;
-  readonly value?: unknown;
   readonly comparisonKind?: string;
   readonly comparisonValue?: unknown;
   readonly delta?: number | null;
@@ -1047,7 +1035,6 @@ export type SemaphorGeneratedTableColumn = {
 };
 export type SemaphorGeneratedKpiResult<TValues extends Record<string, SemaphorGeneratedMetricValue> = Record<string, SemaphorGeneratedMetricValue>> =
   Record<string, unknown> & {
-    readonly value?: SemaphorGeneratedMetricValue;
     readonly primaryValue?: SemaphorGeneratedMetricValue;
     readonly comparisonValue?: SemaphorGeneratedMetricValue;
     readonly comparisonKind?: string;
@@ -1070,51 +1057,47 @@ export type SemaphorGeneratedKpiProps = {
 };
 
 export const fieldsForView = {
-${r}
-} as const;
-
-export const metricFieldsForView = {
 ${n}
 } as const;
 
-export const metricMeasureKeysForView = {
-${t}
+export const metricFieldsForView = {
+${r}
 } as const;
 
 export const metricMeasureBindingKeysForView = {
-${o}
+${t}
 } as const;
 
 export const tableColumnsForView = {
-${F}
+${c}
 } as const;
 
 export const columnKeysForView = {
-${m}
+${S}
 } as const;
 
 export const rowValuesForView = {
-${c}
+${f}
 } as const;
 
 export const rowsForView = {
-${N}
+${y}
 } as const;
 
 export const roleValuesForView = {
-${u}
+${O}
 } as const;
 
 export const metricValuesForView = {
-${i}
+${o}
 } as const;
 
 export const missingMetricMeasuresForView = {
-${l}
+${a}
 } as const;
 
 export const kpiPropsForView = {
-${f}
+${u}
 } as const;
 
 export function resolveColumnKey(
@@ -1158,82 +1141,22 @@ 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;
-}
-
-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;
+  return undefined;
 }
 
-export function readStringMetricValue(
-  measures: SemaphorGeneratedMetricMeasures,
-  field: SemaphorFieldRef,
-): string {
-  const value = readMetricValue(measures, field);
-  return value === null || value === undefined ? "" : String(value);
+export function hasOwnPrimaryMetricValue(
+  result: SemaphorGeneratedMetricResult,
+): boolean {
+  return Boolean(result && Object.prototype.hasOwnProperty.call(result, "primaryValue"));
 }
 
 export function mapMetricDisplayValues(
@@ -1256,112 +1179,6 @@ export function metricDisplayValue(value: unknown): SemaphorGeneratedMetricValue
   return String(value);
 }
 
-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 [
-    field.source ? sourceIdentityKey(field.source as Record<string, unknown>) : "unknown",
-    metricAggregateForField(field),
-    field.name,
-  ].filter(Boolean).join(":");
-}
-
-function metricAggregateForField(field: SemaphorFieldRef): string {
-  return (field.aggregate || "SUM").toUpperCase();
-}
-
-function metricKeyPrefixesForSource(
-  source: SemaphorFieldRef["source"] | undefined,
-): string[] {
-  if (!source) {
-    return [];
-  }
-  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 (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 sourceIdentityKey(source: Record<string, unknown>): string {
-  const kind = stringProperty(source, "kind");
-  if (kind === "semantic") {
-    const datasetId = stringProperty(source, "datasetId");
-    return [
-      kind,
-      stringProperty(source, "domainId") || "",
-      datasetId
-        ? \`datasetId:\${datasetId}\`
-        : \`datasetName:\${stringProperty(source, "datasetName") || ""}\`,
-    ].join(":");
-  }
-  if (kind === "physical") {
-    return [
-      kind,
-      stringProperty(source, "connectionId") || "",
-      stringProperty(source, "databaseName") || "",
-      stringProperty(source, "schemaName") || "",
-      stringProperty(source, "tableName") || "",
-    ].join(":");
-  }
-  return [
-    kind || "unknown",
-    stringProperty(source, "connectionId") || "",
-    stringProperty(source, "dialect") || "",
-    stringProperty(source, "label") || "",
-  ].join(":");
-}
-
-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)));
-}
-
 function resolveColumn(
   columns: SemaphorGeneratedColumns,
   field: SemaphorFieldRef,
@@ -1466,87 +1283,87 @@ function sourcesReferToSameDataset(
 }
 `;
 }
-function Ze(e, r) {
-  const n = D(e, r), t = new Map(
-    (K(e) ? Y(e, r) : []).map((o) => [o.fieldName, o.key])
+function Ze(e, n) {
+  const r = D(e, n), t = new Map(
+    (A(e) ? L(e, n) : []).map((o) => [o.fieldName, o.key])
   );
-  return n.map((o) => {
-    const i = x(o.raw, r), l = i ? t.get(i) : void 0;
-    return O({
+  return r.map((o) => {
+    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 Xe(e) {
-  const r = e.checklist.filterScopeByInput || [], n = e.checklist.requiredDevtools || {}, t = e.summary.views.map((u) => u.id).filter(Boolean), o = e.views.map((u) => u.raw.id).filter(Boolean), i = e.inputs.map((u) => u.raw.id).filter(Boolean), l = e.optionQueries.map((u) => u.raw.id || `${u.input.raw.id}-options`).filter(Boolean), f = Object.fromEntries(o.map((u) => [
-    u,
+function We(e) {
+  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)
-  ])), F = 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
     }
-  ])), m = Object.fromEntries(e.views.map((u) => {
-    var d;
+  ])), f = Object.fromEntries(e.views.map((d) => {
+    var p;
     return [
-      u.raw.id,
-      O({
-        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
         }
       })
     ];
-  })), c = Object.fromEntries(e.inputs.map((u) => {
-    var d;
+  })), y = Object.fromEntries(e.inputs.map((d) => {
+    var p;
     return [
-      u.raw.id,
-      O({
-        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, p, $;
+  })), O = Object.fromEntries(e.views.map((d) => {
+    var p, m, i;
     return [
-      u.name,
-      O({
-        viewId: u.raw.id,
-        viewTitle: ((d = u.raw.visualSpec) == null ? void 0 : d.title) || u.raw.title,
-        visualType: (p = u.raw.visualSpec) == null ? void 0 : p.visualType,
-        title: (($ = u.raw.visualSpec) == null ? void 0 : $.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 `${A}
-export const generatedViewIds = ${R(t)} as const;
-export const generatedQueryViewIds = ${R(o)} as const;
-export const generatedInputIds = ${R(i)} as const;
-export const generatedInputOptionQueryIds = ${R(l)} as const;
-export const generatedViewAuthoring = ${R(m)} as const;
-export const generatedInputAuthoring = ${R(c)} as const;
+  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(u)} as const;
+export const generatedViewAuthoring = ${k(f)} as const;
+export const generatedInputAuthoring = ${k(y)} as const;
 
 export type SemaphorGeneratedViewId = typeof generatedViewIds[number];
 export type SemaphorGeneratedQueryViewId = typeof generatedQueryViewIds[number];
@@ -1565,8 +1382,8 @@ export type SemaphorGeneratedFilterContract = {
   readonly [key: string]: unknown;
 };
 
-export const generatedInputIdsForView = ${R(f)} as const;
-export const generatedFilterContracts: readonly SemaphorGeneratedFilterContract[] = ${R(e.filterContracts)} as const;
+export const generatedInputIdsForView = ${k(c)} as const;
+export const generatedFilterContracts: readonly SemaphorGeneratedFilterContract[] = ${k(e.filterContracts)} as const;
 
 export function semaphorViewMarkerProps(viewId: SemaphorGeneratedViewId) {
   return {
@@ -1586,28 +1403,28 @@ export function filterContractsForView(viewId: SemaphorGeneratedQueryViewId) {
   );
 }
 
-export const queryDebugForView = ${R(N)} as const;
+export const queryDebugForView = ${k(O)} as const;
 
-export const semaphorGeneratedContractMetadata = ${R({
+export const semaphorGeneratedContractMetadata = ${k({
     schemaVersion: "semaphor-generated-data-app-contract/v1",
     title: e.title,
-    requiredDevtools: n,
+    requiredDevtools: r,
     filterContracts: e.filterContracts,
-    filterScopeByInput: r,
+    filterScopeByInput: n,
     generatedViewIds: t,
     generatedQueryViewIds: o,
-    generatedInputIds: i,
-    generatedInputOptionQueryIds: l,
-    generatedInputIdsForView: f,
-    generatedViewAuthoring: m,
-    generatedInputAuthoring: c,
-    visualSpecs: F,
+    generatedInputIds: a,
+    generatedInputOptionQueryIds: u,
+    generatedInputIdsForView: c,
+    generatedViewAuthoring: f,
+    generatedInputAuthoring: y,
+    visualSpecs: S,
     presentationViews: e.presentationViews
   })} as const;
 `;
 }
-function er() {
-  return `${A}
+function Xe() {
+  return `${v}
 export * from "./sources";
 export * from "./fields";
 export * from "./inputs";
@@ -1617,143 +1434,135 @@ export * from "./accessors";
 export * from "./metadata";
 `;
 }
-function Q(e, r) {
-  if (!(!r || typeof r != "object")) {
-    if (Array.isArray(r)) {
-      for (const n of r) Q(e, n);
+function B(e, n) {
+  if (!(!n || typeof n != "object")) {
+    if (Array.isArray(n)) {
+      for (const r of n) B(e, r);
       return;
     }
-    C(r) && w(e, U(r));
-    for (const n of Object.values(r))
-      Q(e, n);
+    x(n) && w(e, Y(n));
+    for (const r of Object.values(n))
+      B(e, r);
   }
 }
-function D(e, r) {
-  const n = [];
-  if (sr(n, e.raw.sdkSpec), n.length === 0)
+function D(e, n) {
+  const r = [];
+  if (on(r, e.raw.sdkSpec), r.length === 0)
     for (const o of e.raw.fields || [])
-      w(n, o);
+      w(r, o);
   const t = X(
-    n.filter((o) => o.name && x(o, r)).map((o) => ({ raw: o, key: J(o), name: "" })),
+    r.filter((o) => o.name && R(o, n)).map((o) => ({ raw: o, key: Z(o), name: "" })),
     (o) => o.key
   );
-  return j(
-    t,
-    (o) => q(o.raw.label || o.raw.name || "field")
-  ), t;
+  return ge(t, n, "field"), t;
 }
-function T(e, r) {
-  if (B(e.raw.sdkSpec.builder) !== "metric")
+function Q(e, n) {
+  if (q(e.raw.sdkSpec.builder) !== "metric")
     return [];
-  const n = k(e.raw.sdkSpec.spec), t = [];
-  w(t, n == null ? void 0 : n.primaryMeasure);
-  for (const i of H(n == null ? void 0 : n.measures))
-    w(t, i);
+  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((i) => i.name && x(i, r)).map((i) => ({ raw: i, key: J(i), name: "" })),
-    (i) => i.key
+    t.filter((a) => a.name && R(a, n)).map((a) => ({ raw: a, key: Z(a), name: "" })),
+    (a) => a.key
   );
-  return j(
-    o,
-    (i) => q(i.raw.label || i.raw.name || "metric")
-  ), o;
+  return ge(o, n, "metric"), o;
 }
-function rr(e, r, n) {
+function en(e, n, r) {
   var o;
-  const t = (o = e.raw.metricBindingKeys) == null ? void 0 : o[n];
+  const t = (o = e.raw.metricBindingKeys) == null ? void 0 : o[r];
   if (typeof t == "string" && t.trim())
     return t;
   throw new Error(
-    `views.${e.raw.id}.metricBindingKeys must include a binding key for metric field ${r.raw.name}.`
-  );
-}
-function nr(e, r) {
-  if (r.length === 1)
-    return /* @__PURE__ */ new Set([r[0].name]);
-  const n = k(e.raw.sdkSpec.spec);
-  if (!C(n == null ? void 0 : n.primaryMeasure))
-    return /* @__PURE__ */ new Set();
-  const t = J(U(n.primaryMeasure)), o = r.find((i) => i.key === t);
-  return o ? /* @__PURE__ */ new Set([o.name]) : /* @__PURE__ */ new Set();
-}
-function tr(e) {
-  const r = /* @__PURE__ */ new Map();
-  for (const n of e)
-    for (const t of new Set(he(n.raw)))
-      r.set(t, (r.get(t) || 0) + 1);
-  return new Set(
-    Array.from(r.entries()).filter(([, n]) => n > 1).map(([n]) => n)
+    `views.${e.raw.id}.metricBindingKeys must include a binding key for metric field ${n.raw.name}.`
   );
 }
-function he(e) {
-  const r = ke(e);
-  return _([
-    `${r.toLowerCase()}_${e.name}`,
-    `${r}_${e.name}`,
-    `${e.name}_${r.toLowerCase()}`,
-    `${e.name}_${r}`,
-    e.name
-  ]);
-}
-function or(e) {
-  const r = /* @__PURE__ */ new Map();
-  for (const n of e)
-    r.set(n.raw.name, (r.get(n.raw.name) || 0) + 1);
-  return new Set(
-    Array.from(r.entries()).filter(([, n]) => n > 1).map(([n]) => n)
-  );
+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 sr(e, r) {
-  const n = k(r.spec);
-  if (!n)
+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) {
+  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) {
+  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(r.builder);
+  const t = q(n.builder);
   if (t === "records") {
-    for (const o of H(n.fields)) w(e, o);
+    for (const o of H(r.fields)) w(e, o);
     return;
   }
   if (t === "sql") {
-    for (const o of H(n.fields)) w(e, o);
+    for (const o of H(r.fields)) w(e, o);
     return;
   }
   if (t === "analysis" || t === "metric") {
-    w(e, n.primaryMeasure);
-    for (const o of H(n.measures)) w(e, o);
-    for (const o of H(n.dimensions)) w(e, o);
-    w(e, n.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 = le(n.rows), i = le(n.columns), l = H(n.values);
-    for (const f of o) pe(e, f);
-    for (const f of i) pe(e, f);
-    for (const f of l) {
-      const F = k(f);
-      w(e, F == null ? void 0 : F.field), w(e, F == null ? void 0 : F.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 le(e) {
+function pe(e) {
   if (Array.isArray(e))
     return e;
-  const r = k(e);
-  return Array.isArray(r == null ? void 0 : r.levels) ? r.levels : [];
+  const n = F(e);
+  return Array.isArray(n == null ? void 0 : n.levels) ? n.levels : [];
 }
-function pe(e, r) {
-  var n;
-  if (C(r)) {
-    w(e, r);
+function le(e, n) {
+  var r;
+  if (x(n)) {
+    w(e, n);
     return;
   }
-  w(e, (n = k(r)) == null ? void 0 : n.field);
+  w(e, (r = F(n)) == null ? void 0 : r.field);
 }
 function ce(e) {
-  var r, n, t, o;
-  return ((r = e == null ? void 0 : e.computation) == null ? void 0 : r.kind) === "presentation_only" || ((n = e == null ? void 0 : e.computation) == null ? void 0 : n.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";
+  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 ar(e) {
-  const r = k(e) || {};
-  return O({
+function sn(e) {
+  const n = F(e) || {};
+  return N({
     id: e.id,
     title: e.title,
     purpose: e.purpose,
@@ -1762,15 +1571,15 @@ function ar(e) {
     computation: e.computation,
     uxExpectations: e.uxExpectations,
     validation: e.validation,
-    sourceViewIds: r.sourceViewIds,
-    content: r.content,
-    description: r.description
+    sourceViewIds: n.sourceViewIds,
+    content: n.content,
+    description: n.description
   });
 }
-function w(e, r) {
-  C(r) && e.push(U(r));
+function w(e, n) {
+  x(n) && e.push(Y(n));
 }
-function U(e) {
+function Y(e) {
   return {
     name: e.name,
     label: e.label,
@@ -1781,63 +1590,63 @@ function U(e) {
     ...e.source ? { source: e.source } : {}
   };
 }
-function ir(e) {
+function an(e) {
   if (!e.source)
     return;
-  const r = {
+  const n = {
     ...e.source,
     ...e.sourceKey ? { sourceKey: e.sourceKey } : {}
-  }, n = $e(r);
-  if (n)
+  }, r = $e(n);
+  if (r)
     return {
-      raw: r,
-      key: n,
-      aliases: Ie(r),
+      raw: n,
+      key: r,
+      aliases: Ie(n),
       name: ""
     };
 }
-function C(e) {
-  const r = k(e);
-  return !!(r && typeof r.name == "string" && (typeof r.role == "string" || typeof r.dataType == "string" || typeof r.aggregate == "string" || r.source || r.sourceKey));
+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 r = k(e);
-  return !!(r && (typeof r.sourceKey == "string" || r.kind === "semantic" || typeof r.datasetName == "string" && typeof r.domainId == "string"));
+  const n = F(e);
+  return !!(n && (typeof n.sourceKey == "string" || n.kind === "semantic" || typeof n.datasetName == "string" && typeof n.domainId == "string"));
 }
-function G(e, r) {
+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) => G(o, r)).join(", ")}]`;
-  if (C(e)) {
-    const o = x(U(e), r);
+    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, r);
+    const o = Se(e, n);
     if (o) return `sources.${o}`;
   }
-  const n = k(e);
-  return n ? `{ ${Object.entries(n).filter(([, o]) => o !== void 0).map(([o, i]) => `${JSON.stringify(o)}: ${G(i, r)}`).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 R(e) {
+function k(e) {
   return JSON.stringify(e, null, 2);
 }
-function x(e, r) {
-  if (C(e))
-    return r.fieldNameByKey.get(J(U(e)));
+function R(e, n) {
+  if (x(e))
+    return n.fieldNameByKey.get(Z(Y(e)));
 }
-function Se(e, r) {
+function Se(e, n) {
   if (we(e))
-    for (const n of Z(e)) {
-      const t = r.sourceNameByKey.get(n);
+    for (const r of W(e)) {
+      const t = n.sourceNameByKey.get(r);
       if (t)
         return t;
     }
 }
-function J(e) {
+function Z(e) {
   return [
     e.sourceKey || "",
     e.name || "",
@@ -1845,153 +1654,153 @@ function J(e) {
     e.aggregate || ""
   ].join("|");
 }
-function ur(e, r) {
-  return !C(e) || !C(r) || e.name !== r.name ? !1 : ie(e).some(
-    (n) => ie(r).includes(n)
+function un(e, n) {
+  return !x(e) || !x(n) || e.name !== n.name ? !1 : ie(e).some(
+    (r) => ie(n).includes(r)
   );
 }
-function dr(e) {
-  return C(e) && e.role === "id";
+function dn(e) {
+  return x(e) && e.role === "id";
 }
-function lr(e) {
-  const r = [], n = /* @__PURE__ */ new Map();
+function pn(e) {
+  const n = [], r = /* @__PURE__ */ new Map();
   for (const t of e) {
-    const o = _(t.aliases.length ? t.aliases : [t.key]), i = o.map((l) => n.get(l)).find(v);
-    if (i) {
-      i.aliases = _([...i.aliases, ...o]);
+    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, r.push(t);
-    for (const l of o)
-      n.set(l, t);
+    t.aliases = o, n.push(t);
+    for (const u of o)
+      r.set(u, t);
   }
-  return r;
+  return n;
 }
-function pr(e) {
-  const r = /* @__PURE__ */ new Map();
-  for (const n of e)
-    for (const t of _([n.key, ...n.aliases])) {
-      const o = r.get(t);
-      if (o && o !== n.name)
+function ln(e) {
+  const n = /* @__PURE__ */ new Map();
+  for (const r of e)
+    for (const t of _([r.key, ...r.aliases])) {
+      const o = n.get(t);
+      if (o && o !== r.name)
         throw new Error(`Source identity ${t} resolves to multiple generated sources.`);
-      r.set(t, n.name);
+      n.set(t, r.name);
     }
-  return r;
+  return n;
 }
 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 r = k(e);
-  if (!r)
+function W(e) {
+  const n = F(e);
+  if (!n)
     return [];
-  const n = [];
-  if (typeof r.sourceKey == "string" && n.push(r.sourceKey), r.kind === "semantic" || r.datasetName) {
-    const t = typeof r.domainId == "string" ? r.domainId : "";
-    t && typeof r.datasetId == "string" && n.push(`semantic:${t}:datasetId:${r.datasetId}`), t && typeof r.datasetName == "string" && n.push(`semantic:${t}:datasetName:${r.datasetName}`);
+  const r = [];
+  if (typeof n.sourceKey == "string" && r.push(n.sourceKey), n.kind === "semantic" || n.datasetName) {
+    const t = typeof n.domainId == "string" ? n.domainId : "";
+    t && typeof n.datasetId == "string" && r.push(`semantic:${t}:datasetId:${n.datasetId}`), t && typeof n.datasetName == "string" && r.push(`semantic:${t}:datasetName:${n.datasetName}`);
   }
-  return n.length === 0 && n.push(de(e)), _(n);
+  return r.length === 0 && r.push(de(e)), _(r);
 }
 function Ie(e) {
-  return Z(e);
+  return W(e);
 }
 function de(e) {
-  const r = k(e);
-  return r ? typeof r.sourceKey == "string" ? r.sourceKey : JSON.stringify(r) : "";
+  const n = F(e);
+  return n ? typeof n.sourceKey == "string" ? n.sourceKey : JSON.stringify(n) : "";
 }
-function cr(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) {
-  const r = String(e || "").replace(/^semaphor\./, "");
-  if (!["metric", "records", "analysis", "matrix", "sql"].includes(r))
+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 r;
+  return n;
 }
-function mr(e) {
-  const r = B(e);
-  return r === "records" || r === "sql";
+function mn(e) {
+  const n = q(e);
+  return n === "records" || n === "sql";
 }
-function fr(e) {
-  const r = k(e);
-  return typeof (r == null ? void 0 : r.operator) == "string" ? r.operator : e.type === "date_range" ? "between" : e.type === "multi_select" || e.type === "select" ? "in" : "=";
+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 j(e, r) {
-  const n = /* @__PURE__ */ new Map();
+function P(e, n) {
+  const r = /* @__PURE__ */ new Map();
   for (const t of e) {
-    const o = r(t) || "item", i = n.get(o) || 0;
-    n.set(o, i + 1), t.name = i === 0 ? o : `${o}${i + 1}`;
+    const o = n(t) || "item", a = r.get(o) || 0;
+    r.set(o, a + 1), t.name = a === 0 ? o : `${o}${a + 1}`;
   }
 }
-function X(e, r) {
-  const n = /* @__PURE__ */ new Set(), t = [];
+function X(e, n) {
+  const r = /* @__PURE__ */ new Set(), t = [];
   for (const o of e) {
-    const i = r(o);
-    !i || n.has(i) || (n.add(i), t.push(o));
+    const a = n(o);
+    !a || r.has(a) || (r.add(a), t.push(o));
   }
   return t;
 }
-function q(e) {
-  const r = String(e || "").replace(/[^A-Za-z0-9]+/g, " ").trim().split(/\s+/).filter(Boolean);
-  if (r.length === 0)
+function K(e) {
+  const n = String(e || "").replace(/[^A-Za-z0-9]+/g, " ").trim().split(/\s+/).filter(Boolean);
+  if (n.length === 0)
     return "item";
-  const [n, ...t] = r, o = [
-    n.toLowerCase(),
-    ...t.map((i) => i.charAt(0).toUpperCase() + i.slice(1).toLowerCase())
+  const [r, ...t] = n, o = [
+    r.toLowerCase(),
+    ...t.map((a) => a.charAt(0).toUpperCase() + a.slice(1).toLowerCase())
   ].join("");
   return /^[A-Za-z_$]/.test(o) ? o : `item${o}`;
 }
 function me(e) {
-  const r = q(e);
-  return r.charAt(0).toUpperCase() + r.slice(1);
+  const n = K(e);
+  return n.charAt(0).toUpperCase() + n.slice(1);
 }
-function yr(e) {
-  const r = String(e).split(":");
-  return r[r.length - 1] || String(e);
+function yn(e) {
+  const n = String(e).split(":");
+  return n[n.length - 1] || String(e);
 }
-function O(e) {
-  return Object.fromEntries(Object.entries(e).filter(([, r]) => r !== void 0));
+function N(e) {
+  return Object.fromEntries(Object.entries(e).filter(([, n]) => n !== void 0));
 }
-function k(e) {
+function F(e) {
   return e && typeof e == "object" && !Array.isArray(e) ? e : void 0;
 }
 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 v(e) {
+function E(e) {
   return e !== void 0;
 }
 export {
-  xr as CODEGEN_SUMMARY_SCHEMA_VERSION,
+  Mn as CODEGEN_SUMMARY_SCHEMA_VERSION,
   Re as CODEGEN_SUMMARY_VALIDATOR_VERSION,
-  xe as CONTRACT_MANIFEST_SCHEMA_VERSION,
-  Sr as DEFAULT_GENERATED_CONTRACT_OUTPUT_DIR,
+  Me as CONTRACT_MANIFEST_SCHEMA_VERSION,
+  wn as DEFAULT_GENERATED_CONTRACT_OUTPUT_DIR,
   fe as GENERATED_CONTRACT_SCHEMA_VERSION,
-  Nr as GENERATED_CONTRACT_TYPESCRIPT_FILES,
-  Cr as REQUIRED_GENERATED_CONTRACT_FILES,
-  Vr as SEMAPHOR_DATA_APP_CODEGEN_SUMMARY_SCHEMA_VERSION,
-  br as SEMAPHOR_DATA_APP_CODEGEN_SUMMARY_VALIDATOR_VERSION,
-  Me as assertValidCodegenSummary,
-  Gr as buildSemaphorGeneratedActiveInput,
-  Or as buildSemaphorGeneratedInputOptionIntent,
-  vr as buildSemaphorGeneratedViewExecutionRequest,
-  Kr as buildSemaphorGeneratedViewExecutionRequests,
-  Er as evaluateSemaphorDataAppContractUpdatePolicy,
-  $r as generateSemaphorDataAppContract,
-  kr as isSemaphorDataAppCodegenSummary,
-  Ar as validateCodegenSummary,
-  Mr as validateSemaphorDataAppCodegenSummary,
-  jr as validateSemaphorGeneratedContract
+  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,
+  xn as buildSemaphorGeneratedActiveInput,
+  Gn as buildSemaphorGeneratedInputOptionIntent,
+  Nn as buildSemaphorGeneratedViewExecutionRequest,
+  En as buildSemaphorGeneratedViewExecutionRequests,
+  An as evaluateSemaphorDataAppContractUpdatePolicy,
+  Sn as generateSemaphorDataAppContract,
+  bn as isSemaphorDataAppCodegenSummary,
+  jn as validateCodegenSummary,
+  kn as validateSemaphorDataAppCodegenSummary,
+  vn as validateSemaphorGeneratedContract
 };