@holistics/cli-core 2.3.8 → 2.3.9

package/dist/commands.js

@@ -27799,7 +27799,7 @@ var require_dist3 = __commonJS((exports2) => {
   exports2.default = deferred;
 });
 // package.json
-var version = "2.3.8";
+var version = "2.3.9";
 
 // ../../node_modules/.pnpm/@commander-js+extra-typings@13.1.0_commander@13.1.0/node_modules/@commander-js/extra-typings/esm.mjs
 var import__ = __toESM(require_extra_typings(), 1);
@@ -38201,7 +38201,7 @@ import fs from "fs";
 import os from "os";
 import path2 from "path";
 
-// ../../node_modules/.pnpm/js-yaml@4.3.0/node_modules/js-yaml/dist/js-yaml.mjs
+// ../../node_modules/.pnpm/js-yaml@4.3.1/node_modules/js-yaml/dist/js-yaml.mjs
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
 }
@@ -39105,7 +39105,7 @@ function requireOmap() {
   function resolveYamlOmap(data) {
     if (data === null)
       return true;
-    const objectKeys = [];
+    const objectKeys = {};
     const object = data;
     for (let index = 0, length = object.length;index < length; index += 1) {
       const pair = object[index];
@@ -39123,10 +39123,9 @@ function requireOmap() {
       }
       if (!pairHasKey)
         return false;
-      if (objectKeys.indexOf(pairKey) === -1)
-        objectKeys.push(pairKey);
-      else
+      if (_hasOwnProperty.call(objectKeys, pairKey))
         return false;
+      Object.defineProperty(objectKeys, pairKey, { value: true });
     }
     return true;
   }
@@ -112837,29 +112836,29 @@ function transformInUserAttribute(e10, t, n, r3) {
   let a = normalizeUserAttribute(e10, n, undefined, true);
   if (a === UserAttributeConstant.ALL)
     return wrapSql(truefalseOp(!i, e10.store.dataSource.dbtype), SqlType.TRUEFALSE);
-  let s3 = getSqlFromRowLevelObject(e10, getRowLevelObjectFromExpression(e10, t, false));
-  return import_lodash2.isArray(a) ? wrapSql(createOperation(i ? OperationType.NOT_IN : OperationType.IN, [s3, ...a]), SqlType.TRUEFALSE) : wrapSql(createOperation(i ? OperationType.NE : OperationType.EQ, [s3, a]), SqlType.TRUEFALSE);
+  let s3 = getRowLevelObjectFromExpression(e10, t, false), c3 = getSqlFromRowLevelObject(e10, s3), l3 = getFieldFlags(s3);
+  return import_lodash2.isArray(a) ? wrapSql(createOperation(i ? OperationType.NOT_IN : OperationType.IN, [c3, ...a]), SqlType.TRUEFALSE, l3) : wrapSql(createOperation(i ? OperationType.NE : OperationType.EQ, [c3, a]), SqlType.TRUEFALSE, l3);
 }
 function transformInTableLiteral(e10, t, n, r3) {
-  let i = !!r3.not, a = getRowLevelObjectFromExpression(e10, n, false).evaluatedRows.map((t3) => normalizeLiteral(e10, t3[0])) || [];
-  if (import_lodash2.isEmpty(a))
+  let i = !!r3.not, a = getRowLevelObjectFromExpression(e10, n, false), s3 = a.evaluatedRows.map((t3) => normalizeLiteral(e10, t3[0])) || [];
+  if (import_lodash2.isEmpty(s3))
     return wrapSql(truefalseOp(i, e10.store.dataSource.dbtype), SqlType.TRUEFALSE);
-  let s3 = getSqlFromRowLevelObject(e10, getRowLevelObjectFromExpression(e10, t, false));
-  return wrapSql(createOperation(i ? OperationType.NOT_IN : OperationType.IN, [s3, ...a]), SqlType.TRUEFALSE);
+  let c3 = getRowLevelObjectFromExpression(e10, t, false), l3 = getSqlFromRowLevelObject(e10, c3);
+  return wrapSql(createOperation(i ? OperationType.NOT_IN : OperationType.IN, [l3, ...s3]), SqlType.TRUEFALSE, getFieldFlags(c3, a));
 }
 function transformInRangeLiteral(e10, t, n, r3) {
-  let i = !!r3.not, a, s3, c3 = getSqlFromRowLevelObject(e10, getRowLevelObjectFromExpression(e10, t, false));
-  if (n.start && (a = createOperation(i ? OperationType.LT : OperationType.GTE, [c3, createOperation(OperationType.NORMALIZE_NUMBER_VALUE, [n.start.toString()])])), n.end && (s3 = createOperation(i ? OperationType.GT : OperationType.LTE, [c3, createOperation(OperationType.NORMALIZE_NUMBER_VALUE, [n.end.toString()])])), a && s3)
-    return n.start > n.end ? wrapSql(truefalseOp(i, e10.store.dataSource.dbtype), SqlType.TRUEFALSE) : wrapSql(createOperation(OperationType.AND, [a, s3]), SqlType.TRUEFALSE);
-  let l3 = truefalseOp(!i, e10.store.dataSource.dbtype);
-  return wrapSql(a || s3 || l3, SqlType.TRUEFALSE);
+  let i = !!r3.not, a, s3, c3 = getRowLevelObjectFromExpression(e10, t, false), l3 = getSqlFromRowLevelObject(e10, c3), u = getFieldFlags(c3);
+  if (n.start && (a = createOperation(i ? OperationType.LT : OperationType.GTE, [l3, createOperation(OperationType.NORMALIZE_NUMBER_VALUE, [n.start.toString()])])), n.end && (s3 = createOperation(i ? OperationType.GT : OperationType.LTE, [l3, createOperation(OperationType.NORMALIZE_NUMBER_VALUE, [n.end.toString()])])), a && s3)
+    return n.start > n.end ? wrapSql(truefalseOp(i, e10.store.dataSource.dbtype), SqlType.TRUEFALSE) : wrapSql(createOperation(i ? OperationType.OR : OperationType.AND, [a, s3]), SqlType.TRUEFALSE, u);
+  let f3 = truefalseOp(!i, e10.store.dataSource.dbtype);
+  return wrapSql(a || s3 || f3, SqlType.TRUEFALSE, u);
 }
 function evalInDatetimeTableLiteral(e10, t, n, r3) {
   let i = !!r3.not, a = getRowLevelObjectFromExpression(e10, n, false).evaluatedRows.map((e11) => e11[0]) || [];
   if (import_lodash2.isEmpty(a))
     return wrapSql(truefalseOp(i, e10.store.dataSource.dbtype), SqlType.TRUEFALSE);
-  let s3 = createInfixOperatorToken(Kind.MATCHES_KEYWORD, r3.loc, i);
-  return wrapSql(createOperation(i ? OperationType.AND : OperationType.OR, a.map((n3) => evalDatetimeInfixExpression(e10, t, n3, s3).sql)), SqlType.TRUEFALSE);
+  let s3 = createInfixOperatorToken(Kind.MATCHES_KEYWORD, r3.loc, i), c3 = a.map((n3) => evalDatetimeInfixExpression(e10, t, n3, s3));
+  return wrapSql(createOperation(i ? OperationType.AND : OperationType.OR, c3.map((e11) => e11.sql)), SqlType.TRUEFALSE, getFieldFlags(...c3));
 }
 function evalInDatetimeUserAttribute(e10, t, n, r3) {
   let i = !!r3.not, a = getRowLevelObjectFromExpression(e10, n, false);
@@ -112869,8 +112868,8 @@ function evalInDatetimeUserAttribute(e10, t, n, r3) {
     return wrapSql(truefalseOp(!i, e10.store.dataSource.dbtype), SqlType.TRUEFALSE);
   if (import_lodash2.isEmpty(a.values))
     return wrapSql(truefalseOp(i, e10.store.dataSource.dbtype), SqlType.TRUEFALSE);
-  let s3 = a.values.map((t3) => assertAqlType(e10.eval(createDatetimeLiteral(t3, n.loc)), isFieldFragment)).map((e11) => getLiteralFromFieldFragment(e11, isDatetimeValue)), c3 = createInfixOperatorToken(Kind.MATCHES_KEYWORD, r3.loc, i);
-  return wrapSql(createOperation(i ? OperationType.AND : OperationType.OR, s3.map((n3) => evalDatetimeRangeInfixExpression(e10, t, n3, c3).sql)), SqlType.TRUEFALSE);
+  let s3 = a.values.map((t3) => assertAqlType(e10.eval(createDatetimeLiteral(t3, n.loc)), isFieldFragment)).map((e11) => getLiteralFromFieldFragment(e11, isDatetimeValue)), c3 = createInfixOperatorToken(Kind.MATCHES_KEYWORD, r3.loc, i), l3 = s3.map((n3) => evalDatetimeRangeInfixExpression(e10, t, n3, c3));
+  return wrapSql(createOperation(i ? OperationType.AND : OperationType.OR, l3.map((e11) => e11.sql)), SqlType.TRUEFALSE, getFieldFlags(...l3));
 }
 function evalDatetimeRangeInfixExpression(e10, t, n, r3) {
   let i = getUnderlyingType(e10, t), a = getRowLevelObjectFromExpression(e10, t, false), s3 = getRowLevelObjectFromExpression(e10, n, false), c3;
@@ -114817,38 +114816,38 @@ function buildApplyFiltersPlan(e10, t, n, r3, i, a = true, s3 = true, c3 = false
         f3(e10, l3, t3, t3.targetFields[n3]);
   return l3;
   function f3(e11, n3, r4, i3, a3, s4 = false) {
-    let { rootModel: S3 } = n3, w3 = refIsGenericTimeSpine(i3) ? substituteTimeSpine(e11, i3) : i3, E3 = r4.isRowLevelPermission ? e11.graphContext.rlpGraph() : null, N = (E3 ?? t).findPath(S3, w3.modelName);
-    if (!p3(S3, w3.modelName, a3, r4, N, l3))
+    let { rootModel: S3 } = n3, w3 = refIsGenericTimeSpine(i3) ? substituteTimeSpine(e11, i3) : i3, E3 = r4.isRowLevelPermission ? e11.graphContext.rlpGraph() : null, N = E3 ?? t, I3 = N.findPath(S3, w3.modelName);
+    if (!p3(S3, w3.modelName, a3, r4, I3, l3))
       return;
-    let [I3, L3] = N, U3 = false, W3 = false;
+    let [L3, U3] = I3, W3 = false, me3 = false;
     if (E3 && E3 !== t) {
       let e12 = t.findPath(S3, w3.modelName);
-      U3 = e12 === null || formatPathToString(e12) !== formatPathToString(N), W3 = e12 !== null && !e12[1] && !!L3;
+      W3 = e12 === null || formatPathToString(e12) !== formatPathToString(I3), me3 = e12 !== null && !e12[1] && !!U3;
     }
-    if (S3 === w3.modelName || U3 && W3 || !U3 && (!import_lodash2.isEmpty(I3) && (!L3 || s4 && !c3) || n3.availableModels?.has(w3.modelName))) {
-      addRefToFilterSet(n3, r4, w3);
+    if (S3 === w3.modelName || W3 && me3 || !W3 && (!import_lodash2.isEmpty(L3) && (!U3 || s4 && !c3) || n3.availableModels?.has(w3.modelName))) {
+      addRefToFilterSet(n3, r4, w3, L3);
       return;
     }
-    if (L3 && c3) {
+    if (U3 && c3) {
       l3.unappliedFilters.add(r4);
       return;
     }
-    if (U3 && !import_lodash2.isEmpty(I3)) {
-      let e12 = n3.rootModel, t3 = I3[0].from, i4 = t3;
-      if (L3) {
-        let r5 = I3[m3(n3.rootModel, I3)];
+    if (W3 && !import_lodash2.isEmpty(L3)) {
+      let e12 = n3.rootModel, t3 = L3[0].from, i4 = t3;
+      if (U3) {
+        let r5 = L3[m3(n3.rootModel, L3)];
         e12 = r5.to.modelName, t3 = r5.to, i4 = r5.from;
       }
-      let a4 = modelFieldRefAsKey(t3), s5 = n3.get(a4);
-      s5 || (s5 = createApplyFiltersPlan(e12, [], t3, i4), s5.useRlpGraph = true, n3.set(a4, s5)), addRefToFilterSet(s5, r4, w3);
+      let a4 = N.findPath(e12, w3.modelName)?.[0] ?? [];
+      addRefToFilterSet(findOrCreateSubPlan(n3, e12, t3, i4, [a4], true), r4, w3, a4);
       return;
     }
-    let me3 = m3(n3.rootModel, I3), He4 = I3[me3], oi3 = u;
+    let He4 = m3(n3.rootModel, L3), oi3 = L3[He4], ci3 = u;
     u = new Set([...u]);
-    let ci3 = false;
-    for (let e12 = me3 - 1;e12 >= 0; e12--) {
-      let t3 = I3[e12];
-      if (ci3) {
+    let li3 = false;
+    for (let e12 = He4 - 1;e12 >= 0; e12--) {
+      let t3 = L3[e12];
+      if (li3) {
         u.add(t3.from.modelName);
         continue;
       }
@@ -114856,20 +114855,23 @@ function buildApplyFiltersPlan(e10, t, n, r3, i, a = true, s3 = true, c3 = false
         case LinkType.ONE_TO_ONE:
           break;
         case LinkType.MANY_TO_ONE:
-          ci3 = true, u.add(t3.from.modelName);
+          li3 = true, u.add(t3.from.modelName);
           break;
         default:
           t3.type;
           break;
       }
     }
-    let li3 = modelFieldRefAsKey(He4.to), di3 = n3.get(li3);
-    if (di3 || (di3 = createApplyFiltersPlan(He4.to.modelName, [], He4.to, He4.from), n3.set(li3, di3)), isConstantFilter(r4))
-      f3(e11, di3, r4, r4.targetField, r4.condition.left.loc, true);
+    let di3 = oi3.to.modelName, fi3 = import_lodash2.compact((isConstantFilter(r4) ? [r4.targetField] : r4.targetFields.filter((e12) => !u.has(e12.modelName))).map((t3) => {
+      let n4 = refIsGenericTimeSpine(t3) ? substituteTimeSpine(e11, t3) : t3;
+      return N.findPath(di3, n4.modelName)?.[0];
+    })), pi3 = findOrCreateSubPlan(n3, di3, oi3.to, oi3.from, fi3);
+    if (isConstantFilter(r4))
+      f3(e11, pi3, r4, r4.targetField, r4.condition.left.loc, true);
     else
       for (let t3 = 0;t3 < r4.targetFields.length; t3++)
-        u.has(r4.targetFields[t3].modelName) || f3(e11, di3, r4, r4.targetFields[t3], undefined, true);
-    u = oi3;
+        u.has(r4.targetFields[t3].modelName) || f3(e11, pi3, r4, r4.targetFields[t3], undefined, true);
+    u = ci3;
   }
   function p3(t3, n3, r4, i3, c4, l4) {
     if (!c4) {
@@ -114901,12 +114903,49 @@ function isRlpStrictBypassed(e10, t, n) {
   return r3 ? hasExplicitRlpPropagation(r3[0]) : false;
 }
 function createApplyFiltersPlan(e10, t, n, r3, i) {
-  let a = /* @__PURE__ */ new Map;
-  return a.rootModel = e10, a.availableModels = new Set(i), a.filters = new Map(t.map((e11) => [e11, /* @__PURE__ */ new Set])), a.ref = n, a.refTarget = r3, a.unappliedFilters = /* @__PURE__ */ new Set, a;
+  return {
+    rootModel: e10,
+    availableModels: new Set(i),
+    filters: new Map(t.map((e11) => [e11, /* @__PURE__ */ new Set])),
+    subPlans: [],
+    modelPathKeyMap: /* @__PURE__ */ new Map,
+    ref: n,
+    refTarget: r3,
+    useRlpGraph: false,
+    unappliedFilters: /* @__PURE__ */ new Set
+  };
+}
+function addRefToFilterSet(e10, t, n, r3) {
+  let i = e10.filters.get(t);
+  i ? i.add(n) : e10.filters.set(t, new Set([n])), recordPathKeys(e10, r3);
+}
+function relationshipKey(e10) {
+  return `${modelFieldRefAsKey(e10.from)}>${modelFieldRefAsKey(e10.to)}:${e10.type}`;
 }
-function addRefToFilterSet(e10, t, n) {
-  let r3 = e10.filters.get(t);
-  r3 ? r3.add(n) : e10.filters.set(t, new Set([n]));
+function stepAcross$1(e10, t) {
+  return t.from.modelName === e10 ? t.to.modelName : t.from.modelName;
+}
+function recordPathKeys(e10, t) {
+  let n = e10.rootModel, r3 = "";
+  for (let i of t)
+    n = stepAcross$1(n, i), r3 += `${relationshipKey(i)} -> `, e10.modelPathKeyMap.has(n) || e10.modelPathKeyMap.set(n, r3);
+}
+function planFitsPath(e10, t) {
+  let n = e10.rootModel, r3 = "";
+  for (let i of t) {
+    n = stepAcross$1(n, i), r3 += `${relationshipKey(i)} -> `;
+    let t3 = e10.modelPathKeyMap.get(n);
+    if (t3 !== undefined && t3 !== r3)
+      return false;
+  }
+  return true;
+}
+function findOrCreateSubPlan(e10, t, n, r3, i, a = false) {
+  let s3 = e10.subPlans.find((e11) => e11.rootModel === t && e11.useRlpGraph === a && e11.ref && refEq(e11.ref, n) && i.every((t3) => planFitsPath(e11, t3)));
+  if (s3)
+    return s3;
+  let c3 = createApplyFiltersPlan(t, [], n, r3);
+  return c3.useRlpGraph = a, e10.subPlans.push(c3), c3;
 }
 function runApplyFiltersPlan(e10, t, n) {
   let { filters: r3 } = t, i = 0;
@@ -114925,22 +114964,22 @@ function runApplyFiltersPlan(e10, t, n) {
         r4 ? n.conditions.push(...r4) : (i++, applyTableFilter(e10, t3, a, n, i));
       }
     n.conditions = import_lodash2.uniqBy(import_lodash2.compact([...n.conditions]), stableStringify);
-    for (let [r4, i3] of t) {
-      let { ref: t3, refTarget: r5 } = i3;
-      if (!t3 || !r5)
+    for (let r4 of t.subPlans) {
+      let { ref: t3, refTarget: i3 } = r4;
+      if (!t3 || !i3)
         continue;
       e10.eval(dotExpressionFromModelFieldRef(t3));
-      let a = filtersPlanKey(i3), s3 = e10.globals.filterPlansCache.get(a);
+      let a = filtersPlanKey(r4), s3 = e10.globals.filterPlansCache.get(a);
       if (!s3) {
-        let n3 = createFunctionCallExpression(createIdentifier("select"), [createIdentifier(t3.modelName), createDotExpression(createIdentifier(t3.modelName), createIdentifier(t3.fieldName))]), r6 = i3.useRlpGraph === true;
-        r6 && e10.graphContext.graphs.push(e10.graphContext.rlpGraph());
+        let n3 = createFunctionCallExpression(createIdentifier("select"), [createIdentifier(t3.modelName), createDotExpression(createIdentifier(t3.modelName), createIdentifier(t3.fieldName))]), i4 = r4.useRlpGraph === true;
+        i4 && e10.graphContext.graphs.push(e10.graphContext.rlpGraph());
         try {
           let t4 = e10.filters;
           e10.filters = [], s3 = assertAqlType(e10.eval(n3), isExploreId);
-          let r7 = e10.getExplore(s3);
-          r7.allowFanoutJoin = true, e10.filters = t4, r7.groupBy = r7.groups = [...r7.fields], runApplyFiltersPlan(e10, i3, r7), e10.globals.filterPlansCache.set(a, s3);
+          let i5 = e10.getExplore(s3);
+          i5.allowFanoutJoin = true, e10.filters = t4, i5.groupBy = i5.groups = [...i5.fields], runApplyFiltersPlan(e10, r4, i5), e10.globals.filterPlansCache.set(a, s3);
         } finally {
-          r6 && e10.graphContext.dropGraph();
+          i4 && e10.graphContext.dropGraph();
         }
       }
       let c3 = e10.getExplore(s3), l3 = c3.fields.find((e11) => e11.origin && refEq(e11.origin, t3));
@@ -115072,7 +115111,7 @@ function applyTableFilter(e10, t, n, r3, i) {
   r3.joins = import_lodash2.uniqWith([...r3.joins, S3], import_lodash2.isEqual), t.notIn && (r3.conditions = import_lodash2.uniqBy(import_lodash2.compact([...r3.conditions, createCondition(a.name, createOperation(OperationType.AND, p3.map((e11) => createOperation(OperationType.IS_NULL, [e11]))))]), stableStringify));
 }
 function filtersPlanKey(e10) {
-  let { ref: t, rootModel: n, filters: r3 } = e10, i = [...e10.entries()].flatMap(([e11, t3]) => `${e11}: ${filtersPlanKey(t3)}`.split(`
+  let { ref: t, rootModel: n, filters: r3 } = e10, i = e10.subPlans.flatMap((e11) => `${e11.ref ? modelFieldRefAsKey(e11.ref) : e11.rootModel}: ${filtersPlanKey(e11)}`.split(`
 `).map((e12) => `  ${e12}`)).join(`
 `), a = [...r3.entries()].map(([e11, t3]) => isConstantFilter(e11) ? stringifyLogic(e11) : `${stringifyLogic(e11)} <${[...t3.values()].map((e12) => `${e12.modelName}.${e12.fieldName}`)}>`).join(`,
     `);
@@ -124429,7 +124468,6 @@ function makeTransform(e10, t, n, r3, i) {
     id: e10.newNodeId(i),
     ty: r3,
     input: n[0],
-    graphId: e10.currentGraphId,
     iterationDepth: iterationDepthOf(n[0])
   };
   switch (t) {
@@ -124478,8 +124516,7 @@ function makeCall(e10, t, n, r3, i, a) {
     id: e10.newNodeId(a),
     ty: r3,
     name: makeIdent(e10, t, [], errType, i),
-    args: n,
-    graphId: e10.currentGraphId
+    args: n
   };
 }
 function projectColumns(e10, t, n) {
@@ -124513,6 +124550,7 @@ function unwrapScopeWrappers(e10) {
     case "block":
       return unwrapScopeWrappers(e10.result);
     case "where":
+    case "with_relationships":
     case "lod":
     case "period":
     case "rolling":
@@ -125211,33 +125249,14 @@ function withParamBindings(e10, t, n) {
     e10.paramBindings = r3;
   }
 }
-function currentGraph(e10) {
-  return e10.dataset.graphs.get(e10.currentGraphId);
-}
 function baseGraph(e10) {
-  return e10.dataset.graphs.get(0);
-}
-function registerGraph(e10, t) {
-  let n = e10.dataset.graphs.size;
-  return e10.dataset.graphs.set(n, t), n;
-}
-function rlpGraphId(e10) {
-  if (e10.rlpViewGraphId !== undefined)
-    return e10.rlpViewGraphId;
-  let t = baseGraph(e10);
-  return e10.rlpViewGraphId = t.relationships.some((e11) => e11.rlp_propagation && e11.rlp_propagation !== "inherit") ? registerGraph(e10, new ModelGraph(t.models, t.relationships.map(toRlpViewRelationship), undefined, t.allowAmbiguousPaths, t.shouldPrioritizeLengthForMixedPaths)) : 0, e10.rlpViewGraphId;
+  return e10.dataset.graph;
 }
 function rlpGraph(e10) {
-  return e10.dataset.graphs.get(rlpGraphId(e10));
-}
-function withGraph(e10, t, n) {
-  let r3 = e10.currentGraphId;
-  e10.currentGraphId = registerGraph(e10, t);
-  try {
-    return n();
-  } finally {
-    e10.currentGraphId = r3;
-  }
+  if (e10.rlpViewGraph !== undefined)
+    return e10.rlpViewGraph;
+  let t = baseGraph(e10);
+  return e10.rlpViewGraph = t.relationships.some((e11) => e11.rlp_propagation && e11.rlp_propagation !== "inherit") ? new ModelGraph(t.models, t.relationships.map(toRlpViewRelationship), undefined, t.allowAmbiguousPaths, t.shouldPrioritizeLengthForMixedPaths) : t, e10.rlpViewGraph;
 }
 function declKey(e10, t, n) {
   switch (e10) {
@@ -125290,7 +125309,7 @@ function recordJoinKeyDeps(e10, t, n) {
   let r3 = currentDeclFrame(e10);
   if (!r3 || r3.kind !== "dimension" || !r3.modelName || r3.modelName === n)
     return;
-  let i = currentGraph(e10).findPath(r3.modelName, n);
+  let i = baseGraph(e10).findPath(r3.modelName, n);
   if (!i)
     return;
   let [a] = i;
@@ -125448,8 +125467,8 @@ function buildGlobals(e10) {
   }
   if (!r3.members.has("calendar")) {
     nestModel(n, buildModelShell(e10, buildCalendarModel(e10.datetimeContext, e10.store.dataSource)));
-    let t3 = e10.dataset.graphs.get(0);
-    t3 && !t3.models.includes("H.calendar") && e10.dataset.graphs.set(0, new ModelGraph([...t3.models, GENERIC_CAL_MODEL_NAME], t3.relationships, t3.root, t3.allowAmbiguousPaths, t3.shouldPrioritizeLengthForMixedPaths));
+    let t3 = e10.dataset.graph;
+    t3.models.includes("H.calendar") || (e10.dataset.graph = new ModelGraph([...t3.models, GENERIC_CAL_MODEL_NAME], t3.relationships, t3.root, t3.allowAmbiguousPaths, t3.shouldPrioritizeLengthForMixedPaths));
   }
 }
 function nestModel(e10, t) {
@@ -125687,8 +125706,7 @@ function coerceBodyToDeclaredType(e10, t, n) {
     id: e10.newNodeId(),
     ty: getScalarTypeFromSqlType(r3.sqlType),
     name: makeIdent(e10, "read_cast", [], errType),
-    args: [n.result, a],
-    graphId: e10.currentGraphId
+    args: [n.result, a]
   }, n.ty = n.result.ty;
 }
 function reportTableAsDimension(e10, t, n) {
@@ -125937,6 +125955,8 @@ var HirFold = class {
         return this.foldPivotContext(e10);
       case "where":
         return this.foldWhere(e10);
+      case "with_relationships":
+        return this.foldWithRelationships(e10);
       case "explore_context":
         return this.foldExploreContext(e10);
       case "in_table_condition":
@@ -126063,6 +126083,12 @@ var HirFold = class {
       conditions: this.foldExprs(e10.conditions)
     };
   }
+  foldWithRelationships(e10) {
+    return {
+      ...e10,
+      value: this.foldExpr(e10.value)
+    };
+  }
   foldExploreContext(e10) {
     return {
       ...e10,
@@ -126315,8 +126341,7 @@ function makeAggregate(e11, t, n, r3, i) {
       id: e11.newNodeId(i),
       ty: c3[0].ty,
       name: makeIdent(e11, r3.fieldName, [], r3, i),
-      expr: c3[0],
-      graphId: e11.currentGraphId
+      expr: c3[0]
     }, a3 = createTableType(createRowType(projectColumns(e11, [n3], [i])), isTableType(s3.ty) ? s3.ty.rootModel : undefined);
     u = makeTransform(e11, "select", [s3, n3], a3, i), l3 = makeCall(e11, t, [columnRef(e11, r3.fieldName, c3[0].ty, i)], r3, i, i);
   } else if (s3 && c3.length >= 2 && c3.some((e12) => AggregationArgFold.inspect(e12).producesRelation)) {
@@ -126325,8 +126350,7 @@ function makeAggregate(e11, t, n, r3, i) {
       id: e11.newNodeId(i),
       ty: t3.ty,
       name: makeIdent(e11, `_f${n4 + 1}`, [], t3.ty, i),
-      expr: t3,
-      graphId: e11.currentGraphId
+      expr: t3
     })), f4 = createTableType(createRowType(projectColumns(e11, a3, a3.map(() => i))), n3);
     u = makeTransform(e11, "select", [s3, ...a3], f4, i), l3 = makeCall(e11, t, c3.map((t3, n4) => columnRef(e11, `_f${n4 + 1}`, t3.ty, i)), r3, i, i);
   } else if (s3 && c3.length === 0) {
@@ -126339,8 +126363,7 @@ function makeAggregate(e11, t, n, r3, i) {
         id: e11.newNodeId(i),
         ty: a3,
         name: makeIdent(e11, a3.fieldName, [], r3, i),
-        expr: c4,
-        graphId: e11.currentGraphId
+        expr: c4
       }, l4 = createTableType(createRowType(projectColumns(e11, [t3], [i])), n3.rootModel);
       u = makeTransform(e11, "select", [s3, t3], l4, i);
     }
@@ -126348,14 +126371,13 @@ function makeAggregate(e11, t, n, r3, i) {
     l3 = makeCall(e11, t, c3, r3, i, i), u = s3 ?? (a ? synthRef(e11, a, [], resolveModel(e11, a)?.ty ?? errType, i) : undefined);
   if (!u)
     return l3;
-  let f3 = buildAggRelation(e11, u, [], [l3], e11.currentGraphId, i);
+  let f3 = buildAggRelation(e11, u, [], [l3], i);
   return {
     kind: "computed_ref",
     id: e11.newNodeId(i),
     ty: r3,
     reduce: f3,
-    column: r3.fieldName,
-    graphId: e11.currentGraphId
+    column: r3.fieldName
   };
 }
 function columnRef(e11, t, n, r3) {
@@ -126365,20 +126387,18 @@ function columnRef(e11, t, n, r3) {
     id: e11.newNodeId(r3),
     ty: i,
     name: t,
-    path: [],
-    graphId: e11.currentGraphId
+    path: []
   };
 }
-function buildAggRelation(e11, t, n, r3, i, a) {
-  let s3 = isTableType(t.ty) ? t.ty.rootModel : undefined, c3 = [...n.map((e12) => e12.expr), ...r3], l3 = createTableType(createRowType(projectColumns(e11, c3, c3.map(() => a))), s3);
+function buildAggRelation(e11, t, n, r3, i) {
+  let a = isTableType(t.ty) ? t.ty.rootModel : undefined, s3 = [...n.map((e12) => e12.expr), ...r3], c3 = createTableType(createRowType(projectColumns(e11, s3, s3.map(() => i))), a);
   return {
     kind: "reduce",
-    id: e11.newNodeId(a),
-    ty: l3,
+    id: e11.newNodeId(i),
+    ty: c3,
     input: t,
     by: n,
-    aggregates: r3,
-    graphId: i
+    aggregates: r3
   };
 }
 function aggregationFieldType(e11, t, n, r3, i, a) {
@@ -126426,7 +126446,7 @@ function clearOrigin(e11, t) {
     return;
   if (t.length === 1)
     return t[0];
-  let n = currentGraph(e11), r3 = t.filter((e12) => !!resolveJoinTree(t.filter((t3) => t3 !== e12), n, e12, false));
+  let n = baseGraph(e11), r3 = t.filter((e12) => !!resolveJoinTree(t.filter((t3) => t3 !== e12), n, e12, false));
   return r3.length === 1 ? r3[0] : undefined;
 }
 function aggregateRelations(e11) {
@@ -126448,6 +126468,7 @@ function aggregateRelations(e11) {
         break;
       case "lod":
       case "where":
+      case "with_relationships":
       case "period":
       case "rolling":
       case "time_spine":
@@ -126588,7 +126609,7 @@ function expandTreeOf(e11) {
       t = t.result;
       continue;
     }
-    if (t.kind === "explore_context") {
+    if (t.kind === "explore_context" || t.kind === "with_relationships") {
       t = t.value;
       continue;
     }
@@ -126643,7 +126664,7 @@ function dimLines(e11, t) {
   return dedupeLines(e11.map((e12) => dimLine(e12.origin, n, r3)));
 }
 function grainSource(e11) {
-  return e11.kind === "block" ? grainSource(e11.result) : e11.kind === "explore_context" ? grainSource(e11.value) : ("input" in e11) ? e11.input : undefined;
+  return e11.kind === "block" ? grainSource(e11.result) : e11.kind === "explore_context" || e11.kind === "with_relationships" ? grainSource(e11.value) : ("input" in e11) ? e11.input : undefined;
 }
 function dedupeLines(e11) {
   let t = /* @__PURE__ */ new Set;
@@ -126679,7 +126700,7 @@ function aggregateSources(e11, t) {
   return r3(t), n;
 }
 function unwrapResult(e11) {
-  return e11.kind === "block" ? unwrapResult(e11.result) : e11.kind === "explore_context" ? unwrapResult(e11.value) : e11.kind === "sort" || e11.kind === "filter" ? unwrapResult(e11.input) : e11;
+  return e11.kind === "block" ? unwrapResult(e11.result) : e11.kind === "explore_context" || e11.kind === "with_relationships" ? unwrapResult(e11.value) : e11.kind === "sort" || e11.kind === "filter" ? unwrapResult(e11.input) : e11;
 }
 function resultMetricSources(e11, t) {
   let n = unwrapResult(t);
@@ -126707,6 +126728,7 @@ function resultGrainKeys(e11) {
     case "block":
       return resultGrainKeys(e11.result);
     case "explore_context":
+    case "with_relationships":
       return resultGrainKeys(e11.value);
     default:
       return "input" in e11 ? resultGrainKeys(e11.input) : [];
@@ -126998,8 +127020,7 @@ var TableToJsonFold = class extends HirFold {
       id: this.resolver.newNodeId(t),
       ty: e11,
       name: e11.fieldName,
-      path: [],
-      graphId: this.resolver.currentGraphId
+      path: []
     }, { origin: r3 } = e11;
     if (r3) {
       let e12 = resolveModel(this.resolver, r3.modelName), t3 = e12 ? findField(e12, r3.fieldName) : undefined;
@@ -127011,12 +127032,11 @@ var TableToJsonFold = class extends HirFold {
 function castTablesToJson(e11, t) {
   return new TableToJsonFold(e11).foldExpr(t);
 }
-function makeCondition(e11, t, n, r3) {
+function makeCondition(e11, t, n) {
   return {
     predicate: t,
     targets: conditionSubjects(e11, t),
-    role: n,
-    graphId: r3
+    role: n
   };
 }
 function conditionSubjects(e11, t) {
@@ -127228,10 +127248,8 @@ function resolveBareName(e11, t, n, r3, i) {
 }
 function resolveModuleRef(e11, t, n, r3, i, a, s3 = i) {
   let c3 = lookupModuleTarget(e11, [...n, t], enclosingModelOf(r3), !!a);
-  if (c3?.kind === "model") {
-    let t3 = makeRef(e11, c3.model.name, [], c3.model.ty, i, a);
-    return t3.graphId = e11.currentGraphId, t3;
-  }
+  if (c3?.kind === "model")
+    return makeRef(e11, c3.model.name, [], c3.model.ty, i, a);
   if (c3?.kind === "module")
     return makeRef(e11, t, n, moduleTargetType(c3.module), i, a);
   if (c3?.kind === "userattribute") {
@@ -127241,11 +127259,7 @@ function resolveModuleRef(e11, t, n, r3, i, a, s3 = i) {
   }
   if (c3?.kind === "field") {
     let s4 = lookupColumn(r3, genUniqueFieldName({ name: c3.field.name.name }, c3.model.name));
-    if (s4) {
-      let r4 = makeRef(e11, t, n, s4, i, a);
-      return r4.graphId = e11.currentGraphId, r4;
-    }
-    return resolveFieldRef(e11, c3.model, c3.field, t, n, i, a);
+    return s4 ? makeRef(e11, t, n, s4, i, a) : resolveFieldRef(e11, c3.model, c3.field, t, n, i, a);
   }
   if (n.length >= 1) {
     let c4 = resolveBlockDecl(e11, t, n, r3, i, a);
@@ -127280,7 +127294,7 @@ function resolveFieldRef(e11, t, n, r3, i, a, s3) {
     };
   }
   let u = makeRef(e11, r3, i, l3, a, s3);
-  if (u.graphId = e11.currentGraphId, n.kind === "dimension") {
+  if (n.kind === "dimension") {
     let t3 = n.id;
     u.declId = t3, e11.declarationsMap.set(t3, n);
   }
@@ -128126,45 +128140,43 @@ function makeUnique(e11, t, n, r3) {
     kind: "unique",
     id: e11.newNodeId(r3),
     ty: n,
-    keys: modelFieldExprs(e11, t),
-    graphId: e11.currentGraphId
+    keys: modelFieldExprs(e11, t)
   };
 }
 var AMBIGUOUS_PATHS_WARNING = "WARNING: There are ambiguities in dimensions' relationships, leading to multiple possible interpretations. Results may not match expectations.";
-function resolveUnique(e11, t, n, r3, i = [], a = [], s3 = undefined) {
-  let c3 = t.map((e12) => e12.expr), l3 = keyOrigins(c3), u = uniqueKeyModels(c3);
-  if (u.length === 0)
-    return selectOneReduce(e11, r3);
-  let f3 = currentGraph(e11), p3 = buildMostEncompassingTree(u, f3), m3 = import_lodash2.uniq([...u, ...i]), S3 = buildComponentTrees(m3, [], f3), w3 = f3.minimalSubGraph(m3, [], true).isCyclic() ? [AMBIGUOUS_PATHS_WARNING] : undefined, E3 = (e12) => w3 && (e12.kind === "fanout" || e12.kind === "reduce") ? {
+function resolveUnique(e11, t, n, r3, i, a = [], s3 = [], c3 = undefined) {
+  let l3 = n.map((e12) => e12.expr), u = keyOrigins(l3), f3 = uniqueKeyModels(l3);
+  if (f3.length === 0)
+    return selectOneReduce(e11, i);
+  let p3 = buildMostEncompassingTree(f3, t), m3 = import_lodash2.uniq([...f3, ...a]), S3 = buildComponentTrees(m3, [], t), w3 = t.minimalSubGraph(m3, [], true).isCyclic() ? [AMBIGUOUS_PATHS_WARNING] : undefined, E3 = (e12) => w3 && (e12.kind === "fanout" || e12.kind === "reduce") ? {
     ...e12,
     annotations: [...e12.annotations ?? [], ...w3]
   } : e12, N = S3.length > 0 && !p3;
   if (!N && p3) {
-    let e12 = new Set(p3.models()), t3 = u.some((t4) => !e12.has(t4)), n3 = i.some((e13) => !buildMostEncompassingTree(import_lodash2.uniq([...u, e13]), f3));
-    N = S3.length > 1 && (t3 || n3);
+    let e12 = new Set(p3.models()), n3 = f3.some((t3) => !e12.has(t3)), r4 = a.some((e13) => !buildMostEncompassingTree(import_lodash2.uniq([...f3, e13]), t));
+    N = S3.length > 1 && (n3 || r4);
   }
   if (N) {
-    let [t3, i3, s4] = connectComponents(e11, c3, S3[0], S3.slice(1), c3, a);
-    if (i3.length === l3.length && s4.length === 0)
+    let [t3, n3, a3] = connectComponents(e11, l3, S3[0], S3.slice(1), l3, s3);
+    if (n3.length === u.length && a3.length === 0)
       return E3({
         kind: "fanout",
-        id: e11.newNodeId(r3),
-        ty: n,
+        id: e11.newNodeId(i),
+        ty: r3,
         root: t3,
-        outerDims: i3,
-        graphId: e11.currentGraphId
+        outerDims: n3
       });
   }
   if (p3) {
-    let a3 = i.length > 0 ? buildMostEncompassingTree(import_lodash2.uniq([...u, ...i]), f3) ?? p3 : p3;
-    if (s3) {
-      let e12 = s3(a3.root);
+    let s4 = a.length > 0 ? buildMostEncompassingTree(import_lodash2.uniq([...f3, ...a]), t) ?? p3 : p3;
+    if (c3) {
+      let e12 = c3(s4.root);
       if (e12)
         return E3(e12);
     }
-    return E3(distinctReduce(e11, t, n, a3.root, buildExpansions(e11, a3, c3), r3));
+    return E3(distinctReduce(e11, n, r3, s4.root, buildExpansions(e11, s4, l3), i));
   }
-  return e11.dataset.diagnostics.push(createError(ErrorCode.RELATIONSHIP_NOT_FOUND_0, r3, undefined, "Cannot resolve relationship between selected fields")), distinctReduce(e11, t, n, u[0] ?? "", [], r3);
+  return e11.dataset.diagnostics.push(createError(ErrorCode.RELATIONSHIP_NOT_FOUND_0, i, undefined, "Cannot resolve relationship between selected fields")), distinctReduce(e11, n, r3, f3[0] ?? "", [], i);
 }
 function selectOneReduce(e11, t) {
   let n = createFieldType("one", numberType, createModelFieldReference(selectOneModelName, "one"), selectOneModelName, "dimension"), r3 = {
@@ -128172,8 +128184,7 @@ function selectOneReduce(e11, t) {
     id: e11.newNodeId(t),
     ty: n,
     name: "one",
-    path: [],
-    graphId: e11.currentGraphId
+    path: []
   }, i = createTableType(createRowType([n]), selectOneModelName);
   return distinctReduce(e11, modelFieldExprs(e11, [r3]), i, selectOneModelName, [], t);
 }
@@ -128185,8 +128196,7 @@ function distinctReduce(e11, t, n, r3, i, a) {
     root: r3,
     expansions: i,
     expandedTables: [],
-    fields: [],
-    graphId: e11.currentGraphId
+    fields: []
   };
   return {
     kind: "reduce",
@@ -128194,8 +128204,7 @@ function distinctReduce(e11, t, n, r3, i, a) {
     ty: n,
     input: s3,
     by: t,
-    aggregates: [],
-    graphId: e11.currentGraphId
+    aggregates: []
   };
 }
 function uniqueKeyModels(e11) {
@@ -128558,6 +128567,8 @@ function grainOf(e11, t) {
     case "filter":
     case "select":
       return grainOf(e11.input, t);
+    case "with_relationships":
+      return grainOf(e11.value, t);
     default:
       return t;
   }
@@ -128936,15 +128947,15 @@ function resolveWithRelationships(e11, t, n, r3) {
   }
   if (c3)
     return e11.resolveExpr(i, r3);
-  try {
-    return withGraph(e11, currentGraph(e11).derivedGraph(s3.map(relTypeToRel), false), () => e11.resolveExpr(i, r3));
-  } catch (t3) {
-    if (t3.code === ErrorCode.RELATIONSHIP_NOT_FOUND_0) {
-      let r4 = t3.args;
-      return e11.dataset.diagnostics.push(createError(ErrorCode.RELATIONSHIP_NOT_FOUND_0, n, undefined, r4?.[0])), synthIdent(e11, "<with_relationships>", [], errType, n);
-    }
-    throw t3;
-  }
+  let l3 = e11.resolveExpr(i, r3);
+  return {
+    kind: "with_relationships",
+    id: e11.newNodeId(n),
+    ty: l3.ty,
+    value: l3,
+    relationships: s3.map(relTypeToRel),
+    allowNewRelationships: false
+  };
 }
 registerMacro("with_relationships", (e11, t, n, r3) => resolveWithRelationships(e11, t, r3, n));
 function resolveRow(e11, t, n) {
@@ -129227,8 +129238,7 @@ function buildBranch(e11, t) {
     id: n.newNodeId(r3),
     ty: c3,
     grains: modelFieldExprs(n, u),
-    output: m3,
-    graphId: n.currentGraphId
+    output: m3
   } : makeTransform(n, "select", [makeUnique(n, u, createTableType(createRowType(u.map((e12) => isFieldType(e12.ty) ? e12.ty : createFieldType("", unknownType))), undefined), r3), ...m3], c3, r3);
 }
 function filterFieldOrigins(e11) {
@@ -129281,7 +129291,6 @@ function relationFieldRef(e11, t, n) {
     name: n.fieldName,
     path: [],
     qualifier: t,
-    graphId: r3.currentGraphId,
     synthetic: true
   };
 }
@@ -129292,8 +129301,7 @@ function boolCall(e11, t, n) {
     id: r3.newNodeId(i),
     ty: a,
     name: makeIdent(r3, t, [], a, i),
-    args: n,
-    graphId: r3.currentGraphId
+    args: n
   };
 }
 function buildEmptyChildrenChain(e11, t, n, r3, i) {
@@ -129317,8 +129325,7 @@ function buildEmptyChildrenChain(e11, t, n, r3, i) {
       joinKind: "left_outer",
       on: i3,
       leftAlias: t3 === 1 ? n3.alias : undefined,
-      rightAlias: r4.alias,
-      graphId: a.currentGraphId
+      rightAlias: r4.alias
     };
   }
   let S3 = (e12) => {
@@ -129334,8 +129341,7 @@ function buildEmptyChildrenChain(e11, t, n, r3, i) {
       id: a.newNodeId(s3),
       ty: t3,
       name: makeIdent(a, "coalesce", [], t3, s3),
-      args: [n3, ...r4.map((e12) => cloneResolved(a, e12))],
-      graphId: a.currentGraphId
+      args: [n3, ...r4.map((e12) => cloneResolved(a, e12))]
     };
     return {
       kind: Kind.NAMED_EXPRESSION,
@@ -129347,11 +129353,17 @@ function buildEmptyChildrenChain(e11, t, n, r3, i) {
   })], r3.ty, s3);
 }
 function resolveDynamicExplore(e11, t, n) {
-  let r3 = exploreRelationshipGraph(e11, t.relationships, n, t.loc), i = () => {
-    let { bindings: r4, inputs: i3 } = resolveExploreParams(e11, t.params, n);
-    return i3.length > 0 && (e11.dataset.paramInputs ??= []).push(...i3), withParamBindings(e11, r4, () => resolveDynamicExploreInner(e11, t, n));
+  let r3 = exploreRelationships(e11, t.relationships, n), { bindings: i, inputs: a } = resolveExploreParams(e11, t.params, n);
+  a.length > 0 && (e11.dataset.paramInputs ??= []).push(...a);
+  let s3 = withParamBindings(e11, i, () => resolveDynamicExploreInner(e11, t, n));
+  return r3.length === 0 ? s3 : {
+    kind: "with_relationships",
+    id: e11.newNodeId(t.loc),
+    ty: s3.ty,
+    value: s3,
+    relationships: r3.map(relTypeToRel),
+    allowNewRelationships: true
   };
-  return r3 ? withGraph(e11, r3, i) : i();
 }
 function resolveExploreParams(e11, t, n) {
   let r3 = [], i = [];
@@ -129376,25 +129388,15 @@ function resolveExploreParams(e11, t, n) {
     inputs: i
   };
 }
-function exploreRelationshipGraph(e11, t, n, r3) {
-  if (t.length === 0)
-    return;
-  let i = [], a = false;
-  for (let r4 of t) {
-    let t3 = resolveRelationshipArg(e11, r4, n);
-    t3 ? i.push(t3) : a = true;
+function exploreRelationships(e11, t, n) {
+  let r3 = [];
+  for (let i of t) {
+    let t3 = resolveRelationshipArg(e11, i, n);
+    if (!t3)
+      return [];
+    r3.push(t3);
   }
-  if (!a && i.length !== 0)
-    try {
-      return currentGraph(e11).derivedGraph(i.map(relTypeToRel), true);
-    } catch (t3) {
-      if (t3.code === ErrorCode.RELATIONSHIP_NOT_FOUND_0) {
-        let n3 = t3.args;
-        e11.dataset.diagnostics.push(createError(ErrorCode.RELATIONSHIP_NOT_FOUND_0, r3, undefined, n3?.[0]));
-        return;
-      }
-      throw t3;
-    }
+  return r3;
 }
 function constantArrayElements(e11) {
   return isConstantArrayType(e11) ? e11.elementTypes : [];
@@ -129548,7 +129550,7 @@ function classifyFilters(e11, t, n) {
   let r3 = [], i = [];
   return t.filters.forEach((t3) => {
     let a = e11.resolveExpr(t3, n);
-    validateExploreFilter(e11, t3, a), !isErrType(a.ty) && (isResultFieldFilter(a) ? r3.push(a) : isTableType(a.ty) ? i.push(desugarTableCondition(e11, a, n)) : involvesTable(a) || i.push(desugarMeasureCondition(e11, desugarSimpleModelCondition(e11, desugarShorthandCondition(e11, a)))));
+    validateExploreFilter(e11, t3, a), !isErrType(a.ty) && (isResultFieldFilter(a) ? r3.push(a) : isTableType(a.ty) ? i.push(desugarTableCondition(e11, a, n)) : referencesAggregateAlias(a) ? e11.dataset.diagnostics.push(createError(ErrorCode.INVALID_CONDITIONAL_EXPRESSION_IN_0, t3.loc, undefined, "filters")) : involvesTable(a) || i.push(desugarMeasureCondition(e11, desugarSimpleModelCondition(e11, desugarShorthandCondition(e11, a)))));
   }), {
     resultFilterNodes: r3,
     contextFilterNodes: i
@@ -129589,7 +129591,10 @@ function resolveDynamicExploreInner(e11, t, n) {
     validateHavingGrouped(e11, n3, t3, li3) && oi3.push(desugarMeasureCondition(e11, t3, di3, true));
   }
   r3.length === 0 && t.measures.length === 0 && e11.dataset.diagnostics.push(createError(ErrorCode.INVALID_EXPRESSION_0, t.loc, undefined, "Explore must have at least one dimension or measure."));
-  let fi3 = buildGrainExprMap(r3), pi3 = S3.map((e12) => e12.ty), mi3 = new Set(pi3.map((e12) => e12.fieldName)), hi3 = (e12) => e12.kind === Kind.FUNCTION_CALL && e12.args.length > 0 && e12.args[0].kind === Kind.IDENTIFIER && mi3.has(e12.args[0].name), gi3 = He4.filter(hi3), _i2 = He4.filter((e12) => !hi3(e12)), vi2 = {
+  let fi3 = buildGrainExprMap(r3), pi3 = S3.map((e12) => e12.ty), mi3 = new Set(pi3.map((e12) => e12.fieldName)), hi3 = (e12) => {
+    let t3 = unwrapNot(e12);
+    return t3.kind === Kind.FUNCTION_CALL && t3.args.length > 0 && t3.args[0].kind === Kind.IDENTIFIER && mi3.has(t3.args[0].name);
+  }, gi3 = He4.filter(hi3), _i2 = He4.filter((e12) => !hi3(e12)), vi2 = {
     resolver: e11,
     loc: t.loc,
     dimColumns: i,
@@ -129651,8 +129656,7 @@ function resolveDynamicExploreInner(e11, t, n) {
       ty: U3,
       input: s4[0],
       iterationDepth: iterationDepthOf(s4[0]),
-      branches: s4,
-      graphId: e11.currentGraphId
+      branches: s4
     };
   } else
     Oi3 = Ei3(buildBranch(vi2, i), i);
@@ -129695,8 +129699,7 @@ function resolveDynamicExploreInner(e11, t, n) {
     ty: Oi3.ty,
     input: Oi3,
     iterationDepth: iterationDepthOf(Oi3),
-    by: me3,
-    graphId: e11.currentGraphId
+    by: me3
   }), m3) {
     let n3 = i.filter((e12) => l3.has(e12.fieldName)), r4 = ki4 && n3.length > 0 && Ai3 ? buildEmptyChildrenPrefixes(vi2, n3, ji4).map((e12) => e12.node) : undefined;
     Oi3 = {
@@ -129712,8 +129715,7 @@ function resolveDynamicExploreInner(e11, t, n) {
       includeEmptyChildrenRows: ki4,
       emptyChildrenPrefixes: r4,
       outputColumns: S3.length > 0 ? Ni3 : undefined,
-      sorts: Ii3 ? Li4 : undefined,
-      graphId: e11.currentGraphId
+      sorts: Ii3 ? Li4 : undefined
     };
   }
   return Di3.length === 0 && (Oi3 = Si3(Oi3)), {
@@ -129728,8 +129730,44 @@ function resolveDynamicExploreInner(e11, t, n) {
 function isBareAliasConstantFilter(e11) {
   return e11.length === 2 && e11[0].kind === Kind.IDENTIFIER && e11[0].path.length === 0 && !involvesField(e11[1]);
 }
+function unwrapNot(e11) {
+  return e11.kind === Kind.FUNCTION_CALL && e11.name.name === Kind.NOT_KEYWORD && e11.args.length === 1 ? unwrapNot(e11.args[0]) : e11;
+}
 function isResultFieldFilter(e11) {
-  return isErrType(e11.ty) || e11.kind !== Kind.FUNCTION_CALL ? false : isBareAliasConstantFilter(e11.args);
+  if (isErrType(e11.ty))
+    return false;
+  let t = unwrapNot(e11);
+  if (t.kind !== Kind.FUNCTION_CALL)
+    return false;
+  if (isBareAliasConstantFilter(t.args))
+    return true;
+  let n = bareAliasLeaves(t);
+  return !!n && n.some(isAggregateAlias);
+}
+function bareAliasLeaves(e11) {
+  let t = unwrapNot(e11);
+  if (t.kind !== Kind.FUNCTION_CALL)
+    return;
+  if (isBareAliasConstantFilter(t.args)) {
+    let e12 = t.args[0];
+    return isFieldType(e12.ty) ? [e12.ty] : undefined;
+  }
+  if (t.name.name !== Kind.AND_KEYWORD && t.name.name !== Kind.OR_KEYWORD)
+    return;
+  let n = [];
+  for (let e12 of t.args) {
+    let t3 = bareAliasLeaves(e12);
+    if (!t3)
+      return;
+    n.push(...t3);
+  }
+  return n;
+}
+function isAggregateAlias(e11) {
+  return e11.subClass === "aggregate" || e11.subClass === "measure" || e11.subClass === "metric";
+}
+function referencesAggregateAlias(e11) {
+  return e11.kind === Kind.IDENTIFIER ? e11.path.length === 0 && isFieldType(e11.ty) && isAggregateAlias(e11.ty) : e11.kind === Kind.FUNCTION_CALL ? e11.args.some(referencesAggregateAlias) : e11.kind === Kind.NAMED_EXPRESSION ? referencesAggregateAlias(e11.expr) : e11.kind === "block" ? referencesAggregateAlias(e11.result) : false;
 }
 function involvesTable(e11) {
   return isTableType(e11.ty) && !e11.ty.isLiteral ? true : e11.kind === Kind.FUNCTION_CALL ? e11.args.some(involvesTable) : e11.kind === Kind.NAMED_EXPRESSION ? involvesTable(e11.expr) : e11.kind === "block" ? involvesTable(e11.result) : false;
@@ -130426,8 +130464,7 @@ function toExpandModel(e11, t) {
       root: n,
       expansions: [],
       expandedTables: [],
-      fields: [],
-      graphId: t.graphId ?? e11.currentGraphId
+      fields: []
     };
 }
 function addJoins(e11, t, n, r3, i = false, a = [], s3 = /* @__PURE__ */ new Set) {
@@ -130463,8 +130500,7 @@ function joinSource(e11, t, n, r3, i, a = false, s3 = [], c3 = /* @__PURE__ */ n
     root: n.kind === "extend_model" ? n : r3,
     expansions: [],
     expandedTables: [],
-    fields: [],
-    graphId: n.graphId ?? e11.currentGraphId
+    fields: []
   }, i, !a, s3, c3);
   return l3.expansions.length > 0 || (l3.expandedTables?.length ?? 0) > 0 ? l3 : n;
 }
@@ -130534,10 +130570,10 @@ function expandRefs(e11, t, n, r3, i, a = [], s3) {
       if (c4.predicate.kind === "in_table_condition") {
         if (!a3.every((e12) => l4.has(e12)))
           continue;
-        n3.predicates = [...n3.predicates ?? [], makeCondition(e11, cloneResolved(e11, appliedPredicate(c4)), c4.role, c4.graphId)];
+        n3.predicates = [...n3.predicates ?? [], makeCondition(e11, cloneResolved(e11, appliedPredicate(c4)), c4.role)];
         continue;
       }
-      let u3 = cloneResolved(e11, appliedPredicate(c4)), f4 = makeCondition(e11, u3, c4.role, c4.graphId);
+      let u3 = cloneResolved(e11, appliedPredicate(c4)), f4 = makeCondition(e11, u3, c4.role);
       joinIntoTable(e11, t, n3, crossModelNames([u3], baseModelName(n3.root)).filter((e12) => !l4.has(e12))) && (c4.targets.some(({ origin: e12 }) => r4.some((t3) => {
         let n4 = originOf(t3.ty);
         return refEq(n4, e12) || isSubtimeFieldOf(n4, e12) || isSubtimeFieldOf(e12, n4);
@@ -130807,10 +130843,10 @@ function normalizeConditions(e11, t, n, r3) {
     if (l3.length !== 0)
       if (t3.isCalendar || l3.some((e12) => reachesFannedModel(n, r3, e12))) {
         let t4 = l3.reduce((t5, n3) => makeCall(e11, "and", [t5, n3], truefalseType, locStub(), locStub()));
-        s3.push(makeCondition(e11, t4, c4.role, c4.graphId));
+        s3.push(makeCondition(e11, t4, c4.role));
       } else
         for (let t4 of l3)
-          s3.push(makeCondition(e11, t4, c4.role, c4.graphId));
+          s3.push(makeCondition(e11, t4, c4.role));
   }
   let c3 = /* @__PURE__ */ new Set;
   return s3.filter((e12) => {
@@ -130910,7 +130946,7 @@ function restatePlacedFilters(e11, t, n, r3, i) {
       if (r4.predicate.kind === "in_table_condition" || r4.targets.length === 0 || !i.has(r4))
         return false;
       let c4 = condFanEdge(e11, t, s3, r4);
-      return c4 !== undefined && n3.backKeys.some((e12) => originEq$1(e12, c4.to)) && r4.targets.every((e12) => a3.has(e12.origin.modelName));
+      return c4 !== undefined && n3.backKeys.some((e12) => originEq$1(e12, c4.to)) && r4.targets.every((e12) => a3.has(e12.origin.modelName)) && treeFitsCondition(e11, t, s3, n3, r4);
     });
     return l4.length <= n3.predicates.length ? n3 : (c3 = true, {
       ...n3,
@@ -130931,6 +130967,36 @@ function existenceTreeModels(e11) {
   }
   return t;
 }
+function stepAcross(e11, t) {
+  return t.from.modelName === e11 ? t.to.modelName : t.from.modelName;
+}
+function existenceTreePathKeys(e11) {
+  let t = /* @__PURE__ */ new Map, n = baseModelName(e11.tree.root);
+  for (let r3 of e11.tree.expansions) {
+    let e12 = n, i = "";
+    for (let n3 of r3.path)
+      e12 = stepAcross(e12, n3), i += `${fanEdgeKey(n3)} -> `, t.has(e12) || t.set(e12, i);
+  }
+  return t;
+}
+function treeFitsCondition(e11, t, n, r3, i) {
+  let a = conditionGraph(e11, t, i), s3 = existenceTreePathKeys(r3);
+  for (let t3 of crossModelNames([appliedPredicate(i)], n)) {
+    if (t3 === n)
+      continue;
+    let r4 = joinPathTo(e11, a, n, t3);
+    if (!r4)
+      continue;
+    let i3 = n, c3 = "";
+    for (let e12 of r4) {
+      i3 = stepAcross(i3, e12), c3 += `${fanEdgeKey(e12)} -> `;
+      let t4 = s3.get(i3);
+      if (t4 !== undefined && t4 !== c3)
+        return false;
+    }
+  }
+  return true;
+}
 function condFanEdge(e11, t, n, r3) {
   let i = conditionGraph(e11, t, r3);
   for (let t3 of import_lodash2.uniq(r3.targets.map((e12) => e12.origin.modelName)).filter((e12) => e12 !== n)) {
@@ -130943,7 +131009,7 @@ function condFanEdge(e11, t, n, r3) {
   }
 }
 function conditionGraph(e11, t, n) {
-  return n.role !== "rlp" || n.graphId == null ? t : e11.dataset.graphs.get(n.graphId) ?? t;
+  return n.role === "rlp" ? rlpGraph(e11) : t;
 }
 function applyFilter(e11, t, n, r3, i) {
   let a = conditionGraph(e11, t, r3), s3 = baseModelName(n.root), c3 = new Set([s3, ...n.expansions.filter((e12) => fanIndex(s3, e12.path) < 0).map((e12) => baseModelName(e12.model))]), l3 = import_lodash2.uniq(r3.targets.map((e12) => e12.origin.modelName)).filter((e12) => !c3.has(e12)), u, f3 = false;
@@ -130977,14 +131043,14 @@ function applyFilter(e11, t, n, r3, i) {
     let c4 = (n.expandedTables ?? []).find((e12) => fanEdgeKey(e12.edge) === fanEdgeKey(p3) && e12.expansions.some((e13) => e13.fields.length > 0)), l4 = leafFieldRefs(r3.predicate.row.map((e12) => e12.expr)).some((e12) => originOf(e12.ty)?.modelName === s3);
     if (c4 && !l4) {
       let t4 = crossModelNames(r3.predicate.row.map((e12) => e12.expr), s3), n3 = new Set(expandedTableModels(c4));
-      joinIntoTable(e11, a, c4, t4.filter((e12) => !n3.has(e12))) && (c4.pruningPredicates = [...c4.pruningPredicates ?? [], makeCondition(e11, cloneResolved(e11, appliedPredicate(r3)), r3.role, r3.graphId)]);
+      joinIntoTable(e11, a, c4, t4.filter((e12) => !n3.has(e12))) && (c4.pruningPredicates = [...c4.pruningPredicates ?? [], makeCondition(e11, cloneResolved(e11, appliedPredicate(r3)), r3.role)]);
     }
     return {
       ...n,
       existenceFilters: [...m3, t3]
     };
   }
-  let S3 = m3.find((e12) => !e12.negated && e12.predicates.every((e13) => e13.kind !== "in_table_condition") && e12.backKeys.some((e13) => originEq$1(e13, p3.to))), w3 = S3 ? conjoinScalarExistenceFilter(e11, a, s3, S3, r3) : buildScalarExistenceFilter(e11, a, s3, [r3], [p3.from.modelName]);
+  let S3 = m3.find((t3) => !t3.negated && t3.predicates.every((e12) => e12.kind !== "in_table_condition") && t3.backKeys.some((e12) => originEq$1(e12, p3.to)) && treeFitsCondition(e11, a, s3, t3, r3)), w3 = S3 ? conjoinScalarExistenceFilter(e11, a, s3, S3, r3) : buildScalarExistenceFilter(e11, a, s3, [r3], [p3.from.modelName]);
   return w3 ? (i.add(r3), {
     ...n,
     existenceFilters: S3 ? m3.map((e12) => e12 === S3 ? w3 : e12) : [...m3, w3]
@@ -131080,25 +131146,23 @@ var Rolling = class {
   applyToRef(e11, t, n) {
     let { g: r3 } = this, i = this.pending;
     this.pending = undefined;
-    let a = i ? rollingGrainLayout(r3.resolver, i, r3.grain.map((e12) => e12.expr)) : undefined, s3 = a ? a.columns.map((e12) => e12.expr) : [], c3 = r3.resolver.currentGraphId;
-    r3.resolver.currentGraphId = e11.graphId ?? c3;
-    let l3 = r3.contextFilters, u, f3 = i?.keepFilters === false || (i?.lowerBounds.size ?? 0) > 0;
-    if (i && a && f3 && r3.contextFilters.some((e12) => filterOnRunDimension(e12, i.run.map((e13) => e13.key)))) {
+    let a = i ? rollingGrainLayout(r3.resolver, i, r3.grain.map((e12) => e12.expr)) : undefined, s3 = a ? a.columns.map((e12) => e12.expr) : [], c3 = r3.contextFilters, l3, u = i?.keepFilters === false || (i?.lowerBounds.size ?? 0) > 0;
+    if (i && a && u && r3.contextFilters.some((e12) => filterOnRunDimension(e12, i.run.map((e13) => e13.key)))) {
       let t3 = r3.period.withActive(s3, () => n(modelFieldExprs(r3.resolver, s3)));
-      u = {
+      l3 = {
         ...e11,
         reduce: t3
       };
       let a3 = i.run.map((e12) => e12.key);
       r3.contextFilters = r3.contextFilters.filter((e12) => !filterOnRunDimension(e12, a3));
     }
-    let p3 = a ? r3.period.withActive(s3, () => n(modelFieldExprs(r3.resolver, s3))) : n(r3.aggGrain());
-    r3.contextFilters = l3, r3.resolver.currentGraphId = c3, this.pending = i;
-    let m3 = {
+    let f3 = a ? r3.period.withActive(s3, () => n(modelFieldExprs(r3.resolver, s3))) : n(r3.aggGrain());
+    r3.contextFilters = c3, this.pending = i;
+    let p3 = {
       ...e11,
-      reduce: p3
-    }, S3 = i?.fillMissing ? r3.explore.pivotAxes() : undefined;
-    return a ? applyRolling(r3.resolver, m3, a, t, u, S3) : m3;
+      reduce: f3
+    }, m3 = i?.fillMissing ? r3.explore.pivotAxes() : undefined;
+    return a ? applyRolling(r3.resolver, p3, a, t, l3, m3) : p3;
   }
 };
 function rollingGrainLayout(e11, t, n) {
@@ -131198,8 +131262,7 @@ function regroupAtGrain(e11, t, n, r3) {
     ty: createTableType(createRowType([...i.map((e12) => e12.ty), ...t.reduce.aggregates.map((e12) => e12.ty)]), t.reduce.ty.rootModel),
     input: t.reduce.input,
     by: i,
-    aggregates: t.reduce.aggregates,
-    graphId: t.reduce.graphId
+    aggregates: t.reduce.aggregates
   };
   return {
     ...t,
@@ -131228,8 +131291,7 @@ function distinctAxis(e11, t, n, r3) {
     ty: createTableType(createRowType(a.map((e12) => e12.ty)), t.ty.rootModel),
     input: i,
     by: a,
-    aggregates: [],
-    graphId: t.graphId
+    aggregates: []
   };
 }
 function fillPivotAnchor(e11, t, n, r3, i) {
@@ -131250,8 +131312,7 @@ function fillPivotAnchor(e11, t, n, r3, i) {
     joinKind: "inner",
     on: f3,
     leftAlias: relationAlias(l3),
-    rightAlias: relationAlias(u),
-    graphId: t.graphId
+    rightAlias: relationAlias(u)
   }, m3 = (e12) => a[e12] === "row" ? l3 : u, S3 = t.by.some((e12, t3) => a[t3] === undefined);
   if (!r3 && !S3) {
     let n3 = modelFieldExprs(e11, t.by.map((t3, n4) => relationColumnRef(e11, m3(n4), t3.expr)));
@@ -131261,8 +131322,7 @@ function fillPivotAnchor(e11, t, n, r3, i) {
       ty: createTableType(createRowType(n3.map((e12) => e12.ty)), t.ty.rootModel),
       input: p3,
       by: n3,
-      aggregates: [],
-      graphId: t.graphId
+      aggregates: []
     };
   }
   let w3 = cloneResolved(e11, t), E3 = t.by.map((t3, n3) => a[n3] === undefined ? undefined : call(e11, "null_safe_eq", [relationColumnRef(e11, m3(n3), t3.expr), relationColumnRef(e11, w3, t3.expr)], truefalseType, i)).filter((e12) => e12 !== undefined), N = {
@@ -131274,8 +131334,7 @@ function fillPivotAnchor(e11, t, n, r3, i) {
     joinKind: "left_outer",
     on: E3.reduce((t3, n3) => call(e11, "and", [t3, n3], truefalseType, i)),
     leftAlias: relationAlias(p3),
-    rightAlias: relationAlias(w3),
-    graphId: t.graphId
+    rightAlias: relationAlias(w3)
   }, I3 = modelFieldExprs(e11, t.by.map((t3, n3) => relationColumnRef(e11, a[n3] === undefined ? w3 : m3(n3), t3.expr))), L3 = t.aggregates.map((t3) => {
     let n3 = t3, r4 = n3.ty.fieldName, a3 = {
       kind: Kind.IDENTIFIER,
@@ -131283,8 +131342,7 @@ function fillPivotAnchor(e11, t, n, r3, i) {
       ty: n3.ty,
       name: r4,
       path: [],
-      qualifier: relationAlias(w3),
-      graphId: w3.graphId
+      qualifier: relationAlias(w3)
     };
     return {
       ...n3,
@@ -131298,8 +131356,7 @@ function fillPivotAnchor(e11, t, n, r3, i) {
     ty: createTableType(createRowType([...I3.map((e12) => e12.ty), ...L3.map((e12) => e12.ty)]), t.ty.rootModel),
     input: N,
     by: I3,
-    aggregates: L3,
-    graphId: t.graphId
+    aggregates: L3
   };
 }
 function windowJoin(e11, t, n, r3, i, a, s3) {
@@ -131322,8 +131379,7 @@ function windowJoin(e11, t, n, r3, i, a, s3) {
     joinKind: "inner",
     on: w3,
     leftAlias: relationAlias(c3),
-    rightAlias: relationAlias(S3),
-    graphId: c3.graphId
+    rightAlias: relationAlias(S3)
   }, N = modelFieldExprs(e11, c3.by.filter((e12, t3) => !i.columns[t3].extra).map((t3) => relationColumnRef(e11, S3, t3.expr))), I3 = relationColumnRef(e11, c3, t, t.column), L3 = isFieldType(t.ty) ? createFieldType(t.column, t.ty.type, undefined, undefined, "aggregate") : t.ty, U3 = {
     kind: Kind.FUNCTION_CALL,
     id: e11.newNodeId(r3),
@@ -131339,8 +131395,7 @@ function windowJoin(e11, t, n, r3, i, a, s3) {
       ty: W3,
       input: E3,
       by: N,
-      aggregates: [U3],
-      graphId: c3.graphId
+      aggregates: [U3]
     },
     column: t.column
   };
@@ -131535,7 +131590,6 @@ function relationColumnRef(e11, t, n, r3) {
     name: r3 ?? columnAlias(n, 0),
     path: [],
     qualifier: relationAlias(t),
-    graphId: t.graphId,
     synthetic: true,
     ...a === undefined ? {} : { timeSpine: a }
   };
@@ -131645,8 +131699,7 @@ function addInheritedPartition(e11, t) {
       id: e11.resolver.newNodeId(r3),
       ty: n3.ty,
       name: makeIdent(e11.resolver, "partition", [], n3.ty, r3),
-      expr: n3,
-      graphId: e11.resolver.currentGraphId
+      expr: n3
     };
   });
   return i.length > 0 ? {
@@ -131668,8 +131721,7 @@ function partitionByRemainingGrain(e11, t) {
       id: e11.resolver.newNodeId(i),
       ty: n3.ty,
       name: makeIdent(e11.resolver, "partition", [], n3.ty, i),
-      expr: n3,
-      graphId: e11.resolver.currentGraphId
+      expr: n3
     };
   });
   return a.length > 0 ? {
@@ -131738,15 +131790,13 @@ var Window = class {
       expr: {
         ...e11,
         ty: a
-      },
-      graphId: t.resolver.currentGraphId
+      }
     }, l3 = {
       kind: "merge",
       id: t.resolver.newNodeId(n),
       ty: createTableType(createRowType([...s3, a]), undefined),
       grains: t.grain.map((e12) => cloneResolved(t.resolver, e12)),
-      output: [...t.grain.map((e12) => cloneResolved(t.resolver, e12.expr)), c3],
-      graphId: t.resolver.currentGraphId
+      output: [...t.grain.map((e12) => cloneResolved(t.resolver, e12.expr)), c3]
     }, u = t.grain.map((e12) => cloneResolved(t.resolver, e12)), f3 = createFieldType(r3, i, undefined, undefined, "aggregate"), p3 = {
       kind: Kind.FUNCTION_CALL,
       id: t.resolver.newNodeId(n),
@@ -131759,16 +131809,14 @@ var Window = class {
       ty: createTableType(createRowType([...u.map((e12) => e12.ty), f3]), undefined),
       input: l3,
       by: u,
-      aggregates: [p3],
-      graphId: t.resolver.currentGraphId
+      aggregates: [p3]
     }, S3 = isFieldType(e11.ty) ? createFieldType(r3, e11.ty.type, undefined, undefined, "aggregate") : f3;
     return {
       kind: "computed_ref",
       id: t.resolver.newNodeId(n),
       ty: S3,
       reduce: m3,
-      column: r3,
-      graphId: t.resolver.currentGraphId
+      column: r3
     };
   }
   foldAgg(e11) {
@@ -131831,8 +131879,7 @@ var Window = class {
         ty: e12.ty,
         name: makeIdent(u.resolver, e12.name, [], e12.ty, l3),
         expr: e12.expr
-      }))],
-      graphId: u.resolver.currentGraphId
+      }))]
     }, N = e11.map((e12, t3) => {
       let i3 = `__w_${this.windowLodCounter++}`, a3 = createFieldType(i3, numberType), c4 = w3[t3];
       return {
@@ -131962,9 +132009,9 @@ function substituteTimeSpineCondition(e11, t, n) {
       ...t.predicate,
       row: substituteTimeSpineRow(e11, t.predicate.row, n)
     };
-    return makeCondition(e11.resolver, r3, t.role, t.graphId);
+    return makeCondition(e11.resolver, r3, t.role);
   }
-  return makeCondition(e11.resolver, substituteTimeSpineInExpr(e11, t.predicate, n), t.role, t.graphId);
+  return makeCondition(e11.resolver, substituteTimeSpineInExpr(e11, t.predicate, n), t.role);
 }
 function substituteTimeSpineRow(e11, t, n) {
   return modelFieldExprs(e11.resolver, t.map((t3) => substituteTimeSpineKey(e11, dayGrainCalendarKey(e11, t3.expr), n)));
@@ -132203,9 +132250,9 @@ var Period = class e11 {
           } else
             this.mods.set(s3, {
               ...c3,
-              match: makeCondition(t.resolver, shiftFilterByInterval(t, c3.match.predicate, r4), c3.match.role, c3.match.graphId)
+              match: makeCondition(t.resolver, shiftFilterByInterval(t, c3.match.predicate, r4), c3.match.role)
             });
-          t.contextFilters = [...u, ...f3.map((e13) => makeCondition(t.resolver, shiftFilterByInterval(t, e13.predicate, r4), e13.role, e13.graphId))];
+          t.contextFilters = [...u, ...f3.map((e13) => makeCondition(t.resolver, shiftFilterByInterval(t, e13.predicate, r4), e13.role))];
         }
       }
       return t.foldExpr(e12.value);
@@ -132237,17 +132284,17 @@ var Period = class e11 {
       if (matchesDim(e12, t.origin))
         return t;
   }
-  strictBounds(e12, t, n) {
+  strictBounds(e12, t) {
     if (!this.anyActive)
       return [];
-    let r3 = [];
-    for (let i of this.mods.values()) {
-      if (i.kind !== "relative" || !i.strictDim)
+    let n = [];
+    for (let r3 of this.mods.values()) {
+      if (r3.kind !== "relative" || !r3.strictDim)
         continue;
-      let a = e12.filter((e13) => matchesDim(e13, i.origin) && this.isShifted(e13)), s3 = a.length > 0 ? strictClamp(this.g, t, n, i.strictDim, a) : undefined;
-      s3 && r3.push(makeCondition(this.g.resolver, s3, "where", n));
+      let i = e12.filter((e13) => matchesDim(e13, r3.origin) && this.isShifted(e13)), a = i.length > 0 ? strictClamp(this.g, t, r3.strictDim, i) : undefined;
+      a && n.push(makeCondition(this.g.resolver, a, "where"));
     }
-    return r3;
+    return n;
   }
   isShifted(t) {
     let n = e11.keyOf(t);
@@ -132272,7 +132319,7 @@ var Period = class e11 {
         id: n.resolver.newNodeId(c3),
         ty: nullType
       }, p3 = call(n.resolver, "is", [cloneResolved(n.resolver, s3), f3], truefalseType, c3);
-      r3.push(makeCondition(n.resolver, call(n.resolver, "or", [p3, u], truefalseType, c3), "where", n.resolver.currentGraphId));
+      r3.push(makeCondition(n.resolver, call(n.resolver, "or", [p3, u], truefalseType, c3), "where"));
     }
     return r3;
   }
@@ -132327,21 +132374,19 @@ function minStartRef(e12, t) {
     ty: c3,
     name: makeIdent(e12.resolver, "min", [], c3, n),
     args: [cloneResolved(e12.resolver, t)]
-  }, u = e12.resolver.currentGraphId, f3 = {
+  }, u = {
     kind: "reduce",
     id: e12.resolver.newNodeId(n),
     ty: createTableType(createRowType([c3]), i.modelName),
     input: makeIdent(e12.resolver, i.modelName, [], a.ty, n),
     by: [],
-    aggregates: [l3],
-    graphId: u
-  }, p3 = {
+    aggregates: [l3]
+  }, f3 = {
     kind: "computed_ref",
     id: e12.resolver.newNodeId(n),
     ty: c3,
-    reduce: f3,
-    column: s3,
-    graphId: u
+    reduce: u,
+    column: s3
   };
   return {
     kind: "lod",
@@ -132351,7 +132396,7 @@ function minStartRef(e12, t) {
     grain: [],
     keepFilters: true,
     exactRangeAnchor: true,
-    value: p3
+    value: f3
   };
 }
 function exactPeriodKey(e12, t, n, r3) {
@@ -132415,63 +132460,61 @@ function exactMatch(e12, t) {
     name: makeIdent(e12.resolver, "match", [], truefalseType, n),
     args: [cloneResolved(e12.resolver, t.dim), cloneResolved(e12.resolver, t.interval)]
   };
-  return makeCondition(e12.resolver, r3, "where", e12.resolver.currentGraphId);
+  return makeCondition(e12.resolver, r3, "where");
 }
-function strictClamp(e12, t, n, r3, i) {
-  if (i.length === 0)
+function strictClamp(e12, t, n, r3) {
+  if (r3.length === 0)
     return;
-  let a = minMaxRefs(e12, t, n, r3);
-  if (!a)
+  let i = minMaxRefs(e12, t, n);
+  if (!i)
     return;
-  let { minRef: s3, maxRef: c3 } = a, l3 = [];
-  for (let t3 of i) {
-    let n3 = unwrapNamed(t3), r4 = dateUnitOfGrain(n3), i3 = e12.resolver.dataset.spans.get(n3.id) ?? locStub(), a3 = () => cloneResolved(e12.resolver, n3), u = r4 ? dateTrunc(e12, s3, r4, i3) : s3, f3 = r4 ? dateTrunc(e12, c3, r4, i3) : c3, p3 = call(e12.resolver, ">=", [a3(), u], truefalseType, i3), m3 = call(e12.resolver, "<=", [a3(), f3], truefalseType, i3);
-    l3.push(call(e12.resolver, "and", [p3, m3], truefalseType, i3));
+  let { minRef: a, maxRef: s3 } = i, c3 = [];
+  for (let t3 of r3) {
+    let n3 = unwrapNamed(t3), r4 = dateUnitOfGrain(n3), i3 = e12.resolver.dataset.spans.get(n3.id) ?? locStub(), l3 = () => cloneResolved(e12.resolver, n3), u = r4 ? dateTrunc(e12, a, r4, i3) : a, f3 = r4 ? dateTrunc(e12, s3, r4, i3) : s3, p3 = call(e12.resolver, ">=", [l3(), u], truefalseType, i3), m3 = call(e12.resolver, "<=", [l3(), f3], truefalseType, i3);
+    c3.push(call(e12.resolver, "and", [p3, m3], truefalseType, i3));
   }
-  return l3.reduce((t3, n3) => {
+  return c3.reduce((t3, n3) => {
     let r4 = e12.resolver.dataset.spans.get(t3.id) ?? locStub();
     return call(e12.resolver, "and", [t3, n3], truefalseType, r4);
   });
 }
-function minMaxRefs(e12, t, n, r3) {
-  let i = isFieldType(r3.ty) ? r3.ty : undefined, a = i?.origin, s3 = a == null ? undefined : findModel$1(e12.resolver.dataset, a.modelName);
-  if (a == null || s3 == null)
+function minMaxRefs(e12, t, n) {
+  let r3 = isFieldType(n.ty) ? n.ty : undefined, i = r3?.origin, a = i == null ? undefined : findModel$1(e12.resolver.dataset, i.modelName);
+  if (i == null || a == null)
     return;
-  let c3 = (c4) => {
-    let l3 = `${c4}_${a.modelName}->${a.fieldName}`, u = createFieldType(l3, i?.type ?? numberType, undefined, undefined, "aggregate"), f3 = {
+  let s3 = (s4) => {
+    let c3 = `${s4}_${i.modelName}->${i.fieldName}`, l3 = createFieldType(c3, r3?.type ?? numberType, undefined, undefined, "aggregate"), u = {
       kind: Kind.FUNCTION_CALL,
       id: e12.resolver.newNodeId(t),
-      ty: u,
-      name: makeIdent(e12.resolver, c4, [], u, t),
-      args: [cloneResolved(e12.resolver, r3)]
-    }, p3 = {
+      ty: l3,
+      name: makeIdent(e12.resolver, s4, [], l3, t),
+      args: [cloneResolved(e12.resolver, n)]
+    }, f3 = {
       kind: "reduce",
       id: e12.resolver.newNodeId(t),
-      ty: createTableType(createRowType([u]), a.modelName),
-      input: makeIdent(e12.resolver, a.modelName, [], s3.ty, t),
+      ty: createTableType(createRowType([l3]), i.modelName),
+      input: makeIdent(e12.resolver, i.modelName, [], a.ty, t),
       by: [],
-      aggregates: [f3],
-      graphId: n
-    }, m3 = {
+      aggregates: [u]
+    }, p3 = {
       kind: "computed_ref",
       id: e12.resolver.newNodeId(t),
-      ty: u,
-      reduce: p3,
-      column: l3,
-      graphId: n
-    }, S3 = {
+      ty: l3,
+      reduce: f3,
+      column: c3
+    }, m3 = {
       kind: "lod",
       id: e12.resolver.newNodeId(t),
-      ty: u,
+      ty: l3,
       modifier: "exclude",
       grain: [],
-      value: m3
+      value: p3
     };
-    return e12.foldExpr(S3);
+    return e12.foldExpr(m3);
   };
   return {
-    minRef: c3("min"),
-    maxRef: c3("max")
+    minRef: s3("min"),
+    maxRef: s3("max")
   };
 }
 function dateTrunc(e12, t, n, r3) {
@@ -132572,7 +132615,7 @@ function foldWhere(e12, t) {
   let n = e12.contextFilters, r3 = mergeGrainsOf(t.value), i = t.conditions.map((t3) => {
     let n3 = e12.grain, i3 = inheritsViz(t3) && r3.length === 0;
     inheritsViz(t3) && r3.length > 0 && (e12.grain = r3);
-    let a3 = () => e12.suppressGroupedRefCheck(() => makeCondition(e12.resolver, unwrapBlock$1(e12.foldExpr(t3)), "where", e12.resolver.currentGraphId));
+    let a3 = () => e12.suppressGroupedRefCheck(() => makeCondition(e12.resolver, unwrapBlock$1(e12.foldExpr(t3)), "where"));
     i3 && (e12.grain = e12.period.rawKeys(e12.grain));
     let s3 = i3 ? e12.period.withoutShift(a3) : a3();
     return e12.grain = n3, s3;
@@ -132746,6 +132789,44 @@ function dimensionsOnAxis(e12, t) {
 function orderWrapperName(e12) {
   return e12.kind === Kind.FUNCTION_CALL && (e12.name.name.startsWith("asc") || e12.name.name.startsWith("desc")) ? e12.name.name : undefined;
 }
+var GraphContext = class {
+  g;
+  graphs = [];
+  constructor(e12) {
+    this.g = e12;
+  }
+  currentGraph() {
+    return this.graphs[this.graphs.length - 1] ?? this.baseGraph();
+  }
+  baseGraph() {
+    return baseGraph(this.g.resolver);
+  }
+  rlpGraph() {
+    return rlpGraph(this.g.resolver);
+  }
+  graphFor(e12) {
+    return e12.role === "rlp" ? this.rlpGraph() : this.currentGraph();
+  }
+  newGraph(e12, t) {
+    try {
+      return this.currentGraph().derivedGraph(e12.relationships.map((e13) => ({ ...e13 })), e12.allowNewRelationships);
+    } catch (e13) {
+      if (e13.code !== ErrorCode.RELATIONSHIP_NOT_FOUND_0)
+        throw e13;
+      let n = e13.args;
+      this.g.resolver.dataset.diagnostics.push(createError(ErrorCode.RELATIONSHIP_NOT_FOUND_0, t, undefined, n?.[0]));
+      return;
+    }
+  }
+  withGraph(e12, t) {
+    this.graphs.push(e12);
+    try {
+      return t();
+    } finally {
+      this.graphs.pop();
+    }
+  }
+};
 function findModelByName(e12, t) {
   let n = e12.globalModule;
   for (let e13 of t.split(".")) {
@@ -132828,6 +132909,7 @@ var GrainFold = class extends HirFold {
   window = new Window(this);
   timeSpine = new TimeSpine(this);
   explore = new Explore(this);
+  graphContext = new GraphContext(this);
   foldedDims = /* @__PURE__ */ new Set;
   foldingDims = /* @__PURE__ */ new Set;
   foldingDimKeys = /* @__PURE__ */ new Set;
@@ -132861,8 +132943,7 @@ var GrainFold = class extends HirFold {
       id: this.resolver.newNodeId(),
       ty: createFieldType(n.name.name, n.ty.type, n.origin, t, "dimension"),
       name: n.name.name,
-      path: [],
-      graphId: this.resolver.currentGraphId
+      path: []
     };
     return modelFieldExprs(this.resolver, [r3]);
   }
@@ -132893,6 +132974,10 @@ var GrainFold = class extends HirFold {
   foldPivotContext(e12) {
     return this.explore.fold(e12);
   }
+  foldWithRelationships(e12) {
+    let t = this.resolver.dataset.spans.get(e12.id) ?? locStub(), n = this.graphContext.newGraph(e12, t);
+    return n ? this.graphContext.withGraph(n, () => this.foldExpr(e12.value)) : synthIdent(this.resolver, "<with_relationships>", [], errType, t);
+  }
   foldExploreContext(e12) {
     let t = this.resolver.exploreContextFilters;
     this.resolver.exploreContextFilters = e12.filters;
@@ -132923,8 +133008,7 @@ var GrainFold = class extends HirFold {
           ty: createTableType(createRowType(i.map((e13) => e13.ty)), e12.ty.rootModel),
           input: s3,
           by: i,
-          aggregates: [],
-          graphId: this.resolver.currentGraphId
+          aggregates: []
         };
         break;
       }
@@ -132989,7 +133073,7 @@ var GrainFold = class extends HirFold {
         break;
       }
       case "reduce": {
-        let t3 = this.timeSpine.graphWithCalendar(this.resolver.dataset.graphs.get(this.resolver.currentGraphId)), r3 = this.inheritedGrain, i = this.grain, a = this.foldKeys(this.period.applyToKeys(e12.by, e12));
+        let t3 = this.timeSpine.graphWithCalendar(this.graphContext.currentGraph()), r3 = this.inheritedGrain, i = this.grain, a = this.foldKeys(this.period.applyToKeys(e12.by, e12));
         this.inheritedGrain = dedupKeys([...this.inheritedGrain, ...a]), this.grain = a;
         let s3 = this.noSlice;
         this.noSlice = [];
@@ -133015,10 +133099,7 @@ var GrainFold = class extends HirFold {
   resolveJoins(e12) {
     if (e12.kind !== "select" && e12.kind !== "filter" && e12.kind !== "sort")
       return e12;
-    let t = this.resolver.dataset.graphs.get(e12.graphId ?? this.resolver.currentGraphId);
-    if (!t)
-      return e12;
-    let n = e12;
+    let t = this.graphContext.currentGraph(), n = e12;
     if (n.input.kind === Kind.IDENTIFIER) {
       let e13 = toExpandModel(this.resolver, n.input);
       e13 && (n = {
@@ -133046,10 +133127,7 @@ var GrainFold = class extends HirFold {
     let n = this.payloadSource;
     if (!n || e12.length === 0)
       return true;
-    let r3 = this.resolver.dataset.graphs.get(n.source.graphId ?? this.resolver.currentGraphId);
-    if (!r3)
-      return true;
-    let i = this.collectAccessedFields(e12, n.depth);
+    let r3 = this.graphContext.currentGraph(), i = this.collectAccessedFields(e12, n.depth);
     if (i.length === 0)
       return true;
     let a = this.resolver.dataset.diagnostics.length;
@@ -133143,12 +133221,7 @@ var GrainFold = class extends HirFold {
         if (!t.inline && !isRelation(t.value))
           return e12;
         let n = cloneResolved(this.resolver, t.value);
-        if (this.groupKeys && isRelation(n)) {
-          let e13 = this.resolver.dataset.graphs.get(n.graphId ?? this.resolver.currentGraphId);
-          if (e13)
-            return addJoins(this.resolver, e13, n, this.groupKeys);
-        }
-        return n;
+        return this.groupKeys && isRelation(n) ? addJoins(this.resolver, this.graphContext.currentGraph(), n, this.groupKeys) : n;
       }
       t?.kind === "dimension" && this.foldDimDeclaration(t);
     }
@@ -133171,33 +133244,30 @@ var GrainFold = class extends HirFold {
     let t = toExpandModel(this.resolver, e12);
     if (!t)
       return;
-    let n = t.graphId ?? this.resolver.currentGraphId, r3 = this.resolver.dataset.graphs.get(n);
-    if (!r3)
-      return;
-    let i = baseModelName(t.root);
-    this.groupKeys && this.diagnoseGroupFanout(r3, i, this.groupKeys);
-    let a = this.timeSpine.graphWithCalendar(r3), s3 = this.period.withExactRange(() => effectiveFiltersForModel(this, i));
-    s3 = [...s3, ...this.period.dayRoundtripFilters(this.period.rawKeys(this.grain).map((e13) => e13.expr))], s3 = this.applicableRlp(i, s3), s3 = this.applicableFilters(a, i, s3);
-    let c3 = normalizeConditions(this.resolver, s3, a, i), l3 = /* @__PURE__ */ new Set, { noSlice: u } = this, { grain: f3 } = this;
-    if (u) {
-      let e13 = (e14) => e14 === "H.calendar" || r3.canReach(i, e14, {
+    let n = this.graphContext.currentGraph(), r3 = baseModelName(t.root);
+    this.groupKeys && this.diagnoseGroupFanout(n, r3, this.groupKeys);
+    let i = this.timeSpine.graphWithCalendar(n), a = this.period.withExactRange(() => effectiveFiltersForModel(this, r3));
+    a = [...a, ...this.period.dayRoundtripFilters(this.period.rawKeys(this.grain).map((e13) => e13.expr))], a = this.applicableRlp(r3, a), a = this.applicableFilters(i, r3, a);
+    let s3 = normalizeConditions(this.resolver, a, i, r3), c3 = /* @__PURE__ */ new Set, { noSlice: l3 } = this, { grain: u } = this;
+    if (l3) {
+      let e13 = (e14) => e14 === "H.calendar" || n.canReach(r3, e14, {
         allowFanout: true,
         respectFilterDirection: true
-      }), t3 = f3.filter((t4) => !exprModels(t4.expr).every(e13));
+      }), t3 = u.filter((t4) => !exprModels(t4.expr).every(e13));
       if (t3.length > 0) {
-        f3 = f3.filter((e15) => !t3.includes(e15));
-        let e14 = this.noSliceComments(i, t3);
-        u.push(...t3.map((t4, n3) => ({
+        u = u.filter((e15) => !t3.includes(e15));
+        let e14 = this.noSliceComments(r3, t3);
+        l3.push(...t3.map((t4, n3) => ({
           key: t4,
           comment: e14[n3]
         })));
       }
     }
-    t = addJoins(this.resolver, a, t, f3, true, c3, l3), t.kind === "expand_model" && (t = applyFilters(this.resolver, a, t, c3, l3));
-    let p3 = c3.filter((e13) => !l3.has(e13)), m3 = this.resolver.dataset.spans.get(e12.id) ?? locStub(), S3 = p3.flatMap((e13) => e13.predicate.kind === "in_table_condition" ? e13.predicate.row.map((e14) => e14.expr) : []);
-    S3.length > 0 && (t = addJoins(this.resolver, r3, t, leafFields(this.resolver, S3))), p3.length > 0 && (t = this.filterInput(t, m3, p3));
-    let w3 = this.period.strictBounds(bareLeafKeys(this.resolver, f3, materialisedOrigins(t)).map((e13) => e13.expr), m3, n);
-    return w3.length > 0 ? this.filterInput(t, m3, w3) : t;
+    t = addJoins(this.resolver, i, t, u, true, s3, c3), t.kind === "expand_model" && (t = applyFilters(this.resolver, i, t, s3, c3));
+    let f3 = s3.filter((e13) => !c3.has(e13)), p3 = this.resolver.dataset.spans.get(e12.id) ?? locStub(), m3 = f3.flatMap((e13) => e13.predicate.kind === "in_table_condition" ? e13.predicate.row.map((e14) => e14.expr) : []);
+    m3.length > 0 && (t = addJoins(this.resolver, n, t, leafFields(this.resolver, m3))), f3.length > 0 && (t = this.filterInput(t, p3, f3));
+    let S3 = this.period.strictBounds(bareLeafKeys(this.resolver, u, materialisedOrigins(t)).map((e13) => e13.expr), p3);
+    return S3.length > 0 ? this.filterInput(t, p3, S3) : t;
   }
   diagnoseGroupFanout(e12, t, n) {
     let r3 = /* @__PURE__ */ new Set;
@@ -133224,7 +133294,7 @@ var GrainFold = class extends HirFold {
     let t = e12.grain;
     if (e12.axis !== undefined && (t = this.explore.axisExcludeGrain(e12.axis), t.length === 0))
       return this.foldExpr(e12.value);
-    let n = this.grain, r3 = this.contextFilters, i = this.resolver.dataset.graphs.get(e12.graphId ?? this.resolver.currentGraphId);
+    let n = this.grain, r3 = this.contextFilters, i = this.graphContext.currentGraph();
     this.grain = lodGrain(this.resolver, e12.modifier, this.grain, t, !!e12.all, i), e12.modifier === "keep" && !e12.all ? this.contextFilters = e12.keepFilters ? r3 : r3.filter((t3) => filterOnKeptGrain(t3, e12.grain)) : e12.modifier === "exclude" && e12.axis === undefined && !e12.all && !e12.keepFilters ? this.contextFilters = r3.filter((e13) => !filterOnExcludedGrain(e13, t, i)) : e12.modifier === "exact_grains" && (e12.keepFilters ? this.foldingDimKeys.size > 0 && (this.contextFilters = this.keepFilterConditions()) : this.contextFilters = []);
     let a = this.inLodBoundary;
     e12.modifier === "exclude" && !e12.all && (this.inLodBoundary = true);
@@ -133245,21 +133315,19 @@ var GrainFold = class extends HirFold {
     try {
       return n.map((e13) => {
         let t3 = this.foldExpr(cloneResolved(this.resolver, e13)), n3 = t3.kind === "block" ? t3.result : t3;
-        return makeCondition(this.resolver, n3, "where", this.resolver.currentGraphId);
+        return makeCondition(this.resolver, n3, "where");
       });
     } finally {
       this.grain = r3;
     }
   }
   foldUnique(e12) {
-    let t = this.resolver.dataset.spans.get(e12.id) ?? locStub(), n = dedupKeys([...this.period.applyToKeys(this.grain), ...this.foldKeys(e12.keys)]), r3 = createTableType(createRowType(n.map((e13) => e13.ty)), undefined), i = this.resolver.currentGraphId;
-    this.resolver.currentGraphId = e12.graphId ?? i;
-    let a = this.resolver.dataset.graphs.get(e12.graphId ?? i), s3 = new Set(n.flatMap((e13) => exprModels(e13.expr))), c3 = this.period.withExactRange(() => effectiveFilters(this)), l3 = fanoutFilterModels(c3, s3, a), u = resolveUnique(this.resolver, n, r3, t, l3, c3, (e13) => this.foldGroupedRoot(e13, n, t));
-    return this.resolver.currentGraphId = i, logger.debug(`unique #${e12.id} → ${u.kind}`, {
+    let t = this.resolver.dataset.spans.get(e12.id) ?? locStub(), n = dedupKeys([...this.period.applyToKeys(this.grain), ...this.foldKeys(e12.keys)]), r3 = createTableType(createRowType(n.map((e13) => e13.ty)), undefined), i = this.graphContext.currentGraph(), a = new Set(n.flatMap((e13) => exprModels(e13.expr))), s3 = this.period.withExactRange(() => effectiveFilters(this)), c3 = fanoutFilterModels(s3, a, i), l3 = resolveUnique(this.resolver, i, n, r3, t, c3, s3, (e13) => this.foldGroupedRoot(e13, n, t));
+    return logger.debug(`unique #${e12.id} → ${l3.kind}`, {
       ownKeys: e12.keys.length,
       inheritedGrain: this.grain.length,
       keys: n.length
-    }), u;
+    }), l3;
   }
   foldGroupedRoot(e12, t, n) {
     let r3 = findModel$1(this.resolver.dataset, e12);
@@ -133274,14 +133342,13 @@ var GrainFold = class extends HirFold {
       ty: createTableType(createRowType(t.map((e13) => e13.ty)), e12),
       input: s3,
       by: t,
-      aggregates: [],
-      graphId: this.resolver.currentGraphId
+      aggregates: []
     };
   }
   foldComputedRef(e12) {
     let t = this.resolver.dataset.spans.get(e12.id) ?? locStub(), n = this.inGroupedOutput, r3 = this.groupKeys;
     this.inGroupedOutput = false, this.groupKeys = undefined;
-    let i = this.rolling.applyToRef(e12, t, (n3) => this.foldExpr(buildAggRelation(this.resolver, e12.reduce.input, n3, e12.reduce.aggregates, e12.reduce.graphId, t)));
+    let i = this.rolling.applyToRef(e12, t, (n3) => this.foldExpr(buildAggRelation(this.resolver, e12.reduce.input, n3, e12.reduce.aggregates, t)));
     return this.groupKeys = r3, this.inGroupedOutput = n, i;
   }
   applicableRlp(e12, t) {
@@ -133327,8 +133394,7 @@ var GrainFold = class extends HirFold {
       id: this.resolver.newNodeId(t),
       ty: e12.ty,
       input: e12,
-      predicates: r3,
-      graphId: this.resolver.currentGraphId
+      predicates: r3
     };
   }
 };
@@ -133462,8 +133528,7 @@ var TransitionFold = class extends HirFold {
       ty: e12.input.ty,
       input: e12.input,
       parts: a,
-      baseMeasure: pickBaseMeasure(e12.input, a),
-      graphId: e12.graphId
+      baseMeasure: pickBaseMeasure(e12.input, a)
     }, c3 = e12.by.map((e13) => ({
       ...e13,
       expr: derefMeasure(this.resolver, e13.expr, r3)
@@ -133613,8 +133678,7 @@ var TransitionFold = class extends HirFold {
       ty: r3.ty,
       input: l3,
       parts: c3,
-      baseMeasure: pickBaseMeasure(l3, c3),
-      graphId: l3.graphId
+      baseMeasure: pickBaseMeasure(l3, c3)
     }, f3 = (e13) => derefMeasure(this.resolver, e13, a);
     return t.kind === "select" ? {
       ...t,
@@ -133686,14 +133750,13 @@ var TransitionFold = class extends HirFold {
     }, { aliasOf: f3, aliasByReduce: p3 } = aliasParts(this.resolver, i), m3 = (e13, t3) => e13.kind === "reduce" ? {
       ...e13,
       alias: p3.get(t3.reduce)
-    } : e13, S3 = i.find((e13) => u(e13.reduce.by)), w3 = S3 ? i.filter((e13) => e13 !== S3) : i, E3 = S3 ? m3(this.foldExpr(S3.reduce), S3) : this.filterSynthBase(resolveUnique(this.resolver, e12.grains, createTableType(createRowType(e12.grains.map((e13) => e13.ty)), undefined), t), e12, t), N = w3.map((e13) => m3(this.foldExpr(e13.reduce), e13)).filter((e13) => e13.kind === "reduce"), I3 = {
+    } : e13, S3 = i.find((e13) => u(e13.reduce.by)), w3 = S3 ? i.filter((e13) => e13 !== S3) : i, E3 = S3 ? m3(this.foldExpr(S3.reduce), S3) : this.filterSynthBase(resolveUnique(this.resolver, baseGraph(this.resolver), e12.grains, createTableType(createRowType(e12.grains.map((e13) => e13.ty)), undefined), t), e12, t), N = w3.map((e13) => m3(this.foldExpr(e13.reduce), e13)).filter((e13) => e13.kind === "reduce"), I3 = {
       kind: "transition",
       id: this.resolver.newNodeId(t),
       ty: E3.ty,
       input: E3,
       parts: N,
-      coalesce: true,
-      graphId: e12.graphId
+      coalesce: true
     };
     logger.info(`merge→transition: root=${S3 ? S3.column : "unique(grains)"}, ${N.length} part(s), ${r3.length - i.length} dup(s) dropped`);
     let L3 = (e13) => {
@@ -133710,7 +133773,6 @@ var TransitionFold = class extends HirFold {
           ty: t3.ty,
           name: t3.column,
           path: [],
-          graphId: t3.graphId,
           qualifier: f3(t3.reduce)
         };
       }
@@ -133743,8 +133805,7 @@ var TransitionFold = class extends HirFold {
       ty: e12.input.ty,
       input: e12.input,
       iterationDepth: iterationDepthOf(e12.input),
-      predicates: s3,
-      graphId: this.resolver.currentGraphId
+      predicates: s3
     };
     return {
       ...e12,
@@ -133769,8 +133830,7 @@ var TransitionFold = class extends HirFold {
       id: this.resolver.newNodeId(t),
       ty: r3,
       name: synthIdent(this.resolver, r3.fieldName || "value", [], r3, t),
-      expr: e12,
-      graphId: this.resolver.currentGraphId
+      expr: e12
     }, a = createTableType(createRowType([r3]), undefined);
     return makeTransform(this.resolver, "select", [n, i], a, t);
   }
@@ -133859,7 +133919,6 @@ function derefMeasure(e12, t, n) {
     ty: t.ty,
     name: t.column,
     path: [],
-    graphId: t.graphId,
     qualifier: n(t.reduce)
   } : t.kind === Kind.NAMED_EXPRESSION ? {
     ...t,
@@ -134044,7 +134103,7 @@ function resolveRowLevelPermissions(e12, t, n) {
       if (!t3)
         continue;
       let a = e12.resolveExpr(t3, n);
-      !isErrType(a.ty) && a.kind !== "in_table_condition" && e12.rlpFilters.push(makeCondition(e12, a, "rlp", rlpGraphId(e12)));
+      !isErrType(a.ty) && a.kind !== "in_table_condition" && e12.rlpFilters.push(makeCondition(e12, a, "rlp"));
     }
 }
 function resolveParamRlp(e12, t, n) {
@@ -134169,7 +134228,6 @@ function createResolver(e13, t, n = false, r3 = DEFAULT_DATETIME_CONTEXT, i = tr
     dbType: e13.dataSource.dbtype,
     modelContext: t,
     datetimeContext: r3,
-    currentGraphId: 0,
     nextId: 0,
     inBizCal: false,
     typeCheckOnly: c3,
@@ -134202,7 +134260,7 @@ function createResolver(e13, t, n = false, r3 = DEFAULT_DATETIME_CONTEXT, i = tr
         members: /* @__PURE__ */ new Map
       },
       spans: /* @__PURE__ */ new Map,
-      graphs: new Map([[0, e13.modelGraph]]),
+      graph: e13.modelGraph,
       diagnostics: [],
       declDeps: /* @__PURE__ */ new Map,
       declsByKey: /* @__PURE__ */ new Map
@@ -134893,7 +134951,7 @@ function rangeToPlan(e13, t, n, r3) {
   }), c3 = t.start ? s3(n ? "<" : ">=", t.start) : undefined, l3 = t.end ? s3(n ? ">" : "<=", t.end) : undefined;
   return c3 && l3 ? t.start > t.end ? a(n) : {
     kind: "call_binary",
-    func: "and",
+    func: n ? "or" : "and",
     type: SqlType.TRUEFALSE,
     expr1: c3,
     expr2: l3
@@ -135751,8 +135809,7 @@ function readThroughSelect(e14, t) {
       id: t3.id,
       ty: t3.ty,
       name: a.fieldName,
-      path: [],
-      graphId: t3.graphId
+      path: []
     }) : i.push(t3));
   }
   return i.length === 0 ? e14 : {
@@ -135801,8 +135858,7 @@ function collapseGrainKeyRefs(e14, t) {
     id: e14.id,
     ty: e14.ty,
     name: n.fieldName,
-    path: [],
-    graphId: e14.graphId
+    path: []
   } : e14.kind === Kind.FUNCTION_CALL ? {
     ...e14,
     args: e14.args.map((e15) => collapseGrainKeyRefs(e15, t))
@@ -136776,7 +136832,6 @@ function rewriteNestedSubtimes(e14, t) {
         kind: Kind.FUNCTION_CALL,
         id: e14.id,
         ty: e14.ty,
-        graphId: e14.graphId,
         name: {
           kind: Kind.IDENTIFIER,
           id: e14.id,
@@ -137007,8 +137062,7 @@ function lowerReduce(e14, t, n) {
           id: e15.id,
           ty: e15.ty,
           name: originKey(t3),
-          path: [],
-          graphId: e15.graphId
+          path: []
         };
     }
     return e15.kind === Kind.FUNCTION_CALL ? {
@@ -140388,14 +140442,22 @@ function closeOverTemplateRefs(e14, t) {
   let n = new Map(e14.dimensions.map((e15) => [e15.name.name, e15])), r3 = new Set(t), i = [...t];
   for (;i.length > 0; ) {
     let t3 = n.get(i.shift());
-    if (t3?.body?.syntax !== "sql")
-      continue;
-    let { resolved: a } = t3;
-    for (let t4 of a && "refs" in a ? a.refs : [])
-      (t4.path.length === 0 || t4.path.length === 1 && t4.path[0] === e14.name) && n.has(t4.name) && !r3.has(t4.name) && (r3.add(t4.name), i.push(t4.name));
+    if (t3?.body?.syntax === "sql")
+      for (let a of templateRefs(t3))
+        (a.path.length === 0 || a.path.length === 1 && a.path[0] === e14.name) && n.has(a.name) && !r3.has(a.name) && (r3.add(a.name), i.push(a.name));
   }
   return r3;
 }
+function templateRefs(e14) {
+  let { resolved: t, body: n } = e14, r3 = t && "refs" in t ? t.refs.map((e15) => ({
+    name: e15.name,
+    path: [...e15.path]
+  })) : [];
+  return n.syntax !== "sql" || typeof n.definition != "string" ? r3 : [...r3, ...parseFieldReferencesInSQL(n.definition).map((e15) => ({
+    name: e15.fieldName,
+    path: e15.modelName ? [e15.modelName] : []
+  }))];
+}
 function modelParamField(e14) {
   return {
     name: e14.name.name,