@contember/cli 1.3.0-alpha.8 → 1.3.0-beta.2
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 -1
- package/build.sh +1 -0
- package/contember-docker.sh +0 -0
- package/dist/src/commands/deploy/DeployCommand.d.ts +2 -2
- package/dist/src/commands/deploy/DeployCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationAmendCommand.d.ts +2 -2
- package/dist/src/commands/migrations/MigrationAmendCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationCreateHelper.d.ts +2 -2
- package/dist/src/commands/migrations/MigrationCreateHelper.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationDescribeCommand.d.ts +2 -2
- package/dist/src/commands/migrations/MigrationDescribeCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationDiffCommand.d.ts +2 -2
- package/dist/src/commands/migrations/MigrationDiffCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationExecuteCommand.d.ts +3 -3
- package/dist/src/commands/migrations/MigrationExecuteCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationExecuteCommand.js +7 -26
- package/dist/src/commands/migrations/MigrationExecuteCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationExecuteHelper.d.ts +1 -1
- package/dist/src/commands/migrations/MigrationExecuteHelper.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationRebaseCommand.d.ts +2 -2
- package/dist/src/commands/migrations/MigrationRebaseCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationStatusCommand.d.ts +2 -2
- package/dist/src/commands/migrations/MigrationStatusCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationValidationHelper.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationValidationHelper.js +7 -1
- package/dist/src/commands/migrations/MigrationValidationHelper.js.map +1 -1
- package/dist/src/commands/project/ProjectCreateCommand.d.ts +2 -2
- package/dist/src/commands/project/ProjectCreateCommand.d.ts.map +1 -1
- package/dist/src/commands/project/ProjectGenerateDocumentation.d.ts +2 -2
- package/dist/src/commands/project/ProjectGenerateDocumentation.d.ts.map +1 -1
- package/dist/src/commands/project/ProjectPrintSchemaCommand.d.ts +3 -2
- package/dist/src/commands/project/ProjectPrintSchemaCommand.d.ts.map +1 -1
- package/dist/src/commands/project/ProjectPrintSchemaCommand.js +8 -5
- package/dist/src/commands/project/ProjectPrintSchemaCommand.js.map +1 -1
- package/dist/src/commands/project/ProjectValidateCommand.d.ts +2 -2
- package/dist/src/commands/project/ProjectValidateCommand.d.ts.map +1 -1
- package/dist/src/commands/tenant/CreateApiKeyCommand.d.ts +2 -2
- package/dist/src/commands/tenant/CreateApiKeyCommand.d.ts.map +1 -1
- package/dist/src/commands/tenant/InviteCommand.d.ts +2 -2
- package/dist/src/commands/tenant/InviteCommand.d.ts.map +1 -1
- package/dist/src/commands/tenant/ResetPasswordCommand.d.ts +2 -2
- package/dist/src/commands/tenant/ResetPasswordCommand.d.ts.map +1 -1
- package/dist/src/commands/tenant/SignInCommand.d.ts +2 -2
- package/dist/src/commands/tenant/SignInCommand.d.ts.map +1 -1
- package/dist/src/commands/transfer/ExportCommand.d.ts +2 -2
- package/dist/src/commands/transfer/ExportCommand.d.ts.map +1 -1
- package/dist/src/commands/transfer/ImportCommand.d.ts +2 -2
- package/dist/src/commands/transfer/ImportCommand.d.ts.map +1 -1
- package/dist/src/commands/transfer/TransferCommand.d.ts +2 -2
- package/dist/src/commands/transfer/TransferCommand.d.ts.map +1 -1
- package/dist/src/commands/transfer/utils.d.ts +1 -1
- package/dist/src/commands/transfer/utils.d.ts.map +1 -1
- package/dist/src/commands/workspace/WorkspaceUpdateApiCommand.d.ts +2 -2
- package/dist/src/commands/workspace/WorkspaceUpdateApiCommand.d.ts.map +1 -1
- package/dist/src/commands/workspace/WorkspaceUpdateApiCommand.js +9 -7
- package/dist/src/commands/workspace/WorkspaceUpdateApiCommand.js.map +1 -1
- package/dist/src/run.js +4 -0
- 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/checkVersions.d.ts +3 -0
- package/dist/src/utils/checkVersions.d.ts.map +1 -0
- package/dist/src/utils/checkVersions.js +83 -0
- package/dist/src/utils/checkVersions.js.map +1 -0
- package/dist/src/utils/dockerCompose.d.ts +3 -0
- package/dist/src/utils/dockerCompose.d.ts.map +1 -1
- package/dist/src/utils/dockerCompose.js +45 -4
- package/dist/src/utils/dockerCompose.js.map +1 -1
- package/dist/src/utils/instance/environment.d.ts +1 -1
- package/dist/src/utils/instance/environment.d.ts.map +1 -1
- package/dist/src/utils/migrations.d.ts +2 -2
- package/dist/src/utils/migrations.d.ts.map +1 -1
- package/dist/src/utils/migrations.js +1 -1
- package/dist/src/utils/migrations.js.map +1 -1
- package/dist/src/utils/schema/collectReferences.d.ts +2 -2
- package/dist/src/utils/schema/collectReferences.d.ts.map +1 -1
- package/dist/src/utils/system/index.d.ts +2 -2
- package/dist/src/utils/system/index.d.ts.map +1 -1
- package/dist/src/utils/system/index.js +1 -1
- package/dist/src/utils/system/index.js.map +1 -1
- package/dist/src/utils/tenant.d.ts +2 -2
- package/dist/src/utils/tenant.d.ts.map +1 -1
- package/dist/src/utils/yaml.d.ts +1 -1
- package/dist/src/utils/yaml.d.ts.map +1 -1
- package/package.json +13 -11
- package/src/commands/migrations/MigrationExecuteCommand.ts +11 -29
- package/src/commands/migrations/MigrationValidationHelper.ts +8 -2
- package/src/commands/project/ProjectPrintSchemaCommand.ts +10 -6
- package/src/commands/workspace/WorkspaceUpdateApiCommand.ts +10 -8
- package/src/run.ts +7 -1
- package/src/utils/checkVersions.ts +58 -0
- package/src/utils/dockerCompose.ts +20 -3
- package/dist/src/utils/commands.d.ts +0 -21
- package/dist/src/utils/commands.d.ts.map +0 -1
- package/dist/src/utils/commands.js +0 -57
- package/dist/src/utils/commands.js.map +0 -1
- package/dist/src/utils/npm.d.ts +0 -6
- package/dist/src/utils/npm.d.ts.map +0 -1
- package/dist/src/utils/npm.js +0 -62
- package/dist/src/utils/npm.js.map +0 -1
- package/src/utils/commands.ts +0 -65
- package/src/utils/npm.ts +0 -63
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin.d.ts","sourceRoot":"","sources":["../../../src/utils/admin.ts"],"names":[],"mappings":"AAIA,qBAAa,WAAW;IACX,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAU,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAtC,GAAG,EAAE,MAAM,EAAmB,QAAQ,EAAE,MAAM;WAE7D,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,WAAW;IAInD,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;YASxD,OAAO;CAOrB;AAED,
|
|
1
|
+
{"version":3,"file":"admin.d.ts","sourceRoot":"","sources":["../../../src/utils/admin.ts"],"names":[],"mappings":"AAIA,qBAAa,WAAW;IACX,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAU,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAtC,GAAG,EAAE,MAAM,EAAmB,QAAQ,EAAE,MAAM;WAE7D,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,WAAW;IAInD,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;YASxD,OAAO;CAOrB;AAED,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAA;AAC9D,eAAO,MAAM,cAAc,QAAe,MAAM,WAAU,MAAM,KAAQ,QAAQ,UAAU,CAezF,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"checkVersions.d.ts","sourceRoot":"","sources":["../../../src/utils/checkVersions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAKpE,eAAO,MAAM,aAAa,cAAqB,SAAS,kBAoDvD,CAAA"}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.checkVersions = void 0;
|
|
27
|
+
const cli_common_1 = require("@contember/cli-common");
|
|
28
|
+
const node_path_1 = require("node:path");
|
|
29
|
+
const semver = __importStar(require("semver"));
|
|
30
|
+
const dockerCompose_1 = require("./dockerCompose");
|
|
31
|
+
const checkVersions = async (workspace) => {
|
|
32
|
+
var _a;
|
|
33
|
+
const cliVersion = (0, cli_common_1.getPackageVersion)();
|
|
34
|
+
const packageWorkspace = await workspace.resolvePackageWorkspace();
|
|
35
|
+
const errors = [];
|
|
36
|
+
for (const packageName of ['@contember/schema', '@contember/schema-definition']) {
|
|
37
|
+
const installedPackages = await packageWorkspace.findInstalledDependencies(packageName);
|
|
38
|
+
for (const pckg of installedPackages) {
|
|
39
|
+
const jsonPath = (0, node_path_1.relative)(workspace.directory, (0, node_path_1.join)(pckg.defined.pckg.dir, 'package.json'));
|
|
40
|
+
if (!pckg.installed) {
|
|
41
|
+
errors.push(`Package ${packageName} defined in ${jsonPath} is not installed.`);
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
44
|
+
if (!semver.satisfies(pckg.installed.version, pckg.defined.version)) {
|
|
45
|
+
errors.push(`Package ${packageName}@${pckg.installed.version} does not match constraint ${pckg.defined.version} defined in ${jsonPath}.`);
|
|
46
|
+
continue;
|
|
47
|
+
}
|
|
48
|
+
if (cliVersion !== pckg.installed.version) {
|
|
49
|
+
errors.push(`Package ${packageName}@${pckg.installed.version} does not match version of CLI ${cliVersion}.`);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
const dockerCompose = await (0, dockerCompose_1.tryReadMainDockerComposeConfig)(workspace.directory);
|
|
54
|
+
if (!dockerCompose) {
|
|
55
|
+
errors.push('docker-compose.yaml not found.');
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
for (const [name, def] of Object.entries((_a = dockerCompose.services) !== null && _a !== void 0 ? _a : {})) {
|
|
59
|
+
if (!def.image) {
|
|
60
|
+
continue;
|
|
61
|
+
}
|
|
62
|
+
const [image, version] = def.image.split(':');
|
|
63
|
+
if (!version || !dockerCompose_1.contemberDockerImages.includes(image)) {
|
|
64
|
+
continue;
|
|
65
|
+
}
|
|
66
|
+
const versionParts = version.split(/[.-]/);
|
|
67
|
+
if (versionParts[versionParts.length - 1] === 'debian') {
|
|
68
|
+
versionParts.pop();
|
|
69
|
+
}
|
|
70
|
+
const cliVersionParts = cliVersion.split(/[.-]/).slice(0, versionParts.length);
|
|
71
|
+
if (versionParts.join('.') !== cliVersionParts.join('.')) {
|
|
72
|
+
errors.push(`Docker service ${name} with image ${image}:${version} does not match version of CLI ${cliVersion}.`);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
if (errors.length) {
|
|
77
|
+
throw `${errors.map(it => `${it}`).join('\n')}
|
|
78
|
+
|
|
79
|
+
Please make sure all dependencies are up to date.\nIf you are really certain about the compatibility, you can disable this version check by running the CLI with the CONTEMBER_SKIP_VERSION_CHECK=1 environment variable`;
|
|
80
|
+
}
|
|
81
|
+
};
|
|
82
|
+
exports.checkVersions = checkVersions;
|
|
83
|
+
//# sourceMappingURL=checkVersions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"checkVersions.js","sourceRoot":"","sources":["../../../src/utils/checkVersions.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,5 +11,8 @@ export interface DockerComposeConfig {
|
|
|
11
11
|
version?: string;
|
|
12
12
|
services?: Record<string, DockerComposeServiceConfig>;
|
|
13
13
|
}
|
|
14
|
+
export declare const resolveMainDockerComposeConfig: (dir: string) => Promise<string | null>;
|
|
15
|
+
export declare const tryReadMainDockerComposeConfig: (dir: string) => Promise<DockerComposeConfig | null>;
|
|
14
16
|
export declare const updateMainDockerComposeConfig: (dir: string, updater: JsonUpdateCallback<DockerComposeConfig>) => Promise<void>;
|
|
17
|
+
export declare const contemberDockerImages: string[];
|
|
15
18
|
//# sourceMappingURL=dockerCompose.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dockerCompose.d.ts","sourceRoot":"","sources":["../../../src/utils/dockerCompose.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAc,MAAM,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"dockerCompose.d.ts","sourceRoot":"","sources":["../../../src/utils/dockerCompose.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAc,MAAM,QAAQ,CAAA;AAMvD,MAAM,WAAW,0BAA0B;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACpC,KAAK,CAAC,EAAE,CAAC,MAAM,GAAG,EAAE,CAAC,EAAE,CAAA;CACvB;AAED,MAAM,WAAW,mBAAmB;IACnC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;IAEtB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAA;CACrD;AAYD,eAAO,MAAM,8BAA8B,QAAe,MAAM,KAAG,QAAQ,MAAM,GAAG,IAAI,CAEvF,CAAA;AAED,eAAO,MAAM,8BAA8B,QAAe,MAAM,KAAG,QAAQ,mBAAmB,GAAG,IAAI,CAMpG,CAAA;AAED,eAAO,MAAM,6BAA6B,QACpC,MAAM,WACF,mBAAmB,mBAAmB,CAAC,KAC9C,QAAQ,IAAI,CAGd,CAAA;AAGD,eAAO,MAAM,qBAAqB,UAA+D,CAAA"}
|
|
@@ -1,22 +1,63 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
2
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.updateMainDockerComposeConfig = void 0;
|
|
29
|
+
exports.contemberDockerImages = exports.updateMainDockerComposeConfig = exports.tryReadMainDockerComposeConfig = exports.resolveMainDockerComposeConfig = void 0;
|
|
4
30
|
const node_path_1 = require("node:path");
|
|
5
31
|
const cli_common_1 = require("@contember/cli-common");
|
|
6
32
|
const yaml_1 = require("./yaml");
|
|
33
|
+
const js_yaml_1 = __importDefault(require("js-yaml"));
|
|
34
|
+
const fs = __importStar(require("node:fs/promises"));
|
|
7
35
|
const MAIN_CONFIGS = ['docker-compose.yaml', 'docker-compose.yml'];
|
|
8
|
-
const resolvePath = async (dir, possibleFileNames
|
|
36
|
+
const resolvePath = async (dir, possibleFileNames) => {
|
|
9
37
|
for (const file of possibleFileNames) {
|
|
10
38
|
const path = (0, node_path_1.join)(dir, file);
|
|
11
39
|
if (await (0, cli_common_1.pathExists)(path)) {
|
|
12
40
|
return path;
|
|
13
41
|
}
|
|
14
42
|
}
|
|
15
|
-
return
|
|
43
|
+
return null;
|
|
44
|
+
};
|
|
45
|
+
const resolveMainDockerComposeConfig = async (dir) => {
|
|
46
|
+
return resolvePath(dir, MAIN_CONFIGS);
|
|
47
|
+
};
|
|
48
|
+
exports.resolveMainDockerComposeConfig = resolveMainDockerComposeConfig;
|
|
49
|
+
const tryReadMainDockerComposeConfig = async (dir) => {
|
|
50
|
+
const path = await (0, exports.resolveMainDockerComposeConfig)(dir);
|
|
51
|
+
if (!path) {
|
|
52
|
+
return null;
|
|
53
|
+
}
|
|
54
|
+
return js_yaml_1.default.load(await fs.readFile(path, 'utf8'));
|
|
16
55
|
};
|
|
56
|
+
exports.tryReadMainDockerComposeConfig = tryReadMainDockerComposeConfig;
|
|
17
57
|
const updateMainDockerComposeConfig = async (dir, updater) => {
|
|
18
|
-
const path = process.env.COMPOSE_FILE || (await resolvePath(dir, MAIN_CONFIGS, MAIN_CONFIGS[0])
|
|
58
|
+
const path = process.env.COMPOSE_FILE || (await resolvePath(dir, MAIN_CONFIGS)) || (0, node_path_1.join)(dir, MAIN_CONFIGS[0]);
|
|
19
59
|
return (0, yaml_1.updateYaml)(path, updater, { createMissing: true });
|
|
20
60
|
};
|
|
21
61
|
exports.updateMainDockerComposeConfig = updateMainDockerComposeConfig;
|
|
62
|
+
exports.contemberDockerImages = ['contember/engine', 'contember/engine-ee', 'contember/cli'];
|
|
22
63
|
//# sourceMappingURL=dockerCompose.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dockerCompose.js","sourceRoot":"","sources":["../../../src/utils/dockerCompose.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dockerCompose.js","sourceRoot":"","sources":["../../../src/utils/dockerCompose.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAAgC;AAChC,sDAAkD;AAClD,iCAAuD;AACvD,sDAA4B;AAC5B,qDAAsC;AAEtC,MAAM,YAAY,GAAG,CAAC,qBAAqB,EAAE,oBAAoB,CAAC,CAAA;AAiBlE,MAAM,WAAW,GAAG,KAAK,EAAE,GAAW,EAAE,iBAA2B,EAA0B,EAAE;IAC9F,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,IAAI,CAAA;AACZ,CAAC,CAAA;AAEM,MAAM,8BAA8B,GAAG,KAAK,EAAE,GAAW,EAA0B,EAAE;IAC3F,OAAO,WAAW,CAAC,GAAG,EAAE,YAAY,CAAC,CAAA;AACtC,CAAC,CAAA;AAFY,QAAA,8BAA8B,kCAE1C;AAEM,MAAM,8BAA8B,GAAG,KAAK,EAAE,GAAW,EAAuC,EAAE;IACxG,MAAM,IAAI,GAAG,MAAM,IAAA,sCAA8B,EAAC,GAAG,CAAC,CAAA;IACtD,IAAI,CAAC,IAAI,EAAE;QACV,OAAO,IAAI,CAAA;KACX;IACD,OAAO,iBAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAwB,CAAA;AAC3E,CAAC,CAAA;AANY,QAAA,8BAA8B,kCAM1C;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,CAAC,CAAC,IAAI,IAAA,gBAAI,EAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAA;IAC7G,OAAO,IAAA,iBAAU,EAAC,IAAI,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAA;AAC1D,CAAC,CAAA;AANY,QAAA,6BAA6B,iCAMzC;AAGY,QAAA,qBAAqB,GAAG,CAAC,kBAAkB,EAAE,qBAAqB,EAAE,eAAe,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../../../src/utils/instance/environment.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../../../src/utils/instance/environment.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,sBAAsB,GAAG;IACpC,OAAO,EAAE,MAAM,CAAA;CACf,CAAA"}
|
|
@@ -49,8 +49,8 @@ interface MigrationExecutedErrorStatus extends MigrationInfo {
|
|
|
49
49
|
localMigration: Migration;
|
|
50
50
|
errorMessage: string;
|
|
51
51
|
}
|
|
52
|
-
export
|
|
53
|
-
export
|
|
52
|
+
export type ErrorMigrationStatus = MigrationToExecuteInvalidStatus | MigrationExecutedMissingStatus | MigrationExecutedErrorStatus;
|
|
53
|
+
export type AnyMigrationStatus = ErrorMigrationStatus | MigrationToExecuteOkStatus | MigrationExecutedOkStatus;
|
|
54
54
|
export declare const isErrorMigrationStatus: (migration: AnyMigrationStatus) => migration is ErrorMigrationStatus;
|
|
55
55
|
export declare const sortMigrations: <M extends {
|
|
56
56
|
version: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../../src/utils/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,SAAS,EACT,kBAAkB,EAClB,aAAa,EACb,kBAAkB,EAElB,MAAM,8BAA8B,CAAA;AAErC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAK1C,eAAO,MAAM,kBAAkB,uBAA8B,kBAAkB,KAAG,QAAQ,SAAS,GAAG,IAAI,CAGzG,CAAA;AACD,eAAO,MAAM,kBAAkB,uBACV,kBAAkB,WAC7B,MAAM,KACb,QAAQ,SAAS,GAAG,IAAI,CAG1B,CAAA;AAED,eAAO,MAAM,aAAa;aAAyB,MAAM;6BAA8B,MAAM,aAGnF,CAAA;AAEV,eAAO,MAAM,yBAAyB,wBAChB,kBAAkB,UAC/B,MAAM,aACH,SAAS,WACX;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,SA8B/C,CAAA;AAED,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC3D,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAA;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CACzB;AAED,MAAM,WAAW,iBAAkB,SAAQ,SAAS;IACnD,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAA;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CACzB;AAED,oBAAY,cAAc;IACzB,aAAa,kBAAkB;IAC/B,gBAAgB,qBAAqB;IACrC,WAAW,gBAAgB;IAC3B,cAAc,mBAAmB;IACjC,gBAAgB,qBAAqB;CACrC;AAED,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAChE,KAAK,EAAE,cAAc,CAAC,aAAa,CAAA;IACnC,cAAc,EAAE,SAAS,CAAA;CACzB;AAED,UAAU,+BAAgC,SAAQ,aAAa;IAC9D,KAAK,EAAE,cAAc,CAAC,gBAAgB,CAAA;IACtC,cAAc,EAAE,SAAS,CAAA;IACzB,YAAY,EAAE,MAAM,CAAA;CACpB;AAED,UAAU,yBAA0B,SAAQ,aAAa;IACxD,KAAK,EAAE,cAAc,CAAC,WAAW,CAAA;IACjC,iBAAiB,EAAE,qBAAqB,CAAA;IACxC,cAAc,EAAE,SAAS,CAAA;CACzB;AAED,UAAU,8BAA+B,SAAQ,aAAa;IAC7D,KAAK,EAAE,cAAc,CAAC,gBAAgB,CAAA;IACtC,iBAAiB,EAAE,qBAAqB,CAAA;IACxC,YAAY,EAAE,MAAM,CAAA;CACpB;AAED,UAAU,4BAA6B,SAAQ,aAAa;IAC3D,KAAK,EAAE,cAAc,CAAC,cAAc,CAAA;IACpC,iBAAiB,EAAE,qBAAqB,CAAA;IACxC,cAAc,EAAE,SAAS,CAAA;IACzB,YAAY,EAAE,MAAM,CAAA;CACpB;AAED,
|
|
1
|
+
{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../../src/utils/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,SAAS,EACT,kBAAkB,EAClB,aAAa,EACb,kBAAkB,EAElB,MAAM,8BAA8B,CAAA;AAErC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAK1C,eAAO,MAAM,kBAAkB,uBAA8B,kBAAkB,KAAG,QAAQ,SAAS,GAAG,IAAI,CAGzG,CAAA;AACD,eAAO,MAAM,kBAAkB,uBACV,kBAAkB,WAC7B,MAAM,KACb,QAAQ,SAAS,GAAG,IAAI,CAG1B,CAAA;AAED,eAAO,MAAM,aAAa;aAAyB,MAAM;6BAA8B,MAAM,aAGnF,CAAA;AAEV,eAAO,MAAM,yBAAyB,wBAChB,kBAAkB,UAC/B,MAAM,aACH,SAAS,WACX;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,SA8B/C,CAAA;AAED,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC3D,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAA;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CACzB;AAED,MAAM,WAAW,iBAAkB,SAAQ,SAAS;IACnD,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAA;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CACzB;AAED,oBAAY,cAAc;IACzB,aAAa,kBAAkB;IAC/B,gBAAgB,qBAAqB;IACrC,WAAW,gBAAgB;IAC3B,cAAc,mBAAmB;IACjC,gBAAgB,qBAAqB;CACrC;AAED,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAChE,KAAK,EAAE,cAAc,CAAC,aAAa,CAAA;IACnC,cAAc,EAAE,SAAS,CAAA;CACzB;AAED,UAAU,+BAAgC,SAAQ,aAAa;IAC9D,KAAK,EAAE,cAAc,CAAC,gBAAgB,CAAA;IACtC,cAAc,EAAE,SAAS,CAAA;IACzB,YAAY,EAAE,MAAM,CAAA;CACpB;AAED,UAAU,yBAA0B,SAAQ,aAAa;IACxD,KAAK,EAAE,cAAc,CAAC,WAAW,CAAA;IACjC,iBAAiB,EAAE,qBAAqB,CAAA;IACxC,cAAc,EAAE,SAAS,CAAA;CACzB;AAED,UAAU,8BAA+B,SAAQ,aAAa;IAC7D,KAAK,EAAE,cAAc,CAAC,gBAAgB,CAAA;IACtC,iBAAiB,EAAE,qBAAqB,CAAA;IACxC,YAAY,EAAE,MAAM,CAAA;CACpB;AAED,UAAU,4BAA6B,SAAQ,aAAa;IAC3D,KAAK,EAAE,cAAc,CAAC,cAAc,CAAA;IACpC,iBAAiB,EAAE,qBAAqB,CAAA;IACxC,cAAc,EAAE,SAAS,CAAA;IACzB,YAAY,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,MAAM,oBAAoB,GAC7B,+BAA+B,GAC/B,8BAA8B,GAC9B,4BAA4B,CAAA;AAE/B,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,GAAG,0BAA0B,GAAG,yBAAyB,CAAA;AAC9G,eAAO,MAAM,sBAAsB,cAAe,kBAAkB,sCAGlE,CAAA;AAEF,eAAO,MAAM,cAAc;aAAyB,MAAM;0BAEzD,CAAA;AAED,eAAO,MAAM,mBAAmB,uBACX,qBAAqB,EAAE,mBAC1B,SAAS,EAAE,UACrB,OAAO;mBAEC,kBAAkB,EAAE;qBAClB,oBAAoB,EAAE;yBAClB,0BAA0B,EAAE;CA4EjD,CAAA;AACD,eAAO,MAAM,0BAA0B,eAAgB,kBAAkB,EAAE,KAAG,MAkC7E,CAAA"}
|
|
@@ -60,7 +60,7 @@ var MigrationState;
|
|
|
60
60
|
MigrationState["EXECUTED_OK"] = "executed_ok";
|
|
61
61
|
MigrationState["EXECUTED_ERROR"] = "executed_error";
|
|
62
62
|
MigrationState["EXECUTED_MISSING"] = "executed_missing";
|
|
63
|
-
})(MigrationState
|
|
63
|
+
})(MigrationState || (exports.MigrationState = MigrationState = {}));
|
|
64
64
|
const isErrorMigrationStatus = (migration) => [MigrationState.EXECUTED_ERROR, MigrationState.EXECUTED_MISSING, MigrationState.TO_EXECUTE_ERROR].includes(migration.state);
|
|
65
65
|
exports.isErrorMigrationStatus = isErrorMigrationStatus;
|
|
66
66
|
const sortMigrations = (migrations) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../src/utils/migrations.ts"],"names":[],"mappings":";;;;;;AAAA,oEAOqC;AACrC,kDAAyB;AAEzB,8DAAoC;AACpC,+CAA2C;AAC3C,0DAAqE;AAE9D,MAAM,kBAAkB,GAAG,KAAK,EAAE,kBAAsC,EAA6B,EAAE;IAC7G,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,aAAa,EAAE,CAAA;IAC3D,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;AACxE,CAAC,CAAA;AAHY,QAAA,kBAAkB,sBAG9B;AACM,MAAM,kBAAkB,GAAG,KAAK,EACtC,kBAAsC,EACtC,OAAe,EACa,EAAE;IAC9B,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,aAAa,EAAE,CAAA;IAC3D,OAAO,IAAA,qBAAa,EAAC,UAAU,EAAE,OAAO,CAAC,CAAA;AAC1C,CAAC,CAAA;AANY,QAAA,kBAAkB,sBAM9B;AAEM,MAAM,aAAa,GAAG,CAAgC,UAAe,EAAE,OAAe,EAAY,EAAE,CAC1G,UAAU,CAAC,IAAI,CACd,EAAE,CAAC,EAAE,CAAC,0CAAsB,CAAC,cAAc,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,0CAAsB,CAAC,cAAc,CAAC,OAAO,CAAC,CAC1G,IAAI,IAAI,CAAA;AAHG,QAAA,aAAa,iBAGhB;AAEH,MAAM,yBAAyB,GAAG,UACxC,mBAAuC,EACvC,MAAc,EACd,SAAoB,EACpB,OAA+C;IAE/C,MAAM,WAAW,GAAG,mBAAmB,CAAC,qBAAqB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IAChF,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,EAAE;QAC7D,MAAM,GAAG,GAAG,MAAM,CAAC;YAClB,YAAY,EAAE,QAAQ;YACtB,gBAAgB,EAAE,0CAA2B;YAC7C,0BAA0B,EAAE,GAAG,EAAE,CAAC,IAAI;SACtC,CAAC,CAAA;QACF,IAAI,OAAO,CAAC,OAAO,EAAE;YACpB,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE;gBACf,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;aAChB;SACD;aAAM;YACN,MAAM,KAAK,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,eAAK,CAAC,GAAG,CAAC,CAAC,CAAC,eAAK,CAAC,IAAI,CAAA;YAChE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,OAAO,KAAK,YAAY,CAAC,YAAY,GAAG,CAAC,CAAC,CAAA;YAC7E,IAAI,WAAW,CAAC,cAAc,EAAE;gBAC/B,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,OAAO,CAAC,eAAK,CAAC,SAAS,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,CAAA;aACvE;YAED,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBACnB,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE;oBACf,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;iBAChB;qBAAM;oBACN,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;iBAChC;aACD;YACD,OAAO,CAAC,QAAQ,EAAE,CAAA;SAClB;IACF,CAAC,CAAC,CAAA;AACH,CAAC,CAAA;AAlCY,QAAA,yBAAyB,6BAkCrC;AAYD,IAAY,cAMX;AAND,WAAY,cAAc;IACzB,iDAA+B,CAAA;IAC/B,uDAAqC,CAAA;IACrC,6CAA2B,CAAA;IAC3B,mDAAiC,CAAA;IACjC,uDAAqC,CAAA;AACtC,CAAC,EANW,cAAc,
|
|
1
|
+
{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../src/utils/migrations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { Model } from '@contember/schema';
|
|
2
|
-
export
|
|
2
|
+
export type ReferenceMapEntry = {
|
|
3
3
|
owningEntity: Model.Entity;
|
|
4
4
|
owningRelation: Model.OneHasOneOwningRelation | Model.ManyHasOneRelation;
|
|
5
5
|
targetEntity: Model.Entity;
|
|
6
6
|
targetRelation: Model.OneHasOneInverseRelation | Model.OneHasManyRelation | null;
|
|
7
7
|
};
|
|
8
|
-
export
|
|
8
|
+
export type ReferencesMap = Record<string, ReferenceMapEntry[]>;
|
|
9
9
|
export declare const collectReferences: (model: Model.Schema) => ReferencesMap;
|
|
10
10
|
//# sourceMappingURL=collectReferences.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collectReferences.d.ts","sourceRoot":"","sources":["../../../../src/utils/schema/collectReferences.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzC,
|
|
1
|
+
{"version":3,"file":"collectReferences.d.ts","sourceRoot":"","sources":["../../../../src/utils/schema/collectReferences.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzC,MAAM,MAAM,iBAAiB,GAAG;IAC/B,YAAY,EAAE,KAAK,CAAC,MAAM,CAAA;IAC1B,cAAc,EAAE,KAAK,CAAC,uBAAuB,GAAG,KAAK,CAAC,kBAAkB,CAAA;IACxE,YAAY,EAAE,KAAK,CAAC,MAAM,CAAA;IAC1B,cAAc,EAAE,KAAK,CAAC,wBAAwB,GAAG,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAA;CAChF,CAAA;AACD,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAA;AAE/D,eAAO,MAAM,iBAAiB,UAAW,MAAM,MAAM,KAAG,aA6BvD,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { GraphQLClient } from 'graphql-request';
|
|
2
2
|
import { Migration } from '@contember/schema-migrations';
|
|
3
3
|
import { ExecutedMigration, ExecutedMigrationInfo } from '../migrations';
|
|
4
|
-
export
|
|
4
|
+
export type MigrateError = {
|
|
5
5
|
readonly code: MigrateErrorCode;
|
|
6
6
|
readonly migration: string;
|
|
7
7
|
readonly message: string;
|
|
@@ -13,7 +13,7 @@ export declare enum MigrateErrorCode {
|
|
|
13
13
|
InvalidSchema = "INVALID_SCHEMA",
|
|
14
14
|
MigrationFailed = "MIGRATION_FAILED"
|
|
15
15
|
}
|
|
16
|
-
export
|
|
16
|
+
export type MigrateResponse = {
|
|
17
17
|
readonly ok: boolean;
|
|
18
18
|
readonly errors: MigrateError[];
|
|
19
19
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/system/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AACxD,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAExE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/system/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AACxD,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAExE,MAAM,MAAM,YAAY,GAAG;IAC1B,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAA;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,oBAAY,gBAAgB;IAC3B,gBAAgB,uBAAuB;IACvC,eAAe,qBAAqB;IACpC,aAAa,mBAAmB;IAChC,aAAa,mBAAmB;IAChC,eAAe,qBAAqB;CACpC;AAED,MAAM,MAAM,eAAe,GAAG;IAC7B,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAA;IACpB,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,CAAA;CAC/B,CAAA;AAED,eAAO,MAAM,eAAe,YAAa,MAAM,eAAe,MAAM,WAKnE,CAAA;AAED,qBAAa,YAAY;IACZ,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,aAAa;WAEvC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,YAAY;IAS7E,OAAO,CAAC,UAAU,EAAE,SAAS,EAAE,EAAE,KAAK,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB9D,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB/C,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBjF,sBAAsB,IAAI,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAiB1D,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAmB9E"}
|
|
@@ -9,7 +9,7 @@ var MigrateErrorCode;
|
|
|
9
9
|
MigrateErrorCode["InvalidFormat"] = "INVALID_FORMAT";
|
|
10
10
|
MigrateErrorCode["InvalidSchema"] = "INVALID_SCHEMA";
|
|
11
11
|
MigrateErrorCode["MigrationFailed"] = "MIGRATION_FAILED";
|
|
12
|
-
})(MigrateErrorCode
|
|
12
|
+
})(MigrateErrorCode || (exports.MigrateErrorCode = MigrateErrorCode = {}));
|
|
13
13
|
const createSystemUrl = (baseUrl, projectName) => {
|
|
14
14
|
if (baseUrl.endsWith('/')) {
|
|
15
15
|
baseUrl = baseUrl.substring(0, baseUrl.length - 1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utils/system/index.ts"],"names":[],"mappings":";;;AAAA,qDAA+C;AAU/C,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC3B,2DAAuC,CAAA;IACvC,wDAAoC,CAAA;IACpC,oDAAgC,CAAA;IAChC,oDAAgC,CAAA;IAChC,wDAAoC,CAAA;AACrC,CAAC,EANW,gBAAgB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utils/system/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,11 +32,11 @@ export declare const interactiveResetPassword: ({ apiUrl, loginToken, }: {
|
|
|
32
32
|
apiUrl: string;
|
|
33
33
|
loginToken: string;
|
|
34
34
|
}) => Promise<void>;
|
|
35
|
-
|
|
35
|
+
type MembershipVariable = {
|
|
36
36
|
name: string;
|
|
37
37
|
values: string[];
|
|
38
38
|
};
|
|
39
|
-
|
|
39
|
+
type Membership = {
|
|
40
40
|
role: string;
|
|
41
41
|
variables: MembershipVariable[];
|
|
42
42
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant.d.ts","sourceRoot":"","sources":["../../../src/utils/tenant.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAKjD,eAAO,MAAM,kBAAkB,QAAS,MAAM,WAQ7C,CAAA;AAED,eAAO,MAAM,4BAA4B,cAAqB,SAAS,iBAUtE,CAAA;AAED,eAAO,MAAM,iBAAiB;YAKrB,MAAM;gBACF,MAAM;;MAEf,QAAQ;IAAE,YAAY,EAAE,MAAM,CAAA;CAAE,CAwBnC,CAAA;AAED,eAAO,MAAM,4BAA4B;WAA8B,MAAM;cAAY,MAAM;EAmB9F,CAAA;AAED,eAAO,MAAM,0BAA0B;eAK3B,SAAS;cACV,sBAAsB;;MAE7B,QAAQ,MAAM,CA4BjB,CAAA;AAED,eAAO,MAAM,iBAAiB;YAAgC,YAAY;MAAK,QAAQ,IAAI,CAyB1F,CAAA;AAED,eAAO,MAAM,uBAAuB;YAG3B,YAAY;MACjB,QAAQ;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAuBxC,CAAA;AA4DD,eAAO,MAAM,wBAAwB;YAI5B,MAAM;gBACF,MAAM;MACf,QAAQ,IAAI,CAkCf,CAAA;AAED,
|
|
1
|
+
{"version":3,"file":"tenant.d.ts","sourceRoot":"","sources":["../../../src/utils/tenant.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAKjD,eAAO,MAAM,kBAAkB,QAAS,MAAM,WAQ7C,CAAA;AAED,eAAO,MAAM,4BAA4B,cAAqB,SAAS,iBAUtE,CAAA;AAED,eAAO,MAAM,iBAAiB;YAKrB,MAAM;gBACF,MAAM;;MAEf,QAAQ;IAAE,YAAY,EAAE,MAAM,CAAA;CAAE,CAwBnC,CAAA;AAED,eAAO,MAAM,4BAA4B;WAA8B,MAAM;cAAY,MAAM;EAmB9F,CAAA;AAED,eAAO,MAAM,0BAA0B;eAK3B,SAAS;cACV,sBAAsB;;MAE7B,QAAQ,MAAM,CA4BjB,CAAA;AAED,eAAO,MAAM,iBAAiB;YAAgC,YAAY;MAAK,QAAQ,IAAI,CAyB1F,CAAA;AAED,eAAO,MAAM,uBAAuB;YAG3B,YAAY;MACjB,QAAQ;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAuBxC,CAAA;AA4DD,eAAO,MAAM,wBAAwB;YAI5B,MAAM;gBACF,MAAM;MACf,QAAQ,IAAI,CAkCf,CAAA;AAED,KAAK,kBAAkB,GAAG;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,EAAE,CAAA;CAChB,CAAA;AACD,KAAK,UAAU,GAAG;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,kBAAkB,EAAE,CAAA;CAC/B,CAAA;AAED,UAAU,OAAO;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE;QACN,IAAI,EAAE,MAAM,CAAA;QACZ,SAAS,EAAE;YACV,IAAI,EAAE,MAAM,CAAA;SACZ,EAAE,CAAA;KACH,EAAE,CAAA;CACH;AAED,qBAAa,YAAY;IACZ,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,aAAa;WAEvC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,YAAY;IASpD,YAAY,CACxB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,UAAU,EAAE,EACzB,WAAW,EAAE,MAAM,GACjB,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAwB5B,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBpF,YAAY,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAsBlC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC;IAsB9F,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IAmBvE,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBxD,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB7D,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAmB/E"}
|
package/dist/src/utils/yaml.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { JSONObject } from '@contember/cli-common';
|
|
2
|
-
export
|
|
2
|
+
export type JsonUpdateCallback<Value = JSONObject> = (data: Partial<Value>, utils: {
|
|
3
3
|
merge: (a: JSONObject, b: JSONObject) => JSONObject;
|
|
4
4
|
}) => Value;
|
|
5
5
|
export declare const updateYaml: <Value = JSONObject>(path: string, updater: JsonUpdateCallback<Value>, options?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yaml.d.ts","sourceRoot":"","sources":["../../../src/utils/yaml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA6B,MAAM,uBAAuB,CAAA;AAM7E,
|
|
1
|
+
{"version":3,"file":"yaml.d.ts","sourceRoot":"","sources":["../../../src/utils/yaml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA6B,MAAM,uBAAuB,CAAA;AAM7E,MAAM,MAAM,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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@contember/cli",
|
|
3
|
-
"version": "1.3.0-
|
|
3
|
+
"version": "1.3.0-beta.2",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"bin": {
|
|
6
6
|
"contember": "./dist/src/run.js"
|
|
@@ -12,24 +12,25 @@
|
|
|
12
12
|
"devDependencies": {
|
|
13
13
|
"@types/fs-extra": "^9.0.3",
|
|
14
14
|
"@types/js-yaml": "^4.0.1",
|
|
15
|
-
"@types/prompts": "^2.0.1",
|
|
16
15
|
"@types/node": "^18",
|
|
16
|
+
"@types/prompts": "^2.0.1",
|
|
17
|
+
"@types/semver": "^7.5.0",
|
|
17
18
|
"autoprefixer": "^10.4.5",
|
|
18
19
|
"postcss": "^8.4.12",
|
|
19
20
|
"tailwindcss": "^3.0.24"
|
|
20
21
|
},
|
|
21
22
|
"dependencies": {
|
|
22
|
-
"@contember/cli-common": "
|
|
23
|
-
"@contember/config-loader": "
|
|
24
|
-
"@contember/dic": "
|
|
25
|
-
"@contember/engine-content-api": "
|
|
26
|
-
"@contember/schema": "
|
|
27
|
-
"@contember/schema-migrations": "
|
|
28
|
-
"@contember/schema-utils": "
|
|
23
|
+
"@contember/cli-common": "1.3.0-beta.2",
|
|
24
|
+
"@contember/config-loader": "1.3.0-beta.2",
|
|
25
|
+
"@contember/dic": "1.3.0-beta.2",
|
|
26
|
+
"@contember/engine-content-api": "1.3.0-beta.2",
|
|
27
|
+
"@contember/schema": "1.3.0-beta.2",
|
|
28
|
+
"@contember/schema-migrations": "1.3.0-beta.2",
|
|
29
|
+
"@contember/schema-utils": "1.3.0-beta.2",
|
|
29
30
|
"@graphql-tools/schema": "^8.3.5",
|
|
30
31
|
"chalk": "^4.1.2",
|
|
31
32
|
"chalk-table": "^1.0.2",
|
|
32
|
-
"esbuild": "^0.
|
|
33
|
+
"esbuild": "^0.17.5",
|
|
33
34
|
"graphql": "^16.5.0",
|
|
34
35
|
"graphql-request": "^4.3.0",
|
|
35
36
|
"js-yaml": "^4.1.0",
|
|
@@ -38,7 +39,8 @@
|
|
|
38
39
|
"preact": "^10.7.1",
|
|
39
40
|
"preact-render-to-string": "^5.2.0",
|
|
40
41
|
"prompts": "^2.2.1",
|
|
42
|
+
"semver": "^7.5.1",
|
|
41
43
|
"vm2": "^3.9.9",
|
|
42
44
|
"yawn-yaml": "^1.5.0"
|
|
43
45
|
}
|
|
44
|
-
}
|
|
46
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Command, CommandConfiguration, Input,
|
|
1
|
+
import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common'
|
|
2
2
|
import { MigrationsContainerFactory } from '../../MigrationsContainer'
|
|
3
3
|
import {
|
|
4
4
|
configureExecuteMigrationCommand,
|
|
@@ -6,18 +6,18 @@ import {
|
|
|
6
6
|
executeMigrations,
|
|
7
7
|
resolveMigrationStatus,
|
|
8
8
|
} from './MigrationExecuteHelper'
|
|
9
|
-
import { createMigrationStatusTable
|
|
10
|
-
import { assertNever } from '../../utils/assertNever'
|
|
9
|
+
import { createMigrationStatusTable } from '../../utils/migrations'
|
|
11
10
|
import { interactiveResolveInstanceEnvironmentFromInput } from '../../utils/instance'
|
|
12
11
|
import { interactiveResolveApiToken, TenantClient } from '../../utils/tenant'
|
|
13
12
|
import { SystemClient } from '../../utils/system'
|
|
13
|
+
import { MigrationVersionHelper } from '@contember/schema-migrations'
|
|
14
14
|
|
|
15
15
|
type Args = {
|
|
16
16
|
project?: string
|
|
17
|
-
migration?: string
|
|
18
17
|
}
|
|
19
18
|
|
|
20
19
|
type Options = ExecuteMigrationOptions & {
|
|
20
|
+
until?: string
|
|
21
21
|
force: boolean
|
|
22
22
|
}
|
|
23
23
|
|
|
@@ -33,8 +33,8 @@ export class MigrationExecuteCommand extends Command<Args, Options> {
|
|
|
33
33
|
if (!this.workspace.isSingleProjectMode()) {
|
|
34
34
|
configuration.argument('project')
|
|
35
35
|
}
|
|
36
|
-
configuration.argument('migration').optional()
|
|
37
36
|
configuration.option('force').description('Ignore migrations order and missing migrations (dev only)')
|
|
37
|
+
configuration.option('until').valueRequired().description('Execute all migrations leading up to, and inclusive of, a specified migration')
|
|
38
38
|
configureExecuteMigrationCommand(configuration)
|
|
39
39
|
}
|
|
40
40
|
|
|
@@ -51,12 +51,10 @@ export class MigrationExecuteCommand extends Command<Args, Options> {
|
|
|
51
51
|
const projects = allProjects
|
|
52
52
|
? await workspace.projects.listProjects()
|
|
53
53
|
: [await workspace.projects.getProject(projectName, { fuzzy: true })]
|
|
54
|
-
|
|
55
54
|
let code = 0
|
|
56
55
|
for (const project of projects) {
|
|
57
56
|
const migrationsDir = project.migrationsDir
|
|
58
57
|
const container = new MigrationsContainerFactory(migrationsDir).create()
|
|
59
|
-
const migrationArg = input.getArgument('migration')
|
|
60
58
|
|
|
61
59
|
const instance = await interactiveResolveInstanceEnvironmentFromInput(workspace, input?.getOption('instance'))
|
|
62
60
|
const apiToken = await interactiveResolveApiToken({ workspace, instance })
|
|
@@ -73,29 +71,13 @@ export class MigrationExecuteCommand extends Command<Args, Options> {
|
|
|
73
71
|
throw `Cannot execute migrations`
|
|
74
72
|
}
|
|
75
73
|
}
|
|
74
|
+
const until = input.getOption('until')
|
|
75
|
+
const untilNormalized = until ? MigrationVersionHelper.extractVersion(until) : null
|
|
76
|
+
|
|
77
|
+
const migrations = untilNormalized
|
|
78
|
+
? status.migrationsToExecute.filter(it => it.version <= MigrationVersionHelper.extractVersion(untilNormalized))
|
|
79
|
+
: status.migrationsToExecute
|
|
76
80
|
|
|
77
|
-
const migrations = (() => {
|
|
78
|
-
if (migrationArg) {
|
|
79
|
-
const migration = findMigration(status.allMigrations, migrationArg)
|
|
80
|
-
if (!migration) {
|
|
81
|
-
throw `Undefined migration ${migrationArg}`
|
|
82
|
-
}
|
|
83
|
-
switch (migration.state) {
|
|
84
|
-
case MigrationState.EXECUTED_OK:
|
|
85
|
-
throw `Migration ${migrationArg} is already executed`
|
|
86
|
-
case MigrationState.TO_EXECUTE_ERROR:
|
|
87
|
-
case MigrationState.EXECUTED_ERROR:
|
|
88
|
-
case MigrationState.EXECUTED_MISSING:
|
|
89
|
-
throw `Cannot execute migration ${migrationArg}: ${migration.errorMessage} (${migration.state})`
|
|
90
|
-
case MigrationState.TO_EXECUTE_OK:
|
|
91
|
-
return [migration]
|
|
92
|
-
default:
|
|
93
|
-
assertNever(migration)
|
|
94
|
-
}
|
|
95
|
-
} else {
|
|
96
|
-
return status.migrationsToExecute
|
|
97
|
-
}
|
|
98
|
-
})()
|
|
99
81
|
if (migrations.length === 0) {
|
|
100
82
|
console.log('No migrations to execute')
|
|
101
83
|
continue
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Schema } from '@contember/schema'
|
|
2
|
-
import { Migration, MigrationDescriber, SchemaMigrator, SchemaUpdateError } from '@contember/schema-migrations'
|
|
2
|
+
import { Migration, MigrationDescriber, MigrationVersionHelper, SchemaMigrator, SchemaUpdateError } from '@contember/schema-migrations'
|
|
3
3
|
import { validateSchemaAndPrintErrors } from '../../utils/schema'
|
|
4
|
+
import { SchemaValidatorSkippedErrors } from '@contember/schema-utils'
|
|
4
5
|
|
|
5
6
|
export const validateMigrations = async (
|
|
6
7
|
initialSchema: Schema,
|
|
@@ -10,6 +11,7 @@ export const validateMigrations = async (
|
|
|
10
11
|
): Promise<boolean> => {
|
|
11
12
|
let migratedSchema = initialSchema
|
|
12
13
|
let projectValid = true
|
|
14
|
+
let skippedErrors: SchemaValidatorSkippedErrors[] = []
|
|
13
15
|
for (const migration of await migrations) {
|
|
14
16
|
try {
|
|
15
17
|
// just a check that it does not fail
|
|
@@ -23,7 +25,11 @@ export const validateMigrations = async (
|
|
|
23
25
|
throw e
|
|
24
26
|
}
|
|
25
27
|
const errorMessage = `Migration ${migration.name} produces invalid schema:`
|
|
26
|
-
|
|
28
|
+
skippedErrors = [
|
|
29
|
+
...skippedErrors.filter(it => it.skipUntil && MigrationVersionHelper.extractVersion(it.skipUntil) >= migration.version),
|
|
30
|
+
...migration.skippedErrors ?? [],
|
|
31
|
+
]
|
|
32
|
+
projectValid = validateSchemaAndPrintErrors(migratedSchema, errorMessage, skippedErrors)
|
|
27
33
|
&& projectValid
|
|
28
34
|
}
|
|
29
35
|
return projectValid
|