@contember/cli 1.3.0-alpha.6 → 1.3.0-alpha.8
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/migrations/MigrationAmendCommand.js +1 -1
- package/dist/src/commands/migrations/MigrationAmendCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationDescribeCommand.d.ts +1 -2
- 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/MigrationValidationHelper.js +1 -1
- package/dist/src/commands/migrations/MigrationValidationHelper.js.map +1 -1
- package/dist/src/commands/project/ProjectPrintSchemaCommand.js +2 -2
- package/dist/src/commands/project/ProjectPrintSchemaCommand.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/src/utils/migrations.d.ts +1 -1
- package/dist/src/utils/migrations.d.ts.map +1 -1
- package/dist/src/utils/migrations.js +12 -4
- package/dist/src/utils/migrations.js.map +1 -1
- package/package.json +8 -8
- package/src/commands/migrations/MigrationAmendCommand.ts +1 -1
- package/src/commands/migrations/MigrationDescribeCommand.ts +3 -37
- package/src/commands/migrations/MigrationValidationHelper.ts +1 -1
- package/src/commands/project/ProjectPrintSchemaCommand.ts +2 -2
- package/src/utils/migrations.ts +12 -4
|
@@ -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,5 +1,4 @@
|
|
|
1
|
-
import { Command, CommandConfiguration, Input } from '@contember/cli-common';
|
|
2
|
-
import { Workspace } from '@contember/cli-common';
|
|
1
|
+
import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common';
|
|
3
2
|
declare type Args = {
|
|
4
3
|
project?: string;
|
|
5
4
|
migration?: string;
|
|
@@ -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,aAAK,IAAI,GAAG;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,aAAK,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"}
|
|
@@ -9,7 +9,7 @@ const validateMigrations = async (initialSchema, migrations, describer, migrator
|
|
|
9
9
|
for (const migration of await migrations) {
|
|
10
10
|
try {
|
|
11
11
|
// just a check that it does not fail
|
|
12
|
-
|
|
12
|
+
describer.describeModifications(migratedSchema, migration);
|
|
13
13
|
migratedSchema = migrator.applyModifications(migratedSchema, migration.modifications, migration.formatVersion);
|
|
14
14
|
}
|
|
15
15
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationValidationHelper.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationValidationHelper.ts"],"names":[],"mappings":";;;AACA,oEAA+G;AAC/G,+CAAiE;AAE1D,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,KAAK,MAAM,SAAS,IAAI,MAAM,UAAU,EAAE;QACzC,IAAI;YACH,qCAAqC;YACrC,
|
|
1
|
+
{"version":3,"file":"MigrationValidationHelper.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationValidationHelper.ts"],"names":[],"mappings":";;;AACA,oEAA+G;AAC/G,+CAAiE;AAE1D,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,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,YAAY,GAAG,IAAA,qCAA4B,EAAC,cAAc,EAAE,YAAY,EAAE,SAAS,CAAC,aAAa,CAAC;eAC9F,YAAY,CAAA;KAChB;IACD,OAAO,YAAY,CAAA;AACpB,CAAC,CAAA;AAzBY,QAAA,kBAAkB,sBAyB9B"}
|
|
@@ -30,9 +30,9 @@ class ProjectPrintSchemaCommand extends cli_common_1.Command {
|
|
|
30
30
|
if (!(0, schema_1.validateSchemaAndPrintErrors)(schema, 'Defined schema is invalid:')) {
|
|
31
31
|
return 1;
|
|
32
32
|
}
|
|
33
|
-
const permissionFactory = new engine_content_api_1.PermissionFactory(
|
|
33
|
+
const permissionFactory = new engine_content_api_1.PermissionFactory();
|
|
34
34
|
const inputRoles = input.getOption('role');
|
|
35
|
-
const permissions = permissionFactory.create(schema
|
|
35
|
+
const permissions = permissionFactory.create(schema, inputRoles || ['admin']);
|
|
36
36
|
const schemaBuilderFactory = new engine_content_api_1.GraphQlSchemaBuilderFactory();
|
|
37
37
|
const authorizator = new engine_content_api_1.Authorizator(permissions, (_a = schema.acl.customPrimary) !== null && _a !== void 0 ? _a : false);
|
|
38
38
|
const introspection = new engine_content_api_1.IntrospectionSchemaFactory(schema.model, new engine_content_api_1.EntityRulesResolver(schema.validation, schema.model), authorizator);
|
|
@@ -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;AAW3D,MAAa,yBAA0B,SAAQ,oBAAsB;IACpE,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,MAAM,CAAC,QAAQ,CAAC,CAAC,aAAa,EAAE,CAAC,WAAW,CAAC,8BAA8B,CAAC,CAAA;QAC1F,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAA;IAC1C,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,KAA2B;;QAClD,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;QAChD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAA;QAChC,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,SAAS,CAAA;QAErD,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QACjF,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAU,EAAC,OAAO,CAAC,CAAA;QACxC,IAAI,CAAC,IAAA,qCAA4B,EAAC,MAAM,EAAE,4BAA4B,CAAC,EAAE;YACxE,OAAO,CAAC,CAAA;SACR;QACD,MAAM,iBAAiB,GAAG,IAAI,sCAAiB,
|
|
1
|
+
{"version":3,"file":"ProjectPrintSchemaCommand.js","sourceRoot":"","sources":["../../../../src/commands/project/ProjectPrintSchemaCommand.ts"],"names":[],"mappings":"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"}
|