@contember/cli 1.2.0-alpha.17 → 1.2.0-alpha.19
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.d.ts.map +1 -1
- package/dist/src/commands/deploy/DeployCommand.js +3 -4
- package/dist/src/commands/deploy/DeployCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationAmendCommand.js +1 -1
- package/dist/src/commands/migrations/MigrationAmendCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationDiffCommand.d.ts +1 -0
- package/dist/src/commands/migrations/MigrationDiffCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationDiffCommand.js +4 -1
- package/dist/src/commands/migrations/MigrationDiffCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationValidationHelper.js +3 -3
- package/dist/src/commands/migrations/MigrationValidationHelper.js.map +1 -1
- package/dist/src/commands/project/ProjectGenerateDocumentation.js +3 -3
- package/dist/src/commands/project/ProjectGenerateDocumentation.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/src/utils/admin.js +1 -1
- package/dist/src/utils/admin.js.map +1 -1
- package/dist/src/utils/commands.d.ts +2 -2
- package/dist/src/utils/commands.d.ts.map +1 -1
- package/dist/src/utils/commands.js +2 -2
- package/dist/src/utils/commands.js.map +1 -1
- package/dist/src/utils/dockerCompose.js +5 -5
- package/dist/src/utils/dockerCompose.js.map +1 -1
- package/dist/src/utils/npm.js +8 -8
- package/dist/src/utils/npm.js.map +1 -1
- package/dist/src/utils/project/loadSchema.js +2 -2
- package/dist/src/utils/project/loadSchema.js.map +1 -1
- package/dist/src/utils/project/projectDescribe.js +1 -1
- package/dist/src/utils/project/projectDescribe.js.map +1 -1
- package/dist/src/utils/schema.d.ts +2 -2
- package/dist/src/utils/schema.d.ts.map +1 -1
- package/dist/src/utils/schema.js +3 -3
- package/dist/src/utils/schema.js.map +1 -1
- package/dist/src/utils/workspace.d.ts.map +1 -1
- package/dist/src/utils/workspace.js +1 -2
- package/dist/src/utils/workspace.js.map +1 -1
- package/dist/src/utils/yaml.d.ts +1 -1
- package/dist/src/utils/yaml.d.ts.map +1 -1
- package/dist/src/utils/yaml.js +3 -3
- package/dist/src/utils/yaml.js.map +1 -1
- package/package.json +9 -11
- package/src/commands/deploy/DeployCommand.ts +2 -3
- package/src/commands/migrations/MigrationAmendCommand.ts +1 -1
- package/src/commands/migrations/MigrationDiffCommand.ts +6 -1
- package/src/commands/migrations/MigrationValidationHelper.ts +3 -3
- package/src/commands/project/ProjectGenerateDocumentation.ts +2 -2
- package/src/utils/admin.ts +1 -1
- package/src/utils/commands.ts +2 -2
- package/src/utils/dockerCompose.ts +2 -2
- package/src/utils/npm.ts +2 -2
- package/src/utils/project/loadSchema.ts +1 -1
- package/src/utils/project/projectDescribe.tsx +1 -1
- package/src/utils/schema.ts +4 -4
- package/src/utils/workspace.ts +1 -2
- package/src/utils/yaml.ts +2 -3
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"DeployCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/deploy/DeployCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAuB,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAC5G,OAAO,EAEN,uBAAuB,EAGvB,MAAM,sCAAsC,CAAA;AAW7C,aAAK,IAAI,GAAG;IACX,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,aAAK,OAAO,GAAG,uBAAuB,GAAG;IACxC,KAAK,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,qBAAa,aAAc,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IAEvD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAKtC,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI;cAU7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;IAmG5E,OAAO,CAAC,kBAAkB;CAS1B"}
|
|
@@ -6,13 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.DeployCommand = void 0;
|
|
7
7
|
const cli_common_1 = require("@contember/cli-common");
|
|
8
8
|
const MigrationExecuteHelper_1 = require("../migrations/MigrationExecuteHelper");
|
|
9
|
-
const fs_extra_1 = require("fs-extra");
|
|
10
9
|
const tenant_1 = require("../../utils/tenant");
|
|
11
10
|
const instance_1 = require("../../utils/instance");
|
|
12
11
|
const system_1 = require("../../utils/system");
|
|
13
12
|
const MigrationsContainer_1 = require("../../MigrationsContainer");
|
|
14
13
|
const admin_1 = require("../../utils/admin");
|
|
15
|
-
const
|
|
14
|
+
const node_url_1 = require("node:url");
|
|
16
15
|
const prompts_1 = __importDefault(require("prompts"));
|
|
17
16
|
const migrations_1 = require("../../utils/migrations");
|
|
18
17
|
const token_1 = require("../../utils/token");
|
|
@@ -38,7 +37,7 @@ class DeployCommand extends cli_common_1.Command {
|
|
|
38
37
|
let apiTokenFromDsn = undefined;
|
|
39
38
|
let remoteProject = input.getOption('remote-project') || project.name;
|
|
40
39
|
if (dsn) {
|
|
41
|
-
const uri = new
|
|
40
|
+
const uri = new node_url_1.URL(dsn);
|
|
42
41
|
if (uri.protocol !== 'contember:' && uri.protocol !== 'contember-unsecure:') {
|
|
43
42
|
throw 'Invalid deploy DSN';
|
|
44
43
|
}
|
|
@@ -62,7 +61,7 @@ class DeployCommand extends cli_common_1.Command {
|
|
|
62
61
|
await tenantClient.createProject(remoteProject, true);
|
|
63
62
|
const systemClient = system_1.SystemClient.create(instance.baseUrl, remoteProject, apiToken);
|
|
64
63
|
const projectAdminDistDir = `${project.adminDir}/dist`;
|
|
65
|
-
if (adminEndpoint && !(await (0,
|
|
64
|
+
if (adminEndpoint && !(await (0, cli_common_1.pathExists)(`${projectAdminDistDir}/index.html`))) {
|
|
66
65
|
throw `Missing ${projectAdminDistDir}/index.html. Please build admin before deploying.`;
|
|
67
66
|
}
|
|
68
67
|
const status = await (0, MigrationExecuteHelper_1.resolveMigrationStatus)(systemClient, container.migrationsResolver, false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeployCommand.js","sourceRoot":"","sources":["../../../../src/commands/deploy/DeployCommand.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"DeployCommand.js","sourceRoot":"","sources":["../../../../src/commands/deploy/DeployCommand.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA4G;AAC5G,iFAK6C;AAC7C,+CAA6E;AAC7E,mDAAqF;AACrF,+CAAiD;AACjD,mEAAsE;AACtE,6CAA+D;AAC/D,uCAA8B;AAC9B,sDAA6B;AAC7B,uDAAmE;AACnE,6CAA6C;AAW7C,MAAa,aAAc,SAAQ,oBAAsB;IACxD,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,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAC7B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,EAAE;YAC1C,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAA;SAC5C;QACD,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,CAAA;QAC7C,IAAA,yDAAgC,EAAC,aAAa,CAAC,CAAA;IAChD,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,KAA2B;QAClD,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;QACzD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QAEtF,IAAI,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;QACxC,IAAI,aAAa,GAAG,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QAE5C,IAAI,eAAe,GAAuB,SAAS,CAAA;QAEnD,IAAI,aAAa,GAAG,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,IAAI,OAAO,CAAC,IAAI,CAAA;QACrE,IAAI,GAAG,EAAE;YACR,MAAM,GAAG,GAAG,IAAI,cAAG,CAAC,GAAG,CAAC,CAAA;YACxB,IAAI,GAAG,CAAC,QAAQ,KAAK,YAAY,IAAI,GAAG,CAAC,QAAQ,KAAK,qBAAqB,EAAE;gBAC5E,MAAM,oBAAoB,CAAA;aAC1B;YACD,aAAa,GAAG,GAAG,CAAC,QAAQ,CAAA;YAC5B,eAAe,GAAG,GAAG,CAAC,QAAQ,CAAA;YAC9B,aAAa,GAAG,CAAC,GAAG,CAAC,QAAQ,KAAK,qBAAqB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,IAAI,CAAA;SAC5F;QACD,MAAM,QAAQ,GAAG,MAAM,IAAA,yDAA8C,EAAC,IAAI,CAAC,SAAS,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAA;QACtJ,MAAM,QAAQ,GAAG,MAAM,IAAA,mCAA0B,EAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,CAAA;QACrH,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACf,OAAO,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAA;QAC1D,OAAO,CAAC,GAAG,CAAC,uBAAuB,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;QAClD,OAAO,CAAC,GAAG,CAAC,wBAAwB,aAAa,EAAE,CAAC,CAAA;QACpD,OAAO,CAAC,GAAG,CAAC,YAAY,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;QAC3C,OAAO,CAAC,GAAG,CAAC,cAAc,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,MAAM,EAAE,CAAC,CAAA;QACpD,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAA,iBAAS,EAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;QACnD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAEf,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;QAC3C,MAAM,SAAS,GAAG,IAAI,gDAA0B,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE,CAAA;QAExE,MAAM,YAAY,GAAG,qBAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QACpE,MAAM,YAAY,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,CAAC,CAAA;QACrD,MAAM,YAAY,GAAG,qBAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAA;QAEnF,MAAM,mBAAmB,GAAG,GAAG,OAAO,CAAC,QAAQ,OAAO,CAAA;QACtD,IAAI,aAAa,IAAI,CAAC,CAAC,MAAM,IAAA,uBAAU,EAAC,GAAG,mBAAmB,aAAa,CAAC,CAAC,EAAE;YAC9E,MAAM,WAAW,mBAAmB,mDAAmD,CAAA;SACvF;QAED,MAAM,MAAM,GAAG,MAAM,IAAA,+CAAsB,EAAC,YAAY,EAAE,SAAS,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAA;QAE9F,IAAI,MAAM,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;YACtC,OAAO,CAAC,KAAK,CAAC,IAAA,uCAA0B,EAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAA;YACjE,MAAM,2BAA2B,CAAA;SACjC;QAED,IAAI,MAAM,CAAC,mBAAmB,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE;YAC9D,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;YAC7B,OAAO,CAAC,CAAA;SACR;QACD,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YAC5B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE;gBACzB,MAAM,4DAA4D,CAAA;aAClE;YACD,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAA;YACrD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;YACjH,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAA;YACtF,OAAO,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAA;YAC/D,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YACf,MAAM,EAAE,EAAE,EAAE,GAAG,MAAM,IAAA,iBAAO,EAAC;gBAC5B,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,0BAA0B;aACnC,CAAC,CAAA;YACD,IAAI,CAAC,EAAE,EAAE;gBACT,OAAO,CAAC,CAAA;aACR;SACD;QACD,MAAM,iBAAiB,GAAG,MAAM,IAAA,0CAAiB,EAAC;YACjD,kBAAkB,EAAE,SAAS,CAAC,kBAAkB;YAChD,oBAAoB,EAAE,SAAS,CAAC,oBAAoB;YACpD,MAAM,EAAE,YAAY;YACpB,UAAU,EAAE,MAAM,CAAC,mBAAmB;YACtC,mBAAmB,EAAE,KAAK;YAC1B,KAAK,EAAE,KAAK;SACZ,CAAC,CAAA;QAEF,IAAI,iBAAiB,KAAK,CAAC,EAAE;YAC5B,OAAO,iBAAiB,CAAA;SACxB;QAED,IAAI,aAAa,EAAE;YAClB,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;YACjC,MAAM,MAAM,GAAG,mBAAW,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAA;YAC1D,MAAM,KAAK,GAAG,MAAM,IAAA,sBAAc,EAAC,mBAAmB,CAAC,CAAA;YACvD,MAAM,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;YACzC,OAAO,CAAC,GAAG,CAAC,mBAAmB,KAAK,CAAC,MAAM,SAAS,CAAC,CAAA;SACrD;QACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACf,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;QACpC,OAAO,CAAC,GAAG,CAAC,YAAY,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;QAC3C,OAAO,CAAC,GAAG,CAAC,cAAc,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,MAAM,EAAE,CAAC,CAAA;QAEpD,OAAO,CAAC,CAAA;IACT,CAAC;IAEO,kBAAkB,CAAC,KAA2B;QACrD,MAAM,iBAAiB,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;QAClD,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;QAEhD,MAAM,SAAS,GAAG,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QACnD,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAA;QACrD,MAAM,WAAW,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,WAAW,CAAA;QAChE,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;IAC1B,CAAC;CACD;AA7HD,sCA6HC"}
|
|
@@ -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 newSchema = await schemaMigrator.applyModifications(prevSchema, [...amendMigration.modifications, ...intermediateResult.migration.modifications], amendMigration.formatVersion);
|
|
68
|
+
const { meta, ...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":";;;;;;AAAA,sDAAuF;AACvF,+CAA0D;AAC1D,oEAAqE;AACrE,mEAAuE;AACvE,uDAK+B;AAC/B,qEAAiE;AACjE,uEAAkE;AAClE,sDAA6B;AAC7B,0DAAqD;AACrD,2EAAgE;AAChE,+DAA2D;AAY3D,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,yBAAyB,CAAC,CAAA;QACpD,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,OAAO,CAAC,CAAC,WAAW,CAAC,2DAA2D,CAAC,CAAA;QACtG,aAAa,CAAC,EAAE;aACd,MAAM,CAAC,KAAK,CAAC;aACb,SAAS,EAAE;aACX,WAAW,CAAC,8BAA8B,CAAC,CAAA;IAC9C,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,oBAAoB,EACpB,kBAAkB,EAClB,SAAS,EACT,OAAO,EACP,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,GACd,EAAE,EAAE;YACJ,MAAM,aAAa,GAAG,KAAK,CAAC,WAAW,CAAC,WAAW,CAAC,CAAA;YACpD,MAAM,cAAc,GAAG,aAAa;gBACnC,CAAC,CAAC,MAAM,IAAA,+BAAkB,EAAC,kBAAkB,EAAE,aAAa,CAAC;gBAC7D,CAAC,CAAC,MAAM,IAAA,+BAAkB,EAAC,kBAAkB,CAAC,CAAA;YAC/C,IAAI,CAAC,cAAc,EAAE;gBACpB,MAAM,uBAAuB,CAAA;aAC7B;YACD,MAAM,MAAM,GAAG,MAAM,IAAA,gDAAsB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAA;YAC/D,MAAM,MAAM,GAAG,MAAM,IAAA,+CAAsB,EAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;YACvE,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;YACtC,IAAI,MAAM,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtC,OAAO,CAAC,KAAK,CAAC,IAAA,uCAA0B,EAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAA;gBACjE,IAAI,CAAC,KAAK,EAAE;oBACX,MAAM,2BAA2B,CAAA;iBACjC;aACD;YACD,IAAI,MAAM,CAAC,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC1C,MAAM,oDAAoD,CAAA;aAC1D;YACD,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAU,EAAC,OAAO,CAAC,CAAA;YACxC,IAAI;gBACH,MAAM,aAAa,GAAG,MAAM,oBAAoB,CAAC,WAAW,EAAE,CAAA;gBAC9D,MAAM,kBAAkB,GAAG,MAAM,gBAAgB,CAAC,gBAAgB,CAAC,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;gBAC7F,IAAI,kBAAkB,KAAK,IAAI,EAAE;oBAChC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;oBAC5B,OAAO,CAAC,CAAA;iBACR;gBACD,IAAI,cAAc,CAAC,aAAa,KAAK,kBAAkB,CAAC,SAAS,CAAC,aAAa,EAAE;oBAChF,MAAM,uCAAuC,CAAA;iBAC7C;gBACD,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,mBAAmB,CAChE,0BAAW,EACX,OAAO,CAAC,EAAE,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO,CAC3C,CAAA;gBACD,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,kBAAkB,
|
|
1
|
+
{"version":3,"file":"MigrationAmendCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationAmendCommand.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,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAYvF,aAAK,IAAI,GAAG;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,aAAK,OAAO,GAAG;IACd,OAAO,CAAC,EAAE,IAAI,CAAA;IACd,GAAG,CAAC,EAAE,IAAI,CAAA;
|
|
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,aAAK,IAAI,GAAG;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,aAAK,OAAO,GAAG;IACd,OAAO,CAAC,EAAE,IAAI,CAAA;IACd,GAAG,CAAC,EAAE,IAAI,CAAA;IACV,gCAAgC,CAAC,EAAE,IAAI,CAAA;CACvC,CAAA;AAED,qBAAa,oBAAqB,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IAE9D,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAKtC,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI;cAe7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CAgFrE"}
|
|
@@ -31,6 +31,7 @@ class MigrationDiffCommand extends cli_common_1.Command {
|
|
|
31
31
|
.option('yes')
|
|
32
32
|
.valueNone()
|
|
33
33
|
.description('Do not ask for confirmation.');
|
|
34
|
+
configuration.option('skip-initial-schema-validation');
|
|
34
35
|
}
|
|
35
36
|
async execute(input) {
|
|
36
37
|
return await (0, MigrationCreateHelper_1.executeCreateMigrationCommand)(input, { workspace: this.workspace }, async ({ schemaVersionBuilder, migrationsResolver, workspace, project, migrationCreator, migrationDescriber, }) => {
|
|
@@ -38,7 +39,9 @@ class MigrationDiffCommand extends cli_common_1.Command {
|
|
|
38
39
|
try {
|
|
39
40
|
const migrationName = input.getArgument('migrationName');
|
|
40
41
|
const initialSchema = await schemaVersionBuilder.buildSchema();
|
|
41
|
-
const result = await migrationCreator.prepareMigration(initialSchema, schema, migrationName
|
|
42
|
+
const result = await migrationCreator.prepareMigration(initialSchema, schema, migrationName, {
|
|
43
|
+
skipInitialSchemaValidation: input.getOption('skip-initial-schema-validation') === true,
|
|
44
|
+
});
|
|
42
45
|
if (result === null) {
|
|
43
46
|
console.log('Nothing to do');
|
|
44
47
|
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,mEAAuE;AACvE,uDAA8F;AAC9F,qEAAoF;AACpF,sDAA6B;AAC7B,+CAA6E;AAC7E,mDAAqF;AACrF,+CAAiD;AACjD,+DAA2D;
|
|
1
|
+
{"version":3,"file":"MigrationDiffCommand.js","sourceRoot":"","sources":["../../../../src/commands/migrations/MigrationDiffCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,9 +18,9 @@ const validateMigrations = async (initialSchema, migrations, describer, migrator
|
|
|
18
18
|
}
|
|
19
19
|
throw e;
|
|
20
20
|
}
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
const errorMessage = `Migration ${migration.name} produces invalid schema:`;
|
|
22
|
+
projectValid = (0, schema_1.validateSchemaAndPrintErrors)(migratedSchema, errorMessage, migration.skippedErrors)
|
|
23
|
+
&& projectValid;
|
|
24
24
|
}
|
|
25
25
|
return projectValid;
|
|
26
26
|
};
|
|
@@ -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,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;
|
|
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,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"}
|
|
@@ -5,8 +5,8 @@ const cli_common_1 = require("@contember/cli-common");
|
|
|
5
5
|
const schema_1 = require("../../utils/schema");
|
|
6
6
|
const loadSchema_1 = require("../../utils/project/loadSchema");
|
|
7
7
|
const projectDescribe_1 = require("../../utils/project/projectDescribe");
|
|
8
|
-
const promises_1 = require("fs/promises");
|
|
9
|
-
const
|
|
8
|
+
const promises_1 = require("node:fs/promises");
|
|
9
|
+
const node_path_1 = require("node:path");
|
|
10
10
|
class ProjectGenerateDocumentation extends cli_common_1.Command {
|
|
11
11
|
constructor(workspace) {
|
|
12
12
|
super();
|
|
@@ -34,7 +34,7 @@ class ProjectGenerateDocumentation extends cli_common_1.Command {
|
|
|
34
34
|
}
|
|
35
35
|
else {
|
|
36
36
|
console.log(`Documentation saved to ${output}`);
|
|
37
|
-
await (0, promises_1.writeFile)((0,
|
|
37
|
+
await (0, promises_1.writeFile)((0, node_path_1.join)(process.cwd(), output), html);
|
|
38
38
|
}
|
|
39
39
|
return 0;
|
|
40
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectGenerateDocumentation.js","sourceRoot":"","sources":["../../../../src/commands/project/ProjectGenerateDocumentation.ts"],"names":[],"mappings":";;;AAAA,sDAAuF;AACvF,+CAAiE;AACjE,+DAA2D;AAC3D,yEAA2E;AAC3E
|
|
1
|
+
{"version":3,"file":"ProjectGenerateDocumentation.js","sourceRoot":"","sources":["../../../../src/commands/project/ProjectGenerateDocumentation.ts"],"names":[],"mappings":";;;AAAA,sDAAuF;AACvF,+CAAiE;AACjE,+DAA2D;AAC3D,yEAA2E;AAC3E,+CAA4C;AAC5C,yCAAgC;AAUhC,MAAa,4BAA6B,SAAQ,oBAAsB;IACvE,YACkB,SAAoB;QAErC,KAAK,EAAE,CAAA;QAFU,cAAS,GAAT,SAAS,CAAW;IAGtC,CAAC;IAES,SAAS,CAAC,aAAkD;QACrE,aAAa,CAAC,WAAW,CAAC,kDAAkD,CAAC,CAAA;QAC7E,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,uBAAuB,CAAC,CAAA;IACpF,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,KAA2B;;QAClD,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;QAChD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QACtF,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,IAAI,GAAG,MAAM,IAAA,uCAAqB,EAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;QAC9D,MAAM,MAAM,GAAG,MAAA,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,mCAAI,GAAG,OAAO,CAAC,IAAI,OAAO,CAAA;QAClE,IAAI,MAAM,KAAK,QAAQ,EAAE;YACxB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;SACjB;aAAM;YACN,OAAO,CAAC,GAAG,CAAC,0BAA0B,MAAM,EAAE,CAAC,CAAA;YAC/C,MAAM,IAAA,oBAAS,EAAC,IAAA,gBAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAA;SAClD;QAED,OAAO,CAAC,CAAA;IACT,CAAC;CACD;AAjCD,oEAiCC"}
|