@contember/cli 1.4.0-alpha.2 → 1.4.0-alpha.3
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 +2 -2
- package/dist/src/commands/deploy/DeployCommand.d.ts +1 -1
- package/dist/src/commands/deploy/DeployCommand.d.ts.map +1 -1
- package/dist/src/commands/deploy/DeployCommand.js +8 -3
- package/dist/src/commands/deploy/DeployCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationAmendCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationAmendCommand.js +6 -6
- package/dist/src/commands/migrations/MigrationAmendCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationBlankCommand.d.ts +15 -0
- package/dist/src/commands/migrations/MigrationBlankCommand.d.ts.map +1 -0
- package/dist/src/commands/migrations/MigrationBlankCommand.js +29 -0
- package/dist/src/commands/migrations/MigrationBlankCommand.js.map +1 -0
- package/dist/src/commands/migrations/MigrationDescribeCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationDescribeCommand.js +5 -5
- package/dist/src/commands/migrations/MigrationDescribeCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationDiffCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationDiffCommand.js +8 -3
- package/dist/src/commands/migrations/MigrationDiffCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationExecuteCommand.d.ts +1 -1
- package/dist/src/commands/migrations/MigrationExecuteCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationExecuteCommand.js +8 -3
- package/dist/src/commands/migrations/MigrationExecuteCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationRebaseCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationRebaseCommand.js +2 -3
- package/dist/src/commands/migrations/MigrationRebaseCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationStatusCommand.d.ts +1 -2
- package/dist/src/commands/migrations/MigrationStatusCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationStatusCommand.js +5 -7
- package/dist/src/commands/migrations/MigrationStatusCommand.js.map +1 -1
- package/dist/src/commands/migrations/index.d.ts +1 -0
- package/dist/src/commands/migrations/index.d.ts.map +1 -1
- package/dist/src/commands/migrations/index.js +1 -0
- package/dist/src/commands/migrations/index.js.map +1 -1
- package/dist/src/commands/project/ProjectValidateCommand.js +2 -2
- package/dist/src/commands/project/ProjectValidateCommand.js.map +1 -1
- package/dist/src/run.js +1 -0
- package/dist/src/run.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/src/utils/admin.d.ts.map +1 -1
- package/dist/src/utils/admin.js +1 -5
- package/dist/src/utils/admin.js.map +1 -1
- package/dist/src/utils/esbuild.d.ts +2 -0
- package/dist/src/utils/esbuild.d.ts.map +1 -0
- package/dist/src/utils/esbuild.js +41 -0
- package/dist/src/utils/esbuild.js.map +1 -0
- package/dist/src/utils/migrations/JsLoader.d.ts +9 -0
- package/dist/src/utils/migrations/JsLoader.d.ts.map +1 -0
- package/dist/src/utils/migrations/JsLoader.js +33 -0
- package/dist/src/utils/migrations/JsLoader.js.map +1 -0
- package/dist/src/utils/migrations/JsonLoader.d.ts +9 -0
- package/dist/src/utils/migrations/JsonLoader.d.ts.map +1 -0
- package/dist/src/utils/migrations/JsonLoader.js +17 -0
- package/dist/src/utils/migrations/JsonLoader.js.map +1 -0
- package/dist/src/{commands → utils}/migrations/MigrationCreateHelper.d.ts +6 -3
- package/dist/src/utils/migrations/MigrationCreateHelper.d.ts.map +1 -0
- package/dist/src/{commands → utils}/migrations/MigrationCreateHelper.js +1 -1
- package/dist/src/utils/migrations/MigrationCreateHelper.js.map +1 -0
- package/dist/src/utils/migrations/MigrationCreator.d.ts +21 -0
- package/dist/src/utils/migrations/MigrationCreator.d.ts.map +1 -0
- package/dist/src/utils/migrations/MigrationCreator.js +47 -0
- package/dist/src/utils/migrations/MigrationCreator.js.map +1 -0
- package/dist/src/{commands → utils}/migrations/MigrationExecuteHelper.d.ts +8 -4
- package/dist/src/utils/migrations/MigrationExecuteHelper.d.ts.map +1 -0
- package/dist/src/{commands → utils}/migrations/MigrationExecuteHelper.js +57 -5
- package/dist/src/utils/migrations/MigrationExecuteHelper.js.map +1 -0
- package/dist/src/utils/migrations/MigrationFile.d.ts +36 -0
- package/dist/src/utils/migrations/MigrationFile.d.ts.map +1 -0
- package/dist/src/utils/migrations/MigrationFile.js +6 -0
- package/dist/src/utils/migrations/MigrationFile.js.map +1 -0
- package/dist/src/utils/migrations/MigrationFileLoader.d.ts +5 -0
- package/dist/src/utils/migrations/MigrationFileLoader.d.ts.map +1 -0
- package/dist/src/utils/migrations/MigrationFileLoader.js +3 -0
- package/dist/src/utils/migrations/MigrationFileLoader.js.map +1 -0
- package/dist/src/utils/migrations/MigrationFilesManager.d.ts +18 -0
- package/dist/src/utils/migrations/MigrationFilesManager.d.ts.map +1 -0
- package/dist/src/utils/migrations/MigrationFilesManager.js +114 -0
- package/dist/src/utils/migrations/MigrationFilesManager.js.map +1 -0
- package/dist/src/utils/migrations/MigrationParser.d.ts +6 -0
- package/dist/src/utils/migrations/MigrationParser.d.ts.map +1 -0
- package/dist/src/utils/migrations/MigrationParser.js +33 -0
- package/dist/src/utils/migrations/MigrationParser.js.map +1 -0
- package/dist/src/{MigrationsContainer.d.ts → utils/migrations/MigrationsContainer.d.ts} +5 -1
- package/dist/src/utils/migrations/MigrationsContainer.d.ts.map +1 -0
- package/dist/src/utils/migrations/MigrationsContainer.js +50 -0
- package/dist/src/utils/migrations/MigrationsContainer.js.map +1 -0
- package/dist/src/utils/migrations/MigrationsResolver.d.ts +14 -0
- package/dist/src/utils/migrations/MigrationsResolver.d.ts.map +1 -0
- package/dist/src/utils/migrations/MigrationsResolver.js +37 -0
- package/dist/src/utils/migrations/MigrationsResolver.js.map +1 -0
- package/dist/src/utils/migrations/SchemaVersionBuilder.d.ts +13 -0
- package/dist/src/utils/migrations/SchemaVersionBuilder.d.ts.map +1 -0
- package/dist/src/utils/migrations/SchemaVersionBuilder.js +26 -0
- package/dist/src/utils/migrations/SchemaVersionBuilder.js.map +1 -0
- package/dist/src/utils/{migrations.d.ts → migrations/migrations.d.ts} +18 -22
- package/dist/src/utils/migrations/migrations.d.ts.map +1 -0
- package/dist/src/utils/{migrations.js → migrations/migrations.js} +13 -28
- package/dist/src/utils/migrations/migrations.js.map +1 -0
- package/dist/src/utils/project/loadSchema.d.ts.map +1 -1
- package/dist/src/utils/project/loadSchema.js +5 -44
- package/dist/src/utils/project/loadSchema.js.map +1 -1
- package/dist/src/utils/project/resources/out.css +106 -124
- package/dist/src/utils/system/index.d.ts +3 -4
- package/dist/src/utils/system/index.d.ts.map +1 -1
- package/dist/src/utils/system/index.js.map +1 -1
- package/package.json +26 -27
- package/src/commands/deploy/DeployCommand.ts +9 -4
- package/src/commands/migrations/MigrationAmendCommand.ts +7 -11
- package/src/commands/migrations/MigrationBlankCommand.ts +46 -0
- package/src/commands/migrations/MigrationDescribeCommand.ts +7 -5
- package/src/commands/migrations/MigrationDiffCommand.ts +8 -3
- package/src/commands/migrations/MigrationExecuteCommand.ts +8 -3
- package/src/commands/migrations/MigrationRebaseCommand.ts +2 -3
- package/src/commands/migrations/MigrationStatusCommand.ts +6 -9
- package/src/commands/migrations/index.ts +1 -0
- package/src/commands/project/ProjectValidateCommand.ts +2 -2
- package/src/run.ts +2 -0
- package/src/tsconfig.json +1 -0
- package/src/utils/admin.ts +0 -1
- package/src/utils/esbuild.ts +14 -0
- package/src/utils/migrations/JsLoader.ts +37 -0
- package/src/utils/migrations/JsonLoader.ts +18 -0
- package/src/{commands → utils}/migrations/MigrationCreateHelper.ts +7 -11
- package/src/utils/migrations/MigrationCreator.ts +60 -0
- package/src/{commands → utils}/migrations/MigrationExecuteHelper.ts +68 -9
- package/src/utils/migrations/MigrationFile.ts +52 -0
- package/src/utils/migrations/MigrationFileLoader.ts +5 -0
- package/src/utils/migrations/MigrationFilesManager.ts +102 -0
- package/src/utils/migrations/MigrationParser.ts +32 -0
- package/src/{MigrationsContainer.ts → utils/migrations/MigrationsContainer.ts} +29 -12
- package/src/utils/migrations/MigrationsResolver.ts +44 -0
- package/src/utils/migrations/SchemaVersionBuilder.ts +33 -0
- package/src/utils/{migrations.ts → migrations/migrations.ts} +33 -57
- package/src/utils/project/loadSchema.ts +7 -21
- package/src/utils/system/index.ts +3 -4
- package/dist/src/MigrationsContainer.d.ts.map +0 -1
- package/dist/src/MigrationsContainer.js +0 -25
- package/dist/src/MigrationsContainer.js.map +0 -1
- package/dist/src/commands/migrations/MigrationCreateHelper.d.ts.map +0 -1
- package/dist/src/commands/migrations/MigrationCreateHelper.js.map +0 -1
- package/dist/src/commands/migrations/MigrationExecuteHelper.d.ts.map +0 -1
- package/dist/src/commands/migrations/MigrationExecuteHelper.js.map +0 -1
- package/dist/src/utils/migrations.d.ts.map +0 -1
- package/dist/src/utils/migrations.js.map +0 -1
package/Dockerfile
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
FROM node:
|
|
1
|
+
FROM node:20-alpine as builder
|
|
2
2
|
|
|
3
3
|
WORKDIR /src
|
|
4
4
|
RUN apk --no-cache add bash
|
|
@@ -7,7 +7,7 @@ COPY ./ ./
|
|
|
7
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
|
-
FROM node:
|
|
10
|
+
FROM node:20-alpine
|
|
11
11
|
|
|
12
12
|
WORKDIR /src
|
|
13
13
|
ENV NODE_ENV "production"
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common';
|
|
2
|
-
import { ExecuteMigrationOptions } from '
|
|
2
|
+
import { ExecuteMigrationOptions } from '../../utils/migrations/MigrationExecuteHelper';
|
|
3
3
|
type Args = {
|
|
4
4
|
dsn: string;
|
|
5
5
|
project?: string;
|
|
@@ -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,EAAc,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACnG,OAAO,EAEN,uBAAuB,EAGvB,MAAM,
|
|
1
|
+
{"version":3,"file":"DeployCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/deploy/DeployCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAc,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACnG,OAAO,EAEN,uBAAuB,EAGvB,MAAM,+CAA+C,CAAA;AAWtD,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;IACd,CAAC,UAAU,CAAC,CAAC,EAAE,OAAO,CAAA;IACtB,CAAC,eAAe,CAAC,CAAC,EAAE,OAAO,CAAA;IAC3B,IAAI,CAAC,EAAE,OAAO,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;cAgB7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;IAkH5E,OAAO,CAAC,kBAAkB;CAS1B"}
|
|
@@ -5,14 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.DeployCommand = void 0;
|
|
7
7
|
const cli_common_1 = require("@contember/cli-common");
|
|
8
|
-
const MigrationExecuteHelper_1 = require("
|
|
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
11
|
const system_1 = require("../../utils/system");
|
|
12
|
-
const MigrationsContainer_1 = require("../../MigrationsContainer");
|
|
12
|
+
const MigrationsContainer_1 = require("../../utils/migrations/MigrationsContainer");
|
|
13
13
|
const admin_1 = require("../../utils/admin");
|
|
14
14
|
const prompts_1 = __importDefault(require("prompts"));
|
|
15
|
-
const migrations_1 = require("../../utils/migrations");
|
|
15
|
+
const migrations_1 = require("../../utils/migrations/migrations");
|
|
16
16
|
const token_1 = require("../../utils/token");
|
|
17
17
|
const dsn_1 = require("../../utils/dsn");
|
|
18
18
|
class DeployCommand extends cli_common_1.Command {
|
|
@@ -97,6 +97,11 @@ class DeployCommand extends cli_common_1.Command {
|
|
|
97
97
|
migrations: status.migrationsToExecute,
|
|
98
98
|
requireConfirmation: false,
|
|
99
99
|
force: false,
|
|
100
|
+
contentMigrationFactoryArgs: {
|
|
101
|
+
apiToken,
|
|
102
|
+
apiBaseUrl: instance.baseUrl.replace(/\/$/, ''),
|
|
103
|
+
projectName: remoteProject,
|
|
104
|
+
},
|
|
100
105
|
});
|
|
101
106
|
if (migrationExitCode !== 0) {
|
|
102
107
|
return migrationExitCode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeployCommand.js","sourceRoot":"","sources":["../../../../src/commands/deploy/DeployCommand.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAmG;AACnG,
|
|
1
|
+
{"version":3,"file":"DeployCommand.js","sourceRoot":"","sources":["../../../../src/commands/deploy/DeployCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;
|
|
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;AAYvF,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;YA6GvD,cAAc;CAgB5B"}
|
|
@@ -7,9 +7,9 @@ exports.MigrationAmendCommand = void 0;
|
|
|
7
7
|
const cli_common_1 = require("@contember/cli-common");
|
|
8
8
|
const schema_1 = require("../../utils/schema");
|
|
9
9
|
const schema_migrations_1 = require("@contember/schema-migrations");
|
|
10
|
-
const MigrationCreateHelper_1 = require("
|
|
11
|
-
const migrations_1 = require("../../utils/migrations");
|
|
12
|
-
const MigrationExecuteHelper_1 = require("
|
|
10
|
+
const MigrationCreateHelper_1 = require("../../utils/migrations/MigrationCreateHelper");
|
|
11
|
+
const migrations_1 = require("../../utils/migrations/migrations");
|
|
12
|
+
const MigrationExecuteHelper_1 = require("../../utils/migrations/MigrationExecuteHelper");
|
|
13
13
|
const SystemApiClientResolver_1 = require("./SystemApiClientResolver");
|
|
14
14
|
const prompts_1 = __importDefault(require("prompts"));
|
|
15
15
|
const schema_utils_1 = require("@contember/schema-utils");
|
|
@@ -36,8 +36,8 @@ class MigrationAmendCommand extends cli_common_1.Command {
|
|
|
36
36
|
return await (0, MigrationCreateHelper_1.executeCreateMigrationCommand)(input, { workspace: this.workspace }, async ({ schemaVersionBuilder, migrationsResolver, workspace, project, migrationCreator, migrationDescriber, schemaMigrator, }) => {
|
|
37
37
|
const migrationName = input.getArgument('migration');
|
|
38
38
|
const amendMigration = migrationName
|
|
39
|
-
? await
|
|
40
|
-
: await
|
|
39
|
+
? await migrationsResolver.findSchemaMigrationByVersion(migrationName)
|
|
40
|
+
: await migrationsResolver.findLatestSchemaMigration();
|
|
41
41
|
if (!amendMigration) {
|
|
42
42
|
throw 'No migration to amend';
|
|
43
43
|
}
|
|
@@ -67,7 +67,7 @@ class MigrationAmendCommand extends cli_common_1.Command {
|
|
|
67
67
|
const prevSchema = await schemaVersionBuilder.buildSchemaAdvanced(schema_utils_1.emptySchema, version => version < amendMigration.version);
|
|
68
68
|
const newSchema = await schemaMigrator.applyModifications(prevSchema, [...amendMigration.modifications, ...intermediateResult.migration.modifications], amendMigration.formatVersion);
|
|
69
69
|
const newMigrationResult = await migrationCreator.prepareMigration(prevSchema, newSchema, '');
|
|
70
|
-
const followingMigrations = (await migrationsResolver.
|
|
70
|
+
const followingMigrations = (await migrationsResolver.getSchemaMigrations()).filter(it => it.version > amendMigration.version);
|
|
71
71
|
const valid = await (0, MigrationValidationHelper_1.validateMigrations)(prevSchema, [...(newMigrationResult ? [newMigrationResult.migration] : []), ...followingMigrations], migrationDescriber, schemaMigrator);
|
|
72
72
|
if (!valid) {
|
|
73
73
|
throw `Cannot amend migration`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationAmendCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationAmendCommand.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAuF;AACvF,+CAA0D;AAC1D,oEAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"MigrationAmendCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationAmendCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common';
|
|
2
|
+
type Args = {
|
|
3
|
+
project?: string;
|
|
4
|
+
migrationName: string;
|
|
5
|
+
format?: string;
|
|
6
|
+
};
|
|
7
|
+
type Options = {};
|
|
8
|
+
export declare class MigrationBlankCommand extends Command<Args, Options> {
|
|
9
|
+
private readonly workspace;
|
|
10
|
+
constructor(workspace: Workspace);
|
|
11
|
+
protected configure(configuration: CommandConfiguration<Args, Options>): void;
|
|
12
|
+
protected execute(input: Input<Args, Options>): Promise<number>;
|
|
13
|
+
}
|
|
14
|
+
export {};
|
|
15
|
+
//# sourceMappingURL=MigrationBlankCommand.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MigrationBlankCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationBlankCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAGvF,KAAK,IAAI,GAAG;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,KAAK,OAAO,GAAG,EACd,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;cAW7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CAcrE"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MigrationBlankCommand = void 0;
|
|
4
|
+
const cli_common_1 = require("@contember/cli-common");
|
|
5
|
+
const MigrationCreateHelper_1 = require("../../utils/migrations/MigrationCreateHelper");
|
|
6
|
+
class MigrationBlankCommand extends cli_common_1.Command {
|
|
7
|
+
constructor(workspace) {
|
|
8
|
+
super();
|
|
9
|
+
this.workspace = workspace;
|
|
10
|
+
}
|
|
11
|
+
configure(configuration) {
|
|
12
|
+
configuration.description('Creates new blank migration file');
|
|
13
|
+
if (!this.workspace.isSingleProjectMode()) {
|
|
14
|
+
configuration.argument('project');
|
|
15
|
+
}
|
|
16
|
+
configuration.argument('migrationName');
|
|
17
|
+
configuration.argument('format').optional().validator(it => !it || ['js', 'ts', 'json'].includes(it))
|
|
18
|
+
.description('Migration file format (js, ts, json), default is ts.');
|
|
19
|
+
}
|
|
20
|
+
async execute(input) {
|
|
21
|
+
return await (0, MigrationCreateHelper_1.executeCreateMigrationCommand)(input, { workspace: this.workspace }, async ({ migrationCreator, }) => {
|
|
22
|
+
const filename = await migrationCreator.createEmptyMigrationFile(input.getArgument('migrationName'), input.getArgument('format') || 'ts');
|
|
23
|
+
console.log(`${filename} created`);
|
|
24
|
+
return 0;
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
exports.MigrationBlankCommand = MigrationBlankCommand;
|
|
29
|
+
//# sourceMappingURL=MigrationBlankCommand.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MigrationBlankCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationBlankCommand.ts"],"names":[],"mappings":";;;AAAA,sDAAuF;AACvF,wFAA4F;AAW5F,MAAa,qBAAsB,SAAQ,oBAAsB;IAChE,YACkB,SAAoB;QAErC,KAAK,EAAE,CAAA;QAFU,cAAS,GAAT,SAAS,CAAW;IAGtC,CAAC;IAES,SAAS,CAAC,aAAkD;QACrE,aAAa,CAAC,WAAW,CAAC,kCAAkC,CAAC,CAAA;QAC7D,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,EAAE;YAC1C,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;SAEjC;QACD,aAAa,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAA;QACvC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;aACnG,WAAW,CAAC,sDAAsD,CAAC,CAAA;IACtE,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,KAA2B;QAClD,OAAO,MAAM,IAAA,qDAA6B,EACzC,KAAK,EACL,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,EAC7B,KAAK,EAAE,EACN,gBAAgB,GAChB,EAAE,EAAE;YACJ,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,wBAAwB,CAAC,KAAK,CAAC,WAAW,CAAC,eAAe,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAA;YACzI,OAAO,CAAC,GAAG,CAAC,GAAG,QAAQ,UAAU,CAAC,CAAA;YAElC,OAAO,CAAC,CAAA;QACT,CAAC,CACD,CAAA;IACF,CAAC;CACD;AAhCD,sDAgCC"}
|
|
@@ -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,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;
|
|
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;CAuBnE"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MigrationDescribeCommand = void 0;
|
|
4
4
|
const cli_common_1 = require("@contember/cli-common");
|
|
5
|
-
const MigrationsContainer_1 = require("../../MigrationsContainer");
|
|
6
|
-
const migrations_1 = require("../../utils/migrations");
|
|
5
|
+
const MigrationsContainer_1 = require("../../utils/migrations/MigrationsContainer");
|
|
6
|
+
const migrations_1 = require("../../utils/migrations/migrations");
|
|
7
7
|
class MigrationDescribeCommand extends cli_common_1.Command {
|
|
8
8
|
constructor(workspace) {
|
|
9
9
|
super();
|
|
@@ -26,9 +26,9 @@ class MigrationDescribeCommand extends cli_common_1.Command {
|
|
|
26
26
|
const container = new MigrationsContainer_1.MigrationsContainerFactory(migrationsDir).create();
|
|
27
27
|
const migrationArg = input.getArgument('migration');
|
|
28
28
|
const migrationsResolver = container.migrationsResolver;
|
|
29
|
-
const migration =
|
|
30
|
-
?
|
|
31
|
-
:
|
|
29
|
+
const migration = migrationArg
|
|
30
|
+
? await migrationsResolver.findSchemaMigrationByVersion(migrationArg)
|
|
31
|
+
: await migrationsResolver.findLatestSchemaMigration();
|
|
32
32
|
if (!migration) {
|
|
33
33
|
throw 'Undefined migration';
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationDescribeCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationDescribeCommand.ts"],"names":[],"mappings":";;;AAAA,sDAAuF;AACvF,
|
|
1
|
+
{"version":3,"file":"MigrationDescribeCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationDescribeCommand.ts"],"names":[],"mappings":";;;AAAA,sDAAuF;AACvF,oFAAuF;AACvF,kEAA6E;AAa7E,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;QAEvD,MAAM,SAAS,GAAG,YAAY;YAC7B,CAAC,CAAC,MAAM,kBAAkB,CAAC,4BAA4B,CAAC,YAAY,CAAC;YACrE,CAAC,CAAC,MAAM,kBAAkB,CAAC,yBAAyB,EAAE,CAAA;QAEvD,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;AAxCD,4DAwCC"}
|
|
@@ -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,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;
|
|
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;CAqFrE"}
|
|
@@ -7,9 +7,9 @@ exports.MigrationDiffCommand = void 0;
|
|
|
7
7
|
const cli_common_1 = require("@contember/cli-common");
|
|
8
8
|
const schema_1 = require("../../utils/schema");
|
|
9
9
|
const schema_migrations_1 = require("@contember/schema-migrations");
|
|
10
|
-
const MigrationCreateHelper_1 = require("
|
|
11
|
-
const migrations_1 = require("../../utils/migrations");
|
|
12
|
-
const MigrationExecuteHelper_1 = require("
|
|
10
|
+
const MigrationCreateHelper_1 = require("../../utils/migrations/MigrationCreateHelper");
|
|
11
|
+
const migrations_1 = require("../../utils/migrations/migrations");
|
|
12
|
+
const MigrationExecuteHelper_1 = require("../../utils/migrations/MigrationExecuteHelper");
|
|
13
13
|
const prompts_1 = __importDefault(require("prompts"));
|
|
14
14
|
const tenant_1 = require("../../utils/tenant");
|
|
15
15
|
const instance_1 = require("../../utils/instance");
|
|
@@ -87,6 +87,11 @@ class MigrationDiffCommand extends cli_common_1.Command {
|
|
|
87
87
|
requireConfirmation: status.migrationsToExecute.length > 1 && !yes,
|
|
88
88
|
schemaVersionBuilder,
|
|
89
89
|
migrationDescriber,
|
|
90
|
+
contentMigrationFactoryArgs: {
|
|
91
|
+
apiToken,
|
|
92
|
+
apiBaseUrl: instance.baseUrl.replace(/\/$/, ''),
|
|
93
|
+
projectName: project.name,
|
|
94
|
+
},
|
|
90
95
|
});
|
|
91
96
|
}
|
|
92
97
|
return 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationDiffCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationDiffCommand.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAuF;AACvF,+CAA0D;AAC1D,oEAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"MigrationDiffCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationDiffCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common';
|
|
2
|
-
import { ExecuteMigrationOptions } from '
|
|
2
|
+
import { ExecuteMigrationOptions } from '../../utils/migrations/MigrationExecuteHelper';
|
|
3
3
|
type Args = {
|
|
4
4
|
project?: string;
|
|
5
5
|
};
|
|
@@ -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,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEvF,OAAO,EAEN,uBAAuB,EAGvB,MAAM,
|
|
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,+CAA+C,CAAA;AAOtD,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;CA8DrE"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MigrationExecuteCommand = void 0;
|
|
4
4
|
const cli_common_1 = require("@contember/cli-common");
|
|
5
|
-
const MigrationsContainer_1 = require("../../MigrationsContainer");
|
|
6
|
-
const MigrationExecuteHelper_1 = require("
|
|
7
|
-
const migrations_1 = require("../../utils/migrations");
|
|
5
|
+
const MigrationsContainer_1 = require("../../utils/migrations/MigrationsContainer");
|
|
6
|
+
const MigrationExecuteHelper_1 = require("../../utils/migrations/MigrationExecuteHelper");
|
|
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
10
|
const system_1 = require("../../utils/system");
|
|
@@ -68,6 +68,11 @@ class MigrationExecuteCommand extends cli_common_1.Command {
|
|
|
68
68
|
migrations,
|
|
69
69
|
requireConfirmation: !input.getOption('yes'),
|
|
70
70
|
force: force,
|
|
71
|
+
contentMigrationFactoryArgs: {
|
|
72
|
+
apiToken,
|
|
73
|
+
apiBaseUrl: instance.baseUrl.replace(/\/$/, ''),
|
|
74
|
+
projectName: remoteProject,
|
|
75
|
+
},
|
|
71
76
|
});
|
|
72
77
|
code || (code = singleCode);
|
|
73
78
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationExecuteCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationExecuteCommand.ts"],"names":[],"mappings":";;;AAAA,sDAAuF;AACvF,
|
|
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":"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;
|
|
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;AAOvF,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"}
|
|
@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.MigrationRebaseCommand = void 0;
|
|
4
4
|
const cli_common_1 = require("@contember/cli-common");
|
|
5
5
|
const schema_migrations_1 = require("@contember/schema-migrations");
|
|
6
|
-
const MigrationCreateHelper_1 = require("
|
|
7
|
-
const migrations_1 = require("../../utils/migrations");
|
|
6
|
+
const MigrationCreateHelper_1 = require("../../utils/migrations/MigrationCreateHelper");
|
|
8
7
|
const SystemApiClientResolver_1 = require("./SystemApiClientResolver");
|
|
9
8
|
const schema_utils_1 = require("@contember/schema-utils");
|
|
10
9
|
const MigrationValidationHelper_1 = require("./MigrationValidationHelper");
|
|
@@ -29,7 +28,7 @@ class MigrationRebaseCommand extends cli_common_1.Command {
|
|
|
29
28
|
const migrationNames = input.getArgument('migration');
|
|
30
29
|
const migrations = [];
|
|
31
30
|
for (const migrationName of migrationNames) {
|
|
32
|
-
const migration = await
|
|
31
|
+
const migration = await migrationsResolver.findSchemaMigrationByVersion(migrationName);
|
|
33
32
|
if (!migration) {
|
|
34
33
|
throw `Migration ${migrationName} not found`;
|
|
35
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationRebaseCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationRebaseCommand.ts"],"names":[],"mappings":";;;AAAA,sDAAuF;AACvF,oEAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"MigrationRebaseCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationRebaseCommand.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,
|
|
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;AASvF,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"}
|
|
@@ -5,12 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.MigrationStatusCommand = void 0;
|
|
7
7
|
const cli_common_1 = require("@contember/cli-common");
|
|
8
|
-
const MigrationsContainer_1 = require("../../MigrationsContainer");
|
|
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
11
|
const system_1 = require("../../utils/system");
|
|
12
|
-
const migrations_1 = require("../../utils/migrations");
|
|
12
|
+
const migrations_1 = require("../../utils/migrations/migrations");
|
|
13
13
|
const chalk_1 = __importDefault(require("chalk"));
|
|
14
|
+
const MigrationExecuteHelper_1 = require("../../utils/migrations/MigrationExecuteHelper");
|
|
14
15
|
class MigrationStatusCommand extends cli_common_1.Command {
|
|
15
16
|
constructor(workspace) {
|
|
16
17
|
super();
|
|
@@ -52,9 +53,7 @@ class MigrationStatusCommand extends cli_common_1.Command {
|
|
|
52
53
|
const apiToken = await (0, tenant_1.interactiveResolveApiToken)({ workspace, instance });
|
|
53
54
|
const remoteProject = input.getOption('remote-project') || project.name;
|
|
54
55
|
const client = system_1.SystemClient.create(instance.baseUrl, remoteProject, apiToken);
|
|
55
|
-
|
|
56
|
-
let localMigrations = await container.migrationsResolver.getMigrations();
|
|
57
|
-
let status = (0, migrations_1.getMigrationsStatus)(executedMigrations, localMigrations);
|
|
56
|
+
let status = await (0, MigrationExecuteHelper_1.resolveMigrationStatus)(client, container.migrationsResolver);
|
|
58
57
|
const restoreMissing = input.getOption('restore-missing');
|
|
59
58
|
if (restoreMissing) {
|
|
60
59
|
const missing = status.errorMigrations.filter(it => it.state === migrations_1.MigrationState.EXECUTED_MISSING);
|
|
@@ -66,8 +65,7 @@ class MigrationStatusCommand extends cli_common_1.Command {
|
|
|
66
65
|
modifications: fullMigration.modifications,
|
|
67
66
|
}, undefined, '\t') + '\n', fullMigration.name);
|
|
68
67
|
}
|
|
69
|
-
|
|
70
|
-
status = (0, migrations_1.getMigrationsStatus)(executedMigrations, localMigrations);
|
|
68
|
+
status = await (0, MigrationExecuteHelper_1.resolveMigrationStatus)(client, container.migrationsResolver);
|
|
71
69
|
}
|
|
72
70
|
const onlyErrors = input.getOption('only-errors');
|
|
73
71
|
const onlyToExecute = input.getOption('only-to-execute');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationStatusCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationStatusCommand.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"MigrationStatusCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationStatusCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAA;AACvC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,wBAAwB,CAAA;AACtC,cAAc,2BAA2B,CAAA;AACzC,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/migrations/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAA;AACvC,cAAc,yBAAyB,CAAA;AACvC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,wBAAwB,CAAA;AACtC,cAAc,2BAA2B,CAAA;AACzC,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA"}
|
|
@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./MigrationAmendCommand"), exports);
|
|
18
|
+
__exportStar(require("./MigrationBlankCommand"), exports);
|
|
18
19
|
__exportStar(require("./MigrationDescribeCommand"), exports);
|
|
19
20
|
__exportStar(require("./MigrationDiffCommand"), exports);
|
|
20
21
|
__exportStar(require("./MigrationExecuteCommand"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/migrations/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0DAAuC;AACvC,6DAA0C;AAC1C,yDAAsC;AACtC,4DAAyC;AACzC,2DAAwC;AACxC,2DAAwC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/migrations/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0DAAuC;AACvC,0DAAuC;AACvC,6DAA0C;AAC1C,yDAAsC;AACtC,4DAAyC;AACzC,2DAAwC;AACxC,2DAAwC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ProjectValidateCommand = void 0;
|
|
4
4
|
const cli_common_1 = require("@contember/cli-common");
|
|
5
|
-
const MigrationsContainer_1 = require("../../MigrationsContainer");
|
|
5
|
+
const MigrationsContainer_1 = require("../../utils/migrations/MigrationsContainer");
|
|
6
6
|
const schema_1 = require("../../utils/schema");
|
|
7
7
|
const schema_utils_1 = require("@contember/schema-utils");
|
|
8
8
|
const MigrationValidationHelper_1 = require("../migrations/MigrationValidationHelper");
|
|
@@ -31,7 +31,7 @@ class ProjectValidateCommand extends cli_common_1.Command {
|
|
|
31
31
|
console.group(`Project ${project.name}:`);
|
|
32
32
|
const migrationsDir = await project.migrationsDir;
|
|
33
33
|
const container = new MigrationsContainer_1.MigrationsContainerFactory(migrationsDir).create();
|
|
34
|
-
const migrations = await container.migrationsResolver.
|
|
34
|
+
const migrations = await container.migrationsResolver.getSchemaMigrations();
|
|
35
35
|
let projectValid = await (0, MigrationValidationHelper_1.validateMigrations)(schema_utils_1.emptySchema, migrations, container.migrationDescriber, container.schemaMigrator);
|
|
36
36
|
const schema = await (0, loadSchema_1.loadSchema)(project);
|
|
37
37
|
projectValid = (0, schema_1.validateSchemaAndPrintErrors)(schema, 'Defined schema is invalid:') && projectValid;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectValidateCommand.js","sourceRoot":"","sources":["../../../../src/commands/project/ProjectValidateCommand.ts"],"names":[],"mappings":";;;AAAA,sDAA4G;AAC5G,
|
|
1
|
+
{"version":3,"file":"ProjectValidateCommand.js","sourceRoot":"","sources":["../../../../src/commands/project/ProjectValidateCommand.ts"],"names":[],"mappings":";;;AAAA,sDAA4G;AAC5G,oFAAuF;AACvF,+CAAiE;AACjE,0DAAqD;AACrD,uFAA4E;AAC5E,+DAA2D;AAQ3D,MAAa,sBAAuB,SAAQ,oBAAsB;IACjE,YACkB,SAAoB;QAErC,KAAK,EAAE,CAAA;QAFU,cAAS,GAAT,SAAS,CAAW;IAGtC,CAAC;IAES,SAAS,CAAC,aAAkD;QACrE,aAAa,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAA;QACrD,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,EAAE;YAC1C,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;SACjC;IACF,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,KAA2B;QAClD,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAA;QACpD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAA;QAEhC,MAAM,WAAW,GAAG,WAAW,KAAK,GAAG,CAAA;QACvC,MAAM,QAAQ,GAAG,WAAW;YAC3B,CAAC,CAAC,MAAM,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE;YACzC,CAAC,CAAC,CAAC,MAAM,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QACtE,IAAI,KAAK,GAAG,IAAI,CAAA;QAChB,MAAM,eAAe,GAAG,EAAE,CAAA;QAC1B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC/B,OAAO,CAAC,KAAK,CAAC,WAAW,OAAO,CAAC,IAAI,GAAG,CAAC,CAAA;YACzC,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,aAAa,CAAA;YACjD,MAAM,SAAS,GAAG,IAAI,gDAA0B,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE,CAAA;YACxE,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,CAAA;YAC3E,IAAI,YAAY,GAAG,MAAM,IAAA,8CAAkB,EAC1C,0BAAW,EACX,UAAU,EACV,SAAS,CAAC,kBAAkB,EAC5B,SAAS,CAAC,cAAc,CACxB,CAAA;YACD,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAU,EAAC,OAAO,CAAC,CAAA;YACxC,YAAY,GAAG,IAAA,qCAA4B,EAAC,MAAM,EAAE,4BAA4B,CAAC,IAAI,YAAY,CAAA;YAEjG,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,oBAAoB,CAAC,WAAW,EAAE,CAAA;YACtE,YAAY;gBACX,IAAA,qCAA4B,EAAC,WAAW,EAAE,0CAA0C,CAAC,IAAI,YAAY,CAAA;YAEtG,IAAI,YAAY,EAAE;gBACjB,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,YAAY,CAAC,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;gBAC1E,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpB,OAAO,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAA;oBAC/D,YAAY,GAAG,KAAK,CAAA;iBACpB;aACD;YAED,IAAI,YAAY,EAAE;gBACjB,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAA;aACtC;iBAAM;gBACN,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;aAClC;YACD,OAAO,CAAC,QAAQ,EAAE,CAAA;YAClB,KAAK,GAAG,KAAK,IAAI,YAAY,CAAA;SAC7B;QACD,IAAI,eAAe,CAAC,MAAM,EAAE;YAC3B,OAAO,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAA;YACxD,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;SAC9C;QACD,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACrB,CAAC;CACD;AAhED,wDAgEC"}
|
package/dist/src/run.js
CHANGED
|
@@ -17,6 +17,7 @@ const checkVersions_1 = require("./utils/checkVersions");
|
|
|
17
17
|
['data:transfer']: () => new TransferCommand_1.TransferCommand(workspace),
|
|
18
18
|
['migrations:diff']: () => new commands_1.MigrationDiffCommand(workspace),
|
|
19
19
|
['migrations:amend']: () => new commands_1.MigrationAmendCommand(workspace),
|
|
20
|
+
['migrations:blank']: () => new commands_1.MigrationBlankCommand(workspace),
|
|
20
21
|
['migrations:describe']: () => new commands_1.MigrationDescribeCommand(workspace),
|
|
21
22
|
['migrations:execute']: () => new commands_1.MigrationExecuteCommand(workspace),
|
|
22
23
|
['migrations:rebase']: () => new commands_1.MigrationRebaseCommand(workspace),
|
package/dist/src/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/run.ts"],"names":[],"mappings":";;;AACA,sDAAqH;AACrH,
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/run.ts"],"names":[],"mappings":"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"}
|