@contember/engine-system-api 1.2.0-alpha.18 → 1.2.0-alpha.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-system-api",
-  "version": "1.2.0-alpha.18",
+  "version": "1.2.0-alpha.19",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -9,22 +9,23 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@contember/authorization": "^1.2.0-alpha.18",
-    "@contember/database": "^1.2.0-alpha.18",
-    "@contember/database-migrations": "^1.2.0-alpha.18",
-    "@contember/dic": "^1.2.0-alpha.18",
-    "@contember/engine-common": "^1.2.0-alpha.18",
-    "@contember/graphql-utils": "^1.2.0-alpha.18",
-    "@contember/queryable": "^1.2.0-alpha.18",
-    "@contember/schema": "^1.2.0-alpha.18",
-    "@contember/schema-migrations": "^1.2.0-alpha.18",
-    "@contember/schema-utils": "^1.2.0-alpha.18",
+    "@contember/authorization": "^1.2.0-alpha.19",
+    "@contember/database": "^1.2.0-alpha.19",
+    "@contember/database-migrations": "^1.2.0-alpha.19",
+    "@contember/dic": "^1.2.0-alpha.19",
+    "@contember/engine-common": "^1.2.0-alpha.19",
+    "@contember/graphql-utils": "^1.2.0-alpha.19",
+    "@contember/logger": "^1.2.0-alpha.19",
+    "@contember/queryable": "^1.2.0-alpha.19",
+    "@contember/schema": "^1.2.0-alpha.19",
+    "@contember/schema-migrations": "^1.2.0-alpha.19",
+    "@contember/schema-utils": "^1.2.0-alpha.19",
     "@graphql-tools/utils": "^8.6.13",
     "graphql-tag": "^2.12.5"
   },
   "devDependencies": {
-    "@contember/engine-api-tester": "^1.2.0-alpha.18",
-    "@contember/schema-definition": "^1.2.0-alpha.18",
+    "@contember/engine-api-tester": "^1.2.0-alpha.19",
+    "@contember/schema-definition": "^1.2.0-alpha.19",
     "@graphql-codegen/cli": "^2.6.2",
     "@graphql-codegen/typescript": "^2.5.1",
     "@graphql-codegen/typescript-operations": "^2.4.2",

package/src/migrations/2020-05-06-150000-composed-primary.ts

@@ -1,7 +1,7 @@
 import { escapeValue, MigrationBuilder, Name } from '@contember/database-migrations'
 import { SystemMigrationArgs } from './types'
 import { getJunctionTables } from '../model'
-import { MigrationArgs } from '@contember/database-migrations/dist/src/Migration'
+import { MigrationArgs } from '@contember/database-migrations'
 
 const createEventTrigger = (builder: MigrationBuilder, tableName: Name, primaryColumns: string[]) => {
 	builder.createTrigger(tableName, 'log_event', {

package/src/migrations/2020-06-01-103000-event-trigger-perf.ts

@@ -1,7 +1,7 @@
 import { MigrationBuilder, Name } from '@contember/database-migrations'
 import { SystemMigrationArgs } from './types'
 import { getJunctionTables } from '../model'
-import { MigrationArgs } from '@contember/database-migrations/dist/src/Migration'
+import { MigrationArgs } from '@contember/database-migrations'
 
 const createEventStatementTrigger = (builder: MigrationBuilder, tableName: Name) => {
 	builder.createTrigger(tableName, 'log_event_statement', {

package/src/migrations/2021-05-07-155800-event-log-rework.ts

@@ -1,7 +1,7 @@
 import { MigrationBuilder, Name } from '@contember/database-migrations'
 import { SystemMigrationArgs } from './types'
 import { getJunctionTables } from '../model'
-import { MigrationArgs } from '@contember/database-migrations/dist/src/Migration'
+import { MigrationArgs } from '@contember/database-migrations'
 
 const createTrxEvent = (builder: MigrationBuilder, tableName: Name) => {
 	builder.createTrigger(tableName, 'log_event_trx', {

package/src/model/ProjectInitializer.ts

@@ -32,8 +32,7 @@ export class ProjectInitializer {
 				// todo: use dbContext
 				initLogger.debug('Executing system schema migrations')
 				await createDatabaseIfNotExists(project.db, message => typeof message === 'string' ? initLogger.warn(message) : initLogger.error(message))
-				const singleConnection = Connection.createSingle(project.db, err => initLogger.error(err))
-				singleConnection.eventManager.on(EventManager.Event.clientError, err => logger.error(err, { message: 'Database client error' }))
+				const singleConnection = Connection.createSingle(project.db, err => initLogger.error(err, { message: 'Database client error' }))
 
 				await singleConnection.scope(async connection => {
 					const systemSchema = dbContext.client.schema

package/src/model/migrations/ProjectMigrator.ts

@@ -82,16 +82,25 @@ export class ProjectMigrator {
 			}
 			const latestModification = described[described.length - 1]
 			schema = latestModification.schema
-			const errors = SchemaValidator.validate(schema)
+			const errors = SchemaValidator.validate(schema, migration.skippedErrors)
 			if (errors.length > 0) {
 				throw new InvalidSchemaError(
 					migration.version,
 					'Migration generates invalid schema: \n' +
-					errors.map(it => it.path.join('.') + ': ' + it.message).join('\n'),
+					errors.map(it => `${it.path.join('.')}: [${it.code}] ${it.message}`).join('\n'),
 				)
 			}
 			toExecute.push(migration)
 		}
+		// intentionally not using skippedErrors here
+		const errors = SchemaValidator.validate(schema)
+		if (errors.length > 0) {
+			throw new InvalidSchemaError(
+				toExecute[toExecute.length - 1].version,
+				'Migration generates invalid schema: \n' +
+				errors.map(it => it.path.join('.') + ': ' + it.message).join('\n'),
+			)
+		}
 		return toExecute
 	}
 

package/src/model/queries/events/LatestTransactionIdByStageQuery.ts

@@ -1,34 +1,20 @@
-import { DatabaseQuery, DatabaseQueryable } from '@contember/database'
+import { DatabaseQuery, DatabaseQueryable, SelectBuilder } from '@contember/database'
 import { ImplementationException } from '../../../utils'
 
 export class LatestTransactionIdByStageQuery extends DatabaseQuery<string> {
-	constructor(private readonly stageSlug: string) {
+	constructor(private readonly stageId: string) {
 		super()
 	}
 
 	async fetch(queryable: DatabaseQueryable): Promise<string> {
-		const stageId = (
-			await queryable.db.query<{ id: string }>(
-				`
-				SELECT id
-				FROM system.stage
-				WHERE slug = ?
-				`,
-				[this.stageSlug],
-			)
-		).rows[0].id
-		const rows = (
-			await queryable.db.query<{ transaction_id: string }>(
-				`
-				SELECT transaction_id
-				FROM system.stage_transaction
-				WHERE stage_id = ?
-				ORDER BY applied_at DESC
-				LIMIT 1
-				`,
-				[stageId],
-			)
-		).rows
+		const rows = await SelectBuilder.create<{ transaction_id: string }>()
+			.from('stage_transaction')
+			.select('transaction_id')
+			.where({ stage_id: this.stageId })
+			.orderBy('applied_at', 'desc')
+			.limit(1)
+			.getResult(queryable.db)
+
 		if (rows.length !== 1) {
 			throw new ImplementationException()
 		}

package/src/schema/system.graphql.ts

@@ -139,6 +139,12 @@ const schema: DocumentNode = gql`
 		name: String!
 		formatVersion: Int!
 		modifications: [Json!]!
+		skippedErrors: [MigrationSkippedError!]
+	}
+
+	input MigrationSkippedError {
+		code: String!
+		path: String
 	}
 
 	enum MigrateErrorCode {

package/src/schema/types.ts

@@ -145,6 +145,7 @@ export type Migration = {
 	readonly formatVersion: Scalars['Int']
 	readonly modifications: ReadonlyArray<Scalars['Json']>
 	readonly name: Scalars['String']
+	readonly skippedErrors?: InputMaybe<ReadonlyArray<MigrationSkippedError>>
 	readonly version: Scalars['String']
 }
 
@@ -188,6 +189,11 @@ export type MigrationModifyResponse = {
 	readonly ok: Scalars['Boolean']
 }
 
+export type MigrationSkippedError = {
+	readonly code: Scalars['String']
+	readonly path?: InputMaybe<Scalars['String']>
+}
+
 export type Mutation = {
 	readonly __typename?: 'Mutation'
 	readonly forceMigrate: MigrateResponse
@@ -358,6 +364,7 @@ export type ResolversTypes = {
 	MigrationModifyError: ResolverTypeWrapper<MigrationModifyError>
 	MigrationModifyErrorCode: MigrationModifyErrorCode
 	MigrationModifyResponse: ResolverTypeWrapper<MigrationModifyResponse>
+	MigrationSkippedError: MigrationSkippedError
 	Mutation: ResolverTypeWrapper<{}>
 	PrimaryKey: ResolverTypeWrapper<Scalars['PrimaryKey']>
 	Query: ResolverTypeWrapper<{}>
@@ -390,6 +397,7 @@ export type ResolversParentTypes = {
 	MigrationModification: MigrationModification
 	MigrationModifyError: MigrationModifyError
 	MigrationModifyResponse: MigrationModifyResponse
+	MigrationSkippedError: MigrationSkippedError
 	Mutation: {}
 	PrimaryKey: Scalars['PrimaryKey']
 	Query: {}

package/src/tsconfig.json

@@ -6,7 +6,7 @@
 	},
 	"references": [
 		{
-			"path": "../../queryable/src"
+			"path": "../../authorization/src"
 		},
 		{
 			"path": "../../database/src"
@@ -14,15 +14,18 @@
 		{
 			"path": "../../database-migrations/src"
 		},
-		{
-			"path": "../../authorization/src"
-		},
 		{
 			"path": "../../engine-common/src"
 		},
 		{
 			"path": "../../graphql-utils/src"
 		},
+		{
+			"path": "../../logger/src"
+		},
+		{
+			"path": "../../queryable/src"
+		},
 		{
 			"path": "../../schema/src"
 		},