@contember/engine-content-api 1.2.0-alpha.15 → 1.2.0-alpha.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-content-api",
-  "version": "1.2.0-alpha.15",
+  "version": "1.2.0-alpha.17",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -10,19 +10,20 @@
     "test": "vitest --no-threads"
   },
   "dependencies": {
-    "@contember/database": "^1.2.0-alpha.15",
-    "@contember/dic": "^1.2.0-alpha.15",
-    "@contember/engine-common": "^1.2.0-alpha.15",
-    "@contember/graphql-utils": "^1.2.0-alpha.15",
-    "@contember/schema": "^1.2.0-alpha.15",
-    "@contember/schema-utils": "^1.2.0-alpha.15",
+    "@contember/database": "^1.2.0-alpha.17",
+    "@contember/dic": "^1.2.0-alpha.17",
+    "@contember/engine-common": "^1.2.0-alpha.17",
+    "@contember/logger": "^1.2.0-alpha.17",
+    "@contember/graphql-utils": "^1.2.0-alpha.17",
+    "@contember/schema": "^1.2.0-alpha.17",
+    "@contember/schema-utils": "^1.2.0-alpha.17",
     "@graphql-tools/schema": "^8.3.5",
     "graphql-tag": "^2.12.5"
   },
   "devDependencies": {
-    "@contember/database-tester": "^1.2.0-alpha.15",
-    "@contember/engine-api-tester": "^1.2.0-alpha.15",
-    "@contember/schema-definition": "^1.2.0-alpha.15",
+    "@contember/database-tester": "^1.2.0-alpha.17",
+    "@contember/engine-api-tester": "^1.2.0-alpha.17",
+    "@contember/schema-definition": "^1.2.0-alpha.17",
     "@graphql-codegen/cli": "^2.6.2",
     "@graphql-codegen/typescript": "^2.5.1",
     "@graphql-codegen/typescript-operations": "^2.4.2",

package/src/mapper/ErrorUtils.ts

@@ -12,6 +12,7 @@ import * as Database from '@contember/database'
 import { UniqueWhereError } from '../inputProcessing'
 import { Model } from '@contember/schema'
 import { isOwningRelation, isRelation, NamingHelper } from '@contember/schema-utils'
+import { logger } from '@contember/logger'
 import RelationType = Model.RelationType
 
 
@@ -108,8 +109,7 @@ export const convertError = (schema: Model.Schema, e: any): MutationResult => {
 		return new MutationSqlError([], e.originalMessage, [MutationResultHint.subSequentSqlError])
 	}
 	if (e instanceof Database.QueryError) {
-		// eslint-disable-next-line no-console
-		console.error(e)
+		logger.error(e, { loc: 'convertError' })
 		return new MutationSqlError([], e.originalMessage, [MutationResultHint.sqlError])
 	}
 	throw e

package/src/mapper/MapperContainer.ts

@@ -3,9 +3,9 @@ import {
 	ConditionBuilder,
 	FieldsVisitorFactory,
 	JoinBuilder,
-	RelationFetcher,
 	MetaHandler,
 	OrderByBuilder,
+	RelationFetcher,
 	WhereBuilder,
 } from './select'
 import { UniqueWhereExpander } from '../inputProcessing'

package/src/mapper/Result.ts

@@ -2,6 +2,7 @@ import { Input, Model, Value } from '@contember/schema'
 import { convertError } from './ErrorUtils'
 import { getFulfilledValues, getRejections } from '../utils'
 import { SerializationFailureError } from '@contember/database'
+import { logger } from '@contember/logger'
 
 export enum MutationResultType {
 	ok = 'ok',
@@ -225,10 +226,7 @@ export const collectResults = async (
 	const failures = getRejections(results)
 	if (failures.length > 0) {
 		if (failures.length > 1 && !failures.every(it => it instanceof SerializationFailureError)) {
-			// eslint-disable-next-line no-console
-			console.error('Multiple error has occurred, printing them & rethrowing the first one')
-			// eslint-disable-next-line no-console
-			failures.slice(1).map(e => console.error(e))
+			failures.slice(1).map(e => logger.error(e))
 		}
 		throw failures[0]
 	}

package/src/mapper/select/SelectHydrator.ts

@@ -1,6 +1,7 @@
 import { Path } from './Path'
 import { Value } from '@contember/schema'
 import { getFulfilledValues, getRejections } from '../../utils'
+import { logger } from '@contember/logger'
 
 type DataPromises = {
 	path: Path
@@ -109,10 +110,7 @@ export class SelectHydrator {
 		const failures = getRejections(results)
 		if (failures.length > 0) {
 			if (failures.length > 1) {
-				// eslint-disable-next-line no-console
-				console.error('Multiple error has occurred, printing them & rethrowing the first one')
-				// eslint-disable-next-line no-console
-				failures.slice(1).map(e => console.error(e))
+				failures.slice(1).map(e => logger.error(e, { loc: 'SelectHydrator' }))
 			}
 			throw failures[0]
 		}

package/src/mapper/update/SqlUpdateInputProcessor.ts

@@ -2,7 +2,6 @@ import { Input, Model, Value } from '@contember/schema'
 import { Mapper } from '../Mapper'
 import { UpdateBuilder } from './UpdateBuilder'
 import { UpdateInputProcessor } from '../../inputProcessing'
-import * as Context from '../../inputProcessing'
 import {
 	ConstraintType,
 	getInsertPrimary,
@@ -17,6 +16,7 @@ import { hasManyProcessor, hasOneProcessor } from '../MutationProcessorHelper'
 import { AbortUpdate } from './Updater'
 import { ImplementationException } from '../../exception'
 import { CheckedPrimary } from '../CheckedPrimary'
+import { logger } from '@contember/logger'
 
 export class SqlUpdateInputProcessor implements UpdateInputProcessor<MutationResultList> {
 	constructor(
@@ -228,10 +228,7 @@ export class SqlUpdateInputProcessor implements UpdateInputProcessor<MutationRes
 				return [new MutationConstraintViolationError([], ConstraintType.notNull)]
 			}
 			if (relation.joiningColumn.onDelete === Model.OnDelete.restrict) {
-				// eslint-disable-next-line no-console
-				console.error(
-					'[DEPRECATED] You are deleting an entity over the relation where onDelete behaviour is set to restrict. This will fail in next version.',
-				)
+				logger.warn('You are deleting an entity over the relation where onDelete behaviour is set to restrict. This will fail in next version.', { loc: 'SqlUpdateInputProcessor' })
 				this.updateBuilder.addFieldValue(relation.name, null)
 			}
 			const inversePrimary = await this.mapper.selectField(
@@ -490,10 +487,7 @@ export class SqlUpdateInputProcessor implements UpdateInputProcessor<MutationRes
 				return [new MutationConstraintViolationError([], ConstraintType.notNull)]
 			}
 			if (relation.joiningColumn.onDelete === Model.OnDelete.restrict) {
-				// eslint-disable-next-line no-console
-				console.error(
-					'[DEPRECATED] You are deleting an entity over the relation where onDelete behaviour is set to restrict. This will fail in next version.',
-				)
+				logger.warn('You are deleting an entity over the relation where onDelete behaviour is set to restrict. This will fail in next version.', { loc: 'SqlUpdateInputProcessor' })
 				this.updateBuilder.addFieldValue(relation.name, null)
 			}
 			const targetPrimary = await this.mapper.selectField(

package/src/resolvers/MutationResolver.ts

@@ -2,13 +2,13 @@ import { Input, Model, Result, Value } from '@contember/schema'
 import {
 	ConstraintType,
 	getInsertPrimary,
-	getUpdatePrimary,
 	InputErrorKind,
 	Mapper,
 	MapperFactory,
 	MutationResultHint,
 	MutationResultList,
-	MutationResultType, tryMutation,
+	MutationResultType,
+	tryMutation,
 } from '../mapper'
 import { ValidationResolver } from './ValidationResolver'
 import { GraphQLResolveInfo } from 'graphql'
@@ -20,6 +20,7 @@ import { assertNever } from '../utils'
 import { InputPreValidator } from '../input-validation'
 import { ObjectNode } from '../inputProcessing'
 import { executeReadOperations } from './ReadHelpers'
+import { logger } from '@contember/logger'
 
 type WithoutNode<T extends { node: any }> = Pick<T, Exclude<keyof T, 'node'>>
 
@@ -479,6 +480,7 @@ export class MutationResolver {
 					return result
 				})
 			},
+			message => logger.warn(message),
 			{
 				maxAttempts: 15,
 				minTimeout: 10,

package/src/tsconfig.json

@@ -8,23 +8,26 @@
 		{
 			"path": "../../database/src"
 		},
+		{
+			"path": "../../dic/src"
+		},
 		{
 			"path": "../../engine-common/src"
 		},
 		{
-			"path": "../../schema/src"
+			"path": "../../graphql-utils/src"
 		},
 		{
-			"path": "../../schema-definition/src"
+			"path": "../../logger/src"
 		},
 		{
-			"path": "../../schema-utils/src"
+			"path": "../../schema/src"
 		},
 		{
-			"path": "../../dic/src"
+			"path": "../../schema-definition/src"
 		},
 		{
-			"path": "../../graphql-utils/src"
+			"path": "../../schema-utils/src"
 		}
 	]
 }

package/tests/src/test.ts

@@ -1,5 +1,5 @@
 import { Acl, Model, Schema, Validation } from '@contember/schema'
-import { ExecutionContainerFactory, GraphQlSchemaBuilderFactory, Authorizator } from '../../src'
+import { Authorizator, ExecutionContainerFactory, GraphQlSchemaBuilderFactory } from '../../src'
 import { AllowAllPermissionFactory, emptySchema } from '@contember/schema-utils'
 import { executeGraphQlTest } from './testGraphql'
 import { Client } from '@contember/database'