@contember/cli 1.3.0-rc.1 → 1.3.0-rc.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/dist/src/commands/deploy/DeployCommand.d.ts +3 -0
- package/dist/src/commands/deploy/DeployCommand.d.ts.map +1 -1
- package/dist/src/commands/deploy/DeployCommand.js +49 -42
- package/dist/src/commands/deploy/DeployCommand.js.map +1 -1
- package/dist/src/commands/transfer/ExportCommand.js +1 -1
- package/dist/src/commands/transfer/ImportCommand.js +1 -1
- package/dist/src/commands/transfer/TransferCommand.js +1 -1
- package/dist/src/run.js +7 -4
- package/dist/src/run.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/src/utils/admin.d.ts +1 -1
- package/dist/src/utils/admin.d.ts.map +1 -1
- package/dist/src/utils/admin.js.map +1 -1
- package/dist/src/utils/checkVersions.js +1 -1
- package/dist/src/utils/checkVersions.js.map +1 -1
- package/dist/src/utils/project/loadSchema.d.ts.map +1 -1
- package/dist/src/utils/project/loadSchema.js +1 -0
- package/dist/src/utils/project/loadSchema.js.map +1 -1
- package/dist/src/utils/stdio.d.ts +1 -1
- package/dist/src/utils/stdio.d.ts.map +1 -1
- package/dist/src/utils/stdio.js +6 -3
- package/dist/src/utils/stdio.js.map +1 -1
- package/package.json +8 -8
- package/src/commands/deploy/DeployCommand.ts +69 -47
- package/src/commands/transfer/ExportCommand.ts +2 -2
- package/src/commands/transfer/ImportCommand.ts +2 -2
- package/src/commands/transfer/TransferCommand.ts +2 -2
- package/src/run.ts +11 -5
- package/src/utils/admin.ts +1 -1
- package/src/utils/checkVersions.ts +1 -1
- package/src/utils/project/loadSchema.ts +1 -0
- package/src/utils/stdio.ts +4 -1
|
@@ -6,6 +6,9 @@ type Args = {
|
|
|
6
6
|
};
|
|
7
7
|
type Options = ExecuteMigrationOptions & {
|
|
8
8
|
admin?: string;
|
|
9
|
+
['no-admin']?: boolean;
|
|
10
|
+
['no-migrations']?: boolean;
|
|
11
|
+
root?: boolean;
|
|
9
12
|
};
|
|
10
13
|
export declare class DeployCommand extends Command<Args, Options> {
|
|
11
14
|
private readonly workspace;
|
|
@@ -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,EAAc,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACnG,OAAO,EAEN,uBAAuB,EAGvB,MAAM,sCAAsC,CAAA;AAW7C,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;IA2G5E,OAAO,CAAC,kBAAkB;CAS1B"}
|
|
@@ -27,6 +27,9 @@ class DeployCommand extends cli_common_1.Command {
|
|
|
27
27
|
configuration.argument('project').optional();
|
|
28
28
|
}
|
|
29
29
|
configuration.option('admin').valueRequired();
|
|
30
|
+
configuration.option('root').valueNone();
|
|
31
|
+
configuration.option('no-admin').valueNone();
|
|
32
|
+
configuration.option('no-migrations').valueNone();
|
|
30
33
|
(0, MigrationExecuteHelper_1.configureExecuteMigrationCommand)(configuration);
|
|
31
34
|
}
|
|
32
35
|
async execute(input) {
|
|
@@ -49,58 +52,62 @@ class DeployCommand extends cli_common_1.Command {
|
|
|
49
52
|
console.log(`Admin URL: ${adminEndpoint !== null && adminEndpoint !== void 0 ? adminEndpoint : 'none'}`);
|
|
50
53
|
console.log(`Deploy token: ${(0, token_1.maskToken)(apiToken)}`);
|
|
51
54
|
console.log('');
|
|
52
|
-
const migrationsDir = project.migrationsDir;
|
|
53
|
-
const container = new MigrationsContainer_1.MigrationsContainerFactory(migrationsDir).create();
|
|
54
|
-
const tenantClient = tenant_1.TenantClient.create(instance.baseUrl, apiToken);
|
|
55
|
-
await tenantClient.createProject(remoteProject, true);
|
|
56
|
-
const systemClient = system_1.SystemClient.create(instance.baseUrl, remoteProject, apiToken);
|
|
57
55
|
const projectAdminDistDir = `${project.adminDir}/dist`;
|
|
58
|
-
if (adminEndpoint && !(await (0, cli_common_1.pathExists)(`${projectAdminDistDir}/index.html`))) {
|
|
56
|
+
if (adminEndpoint && input.getOption('no-admin') !== true && !(await (0, cli_common_1.pathExists)(`${projectAdminDistDir}/index.html`))) {
|
|
59
57
|
throw `Missing ${projectAdminDistDir}/index.html. Please build admin before deploying.`;
|
|
60
58
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
59
|
+
if (input.getOption('no-migrations') !== true) {
|
|
60
|
+
const migrationsDir = project.migrationsDir;
|
|
61
|
+
const container = new MigrationsContainer_1.MigrationsContainerFactory(migrationsDir).create();
|
|
62
|
+
const tenantClient = tenant_1.TenantClient.create(instance.baseUrl, apiToken);
|
|
63
|
+
await tenantClient.createProject(remoteProject, true);
|
|
64
|
+
const systemClient = system_1.SystemClient.create(instance.baseUrl, remoteProject, apiToken);
|
|
65
|
+
const status = await (0, MigrationExecuteHelper_1.resolveMigrationStatus)(systemClient, container.migrationsResolver, false);
|
|
66
|
+
if (status.errorMigrations.length > 0) {
|
|
67
|
+
console.error((0, migrations_1.createMigrationStatusTable)(status.errorMigrations));
|
|
68
|
+
throw `Cannot execute migrations`;
|
|
69
|
+
}
|
|
70
|
+
if (status.migrationsToExecute.length === 0 && !adminEndpoint) {
|
|
71
|
+
console.log('Nothing to do.');
|
|
72
|
+
return 0;
|
|
73
73
|
}
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
74
|
+
if (!input.getOption('yes')) {
|
|
75
|
+
if (!process.stdin.isTTY) {
|
|
76
|
+
throw 'TTY not available. Pass --yes option to confirm execution.';
|
|
77
|
+
}
|
|
78
|
+
console.log('Following migrations will be executed:');
|
|
79
|
+
console.log(status.migrationsToExecute.length ? status.migrationsToExecute.map(it => it.name).join(' ') : 'none');
|
|
80
|
+
console.log(adminEndpoint ? 'Admin will be deployed.' : 'Admin will NOT be deployed.');
|
|
81
|
+
console.log('(to skip this dialog, you can pass --yes option)');
|
|
82
|
+
console.log('');
|
|
83
|
+
const { ok } = await (0, prompts_1.default)({
|
|
84
|
+
type: 'confirm',
|
|
85
|
+
name: 'ok',
|
|
86
|
+
message: `Do you want to continue?`,
|
|
87
|
+
});
|
|
88
|
+
if (!ok) {
|
|
89
|
+
return 1;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
const migrationExitCode = await (0, MigrationExecuteHelper_1.executeMigrations)({
|
|
93
|
+
migrationDescriber: container.migrationDescriber,
|
|
94
|
+
schemaVersionBuilder: container.schemaVersionBuilder,
|
|
95
|
+
client: systemClient,
|
|
96
|
+
migrations: status.migrationsToExecute,
|
|
97
|
+
requireConfirmation: false,
|
|
98
|
+
force: false,
|
|
83
99
|
});
|
|
84
|
-
if (
|
|
85
|
-
return
|
|
100
|
+
if (migrationExitCode !== 0) {
|
|
101
|
+
return migrationExitCode;
|
|
86
102
|
}
|
|
87
103
|
}
|
|
88
|
-
|
|
89
|
-
migrationDescriber: container.migrationDescriber,
|
|
90
|
-
schemaVersionBuilder: container.schemaVersionBuilder,
|
|
91
|
-
client: systemClient,
|
|
92
|
-
migrations: status.migrationsToExecute,
|
|
93
|
-
requireConfirmation: false,
|
|
94
|
-
force: false,
|
|
95
|
-
});
|
|
96
|
-
if (migrationExitCode !== 0) {
|
|
97
|
-
return migrationExitCode;
|
|
98
|
-
}
|
|
99
|
-
if (adminEndpoint) {
|
|
104
|
+
if (adminEndpoint && input.getOption('no-admin') !== true) {
|
|
100
105
|
console.log('Deploying admin...');
|
|
101
106
|
const client = admin_1.AdminClient.create(adminEndpoint, apiToken);
|
|
102
107
|
const files = await (0, admin_1.readAdminFiles)(projectAdminDistDir);
|
|
103
|
-
|
|
108
|
+
// in some cases you need deploy whole folder with custom build etc.
|
|
109
|
+
// with root option you can build app on your own and simply deploy it with subprojects
|
|
110
|
+
await client.deploy(input.getOption('root') ? null : remoteProject, files);
|
|
104
111
|
console.log(`Admin deployed (${files.length} files)`);
|
|
105
112
|
}
|
|
106
113
|
console.log('');
|
|
@@ -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":"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"}
|
|
@@ -44,7 +44,7 @@ class ExportCommand extends cli_common_1.Command {
|
|
|
44
44
|
const currentMb = Math.floor(transferred / 1024 / 1024);
|
|
45
45
|
if (currentMb > lastMbReported) {
|
|
46
46
|
const durationS = Math.floor((Date.now() - start) / 1000);
|
|
47
|
-
(0, stdio_1.
|
|
47
|
+
(0, stdio_1.printProgressLine)(`transferred ${currentMb} MiB; ${durationS} seconds`);
|
|
48
48
|
lastMbReported = currentMb;
|
|
49
49
|
}
|
|
50
50
|
});
|
|
@@ -38,7 +38,7 @@ class ImportCommand extends cli_common_1.Command {
|
|
|
38
38
|
const file = input.getArgument('file');
|
|
39
39
|
const baseInputStream = (0, node_fs_1.createReadStream)(file);
|
|
40
40
|
const stream = (file.endsWith('.gz') ? baseInputStream.pipe((0, node_zlib_1.createGunzip)()) : baseInputStream);
|
|
41
|
-
const response = await (0, utils_1.dataImport)({ stream: stream, project, printProgress: stdio_1.
|
|
41
|
+
const response = await (0, utils_1.dataImport)({ stream: stream, project, printProgress: stdio_1.printProgressLine });
|
|
42
42
|
console.log('');
|
|
43
43
|
const responseData = JSON.parse((await (0, stream_1.readStream)(response)).toString());
|
|
44
44
|
if (responseData.ok) {
|
|
@@ -43,7 +43,7 @@ class TransferCommand extends cli_common_1.Command {
|
|
|
43
43
|
const includeSystem = input.getOption('include-system') === true;
|
|
44
44
|
const exportResponse = (await (0, utils_1.dataExport)({ project: sourceProject, includeSystem, noGzip: true }));
|
|
45
45
|
const importResponse = await (0, utils_1.dataImport)({
|
|
46
|
-
stream: exportResponse, project: targetProject, printProgress: stdio_1.
|
|
46
|
+
stream: exportResponse, project: targetProject, printProgress: stdio_1.printProgressLine,
|
|
47
47
|
});
|
|
48
48
|
console.log('');
|
|
49
49
|
const responseData = JSON.parse((await (0, stream_1.readStream)(importResponse)).toString());
|
package/dist/src/run.js
CHANGED
|
@@ -9,9 +9,6 @@ const TransferCommand_1 = require("./commands/transfer/TransferCommand");
|
|
|
9
9
|
const checkVersions_1 = require("./utils/checkVersions");
|
|
10
10
|
(async () => {
|
|
11
11
|
const workspace = await cli_common_1.Workspace.get(process.cwd());
|
|
12
|
-
if (!process.env.CONTEMBER_SKIP_VERSION_CHECK) {
|
|
13
|
-
await (0, checkVersions_1.checkVersions)(workspace);
|
|
14
|
-
}
|
|
15
12
|
const commands = {
|
|
16
13
|
['deploy']: () => new commands_1.DeployCommand(workspace),
|
|
17
14
|
['version']: () => new commands_1.VersionCommand(),
|
|
@@ -42,7 +39,13 @@ const checkVersions_1 = require("./utils/checkVersions");
|
|
|
42
39
|
throw `Node >= 12 is required`;
|
|
43
40
|
}
|
|
44
41
|
const cliVersion = (0, cli_common_1.getPackageVersion)();
|
|
45
|
-
const app = new cli_common_1.Application(commandManager, `Contember CLI version ${cliVersion}
|
|
42
|
+
const app = new cli_common_1.Application(commandManager, `Contember CLI version ${cliVersion}`, {
|
|
43
|
+
beforeRun: async ({ name }) => {
|
|
44
|
+
if (!process.env.CONTEMBER_SKIP_VERSION_CHECK && !['deploy', 'version', 'data:export', 'data:import', 'data:transfer'].includes(name)) {
|
|
45
|
+
await (0, checkVersions_1.checkVersions)(workspace);
|
|
46
|
+
}
|
|
47
|
+
},
|
|
48
|
+
});
|
|
46
49
|
await app.run(process.argv.slice(2));
|
|
47
50
|
})().catch(e => {
|
|
48
51
|
console.log(e);
|
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,yCAkBmB;AACnB,qEAAiE;AACjE,qEAAiE;AACjE,yEAAqE;AACrE,yDAAsD;AAEtD,CAAC,KAAK,IAAI,EAAE;IACX,MAAM,SAAS,GAAG,MAAM,sBAAS,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;IAEpD,
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/run.ts"],"names":[],"mappings":"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"}
|