@holistics/cli-core 2.5.5 → 2.5.6

package/dist/commands.js

@@ -24022,7 +24022,7 @@ var require_dist4 = __commonJS((exports2) => {
   exports2.default = deferred;
 });
 // package.json
-var version = "2.5.5";
+var version = "2.5.6";
 
 // ../../node_modules/.pnpm/commander@15.0.0/node_modules/commander/lib/error.js
 class CommanderError extends Error {
@@ -105272,7 +105272,7 @@ var TypeClass = /* @__PURE__ */ function(e9) {
   return e9.SCALAR = "scalar", e9.FIELD = "field", e9.ROW = "row", e9.TABLE = "table", e9.RELATIONSHIP = "relationship", e9.ARRAY = "array", e9.GROUPING_SET = "grouping_set", e9.FUNCTION = "function", e9.UNION = "union", e9.TYPE_PARAMETER = "type_parameter", e9.TYPE_CLASS = "type_class", e9.USER_ATTRIBUTE = "user_attribute", e9.MODULE = "module", e9.ERROR_ANY = "error_any", e9.NULL = "null", e9;
 }({});
 var ErrorCode = /* @__PURE__ */ function(e9) {
-  return e9[e9.UNEXPECTED_ERROR = 0] = "UNEXPECTED_ERROR", e9[e9.SYNTAX_ERROR = 1] = "SYNTAX_ERROR", e9[e9.INVALID_EXPRESSION_0 = 100] = "INVALID_EXPRESSION_0", e9[e9.RELATIONSHIP_NOT_FOUND_0 = 101] = "RELATIONSHIP_NOT_FOUND_0", e9[e9.MODEL_0_NOT_FOUND = 102] = "MODEL_0_NOT_FOUND", e9[e9.FIELD_0_NOT_FOUND_IN_MODEL_1 = 103] = "FIELD_0_NOT_FOUND_IN_MODEL_1", e9[e9.FANOUT_ON_0_FROM_1 = 104] = "FANOUT_ON_0_FROM_1", e9[e9.MODEL_IN_AQL_FIELD_NOT_FOUND = 105] = "MODEL_IN_AQL_FIELD_NOT_FOUND", e9[e9.RELATIONSHIP_PATH_NOT_FOUND_FROM_0_TO_1 = 106] = "RELATIONSHIP_PATH_NOT_FOUND_FROM_0_TO_1", e9[e9.INVALID_ARITY_EXPECT_0_FOR_FUNCTION_1_GOT_2 = 200] = "INVALID_ARITY_EXPECT_0_FOR_FUNCTION_1_GOT_2", e9[e9.INVALID_ARGUMENT_TYPE = 201] = "INVALID_ARGUMENT_TYPE", e9[e9.UNKNOWN_IDENTIFIER_0 = 202] = "UNKNOWN_IDENTIFIER_0", e9[e9.UNSUPPORTED_OPERATOR_0_FOR_TYPE_1 = 203] = "UNSUPPORTED_OPERATOR_0_FOR_TYPE_1", e9[e9.EXPECTED_0_FOUND_1 = 204] = "EXPECTED_0_FOUND_1", e9[e9.NAMED_EXPRESSION_EXPECT_A_FIELD_OR_SCALAR_VALUE_FOUND_0 = 205] = "NAMED_EXPRESSION_EXPECT_A_FIELD_OR_SCALAR_VALUE_FOUND_0", e9[e9.EXPECTED_SCALAR_LIKE_TYPE_FOUND_0 = 206] = "EXPECTED_SCALAR_LIKE_TYPE_FOUND_0", e9[e9.NO_MATCHING_SIGNATURE_FOR_FUNCTION_0 = 207] = "NO_MATCHING_SIGNATURE_FOR_FUNCTION_0", e9[e9.INVALID_MEASURE_DEFINITION_FOR_FIELD_0_IN_MODEL_1 = 208] = "INVALID_MEASURE_DEFINITION_FOR_FIELD_0_IN_MODEL_1", e9[e9.DIMENSIONALIZE_NOT_ALLOWED_DUE_TO_0 = 209] = "DIMENSIONALIZE_NOT_ALLOWED_DUE_TO_0", e9[e9.CANNOT_REFERENCE_AQL_FIELD_0_FROM_SQL = 210] = "CANNOT_REFERENCE_AQL_FIELD_0_FROM_SQL", e9[e9.RIGHT_SIDE_OF_PIPE_MUST_BE_A_FUNCTION = 211] = "RIGHT_SIDE_OF_PIPE_MUST_BE_A_FUNCTION", e9[e9.INVALID_METRIC_DEFINITION_0_IN_DATASET_1 = 212] = "INVALID_METRIC_DEFINITION_0_IN_DATASET_1", e9[e9.MEMBER_0_NOT_FOUND_IN_MODULE_1 = 213] = "MEMBER_0_NOT_FOUND_IN_MODULE_1", e9[e9.INVALID_BIZ_CAL_FUNCTION_0 = 214] = "INVALID_BIZ_CAL_FUNCTION_0", e9[e9.USER_ATTRIBUTE_0_NOT_FOUND = 215] = "USER_ATTRIBUTE_0_NOT_FOUND", e9[e9.INVALID_USAGE_OF_USER_ATTRIBUTE_0_MUTIPLE_VALUES = 216] = "INVALID_USAGE_OF_USER_ATTRIBUTE_0_MUTIPLE_VALUES", e9[e9.TABLE_LITERAL_ROWS_MUST_HAVE_SAME_NUMBER_OF_COLUMNS = 217] = "TABLE_LITERAL_ROWS_MUST_HAVE_SAME_NUMBER_OF_COLUMNS", e9[e9.INVALID_ROW_LEVEL_PERMISSION = 218] = "INVALID_ROW_LEVEL_PERMISSION", e9[e9.PERMISSION_RULE_VIOLATION_ERROR = 219] = "PERMISSION_RULE_VIOLATION_ERROR", e9[e9.UNSUPPORTED_BEHAVIOR_0 = 220] = "UNSUPPORTED_BEHAVIOR_0", e9[e9.POTENTIAL_DB_RUNTIME_ERROR_0 = 221] = "POTENTIAL_DB_RUNTIME_ERROR_0", e9[e9.AMBIGUOUS_RELATIONSHIP_0 = 222] = "AMBIGUOUS_RELATIONSHIP_0", e9[e9.QUERY_PARAM_UNSUPPORTED_OPERATOR = 223] = "QUERY_PARAM_UNSUPPORTED_OPERATOR", e9[e9.QUERY_PARAM_INVALID_PARAM_INPUT = 224] = "QUERY_PARAM_INVALID_PARAM_INPUT", e9[e9.ROW_MUST_CONTAIN_DIMENSIONS_ONLY_0 = 225] = "ROW_MUST_CONTAIN_DIMENSIONS_ONLY_0", e9[e9.ROW_COLUMNS_MUST_BE_SUBSET_OF_TABLE_COLUMNS = 226] = "ROW_COLUMNS_MUST_BE_SUBSET_OF_TABLE_COLUMNS", e9[e9.CANNOT_MATCH_ROW_WITH_LITERAL_TABLE_0 = 227] = "CANNOT_MATCH_ROW_WITH_LITERAL_TABLE_0", e9[e9.INVALID_FIELD_DECLARATION = 228] = "INVALID_FIELD_DECLARATION", e9[e9.CANNOT_REDECLARE_FIELD = 229] = "CANNOT_REDECLARE_FIELD", e9[e9.ADHOC_FIELD_UNSUPPORTED_FIELD_TYPE = 230] = "ADHOC_FIELD_UNSUPPORTED_FIELD_TYPE", e9[e9.CANNOT_RUN_WINDOW_FUNCTION_IN_THIS_CONTEXT_0 = 231] = "CANNOT_RUN_WINDOW_FUNCTION_IN_THIS_CONTEXT_0", e9[e9.INVALID_WINDOW_FRAME_0 = 232] = "INVALID_WINDOW_FRAME_0", e9[e9.CYLIC_FIELD_DEPENDENCY_DETECTED_0 = 233] = "CYLIC_FIELD_DEPENDENCY_DETECTED_0", e9[e9.INVALID_SHORTHAND_AGGREGATION_0 = 234] = "INVALID_SHORTHAND_AGGREGATION_0", e9[e9.UNSUPPORTED_DATE_UNIT_0 = 235] = "UNSUPPORTED_DATE_UNIT_0", e9[e9.INVALID_CONDITIONAL_EXPRESSION_IN_0 = 236] = "INVALID_CONDITIONAL_EXPRESSION_IN_0", e9[e9.UNKNOWN_FUNCTION_0 = 237] = "UNKNOWN_FUNCTION_0", e9[e9.CANNOT_MATCH_ROW_WITH_TABLE_0 = 238] = "CANNOT_MATCH_ROW_WITH_TABLE_0", e9[e9.DUPLICATE_FIELD_NAME_0 = 239] = "DUPLICATE_FIELD_NAME_0", e9[e9.FUNCTION_0_EXPECT_1_GOT_2 = 240] = "FUNCTION_0_EXPECT_1_GOT_2", e9[e9.NESTED_WINDOW_FUNCTION = 241] = "NESTED_WINDOW_FUNCTION", e9[e9.FIELD_0_NOT_FOUND_IN_SELECTED_FIELDS = 242] = "FIELD_0_NOT_FOUND_IN_SELECTED_FIELDS", e9[e9.REFERENCE_FIELD_0_NOT_GROUP_NOR_AGGREGATED = 243] = "REFERENCE_FIELD_0_NOT_GROUP_NOR_AGGREGATED", e9[e9.INVALID_TABLE_CONDITION_0 = 244] = "INVALID_TABLE_CONDITION_0", e9[e9.INVALID_DATETIME_LITERAL_0 = 245] = "INVALID_DATETIME_LITERAL_0", e9[e9.NO_PRIMARY_KEY_FOUND_FOR_MODEL_0_REASON_1 = 246] = "NO_PRIMARY_KEY_FOUND_FOR_MODEL_0_REASON_1", e9[e9.RECURSIVE_AQL_FUNCTION_0_CHAIN_1 = 247] = "RECURSIVE_AQL_FUNCTION_0_CHAIN_1", e9[e9.INVALID_RETURN_TYPE_FOR_FUNCTION_0_EXPECTED_1_GOT_2 = 248] = "INVALID_RETURN_TYPE_FOR_FUNCTION_0_EXPECTED_1_GOT_2", e9[e9.INVALID_REF_ARGUMENT_FOR_PARAM_0_EXPECTED_1_GOT_2 = 249] = "INVALID_REF_ARGUMENT_FOR_PARAM_0_EXPECTED_1_GOT_2", e9[e9.AQL_0_1_SHADOWS_BUILTIN = 250] = "AQL_0_1_SHADOWS_BUILTIN", e9[e9.RELATIONSHIP_FILTER_ON_0_READS_1 = 251] = "RELATIONSHIP_FILTER_ON_0_READS_1", e9[e9.RELATIONSHIP_MATCH_READS_0 = 252] = "RELATIONSHIP_MATCH_READS_0", e9[e9.RELATIONSHIP_MATCH_MISSES_0 = 253] = "RELATIONSHIP_MATCH_MISSES_0", e9[e9.AQL_NAME_0_DECLARED_AS_1_AND_2_IN_3 = 254] = "AQL_NAME_0_DECLARED_AS_1_AND_2_IN_3", e9[e9.SHOULD_FOLLOW_GROUP_WITH_SELECT_OR_FILTER = 300] = "SHOULD_FOLLOW_GROUP_WITH_SELECT_OR_FILTER", e9;
+  return e9[e9.UNEXPECTED_ERROR = 0] = "UNEXPECTED_ERROR", e9[e9.SYNTAX_ERROR = 1] = "SYNTAX_ERROR", e9[e9.INVALID_EXPRESSION_0 = 100] = "INVALID_EXPRESSION_0", e9[e9.RELATIONSHIP_NOT_FOUND_0 = 101] = "RELATIONSHIP_NOT_FOUND_0", e9[e9.MODEL_0_NOT_FOUND = 102] = "MODEL_0_NOT_FOUND", e9[e9.FIELD_0_NOT_FOUND_IN_MODEL_1 = 103] = "FIELD_0_NOT_FOUND_IN_MODEL_1", e9[e9.FANOUT_ON_0_FROM_1 = 104] = "FANOUT_ON_0_FROM_1", e9[e9.MODEL_IN_AQL_FIELD_NOT_FOUND = 105] = "MODEL_IN_AQL_FIELD_NOT_FOUND", e9[e9.RELATIONSHIP_PATH_NOT_FOUND_FROM_0_TO_1 = 106] = "RELATIONSHIP_PATH_NOT_FOUND_FROM_0_TO_1", e9[e9.INVALID_ARITY_EXPECT_0_FOR_FUNCTION_1_GOT_2 = 200] = "INVALID_ARITY_EXPECT_0_FOR_FUNCTION_1_GOT_2", e9[e9.INVALID_ARGUMENT_TYPE = 201] = "INVALID_ARGUMENT_TYPE", e9[e9.UNKNOWN_IDENTIFIER_0 = 202] = "UNKNOWN_IDENTIFIER_0", e9[e9.UNSUPPORTED_OPERATOR_0_FOR_TYPE_1 = 203] = "UNSUPPORTED_OPERATOR_0_FOR_TYPE_1", e9[e9.EXPECTED_0_FOUND_1 = 204] = "EXPECTED_0_FOUND_1", e9[e9.NAMED_EXPRESSION_EXPECT_A_FIELD_OR_SCALAR_VALUE_FOUND_0 = 205] = "NAMED_EXPRESSION_EXPECT_A_FIELD_OR_SCALAR_VALUE_FOUND_0", e9[e9.EXPECTED_SCALAR_LIKE_TYPE_FOUND_0 = 206] = "EXPECTED_SCALAR_LIKE_TYPE_FOUND_0", e9[e9.NO_MATCHING_SIGNATURE_FOR_FUNCTION_0 = 207] = "NO_MATCHING_SIGNATURE_FOR_FUNCTION_0", e9[e9.INVALID_MEASURE_DEFINITION_FOR_FIELD_0_IN_MODEL_1 = 208] = "INVALID_MEASURE_DEFINITION_FOR_FIELD_0_IN_MODEL_1", e9[e9.DIMENSIONALIZE_NOT_ALLOWED_DUE_TO_0 = 209] = "DIMENSIONALIZE_NOT_ALLOWED_DUE_TO_0", e9[e9.CANNOT_REFERENCE_AQL_FIELD_0_FROM_SQL = 210] = "CANNOT_REFERENCE_AQL_FIELD_0_FROM_SQL", e9[e9.RIGHT_SIDE_OF_PIPE_MUST_BE_A_FUNCTION = 211] = "RIGHT_SIDE_OF_PIPE_MUST_BE_A_FUNCTION", e9[e9.INVALID_METRIC_DEFINITION_0_IN_DATASET_1 = 212] = "INVALID_METRIC_DEFINITION_0_IN_DATASET_1", e9[e9.MEMBER_0_NOT_FOUND_IN_MODULE_1 = 213] = "MEMBER_0_NOT_FOUND_IN_MODULE_1", e9[e9.INVALID_BIZ_CAL_FUNCTION_0 = 214] = "INVALID_BIZ_CAL_FUNCTION_0", e9[e9.USER_ATTRIBUTE_0_NOT_FOUND = 215] = "USER_ATTRIBUTE_0_NOT_FOUND", e9[e9.INVALID_USAGE_OF_USER_ATTRIBUTE_0_MUTIPLE_VALUES = 216] = "INVALID_USAGE_OF_USER_ATTRIBUTE_0_MUTIPLE_VALUES", e9[e9.TABLE_LITERAL_ROWS_MUST_HAVE_SAME_NUMBER_OF_COLUMNS = 217] = "TABLE_LITERAL_ROWS_MUST_HAVE_SAME_NUMBER_OF_COLUMNS", e9[e9.INVALID_ROW_LEVEL_PERMISSION = 218] = "INVALID_ROW_LEVEL_PERMISSION", e9[e9.PERMISSION_RULE_VIOLATION_ERROR = 219] = "PERMISSION_RULE_VIOLATION_ERROR", e9[e9.UNSUPPORTED_BEHAVIOR_0 = 220] = "UNSUPPORTED_BEHAVIOR_0", e9[e9.POTENTIAL_DB_RUNTIME_ERROR_0 = 221] = "POTENTIAL_DB_RUNTIME_ERROR_0", e9[e9.AMBIGUOUS_RELATIONSHIP_0 = 222] = "AMBIGUOUS_RELATIONSHIP_0", e9[e9.QUERY_PARAM_UNSUPPORTED_OPERATOR = 223] = "QUERY_PARAM_UNSUPPORTED_OPERATOR", e9[e9.QUERY_PARAM_INVALID_PARAM_INPUT = 224] = "QUERY_PARAM_INVALID_PARAM_INPUT", e9[e9.ROW_MUST_CONTAIN_DIMENSIONS_ONLY_0 = 225] = "ROW_MUST_CONTAIN_DIMENSIONS_ONLY_0", e9[e9.ROW_COLUMNS_MUST_BE_SUBSET_OF_TABLE_COLUMNS = 226] = "ROW_COLUMNS_MUST_BE_SUBSET_OF_TABLE_COLUMNS", e9[e9.CANNOT_MATCH_ROW_WITH_LITERAL_TABLE_0 = 227] = "CANNOT_MATCH_ROW_WITH_LITERAL_TABLE_0", e9[e9.INVALID_FIELD_DECLARATION = 228] = "INVALID_FIELD_DECLARATION", e9[e9.CANNOT_REDECLARE_FIELD = 229] = "CANNOT_REDECLARE_FIELD", e9[e9.ADHOC_FIELD_UNSUPPORTED_FIELD_TYPE = 230] = "ADHOC_FIELD_UNSUPPORTED_FIELD_TYPE", e9[e9.CANNOT_RUN_WINDOW_FUNCTION_IN_THIS_CONTEXT_0 = 231] = "CANNOT_RUN_WINDOW_FUNCTION_IN_THIS_CONTEXT_0", e9[e9.INVALID_WINDOW_FRAME_0 = 232] = "INVALID_WINDOW_FRAME_0", e9[e9.CYLIC_FIELD_DEPENDENCY_DETECTED_0 = 233] = "CYLIC_FIELD_DEPENDENCY_DETECTED_0", e9[e9.INVALID_SHORTHAND_AGGREGATION_0 = 234] = "INVALID_SHORTHAND_AGGREGATION_0", e9[e9.UNSUPPORTED_DATE_UNIT_0 = 235] = "UNSUPPORTED_DATE_UNIT_0", e9[e9.INVALID_CONDITIONAL_EXPRESSION_IN_0 = 236] = "INVALID_CONDITIONAL_EXPRESSION_IN_0", e9[e9.UNKNOWN_FUNCTION_0 = 237] = "UNKNOWN_FUNCTION_0", e9[e9.CANNOT_MATCH_ROW_WITH_TABLE_0 = 238] = "CANNOT_MATCH_ROW_WITH_TABLE_0", e9[e9.DUPLICATE_FIELD_NAME_0 = 239] = "DUPLICATE_FIELD_NAME_0", e9[e9.FUNCTION_0_EXPECT_1_GOT_2 = 240] = "FUNCTION_0_EXPECT_1_GOT_2", e9[e9.NESTED_WINDOW_FUNCTION = 241] = "NESTED_WINDOW_FUNCTION", e9[e9.FIELD_0_NOT_FOUND_IN_SELECTED_FIELDS = 242] = "FIELD_0_NOT_FOUND_IN_SELECTED_FIELDS", e9[e9.REFERENCE_FIELD_0_NOT_GROUP_NOR_AGGREGATED = 243] = "REFERENCE_FIELD_0_NOT_GROUP_NOR_AGGREGATED", e9[e9.INVALID_TABLE_CONDITION_0 = 244] = "INVALID_TABLE_CONDITION_0", e9[e9.INVALID_DATETIME_LITERAL_0 = 245] = "INVALID_DATETIME_LITERAL_0", e9[e9.NO_PRIMARY_KEY_FOUND_FOR_MODEL_0_REASON_1 = 246] = "NO_PRIMARY_KEY_FOUND_FOR_MODEL_0_REASON_1", e9[e9.RECURSIVE_AQL_FUNCTION_0_CHAIN_1 = 247] = "RECURSIVE_AQL_FUNCTION_0_CHAIN_1", e9[e9.INVALID_RETURN_TYPE_FOR_FUNCTION_0_EXPECTED_1_GOT_2 = 248] = "INVALID_RETURN_TYPE_FOR_FUNCTION_0_EXPECTED_1_GOT_2", e9[e9.INVALID_REF_ARGUMENT_FOR_PARAM_0_EXPECTED_1_GOT_2 = 249] = "INVALID_REF_ARGUMENT_FOR_PARAM_0_EXPECTED_1_GOT_2", e9[e9.AQL_0_1_SHADOWS_BUILTIN = 250] = "AQL_0_1_SHADOWS_BUILTIN", e9[e9.RELATIONSHIP_FILTER_ON_0_READS_1 = 251] = "RELATIONSHIP_FILTER_ON_0_READS_1", e9[e9.RELATIONSHIP_MATCH_READS_0 = 252] = "RELATIONSHIP_MATCH_READS_0", e9[e9.RELATIONSHIP_MATCH_MISSES_0 = 253] = "RELATIONSHIP_MATCH_MISSES_0", e9[e9.AQL_NAME_0_DECLARED_AS_1_AND_2_IN_3 = 254] = "AQL_NAME_0_DECLARED_AS_1_AND_2_IN_3", e9[e9.OPERATOR_0_ON_PARAM_1 = 255] = "OPERATOR_0_ON_PARAM_1", e9[e9.SHOULD_FOLLOW_GROUP_WITH_SELECT_OR_FILTER = 300] = "SHOULD_FOLLOW_GROUP_WITH_SELECT_OR_FILTER", e9;
 }({});
 var isFieldTrace = (e9) => e9.type !== "udf";
 var isUdfTrace = (e9) => e9.type === "udf";
@@ -108060,6 +108060,7 @@ var errorMessages = {
   [ErrorCode.INVALID_ARGUMENT_TYPE]: "Invalid argument type.",
   [ErrorCode.UNKNOWN_IDENTIFIER_0]: "Unknown identifier `{0}` is not defined.",
   [ErrorCode.UNSUPPORTED_OPERATOR_0_FOR_TYPE_1]: "Unsupported operator `{0}` for type `{1}`.",
+  [ErrorCode.OPERATOR_0_ON_PARAM_1]: "Param `{1}` holds a list of values, so operator `{0}` cannot use it directly. To read it, use `first({1})` for the first value, or `in {1}` to match any value.",
   [ErrorCode.EXPECTED_0_FOUND_1]: "Expected `{0}`, found `{1}`.",
   [ErrorCode.FUNCTION_0_EXPECT_1_GOT_2]: "The `{0}` function expects `{1}`, but got `{2}` instead. Please update the input or use another function.",
   [ErrorCode.NAMED_EXPRESSION_EXPECT_A_FIELD_OR_SCALAR_VALUE_FOUND_0]: "Named expression expects a field or scalar value, found `{0}`",
@@ -108122,7 +108123,7 @@ Complex conditions:
   [ErrorCode.RELATIONSHIP_MATCH_MISSES_0]: "A relationship `match` must read columns of both models, but it never reads `{0}`."
 };
 function createError(e9, t, n, r3, i, a, s3) {
-  let c3 = `${errorMessages[e9]} ${n || ""}`.replace("{0}", u(r3)).replace("{1}", u(i)).replace("{2}", u(a)).replace("{3}", u(s3));
+  let c3 = `${errorMessages[e9]} ${n || ""}`.replace(/\{0\}/g, () => u(r3)).replace(/\{1\}/g, () => u(i)).replace(/\{2\}/g, () => u(a)).replace(/\{3\}/g, () => u(s3));
   (e9 === ErrorCode.EXPECTED_0_FOUND_1 && (u(r3) === "NamedField" || u(r3).match(/Union\(.*NamedField.*\)/)) || e9 === ErrorCode.FUNCTION_0_EXPECT_1_GOT_2 && (u(i) === "NamedField" || u(i).match(/Union\(.*NamedField.*\)/))) && (c3 = "Cannot infer a name for this field. Please provide an explicit name for this field.");
   let l = SyntaxError(String(c3));
   return l.args = [
@@ -119697,7 +119698,9 @@ function checkRowLevelExpression(e10, t, n) {
   function u(t3, n3) {
     e10.checkExpression(t3.right, n3);
     let r4 = e10.getTypeFromNode(t3.right);
-    if (isScalarLikeType(r4)) {
+    if (isTableType(r4) && r4.param)
+      e10.addError(t3.right, ErrorCode.OPERATOR_0_ON_PARAM_1, t3.operator.loc.source, r4.param);
+    else if (isScalarLikeType(r4)) {
       let n4 = getScalarType(r4), i3 = t3.operator.kind, a3;
       if (n4 === numberType$1 && i3 === Kind.MINUS ? a3 = numberType$1 : isAssignable$1(e10, n4, truefalseType$1) && (i3 === Kind.NOT_KEYWORD || i3 === Kind.EXCLAMATION) && (a3 = truefalseType$1), a3) {
         if (isFieldType(r4)) {
@@ -119715,7 +119718,21 @@ function checkRowLevelExpression(e10, t, n) {
   }
   function f(t3, n3) {
     e10.checkExpression(t3.left, n3), e10.checkExpression(t3.right, n3);
-    let r4 = e10.getTypeFromNode(t3.left), i3 = e10.getTypeFromNode(t3.right), a3 = isFieldType(r4) && r4.hasWindowFunction || isFieldType(i3) && i3.hasWindowFunction;
+    let r4 = e10.getTypeFromNode(t3.left), i3 = e10.getTypeFromNode(t3.right), a3 = isFieldType(r4) && r4.hasWindowFunction || isFieldType(i3) && i3.hasWindowFunction, s4 = t3.operator.kind === Kind.IN_KEYWORD ? [{
+      expr: t3.left,
+      type: r4
+    }] : [{
+      expr: t3.left,
+      type: r4
+    }, {
+      expr: t3.right,
+      type: i3
+    }];
+    for (let { expr: n4, type: r5 } of s4)
+      if (isTableType(r5) && r5.param) {
+        e10.addError(n4, ErrorCode.OPERATOR_0_ON_PARAM_1, t3.operator.loc.source, r5.param);
+        return;
+      }
     if (isTableType(r4))
       e10.addError(t3.left, ErrorCode.UNSUPPORTED_OPERATOR_0_FOR_TYPE_1, t3.operator.loc.source, "Table");
     else if (isRowType(r4))
@@ -119728,14 +119745,14 @@ function checkRowLevelExpression(e10, t, n) {
         e10.addError(t3, ErrorCode.EXPECTED_SCALAR_LIKE_TYPE_FOUND_0, r4);
         return;
       }
-      let s4;
+      let s5;
       if (isTableType(i3)) {
         if (isTableLiteral(t3.right) && i3.rowType.columns.length > 1) {
           e10.addError(t3.right, ErrorCode.EXPECTED_0_FOUND_1, "Table Literal with one column", i3);
           return;
         }
         if (isTableLiteral(t3.right) || i3.isLiteral)
-          s4 = i3.rowType.columns[0]?.type || getScalarType(r4);
+          s5 = i3.rowType.columns[0]?.type || getScalarType(r4);
         else if (isFieldType(r4) && r4.subClass === "dimension" && t3.operator.kind === Kind.IN_KEYWORD) {
           let n5 = r4, a4 = i3.rowType.columns.some((e11) => e11.origin && n5.origin && refEq(e11.origin, n5.origin)), c5 = i3.rowType.columns.length === 1 && isAssignable$1(e10, n5.type, i3.rowType.columns[0].type);
           if (i3.name) {
@@ -119743,7 +119760,7 @@ function checkRowLevelExpression(e10, t, n) {
             return;
           }
           if (a4 || c5)
-            s4 = getScalarType(r4);
+            s5 = getScalarType(r4);
           else {
             e10.addError(t3.right, ErrorCode.EXPECTED_0_FOUND_1, `Table that includes the \`${r4.fieldName}\` dimension`, i3);
             return;
@@ -119753,9 +119770,9 @@ function checkRowLevelExpression(e10, t, n) {
           return;
         }
       } else
-        s4 = isNullType(i3) ? n4 : getScalarType(i3);
+        s5 = isNullType(i3) ? n4 : getScalarType(i3);
       let c4 = t3.operator.kind;
-      if (sqlTypeEquivalent(n4.sqlType, s4.sqlType)) {
+      if (sqlTypeEquivalent(n4.sqlType, s5.sqlType)) {
         if (isTableType(i3) && c4 !== Kind.IN_KEYWORD || !isTableType(i3) && !isUserAttributeType(i3) && c4 === Kind.IN_KEYWORD) {
           e10.addError(t3.operator, ErrorCode.UNSUPPORTED_OPERATOR_0_FOR_TYPE_1, c4, i3);
           return;
@@ -119800,26 +119817,26 @@ function checkRowLevelExpression(e10, t, n) {
           default:
             e10.addError(t3, ErrorCode.UNSUPPORTED_OPERATOR_0_FOR_TYPE_1, c4, n4);
         }
-      } else if (isAssignable$1(e10, n4, datetimeType$1) && isAssignable$1(e10, s4, durationType$1)) {
+      } else if (isAssignable$1(e10, n4, datetimeType$1) && isAssignable$1(e10, s5, durationType$1)) {
         if (c4 === Kind.PLUS || c4 === Kind.MINUS) {
           let r5 = createFieldType$1("", n4, undefined);
           r5.hasWindowFunction = a3, e10.setNodeType(t3, r5);
         } else
           e10.addError(t3, ErrorCode.UNSUPPORTED_OPERATOR_0_FOR_TYPE_1, c4, n4);
       } else if (isAssignable$1(e10, n4, durationType$1)) {
-        if (c4 === Kind.PLUS && isAssignable$1(e10, s4, datetimeType$1)) {
-          let n5 = createFieldType$1("", s4, undefined);
+        if (c4 === Kind.PLUS && isAssignable$1(e10, s5, datetimeType$1)) {
+          let n5 = createFieldType$1("", s5, undefined);
           n5.hasWindowFunction = a3, e10.setNodeType(t3, n5);
         } else
           e10.addError(t3, ErrorCode.UNSUPPORTED_OPERATOR_0_FOR_TYPE_1, c4, n4);
-      } else if (isAssignable$1(e10, n4, numberType$1) && isAssignable$1(e10, s4, rangeType$1)) {
+      } else if (isAssignable$1(e10, n4, numberType$1) && isAssignable$1(e10, s5, rangeType$1)) {
         if (c4 === Kind.IN_KEYWORD) {
           let n5 = createFieldType$1("", truefalseType$1, undefined);
           n5.hasWindowFunction = a3, e10.setNodeType(t3, n5);
         } else
-          e10.addError(t3, ErrorCode.UNSUPPORTED_OPERATOR_0_FOR_TYPE_1, c4, s4);
+          e10.addError(t3, ErrorCode.UNSUPPORTED_OPERATOR_0_FOR_TYPE_1, c4, s5);
       } else
-        c4 === Kind.OR_KEYWORD || c4 === Kind.AND_KEYWORD ? (isAssignable$1(e10, n4, truefalseType$1) || e10.addError(t3, ErrorCode.EXPECTED_0_FOUND_1, truefalseType$1, n4), isAssignable$1(e10, s4, truefalseType$1) || e10.addError(t3, ErrorCode.EXPECTED_0_FOUND_1, truefalseType$1, s4)) : e10.addError(t3.right, ErrorCode.EXPECTED_0_FOUND_1, n4, s4);
+        c4 === Kind.OR_KEYWORD || c4 === Kind.AND_KEYWORD ? (isAssignable$1(e10, n4, truefalseType$1) || e10.addError(t3, ErrorCode.EXPECTED_0_FOUND_1, truefalseType$1, n4), isAssignable$1(e10, s5, truefalseType$1) || e10.addError(t3, ErrorCode.EXPECTED_0_FOUND_1, truefalseType$1, s5)) : e10.addError(t3.right, ErrorCode.EXPECTED_0_FOUND_1, n4, s5);
     } else
       isErrType(r4) || isErrType(i3) || e10.addError(t3, ErrorCode.EXPECTED_SCALAR_LIKE_TYPE_FOUND_0, r4);
   }
@@ -120991,10 +121008,13 @@ function _createTypeChecker(e10, t, n, r3, i = CheckFlags.Normal) {
             fieldName: u3
           };
         } else
-          f3 = c4.subClass === "param" ? createTableLiteralType$1(createRowType$1([{
-            ...c4,
-            subClass: undefined
-          }])) : {
+          f3 = c4.subClass === "param" ? {
+            ...createTableLiteralType$1(createRowType$1([{
+              ...c4,
+              subClass: undefined
+            }])),
+            param: `${i3}.${s4}`
+          } : {
             ...c4,
             fieldName: u3
           };
@@ -121003,10 +121023,13 @@ function _createTypeChecker(e10, t, n, r3, i = CheckFlags.Normal) {
         n4 && isFieldType(n4) ? n4.origin && n4.subClass !== "param" ? (checkModelField(k3, n4.origin, t3), f3 = {
           ...n4,
           fieldName: u3
-        }) : f3 = n4.subClass === "param" ? createTableLiteralType$1(createRowType$1([{
-          ...n4,
-          subClass: undefined
-        }])) : {
+        }) : f3 = n4.subClass === "param" ? {
+          ...createTableLiteralType$1(createRowType$1([{
+            ...n4,
+            subClass: undefined
+          }])),
+          param: `${i3}.${s4}`
+        } : {
           ...n4,
           fieldName: u3
         } : k3.addError(e11.right, ErrorCode.FIELD_0_NOT_FOUND_IN_MODEL_1, s4, i3);
@@ -122032,6 +122055,11 @@ function unsupportedOperator(e10, t, n, r3) {
 function checkOperatorCall(e10, t, n, r3, i = r3, a = []) {
   if (n.some(isErrType))
     return errType;
+  for (let [i3, s4] of n.entries()) {
+    let n3 = t === Kind.IN_KEYWORD && i3 === 1;
+    if (isTableType(s4) && s4.param && !n3)
+      return e10.dataset.diagnostics.push(createError(ErrorCode.OPERATOR_0_ON_PARAM_1, a[i3] ?? r3, undefined, t, s4.param)), errType;
+  }
   if (n.length === 2) {
     if (isRowType(n[0]))
       return checkTableCondition(e10, t, n[0], n[1], r3);
@@ -123048,6 +123076,16 @@ function resolveBlock(e10, t, n) {
     n3.kind === Kind.FIELD_DECLARATION ? registerConstDecl(e10, n3, r3, i) : n3.kind === Kind.FUNCTION_DECLARATION ? registerFunctionDecl(e10, n3, r3, i) : r3.result = e10.resolveExpr(n3, i);
   return r3.ty = r3.result.ty, r3;
 }
+function makeBlock(e10, t, n, r3) {
+  return {
+    kind: "block",
+    id: e10.newNodeId(t),
+    ty: r3 ?? n.ty,
+    result: n,
+    declarations: /* @__PURE__ */ new Map,
+    synthetic: true
+  };
+}
 function registerConstDecl(e10, t, n, r3) {
   let { name: i } = flattenName(t.name), a = e10.iterationDepth, s3 = e10.resolveExpr(t.expr, r3);
   n.declarations.set(i, {
@@ -123665,12 +123703,12 @@ function involvesAggregation(e11) {
   return e11 ? e11.kind === "computed_ref" || isFieldType(e11.ty) && (e11.ty.subClass === "measure" || e11.ty.subClass === "aggregate") ? true : e11.kind === Kind.FUNCTION_CALL ? e11.args.some(involvesAggregation) : e11.kind === Kind.NAMED_EXPRESSION ? involvesAggregation(e11.expr) : e11.kind === "block" ? involvesAggregation(e11.result) : e11.kind === "lod" || e11.kind === "where" || e11.kind === Kind.INTERVAL ? involvesAggregation(e11.value) : false : false;
 }
 function expandMetric(e11, t, n, r3) {
-  let i = `metric:${t.name.name}`;
-  return recordDep(e11, i), e11.expanding.has(i) ? (reportCycle(e11, i, r3), makeRef(e11, t.name.name, [], t.ty, r3)) : (resolveMetricDecl(e11, t, n), withGuard(e11, i, () => makeRef(e11, t.name.name, [], t.ty, r3), () => {
+  let i = `metric:${t.name.name}`, a = t.source ?? t.name.name;
+  return recordDep(e11, i), e11.expanding.has(i) ? (reportCycle(e11, i, r3), makeRef(e11, a, [], t.ty, r3)) : (resolveMetricDecl(e11, t, n), withGuard(e11, i, () => makeRef(e11, a, [], t.ty, r3), () => {
     if (!t.resolved)
-      return makeRef(e11, t.name.name, [], t.ty, r3);
+      return makeRef(e11, a, [], t.ty, r3);
     let n3 = t.resolved;
-    return nameInlined(e11, t.name.name, n3, r3, "measure", createModelFieldReference("", t.name.name));
+    return nameInlined(e11, a, n3, r3, "measure", createModelFieldReference("", a));
   }));
 }
 var CUSTOM_AGG_FN = "custom_agg";
@@ -124623,7 +124661,7 @@ var ExtendFold = class extends HirFold {
     let t = this.planning.size === 0 ? e11 : {
       ...e11,
       children: e11.children.filter((e12) => e12.edge.join !== "semi" || !(e12.input.predicates ?? []).some((e13) => referencesPlanning(this, e13.predicate)))
-    }, n = materialiseExpandGrain(this, t);
+    }, n = materialiseExpandGrain(this, t, [], "scan");
     return {
       ...t,
       ...foldExpandedPredicates(this, n)
@@ -124667,25 +124705,51 @@ function declOrigin(e11, t) {
   let n = e11.declarationsMap.get(t);
   return n?.kind === "dimension" ? n.origin : undefined;
 }
-function materialiseExpandGrain(e11, t, n = []) {
-  let r3 = partGrainKeys(e11, t, n), i = (e12, t3 = []) => [
+function materialiseExpandGrain(e11, t, n = [], r3 = undefined) {
+  let i = partGrainKeys(e11, t, n), a = (e12, t3 = []) => [
     ...e12,
     ...n,
-    ...r3,
+    ...i,
     ...t3 ?? []
-  ], a = slotKeys(t), s3 = (t3, n3) => ({
+  ], s3 = slotKeys(t), c3 = /* @__PURE__ */ new Set;
+  walkTree(t, (e12) => c3.add(e12.model));
+  let l = (n3, i3) => {
+    let l3 = n3.extend ?? extendSlot(e11, n3.model, a(n3.fields ?? [], i3), s3.get(n3.model) ?? []), f = r3 ? joinPartKeyModels(e11, n3, l3, c3, r3 === "scan" && n3 === t) : n3;
+    return u(f, l3, i3);
+  }, u = (t3, n3, r4) => ({
     ...t3,
-    ...import_lodash2.omitBy({ extend: t3.extend ?? extendSlot(e11, t3.model, i(t3.fields ?? [], n3), a.get(t3.model) ?? []) }, import_lodash2.isUndefined),
+    ...import_lodash2.omitBy({ extend: n3 }, import_lodash2.isUndefined),
     ...t3.fields ? { fields: foldComputedKeys(e11, t3.fields) } : {},
     children: t3.children.map((t4) => ownScope(t4) && !t4.expanded ? {
       ...t4,
-      input: materialiseExpandGrain(e11, t4.input, levelSubjects(t4.input))
+      input: materialiseExpandGrain(e11, t4.input, levelSubjects(t4.input), "branch")
     } : {
       ...t4,
-      input: s3(t4.input, t4.expanded ? (t4.input.predicates ?? []).flatMap((e12) => e12.targets) : n3)
+      input: l(t4.input, t4.expanded ? (t4.input.predicates ?? []).flatMap((e12) => e12.targets) : r4)
     })
   });
-  return s3(t);
+  return l(t);
+}
+function keyModelPaths(e11, t, n, r3) {
+  let i = import_lodash2.uniq(n.map((e12) => e12.modelName)).filter((e12) => !r3.has(e12));
+  if (i.length === 0)
+    return [];
+  let a = resolveJoinTree(i, baseGraph(e11), t, true);
+  return a ? a.paths.filter((e12) => e12[0].length > 0).map((n3) => pathToEdges(e11, t, n3[0])).filter((e12) => !r3.has(e12[e12.length - 1].destModel)) : [];
+}
+function joinPartKeyModels(e11, t, n, r3, i) {
+  if (n === undefined || !i && !bareNode(extendDef(e11.resolver.dataset, n).base))
+    return t;
+  let a = partKeysOf(e11, t.fields ?? []).map((e12) => e12.origin), s3 = keyModelPaths(e11.resolver, t.model, a, r3);
+  if (s3.length === 0)
+    return t;
+  let c3 = cloneTree(t);
+  for (let e12 of s3) {
+    for (let t3 of e12)
+      r3.add(t3.destModel);
+    placeChain(c3, e12);
+  }
+  return c3;
 }
 function levelSubjects(e11) {
   return (e11.predicates ?? []).flatMap((e12) => e12.targets);
@@ -124697,26 +124761,28 @@ function foldComputedKeys(e11, t) {
   } : t3);
 }
 function partGrainKeys(e11, t, n) {
-  let r3 = [], i = /* @__PURE__ */ new Set, a = [...n];
-  walkTree(t, (e12) => a.push(...e12.fields ?? []));
-  let s3 = /* @__PURE__ */ new Set, c3 = (t3) => {
+  let r3 = [...n];
+  return walkTree(t, (e12) => r3.push(...e12.fields ?? [])), partKeysOf(e11, r3);
+}
+function partKeysOf(e11, t) {
+  let n = [], r3 = /* @__PURE__ */ new Set, i = /* @__PURE__ */ new Set, a = (t3) => {
     t3 && walkAll(t3, (t4) => {
       if (t4.kind === "computed_ref") {
         for (let e12 of t4.reduce.by) {
           let t5 = modelFieldRefAsKey(e12.origin);
-          i.has(t5) || (i.add(t5), r3.push(e12));
+          r3.has(t5) || (r3.add(t5), n.push(e12));
         }
         return false;
       }
       if (t4.kind !== Kind.IDENTIFIER)
         return false;
-      let n3 = lookupDim(e11.resolver, t4);
-      return !n3 || s3.has(n3) || n3.body?.syntax !== "aql" || (s3.add(n3), c3(unwrapDimBody(n3))), false;
+      let s3 = lookupDim(e11.resolver, t4);
+      return !s3 || i.has(s3) || s3.body?.syntax !== "aql" || (i.add(s3), a(unwrapDimBody(s3))), false;
     });
   };
-  for (let t3 of a)
-    c3(dimBodyOf(e11, t3));
-  return r3;
+  for (let n3 of t)
+    a(dimBodyOf(e11, n3));
+  return n;
 }
 function dimBodyOf(e11, t) {
   let n = lookupDim(e11.resolver, unwrapNamed(t.expr));
@@ -124823,13 +124889,20 @@ function defineSlot(e11, t, n, r3) {
     };
   }
   let f = n.filter((e12) => !l.has(e12)), p3 = {
-    base: f.some((e12) => e12.dependentModels.length > 0) ? dependentBase(e11, t, f, u) : u,
+    base: f.some((e12) => e12.dependentModels.length > 0) ? dependentBase(e11, t, f.map(withPartKeyModels), u) : u,
     computed: f.map((t3) => foldPartScans(e11, t3)),
     projected: f.filter((e12) => !e12.unrollOnly).map((e12) => e12.computed.origin),
     parts: []
   };
   return a && (p3.sealed = true), defineExtend(i.dataset, p3);
 }
+function withPartKeyModels(e11) {
+  let t = e11.partKeyModels.filter((t3) => !e11.dependentModels.includes(t3));
+  return t.length === 0 ? e11 : {
+    ...e11,
+    dependentModels: [...e11.dependentModels, ...t]
+  };
+}
 function planKeys(e11, t, n, r3) {
   let { resolver: i } = e11, a = [], s3 = (e12) => r3.some((t3) => t3.field.name.name === e12) || a.some((t3) => t3.field.name.name === e12);
   for (let r4 of n) {
@@ -124937,7 +125010,8 @@ function planDim(e11, t, n) {
     let u = t.modelPaths ? [...t.modelPaths.keys()] : dependentModels(r3, i, n), f = u.filter((e12) => c3.has(e12)), p3 = hasComputedRef$1(a) ? f.length === 0 ? [] : u.filter((e12) => c3.has(e12) || l.has(e12)) : u, m3 = {
       field: t,
       computed: computedColumn(r3, t),
-      dependentModels: p3
+      dependentModels: p3,
+      partKeyModels: u.filter((e12) => l.has(e12))
     };
     if (s3.length === 0)
       return [m3];
@@ -125690,7 +125764,10 @@ function resolveModuleRef(e11, t, n, r3, i, a, s3 = i) {
 function resolveFieldRef(e11, t, n, r3, i, a, s3) {
   if ((n.kind === "dimension" || n.kind === "measure") && resolveModelField(e11, t, n), n.kind === "measure")
     return expandMeasure(e11, t, n, a);
-  let c3 = createFieldType(genUniqueFieldName({ name: n.name.name }, t.name), n.ty.type, n.ty.origin, t.name, n.kind), l = n.kind === "param" ? createTableLiteralType(createRowType([createFieldType(n.name.name, n.ty.type, n.ty.origin, t.name, "param")])) : c3;
+  let c3 = createFieldType(genUniqueFieldName({ name: n.name.name }, t.name), n.ty.type, n.ty.origin, t.name, n.kind), l = n.kind === "param" ? {
+    ...createTableLiteralType(createRowType([createFieldType(n.name.name, n.ty.type, n.ty.origin, t.name, "param")])),
+    param: `${t.name}.${n.name.name}`
+  } : c3;
   if (n.kind === "param" && n.ty.origin) {
     let t3 = getParamBinding(e11, n.ty.origin);
     if (t3)
@@ -127549,6 +127626,18 @@ function applyFilter(e11, t, n, r3, i) {
   let w3 = m3.find((t3) => t3.edge.keys.some((e12) => p3.keys.some((t4) => originEq$1(e12.from, t4.from))) && treeFitsCondition(e11, a, s3, t3, r3)), E3 = w3 ? conjoinScalarExistenceFilter(e11, a, s3, w3, r3) : buildScalarExistenceFilter(e11, a, s3, [r3], [p3.destModel]);
   return E3 ? (i.add(r3), withMembershipHops(S3(w3, E3))) : n;
 }
+function narrowToReachableRows(e11, t, n, r3) {
+  let i = (r4) => r4 === n || r4 === "H.calendar" || joinPathTo(e11, t, n, r4) !== undefined;
+  return r3.flatMap((t3) => {
+    if (t3.predicate.kind !== "in_table_condition" || t3.role === "rlp")
+      return [t3];
+    let n3 = t3.predicate.row.filter((e12) => exprModels(e12.expr).every(i));
+    return n3.length === t3.predicate.row.length ? [t3] : n3.length === 0 ? [] : [makeCondition(e11, {
+      ...t3.predicate,
+      row: n3
+    }, t3.role)];
+  });
+}
 function joinPathTo(e11, t, n, r3) {
   let i = t.findPath(n, r3, true);
   if (i && i[0].length !== 0)
@@ -128427,7 +128516,7 @@ var Window = class {
       return u.foldFunctionCall(e12);
     if (f.kind === "unsupported")
       return u.resolver.dataset.diagnostics.push(createError(ErrorCode.INVALID_EXPRESSION_0, l, undefined, `Window aggregation does not support \`${f.type}\` yet.`)), u.foldFunctionCall(e12);
-    let p3 = dedupKeys([...u.aggGrain(), ...modelFieldExprs(u.resolver, [...s3, ...a])]), m3 = f.kind === "simple" ? [{
+    let p3 = [...s3, ...a].filter((e13) => !this.hasAggregate(e13)), m3 = dedupKeys([...u.aggGrain(), ...modelFieldExprs(u.resolver, p3)]), S3 = f.kind === "simple" ? [{
       windowFn: t,
       rollupFn: f.func,
       arg: n
@@ -128435,8 +128524,8 @@ var Window = class {
       windowFn: e13.aggFn,
       rollupFn: e13.rollupFn,
       arg: e13.arg
-    })), S3 = this.buildWindowLodParts(e12, m3, p3, r3, i, s3, a, c3, l);
-    return f.kind === "simple" ? S3[0] : f.combine(S3, e12.ty, l);
+    })), w3 = this.buildWindowLodParts(e12, S3, m3, r3, i, s3, a, c3, l);
+    return f.kind === "simple" ? w3[0] : f.combine(w3, e12.ty, l);
   }
   aggregateValue(e12, t, n, r3) {
     let i = createFieldType(n, e12 === "count" ? numberType : scalarOf(t.ty), undefined, exprModels(t)[0], "measure");
@@ -128445,24 +128534,47 @@ var Window = class {
   buildWindowLodParts(e12, t, n, r3, i, a, s3, c3, l) {
     let { g: u } = this, f = e12.ty, p3 = windowLodPartitionKeys(u, s3, a), m3 = u.currentIteration(), S3 = m3.groups;
     m3.groups = n;
-    let w3 = [], E3 = /* @__PURE__ */ new Map, k3 = u.inScope("window-lod", e12, () => t.map((e13) => {
-      let t3 = !this.hasAggregate(e13.arg), n3 = t3 ? `${e13.windowFn}(${argSig(e13.arg)})` : argSig(e13.arg), r4 = E3.get(n3);
-      if (r4)
-        return r4;
-      let i3 = `__wv_${this.windowLodCounter++}`, a3 = cloneResolved(u.resolver, e13.arg), s4 = u.foldExpr(t3 ? this.aggregateValue(e13.windowFn, a3, i3, l) : a3), c4 = createFieldType(i3, scalarOf(s4.ty));
+    let w3 = [], E3 = /* @__PURE__ */ new Map, k3 = (e13, t3) => {
+      let n3 = E3.get(e13);
+      if (n3)
+        return n3;
+      let r4 = `__wv_${this.windowLodCounter++}`, i3 = u.foldExpr(t3(r4)), a3 = createFieldType(r4, scalarOf(i3.ty));
       w3.push({
-        name: i3,
-        ty: c4,
-        expr: s4
+        name: r4,
+        ty: a3,
+        expr: i3
       });
-      let f3 = {
-        name: i3,
-        ty: c4
+      let s4 = {
+        name: r4,
+        ty: a3
       };
-      return E3.set(n3, f3), f3;
+      return E3.set(e13, s4), s4;
+    }, { partValues: N3, orderCols: I3 } = u.inScope("window-lod", e12, () => ({
+      partValues: t.map((e13) => {
+        let t3 = !this.hasAggregate(e13.arg), n3 = t3 ? `${e13.windowFn}(${argSig(e13.arg)})` : argSig(e13.arg);
+        return k3(n3, (n4) => {
+          let r4 = cloneResolved(u.resolver, e13.arg);
+          return t3 ? this.aggregateValue(e13.windowFn, r4, n4, l) : r4;
+        });
+      }),
+      orderCols: a.map((e13) => this.hasAggregate(e13) ? k3(argSig(e13), () => cloneResolved(u.resolver, e13)) : undefined)
     }));
     m3.groups = S3;
-    let N3 = {
+    let L3 = i.map((e13, t3) => {
+      let n3 = I3[t3];
+      if (!n3)
+        return cloneResolved(u.resolver, e13);
+      let r4 = makeIdent(u.resolver, n3.name, [], n3.ty, l), { expr: i3 } = e13, a3 = i3.kind === Kind.FUNCTION_CALL && unwrapOrderKey(i3) !== i3 ? {
+        ...i3,
+        id: u.resolver.newNodeId(l),
+        args: [r4, ...i3.args.slice(1).map((e14) => cloneResolved(u.resolver, e14))]
+      } : r4;
+      return {
+        ...e13,
+        id: u.resolver.newNodeId(l),
+        expr: a3
+      };
+    }), U3 = {
       kind: "merge",
       id: u.resolver.newNodeId(l),
       ty: createTableType(createRowType([...n.map((e13) => e13.ty), ...w3.map((e13) => e13.ty)]), undefined),
@@ -128475,37 +128587,37 @@ var Window = class {
         name: makeIdent(u.resolver, e13.name, [], e13.ty, l),
         expr: e13.expr
       }))]
-    }, I3 = t.map((e13, t3) => {
-      let n3 = `__w_${this.windowLodCounter++}`, a3 = createFieldType(n3, scalarOf(f)), s4 = k3[t3];
+    }, pe3 = t.map((e13, t3) => {
+      let n3 = `__w_${this.windowLodCounter++}`, i3 = createFieldType(n3, scalarOf(f)), a3 = N3[t3];
       return {
         name: n3,
-        ty: a3,
+        ty: i3,
         value: {
           kind: Kind.FUNCTION_CALL,
           id: u.resolver.newNodeId(l),
-          ty: a3,
-          name: makeIdent(u.resolver, `window_${e13.windowFn}`, [], a3, l),
+          ty: i3,
+          name: makeIdent(u.resolver, `window_${e13.windowFn}`, [], i3, l),
           args: [
-            makeIdent(u.resolver, s4.name, [], s4.ty, l),
+            makeIdent(u.resolver, a3.name, [], a3.ty, l),
             ...r3 ? [cloneResolved(u.resolver, r3)] : [],
-            ...i.map((e14) => cloneResolved(u.resolver, e14)),
+            ...L3,
             ...p3.map((e14) => namedPartitionArg(u, e14, l)),
             ...c3 ? [cloneResolved(u.resolver, c3)] : []
           ]
         }
       };
-    }), L3 = {
+    }), me3 = {
       kind: "window",
       id: u.resolver.newNodeId(l),
-      ty: N3.ty,
-      input: N3,
-      columns: I3.map((e13) => ({
+      ty: U3.ty,
+      input: U3,
+      columns: pe3.map((e13) => ({
         name: e13.name,
         value: e13.value
       }))
     };
     return t.map((e13, t3) => {
-      let { name: n3, ty: r4 } = I3[t3], i3 = u.grain().map((e14) => cloneResolved(u.resolver, e14)), a3 = createFieldType(n3, scalarOf(f), undefined, undefined, "aggregate"), s4 = {
+      let { name: n3, ty: r4 } = pe3[t3], i3 = u.grain().map((e14) => cloneResolved(u.resolver, e14)), a3 = createFieldType(n3, scalarOf(f), undefined, undefined, "aggregate"), s4 = {
         kind: Kind.FUNCTION_CALL,
         id: u.resolver.newNodeId(l),
         ty: a3,
@@ -128515,7 +128627,7 @@ var Window = class {
         kind: "reduce",
         id: u.resolver.newNodeId(l),
         ty: createTableType(createRowType([...i3.map((e14) => e14.ty), a3]), undefined),
-        input: L3,
+        input: me3,
         by: i3,
         aggregates: [s4]
       }, p4 = isFieldType(f) ? createFieldType(n3, f.type, undefined, undefined, "aggregate") : a3;
@@ -129248,20 +129360,56 @@ function nonCyclicRlp(e13, t) {
   return t.filter((t3) => t3.role !== "rlp" || !filterRefKeys(t3.predicate).some((t4) => e13.foldingDimKeys.has(t4) || n.some((n3) => dependsOn(e13.resolver.dataset, t4, n3))));
 }
 function foldWhere(e13, t) {
-  let n = e13.contextFilters, r3 = mergeGrainsOf(t.value), i = e13.currentIteration(), a = t.conditions.map((t3) => {
-    let n3 = i.inheritedGroups, a3 = inheritsViz(t3) && r3.length === 0;
-    inheritsViz(t3) && r3.length > 0 && (i.inheritedGroups = r3);
-    let s4 = () => e13.withoutIteration(t3, () => makeCondition(e13.resolver, unwrapBlock$1(e13.foldExpr(t3)), "where"));
-    a3 && (i.inheritedGroups = e13.period.rawKeys(e13.grain()));
-    let c3 = a3 ? e13.period.withoutShift(t3, s4) : s4();
-    return i.inheritedGroups = n3, c3;
+  let n = t.conditions.filter(isShorthand);
+  if (n.length > 0 && hasUnion(t.value))
+    return foldWhere(e13, {
+      ...t,
+      value: distributeOverBranches(e13, t.value, n),
+      conditions: t.conditions.filter((e14) => !isShorthand(e14))
+    });
+  let r3 = e13.contextFilters, i = mergeGrainsOf(t.value), a = i.length > 0 ? [] : relationKeysOf(t.value), s3 = a.length > 0 ? dedupKeys([...e13.grain(), ...a]) : i, c3 = e13.currentIteration(), l = t.conditions.map((t3) => {
+    let n3 = c3.inheritedGroups, r4 = inheritsViz(t3) && s3.length === 0;
+    inheritsViz(t3) && s3.length > 0 && (c3.inheritedGroups = s3);
+    let i3 = () => e13.withoutIteration(t3, () => makeCondition(e13.resolver, unwrapBlock$1(e13.foldExpr(t3)), "where"));
+    r4 && (c3.inheritedGroups = e13.period.rawKeys(e13.grain()));
+    let a3 = r4 ? e13.period.withoutShift(t3, i3) : i3();
+    return c3.inheritedGroups = n3, a3;
   });
-  e13.contextFilters = [...n, ...a];
-  let s3 = e13.inScope("where-value", t, () => e13.foldExpr(t.value));
-  return e13.contextFilters = n, s3;
+  e13.contextFilters = [...r3, ...l];
+  let u = e13.inScope("where-value", t, () => e13.foldExpr(t.value));
+  return e13.contextFilters = r3, u;
 }
 function mergeGrainsOf(e13) {
-  return e13.kind === "merge" ? e13.grains : e13.kind === "pivot_context" ? mergeGrainsOf(e13.value) : e13.kind === "union" && e13.branches.length > 0 ? mergeGrainsOf(e13.branches[0]) : [];
+  return e13.kind === "merge" ? e13.grains : e13.kind === "pivot_context" ? mergeGrainsOf(e13.value) : e13.kind === "union" ? dedupKeys(e13.branches.flatMap(mergeGrainsOf)) : [];
+}
+function relationKeysOf(e13) {
+  return e13.kind === "unique" || e13.kind === "group" ? e13.keys : [];
+}
+function isShorthand(e13) {
+  return e13.kind === "block" && inheritsViz(e13);
+}
+function hasUnion(e13) {
+  return e13.kind === "union" || e13.kind === "pivot_context" && hasUnion(e13.value);
+}
+function distributeOverBranches(e13, t, n) {
+  if (t.kind === "pivot_context")
+    return {
+      ...t,
+      value: distributeOverBranches(e13, t.value, n)
+    };
+  if (t.kind !== "union")
+    return t;
+  let r3 = e13.resolver.dataset.spans.get(t.id) ?? locStub();
+  return {
+    ...t,
+    branches: t.branches.map((t3) => ({
+      kind: "where",
+      id: e13.resolver.newNodeId(r3),
+      ty: t3.ty,
+      value: t3,
+      conditions: n.map((t4) => cloneResolved(e13.resolver, t4))
+    }))
+  };
 }
 function unwrapBlock$1(e13) {
   return e13.kind === "block" ? unwrapBlock$1(e13.result) : e13;
@@ -129279,7 +129427,7 @@ function grainTableCondition(e13, t) {
       table: foldTableAtGrain(e13, t.table, e13.grain())
     };
   }
-  let n = (t.inheritGrains ? e13.grain() : []).map((t3) => cloneResolved(e13.resolver, t3)), r3 = t.row.map((t3) => cloneResolved(e13.resolver, t3)), i = dedupKeys([...n, ...r3]), a = foldTableAtGrain(e13, t.table, i), s3 = a.kind === "filter" ? {
+  let n = (t.inheritGrains ? e13.grain() : []).map((t3) => cloneResolved(e13.resolver, t3)), r3 = t.row.map((t3) => cloneResolved(e13.resolver, t3)), i = dedupKeys([...n, ...r3]), a = foldTableAtGrain(e13, withOwnGrain(t.table, i), []), s3 = a.kind === "filter" ? {
     ...a,
     ty: a.input.ty
   } : a;
@@ -129289,6 +129437,25 @@ function grainTableCondition(e13, t) {
     table: s3
   };
 }
+function withOwnGrain(e13, t) {
+  if (e13.kind === "where")
+    return {
+      ...e13,
+      value: withOwnGrain(e13.value, t)
+    };
+  if (e13.kind !== "filter" || e13.input.kind !== "unique")
+    return e13;
+  let n = createTableType(createRowType(t.map((e14) => e14.ty)), undefined);
+  return {
+    ...e13,
+    ty: n,
+    input: {
+      ...e13.input,
+      ty: n,
+      keys: t
+    }
+  };
+}
 function foldTableAtGrain(e13, t, n) {
   return e13.inIteration({
     groups: undefined,
@@ -129551,7 +129718,7 @@ var GrainFold = class e13 extends HirFold {
     }
   }
   stateFingerprint() {
-    let { pkGrain: e14, inheritedGroups: t, groups: n, dim: r3, noSlice: i, source: a } = this.currentIteration();
+    let { pkGrain: e14, inheritedGroups: t, groups: n, dim: r3, droppable: i, source: a } = this.currentIteration();
     return [
       `pk=${keyFingerprint(e14)}`,
       `inherited=${keyFingerprint(t)}`,
@@ -129699,29 +129866,40 @@ var GrainFold = class e13 extends HirFold {
     }
   }
   foldTransform(e14) {
-    let t = this.currentIteration(), n = groupingOf(e14.input), r3 = (t3, r4, i3) => this.inIteration({
-      groups: n,
-      source: {
-        relation: t3,
-        depth: r4
-      }
-    }, () => this.inScope("agg-output", e14, i3)), i;
+    let t = this.currentIteration(), n = groupingOf(e14.input), r3 = (r4, i3, a) => {
+      let s3 = new Set(unslicedOf(r4).keys.map((e15) => modelFieldRefAsKey(e15.origin)));
+      return this.inIteration({
+        groups: n,
+        source: {
+          relation: r4,
+          depth: i3
+        },
+        inheritedGroups: t.inheritedGroups.filter((e15) => !s3.has(modelFieldRefAsKey(e15.origin)))
+      }, () => this.inScope("agg-output", e14, a));
+    }, i;
     switch (e14.kind) {
       case "group": {
-        let r4 = dedupKeys([...this.grain(), ...n ?? []]), a = this.foldKeys(this.period.applyToKeys(e14.keys)), s3 = dedupKeys([...a, ...r4]), c3 = this.inIteration({
+        let r4 = dedupKeys([...this.grain(), ...n ?? []]), a = this.foldKeys(this.period.applyToKeys(e14.keys)), s3 = dedupKeys([...a, ...r4]), c3 = dedupKeys([...s3, ...t.inheritedGroups]), l = this.inIteration({
           groups: n,
-          inheritedGroups: dedupKeys([...s3, ...t.inheritedGroups])
-        }, () => this.inScope("group-input", e14, () => this.foldExpr(e14.input))), l = scanRootOf(c3);
-        l && this.diagnoseGroupFanout(this.graphContext.currentGraph(), l, a);
-        let u = this.resolver.dataset.spans.get(e14.id) ?? locStub();
+          inheritedGroups: c3,
+          droppable: c3.filter((e15) => !a.includes(e15))
+        }, () => this.inScope("group-input", e14, () => this.foldExpr(e14.input))), u = scanRootOf(l);
+        u && this.diagnoseGroupFanout(this.graphContext.currentGraph(), u, a);
+        let f = unslicedOf(l), p3 = s3.filter((e15) => !f.keys.includes(e15)), m3 = f.scanRoot ? this.noSliceComments(f.scanRoot, f.keys) : [], S3 = this.resolver.dataset.spans.get(e14.id) ?? locStub();
         i = {
           kind: "reduce",
-          id: this.resolver.newNodeId(u),
-          ty: createTableType(createRowType(s3.map((e15) => e15.ty)), e14.ty.rootModel),
-          input: c3,
-          by: s3,
+          id: this.resolver.newNodeId(S3),
+          ty: createTableType(createRowType(p3.map((e15) => e15.ty)), e14.ty.rootModel),
+          input: l,
+          by: p3,
           aggregates: []
-        };
+        }, f.keys.length > 0 && (i = {
+          ...i,
+          unsliced: f.keys
+        }), m3.length > 0 && (i = {
+          ...i,
+          annotations: m3
+        });
         break;
       }
       case "select": {
@@ -129781,26 +129959,28 @@ var GrainFold = class e13 extends HirFold {
         break;
       }
       case "reduce": {
-        let t3 = this.timeSpine.graphWithCalendar(this.graphContext.currentGraph()), r4 = this.inScope("reduce-keys", e14, () => this.foldKeys(this.period.applyToKeys(e14.by, e14))), a = dedupKeys([...r4, ...this.grain()]), s3 = [], c3 = this.inIteration({
+        let t3 = this.timeSpine.graphWithCalendar(this.graphContext.currentGraph()), r4 = this.inScope("reduce-keys", e14, () => this.foldKeys(this.period.applyToKeys(e14.by, e14))), a = dedupKeys([...r4, ...this.grain()]), s3 = this.inIteration({
           groups: n,
           inheritedGroups: a,
-          noSlice: s3
-        }, () => this.inScope("reduce-input", e14, () => this.foldExpr(e14.input))), l = s3.filter((e15) => r4.includes(e15.key)), u = l.length > 0 ? r4.filter((e15) => !l.some((t4) => t4.key === e15)) : r4, f = bareLeafKeys(this.resolver, u, materialisedOrigins(c3)), p3 = this.inIteration({
+          droppable: a
+        }, () => this.inScope("reduce-input", e14, () => this.foldExpr(e14.input))), c3 = unslicedOf(s3), l = c3.keys.filter((e15) => r4.includes(e15)), u = l.length > 0 ? r4.filter((e15) => !l.includes(e15)) : r4, f = bareLeafKeys(this.resolver, u, materialisedOrigins(s3)), p3 = this.inIteration({
           groups: n,
           inheritedGroups: a,
           source: {
-            relation: c3,
-            depth: iterationDepthOf(c3)
+            relation: s3,
+            depth: iterationDepthOf(s3)
           }
-        }, () => this.inScope("agg-output", e14, () => this.foldExprs(e14.aggregates))), m3 = this.collectAccessedFields(p3, iterationDepthOf(c3));
-        c3 = addJoins(this.resolver, t3, c3, m3, e14.allowFanout ? "fanInvariant" : "rowLevel"), i = {
+        }, () => this.inScope("agg-output", e14, () => this.foldExprs(e14.aggregates))), m3 = this.collectAccessedFields(p3, iterationDepthOf(s3));
+        s3 = addJoins(this.resolver, t3, s3, m3, e14.allowFanout ? "fanInvariant" : "rowLevel"), i = {
           ...e14,
           by: f,
-          input: c3,
+          input: s3,
           aggregates: p3
-        }, l.length > 0 && (i = {
+        };
+        let S3 = c3.scanRoot ? this.noSliceComments(c3.scanRoot, l) : [];
+        S3.length > 0 && (i = {
           ...i,
-          annotations: [...e14.annotations ?? [], ...l.map((e15) => e15.comment)]
+          annotations: [...e14.annotations ?? [], ...S3]
         });
         break;
       }
@@ -129979,26 +130159,18 @@ var GrainFold = class e13 extends HirFold {
       return;
     let n = this.graphContext.currentGraph(), r3 = t.model, i = this.timeSpine.graphWithCalendar(n), a = this.period.withExactRange(e14, () => effectiveFiltersForModel(this, r3));
     a = [...a, ...this.period.dayRoundtripFilters(this.period.rawKeys(this.currentIteration().inheritedGroups).map((e15) => e15.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: l } = this.currentIteration(), u = this.currentIteration().inheritedGroups;
-    if (l) {
-      let e15 = (e16) => e16 === "H.calendar" || n.canReach(r3, e16, {
-        allowFanout: true,
-        respectFilterDirection: true
-      }), t3 = u.filter((t4) => !exprModels(t4.expr).every(e15));
-      if (t3.length > 0) {
-        u = u.filter((e17) => !t3.includes(e17));
-        let e16 = this.noSliceComments(r3, t3);
-        l.push(...t3.map((t4, n3) => ({
-          key: t4,
-          comment: e16[n3]
-        })));
-      }
-    }
-    t = addJoins(this.resolver, i, t, u, "grainKey", s3, c3), t.kind === "expand_model" && (t = applyFilters(this.resolver, i, t, s3, c3));
-    let f = s3.filter((e15) => !c3.has(e15)), p3 = this.resolver.dataset.spans.get(e14.id) ?? locStub(), m3 = f.flatMap((e15) => e15.predicate.kind === "in_table_condition" ? e15.predicate.row.map((e16) => e16.expr) : []);
-    m3.length > 0 && (t = addJoins(this.resolver, n, t, leafFields(this.resolver, m3))), f.length > 0 && (t = this.filterInput(t, p3, f));
-    let S3 = this.period.strictBounds(bareLeafKeys(this.resolver, u, materialisedOrigins(t)).map((e15) => e15.expr), p3);
-    return S3.length > 0 ? this.filterInput(t, p3, S3) : t;
+    let s3 = narrowToReachableRows(this.resolver, i, r3, normalizeConditions(this.resolver, a, i, r3)), c3 = /* @__PURE__ */ new Set, { droppable: l = [] } = this.currentIteration(), u = (e15) => e15 === "H.calendar" || n.canReach(r3, e15, {
+      allowFanout: true,
+      respectFilterDirection: true
+    }), f = l.filter((e15) => !exprModels(e15.expr).every(u)), p3 = this.currentIteration().inheritedGroups.filter((e15) => !f.includes(e15));
+    t = addJoins(this.resolver, i, t, p3, "grainKey", s3, c3), t.kind === "expand_model" && (t = applyFilters(this.resolver, i, t, s3, c3));
+    let m3 = s3.filter((e15) => !c3.has(e15)), S3 = this.resolver.dataset.spans.get(e14.id) ?? locStub(), w3 = m3.flatMap((e15) => e15.predicate.kind === "in_table_condition" ? e15.predicate.row.map((e16) => e16.expr) : []);
+    w3.length > 0 && (t = addJoins(this.resolver, n, t, leafFields(this.resolver, w3))), f.length > 0 && t.kind === "expand_model" && (t = {
+      ...t,
+      unsliced: f
+    }), m3.length > 0 && (t = this.filterInput(t, S3, m3));
+    let E3 = this.period.strictBounds(bareLeafKeys(this.resolver, p3, materialisedOrigins(t)).map((e15) => e15.expr), S3);
+    return E3.length > 0 ? this.filterInput(t, S3, E3) : t;
   }
   diagnoseGroupFanout(e14, t, n) {
     let r3 = /* @__PURE__ */ new Set;
@@ -130195,6 +130367,15 @@ function wireGrains(e14, t) {
   let n = new GrainFold(e14);
   return n.foldRelationshipKeyDims(), n.foldBlock(t);
 }
+function unslicedOf(e14) {
+  let t = e14;
+  for (;t.kind === "filter" || t.kind === "select" || t.kind === "sort"; )
+    t = t.input;
+  return t.kind === "expand_model" ? {
+    keys: t.unsliced ?? [],
+    scanRoot: t.model
+  } : t.kind === "reduce" ? { keys: t.unsliced ?? [] } : { keys: [] };
+}
 function scanRootOf(e14) {
   let t = e14;
   for (;; ) {
@@ -130208,18 +130389,6 @@ function scanRootOf(e14) {
       return;
   }
 }
-function partGrainPaths(e14, t, n, r3) {
-  let i = [];
-  for (let e15 of n)
-    for (let t3 of e15.by) {
-      let e16 = isFieldType(t3.ty) ? t3.ty.origin : undefined;
-      e16 && !r3.has(e16.modelName) && !i.includes(e16.modelName) && i.push(e16.modelName);
-    }
-  if (i.length === 0)
-    return [];
-  let a = resolveJoinTree(i, baseGraph(e14), t, true);
-  return a ? a.paths.filter((e15) => e15[0].length > 0).map((n3) => pathToEdges(e14, t, n3[0])).filter((e15) => !r3.has(e15[e15.length - 1].destModel)) : [];
-}
 function appendPartGrains(e14, t, n) {
   let r3 = (t3) => extendDef(e14.dataset, t3), i = /* @__PURE__ */ new Set;
   walkTree(t, (e15) => i.add(e15.model)), n && t.extend !== undefined && walkTree(r3(t.extend).base, (e15) => i.add(e15.model));
@@ -130230,12 +130399,14 @@ function appendPartGrains(e14, t, n) {
     if (t3.extend === undefined)
       continue;
     let { base: s4, parts: l } = r3(t3.extend);
-    if (l.length !== 0 && (bareNode(s4) || n && t3 === a))
-      for (let n3 of partGrainPaths(e14, t3.model, l, i)) {
-        for (let e15 of n3)
-          i.add(e15.destModel);
-        placeChain(t3, n3), c3 = true;
-      }
+    if (l.length === 0 || !bareNode(s4) && !(n && t3 === a))
+      continue;
+    let u = l.flatMap((e15) => e15.by.flatMap((e16) => isFieldType(e16.ty) && e16.ty.origin ? [e16.ty.origin] : []));
+    for (let n3 of keyModelPaths(e14, t3.model, u, i)) {
+      for (let e15 of n3)
+        i.add(e15.destModel);
+      placeChain(t3, n3), c3 = true;
+    }
   }
   return c3 ? a : t;
 }
@@ -130732,7 +130903,15 @@ var WindowFold = class extends HirFold {
     }
     return t;
   }
+  levels = /* @__PURE__ */ new Map;
   windowInput(e15, t) {
+    let n = [];
+    for (let e16 of t)
+      (n[this.levels.get(e16) ?? 0] ??= []).push(e16);
+    let [r3, ...i] = n;
+    return i.reduce((e16, t3) => this.windowLevel(e16, t3), this.windowLevel(e15, r3));
+  }
+  windowLevel(e15, t) {
     return {
       kind: "window",
       id: this.resolver.newNodeId(),
@@ -130775,17 +130954,17 @@ var WindowFold = class extends HirFold {
     if (!this.hasWindowBelow(e15))
       return e15;
     if (e15.kind === Kind.FUNCTION_CALL) {
-      let n = {
+      let n = t.length, r3 = {
         ...e15,
         args: e15.args.map((e16) => this.hoistWindows(e16, t))
       };
       if (!isWindowFn(e15.name.name))
-        return n;
-      let r3 = `__w${this.counter++}`;
-      return t.push({
-        name: r3,
-        value: n
-      }), this.columnRef(r3, n.ty);
+        return r3;
+      let i = `__w${this.counter++}`, a = {
+        name: i,
+        value: r3
+      }, s3 = t.slice(n).map((e16) => this.levels.get(e16) ?? 0);
+      return this.levels.set(a, s3.length > 0 ? Math.max(...s3) + 1 : 0), t.push(a), this.columnRef(i, r3.ty);
     }
     return e15.kind === Kind.NAMED_EXPRESSION ? {
       ...e15,
@@ -131088,6 +131267,8 @@ function resolvePrefix(e15, t, n) {
   let s3;
   if (isErrType(r3.ty))
     s3 = errType;
+  else if (isTableType(r3.ty) && r3.ty.param)
+    e15.dataset.diagnostics.push(createError(ErrorCode.OPERATOR_0_ON_PARAM_1, t.right.loc, undefined, i, r3.ty.param)), s3 = errType;
   else if (!isScalarLikeType(r3.ty))
     e15.dataset.diagnostics.push(createError(ErrorCode.EXPECTED_SCALAR_LIKE_TYPE_FOUND_0, t.loc, undefined, r3.ty)), s3 = errType;
   else {
@@ -131510,6 +131691,27 @@ function resolveSorts(e15, t, n, r3) {
     return !isErrType(a.ty) && !isAssignable(SHIM, a.ty, fieldTypeClass) && e15.dataset.diagnostics.push(createError(ErrorCode.EXPECTED_0_FOUND_1, t3.loc, undefined, fieldTypeClass, a.ty)), [a, i];
   });
 }
+function measureAliasScope(e15, t, n) {
+  let r3 = locStub(), i = makeBlock(e15, r3, aqlNull(e15, r3));
+  for (let r4 of n) {
+    if (!isNamedExpression(r4))
+      continue;
+    let n3 = r4.name.value, a = `${n3}'`, s3 = createFieldType(n3, unknownType, undefined, undefined, "metric");
+    i.declarations.set(n3, {
+      id: e15.newNodeId(r4.loc),
+      kind: "metric",
+      name: makeIdent(e15, a, [], s3),
+      ty: s3,
+      body: {
+        syntax: "aql",
+        definition: r4.expr
+      },
+      scope: t,
+      source: n3
+    });
+  }
+  return makeScope(t, i);
+}
 function namesResultField(e15, t) {
   if (isFunctionCall(e15) && functionCallName(e15) === Kind.NOT_KEYWORD && e15.args.length === 1)
     return namesResultField(e15.args[0], t);
@@ -131522,7 +131724,7 @@ function classifyFilters(e15, t, n, r3, i) {
   let a = [], s3 = [];
   return t.filters.forEach((t3) => {
     let c3 = namesResultField(t3, i) ? n : r3, l = e15.resolveExpr(t3, c3);
-    validateExploreFilter(e15, t3, l), !isErrType(l.ty) && (isResultFieldFilter(l) ? a.push(l) : isTableType(l.ty) ? s3.push(desugarTableCondition(e15, l, n)) : referencesAggregateAlias(l) ? e15.dataset.diagnostics.push(createError(ErrorCode.INVALID_CONDITIONAL_EXPRESSION_IN_0, t3.loc, undefined, "filters")) : involvesTable(l) || s3.push(desugarMeasureCondition(e15, desugarSimpleModelCondition(e15, desugarShorthandCondition(e15, l)))));
+    validateExploreFilter(e15, t3, l), !isErrType(l.ty) && (isResultFieldFilter(l, i) ? a.push(l) : isTableType(l.ty) ? s3.push(desugarTableCondition(e15, l, n)) : referencesAggregateAlias(l) ? e15.dataset.diagnostics.push(createError(ErrorCode.INVALID_CONDITIONAL_EXPRESSION_IN_0, t3.loc, undefined, "filters")) : involvesTable(l) || s3.push(desugarMeasureCondition(e15, desugarSimpleModelCondition(e15, desugarShorthandCondition(e15, l)))));
   }), {
     resultFilterNodes: a,
     contextFilterNodes: s3
@@ -131579,35 +131781,35 @@ function resolveDynamicExploreInner(e15, t, n) {
     let t3 = originOf(e16.ty);
     t3 && li3.add(modelFieldRefAsKey(t3));
   }
-  let di3 = [...oi3];
+  let di3 = [...oi3], fi3 = measureAliasScope(e15, me3, t.measures);
   for (let n3 of t.having) {
-    let t3 = e15.resolveExpr(n3, U3);
+    let t3 = e15.resolveExpr(n3, fi3);
     validateHavingGrouped(e15, n3, t3, li3) && oi3.push(desugarMeasureCondition(e15, t3, di3, true));
   }
   r3.length === 0 && t.measures.length === 0 && e15.dataset.diagnostics.push(createError(ErrorCode.INVALID_EXPRESSION_0, t.loc, undefined, "Explore must have at least one dimension or measure."));
-  let fi3 = grainDimsOf(r3), pi3 = S3.map((e16) => e16.ty), mi3 = new Set(pi3.map((e16) => e16.fieldName)), hi3 = (e16) => {
+  let pi3 = grainDimsOf(r3), mi3 = S3.map((e16) => e16.ty), hi3 = new Set(mi3.map((e16) => e16.fieldName)), gi3 = (e16) => {
     let t3 = unwrapNot(e16);
-    return t3.kind === Kind.FUNCTION_CALL && t3.args.length > 0 && t3.args[0].kind === Kind.IDENTIFIER && mi3.has(t3.args[0].name);
-  }, gi3 = yr4.filter(hi3), _i3 = yr4.filter((e16) => !hi3(e16)), vi3 = {
+    return t3.kind === Kind.FUNCTION_CALL && t3.args.length > 0 && t3.args[0].kind === Kind.IDENTIFIER && hi3.has(t3.args[0].name);
+  }, _i3 = yr4.filter(gi3), vi3 = yr4.filter((e16) => !gi3(e16)), yi3 = {
     resolver: e15,
     loc: t.loc,
     dimColumns: i,
     markedDims: k3,
     typedMeasures: w3,
     resultTableTy: L3,
-    grainDims: fi3
-  }, yi3 = {};
+    grainDims: pi3
+  }, bi3 = {};
   for (let [e16, t3] of Ze4) {
     let { ty: n3 } = e16;
-    isFieldType(n3) && n3.origin && (yi3[modelFieldRefAsKey(n3.origin)] = t3);
+    isFieldType(n3) && n3.origin && (bi3[modelFieldRefAsKey(n3.origin)] = t3);
   }
-  let bi3 = (e16) => isFieldType(e16.ty) && e16.ty.origin ? modelFieldRefAsKey(e16.ty.origin) : undefined, xi3 = f.length + p3.length > 0, Si2 = (n3, r4) => {
-    if (!xi3)
+  let xi3 = (e16) => isFieldType(e16.ty) && e16.ty.origin ? modelFieldRefAsKey(e16.ty.origin) : undefined, Si2 = f.length + p3.length > 0, Ci3 = (n3, r4) => {
+    if (!Si2)
       return n3;
     let i3 = (e16) => {
       if (!r4)
         return true;
-      let t3 = bi3(e16);
+      let t3 = xi3(e16);
       return t3 !== undefined && r4.has(t3);
     };
     return {
@@ -131616,35 +131818,35 @@ function resolveDynamicExploreInner(e15, t, n) {
       ty: n3.ty,
       rows: f.filter(i3),
       cols: p3.filter(i3),
-      sortDirs: yi3,
+      sortDirs: bi3,
       value: n3
     };
-  }, Ci3 = f.length, wi3 = p3.length, Ti3 = [...new Set(t.measures.map((e16) => (isNamedExpression(e16) ? e16.expr : e16).loc.source))], Ei3 = (e16, t3) => {
+  }, wi3 = f.length, Ti3 = p3.length, Ei3 = [...new Set(t.measures.map((e16) => (isNamedExpression(e16) ? e16.expr : e16).loc.source))], Di3 = (e16, t3) => {
     let n3 = new Set(t3.map((e17) => e17.origin ? modelFieldRefAsKey(e17.origin) : "").filter(Boolean)), r4 = (e17) => {
-      let t4 = bi3(e17);
+      let t4 = xi3(e17);
       return t4 !== undefined && n3.has(t4);
-    }, i3 = exploreTypeLabel(f.filter(r4).length, p3.filter(r4).length, Ci3, wi3), a3 = t3.filter((e17) => e17.origin).map((e17) => `${e17.origin.modelName}.${e17.origin.fieldName}`), s4 = {
+    }, i3 = exploreTypeLabel(f.filter(r4).length, p3.filter(r4).length, wi3, Ti3), a3 = t3.filter((e17) => e17.origin).map((e17) => `${e17.origin.modelName}.${e17.origin.fieldName}`), s4 = {
       ...a3.length > 0 ? { dimensions: a3 } : {},
-      ...Ti3.length > 0 ? { metrics: Ti3 } : {}
+      ...Ei3.length > 0 ? { metrics: Ei3 } : {}
     };
     return {
       ...e16,
       annotation: [
         ...e16.annotation ?? [],
         { comments: [i3] },
-        ...a3.length > 0 || Ti3.length > 0 ? [{ meta: s4 }] : []
+        ...a3.length > 0 || Ei3.length > 0 ? [{ meta: s4 }] : []
       ]
     };
-  }, Di3 = r3.filter((e16) => isConstantArrayType(e16.ty)), Oi3;
-  if (Di3.length > 0) {
-    let n3 = dedupeGrains(c3), r4 = expandRollup(Di3.map(groupingDimSets)), i3 = n3.map(grainName), a3 = /* @__PURE__ */ new Set, s4 = r4.filter((e16) => {
+  }, Oi3 = r3.filter((e16) => isConstantArrayType(e16.ty)), ki4;
+  if (Oi3.length > 0) {
+    let n3 = dedupeGrains(c3), r4 = expandRollup(Oi3.map(groupingDimSets)), i3 = n3.map(grainName), a3 = /* @__PURE__ */ new Set, s4 = r4.filter((e16) => {
       let t3 = [.../* @__PURE__ */ new Set([...i3, ...e16.map(grainName)])].sort().join(" ");
       return !a3.has(t3) && (a3.add(t3), true);
     }).map((r5) => {
-      let i4 = dedupeGrains([...n3, ...r5]), a4 = grainFields(i4), s5 = buildBranch(vi3, i4), c4 = new Set(a4.map((e16) => e16.fieldName)), l3 = k3.length > 0 && k3.every((e16) => c4.has(e16.fieldName)) && _i3.length > 0 ? makeTransform(e15, "filter", [s5, ..._i3], s5.ty, t.loc) : s5, u3 = new Set(a4.map((e16) => e16.origin ? modelFieldRefAsKey(e16.origin) : "").filter(Boolean));
-      return Ei3(Si2(l3, u3), a4);
+      let i4 = dedupeGrains([...n3, ...r5]), a4 = grainFields(i4), s5 = buildBranch(yi3, i4), c4 = new Set(a4.map((e16) => e16.fieldName)), l3 = k3.length > 0 && k3.every((e16) => c4.has(e16.fieldName)) && vi3.length > 0 ? makeTransform(e15, "filter", [s5, ...vi3], s5.ty, t.loc) : s5, u3 = new Set(a4.map((e16) => e16.origin ? modelFieldRefAsKey(e16.origin) : "").filter(Boolean));
+      return Di3(Ci3(l3, u3), a4);
     });
-    Oi3 = s4.length === 1 ? s4[0] : {
+    ki4 = s4.length === 1 ? s4[0] : {
       kind: "union",
       id: e15.newNodeId(t.loc),
       ty: L3,
@@ -131653,17 +131855,17 @@ function resolveDynamicExploreInner(e15, t, n) {
       branches: s4
     };
   } else
-    Oi3 = Ei3(buildBranch(vi3, fi3), grainFields(fi3));
-  oi3.length > 0 && (Oi3 = {
+    ki4 = Di3(buildBranch(yi3, pi3), grainFields(pi3));
+  oi3.length > 0 && (ki4 = {
     kind: "where",
     id: e15.newNodeId(t.loc),
-    ty: Oi3.ty,
-    value: Oi3,
+    ty: ki4.ty,
+    value: ki4,
     conditions: oi3
   });
-  let ki4 = t.options.some((e16) => e16.value === "include_empty_children_rows") || undefined, Ai3 = w3.length > 0, ji4 = [...oi3, ...yr4];
-  ki4 && !m3 && Ai3 && Di3.length === 0 && i.length > 0 && (Oi3 = buildEmptyChildrenChain(vi3, i, ji4, Oi3, [...i, ...I3]));
-  let Mi3 = S3.flatMap((e16) => {
+  let Ai3 = t.options.some((e16) => e16.value === "include_empty_children_rows") || undefined, ji4 = w3.length > 0, Mi3 = [...oi3, ...yr4];
+  Ai3 && !m3 && ji4 && Oi3.length === 0 && i.length > 0 && (ki4 = buildEmptyChildrenChain(yi3, i, Mi3, ki4, [...i, ...I3]));
+  let Ni3 = S3.flatMap((e16) => {
     if (!e16.rollup)
       return [];
     let t3 = bizCalDimRefs(e16.expr).map((e17) => e17.ty.fieldName).find((e17) => s3.has(e17));
@@ -131671,91 +131873,97 @@ function resolveDynamicExploreInner(e15, t, n) {
       ty: createFieldType(rollupMarkerFieldName(e16.ty.fieldName), numberType),
       sourceName: rollupMarkerFieldName(t3)
     }] : [];
-  }), Ni3 = [
+  }), Pi3 = [
     ...a,
     ...I3,
-    ...Mi3.map((e16) => e16.ty)
+    ...Ni3.map((e16) => e16.ty)
   ].map((e16) => e16.fieldName);
   if (S3.length > 0) {
     let n3 = new Set(a.map((e16) => e16.fieldName)), r4 = m3 ? [...a, ...i.filter((e16) => !n3.has(e16.fieldName))] : a, s4 = createTableType(createRowType([
       ...r4,
       ...I3,
-      ...Mi3.map((e16) => e16.ty)
+      ...Ni3.map((e16) => e16.ty)
     ]), undefined);
-    Oi3 = buildBizCalWrapper(e15, Oi3, r4, I3, S3, Mi3, s4, t.loc);
+    ki4 = buildBizCalWrapper(e15, ki4, r4, I3, S3, Ni3, s4, t.loc);
   }
-  let Pi3 = Di3.length === 0 ? yr4 : gi3;
-  Pi3.length > 0 && (Oi3 = makeTransform(e15, "filter", [Oi3, ...Pi3], Oi3.ty, t.loc));
-  let Fi3 = !!e15.dataset.sqlGenerationFlags.shouldApplySortings, Ii2 = Fi3 && S3.length === 0 && ![...l].some((e16) => u.has(e16)), Li3 = Ze4.flatMap(([e16, t3]) => isFieldType(e16.ty) ? [[e16.ty.fieldName, t3]] : []);
-  if (!m3 && Fi3 && Ze4.length > 0 && (Oi3 = {
+  let Fi3 = Oi3.length === 0 ? yr4 : _i3;
+  Fi3.length > 0 && (ki4 = makeTransform(e15, "filter", [ki4, ...Fi3], ki4.ty, t.loc));
+  let Ii2 = !!e15.dataset.sqlGenerationFlags.shouldApplySortings, Li3 = Ii2 && S3.length === 0 && ![...l].some((e16) => u.has(e16)), Ri3 = Ze4.flatMap(([e16, t3]) => isFieldType(e16.ty) ? [[e16.ty.fieldName, t3]] : []);
+  if (!m3 && Ii2 && Ze4.length > 0 && (ki4 = {
     kind: "sort",
     id: e15.newNodeId(t.loc),
-    ty: Oi3.ty,
-    input: Oi3,
-    iterationDepth: iterationDepthOf(Oi3),
+    ty: ki4.ty,
+    input: ki4,
+    iterationDepth: iterationDepthOf(ki4),
     by: Ze4
   }), m3) {
-    let n3 = fi3.filter((e16) => l.has(grainName(e16))), r4 = ki4 && n3.length > 0 && Ai3 ? buildEmptyChildrenPrefixes(vi3, n3, ji4).map((e16) => e16.node) : undefined;
-    Oi3 = {
+    let n3 = pi3.filter((e16) => l.has(grainName(e16))), r4 = Ai3 && n3.length > 0 && ji4 ? buildEmptyChildrenPrefixes(yi3, n3, Mi3).map((e16) => e16.node) : undefined;
+    ki4 = {
       kind: "pivot",
       id: e15.newNodeId(t.loc),
-      ty: Oi3.ty,
-      input: Oi3,
-      iterationDepth: iterationDepthOf(Oi3),
+      ty: ki4.ty,
+      input: ki4,
+      iterationDepth: iterationDepthOf(ki4),
       rows: [...l],
       columns: [...u],
       rollupRows: [...l].filter((e16) => s3.has(e16)),
       rollupColumns: [...u].filter((e16) => s3.has(e16)),
-      includeEmptyChildrenRows: ki4,
+      includeEmptyChildrenRows: Ai3,
       emptyChildrenPrefixes: r4,
-      outputColumns: S3.length > 0 ? Ni3 : undefined,
-      sorts: Ii2 ? Li3 : undefined
+      outputColumns: S3.length > 0 ? Pi3 : undefined,
+      sorts: Li3 ? Ri3 : undefined
     };
   }
-  return Di3.length === 0 && (Oi3 = Si2(Oi3)), {
+  return Oi3.length === 0 && (ki4 = Ci3(ki4)), {
     kind: "explore_context",
     id: e15.newNodeId(t.loc),
-    ty: Oi3.ty,
-    value: Oi3,
+    ty: ki4.ty,
+    value: ki4,
     filters: ci3,
     allDimensions: [...f, ...p3]
   };
 }
-function isBareAliasConstantFilter(e15) {
-  return e15.length === 2 && e15[0].kind === Kind.IDENTIFIER && e15[0].path.length === 0 && !involvesField(e15[1]);
+function isBareAliasResultFilter(e15, t) {
+  return e15.length === 2 && e15[0].kind === Kind.IDENTIFIER && e15[0].path.length === 0 && readsOnlyResultColumns(e15[1], t);
+}
+function rhsAliases(e15) {
+  return e15.kind === Kind.IDENTIFIER ? isFieldType(e15.ty) ? [e15.ty] : [] : e15.kind === Kind.FUNCTION_CALL ? e15.args.flatMap(rhsAliases) : e15.kind === Kind.NAMED_EXPRESSION ? rhsAliases(e15.expr) : [];
+}
+function readsOnlyResultColumns(e15, t) {
+  return e15.kind === "computed_ref" ? false : e15.kind === Kind.IDENTIFIER ? !isFieldType(e15.ty) || e15.path.length === 0 && t.has(e15.name) : e15.kind === Kind.FUNCTION_CALL ? e15.args.every((e16) => readsOnlyResultColumns(e16, t)) : e15.kind !== Kind.NAMED_EXPRESSION || readsOnlyResultColumns(e15.expr, t);
 }
 function unwrapNot(e15) {
   return e15.kind === Kind.FUNCTION_CALL && e15.name.name === Kind.NOT_KEYWORD && e15.args.length === 1 ? unwrapNot(e15.args[0]) : e15;
 }
-function isResultFieldFilter(e15) {
+function isResultFieldFilter(e15, t) {
   if (isErrType(e15.ty))
     return false;
-  let t = unwrapNot(e15);
-  if (t.kind !== Kind.FUNCTION_CALL)
+  let n = unwrapNot(e15);
+  if (n.kind !== Kind.FUNCTION_CALL)
     return false;
-  if (isBareAliasConstantFilter(t.args))
+  if (isBareAliasResultFilter(n.args, t))
     return true;
-  let n = bareAliasLeaves(t);
-  return !!n && n.some(isAggregateAlias);
+  let r3 = bareAliasLeaves(n, t);
+  return !!r3 && r3.some(isAggregateAlias);
 }
-function bareAliasLeaves(e15) {
-  let t = unwrapNot(e15);
-  if (t.kind !== Kind.FUNCTION_CALL)
+function bareAliasLeaves(e15, t) {
+  let n = unwrapNot(e15);
+  if (n.kind !== Kind.FUNCTION_CALL)
     return;
-  if (isBareAliasConstantFilter(t.args)) {
-    let e16 = t.args[0];
-    return isFieldType(e16.ty) ? [e16.ty] : undefined;
+  if (isBareAliasResultFilter(n.args, t)) {
+    let e16 = n.args[0];
+    return isFieldType(e16.ty) ? [e16.ty, ...rhsAliases(n.args[1])] : undefined;
   }
-  if (t.name.name !== Kind.AND_KEYWORD && t.name.name !== Kind.OR_KEYWORD)
+  if (n.name.name !== Kind.AND_KEYWORD && n.name.name !== Kind.OR_KEYWORD)
     return;
-  let n = [];
-  for (let e16 of t.args) {
-    let t3 = bareAliasLeaves(e16);
-    if (!t3)
+  let r3 = [];
+  for (let e16 of n.args) {
+    let n3 = bareAliasLeaves(e16, t);
+    if (!n3)
       return;
-    n.push(...t3);
+    r3.push(...n3);
   }
-  return n;
+  return r3;
 }
 function isAggregateAlias(e15) {
   return e15.subClass === "aggregate" || e15.subClass === "measure" || e15.subClass === "metric";
@@ -131766,9 +131974,6 @@ function referencesAggregateAlias(e15) {
 function involvesTable(e15) {
   return isTableType(e15.ty) && !e15.ty.isLiteral ? true : e15.kind === Kind.FUNCTION_CALL ? e15.args.some(involvesTable) : e15.kind === Kind.NAMED_EXPRESSION ? involvesTable(e15.expr) : e15.kind === "block" && involvesTable(e15.result);
 }
-function involvesField(e15) {
-  return e15 ? e15.kind === "computed_ref" ? true : e15.kind === Kind.IDENTIFIER ? isFieldType(e15.ty) : e15.kind === Kind.FUNCTION_CALL ? e15.args.some(involvesField) : e15.kind === Kind.NAMED_EXPRESSION && involvesField(e15.expr) : false;
-}
 function validateExploreFilter(e15, t, n) {
   let { ty: r3 } = n;
   isErrType(r3) || !isAssignable(SHIM, r3, truefalseType) && !isAssignable(SHIM, r3, tableTypeClass) && e15.dataset.diagnostics.push(createError(ErrorCode.EXPECTED_0_FOUND_1, t.loc, undefined, "Condition", r3));
@@ -135304,7 +135509,12 @@ function matchToPlan(e16, t) {
       type: SqlType.TRUEFALSE
     };
   }
-  return isUserAttributeType(n.ty) ? datetimeUaToPlan(e16[0], n, t) : unsupported$1("match against a non-literal range");
+  return isUserAttributeType(n.ty) ? datetimeUaToPlan(e16[0], n, t) : isNullValue$1(n) ? {
+    kind: "call_variadic",
+    func: "is",
+    exprs: [scalarToPlan(e16[0], t), scalarToPlan(n, t)],
+    type: SqlType.TRUEFALSE
+  } : unsupported$1("match against a non-literal range");
 }
 function negateMagnitude(e16) {
   return e16.kind === "literal" && e16.literal === "number" ? {
@@ -136418,7 +136628,7 @@ function attachLodParts(e17, t, n, r3, i, a) {
       type: SqlType.UNKNOWN
     }), k3 = relationType(n.relation), N3 = i3.by.map((e18, r5) => {
       let { expr: a4, origin: s4 } = i3.by[r5];
-      return grainKeyEq(t, s4, a4.kind === Kind.IDENTIFIER && s4.fieldName.includes("->") && l(a4) == null && n.tryIndexOf(a4) == null ? subtimeGrainScalar(n, k3, s4) : lodKeyScalar(derefExtend(t, i3.input, a4), n, u), E3(w3 + r5));
+      return grainKeyEq(t, s4, a4.kind === Kind.IDENTIFIER && s4.fieldName.includes("->") && l(a4) == null && n.tryIndexOf(a4) == null ? subtimeGrainScalar(n, k3, s4) : lodKeyScalar(joinBackKey(t, i3.input, a4, n), n, u), E3(w3 + r5));
     });
     f = cons({
       kind: "join",
@@ -136586,6 +136796,7 @@ function lowerModelSourceRelation(e17, t, n) {
     return buildJoinScope(t, r3, i, s4, {
       rootRel: a,
       fanouts: c4,
+      substitute: slotSubstitutes(t, n, e17),
       tree: n
     });
   })() : buildJoinScope(t, r3, i, [], { rootRel: a }), c3 = n.kind === "expand_model" ? expandTreeComputed(t, n) : [], l = n.kind === "expand_model" ? expandTreeComputedAll(t, n) : [], u = (e18) => {
@@ -136969,13 +137180,19 @@ function buildJoinScopeUncached(e17, t, n, r3, i) {
   };
 }
 function extendSlotsOf(e17) {
+  let t = [];
+  for (let n of scansOf(e17))
+    forEachTreeNode(n, (e18) => {
+      e18.extend !== undefined && t.push(e18);
+    });
+  return t;
+}
+function scansOf(e17) {
   let t = [], n = /* @__PURE__ */ new Set, r3 = (e18) => {
     if (!e18 || typeof e18 != "object" || n.has(e18))
       return;
     if (n.add(e18), e18.kind === "expand_model") {
-      forEachTreeNode(e18, (e19) => {
-        e19.extend !== undefined && t.push(e19);
-      });
+      t.push(e18);
       return;
     }
     let i = e18;
@@ -136989,6 +137206,22 @@ function extendSlotsOf(e17) {
   };
   return r3(e17), t;
 }
+function joinBackKey(e17, t, n, r3) {
+  let i = n.kind === Kind.IDENTIFIER ? refOrigin(n) : undefined;
+  if (!i)
+    return n;
+  for (let a of scansOf(t)) {
+    let t3;
+    if (forEachTreeNode(a, (a3) => {
+      if (t3 !== undefined || a3.extend === undefined)
+        return;
+      let s3 = extendDef(e17, a3.extend), c3 = s3.computed.find((e18) => e18.origin && originKey(e18.origin) === originKey(i));
+      c3 && (t3 = !isCrossModelExtend(e17, a3) || readsPart(s3.parts, c3.expr) || r3.tryIndexOf(n) == null ? c3.expr : n);
+    }), t3)
+      return t3;
+  }
+  return n;
+}
 function derefExtend(e17, t, n) {
   if (n.kind !== Kind.IDENTIFIER)
     return n;
@@ -137248,51 +137481,54 @@ function extendRootRelation(e17, t, n) {
 function lowerExtendRelation(e17, t, n) {
   return memoized("extendRelation", `${extendIdOf(t)}|${identityToken(n)}`, () => lowerExtendRelationUncached(e17, t, n));
 }
+function slotSubstitutes(e17, t, n) {
+  let r3 = [];
+  walkTree(t, (e18) => {
+    e18 !== t && r3.push(e18);
+  });
+  let i = crossModelSubstitute(e17, r3.filter((t3) => isCrossModelExtend(e17, t3)), scopeModelsOf(t), n);
+  for (let t3 of r3)
+    sealedSlot(e17, t3) && i.set(t3.model, lowerSealedSlot(e17, t3, n));
+  return i;
+}
 function lowerExtendRelationUncached(e17, t, n) {
   let r3 = extendDef(e17, extendIdOf(t)), i = r3.base;
   bareNode(i) && unsupported$1(`extend on '${t.model}' has no join tree`);
-  let a = [];
-  walkTree(i, (e18) => {
-    e18 !== i && a.push(e18);
-  });
-  let s3 = crossModelSubstitute(e17, a.filter((t3) => isCrossModelExtend(e17, t3)), scopeModelsOf(i), n);
-  for (let t3 of a)
-    sealedSlot(e17, t3) && s3.set(t3.model, lowerSealedSlot(e17, t3, n));
-  let c3 = i.model, l = /* @__PURE__ */ new Set([c3]), u = (t3, n3) => ({
+  let a = slotSubstitutes(e17, i, n), s3 = i.model, c3 = /* @__PURE__ */ new Set([s3]), l = (t3, n3) => ({
     ...t3,
     children: t3.children.map((t4) => {
       let r4 = t4.input.model, i3 = [...n3, t4.edge];
-      if (!l.has(r4))
-        return l.add(r4), {
+      if (!c3.has(r4))
+        return c3.add(r4), {
           ...t4,
-          input: u(t4.input, i3)
+          input: l(t4.input, i3)
         };
       let a3 = mintModelAlias(e17, r4, pathSig(i3));
       return {
         edge: retargetEdge(t4.edge, a3),
-        input: u(t4.input, i3)
+        input: l(t4.input, i3)
       };
     })
-  }), f = buildJoinScope(e17, c3, undefined, expandEdges(u(i, [])), {
+  }), u = buildJoinScope(e17, s3, undefined, expandEdges(l(i, [])), {
     rootRel: extendRootRelation(e17, i, n),
-    substitute: s3,
+    substitute: a,
     tree: i
-  }), p3 = [...r3.parts, ...baseTreeParts(e17, r3)], m3 = f.relation, S3 = () => {
+  }), f = [...r3.parts, ...baseTreeParts(e17, r3)], p3 = u.relation, m3 = () => {
     return;
   };
-  n && p3.length > 0 && ({ base: m3, partOf: S3 } = attachLodParts(n, e17, f, p3, f.relation, f.arity));
-  let w3 = inlineExtendComputed([...expandTreeComputedAll(e17, i), ...r3.computed]), E3 = projectedComputed(e17, t).filter((e18) => n != null && p3.length > 0 || !readsPart(p3, w3(e18.expr))), k3 = (t3) => {
+  n && f.length > 0 && ({ base: p3, partOf: m3 } = attachLodParts(n, e17, u, f, u.relation, u.arity));
+  let S3 = inlineExtendComputed([...expandTreeComputedAll(e17, i), ...r3.computed]), w3 = projectedComputed(e17, t).filter((e18) => n != null && f.length > 0 || !readsPart(f, S3(e18.expr))), E3 = (t3) => {
     let n3 = aliasedOrigin(e17, t3);
-    return n3 ? f.indexOfOrigin(n3) : S3(t3) ?? f.indexOf(t3);
-  }, N3 = E3.map((e18) => scalarToPlan(w3(e18.expr), k3)), I3 = E3.map((e18) => e18.origin);
+    return n3 ? u.indexOfOrigin(n3) : m3(t3) ?? u.indexOf(t3);
+  }, k3 = w3.map((e18) => scalarToPlan(S3(e18.expr), E3)), N3 = w3.map((e18) => e18.origin);
   return {
-    relation: N3.length > 0 ? cons({
+    relation: k3.length > 0 ? cons({
       kind: "map",
-      input: m3,
-      scalars: N3,
-      origins: I3
-    }) : m3,
-    columns: [...relationType(m3), ...E3.map((e18) => ({
+      input: p3,
+      scalars: k3,
+      origins: N3
+    }) : p3,
+    columns: [...relationType(p3), ...w3.map((e18) => ({
       type: sqlTypeOf(e18.ty),
       origin: e18.origin
     }))]
@@ -138428,7 +138664,8 @@ function lowerTransitionCoalesce(e17, t, n) {
       measureAt: (t4) => e18.get(t4),
       measures: k3.map((e19) => ({
         name: e19.name,
-        pos: e19.abs
+        pos: e19.abs,
+        alias: e19.alias
       }))
     };
   }
@@ -138458,7 +138695,8 @@ function lowerTransitionCoalesce(e17, t, n) {
       measureAt: (e19) => t3.get(e19),
       measures: k3.map((e19) => ({
         name: e19.name,
-        pos: e19.abs
+        pos: e19.abs,
+        alias: e19.alias
       })),
       nullMeasureFilter: true
     };
@@ -138531,7 +138769,8 @@ function lowerTransitionCoalesce(e17, t, n) {
     measureAt: (e18) => Ze4.get(e18),
     measures: k3.map((e18, t3) => ({
       name: e18.name,
-      pos: f + t3
+      pos: f + t3,
+      alias: e18.alias
     })),
     nullMeasureFilter: true
   };
@@ -143306,9 +143545,11 @@ function collectJoins(e17, t = [], n = /* @__PURE__ */ new Set) {
       purpose: JoinPurpose.EXPANSION
     });
   } else {
-    let n3 = onLeftModel(e17.on) ?? fromRootAlias(e17.left);
+    let n3 = /* @__PURE__ */ new Map;
+    collectFieldRefs(e17.on, n3);
+    let i = [...n3.keys()].filter((e18) => e18 !== r3);
     t.push({
-      sourceTable: [n3],
+      sourceTable: i.length > 0 ? i : [fromRootAlias(e17.left)],
       destTable: r3,
       joinType: JOIN_TYPE[e17.joinType],
       joinOn: e17.on,
@@ -143335,17 +143576,6 @@ function toPlaceholderJoinOn(e17, t, n, r3) {
     operands: e17.operands.map((e18) => toPlaceholderJoinOn(e18, t, n, r3))
   };
 }
-function onLeftModel(e17) {
-  if (typeof e17 != "string") {
-    if (e17.operator === OperationType.AND)
-      return onLeftModel(e17.operands[0]);
-    if (e17.operator === OperationType.EQ) {
-      let t = e17.operands[0];
-      if (typeof t != "string" && t.operator === OperationType.FIELD && typeof t.operands[0] == "string")
-        return t.operands[0];
-    }
-  }
-}
 function collectJoinOnRefs(e17, t) {
   e17.kind === "join" ? (e17.on && collectFieldRefs(e17.on, t), collectJoinOnRefs(e17.left, t), collectJoinOnRefs(e17.right, t)) : e17.kind === "subquery" && e17.select;
 }
@@ -146582,7 +146812,7 @@ function _transform(e17, t) {
     });
   }
   function wi3(e18, t3, r4, i3) {
-    let a3 = createFunctionCallExpression(createIdentifier("select"), [t3, r4], e18.loc), s4 = i3.find((e19) => e19.name.value === "sep")?.expr ?? createTextLiteral(","), c4 = i3.find((e19) => e19.name.value === "order")?.expr ?? createTextLiteral("ASC"), l3 = i3.find((e19) => e19.name.value === "distinct")?.expr ?? createTruefalseLiteral(false), u3 = getSqlFromRowLevelObject(n, getRowLevelObjectFromExpression(n, getTextLiteralFromExpression(n, s4), false)), f3 = import_lodash2.toUpper(c4.value), p4 = l3.value ? "DISTINCT" : "", m4 = computeAggregationKey(n, "string_agg", a3, `sep: ${stableStringify(u3)}, order: ${f3}, distinctOp: ${p4}`);
+    let a3 = createFunctionCallExpression(createIdentifier("select"), [t3, createNamedExpression(createIdentifier("_f1"), r4)], e18.loc), s4 = i3.find((e19) => e19.name.value === "sep")?.expr ?? createTextLiteral(","), c4 = i3.find((e19) => e19.name.value === "order")?.expr ?? createTextLiteral("ASC"), l3 = i3.find((e19) => e19.name.value === "distinct")?.expr ?? createTruefalseLiteral(false), u3 = getSqlFromRowLevelObject(n, getRowLevelObjectFromExpression(n, getTextLiteralFromExpression(n, s4), false)), f3 = import_lodash2.toUpper(c4.value), p4 = l3.value ? "DISTINCT" : "", m4 = computeAggregationKey(n, "string_agg", a3, `sep: ${stableStringify(u3)}, order: ${f3}, distinctOp: ${p4}`);
     return aggregateOnTable(n, e18, a3, m4, (e19, t4) => {
       let n3 = t4 ? createOperation(OperationType.FIELD, ["SOURCE", e19.fields[e19.fields.length - 1].name]) : e19.fields[e19.fields.length - 1].sql;
       return {