@dbsp/nql 1.4.0 → 1.5.0

package/dist/index.js

@@ -1,4 +1,4 @@
-import { NQL_INTERNAL_COMPILER_OPTIONS, createNqlBindingRef, isNqlBindingRef, getNqlBindingRefName } from '@dbsp/types/internal';
+import { NQL_INTERNAL_COMPILER_OPTIONS, markNqlTrustedRelationFilter, createNqlBindingRef, isNqlBindingRef, getNqlBindingRefName } from '@dbsp/types/internal';
 import { NQL_SELECT_AGGREGATE_FUNCTIONS, NQL_SELECT_VALUE_FUNCTIONS, NQL_SELECT_JSON_FUNCTIONS, NQL_SELECT_SCALAR_FUNCTIONS, isNqlSelectWindowFunctionAllowed, isRankingWindowFunction, isParamIntent } from '@dbsp/types';
 import { createToken, Lexer, CstParser } from 'chevrotain';
 
@@ -52,6 +52,7 @@ var ColumnValidator = class _ColumnValidator {
   schema;
   knownCteTables = /* @__PURE__ */ new Set();
   virtualBindingTables = /* @__PURE__ */ new Map();
+  virtualBindingRelationFilters = /* @__PURE__ */ new Map();
   /**
    * Register CTE names so validateTable() skips validation for them.
    * CTE names are not physical tables in the schema, but are valid FROM targets.
@@ -69,12 +70,16 @@ var ColumnValidator = class _ColumnValidator {
    * Register an NQL binding as a virtual table with a concrete output schema.
    * Binding columns are logical output names, so matching is exact.
    */
-  addVirtualBindingTable(name, columns) {
+  addVirtualBindingTable(name, columns, relationFilters) {
     this.virtualBindingTables.set(name, columns);
+    if (relationFilters) {
+      this.virtualBindingRelationFilters.set(name, relationFilters);
+    }
   }
   /** Clear all registered virtual binding tables (used between compilations). */
   clearVirtualBindingTables() {
     this.virtualBindingTables.clear();
+    this.virtualBindingRelationFilters.clear();
   }
   isVirtualBindingTable(name) {
     return name !== void 0 && this.virtualBindingTables.has(name);
@@ -87,6 +92,98 @@ var ColumnValidator = class _ColumnValidator {
     if (virtualColumns) return virtualColumns;
     return this.schema.getTable(name)?.columns.map((column) => column.name);
   }
+  hasPhysicalTable(name) {
+    return !this.virtualBindingTables.has(name) && !!this.schema.getTable(name);
+  }
+  hasQualifiedRelationLookup() {
+    return typeof this.schema.getRelation === "function";
+  }
+  getRelation(sourceTable, relationName) {
+    return this.schema.getRelation?.(`${sourceTable}.${relationName}`) ?? this.schema.getRelationsFrom(sourceTable).find((relation) => relation.name === relationName);
+  }
+  getRelationsFrom(sourceTable) {
+    return this.schema.getRelationsFrom(sourceTable);
+  }
+  getVirtualBindingRelation(bindingName, relationName) {
+    return this.virtualBindingRelationFilters.get(bindingName)?.relations.find((relation) => relation.relation === relationName);
+  }
+  getVirtualBindingScalarRelation(bindingName, relationName) {
+    return this.virtualBindingRelationFilters.get(bindingName)?.scalarRelations?.find((relation) => relation.relation === relationName);
+  }
+  explainVirtualBindingRelationRejection(bindingName, relationName) {
+    const metadata = this.virtualBindingRelationFilters.get(bindingName);
+    if (!metadata) {
+      return "no binding relation-filter metadata is available";
+    }
+    if (metadata.unsafeReason) return metadata.unsafeReason;
+    const sourceTable = metadata.sourceTable;
+    if (!sourceTable) {
+      return "the binding source table could not be proven";
+    }
+    const relation = this.getRelation(sourceTable, relationName);
+    if (!relation) {
+      return `relation '${relationName}' is not declared on source table '${sourceTable}'`;
+    }
+    const fk = relation.foreignKey;
+    const fkColumns = typeof fk === "string" ? [fk] : Array.isArray(fk) ? [...fk] : [];
+    if (relation.type !== "belongsTo") {
+      return `relation '${relationName}' is '${relation.type ?? "unknown"}'; A-lite only supports relations whose FK column is on the binding source table`;
+    }
+    if (fkColumns.length !== 1) {
+      return `relation '${relationName}' must have exactly one FK column for A-lite binding relation filters`;
+    }
+    const fkColumn = fkColumns[0];
+    if (fkColumn === void 0) {
+      return `relation '${relationName}' must have exactly one FK column for A-lite binding relation filters`;
+    }
+    const directProjection = metadata.directProjectionLineage?.find(
+      (projection) => projection.sourceTable === sourceTable && _ColumnValidator.columnsMatch(projection.sourceColumn, fkColumn)
+    );
+    if (!directProjection) {
+      const available2 = this.virtualBindingTables.get(bindingName)?.join(", ");
+      return `relation '${relationName}' FK column '${fkColumn}' is not projected as a direct source-column projection by binding '${bindingName}'${available2 ? ` (available columns: ${available2})` : ""}`;
+    }
+    const available = this.virtualBindingTables.get(bindingName)?.join(", ");
+    return `relation '${relationName}' FK column '${fkColumn}' is not available through binding '${bindingName}'${available ? ` (available columns: ${available})` : ""}`;
+  }
+  explainVirtualBindingScalarRelationRejection(bindingName, relationName) {
+    const metadata = this.virtualBindingRelationFilters.get(bindingName);
+    if (!metadata) {
+      return "no binding relation metadata is available";
+    }
+    if (metadata.unsafeReason) return metadata.unsafeReason;
+    const sourceTable = metadata.sourceTable;
+    if (!sourceTable) {
+      return "the binding source table could not be proven";
+    }
+    const relation = this.getRelation(sourceTable, relationName);
+    if (!relation) {
+      return `relation '${relationName}' is not declared on source table '${sourceTable}'`;
+    }
+    const fk = relation.foreignKey;
+    const fkColumns = typeof fk === "string" ? [fk] : Array.isArray(fk) ? [...fk] : [];
+    if (relation.type !== "belongsTo" && relation.type !== "hasOne") {
+      return `relation '${relationName}' is '${relation.type ?? "unknown"}'; binding relation columns require a scalar belongsTo/hasOne relation`;
+    }
+    if (fkColumns.length !== 1) {
+      return `relation '${relationName}' must have exactly one FK column for binding relation columns`;
+    }
+    const fkColumn = fkColumns[0];
+    if (fkColumn === void 0) {
+      return `relation '${relationName}' must have exactly one FK column for binding relation columns`;
+    }
+    const sourceColumn = relation.type === "belongsTo" ? fkColumn : relation.sourceKey ?? "id";
+    const directProjection = metadata.directProjectionLineage?.find(
+      (projection) => projection.sourceTable === sourceTable && _ColumnValidator.columnsMatch(projection.sourceColumn, sourceColumn)
+    );
+    if (!directProjection) {
+      const available2 = this.virtualBindingTables.get(bindingName)?.join(", ");
+      const sourceColumnLabel = relation.type === "belongsTo" ? "FK column" : "source key column";
+      return `relation '${relationName}' ${sourceColumnLabel} '${sourceColumn}' is not projected as a direct source-column projection by binding '${bindingName}'${available2 ? ` (available columns: ${available2})` : ""}`;
+    }
+    const available = this.virtualBindingTables.get(bindingName)?.join(", ");
+    return `relation '${relationName}' source column '${sourceColumn}' is not available through binding '${bindingName}'${available ? ` (available columns: ${available})` : ""}`;
+  }
   /**
    * Convert camelCase to snake_case for column name matching.
    * NQL queries may use either form (e.g., viewCount or view_count).
@@ -156,13 +253,17 @@ var ColumnValidator = class _ColumnValidator {
   }
   resolveRelationTarget(sourceTable, relationName) {
     if (this.virtualBindingTables.has(sourceTable)) {
+      const virtualRelation = this.getVirtualBindingRelation(
+        sourceTable,
+        relationName
+      );
+      if (virtualRelation) return virtualRelation.targetTable;
       throw new NqlSemanticException(
         NqlErrorCodes.SEM_INVALID_SYNTAX,
-        `Query '${sourceTable}' reads from an NQL binding and cannot use relation filters (${relationName}). Relation constructs require a physical model table, not a CTE binding.`
+        `Query '${sourceTable}' reads from an NQL binding and cannot use relation filters (${relationName}) under A-lite (ref-#182): ${this.explainVirtualBindingRelationRejection(sourceTable, relationName)}.`
       );
     }
-    const relations = this.schema.getRelationsFrom(sourceTable);
-    const rel = relations.find((r) => r.name === relationName);
+    const rel = this.getRelation(sourceTable, relationName);
     return rel?.target;
   }
   assertNoBindingRelationConstruct(bindingName, construct, detail) {
@@ -288,6 +389,81 @@ function assertNoBindingRelationConstruct(ctx, bindingName, construct, detail) {
     `Query '${bindingName}' reads from an NQL binding and cannot ${construct} (${detail}). Relation constructs require a physical model table, not a CTE binding.`
   );
 }
+function throwBindingRelationFilter182(bindingName, relationName, reason) {
+  throw new NqlSemanticException(
+    NqlErrorCodes.SEM_INVALID_SYNTAX,
+    `Query '${bindingName}' reads from an NQL binding and cannot use relation filters (${relationName}) under A-lite (ref-#182): ${reason}.`
+  );
+}
+function throwBindingRelationColumn182(bindingName, relationName, reason) {
+  throw new NqlSemanticException(
+    NqlErrorCodes.SEM_INVALID_SYNTAX,
+    `Query '${bindingName}' reads from an NQL binding and cannot select relation column '${relationName}' under A-full (ref-#182): ${reason}.`
+  );
+}
+function resolveBindingRelationFilter(ctx, bindingName, relationPath) {
+  if (!isBindingTable(ctx, bindingName)) return void 0;
+  const actualBindingName = bindingName;
+  const relationName = relationPath.join(".");
+  if (relationPath.length !== 1) {
+    throwBindingRelationFilter182(
+      actualBindingName,
+      relationName,
+      "multi-hop binding relation filters are not supported; the relation path must be a single source-table relation"
+    );
+  }
+  const relation = relationPath[0];
+  if (!relation) {
+    throwBindingRelationFilter182(
+      actualBindingName,
+      relationName,
+      "the relation path must name a source-table relation"
+    );
+  }
+  const virtualRelation = ctx.validator?.getVirtualBindingRelation(
+    actualBindingName,
+    relation
+  );
+  if (virtualRelation) return virtualRelation;
+  const reason = ctx.validator?.explainVirtualBindingRelationRejection(
+    actualBindingName,
+    relation
+  ) ?? "model metadata is not available";
+  throwBindingRelationFilter182(actualBindingName, relation, reason);
+}
+function resolveBindingRelationColumn(ctx, bindingName, relationPath, selectedColumn) {
+  if (!isBindingTable(ctx, bindingName)) return void 0;
+  const actualBindingName = bindingName;
+  const relationName = relationPath.join(".");
+  if (relationPath.length !== 1) {
+    throwBindingRelationColumn182(
+      actualBindingName,
+      relationName,
+      "multi-hop binding relation columns are not supported; the relation path must be a single source-table relation"
+    );
+  }
+  const relation = relationPath[0];
+  if (!relation) {
+    throwBindingRelationColumn182(
+      actualBindingName,
+      relationName,
+      "the relation path must name a source-table relation"
+    );
+  }
+  const virtualRelation = ctx.validator?.getVirtualBindingScalarRelation(
+    actualBindingName,
+    relation
+  );
+  if (!virtualRelation) {
+    const reason = ctx.validator?.explainVirtualBindingScalarRelationRejection(
+      actualBindingName,
+      relation
+    ) ?? "model metadata is not available";
+    throwBindingRelationColumn182(actualBindingName, relation, reason);
+  }
+  ctx.validator?.validateColumn(virtualRelation.targetTable, selectedColumn);
+  return virtualRelation;
+}
 function assertNoBindingRelationPath(ctx, bindingName, path) {
   if (!isBindingTable(ctx, bindingName)) return;
   throw new NqlSemanticException(
@@ -518,6 +694,10 @@ function validateWhereField(ctx, field, aliasContext, originalExpr) {
       `HAVING cannot reference SELECT alias '${field}'. PostgreSQL does not allow SELECT aliases in HAVING; repeat the aggregate expression or filter the result in an outer query.`
     );
   }
+  if (!aliasContext && ctx.currentRelationTarget && !field.includes(".")) {
+    ctx.validator?.validateColumn(ctx.currentRelationTarget, field);
+    return;
+  }
   if (!aliasContext && ctx.currentFromTable && isBindingTable(ctx, ctx.currentFromTable)) {
     if (field.includes(".")) {
       assertNoBindingRelationPath(ctx, ctx.currentFromTable, field);
@@ -540,10 +720,6 @@ function validateWhereField(ctx, field, aliasContext, originalExpr) {
     }
     return;
   }
-  if (ctx.currentRelationTarget && !field.includes(".")) {
-    ctx.validator.validateColumn(ctx.currentRelationTarget, field);
-    return;
-  }
   if (ctx.currentFromTable && field.includes(".")) {
     if (isBindingTable(ctx, ctx.currentFromTable)) {
       assertNoBindingRelationPath(ctx, ctx.currentFromTable, field);
@@ -923,6 +1099,7 @@ var PORTABLE_BINDING_FINAL_FUNCTIONS = /* @__PURE__ */ new Set([
   ...NQL_SELECT_AGGREGATE_FUNCTIONS,
   ...NQL_SELECT_VALUE_FUNCTIONS
 ]);
+var DEFAULT_RELATION_TARGET_COLUMN = "id";
 function compileNestedQuery(query, ctx, fns, bindings) {
   const savedContext = {
     currentFromTable: ctx.currentFromTable,
@@ -975,6 +1152,168 @@ function throwUnsupportedBindingFinal(bindingName, feature) {
     `Query '${bindingName}' reads from an NQL binding and cannot use ${feature} in a binding-final query (#183). Binding-final queries are restricted to portable common-ground SQL over projected binding columns: SELECT (including plain DISTINCT), WHERE, GROUP BY, HAVING, ORDER BY, LIMIT, OFFSET, and UNION/INTERSECT/EXCEPT.`
   );
 }
+function toSnakeCase(name) {
+  return name.replace(/[A-Z]/g, (ch) => `_${ch.toLowerCase()}`);
+}
+function columnsMatch(left, right) {
+  return left === right || toSnakeCase(left) === toSnakeCase(right);
+}
+function expressionIntentContainsAggregate(value) {
+  if (!value || typeof value !== "object") return false;
+  const record = value;
+  if (record.kind === "aggregate") return true;
+  for (const child of Object.values(record)) {
+    if (Array.isArray(child)) {
+      if (child.some((item) => expressionIntentContainsAggregate(item))) {
+        return true;
+      }
+    } else if (expressionIntentContainsAggregate(child)) {
+      return true;
+    }
+  }
+  return false;
+}
+function selectContainsAggregate(select) {
+  if (!select) return false;
+  if (select.type === "aggregate") return true;
+  if (select.type !== "expressions") return false;
+  return select.columns.some(
+    (column) => expressionIntentContainsAggregate(column)
+  );
+}
+function relationForeignKeysOnSource(relation) {
+  if (!relation || relation.type !== "belongsTo") return void 0;
+  if (typeof relation.foreignKey === "string") return [relation.foreignKey];
+  if (Array.isArray(relation.foreignKey)) return relation.foreignKey;
+  return void 0;
+}
+function relationForeignKeys(relation) {
+  if (!relation) return void 0;
+  if (typeof relation.foreignKey === "string") return [relation.foreignKey];
+  if (Array.isArray(relation.foreignKey)) return relation.foreignKey;
+  return void 0;
+}
+function relationCardinality(relation) {
+  return relation?.type === "hasMany" || relation?.type === "belongsToMany" ? "many" : "one";
+}
+function unsafeBindingRelationReason(intent, ctx, bindingDependencies) {
+  if (!ctx.validator) return "model metadata is not available";
+  if (!ctx.validator.hasQualifiedRelationLookup()) {
+    return "model.getRelation metadata is not available";
+  }
+  if (bindingDependencies.length > 0 || isBindingTable(ctx, intent.from)) {
+    return "the binding body reads from another NQL binding";
+  }
+  if (!ctx.validator.hasPhysicalTable(intent.from)) {
+    return `the binding source '${intent.from}' is not a single real model table`;
+  }
+  if (intent.batchValuesSource) {
+    return "the binding body reads from a batch-values source";
+  }
+  if ((intent.joins?.length ?? 0) > 0) {
+    return "the binding body uses joins";
+  }
+  if ((intent.include?.length ?? 0) > 0) {
+    return "the binding body uses relation includes";
+  }
+  if ((intent.groupBy?.length ?? 0) > 0 || intent.having) {
+    return "the binding body uses GROUP BY or HAVING";
+  }
+  if (selectContainsAggregate(intent.select)) {
+    return "the binding body uses aggregate projections";
+  }
+  return void 0;
+}
+function findDirectSourceProjection(sourceTable, sourceColumn, directProjectionLineage) {
+  return directProjectionLineage.find(
+    (projection) => projection.sourceTable === sourceTable && columnsMatch(projection.sourceColumn, sourceColumn)
+  );
+}
+function virtualRelationForBinding(relation, sourceTable, directProjectionLineage) {
+  const fkColumns = relationForeignKeysOnSource(relation);
+  if (!relation || !fkColumns || fkColumns.length !== 1) return void 0;
+  const fkColumn = fkColumns[0];
+  const sourceProjection = findDirectSourceProjection(
+    sourceTable,
+    fkColumn,
+    directProjectionLineage
+  );
+  if (!sourceProjection) return void 0;
+  return {
+    relation: relation.name,
+    sourceTable,
+    targetTable: relation.target,
+    sourceColumn: sourceProjection.outputColumn,
+    targetColumn: relation.targetKey ?? DEFAULT_RELATION_TARGET_COLUMN,
+    cardinality: "one"
+  };
+}
+function scalarVirtualRelationForBinding(relation, sourceTable, directProjectionLineage) {
+  if (!relation) return void 0;
+  if (relation.type !== "belongsTo" && relation.type !== "hasOne") {
+    return void 0;
+  }
+  const fkColumns = relationForeignKeys(relation);
+  if (!fkColumns || fkColumns.length !== 1) return void 0;
+  const fkColumn = fkColumns[0];
+  const sourceJoinColumn = relation.type === "belongsTo" ? fkColumn : relation.sourceKey ?? DEFAULT_RELATION_TARGET_COLUMN;
+  const targetJoinColumn = relation.type === "belongsTo" ? relation.targetKey ?? DEFAULT_RELATION_TARGET_COLUMN : fkColumn;
+  const sourceProjection = findDirectSourceProjection(
+    sourceTable,
+    sourceJoinColumn,
+    directProjectionLineage
+  );
+  if (!sourceProjection) return void 0;
+  return {
+    relation: relation.name,
+    sourceTable,
+    targetTable: relation.target,
+    sourceColumn: sourceProjection.outputColumn,
+    targetColumn: targetJoinColumn,
+    cardinality: relationCardinality(relation)
+  };
+}
+function getBindingRelationFilterMetadata(intent, ctx, outputSchema, bindingDependencies) {
+  const unsafeReason = unsafeBindingRelationReason(
+    intent,
+    ctx,
+    bindingDependencies
+  );
+  if (unsafeReason) {
+    return {
+      unsafeReason,
+      directProjectionLineage: outputSchema.directProjectionLineage,
+      relations: []
+    };
+  }
+  const sourceTable = intent.from;
+  const relations = [];
+  const scalarRelations = [];
+  const relationNames = new Set(
+    ctx.validator?.getRelationsFrom(sourceTable).map((relation) => relation.name)
+  );
+  for (const relationName of relationNames ?? []) {
+    const relation = ctx.validator?.getRelation(sourceTable, relationName);
+    const virtualRelation = virtualRelationForBinding(
+      relation,
+      sourceTable,
+      outputSchema.directProjectionLineage ?? []
+    );
+    if (virtualRelation) relations.push(virtualRelation);
+    const scalarRelation = scalarVirtualRelationForBinding(
+      relation,
+      sourceTable,
+      outputSchema.directProjectionLineage ?? []
+    );
+    if (scalarRelation) scalarRelations.push(scalarRelation);
+  }
+  return {
+    sourceTable,
+    directProjectionLineage: outputSchema.directProjectionLineage,
+    relations,
+    scalarRelations
+  };
+}
 function validateBindingFinalPath(expr, ctx, bindingName) {
   const { segments } = expr;
   if (segments.length === 1) {
@@ -999,63 +1338,151 @@ function validateBindingFinalPath(expr, ctx, bindingName) {
   }
   assertNoBindingRelationPath(ctx, bindingName, segments.join("."));
 }
-function validateBindingFinalFunction(expr, ctx, bindingName) {
+function validateBindingFinalFunction(expr, ctx, bindingName, allowRelationFilters) {
   const fn = expr.name.toLowerCase();
   if (!PORTABLE_BINDING_FINAL_FUNCTIONS.has(fn)) {
     throwUnsupportedBindingFinal(bindingName, `function ${expr.name}()`);
   }
   for (const arg of expr.args) {
-    validateBindingFinalExpression(arg, ctx, bindingName);
+    validateBindingFinalExpression(arg, ctx, bindingName, allowRelationFilters);
   }
 }
-function validateBindingFinalExpression(expr, ctx, bindingName) {
+function validateBindingFinalExpression(expr, ctx, bindingName, allowRelationFilters = false) {
   switch (expr.type) {
     case "path":
       validateBindingFinalPath(expr, ctx, bindingName);
       break;
     case "binary":
-      validateBindingFinalExpression(expr.left, ctx, bindingName);
-      validateBindingFinalExpression(expr.right, ctx, bindingName);
+      validateBindingFinalExpression(
+        expr.left,
+        ctx,
+        bindingName,
+        allowRelationFilters
+      );
+      validateBindingFinalExpression(
+        expr.right,
+        ctx,
+        bindingName,
+        allowRelationFilters
+      );
       break;
     case "unary":
-      validateBindingFinalExpression(expr.operand, ctx, bindingName);
+      validateBindingFinalExpression(
+        expr.operand,
+        ctx,
+        bindingName,
+        allowRelationFilters
+      );
       break;
     case "comparison":
-      validateBindingFinalExpression(expr.left, ctx, bindingName);
-      validateBindingFinalExpression(expr.right, ctx, bindingName);
+      validateBindingFinalExpression(
+        expr.left,
+        ctx,
+        bindingName,
+        allowRelationFilters
+      );
+      validateBindingFinalExpression(
+        expr.right,
+        ctx,
+        bindingName,
+        allowRelationFilters
+      );
       break;
     case "in":
-      validateBindingFinalExpression(expr.expression, ctx, bindingName);
+      validateBindingFinalExpression(
+        expr.expression,
+        ctx,
+        bindingName,
+        allowRelationFilters
+      );
       if (Array.isArray(expr.values)) {
         for (const value of expr.values) {
-          validateBindingFinalExpression(value, ctx, bindingName);
+          validateBindingFinalExpression(
+            value,
+            ctx,
+            bindingName,
+            allowRelationFilters
+          );
         }
       } else if (expr.values.type === "dateRange") ; else ;
       break;
     case "between":
-      validateBindingFinalExpression(expr.expression, ctx, bindingName);
-      validateBindingFinalExpression(expr.low, ctx, bindingName);
-      validateBindingFinalExpression(expr.high, ctx, bindingName);
+      validateBindingFinalExpression(
+        expr.expression,
+        ctx,
+        bindingName,
+        allowRelationFilters
+      );
+      validateBindingFinalExpression(
+        expr.low,
+        ctx,
+        bindingName,
+        allowRelationFilters
+      );
+      validateBindingFinalExpression(
+        expr.high,
+        ctx,
+        bindingName,
+        allowRelationFilters
+      );
       break;
     case "isNull":
-      validateBindingFinalExpression(expr.expression, ctx, bindingName);
+      validateBindingFinalExpression(
+        expr.expression,
+        ctx,
+        bindingName,
+        allowRelationFilters
+      );
       break;
     case "function":
-      validateBindingFinalFunction(expr, ctx, bindingName);
+      validateBindingFinalFunction(
+        expr,
+        ctx,
+        bindingName,
+        allowRelationFilters
+      );
       break;
     case "case":
       if (expr.subject) {
-        validateBindingFinalExpression(expr.subject, ctx, bindingName);
+        validateBindingFinalExpression(
+          expr.subject,
+          ctx,
+          bindingName,
+          allowRelationFilters
+        );
       }
       for (const when of expr.whenClauses) {
-        validateBindingFinalExpression(when.condition, ctx, bindingName);
-        validateBindingFinalExpression(when.result, ctx, bindingName);
+        validateBindingFinalExpression(
+          when.condition,
+          ctx,
+          bindingName,
+          allowRelationFilters
+        );
+        validateBindingFinalExpression(
+          when.result,
+          ctx,
+          bindingName,
+          allowRelationFilters
+        );
       }
       if (expr.elseClause) {
-        validateBindingFinalExpression(expr.elseClause, ctx, bindingName);
+        validateBindingFinalExpression(
+          expr.elseClause,
+          ctx,
+          bindingName,
+          allowRelationFilters
+        );
       }
       break;
     case "relationFilter":
+      if (allowRelationFilters) {
+        resolveBindingRelationFilter(
+          ctx,
+          bindingName,
+          expr.relation
+        );
+        break;
+      }
       assertNoBindingRelationConstruct(
         ctx,
         bindingName,
@@ -1130,11 +1557,11 @@ function validateBindingFinalSelectClause(clause, ctx, bindingName) {
               firstSegment
             );
           } else {
-            assertNoBindingRelationConstruct(
+            resolveBindingRelationColumn(
               ctx,
               bindingName,
-              "select relation columns",
-              segments.slice(0, -1).join(".")
+              segments.slice(0, -1),
+              segments.at(-1)
             );
           }
         } else {
@@ -1166,7 +1593,12 @@ function validateBindingFinalQuery(query, ctx) {
             ctx.currentHavingAliases = previousHavingAliases;
           }
         } else {
-          validateBindingFinalExpression(clause.condition, ctx, query.table);
+          validateBindingFinalExpression(
+            clause.condition,
+            ctx,
+            query.table,
+            true
+          );
         }
         break;
       }
@@ -1347,7 +1779,7 @@ function compileQueryInternal(query, ctx, fns, bindings) {
       }
     }
   }
-  if (select && select.type === "expressions") {
+  if (select && select.type === "expressions" && !isBindingSource) {
     const relationPaths = /* @__PURE__ */ new Set();
     for (const expr of select.columns) {
       if (expr.kind === "relationColumn") {
@@ -1489,9 +1921,10 @@ function expressionOutputColumn(expr) {
   }
 }
 function addUnique(columns, seen, column) {
-  if (seen.has(column)) return;
+  if (seen.has(column)) return false;
   seen.add(column);
   columns.push(column);
+  return true;
 }
 function resolveSourceOutputColumns(intent, ctx, bindingName) {
   const bindingColumns2 = getKnownBindingColumns(ctx, intent.from);
@@ -1503,33 +1936,62 @@ function resolveSourceOutputColumns(intent, ctx, bindingName) {
     `Cannot compute output schema for NQL binding '${bindingName}' from SELECT * on '${intent.from}' without a concrete table schema.`
   );
 }
-function getQueryOutputSchema(intent, ctx, bindingName) {
+function getQueryOutputSchema(intent, ctx, bindingName, bindingDependencies = []) {
   const columns = [];
   const seen = /* @__PURE__ */ new Set();
+  const directProjectionLineage = [];
   const addColumn = (column) => addUnique(columns, seen, column);
+  const resolveSourceColumn = (column) => ctx.validator?.resolveColumnName(intent.from, column) ?? column;
+  const addDirectProjection = (outputColumn, sourceColumn) => {
+    if (!addColumn(outputColumn)) return;
+    directProjectionLineage.push({
+      kind: "directProjection",
+      sourceTable: intent.from,
+      sourceColumn: resolveSourceColumn(sourceColumn),
+      outputColumn
+    });
+  };
   const addSourceColumns = () => {
     for (const column of resolveSourceOutputColumns(intent, ctx, bindingName)) {
-      addColumn(column);
+      addDirectProjection(column, column);
     }
   };
   const { select } = intent;
   if (!select || select.type === "all") {
     addSourceColumns();
-    return { columns };
+    const outputSchema2 = { columns, directProjectionLineage };
+    return {
+      columns: outputSchema2.columns,
+      relationFilters: getBindingRelationFilterMetadata(
+        intent,
+        ctx,
+        outputSchema2,
+        bindingDependencies
+      )
+    };
   }
   if (select.type === "fields") {
     for (const field of select.fields) {
       if (field === "*") {
         addSourceColumns();
       } else {
-        addColumn(field);
+        addDirectProjection(field, field);
       }
     }
-    return { columns };
+    const outputSchema2 = { columns, directProjectionLineage };
+    return {
+      columns: outputSchema2.columns,
+      relationFilters: getBindingRelationFilterMetadata(
+        intent,
+        ctx,
+        outputSchema2,
+        bindingDependencies
+      )
+    };
   }
   if (select.type === "aggregate") {
     for (const field of select.fields ?? []) {
-      addColumn(field);
+      addDirectProjection(field, field);
     }
     for (const aggregate of select.aggregates) {
       if (!aggregate.as) {
@@ -1540,7 +2002,16 @@ function getQueryOutputSchema(intent, ctx, bindingName) {
       }
       addColumn(aggregate.as);
     }
-    return { columns };
+    const outputSchema2 = { columns, directProjectionLineage };
+    return {
+      columns: outputSchema2.columns,
+      relationFilters: getBindingRelationFilterMetadata(
+        intent,
+        ctx,
+        outputSchema2,
+        bindingDependencies
+      )
+    };
   }
   for (const expr of select.columns) {
     if (expr.kind === "column" && expr.column === "*") {
@@ -1560,9 +2031,24 @@ function getQueryOutputSchema(intent, ctx, bindingName) {
         `Cannot compute output schema for NQL binding '${bindingName}': selected expression must use an alias.`
       );
     }
-    addColumn(outputColumn);
+    if (expr.kind === "column") {
+      addDirectProjection(outputColumn, expr.column);
+    } else if (expr.kind === "columnAlias") {
+      addDirectProjection(outputColumn, expr.column);
+    } else {
+      addColumn(outputColumn);
+    }
   }
-  return { columns };
+  const outputSchema = { columns, directProjectionLineage };
+  return {
+    columns: outputSchema.columns,
+    relationFilters: getBindingRelationFilterMetadata(
+      intent,
+      ctx,
+      outputSchema,
+      bindingDependencies
+    )
+  };
 }
 function validateNqlExpressionPaths(expr, ctx) {
   switch (expr.type) {
@@ -2334,13 +2820,12 @@ function compileRelationFilter(expr, ctx, fns, aliasContext, outerAliases) {
   const relFilter = expr;
   const nestedOuterAliases = aliasContext ? [...outerAliases ?? [], aliasContext] : outerAliases ?? [];
   const prevRelationTarget = ctx.currentRelationTarget;
+  const bindingRelation = ctx.currentFromTable && relFilter.relation[0] ? resolveBindingRelationFilter(
+    ctx,
+    ctx.currentFromTable,
+    relFilter.relation
+  ) : void 0;
   if (ctx.currentFromTable && relFilter.relation[0]) {
-    assertNoBindingRelationConstruct(
-      ctx,
-      ctx.currentFromTable,
-      "use relation filters",
-      relFilter.relation.join(".")
-    );
     if (ctx.validator) {
       ctx.currentRelationTarget = ctx.validator.resolveRelationTarget(
         ctx.currentFromTable,
@@ -2356,13 +2841,27 @@ function compileRelationFilter(expr, ctx, fns, aliasContext, outerAliases) {
     nestedOuterAliases
   );
   ctx.currentRelationTarget = prevRelationTarget;
-  return {
+  const relationFilterIntent = {
     kind: "relationFilter",
     relation: relFilter.relation,
     where,
     mode: relFilter.mode,
-    ...relFilter.alias !== void 0 && { alias: relFilter.alias }
+    ...relFilter.alias !== void 0 && { alias: relFilter.alias },
+    ...bindingRelation !== void 0 && {
+      targetTable: bindingRelation.targetTable,
+      sourceColumn: bindingRelation.sourceColumn,
+      targetColumn: bindingRelation.targetColumn
+    }
   };
+  return bindingRelation ? markNqlTrustedRelationFilter(relationFilterIntent, {
+    relation: bindingRelation.relation,
+    targetTable: bindingRelation.targetTable,
+    sourceColumn: bindingRelation.sourceColumn,
+    targetColumn: bindingRelation.targetColumn,
+    ...bindingRelation.cardinality !== void 0 && {
+      cardinality: bindingRelation.cardinality
+    }
+  }) : relationFilterIntent;
 }
 function expandDateRangeList(field, patterns, negated) {
   const conditions = patterns.map((pattern) => {
@@ -2854,27 +3353,42 @@ function compileMultiSegmentPath(expr, item, ctx) {
   }
   const column = segments[segments.length - 1];
   const relation = segments.slice(0, -1).join(".");
-  assertNoBindingRelationConstruct(
+  const bindingRelation = resolveBindingRelationColumn(
     ctx,
     ctx.currentFromTable,
-    "select relation columns",
-    relation
+    segments.slice(0, -1),
+    column
   );
-  if (ctx.currentFromTable && ctx.validator) {
-    const targetTable = ctx.validator.resolveRelationTarget(
+  if (!bindingRelation) {
+    assertNoBindingRelationConstruct(
+      ctx,
       ctx.currentFromTable,
-      segments[0]
+      "select relation columns",
+      relation
     );
+  }
+  if (ctx.currentFromTable && ctx.validator) {
+    const targetTable = bindingRelation?.targetTable ?? ctx.validator.resolveRelationTarget(ctx.currentFromTable, segments[0]);
     if (targetTable) {
       ctx.validator.validateColumn(targetTable, column);
     }
   }
-  return {
+  const relationColumnIntent = {
     kind: "relationColumn",
     relation,
     column,
     as: item.alias ?? `${relation}.${column}`
   };
+  return bindingRelation ? markNqlTrustedRelationFilter(relationColumnIntent, {
+    relation: bindingRelation.relation,
+    targetTable: bindingRelation.targetTable,
+    sourceColumn: bindingRelation.sourceColumn,
+    targetColumn: bindingRelation.targetColumn,
+    selectedColumn: column,
+    ...bindingRelation.cardinality !== void 0 && {
+      cardinality: bindingRelation.cardinality
+    }
+  }) : relationColumnIntent;
 }
 function compileCaseExpression(caseExpr, item, ctx, fns) {
   if (caseExpr.subject) {
@@ -3262,6 +3776,7 @@ var NqlCompiler = class {
       recursiveKeywords,
       validator,
       bindingOutputColumns: /* @__PURE__ */ new Map(),
+      bindingRelationFilters: /* @__PURE__ */ new Map(),
       params,
       maxAnyItems: maxAnyItemsRaw ?? MAX_ANY_ITEMS,
       allowUnfilteredMutations: options?.allowUnfilteredMutations ?? false,
@@ -3281,6 +3796,7 @@ var NqlCompiler = class {
       return this.compileProgram(program);
     } finally {
       this.ctx.bindingOutputColumns.clear();
+      this.ctx.bindingRelationFilters.clear();
       this.ctx.validator?.clearVirtualBindingTables();
     }
   }
@@ -3364,13 +3880,15 @@ var NqlCompiler = class {
           const outputSchema = this.registerQueryBindingOutputSchema(
             bindName,
             lastResult.query,
-            bindingOutputSchemas
+            bindingOutputSchemas,
+            statementBindingDependencies
           );
           bindings.set(bindName, lastResult.query);
           if (outputSchema) {
             this.ctx.validator?.addVirtualBindingTable(
               bindName,
-              outputSchema.columns
+              outputSchema.columns,
+              outputSchema.relationFilters
             );
           }
           materializedBindStatements.add(i);
@@ -3399,7 +3917,8 @@ var NqlCompiler = class {
             bindingOutputSchemas.set(bindName, outputSchema);
             this.ctx.validator?.addVirtualBindingTable(
               bindName,
-              outputSchema.columns
+              outputSchema.columns,
+              outputSchema.relationFilters
             );
           }
           materializedBindStatements.add(i);
@@ -3439,11 +3958,22 @@ var NqlCompiler = class {
     }
     return lastResult;
   }
-  registerQueryBindingOutputSchema(bindName, query, bindingOutputSchemas) {
+  registerQueryBindingOutputSchema(bindName, query, bindingOutputSchemas, bindingDependencies) {
     try {
-      const outputSchema = getQueryOutputSchema(query, this.ctx, bindName);
+      const outputSchema = getQueryOutputSchema(
+        query,
+        this.ctx,
+        bindName,
+        bindingDependencies
+      );
       bindingOutputSchemas.set(bindName, outputSchema);
       this.ctx.bindingOutputColumns.set(bindName, outputSchema.columns);
+      if (outputSchema.relationFilters) {
+        this.ctx.bindingRelationFilters.set(
+          bindName,
+          outputSchema.relationFilters
+        );
+      }
       return outputSchema;
     } catch (error) {
       if (!this.ctx.validator && isUnresolvedSelectAllOutputSchemaError(error)) {