react-semaphor 0.1.369 → 0.1.371

package/dist/chunks/{validation-nOPr0mTk.js → validation-CQFpcSSP.js}

@@ -1,38 +1,40 @@
-import { n as T, v as x } from "./validators-CVuWOHYv.js";
-import { b as S, c as H, a as b } from "./source-identity-Dj3dryN9.js";
-function w(e) {
-  var t;
-  const r = B(e);
+import { n as z, c as D } from "./validators-CuKnUZFO.js";
+import { n as O } from "./catalog-field-grounding-DoEBOXQd.js";
+import { b as M, c as j, a as q } from "./source-identity-Dj3dryN9.js";
+function x(e) {
+  var t, i;
+  const r = Q(e);
   return {
     version: 1,
     kind: "metric",
     id: e.id,
     label: e.label,
-    source: h(e),
+    source: p(e),
     metrics: r,
-    primaryMetric: z(e, r),
+    primaryMetric: K(e, r),
     dateField: e.dateField ? a(e.dateField, "date") : void 0,
     timeGrain: e.timeGrain,
     dimensions: (t = e.dimensions) == null ? void 0 : t.map((o) => a(o, "dimension")),
-    comparison: X(e.comparison),
+    comparison: se(e.comparison),
     orderBy: e.orderBy ? {
       field: a(e.orderBy.field),
       direction: e.orderBy.direction
     } : void 0,
-    inputs: m(e.inputs),
-    limit: e.limit
+    inputs: y(e.inputs),
+    limit: e.limit,
+    ...(i = e.derivedFields) != null && i.length ? { derivedFields: e.derivedFields } : {}
   };
 }
-function F(e) {
+function E(e) {
   var t;
   return {
-    ...w(e),
+    ...x(e),
     ...e.timeWindow ? { timeWindow: e.timeWindow } : {},
     ...(t = e.filters) != null && t.length ? { filters: e.filters } : {},
     ...e.analysis ? { analysis: e.analysis } : {}
   };
 }
-function ge(e) {
+function Re(e) {
   return {
     ...e.chartTitle ? { chartTitle: e.chartTitle } : {},
     ...e.chartType ? { chartType: e.chartType } : {},
@@ -41,76 +43,76 @@ function ge(e) {
     ...e.calendarContext ? { calendarContext: e.calendarContext } : {}
   };
 }
-function z(e, r) {
+function K(e, r) {
   if (!e.primaryMetric)
     return r[0] || { name: "", role: "measure" };
-  const t = a(e.primaryMetric, "measure"), o = K(t, r), i = o.length === 1 ? o[0] : void 0;
-  return i ? A(t, i) : t;
+  const t = a(e.primaryMetric, "measure"), i = L(t, r), o = i.length === 1 ? i[0] : void 0;
+  return o ? F(t, o) : t;
 }
-function B(e) {
+function Q(e) {
   const r = [];
   for (const t of e.metrics.map(
-    (o) => a(o, "measure")
+    (i) => a(i, "measure")
   )) {
     if (!t.name)
       continue;
-    const o = r.findIndex(
-      (i) => O(i, t)
+    const i = r.findIndex(
+      (o) => N(o, t)
     );
-    if (o === -1) {
+    if (i === -1) {
       r.push(t);
       continue;
     }
-    r[o] = A(
-      r[o],
+    r[i] = F(
+      r[i],
       t
     );
   }
   return r;
 }
-function O(e, r) {
-  return S(e, r) && f(e) === f(r);
+function N(e, r) {
+  return M(e, r) && h(e) === h(r);
 }
-function D(e, r) {
-  return f(r) === f(e);
+function V(e, r) {
+  return h(r) === h(e);
 }
-function j(e, r) {
-  return r.name !== e.name || e.source && !S(r, e) ? !1 : D(e, r);
+function W(e, r) {
+  return r.name !== e.name || e.source && !M(r, e) ? !1 : V(e, r);
 }
-function K(e, r) {
+function L(e, r) {
   const t = r.filter(
-    (o) => j(e, o)
+    (i) => W(e, i)
   );
   return e.aggregate !== void 0, t;
 }
-function f(e) {
+function h(e) {
   return (e.aggregate || "SUM").toUpperCase();
 }
-function A(e, r) {
+function F(e, r) {
   if (e.aggregate && r.aggregate && e.aggregate !== r.aggregate)
     throw new Error(
       `Metric "${e.name}" was requested with conflicting aggregate semantics: ${e.aggregate} and ${r.aggregate}.`
     );
   return {
-    ...H(e, r),
+    ...j(e, r),
     aggregate: e.aggregate || r.aggregate
   };
 }
-function Q(e) {
-  var t;
+function U(e) {
+  var t, i;
   if ("sort" in e)
     throw new Error(
       "semaphor.records supports orderBy for a single deterministic sort. Multiple sort clauses are not supported by the analytics protocol yet."
     );
-  if (!J(e))
+  if (!ae(e))
     throw new Error("semaphor.records needs at least one field.");
-  const r = E(e.fields);
+  const r = G(e.fields);
   return {
     version: 1,
     kind: "records",
     id: e.id,
     label: e.label,
-    source: h(e),
+    source: p(e),
     fields: r,
     dateField: e.dateField ? a(e.dateField, "date") : void 0,
     timeGrain: e.timeGrain,
@@ -120,12 +122,13 @@ function Q(e) {
       field: a(e.orderBy.field),
       direction: e.orderBy.direction
     } : void 0,
-    inputs: m(e.inputs),
+    inputs: y(e.inputs),
     limit: e.limit,
-    ...e.pagination ? { pagination: e.pagination } : {}
+    ...e.pagination ? { pagination: e.pagination } : {},
+    ...(i = e.derivedFields) != null && i.length ? { derivedFields: e.derivedFields } : {}
   };
 }
-function E(e) {
+function G(e) {
   return e.map((r) => {
     const t = a(r);
     if (!t.role)
@@ -135,19 +138,21 @@ function E(e) {
     return t;
   });
 }
-function N(e) {
+function J(e) {
+  var r;
   return {
     version: 1,
     kind: "inputOptions",
     id: e.id,
     label: e.label,
-    source: h(e),
+    source: p(e),
     field: a(e.field, "dimension"),
     search: e.search,
-    limit: e.limit
+    limit: e.limit,
+    ...(r = e.derivedFields) != null && r.length ? { derivedFields: e.derivedFields } : {}
   };
 }
-function W(e) {
+function X(e) {
   var r;
   return {
     version: 1,
@@ -159,13 +164,60 @@ function W(e) {
     ...e.defaultParameters ? { defaultParameters: e.defaultParameters } : {},
     ...e.pythonCode ? { pythonCode: e.pythonCode } : {},
     ...(r = e.fields) != null && r.length ? { fields: e.fields.map((t) => a(t)) } : {},
-    inputs: m(e.inputs),
+    inputs: y(e.inputs),
     limit: e.limit,
     ...e.pagination ? { pagination: e.pagination } : {},
     rationale: e.rationale
   };
 }
-function U(e) {
+function Y(e) {
+  var r, t;
+  return {
+    version: 1,
+    kind: "matrix",
+    id: e.id,
+    label: e.label,
+    source: p(e),
+    rows: e.rows.map((i) => k(i, "dimension")),
+    ...e.columns ? {
+      columns: e.columns.map(
+        (i) => k(i, "dimension")
+      )
+    } : {},
+    values: e.values.map(Z),
+    ...(r = e.filters) != null && r.length ? { filters: e.filters } : {},
+    inputs: y(e.inputs),
+    ...e.totals ? { totals: e.totals } : {},
+    ...(t = e.sort) != null && t.length ? { sort: e.sort } : {},
+    ...e.expansion ? { expansion: e.expansion } : {},
+    ...e.layout ? { layout: e.layout } : {},
+    ...e.displayLimits ? { displayLimits: e.displayLimits } : {}
+  };
+}
+function k(e, r) {
+  return ee(e) ? {
+    ...e,
+    field: a(e.field, r)
+  } : {
+    field: a(e, r)
+  };
+}
+function Z(e) {
+  return re(e) ? {
+    ...e,
+    field: a(e.field, "measure")
+  } : {
+    field: a(e, "measure"),
+    aggregate: e.aggregate
+  };
+}
+function ee(e) {
+  return "field" in e;
+}
+function re(e) {
+  return "field" in e;
+}
+function te(e) {
   if ("toAnalyticsInput" in e) {
     const n = e.toAnalyticsInput();
     return {
@@ -177,7 +229,7 @@ function U(e) {
     };
   }
   if ("id" in e) {
-    const n = M(e);
+    const n = C(e);
     return {
       inputId: n.inputId,
       kind: n.kind,
@@ -186,31 +238,31 @@ function U(e) {
       ...n.field ? { field: n.field } : {}
     };
   }
-  const r = "kind" in e ? e.kind : void 0, t = "operator" in e ? _(e.operator, e.inputId) : void 0, o = "controlRole" in e ? e.controlRole : "role" in e ? e.role : void 0, i = V(o) ? o : void 0;
+  const r = "kind" in e ? e.kind : void 0, t = "operator" in e ? R(e.operator, e.inputId) : void 0, i = "controlRole" in e ? e.controlRole : "role" in e ? e.role : void 0, o = ie(i) ? i : void 0;
   return {
     inputId: e.inputId,
     ...r ? { kind: r } : {},
-    ...i ? { controlRole: i } : {},
+    ...o ? { controlRole: o } : {},
     ...t ? { operator: t } : {},
     ...e.field ? { field: e.field } : {}
   };
 }
-function V(e) {
+function ie(e) {
   return e === "grain" || e === "metric" || e === "dimension" || e === "aggregation" || e === "sqlParam";
 }
-function ve(e) {
-  const r = m(e);
+function He(e) {
+  const r = y(e);
   return r.length > 0 ? r : void 0;
 }
-function G(e) {
-  return (e || []).map(L);
+function oe(e) {
+  return (e || []).map(ne);
 }
-function qe(e) {
-  return G(e).filter((r) => r.isActive);
+function Te(e) {
+  return oe(e).filter((r) => r.isActive);
 }
-function M(e) {
+function C(e) {
   if (e.kind === "filter") {
-    const r = _(e.operator, e.id);
+    const r = R(e.operator, e.id);
     return {
       inputId: e.id,
       kind: e.kind,
@@ -226,7 +278,7 @@ function M(e) {
     controlRole: e.role
   };
 }
-function Ie(e = []) {
+function Pe(e = []) {
   return e.map(
     (r) => typeof r == "object" ? r : {
       label: String(r),
@@ -234,16 +286,16 @@ function Ie(e = []) {
     }
   );
 }
-function g(e) {
+function S(e) {
   return e == null ? !1 : Array.isArray(e) ? e.length > 0 : typeof e == "string" ? e.trim().length > 0 : !0;
 }
-function L(e) {
+function ne(e) {
   if ("toAnalyticsInput" in e)
     return e.toAnalyticsInput();
   if ("kind" in e && "isActive" in e)
     return e;
   if ("id" in e) {
-    const r = M(e), t = Object.prototype.hasOwnProperty.call(e, "value") ? e.value : e.defaultValue;
+    const r = C(e), t = Object.prototype.hasOwnProperty.call(e, "value") ? e.value : e.defaultValue;
     return {
       inputId: r.inputId,
       kind: r.kind,
@@ -252,22 +304,22 @@ function L(e) {
       ...r.operator ? { operator: r.operator } : {},
       ...r.controlRole ? { controlRole: r.controlRole } : {},
       value: t,
-      isActive: g(t)
+      isActive: S(t)
     };
   }
   return {
     ...e,
     kind: "filter",
-    isActive: g(
+    isActive: S(
       e.value
     ),
     value: e.value
   };
 }
-function h(e) {
+function p(e) {
   return e.source;
 }
-function J(e) {
+function ae(e) {
   var r;
   return !!((r = e.fields) != null && r.length);
 }
@@ -277,68 +329,68 @@ function a(e, r) {
     role: e.role || r
   };
 }
-function m(e) {
-  return (e || []).map(U);
+function y(e) {
+  return (e || []).map(te);
 }
-function X(e) {
+function se(e) {
   if (e)
     return e;
 }
-function _(e, r) {
+function R(e, r) {
   if (e === void 0)
     return;
-  const t = T(e);
+  const t = z(e);
   if (!t)
     throw new Error(
       `useSemaphorInput "${r}" uses unsupported filter operator "${e}".`
     );
   return t;
 }
-function Y(e, r = {}) {
+function de(e, r = {}) {
   const t = r.pathPrefix || "analysisOptions";
   if (e === void 0)
     return { ok: !0 };
   if (!e || typeof e != "object" || Array.isArray(e))
-    return s(
+    return u(
       t,
       "Data App analysis options must be an object."
     );
-  const o = e, i = {};
-  if (o.chartTitle !== void 0) {
-    if (typeof o.chartTitle != "string")
-      return s(
+  const i = e, o = {};
+  if (i.chartTitle !== void 0) {
+    if (typeof i.chartTitle != "string")
+      return u(
         `${t}.chartTitle`,
         'Data App analysis option "chartTitle" must be a string.'
       );
-    i.chartTitle = o.chartTitle;
+    o.chartTitle = i.chartTitle;
   }
-  if (o.chartType !== void 0) {
-    if (typeof o.chartType != "string")
-      return s(
+  if (i.chartType !== void 0) {
+    if (typeof i.chartType != "string")
+      return u(
         `${t}.chartType`,
         'Data App analysis option "chartType" must be a string.'
       );
-    i.chartType = o.chartType;
+    o.chartType = i.chartType;
   }
-  if (o.driverMode !== void 0) {
-    if (!ee(o.driverMode))
-      return s(
+  if (i.driverMode !== void 0) {
+    if (!ue(i.driverMode))
+      return u(
         `${t}.driverMode`,
         'Data App analysis option "driverMode" must be absolute_delta, largest_negative, largest_positive, positive_and_negative, or all.'
       );
-    i.driverMode = o.driverMode;
+    o.driverMode = i.driverMode;
   }
-  if (o.includePopulation !== void 0) {
-    if (typeof o.includePopulation != "boolean")
-      return s(
+  if (i.includePopulation !== void 0) {
+    if (typeof i.includePopulation != "boolean")
+      return u(
         `${t}.includePopulation`,
         'Data App analysis option "includePopulation" must be a boolean.'
       );
-    i.includePopulation = o.includePopulation;
+    o.includePopulation = i.includePopulation;
   }
-  if (o.calendarContext !== void 0) {
-    const n = te(
-      o.calendarContext,
+  if (i.calendarContext !== void 0) {
+    const n = ce(
+      i.calendarContext,
       {
         pathPrefix: `${t}.calendarContext`,
         validateTimezone: r.validateTimezone
@@ -346,104 +398,104 @@ function Y(e, r = {}) {
     );
     if (!n.ok)
       return n;
-    i.calendarContext = n.calendarContext;
+    o.calendarContext = n.calendarContext;
   }
-  return { ok: !0, analysisOptions: i };
+  return { ok: !0, analysisOptions: o };
 }
-function ke(e) {
+function Be(e) {
   const r = e.queries.map(
-    (i, n) => Z(i, n, {
+    (o, n) => le(o, n, {
       fieldCatalogs: e.fieldCatalogs || [],
       requireFieldCatalog: !!e.requireFieldCatalog,
       validateTimezone: e.validateTimezone
     })
-  ), t = r.flatMap((i) => i.diagnostics), o = r.map((i) => i.executionResult);
+  ), t = r.flatMap((o) => o.diagnostics), i = r.map((o) => o.executionResult);
   return {
-    ok: t.every((i) => i.severity !== "error"),
+    ok: t.every((o) => o.severity !== "error"),
     diagnostics: t,
     queries: r,
     intents: r.flatMap(
-      (i) => i.intent ? [i.intent] : []
+      (o) => o.intent ? [o.intent] : []
     ),
-    executionResults: o
+    executionResults: i
   };
 }
-function Z(e, r, t) {
-  const o = `queries.${r}`;
+function le(e, r, t) {
+  const i = `queries.${r}`;
   try {
-    const i = ie(e), n = ye(e, i), d = x(i), l = [
-      ...le({
+    const o = me(e), n = Me(e, o), s = D(o), d = [
+      ...Ie({
         querySpec: e,
         queryId: n,
-        intent: i,
-        pathPrefix: o
+        intent: o,
+        pathPrefix: i
       }),
-      ...d.errors.map(
-        (y) => v(y, {
+      ...s.errors.map(
+        (c) => $(c, {
           queryHook: e.queryHook,
           queryId: n,
-          pathPrefix: o,
+          pathPrefix: i,
           severity: "error",
-          intent: i
+          intent: o
         })
       ),
-      ...d.warnings.map(
-        (y) => v(y, {
+      ...s.warnings.map(
+        (c) => $(c, {
           queryHook: e.queryHook,
           queryId: n,
-          pathPrefix: o,
+          pathPrefix: i,
           severity: "warning",
-          intent: i
+          intent: o
         })
       ),
-      ...ne({
+      ...he({
         querySpec: e,
         queryId: n,
-        intent: i,
-        pathPrefix: o,
+        intent: o,
+        pathPrefix: i,
         fieldCatalogs: t.fieldCatalogs,
         requireFieldCatalog: t.requireFieldCatalog
       }),
-      ...de({
+      ...qe({
         querySpec: e,
         queryId: n,
-        intent: i,
-        pathPrefix: o,
+        intent: o,
+        pathPrefix: i,
         validateTimezone: t.validateTimezone
       })
-    ], u = me(d, l);
+    ], l = _e(s, d);
     return {
       queryHook: e.queryHook,
       queryId: n,
-      intent: i,
-      diagnostics: l,
-      executionResult: k({
-        intent: i,
-        validation: u,
-        diagnostics: l
+      intent: o,
+      diagnostics: d,
+      executionResult: _({
+        intent: o,
+        validation: l,
+        diagnostics: d
       })
     };
-  } catch (i) {
+  } catch (o) {
     const n = {
       severity: "error",
       code: "invalid_query_spec",
-      message: i instanceof Error ? i.message : String(i),
-      path: o,
+      message: o instanceof Error ? o.message : String(o),
+      path: i,
       queryHook: e.queryHook,
-      queryId: P(e.spec)
-    }, d = R([n]);
+      queryId: B(e.spec)
+    }, s = P([n]);
     return {
       queryHook: e.queryHook,
       queryId: n.queryId,
       diagnostics: [n],
-      executionResult: k({
-        validation: d,
+      executionResult: _({
+        validation: s,
         diagnostics: [n]
       })
     };
   }
 }
-function s(e, r) {
+function u(e, r) {
   return {
     ok: !1,
     issues: [
@@ -455,94 +507,169 @@ function s(e, r) {
     ]
   };
 }
-function C(e) {
+function H(e) {
   return !!(e && typeof e == "object" && !Array.isArray(e));
 }
-function ee(e) {
+function ue(e) {
   return e === "absolute_delta" || e === "largest_negative" || e === "largest_positive" || e === "positive_and_negative" || e === "all";
 }
-function re(e) {
+function fe(e) {
   return e.trim().length > 0 && !Number.isNaN(Date.parse(e));
 }
-function te(e, r) {
-  var u;
+function ce(e, r) {
+  var l;
   if (!e || typeof e != "object" || Array.isArray(e))
-    return s(
+    return u(
       r.pathPrefix,
       'Data App analysis option "calendarContext" must be an object.'
     );
-  const t = e, o = t.tz, i = t.weekStart, n = t.anchor, d = n && typeof n == "object" && !Array.isArray(n) ? n.iso : void 0, l = typeof o == "string" ? ((u = r.validateTimezone) == null ? void 0 : u.call(r, o)) ?? o : null;
-  return l ? typeof i != "number" || !Number.isInteger(i) || i < 0 || i > 6 ? s(
+  const t = e, i = t.tz, o = t.weekStart, n = t.anchor, s = n && typeof n == "object" && !Array.isArray(n) ? n.iso : void 0, d = typeof i == "string" ? ((l = r.validateTimezone) == null ? void 0 : l.call(r, i)) ?? i : null;
+  return d ? typeof o != "number" || !Number.isInteger(o) || o < 0 || o > 6 ? u(
     `${r.pathPrefix}.weekStart`,
     'Data App analysis option "calendarContext.weekStart" must be an integer from 0 to 6.'
-  ) : n !== "now" && !(typeof d == "string" && re(d)) ? s(
+  ) : n !== "now" && !(typeof s == "string" && fe(s)) ? u(
     `${r.pathPrefix}.anchor`,
     'Data App analysis option "calendarContext.anchor" must be "now" or an object with a valid iso string.'
   ) : {
     ok: !0,
     calendarContext: {
-      tz: l,
-      weekStart: i,
+      tz: d,
+      weekStart: o,
       anchor: n
     }
-  } : s(
+  } : u(
     `${r.pathPrefix}.tz`,
     'Data App analysis option "calendarContext.tz" must be a valid timezone string.'
   );
 }
-function ie(e) {
-  return oe(e.spec);
+function me(e) {
+  return ye(e.spec);
 }
-function oe(e) {
-  if (!C(e))
+function ye(e) {
+  if (!H(e))
     throw new Error("useSemaphorQuery spec must be an object.");
   if (e.queryKind === "metric")
-    return w(e);
+    return x(e);
   if (e.queryKind === "analysis")
-    return F(e);
+    return E(e);
   if (e.queryKind === "records")
-    return Q(e);
+    return U(e);
   if (e.queryKind === "sql")
-    return W(e);
+    return X(e);
+  if (e.queryKind === "matrix")
+    return Y(e);
   if (e.queryKind === "inputOptions")
-    return N(e);
+    return J(e);
   throw new Error(
-    "useSemaphorQuery spec.queryKind must be metric, analysis, records, inputOptions, or sql."
+    "useSemaphorQuery spec.queryKind must be metric, analysis, records, inputOptions, sql, or matrix."
   );
 }
-function ne(e) {
+function he(e) {
   if (e.intent.kind === "sql")
     return [];
   if (e.fieldCatalogs.length === 0 && !e.requireFieldCatalog)
     return [];
-  const r = fe(
+  const r = Se(
     e.fieldCatalogs,
     e.intent.source
   );
-  return r ? [
-    ...ae({
+  if (!r)
+    return [
+      {
+        severity: "error",
+        code: "invalid_source_ref",
+        message: `Source ref for ${e.querySpec.queryHook} does not match a visible Semaphor source.`,
+        path: `${e.pathPrefix}.spec.source`,
+        queryHook: e.querySpec.queryHook,
+        queryId: e.queryId,
+        intentId: e.intent.id,
+        source: e.intent.source
+      }
+    ];
+  const t = pe({
+    ...e,
+    catalog: r
+  }), i = {
+    ...r,
+    fields: [
+      ...r.fields,
+      ...be(e.intent, r, e.intent.source)
+    ]
+  };
+  return [
+    ...t,
+    ...ge({
       ...e,
-      catalog: r
+      catalog: i
     }),
-    ...se({
+    ...ve({
       ...e,
-      catalog: r
+      catalog: i
     })
-  ] : [
-    {
+  ];
+}
+function pe(e) {
+  const r = T(e.intent);
+  if (r.length === 0)
+    return [];
+  const t = [], i = /* @__PURE__ */ new Set();
+  return r.forEach((o, n) => {
+    const s = `${e.pathPrefix}.spec.derivedFields.${n}`, d = b(o.name);
+    d && (i.has(d) && t.push({
       severity: "error",
-      code: "invalid_source_ref",
-      message: `Source ref for ${e.querySpec.queryHook} does not match a visible Semaphor source.`,
-      path: `${e.pathPrefix}.spec.source`,
+      code: "duplicate_derived_field",
+      message: `Derived field "${o.name}" is declared more than once.`,
+      path: `${s}.name`,
       queryHook: e.querySpec.queryHook,
       queryId: e.queryId,
       intentId: e.intent.id,
       source: e.intent.source
-    }
-  ];
+    }), i.add(d), e.catalog.fields.some(
+      (l) => b(l.name) === d
+    ) && t.push({
+      severity: "error",
+      code: "derived_field_name_collision",
+      message: `Derived field "${o.name}" conflicts with a field already visible on the selected Semaphor source.`,
+      path: `${s}.name`,
+      queryHook: e.querySpec.queryHook,
+      queryId: e.queryId,
+      intentId: e.intent.id,
+      source: e.intent.source
+    })), Object.entries(o.inputs || {}).forEach(([l, c]) => {
+      const f = we(c);
+      if (!f)
+        return;
+      const g = m(f, e.intent.source);
+      if (!q(g, e.intent.source)) {
+        t.push({
+          severity: "error",
+          code: "unsupported_derived_field_source",
+          message: `Derived field "${o.name}" input "${l}" references a different Semaphor source. App-local derived fields must use fields from the query source.`,
+          path: `${s}.inputs.${l}`,
+          queryHook: e.querySpec.queryHook,
+          queryId: e.queryId,
+          intentId: e.intent.id,
+          source: g,
+          field: f
+        });
+        return;
+      }
+      I(e.catalog, f, e.intent.source) || t.push({
+        severity: "error",
+        code: "missing_field",
+        message: `Derived field "${o.name}" input "${l}" references field "${f.name}", which is not visible on the selected Semaphor source.`,
+        path: `${s}.inputs.${l}`,
+        queryHook: e.querySpec.queryHook,
+        queryId: e.queryId,
+        intentId: e.intent.id,
+        source: g,
+        field: f
+      });
+    });
+  }), t;
 }
-function ae(e) {
-  return ue(e.intent).flatMap(({ field: r, path: t }) => $(e.catalog, r, e.intent.source) ? [] : [
+function ge(e) {
+  return ke(e.intent).flatMap(({ field: r, path: t }) => I(e.catalog, r, e.intent.source) ? [] : [
     {
       severity: "error",
       code: "missing_field",
@@ -551,26 +678,26 @@ function ae(e) {
       queryHook: e.querySpec.queryHook,
       queryId: e.queryId,
       intentId: e.intent.id,
-      source: c(r, e.intent.source),
+      source: m(r, e.intent.source),
       field: r
     }
   ]);
 }
-function se(e) {
-  return ("inputs" in e.intent ? e.intent.inputs || [] : []).flatMap((t, o) => {
+function ve(e) {
+  return ("inputs" in e.intent ? e.intent.inputs || [] : []).flatMap((t, i) => {
     if (!t.field)
       return [];
-    const i = c(t.field, e.intent.source);
-    return b(i, e.intent.source) ? $(e.catalog, t.field, e.intent.source) ? [] : [
+    const o = m(t.field, e.intent.source);
+    return q(o, e.intent.source) ? I(e.catalog, t.field, e.intent.source) ? [] : [
       {
         severity: "error",
         code: "missing_field",
         message: `Input "${t.inputId}" references field "${t.field.name}", which is not visible on the selected Semaphor source.`,
-        path: `${e.pathPrefix}.spec.inputs.${o}.field`,
+        path: `${e.pathPrefix}.spec.inputs.${i}.field`,
         queryHook: e.querySpec.queryHook,
         queryId: e.queryId,
         intentId: e.intent.id,
-        source: i,
+        source: o,
         field: t.field
       }
     ] : [
@@ -578,20 +705,20 @@ function se(e) {
         severity: "error",
         code: "unsupported_input_filter_composition",
         message: `Input "${t.inputId}" filters a different Semaphor source than the query. Cross-source Data App inputs are not supported yet.`,
-        path: `${e.pathPrefix}.spec.inputs.${o}.field`,
+        path: `${e.pathPrefix}.spec.inputs.${i}.field`,
         queryHook: e.querySpec.queryHook,
         queryId: e.queryId,
         intentId: e.intent.id,
-        source: i,
+        source: o,
         field: t.field
       }
     ];
   });
 }
-function de(e) {
+function qe(e) {
   if (e.querySpec.spec.queryKind !== "analysis")
     return [];
-  const r = Y(
+  const r = de(
     e.querySpec.spec,
     {
       pathPrefix: `${e.pathPrefix}.spec`,
@@ -609,8 +736,8 @@ function de(e) {
     source: e.intent.source
   }));
 }
-function le(e) {
-  return e.querySpec.spec.queryKind !== "sql" ? [] : C(e.querySpec.spec) ? Object.prototype.hasOwnProperty.call(e.querySpec.spec, "parameters") ? [
+function Ie(e) {
+  return e.querySpec.spec.queryKind !== "sql" ? [] : H(e.querySpec.spec) ? Object.prototype.hasOwnProperty.call(e.querySpec.spec, "parameters") ? [
     {
       severity: "error",
       code: "deprecated_sql_parameters",
@@ -622,7 +749,7 @@ function le(e) {
     }
   ] : [] : [];
 }
-function ue(e) {
+function ke(e) {
   return e.kind === "metric" ? [
     ...e.metrics.map((r, t) => ({
       field: r,
@@ -650,33 +777,105 @@ function ue(e) {
       field: r.field,
       path: `spec.filters.${t}.field`
     }))
-  ] : e.kind === "inputOptions" ? [{ field: e.field, path: "spec.field" }] : [];
+  ] : e.kind === "inputOptions" ? [{ field: e.field, path: "spec.field" }] : e.kind === "matrix" ? [
+    ...e.rows.map((r, t) => ({
+      field: r.field,
+      path: `spec.rows.${t}.field`
+    })),
+    ...e.rows.flatMap(
+      (r, t) => {
+        var i;
+        return ((i = r.sortBy) == null ? void 0 : i.by.kind) === "field" ? [
+          {
+            field: r.sortBy.by.field,
+            path: `spec.rows.${t}.sortBy.by.field`
+          }
+        ] : [];
+      }
+    ),
+    ...(e.columns || []).map((r, t) => ({
+      field: r.field,
+      path: `spec.columns.${t}.field`
+    })),
+    ...(e.columns || []).flatMap(
+      (r, t) => {
+        var i;
+        return ((i = r.sortBy) == null ? void 0 : i.by.kind) === "field" ? [
+          {
+            field: r.sortBy.by.field,
+            path: `spec.columns.${t}.sortBy.by.field`
+          }
+        ] : [];
+      }
+    ),
+    ...e.values.map((r, t) => ({
+      field: r.field,
+      path: `spec.values.${t}.field`
+    })),
+    ...(e.sort || []).flatMap(
+      (r, t) => r.by.kind === "field" ? [
+        {
+          field: r.by.field,
+          path: `spec.sort.${t}.by.field`
+        }
+      ] : []
+    ),
+    ...(e.filters || []).map((r, t) => ({
+      field: r.field,
+      path: `spec.filters.${t}.field`
+    }))
+  ] : [];
 }
-function fe(e, r) {
-  return e.find((t) => p(t, r));
+function Se(e, r) {
+  return e.find((t) => v(t, r));
 }
-function $(e, r, t) {
-  const o = c(r, t);
-  if (p(e, o))
+function I(e, r, t) {
+  const i = m(r, t);
+  if (v(e, i))
     return e.fields.find(
-      (i) => ce(i, r) && p(
+      (o) => Ae(o, r) && v(
         e,
-        c(i, e.source)
+        m(o, e.source)
       )
     );
 }
-function p(e, r) {
+function T(e) {
+  return !("derivedFields" in e) || !Array.isArray(e.derivedFields) ? [] : e.derivedFields;
+}
+function be(e, r, t) {
+  return T(e).map((i) => ({
+    name: i.name,
+    label: i.label,
+    role: $e(i.resultRole),
+    dataType: i.dataType,
+    source: r.source || t,
+    ...i.defaultAggregate ? { aggregate: i.defaultAggregate } : {}
+  }));
+}
+function $e(e) {
+  return e === "measure" ? "measure" : e === "date" ? "date" : e === "id" ? "id" : "dimension";
+}
+function we(e) {
+  if (!e || typeof e != "object")
+    return;
+  const r = e;
+  return r.field || r.metric || r.dimension;
+}
+function b(e) {
+  return O(e);
+}
+function v(e, r) {
   return [e.source, ...e.sourceAliases || []].some(
-    (t) => b(t, r)
+    (t) => q(t, r)
   );
 }
-function c(e, r) {
+function m(e, r) {
   return e.source || r;
 }
-function ce(e, r) {
+function Ae(e, r) {
   return !!(e.name && r.name && e.name === r.name);
 }
-function v(e, r) {
+function $(e, r) {
   return {
     severity: r.severity,
     code: e.code || "invalid_analytics_intent",
@@ -688,15 +887,15 @@ function v(e, r) {
     source: r.intent.source
   };
 }
-function me(e, r) {
-  const t = R(r);
+function _e(e, r) {
+  const t = P(r);
   return {
     ok: t.ok && e.ok,
-    errors: I([
+    errors: A([
       ...e.errors,
       ...t.errors
     ]),
-    warnings: I([
+    warnings: A([
       ...e.warnings,
       ...t.warnings
     ]),
@@ -706,25 +905,25 @@ function me(e, r) {
     ]
   };
 }
-function R(e) {
-  const r = e.filter((o) => o.severity === "error").map(q), t = e.filter((o) => o.severity === "warning").map(q);
+function P(e) {
+  const r = e.filter((i) => i.severity === "error").map(w), t = e.filter((i) => i.severity === "warning").map(w);
   return {
     ok: r.length === 0,
     errors: r,
     warnings: t,
-    repairHints: r.map((o) => {
-      var i, n;
+    repairHints: r.map((i) => {
+      var o, n;
       return {
-        code: o.code,
-        message: o.message,
-        fieldRole: o.fieldRole,
-        invalidField: (i = o.repairHint) == null ? void 0 : i.invalidField,
-        recommendedNextStep: ((n = o.repairHint) == null ? void 0 : n.recommendedNextStep) || "Update the Data App SDK query spec to use visible Semaphor source and field refs."
+        code: i.code,
+        message: i.message,
+        fieldRole: i.fieldRole,
+        invalidField: (o = i.repairHint) == null ? void 0 : o.invalidField,
+        recommendedNextStep: ((n = i.repairHint) == null ? void 0 : n.recommendedNextStep) || "Update the Data App SDK query spec to use visible Semaphor source and field refs."
       };
     })
   };
 }
-function q(e) {
+function w(e) {
   var r;
   return {
     code: e.code,
@@ -740,22 +939,22 @@ function q(e) {
     }
   };
 }
-function I(e) {
+function A(e) {
   const r = /* @__PURE__ */ new Set();
   return e.filter((t) => {
-    const o = `${t.code}:${t.path || ""}:${t.message}`;
-    return r.has(o) ? !1 : (r.add(o), !0);
+    const i = `${t.code}:${t.path || ""}:${t.message}`;
+    return r.has(i) ? !1 : (r.add(i), !0);
   });
 }
-function k(e) {
-  var t, o;
+function _(e) {
+  var t, i;
   const r = e.diagnostics.filter(
-    (i) => i.severity === "error"
+    (o) => o.severity === "error"
   );
   return {
     intentId: (t = e.intent) == null ? void 0 : t.id,
     status: r.length ? "failed" : "answered",
-    resultShape: (o = e.intent) == null ? void 0 : o.kind,
+    resultShape: (i = e.intent) == null ? void 0 : i.kind,
     intent: e.intent,
     validation: e.validation,
     coverage: {
@@ -763,41 +962,42 @@ function k(e) {
       missingObligations: r.length ? ["query_spec_validation"] : [],
       warnings: e.validation.warnings
     },
-    missingFields: r.filter((i) => i.code === "missing_field").flatMap(
-      (i) => {
+    missingFields: r.filter((o) => o.code === "missing_field").flatMap(
+      (o) => {
         var n;
-        return (n = i.field) != null && n.name ? [i.field.name] : [];
+        return (n = o.field) != null && n.name ? [o.field.name] : [];
       }
     ),
-    warnings: e.diagnostics.filter((i) => i.severity === "warning").map((i) => i.message),
+    warnings: e.diagnostics.filter((o) => o.severity === "warning").map((o) => o.message),
     metadata: {
       validationKind: "data_app_sdk_query_spec"
     }
   };
 }
-function ye(e, r) {
-  return r.id || P(e.spec);
+function Me(e, r) {
+  return r.id || B(e.spec);
 }
-function P(e) {
+function B(e) {
   if (!e || typeof e != "object" || !("id" in e))
     return;
   const r = e.id;
   return typeof r == "string" && r.trim() ? r : void 0;
 }
 export {
-  W as a,
-  N as b,
-  Q as c,
-  ge as d,
-  F as e,
-  w as f,
-  M as g,
-  g as h,
-  U as i,
-  ve as j,
-  G as k,
-  Y as l,
-  Ie as n,
-  qe as t,
-  ke as v
+  Y as a,
+  X as b,
+  J as c,
+  U as d,
+  Re as e,
+  E as f,
+  x as g,
+  C as h,
+  S as i,
+  te as j,
+  He as k,
+  oe as l,
+  de as m,
+  Pe as n,
+  Te as t,
+  Be as v
 };