@contember/cli 1.2.0-alpha.18 → 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/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/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
package/dist/src/utils/admin.js
CHANGED
|
@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.readAdminFiles = exports.AdminClient = void 0;
|
|
7
7
|
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
8
|
-
const promises_1 = require("fs/promises");
|
|
8
|
+
const promises_1 = require("node:fs/promises");
|
|
9
9
|
const token_1 = require("./token");
|
|
10
10
|
class AdminClient {
|
|
11
11
|
constructor(url, apiToken) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../../src/utils/admin.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA4C;AAC5C
|
|
1
|
+
{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../../src/utils/admin.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA4C;AAC5C,+CAAoD;AACpD,mCAAmC;AAEnC,MAAa,WAAW;IACvB,YAA6B,GAAW,EAAmB,QAAgB;QAA9C,QAAG,GAAH,GAAG,CAAQ;QAAmB,aAAQ,GAAR,QAAQ,CAAQ;IAAG,CAAC;IAExE,MAAM,CAAC,MAAM,CAAC,GAAW,EAAE,QAAgB;QACjD,OAAO,IAAI,WAAW,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;IACtC,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,OAAe,EAAE,KAAiB;QACrD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAA;QAE1E,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;YACjB,MAAM,WAAW,GAAG,IAAA,iBAAS,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAC5C,MAAM,2CAA2C,IAAI,CAAC,GAAG,uBAAuB,WAAW,oBAAoB,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,KAAK,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAA;SACjL;IACF,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,IAAY,EAAE,MAAc,EAAE,IAAS;QAC5D,OAAO,MAAM,IAAA,oBAAK,EAAC,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,EAAE,EAAE;YACzC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,eAAe,EAAE,UAAU,IAAI,CAAC,QAAQ,EAAE,EAAE;YAC3F,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC1B,CAAC,CAAA;IACH,CAAC;CACD;AAvBD,kCAuBC;AAGM,MAAM,cAAc,GAAG,KAAK,EAAE,GAAW,EAAE,SAAiB,EAAE,EAAuB,EAAE;IAC7F,MAAM,KAAK,GAAG,EAAE,CAAA;IAChB,KAAK,MAAM,QAAQ,IAAI,MAAM,IAAA,kBAAO,EAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE;QACnE,IAAI,QAAQ,CAAC,WAAW,EAAE,EAAE;YAC3B,MAAM,QAAQ,GAAG,MAAM,IAAA,sBAAc,EAAC,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,GAAG,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC,CAAA;YAC9F,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAA;SACvB;aAAM,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE;YAC7B,KAAK,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,IAAI;gBAC5B,IAAI,EAAE,CAAC,MAAM,IAAA,mBAAQ,EAAC,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;aACpE,CAAC,CAAA;SACF;KACD;IAED,OAAO,KAAK,CAAA;AACb,CAAC,CAAA;AAfY,QAAA,cAAc,kBAe1B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { ChildProcessWithoutNullStreams } from 'child_process';
|
|
3
|
-
import { Readable, Writable } from 'stream';
|
|
2
|
+
import { ChildProcessWithoutNullStreams } from 'node:child_process';
|
|
3
|
+
import { Readable, Writable } from 'node:stream';
|
|
4
4
|
export declare type RunningCommand = {
|
|
5
5
|
child: ChildProcessWithoutNullStreams;
|
|
6
6
|
output: Promise<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../src/utils/commands.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,8BAA8B,EAAS,MAAM,
|
|
1
|
+
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../src/utils/commands.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,8BAA8B,EAAS,MAAM,oBAAoB,CAAA;AAC1E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAGhD,oBAAY,cAAc,GAAG;IAAE,KAAK,EAAE,8BAA8B,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;CAAE,CAAA;AAC/F,eAAO,MAAM,UAAU,YACb,MAAM,QACT,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,WACnB;IACR,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,QAAQ,CAAA;IAChB,MAAM,CAAC,EAAE,QAAQ,CAAA;IACjB,MAAM,CAAC,EAAE,QAAQ,CAAA;IACjB,GAAG,CAAC,EAAE,OAAO,UAAU,CAAA;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAA;CAClB,KACC,cA0CF,CAAA;AAED,qBAAa,iBAAkB,SAAQ,KAAK;aACf,QAAQ,EAAE,MAAM,GAAG,IAAI;aAAkB,MAAM,EAAE,MAAM;gBAAvD,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAkB,MAAM,EAAE,MAAM;CAGnF"}
|
|
@@ -4,14 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.ChildProcessError = exports.runCommand = void 0;
|
|
7
|
-
const
|
|
7
|
+
const node_child_process_1 = require("node:child_process");
|
|
8
8
|
const chalk_1 = __importDefault(require("chalk"));
|
|
9
9
|
const runCommand = (command, args, options) => {
|
|
10
10
|
const args2 = args.filter((it) => it !== undefined);
|
|
11
11
|
if (!process.env.DISABLE_COMMAND_PRINTING) {
|
|
12
12
|
console.error(chalk_1.default.gray(`$ ${command} ${args2.map(it => `'${it.replace(/'/g, `'\\''`)}'`).join(' ')}`));
|
|
13
13
|
}
|
|
14
|
-
const child = (0,
|
|
14
|
+
const child = (0, node_child_process_1.spawn)(command, args2, {
|
|
15
15
|
cwd: options.cwd,
|
|
16
16
|
env: { ...process.env, ...(options.env || {}) },
|
|
17
17
|
detached: options.detached,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../src/utils/commands.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../src/utils/commands.ts"],"names":[],"mappings":";;;;;;AAAA,2DAA0E;AAE1E,kDAAyB;AAGlB,MAAM,UAAU,GAAG,CACzB,OAAe,EACf,IAA4B,EAC5B,OAOC,EACgB,EAAE;IACnB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,EAAgB,EAAE,CAAC,EAAE,KAAK,SAAS,CAAC,CAAA;IACjE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE;QAC1C,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,KAAK,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;KACxG;IACD,MAAM,KAAK,GAAG,IAAA,0BAAK,EAAC,OAAO,EAAE,KAAK,EAAE;QACnC,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE;QAC/C,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC1B,CAAC,CAAA;IACF,IAAI,OAAO,CAAC,KAAK,EAAE;QAClB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;KAC/B;IAED,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI,MAAM,GAAG,EAAE,CAAA;IAEf,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAQ,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAA;IAC3B,CAAC,CAAC,CAAA;IAEF,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAQ,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAA;IAC3B,CAAC,CAAC,CAAA;IACF,IAAI,OAAO,CAAC,MAAM,EAAE;QACnB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;KACjC;IACD,IAAI,OAAO,CAAC,MAAM,EAAE;QACnB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;KACjC;IAED,MAAM,MAAM,GAAG,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtD,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAQ,EAAE;YACnC,IAAI,QAAQ,KAAK,CAAC,EAAE;gBACnB,OAAO,CAAC,MAAM,CAAC,CAAA;aACf;iBAAM;gBACN,MAAM,CAAC,IAAI,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;aAC/C;QACF,CAAC,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAA;AACzB,CAAC,CAAA;AArDY,QAAA,UAAU,cAqDtB;AAED,MAAa,iBAAkB,SAAQ,KAAK;IAC3C,YAA4B,QAAuB,EAAkB,MAAc;QAClF,KAAK,CAAC,sBAAsB,QAAQ,MAAM,MAAM,GAAG,CAAC,CAAA;QADzB,aAAQ,GAAR,QAAQ,CAAe;QAAkB,WAAM,GAAN,MAAM,CAAQ;IAEnF,CAAC;CACD;AAJD,8CAIC"}
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateMainDockerComposeConfig = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
4
|
+
const node_path_1 = require("node:path");
|
|
5
|
+
const cli_common_1 = require("@contember/cli-common");
|
|
6
6
|
const yaml_1 = require("./yaml");
|
|
7
7
|
const MAIN_CONFIGS = ['docker-compose.yaml', 'docker-compose.yml'];
|
|
8
8
|
const resolvePath = async (dir, possibleFileNames, fallbackFileName) => {
|
|
9
9
|
for (const file of possibleFileNames) {
|
|
10
|
-
const path = (0,
|
|
11
|
-
if (await (0,
|
|
10
|
+
const path = (0, node_path_1.join)(dir, file);
|
|
11
|
+
if (await (0, cli_common_1.pathExists)(path)) {
|
|
12
12
|
return path;
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
|
-
return (0,
|
|
15
|
+
return (0, node_path_1.join)(dir, fallbackFileName);
|
|
16
16
|
};
|
|
17
17
|
const updateMainDockerComposeConfig = async (dir, updater) => {
|
|
18
18
|
const path = process.env.COMPOSE_FILE || (await resolvePath(dir, MAIN_CONFIGS, MAIN_CONFIGS[0]));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dockerCompose.js","sourceRoot":"","sources":["../../../src/utils/dockerCompose.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"dockerCompose.js","sourceRoot":"","sources":["../../../src/utils/dockerCompose.ts"],"names":[],"mappings":";;;AAAA,yCAAgC;AAChC,sDAAkD;AAClD,iCAAuD;AAEvD,MAAM,YAAY,GAAG,CAAC,qBAAqB,EAAE,oBAAoB,CAAC,CAAA;AAiBlE,MAAM,WAAW,GAAG,KAAK,EAAE,GAAW,EAAE,iBAA2B,EAAE,gBAAwB,EAAmB,EAAE;IACjH,KAAK,MAAM,IAAI,IAAI,iBAAiB,EAAE;QACrC,MAAM,IAAI,GAAG,IAAA,gBAAI,EAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QAC5B,IAAI,MAAM,IAAA,uBAAU,EAAC,IAAI,CAAC,EAAE;YAC3B,OAAO,IAAI,CAAA;SACX;KACD;IACD,OAAO,IAAA,gBAAI,EAAC,GAAG,EAAE,gBAAgB,CAAC,CAAA;AACnC,CAAC,CAAA;AAEM,MAAM,6BAA6B,GAAG,KAAK,EACjD,GAAW,EACX,OAAgD,EAChC,EAAE;IAClB,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,MAAM,WAAW,CAAC,GAAG,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAChG,OAAO,IAAA,iBAAU,EAAC,IAAI,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAA;AAC1D,CAAC,CAAA;AANY,QAAA,6BAA6B,iCAMzC"}
|
package/dist/src/utils/npm.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateNpmPackages = void 0;
|
|
4
|
-
const fs_extra_1 = require("fs-extra");
|
|
5
|
-
const path_1 = require("path");
|
|
6
|
-
const commands_1 = require("./commands");
|
|
7
4
|
const cli_common_1 = require("@contember/cli-common");
|
|
5
|
+
const node_path_1 = require("node:path");
|
|
6
|
+
const commands_1 = require("./commands");
|
|
7
|
+
const cli_common_2 = require("@contember/cli-common");
|
|
8
8
|
const install = async (hasYarn, packages, isDev, dir) => {
|
|
9
9
|
const [cmd, ...args] = hasYarn
|
|
10
10
|
? ['yarn', 'add', isDev ? '--dev' : undefined, '--ignore-workspace-root-check']
|
|
@@ -24,10 +24,10 @@ const install = async (hasYarn, packages, isDev, dir) => {
|
|
|
24
24
|
console.log('npm update done');
|
|
25
25
|
};
|
|
26
26
|
const updateNpmPackages = async (packages, workspaceDirectory) => {
|
|
27
|
-
const hasYarn = await (0,
|
|
27
|
+
const hasYarn = await (0, cli_common_1.pathExists)((0, node_path_1.join)(workspaceDirectory, 'yarn.lock'));
|
|
28
28
|
const processPackageFile = async (dir) => {
|
|
29
|
-
const packageJsonFile = (0,
|
|
30
|
-
if (!(await (0,
|
|
29
|
+
const packageJsonFile = (0, node_path_1.join)(dir, 'package.json');
|
|
30
|
+
if (!(await (0, cli_common_1.pathExists)(packageJsonFile))) {
|
|
31
31
|
return;
|
|
32
32
|
}
|
|
33
33
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
@@ -44,10 +44,10 @@ const updateNpmPackages = async (packages, workspaceDirectory) => {
|
|
|
44
44
|
const dirsPromise = packageJson.workspaces.map(async (it) => {
|
|
45
45
|
if (it.substr(-1) === '*') {
|
|
46
46
|
const baseDir = it.substring(0, it.length - 1);
|
|
47
|
-
return await (0,
|
|
47
|
+
return await (0, cli_common_2.listDirectories)(baseDir);
|
|
48
48
|
}
|
|
49
49
|
else {
|
|
50
|
-
return [(0,
|
|
50
|
+
return [(0, node_path_1.join)(dir, it)];
|
|
51
51
|
}
|
|
52
52
|
});
|
|
53
53
|
const workspaceDirs = (await Promise.all(dirsPromise)).flatMap(it => it);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../../src/utils/npm.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../../src/utils/npm.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,12 +25,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.loadSchema = void 0;
|
|
27
27
|
const esbuild = __importStar(require("esbuild"));
|
|
28
|
-
const
|
|
28
|
+
const node_path_1 = require("node:path");
|
|
29
29
|
const vm2_1 = require("vm2");
|
|
30
30
|
const schema_utils_1 = require("@contember/schema-utils");
|
|
31
31
|
const loadSchema = async (project) => {
|
|
32
32
|
const response = await esbuild.build({
|
|
33
|
-
entryPoints: [(0,
|
|
33
|
+
entryPoints: [(0, node_path_1.join)(project.apiDir, 'index.ts')],
|
|
34
34
|
platform: 'node',
|
|
35
35
|
bundle: true,
|
|
36
36
|
treeShaking: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadSchema.js","sourceRoot":"","sources":["../../../../src/utils/project/loadSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,iDAAkC;AAClC
|
|
1
|
+
{"version":3,"file":"loadSchema.js","sourceRoot":"","sources":["../../../../src/utils/project/loadSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,iDAAkC;AAClC,yCAAgC;AAChC,6BAA4B;AAC5B,0DAAoD;AAE7C,MAAM,UAAU,GAAG,KAAK,EAAE,OAAgB,EAAmB,EAAE;IACrE,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC;QACpC,WAAW,EAAE,CAAC,IAAA,gBAAI,EAAC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAC/C,QAAQ,EAAE,MAAM;QAChB,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,IAAI;QACjB,KAAK,EAAE,KAAK;QACZ,QAAQ,EAAE,CAAC,kBAAkB,EAAE,OAAO,EAAE,mBAAmB,CAAC;KAC5D,CAAC,CAAA;IACF,MAAM,SAAS,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAC9C,MAAM,EAAE,GAAG,IAAI,YAAM,CAAC;QACrB,OAAO,EAAE;YACR,OAAO,EAAE,CAAC,GAAG,CAAC;SACd;KACD,CAAC,CAAA;IACF,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,OAAO,CAAA;IAC9C,gDAAgD;IAChD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;IACtD,OAAO,IAAA,yBAAU,EAAC,WAAW,CAAC,CAAA;AAC/B,CAAC,CAAA;AAnBY,QAAA,UAAU,cAmBtB"}
|
|
@@ -7,7 +7,7 @@ exports.renderProjectInfoHtml = void 0;
|
|
|
7
7
|
const preact_1 = require("preact");
|
|
8
8
|
const preact_render_to_string_1 = __importDefault(require("preact-render-to-string"));
|
|
9
9
|
const ProjectInfo_1 = require("./components/ProjectInfo");
|
|
10
|
-
const promises_1 = require("fs/promises");
|
|
10
|
+
const promises_1 = require("node:fs/promises");
|
|
11
11
|
const renderProjectInfoHtml = async (schema, projectName) => {
|
|
12
12
|
const html = (0, preact_render_to_string_1.default)((0, preact_1.h)(ProjectInfo_1.ProjectInfo, { schema: schema, projectName: projectName }));
|
|
13
13
|
const css = await (0, promises_1.readFile)(__dirname + '/resources/out.css');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectDescribe.js","sourceRoot":"","sources":["../../../../src/utils/project/projectDescribe.tsx"],"names":[],"mappings":";;;;;;AACA,mCAA0B;AAC1B,sFAA4C;AAC5C,0DAAsD;AACtD
|
|
1
|
+
{"version":3,"file":"projectDescribe.js","sourceRoot":"","sources":["../../../../src/utils/project/projectDescribe.tsx"],"names":[],"mappings":";;;;;;AACA,mCAA0B;AAC1B,sFAA4C;AAC5C,0DAAsD;AACtD,+CAA2C;AAEpC,MAAM,qBAAqB,GAAG,KAAK,EAAE,MAAc,EAAE,WAAmB,EAAE,EAAE;IAClF,MAAM,IAAI,GAAG,IAAA,iCAAM,EAAC,gBAAC,yBAAW,IAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,GAAI,CAAC,CAAA;IAE9E,MAAM,GAAG,GAAG,MAAM,IAAA,mBAAQ,EAAC,SAAS,GAAG,oBAAoB,CAAC,CAAA;IAC5D,OAAO;;;;;UAKE,GAAG;UACH,WAAW;;;EAGnB,IAAI;;;CAGL,CAAA;AAED,CAAC,CAAA;AAlBY,QAAA,qBAAqB,yBAkBjC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ValidationError } from '@contember/schema-utils';
|
|
1
|
+
import { SchemaValidatorSkippedErrors, ValidationError } from '@contember/schema-utils';
|
|
2
2
|
import { Schema } from '@contember/schema';
|
|
3
3
|
export declare const printValidationErrors: (errors: ValidationError[], message?: string) => void;
|
|
4
|
-
export declare const validateSchemaAndPrintErrors: (schema: Schema, message?: string) => boolean;
|
|
4
|
+
export declare const validateSchemaAndPrintErrors: (schema: Schema, message?: string, skippedErrors?: SchemaValidatorSkippedErrors[]) => boolean;
|
|
5
5
|
//# sourceMappingURL=schema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,eAAe,EAAE,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,4BAA4B,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACxG,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,eAAO,MAAM,qBAAqB,WAAY,eAAe,EAAE,YAAY,MAAM,SAShF,CAAA;AAED,eAAO,MAAM,4BAA4B,WAAY,MAAM,YAAY,MAAM,kBAAkB,4BAA4B,EAAE,KAAG,OAI/H,CAAA"}
|
package/dist/src/utils/schema.js
CHANGED
|
@@ -8,13 +8,13 @@ const printValidationErrors = (errors, message) => {
|
|
|
8
8
|
}
|
|
9
9
|
console.group(message || 'Schema is invalid:');
|
|
10
10
|
for (const err of errors) {
|
|
11
|
-
console.log(err.path.join('.')
|
|
11
|
+
console.log(`${err.path.join('.')}: [${err.code}] ${err.message}`);
|
|
12
12
|
}
|
|
13
13
|
console.groupEnd();
|
|
14
14
|
};
|
|
15
15
|
exports.printValidationErrors = printValidationErrors;
|
|
16
|
-
const validateSchemaAndPrintErrors = (schema, message) => {
|
|
17
|
-
const errors = schema_utils_1.SchemaValidator.validate(schema);
|
|
16
|
+
const validateSchemaAndPrintErrors = (schema, message, skippedErrors) => {
|
|
17
|
+
const errors = schema_utils_1.SchemaValidator.validate(schema, skippedErrors);
|
|
18
18
|
(0, exports.printValidationErrors)(errors, message);
|
|
19
19
|
return errors.length === 0;
|
|
20
20
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":";;;AAAA,0DAAwG;AAGjG,MAAM,qBAAqB,GAAG,CAAC,MAAyB,EAAE,OAAgB,EAAE,EAAE;IACpF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,OAAM;KACN;IACD,OAAO,CAAC,KAAK,CAAC,OAAO,IAAI,oBAAoB,CAAC,CAAA;IAC9C,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;QACzB,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;KAClE;IACD,OAAO,CAAC,QAAQ,EAAE,CAAA;AACnB,CAAC,CAAA;AATY,QAAA,qBAAqB,yBASjC;AAEM,MAAM,4BAA4B,GAAG,CAAC,MAAc,EAAE,OAAgB,EAAE,aAA8C,EAAW,EAAE;IACzI,MAAM,MAAM,GAAG,8BAAe,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC9D,IAAA,6BAAqB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACtC,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAA;AAC3B,CAAC,CAAA;AAJY,QAAA,4BAA4B,gCAIxC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../../src/utils/workspace.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../../src/utils/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAGxF,eAAO,MAAM,yBAAyB,cAAqB,SAAS,cAAc,MAAM,KAAG,QAAQ,MAAM,GAAG,IAAI,CAiB/G,CAAA"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateWorkspaceApiVersion = void 0;
|
|
4
|
-
const fs_extra_1 = require("fs-extra");
|
|
5
4
|
const cli_common_1 = require("@contember/cli-common");
|
|
6
5
|
const yaml_1 = require("./yaml");
|
|
7
6
|
const updateWorkspaceApiVersion = async (workspace, newVersion) => {
|
|
8
7
|
const possiblePaths = (0, cli_common_1.formatWorkspaceConfigPath)(workspace.directory);
|
|
9
8
|
for (const configPath of possiblePaths) {
|
|
10
|
-
if (await (0,
|
|
9
|
+
if (await (0, cli_common_1.pathExists)(configPath)) {
|
|
11
10
|
await (0, yaml_1.updateYaml)(configPath, data => {
|
|
12
11
|
return {
|
|
13
12
|
...data,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../src/utils/workspace.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../src/utils/workspace.ts"],"names":[],"mappings":";;;AAAA,sDAAwF;AACxF,iCAAmC;AAE5B,MAAM,yBAAyB,GAAG,KAAK,EAAE,SAAoB,EAAE,UAAkB,EAA0B,EAAE;IACnH,MAAM,aAAa,GAAG,IAAA,sCAAyB,EAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IACpE,KAAK,MAAM,UAAU,IAAI,aAAa,EAAE;QACvC,IAAI,MAAM,IAAA,uBAAU,EAAC,UAAU,CAAC,EAAE;YACjC,MAAM,IAAA,iBAAU,EAAC,UAAU,EAAE,IAAI,CAAC,EAAE;gBACnC,OAAO;oBACN,GAAG,IAAI;oBACP,GAAG,EAAE;wBACJ,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;wBACjD,OAAO,EAAE,UAAU;qBACnB;iBACD,CAAA;YACF,CAAC,CAAC,CAAA;YACF,OAAO,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;SACnD;KACD;IACD,OAAO,IAAI,CAAA;AACZ,CAAC,CAAA;AAjBY,QAAA,yBAAyB,6BAiBrC"}
|
package/dist/src/utils/yaml.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { JSONObject } from '@contember/cli-common
|
|
1
|
+
import { JSONObject } from '@contember/cli-common';
|
|
2
2
|
export declare type JsonUpdateCallback<Value = JSONObject> = (data: Partial<Value>, utils: {
|
|
3
3
|
merge: (a: JSONObject, b: JSONObject) => JSONObject;
|
|
4
4
|
}) => Value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yaml.d.ts","sourceRoot":"","sources":["../../../src/utils/yaml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"yaml.d.ts","sourceRoot":"","sources":["../../../src/utils/yaml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA6B,MAAM,uBAAuB,CAAA;AAM7E,oBAAY,kBAAkB,CAAC,KAAK,GAAG,UAAU,IAAI,CACpD,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,EACpB,KAAK,EAAE;IAAE,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,KAAK,UAAU,CAAA;CAAE,KAC1D,KAAK,CAAA;AAEV,eAAO,MAAM,UAAU,6BAChB,MAAM,gDAEH;IAAE,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,kBAoBpC,CAAA"}
|
package/dist/src/utils/yaml.js
CHANGED
|
@@ -4,14 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.updateYaml = void 0;
|
|
7
|
-
const
|
|
7
|
+
const cli_common_1 = require("@contember/cli-common");
|
|
8
8
|
const cjs_1 = __importDefault(require("yawn-yaml/cjs"));
|
|
9
9
|
const config_loader_1 = require("@contember/config-loader");
|
|
10
10
|
const js_yaml_1 = __importDefault(require("js-yaml"));
|
|
11
|
-
const promises_1 = require("fs/promises");
|
|
11
|
+
const promises_1 = require("node:fs/promises");
|
|
12
12
|
const updateYaml = async (path, updater, options = {}) => {
|
|
13
13
|
let config = '';
|
|
14
|
-
if (await (0,
|
|
14
|
+
if (await (0, cli_common_1.pathExists)(path)) {
|
|
15
15
|
config = await (0, promises_1.readFile)(path, { encoding: 'utf8' });
|
|
16
16
|
}
|
|
17
17
|
else if (options.createMissing !== true) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yaml.js","sourceRoot":"","sources":["../../../src/utils/yaml.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"yaml.js","sourceRoot":"","sources":["../../../src/utils/yaml.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA6E;AAC7E,wDAAgC;AAChC,4DAAiD;AACjD,sDAA4B;AAC5B,+CAAsD;AAO/C,MAAM,UAAU,GAAG,KAAK,EAC9B,IAAY,EACZ,OAAkC,EAClC,UAAuC,EAAE,EACxC,EAAE;IACH,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI,MAAM,IAAA,uBAAU,EAAC,IAAI,CAAC,EAAE;QAC3B,MAAM,GAAG,MAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;KACnD;SAAM,IAAI,OAAO,CAAC,aAAa,KAAK,IAAI,EAAE;QAC1C,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,kBAAkB,CAAC,CAAA;KAC/C;IAED,IAAI,SAAS,GAAG,EAAE,CAAA;IAClB,MAAM,UAAU,GAAG,EAAE,KAAK,EAAE,CAAC,CAAa,EAAE,CAAa,EAAE,EAAE,CAAC,sBAAM,CAAC,KAAK,CAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,CAAA;IACjG,IAAI,MAAM,EAAE;QACX,MAAM,IAAI,GAAG,IAAI,aAAI,CAAC,MAAM,CAAC,CAAA;QAC7B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;QAC1C,SAAS,GAAG,IAAI,CAAC,IAAI,CAAA;KACrB;SAAM;QACN,SAAS,GAAG,iBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAA;KAChD;IAED,MAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;AACvD,CAAC,CAAA;AAvBY,QAAA,UAAU,cAuBtB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@contember/cli",
|
|
3
|
-
"version": "1.2.0-alpha.
|
|
3
|
+
"version": "1.2.0-alpha.19",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"bin": {
|
|
6
6
|
"contember": "./dist/src/run.js"
|
|
@@ -18,19 +18,17 @@
|
|
|
18
18
|
"tailwindcss": "^3.0.24"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@contember/cli-common": "^1.2.0-alpha.
|
|
22
|
-
"@contember/config-loader": "^1.2.0-alpha.
|
|
23
|
-
"@contember/
|
|
24
|
-
"@contember/
|
|
25
|
-
"@contember/
|
|
26
|
-
"@contember/schema": "^1.2.0-alpha.
|
|
27
|
-
"@contember/schema-
|
|
28
|
-
"@
|
|
29
|
-
"@contember/schema-utils": "^1.2.0-alpha.18",
|
|
21
|
+
"@contember/cli-common": "^1.2.0-alpha.19",
|
|
22
|
+
"@contember/config-loader": "^1.2.0-alpha.19",
|
|
23
|
+
"@contember/dic": "^1.2.0-alpha.19",
|
|
24
|
+
"@contember/engine-content-api": "^1.2.0-alpha.19",
|
|
25
|
+
"@contember/schema": "^1.2.0-alpha.19",
|
|
26
|
+
"@contember/schema-migrations": "^1.2.0-alpha.19",
|
|
27
|
+
"@contember/schema-utils": "^1.2.0-alpha.19",
|
|
28
|
+
"@graphql-tools/schema": "^8.3.5",
|
|
30
29
|
"chalk": "^4.1.2",
|
|
31
30
|
"chalk-table": "^1.0.2",
|
|
32
31
|
"esbuild": "^0.14.54",
|
|
33
|
-
"get-port": "^5.0.0",
|
|
34
32
|
"graphql": "^16.5.0",
|
|
35
33
|
"graphql-request": "^4.3.0",
|
|
36
34
|
"js-yaml": "^4.1.0",
|
|
@@ -1,17 +1,16 @@
|
|
|
1
|
-
import { Command, CommandConfiguration, Input, Project, Workspace } from '@contember/cli-common'
|
|
1
|
+
import { Command, CommandConfiguration, Input, pathExists, Project, Workspace } from '@contember/cli-common'
|
|
2
2
|
import {
|
|
3
3
|
configureExecuteMigrationCommand,
|
|
4
4
|
ExecuteMigrationOptions,
|
|
5
5
|
executeMigrations,
|
|
6
6
|
resolveMigrationStatus,
|
|
7
7
|
} from '../migrations/MigrationExecuteHelper'
|
|
8
|
-
import { pathExists } from 'fs-extra'
|
|
9
8
|
import { interactiveResolveApiToken, TenantClient } from '../../utils/tenant'
|
|
10
9
|
import { interactiveResolveInstanceEnvironmentFromInput } from '../../utils/instance'
|
|
11
10
|
import { SystemClient } from '../../utils/system'
|
|
12
11
|
import { MigrationsContainerFactory } from '../../MigrationsContainer'
|
|
13
12
|
import { AdminClient, readAdminFiles } from '../../utils/admin'
|
|
14
|
-
import { URL } from 'url'
|
|
13
|
+
import { URL } from 'node:url'
|
|
15
14
|
import prompts from 'prompts'
|
|
16
15
|
import { createMigrationStatusTable } from '../../utils/migrations'
|
|
17
16
|
import { maskToken } from '../../utils/token'
|
|
@@ -18,6 +18,7 @@ type Args = {
|
|
|
18
18
|
type Options = {
|
|
19
19
|
execute?: true
|
|
20
20
|
yes?: true
|
|
21
|
+
'skip-initial-schema-validation'?: true
|
|
21
22
|
}
|
|
22
23
|
|
|
23
24
|
export class MigrationDiffCommand extends Command<Args, Options> {
|
|
@@ -38,6 +39,8 @@ export class MigrationDiffCommand extends Command<Args, Options> {
|
|
|
38
39
|
.option('yes')
|
|
39
40
|
.valueNone()
|
|
40
41
|
.description('Do not ask for confirmation.')
|
|
42
|
+
|
|
43
|
+
configuration.option('skip-initial-schema-validation')
|
|
41
44
|
}
|
|
42
45
|
|
|
43
46
|
protected async execute(input: Input<Args, Options>): Promise<number> {
|
|
@@ -56,7 +59,9 @@ export class MigrationDiffCommand extends Command<Args, Options> {
|
|
|
56
59
|
try {
|
|
57
60
|
const migrationName = input.getArgument('migrationName')
|
|
58
61
|
const initialSchema = await schemaVersionBuilder.buildSchema()
|
|
59
|
-
const result = await migrationCreator.prepareMigration(initialSchema, schema, migrationName
|
|
62
|
+
const result = await migrationCreator.prepareMigration(initialSchema, schema, migrationName, {
|
|
63
|
+
skipInitialSchemaValidation: input.getOption('skip-initial-schema-validation') === true,
|
|
64
|
+
})
|
|
60
65
|
if (result === null) {
|
|
61
66
|
console.log('Nothing to do')
|
|
62
67
|
return 0
|
|
@@ -22,9 +22,9 @@ export const validateMigrations = async (
|
|
|
22
22
|
}
|
|
23
23
|
throw e
|
|
24
24
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
projectValid
|
|
25
|
+
const errorMessage = `Migration ${migration.name} produces invalid schema:`
|
|
26
|
+
projectValid = validateSchemaAndPrintErrors(migratedSchema, errorMessage, migration.skippedErrors)
|
|
27
|
+
&& projectValid
|
|
28
28
|
}
|
|
29
29
|
return projectValid
|
|
30
30
|
}
|
|
@@ -2,8 +2,8 @@ import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-
|
|
|
2
2
|
import { validateSchemaAndPrintErrors } from '../../utils/schema'
|
|
3
3
|
import { loadSchema } from '../../utils/project/loadSchema'
|
|
4
4
|
import { renderProjectInfoHtml } from '../../utils/project/projectDescribe'
|
|
5
|
-
import { writeFile } from 'fs/promises'
|
|
6
|
-
import { join } from 'path'
|
|
5
|
+
import { writeFile } from 'node:fs/promises'
|
|
6
|
+
import { join } from 'node:path'
|
|
7
7
|
|
|
8
8
|
type Args = {
|
|
9
9
|
project?: string
|
package/src/utils/admin.ts
CHANGED
package/src/utils/commands.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ChildProcessWithoutNullStreams, spawn } from 'child_process'
|
|
2
|
-
import { Readable, Writable } from 'stream'
|
|
1
|
+
import { ChildProcessWithoutNullStreams, spawn } from 'node:child_process'
|
|
2
|
+
import { Readable, Writable } from 'node:stream'
|
|
3
3
|
import chalk from 'chalk'
|
|
4
4
|
|
|
5
5
|
export type RunningCommand = { child: ChildProcessWithoutNullStreams; output: Promise<string> }
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { join } from 'path'
|
|
2
|
-
import { pathExists } from '
|
|
1
|
+
import { join } from 'node:path'
|
|
2
|
+
import { pathExists } from '@contember/cli-common'
|
|
3
3
|
import { JsonUpdateCallback, updateYaml } from './yaml'
|
|
4
4
|
|
|
5
5
|
const MAIN_CONFIGS = ['docker-compose.yaml', 'docker-compose.yml']
|
package/src/utils/npm.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Project } from '@contember/cli-common'
|
|
2
2
|
import { Schema } from '@contember/schema'
|
|
3
3
|
import * as esbuild from 'esbuild'
|
|
4
|
-
import { join } from 'path'
|
|
4
|
+
import { join } from 'node:path'
|
|
5
5
|
import { NodeVM } from 'vm2'
|
|
6
6
|
import { schemaType } from '@contember/schema-utils'
|
|
7
7
|
|
|
@@ -2,7 +2,7 @@ import { Schema } from '@contember/schema'
|
|
|
2
2
|
import { h } from 'preact'
|
|
3
3
|
import render from 'preact-render-to-string'
|
|
4
4
|
import { ProjectInfo } from './components/ProjectInfo'
|
|
5
|
-
import { readFile } from 'fs/promises'
|
|
5
|
+
import { readFile } from 'node:fs/promises'
|
|
6
6
|
|
|
7
7
|
export const renderProjectInfoHtml = async (schema: Schema, projectName: string) => {
|
|
8
8
|
const html = render(<ProjectInfo schema={schema} projectName={projectName} />)
|
package/src/utils/schema.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SchemaValidator, ValidationError } from '@contember/schema-utils'
|
|
1
|
+
import { SchemaValidator, SchemaValidatorSkippedErrors, ValidationError } from '@contember/schema-utils'
|
|
2
2
|
import { Schema } from '@contember/schema'
|
|
3
3
|
|
|
4
4
|
export const printValidationErrors = (errors: ValidationError[], message?: string) => {
|
|
@@ -7,13 +7,13 @@ export const printValidationErrors = (errors: ValidationError[], message?: strin
|
|
|
7
7
|
}
|
|
8
8
|
console.group(message || 'Schema is invalid:')
|
|
9
9
|
for (const err of errors) {
|
|
10
|
-
console.log(err.path.join('.')
|
|
10
|
+
console.log(`${err.path.join('.')}: [${err.code}] ${err.message}`)
|
|
11
11
|
}
|
|
12
12
|
console.groupEnd()
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
-
export const validateSchemaAndPrintErrors = (schema: Schema, message?: string): boolean => {
|
|
16
|
-
const errors = SchemaValidator.validate(schema)
|
|
15
|
+
export const validateSchemaAndPrintErrors = (schema: Schema, message?: string, skippedErrors?: SchemaValidatorSkippedErrors[]): boolean => {
|
|
16
|
+
const errors = SchemaValidator.validate(schema, skippedErrors)
|
|
17
17
|
printValidationErrors(errors, message)
|
|
18
18
|
return errors.length === 0
|
|
19
19
|
}
|
package/src/utils/workspace.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { pathExists } from '
|
|
2
|
-
import { formatWorkspaceConfigPath, Workspace } from '@contember/cli-common'
|
|
1
|
+
import { formatWorkspaceConfigPath, pathExists, Workspace } from '@contember/cli-common'
|
|
3
2
|
import { updateYaml } from './yaml'
|
|
4
3
|
|
|
5
4
|
export const updateWorkspaceApiVersion = async (workspace: Workspace, newVersion: string): Promise<string | null> => {
|
package/src/utils/yaml.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import { JSONObject, JSONPrimitive } from '@contember/cli-common
|
|
2
|
-
import { pathExists } from 'fs-extra'
|
|
1
|
+
import { JSONObject, JSONPrimitive, pathExists } from '@contember/cli-common'
|
|
3
2
|
import YAWN from 'yawn-yaml/cjs'
|
|
4
3
|
import { Merger } from '@contember/config-loader'
|
|
5
4
|
import jsyaml from 'js-yaml'
|
|
6
|
-
import { readFile, writeFile } from 'fs/promises'
|
|
5
|
+
import { readFile, writeFile } from 'node:fs/promises'
|
|
7
6
|
|
|
8
7
|
export type JsonUpdateCallback<Value = JSONObject> = (
|
|
9
8
|
data: Partial<Value>,
|