@zenstackhq/runtime 3.0.0-beta.10 → 3.0.0-beta.12

package/dist/index.js

@@ -16,7 +16,6 @@ import { match as match7 } from "ts-pattern";
 var query_utils_exports = {};
 __export(query_utils_exports, {
   aggregate: () => aggregate,
-  buildFieldRef: () => buildFieldRef,
   buildJoinPairs: () => buildJoinPairs,
   ensureArray: () => ensureArray,
   extractFieldName: () => extractFieldName,
@@ -362,28 +361,6 @@ function getIdValues(schema, model, data) {
   }), {});
 }
 __name(getIdValues, "getIdValues");
-function buildFieldRef(schema, model, field, options, eb, modelAlias, inlineComputedField = true) {
-  const fieldDef = requireField(schema, model, field);
-  if (!fieldDef.computed) {
-    return eb.ref(modelAlias ? `${modelAlias}.${field}` : field);
-  } else {
-    if (!inlineComputedField) {
-      return eb.ref(modelAlias ? `${modelAlias}.${field}` : field);
-    }
-    let computer;
-    if ("computedFields" in options) {
-      const computedFields = options.computedFields;
-      computer = computedFields?.[model]?.[field];
-    }
-    if (!computer) {
-      throw new QueryError(`Computed field "${field}" implementation not provided for model "${model}"`);
-    }
-    return computer(eb, {
-      modelAlias
-    });
-  }
-}
-__name(buildFieldRef, "buildFieldRef");
 function fieldHasDefaultValue(fieldDef) {
   return fieldDef.default !== void 0 || fieldDef.updatedAt;
 }
@@ -735,7 +712,7 @@ var BaseCrudDialect = class {
       take = -take;
     }
     result = this.buildSkipTake(result, skip, take);
-    result = this.buildOrderBy(result, model, modelAlias, args.orderBy, skip !== void 0 || take !== void 0, negateOrderBy);
+    result = this.buildOrderBy(result, model, modelAlias, args.orderBy, negateOrderBy);
     if ("distinct" in args && args.distinct) {
       const distinct = ensureArray(args.distinct);
       if (this.supportsDistinctOn) {
@@ -1094,16 +1071,12 @@ var BaseCrudDialect = class {
     ]);
     return this.and(...conditions.conditions);
   }
-  buildOrderBy(query, model, modelAlias, orderBy, useDefaultIfEmpty, negated) {
+  buildOrderBy(query, model, modelAlias, orderBy, negated) {
     if (!orderBy) {
-      if (useDefaultIfEmpty) {
-        orderBy = makeDefaultOrderBy(this.schema, model);
-      } else {
-        return query;
-      }
+      return query;
     }
     let result = query;
-    const buildFieldRef2 = /* @__PURE__ */ __name((model2, field, modelAlias2) => {
+    const buildFieldRef = /* @__PURE__ */ __name((model2, field, modelAlias2) => {
       const fieldDef = requireField(this.schema, model2, field);
       return fieldDef.originModel ? this.fieldRef(fieldDef.originModel, field, fieldDef.originModel) : this.fieldRef(model2, field, modelAlias2);
     }, "buildFieldRef");
@@ -1122,7 +1095,7 @@ var BaseCrudDialect = class {
           invariant2(value && typeof value === "object", `invalid orderBy value for field "${field}"`);
           for (const [k, v] of Object.entries(value)) {
             invariant2(v === "asc" || v === "desc", `invalid orderBy value for field "${field}"`);
-            result = result.orderBy((eb) => aggregate(eb, buildFieldRef2(model, k, modelAlias), field), sql.raw(this.negateSort(v, negated)));
+            result = result.orderBy((eb) => aggregate(eb, buildFieldRef(model, k, modelAlias), field), sql.raw(this.negateSort(v, negated)));
           }
           continue;
         }
@@ -1131,7 +1104,7 @@ var BaseCrudDialect = class {
             invariant2(value && typeof value === "object", 'invalid orderBy value for field "_count"');
             for (const [k, v] of Object.entries(value)) {
               invariant2(v === "asc" || v === "desc", `invalid orderBy value for field "${field}"`);
-              result = result.orderBy((eb) => eb.fn.count(buildFieldRef2(model, k, modelAlias)), sql.raw(this.negateSort(v, negated)));
+              result = result.orderBy((eb) => eb.fn.count(buildFieldRef(model, k, modelAlias)), sql.raw(this.negateSort(v, negated)));
             }
             continue;
           }
@@ -1140,7 +1113,7 @@ var BaseCrudDialect = class {
         }
         const fieldDef = requireField(this.schema, model, field);
         if (!fieldDef.relation) {
-          const fieldRef = buildFieldRef2(model, field, modelAlias);
+          const fieldRef = buildFieldRef(model, field, modelAlias);
           if (value === "asc" || value === "desc") {
             result = result.orderBy(fieldRef, this.negateSort(value, negated));
           } else if (value && typeof value === "object" && "nulls" in value && "sort" in value && (value.sort === "asc" || value.sort === "desc") && (value.nulls === "first" || value.nulls === "last")) {
@@ -1169,7 +1142,7 @@ var BaseCrudDialect = class {
               const joinPairs = buildJoinPairs(this.schema, model, modelAlias, field, relationModel);
               return join.on((eb) => this.and(...joinPairs.map(([left, right]) => eb(this.eb.ref(left), "=", this.eb.ref(right)))));
             });
-            result = this.buildOrderBy(result, fieldDef.type, relationModel, value, false, negated);
+            result = this.buildOrderBy(result, fieldDef.type, relationModel, value, negated);
           }
         }
       }
@@ -1216,13 +1189,9 @@ var BaseCrudDialect = class {
   }
   buildSelectField(query, model, modelAlias, field) {
     const fieldDef = requireField(this.schema, model, field);
-    if (fieldDef.computed) {
-      return query.select(() => this.fieldRef(model, field, modelAlias).as(field));
-    } else if (!fieldDef.originModel) {
-      return query.select(this.eb.ref(`${modelAlias}.${field}`).as(field));
-    } else {
-      return this.buildSelectField(query, fieldDef.originModel, fieldDef.originModel, field);
-    }
+    const fieldModel = fieldDef.originModel ?? model;
+    const alias = fieldDef.originModel ?? modelAlias;
+    return query.select(() => this.fieldRef(fieldModel, field, alias).as(field));
   }
   buildDelegateJoin(thisModel, thisModelAlias, otherModelAlias, query) {
     const idFields = requireIdFields(this.schema, thisModel);
@@ -1311,7 +1280,25 @@ var BaseCrudDialect = class {
     return this.eb.not(this.and(...args));
   }
   fieldRef(model, field, modelAlias, inlineComputedField = true) {
-    return buildFieldRef(this.schema, model, field, this.options, this.eb, modelAlias, inlineComputedField);
+    const fieldDef = requireField(this.schema, model, field);
+    if (!fieldDef.computed) {
+      return this.eb.ref(modelAlias ? `${modelAlias}.${field}` : field);
+    } else {
+      if (!inlineComputedField) {
+        return this.eb.ref(modelAlias ? `${modelAlias}.${field}` : field);
+      }
+      let computer;
+      if ("computedFields" in this.options) {
+        const computedFields = this.options.computedFields;
+        computer = computedFields?.[fieldDef.originModel ?? model]?.[field];
+      }
+      if (!computer) {
+        throw new QueryError(`Computed field "${field}" implementation not provided for model "${model}"`);
+      }
+      return computer(this.eb, {
+        modelAlias
+      });
+    }
   }
   canJoinWithoutNestedSelect(modelDef, payload) {
     if (modelDef.computedFields) {
@@ -1904,7 +1891,7 @@ var BaseOperationHandler = class {
   buildCountSelection(query, model, parentAlias, payload) {
     return query.select((eb) => this.dialect.buildCountJson(model, eb, parentAlias, payload).as("_count"));
   }
-  async create(kysely, model, data, fromRelation, creatingForDelegate = false) {
+  async create(kysely, model, data, fromRelation, creatingForDelegate = false, returnFields) {
     const modelDef = this.requireModel(model);
     if (modelDef.isDelegate && !creatingForDelegate) {
       throw new QueryError(`Model "${this.model}" is a delegate and cannot be created directly.`);
@@ -1957,8 +1944,8 @@ var BaseOperationHandler = class {
       createFields = baseCreateResult.remainingFields;
     }
     const updatedData = this.fillGeneratedAndDefaultValues(modelDef, createFields);
-    const idFields = requireIdFields(this.schema, model);
-    const query = kysely.insertInto(model).$if(Object.keys(updatedData).length === 0, (qb) => qb.defaultValues()).$if(Object.keys(updatedData).length > 0, (qb) => qb.values(updatedData)).returning(idFields).modifyEnd(this.makeContextComment({
+    returnFields = returnFields ?? requireIdFields(this.schema, model);
+    const query = kysely.insertInto(model).$if(Object.keys(updatedData).length === 0, (qb) => qb.defaultValues()).$if(Object.keys(updatedData).length > 0, (qb) => qb.values(updatedData)).returning(returnFields).modifyEnd(this.makeContextComment({
       model,
       operation: "create"
     }));
@@ -2163,7 +2150,7 @@ var BaseOperationHandler = class {
       }
     }
   }
-  async createMany(kysely, model, input, returnData, fromRelation) {
+  async createMany(kysely, model, input, returnData, fromRelation, fieldsToReturn) {
     if (!input.data || Array.isArray(input.data) && input.data.length === 0) {
       return returnData ? [] : {
         count: 0
@@ -2232,8 +2219,8 @@ var BaseOperationHandler = class {
         count: Number(result.numAffectedRows)
       };
     } else {
-      const idFields = requireIdFields(this.schema, model);
-      const result = await query.returning(idFields).execute();
+      fieldsToReturn = fieldsToReturn ?? requireIdFields(this.schema, model);
+      const result = await query.returning(fieldsToReturn).execute();
       return result;
     }
   }
@@ -2313,7 +2300,7 @@ var BaseOperationHandler = class {
       return void 0;
     }
   }
-  async update(kysely, model, where, data, fromRelation, allowRelationUpdate = true, throwIfNotFound = true) {
+  async update(kysely, model, where, data, fromRelation, allowRelationUpdate = true, throwIfNotFound = true, fieldsToReturn) {
     if (!data || typeof data !== "object") {
       throw new InternalError("data must be an object");
     }
@@ -2419,8 +2406,8 @@ var BaseOperationHandler = class {
     if (!hasFieldUpdate) {
       return combinedWhere;
     } else {
-      const idFields = requireIdFields(this.schema, model);
-      const query = kysely.updateTable(model).where(() => this.dialect.buildFilter(model, model, combinedWhere)).set(updateFields).returning(idFields).modifyEnd(this.makeContextComment({
+      fieldsToReturn = fieldsToReturn ?? requireIdFields(this.schema, model);
+      const query = kysely.updateTable(model).where(() => this.dialect.buildFilter(model, model, combinedWhere)).set(updateFields).returning(fieldsToReturn).modifyEnd(this.makeContextComment({
         model,
         operation: "update"
       }));
@@ -2512,7 +2499,7 @@ var BaseOperationHandler = class {
   makeContextComment(_context) {
     return sql4``;
   }
-  async updateMany(kysely, model, where, data, limit, returnData, filterModel) {
+  async updateMany(kysely, model, where, data, limit, returnData, filterModel, fieldsToReturn) {
     if (typeof data !== "object") {
       throw new InternalError("data must be an object");
     }
@@ -2569,8 +2556,8 @@ var BaseOperationHandler = class {
         count: Number(result.numAffectedRows)
       };
     } else {
-      const idFields = requireIdFields(this.schema, model);
-      const finalQuery = query.returning(idFields);
+      fieldsToReturn = fieldsToReturn ?? requireIdFields(this.schema, model);
+      const finalQuery = query.returning(fieldsToReturn);
       const result = await this.executeQuery(kysely, finalQuery, "update");
       return result.rows;
     }
@@ -2974,7 +2961,7 @@ var BaseOperationHandler = class {
         });
       }
     }
-    if (throwForNotFound && expectedDeleteCount > deleteResult.count) {
+    if (throwForNotFound && expectedDeleteCount > deleteResult.rows.length) {
       throw new NotFoundError(deleteFromModel);
     }
   }
@@ -2982,7 +2969,7 @@ var BaseOperationHandler = class {
     return enumerate(data).map((item) => flattenCompoundUniqueFilters(this.schema, model, item));
   }
   // #endregion
-  async delete(kysely, model, where, limit, filterModel) {
+  async delete(kysely, model, where, limit, filterModel, fieldsToReturn) {
     filterModel ??= model;
     const modelDef = this.requireModel(model);
     if (modelDef.baseModel) {
@@ -2991,7 +2978,8 @@ var BaseOperationHandler = class {
       }
       return this.processBaseModelDelete(kysely, modelDef.baseModel, where, limit, filterModel);
     }
-    let query = kysely.deleteFrom(model);
+    fieldsToReturn = fieldsToReturn ?? requireIdFields(this.schema, model);
+    let query = kysely.deleteFrom(model).returning(fieldsToReturn);
     let needIdFilter = false;
     if (limit !== void 0 && !this.dialect.supportsDeleteWithLimit) {
       needIdFilter = true;
@@ -3011,10 +2999,7 @@ var BaseOperationHandler = class {
       model,
       operation: "delete"
     }));
-    const result = await this.executeQuery(kysely, query, "delete");
-    return {
-      count: Number(result.numAffectedRows)
-    };
+    return this.executeQuery(kysely, query, "delete");
   }
   async processDelegateRelationDelete(kysely, modelDef, where, limit) {
     for (const fieldDef of Object.values(modelDef.fields)) {
@@ -3068,7 +3053,7 @@ var BaseOperationHandler = class {
       return callback(this.kysely);
     } else {
       let txBuilder = this.kysely.transaction();
-      txBuilder = txBuilder.setIsolationLevel(isolationLevel ?? TransactionIsolationLevel.RepeatableRead);
+      txBuilder = txBuilder.setIsolationLevel(isolationLevel ?? TransactionIsolationLevel.ReadCommitted);
       return txBuilder.execute(callback);
     }
   }
@@ -3120,6 +3105,48 @@ var BaseOperationHandler = class {
     }
     return result.rows[0];
   }
+  mutationNeedsReadBack(model, args) {
+    if (this.hasPolicyEnabled) {
+      return {
+        needReadBack: true,
+        selectedFields: void 0
+      };
+    }
+    if (args.include && typeof args.include === "object" && Object.keys(args.include).length > 0) {
+      return {
+        needReadBack: true,
+        selectedFields: void 0
+      };
+    }
+    const modelDef = this.requireModel(model);
+    if (modelDef.baseModel || modelDef.isDelegate) {
+      return {
+        needReadBack: true,
+        selectedFields: void 0
+      };
+    }
+    const allFields = Object.keys(modelDef.fields);
+    const relationFields = Object.values(modelDef.fields).filter((f) => f.relation).map((f) => f.name);
+    const computedFields = Object.values(modelDef.fields).filter((f) => f.computed).map((f) => f.name);
+    const omit = Object.entries(args.omit ?? {}).filter(([, v]) => v).map(([k]) => k);
+    const allFieldsSelected = [];
+    if (!args.select || typeof args.select !== "object") {
+      allFieldsSelected.push(...allFields.filter((f) => !relationFields.includes(f) && !omit.includes(f)));
+    } else {
+      allFieldsSelected.push(...Object.entries(args.select).filter(([k, v]) => v && !omit.includes(k)).map(([k]) => k));
+    }
+    if (allFieldsSelected.some((f) => relationFields.includes(f) || computedFields.includes(f))) {
+      return {
+        needReadBack: true,
+        selectedFields: void 0
+      };
+    } else {
+      return {
+        needReadBack: false,
+        selectedFields: allFieldsSelected
+      };
+    }
+  }
 };
 
 // src/client/crud/operations/aggregate.ts
@@ -3155,7 +3182,7 @@ var AggregateOperationHandler = class extends BaseOperationHandler {
         take = -take;
       }
       subQuery = this.dialect.buildSkipTake(subQuery, skip, take);
-      subQuery = this.dialect.buildOrderBy(subQuery, this.model, this.model, parsedArgs.orderBy, skip !== void 0 || take !== void 0, negateOrderBy);
+      subQuery = this.dialect.buildOrderBy(subQuery, this.model, this.model, parsedArgs.orderBy, negateOrderBy);
       return subQuery.as("$sub");
     });
     for (const [key, value] of Object.entries(parsedArgs)) {
@@ -3280,14 +3307,19 @@ var CreateOperationHandler = class extends BaseOperationHandler {
     }).exhaustive();
   }
   async runCreate(args) {
+    const { needReadBack, selectedFields } = this.mutationNeedsReadBack(this.model, args);
     const result = await this.safeTransaction(async (tx) => {
-      const createResult = await this.create(tx, this.model, args.data);
-      return this.readUnique(tx, this.model, {
-        select: args.select,
-        include: args.include,
-        omit: args.omit,
-        where: getIdValues(this.schema, this.model, createResult)
-      });
+      const createResult = await this.create(tx, this.model, args.data, void 0, false, selectedFields);
+      if (needReadBack) {
+        return this.readUnique(tx, this.model, {
+          select: args.select,
+          include: args.include,
+          omit: args.omit,
+          where: getIdValues(this.schema, this.model, createResult)
+        });
+      } else {
+        return createResult;
+      }
     });
     if (!result && this.hasPolicyEnabled) {
       throw new RejectedByPolicyError(this.model, RejectedByPolicyReason.CANNOT_READ_BACK, `result is not allowed to be read back`);
@@ -3306,15 +3338,20 @@ var CreateOperationHandler = class extends BaseOperationHandler {
     if (args === void 0) {
       return [];
     }
+    const { needReadBack, selectedFields } = this.mutationNeedsReadBack(this.model, args);
     return this.safeTransaction(async (tx) => {
-      const createResult = await this.createMany(tx, this.model, args, true);
-      return this.read(tx, this.model, {
-        select: args.select,
-        omit: args.omit,
-        where: {
-          OR: createResult.map((item) => getIdValues(this.schema, this.model, item))
-        }
-      });
+      const createResult = await this.createMany(tx, this.model, args, true, void 0, selectedFields);
+      if (needReadBack) {
+        return this.read(tx, this.model, {
+          select: args.select,
+          omit: args.omit,
+          where: {
+            OR: createResult.map((item) => getIdValues(this.schema, this.model, item))
+          }
+        });
+      } else {
+        return createResult;
+      }
     });
   }
 };
@@ -3330,27 +3367,34 @@ var DeleteOperationHandler = class extends BaseOperationHandler {
     return match9(operation).with("delete", () => this.runDelete(this.inputValidator.validateDeleteArgs(this.model, normalizedArgs))).with("deleteMany", () => this.runDeleteMany(this.inputValidator.validateDeleteManyArgs(this.model, normalizedArgs))).exhaustive();
   }
   async runDelete(args) {
-    const existing = await this.readUnique(this.kysely, this.model, {
-      select: args.select,
-      include: args.include,
-      omit: args.omit,
-      where: args.where
-    });
-    await this.safeTransaction(async (tx) => {
-      const result = await this.delete(tx, this.model, args.where);
-      if (result.count === 0) {
+    const { needReadBack, selectedFields } = this.mutationNeedsReadBack(this.model, args);
+    const result = await this.safeTransaction(async (tx) => {
+      let preDeleteRead = void 0;
+      if (needReadBack) {
+        preDeleteRead = await this.readUnique(tx, this.model, {
+          select: args.select,
+          include: args.include,
+          omit: args.omit,
+          where: args.where
+        });
+      }
+      const deleteResult = await this.delete(tx, this.model, args.where, void 0, void 0, selectedFields);
+      if (deleteResult.rows.length === 0) {
         throw new NotFoundError(this.model);
       }
+      return needReadBack ? preDeleteRead : deleteResult.rows[0];
     });
-    if (!existing && this.hasPolicyEnabled) {
+    if (!result && this.hasPolicyEnabled) {
       throw new RejectedByPolicyError(this.model, RejectedByPolicyReason.CANNOT_READ_BACK, "result is not allowed to be read back");
     }
-    return existing;
+    return result;
   }
   async runDeleteMany(args) {
     return await this.safeTransaction(async (tx) => {
       const result = await this.delete(tx, this.model, args?.where, args?.limit);
-      return result;
+      return {
+        count: result.rows.length
+      };
     });
   }
 };
@@ -3386,29 +3430,23 @@ var GroupByOperationHandler = class extends BaseOperationHandler {
   async handle(_operation, args) {
     const normalizedArgs = this.normalizeArgs(args);
     const parsedArgs = this.inputValidator.validateGroupByArgs(this.model, normalizedArgs);
-    let query = this.kysely.selectFrom((eb) => {
-      let subQuery = eb.selectFrom(this.model).selectAll().where(() => this.dialect.buildFilter(this.model, this.model, parsedArgs?.where));
-      const skip = parsedArgs?.skip;
-      let take = parsedArgs?.take;
-      let negateOrderBy = false;
-      if (take !== void 0 && take < 0) {
-        negateOrderBy = true;
-        take = -take;
-      }
-      subQuery = this.dialect.buildSkipTake(subQuery, skip, take);
-      subQuery = this.dialect.buildOrderBy(subQuery, this.model, this.model, void 0, skip !== void 0 || take !== void 0, negateOrderBy);
-      return subQuery.as("$sub");
-    });
-    const fieldRef = /* @__PURE__ */ __name((field) => this.dialect.fieldRef(this.model, field, "$sub"), "fieldRef");
+    let query = this.kysely.selectFrom(this.model).where(() => this.dialect.buildFilter(this.model, this.model, parsedArgs?.where));
+    const fieldRef = /* @__PURE__ */ __name((field) => this.dialect.fieldRef(this.model, field), "fieldRef");
     const bys = typeof parsedArgs.by === "string" ? [
       parsedArgs.by
     ] : parsedArgs.by;
     query = query.groupBy(bys.map((by) => fieldRef(by)));
-    if (parsedArgs.orderBy) {
-      query = this.dialect.buildOrderBy(query, this.model, "$sub", parsedArgs.orderBy, false, false);
+    const skip = parsedArgs?.skip;
+    let take = parsedArgs?.take;
+    let negateOrderBy = false;
+    if (take !== void 0 && take < 0) {
+      negateOrderBy = true;
+      take = -take;
     }
+    query = this.dialect.buildSkipTake(query, skip, take);
+    query = this.dialect.buildOrderBy(query, this.model, this.model, parsedArgs.orderBy, negateOrderBy);
     if (parsedArgs.having) {
-      query = query.having(() => this.dialect.buildFilter(this.model, "$sub", parsedArgs.having));
+      query = query.having(() => this.dialect.buildFilter(this.model, this.model, parsedArgs.having));
     }
     for (const by of bys) {
       query = query.select(() => fieldRef(by).as(by));
@@ -3497,29 +3535,31 @@ var UpdateOperationHandler = class extends BaseOperationHandler {
     return match11(operation).with("update", () => this.runUpdate(this.inputValidator.validateUpdateArgs(this.model, normalizedArgs))).with("updateMany", () => this.runUpdateMany(this.inputValidator.validateUpdateManyArgs(this.model, normalizedArgs))).with("updateManyAndReturn", () => this.runUpdateManyAndReturn(this.inputValidator.validateUpdateManyAndReturnArgs(this.model, normalizedArgs))).with("upsert", () => this.runUpsert(this.inputValidator.validateUpsertArgs(this.model, normalizedArgs))).exhaustive();
   }
   async runUpdate(args) {
-    const readBackResult = await this.safeTransaction(async (tx) => {
-      const updateResult = await this.update(tx, this.model, args.where, args.data);
-      const readFilter = updateResult ?? args.where;
-      let readBackResult2 = void 0;
-      try {
-        readBackResult2 = await this.readUnique(tx, this.model, {
+    const { needReadBack, selectedFields } = this.needReadBack(args);
+    const result = await this.safeTransaction(async (tx) => {
+      const updateResult = await this.update(tx, this.model, args.where, args.data, void 0, void 0, void 0, selectedFields);
+      if (needReadBack) {
+        const readFilter = updateResult ?? args.where;
+        let readBackResult = void 0;
+        readBackResult = await this.readUnique(tx, this.model, {
           select: args.select,
           include: args.include,
           omit: args.omit,
           where: readFilter
         });
-      } catch {
+        return readBackResult;
+      } else {
+        return updateResult;
       }
-      return readBackResult2;
     });
-    if (!readBackResult) {
+    if (!result) {
       if (this.hasPolicyEnabled) {
         throw new RejectedByPolicyError(this.model, RejectedByPolicyReason.CANNOT_READ_BACK, "result is not allowed to be read back");
       } else {
         return null;
       }
     } else {
-      return readBackResult;
+      return result;
     }
   }
   async runUpdateMany(args) {
@@ -3531,19 +3571,27 @@ var UpdateOperationHandler = class extends BaseOperationHandler {
     if (!args) {
       return [];
     }
+    const { needReadBack, selectedFields } = this.needReadBack(args);
     const { readBackResult, updateResult } = await this.safeTransaction(async (tx) => {
-      const updateResult2 = await this.updateMany(tx, this.model, args.where, args.data, args.limit, true);
-      const readBackResult2 = await this.read(tx, this.model, {
-        select: args.select,
-        omit: args.omit,
-        where: {
-          OR: updateResult2.map((item) => getIdValues(this.schema, this.model, item))
-        }
-      });
-      return {
-        readBackResult: readBackResult2,
-        updateResult: updateResult2
-      };
+      const updateResult2 = await this.updateMany(tx, this.model, args.where, args.data, args.limit, true, void 0, selectedFields);
+      if (needReadBack) {
+        const readBackResult2 = await this.read(tx, this.model, {
+          select: args.select,
+          omit: args.omit,
+          where: {
+            OR: updateResult2.map((item) => getIdValues(this.schema, this.model, item))
+          }
+        });
+        return {
+          readBackResult: readBackResult2,
+          updateResult: updateResult2
+        };
+      } else {
+        return {
+          readBackResult: updateResult2,
+          updateResult: updateResult2
+        };
+      }
     });
     if (readBackResult.length < updateResult.length && this.hasPolicyEnabled) {
       throw new RejectedByPolicyError(this.model, RejectedByPolicyReason.CANNOT_READ_BACK, "result is not allowed to be read back");
@@ -3551,23 +3599,49 @@ var UpdateOperationHandler = class extends BaseOperationHandler {
     return readBackResult;
   }
   async runUpsert(args) {
+    const { needReadBack, selectedFields } = this.needReadBack(args);
     const result = await this.safeTransaction(async (tx) => {
-      let mutationResult = await this.update(tx, this.model, args.where, args.update, void 0, true, false);
+      let mutationResult = await this.update(tx, this.model, args.where, args.update, void 0, true, false, selectedFields);
       if (!mutationResult) {
-        mutationResult = await this.create(tx, this.model, args.create);
+        mutationResult = await this.create(tx, this.model, args.create, void 0, void 0, selectedFields);
+      }
+      if (needReadBack) {
+        return this.readUnique(tx, this.model, {
+          select: args.select,
+          include: args.include,
+          omit: args.omit,
+          where: getIdValues(this.schema, this.model, mutationResult)
+        });
+      } else {
+        return mutationResult;
       }
-      return this.readUnique(tx, this.model, {
-        select: args.select,
-        include: args.include,
-        omit: args.omit,
-        where: getIdValues(this.schema, this.model, mutationResult)
-      });
     });
     if (!result && this.hasPolicyEnabled) {
       throw new RejectedByPolicyError(this.model, RejectedByPolicyReason.CANNOT_READ_BACK, "result is not allowed to be read back");
     }
     return result;
   }
+  needReadBack(args) {
+    const baseResult = this.mutationNeedsReadBack(this.model, args);
+    if (baseResult.needReadBack) {
+      return baseResult;
+    }
+    const modelDef = this.requireModel(this.model);
+    const nonRelationFields = Object.entries(modelDef.fields).filter(([_, def]) => !def.relation).map(([name, _]) => name);
+    if (args.data && !Object.keys(args.data).some((field) => nonRelationFields.includes(field))) {
+      return {
+        needReadBack: true,
+        selectedFields: void 0
+      };
+    }
+    if (args.update && !Object.keys(args.update).some((field) => nonRelationFields.includes(field))) {
+      return {
+        needReadBack: true,
+        selectedFields: void 0
+      };
+    }
+    return baseResult;
+  }
 };
 
 // src/client/crud/validator/index.ts
@@ -3932,12 +4006,12 @@ function evalCall(data, expr) {
 __name(evalCall, "evalCall");
 
 // src/client/crud/validator/index.ts
+var schemaCache = /* @__PURE__ */ new WeakMap();
 var InputValidator = class {
   static {
     __name(this, "InputValidator");
   }
   client;
-  schemaCache = /* @__PURE__ */ new Map();
   constructor(client) {
     this.client = client;
   }
@@ -3986,16 +4060,34 @@ var InputValidator = class {
   validateGroupByArgs(model, args) {
     return this.validate(model, "groupBy", void 0, (model2) => this.makeGroupBySchema(model2), args);
   }
+  getSchemaCache(cacheKey) {
+    let thisCache = schemaCache.get(this.schema);
+    if (!thisCache) {
+      thisCache = /* @__PURE__ */ new Map();
+      schemaCache.set(this.schema, thisCache);
+    }
+    return thisCache.get(cacheKey);
+  }
+  setSchemaCache(cacheKey, schema) {
+    let thisCache = schemaCache.get(this.schema);
+    if (!thisCache) {
+      thisCache = /* @__PURE__ */ new Map();
+      schemaCache.set(this.schema, thisCache);
+    }
+    return thisCache.set(cacheKey, schema);
+  }
   validate(model, operation, options, getSchema, args) {
     const cacheKey = stableStringify({
+      type: "model",
       model,
       operation,
-      options
+      options,
+      extraValidationsEnabled: this.extraValidationsEnabled
     });
-    let schema = this.schemaCache.get(cacheKey);
+    let schema = this.getSchemaCache(cacheKey);
     if (!schema) {
       schema = getSchema(model, options);
-      this.schemaCache.set(cacheKey, schema);
+      this.setSchemaCache(cacheKey, schema);
     }
     const { error, data } = schema.safeParse(args);
     if (error) {
@@ -4054,8 +4146,12 @@ var InputValidator = class {
     }
   }
   makeTypeDefSchema(type) {
-    const key = `$typedef-${type}`;
-    let schema = this.schemaCache.get(key);
+    const key = stableStringify({
+      type: "typedef",
+      name: type,
+      extraValidationsEnabled: this.extraValidationsEnabled
+    });
+    let schema = this.getSchemaCache(key);
     if (schema) {
       return schema;
     }
@@ -4074,7 +4170,7 @@ var InputValidator = class {
         fieldSchema
       ];
     }))).passthrough();
-    this.schemaCache.set(key, schema);
+    this.setSchemaCache(key, schema);
     return schema;
   }
   makeWhereSchema(model, unique, withoutRelationFields = false, withAggregations = false) {
@@ -5523,7 +5619,18 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
   nameMapper;
   constructor(client, driver, compiler, adapter, connectionProvider, plugins = [], suppressMutationHooks = false) {
     super(compiler, adapter, connectionProvider, plugins), this.client = client, this.driver = driver, this.compiler = compiler, this.connectionProvider = connectionProvider, this.suppressMutationHooks = suppressMutationHooks;
-    this.nameMapper = new QueryNameMapper(client.$schema);
+    if (this.schemaHasMappedNames(client.$schema)) {
+      this.nameMapper = new QueryNameMapper(client.$schema);
+    }
+  }
+  schemaHasMappedNames(schema) {
+    const hasMapAttr = /* @__PURE__ */ __name((decl) => {
+      if (decl.attributes?.some((attr) => attr.name === "@@map")) {
+        return true;
+      }
+      return Object.values(decl.fields).some((field) => field.attributes?.some((attr) => attr.name === "@map"));
+    }, "hasMapAttr");
+    return Object.values(schema.models).some(hasMapAttr) || Object.values(schema.typeDefs ?? []).some(hasMapAttr);
   }
   get kysely() {
     return this.client.$qb;
@@ -5538,7 +5645,7 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
       try {
         if (this.isMutationNode(compiledQuery.query) && !this.driver.isTransactionConnection(connection)) {
           await this.driver.beginTransaction(connection, {
-            isolationLevel: TransactionIsolationLevel.RepeatableRead
+            isolationLevel: TransactionIsolationLevel.ReadCommitted
           });
           startedTx = true;
         }
@@ -5605,7 +5712,7 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
   async proceedQuery(connection, query, parameters, queryId) {
     let compiled;
     if (this.suppressMutationHooks || !this.isMutationNode(query) || !this.hasEntityMutationPlugins) {
-      const finalQuery2 = this.nameMapper.transformNode(query);
+      const finalQuery2 = this.processNameMapping(query);
       compiled = this.compileQuery(finalQuery2);
       if (parameters) {
         compiled = {
@@ -5623,7 +5730,7 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
         ])
       };
     }
-    const finalQuery = this.nameMapper.transformNode(query);
+    const finalQuery = this.processNameMapping(query);
     compiled = this.compileQuery(finalQuery);
     if (parameters) {
       compiled = {
@@ -5651,6 +5758,9 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
     }
     return result;
   }
+  processNameMapping(query) {
+    return this.nameMapper?.transformNode(query) ?? query;
+  }
   createClientForConnection(connection, inTx) {
     const innerExecutor = this.withConnectionProvider(new SingleConnectionProvider(connection));
     innerExecutor.suppressMutationHooks = true;
@@ -6435,6 +6545,11 @@ var ClientImpl = class _ClientImpl {
       ...args
     ]);
   }
+  async $connect() {
+    await this.kysely.connection().execute(async (conn) => {
+      await conn.executeQuery(sql7`select 1`.compile(this.kysely));
+    });
+  }
   async $disconnect() {
     await this.kysely.destroy();
   }