pqb 0.2.7 → 0.2.9

package/dist/index.d.ts

@@ -751,19 +751,19 @@ declare type UpdateBelongsToData<T extends Query, Rel extends BelongsToRelation>
     update: UpdateData<Rel['model']>;
 } | {
     create: InsertData<Rel['nestedCreateQuery']>;
-} | (T['returnType'] extends 'one' | 'oneOrThrow' ? {
+} | (T['returnType'] extends 'all' ? never : {
     upsert: {
         update: UpdateData<Rel['model']>;
         create: InsertData<Rel['nestedCreateQuery']>;
     };
-} : never);
+});
 declare type UpdateHasOneData<T extends Query, Rel extends HasOneRelation> = {
     disconnect: boolean;
 } | {
     delete: boolean;
 } | {
     update: UpdateData<Rel['model']>;
-} | (T['returnType'] extends 'one' | 'oneOrThrow' ? {
+} | (T['returnType'] extends 'all' ? never : {
     set: WhereArg<Rel['model']>;
 } | {
     upsert: {
@@ -772,7 +772,7 @@ declare type UpdateHasOneData<T extends Query, Rel extends HasOneRelation> = {
     };
 } | {
     create: InsertData<Rel['nestedCreateQuery']>;
-} : never);
+});
 declare type UpdateHasManyData<T extends Query, Rel extends HasManyRelation> = {
     disconnect?: MaybeArray<WhereArg<Rel['model']>>;
     delete?: MaybeArray<WhereArg<Rel['model']>>;
@@ -780,10 +780,10 @@ declare type UpdateHasManyData<T extends Query, Rel extends HasManyRelation> = {
         where: MaybeArray<WhereArg<Rel['model']>>;
         data: UpdateData<Rel['model']>;
     };
-} & (T['returnType'] extends 'one' | 'oneOrThrow' ? {
+} & (T['returnType'] extends 'all' ? EmptyObject : {
     set?: MaybeArray<WhereArg<Rel['model']>>;
     create?: InsertData<Rel['nestedCreateQuery']>[];
-} : EmptyObject);
+});
 declare type UpdateHasAndBelongsToManyData<Rel extends HasAndBelongsToManyRelation> = {
     disconnect?: MaybeArray<WhereArg<Rel['model']>>;
     set?: MaybeArray<WhereArg<Rel['model']>>;

package/dist/index.esm.js

@@ -3248,10 +3248,10 @@ class QueryGet {
 
 const queryMethodByReturnType = {
   all: "query",
-  one: "query",
-  oneOrThrow: "query",
   rows: "arrays",
   pluck: "arrays",
+  one: "query",
+  oneOrThrow: "query",
   value: "arrays",
   valueOrThrow: "arrays",
   rowCount: "arrays",
@@ -4553,6 +4553,10 @@ const applyCountChange = (self, op, data) => {
   pushQueryValue(self, "data", map);
   return self;
 };
+const checkIfUpdateIsEmpty = (q) => {
+  var _a;
+  return !((_a = q.data) == null ? void 0 : _a.some((item) => isRaw(item) || Object.keys(item).length));
+};
 class Update {
   update(...args) {
     const q = this.clone();
@@ -4571,11 +4575,12 @@ class Update {
     if (isRaw(data)) {
       pushQueryValue(this, "data", data);
     } else {
+      const update = __spreadValues$2({}, data);
+      pushQueryValue(this, "data", update);
       const relations = this.relations;
       const prependRelations = {};
       const appendRelations = {};
       const originalReturnType = this.query.returnType;
-      const update = __spreadValues$2({}, data);
       for (const key in data) {
         if (relations[key]) {
           delete update[key];
@@ -4594,15 +4599,14 @@ class Update {
       }
       const state = {};
       const prependRelationKeys = Object.keys(prependRelations);
+      let willSetKeys = false;
       if (prependRelationKeys.length) {
-        const willSetKeys = prependRelationKeys.some((relationName) => {
+        willSetKeys = prependRelationKeys.some((relationName) => {
           const data2 = prependRelations[relationName];
           return relations[relationName].nestedUpdate(this, update, data2, state);
         });
-        if (!willSetKeys && !Object.keys(update).length) {
-          delete this.query.type;
-        }
-      } else if (!Object.keys(update).length) {
+      }
+      if (!willSetKeys && checkIfUpdateIsEmpty(this.query)) {
         delete this.query.type;
       }
       const appendRelationKeys = Object.keys(appendRelations);
@@ -4657,7 +4661,6 @@ class Update {
       if (prependRelationKeys.length || appendRelationKeys.length) {
         query.wrapInTransaction = true;
       }
-      pushQueryValue(this, "data", update);
     }
     if (!query.select) {
       this.query.returnType = "rowCount";