@zenstackhq/runtime 3.0.0-alpha.32 → 3.0.0-alpha.33

package/dist/index.js

@@ -92,7 +92,10 @@ var ExpressionUtils = {
   isUnary: /* @__PURE__ */ __name((value) => ExpressionUtils.is(value, "unary"), "isUnary"),
   isBinary: /* @__PURE__ */ __name((value) => ExpressionUtils.is(value, "binary"), "isBinary"),
   isField: /* @__PURE__ */ __name((value) => ExpressionUtils.is(value, "field"), "isField"),
-  isMember: /* @__PURE__ */ __name((value) => ExpressionUtils.is(value, "member"), "isMember")
+  isMember: /* @__PURE__ */ __name((value) => ExpressionUtils.is(value, "member"), "isMember"),
+  getLiteralValue: /* @__PURE__ */ __name((expr2) => {
+    return ExpressionUtils.isLiteral(expr2) ? expr2.value : void 0;
+  }, "getLiteralValue")
 };
 
 // src/utils/object-utils.ts
@@ -1016,6 +1019,16 @@ var BaseCrudDialect = class {
     }
     return result;
   }
+  buildModelSelect(eb, model, subQueryAlias, payload, selectAllFields) {
+    let subQuery = this.buildSelectModel(eb, model, subQueryAlias);
+    if (selectAllFields) {
+      subQuery = this.buildSelectAllFields(model, subQuery, typeof payload === "object" ? payload?.omit : void 0, subQueryAlias);
+    }
+    if (payload && typeof payload === "object") {
+      subQuery = this.buildFilterSortTake(model, payload, subQuery, subQueryAlias);
+    }
+    return subQuery;
+  }
   buildSelectField(query, model, modelAlias, field) {
     const fieldDef = requireField(this.schema, model, field);
     if (fieldDef.computed) {
@@ -1113,6 +1126,18 @@ var BaseCrudDialect = class {
   fieldRef(model, field, eb, modelAlias, inlineComputedField = true) {
     return buildFieldRef(this.schema, model, field, this.options, eb, modelAlias, inlineComputedField);
   }
+  canJoinWithoutNestedSelect(modelDef, payload) {
+    if (modelDef.computedFields) {
+      return false;
+    }
+    if (modelDef.baseModel || modelDef.isDelegate) {
+      return false;
+    }
+    if (typeof payload === "object" && (payload.orderBy || payload.skip !== void 0 || payload.take !== void 0 || payload.cursor || payload.distinct)) {
+      return false;
+    }
+    return true;
+  }
 };
 
 // src/client/crud/dialects/postgresql.ts
@@ -1138,52 +1163,58 @@ var PostgresCrudDialect = class extends BaseCrudDialect {
     }
   }
   buildRelationSelection(query, model, relationField, parentAlias, payload) {
-    const joinedQuery = this.buildRelationJSON(model, query, relationField, parentAlias, payload);
-    return joinedQuery.select(`${parentAlias}$${relationField}.$j as ${relationField}`);
+    const relationResultName = `${parentAlias}$${relationField}`;
+    const joinedQuery = this.buildRelationJSON(model, query, relationField, parentAlias, payload, relationResultName);
+    return joinedQuery.select(`${relationResultName}.$data as ${relationField}`);
   }
-  buildRelationJSON(model, qb, relationField, parentName, payload) {
+  buildRelationJSON(model, qb, relationField, parentAlias, payload, resultName) {
     const relationFieldDef = requireField(this.schema, model, relationField);
     const relationModel = relationFieldDef.type;
     return qb.leftJoinLateral((eb) => {
-      const joinTableName = `${parentName}$${relationField}`;
-      let result = eb.selectFrom(`${relationModel} as ${joinTableName}`);
-      const subQueryAlias = `${relationModel}$${relationField}$sub`;
-      result = eb.selectFrom(() => {
-        let subQuery = this.buildSelectModel(eb, relationModel, subQueryAlias);
-        subQuery = this.buildSelectAllFields(relationModel, subQuery, typeof payload === "object" ? payload?.omit : void 0, subQueryAlias);
-        if (payload && typeof payload === "object") {
-          subQuery = this.buildFilterSortTake(relationModel, payload, subQuery, subQueryAlias);
-        }
-        const m2m = getManyToManyRelation(this.schema, model, relationField);
-        if (m2m) {
-          const parentIds = getIdFields(this.schema, model);
-          const relationIds = getIdFields(this.schema, relationModel);
-          invariant2(parentIds.length === 1, "many-to-many relation must have exactly one id field");
-          invariant2(relationIds.length === 1, "many-to-many relation must have exactly one id field");
-          subQuery = subQuery.where(eb(eb.ref(`${subQueryAlias}.${relationIds[0]}`), "in", eb.selectFrom(m2m.joinTable).select(`${m2m.joinTable}.${m2m.otherFkName}`).whereRef(`${parentName}.${parentIds[0]}`, "=", `${m2m.joinTable}.${m2m.parentFkName}`)));
-        } else {
-          const joinPairs = buildJoinPairs(this.schema, model, parentName, relationField, subQueryAlias);
-          subQuery = subQuery.where((eb2) => this.and(eb2, ...joinPairs.map(([left, right]) => eb2(sql2.ref(left), "=", sql2.ref(right)))));
-        }
-        return subQuery.as(joinTableName);
-      });
-      result = this.buildRelationObjectSelect(relationModel, joinTableName, relationField, relationFieldDef, result, payload, parentName);
-      result = this.buildRelationJoins(relationModel, relationField, result, payload, parentName);
-      return result.as(joinTableName);
+      const relationSelectName = `${resultName}$sub`;
+      const relationModelDef = requireModel(this.schema, relationModel);
+      let tbl;
+      if (this.canJoinWithoutNestedSelect(relationModelDef, payload)) {
+        tbl = this.buildModelSelect(eb, relationModel, relationSelectName, payload, false);
+        tbl = this.buildRelationJoinFilter(tbl, model, relationField, relationModel, relationSelectName, parentAlias);
+      } else {
+        tbl = eb.selectFrom(() => {
+          let subQuery = this.buildModelSelect(eb, relationModel, `${relationSelectName}$t`, payload, true);
+          subQuery = this.buildRelationJoinFilter(subQuery, model, relationField, relationModel, `${relationSelectName}$t`, parentAlias);
+          return subQuery.as(relationSelectName);
+        });
+      }
+      tbl = this.buildRelationObjectSelect(relationModel, relationSelectName, relationFieldDef, tbl, payload, resultName);
+      tbl = this.buildRelationJoins(tbl, relationModel, relationSelectName, payload, resultName);
+      return tbl.as(resultName);
     }, (join) => join.onTrue());
   }
-  buildRelationObjectSelect(relationModel, relationModelAlias, relationField, relationFieldDef, qb, payload, parentName) {
+  buildRelationJoinFilter(query, model, relationField, relationModel, relationModelAlias, parentAlias) {
+    const m2m = getManyToManyRelation(this.schema, model, relationField);
+    if (m2m) {
+      const parentIds = getIdFields(this.schema, model);
+      const relationIds = getIdFields(this.schema, relationModel);
+      invariant2(parentIds.length === 1, "many-to-many relation must have exactly one id field");
+      invariant2(relationIds.length === 1, "many-to-many relation must have exactly one id field");
+      query = query.where((eb) => eb(eb.ref(`${relationModelAlias}.${relationIds[0]}`), "in", eb.selectFrom(m2m.joinTable).select(`${m2m.joinTable}.${m2m.otherFkName}`).whereRef(`${parentAlias}.${parentIds[0]}`, "=", `${m2m.joinTable}.${m2m.parentFkName}`)));
+    } else {
+      const joinPairs = buildJoinPairs(this.schema, model, parentAlias, relationField, relationModelAlias);
+      query = query.where((eb) => this.and(eb, ...joinPairs.map(([left, right]) => eb(sql2.ref(left), "=", sql2.ref(right)))));
+    }
+    return query;
+  }
+  buildRelationObjectSelect(relationModel, relationModelAlias, relationFieldDef, qb, payload, parentResultName) {
     qb = qb.select((eb) => {
-      const objArgs = this.buildRelationObjectArgs(relationModel, relationModelAlias, relationField, eb, payload, parentName);
+      const objArgs = this.buildRelationObjectArgs(relationModel, relationModelAlias, eb, payload, parentResultName);
       if (relationFieldDef.array) {
-        return eb.fn.coalesce(sql2`jsonb_agg(jsonb_build_object(${sql2.join(objArgs)}))`, sql2`'[]'::jsonb`).as("$j");
+        return eb.fn.coalesce(sql2`jsonb_agg(jsonb_build_object(${sql2.join(objArgs)}))`, sql2`'[]'::jsonb`).as("$data");
       } else {
-        return sql2`jsonb_build_object(${sql2.join(objArgs)})`.as("$j");
+        return sql2`jsonb_build_object(${sql2.join(objArgs)})`.as("$data");
       }
     });
     return qb;
   }
-  buildRelationObjectArgs(relationModel, relationModelAlias, relationField, eb, payload, parentAlias) {
+  buildRelationObjectArgs(relationModel, relationModelAlias, eb, payload, parentResultName) {
     const relationModelDef = requireModel(this.schema, relationModel);
     const objArgs = [];
     const descendantModels = getDelegateDescendantModels(this.schema, relationModel);
@@ -1201,14 +1232,14 @@ var PostgresCrudDialect = class extends BaseCrudDialect {
     } else if (payload.select) {
       objArgs.push(...Object.entries(payload.select).filter(([, value]) => value).map(([field, value]) => {
         if (field === "_count") {
-          const subJson = this.buildCountJson(relationModel, eb, `${parentAlias}$${relationField}`, value);
+          const subJson = this.buildCountJson(relationModel, eb, relationModelAlias, value);
           return [
             sql2.lit(field),
             subJson
           ];
         } else {
           const fieldDef = requireField(this.schema, relationModel, field);
-          const fieldValue = fieldDef.relation ? eb.ref(`${parentAlias}$${relationField}$${field}.$j`) : this.fieldRef(relationModel, field, eb, void 0, false);
+          const fieldValue = fieldDef.relation ? eb.ref(`${parentResultName}$${field}.$data`) : this.fieldRef(relationModel, field, eb, relationModelAlias, false);
           return [
             sql2.lit(field),
             fieldValue
@@ -1220,18 +1251,18 @@ var PostgresCrudDialect = class extends BaseCrudDialect {
       objArgs.push(...Object.entries(payload.include).filter(([, value]) => value).map(([field]) => [
         sql2.lit(field),
         // reference the synthesized JSON field
-        eb.ref(`${parentAlias}$${relationField}$${field}.$j`)
+        eb.ref(`${parentResultName}$${field}.$data`)
       ]).flatMap((v) => v));
     }
     return objArgs;
   }
-  buildRelationJoins(relationModel, relationField, qb, payload, parentName) {
-    let result = qb;
+  buildRelationJoins(query, relationModel, relationModelAlias, payload, parentResultName) {
+    let result = query;
     if (typeof payload === "object") {
       const selectInclude = payload.include ?? payload.select;
       if (selectInclude && typeof selectInclude === "object") {
         Object.entries(selectInclude).filter(([, value]) => value).filter(([field]) => isRelationField(this.schema, relationModel, field)).forEach(([field, value]) => {
-          result = this.buildRelationJSON(relationModel, result, field, `${parentName}$${relationField}`, value);
+          result = this.buildRelationJSON(relationModel, result, field, relationModelAlias, value, `${parentResultName}$${field}`);
         });
       }
     }
@@ -1311,32 +1342,18 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
     const relationModel = relationFieldDef.type;
     const relationModelDef = requireModel(this.schema, relationModel);
     const subQueryName = `${parentAlias}$${relationField}`;
-    let tbl = eb.selectFrom(() => {
-      const subQueryAlias = `${parentAlias}$${relationField}$sub`;
-      let subQuery = this.buildSelectModel(eb, relationModel, subQueryAlias);
-      subQuery = this.buildSelectAllFields(relationModel, subQuery, typeof payload === "object" ? payload?.omit : void 0, subQueryAlias);
-      if (payload && typeof payload === "object") {
-        subQuery = this.buildFilterSortTake(relationModel, payload, subQuery, subQueryAlias);
-      }
-      const m2m = getManyToManyRelation(this.schema, model, relationField);
-      if (m2m) {
-        const parentIds = getIdFields(this.schema, model);
-        const relationIds = getIdFields(this.schema, relationModel);
-        invariant3(parentIds.length === 1, "many-to-many relation must have exactly one id field");
-        invariant3(relationIds.length === 1, "many-to-many relation must have exactly one id field");
-        subQuery = subQuery.where(eb(eb.ref(`${subQueryAlias}.${relationIds[0]}`), "in", eb.selectFrom(m2m.joinTable).select(`${m2m.joinTable}.${m2m.otherFkName}`).whereRef(`${parentAlias}.${parentIds[0]}`, "=", `${m2m.joinTable}.${m2m.parentFkName}`)));
-      } else {
-        const { keyPairs, ownedByModel } = getRelationForeignKeyFieldPairs(this.schema, model, relationField);
-        keyPairs.forEach(({ fk, pk }) => {
-          if (ownedByModel) {
-            subQuery = subQuery.whereRef(`${subQueryAlias}.${pk}`, "=", `${parentAlias}.${fk}`);
-          } else {
-            subQuery = subQuery.whereRef(`${subQueryAlias}.${fk}`, "=", `${parentAlias}.${pk}`);
-          }
-        });
-      }
-      return subQuery.as(subQueryName);
-    });
+    let tbl;
+    if (this.canJoinWithoutNestedSelect(relationModelDef, payload)) {
+      tbl = this.buildModelSelect(eb, relationModel, subQueryName, payload, false);
+      tbl = this.buildRelationJoinFilter(tbl, model, relationField, subQueryName, parentAlias);
+    } else {
+      tbl = eb.selectFrom(() => {
+        const selectModelAlias = `${parentAlias}$${relationField}$sub`;
+        let selectModelQuery = this.buildModelSelect(eb, relationModel, selectModelAlias, payload, true);
+        selectModelQuery = this.buildRelationJoinFilter(selectModelQuery, model, relationField, selectModelAlias, parentAlias);
+        return selectModelQuery.as(subQueryName);
+      });
+    }
     tbl = tbl.select(() => {
       const objArgs = [];
       const descendantModels = getDelegateDescendantModels(this.schema, relationModel);
@@ -1349,7 +1366,7 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
       if (payload === true || !payload.select) {
         objArgs.push(...Object.entries(relationModelDef.fields).filter(([, value]) => !value.relation).filter(([name]) => !(typeof payload === "object" && payload.omit?.[name] === true)).map(([field]) => [
           sql3.lit(field),
-          this.fieldRef(relationModel, field, eb, void 0, false)
+          this.fieldRef(relationModel, field, eb, subQueryName, false)
         ]).flatMap((v) => v));
       } else if (payload.select) {
         objArgs.push(...Object.entries(payload.select).filter(([, value]) => value).map(([field, value]) => {
@@ -1370,7 +1387,7 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
             } else {
               return [
                 sql3.lit(field),
-                this.fieldRef(relationModel, field, eb, void 0, false)
+                this.fieldRef(relationModel, field, eb, subQueryName, false)
               ];
             }
           }
@@ -1386,13 +1403,35 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
         }).flatMap((v) => v));
       }
       if (relationFieldDef.array) {
-        return eb.fn.coalesce(sql3`json_group_array(json_object(${sql3.join(objArgs)}))`, sql3`json_array()`).as("$j");
+        return eb.fn.coalesce(sql3`json_group_array(json_object(${sql3.join(objArgs)}))`, sql3`json_array()`).as("$data");
       } else {
-        return sql3`json_object(${sql3.join(objArgs)})`.as("data");
+        return sql3`json_object(${sql3.join(objArgs)})`.as("$data");
       }
     });
     return tbl;
   }
+  buildRelationJoinFilter(selectModelQuery, model, relationField, relationModelAlias, parentAlias) {
+    const fieldDef = requireField(this.schema, model, relationField);
+    const relationModel = fieldDef.type;
+    const m2m = getManyToManyRelation(this.schema, model, relationField);
+    if (m2m) {
+      const parentIds = getIdFields(this.schema, model);
+      const relationIds = getIdFields(this.schema, relationModel);
+      invariant3(parentIds.length === 1, "many-to-many relation must have exactly one id field");
+      invariant3(relationIds.length === 1, "many-to-many relation must have exactly one id field");
+      selectModelQuery = selectModelQuery.where((eb) => eb(eb.ref(`${relationModelAlias}.${relationIds[0]}`), "in", eb.selectFrom(m2m.joinTable).select(`${m2m.joinTable}.${m2m.otherFkName}`).whereRef(`${parentAlias}.${parentIds[0]}`, "=", `${m2m.joinTable}.${m2m.parentFkName}`)));
+    } else {
+      const { keyPairs, ownedByModel } = getRelationForeignKeyFieldPairs(this.schema, model, relationField);
+      keyPairs.forEach(({ fk, pk }) => {
+        if (ownedByModel) {
+          selectModelQuery = selectModelQuery.whereRef(`${relationModelAlias}.${pk}`, "=", `${parentAlias}.${fk}`);
+        } else {
+          selectModelQuery = selectModelQuery.whereRef(`${relationModelAlias}.${fk}`, "=", `${parentAlias}.${pk}`);
+        }
+      });
+    }
+    return selectModelQuery;
+  }
   buildSkipTake(query, skip, take) {
     if (take !== void 0) {
       query = query.limit(take);
@@ -5673,7 +5712,7 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
   schema;
   modelToTableMap = /* @__PURE__ */ new Map();
   fieldToColumnMap = /* @__PURE__ */ new Map();
-  modelScopes = [];
+  scopes = [];
   constructor(schema) {
     super(), this.schema = schema;
     for (const [modelName, modelDef] of Object.entries(schema.models)) {
@@ -5694,12 +5733,23 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
     if (!node.from?.froms) {
       return super.transformSelectQuery(node);
     }
-    const scopes = this.createScopesFromFroms(node.from, true);
+    const processedFroms = node.from.froms.map((from) => this.processSelectTable(from));
+    const processedJoins = (node.joins ?? []).map((join) => this.processSelectTable(join.table));
+    const scopes = [
+      ...processedFroms.map(({ scope }) => scope),
+      ...processedJoins.map(({ scope }) => scope)
+    ];
     return this.withScopes(scopes, () => {
+      const joins = node.joins ? node.joins.map((join, i) => ({
+        ...join,
+        table: processedJoins[i].node,
+        on: this.transformNode(join.on)
+      })) : void 0;
       return {
         ...super.transformSelectQuery(node),
-        // convert "from" to nested query as needed
-        from: this.processFrom(node.from)
+        from: FromNode3.create(processedFroms.map((f) => f.node)),
+        joins,
+        selections: this.processSelectQuerySelections(node)
       };
     });
   }
@@ -5722,27 +5772,13 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
       selections: this.processSelections(node.selections)
     };
   }
-  transformJoin(node) {
-    const { alias, node: innerNode } = stripAlias(node.table);
-    if (TableNode4.is(innerNode)) {
-      const modelName = innerNode.table.identifier.name;
-      if (this.hasMappedColumns(modelName)) {
-        const select = this.createSelectAll(modelName);
-        return {
-          ...super.transformJoin(node),
-          table: this.wrapAlias(select, alias ?? modelName)
-        };
-      }
-    }
-    return super.transformJoin(node);
-  }
   transformReference(node) {
     if (!ColumnNode3.is(node.column)) {
       return super.transformReference(node);
     }
-    const { fieldDef, modelDef, scope } = this.resolveFieldFromScopes(node.column.column.name, node.table?.table.identifier.name);
-    if (fieldDef && !scope.namesMapped) {
-      const mappedFieldName = this.mapFieldName(modelDef.name, fieldDef.name);
+    const scope = this.resolveFieldFromScopes(node.column.column.name, node.table?.table.identifier.name);
+    if (scope && !scope.namesMapped && scope.model) {
+      const mappedFieldName = this.mapFieldName(scope.model, node.column.column.name);
       let mappedTableName = node.table?.table.identifier.name;
       if (mappedTableName) {
         if (scope.alias === mappedTableName) {
@@ -5756,11 +5792,11 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
     }
   }
   transformColumn(node) {
-    const { modelDef, fieldDef, scope } = this.resolveFieldFromScopes(node.column.name);
-    if (!fieldDef || scope.namesMapped) {
+    const scope = this.resolveFieldFromScopes(node.column.name);
+    if (!scope || scope.namesMapped || !scope.model) {
       return super.transformColumn(node);
     }
-    const mappedName = this.mapFieldName(modelDef.name, fieldDef.name);
+    const mappedName = this.mapFieldName(scope.model, node.column.name);
     return ColumnNode3.create(mappedName);
   }
   transformUpdateQuery(node) {
@@ -5783,7 +5819,14 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
     });
   }
   transformDeleteQuery(node) {
-    const scopes = this.createScopesFromFroms(node.from, false);
+    const scopes = node.from.froms.map((node2) => {
+      const { alias, node: innerNode } = stripAlias(node2);
+      return {
+        model: this.extractModelName(innerNode),
+        alias,
+        namesMapped: false
+      };
+    });
     const froms = node.from.froms.map((from) => {
       const { alias, node: innerNode } = stripAlias(from);
       if (TableNode4.is(innerNode)) {
@@ -5801,46 +5844,75 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
   }
   // #endregion
   // #region utils
+  processSelectQuerySelections(node) {
+    const selections = [];
+    for (const selection of node.selections ?? []) {
+      if (SelectAllNode.is(selection.selection)) {
+        const scope = this.scopes[this.scopes.length - 1];
+        if (scope?.model && !scope.namesMapped) {
+          selections.push(...this.createSelectAllFields(scope.model, scope.alias));
+        } else {
+          selections.push(super.transformSelection(selection));
+        }
+      } else if (ReferenceNode3.is(selection.selection) || ColumnNode3.is(selection.selection)) {
+        const transformed = this.transformNode(selection.selection);
+        if (AliasNode5.is(transformed)) {
+          selections.push(SelectionNode3.create(transformed));
+        } else {
+          const origFieldName = this.extractFieldName(selection.selection);
+          const fieldName = this.extractFieldName(transformed);
+          if (fieldName !== origFieldName) {
+            selections.push(SelectionNode3.create(this.wrapAlias(transformed, origFieldName)));
+          } else {
+            selections.push(SelectionNode3.create(transformed));
+          }
+        }
+      } else {
+        selections.push(super.transformSelection(selection));
+      }
+    }
+    return selections;
+  }
   resolveFieldFromScopes(name, qualifier) {
-    for (const scope of this.modelScopes.toReversed()) {
+    for (let i = this.scopes.length - 1; i >= 0; i--) {
+      const scope = this.scopes[i];
       if (qualifier) {
         if (scope.alias) {
-          if (qualifier !== scope.alias) {
+          if (scope.alias === qualifier) {
+            return scope;
+          } else {
             continue;
           }
-        } else {
-          if (qualifier !== scope.model) {
+        } else if (scope.model) {
+          if (scope.model === qualifier) {
+            return scope;
+          } else {
             continue;
           }
         }
-      }
-      const modelDef = getModel(this.schema, scope.model);
-      if (!modelDef) {
-        continue;
-      }
-      if (modelDef.fields[name]) {
-        return {
-          modelDef,
-          fieldDef: modelDef.fields[name],
-          scope
-        };
+      } else {
+        if (scope.model) {
+          const modelDef = getModel(this.schema, scope.model);
+          if (!modelDef) {
+            continue;
+          }
+          if (modelDef.fields[name]) {
+            return scope;
+          }
+        }
       }
     }
-    return {
-      modelDef: void 0,
-      fieldDef: void 0,
-      scope: void 0
-    };
+    return void 0;
   }
   pushScope(scope) {
-    this.modelScopes.push(scope);
+    this.scopes.push(scope);
   }
   withScope(scope, fn) {
     this.pushScope(scope);
     try {
       return fn();
     } finally {
-      this.modelScopes.pop();
+      this.scopes.pop();
     }
   }
   withScopes(scopes, fn) {
@@ -5848,18 +5920,12 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
     try {
       return fn();
     } finally {
-      scopes.forEach(() => this.modelScopes.pop());
+      scopes.forEach(() => this.scopes.pop());
     }
   }
   wrapAlias(node, alias) {
     return alias ? AliasNode5.create(node, IdentifierNode4.create(alias)) : node;
   }
-  ensureAlias(node, alias, fallbackName) {
-    if (!node) {
-      return node;
-    }
-    return alias ? AliasNode5.create(node, IdentifierNode4.create(alias)) : AliasNode5.create(node, IdentifierNode4.create(fallbackName));
-  }
   processTableRef(node) {
     if (!node) {
       return node;
@@ -5900,62 +5966,44 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
       ...this.fieldToColumnMap.keys()
     ].some((key) => key.startsWith(modelName + "."));
   }
-  createScopesFromFroms(node, namesMapped) {
-    if (!node) {
-      return [];
-    }
-    return node.froms.map((from) => {
-      const { alias, node: innerNode } = stripAlias(from);
-      if (innerNode && TableNode4.is(innerNode)) {
-        return {
-          model: innerNode.table.identifier.name,
-          alias,
-          namesMapped
-        };
-      } else {
-        return void 0;
-      }
-    }).filter((s) => !!s);
-  }
   // convert a "from" node to a nested query if there are columns with name mapping
-  processFrom(node) {
-    return {
-      ...super.transformFrom(node),
-      froms: node.froms.map((from) => {
-        const { alias, node: innerNode } = stripAlias(from);
-        if (!innerNode) {
-          return super.transformNode(from);
-        }
-        if (TableNode4.is(innerNode)) {
-          if (this.hasMappedColumns(innerNode.table.identifier.name)) {
-            const selectAll = this.createSelectAll(innerNode.table.identifier.name);
-            return this.ensureAlias(selectAll, alias, innerNode.table.identifier.name);
-          }
+  processSelectTable(node) {
+    const { alias, node: innerNode } = stripAlias(node);
+    if (innerNode && TableNode4.is(innerNode)) {
+      const modelName = innerNode.table.identifier.name;
+      const mappedName = this.mapTableName(modelName);
+      const finalAlias = alias ?? (mappedName !== modelName ? modelName : void 0);
+      return {
+        node: this.wrapAlias(TableNode4.create(mappedName), finalAlias),
+        scope: {
+          alias: alias ?? modelName,
+          model: modelName,
+          namesMapped: !this.hasMappedColumns(modelName)
         }
-        return this.transformNode(from);
-      })
-    };
+      };
+    } else {
+      return {
+        node: super.transformNode(node),
+        scope: {
+          alias,
+          model: void 0,
+          namesMapped: true
+        }
+      };
+    }
   }
-  // create a `SelectQueryNode` for the given model with all columns mapped
-  createSelectAll(model) {
+  createSelectAllFields(model, alias) {
     const modelDef = requireModel(this.schema, model);
-    const tableName = this.mapTableName(model);
-    return {
-      kind: "SelectQueryNode",
-      from: FromNode3.create([
-        TableNode4.create(tableName)
-      ]),
-      selections: this.getModelFields(modelDef).map((fieldDef) => {
-        const columnName = this.mapFieldName(model, fieldDef.name);
-        const columnRef = ReferenceNode3.create(ColumnNode3.create(columnName), TableNode4.create(tableName));
-        if (columnName !== fieldDef.name) {
-          const aliased = AliasNode5.create(columnRef, IdentifierNode4.create(fieldDef.name));
-          return SelectionNode3.create(aliased);
-        } else {
-          return SelectionNode3.create(columnRef);
-        }
-      })
-    };
+    return this.getModelFields(modelDef).map((fieldDef) => {
+      const columnName = this.mapFieldName(model, fieldDef.name);
+      const columnRef = ReferenceNode3.create(ColumnNode3.create(columnName), alias ? TableNode4.create(alias) : void 0);
+      if (columnName !== fieldDef.name) {
+        const aliased = AliasNode5.create(columnRef, IdentifierNode4.create(fieldDef.name));
+        return SelectionNode3.create(aliased);
+      } else {
+        return SelectionNode3.create(columnRef);
+      }
+    });
   }
   getModelFields(modelDef) {
     return Object.values(modelDef.fields).filter((f) => !f.relation && !f.computed && !f.originModel);
@@ -5985,18 +6033,22 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
     return this.wrapAlias(result, alias);
   }
   processSelectAll(node) {
-    const scope = this.modelScopes[this.modelScopes.length - 1];
+    const scope = this.scopes[this.scopes.length - 1];
     invariant10(scope);
-    if (!this.hasMappedColumns(scope.model)) {
+    if (!scope.model || !this.hasMappedColumns(scope.model)) {
       return super.transformSelectAll(node);
     }
     const modelDef = requireModel(this.schema, scope.model);
     return this.getModelFields(modelDef).map((fieldDef) => {
-      const columnName = this.mapFieldName(scope.model, fieldDef.name);
+      const columnName = this.mapFieldName(modelDef.name, fieldDef.name);
       const columnRef = ReferenceNode3.create(ColumnNode3.create(columnName));
       return columnName !== fieldDef.name ? this.wrapAlias(columnRef, fieldDef.name) : columnRef;
     });
   }
+  extractModelName(node) {
+    const { node: innerNode } = stripAlias(node);
+    return TableNode4.is(innerNode) ? innerNode.table.identifier.name : void 0;
+  }
   extractFieldName(node) {
     if (ReferenceNode3.is(node) && ColumnNode3.is(node.column)) {
       return node.column.column.name;
@@ -6496,7 +6548,7 @@ var SchemaDbPusher = class {
     return toposort(graph).reverse().filter((m) => !!m);
   }
   createModelTable(kysely, modelDef) {
-    let table = kysely.schema.createTable(modelDef.name).ifNotExists();
+    let table = kysely.schema.createTable(this.getTableName(modelDef)).ifNotExists();
     for (const [fieldName, fieldDef] of Object.entries(modelDef.fields)) {
       if (fieldDef.originModel && !fieldDef.id) {
         continue;
@@ -6515,6 +6567,26 @@ var SchemaDbPusher = class {
     table = this.addUniqueConstraint(table, modelDef);
     return table;
   }
+  getTableName(modelDef) {
+    const mapAttr = modelDef.attributes?.find((a) => a.name === "@@map");
+    if (mapAttr && mapAttr.args?.[0]) {
+      const mappedName = ExpressionUtils.getLiteralValue(mapAttr.args[0].value);
+      if (mappedName) {
+        return mappedName;
+      }
+    }
+    return modelDef.name;
+  }
+  getColumnName(fieldDef) {
+    const mapAttr = fieldDef.attributes?.find((a) => a.name === "@map");
+    if (mapAttr && mapAttr.args?.[0]) {
+      const mappedName = ExpressionUtils.getLiteralValue(mapAttr.args[0].value);
+      if (mappedName) {
+        return mappedName;
+      }
+    }
+    return fieldDef.name;
+  }
   isComputedField(fieldDef) {
     return fieldDef.attributes?.some((a) => a.name === "@computed");
   }
@@ -6525,7 +6597,7 @@ var SchemaDbPusher = class {
       }
     }
     if (modelDef.idFields.length > 0) {
-      table = table.addPrimaryKeyConstraint(`pk_${modelDef.name}`, modelDef.idFields);
+      table = table.addPrimaryKeyConstraint(`pk_${modelDef.name}`, modelDef.idFields.map((f) => this.getColumnName(modelDef.fields[f])));
     }
     return table;
   }
@@ -6538,16 +6610,16 @@ var SchemaDbPusher = class {
           continue;
         }
         table = table.addUniqueConstraint(`unique_${modelDef.name}_${key}`, [
-          key
+          this.getColumnName(fieldDef)
         ]);
       } else {
-        table = table.addUniqueConstraint(`unique_${modelDef.name}_${key}`, Object.keys(value));
+        table = table.addUniqueConstraint(`unique_${modelDef.name}_${key}`, Object.keys(value).map((f) => this.getColumnName(modelDef.fields[f])));
       }
     }
     return table;
   }
   createModelField(table, fieldDef, modelDef) {
-    return table.addColumn(fieldDef.name, this.mapFieldType(fieldDef), (col) => {
+    return table.addColumn(this.getColumnName(fieldDef), this.mapFieldType(fieldDef), (col) => {
       if (fieldDef.id && modelDef.idFields.length === 1) {
         col = col.primaryKey();
       }
@@ -6603,7 +6675,9 @@ var SchemaDbPusher = class {
     if (!fieldDef.relation.fields || !fieldDef.relation.references) {
       return table;
     }
-    table = table.addForeignKeyConstraint(`fk_${model}_${fieldName}`, fieldDef.relation.fields, fieldDef.type, fieldDef.relation.references, (cb) => {
+    const modelDef = requireModel(this.schema, model);
+    const relationModelDef = requireModel(this.schema, fieldDef.type);
+    table = table.addForeignKeyConstraint(`fk_${model}_${fieldName}`, fieldDef.relation.fields.map((f) => this.getColumnName(modelDef.fields[f])), this.getTableName(relationModelDef), fieldDef.relation.references.map((f) => this.getColumnName(relationModelDef.fields[f])), (cb) => {
       if (fieldDef.relation?.onDelete) {
         cb = cb.onDelete(this.mapCascadeAction(fieldDef.relation.onDelete));
       }