metal-orm 1.0.101 → 1.0.102

package/dist/index.cjs

@@ -4444,6 +4444,37 @@ var collectFromOrderingTerm = (term, collector) => {
 };
 
 // src/query-builder/relation-join-planner.ts
+var getExposedName = (ts) => {
+  if (ts.type === "Table") return ts.alias ?? ts.name;
+  if (ts.type === "DerivedTable") return ts.alias;
+  if (ts.type === "FunctionTable") return ts.alias ?? ts.name;
+  return null;
+};
+var collectExposedNames = (state) => {
+  const used = /* @__PURE__ */ new Set();
+  const fromName = getExposedName(state.ast.from);
+  if (fromName) used.add(fromName);
+  for (const j of state.ast.joins) {
+    const n = getExposedName(j.table);
+    if (n) used.add(n);
+  }
+  return used;
+};
+var makeUniqueAlias = (base, used) => {
+  let alias = base;
+  let i = 2;
+  while (used.has(alias)) alias = `${base}_${i++}`;
+  return alias;
+};
+var ensureCorrelationName = (state, relationName, ts, extraUsed) => {
+  if (ts.type !== "Table") return ts;
+  if (ts.alias) return ts;
+  const used = collectExposedNames(state);
+  for (const x of extraUsed ?? []) used.add(x);
+  if (!used.has(ts.name)) return ts;
+  const alias = makeUniqueAlias(relationName, used);
+  return { ...ts, alias };
+};
 var RelationJoinPlanner = class {
   constructor(table, createQueryAstService) {
     this.table = table;
@@ -4452,11 +4483,17 @@ var RelationJoinPlanner = class {
   withJoin(state, relationName, relation, joinKind, extraCondition, tableSource) {
     const rootAlias = state.ast.from.type === "Table" ? state.ast.from.alias : void 0;
     if (relation.type === RelationKinds.BelongsToMany) {
-      const targetTableSource = tableSource ?? {
+      let targetTableSource = tableSource ?? {
         type: "Table",
         name: relation.target.name,
         schema: relation.target.schema
       };
+      targetTableSource = ensureCorrelationName(
+        state,
+        relationName,
+        targetTableSource,
+        [relation.pivotTable.name]
+      );
       const targetName2 = this.resolveTargetTableName(targetTableSource, relation);
       const joins = buildBelongsToManyJoins(
         this.table,
@@ -4470,11 +4507,12 @@ var RelationJoinPlanner = class {
       );
       return joins.reduce((current, join) => this.astService(current).withJoin(join), state);
     }
-    const targetTable = tableSource ?? {
+    let targetTable = tableSource ?? {
       type: "Table",
       name: relation.target.name,
       schema: relation.target.schema
     };
+    targetTable = ensureCorrelationName(state, relationName, targetTable);
     const targetName = this.resolveTargetTableName(targetTable, relation);
     const condition = buildRelationJoinCondition(
       this.table,
@@ -4550,13 +4588,22 @@ var RelationCteBuilder = class {
 };
 
 // src/query-builder/relation-include-strategies.ts
-var buildTypedSelection = (columns, prefix, keys, missingMsg) => {
+var getJoinCorrelationName = (state, relationName, fallback) => {
+  const join = state.ast.joins.find((j) => getJoinRelationName(j) === relationName);
+  if (!join) return fallback;
+  const t = join.table;
+  if (t.type === "Table") return t.alias ?? t.name;
+  if (t.type === "DerivedTable") return t.alias;
+  if (t.type === "FunctionTable") return t.alias ?? fallback;
+  return fallback;
+};
+var buildTypedSelection = (columns, prefix, keys, missingMsg, tableOverride) => {
   return keys.reduce((acc, key) => {
     const def = columns[key];
     if (!def) {
       throw new Error(missingMsg(key));
     }
-    acc[makeRelationAlias(prefix, key)] = def;
+    acc[makeRelationAlias(prefix, key)] = tableOverride ? { ...def, table: tableOverride } : def;
     return acc;
   }, {});
 };
@@ -4593,11 +4640,13 @@ var standardIncludeStrategy = (context) => {
   state = fkSelectionResult.state;
   hydration = fkSelectionResult.hydration;
   const targetColumns = resolveTargetColumns(relation, context.options);
+  const tableOverride = getJoinCorrelationName(state, context.relationName, relation.target.name);
   const targetSelection = buildTypedSelection(
     relation.target.columns,
     context.aliasPrefix,
     targetColumns,
-    (key) => `Column '${key}' not found on relation '${context.relationName}'`
+    (key) => `Column '${key}' not found on relation '${context.relationName}'`,
+    tableOverride
   );
   const relationSelectionResult = context.selectColumns(state, hydration, targetSelection);
   state = relationSelectionResult.state;
@@ -4615,11 +4664,13 @@ var belongsToManyStrategy = (context) => {
   const relation = context.relation;
   let { state, hydration } = context;
   const targetColumns = resolveTargetColumns(relation, context.options);
+  const tableOverride = getJoinCorrelationName(state, context.relationName, relation.target.name);
   const targetSelection = buildTypedSelection(
     relation.target.columns,
     context.aliasPrefix,
     targetColumns,
-    (key) => `Column '${key}' not found on relation '${context.relationName}'`
+    (key) => `Column '${key}' not found on relation '${context.relationName}'`,
+    tableOverride
   );
   const pivotAliasPrefix = context.options?.pivot?.aliasPrefix ?? `${context.aliasPrefix}_pivot`;
   const pivotPk = relation.pivotPrimaryKey || findPrimaryKey(relation.pivotTable);