@contember/cli 1.1.0-alpha.2 → 1.1.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/Dockerfile +1 -0
- package/build.sh +2 -2
- package/dist/src/commands/migrations/MigrationAmendCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationAmendCommand.js +2 -2
- package/dist/src/commands/migrations/MigrationAmendCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationDescribeCommand.js +1 -1
- 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 +2 -2
- package/dist/src/commands/migrations/MigrationDiffCommand.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.d.ts.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/commands/project/ProjectValidateCommand.d.ts.map +1 -1
- package/dist/src/commands/project/ProjectValidateCommand.js +4 -5
- package/dist/src/commands/project/ProjectValidateCommand.js.map +1 -1
- package/dist/src/run.js +0 -7
- package/dist/src/run.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/src/utils/migrations.js +1 -1
- package/dist/src/utils/migrations.js.map +1 -1
- package/dist/src/utils/project.d.ts +4 -0
- package/dist/src/utils/project.d.ts.map +1 -0
- package/dist/src/utils/project.js +47 -0
- package/dist/src/utils/project.js.map +1 -0
- package/esbuild.js +1 -1
- package/package.json +14 -14
- package/src/commands/migrations/MigrationAmendCommand.ts +2 -3
- package/src/commands/migrations/MigrationDescribeCommand.ts +1 -1
- package/src/commands/migrations/MigrationDiffCommand.ts +2 -3
- package/src/commands/migrations/MigrationValidationHelper.ts +1 -1
- package/src/commands/project/ProjectPrintSchemaCommand.ts +2 -3
- package/src/commands/project/ProjectValidateCommand.ts +3 -6
- package/src/run.ts +3 -9
- package/src/utils/migrations.ts +1 -1
- package/src/utils/project.ts +26 -0
package/Dockerfile
CHANGED
package/build.sh
CHANGED
|
@@ -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,MAAM,uBAAuB,CAAA;AAiB5E,aAAK,IAAI,GAAG;IACX,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,aAAK,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;IAChE,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;
|
|
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,MAAM,uBAAuB,CAAA;AAiB5E,aAAK,IAAI,GAAG;IACX,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,aAAK,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;IAChE,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;YA2GvD,cAAc;CAgB5B"}
|
|
@@ -14,6 +14,7 @@ const SystemApiClientResolver_1 = require("./SystemApiClientResolver");
|
|
|
14
14
|
const prompts_1 = __importDefault(require("prompts"));
|
|
15
15
|
const schema_utils_1 = require("@contember/schema-utils");
|
|
16
16
|
const MigrationValidationHelper_1 = require("./MigrationValidationHelper");
|
|
17
|
+
const project_1 = require("../../utils/project");
|
|
17
18
|
class MigrationAmendCommand extends cli_common_1.Command {
|
|
18
19
|
configure(configuration) {
|
|
19
20
|
configuration.description('Amends latest migration');
|
|
@@ -46,8 +47,7 @@ class MigrationAmendCommand extends cli_common_1.Command {
|
|
|
46
47
|
if (status.migrationsToExecute.length > 0) {
|
|
47
48
|
throw `Some migrations are not executed. Unable to amend.`;
|
|
48
49
|
}
|
|
49
|
-
|
|
50
|
-
const schema = require(project.apiDir).default;
|
|
50
|
+
const schema = await (0, project_1.loadSchema)(project);
|
|
51
51
|
try {
|
|
52
52
|
const initialSchema = await schemaVersionBuilder.buildSchema();
|
|
53
53
|
const intermediateResult = await migrationCreator.prepareMigration(initialSchema, schema, '');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationAmendCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationAmendCommand.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA4E;
|
|
1
|
+
{"version":3,"file":"MigrationAmendCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationAmendCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ const migrations_1 = require("../../utils/migrations");
|
|
|
10
10
|
const chalk_1 = __importDefault(require("chalk"));
|
|
11
11
|
const cli_common_2 = require("@contember/cli-common");
|
|
12
12
|
let printMigrationDescription = async function (migrationsDescriber, schema, migration, options) {
|
|
13
|
-
const description = await migrationsDescriber.describeModifications(schema, migration);
|
|
13
|
+
const description = await migrationsDescriber.describeModifications(schema, migration, 'system'); // schema name cannot be determined here
|
|
14
14
|
description.forEach(({ modification, sql, description }) => {
|
|
15
15
|
if (options.sqlOnly) {
|
|
16
16
|
if (sql.trim()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationDescribeCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationDescribeCommand.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA4E;AAC5E,mEAAsE;AACtE,uDAA+E;AAC/E,kDAAyB;AAGzB,sDAAiD;AAYjD,IAAI,yBAAyB,GAAG,KAAK,WACpC,mBAAuC,EACvC,MAAc,EACd,SAAoB,EACpB,OAA6C;IAE7C,MAAM,WAAW,GAAG,MAAM,mBAAmB,CAAC,qBAAqB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"MigrationDescribeCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationDescribeCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,MAAM,uBAAuB,CAAA;AAY5E,aAAK,IAAI,GAAG;IACX,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,aAAK,OAAO,GAAG;IACd,OAAO,CAAC,EAAE,IAAI,CAAA;IACd,GAAG,CAAC,EAAE,IAAI,CAAA;CACV,CAAA;AAED,qBAAa,oBAAqB,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IAC/D,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;
|
|
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,MAAM,uBAAuB,CAAA;AAY5E,aAAK,IAAI,GAAG;IACX,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,aAAK,OAAO,GAAG;IACd,OAAO,CAAC,EAAE,IAAI,CAAA;IACd,GAAG,CAAC,EAAE,IAAI,CAAA;CACV,CAAA;AAED,qBAAa,oBAAqB,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IAC/D,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;CA6ErE"}
|
|
@@ -14,6 +14,7 @@ const prompts_1 = __importDefault(require("prompts"));
|
|
|
14
14
|
const tenant_1 = require("../../utils/tenant");
|
|
15
15
|
const instance_1 = require("../../utils/instance");
|
|
16
16
|
const system_1 = require("../../utils/system");
|
|
17
|
+
const project_1 = require("../../utils/project");
|
|
17
18
|
class MigrationDiffCommand extends cli_common_1.Command {
|
|
18
19
|
configure(configuration) {
|
|
19
20
|
configuration.description('Creates schema migration diff for given project');
|
|
@@ -26,8 +27,7 @@ class MigrationDiffCommand extends cli_common_1.Command {
|
|
|
26
27
|
}
|
|
27
28
|
async execute(input) {
|
|
28
29
|
return await (0, MigrationCreateHelper_1.executeCreateMigrationCommand)(input, async ({ schemaVersionBuilder, migrationsResolver, workspace, project, migrationCreator, migrationDescriber, }) => {
|
|
29
|
-
|
|
30
|
-
const schema = require(project.apiDir).default;
|
|
30
|
+
const schema = await (0, project_1.loadSchema)(project);
|
|
31
31
|
try {
|
|
32
32
|
const migrationName = input.getArgument('migrationName');
|
|
33
33
|
const initialSchema = await schemaVersionBuilder.buildSchema();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationDiffCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationDiffCommand.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA4E;
|
|
1
|
+
{"version":3,"file":"MigrationDiffCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationDiffCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
-
await describer.describeModifications(migratedSchema, migration);
|
|
12
|
+
await describer.describeModifications(migratedSchema, migration, 'system'); // schema name not important here
|
|
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,MAAM,SAAS,CAAC,qBAAqB,CAAC,cAAc,EAAE,SAAS,CAAC,CAAA;
|
|
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,MAAM,SAAS,CAAC,qBAAqB,CAAC,cAAc,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA,CAAC,iCAAiC;YAE5G,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,YAAY;YACX,IAAA,qCAA4B,EAAC,cAAc,EAAE,aAAa,SAAS,CAAC,IAAI,2BAA2B,CAAC;gBACpG,YAAY,CAAA;KACb;IACD,OAAO,YAAY,CAAA;AACpB,CAAC,CAAA;AAzBY,QAAA,kBAAkB,sBAyB9B"}
|
|
@@ -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,aAAK,IAAI,GAAG;IACX,OAAO,EAAE,MAAM,CAAA;CACf,CAAA;AAED,aAAK,OAAO,GAAG;IACd,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,MAAM,CAAC,EAAE,SAAS,GAAG,eAAe,CAAA;CACpC,CAAA;AAED,qBAAa,yBAA0B,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IACpE,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;
|
|
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,aAAK,IAAI,GAAG;IACX,OAAO,EAAE,MAAM,CAAA;CACf,CAAA;AAED,aAAK,OAAO,GAAG;IACd,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,MAAM,CAAC,EAAE,SAAS,GAAG,eAAe,CAAA;CACpC,CAAA;AAED,qBAAa,yBAA0B,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IACpE,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;CAuCrE"}
|
|
@@ -7,6 +7,7 @@ const cli_common_2 = require("@contember/cli-common");
|
|
|
7
7
|
const engine_content_api_1 = require("@contember/engine-content-api");
|
|
8
8
|
const graphql_1 = require("graphql");
|
|
9
9
|
const merge_1 = require("@graphql-tools/merge");
|
|
10
|
+
const project_1 = require("../../utils/project");
|
|
10
11
|
class ProjectPrintSchemaCommand extends cli_common_1.Command {
|
|
11
12
|
configure(configuration) {
|
|
12
13
|
configuration.description('Prints project schema');
|
|
@@ -20,8 +21,7 @@ class ProjectPrintSchemaCommand extends cli_common_1.Command {
|
|
|
20
21
|
const format = input.getOption('format') || 'graphql';
|
|
21
22
|
(0, cli_common_2.validateProjectName)(projectName);
|
|
22
23
|
const project = await workspace.projects.getProject(projectName, { fuzzy: true });
|
|
23
|
-
|
|
24
|
-
const schema = require(project.apiDir).default;
|
|
24
|
+
const schema = await (0, project_1.loadSchema)(project);
|
|
25
25
|
if (!(0, schema_1.validateSchemaAndPrintErrors)(schema, 'Defined schema is invalid:')) {
|
|
26
26
|
return 1;
|
|
27
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectPrintSchemaCommand.js","sourceRoot":"","sources":["../../../../src/commands/project/ProjectPrintSchemaCommand.ts"],"names":[],"mappings":";;;AAAA,sDAA4E;
|
|
1
|
+
{"version":3,"file":"ProjectPrintSchemaCommand.js","sourceRoot":"","sources":["../../../../src/commands/project/ProjectPrintSchemaCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"ProjectValidateCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/ProjectValidateCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAkC,MAAM,uBAAuB,CAAA;AAO5G,aAAK,IAAI,GAAG;IACX,OAAO,EAAE,MAAM,CAAA;CACf,CAAA;AAED,aAAK,OAAO,GAAG,EAAE,CAAA;AAEjB,qBAAa,sBAAuB,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IACjE,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI;cAK7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CAqDrE"}
|
|
@@ -5,8 +5,8 @@ const cli_common_1 = require("@contember/cli-common");
|
|
|
5
5
|
const MigrationsContainer_1 = require("../../MigrationsContainer");
|
|
6
6
|
const schema_1 = require("../../utils/schema");
|
|
7
7
|
const schema_utils_1 = require("@contember/schema-utils");
|
|
8
|
-
const cli_common_2 = require("@contember/cli-common");
|
|
9
8
|
const MigrationValidationHelper_1 = require("../migrations/MigrationValidationHelper");
|
|
9
|
+
const project_1 = require("../../utils/project");
|
|
10
10
|
class ProjectValidateCommand extends cli_common_1.Command {
|
|
11
11
|
configure(configuration) {
|
|
12
12
|
configuration.description('Validates project schema');
|
|
@@ -14,10 +14,10 @@ class ProjectValidateCommand extends cli_common_1.Command {
|
|
|
14
14
|
}
|
|
15
15
|
async execute(input) {
|
|
16
16
|
const [projectName] = [input.getArgument('project')];
|
|
17
|
-
const workspace = await
|
|
17
|
+
const workspace = await cli_common_1.Workspace.get(process.cwd());
|
|
18
18
|
const allProjects = projectName === '.';
|
|
19
19
|
if (!allProjects) {
|
|
20
|
-
(0,
|
|
20
|
+
(0, cli_common_1.validateProjectName)(projectName);
|
|
21
21
|
}
|
|
22
22
|
const projects = allProjects
|
|
23
23
|
? await workspace.projects.listProjects()
|
|
@@ -30,8 +30,7 @@ class ProjectValidateCommand extends cli_common_1.Command {
|
|
|
30
30
|
const container = new MigrationsContainer_1.MigrationsContainerFactory(migrationsDir).create();
|
|
31
31
|
const migrations = await container.migrationsResolver.getMigrations();
|
|
32
32
|
let projectValid = await (0, MigrationValidationHelper_1.validateMigrations)(schema_utils_1.emptySchema, migrations, container.migrationDescriber, container.schemaMigrator);
|
|
33
|
-
|
|
34
|
-
const schema = require(project.apiDir).default;
|
|
33
|
+
const schema = await (0, project_1.loadSchema)(project);
|
|
35
34
|
projectValid = (0, schema_1.validateSchemaAndPrintErrors)(schema, 'Defined schema is invalid:') && projectValid;
|
|
36
35
|
const builtSchema = await container.schemaVersionBuilder.buildSchema();
|
|
37
36
|
projectValid =
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectValidateCommand.js","sourceRoot":"","sources":["../../../../src/commands/project/ProjectValidateCommand.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"ProjectValidateCommand.js","sourceRoot":"","sources":["../../../../src/commands/project/ProjectValidateCommand.ts"],"names":[],"mappings":"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"}
|
package/dist/src/run.js
CHANGED
|
@@ -1,16 +1,9 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
"use strict";
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
const ts_node_1 = require("ts-node");
|
|
5
4
|
const cli_common_1 = require("@contember/cli-common");
|
|
6
5
|
const commands_1 = require("./commands");
|
|
7
6
|
(async () => {
|
|
8
|
-
(0, ts_node_1.register)({
|
|
9
|
-
compilerOptions: {
|
|
10
|
-
experimentalDecorators: true,
|
|
11
|
-
module: 'commonjs',
|
|
12
|
-
},
|
|
13
|
-
});
|
|
14
7
|
const diffCommandFactory = () => new commands_1.MigrationDiffCommand();
|
|
15
8
|
const migrationsDescribeFactory = () => new commands_1.MigrationDescribeCommand();
|
|
16
9
|
const commandManager = new cli_common_1.CommandManager({
|
package/dist/src/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/run.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/run.ts"],"names":[],"mappings":";;;AACA,sDAAsF;AACtF,yCAiBoB;AAEpB,CAAC,KAAK,IAAI,EAAE;IACX,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,IAAI,+BAAoB,EAAE,CAAA;IAC3D,MAAM,yBAAyB,GAAG,GAAG,EAAE,CAAC,IAAI,mCAAwB,EAAE,CAAA;IACtE,MAAM,cAAc,GAAG,IAAI,2BAAc,CAAC;QACzC,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,wBAAa,EAAE;QACrC,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,yBAAc,EAAE;QACvC,CAAC,iBAAiB,CAAC,EAAE,kBAAkB;QACvC,CAAC,kBAAkB,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,gCAAqB,EAAE;QACvD,CAAC,qBAAqB,CAAC,EAAE,yBAAyB;QAClD,CAAC,oBAAoB,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,kCAAuB,EAAE;QAC3D,CAAC,mBAAmB,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,iCAAsB,EAAE;QACzD,CAAC,mBAAmB,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,iCAAsB,EAAE;QACzD,CAAC,sBAAsB,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,oCAAyB,EAAE;QAC/D,CAAC,gBAAgB,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,+BAAoB,EAAE;QACpD,CAAC,kBAAkB,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,iCAAsB,EAAE;QACxD,CAAC,sBAAsB,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,oCAAyB,EAAE;QAC/D,CAAC,gBAAgB,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,wBAAa,EAAE;QAC7C,CAAC,uBAAuB,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,8BAAmB,EAAE;QAC1D,CAAC,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,wBAAa,EAAE;QAC5C,CAAC,uBAAuB,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,+BAAoB,EAAE;QAE3D,aAAa;QACb,CAAC,oBAAoB,CAAC,EAAE,yBAAyB;QACjD,CAAC,MAAM,CAAC,EAAE,kBAAkB;KAC5B,CAAC,CAAA;IAEF,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;IAC1D,IAAI,WAAW,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE;QAC/C,MAAM,wBAAwB,CAAA;KAC9B;IACD,MAAM,UAAU,GAAG,IAAA,8BAAiB,GAAE,CAAA;IACtC,MAAM,GAAG,GAAG,IAAI,wBAAW,CAAC,cAAc,EAAE,yBAAyB,UAAU,EAAE,CAAC,CAAA;IAClF,MAAM,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AACrC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACd,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAChB,CAAC,CAAC,CAAA"}
|