react-semaphor 0.1.417 → 0.1.418

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

@@ -1,33 +1,33 @@
-import { S as wn, a as $n, i as In, v as Fn } from "../chunks/analyze-result-contract-B0O3oIYu.js";
-import { c as Ve, G as me, a as ke, b as Re } from "../chunks/update-policy-CQLHKQ_h.js";
-import { C as Vn, e as kn, R as Rn, f as Mn, g as Nn, h as xn, i as Cn, j as On, v as Gn, d as Kn } from "../chunks/update-policy-CQLHKQ_h.js";
-import { createHash as fe } from "node:crypto";
-const yn = "src/semaphor/generated", H = `// Generated by Semaphor Agent Plugin. Do not hand-edit analytics wiring here.
+import { S as In, a as Fn, i as bn, v as Vn } from "../chunks/analyze-result-contract-Akysi2ML.js";
+import { c as ke, G as fe, a as Re, b as Me } from "../chunks/update-policy-B5S_LfEu.js";
+import { C as Rn, e as Mn, R as Nn, f as xn, g as Cn, h as On, i as Gn, j as Kn, v as En, d as An } from "../chunks/update-policy-B5S_LfEu.js";
+import { createHash as ye } from "node:crypto";
+const hn = "src/semaphor/generated", H = `// Generated by Semaphor Agent Plugin. Do not hand-edit analytics wiring here.
 // Regenerate from the accepted semaphor_plan_data_app codegenSummary when the plan changes.
 `;
-function gn(e, n = {}) {
-  Ve(e);
-  const r = Me(e);
+function wn(e, n = {}) {
+  ke(e);
+  const r = Ne(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 o = xe(r), t = Ce({
+  const t = Ce(r), o = Oe({
     contract: r,
-    files: o,
+    files: t,
     generatorName: n.generatorName || "react-semaphor/data-app-codegen/node",
     generatorVersion: n.generatorVersion || "unknown"
-  }), a = {
-    ...o,
-    "contract.manifest.json": `${JSON.stringify(t, null, 2)}
+  }), i = {
+    ...t,
+    "contract.manifest.json": `${JSON.stringify(o, null, 2)}
 `
   };
   return {
-    schemaVersion: me,
-    files: a,
-    manifest: t,
-    contentHash: String(t.generatedContentHash || ""),
-    usageExample: Ke(r),
+    schemaVersion: fe,
+    files: i,
+    manifest: o,
+    contentHash: String(o.generatedContentHash || ""),
+    usageExample: Ee(r),
     warnings: r.warnings,
     stats: {
       inputCount: r.inputs.length,
@@ -38,199 +38,199 @@ function gn(e, n = {}) {
     }
   };
 }
-function Me(e) {
-  var l, u, d, m, c, $, F, b, R, G, V, N;
+function Ne(e) {
+  var d, s, u, c, p, S, I, F, b, K, V, N;
   const n = [], r = [];
-  for (const s of e.inputs) {
-    g(r, s.fieldRef);
-    for (const S of s.bindings || [])
-      g(r, S.fieldRef);
-    g(r, (l = s.optionQuery) == null ? void 0 : l.valueFieldRef), g(r, (u = s.optionQuery) == null ? void 0 : u.labelFieldRef), g(r, (d = s.optionQuery) == null ? void 0 : d.filterFieldRef), T(r, (m = s.optionQuery) == null ? void 0 : m.spec);
+  for (const a of e.inputs) {
+    g(r, a.fieldRef);
+    for (const w of a.bindings || [])
+      g(r, w.fieldRef);
+    g(r, (d = a.optionQuery) == null ? void 0 : d.valueFieldRef), g(r, (s = a.optionQuery) == null ? void 0 : s.labelFieldRef), g(r, (u = a.optionQuery) == null ? void 0 : u.filterFieldRef), Q(r, (c = a.optionQuery) == null ? void 0 : c.spec);
   }
-  for (const s of e.filterContracts) {
-    g(r, s.fieldRef), g(r, (c = s.optionQuery) == null ? void 0 : c.valueFieldRef), g(r, ($ = s.optionQuery) == null ? void 0 : $.labelFieldRef), g(r, (F = s.optionQuery) == null ? void 0 : F.filterFieldRef), T(r, (b = s.optionQuery) == null ? void 0 : b.spec);
-    for (const S of s.bindings || [])
-      g(r, S.fieldRef);
+  for (const a of e.filterContracts) {
+    g(r, a.fieldRef), g(r, (p = a.optionQuery) == null ? void 0 : p.valueFieldRef), g(r, (S = a.optionQuery) == null ? void 0 : S.labelFieldRef), g(r, (I = a.optionQuery) == null ? void 0 : I.filterFieldRef), Q(r, (F = a.optionQuery) == null ? void 0 : F.spec);
+    for (const w of a.bindings || [])
+      g(r, w.fieldRef);
   }
-  for (const s of e.views) {
-    for (const S of s.fields || [])
-      g(r, S);
-    T(r, (R = s.sdkSpec) == null ? void 0 : R.spec), T(r, s.visualSpec);
+  for (const a of e.views) {
+    for (const w of a.fields || [])
+      g(r, w);
+    Q(r, (b = a.sdkSpec) == null ? void 0 : b.spec), Q(r, a.visualSpec);
   }
-  const o = e.implementationChecklist || {};
-  for (const s of Object.values(o.bindingsByView || {}))
-    for (const S of Array.isArray(s) ? s : [])
-      g(r, S.fieldRef), g(r, S.optionValueField), g(r, S.optionLabelField);
-  for (const s of o.requiredInputOptions || [])
-    g(r, s.visibleLabelField), g(r, s.optionValueField), g(r, s.runtimeFilterField);
-  const t = an(
+  const t = e.implementationChecklist || {};
+  for (const a of Object.values(t.bindingsByView || {}))
+    for (const w of Array.isArray(a) ? a : [])
+      g(r, w.fieldRef), g(r, w.optionValueField), g(r, w.optionLabelField);
+  for (const a of t.requiredInputOptions || [])
+    g(r, a.visibleLabelField), g(r, a.optionValueField), g(r, a.runtimeFilterField);
+  const o = dn(
     [
-      ...e.sources.map((s) => ({
-        raw: s,
-        key: we(s),
-        aliases: $e(s),
+      ...e.sources.map((a) => ({
+        raw: a,
+        key: $e(a),
+        aliases: Ie(a),
         name: ""
       })),
-      ...r.map((s) => tn(s)).filter(O)
+      ...r.map((a) => sn(a)).filter(G)
     ]
   );
-  v(t, (s) => {
-    const S = w(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"
+  v(o, (a) => {
+    const w = $(a.raw);
+    return B(
+      a.raw.label || (w == null ? void 0 : w.datasetName) || (w == null ? void 0 : w.datasetId) || (w == null ? void 0 : w.name) || a.raw.kind || "source"
     );
   });
-  const a = un(t), p = X(
-    r.filter((s) => s.name).map((s) => ({
-      raw: s,
-      key: D(s),
+  const i = pn(o), l = X(
+    r.filter((a) => a.name).map((a) => ({
+      raw: a,
+      key: U(a),
       name: ""
     })),
-    (s) => s.key
+    (a) => a.key
   );
   v(
-    p,
-    (s) => Q([
-      s.raw.sourceKey ? cn(s.raw.sourceKey) : "",
-      s.raw.aggregate ? s.raw.aggregate.toLowerCase() : "",
-      s.raw.name
+    l,
+    (a) => B([
+      a.raw.sourceKey ? fn(a.raw.sourceKey) : "",
+      a.raw.aggregate ? a.raw.aggregate.toLowerCase() : "",
+      a.raw.name
     ].filter(Boolean).join("_"))
   );
-  const f = new Map(p.map((s) => [s.key, s.name])), h = e.inputs.map((s) => ({
-    raw: s,
-    name: Q(s.id || s.label || "input")
+  const y = new Map(l.map((a) => [a.key, a.name])), h = e.inputs.map((a) => ({
+    raw: a,
+    name: B(a.id || a.label || "input")
   }));
-  v(h, (s) => s.name);
-  const y = h.filter((s) => !!s.raw.optionQuery).map((s) => ({
-    input: s,
-    name: `${s.name}Options`,
-    raw: s.raw.optionQuery
+  v(h, (a) => a.name);
+  const f = h.filter((a) => !!a.raw.optionQuery).map((a) => ({
+    input: a,
+    name: `${a.name}Options`,
+    raw: a.raw.optionQuery
   }));
-  v(y, (s) => s.name);
-  for (const s of y)
-    on(s.raw.labelFieldRef, s.raw.valueFieldRef) && sn(s.raw.valueFieldRef) && n.push(
-      `Input option query ${((G = s.raw.spec) == null ? void 0 : G.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.`
+  v(f, (a) => a.name);
+  for (const a of f)
+    an(a.raw.labelFieldRef, a.raw.valueFieldRef) && un(a.raw.valueFieldRef) && n.push(
+      `Input option query ${((K = a.raw.spec) == null ? void 0 : K.inputId) || a.input.raw.id || a.name} uses identifier field ${a.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 i = e.views.filter(
-    (s) => {
-      var S, j;
-      return !!((S = s.sdkSpec) != null && S.builder && ((j = s.sdkSpec) != null && j.spec));
+  const m = e.views.filter(
+    (a) => {
+      var w, T;
+      return !!((w = a.sdkSpec) != null && w.builder && ((T = a.sdkSpec) != null && T.spec));
     }
-  ).map((s) => ({
-    raw: s,
-    name: Q(s.id || s.title || "query")
+  ).map((a) => ({
+    raw: a,
+    name: B(a.id || a.title || "query")
   }));
-  v(i, (s) => s.name);
-  const I = e.views.filter((s) => ce(s) && !("sdkSpec" in s)).map((s) => rn(s));
-  for (const s of e.views)
-    (!("sdkSpec" in s) || !((V = s.sdkSpec) != null && V.builder) || !((N = s.sdkSpec) != null && N.spec)) && !ce(s) && n.push(`Skipped view ${s.id || s.title || "unknown"} because it has no sdkSpec.`);
-  return Ne({
+  v(m, (a) => a.name);
+  const M = e.views.filter((a) => ce(a) && !("sdkSpec" in a)).map((a) => on(a));
+  for (const a of e.views)
+    (!("sdkSpec" in a) || !((V = a.sdkSpec) != null && V.builder) || !((N = a.sdkSpec) != null && N.spec)) && !ce(a) && n.push(`Skipped view ${a.id || a.title || "unknown"} because it has no sdkSpec.`);
+  return xe({
     inputs: h,
-    views: i,
+    views: m,
     filterContracts: e.filterContracts
   }), {
     summary: e,
     title: e.title || "Semaphor Data App",
-    sources: t,
-    fields: p,
+    sources: o,
+    fields: l,
     inputs: h,
-    optionQueries: y,
-    views: i,
-    presentationViews: I,
+    optionQueries: f,
+    views: m,
+    presentationViews: M,
     filterContracts: e.filterContracts,
-    checklist: o,
-    sourceNameByKey: a,
-    fieldNameByKey: f,
+    checklist: t,
+    sourceNameByKey: i,
+    fieldNameByKey: y,
     warnings: n
   };
 }
-function Ne({
+function xe({
   inputs: e,
   views: n,
   filterContracts: r
 }) {
-  const o = new Set(e.map((a) => a.raw.id).filter(Boolean)), t = new Set(n.map((a) => a.raw.id).filter(Boolean));
-  for (const [a, p] of r.entries()) {
-    if (!o.has(p.inputId))
-      throw new Error(`filterContracts.${a}.inputId must reference a generated input.`);
-    const f = new Set(p.appliesToViewIds || []), h = new Set(p.notAppliedToViewIds || []);
-    for (const [y, i] of (p.appliesToViewIds || []).entries())
-      if (!t.has(i))
+  const t = new Set(e.map((i) => i.raw.id).filter(Boolean)), o = new Set(n.map((i) => i.raw.id).filter(Boolean));
+  for (const [i, l] of r.entries()) {
+    if (!t.has(l.inputId))
+      throw new Error(`filterContracts.${i}.inputId must reference a generated input.`);
+    const y = new Set(l.appliesToViewIds || []), h = new Set(l.notAppliedToViewIds || []);
+    for (const [f, m] of (l.appliesToViewIds || []).entries())
+      if (!o.has(m))
         throw new Error(
-          `filterContracts.${a}.appliesToViewIds.${y} must reference an executable generated view.`
+          `filterContracts.${i}.appliesToViewIds.${f} must reference an executable generated view.`
         );
-    for (const [y, i] of (p.notAppliedToViewIds || []).entries())
-      if (!t.has(i))
+    for (const [f, m] of (l.notAppliedToViewIds || []).entries())
+      if (!o.has(m))
         throw new Error(
-          `filterContracts.${a}.notAppliedToViewIds.${y} must reference an executable generated view.`
+          `filterContracts.${i}.notAppliedToViewIds.${f} must reference an executable generated view.`
         );
-    for (const [y, i] of (p.bindings || []).entries()) {
-      if (!t.has(i.viewId))
+    for (const [f, m] of (l.bindings || []).entries()) {
+      if (!o.has(m.viewId))
         throw new Error(
-          `filterContracts.${a}.bindings.${y}.viewId must reference an executable generated view.`
+          `filterContracts.${i}.bindings.${f}.viewId must reference an executable generated view.`
         );
-      if (!f.has(i.viewId))
+      if (!y.has(m.viewId))
         throw new Error(
-          `filterContracts.${a}.bindings.${y}.viewId must be included in appliesToViewIds.`
+          `filterContracts.${i}.bindings.${f}.viewId must be included in appliesToViewIds.`
         );
-      if (h.has(i.viewId))
+      if (h.has(m.viewId))
         throw new Error(
-          `filterContracts.${a}.bindings.${y}.viewId must not be listed in notAppliedToViewIds.`
+          `filterContracts.${i}.bindings.${f}.viewId must not be listed in notAppliedToViewIds.`
         );
     }
   }
 }
-function xe(e) {
+function Ce(e) {
   return {
     "sources.ts": ve(e),
-    "fields.ts": Ae(e),
-    "inputs.ts": je(e),
-    "queries.ts": Qe(e),
-    "bindings.ts": Ue(e),
-    "accessors.ts": Je(e),
-    "metadata.ts": Ye(e),
-    "index.ts": We()
+    "fields.ts": Be(e),
+    "inputs.ts": Te(e),
+    "queries.ts": _e(e),
+    "bindings.ts": Le(e),
+    "accessors.ts": ze(e),
+    "metadata.ts": We(e),
+    "index.ts": Ze()
   };
 }
-function Ce({
+function Oe({
   contract: e,
   files: n,
   generatorName: r,
-  generatorVersion: o
+  generatorVersion: t
 }) {
   return {
-    schemaVersion: Re,
-    generatedContractSchemaVersion: me,
+    schemaVersion: Me,
+    generatedContractSchemaVersion: fe,
     generator: {
       name: r,
-      version: o
+      version: t
     },
-    generatedContentHash: Oe(n),
-    codegenSummaryValidatorVersion: ke,
-    codegenSummaryHash: Ge(e.summary),
+    generatedContentHash: Ge(n),
+    codegenSummaryValidatorVersion: Re,
+    codegenSummaryHash: Ke(e.summary),
     codegenSummary: e.summary
   };
 }
-function Oe(e) {
-  const n = fe("sha256");
+function Ge(e) {
+  const n = ye("sha256");
   for (const r of Object.keys(e).sort())
     n.update(r), n.update("\0"), n.update(e[r]), n.update("\0");
   return `sha256:${n.digest("hex")}`;
 }
-function Ge(e) {
-  return `sha256:${fe("sha256").update(ae(e)).digest("hex")}`;
+function Ke(e) {
+  return `sha256:${ye("sha256").update(ae(e)).digest("hex")}`;
 }
 function ae(e) {
   if (e === null || typeof e != "object")
     return JSON.stringify(e);
   if (Array.isArray(e))
-    return `[${e.map((o) => ae(o)).join(",")}]`;
+    return `[${e.map((t) => ae(t)).join(",")}]`;
   const n = e;
-  return `{${Object.keys(n).sort().filter((o) => n[o] !== void 0).map((o) => `${JSON.stringify(o)}:${ae(n[o])}`).join(",")}}`;
+  return `{${Object.keys(n).sort().filter((t) => n[t] !== void 0).map((t) => `${JSON.stringify(t)}:${ae(n[t])}`).join(",")}}`;
 }
-function Ke(e) {
+function Ee(e) {
   const n = e.views.find(
-    (y) => K(y) && E(y)
+    (f) => E(f) && A(f)
   );
   if (n)
     return [
@@ -246,7 +246,7 @@ function Ke(e) {
     ].join(`
 `);
   const r = e.views.find(
-    (y) => K(y)
+    (f) => E(f)
   );
   if (r)
     return [
@@ -261,98 +261,98 @@ function Ke(e) {
       "const presentationViews = semaphorGeneratedContractMetadata.presentationViews;"
     ].join(`
 `);
-  const o = e.views.find(
-    (y) => W(y) && E(y)
+  const t = e.views.find(
+    (f) => W(f) && A(f)
   );
-  if (o)
+  if (t)
     return [
       'import { appInputSpecs, createInputHandleMap, queries, queryOptionsForView, rowValuesForView, semaphorGeneratedContractMetadata } from "./semaphor/generated";',
       "const handles = useSemaphorInputs(appInputSpecs);",
       "const inputHandles = createInputHandleMap(handles);",
-      `const query = queries.${o.name}({ page, pageSize });`,
-      `const result = useSemaphorQuery(query, queryOptionsForView.${o.name}(inputHandles));`,
-      `const rows = result.records.map((row) => rowValuesForView.${o.name}(row, result.columns));`,
+      `const query = queries.${t.name}({ page, pageSize });`,
+      `const result = useSemaphorQuery(query, queryOptionsForView.${t.name}(inputHandles));`,
+      `const rows = result.records.map((row) => rowValuesForView.${t.name}(row, result.columns));`,
       "const presentationViews = semaphorGeneratedContractMetadata.presentationViews;"
     ].join(`
 `);
-  const t = e.views.find(
-    (y) => ue(y) && E(y)
+  const o = e.views.find(
+    (f) => ue(f) && A(f)
   );
-  if (t)
+  if (o)
     return [
       'import { appInputSpecs, createInputHandleMap, queries, queryOptionsForView, rowValuesForView, semaphorGeneratedContractMetadata } from "./semaphor/generated";',
       "const handles = useSemaphorInputs(appInputSpecs);",
       "const inputHandles = createInputHandleMap(handles);",
-      `const query = queries.${t.name}({ page, pageSize });`,
-      `const result = useSemaphorQuery(query, queryOptionsForView.${t.name}(inputHandles));`,
-      `const rows = result.records.map((row) => rowValuesForView.${t.name}(row, result.columns));`,
+      `const query = queries.${o.name}({ page, pageSize });`,
+      `const result = useSemaphorQuery(query, queryOptionsForView.${o.name}(inputHandles));`,
+      `const rows = result.records.map((row) => rowValuesForView.${o.name}(row, result.columns));`,
       "const presentationViews = semaphorGeneratedContractMetadata.presentationViews;"
     ].join(`
 `);
-  const a = e.views.find((y) => {
-    var i;
-    return pn((i = y.raw.sdkSpec) == null ? void 0 : i.builder);
+  const i = e.views.find((f) => {
+    var m;
+    return cn((m = f.raw.sdkSpec) == null ? void 0 : m.builder);
   });
-  if (a)
+  if (i)
     return [
       'import { appInputSpecs, createInputHandleMap, queries, queryOptionsForView, rowValuesForView, semaphorGeneratedContractMetadata } from "./semaphor/generated";',
       "const handles = useSemaphorInputs(appInputSpecs);",
       "const inputHandles = createInputHandleMap(handles);",
-      `const result = useSemaphorQuery(queries.${a.name}(), queryOptionsForView.${a.name}(inputHandles));`,
-      `const rows = result.records.map((row) => rowValuesForView.${a.name}(row, result.columns));`,
+      `const result = useSemaphorQuery(queries.${i.name}(), queryOptionsForView.${i.name}(inputHandles));`,
+      `const rows = result.records.map((row) => rowValuesForView.${i.name}(row, result.columns));`,
       "const presentationViews = semaphorGeneratedContractMetadata.presentationViews;"
     ].join(`
 `);
-  const p = e.views.find((y) => Ee(y));
-  if (p)
+  const l = e.views.find((f) => Ae(f));
+  if (l)
     return [
       'import { appInputSpecs, createInputHandleMap, metricValuesForView, queries, queryOptionsForView, semaphorGeneratedContractMetadata } from "./semaphor/generated";',
       "const handles = useSemaphorInputs(appInputSpecs);",
       "const inputHandles = createInputHandleMap(handles);",
-      `const result = useSemaphorQuery(queries.${p.name}(), queryOptionsForView.${p.name}(inputHandles));`,
-      `const metrics = metricValuesForView.${p.name}(result);`,
+      `const result = useSemaphorQuery(queries.${l.name}(), queryOptionsForView.${l.name}(inputHandles));`,
+      `const metrics = metricValuesForView.${l.name}(result);`,
       "const presentationViews = semaphorGeneratedContractMetadata.presentationViews;"
     ].join(`
 `);
-  const f = e.views[0];
+  const y = 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;",
+    y ? `const result = useSemaphorQuery(queries.${y.name}(), queryOptionsForView.${y.name}(inputHandles));` : "const result = undefined;",
     "const presentationViews = semaphorGeneratedContractMetadata.presentationViews;"
   ].join(`
 `);
 }
 function W(e) {
   var n;
-  return B((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "records";
+  return j((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "records";
 }
-function Ee(e) {
+function Ae(e) {
   var n;
-  return B((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "metric";
+  return j((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "metric";
 }
-function K(e) {
-  var n, r, o;
-  return W(e) && ((o = (r = (n = e.raw.visualSpec) == null ? void 0 : n.tableBehavior) == null ? void 0 : r.sorting) == null ? void 0 : o.mode) === "server";
+function E(e) {
+  var n, r, t;
+  return W(e) && ((t = (r = (n = e.raw.visualSpec) == null ? void 0 : n.tableBehavior) == null ? void 0 : r.sorting) == null ? void 0 : t.mode) === "server";
 }
 function ue(e) {
   var n;
-  return B((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "sql";
+  return j((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "sql";
 }
-function E(e) {
-  var n, r, o;
-  return ((o = (r = (n = e.raw.visualSpec) == null ? void 0 : n.tableBehavior) == null ? void 0 : r.pagination) == null ? void 0 : o.mode) === "server";
+function A(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 W(e) && (A(e) || E(e)) || ue(e) && A(e);
 }
 function ve(e) {
-  const n = e.sources.map(({ name: o, raw: t }) => {
-    const a = qe(t);
-    return `  ${o}: ${a},`;
+  const n = e.sources.map(({ name: t, raw: o }) => {
+    const i = qe(o);
+    return `  ${t}: ${i},`;
   }).join(`
-`), r = e.sources.some((o) => o.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 `${H}
@@ -369,14 +369,14 @@ function qe(e) {
       datasetName: e.datasetName,
       label: e.label
     };
-    return `semaphor.source.semantic(${k(A(n))})`;
+    return `semaphor.source.semantic(${k(O(n))})`;
   }
-  return `${k(A({ ...e, sourceKey: void 0 }))} as const`;
+  return `${k(O({ ...e, sourceKey: void 0 }))} as const`;
 }
-function Ae(e) {
-  const n = e.fields.map(({ name: o, raw: t }) => {
-    const a = Be(t, e);
-    return `  ${o}: ${a},`;
+function Be(e) {
+  const n = e.fields.map(({ name: t, raw: o }) => {
+    const i = je(o, e);
+    return `  ${t}: ${i},`;
   }).join(`
 `), r = n.includes("sources.") ? `import { sources } from "./sources";
 
@@ -387,109 +387,109 @@ ${n}
 } as const;
 `;
 }
-function Be(e, n) {
+function je(e, n) {
   const r = {
     name: e.name,
     label: e.label,
     role: e.role,
     dataType: e.dataType,
     aggregate: e.aggregate
-  }, o = dn(e), t = o ? n.sourceNameByKey.get(o) : void 0;
-  if (o && !t)
+  }, t = ln(e), o = t ? n.sourceNameByKey.get(t) : void 0;
+  if (t && !o)
     throw new Error(
-      `Field ${e.name} references source ${o}, but that source is not renderable. Include the source in codegenSummary.sources or provide field.source.`
+      `Field ${e.name} references source ${t}, but that source is not renderable. Include the source in codegenSummary.sources or provide field.source.`
     );
-  const a = Object.entries(A(r)).map(([p, f]) => `${JSON.stringify(p)}: ${C(f, n)}`);
-  return t && a.push(`"source": sources.${t}`), `{ ${a.join(", ")} }`;
-}
-function je(e) {
-  const n = e.inputs.map((d) => {
-    const m = M(d.raw.fieldRef, e), c = [
-      `id: ${JSON.stringify(d.raw.id)}`,
-      `label: ${JSON.stringify(d.raw.label || d.raw.id)}`,
-      `operator: ${JSON.stringify(ln(d.raw))}`
+  const i = Object.entries(O(r)).map(([l, y]) => `${JSON.stringify(l)}: ${C(y, n)}`);
+  return o && i.push(`"source": sources.${o}`), `{ ${i.join(", ")} }`;
+}
+function Te(e) {
+  const n = e.inputs.map((u) => {
+    const c = R(u.raw.fieldRef, e), p = [
+      `id: ${JSON.stringify(u.raw.id)}`,
+      `label: ${JSON.stringify(u.raw.label || u.raw.id)}`,
+      `operator: ${JSON.stringify(mn(u.raw))}`
     ];
-    if (m && c.push(`field: fields.${m}`), d.raw.relationshipHint && c.push(`relationshipHint: ${k(d.raw.relationshipHint)}`), !m)
-      throw new Error(`Input ${d.raw.id || d.name} is missing a generated field reference.`);
-    return `  ${d.name}: semaphor.filter({ ${c.join(", ")} }),`;
+    if (c && p.push(`field: fields.${c}`), u.raw.relationshipHint && p.push(`relationshipHint: ${k(u.raw.relationshipHint)}`), !c)
+      throw new Error(`Input ${u.raw.id || u.name} is missing a generated field reference.`);
+    return `  ${u.name}: semaphor.filter({ ${p.join(", ")} }),`;
   }).join(`
-`), r = e.inputs.map((d) => `filterSpecs.${d.name}`).join(", "), o = e.inputs.map((d) => JSON.stringify(d.raw.id)).join(", "), t = e.optionQueries.map((d) => {
-    const m = d.input.raw, c = d.raw, $ = w(c.spec) || {}, {
-      id: F,
-      inputId: b,
-      source: R,
-      sourceKey: G,
+`), r = e.inputs.map((u) => `filterSpecs.${u.name}`).join(", "), t = e.inputs.map((u) => JSON.stringify(u.raw.id)).join(", "), o = e.optionQueries.map((u) => {
+    const c = u.input.raw, p = u.raw, S = $(p.spec) || {}, {
+      id: I,
+      inputId: F,
+      source: b,
+      sourceKey: K,
       valueField: V,
       labelField: N,
-      population: s,
-      dependencies: S,
-      limit: j,
+      population: a,
+      dependencies: w,
+      limit: T,
       ...ee
-    } = $, U = c.sourceKey ? { sourceKey: c.sourceKey } : c.source || R || (typeof G == "string" ? { sourceKey: G } : void 0), ne = Se(U, e), re = M(c.valueFieldRef, e), te = M(c.labelFieldRef, e), oe = ye(d), se = {
+    } = S, L = p.sourceKey ? { sourceKey: p.sourceKey } : p.source || b || (typeof K == "string" ? { sourceKey: K } : void 0), ne = Se(L, e), re = R(p.valueFieldRef, e), te = R(p.labelFieldRef, e), oe = ge(u), se = {
       ...ee,
-      id: c.id || $.id || `${m.id}-options`,
-      inputId: m.id,
-      source: U,
-      valueField: c.valueFieldRef,
-      labelField: c.labelFieldRef,
-      population: c.population || s,
+      id: p.id || S.id || `${c.id}-options`,
+      inputId: c.id,
+      source: L,
+      valueField: p.valueFieldRef,
+      labelField: p.labelFieldRef,
+      population: p.population || a,
       dependencies: oe,
-      limit: c.limit || j || 100
+      limit: p.limit || T || 100
     };
     if (!ne || !re || !te)
-      throw new Error(`Input option query ${c.id || `${m.id}-options`} is missing source, valueField, or labelField.`);
-    const Ie = Object.entries(A(se)).map(([Fe, be]) => `${JSON.stringify(Fe)}: ${C(be, e)}`);
-    return `  ${d.name}: semaphor.inputOptions({ ${Ie.join(", ")} }),`;
+      throw new Error(`Input option query ${p.id || `${c.id}-options`} is missing source, valueField, or labelField.`);
+    const Fe = Object.entries(O(se)).map(([be, Ve]) => `${JSON.stringify(be)}: ${C(Ve, e)}`);
+    return `  ${u.name}: semaphor.inputOptions({ ${Fe.join(", ")} }),`;
   }).join(`
-`), a = e.optionQueries.map((d) => {
-    const m = Te(e, d), c = m.length > 0 ? "inputHandles" : "_inputHandles", $ = m.map((F) => {
-      const b = M(F.raw.fieldRef, e);
-      if (!b)
+`), i = e.optionQueries.map((u) => {
+    const c = Qe(e, u), p = c.length > 0 ? "inputHandles" : "_inputHandles", S = c.map((I) => {
+      const F = R(I.raw.fieldRef, e);
+      if (!F)
         throw new Error(
-          `Input option query ${d.raw.id || `${d.input.raw.id}-options`} references input ${F.raw.id} without a generated field reference.`
+          `Input option query ${u.raw.id || `${u.input.raw.id}-options`} references input ${I.raw.id} without a generated field reference.`
         );
-      const R = `inputHandles[${JSON.stringify(F.raw.id)}]`;
-      return `    if (${R}) {
-      inputs.push(semaphor.bindInput(${R}, { field: fields.${b} }));
+      const b = `inputHandles[${JSON.stringify(I.raw.id)}]`;
+      return `    if (${b}) {
+      inputs.push(semaphor.bindInput(${b}, { field: fields.${F} }));
     }`;
     }).join(`
 `);
-    return `  ${d.name}(${c}: SemaphorGeneratedInputHandleMap): SemaphorInputReference[] {
+    return `  ${u.name}(${p}: SemaphorGeneratedInputHandleMap): SemaphorInputReference[] {
     const inputs: SemaphorInputReference[] = [];
-${$}
+${S}
     return inputs;
   },`;
   }).join(`
 
-`), p = e.optionQueries.map((d) => `  ${d.name}(inputHandles: SemaphorGeneratedInputHandleMap): SemaphorQueryRuntimeOptions {
+`), l = e.optionQueries.map((u) => `  ${u.name}(inputHandles: SemaphorGeneratedInputHandleMap): SemaphorQueryRuntimeOptions {
     return {
-      inputs: inputsForInputOptionQuery.${d.name}(inputHandles),
+      inputs: inputsForInputOptionQuery.${u.name}(inputHandles),
     };
   },`).join(`
 
-`), f = e.optionQueries.map((d) => `    case ${JSON.stringify(d.raw.id || `${d.input.raw.id}-options`)}:
-      return queryOptionsForInputOptionQuery.${d.name}(inputHandles);`).join(`
-`), h = e.inputs.length > 0, y = e.optionQueries.length > 0, i = y ? "inputOptionQueryId" : "_inputOptionQueryId", I = y ? "inputHandles" : "_inputHandles", l = [
+`), y = e.optionQueries.map((u) => `    case ${JSON.stringify(u.raw.id || `${u.input.raw.id}-options`)}:
+      return queryOptionsForInputOptionQuery.${u.name}(inputHandles);`).join(`
+`), h = e.inputs.length > 0, f = e.optionQueries.length > 0, m = f ? "inputOptionQueryId" : "_inputOptionQueryId", M = f ? "inputHandles" : "_inputHandles", d = [
     "SemaphorInputHandle",
-    y ? "SemaphorInputReference" : void 0,
+    f ? "SemaphorInputReference" : void 0,
     "SemaphorQueryRuntimeOptions"
-  ].filter(O).join(", "), u = [
-    h || y ? 'import { semaphor } from "react-semaphor/data-app-sdk";' : void 0,
-    `import type { ${l} } from "react-semaphor/data-app-sdk";`,
-    h || y ? 'import { fields } from "./fields";' : void 0,
-    y ? 'import { sources } from "./sources";' : void 0,
+  ].filter(G).join(", "), s = [
+    h || f ? 'import { semaphor } from "react-semaphor/data-app-sdk";' : void 0,
+    `import type { ${d} } from "react-semaphor/data-app-sdk";`,
+    h || f ? 'import { fields } from "./fields";' : void 0,
+    f ? 'import { sources } from "./sources";' : void 0,
     'import type { SemaphorGeneratedInputId, SemaphorGeneratedInputOptionQueryId } from "./metadata";'
-  ].filter(O).join(`
+  ].filter(G).join(`
 `);
   return `${H}
-${u}
+${s}
 
 export const filterSpecs = {
 ${n}
 } as const;
 
 export const appInputSpecs = [${r}] as const;
-export const appInputIds = [${o}] as const;
+export const appInputIds = [${t}] as const;
 
 export type SemaphorGeneratedInputHandleMap = Partial<Record<SemaphorGeneratedInputId, SemaphorInputHandle>>;
 
@@ -498,113 +498,113 @@ export function createInputHandleMap(handles: readonly SemaphorInputHandle[]): S
 }
 
 export const inputOptionQueries = {
-${t}
+${o}
 } as const;
 
 export const inputsForInputOptionQuery = {
-${a}
+${i}
 } as const;
 
 export const queryOptionsForInputOptionQuery = {
-${p}
+${l}
 } as const;
 
 export function queryOptionsForInputOptionQueryId(
-  ${i}: SemaphorGeneratedInputOptionQueryId,
-  ${I}: SemaphorGeneratedInputHandleMap,
+  ${m}: SemaphorGeneratedInputOptionQueryId,
+  ${M}: SemaphorGeneratedInputHandleMap,
 ): SemaphorQueryRuntimeOptions {
-  switch (${i}) {
-${f}
+  switch (${m}) {
+${y}
   }
-  throw new Error(\`Unknown generated Semaphor input option query id: \${${i}}\`);
+  throw new Error(\`Unknown generated Semaphor input option query id: \${${m}}\`);
 }
 `;
 }
-function Te(e, n) {
-  const r = ye(n);
+function Qe(e, n) {
+  const r = ge(n);
   if (!r || r.mode === "independent")
     return [];
   if (r.mode !== "explicit")
     return [];
-  const o = new Set(r.includeInputIds || []), t = /* @__PURE__ */ new Set([
+  const t = new Set(r.includeInputIds || []), o = /* @__PURE__ */ new Set([
     n.input.raw.id,
     ...r.excludeInputIds || []
   ]);
-  return e.inputs.filter((a) => t.has(a.raw.id) ? !1 : o.has(a.raw.id));
+  return e.inputs.filter((i) => o.has(i.raw.id) ? !1 : t.has(i.raw.id));
 }
-function ye(e) {
+function ge(e) {
   var n;
   return e.raw.dependencies || ((n = e.raw.spec) == null ? void 0 : n.dependencies);
 }
-function Qe(e) {
-  const n = e.views.map((u) => {
-    var c, $, F, b, R, G;
-    const d = B(u.raw.sdkSpec.builder), m = _e(u);
-    if (W(u) && He(u)) {
-      const V = (c = u.raw.visualSpec) == null ? void 0 : c.tableBehavior, N = w(m.pagination), s = E(u), S = K(u), j = (($ = V == null ? void 0 : V.pagination) == null ? void 0 : $.pageSize) || J(N == null ? void 0 : N.pageSize) || J(m.limit) || 100, ee = S ? z(u, e) : [], U = S ? Pe({
-        view: u,
+function _e(e) {
+  const n = e.views.map((s) => {
+    var p, S, I, F, b, K;
+    const u = j(s.raw.sdkSpec.builder), c = Pe(s);
+    if (W(s) && He(s)) {
+      const V = (p = s.raw.visualSpec) == null ? void 0 : p.tableBehavior, N = $(c.pagination), a = A(s), w = E(s), T = ((S = V == null ? void 0 : V.pagination) == null ? void 0 : S.pageSize) || J(N == null ? void 0 : N.pageSize) || J(c.limit) || 100, ee = w ? z(s, e) : [], L = w ? De({
+        view: s,
         contract: e,
         sortFields: ee,
-        defaultField: (F = V == null ? void 0 : V.sorting) == null ? void 0 : F.defaultField
-      }) : void 0, ne = S ? (b = V == null ? void 0 : V.sorting) == null ? void 0 : b.defaultDirection : void 0, re = De({
-        viewName: u.name,
-        supportsPagination: s,
-        supportsSort: S
-      }), te = S ? `    const orderBy = resolveRecordsOrderBy(
-      recordsSortFieldsForView.${u.name},
+        defaultField: (I = V == null ? void 0 : V.sorting) == null ? void 0 : I.defaultField
+      }) : void 0, ne = w ? (F = V == null ? void 0 : V.sorting) == null ? void 0 : F.defaultDirection : void 0, re = Ue({
+        viewName: s.name,
+        supportsPagination: a,
+        supportsSort: w
+      }), te = w ? `    const orderBy = resolveRecordsOrderBy(
+      recordsSortFieldsForView.${s.name},
       params.sort,
-      ${C(U, e)},
+      ${C(L, e)},
       ${C(ne, e)},
     );
-` : "", oe = S ? `      ...(orderBy ? { orderBy } : {}),
-` : "", se = s ? `      pagination: resolveServerTablePagination(params, ${JSON.stringify(j)}),
+` : "", oe = w ? `      ...(orderBy ? { orderBy } : {}),
+` : "", se = a ? `      pagination: resolveServerTablePagination(params, ${JSON.stringify(T)}),
 ` : "";
-      return `  ${u.name}(
+      return `  ${s.name}(
     params: ${re} = {},
   ) {
-${te}    return semaphor.${d}({
-      ...${C(m, e)},
+${te}    return semaphor.${u}({
+      ...${C(c, e)},
 ${oe}${se}    });
   },`;
     }
-    if (ue(u) && E(u)) {
-      const V = (R = u.raw.visualSpec) == null ? void 0 : R.tableBehavior, N = w(m.pagination), s = ((G = V == null ? void 0 : V.pagination) == null ? void 0 : G.pageSize) || J(N == null ? void 0 : N.pageSize) || J(m.limit) || 100;
-      return `  ${u.name}(
+    if (ue(s) && A(s)) {
+      const V = (b = s.raw.visualSpec) == null ? void 0 : b.tableBehavior, N = $(c.pagination), a = ((K = V == null ? void 0 : V.pagination) == null ? void 0 : K.pageSize) || J(N == null ? void 0 : N.pageSize) || J(c.limit) || 100;
+      return `  ${s.name}(
     params: SemaphorGeneratedServerPaginationParams = {},
   ) {
-    return semaphor.${d}({
-      ...${C(m, e)},
-      pagination: resolveServerTablePagination(params, ${JSON.stringify(s)}),
+    return semaphor.${u}({
+      ...${C(c, e)},
+      pagination: resolveServerTablePagination(params, ${JSON.stringify(a)}),
     });
   },`;
     }
-    return `  ${u.name}: () => semaphor.${d}(${C(m, e)}),`;
+    return `  ${s.name}: () => semaphor.${u}(${C(c, e)}),`;
   }).join(`
-`), r = e.views.filter((u) => K(u)).map((u) => {
-    const m = z(u, e).map((c) => `    ${JSON.stringify(c.key)}: fields.${c.fieldName},`).join(`
+`), r = e.views.filter((s) => E(s)).map((s) => {
+    const c = z(s, e).map((p) => `    ${JSON.stringify(p.key)}: fields.${p.fieldName},`).join(`
 `);
-    return `  ${u.name}: {
-${m}
+    return `  ${s.name}: {
+${c}
   },`;
   }).join(`
-`), o = e.views.filter((u) => K(u)).map((u) => {
-    const m = z(u, e).map((c) => `    { key: ${JSON.stringify(c.key)}, label: ${JSON.stringify(c.label)}, field: fields.${c.fieldName} },`).join(`
+`), t = e.views.filter((s) => E(s)).map((s) => {
+    const c = z(s, e).map((p) => `    { key: ${JSON.stringify(p.key)}, label: ${JSON.stringify(p.label)}, field: fields.${p.fieldName} },`).join(`
 `);
-    return `  ${u.name}: [
-${m}
+    return `  ${s.name}: [
+${c}
   ],`;
   }).join(`
-`), t = e.views.some((u) => K(u)), a = e.views.some((u) => E(u)), p = [n, r, o].join(`
-`), f = [
+`), o = e.views.some((s) => E(s)), i = e.views.some((s) => A(s)), l = [n, r, t].join(`
+`), y = [
     n ? 'import { semaphor } from "react-semaphor/data-app-sdk";' : void 0,
-    t ? 'import type { SemaphorFieldRef } from "react-semaphor/data-app-sdk";' : void 0,
-    p.includes("fields.") ? 'import { fields } from "./fields";' : void 0,
-    p.includes("sources.") ? 'import { sources } from "./sources";' : void 0
-  ].filter(O).join(`
+    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(G).join(`
 `);
   return `${H}
-${f}
-${t ? `export type SemaphorGeneratedRecordsSortDirection = "asc" | "desc";
+${y}
+${o ? `export type SemaphorGeneratedRecordsSortDirection = "asc" | "desc";
 
 export type SemaphorGeneratedRecordsSort<TSortKey extends string = string> = {
   key: TSortKey;
@@ -614,11 +614,11 @@ export type SemaphorGeneratedRecordsSort<TSortKey extends string = string> = {
 export type SemaphorGeneratedRecordsSortParams<TSortKey extends string = string> = {
   sort?: SemaphorGeneratedRecordsSort<TSortKey> | null;
 };
-` : ""}${a ? `export type SemaphorGeneratedServerPaginationParams = {
+` : ""}${i ? `export type SemaphorGeneratedServerPaginationParams = {
   page?: number;
   pageSize?: number;
 };
-` : ""}${t && a ? `export type SemaphorGeneratedRecordsQueryParams<TSortKey extends string = string> =
+` : ""}${o && i ? `export type SemaphorGeneratedRecordsQueryParams<TSortKey extends string = string> =
   SemaphorGeneratedServerPaginationParams &
   SemaphorGeneratedRecordsSortParams<TSortKey>;
 ` : ""}
@@ -628,14 +628,14 @@ ${r}
 } as const;
 
 export const recordsSortOptionsForView = {
-${o}
+${t}
 } as const;
 
 export const queries = {
 ${n}
 } as const;
 
-${t ? `function resolveRecordsOrderBy<TSortKey extends string>(
+${o ? `function resolveRecordsOrderBy<TSortKey extends string>(
   sortFields: Record<TSortKey, SemaphorFieldRef>,
   sort: SemaphorGeneratedRecordsSort<TSortKey> | null | undefined,
   defaultKey: TSortKey | undefined,
@@ -655,7 +655,7 @@ ${t ? `function resolveRecordsOrderBy<TSortKey extends string>(
   };
 }
 ` : ""}
-${a ? `function resolveServerTablePagination(
+${i ? `function resolveServerTablePagination(
   params: SemaphorGeneratedServerPaginationParams,
   defaultPageSize: number,
 ) {
@@ -667,119 +667,119 @@ ${a ? `function resolveServerTablePagination(
 ` : ""}
 `;
 }
-function _e(e) {
-  var a, p;
-  const n = w((a = e.raw.sdkSpec) == null ? void 0 : a.spec) || {}, { kind: r, id: o, ...t } = n;
+function Pe(e) {
+  var i, l;
+  const n = $((i = e.raw.sdkSpec) == null ? void 0 : i.spec) || {}, { kind: r, id: t, ...o } = n;
   return {
-    ...t,
+    ...o,
     id: e.raw.id,
-    label: ((p = e.raw.visualSpec) == null ? void 0 : p.title) || e.raw.title || t.label
+    label: ((l = e.raw.visualSpec) == null ? void 0 : l.title) || e.raw.title || o.label
   };
 }
 function z(e, n) {
-  var a, p;
-  const r = [], o = w((a = e.raw.sdkSpec) == null ? void 0 : a.spec) || {};
-  for (const f of q(o.fields)) g(r, f);
-  g(r, o.dateField), g(r, (p = w(o.orderBy)) == null ? void 0 : p.field);
-  for (const f of e.raw.fields || []) g(r, f);
+  var i, l;
+  const r = [], t = $((i = e.raw.sdkSpec) == null ? void 0 : i.spec) || {};
+  for (const y of q(t.fields)) g(r, y);
+  g(r, t.dateField), g(r, (l = $(t.orderBy)) == null ? void 0 : l.field);
+  for (const y of e.raw.fields || []) g(r, y);
   return X(
-    r.map((f) => {
-      const h = M(f, n);
-      if (!(!f.name || !h))
+    r.map((y) => {
+      const h = R(y, n);
+      if (!(!y.name || !h))
         return {
           key: h,
           fieldName: h,
-          rawName: f.name,
-          label: f.label || f.name
+          rawName: y.name,
+          label: y.label || y.name
         };
-    }).filter(O),
-    (f) => f.key
+    }).filter(G),
+    (y) => y.key
   );
 }
-function Pe({
+function De({
   view: e,
   contract: n,
   sortFields: r,
-  defaultField: o
+  defaultField: t
 }) {
-  var h, y;
-  const t = new Set(r.map((i) => i.key));
-  if (o && t.has(o))
-    return o;
-  const a = r.filter((i) => i.rawName === o);
-  if (a.length === 1)
-    return a[0].key;
-  const p = w((h = e.raw.sdkSpec) == null ? void 0 : h.spec), f = M((y = w(p == null ? void 0 : p.orderBy)) == null ? void 0 : y.field, n);
-  return f && t.has(f) ? f : void 0;
-}
-function De({
+  var h, f;
+  const o = new Set(r.map((m) => m.key));
+  if (t && o.has(t))
+    return t;
+  const i = r.filter((m) => m.rawName === t);
+  if (i.length === 1)
+    return i[0].key;
+  const l = $((h = e.raw.sdkSpec) == null ? void 0 : h.spec), y = R((f = $(l == null ? void 0 : l.orderBy)) == null ? void 0 : f.field, n);
+  return y && o.has(y) ? y : void 0;
+}
+function Ue({
   viewName: e,
   supportsPagination: n,
   supportsSort: r
 }) {
   return n && r ? `SemaphorGeneratedRecordsQueryParams<Extract<keyof typeof recordsSortFieldsForView.${e}, string>>` : r ? `SemaphorGeneratedRecordsSortParams<Extract<keyof typeof recordsSortFieldsForView.${e}, string>>` : "SemaphorGeneratedServerPaginationParams";
 }
-function Ue(e) {
-  const n = e.views.map((i) => {
-    const l = Le(e, i.raw.id).map((u) => {
-      const d = u.inputId, m = M(u.fieldRef, e);
-      if (!d || !m)
+function Le(e) {
+  const n = e.views.map((m) => {
+    const d = Je(e, m.raw.id).map((s) => {
+      const u = s.inputId, c = R(s.fieldRef, e);
+      if (!u || !c)
         return "";
-      const c = [`field: fields.${m}`];
-      if (u.relationshipHint)
-        c.push(`relationshipHint: ${k(u.relationshipHint)}`);
-      else if (Array.isArray(u.relationshipsUsed) && u.relationshipsUsed.length > 0) {
-        const F = u.relationshipsUsed.map((b) => {
-          var R;
-          return (R = w(b)) == null ? void 0 : R.id;
-        }).filter((b) => typeof b == "string" && b.length > 0);
-        F.length > 0 && c.push(`relationshipHint: ${k({ relationshipIds: F })}`);
+      const p = [`field: fields.${c}`];
+      if (s.relationshipHint)
+        p.push(`relationshipHint: ${k(s.relationshipHint)}`);
+      else if (Array.isArray(s.relationshipsUsed) && s.relationshipsUsed.length > 0) {
+        const I = s.relationshipsUsed.map((F) => {
+          var b;
+          return (b = $(F)) == null ? void 0 : b.id;
+        }).filter((F) => typeof F == "string" && F.length > 0);
+        I.length > 0 && p.push(`relationshipHint: ${k({ relationshipIds: I })}`);
       }
-      const $ = `inputHandles[${JSON.stringify(d)}]`;
-      return `    if (${$}) {
-      inputs.push(semaphor.bindInput(${$}, { ${c.join(", ")} }));
+      const S = `inputHandles[${JSON.stringify(u)}]`;
+      return `    if (${S}) {
+      inputs.push(semaphor.bindInput(${S}, { ${p.join(", ")} }));
     }`;
     }).filter(Boolean).join(`
 `);
-    return { view: i, renderedBindings: l };
-  }), r = n.some((i) => i.renderedBindings.length > 0), o = n.map(({ view: i, renderedBindings: I }) => {
-    const l = I ? "inputHandles" : "_inputHandles";
-    return `  ${i.name}(${l}: SemaphorGeneratedInputHandleMap): SemaphorInputReference[] {
+    return { view: m, renderedBindings: d };
+  }), r = n.some((m) => m.renderedBindings.length > 0), t = n.map(({ view: m, renderedBindings: M }) => {
+    const d = M ? "inputHandles" : "_inputHandles";
+    return `  ${m.name}(${d}: SemaphorGeneratedInputHandleMap): SemaphorInputReference[] {
     const inputs: SemaphorInputReference[] = [];
-${I}
+${M}
     return inputs;
   },`;
   }).join(`
 
-`), t = e.views.map((i) => `  ${i.name}(inputHandles: SemaphorGeneratedInputHandleMap): SemaphorQueryRuntimeOptions {
+`), o = e.views.map((m) => `  ${m.name}(inputHandles: SemaphorGeneratedInputHandleMap): SemaphorQueryRuntimeOptions {
     return {
-      inputs: inputsForView.${i.name}(inputHandles),
-      debug: queryDebugForView.${i.name},
+      inputs: inputsForView.${m.name}(inputHandles),
+      debug: queryDebugForView.${m.name},
     };
   },`).join(`
 
-`), a = e.views.map((i) => `    case ${JSON.stringify(i.raw.id)}:
-      return inputsForView.${i.name}(inputHandles);`).join(`
-`), p = e.views.map((i) => `    case ${JSON.stringify(i.raw.id)}:
-      return queryOptionsForView.${i.name}(inputHandles);`).join(`
-`), f = e.views.length > 0, h = f ? "inputHandles" : "_inputHandles", y = [
+`), i = e.views.map((m) => `    case ${JSON.stringify(m.raw.id)}:
+      return inputsForView.${m.name}(inputHandles);`).join(`
+`), l = e.views.map((m) => `    case ${JSON.stringify(m.raw.id)}:
+      return queryOptionsForView.${m.name}(inputHandles);`).join(`
+`), y = e.views.length > 0, h = y ? "inputHandles" : "_inputHandles", f = [
     r ? 'import { semaphor } from "react-semaphor/data-app-sdk";' : void 0,
     'import type { SemaphorInputReference, SemaphorQueryRuntimeOptions } from "react-semaphor/data-app-sdk";',
     r ? 'import { fields } from "./fields";' : void 0,
     'import type { SemaphorGeneratedInputHandleMap } from "./inputs";',
-    f ? 'import { queryDebugForView } from "./metadata";' : void 0,
+    y ? 'import { queryDebugForView } from "./metadata";' : void 0,
     'import type { SemaphorGeneratedQueryViewId } from "./metadata";'
-  ].filter(O).join(`
+  ].filter(G).join(`
 `);
   return `${H}
-${y}
+${f}
 
 export const inputsForView = {
-${o}
+${t}
 } as const;
 
 export const queryOptionsForView = {
-${t}
+${o}
 } as const;
 
 export function inputsForViewId(
@@ -787,7 +787,7 @@ export function inputsForViewId(
   ${h}: SemaphorGeneratedInputHandleMap,
 ): SemaphorInputReference[] {
   switch (viewId) {
-${a}
+${i}
   }
   throw new Error(\`Unknown generated Semaphor view id: \${viewId}\`);
 }
@@ -797,120 +797,136 @@ export function queryOptionsForViewId(
   ${h}: SemaphorGeneratedInputHandleMap,
 ): SemaphorQueryRuntimeOptions {
   switch (viewId) {
-${p}
+${l}
   }
   throw new Error(\`Unknown generated Semaphor view id: \${viewId}\`);
 }
 `;
 }
-function Le(e, n) {
+function Je(e, n) {
   return e.filterContracts.flatMap(
-    (r) => (r.bindings || []).filter((o) => o.viewId === n).map((o) => ({
+    (r) => (r.bindings || []).filter((t) => t.viewId === n).map((t) => ({
       inputId: r.inputId,
-      fieldRef: o.fieldRef,
-      relationshipHint: o.relationshipHint,
-      relationshipsUsed: o.relationshipsUsed
+      fieldRef: t.fieldRef,
+      relationshipHint: t.relationshipHint,
+      relationshipsUsed: t.relationshipsUsed
     }))
   );
 }
-function Je(e) {
-  const n = e.views.map((l) => {
-    const d = Y(l, e).map((m) => {
-      const c = M(m.raw, e);
-      return c ? `    ${m.name}: fields.${c},` : "";
+function ze(e) {
+  const n = e.views.map((s) => {
+    const c = Y(s, e).map((p) => {
+      const S = R(p.raw, e);
+      return S ? `    ${p.name}: fields.${S},` : "";
     }).filter(Boolean).join(`
 `);
-    return `  ${l.name}: {
-${d}
+    return `  ${s.name}: {
+${c}
   },`;
   }).join(`
-`), r = e.views.map((l) => {
-    const d = L(l, e).map((m) => {
-      const c = M(m.raw, e);
-      return c ? `    ${m.name}: fields.${c},` : "";
+`), r = e.views.map((s) => {
+    const c = P(s, e).map((p) => {
+      const S = R(p.raw, e);
+      return S ? `    ${p.name}: fields.${S},` : "";
     }).filter(Boolean).join(`
 `);
-    return `  ${l.name}: {
-${d}
+    return `  ${s.name}: {
+${c}
   },`;
   }).join(`
-`), o = e.views.map((l) => {
-    const u = L(l, e), d = en(u), m = Xe(u), c = u.map(($) => {
+`), t = e.views.map((s) => {
+    const u = P(s, e), c = rn(u), p = nn(u), S = u.map((I) => {
       const F = Array.from(
         new Set(
-          ge($.raw).filter((b) => m.has(b))
+          he(I.raw).filter((b) => p.has(b))
         )
       );
-      return `    ${$.name}: metricKeysForField(metricFieldsForView.${l.name}.${$.name}, { allowNameFallback: ${d.has($.raw.name) ? "false" : "true"}, excludedKeys: ${k(F)} }),`;
+      return `    ${I.name}: metricKeysForField(metricFieldsForView.${s.name}.${I.name}, { allowNameFallback: ${c.has(I.raw.name) ? "false" : "true"}, excludedKeys: ${k(F)} }),`;
     }).join(`
 `);
-    return `  ${l.name}: {
-${c}
+    return `  ${s.name}: {
+${S}
   },`;
   }).join(`
-`), t = e.views.map((l) => {
-    const d = L(l, e).map((m) => `    ${m.name}: semaphorMetricMeasureBindingKey(metricFieldsForView.${l.name}.${m.name}),`).join(`
+`), o = e.views.map((s) => {
+    const c = P(s, e).map((p, S) => `    ${p.name}: ${JSON.stringify(Xe(s, p, S))},`).join(`
 `);
-    return `  ${l.name}: {
-${d}
+    return `  ${s.name}: {
+${c}
   },`;
   }).join(`
-`), a = e.views.map((l) => {
-    const u = L(l, e);
+`), i = e.views.map((s) => {
+    const u = P(s, e);
     if (u.length === 0)
-      return `  ${l.name}(): Record<keyof typeof metricFieldsForView.${l.name}, unknown> {
+      return `  ${s.name}(): Record<keyof typeof metricFieldsForView.${s.name}, unknown> {
     return {};
   },`;
-    const d = Ze(l, u), m = u.map((c) => {
-      const $ = `metricMeasureKeysForView.${l.name}.${c.name}`, F = `metricMeasureBindingKeysForView.${l.name}.${c.name}`, b = d.has(c.name) ? `readMetricValueByBindingWithFallback(measures, measureBindings, ${F}, ${$}, scalarValue)` : `readMetricValueByBinding(measures, measureBindings, ${F}, ${$})`;
-      return `      ${c.name}: ${b},`;
+    const c = en(s, u), p = u.map((S) => {
+      const I = `metricMeasureKeysForView.${s.name}.${S.name}`, F = `metricMeasureBindingKeysForView.${s.name}.${S.name}`, b = c.has(S.name) ? `readMetricValueByBindingWithFallback(measures, measureBindings, ${F}, ${I}, scalarValue)` : `readMetricValueByBinding(measures, measureBindings, ${F}, ${I})`;
+      return `      ${S.name}: ${b},`;
     }).join(`
 `);
-    return `  ${l.name}(result: SemaphorGeneratedMetricResult): Record<keyof typeof metricFieldsForView.${l.name}, unknown> {
+    return `  ${s.name}(result: SemaphorGeneratedMetricResult): Record<keyof typeof metricFieldsForView.${s.name}, unknown> {
     const measures = result?.measures;
     const measureBindings = result?.measureBindings;
     const scalarValue = result?.value;
     return {
-${m}
+${p}
     };
   },`;
   }).join(`
 
-`), p = e.views.map((l) => {
-    const u = ze(l, e);
-    return `  ${l.name}: ${k(u)},`;
+`), l = e.views.map((s) => {
+    const u = P(s, e);
+    if (u.length === 0)
+      return `  ${s.name}(): Array<keyof typeof metricFieldsForView.${s.name}> {
+    return [];
+  },`;
+    const c = u.map((p) => `    ...(missing.has(metricMeasureBindingKeysForView.${s.name}.${p.name}) ? [${JSON.stringify(p.name)} as keyof typeof metricFieldsForView.${s.name}] : []),`).join(`
+`);
+    return `  ${s.name}(result: SemaphorGeneratedMetricResult): Array<keyof typeof metricFieldsForView.${s.name}> {
+    const missing = new Set(result?.missingMeasures || []);
+    return [
+${c}
+    ];
+  },`;
+  }).join(`
+
+`), y = e.views.map((s) => {
+    const u = Ye(s, e);
+    return `  ${s.name}: ${k(u)},`;
   }).join(`
-`), f = e.views.map((l) => {
-    const d = Y(l, e).map((m) => `      ${m.name}: resolveColumnKey(columns, fieldsForView.${l.name}.${m.name}),`).join(`
+`), h = e.views.map((s) => {
+    const c = Y(s, e).map((p) => `      ${p.name}: resolveColumnKey(columns, fieldsForView.${s.name}.${p.name}),`).join(`
 `);
-    return `  ${l.name}(columns: SemaphorGeneratedColumns): Record<keyof typeof fieldsForView.${l.name}, string | undefined> {
+    return `  ${s.name}(columns: SemaphorGeneratedColumns): Record<keyof typeof fieldsForView.${s.name}, string | undefined> {
     return {
-${d}
+${c}
     };
   },`;
   }).join(`
 
-`), h = e.views.map((l) => {
-    const d = Y(l, e).map((m) => `      ${m.name}: readCell(row, columns, fieldsForView.${l.name}.${m.name}),`).join(`
+`), f = e.views.map((s) => {
+    const c = Y(s, e).map((p) => `      ${p.name}: readCell(row, columns, fieldsForView.${s.name}.${p.name}),`).join(`
 `);
-    return `  ${l.name}(row: SemaphorGeneratedRow, columns: SemaphorGeneratedColumns): Record<keyof typeof fieldsForView.${l.name}, unknown> {
+    return `  ${s.name}(row: SemaphorGeneratedRow, columns: SemaphorGeneratedColumns): Record<keyof typeof fieldsForView.${s.name}, unknown> {
     return {
-${d}
+${c}
     };
   },`;
   }).join(`
 
-`), y = n.includes("fields.") || r.includes("fields."), I = [
+`), m = n.includes("fields.") || r.includes("fields."), d = [
     `import { ${[
       "type SemaphorFieldRef",
       "type SemaphorResultColumn",
       "semaphorMetricMeasureBindingKey"
-    ].filter(O).join(", ")} } from "react-semaphor/data-app-sdk";`,
-    y ? 'import { fields } from "./fields";' : void 0
-  ].filter(O).join(`
+    ].filter(G).join(", ")} } from "react-semaphor/data-app-sdk";`,
+    m ? 'import { fields } from "./fields";' : void 0
+  ].filter(G).join(`
 `);
   return `${H}
-${I}
+${d}
 
 export type SemaphorGeneratedRow = Record<string, unknown>;
 export type SemaphorGeneratedColumns = readonly SemaphorResultColumn[] | null | undefined;
@@ -919,6 +935,7 @@ export type SemaphorGeneratedMetricMeasureBindings = Record<string, string> | nu
 export type SemaphorGeneratedMetricResult = {
   readonly measures?: SemaphorGeneratedMetricMeasures;
   readonly measureBindings?: SemaphorGeneratedMetricMeasureBindings;
+  readonly missingMeasures?: readonly string[];
   readonly value?: unknown;
 } | null | undefined;
 export type SemaphorGeneratedTableColumn = {
@@ -938,27 +955,31 @@ ${r}
 } as const;
 
 export const metricMeasureKeysForView = {
-${o}
+${t}
 } as const;
 
 export const metricMeasureBindingKeysForView = {
-${t}
+${o}
 } as const;
 
 export const tableColumnsForView = {
-${p}
+${y}
 } as const;
 
 export const columnKeysForView = {
-${f}
+${h}
 } as const;
 
 export const rowValuesForView = {
-${h}
+${f}
 } as const;
 
 export const metricValuesForView = {
-${a}
+${i}
+} as const;
+
+export const missingMetricMeasuresForView = {
+${l}
 } as const;
 
 export function resolveColumnKey(
@@ -1257,53 +1278,87 @@ function sourcesReferToSameDataset(
 }
 `;
 }
-function ze(e, n) {
-  const r = Y(e, n), o = new Map(
-    (K(e) ? z(e, n) : []).map((t) => [t.fieldName, t.key])
+function Ye(e, n) {
+  const r = Y(e, n), t = new Map(
+    (E(e) ? z(e, n) : []).map((o) => [o.fieldName, o.key])
   );
-  return r.map((t) => {
-    const a = M(t.raw, n), p = a ? o.get(a) : void 0;
-    return A({
-      key: t.name,
-      label: t.raw.label || t.raw.name,
-      dataType: t.raw.dataType,
-      sortable: !!p,
-      sortKey: p
+  return r.map((o) => {
+    const i = R(o.raw, n), l = i ? t.get(i) : void 0;
+    return O({
+      key: o.name,
+      label: o.raw.label || o.raw.name,
+      dataType: o.raw.dataType,
+      sortable: !!l,
+      sortKey: l
     });
   });
 }
-function Ye(e) {
-  const n = e.checklist.filterScopeByInput || [], r = e.checklist.requiredDevtools || {}, o = e.summary.views.map((i) => i.id).filter(Boolean), t = e.views.map((i) => i.raw.id).filter(Boolean), a = e.inputs.map((i) => i.raw.id).filter(Boolean), p = e.optionQueries.map((i) => i.raw.id || `${i.input.raw.id}-options`).filter(Boolean), f = Object.fromEntries(t.map((i) => [
-    i,
+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), i = e.inputs.map((d) => d.raw.id).filter(Boolean), l = e.optionQueries.map((d) => d.raw.id || `${d.input.raw.id}-options`).filter(Boolean), y = Object.fromEntries(o.map((d) => [
+    d,
     e.filterContracts.filter(
-      (I) => Array.isArray(I.appliesToViewIds) && I.appliesToViewIds.includes(i)
-    ).map((I) => I.inputId)
-  ])), h = Object.fromEntries(e.views.map((i) => [
-    i.raw.id,
+      (s) => Array.isArray(s.appliesToViewIds) && s.appliesToViewIds.includes(d)
+    ).map((s) => s.inputId)
+  ])), h = Object.fromEntries(e.views.map((d) => [
+    d.raw.id,
     {
-      title: i.raw.title,
-      visual: i.raw.visual,
-      visualSpec: i.raw.visualSpec,
-      queryKind: i.raw.queryKind,
-      sdkBuilder: i.raw.sdkBuilder
+      title: d.raw.title,
+      visual: d.raw.visual,
+      visualSpec: d.raw.visualSpec,
+      queryKind: d.raw.queryKind,
+      sdkBuilder: d.raw.sdkBuilder
     }
-  ])), y = Object.fromEntries(e.views.map((i) => {
-    var I, l, u;
+  ])), f = Object.fromEntries(e.views.map((d) => {
+    var s;
     return [
-      i.name,
-      A({
-        viewId: i.raw.id,
-        viewTitle: ((I = i.raw.visualSpec) == null ? void 0 : I.title) || i.raw.title,
-        visualType: (l = i.raw.visualSpec) == null ? void 0 : l.visualType,
-        title: ((u = i.raw.visualSpec) == null ? void 0 : u.title) || i.raw.title
+      d.raw.id,
+      O({
+        viewId: d.raw.id,
+        queryId: d.name,
+        title: d.raw.title,
+        visualType: ((s = d.raw.visualSpec) == null ? void 0 : s.visualType) || d.raw.visual,
+        suggestedComponentName: me(d.raw.title || d.raw.id || d.name),
+        marker: {
+          attribute: "data-semaphor-view-id",
+          value: d.raw.id
+        }
+      })
+    ];
+  })), m = Object.fromEntries(e.inputs.map((d) => {
+    var s;
+    return [
+      d.raw.id,
+      O({
+        inputId: d.raw.id,
+        label: d.raw.label,
+        type: d.raw.type,
+        optionQueryId: ((s = d.raw.optionQuery) == null ? void 0 : s.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: d.raw.id
+        }
+      })
+    ];
+  })), M = Object.fromEntries(e.views.map((d) => {
+    var s, u, c;
+    return [
+      d.name,
+      O({
+        viewId: d.raw.id,
+        viewTitle: ((s = d.raw.visualSpec) == null ? void 0 : s.title) || d.raw.title,
+        visualType: (u = d.raw.visualSpec) == null ? void 0 : u.visualType,
+        title: ((c = d.raw.visualSpec) == null ? void 0 : c.title) || d.raw.title
       })
     ];
   }));
   return `${H}
-export const generatedViewIds = ${k(o)} as const;
-export const generatedQueryViewIds = ${k(t)} as const;
-export const generatedInputIds = ${k(a)} as const;
-export const generatedInputOptionQueryIds = ${k(p)} as const;
+export const generatedViewIds = ${k(t)} as const;
+export const generatedQueryViewIds = ${k(o)} as const;
+export const generatedInputIds = ${k(i)} as const;
+export const generatedInputOptionQueryIds = ${k(l)} as const;
+export const generatedViewAuthoring = ${k(f)} as const;
+export const generatedInputAuthoring = ${k(m)} as const;
 
 export type SemaphorGeneratedViewId = typeof generatedViewIds[number];
 export type SemaphorGeneratedQueryViewId = typeof generatedQueryViewIds[number];
@@ -1322,16 +1377,28 @@ export type SemaphorGeneratedFilterContract = {
   readonly [key: string]: unknown;
 };
 
-export const generatedInputIdsForView = ${k(f)} as const;
+export const generatedInputIdsForView = ${k(y)} as const;
 export const generatedFilterContracts: readonly SemaphorGeneratedFilterContract[] = ${k(e.filterContracts)} as const;
 
+export function semaphorViewMarkerProps(viewId: SemaphorGeneratedViewId) {
+  return {
+    "data-semaphor-view-id": viewId,
+  } as const;
+}
+
+export function semaphorInputMarkerProps(inputId: SemaphorGeneratedInputId) {
+  return {
+    "data-semaphor-input-id": inputId,
+  } as const;
+}
+
 export function filterContractsForView(viewId: SemaphorGeneratedQueryViewId) {
   return generatedFilterContracts.filter((filterContract) =>
     filterContract.appliesToViewIds.includes(viewId)
   );
 }
 
-export const queryDebugForView = ${k(y)} as const;
+export const queryDebugForView = ${k(M)} as const;
 
 export const semaphorGeneratedContractMetadata = ${k({
     schemaVersion: "semaphor-generated-data-app-contract/v1",
@@ -1339,17 +1406,19 @@ export const semaphorGeneratedContractMetadata = ${k({
     requiredDevtools: r,
     filterContracts: e.filterContracts,
     filterScopeByInput: n,
-    generatedViewIds: o,
-    generatedQueryViewIds: t,
-    generatedInputIds: a,
-    generatedInputOptionQueryIds: p,
-    generatedInputIdsForView: f,
+    generatedViewIds: t,
+    generatedQueryViewIds: o,
+    generatedInputIds: i,
+    generatedInputOptionQueryIds: l,
+    generatedInputIdsForView: y,
+    generatedViewAuthoring: f,
+    generatedInputAuthoring: m,
     visualSpecs: h,
     presentationViews: e.presentationViews
   })} as const;
 `;
 }
-function We() {
+function Ze() {
   return `${H}
 export * from "./sources";
 export * from "./fields";
@@ -1360,66 +1429,75 @@ export * from "./accessors";
 export * from "./metadata";
 `;
 }
-function T(e, n) {
+function Q(e, n) {
   if (!(!n || typeof n != "object")) {
     if (Array.isArray(n)) {
-      for (const r of n) T(e, r);
+      for (const r of n) Q(e, r);
       return;
     }
-    x(n) && g(e, P(n));
+    x(n) && g(e, D(n));
     for (const r of Object.values(n))
-      T(e, r);
+      Q(e, r);
   }
 }
 function Y(e, n) {
   const r = [];
-  if (nn(r, e.raw.sdkSpec), r.length === 0)
-    for (const t of e.raw.fields || [])
-      g(r, t);
+  if (tn(r, e.raw.sdkSpec), r.length === 0)
+    for (const o of e.raw.fields || [])
+      g(r, o);
+  const t = X(
+    r.filter((o) => o.name && R(o, n)).map((o) => ({ raw: o, key: U(o), name: "" })),
+    (o) => o.key
+  );
+  return v(
+    t,
+    (o) => B(o.raw.label || o.raw.name || "field")
+  ), t;
+}
+function P(e, n) {
+  if (j(e.raw.sdkSpec.builder) !== "metric")
+    return [];
+  const r = $(e.raw.sdkSpec.spec), t = [];
+  g(t, r == null ? void 0 : r.primaryMeasure);
+  for (const i of q(r == null ? void 0 : r.measures))
+    g(t, i);
   const o = X(
-    r.filter((t) => t.name && M(t, n)).map((t) => ({ raw: t, key: D(t), name: "" })),
-    (t) => t.key
+    t.filter((i) => i.name && R(i, n)).map((i) => ({ raw: i, key: U(i), name: "" })),
+    (i) => i.key
   );
   return v(
     o,
-    (t) => Q(t.raw.label || t.raw.name || "field")
+    (i) => B(i.raw.label || i.raw.name || "metric")
   ), o;
 }
-function L(e, n) {
-  if (B(e.raw.sdkSpec.builder) !== "metric")
-    return [];
-  const r = w(e.raw.sdkSpec.spec), o = [];
-  g(o, r == null ? void 0 : r.primaryMeasure);
-  for (const a of q(r == null ? void 0 : r.measures))
-    g(o, a);
-  const t = X(
-    o.filter((a) => a.name && M(a, n)).map((a) => ({ raw: a, key: D(a), name: "" })),
-    (a) => a.key
+function Xe(e, n, r) {
+  var o;
+  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 ${n.raw.name}.`
   );
-  return v(
-    t,
-    (a) => Q(a.raw.label || a.raw.name || "metric")
-  ), t;
 }
-function Ze(e, n) {
+function en(e, n) {
   if (n.length === 1)
     return /* @__PURE__ */ new Set([n[0].name]);
-  const r = w(e.raw.sdkSpec.spec);
+  const r = $(e.raw.sdkSpec.spec);
   if (!x(r == null ? void 0 : r.primaryMeasure))
     return /* @__PURE__ */ new Set();
-  const o = D(P(r.primaryMeasure)), t = n.find((a) => a.key === o);
-  return t ? /* @__PURE__ */ new Set([t.name]) : /* @__PURE__ */ new Set();
+  const t = U(D(r.primaryMeasure)), o = n.find((i) => i.key === t);
+  return o ? /* @__PURE__ */ new Set([o.name]) : /* @__PURE__ */ new Set();
 }
-function Xe(e) {
+function nn(e) {
   const n = /* @__PURE__ */ new Map();
   for (const r of e)
-    for (const o of new Set(ge(r.raw)))
-      n.set(o, (n.get(o) || 0) + 1);
+    for (const t of new Set(he(r.raw)))
+      n.set(t, (n.get(t) || 0) + 1);
   return new Set(
     Array.from(n.entries()).filter(([, r]) => r > 1).map(([r]) => r)
   );
 }
-function ge(e) {
+function he(e) {
   const n = (e.aggregate || "SUM").toUpperCase();
   return _([
     `${n.toLowerCase()}_${e.name}`,
@@ -1429,7 +1507,7 @@ function ge(e) {
     e.name
   ]);
 }
-function en(e) {
+function rn(e) {
   const n = /* @__PURE__ */ new Map();
   for (const r of e)
     n.set(r.raw.name, (n.get(r.raw.name) || 0) + 1);
@@ -1437,32 +1515,32 @@ function en(e) {
     Array.from(n.entries()).filter(([, r]) => r > 1).map(([r]) => r)
   );
 }
-function nn(e, n) {
-  const r = w(n.spec);
+function tn(e, n) {
+  const r = $(n.spec);
   if (!r)
     return;
-  const o = B(n.builder);
-  if (o === "records") {
-    for (const t of q(r.fields)) g(e, t);
+  const t = j(n.builder);
+  if (t === "records") {
+    for (const o of q(r.fields)) g(e, o);
     return;
   }
-  if (o === "sql") {
-    for (const t of q(r.fields)) g(e, t);
+  if (t === "sql") {
+    for (const o of q(r.fields)) g(e, o);
     return;
   }
-  if (o === "analysis" || o === "metric") {
+  if (t === "analysis" || t === "metric") {
     g(e, r.primaryMeasure);
-    for (const t of q(r.measures)) g(e, t);
-    for (const t of q(r.dimensions)) g(e, t);
+    for (const o of q(r.measures)) g(e, o);
+    for (const o of q(r.dimensions)) g(e, o);
     g(e, r.dateField);
     return;
   }
-  if (o === "matrix") {
-    const t = pe(r.rows), a = pe(r.columns), p = q(r.values);
-    for (const f of t) le(e, f);
-    for (const f of a) le(e, f);
-    for (const f of p) {
-      const h = w(f);
+  if (t === "matrix") {
+    const o = pe(r.rows), i = pe(r.columns), l = q(r.values);
+    for (const y of o) le(e, y);
+    for (const y of i) le(e, y);
+    for (const y of l) {
+      const h = $(y);
       g(e, h == null ? void 0 : h.field), g(e, h == null ? void 0 : h.measure);
     }
   }
@@ -1470,7 +1548,7 @@ function nn(e, n) {
 function pe(e) {
   if (Array.isArray(e))
     return e;
-  const n = w(e);
+  const n = $(e);
   return Array.isArray(n == null ? void 0 : n.levels) ? n.levels : [];
 }
 function le(e, n) {
@@ -1479,15 +1557,15 @@ function le(e, n) {
     g(e, n);
     return;
   }
-  g(e, (r = w(n)) == null ? void 0 : r.field);
+  g(e, (r = $(n)) == null ? void 0 : r.field);
 }
 function ce(e) {
-  var n, r, o, t;
-  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" || ((o = e == null ? void 0 : e.computation) == null ? void 0 : o.kind) === "unsupported" || (e == null ? void 0 : e.visual) === "text_block" || ((t = e == null ? void 0 : e.visualSpec) == null ? void 0 : t.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 rn(e) {
-  const n = w(e) || {};
-  return A({
+function on(e) {
+  const n = $(e) || {};
+  return O({
     id: e.id,
     title: e.title,
     purpose: e.purpose,
@@ -1502,9 +1580,9 @@ function rn(e) {
   });
 }
 function g(e, n) {
-  x(n) && e.push(P(n));
+  x(n) && e.push(D(n));
 }
-function P(e) {
+function D(e) {
   return {
     name: e.name,
     label: e.label,
@@ -1515,27 +1593,27 @@ function P(e) {
     ...e.source ? { source: e.source } : {}
   };
 }
-function tn(e) {
+function sn(e) {
   if (!e.source)
     return;
   const n = {
     ...e.source,
     ...e.sourceKey ? { sourceKey: e.sourceKey } : {}
-  }, r = we(n);
+  }, r = $e(n);
   if (r)
     return {
       raw: n,
       key: r,
-      aliases: $e(n),
+      aliases: Ie(n),
       name: ""
     };
 }
 function x(e) {
-  const n = w(e);
+  const n = $(e);
   return !!(n && typeof n.name == "string" && (typeof n.role == "string" || typeof n.dataType == "string" || typeof n.aggregate == "string" || n.source || n.sourceKey));
 }
-function he(e) {
-  const n = w(e);
+function we(e) {
+  const n = $(e);
   return !!(n && (typeof n.sourceKey == "string" || n.kind === "semantic" || typeof n.datasetName == "string" && typeof n.domainId == "string"));
 }
 function C(e, n) {
@@ -1544,34 +1622,34 @@ function C(e, n) {
   if (e === null || typeof e == "number" || typeof e == "boolean" || typeof e == "string")
     return JSON.stringify(e);
   if (Array.isArray(e))
-    return `[${e.map((t) => C(t, n)).join(", ")}]`;
+    return `[${e.map((o) => C(o, n)).join(", ")}]`;
   if (x(e)) {
-    const t = M(P(e), n);
-    if (t) return `fields.${t}`;
+    const o = R(D(e), n);
+    if (o) return `fields.${o}`;
   }
-  if (he(e)) {
-    const t = Se(e, n);
-    if (t) return `sources.${t}`;
+  if (we(e)) {
+    const o = Se(e, n);
+    if (o) return `sources.${o}`;
   }
-  const r = w(e);
-  return r ? `{ ${Object.entries(r).filter(([, t]) => t !== void 0).map(([t, a]) => `${JSON.stringify(t)}: ${C(a, n)}`).join(", ")} }` : JSON.stringify(e);
+  const r = $(e);
+  return r ? `{ ${Object.entries(r).filter(([, o]) => o !== void 0).map(([o, i]) => `${JSON.stringify(o)}: ${C(i, n)}`).join(", ")} }` : JSON.stringify(e);
 }
 function k(e) {
   return JSON.stringify(e, null, 2);
 }
-function M(e, n) {
+function R(e, n) {
   if (x(e))
-    return n.fieldNameByKey.get(D(P(e)));
+    return n.fieldNameByKey.get(U(D(e)));
 }
 function Se(e, n) {
-  if (he(e))
+  if (we(e))
     for (const r of Z(e)) {
-      const o = n.sourceNameByKey.get(r);
-      if (o)
-        return o;
+      const t = n.sourceNameByKey.get(r);
+      if (t)
+        return t;
     }
 }
-function D(e) {
+function U(e) {
   return [
     e.sourceKey || "",
     e.name || "",
@@ -1579,64 +1657,64 @@ function D(e) {
     e.aggregate || ""
   ].join("|");
 }
-function on(e, n) {
+function an(e, n) {
   return !x(e) || !x(n) || e.name !== n.name ? !1 : ie(e).some(
     (r) => ie(n).includes(r)
   );
 }
-function sn(e) {
+function un(e) {
   return x(e) && e.role === "id";
 }
-function an(e) {
+function dn(e) {
   const n = [], r = /* @__PURE__ */ new Map();
-  for (const o of e) {
-    const t = _(o.aliases.length ? o.aliases : [o.key]), a = t.map((p) => r.get(p)).find(O);
-    if (a) {
-      a.aliases = _([...a.aliases, ...t]);
+  for (const t of e) {
+    const o = _(t.aliases.length ? t.aliases : [t.key]), i = o.map((l) => r.get(l)).find(G);
+    if (i) {
+      i.aliases = _([...i.aliases, ...o]);
       continue;
     }
-    o.aliases = t, n.push(o);
-    for (const p of t)
-      r.set(p, o);
+    t.aliases = o, n.push(t);
+    for (const l of o)
+      r.set(l, t);
   }
   return n;
 }
-function un(e) {
+function pn(e) {
   const n = /* @__PURE__ */ new Map();
   for (const r of e)
-    for (const o of _([r.key, ...r.aliases])) {
-      const t = n.get(o);
-      if (t && t !== r.name)
-        throw new Error(`Source identity ${o} resolves to multiple generated sources.`);
-      n.set(o, r.name);
+    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.`);
+      n.set(t, r.name);
     }
   return n;
 }
 function _(e) {
   return Array.from(new Set(e.filter(Boolean)));
 }
-function we(e) {
+function $e(e) {
   return Z(e)[0] || de(e);
 }
 function Z(e) {
-  const n = w(e);
+  const n = $(e);
   if (!n)
     return [];
   const r = [];
   if (typeof n.sourceKey == "string" && r.push(n.sourceKey), n.kind === "semantic" || n.datasetName) {
-    const o = typeof n.domainId == "string" ? n.domainId : "";
-    o && typeof n.datasetId == "string" && r.push(`semantic:${o}:datasetId:${n.datasetId}`), o && typeof n.datasetName == "string" && r.push(`semantic:${o}:datasetName:${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 r.length === 0 && r.push(de(e)), _(r);
 }
-function $e(e) {
+function Ie(e) {
   return Z(e);
 }
 function de(e) {
-  const n = w(e);
+  const n = $(e);
   return n ? typeof n.sourceKey == "string" ? n.sourceKey : JSON.stringify(n) : "";
 }
-function dn(e) {
+function ln(e) {
   return x(e) && ie(e)[0] || "";
 }
 function ie(e) {
@@ -1645,53 +1723,57 @@ function ie(e) {
     ...e.source ? Z(e.source) : []
   ]) : [];
 }
-function B(e) {
+function j(e) {
   const n = String(e || "").replace(/^semaphor\./, "");
   if (!["metric", "records", "analysis", "matrix", "sql"].includes(n))
     throw new Error(`Unsupported sdkSpec builder: ${e}`);
   return n;
 }
-function pn(e) {
-  const n = B(e);
+function cn(e) {
+  const n = j(e);
   return n === "records" || n === "sql";
 }
-function ln(e) {
-  const n = w(e);
+function mn(e) {
+  const n = $(e);
   return typeof (n == null ? void 0 : n.operator) == "string" ? n.operator : e.type === "date_range" ? "between" : e.type === "multi_select" || e.type === "select" ? "in" : "=";
 }
 function v(e, n) {
   const r = /* @__PURE__ */ new Map();
-  for (const o of e) {
-    const t = n(o) || "item", a = r.get(t) || 0;
-    r.set(t, a + 1), o.name = a === 0 ? t : `${t}${a + 1}`;
+  for (const t of e) {
+    const o = n(t) || "item", i = r.get(o) || 0;
+    r.set(o, i + 1), t.name = i === 0 ? o : `${o}${i + 1}`;
   }
 }
 function X(e, n) {
-  const r = /* @__PURE__ */ new Set(), o = [];
-  for (const t of e) {
-    const a = n(t);
-    !a || r.has(a) || (r.add(a), o.push(t));
+  const r = /* @__PURE__ */ new Set(), t = [];
+  for (const o of e) {
+    const i = n(o);
+    !i || r.has(i) || (r.add(i), t.push(o));
   }
-  return o;
+  return t;
 }
-function Q(e) {
+function B(e) {
   const n = String(e || "").replace(/[^A-Za-z0-9]+/g, " ").trim().split(/\s+/).filter(Boolean);
   if (n.length === 0)
     return "item";
-  const [r, ...o] = n, t = [
+  const [r, ...t] = n, o = [
     r.toLowerCase(),
-    ...o.map((a) => a.charAt(0).toUpperCase() + a.slice(1).toLowerCase())
+    ...t.map((i) => i.charAt(0).toUpperCase() + i.slice(1).toLowerCase())
   ].join("");
-  return /^[A-Za-z_$]/.test(t) ? t : `item${t}`;
+  return /^[A-Za-z_$]/.test(o) ? o : `item${o}`;
 }
-function cn(e) {
+function me(e) {
+  const n = B(e);
+  return n.charAt(0).toUpperCase() + n.slice(1);
+}
+function fn(e) {
   const n = String(e).split(":");
   return n[n.length - 1] || String(e);
 }
-function A(e) {
+function O(e) {
   return Object.fromEntries(Object.entries(e).filter(([, n]) => n !== void 0));
 }
-function w(e) {
+function $(e) {
   return e && typeof e == "object" && !Array.isArray(e) ? e : void 0;
 }
 function q(e) {
@@ -1700,28 +1782,28 @@ function q(e) {
 function J(e) {
   return typeof e == "number" && Number.isFinite(e) ? e : void 0;
 }
-function O(e) {
+function G(e) {
   return e !== void 0;
 }
 export {
-  Vn as CODEGEN_SUMMARY_SCHEMA_VERSION,
-  ke as CODEGEN_SUMMARY_VALIDATOR_VERSION,
-  Re as CONTRACT_MANIFEST_SCHEMA_VERSION,
-  yn as DEFAULT_GENERATED_CONTRACT_OUTPUT_DIR,
-  me as GENERATED_CONTRACT_SCHEMA_VERSION,
-  kn as GENERATED_CONTRACT_TYPESCRIPT_FILES,
-  Rn as REQUIRED_GENERATED_CONTRACT_FILES,
-  wn as SEMAPHOR_DATA_APP_CODEGEN_SUMMARY_SCHEMA_VERSION,
-  $n as SEMAPHOR_DATA_APP_CODEGEN_SUMMARY_VALIDATOR_VERSION,
-  Ve as assertValidCodegenSummary,
-  Mn as buildSemaphorGeneratedActiveInput,
-  Nn as buildSemaphorGeneratedInputOptionIntent,
-  xn as buildSemaphorGeneratedViewExecutionRequest,
-  Cn as buildSemaphorGeneratedViewExecutionRequests,
-  On as evaluateSemaphorDataAppContractUpdatePolicy,
-  gn as generateSemaphorDataAppContract,
-  In as isSemaphorDataAppCodegenSummary,
-  Gn as validateCodegenSummary,
-  Fn as validateSemaphorDataAppCodegenSummary,
-  Kn as validateSemaphorGeneratedContract
+  Rn as CODEGEN_SUMMARY_SCHEMA_VERSION,
+  Re as CODEGEN_SUMMARY_VALIDATOR_VERSION,
+  Me as CONTRACT_MANIFEST_SCHEMA_VERSION,
+  hn as DEFAULT_GENERATED_CONTRACT_OUTPUT_DIR,
+  fe as GENERATED_CONTRACT_SCHEMA_VERSION,
+  Mn as GENERATED_CONTRACT_TYPESCRIPT_FILES,
+  Nn as REQUIRED_GENERATED_CONTRACT_FILES,
+  In as SEMAPHOR_DATA_APP_CODEGEN_SUMMARY_SCHEMA_VERSION,
+  Fn as SEMAPHOR_DATA_APP_CODEGEN_SUMMARY_VALIDATOR_VERSION,
+  ke as assertValidCodegenSummary,
+  xn as buildSemaphorGeneratedActiveInput,
+  Cn as buildSemaphorGeneratedInputOptionIntent,
+  On as buildSemaphorGeneratedViewExecutionRequest,
+  Gn as buildSemaphorGeneratedViewExecutionRequests,
+  Kn as evaluateSemaphorDataAppContractUpdatePolicy,
+  wn as generateSemaphorDataAppContract,
+  bn as isSemaphorDataAppCodegenSummary,
+  En as validateCodegenSummary,
+  Vn as validateSemaphorDataAppCodegenSummary,
+  An as validateSemaphorGeneratedContract
 };