@contember/cli 1.4.0-alpha.3 → 1.4.0-alpha.5
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/dist/src/commands/deploy/DeployCommand.js +2 -2
- package/dist/src/commands/deploy/DeployCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationDiffCommand.js +2 -2
- package/dist/src/commands/migrations/MigrationDiffCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationExecuteCommand.js +2 -2
- package/dist/src/commands/migrations/MigrationExecuteCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationStatusCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationStatusCommand.js +5 -4
- package/dist/src/commands/migrations/MigrationStatusCommand.js.map +1 -1
- package/dist/src/commands/migrations/SystemApiClientResolver.d.ts +1 -1
- package/dist/src/commands/migrations/SystemApiClientResolver.d.ts.map +1 -1
- package/dist/src/commands/migrations/SystemApiClientResolver.js +2 -2
- package/dist/src/commands/migrations/SystemApiClientResolver.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/src/utils/migrations/MigrationCreateHelper.d.ts +1 -5
- package/dist/src/utils/migrations/MigrationCreateHelper.d.ts.map +1 -1
- package/dist/src/utils/migrations/MigrationCreateHelper.js.map +1 -1
- package/dist/src/utils/migrations/MigrationExecuteHelper.d.ts +6 -7
- package/dist/src/utils/migrations/MigrationExecuteHelper.d.ts.map +1 -1
- package/dist/src/utils/migrations/MigrationExecuteHelper.js +12 -52
- package/dist/src/utils/migrations/MigrationExecuteHelper.js.map +1 -1
- package/dist/src/utils/migrations/MigrationsContainer.d.ts +4 -4
- package/dist/src/utils/migrations/MigrationsContainer.d.ts.map +1 -1
- package/dist/src/utils/migrations/MigrationsContainer.js +23 -15
- package/dist/src/utils/migrations/MigrationsContainer.js.map +1 -1
- package/dist/src/utils/migrations/migrations.d.ts +2 -54
- package/dist/src/utils/migrations/migrations.d.ts.map +1 -1
- package/dist/src/utils/migrations/migrations.js +7 -88
- package/dist/src/utils/migrations/migrations.js.map +1 -1
- package/package.json +10 -10
- package/src/commands/deploy/DeployCommand.ts +1 -1
- package/src/commands/migrations/MigrationDiffCommand.ts +1 -1
- package/src/commands/migrations/MigrationExecuteCommand.ts +1 -1
- package/src/commands/migrations/MigrationStatusCommand.ts +3 -2
- package/src/commands/migrations/SystemApiClientResolver.ts +1 -1
- package/src/tsconfig.json +1 -1
- package/src/utils/migrations/MigrationCreateHelper.ts +8 -5
- package/src/utils/migrations/MigrationExecuteHelper.ts +23 -61
- package/src/utils/migrations/MigrationsContainer.ts +20 -12
- package/src/utils/migrations/migrations.ts +3 -148
- package/dist/src/utils/migrations/JsLoader.d.ts +0 -9
- package/dist/src/utils/migrations/JsLoader.d.ts.map +0 -1
- package/dist/src/utils/migrations/JsLoader.js +0 -33
- package/dist/src/utils/migrations/JsLoader.js.map +0 -1
- package/dist/src/utils/migrations/JsonLoader.d.ts +0 -9
- package/dist/src/utils/migrations/JsonLoader.d.ts.map +0 -1
- package/dist/src/utils/migrations/JsonLoader.js +0 -17
- package/dist/src/utils/migrations/JsonLoader.js.map +0 -1
- package/dist/src/utils/migrations/MigrationCreator.d.ts +0 -21
- package/dist/src/utils/migrations/MigrationCreator.d.ts.map +0 -1
- package/dist/src/utils/migrations/MigrationCreator.js +0 -47
- package/dist/src/utils/migrations/MigrationCreator.js.map +0 -1
- package/dist/src/utils/migrations/MigrationFile.d.ts +0 -36
- package/dist/src/utils/migrations/MigrationFile.d.ts.map +0 -1
- package/dist/src/utils/migrations/MigrationFile.js +0 -6
- package/dist/src/utils/migrations/MigrationFile.js.map +0 -1
- package/dist/src/utils/migrations/MigrationFileLoader.d.ts +0 -5
- package/dist/src/utils/migrations/MigrationFileLoader.d.ts.map +0 -1
- package/dist/src/utils/migrations/MigrationFileLoader.js +0 -3
- package/dist/src/utils/migrations/MigrationFileLoader.js.map +0 -1
- package/dist/src/utils/migrations/MigrationFilesManager.d.ts +0 -18
- package/dist/src/utils/migrations/MigrationFilesManager.d.ts.map +0 -1
- package/dist/src/utils/migrations/MigrationFilesManager.js +0 -114
- package/dist/src/utils/migrations/MigrationFilesManager.js.map +0 -1
- package/dist/src/utils/migrations/MigrationParser.d.ts +0 -6
- package/dist/src/utils/migrations/MigrationParser.d.ts.map +0 -1
- package/dist/src/utils/migrations/MigrationParser.js +0 -33
- package/dist/src/utils/migrations/MigrationParser.js.map +0 -1
- package/dist/src/utils/migrations/MigrationsResolver.d.ts +0 -14
- package/dist/src/utils/migrations/MigrationsResolver.d.ts.map +0 -1
- package/dist/src/utils/migrations/MigrationsResolver.js +0 -37
- package/dist/src/utils/migrations/MigrationsResolver.js.map +0 -1
- package/dist/src/utils/migrations/SchemaVersionBuilder.d.ts +0 -13
- package/dist/src/utils/migrations/SchemaVersionBuilder.d.ts.map +0 -1
- package/dist/src/utils/migrations/SchemaVersionBuilder.js +0 -26
- package/dist/src/utils/migrations/SchemaVersionBuilder.js.map +0 -1
- package/dist/src/utils/system/index.d.ts +0 -30
- package/dist/src/utils/system/index.d.ts.map +0 -1
- package/dist/src/utils/system/index.js +0 -118
- package/dist/src/utils/system/index.js.map +0 -1
- package/src/utils/migrations/JsLoader.ts +0 -37
- package/src/utils/migrations/JsonLoader.ts +0 -18
- package/src/utils/migrations/MigrationCreator.ts +0 -60
- package/src/utils/migrations/MigrationFile.ts +0 -52
- package/src/utils/migrations/MigrationFileLoader.ts +0 -5
- package/src/utils/migrations/MigrationFilesManager.ts +0 -102
- package/src/utils/migrations/MigrationParser.ts +0 -32
- package/src/utils/migrations/MigrationsResolver.ts +0 -44
- package/src/utils/migrations/SchemaVersionBuilder.ts +0 -33
- package/src/utils/system/index.ts +0 -150
|
@@ -8,7 +8,7 @@ const cli_common_1 = require("@contember/cli-common");
|
|
|
8
8
|
const MigrationExecuteHelper_1 = require("../../utils/migrations/MigrationExecuteHelper");
|
|
9
9
|
const tenant_1 = require("../../utils/tenant");
|
|
10
10
|
const instance_1 = require("../../utils/instance");
|
|
11
|
-
const
|
|
11
|
+
const migrations_client_1 = require("@contember/migrations-client");
|
|
12
12
|
const MigrationsContainer_1 = require("../../utils/migrations/MigrationsContainer");
|
|
13
13
|
const admin_1 = require("../../utils/admin");
|
|
14
14
|
const prompts_1 = __importDefault(require("prompts"));
|
|
@@ -62,7 +62,7 @@ class DeployCommand extends cli_common_1.Command {
|
|
|
62
62
|
const container = new MigrationsContainer_1.MigrationsContainerFactory(migrationsDir).create();
|
|
63
63
|
const tenantClient = tenant_1.TenantClient.create(instance.baseUrl, apiToken);
|
|
64
64
|
await tenantClient.createProject(remoteProject, true);
|
|
65
|
-
const systemClient =
|
|
65
|
+
const systemClient = migrations_client_1.SystemClient.create(instance.baseUrl, remoteProject, apiToken);
|
|
66
66
|
const status = await (0, MigrationExecuteHelper_1.resolveMigrationStatus)(systemClient, container.migrationsResolver, false);
|
|
67
67
|
if (status.errorMigrations.length > 0) {
|
|
68
68
|
console.error((0, migrations_1.createMigrationStatusTable)(status.errorMigrations));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeployCommand.js","sourceRoot":"","sources":["../../../../src/commands/deploy/DeployCommand.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAmG;AACnG,0FAKsD;AACtD,+CAA6E;AAC7E,mDAAqF;AACrF
|
|
1
|
+
{"version":3,"file":"DeployCommand.js","sourceRoot":"","sources":["../../../../src/commands/deploy/DeployCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ const MigrationExecuteHelper_1 = require("../../utils/migrations/MigrationExecut
|
|
|
13
13
|
const prompts_1 = __importDefault(require("prompts"));
|
|
14
14
|
const tenant_1 = require("../../utils/tenant");
|
|
15
15
|
const instance_1 = require("../../utils/instance");
|
|
16
|
-
const
|
|
16
|
+
const migrations_client_1 = require("@contember/migrations-client");
|
|
17
17
|
const loadSchema_1 = require("../../utils/project/loadSchema");
|
|
18
18
|
class MigrationDiffCommand extends cli_common_1.Command {
|
|
19
19
|
constructor(workspace) {
|
|
@@ -75,7 +75,7 @@ class MigrationDiffCommand extends cli_common_1.Command {
|
|
|
75
75
|
const apiToken = await (0, tenant_1.interactiveResolveApiToken)({ workspace, instance });
|
|
76
76
|
const tenantClient = tenant_1.TenantClient.create(instance.baseUrl, apiToken);
|
|
77
77
|
await tenantClient.createProject(project.name, true);
|
|
78
|
-
const systemClient =
|
|
78
|
+
const systemClient = migrations_client_1.SystemClient.create(instance.baseUrl, project.name, apiToken);
|
|
79
79
|
const status = await (0, MigrationExecuteHelper_1.resolveMigrationStatus)(systemClient, migrationsResolver);
|
|
80
80
|
if (status.errorMigrations.length > 0) {
|
|
81
81
|
console.error((0, migrations_1.createMigrationStatusTable)(status.errorMigrations));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationDiffCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationDiffCommand.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAuF;AACvF,+CAA0D;AAC1D,oEAAqE;AACrE,wFAA4F;AAC5F,kEAAyG;AACzG,0FAAyG;AACzG,sDAA6B;AAC7B,+CAA6E;AAC7E,mDAAqF;AACrF
|
|
1
|
+
{"version":3,"file":"MigrationDiffCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationDiffCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ const MigrationExecuteHelper_1 = require("../../utils/migrations/MigrationExecut
|
|
|
7
7
|
const migrations_1 = require("../../utils/migrations/migrations");
|
|
8
8
|
const instance_1 = require("../../utils/instance");
|
|
9
9
|
const tenant_1 = require("../../utils/tenant");
|
|
10
|
-
const
|
|
10
|
+
const migrations_client_1 = require("@contember/migrations-client");
|
|
11
11
|
const schema_migrations_1 = require("@contember/schema-migrations");
|
|
12
12
|
class MigrationExecuteCommand extends cli_common_1.Command {
|
|
13
13
|
constructor(workspace) {
|
|
@@ -43,7 +43,7 @@ class MigrationExecuteCommand extends cli_common_1.Command {
|
|
|
43
43
|
const remoteProject = remoteProjectOption || project.name;
|
|
44
44
|
const tenantClient = tenant_1.TenantClient.create(instance.baseUrl, apiToken);
|
|
45
45
|
await tenantClient.createProject(remoteProject, true);
|
|
46
|
-
const systemClient =
|
|
46
|
+
const systemClient = migrations_client_1.SystemClient.create(instance.baseUrl, remoteProject, apiToken);
|
|
47
47
|
const force = input.getOption('force');
|
|
48
48
|
const status = await (0, MigrationExecuteHelper_1.resolveMigrationStatus)(systemClient, container.migrationsResolver, force);
|
|
49
49
|
if (status.errorMigrations.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationExecuteCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationExecuteCommand.ts"],"names":[],"mappings":";;;AAAA,sDAAuF;AACvF,oFAAuF;AACvF,0FAKsD;AACtD,kEAA8E;AAC9E,mDAAqF;AACrF,+CAA6E;AAC7E
|
|
1
|
+
{"version":3,"file":"MigrationExecuteCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationExecuteCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,SAAS,EAAE,MAAM,uBAAuB,CAAA;
|
|
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,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAUvF,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;CAsDrE"}
|
|
@@ -8,7 +8,8 @@ const cli_common_1 = require("@contember/cli-common");
|
|
|
8
8
|
const MigrationsContainer_1 = require("../../utils/migrations/MigrationsContainer");
|
|
9
9
|
const instance_1 = require("../../utils/instance");
|
|
10
10
|
const tenant_1 = require("../../utils/tenant");
|
|
11
|
-
const
|
|
11
|
+
const migrations_client_1 = require("@contember/migrations-client");
|
|
12
|
+
const migrations_client_2 = require("@contember/migrations-client");
|
|
12
13
|
const migrations_1 = require("../../utils/migrations/migrations");
|
|
13
14
|
const chalk_1 = __importDefault(require("chalk"));
|
|
14
15
|
const MigrationExecuteHelper_1 = require("../../utils/migrations/MigrationExecuteHelper");
|
|
@@ -52,11 +53,11 @@ class MigrationStatusCommand extends cli_common_1.Command {
|
|
|
52
53
|
const instance = await (0, instance_1.interactiveResolveInstanceEnvironmentFromInput)(workspace, input.getOption('instance'));
|
|
53
54
|
const apiToken = await (0, tenant_1.interactiveResolveApiToken)({ workspace, instance });
|
|
54
55
|
const remoteProject = input.getOption('remote-project') || project.name;
|
|
55
|
-
const client =
|
|
56
|
+
const client = migrations_client_1.SystemClient.create(instance.baseUrl, remoteProject, apiToken);
|
|
56
57
|
let status = await (0, MigrationExecuteHelper_1.resolveMigrationStatus)(client, container.migrationsResolver);
|
|
57
58
|
const restoreMissing = input.getOption('restore-missing');
|
|
58
59
|
if (restoreMissing) {
|
|
59
|
-
const missing = status.errorMigrations.filter(it => it.state ===
|
|
60
|
+
const missing = status.errorMigrations.filter(it => it.state === migrations_client_2.MigrationState.EXECUTED_MISSING);
|
|
60
61
|
for (const migration of missing) {
|
|
61
62
|
console.log(`Restoring migration ${migration.name}`);
|
|
62
63
|
const fullMigration = await client.getExecutedMigration(migration.version);
|
|
@@ -70,7 +71,7 @@ class MigrationStatusCommand extends cli_common_1.Command {
|
|
|
70
71
|
const onlyErrors = input.getOption('only-errors');
|
|
71
72
|
const onlyToExecute = input.getOption('only-to-execute');
|
|
72
73
|
const filtered = onlyErrors || onlyToExecute
|
|
73
|
-
? (0,
|
|
74
|
+
? (0, migrations_client_2.sortMigrations)([
|
|
74
75
|
...(onlyErrors ? status.errorMigrations : []),
|
|
75
76
|
...(onlyToExecute ? status.migrationsToExecute : []),
|
|
76
77
|
])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationStatusCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationStatusCommand.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAuF;AACvF,oFAAuF;AACvF,mDAAqF;AACrF,+CAA+D;AAC/D
|
|
1
|
+
{"version":3,"file":"MigrationStatusCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationStatusCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SystemClient } from '
|
|
1
|
+
import { SystemClient } from '@contember/migrations-client';
|
|
2
2
|
import { Workspace, Project } from '@contember/cli-common';
|
|
3
3
|
import { Input } from '@contember/cli-common';
|
|
4
4
|
export declare const resolveSystemApiClient: (workspace: Workspace, project: Project, input?: Input<{}, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SystemApiClientResolver.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/SystemApiClientResolver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"SystemApiClientResolver.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/SystemApiClientResolver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAE7C,eAAO,MAAM,sBAAsB,cACvB,SAAS,WACX,OAAO,UACR,MACP,EAAE,EACF;IACC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,CAAC,gBAAgB,CAAC,CAAC,EAAE,MAAM,CAAA;CAC3B,CACD,KACC,QAAQ,YAAY,CAKtB,CAAA"}
|
|
@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.resolveSystemApiClient = void 0;
|
|
4
4
|
const instance_1 = require("../../utils/instance");
|
|
5
5
|
const tenant_1 = require("../../utils/tenant");
|
|
6
|
-
const
|
|
6
|
+
const migrations_client_1 = require("@contember/migrations-client");
|
|
7
7
|
const resolveSystemApiClient = async (workspace, project, input) => {
|
|
8
8
|
const instance = await (0, instance_1.interactiveResolveInstanceEnvironmentFromInput)(workspace, input === null || input === void 0 ? void 0 : input.getOption('instance'));
|
|
9
9
|
const apiToken = await (0, tenant_1.interactiveResolveApiToken)({ workspace, instance });
|
|
10
10
|
const remoteProject = (input === null || input === void 0 ? void 0 : input.getOption('remote-project')) || project.name;
|
|
11
|
-
return
|
|
11
|
+
return migrations_client_1.SystemClient.create(instance.baseUrl, remoteProject, apiToken);
|
|
12
12
|
};
|
|
13
13
|
exports.resolveSystemApiClient = resolveSystemApiClient;
|
|
14
14
|
//# sourceMappingURL=SystemApiClientResolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SystemApiClientResolver.js","sourceRoot":"","sources":["../../../../src/commands/migrations/SystemApiClientResolver.ts"],"names":[],"mappings":";;;AAAA,mDAAqF;AACrF,+CAA+D;AAC/D
|
|
1
|
+
{"version":3,"file":"SystemApiClientResolver.js","sourceRoot":"","sources":["../../../../src/commands/migrations/SystemApiClientResolver.ts"],"names":[],"mappings":";;;AAAA,mDAAqF;AACrF,+CAA+D;AAC/D,oEAA2D;AAIpD,MAAM,sBAAsB,GAAG,KAAK,EAC1C,SAAoB,EACpB,OAAgB,EAChB,KAMC,EACuB,EAAE;IAC1B,MAAM,QAAQ,GAAG,MAAM,IAAA,yDAA8C,EAAC,SAAS,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,SAAS,CAAC,UAAU,CAAC,CAAC,CAAA;IAC9G,MAAM,QAAQ,GAAG,MAAM,IAAA,mCAA0B,EAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAA;IAC1E,MAAM,aAAa,GAAG,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,SAAS,CAAC,gBAAgB,CAAC,KAAI,OAAO,CAAC,IAAI,CAAA;IACxE,OAAO,gCAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAA;AACtE,CAAC,CAAA;AAfY,QAAA,sBAAsB,0BAelC"}
|