@contember/engine-content-api 2.0.0-alpha.10 → 2.0.0-alpha.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-content-api",
-  "version": "2.0.0-alpha.10",
+  "version": "2.0.0-alpha.12",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
@@ -26,18 +26,18 @@
     "generate": "gql-gen --config graphql.codegen.yml"
   },
   "dependencies": {
-    "@contember/database": "2.0.0-alpha.10",
-    "@contember/dic": "2.0.0-alpha.10",
-    "@contember/graphql-utils": "2.0.0-alpha.10",
-    "@contember/logger": "2.0.0-alpha.10",
-    "@contember/schema": "2.0.0-alpha.10",
-    "@contember/schema-definition": "2.0.0-alpha.10",
-    "@contember/schema-utils": "2.0.0-alpha.10",
+    "@contember/database": "2.0.0-alpha.12",
+    "@contember/dic": "2.0.0-alpha.12",
+    "@contember/graphql-utils": "2.0.0-alpha.12",
+    "@contember/logger": "2.0.0-alpha.12",
+    "@contember/schema": "2.0.0-alpha.12",
+    "@contember/schema-definition": "2.0.0-alpha.12",
+    "@contember/schema-utils": "2.0.0-alpha.12",
     "fast-deep-equal": "^3.1.3"
   },
   "devDependencies": {
-    "@contember/database-tester": "2.0.0-alpha.10",
-    "@contember/schema-definition": "2.0.0-alpha.10",
+    "@contember/database-tester": "2.0.0-alpha.12",
+    "@contember/schema-definition": "2.0.0-alpha.12",
     "@graphql-codegen/cli": "^5.0.0",
     "@graphql-codegen/typescript": "^4.0.1",
     "@graphql-codegen/typescript-operations": "^4.0.1",

package/src/mapper/ErrorUtils.ts

@@ -134,7 +134,7 @@ export const convertError = (
 	if (e instanceof Database.TransactionAbortedError) {
 		return new MutationSqlError([], e.originalMessage, [MutationResultHint.subSequentSqlError])
 	}
-	if (e instanceof Database.QueryError) {
+	if (e instanceof Database.QueryError || e instanceof Database.CannotCommitError) {
 		logger.error(e, { loc: 'convertError' })
 		return new MutationSqlError([], e.originalMessage, [MutationResultHint.sqlError])
 	}

package/src/mapper/EventManager.ts

@@ -1,7 +1,6 @@
 import { Input, Model, Value } from '@contember/schema'
 import { ResolvedColumnValue } from './ColumnValue'
 import { Mapper } from './Mapper'
-import { logger } from '@contember/logger'
 
 export class BeforeInsertEvent {
 	public type = 'BeforeInsertEvent' as const
@@ -148,11 +147,8 @@ export class EventManager {
 	}
 
 	public async fire<K extends keyof EventMap>(event: EventMap[K]) {
-		(await Promise.allSettled(this.listeners[event.type].map(it => (it as EventListener<K>)(event, this.mapper))))
-			.map(it => {
-				if (it.status === 'rejected') {
-					logger.error(it.reason)
-				}
-			})
+		for (const listener of this.listeners[event.type]) {
+			await listener(event, this.mapper)
+		}
 	}
 }

package/src/resolvers/MutationResolver.ts

@@ -476,12 +476,15 @@ export class MutationResolver {
 						logger.debug('MutationResolver: Transaction failed, rolling back', { result })
 						await mapper.db.connection.rollback()
 					} else {
-						await mapper.eventManager.fire(new BeforeCommitEvent())
-
-						logger.debug('MutationResolver: Transaction ok, committing')
 						try {
+							await mapper.eventManager.fire(new BeforeCommitEvent())
+							logger.debug('MutationResolver: Transaction ok, committing')
 							await mapper.db.connection.commit()
+							await mapper.eventManager.fire(new AfterCommitEvent())
 						} catch (e) {
+							try {
+								await mapper.db.connection.rollback()
+							} catch {}
 							const err = convertError(this.schema, this.schemaDatabaseMetadata, e)
 							const errorResponse = this.createErrorResponse([err])
 							if (!errorResponse) {
@@ -490,7 +493,6 @@ export class MutationResolver {
 							return { ...result, ...errorResponse }
 						}
 
-						await mapper.eventManager.fire(new AfterCommitEvent())
 					}
 					return result
 				})