arkormx 2.0.0-next.23 → 2.0.0-next.25

package/dist/index.cjs

@@ -7593,12 +7593,14 @@ var QueryBuilder = class QueryBuilder {
 	* @returns
 	*/
 	async updateOrInsert(attributes, values = {}) {
-		if (typeof values !== "function" && this.adapter?.capabilities?.upsert && typeof this.requireAdapter().upsert === "function") {
+		if (typeof values !== "function" && this.adapter?.capabilities?.upsert && typeof this.requireAdapter().upsert === "function") try {
 			await this.executeUpsertRows([{
 				...attributes,
 				...values
 			}], Object.keys(attributes), Object.keys(values));
 			return true;
+		} catch (error) {
+			if (!this.shouldFallbackUpdateOrInsertUpsert(error)) throw error;
 		}
 		const exists = await this.clone().where(attributes).first() != null;
 		const resolvedValues = typeof values === "function" ? await values(exists) : values;
@@ -7611,6 +7613,13 @@ var QueryBuilder = class QueryBuilder {
 		}
 		return await this.clone().where(attributes).update(resolvedValues) != null;
 	}
+	shouldFallbackUpdateOrInsertUpsert(error) {
+		if (!(error instanceof QueryExecutionException)) return false;
+		const cause = error.cause;
+		const code = typeof cause?.code === "string" ? cause.code : void 0;
+		const message = typeof cause?.message === "string" ? cause.message : error.message;
+		return code === "42P10" || message.includes("there is no unique or exclusion constraint matching the ON CONFLICT specification");
+	}
 	/**
 	* Insert new records or update existing records by one or more unique keys.
 	*
@@ -7639,8 +7648,8 @@ var QueryBuilder = class QueryBuilder {
 		return affected;
 	}
 	/**
-	* Deletes records matching the current query constraints and returns 
-	* the deleted record(s) as model instance(s).
+	* Deletes the first record matching the current query constraints and returns
+	* it as a hydrated model instance. Returns null when no record matches.
 	* 
 	* @returns 
 	*/
@@ -7654,13 +7663,26 @@ var QueryBuilder = class QueryBuilder {
 		const adapter = this.requireAdapter();
 		if (!this.isUniqueWhere(where) && directSpec && typeof adapter.deleteFirst === "function") {
 			const deleted = await adapter.deleteFirst(directSpec);
-			if (!deleted) throw new ModelNotFoundException(this.model.name, "Record not found for delete operation.", { operation: "delete" });
+			if (!deleted) return null;
 			return this.model.hydrate(deleted);
 		}
-		const uniqueWhere = await this.resolveUniqueWhere(where);
-		const deleted = await this.executeDeleteRow(uniqueWhere);
+		const uniqueWhere = await this.resolveUniqueWhere(where, false);
+		if (!uniqueWhere) return null;
+		const deleted = await this.executeDeleteRow(uniqueWhere, false);
+		if (!deleted) return null;
 		return this.model.hydrate(deleted);
 	}
+	/**
+	* Deletes the first record matching the current query constraints and throws
+	* when no record matches.
+	*
+	* @returns
+	*/
+	async deleteOrFail() {
+		const deleted = await this.delete();
+		if (!deleted) throw new ModelNotFoundException(this.model.name, "Record not found for delete operation.", { operation: "delete" });
+		return deleted;
+	}
 	tryBuildInsertSpec(values) {
 		return {
 			target: this.buildQueryTarget(),
@@ -8434,7 +8456,7 @@ var QueryBuilder = class QueryBuilder {
 		}
 		return updated;
 	}
-	async executeDeleteRow(where) {
+	async executeDeleteRow(where, failIfMissing = true) {
 		const adapter = this.requireAdapter();
 		const spec = this.tryBuildDeleteSpec(where);
 		if (!spec) throw new UnsupportedAdapterFeatureException("Delete could not be compiled into an Arkorm delete specification.", {
@@ -8442,7 +8464,9 @@ var QueryBuilder = class QueryBuilder {
 			model: this.model.name
 		});
 		const deleted = await adapter.delete(spec);
-		if (!deleted) throw new ModelNotFoundException(this.model.name, "Record not found for delete operation.", { operation: "delete" });
+		if (!deleted) return failIfMissing ? (() => {
+			throw new ModelNotFoundException(this.model.name, "Record not found for delete operation.", { operation: "delete" });
+		})() : null;
 		return deleted;
 	}
 	/**
@@ -8471,7 +8495,7 @@ var QueryBuilder = class QueryBuilder {
 	* @param where 
 	* @returns 
 	*/
-	async resolveUniqueWhere(where) {
+	async resolveUniqueWhere(where, failIfMissing = true) {
 		if (this.isUniqueWhere(where)) return where;
 		const condition = this.tryBuildQueryCondition(where);
 		if (!condition) throw new UniqueConstraintResolutionException("Unable to resolve a unique identifier for update/delete operation from the current query shape.", {
@@ -8485,10 +8509,12 @@ var QueryBuilder = class QueryBuilder {
 			where: condition,
 			limit: 1
 		});
-		if (!row) throw new ModelNotFoundException(this.model.name, "Record not found for update/delete operation.", {
-			operation: "resolveUniqueWhere",
-			meta: { where }
-		});
+		if (!row) return failIfMissing ? (() => {
+			throw new ModelNotFoundException(this.model.name, "Record not found for update/delete operation.", {
+				operation: "resolveUniqueWhere",
+				meta: { where }
+			});
+		})() : null;
 		const primaryKey = this.model.getPrimaryKey();
 		if (!Object.prototype.hasOwnProperty.call(row, primaryKey)) throw new UniqueConstraintResolutionException(`Unable to resolve a unique identifier for update/delete operation. Include [${primaryKey}] in the query constraints.`, {
 			operation: "resolveUniqueWhere",
@@ -10682,7 +10708,7 @@ var Model = class Model {
 			await Model.dispatchEvent(constructor, "deleted", this);
 			return this;
 		}
-		const deleted = await constructor.query().where({ [primaryKey]: identifier }).delete();
+		const deleted = await constructor.query().where({ [primaryKey]: identifier }).deleteOrFail();
 		this.fill(deleted.getRawAttributes());
 		this.syncChanges(previousOriginal);
 		this.syncOriginal();
@@ -10711,7 +10737,7 @@ var Model = class Model {
 		const previousOriginal = this.getOriginal();
 		await Model.dispatchEvent(constructor, "forceDeleting", this);
 		await Model.dispatchEvent(constructor, "deleting", this);
-		const deleted = await constructor.query().withTrashed().where({ [primaryKey]: identifier }).delete();
+		const deleted = await constructor.query().withTrashed().where({ [primaryKey]: identifier }).deleteOrFail();
 		this.fill(deleted.getRawAttributes());
 		this.syncChanges(previousOriginal);
 		this.syncOriginal();

package/dist/index.d.cts

@@ -2687,6 +2687,7 @@ declare class QueryBuilder<TModel, TDelegate extends PrismaDelegateLike = Prisma
    * @returns
    */
   updateOrInsert(attributes: Record<string, unknown>, values?: Record<string, unknown> | ((exists: boolean) => Record<string, unknown> | Promise<Record<string, unknown>>)): Promise<boolean>;
+  private shouldFallbackUpdateOrInsertUpsert;
   /**
    * Insert new records or update existing records by one or more unique keys.
    *
@@ -2697,12 +2698,19 @@ declare class QueryBuilder<TModel, TDelegate extends PrismaDelegateLike = Prisma
    */
   upsert(values: Array<Record<string, unknown>>, uniqueBy: string | string[], update?: string[] | null): Promise<number>;
   /**
-   * Deletes records matching the current query constraints and returns
-   * the deleted record(s) as model instance(s).
+   * Deletes the first record matching the current query constraints and returns
+   * it as a hydrated model instance. Returns null when no record matches.
    *
    * @returns
    */
-  delete(): Promise<TModel>;
+  delete(): Promise<TModel | null>;
+  /**
+   * Deletes the first record matching the current query constraints and throws
+   * when no record matches.
+   *
+   * @returns
+   */
+  deleteOrFail(): Promise<TModel>;
   private tryBuildInsertSpec;
   private tryBuildInsertManySpec;
   private tryBuildUpsertSpec;

package/dist/index.d.mts

@@ -2687,6 +2687,7 @@ declare class QueryBuilder<TModel, TDelegate extends PrismaDelegateLike = Prisma
    * @returns
    */
   updateOrInsert(attributes: Record<string, unknown>, values?: Record<string, unknown> | ((exists: boolean) => Record<string, unknown> | Promise<Record<string, unknown>>)): Promise<boolean>;
+  private shouldFallbackUpdateOrInsertUpsert;
   /**
    * Insert new records or update existing records by one or more unique keys.
    *
@@ -2697,12 +2698,19 @@ declare class QueryBuilder<TModel, TDelegate extends PrismaDelegateLike = Prisma
    */
   upsert(values: Array<Record<string, unknown>>, uniqueBy: string | string[], update?: string[] | null): Promise<number>;
   /**
-   * Deletes records matching the current query constraints and returns
-   * the deleted record(s) as model instance(s).
+   * Deletes the first record matching the current query constraints and returns
+   * it as a hydrated model instance. Returns null when no record matches.
    *
    * @returns
    */
-  delete(): Promise<TModel>;
+  delete(): Promise<TModel | null>;
+  /**
+   * Deletes the first record matching the current query constraints and throws
+   * when no record matches.
+   *
+   * @returns
+   */
+  deleteOrFail(): Promise<TModel>;
   private tryBuildInsertSpec;
   private tryBuildInsertManySpec;
   private tryBuildUpsertSpec;

package/dist/index.mjs

@@ -7564,12 +7564,14 @@ var QueryBuilder = class QueryBuilder {
 	* @returns
 	*/
 	async updateOrInsert(attributes, values = {}) {
-		if (typeof values !== "function" && this.adapter?.capabilities?.upsert && typeof this.requireAdapter().upsert === "function") {
+		if (typeof values !== "function" && this.adapter?.capabilities?.upsert && typeof this.requireAdapter().upsert === "function") try {
 			await this.executeUpsertRows([{
 				...attributes,
 				...values
 			}], Object.keys(attributes), Object.keys(values));
 			return true;
+		} catch (error) {
+			if (!this.shouldFallbackUpdateOrInsertUpsert(error)) throw error;
 		}
 		const exists = await this.clone().where(attributes).first() != null;
 		const resolvedValues = typeof values === "function" ? await values(exists) : values;
@@ -7582,6 +7584,13 @@ var QueryBuilder = class QueryBuilder {
 		}
 		return await this.clone().where(attributes).update(resolvedValues) != null;
 	}
+	shouldFallbackUpdateOrInsertUpsert(error) {
+		if (!(error instanceof QueryExecutionException)) return false;
+		const cause = error.cause;
+		const code = typeof cause?.code === "string" ? cause.code : void 0;
+		const message = typeof cause?.message === "string" ? cause.message : error.message;
+		return code === "42P10" || message.includes("there is no unique or exclusion constraint matching the ON CONFLICT specification");
+	}
 	/**
 	* Insert new records or update existing records by one or more unique keys.
 	*
@@ -7610,8 +7619,8 @@ var QueryBuilder = class QueryBuilder {
 		return affected;
 	}
 	/**
-	* Deletes records matching the current query constraints and returns 
-	* the deleted record(s) as model instance(s).
+	* Deletes the first record matching the current query constraints and returns
+	* it as a hydrated model instance. Returns null when no record matches.
 	* 
 	* @returns 
 	*/
@@ -7625,13 +7634,26 @@ var QueryBuilder = class QueryBuilder {
 		const adapter = this.requireAdapter();
 		if (!this.isUniqueWhere(where) && directSpec && typeof adapter.deleteFirst === "function") {
 			const deleted = await adapter.deleteFirst(directSpec);
-			if (!deleted) throw new ModelNotFoundException(this.model.name, "Record not found for delete operation.", { operation: "delete" });
+			if (!deleted) return null;
 			return this.model.hydrate(deleted);
 		}
-		const uniqueWhere = await this.resolveUniqueWhere(where);
-		const deleted = await this.executeDeleteRow(uniqueWhere);
+		const uniqueWhere = await this.resolveUniqueWhere(where, false);
+		if (!uniqueWhere) return null;
+		const deleted = await this.executeDeleteRow(uniqueWhere, false);
+		if (!deleted) return null;
 		return this.model.hydrate(deleted);
 	}
+	/**
+	* Deletes the first record matching the current query constraints and throws
+	* when no record matches.
+	*
+	* @returns
+	*/
+	async deleteOrFail() {
+		const deleted = await this.delete();
+		if (!deleted) throw new ModelNotFoundException(this.model.name, "Record not found for delete operation.", { operation: "delete" });
+		return deleted;
+	}
 	tryBuildInsertSpec(values) {
 		return {
 			target: this.buildQueryTarget(),
@@ -8405,7 +8427,7 @@ var QueryBuilder = class QueryBuilder {
 		}
 		return updated;
 	}
-	async executeDeleteRow(where) {
+	async executeDeleteRow(where, failIfMissing = true) {
 		const adapter = this.requireAdapter();
 		const spec = this.tryBuildDeleteSpec(where);
 		if (!spec) throw new UnsupportedAdapterFeatureException("Delete could not be compiled into an Arkorm delete specification.", {
@@ -8413,7 +8435,9 @@ var QueryBuilder = class QueryBuilder {
 			model: this.model.name
 		});
 		const deleted = await adapter.delete(spec);
-		if (!deleted) throw new ModelNotFoundException(this.model.name, "Record not found for delete operation.", { operation: "delete" });
+		if (!deleted) return failIfMissing ? (() => {
+			throw new ModelNotFoundException(this.model.name, "Record not found for delete operation.", { operation: "delete" });
+		})() : null;
 		return deleted;
 	}
 	/**
@@ -8442,7 +8466,7 @@ var QueryBuilder = class QueryBuilder {
 	* @param where 
 	* @returns 
 	*/
-	async resolveUniqueWhere(where) {
+	async resolveUniqueWhere(where, failIfMissing = true) {
 		if (this.isUniqueWhere(where)) return where;
 		const condition = this.tryBuildQueryCondition(where);
 		if (!condition) throw new UniqueConstraintResolutionException("Unable to resolve a unique identifier for update/delete operation from the current query shape.", {
@@ -8456,10 +8480,12 @@ var QueryBuilder = class QueryBuilder {
 			where: condition,
 			limit: 1
 		});
-		if (!row) throw new ModelNotFoundException(this.model.name, "Record not found for update/delete operation.", {
-			operation: "resolveUniqueWhere",
-			meta: { where }
-		});
+		if (!row) return failIfMissing ? (() => {
+			throw new ModelNotFoundException(this.model.name, "Record not found for update/delete operation.", {
+				operation: "resolveUniqueWhere",
+				meta: { where }
+			});
+		})() : null;
 		const primaryKey = this.model.getPrimaryKey();
 		if (!Object.prototype.hasOwnProperty.call(row, primaryKey)) throw new UniqueConstraintResolutionException(`Unable to resolve a unique identifier for update/delete operation. Include [${primaryKey}] in the query constraints.`, {
 			operation: "resolveUniqueWhere",
@@ -10653,7 +10679,7 @@ var Model = class Model {
 			await Model.dispatchEvent(constructor, "deleted", this);
 			return this;
 		}
-		const deleted = await constructor.query().where({ [primaryKey]: identifier }).delete();
+		const deleted = await constructor.query().where({ [primaryKey]: identifier }).deleteOrFail();
 		this.fill(deleted.getRawAttributes());
 		this.syncChanges(previousOriginal);
 		this.syncOriginal();
@@ -10682,7 +10708,7 @@ var Model = class Model {
 		const previousOriginal = this.getOriginal();
 		await Model.dispatchEvent(constructor, "forceDeleting", this);
 		await Model.dispatchEvent(constructor, "deleting", this);
-		const deleted = await constructor.query().withTrashed().where({ [primaryKey]: identifier }).delete();
+		const deleted = await constructor.query().withTrashed().where({ [primaryKey]: identifier }).deleteOrFail();
 		this.fill(deleted.getRawAttributes());
 		this.syncChanges(previousOriginal);
 		this.syncOriginal();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arkormx",
-  "version": "2.0.0-next.23",
+  "version": "2.0.0-next.25",
   "description": "Modern TypeScript-first ORM for Node.js.",
   "keywords": [
     "orm",