@contember/cli 1.3.0-alpha.7 → 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.
- package/Dockerfile +1 -1
- package/build.sh +1 -0
- package/contember-docker.sh +0 -0
- package/dist/src/commands/deploy/DeployCommand.d.ts +2 -2
- package/dist/src/commands/deploy/DeployCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationAmendCommand.d.ts +2 -2
- package/dist/src/commands/migrations/MigrationAmendCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationAmendCommand.js +1 -1
- package/dist/src/commands/migrations/MigrationAmendCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationCreateHelper.d.ts +2 -2
- package/dist/src/commands/migrations/MigrationCreateHelper.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationDescribeCommand.d.ts +3 -4
- package/dist/src/commands/migrations/MigrationDescribeCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationDescribeCommand.js +1 -31
- package/dist/src/commands/migrations/MigrationDescribeCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationDiffCommand.d.ts +2 -2
- package/dist/src/commands/migrations/MigrationDiffCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationExecuteCommand.d.ts +3 -3
- package/dist/src/commands/migrations/MigrationExecuteCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationExecuteCommand.js +7 -26
- package/dist/src/commands/migrations/MigrationExecuteCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationExecuteHelper.d.ts +1 -1
- package/dist/src/commands/migrations/MigrationExecuteHelper.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationRebaseCommand.d.ts +2 -2
- package/dist/src/commands/migrations/MigrationRebaseCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationStatusCommand.d.ts +2 -2
- package/dist/src/commands/migrations/MigrationStatusCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationValidationHelper.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationValidationHelper.js +8 -2
- package/dist/src/commands/migrations/MigrationValidationHelper.js.map +1 -1
- package/dist/src/commands/project/ProjectCreateCommand.d.ts +2 -2
- package/dist/src/commands/project/ProjectCreateCommand.d.ts.map +1 -1
- package/dist/src/commands/project/ProjectGenerateDocumentation.d.ts +2 -2
- package/dist/src/commands/project/ProjectGenerateDocumentation.d.ts.map +1 -1
- package/dist/src/commands/project/ProjectPrintSchemaCommand.d.ts +3 -2
- package/dist/src/commands/project/ProjectPrintSchemaCommand.d.ts.map +1 -1
- package/dist/src/commands/project/ProjectPrintSchemaCommand.js +8 -5
- package/dist/src/commands/project/ProjectPrintSchemaCommand.js.map +1 -1
- package/dist/src/commands/project/ProjectValidateCommand.d.ts +2 -2
- package/dist/src/commands/project/ProjectValidateCommand.d.ts.map +1 -1
- package/dist/src/commands/tenant/CreateApiKeyCommand.d.ts +2 -2
- package/dist/src/commands/tenant/CreateApiKeyCommand.d.ts.map +1 -1
- package/dist/src/commands/tenant/InviteCommand.d.ts +2 -2
- package/dist/src/commands/tenant/InviteCommand.d.ts.map +1 -1
- package/dist/src/commands/tenant/ResetPasswordCommand.d.ts +2 -2
- package/dist/src/commands/tenant/ResetPasswordCommand.d.ts.map +1 -1
- package/dist/src/commands/tenant/SignInCommand.d.ts +2 -2
- package/dist/src/commands/tenant/SignInCommand.d.ts.map +1 -1
- package/dist/src/commands/transfer/ExportCommand.d.ts +2 -2
- package/dist/src/commands/transfer/ExportCommand.d.ts.map +1 -1
- package/dist/src/commands/transfer/ImportCommand.d.ts +2 -2
- package/dist/src/commands/transfer/ImportCommand.d.ts.map +1 -1
- package/dist/src/commands/transfer/TransferCommand.d.ts +2 -2
- package/dist/src/commands/transfer/TransferCommand.d.ts.map +1 -1
- package/dist/src/commands/transfer/utils.d.ts +1 -1
- package/dist/src/commands/transfer/utils.d.ts.map +1 -1
- package/dist/src/commands/workspace/WorkspaceUpdateApiCommand.d.ts +2 -2
- package/dist/src/commands/workspace/WorkspaceUpdateApiCommand.d.ts.map +1 -1
- package/dist/src/commands/workspace/WorkspaceUpdateApiCommand.js +9 -7
- package/dist/src/commands/workspace/WorkspaceUpdateApiCommand.js.map +1 -1
- package/dist/src/run.js +4 -0
- package/dist/src/run.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/src/utils/admin.d.ts +1 -1
- package/dist/src/utils/admin.d.ts.map +1 -1
- package/dist/src/utils/checkVersions.d.ts +3 -0
- package/dist/src/utils/checkVersions.d.ts.map +1 -0
- package/dist/src/utils/checkVersions.js +83 -0
- package/dist/src/utils/checkVersions.js.map +1 -0
- package/dist/src/utils/dockerCompose.d.ts +3 -0
- package/dist/src/utils/dockerCompose.d.ts.map +1 -1
- package/dist/src/utils/dockerCompose.js +45 -4
- package/dist/src/utils/dockerCompose.js.map +1 -1
- package/dist/src/utils/instance/environment.d.ts +1 -1
- package/dist/src/utils/instance/environment.d.ts.map +1 -1
- package/dist/src/utils/migrations.d.ts +3 -3
- package/dist/src/utils/migrations.d.ts.map +1 -1
- package/dist/src/utils/migrations.js +13 -5
- package/dist/src/utils/migrations.js.map +1 -1
- package/dist/src/utils/schema/collectReferences.d.ts +2 -2
- package/dist/src/utils/schema/collectReferences.d.ts.map +1 -1
- package/dist/src/utils/system/index.d.ts +2 -2
- package/dist/src/utils/system/index.d.ts.map +1 -1
- package/dist/src/utils/system/index.js +1 -1
- package/dist/src/utils/system/index.js.map +1 -1
- package/dist/src/utils/tenant.d.ts +2 -2
- package/dist/src/utils/tenant.d.ts.map +1 -1
- package/dist/src/utils/yaml.d.ts +1 -1
- package/dist/src/utils/yaml.d.ts.map +1 -1
- package/package.json +13 -11
- package/src/commands/migrations/MigrationAmendCommand.ts +1 -1
- package/src/commands/migrations/MigrationDescribeCommand.ts +3 -37
- package/src/commands/migrations/MigrationExecuteCommand.ts +11 -29
- package/src/commands/migrations/MigrationValidationHelper.ts +9 -3
- package/src/commands/project/ProjectPrintSchemaCommand.ts +10 -6
- package/src/commands/workspace/WorkspaceUpdateApiCommand.ts +10 -8
- package/src/run.ts +7 -1
- package/src/utils/checkVersions.ts +58 -0
- package/src/utils/dockerCompose.ts +20 -3
- package/src/utils/migrations.ts +12 -4
- package/dist/src/utils/commands.d.ts +0 -21
- package/dist/src/utils/commands.d.ts.map +0 -1
- package/dist/src/utils/commands.js +0 -57
- package/dist/src/utils/commands.js.map +0 -1
- package/dist/src/utils/npm.d.ts +0 -6
- package/dist/src/utils/npm.d.ts.map +0 -1
- package/dist/src/utils/npm.js +0 -62
- package/dist/src/utils/npm.js.map +0 -1
- package/src/utils/commands.ts +0 -65
- package/src/utils/npm.ts +0 -63
package/Dockerfile
CHANGED
|
@@ -4,7 +4,7 @@ WORKDIR /src
|
|
|
4
4
|
RUN apk --no-cache add bash
|
|
5
5
|
RUN apk --no-cache add build-base python3
|
|
6
6
|
COPY ./ ./
|
|
7
|
-
RUN test ! -f yarn.tar.gz || tar xf yarn.tar.gz -C "
|
|
7
|
+
RUN test ! -f yarn.tar.gz || tar xf yarn.tar.gz -C "./.yarn/cache" .
|
|
8
8
|
RUN /src/packages/cli/build.sh
|
|
9
9
|
|
|
10
10
|
FROM node:18-alpine
|
package/build.sh
CHANGED
package/contember-docker.sh
CHANGED
|
File without changes
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common';
|
|
2
2
|
import { ExecuteMigrationOptions } from '../migrations/MigrationExecuteHelper';
|
|
3
|
-
|
|
3
|
+
type Args = {
|
|
4
4
|
dsn: string;
|
|
5
5
|
project?: string;
|
|
6
6
|
};
|
|
7
|
-
|
|
7
|
+
type Options = ExecuteMigrationOptions & {
|
|
8
8
|
admin?: string;
|
|
9
9
|
};
|
|
10
10
|
export declare class DeployCommand extends Command<Args, Options> {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeployCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/deploy/DeployCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAuB,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAC5G,OAAO,EAEN,uBAAuB,EAGvB,MAAM,sCAAsC,CAAA;AAY7C,
|
|
1
|
+
{"version":3,"file":"DeployCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/deploy/DeployCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAuB,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAC5G,OAAO,EAEN,uBAAuB,EAGvB,MAAM,sCAAsC,CAAA;AAY7C,KAAK,IAAI,GAAG;IACX,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,OAAO,GAAG,uBAAuB,GAAG;IACxC,KAAK,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,qBAAa,aAAc,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IAEvD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAKtC,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI;cAU7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;IA6F5E,OAAO,CAAC,kBAAkB;CAS1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationAmendCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationAmendCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAiBvF,
|
|
1
|
+
{"version":3,"file":"MigrationAmendCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationAmendCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAiBvF,KAAK,IAAI,GAAG;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,KAAK,OAAO,GAAG;IACd,GAAG,CAAC,EAAE,IAAI,CAAA;IACV,KAAK,EAAE,OAAO,CAAA;CACd,CAAA;AAED,qBAAa,qBAAsB,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IAE/D,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAKtC,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI;cAa7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;YA4GvD,cAAc;CAgB5B"}
|
|
@@ -65,7 +65,7 @@ class MigrationAmendCommand extends cli_common_1.Command {
|
|
|
65
65
|
throw 'Incompatible migration format version';
|
|
66
66
|
}
|
|
67
67
|
const prevSchema = await schemaVersionBuilder.buildSchemaAdvanced(schema_utils_1.emptySchema, version => version < amendMigration.version);
|
|
68
|
-
const
|
|
68
|
+
const newSchema = await schemaMigrator.applyModifications(prevSchema, [...amendMigration.modifications, ...intermediateResult.migration.modifications], amendMigration.formatVersion);
|
|
69
69
|
const newMigrationResult = await migrationCreator.prepareMigration(prevSchema, newSchema, '');
|
|
70
70
|
const followingMigrations = (await migrationsResolver.getMigrations()).filter(it => it.version > amendMigration.version);
|
|
71
71
|
const valid = await (0, MigrationValidationHelper_1.validateMigrations)(prevSchema, [...(newMigrationResult ? [newMigrationResult.migration] : []), ...followingMigrations], migrationDescriber, schemaMigrator);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationAmendCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationAmendCommand.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"MigrationAmendCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationAmendCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { Input } from '@contember/cli-common';
|
|
2
2
|
import { MigrationCreator, MigrationDescriber, MigrationFilesManager, MigrationsResolver, SchemaMigrator, SchemaVersionBuilder } from '@contember/schema-migrations';
|
|
3
3
|
import { Workspace, Project } from '@contember/cli-common';
|
|
4
|
-
|
|
4
|
+
type Args = {
|
|
5
5
|
project?: string;
|
|
6
6
|
migrationName: string;
|
|
7
7
|
};
|
|
8
|
-
|
|
8
|
+
type Options = {};
|
|
9
9
|
export declare const executeCreateMigrationCommand: (input: Input<Pick<Args, 'project'>, Options>, { workspace }: {
|
|
10
10
|
workspace: Workspace;
|
|
11
11
|
}, createMigrationCallback: (args: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationCreateHelper.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationCreateHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAEnE,OAAO,EACN,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EAClB,cAAc,EACd,oBAAoB,EACpB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAE1D,
|
|
1
|
+
{"version":3,"file":"MigrationCreateHelper.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationCreateHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAEnE,OAAO,EACN,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EAClB,cAAc,EACd,oBAAoB,EACpB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAE1D,KAAK,IAAI,GAAG;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,KAAK,OAAO,GAAG,EAAE,CAAA;AAEjB,eAAO,MAAM,6BAA6B,UAClC,MAAM,KAAK,IAAI,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC;eACjB,SAAS;;eAExB,SAAS;aACX,OAAO;sBACE,gBAAgB;wBACd,kBAAkB;wBAClB,kBAAkB;0BAChB,oBAAoB;oBAC1B,cAAc;2BACP,qBAAqB;MACvC,QAAQ,MAAM,CAAC,oBA4BrB,CAAA"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import { Command, CommandConfiguration, Input } from '@contember/cli-common';
|
|
2
|
-
|
|
3
|
-
declare type Args = {
|
|
1
|
+
import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common';
|
|
2
|
+
type Args = {
|
|
4
3
|
project?: string;
|
|
5
4
|
migration?: string;
|
|
6
5
|
};
|
|
7
|
-
|
|
6
|
+
type Options = {
|
|
8
7
|
['sql-only']: boolean;
|
|
9
8
|
['no-sql']: boolean;
|
|
10
9
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationDescribeCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationDescribeCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"MigrationDescribeCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationDescribeCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAIvF,KAAK,IAAI,GAAG;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,KAAK,OAAO,GAAG;IACd,CAAC,UAAU,CAAC,EAAE,OAAO,CAAA;IACrB,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAGD,qBAAa,wBAAyB,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IAElE,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAKtC,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI;cAU7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAqBnE"}
|
|
@@ -1,39 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.MigrationDescribeCommand = void 0;
|
|
7
4
|
const cli_common_1 = require("@contember/cli-common");
|
|
8
5
|
const MigrationsContainer_1 = require("../../MigrationsContainer");
|
|
9
6
|
const migrations_1 = require("../../utils/migrations");
|
|
10
|
-
const chalk_1 = __importDefault(require("chalk"));
|
|
11
|
-
let printMigrationDescription = async function (migrationsDescriber, schema, migration, options) {
|
|
12
|
-
const description = await migrationsDescriber.describeModifications(schema, migration, 'system'); // schema name cannot be determined here
|
|
13
|
-
description.forEach(({ modification, sql, description }) => {
|
|
14
|
-
if (options.sqlOnly) {
|
|
15
|
-
if (sql.trim()) {
|
|
16
|
-
console.log(sql);
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
else {
|
|
20
|
-
const color = description.isDestructive ? chalk_1.default.red : chalk_1.default.blue;
|
|
21
|
-
console.group(color(`${description.message} [${modification.modification}]`));
|
|
22
|
-
if (description.failureWarning) {
|
|
23
|
-
console.log(chalk_1.default.bgWhite(chalk_1.default.redBright(description.failureWarning)));
|
|
24
|
-
}
|
|
25
|
-
if (!options.noSql) {
|
|
26
|
-
if (sql.trim()) {
|
|
27
|
-
console.log(sql);
|
|
28
|
-
}
|
|
29
|
-
else {
|
|
30
|
-
console.log('No sql to execute');
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
console.groupEnd();
|
|
34
|
-
}
|
|
35
|
-
});
|
|
36
|
-
};
|
|
37
7
|
class MigrationDescribeCommand extends cli_common_1.Command {
|
|
38
8
|
constructor(workspace) {
|
|
39
9
|
super();
|
|
@@ -65,7 +35,7 @@ class MigrationDescribeCommand extends cli_common_1.Command {
|
|
|
65
35
|
const schema = await container.schemaVersionBuilder.buildSchemaUntil(migration.version);
|
|
66
36
|
const sqlOnly = input.getOption('sql-only');
|
|
67
37
|
const noSql = input.getOption('no-sql');
|
|
68
|
-
|
|
38
|
+
(0, migrations_1.printMigrationDescription)(container.migrationDescriber, schema, migration, { sqlOnly, noSql });
|
|
69
39
|
}
|
|
70
40
|
}
|
|
71
41
|
exports.MigrationDescribeCommand = MigrationDescribeCommand;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationDescribeCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationDescribeCommand.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MigrationDescribeCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationDescribeCommand.ts"],"names":[],"mappings":";;;AAAA,sDAAuF;AACvF,mEAAsE;AACtE,uDAA0G;AAa1G,MAAa,wBAAyB,SAAQ,oBAAsB;IACnE,YACkB,SAAoB;QAErC,KAAK,EAAE,CAAA;QAFU,cAAS,GAAT,SAAS,CAAW;IAGtC,CAAC;IAES,SAAS,CAAC,aAAkD;QACrE,aAAa,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAA;QAClD,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,EAAE;YAC1C,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;SACjC;QACD,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAA;QAC9C,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,EAAE,CAAA;QAC5C,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,EAAE,CAAA;IAC3C,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,KAA2B;QAClD,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;QAEhD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAA;QAChC,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QACjF,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,aAAa,CAAA;QACjD,MAAM,SAAS,GAAG,IAAI,gDAA0B,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE,CAAA;QAExE,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,CAAC,WAAW,CAAC,CAAA;QACnD,MAAM,kBAAkB,GAAG,SAAS,CAAC,kBAAkB,CAAA;QACvD,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY;YACpC,CAAC,CAAC,IAAA,+BAAkB,EAAC,kBAAkB,EAAE,YAAY,CAAC;YACtD,CAAC,CAAC,IAAA,+BAAkB,EAAC,kBAAkB,CAAC,CAAC,CAAA;QAC1C,IAAI,CAAC,SAAS,EAAE;YACf,MAAM,qBAAqB,CAAA;SAC3B;QACD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QACvF,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;QAC3C,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QACvC,IAAA,sCAAyB,EAAC,SAAS,CAAC,kBAAkB,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAA;IAC/F,CAAC;CACD;AAtCD,4DAsCC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common';
|
|
2
|
-
|
|
2
|
+
type Args = {
|
|
3
3
|
project?: string;
|
|
4
4
|
migrationName: string;
|
|
5
5
|
};
|
|
6
|
-
|
|
6
|
+
type Options = {
|
|
7
7
|
execute?: true;
|
|
8
8
|
yes?: true;
|
|
9
9
|
'skip-initial-schema-validation'?: true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationDiffCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationDiffCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAYvF,
|
|
1
|
+
{"version":3,"file":"MigrationDiffCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationDiffCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAYvF,KAAK,IAAI,GAAG;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,KAAK,OAAO,GAAG;IACd,OAAO,CAAC,EAAE,IAAI,CAAA;IACd,GAAG,CAAC,EAAE,IAAI,CAAA;IACV,gCAAgC,CAAC,EAAE,IAAI,CAAA;CACvC,CAAA;AAED,qBAAa,oBAAqB,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IAE9D,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAKtC,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI;cAe7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CAgFrE"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common';
|
|
2
2
|
import { ExecuteMigrationOptions } from './MigrationExecuteHelper';
|
|
3
|
-
|
|
3
|
+
type Args = {
|
|
4
4
|
project?: string;
|
|
5
|
-
migration?: string;
|
|
6
5
|
};
|
|
7
|
-
|
|
6
|
+
type Options = ExecuteMigrationOptions & {
|
|
7
|
+
until?: string;
|
|
8
8
|
force: boolean;
|
|
9
9
|
};
|
|
10
10
|
export declare class MigrationExecuteCommand extends Command<Args, Options> {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationExecuteCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationExecuteCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"MigrationExecuteCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationExecuteCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEvF,OAAO,EAEN,uBAAuB,EAGvB,MAAM,0BAA0B,CAAA;AAOjC,KAAK,IAAI,GAAG;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,OAAO,GAAG,uBAAuB,GAAG;IACxC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,OAAO,CAAA;CACd,CAAA;AAED,qBAAa,uBAAwB,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IAEjE,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAKtC,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI;cAU7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CAyDrE"}
|
|
@@ -5,10 +5,10 @@ const cli_common_1 = require("@contember/cli-common");
|
|
|
5
5
|
const MigrationsContainer_1 = require("../../MigrationsContainer");
|
|
6
6
|
const MigrationExecuteHelper_1 = require("./MigrationExecuteHelper");
|
|
7
7
|
const migrations_1 = require("../../utils/migrations");
|
|
8
|
-
const assertNever_1 = require("../../utils/assertNever");
|
|
9
8
|
const instance_1 = require("../../utils/instance");
|
|
10
9
|
const tenant_1 = require("../../utils/tenant");
|
|
11
10
|
const system_1 = require("../../utils/system");
|
|
11
|
+
const schema_migrations_1 = require("@contember/schema-migrations");
|
|
12
12
|
class MigrationExecuteCommand extends cli_common_1.Command {
|
|
13
13
|
constructor(workspace) {
|
|
14
14
|
super();
|
|
@@ -19,8 +19,8 @@ class MigrationExecuteCommand extends cli_common_1.Command {
|
|
|
19
19
|
if (!this.workspace.isSingleProjectMode()) {
|
|
20
20
|
configuration.argument('project');
|
|
21
21
|
}
|
|
22
|
-
configuration.argument('migration').optional();
|
|
23
22
|
configuration.option('force').description('Ignore migrations order and missing migrations (dev only)');
|
|
23
|
+
configuration.option('until').valueRequired().description('Execute all migrations leading up to, and inclusive of, a specified migration');
|
|
24
24
|
(0, MigrationExecuteHelper_1.configureExecuteMigrationCommand)(configuration);
|
|
25
25
|
}
|
|
26
26
|
async execute(input) {
|
|
@@ -38,7 +38,6 @@ class MigrationExecuteCommand extends cli_common_1.Command {
|
|
|
38
38
|
for (const project of projects) {
|
|
39
39
|
const migrationsDir = project.migrationsDir;
|
|
40
40
|
const container = new MigrationsContainer_1.MigrationsContainerFactory(migrationsDir).create();
|
|
41
|
-
const migrationArg = input.getArgument('migration');
|
|
42
41
|
const instance = await (0, instance_1.interactiveResolveInstanceEnvironmentFromInput)(workspace, input === null || input === void 0 ? void 0 : input.getOption('instance'));
|
|
43
42
|
const apiToken = await (0, tenant_1.interactiveResolveApiToken)({ workspace, instance });
|
|
44
43
|
const remoteProject = remoteProjectOption || project.name;
|
|
@@ -53,29 +52,11 @@ class MigrationExecuteCommand extends cli_common_1.Command {
|
|
|
53
52
|
throw `Cannot execute migrations`;
|
|
54
53
|
}
|
|
55
54
|
}
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
}
|
|
62
|
-
switch (migration.state) {
|
|
63
|
-
case migrations_1.MigrationState.EXECUTED_OK:
|
|
64
|
-
throw `Migration ${migrationArg} is already executed`;
|
|
65
|
-
case migrations_1.MigrationState.TO_EXECUTE_ERROR:
|
|
66
|
-
case migrations_1.MigrationState.EXECUTED_ERROR:
|
|
67
|
-
case migrations_1.MigrationState.EXECUTED_MISSING:
|
|
68
|
-
throw `Cannot execute migration ${migrationArg}: ${migration.errorMessage} (${migration.state})`;
|
|
69
|
-
case migrations_1.MigrationState.TO_EXECUTE_OK:
|
|
70
|
-
return [migration];
|
|
71
|
-
default:
|
|
72
|
-
(0, assertNever_1.assertNever)(migration);
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
else {
|
|
76
|
-
return status.migrationsToExecute;
|
|
77
|
-
}
|
|
78
|
-
})();
|
|
55
|
+
const until = input.getOption('until');
|
|
56
|
+
const untilNormalized = until ? schema_migrations_1.MigrationVersionHelper.extractVersion(until) : null;
|
|
57
|
+
const migrations = untilNormalized
|
|
58
|
+
? status.migrationsToExecute.filter(it => it.version <= schema_migrations_1.MigrationVersionHelper.extractVersion(untilNormalized))
|
|
59
|
+
: status.migrationsToExecute;
|
|
79
60
|
if (migrations.length === 0) {
|
|
80
61
|
console.log('No migrations to execute');
|
|
81
62
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationExecuteCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationExecuteCommand.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"MigrationExecuteCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationExecuteCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { CommandConfiguration } from '@contember/cli-common';
|
|
|
2
2
|
import { SystemClient } from '../../utils/system';
|
|
3
3
|
import { getMigrationsStatus, MigrationToExecuteOkStatus } from '../../utils/migrations';
|
|
4
4
|
import { MigrationDescriber, MigrationsResolver, SchemaVersionBuilder } from '@contember/schema-migrations';
|
|
5
|
-
export
|
|
5
|
+
export type ExecuteMigrationOptions = {
|
|
6
6
|
instance?: string;
|
|
7
7
|
['remote-project']?: string;
|
|
8
8
|
yes?: true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationExecuteHelper.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationExecuteHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAA6B,MAAM,wBAAwB,CAAA;AACnH,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAG3G,
|
|
1
|
+
{"version":3,"file":"MigrationExecuteHelper.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationExecuteHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAA6B,MAAM,wBAAwB,CAAA;AACnH,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAG3G,MAAM,MAAM,uBAAuB,GAAG;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,CAAC,gBAAgB,CAAC,CAAC,EAAE,MAAM,CAAA;IAC3B,GAAG,CAAC,EAAE,IAAI,CAAA;CACV,CAAA;AAED,eAAO,MAAM,gCAAgC,kBAAmB,qBAAqB,EAAE,EAAE,uBAAuB,CAAC,SAahH,CAAA;AAED,eAAO,MAAM,sBAAsB,WAC1B,YAAY,sBACA,kBAAkB,UAC/B,OAAO,KACZ,QAAQ,WAAW,0BAA0B,CAAC,CAIhD,CAAA;AAED,eAAO,MAAM,iBAAiB;YAQrB,YAAY;gBACR,0BAA0B,EAAE;yBACnB,OAAO;0BACN,oBAAoB;wBACtB,kBAAkB;;MAEnC,QAAQ,MAAM,CA0CjB,CAAA"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common';
|
|
2
|
-
|
|
2
|
+
type Args = {
|
|
3
3
|
project?: string;
|
|
4
4
|
migration: string[];
|
|
5
5
|
};
|
|
6
|
-
|
|
6
|
+
type Options = {
|
|
7
7
|
yes?: true;
|
|
8
8
|
};
|
|
9
9
|
export declare class MigrationRebaseCommand extends Command<Args, Options> {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationRebaseCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationRebaseCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAQvF,
|
|
1
|
+
{"version":3,"file":"MigrationRebaseCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationRebaseCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAQvF,KAAK,IAAI,GAAG;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,EAAE,CAAA;CACnB,CAAA;AAED,KAAK,OAAO,GAAG;IACd,GAAG,CAAC,EAAE,IAAI,CAAA;CACV,CAAA;AAED,qBAAa,sBAAuB,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IAEhE,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAMtC,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI;cAY7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CAqDrE"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Command, CommandConfiguration, Input } from '@contember/cli-common';
|
|
2
2
|
import { Workspace } from '@contember/cli-common';
|
|
3
|
-
|
|
3
|
+
type Args = {
|
|
4
4
|
project?: string;
|
|
5
5
|
};
|
|
6
|
-
|
|
6
|
+
type Options = {
|
|
7
7
|
instance?: string;
|
|
8
8
|
['remote-project']?: string;
|
|
9
9
|
['only-to-execute']?: true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationStatusCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationStatusCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAO5E,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEjD,
|
|
1
|
+
{"version":3,"file":"MigrationStatusCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationStatusCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAO5E,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEjD,KAAK,IAAI,GAAG;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,OAAO,GAAG;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,CAAC,gBAAgB,CAAC,CAAC,EAAE,MAAM,CAAA;IAC3B,CAAC,iBAAiB,CAAC,CAAC,EAAE,IAAI,CAAA;IAC1B,CAAC,aAAa,CAAC,CAAC,EAAE,IAAI,CAAA;IACtB,CAAC,iBAAiB,CAAC,CAAC,EAAE,IAAI,CAAA;CAC1B,CAAA;AAED,qBAAa,sBAAuB,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IAEhE,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAKtC,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI;cA2B7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CAyDrE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationValidationHelper.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationValidationHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,SAAS,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"MigrationValidationHelper.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationValidationHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAA0B,cAAc,EAAqB,MAAM,8BAA8B,CAAA;AAIvI,eAAO,MAAM,kBAAkB,kBACf,MAAM,cACT,SAAS,EAAE,aACZ,kBAAkB,YACnB,cAAc,KACtB,QAAQ,OAAO,CAyBjB,CAAA"}
|
|
@@ -4,12 +4,14 @@ exports.validateMigrations = void 0;
|
|
|
4
4
|
const schema_migrations_1 = require("@contember/schema-migrations");
|
|
5
5
|
const schema_1 = require("../../utils/schema");
|
|
6
6
|
const validateMigrations = async (initialSchema, migrations, describer, migrator) => {
|
|
7
|
+
var _a;
|
|
7
8
|
let migratedSchema = initialSchema;
|
|
8
9
|
let projectValid = true;
|
|
10
|
+
let skippedErrors = [];
|
|
9
11
|
for (const migration of await migrations) {
|
|
10
12
|
try {
|
|
11
13
|
// just a check that it does not fail
|
|
12
|
-
|
|
14
|
+
describer.describeModifications(migratedSchema, migration);
|
|
13
15
|
migratedSchema = migrator.applyModifications(migratedSchema, migration.modifications, migration.formatVersion);
|
|
14
16
|
}
|
|
15
17
|
catch (e) {
|
|
@@ -19,7 +21,11 @@ const validateMigrations = async (initialSchema, migrations, describer, migrator
|
|
|
19
21
|
throw e;
|
|
20
22
|
}
|
|
21
23
|
const errorMessage = `Migration ${migration.name} produces invalid schema:`;
|
|
22
|
-
|
|
24
|
+
skippedErrors = [
|
|
25
|
+
...skippedErrors.filter(it => it.skipUntil && schema_migrations_1.MigrationVersionHelper.extractVersion(it.skipUntil) >= migration.version),
|
|
26
|
+
...(_a = migration.skippedErrors) !== null && _a !== void 0 ? _a : [],
|
|
27
|
+
];
|
|
28
|
+
projectValid = (0, schema_1.validateSchemaAndPrintErrors)(migratedSchema, errorMessage, skippedErrors)
|
|
23
29
|
&& projectValid;
|
|
24
30
|
}
|
|
25
31
|
return projectValid;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationValidationHelper.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationValidationHelper.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"MigrationValidationHelper.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationValidationHelper.ts"],"names":[],"mappings":";;;AACA,oEAAuI;AACvI,+CAAiE;AAG1D,MAAM,kBAAkB,GAAG,KAAK,EACtC,aAAqB,EACrB,UAAuB,EACvB,SAA6B,EAC7B,QAAwB,EACL,EAAE;;IACrB,IAAI,cAAc,GAAG,aAAa,CAAA;IAClC,IAAI,YAAY,GAAG,IAAI,CAAA;IACvB,IAAI,aAAa,GAAmC,EAAE,CAAA;IACtD,KAAK,MAAM,SAAS,IAAI,MAAM,UAAU,EAAE;QACzC,IAAI;YACH,qCAAqC;YACrC,SAAS,CAAC,qBAAqB,CAAC,cAAc,EAAE,SAAS,CAAC,CAAA;YAE1D,cAAc,GAAG,QAAQ,CAAC,kBAAkB,CAAC,cAAc,EAAE,SAAS,CAAC,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,CAAA;SAC9G;QAAC,OAAO,CAAC,EAAE;YACX,IAAI,CAAC,YAAY,qCAAiB,EAAE;gBACnC,OAAO,CAAC,KAAK,CAAC,aAAa,SAAS,CAAC,IAAI,aAAa,CAAC,CAAA;aACvD;YACD,MAAM,CAAC,CAAA;SACP;QACD,MAAM,YAAY,GAAG,aAAa,SAAS,CAAC,IAAI,2BAA2B,CAAA;QAC3E,aAAa,GAAG;YACf,GAAG,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,IAAI,0CAAsB,CAAC,cAAc,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC;YACvH,GAAG,MAAA,SAAS,CAAC,aAAa,mCAAI,EAAE;SAChC,CAAA;QACD,YAAY,GAAG,IAAA,qCAA4B,EAAC,cAAc,EAAE,YAAY,EAAE,aAAa,CAAC;eACpF,YAAY,CAAA;KAChB;IACD,OAAO,YAAY,CAAA;AACpB,CAAC,CAAA;AA9BY,QAAA,kBAAkB,sBA8B9B"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Command, CommandConfiguration, Input } from '@contember/cli-common';
|
|
2
2
|
import { Workspace } from '@contember/cli-common';
|
|
3
|
-
|
|
3
|
+
type Args = {
|
|
4
4
|
project: string;
|
|
5
5
|
};
|
|
6
|
-
|
|
6
|
+
type Options = {
|
|
7
7
|
template: string;
|
|
8
8
|
};
|
|
9
9
|
export declare class ProjectCreateCommand extends Command<Args, Options> {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectCreateCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/ProjectCreateCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAC5E,OAAO,EAAE,SAAS,EAAuB,MAAM,uBAAuB,CAAA;AAEtE,
|
|
1
|
+
{"version":3,"file":"ProjectCreateCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/ProjectCreateCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAC5E,OAAO,EAAE,SAAS,EAAuB,MAAM,uBAAuB,CAAA;AAEtE,KAAK,IAAI,GAAG;IACX,OAAO,EAAE,MAAM,CAAA;CACf,CAAA;AAED,KAAK,OAAO,GAAG;IACd,QAAQ,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,qBAAa,oBAAqB,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IAE9D,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAKtC,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI;cAM7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAUnE"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common';
|
|
2
|
-
|
|
2
|
+
type Args = {
|
|
3
3
|
project?: string;
|
|
4
4
|
};
|
|
5
|
-
|
|
5
|
+
type Options = {
|
|
6
6
|
output?: string;
|
|
7
7
|
};
|
|
8
8
|
export declare class ProjectGenerateDocumentation extends Command<Args, Options> {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectGenerateDocumentation.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/ProjectGenerateDocumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAOvF,
|
|
1
|
+
{"version":3,"file":"ProjectGenerateDocumentation.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/ProjectGenerateDocumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAOvF,KAAK,IAAI,GAAG;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,OAAO,GAAG;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,qBAAa,4BAA6B,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IAEtE,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAKtC,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI;cAQ7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CAkBrE"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Command, CommandConfiguration, Input } from '@contember/cli-common';
|
|
2
2
|
import { Workspace } from '@contember/cli-common';
|
|
3
|
-
|
|
3
|
+
type Args = {
|
|
4
4
|
project?: string;
|
|
5
5
|
};
|
|
6
|
-
|
|
6
|
+
type Options = {
|
|
7
7
|
role?: string[];
|
|
8
|
+
normalize?: boolean;
|
|
8
9
|
format?: 'graphql' | 'introspection' | 'schema';
|
|
9
10
|
};
|
|
10
11
|
export declare class ProjectPrintSchemaCommand extends Command<Args, Options> {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectPrintSchemaCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/ProjectPrintSchemaCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAE5E,OAAO,EAAE,SAAS,EAAuB,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"ProjectPrintSchemaCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/ProjectPrintSchemaCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAE5E,OAAO,EAAE,SAAS,EAAuB,MAAM,uBAAuB,CAAA;AActE,KAAK,IAAI,GAAG;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,OAAO,GAAG;IACd,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,MAAM,CAAC,EAAE,SAAS,GAAG,eAAe,GAAG,QAAQ,CAAA;CAC/C,CAAA;AAED,qBAAa,yBAA0B,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IAEnE,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAKtC,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI;cAU7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CA6CrE"}
|
|
@@ -7,6 +7,7 @@ const engine_content_api_1 = require("@contember/engine-content-api");
|
|
|
7
7
|
const graphql_1 = require("graphql");
|
|
8
8
|
const schema_2 = require("@graphql-tools/schema");
|
|
9
9
|
const loadSchema_1 = require("../../utils/project/loadSchema");
|
|
10
|
+
const schema_utils_1 = require("@contember/schema-utils");
|
|
10
11
|
class ProjectPrintSchemaCommand extends cli_common_1.Command {
|
|
11
12
|
constructor(workspace) {
|
|
12
13
|
super();
|
|
@@ -19,6 +20,7 @@ class ProjectPrintSchemaCommand extends cli_common_1.Command {
|
|
|
19
20
|
}
|
|
20
21
|
configuration.option('format').valueRequired().description('graphql|introspection|schema');
|
|
21
22
|
configuration.option('role').valueArray();
|
|
23
|
+
configuration.option('normalize').valueNone();
|
|
22
24
|
}
|
|
23
25
|
async execute(input) {
|
|
24
26
|
var _a;
|
|
@@ -32,21 +34,22 @@ class ProjectPrintSchemaCommand extends cli_common_1.Command {
|
|
|
32
34
|
}
|
|
33
35
|
const permissionFactory = new engine_content_api_1.PermissionFactory();
|
|
34
36
|
const inputRoles = input.getOption('role');
|
|
35
|
-
const
|
|
37
|
+
const schemaNormalized = input.getOption('normalize') ? (0, schema_utils_1.normalizeSchema)(schema) : schema;
|
|
38
|
+
const permissions = permissionFactory.create(schemaNormalized, inputRoles || ['admin']);
|
|
36
39
|
const schemaBuilderFactory = new engine_content_api_1.GraphQlSchemaBuilderFactory();
|
|
37
|
-
const authorizator = new engine_content_api_1.Authorizator(permissions, (_a =
|
|
38
|
-
const introspection = new engine_content_api_1.IntrospectionSchemaFactory(
|
|
40
|
+
const authorizator = new engine_content_api_1.Authorizator(permissions, (_a = schemaNormalized.acl.customPrimary) !== null && _a !== void 0 ? _a : false);
|
|
41
|
+
const introspection = new engine_content_api_1.IntrospectionSchemaFactory(schemaNormalized.model, new engine_content_api_1.EntityRulesResolver(schemaNormalized.validation, schemaNormalized.model), authorizator);
|
|
39
42
|
if (format === 'schema') {
|
|
40
43
|
if (inputRoles) {
|
|
41
44
|
throw `--roles option is not supported for "schema" format`;
|
|
42
45
|
}
|
|
43
|
-
console.log(JSON.stringify(
|
|
46
|
+
console.log(JSON.stringify(schemaNormalized, null, '\t'));
|
|
44
47
|
}
|
|
45
48
|
else if (format === 'introspection') {
|
|
46
49
|
console.log(JSON.stringify(introspection.create(), null, '\t'));
|
|
47
50
|
}
|
|
48
51
|
else if (format === 'graphql') {
|
|
49
|
-
const contentSchema = schemaBuilderFactory.create(
|
|
52
|
+
const contentSchema = schemaBuilderFactory.create(schemaNormalized.model, authorizator).build();
|
|
50
53
|
const introspectionSchemaFactory = new engine_content_api_1.IntrospectionSchemaDefinitionFactory(introspection);
|
|
51
54
|
const introspectionSchema = introspectionSchemaFactory.create();
|
|
52
55
|
const gqlSchema = (0, schema_2.mergeSchemas)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectPrintSchemaCommand.js","sourceRoot":"","sources":["../../../../src/commands/project/ProjectPrintSchemaCommand.ts"],"names":[],"mappings":";;;AAAA,sDAA4E;AAC5E,+CAAiE;AAEjE,sEAOsC;AACtC,qCAAmD;AACnD,kDAAoD;AACpD,+DAA2D;
|
|
1
|
+
{"version":3,"file":"ProjectPrintSchemaCommand.js","sourceRoot":"","sources":["../../../../src/commands/project/ProjectPrintSchemaCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common';
|
|
2
|
-
|
|
2
|
+
type Args = {
|
|
3
3
|
project?: string;
|
|
4
4
|
};
|
|
5
|
-
|
|
5
|
+
type Options = {};
|
|
6
6
|
export declare class ProjectValidateCommand extends Command<Args, Options> {
|
|
7
7
|
private readonly workspace;
|
|
8
8
|
constructor(workspace: Workspace);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectValidateCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/ProjectValidateCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAuB,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAO5G,
|
|
1
|
+
{"version":3,"file":"ProjectValidateCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/ProjectValidateCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAuB,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAO5G,KAAK,IAAI,GAAG;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,OAAO,GAAG,EAAE,CAAA;AAEjB,qBAAa,sBAAuB,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IAEhE,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAKtC,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI;cAO7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CAkDrE"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Command, CommandConfiguration, Input } from '@contember/cli-common';
|
|
2
2
|
import { Workspace } from '@contember/cli-common';
|
|
3
|
-
|
|
3
|
+
type Args = {
|
|
4
4
|
instance?: string;
|
|
5
5
|
};
|
|
6
|
-
|
|
6
|
+
type Options = {};
|
|
7
7
|
export declare class CreateApiKeyCommand extends Command<Args, Options> {
|
|
8
8
|
private readonly workspace;
|
|
9
9
|
constructor(workspace: Workspace);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateApiKeyCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/tenant/CreateApiKeyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAG5E,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEjD,
|
|
1
|
+
{"version":3,"file":"CreateApiKeyCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/tenant/CreateApiKeyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAG5E,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEjD,KAAK,IAAI,GAAG;IACX,QAAQ,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,KAAK,OAAO,GAAG,EAAE,CAAA;AAEjB,qBAAa,mBAAoB,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IAE7D,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAKtC,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI;cAQ7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAanE"}
|