@contember/engine-system-api 1.3.0-alpha.8 → 1.3.0-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (43) hide show
  1. package/dist/src/SystemContainer.d.ts +1 -1
  2. package/dist/src/SystemContainer.d.ts.map +1 -1
  3. package/dist/src/model/authorization/AuthorizationActions.js +1 -1
  4. package/dist/src/model/authorization/AuthorizationActions.js.map +1 -1
  5. package/dist/src/model/dependencies/tenant/IdentityFetcher.d.ts +1 -1
  6. package/dist/src/model/dependencies/tenant/IdentityFetcher.d.ts.map +1 -1
  7. package/dist/src/model/events/types.d.ts +1 -1
  8. package/dist/src/model/events/types.d.ts.map +1 -1
  9. package/dist/src/model/events/types.js +1 -1
  10. package/dist/src/model/events/types.js.map +1 -1
  11. package/dist/src/model/migrations/MigrationAlterer.js +2 -2
  12. package/dist/src/model/migrations/MigrationAlterer.js.map +1 -1
  13. package/dist/src/model/migrations/ProjectMigrator.d.ts.map +1 -1
  14. package/dist/src/model/migrations/ProjectMigrator.js +7 -1
  15. package/dist/src/model/migrations/ProjectMigrator.js.map +1 -1
  16. package/dist/src/model/migrations/SchemaVersionBuilder.d.ts +1 -1
  17. package/dist/src/model/migrations/SchemaVersionBuilder.d.ts.map +1 -1
  18. package/dist/src/model/queries/events/EventQueryHelpers.d.ts +1 -1
  19. package/dist/src/model/queries/events/EventQueryHelpers.d.ts.map +1 -1
  20. package/dist/src/model/queries/migrations/ExecutedMigrationsQueryHelper.d.ts +1 -1
  21. package/dist/src/model/queries/migrations/ExecutedMigrationsQueryHelper.d.ts.map +1 -1
  22. package/dist/src/resolvers/Resolver.d.ts +2 -2
  23. package/dist/src/resolvers/Resolver.d.ts.map +1 -1
  24. package/dist/src/resolvers/SystemResolverContext.d.ts +1 -1
  25. package/dist/src/resolvers/SystemResolverContext.d.ts.map +1 -1
  26. package/dist/src/schema/types.d.ts +67 -67
  27. package/dist/src/schema/types.d.ts.map +1 -1
  28. package/dist/src/schema/types.js +5 -5
  29. package/dist/src/schema/types.js.map +1 -1
  30. package/dist/src/tsconfig.tsbuildinfo +1 -1
  31. package/dist/src/utils/Response.d.ts +1 -1
  32. package/dist/src/utils/Response.d.ts.map +1 -1
  33. package/dist/src/utils/batchQuery.d.ts +1 -1
  34. package/dist/src/utils/batchQuery.d.ts.map +1 -1
  35. package/dist/src/utils/providers.d.ts +1 -1
  36. package/dist/src/utils/providers.d.ts.map +1 -1
  37. package/dist/src/utils/set.d.ts +1 -1
  38. package/dist/src/utils/set.d.ts.map +1 -1
  39. package/dist/tests/src/utils.d.ts +1 -1
  40. package/dist/tests/src/utils.d.ts.map +1 -1
  41. package/dist/tests/tsconfig.tsbuildinfo +1 -1
  42. package/package.json +15 -15
  43. package/src/model/migrations/ProjectMigrator.ts +8 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@contember/engine-system-api",
3
- "version": "1.3.0-alpha.8",
3
+ "version": "1.3.0-beta.1",
4
4
  "license": "Apache-2.0",
5
5
  "main": "dist/src/index.js",
6
6
  "typings": "dist/src/index.d.ts",
@@ -10,25 +10,25 @@
10
10
  },
11
11
  "scripts": {
12
12
  "generate": "gql-gen --config graphql.codegen.yml",
13
- "test": "vitest"
13
+ "test": "vitest --dir ./tests/cases"
14
14
  },
15
15
  "dependencies": {
16
- "@contember/authorization": "^1.3.0-alpha.8",
17
- "@contember/database": "^1.3.0-alpha.8",
18
- "@contember/database-migrations": "^1.3.0-alpha.8",
19
- "@contember/dic": "^1.3.0-alpha.8",
20
- "@contember/graphql-utils": "^1.3.0-alpha.8",
21
- "@contember/logger": "^1.3.0-alpha.8",
22
- "@contember/queryable": "^1.3.0-alpha.8",
23
- "@contember/schema": "^1.3.0-alpha.8",
24
- "@contember/schema-migrations": "^1.3.0-alpha.8",
25
- "@contember/schema-utils": "^1.3.0-alpha.8",
16
+ "@contember/authorization": "1.3.0-beta.1",
17
+ "@contember/database": "1.3.0-beta.1",
18
+ "@contember/database-migrations": "1.3.0-beta.1",
19
+ "@contember/dic": "1.3.0-beta.1",
20
+ "@contember/graphql-utils": "1.3.0-beta.1",
21
+ "@contember/logger": "1.3.0-beta.1",
22
+ "@contember/queryable": "1.3.0-beta.1",
23
+ "@contember/schema": "1.3.0-beta.1",
24
+ "@contember/schema-migrations": "1.3.0-beta.1",
25
+ "@contember/schema-utils": "1.3.0-beta.1",
26
26
  "@graphql-tools/utils": "^8.6.13",
27
27
  "graphql-tag": "^2.12.5"
28
28
  },
29
29
  "devDependencies": {
30
- "@contember/engine-api-tester": "^1.3.0-alpha.8",
31
- "@contember/schema-definition": "^1.3.0-alpha.8",
30
+ "@contember/engine-api-tester": "1.3.0-beta.1",
31
+ "@contember/schema-definition": "1.3.0-beta.1",
32
32
  "@graphql-codegen/cli": "^2.6.2",
33
33
  "@graphql-codegen/typescript": "^2.5.1",
34
34
  "@graphql-codegen/typescript-operations": "^2.4.2",
@@ -41,4 +41,4 @@
41
41
  "graphql": ">= 14.6.0",
42
42
  "pg": "^8.9.0"
43
43
  }
44
- }
44
+ }
package/src/model/migrations/ProjectMigrator.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { calculateMigrationChecksum, Migration, MigrationDescriber } from '@contember/schema-migrations'
1
+ import { calculateMigrationChecksum, Migration, MigrationDescriber, MigrationVersionHelper } from '@contember/schema-migrations'
2
2
  import { Client, QueryError, wrapIdentifier } from '@contember/database'
3
3
  import { Schema } from '@contember/schema'
4
4
  import { SaveMigrationCommand } from '../commands'
@@ -7,7 +7,7 @@ import { DatabaseContext } from '../database'
7
7
  import { ExecutedMigrationsResolver } from './ExecutedMigrationsResolver'
8
8
  import { MigrateErrorCode } from '../../schema'
9
9
  import { SchemaVersionBuilder } from './SchemaVersionBuilder'
10
- import { SchemaValidator } from '@contember/schema-utils'
10
+ import { SchemaValidator, SchemaValidatorSkippedErrors } from '@contember/schema-utils'
11
11
  import { logger } from '@contember/logger'
12
12
  import {
13
13
  SchemaDatabaseMetadataResolverStore,
@@ -72,6 +72,7 @@ export class ProjectMigrator {
72
72
  ): Promise<readonly Migration[]> {
73
73
  const executedMigrations = await this.executedMigrationsResolver.getMigrations(db)
74
74
  const toExecute = []
75
+ let skippedErrors: SchemaValidatorSkippedErrors[] = []
75
76
  for (const migration of migrationsToExecute) {
76
77
  const executedMigration = executedMigrations.find(it => it.version === migration.version)
77
78
  if (executedMigration) {
@@ -90,7 +91,11 @@ export class ProjectMigrator {
90
91
  }
91
92
  const latestModification = described[described.length - 1]
92
93
  schema = latestModification.schema
93
- const errors = SchemaValidator.validate(schema, migration.skippedErrors)
94
+ skippedErrors = [
95
+ ...skippedErrors.filter(it => it.skipUntil && MigrationVersionHelper.extractVersion(it.skipUntil) >= migration.version),
96
+ ...migration.skippedErrors ?? [],
97
+ ]
98
+ const errors = SchemaValidator.validate(schema, skippedErrors)
94
99
  if (errors.length > 0) {
95
100
  throw new InvalidSchemaError(
96
101
  migration.version,