react-semaphor 0.1.418 → 0.1.419

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

@@ -1,13 +1,13 @@
-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 { S as In, a as Fn, i as bn, v as Vn } from "../chunks/analyze-result-contract-DdhEt99q.js";
+import { c as ke, G as fe, a as Re, b as Me } from "../chunks/update-policy-BzT2k4n6.js";
+import { C as Rn, e as Mn, R as xn, f as Nn, g as Cn, h as On, i as Gn, j as Kn, v as En, d as An } from "../chunks/update-policy-BzT2k4n6.js";
 import { 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 wn(e, n = {}) {
   ke(e);
-  const r = Ne(e);
+  const r = xe(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."
@@ -17,14 +17,14 @@ function wn(e, n = {}) {
     files: t,
     generatorName: n.generatorName || "react-semaphor/data-app-codegen/node",
     generatorVersion: n.generatorVersion || "unknown"
-  }), i = {
+  }), a = {
     ...t,
     "contract.manifest.json": `${JSON.stringify(o, null, 2)}
 `
   };
   return {
     schemaVersion: fe,
-    files: i,
+    files: a,
     manifest: o,
     contentHash: String(o.generatedContentHash || ""),
     usageExample: Ee(r),
@@ -38,94 +38,94 @@ function wn(e, n = {}) {
     }
   };
 }
-function Ne(e) {
-  var d, s, u, c, p, S, I, F, b, K, V, N;
+function xe(e) {
+  var u, d, c, i, p, S, g, $, F, R, b, M;
   const n = [], r = [];
-  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.inputs) {
+    h(r, s.fieldRef);
+    for (const I of s.bindings || [])
+      h(r, I.fieldRef);
+    h(r, (u = s.optionQuery) == null ? void 0 : u.valueFieldRef), h(r, (d = s.optionQuery) == null ? void 0 : d.labelFieldRef), h(r, (c = s.optionQuery) == null ? void 0 : c.filterFieldRef), Q(r, (i = s.optionQuery) == null ? void 0 : i.spec);
   }
-  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.filterContracts) {
+    h(r, s.fieldRef), h(r, (p = s.optionQuery) == null ? void 0 : p.valueFieldRef), h(r, (S = s.optionQuery) == null ? void 0 : S.labelFieldRef), h(r, (g = s.optionQuery) == null ? void 0 : g.filterFieldRef), Q(r, ($ = s.optionQuery) == null ? void 0 : $.spec);
+    for (const I of s.bindings || [])
+      h(r, I.fieldRef);
   }
-  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);
+  for (const s of e.views) {
+    for (const I of s.fields || [])
+      h(r, I);
+    Q(r, (F = s.sdkSpec) == null ? void 0 : F.spec), Q(r, s.visualSpec);
   }
   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);
+  for (const s of Object.values(t.bindingsByView || {}))
+    for (const I of Array.isArray(s) ? s : [])
+      h(r, I.fieldRef), h(r, I.optionValueField), h(r, I.optionLabelField);
+  for (const s of t.requiredInputOptions || [])
+    h(r, s.visibleLabelField), h(r, s.optionValueField), h(r, s.runtimeFilterField);
   const o = dn(
     [
-      ...e.sources.map((a) => ({
-        raw: a,
-        key: $e(a),
-        aliases: Ie(a),
+      ...e.sources.map((s) => ({
+        raw: s,
+        key: $e(s),
+        aliases: Ie(s),
         name: ""
       })),
-      ...r.map((a) => sn(a)).filter(G)
+      ...r.map((s) => sn(s)).filter(K)
     ]
   );
-  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"
+  v(o, (s) => {
+    const I = V(s.raw);
+    return q(
+      s.raw.label || (I == null ? void 0 : I.datasetName) || (I == null ? void 0 : I.datasetId) || (I == null ? void 0 : I.name) || s.raw.kind || "source"
     );
   });
-  const i = pn(o), l = X(
-    r.filter((a) => a.name).map((a) => ({
-      raw: a,
-      key: U(a),
+  const a = pn(o), l = X(
+    r.filter((s) => s.name).map((s) => ({
+      raw: s,
+      key: L(s),
       name: ""
     })),
-    (a) => a.key
+    (s) => s.key
   );
   v(
     l,
-    (a) => B([
-      a.raw.sourceKey ? fn(a.raw.sourceKey) : "",
-      a.raw.aggregate ? a.raw.aggregate.toLowerCase() : "",
-      a.raw.name
+    (s) => q([
+      s.raw.sourceKey ? fn(s.raw.sourceKey) : "",
+      s.raw.aggregate ? s.raw.aggregate.toLowerCase() : "",
+      s.raw.name
     ].filter(Boolean).join("_"))
   );
-  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")
+  const y = new Map(l.map((s) => [s.key, s.name])), w = e.inputs.map((s) => ({
+    raw: s,
+    name: q(s.id || s.label || "input")
   }));
-  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(w, (s) => s.name);
+  const f = w.filter((s) => !!s.raw.optionQuery).map((s) => ({
+    input: s,
+    name: `${s.name}Options`,
+    raw: s.raw.optionQuery
   }));
-  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.`
+  v(f, (s) => s.name);
+  for (const s of f)
+    an(s.raw.labelFieldRef, s.raw.valueFieldRef) && un(s.raw.valueFieldRef) && n.push(
+      `Input option query ${((R = s.raw.spec) == null ? void 0 : R.inputId) || s.input.raw.id || s.name} uses identifier field ${s.raw.valueFieldRef.name} as both label and value. It can execute, but the UI will show key values unless the semantic model exposes a human-readable label through a modeled relationship.`
     );
   const m = e.views.filter(
-    (a) => {
-      var w, T;
-      return !!((w = a.sdkSpec) != null && w.builder && ((T = a.sdkSpec) != null && T.spec));
+    (s) => {
+      var I, T;
+      return !!((I = s.sdkSpec) != null && I.builder && ((T = s.sdkSpec) != null && T.spec));
     }
-  ).map((a) => ({
-    raw: a,
-    name: B(a.id || a.title || "query")
+  ).map((s) => ({
+    raw: s,
+    name: q(s.id || s.title || "query")
   }));
-  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,
+  v(m, (s) => s.name);
+  const N = e.views.filter((s) => ce(s) && !("sdkSpec" in s)).map((s) => on(s));
+  for (const s of e.views)
+    (!("sdkSpec" in s) || !((b = s.sdkSpec) != null && b.builder) || !((M = s.sdkSpec) != null && M.spec)) && !ce(s) && n.push(`Skipped view ${s.id || s.title || "unknown"} because it has no sdkSpec.`);
+  return Ne({
+    inputs: w,
     views: m,
     filterContracts: e.filterContracts
   }), {
@@ -133,49 +133,49 @@ function Ne(e) {
     title: e.title || "Semaphor Data App",
     sources: o,
     fields: l,
-    inputs: h,
+    inputs: w,
     optionQueries: f,
     views: m,
-    presentationViews: M,
+    presentationViews: N,
     filterContracts: e.filterContracts,
     checklist: t,
-    sourceNameByKey: i,
+    sourceNameByKey: a,
     fieldNameByKey: y,
     warnings: n
   };
 }
-function xe({
+function Ne({
   inputs: e,
   views: n,
   filterContracts: r
 }) {
-  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()) {
+  const t = new Set(e.map((a) => a.raw.id).filter(Boolean)), o = new Set(n.map((a) => a.raw.id).filter(Boolean));
+  for (const [a, l] of r.entries()) {
     if (!t.has(l.inputId))
-      throw new Error(`filterContracts.${i}.inputId must reference a generated input.`);
-    const y = new Set(l.appliesToViewIds || []), h = new Set(l.notAppliedToViewIds || []);
+      throw new Error(`filterContracts.${a}.inputId must reference a generated input.`);
+    const y = new Set(l.appliesToViewIds || []), w = new Set(l.notAppliedToViewIds || []);
     for (const [f, m] of (l.appliesToViewIds || []).entries())
       if (!o.has(m))
         throw new Error(
-          `filterContracts.${i}.appliesToViewIds.${f} must reference an executable generated view.`
+          `filterContracts.${a}.appliesToViewIds.${f} must reference an executable generated view.`
         );
     for (const [f, m] of (l.notAppliedToViewIds || []).entries())
       if (!o.has(m))
         throw new Error(
-          `filterContracts.${i}.notAppliedToViewIds.${f} must reference an executable generated view.`
+          `filterContracts.${a}.notAppliedToViewIds.${f} must reference an executable generated view.`
         );
     for (const [f, m] of (l.bindings || []).entries()) {
       if (!o.has(m.viewId))
         throw new Error(
-          `filterContracts.${i}.bindings.${f}.viewId must reference an executable generated view.`
+          `filterContracts.${a}.bindings.${f}.viewId must reference an executable generated view.`
         );
       if (!y.has(m.viewId))
         throw new Error(
-          `filterContracts.${i}.bindings.${f}.viewId must be included in appliesToViewIds.`
+          `filterContracts.${a}.bindings.${f}.viewId must be included in appliesToViewIds.`
         );
-      if (h.has(m.viewId))
+      if (w.has(m.viewId))
         throw new Error(
-          `filterContracts.${i}.bindings.${f}.viewId must not be listed in notAppliedToViewIds.`
+          `filterContracts.${a}.bindings.${f}.viewId must not be listed in notAppliedToViewIds.`
         );
     }
   }
@@ -183,7 +183,7 @@ function xe({
 function Ce(e) {
   return {
     "sources.ts": ve(e),
-    "fields.ts": Be(e),
+    "fields.ts": qe(e),
     "inputs.ts": Te(e),
     "queries.ts": _e(e),
     "bindings.ts": Le(e),
@@ -234,14 +234,14 @@ function Ee(e) {
   );
   if (n)
     return [
-      'import { appInputSpecs, createInputHandleMap, queries, queryOptionsForView, recordsSortOptionsForView, rowValuesForView, semaphorGeneratedContractMetadata } from "./semaphor/generated";',
+      '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 sort = sortOption ? { key: sortOption.key, direction: "asc" as const } : undefined;',
       `const query = queries.${n.name}({ page, pageSize, sort });`,
       `const result = useSemaphorQuery(query, queryOptionsForView.${n.name}(inputHandles));`,
-      `const rows = result.records.map((row) => rowValuesForView.${n.name}(row, result.columns));`,
+      `const rows = rowsForView.${n.name}(result);`,
       "const presentationViews = semaphorGeneratedContractMetadata.presentationViews;"
     ].join(`
 `);
@@ -250,14 +250,14 @@ function Ee(e) {
   );
   if (r)
     return [
-      'import { appInputSpecs, createInputHandleMap, queries, queryOptionsForView, recordsSortOptionsForView, rowValuesForView, semaphorGeneratedContractMetadata } from "./semaphor/generated";',
+      '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 sort = sortOption ? { key: sortOption.key, direction: "asc" as const } : undefined;',
       `const query = queries.${r.name}({ sort });`,
       `const result = useSemaphorQuery(query, queryOptionsForView.${r.name}(inputHandles));`,
-      `const rows = result.records.map((row) => rowValuesForView.${r.name}(row, result.columns));`,
+      `const rows = rowsForView.${r.name}(result);`,
       "const presentationViews = semaphorGeneratedContractMetadata.presentationViews;"
     ].join(`
 `);
@@ -266,12 +266,12 @@ function Ee(e) {
   );
   if (t)
     return [
-      'import { appInputSpecs, createInputHandleMap, queries, queryOptionsForView, rowValuesForView, semaphorGeneratedContractMetadata } from "./semaphor/generated";',
+      'import { appInputSpecs, createInputHandleMap, queries, queryOptionsForView, rowsForView, 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 rows = rowsForView.${t.name}(result);`,
       "const presentationViews = semaphorGeneratedContractMetadata.presentationViews;"
     ].join(`
 `);
@@ -280,26 +280,26 @@ function Ee(e) {
   );
   if (o)
     return [
-      'import { appInputSpecs, createInputHandleMap, queries, queryOptionsForView, rowValuesForView, semaphorGeneratedContractMetadata } from "./semaphor/generated";',
+      'import { appInputSpecs, createInputHandleMap, queries, queryOptionsForView, rowsForView, 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 rows = rowsForView.${o.name}(result);`,
       "const presentationViews = semaphorGeneratedContractMetadata.presentationViews;"
     ].join(`
 `);
-  const i = e.views.find((f) => {
+  const a = e.views.find((f) => {
     var m;
     return cn((m = f.raw.sdkSpec) == null ? void 0 : m.builder);
   });
-  if (i)
+  if (a)
     return [
-      'import { appInputSpecs, createInputHandleMap, queries, queryOptionsForView, rowValuesForView, semaphorGeneratedContractMetadata } from "./semaphor/generated";',
+      '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 = result.records.map((row) => rowValuesForView.${i.name}(row, result.columns));`,
+      `const result = useSemaphorQuery(queries.${a.name}(), queryOptionsForView.${a.name}(inputHandles));`,
+      `const rows = rowsForView.${a.name}(result);`,
       "const presentationViews = semaphorGeneratedContractMetadata.presentationViews;"
     ].join(`
 `);
@@ -326,11 +326,11 @@ function Ee(e) {
 }
 function W(e) {
   var n;
-  return j((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "records";
+  return B((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "records";
 }
 function Ae(e) {
   var n;
-  return j((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "metric";
+  return B((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "metric";
 }
 function E(e) {
   var n, r, t;
@@ -338,7 +338,7 @@ function E(e) {
 }
 function ue(e) {
   var n;
-  return j((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "sql";
+  return B((n = e.raw.sdkSpec) == null ? void 0 : n.builder) === "sql";
 }
 function A(e) {
   var n, r, t;
@@ -349,8 +349,8 @@ function He(e) {
 }
 function ve(e) {
   const n = e.sources.map(({ name: t, raw: o }) => {
-    const i = qe(o);
-    return `  ${t}: ${i},`;
+    const a = je(o);
+    return `  ${t}: ${a},`;
   }).join(`
 `), r = e.sources.some((t) => t.raw.kind === "semantic") ? `import { semaphor } from "react-semaphor/data-app-sdk";
 
@@ -361,7 +361,7 @@ ${n}
 } as const;
 `;
 }
-function qe(e) {
+function je(e) {
   if (e.kind === "semantic") {
     const n = {
       domainId: e.domainId,
@@ -369,14 +369,14 @@ function qe(e) {
       datasetName: e.datasetName,
       label: e.label
     };
-    return `semaphor.source.semantic(${k(O(n))})`;
+    return `semaphor.source.semantic(${k(G(n))})`;
   }
-  return `${k(O({ ...e, sourceKey: void 0 }))} as const`;
+  return `${k(G({ ...e, sourceKey: void 0 }))} as const`;
 }
-function Be(e) {
+function qe(e) {
   const n = e.fields.map(({ name: t, raw: o }) => {
-    const i = je(o, e);
-    return `  ${t}: ${i},`;
+    const a = Be(o, e);
+    return `  ${t}: ${a},`;
   }).join(`
 `), r = n.includes("sources.") ? `import { sources } from "./sources";
 
@@ -387,7 +387,7 @@ ${n}
 } as const;
 `;
 }
-function je(e, n) {
+function Be(e, n) {
   const r = {
     name: e.name,
     label: e.label,
@@ -399,90 +399,90 @@ function je(e, n) {
     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(r)).map(([l, y]) => `${JSON.stringify(l)}: ${C(y, n)}`);
-  return o && i.push(`"source": sources.${o}`), `{ ${i.join(", ")} }`;
+  const a = Object.entries(G(r)).map(([l, y]) => `${JSON.stringify(l)}: ${O(y, n)}`);
+  return o && a.push(`"source": sources.${o}`), `{ ${a.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))}`
+  const n = e.inputs.map((c) => {
+    const i = x(c.raw.fieldRef, e), p = [
+      `id: ${JSON.stringify(c.raw.id)}`,
+      `label: ${JSON.stringify(c.raw.label || c.raw.id)}`,
+      `operator: ${JSON.stringify(mn(c.raw))}`
     ];
-    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(", ")} }),`;
+    if (i && p.push(`field: fields.${i}`), c.raw.relationshipHint && p.push(`relationshipHint: ${k(c.raw.relationshipHint)}`), !i)
+      throw new Error(`Input ${c.raw.id || c.name} is missing a generated field reference.`);
+    return `  ${c.name}: semaphor.filter({ ${p.join(", ")} }),`;
   }).join(`
-`), 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: a,
-      dependencies: w,
+`), r = e.inputs.map((c) => `filterSpecs.${c.name}`).join(", "), t = e.inputs.map((c) => JSON.stringify(c.raw.id)).join(", "), o = e.optionQueries.map((c) => {
+    const i = c.input.raw, p = c.raw, S = V(p.spec) || {}, {
+      id: g,
+      inputId: $,
+      source: F,
+      sourceKey: R,
+      valueField: b,
+      labelField: M,
+      population: s,
+      dependencies: I,
       limit: T,
       ...ee
-    } = 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 = {
+    } = S, J = p.sourceKey ? { sourceKey: p.sourceKey } : p.source || F || (typeof R == "string" ? { sourceKey: R } : void 0), ne = Se(J, e), re = x(p.valueFieldRef, e), te = x(p.labelFieldRef, e), oe = ge(c), se = {
       ...ee,
-      id: p.id || S.id || `${c.id}-options`,
-      inputId: c.id,
-      source: L,
+      id: p.id || S.id || `${i.id}-options`,
+      inputId: i.id,
+      source: J,
       valueField: p.valueFieldRef,
       labelField: p.labelFieldRef,
-      population: p.population || a,
+      population: p.population || s,
       dependencies: oe,
       limit: p.limit || T || 100
     };
     if (!ne || !re || !te)
-      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(", ")} }),`;
+      throw new Error(`Input option query ${p.id || `${i.id}-options`} is missing source, valueField, or labelField.`);
+    const Fe = Object.entries(G(se)).map(([be, Ve]) => `${JSON.stringify(be)}: ${O(Ve, e)}`);
+    return `  ${c.name}: semaphor.inputOptions({ ${Fe.join(", ")} }),`;
   }).join(`
-`), 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)
+`), a = e.optionQueries.map((c) => {
+    const i = Qe(e, c), p = i.length > 0 ? "inputHandles" : "_inputHandles", S = i.map((g) => {
+      const $ = x(g.raw.fieldRef, e);
+      if (!$)
         throw new Error(
-          `Input option query ${u.raw.id || `${u.input.raw.id}-options`} references input ${I.raw.id} without a generated field reference.`
+          `Input option query ${c.raw.id || `${c.input.raw.id}-options`} references input ${g.raw.id} without a generated field reference.`
         );
-      const b = `inputHandles[${JSON.stringify(I.raw.id)}]`;
-      return `    if (${b}) {
-      inputs.push(semaphor.bindInput(${b}, { field: fields.${F} }));
+      const F = `inputHandles[${JSON.stringify(g.raw.id)}]`;
+      return `    if (${F}) {
+      inputs.push(semaphor.bindInput(${F}, { field: fields.${$} }));
     }`;
     }).join(`
 `);
-    return `  ${u.name}(${p}: SemaphorGeneratedInputHandleMap): SemaphorInputReference[] {
+    return `  ${c.name}(${p}: SemaphorGeneratedInputHandleMap): SemaphorInputReference[] {
     const inputs: SemaphorInputReference[] = [];
 ${S}
     return inputs;
   },`;
   }).join(`
 
-`), l = e.optionQueries.map((u) => `  ${u.name}(inputHandles: SemaphorGeneratedInputHandleMap): SemaphorQueryRuntimeOptions {
+`), l = e.optionQueries.map((c) => `  ${c.name}(inputHandles: SemaphorGeneratedInputHandleMap): SemaphorQueryRuntimeOptions {
     return {
-      inputs: inputsForInputOptionQuery.${u.name}(inputHandles),
+      inputs: inputsForInputOptionQuery.${c.name}(inputHandles),
     };
   },`).join(`
 
-`), 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 = [
+`), y = e.optionQueries.map((c) => `    case ${JSON.stringify(c.raw.id || `${c.input.raw.id}-options`)}:
+      return queryOptionsForInputOptionQuery.${c.name}(inputHandles);`).join(`
+`), w = e.inputs.length > 0, f = e.optionQueries.length > 0, m = f ? "inputOptionQueryId" : "_inputOptionQueryId", N = f ? "inputHandles" : "_inputHandles", u = [
     "SemaphorInputHandle",
     f ? "SemaphorInputReference" : void 0,
     "SemaphorQueryRuntimeOptions"
-  ].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,
+  ].filter(K).join(", "), d = [
+    w || f ? 'import { semaphor } from "react-semaphor/data-app-sdk";' : void 0,
+    `import type { ${u} } from "react-semaphor/data-app-sdk";`,
+    w || f ? 'import { fields } from "./fields";' : void 0,
     f ? 'import { sources } from "./sources";' : void 0,
     'import type { SemaphorGeneratedInputId, SemaphorGeneratedInputOptionQueryId } from "./metadata";'
-  ].filter(G).join(`
+  ].filter(K).join(`
 `);
   return `${H}
-${s}
+${d}
 
 export const filterSpecs = {
 ${n}
@@ -502,7 +502,7 @@ ${o}
 } as const;
 
 export const inputsForInputOptionQuery = {
-${i}
+${a}
 } as const;
 
 export const queryOptionsForInputOptionQuery = {
@@ -511,7 +511,7 @@ ${l}
 
 export function queryOptionsForInputOptionQueryId(
   ${m}: SemaphorGeneratedInputOptionQueryId,
-  ${M}: SemaphorGeneratedInputHandleMap,
+  ${N}: SemaphorGeneratedInputHandleMap,
 ): SemaphorQueryRuntimeOptions {
   switch (${m}) {
 ${y}
@@ -530,77 +530,77 @@ function Qe(e, n) {
     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 n;
   return e.raw.dependencies || ((n = e.raw.spec) == null ? void 0 : n.dependencies);
 }
 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,
+  const n = e.views.map((d) => {
+    var p, S, g, $, F, R;
+    const c = B(d.raw.sdkSpec.builder), i = Pe(d);
+    if (W(d) && He(d)) {
+      const b = (p = d.raw.visualSpec) == null ? void 0 : p.tableBehavior, M = V(i.pagination), s = A(d), I = E(d), T = ((S = b == null ? void 0 : b.pagination) == null ? void 0 : S.pageSize) || z(M == null ? void 0 : M.pageSize) || z(i.limit) || 100, ee = I ? Y(d, e) : [], J = I ? De({
+        view: d,
         contract: e,
         sortFields: ee,
-        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},
+        defaultField: (g = b == null ? void 0 : b.sorting) == null ? void 0 : g.defaultField
+      }) : void 0, ne = I ? ($ = b == null ? void 0 : b.sorting) == null ? void 0 : $.defaultDirection : void 0, re = Ue({
+        viewName: d.name,
+        supportsPagination: s,
+        supportsSort: I
+      }), te = I ? `    const orderBy = resolveRecordsOrderBy(
+      recordsSortFieldsForView.${d.name},
       params.sort,
-      ${C(L, e)},
-      ${C(ne, e)},
+      ${O(J, e)},
+      ${O(ne, e)},
     );
-` : "", oe = w ? `      ...(orderBy ? { orderBy } : {}),
-` : "", se = a ? `      pagination: resolveServerTablePagination(params, ${JSON.stringify(T)}),
+` : "", oe = I ? `      ...(orderBy ? { orderBy } : {}),
+` : "", se = s ? `      pagination: resolveServerTablePagination(params, ${JSON.stringify(T)}),
 ` : "";
-      return `  ${s.name}(
+      return `  ${d.name}(
     params: ${re} = {},
   ) {
-${te}    return semaphor.${u}({
-      ...${C(c, e)},
+${te}    return semaphor.${c}({
+      ...${O(i, e)},
 ${oe}${se}    });
   },`;
     }
-    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}(
+    if (ue(d) && A(d)) {
+      const b = (F = d.raw.visualSpec) == null ? void 0 : F.tableBehavior, M = V(i.pagination), s = ((R = b == null ? void 0 : b.pagination) == null ? void 0 : R.pageSize) || z(M == null ? void 0 : M.pageSize) || z(i.limit) || 100;
+      return `  ${d.name}(
     params: SemaphorGeneratedServerPaginationParams = {},
   ) {
-    return semaphor.${u}({
-      ...${C(c, e)},
-      pagination: resolveServerTablePagination(params, ${JSON.stringify(a)}),
+    return semaphor.${c}({
+      ...${O(i, e)},
+      pagination: resolveServerTablePagination(params, ${JSON.stringify(s)}),
     });
   },`;
     }
-    return `  ${s.name}: () => semaphor.${u}(${C(c, e)}),`;
+    return `  ${d.name}: () => semaphor.${c}(${O(i, e)}),`;
   }).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(`
+`), r = e.views.filter((d) => E(d)).map((d) => {
+    const i = Y(d, e).map((p) => `    ${JSON.stringify(p.key)}: fields.${p.fieldName},`).join(`
 `);
-    return `  ${s.name}: {
-${c}
+    return `  ${d.name}: {
+${i}
   },`;
   }).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(`
+`), t = e.views.filter((d) => E(d)).map((d) => {
+    const i = Y(d, e).map((p) => `    { key: ${JSON.stringify(p.key)}, label: ${JSON.stringify(p.label)}, field: fields.${p.fieldName} },`).join(`
 `);
-    return `  ${s.name}: [
-${c}
+    return `  ${d.name}: [
+${i}
   ],`;
   }).join(`
-`), o = e.views.some((s) => E(s)), i = e.views.some((s) => A(s)), l = [n, r, t].join(`
+`), o = e.views.some((d) => E(d)), a = e.views.some((d) => A(d)), l = [n, r, t].join(`
 `), y = [
     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(G).join(`
+  ].filter(K).join(`
 `);
   return `${H}
 ${y}
@@ -614,11 +614,11 @@ 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>;
 ` : ""}
@@ -655,7 +655,7 @@ ${o ? `function resolveRecordsOrderBy<TSortKey extends string>(
   };
 }
 ` : ""}
-${i ? `function resolveServerTablePagination(
+${a ? `function resolveServerTablePagination(
   params: SemaphorGeneratedServerPaginationParams,
   defaultPageSize: number,
 ) {
@@ -668,31 +668,31 @@ ${i ? `function resolveServerTablePagination(
 `;
 }
 function Pe(e) {
-  var i, l;
-  const n = $((i = e.raw.sdkSpec) == null ? void 0 : i.spec) || {}, { kind: r, id: t, ...o } = n;
+  var a, l;
+  const n = V((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
   };
 }
-function z(e, n) {
-  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);
+function Y(e, n) {
+  var a, l;
+  const r = [], t = V((a = e.raw.sdkSpec) == null ? void 0 : a.spec) || {};
+  for (const y of j(t.fields)) h(r, y);
+  h(r, t.dateField), h(r, (l = V(t.orderBy)) == null ? void 0 : l.field);
+  for (const y of e.raw.fields || []) h(r, y);
   return X(
     r.map((y) => {
-      const h = R(y, n);
-      if (!(!y.name || !h))
+      const w = x(y, n);
+      if (!(!y.name || !w))
         return {
-          key: h,
-          fieldName: h,
+          key: w,
+          fieldName: w,
           rawName: y.name,
           label: y.label || y.name
         };
-    }).filter(G),
+    }).filter(K),
     (y) => y.key
   );
 }
@@ -702,14 +702,14 @@ function De({
   sortFields: r,
   defaultField: t
 }) {
-  var h, f;
+  var w, 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);
+  const a = r.filter((m) => m.rawName === t);
+  if (a.length === 1)
+    return a[0].key;
+  const l = V((w = e.raw.sdkSpec) == null ? void 0 : w.spec), y = x((f = V(l == null ? void 0 : l.orderBy)) == null ? void 0 : f.field, n);
   return y && o.has(y) ? y : void 0;
 }
 function Ue({
@@ -721,32 +721,32 @@ function Ue({
 }
 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)
+    const u = Je(e, m.raw.id).map((d) => {
+      const c = d.inputId, i = x(d.fieldRef, e);
+      if (!c || !i)
         return "";
-      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 p = [`field: fields.${i}`];
+      if (d.relationshipHint)
+        p.push(`relationshipHint: ${k(d.relationshipHint)}`);
+      else if (Array.isArray(d.relationshipsUsed) && d.relationshipsUsed.length > 0) {
+        const g = d.relationshipsUsed.map(($) => {
+          var F;
+          return (F = V($)) == null ? void 0 : F.id;
+        }).filter(($) => typeof $ == "string" && $.length > 0);
+        g.length > 0 && p.push(`relationshipHint: ${k({ relationshipIds: g })}`);
       }
-      const S = `inputHandles[${JSON.stringify(u)}]`;
+      const S = `inputHandles[${JSON.stringify(c)}]`;
       return `    if (${S}) {
       inputs.push(semaphor.bindInput(${S}, { ${p.join(", ")} }));
     }`;
     }).filter(Boolean).join(`
 `);
-    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[] {
+    return { view: m, renderedBindings: u };
+  }), r = n.some((m) => m.renderedBindings.length > 0), t = n.map(({ view: m, renderedBindings: N }) => {
+    const u = N ? "inputHandles" : "_inputHandles";
+    return `  ${m.name}(${u}: SemaphorGeneratedInputHandleMap): SemaphorInputReference[] {
     const inputs: SemaphorInputReference[] = [];
-${M}
+${N}
     return inputs;
   },`;
   }).join(`
@@ -758,18 +758,18 @@ ${M}
     };
   },`).join(`
 
-`), i = e.views.map((m) => `    case ${JSON.stringify(m.raw.id)}:
+`), a = e.views.map((m) => `    case ${JSON.stringify(m.raw.id)}:
       return inputsForView.${m.name}(inputHandles);`).join(`
 `), l = e.views.map((m) => `    case ${JSON.stringify(m.raw.id)}:
       return queryOptionsForView.${m.name}(inputHandles);`).join(`
-`), y = e.views.length > 0, h = y ? "inputHandles" : "_inputHandles", f = [
+`), y = e.views.length > 0, w = 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";',
     y ? 'import { queryDebugForView } from "./metadata";' : void 0,
     'import type { SemaphorGeneratedQueryViewId } from "./metadata";'
-  ].filter(G).join(`
+  ].filter(K).join(`
 `);
   return `${H}
 ${f}
@@ -784,17 +784,17 @@ ${o}
 
 export function inputsForViewId(
   viewId: SemaphorGeneratedQueryViewId,
-  ${h}: SemaphorGeneratedInputHandleMap,
+  ${w}: SemaphorGeneratedInputHandleMap,
 ): SemaphorInputReference[] {
   switch (viewId) {
-${i}
+${a}
   }
   throw new Error(\`Unknown generated Semaphor view id: \${viewId}\`);
 }
 
 export function queryOptionsForViewId(
   viewId: SemaphorGeneratedQueryViewId,
-  ${h}: SemaphorGeneratedInputHandleMap,
+  ${w}: SemaphorGeneratedInputHandleMap,
 ): SemaphorQueryRuntimeOptions {
   switch (viewId) {
 ${l}
@@ -814,130 +814,161 @@ function Je(e, n) {
   );
 }
 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},` : "";
+  const n = e.views.map((i) => {
+    const S = D(i, e).map((g) => {
+      const $ = x(g.raw, e);
+      return $ ? `    ${g.name}: fields.${$},` : "";
     }).filter(Boolean).join(`
 `);
-    return `  ${s.name}: {
-${c}
+    return `  ${i.name}: {
+${S}
   },`;
   }).join(`
-`), r = e.views.map((s) => {
-    const c = P(s, e).map((p) => {
-      const S = R(p.raw, e);
-      return S ? `    ${p.name}: fields.${S},` : "";
+`), r = e.views.map((i) => {
+    const S = P(i, e).map((g) => {
+      const $ = x(g.raw, e);
+      return $ ? `    ${g.name}: fields.${$},` : "";
     }).filter(Boolean).join(`
 `);
-    return `  ${s.name}: {
-${c}
+    return `  ${i.name}: {
+${S}
   },`;
   }).join(`
-`), t = e.views.map((s) => {
-    const u = P(s, e), c = rn(u), p = nn(u), S = u.map((I) => {
-      const F = Array.from(
+`), t = e.views.map((i) => {
+    const p = P(i, e), S = rn(p), g = nn(p), $ = p.map((F) => {
+      const R = Array.from(
         new Set(
-          he(I.raw).filter((b) => p.has(b))
+          he(F.raw).filter((b) => g.has(b))
         )
       );
-      return `    ${I.name}: metricKeysForField(metricFieldsForView.${s.name}.${I.name}, { allowNameFallback: ${c.has(I.raw.name) ? "false" : "true"}, excludedKeys: ${k(F)} }),`;
+      return `    ${F.name}: metricKeysForField(metricFieldsForView.${i.name}.${F.name}, { allowNameFallback: ${S.has(F.raw.name) ? "false" : "true"}, excludedKeys: ${k(R)} }),`;
     }).join(`
 `);
-    return `  ${s.name}: {
-${S}
+    return `  ${i.name}: {
+${$}
   },`;
   }).join(`
-`), o = e.views.map((s) => {
-    const c = P(s, e).map((p, S) => `    ${p.name}: ${JSON.stringify(Xe(s, p, S))},`).join(`
+`), o = e.views.map((i) => {
+    const S = P(i, e).map((g, $) => `    ${g.name}: ${JSON.stringify(Xe(i, g, $))},`).join(`
 `);
-    return `  ${s.name}: {
-${c}
+    return `  ${i.name}: {
+${S}
   },`;
   }).join(`
-`), i = e.views.map((s) => {
-    const u = P(s, e);
-    if (u.length === 0)
-      return `  ${s.name}(): Record<keyof typeof metricFieldsForView.${s.name}, unknown> {
+`), a = e.views.map((i) => {
+    const p = P(i, e);
+    if (p.length === 0)
+      return `  ${i.name}(): Record<keyof typeof metricFieldsForView.${i.name}, unknown> {
     return {};
   },`;
-    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},`;
+    const S = en(i, p), g = p.map(($) => {
+      const F = `metricMeasureKeysForView.${i.name}.${$.name}`, R = `metricMeasureBindingKeysForView.${i.name}.${$.name}`, b = S.has($.name) ? `readMetricValueByBindingWithFallback(measures, measureBindings, ${R}, ${F}, primaryValue)` : `readMetricValueByBinding(measures, measureBindings, ${R}, ${F})`;
+      return `      ${$.name}: ${b},`;
     }).join(`
 `);
-    return `  ${s.name}(result: SemaphorGeneratedMetricResult): Record<keyof typeof metricFieldsForView.${s.name}, unknown> {
+    return `  ${i.name}(result: SemaphorGeneratedMetricResult): Record<keyof typeof metricFieldsForView.${i.name}, unknown> {
     const measures = result?.measures;
     const measureBindings = result?.measureBindings;
-    const scalarValue = result?.value;
+    const primaryValue = result?.primaryValue;
     return {
-${p}
+${g}
     };
   },`;
   }).join(`
 
-`), l = e.views.map((s) => {
-    const u = P(s, e);
-    if (u.length === 0)
-      return `  ${s.name}(): Array<keyof typeof metricFieldsForView.${s.name}> {
+`), l = e.views.map((i) => {
+    const p = P(i, e);
+    if (p.length === 0)
+      return `  ${i.name}(): Array<keyof typeof metricFieldsForView.${i.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(`
+    const S = p.map((g) => `    ...(missing.has(metricMeasureBindingKeysForView.${i.name}.${g.name}) ? [${JSON.stringify(g.name)} as keyof typeof metricFieldsForView.${i.name}] : []),`).join(`
 `);
-    return `  ${s.name}(result: SemaphorGeneratedMetricResult): Array<keyof typeof metricFieldsForView.${s.name}> {
+    return `  ${i.name}(result: SemaphorGeneratedMetricResult): Array<keyof typeof metricFieldsForView.${i.name}> {
     const missing = new Set(result?.missingMeasures || []);
     return [
-${c}
+${S}
     ];
   },`;
   }).join(`
 
-`), y = e.views.map((s) => {
-    const u = Ye(s, e);
-    return `  ${s.name}: ${k(u)},`;
+`), y = e.views.map((i) => {
+    const p = Ye(i, e);
+    return `  ${i.name}: ${k(p)},`;
   }).join(`
-`), h = e.views.map((s) => {
-    const c = Y(s, e).map((p) => `      ${p.name}: resolveColumnKey(columns, fieldsForView.${s.name}.${p.name}),`).join(`
+`), w = e.views.map((i) => {
+    const S = D(i, e).map((g) => `      ${g.name}: resolveColumnKey(columns, fieldsForView.${i.name}.${g.name}),`).join(`
 `);
-    return `  ${s.name}(columns: SemaphorGeneratedColumns): Record<keyof typeof fieldsForView.${s.name}, string | undefined> {
+    return `  ${i.name}(columns: SemaphorGeneratedColumns): Record<keyof typeof fieldsForView.${i.name}, string | undefined> {
     return {
-${c}
+${S}
     };
   },`;
   }).join(`
 
-`), f = e.views.map((s) => {
-    const c = Y(s, e).map((p) => `      ${p.name}: readCell(row, columns, fieldsForView.${s.name}.${p.name}),`).join(`
+`), f = e.views.map((i) => {
+    const S = D(i, e).map((g) => `      ${g.name}: readCell(row, columns, fieldsForView.${i.name}.${g.name}),`).join(`
 `);
-    return `  ${s.name}(row: SemaphorGeneratedRow, columns: SemaphorGeneratedColumns): Record<keyof typeof fieldsForView.${s.name}, unknown> {
+    return `  ${i.name}(row: SemaphorGeneratedRow, columns: SemaphorGeneratedColumns): Record<keyof typeof fieldsForView.${i.name}, unknown> {
     return {
-${c}
+${S}
+    };
+  },`;
+  }).join(`
+
+`), m = e.views.map((i) => `  ${i.name}(result: SemaphorGeneratedRecordsResult): Array<Record<keyof typeof fieldsForView.${i.name}, unknown>> {
+    return (result?.records || []).map((row) => rowValuesForView.${i.name}(row, result?.columns));
+  },`).join(`
+
+`), N = e.views.map((i) => {
+    const p = D(i, e), S = p.filter((s) => s.raw.role === "dimension"), g = p.filter((s) => s.raw.role === "measure"), $ = S[0], F = S[1], R = g[0], b = g[1], M = [
+      $ ? `      primaryDimension: values.${$.name},` : "      primaryDimension: undefined,",
+      F ? `      secondaryDimension: values.${F.name},` : "      secondaryDimension: undefined,",
+      R ? `      primaryMeasure: values.${R.name},` : "      primaryMeasure: undefined,",
+      b ? `      secondaryMeasure: values.${b.name},` : "      secondaryMeasure: undefined,"
+    ].join(`
+`);
+    return `  ${i.name}(row: SemaphorGeneratedRow, columns: SemaphorGeneratedColumns): SemaphorGeneratedRoleValues {
+    const values = rowValuesForView.${i.name}(row, columns);
+    return {
+${M}
     };
   },`;
   }).join(`
 
-`), m = n.includes("fields.") || r.includes("fields."), d = [
+`), u = n.includes("fields.") || r.includes("fields."), c = [
     `import { ${[
       "type SemaphorFieldRef",
       "type SemaphorResultColumn",
       "semaphorMetricMeasureBindingKey"
-    ].filter(G).join(", ")} } from "react-semaphor/data-app-sdk";`,
-    m ? 'import { fields } from "./fields";' : void 0
-  ].filter(G).join(`
+    ].filter(K).join(", ")} } from "react-semaphor/data-app-sdk";`,
+    u ? 'import { fields } from "./fields";' : void 0
+  ].filter(K).join(`
 `);
   return `${H}
-${d}
+${c}
 
 export type SemaphorGeneratedRow = Record<string, unknown>;
 export type SemaphorGeneratedColumns = readonly SemaphorResultColumn[] | null | undefined;
+export type SemaphorGeneratedRecordsResult = {
+  readonly records?: readonly SemaphorGeneratedRow[];
+  readonly columns?: SemaphorGeneratedColumns;
+} | null | undefined;
 export type SemaphorGeneratedMetricMeasures = Record<string, unknown> | null | undefined;
 export type SemaphorGeneratedMetricMeasureBindings = Record<string, string> | null | undefined;
 export type SemaphorGeneratedMetricResult = {
   readonly measures?: SemaphorGeneratedMetricMeasures;
   readonly measureBindings?: SemaphorGeneratedMetricMeasureBindings;
   readonly missingMeasures?: readonly string[];
+  readonly primaryValue: unknown;
   readonly value?: unknown;
 } | null | undefined;
+export type SemaphorGeneratedRoleValues = {
+  readonly primaryDimension: unknown;
+  readonly secondaryDimension: unknown;
+  readonly primaryMeasure: unknown;
+  readonly secondaryMeasure: unknown;
+};
 export type SemaphorGeneratedTableColumn = {
   readonly key: string;
   readonly label: string;
@@ -967,15 +998,23 @@ ${y}
 } as const;
 
 export const columnKeysForView = {
-${h}
+${w}
 } as const;
 
 export const rowValuesForView = {
 ${f}
 } as const;
 
+export const rowsForView = {
+${m}
+} as const;
+
+export const roleValuesForView = {
+${N}
+} as const;
+
 export const metricValuesForView = {
-${i}
+${a}
 } as const;
 
 export const missingMetricMeasuresForView = {
@@ -1279,12 +1318,12 @@ function sourcesReferToSameDataset(
 `;
 }
 function Ye(e, n) {
-  const r = Y(e, n), t = new Map(
-    (E(e) ? z(e, n) : []).map((o) => [o.fieldName, o.key])
+  const r = D(e, n), t = new Map(
+    (E(e) ? Y(e, n) : []).map((o) => [o.fieldName, o.key])
   );
   return r.map((o) => {
-    const i = R(o.raw, n), l = i ? t.get(i) : void 0;
-    return O({
+    const a = x(o.raw, n), l = a ? t.get(a) : void 0;
+    return G({
       key: o.name,
       label: o.raw.label || o.raw.name,
       dataType: o.raw.dataType,
@@ -1294,68 +1333,68 @@ function Ye(e, n) {
   });
 }
 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,
+  const n = e.checklist.filterScopeByInput || [], r = e.checklist.requiredDevtools || {}, t = e.summary.views.map((u) => u.id).filter(Boolean), o = e.views.map((u) => u.raw.id).filter(Boolean), a = e.inputs.map((u) => u.raw.id).filter(Boolean), l = e.optionQueries.map((u) => u.raw.id || `${u.input.raw.id}-options`).filter(Boolean), y = Object.fromEntries(o.map((u) => [
+    u,
     e.filterContracts.filter(
-      (s) => Array.isArray(s.appliesToViewIds) && s.appliesToViewIds.includes(d)
-    ).map((s) => s.inputId)
-  ])), h = Object.fromEntries(e.views.map((d) => [
-    d.raw.id,
+      (d) => Array.isArray(d.appliesToViewIds) && d.appliesToViewIds.includes(u)
+    ).map((d) => d.inputId)
+  ])), w = Object.fromEntries(e.views.map((u) => [
+    u.raw.id,
     {
-      title: d.raw.title,
-      visual: d.raw.visual,
-      visualSpec: d.raw.visualSpec,
-      queryKind: d.raw.queryKind,
-      sdkBuilder: d.raw.sdkBuilder
+      title: u.raw.title,
+      visual: u.raw.visual,
+      visualSpec: u.raw.visualSpec,
+      queryKind: u.raw.queryKind,
+      sdkBuilder: u.raw.sdkBuilder
     }
-  ])), f = Object.fromEntries(e.views.map((d) => {
-    var s;
+  ])), f = Object.fromEntries(e.views.map((u) => {
+    var d;
     return [
-      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),
+      u.raw.id,
+      G({
+        viewId: u.raw.id,
+        queryId: u.name,
+        title: u.raw.title,
+        visualType: ((d = u.raw.visualSpec) == null ? void 0 : d.visualType) || u.raw.visual,
+        suggestedComponentName: me(u.raw.title || u.raw.id || u.name),
         marker: {
           attribute: "data-semaphor-view-id",
-          value: d.raw.id
+          value: u.raw.id
         }
       })
     ];
-  })), m = Object.fromEntries(e.inputs.map((d) => {
-    var s;
+  })), m = Object.fromEntries(e.inputs.map((u) => {
+    var d;
     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),
+      u.raw.id,
+      G({
+        inputId: u.raw.id,
+        label: u.raw.label,
+        type: u.raw.type,
+        optionQueryId: ((d = u.raw.optionQuery) == null ? void 0 : d.id) || (u.raw.optionQuery ? `${u.raw.id}-options` : void 0),
+        suggestedComponentName: me(u.raw.label || u.raw.id || u.name),
         marker: {
           attribute: "data-semaphor-input-id",
-          value: d.raw.id
+          value: u.raw.id
         }
       })
     ];
-  })), M = Object.fromEntries(e.views.map((d) => {
-    var s, u, c;
+  })), N = Object.fromEntries(e.views.map((u) => {
+    var d, c, i;
     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
+      u.name,
+      G({
+        viewId: u.raw.id,
+        viewTitle: ((d = u.raw.visualSpec) == null ? void 0 : d.title) || u.raw.title,
+        visualType: (c = u.raw.visualSpec) == null ? void 0 : c.visualType,
+        title: ((i = u.raw.visualSpec) == null ? void 0 : i.title) || u.raw.title
       })
     ];
   }));
   return `${H}
 export const generatedViewIds = ${k(t)} as const;
 export const generatedQueryViewIds = ${k(o)} as const;
-export const generatedInputIds = ${k(i)} as const;
+export const generatedInputIds = ${k(a)} as const;
 export const generatedInputOptionQueryIds = ${k(l)} as const;
 export const generatedViewAuthoring = ${k(f)} as const;
 export const generatedInputAuthoring = ${k(m)} as const;
@@ -1398,7 +1437,7 @@ export function filterContractsForView(viewId: SemaphorGeneratedQueryViewId) {
   );
 }
 
-export const queryDebugForView = ${k(M)} as const;
+export const queryDebugForView = ${k(N)} as const;
 
 export const semaphorGeneratedContractMetadata = ${k({
     schemaVersion: "semaphor-generated-data-app-contract/v1",
@@ -1408,12 +1447,12 @@ export const semaphorGeneratedContractMetadata = ${k({
     filterScopeByInput: n,
     generatedViewIds: t,
     generatedQueryViewIds: o,
-    generatedInputIds: i,
+    generatedInputIds: a,
     generatedInputOptionQueryIds: l,
     generatedInputIdsForView: y,
     generatedViewAuthoring: f,
     generatedInputAuthoring: m,
-    visualSpecs: h,
+    visualSpecs: w,
     presentationViews: e.presentationViews
   })} as const;
 `;
@@ -1435,39 +1474,39 @@ function Q(e, n) {
       for (const r of n) Q(e, r);
       return;
     }
-    x(n) && g(e, D(n));
+    C(n) && h(e, U(n));
     for (const r of Object.values(n))
       Q(e, r);
   }
 }
-function Y(e, n) {
+function D(e, n) {
   const r = [];
   if (tn(r, e.raw.sdkSpec), r.length === 0)
     for (const o of e.raw.fields || [])
-      g(r, o);
+      h(r, o);
   const t = X(
-    r.filter((o) => o.name && R(o, n)).map((o) => ({ raw: o, key: U(o), name: "" })),
+    r.filter((o) => o.name && x(o, n)).map((o) => ({ raw: o, key: L(o), name: "" })),
     (o) => o.key
   );
   return v(
     t,
-    (o) => B(o.raw.label || o.raw.name || "field")
+    (o) => q(o.raw.label || o.raw.name || "field")
   ), t;
 }
 function P(e, n) {
-  if (j(e.raw.sdkSpec.builder) !== "metric")
+  if (B(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 r = V(e.raw.sdkSpec.spec), t = [];
+  h(t, r == null ? void 0 : r.primaryMeasure);
+  for (const a of j(r == null ? void 0 : r.measures))
+    h(t, a);
   const o = X(
-    t.filter((i) => i.name && R(i, n)).map((i) => ({ raw: i, key: U(i), name: "" })),
-    (i) => i.key
+    t.filter((a) => a.name && x(a, n)).map((a) => ({ raw: a, key: L(a), name: "" })),
+    (a) => a.key
   );
   return v(
     o,
-    (i) => B(i.raw.label || i.raw.name || "metric")
+    (a) => q(a.raw.label || a.raw.name || "metric")
   ), o;
 }
 function Xe(e, n, r) {
@@ -1482,10 +1521,10 @@ function Xe(e, n, r) {
 function en(e, n) {
   if (n.length === 1)
     return /* @__PURE__ */ new Set([n[0].name]);
-  const r = $(e.raw.sdkSpec.spec);
-  if (!x(r == null ? void 0 : r.primaryMeasure))
+  const r = V(e.raw.sdkSpec.spec);
+  if (!C(r == null ? void 0 : r.primaryMeasure))
     return /* @__PURE__ */ new Set();
-  const t = U(D(r.primaryMeasure)), o = n.find((i) => i.key === t);
+  const t = L(U(r.primaryMeasure)), o = n.find((a) => a.key === t);
   return o ? /* @__PURE__ */ new Set([o.name]) : /* @__PURE__ */ new Set();
 }
 function nn(e) {
@@ -1516,56 +1555,56 @@ function rn(e) {
   );
 }
 function tn(e, n) {
-  const r = $(n.spec);
+  const r = V(n.spec);
   if (!r)
     return;
-  const t = j(n.builder);
+  const t = B(n.builder);
   if (t === "records") {
-    for (const o of q(r.fields)) g(e, o);
+    for (const o of j(r.fields)) h(e, o);
     return;
   }
   if (t === "sql") {
-    for (const o of q(r.fields)) g(e, o);
+    for (const o of j(r.fields)) h(e, o);
     return;
   }
   if (t === "analysis" || t === "metric") {
-    g(e, r.primaryMeasure);
-    for (const o of q(r.measures)) g(e, o);
-    for (const o of q(r.dimensions)) g(e, o);
-    g(e, r.dateField);
+    h(e, r.primaryMeasure);
+    for (const o of j(r.measures)) h(e, o);
+    for (const o of j(r.dimensions)) h(e, o);
+    h(e, r.dateField);
     return;
   }
   if (t === "matrix") {
-    const o = pe(r.rows), i = pe(r.columns), l = q(r.values);
+    const o = pe(r.rows), a = pe(r.columns), l = j(r.values);
     for (const y of o) le(e, y);
-    for (const y of i) le(e, y);
+    for (const y of a) 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);
+      const w = V(y);
+      h(e, w == null ? void 0 : w.field), h(e, w == null ? void 0 : w.measure);
     }
   }
 }
 function pe(e) {
   if (Array.isArray(e))
     return e;
-  const n = $(e);
+  const n = V(e);
   return Array.isArray(n == null ? void 0 : n.levels) ? n.levels : [];
 }
 function le(e, n) {
   var r;
-  if (x(n)) {
-    g(e, n);
+  if (C(n)) {
+    h(e, n);
     return;
   }
-  g(e, (r = $(n)) == null ? void 0 : r.field);
+  h(e, (r = V(n)) == null ? void 0 : r.field);
 }
 function ce(e) {
   var n, r, t, o;
   return ((n = e == null ? void 0 : e.computation) == null ? void 0 : n.kind) === "presentation_only" || ((r = e == null ? void 0 : e.computation) == null ? void 0 : r.kind) === "derived" || ((t = e == null ? void 0 : e.computation) == null ? void 0 : t.kind) === "unsupported" || (e == null ? void 0 : e.visual) === "text_block" || ((o = e == null ? void 0 : e.visualSpec) == null ? void 0 : o.visualType) === "text_block";
 }
 function on(e) {
-  const n = $(e) || {};
-  return O({
+  const n = V(e) || {};
+  return G({
     id: e.id,
     title: e.title,
     purpose: e.purpose,
@@ -1579,10 +1618,10 @@ function on(e) {
     description: n.description
   });
 }
-function g(e, n) {
-  x(n) && e.push(D(n));
+function h(e, n) {
+  C(n) && e.push(U(n));
 }
-function D(e) {
+function U(e) {
   return {
     name: e.name,
     label: e.label,
@@ -1608,38 +1647,38 @@ function sn(e) {
       name: ""
     };
 }
-function x(e) {
-  const n = $(e);
+function C(e) {
+  const n = V(e);
   return !!(n && typeof n.name == "string" && (typeof n.role == "string" || typeof n.dataType == "string" || typeof n.aggregate == "string" || n.source || n.sourceKey));
 }
 function we(e) {
-  const n = $(e);
+  const n = V(e);
   return !!(n && (typeof n.sourceKey == "string" || n.kind === "semantic" || typeof n.datasetName == "string" && typeof n.domainId == "string"));
 }
-function C(e, n) {
+function O(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) => C(o, n)).join(", ")}]`;
-  if (x(e)) {
-    const o = R(D(e), n);
+    return `[${e.map((o) => O(o, n)).join(", ")}]`;
+  if (C(e)) {
+    const o = x(U(e), n);
     if (o) return `fields.${o}`;
   }
   if (we(e)) {
     const o = Se(e, n);
     if (o) return `sources.${o}`;
   }
-  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);
+  const r = V(e);
+  return r ? `{ ${Object.entries(r).filter(([, o]) => o !== void 0).map(([o, a]) => `${JSON.stringify(o)}: ${O(a, n)}`).join(", ")} }` : JSON.stringify(e);
 }
 function k(e) {
   return JSON.stringify(e, null, 2);
 }
-function R(e, n) {
-  if (x(e))
-    return n.fieldNameByKey.get(U(D(e)));
+function x(e, n) {
+  if (C(e))
+    return n.fieldNameByKey.get(L(U(e)));
 }
 function Se(e, n) {
   if (we(e))
@@ -1649,7 +1688,7 @@ function Se(e, n) {
         return t;
     }
 }
-function U(e) {
+function L(e) {
   return [
     e.sourceKey || "",
     e.name || "",
@@ -1658,19 +1697,19 @@ function U(e) {
   ].join("|");
 }
 function an(e, n) {
-  return !x(e) || !x(n) || e.name !== n.name ? !1 : ie(e).some(
+  return !C(e) || !C(n) || e.name !== n.name ? !1 : ie(e).some(
     (r) => ie(n).includes(r)
   );
 }
 function un(e) {
-  return x(e) && e.role === "id";
+  return C(e) && e.role === "id";
 }
 function dn(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) => r.get(l)).find(G);
-    if (i) {
-      i.aliases = _([...i.aliases, ...o]);
+    const o = _(t.aliases.length ? t.aliases : [t.key]), a = o.map((l) => r.get(l)).find(K);
+    if (a) {
+      a.aliases = _([...a.aliases, ...o]);
       continue;
     }
     t.aliases = o, n.push(t);
@@ -1697,7 +1736,7 @@ function $e(e) {
   return Z(e)[0] || de(e);
 }
 function Z(e) {
-  const n = $(e);
+  const n = V(e);
   if (!n)
     return [];
   const r = [];
@@ -1711,78 +1750,78 @@ function Ie(e) {
   return Z(e);
 }
 function de(e) {
-  const n = $(e);
+  const n = V(e);
   return n ? typeof n.sourceKey == "string" ? n.sourceKey : JSON.stringify(n) : "";
 }
 function ln(e) {
-  return x(e) && ie(e)[0] || "";
+  return C(e) && ie(e)[0] || "";
 }
 function ie(e) {
-  return x(e) ? _([
+  return C(e) ? _([
     ...typeof e.sourceKey == "string" ? [e.sourceKey] : [],
     ...e.source ? Z(e.source) : []
   ]) : [];
 }
-function j(e) {
+function B(e) {
   const n = String(e || "").replace(/^semaphor\./, "");
   if (!["metric", "records", "analysis", "matrix", "sql"].includes(n))
     throw new Error(`Unsupported sdkSpec builder: ${e}`);
   return n;
 }
 function cn(e) {
-  const n = j(e);
+  const n = B(e);
   return n === "records" || n === "sql";
 }
 function mn(e) {
-  const n = $(e);
+  const n = V(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 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}`;
+    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, n) {
   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));
+    const a = n(o);
+    !a || r.has(a) || (r.add(a), t.push(o));
   }
   return t;
 }
-function B(e) {
+function q(e) {
   const n = String(e || "").replace(/[^A-Za-z0-9]+/g, " ").trim().split(/\s+/).filter(Boolean);
   if (n.length === 0)
     return "item";
   const [r, ...t] = n, o = [
     r.toLowerCase(),
-    ...t.map((i) => i.charAt(0).toUpperCase() + i.slice(1).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 n = B(e);
+  const n = q(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 O(e) {
+function G(e) {
   return Object.fromEntries(Object.entries(e).filter(([, n]) => n !== void 0));
 }
-function $(e) {
+function V(e) {
   return e && typeof e == "object" && !Array.isArray(e) ? e : void 0;
 }
-function q(e) {
+function j(e) {
   return Array.isArray(e) ? e : [];
 }
-function J(e) {
+function z(e) {
   return typeof e == "number" && Number.isFinite(e) ? e : void 0;
 }
-function G(e) {
+function K(e) {
   return e !== void 0;
 }
 export {
@@ -1792,11 +1831,11 @@ export {
   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,
+  xn 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,
+  Nn as buildSemaphorGeneratedActiveInput,
   Cn as buildSemaphorGeneratedInputOptionIntent,
   On as buildSemaphorGeneratedViewExecutionRequest,
   Gn as buildSemaphorGeneratedViewExecutionRequests,