@eclipse-glsp/cli 2.2.0-next.063af47.158 → 2.2.0-next.166
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/bin/glsp +1 -1
- package/lib/app.js +17 -14
- package/lib/app.js.map +1 -1
- package/lib/commands/check-header.js +74 -43
- package/lib/commands/check-header.js.map +1 -1
- package/lib/commands/coverage-report.d.ts +1 -1
- package/lib/commands/coverage-report.js +58 -26
- package/lib/commands/coverage-report.js.map +1 -1
- package/lib/commands/generate-index.d.ts +10 -2
- package/lib/commands/generate-index.d.ts.map +1 -1
- package/lib/commands/generate-index.js +79 -37
- package/lib/commands/generate-index.js.map +1 -1
- package/lib/commands/release/common.d.ts +1 -1
- package/lib/commands/release/common.js +130 -88
- package/lib/commands/release/common.js.map +1 -1
- package/lib/commands/release/release-client.d.ts +1 -1
- package/lib/commands/release/release-client.d.ts.map +1 -1
- package/lib/commands/release/release-client.js +28 -21
- package/lib/commands/release/release-client.js.map +1 -1
- package/lib/commands/release/release-eclipse-integration.d.ts +1 -1
- package/lib/commands/release/release-eclipse-integration.js +45 -38
- package/lib/commands/release/release-eclipse-integration.js.map +1 -1
- package/lib/commands/release/release-java-server.d.ts +1 -1
- package/lib/commands/release/release-java-server.d.ts.map +1 -1
- package/lib/commands/release/release-java-server.js +38 -31
- package/lib/commands/release/release-java-server.js.map +1 -1
- package/lib/commands/release/release-server-node.d.ts +1 -1
- package/lib/commands/release/release-server-node.js +25 -18
- package/lib/commands/release/release-server-node.js.map +1 -1
- package/lib/commands/release/release-theia-integration.d.ts +1 -1
- package/lib/commands/release/release-theia-integration.js +25 -18
- package/lib/commands/release/release-theia-integration.js.map +1 -1
- package/lib/commands/release/release-vscode-integration.d.ts +1 -1
- package/lib/commands/release/release-vscode-integration.js +25 -18
- package/lib/commands/release/release-vscode-integration.js.map +1 -1
- package/lib/commands/release/release.js +92 -62
- package/lib/commands/release/release.js.map +1 -1
- package/lib/commands/update-next.js +65 -35
- package/lib/commands/update-next.js.map +1 -1
- package/lib/util/command-util.d.ts +1 -1
- package/lib/util/command-util.js +23 -13
- package/lib/util/command-util.js.map +1 -1
- package/lib/util/git-util.d.ts +1 -1
- package/lib/util/git-util.js +49 -32
- package/lib/util/git-util.js.map +1 -1
- package/lib/util/logger.d.ts +1 -1
- package/lib/util/logger.js +10 -6
- package/lib/util/logger.js.map +1 -1
- package/lib/util/validation-util.js +52 -22
- package/lib/util/validation-util.js.map +1 -1
- package/package.json +3 -5
- package/src/app.ts +6 -6
- package/src/commands/check-header.ts +5 -5
- package/src/commands/coverage-report.ts +4 -4
- package/src/commands/generate-index.ts +23 -8
- package/src/commands/release/common.ts +5 -5
- package/src/commands/release/release-client.ts +5 -5
- package/src/commands/release/release-eclipse-integration.ts +3 -3
- package/src/commands/release/release-java-server.ts +4 -4
- package/src/commands/release/release-server-node.ts +2 -2
- package/src/commands/release/release-theia-integration.ts +2 -2
- package/src/commands/release/release-vscode-integration.ts +2 -2
- package/src/commands/release/release.ts +10 -10
- package/src/commands/update-next.ts +5 -5
- package/src/util/command-util.ts +1 -1
- package/src/util/git-util.ts +2 -2
- package/src/util/logger.ts +1 -1
- package/src/util/validation-util.ts +3 -3
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
"use strict";
|
|
1
2
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2023 EclipseSource and others.
|
|
3
|
+
* Copyright (c) 2023-2024 EclipseSource and others.
|
|
3
4
|
*
|
|
4
5
|
* This program and the accompanying materials are made available under the
|
|
5
6
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -13,16 +14,43 @@
|
|
|
13
14
|
*
|
|
14
15
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
16
|
********************************************************************************/
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
17
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
18
|
+
if (k2 === undefined) k2 = k;
|
|
19
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
20
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
21
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
22
|
+
}
|
|
23
|
+
Object.defineProperty(o, k2, desc);
|
|
24
|
+
}) : (function(o, m, k, k2) {
|
|
25
|
+
if (k2 === undefined) k2 = k;
|
|
26
|
+
o[k2] = m[k];
|
|
27
|
+
}));
|
|
28
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
29
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
30
|
+
}) : function(o, v) {
|
|
31
|
+
o["default"] = v;
|
|
32
|
+
});
|
|
33
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
34
|
+
if (mod && mod.__esModule) return mod;
|
|
35
|
+
var result = {};
|
|
36
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
37
|
+
__setModuleDefault(result, mod);
|
|
38
|
+
return result;
|
|
39
|
+
};
|
|
40
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
41
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
42
|
+
};
|
|
43
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
44
|
+
exports.extractReusableContent = exports.createExport = exports.writeIndex = exports.isChildFile = exports.isChildDirectory = exports.isChild = exports.getLevel = exports.isFile = exports.isDirectory = exports.isDirectChild = exports.generateIndex = exports.generateIndices = exports.GenerateIndex = void 0;
|
|
45
|
+
const commander_1 = require("commander");
|
|
46
|
+
const fs = __importStar(require("fs"));
|
|
47
|
+
const os = __importStar(require("os"));
|
|
48
|
+
const path = __importStar(require("path"));
|
|
49
|
+
const shelljs_1 = __importDefault(require("shelljs"));
|
|
50
|
+
const command_util_1 = require("../util/command-util");
|
|
51
|
+
const logger_1 = require("../util/logger");
|
|
52
|
+
const validation_util_1 = require("../util/validation-util");
|
|
53
|
+
exports.GenerateIndex = (0, command_util_1.baseCommand)() //
|
|
26
54
|
.name('generateIndex')
|
|
27
55
|
.description('Generate index files in a given source directory.')
|
|
28
56
|
.argument('<rootDir...>', 'The source directory for index generation.')
|
|
@@ -30,18 +58,21 @@ export const GenerateIndex = baseCommand() //
|
|
|
30
58
|
.option('-f, --forceOverwrite', 'Overwrite existing index files and remove them if there are no entries', false)
|
|
31
59
|
.option('-m, --match [match patterns...]', 'File patterns to consider during indexing', ['**/*.ts', '**/*.tsx'])
|
|
32
60
|
.option('-i, --ignore [ignore patterns...]', 'File patterns to ignore during indexing', ['**/*.spec.ts', '**/*.spec.tsx', '**/*.d.ts'])
|
|
33
|
-
.addOption(createOption('-s, --style <importStyle>', 'Import Style').choices(['commonjs', 'esm']).default('commonjs'))
|
|
61
|
+
.addOption((0, commander_1.createOption)('-s, --style <importStyle>', 'Import Style').choices(['commonjs', 'esm']).default('commonjs'))
|
|
34
62
|
.option('--ignoreFile <ignoreFile>', 'The file that is used to specify patterns that should be ignored during indexing', '.indexignore')
|
|
35
63
|
.option('-v, --verbose', 'Generate verbose output during generation', false)
|
|
36
64
|
.action(generateIndices);
|
|
37
|
-
|
|
38
|
-
const dirs = rootDirs.map(rootDir => validateDirectory(path.resolve(rootDir)));
|
|
39
|
-
|
|
65
|
+
async function generateIndices(rootDirs, options) {
|
|
66
|
+
const dirs = rootDirs.map(rootDir => (0, validation_util_1.validateDirectory)(path.resolve(rootDir)));
|
|
67
|
+
const globby = await import('globby');
|
|
68
|
+
const ignoreFilter = (pattern, globbyOptions) => globby.globbySync(pattern, globbyOptions);
|
|
69
|
+
dirs.forEach(dir => generateIndex(dir, ignoreFilter, options));
|
|
40
70
|
}
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
71
|
+
exports.generateIndices = generateIndices;
|
|
72
|
+
async function generateIndex(rootDir, ignoreFilter, options) {
|
|
73
|
+
(0, logger_1.configureLogger)(options.verbose);
|
|
74
|
+
logger_1.LOGGER.debug('Run generateIndex for', rootDir, 'with the following options:', options);
|
|
75
|
+
shelljs_1.default.cd(rootDir);
|
|
45
76
|
const cwd = process.cwd();
|
|
46
77
|
// we want to match all given patterns and subdirectories and ignore all given patterns and (generated) index files
|
|
47
78
|
const pattern = typeof options.match === 'boolean' ? ['**/'] : [...options.match, '**/'];
|
|
@@ -50,12 +81,12 @@ export async function generateIndex(rootDir, options) {
|
|
|
50
81
|
ignore,
|
|
51
82
|
cwd,
|
|
52
83
|
onlyFiles: options.singleIndex,
|
|
53
|
-
markDirectories: true,
|
|
84
|
+
markDirectories: true, // directories have '/' at the end
|
|
54
85
|
ignoreFiles: '**/' + options.ignoreFile // users can add this file in their directories to ignore files for indexing
|
|
55
86
|
};
|
|
56
|
-
LOGGER.debug('Search for children using the following globby options', globbyOptions);
|
|
57
|
-
const files =
|
|
58
|
-
LOGGER.debug('All children considered in the input directory', files);
|
|
87
|
+
logger_1.LOGGER.debug('Search for children using the following globby options', globbyOptions);
|
|
88
|
+
const files = ignoreFilter(pattern, globbyOptions);
|
|
89
|
+
logger_1.LOGGER.debug('All children considered in the input directory', files);
|
|
59
90
|
const relativeRootDirectory = '';
|
|
60
91
|
if (options.singleIndex) {
|
|
61
92
|
writeIndex(relativeRootDirectory, files.filter(isFile), options);
|
|
@@ -71,49 +102,58 @@ export async function generateIndex(rootDir, options) {
|
|
|
71
102
|
}
|
|
72
103
|
}
|
|
73
104
|
}
|
|
74
|
-
|
|
105
|
+
exports.generateIndex = generateIndex;
|
|
106
|
+
function isDirectChild(parent, child, childHasChildren) {
|
|
75
107
|
return isChildFile(parent, child) || (isChildDirectory(parent, child) && childHasChildren());
|
|
76
108
|
}
|
|
77
|
-
|
|
109
|
+
exports.isDirectChild = isDirectChild;
|
|
110
|
+
function isDirectory(file) {
|
|
78
111
|
return file.endsWith('/');
|
|
79
112
|
}
|
|
80
|
-
|
|
113
|
+
exports.isDirectory = isDirectory;
|
|
114
|
+
function isFile(file) {
|
|
81
115
|
return !isDirectory(file);
|
|
82
116
|
}
|
|
83
|
-
|
|
117
|
+
exports.isFile = isFile;
|
|
118
|
+
function getLevel(file) {
|
|
84
119
|
return file.split('/').length;
|
|
85
120
|
}
|
|
86
|
-
|
|
121
|
+
exports.getLevel = getLevel;
|
|
122
|
+
function isChild(parent, child) {
|
|
87
123
|
return child.startsWith(parent);
|
|
88
124
|
}
|
|
89
|
-
|
|
125
|
+
exports.isChild = isChild;
|
|
126
|
+
function isChildDirectory(parent, child) {
|
|
90
127
|
return isDirectory(child) && isChild(parent, child) && getLevel(child) === getLevel(parent) + 1;
|
|
91
128
|
}
|
|
92
|
-
|
|
129
|
+
exports.isChildDirectory = isChildDirectory;
|
|
130
|
+
function isChildFile(parent, child) {
|
|
93
131
|
return isFile(child) && isChild(parent, child) && getLevel(child) === getLevel(parent);
|
|
94
132
|
}
|
|
95
|
-
|
|
133
|
+
exports.isChildFile = isChildFile;
|
|
134
|
+
function writeIndex(directory, exports, options) {
|
|
96
135
|
const indexFile = path.join(process.cwd(), directory, 'index.ts');
|
|
97
136
|
if (exports.length === 0) {
|
|
98
137
|
if (options.forceOverwrite && fs.existsSync(indexFile)) {
|
|
99
|
-
LOGGER.info('Remove index file', indexFile);
|
|
138
|
+
logger_1.LOGGER.info('Remove index file', indexFile);
|
|
100
139
|
fs.rmSync(indexFile);
|
|
101
140
|
}
|
|
102
141
|
return;
|
|
103
142
|
}
|
|
104
143
|
const exists = fs.existsSync(indexFile);
|
|
105
144
|
if (exists && !options.forceOverwrite) {
|
|
106
|
-
LOGGER.info("Do not overwrite existing index file. Use '-f' to force an overwrite.", indexFile);
|
|
145
|
+
logger_1.LOGGER.info("Do not overwrite existing index file. Use '-f' to force an overwrite.", indexFile);
|
|
107
146
|
return;
|
|
108
147
|
}
|
|
109
148
|
const headerContent = exists ? extractReusableContent(fs.readFileSync(indexFile, { encoding: 'utf-8' })) : '';
|
|
110
149
|
const exportContent = exports.map(exported => createExport(directory, exported, options)).sort();
|
|
111
150
|
const content = headerContent + exportContent.join(os.EOL) + os.EOL; // end with an empty line
|
|
112
|
-
LOGGER.info((exists ? 'Overwrite' : 'Write') + ' index file', indexFile);
|
|
113
|
-
LOGGER.debug(' ' + content.split(os.EOL).join(os.EOL + ' '));
|
|
151
|
+
logger_1.LOGGER.info((exists ? 'Overwrite' : 'Write') + ' index file', indexFile);
|
|
152
|
+
logger_1.LOGGER.debug(' ' + content.split(os.EOL).join(os.EOL + ' '));
|
|
114
153
|
fs.writeFileSync(indexFile, content, { flag: 'w' });
|
|
115
154
|
}
|
|
116
|
-
|
|
155
|
+
exports.writeIndex = writeIndex;
|
|
156
|
+
function createExport(directory, relativePath, options) {
|
|
117
157
|
// remove directory prefix, file extension and directory ending '/'
|
|
118
158
|
const parentPrefix = directory.length;
|
|
119
159
|
const suffix = isFile(relativePath) ? path.extname(relativePath).length : 1;
|
|
@@ -122,9 +162,11 @@ export function createExport(directory, relativePath, options) {
|
|
|
122
162
|
const exportLine = `export * from './${exportName}';`;
|
|
123
163
|
return exportLine;
|
|
124
164
|
}
|
|
125
|
-
|
|
165
|
+
exports.createExport = createExport;
|
|
166
|
+
function extractReusableContent(fileContent) {
|
|
126
167
|
var _a, _b;
|
|
127
168
|
// all code before any actual export lines are considered re-usable
|
|
128
169
|
return (_b = (_a = fileContent.match(/^(.*?)(?=^export)/ms)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : '';
|
|
129
170
|
}
|
|
171
|
+
exports.extractReusableContent = extractReusableContent;
|
|
130
172
|
//# sourceMappingURL=generate-index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-index.js","sourceRoot":"","sources":["../../src/commands/generate-index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF
|
|
1
|
+
{"version":3,"file":"generate-index.js","sourceRoot":"","sources":["../../src/commands/generate-index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022 EclipseSource and others.
|
|
2
|
+
* Copyright (c) 2022-2024 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
"use strict";
|
|
1
2
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022 EclipseSource and others.
|
|
3
|
+
* Copyright (c) 2022-2024 EclipseSource and others.
|
|
3
4
|
*
|
|
4
5
|
* This program and the accompanying materials are made available under the
|
|
5
6
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -13,18 +14,46 @@
|
|
|
13
14
|
*
|
|
14
15
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
16
|
********************************************************************************/
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
17
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
18
|
+
if (k2 === undefined) k2 = k;
|
|
19
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
20
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
21
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
22
|
+
}
|
|
23
|
+
Object.defineProperty(o, k2, desc);
|
|
24
|
+
}) : (function(o, m, k, k2) {
|
|
25
|
+
if (k2 === undefined) k2 = k;
|
|
26
|
+
o[k2] = m[k];
|
|
27
|
+
}));
|
|
28
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
29
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
30
|
+
}) : function(o, v) {
|
|
31
|
+
o["default"] = v;
|
|
32
|
+
});
|
|
33
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
34
|
+
if (mod && mod.__esModule) return mod;
|
|
35
|
+
var result = {};
|
|
36
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
37
|
+
__setModuleDefault(result, mod);
|
|
38
|
+
return result;
|
|
39
|
+
};
|
|
40
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
41
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
42
|
+
};
|
|
43
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
44
|
+
exports.updateLernaForDryRun = exports.checkJavaServerVersion = exports.isExistingMavenVersion = exports.checkIfMavenVersionExists = exports.checkIfNpmVersionIsNew = exports.asMvnVersion = exports.updateVersion = exports.upgradeCommand = exports.yarnInstall = exports.lernaSetVersion = exports.publish = exports.commitAndTag = exports.checkoutAndCd = exports.ReleaseType = exports.Component = exports.VERDACCIO_REGISTRY = void 0;
|
|
45
|
+
const fs = __importStar(require("fs"));
|
|
46
|
+
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
47
|
+
const path_1 = require("path");
|
|
48
|
+
const readline = __importStar(require("readline-sync"));
|
|
49
|
+
const semver = __importStar(require("semver"));
|
|
50
|
+
const shelljs_1 = __importDefault(require("shelljs"));
|
|
51
|
+
const command_util_1 = require("../../util/command-util");
|
|
52
|
+
const git_util_1 = require("../../util/git-util");
|
|
53
|
+
const logger_1 = require("../../util/logger");
|
|
54
|
+
const validation_util_1 = require("../../util/validation-util");
|
|
55
|
+
exports.VERDACCIO_REGISTRY = 'http://localhost:4873/';
|
|
56
|
+
var Component;
|
|
28
57
|
(function (Component) {
|
|
29
58
|
Component.CLIENT = {
|
|
30
59
|
type: 'client',
|
|
@@ -84,76 +113,79 @@ export var Component;
|
|
|
84
113
|
return typeof object === 'object' && typeof object.type === 'string';
|
|
85
114
|
}
|
|
86
115
|
Component.is = is;
|
|
87
|
-
})(Component || (Component = {}));
|
|
88
|
-
|
|
116
|
+
})(Component || (exports.Component = Component = {}));
|
|
117
|
+
var ReleaseType;
|
|
89
118
|
(function (ReleaseType) {
|
|
90
119
|
ReleaseType.CLI_CHOICES = ['major', 'minor', 'patch', 'rc', 'custom'];
|
|
91
|
-
})(ReleaseType || (ReleaseType = {}));
|
|
92
|
-
|
|
120
|
+
})(ReleaseType || (exports.ReleaseType = ReleaseType = {}));
|
|
121
|
+
function checkoutAndCd(options) {
|
|
93
122
|
const ghUrl = options.component.githubRepo;
|
|
94
|
-
LOGGER.info(`Clone repository '${ghUrl}' to directory: ${options.checkoutDir}`);
|
|
95
|
-
|
|
123
|
+
logger_1.LOGGER.info(`Clone repository '${ghUrl}' to directory: ${options.checkoutDir}`);
|
|
124
|
+
shelljs_1.default.cd(options.checkoutDir);
|
|
96
125
|
const directory = ghUrl.substring(ghUrl.lastIndexOf('/') + 1);
|
|
97
|
-
const repoPath = resolve(options.checkoutDir, directory);
|
|
98
|
-
if (fs.existsSync(resolve(options.checkoutDir, directory))) {
|
|
126
|
+
const repoPath = (0, path_1.resolve)(options.checkoutDir, directory);
|
|
127
|
+
if (fs.existsSync((0, path_1.resolve)(options.checkoutDir, directory))) {
|
|
99
128
|
if (options.force) {
|
|
100
|
-
LOGGER.debug('A directory with the checkout name already exists.');
|
|
101
|
-
LOGGER.debug('Force mode is enabled. The directory will be removed');
|
|
102
|
-
fatalExec(`rm -rf ${repoPath}`, `Could not remove directory: ${repoPath}`);
|
|
129
|
+
logger_1.LOGGER.debug('A directory with the checkout name already exists.');
|
|
130
|
+
logger_1.LOGGER.debug('Force mode is enabled. The directory will be removed');
|
|
131
|
+
(0, command_util_1.fatalExec)(`rm -rf ${repoPath}`, `Could not remove directory: ${repoPath}`);
|
|
103
132
|
}
|
|
104
133
|
else {
|
|
105
134
|
throw new Error('Directory with the checkout name already exists.');
|
|
106
135
|
}
|
|
107
136
|
}
|
|
108
|
-
|
|
109
|
-
LOGGER.debug(`Successfully cloned to ${directory}`);
|
|
110
|
-
|
|
137
|
+
shelljs_1.default.exec(`gh repo clone ${ghUrl}`, (0, command_util_1.getShellConfig)());
|
|
138
|
+
logger_1.LOGGER.debug(`Successfully cloned to ${directory}`);
|
|
139
|
+
shelljs_1.default.cd(directory);
|
|
111
140
|
if (options.branch !== 'master' && options.branch !== 'main') {
|
|
112
|
-
|
|
141
|
+
shelljs_1.default.exec(`git checkout ${options.branch} `);
|
|
113
142
|
}
|
|
114
|
-
return
|
|
143
|
+
return shelljs_1.default.pwd();
|
|
115
144
|
}
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
145
|
+
exports.checkoutAndCd = checkoutAndCd;
|
|
146
|
+
function commitAndTag(version, repositoryPath) {
|
|
147
|
+
logger_1.LOGGER.info('Commit changes and create new tag');
|
|
148
|
+
shelljs_1.default.cd(repositoryPath);
|
|
149
|
+
logger_1.LOGGER.debug('Check wether the given url is a git repository');
|
|
150
|
+
if (!(0, git_util_1.isGitRepository)(shelljs_1.default.pwd())) {
|
|
121
151
|
throw new Error(`The given path is not a git repository: ${repositoryPath}`);
|
|
122
152
|
}
|
|
123
153
|
const tag = `v${version}`;
|
|
124
|
-
LOGGER.debug(`Create tag with label: ${tag}}`);
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
154
|
+
logger_1.LOGGER.debug(`Create tag with label: ${tag}}`);
|
|
155
|
+
shelljs_1.default.exec(`git checkout -b ${tag}`, (0, command_util_1.getShellConfig)());
|
|
156
|
+
shelljs_1.default.exec('git add .', (0, command_util_1.getShellConfig)());
|
|
157
|
+
shelljs_1.default.exec(`git commit -m "${tag}"`, (0, command_util_1.getShellConfig)());
|
|
158
|
+
shelljs_1.default.exec(`git tag ${tag}`, (0, command_util_1.getShellConfig)());
|
|
129
159
|
return tag;
|
|
130
160
|
}
|
|
131
|
-
|
|
161
|
+
exports.commitAndTag = commitAndTag;
|
|
162
|
+
function publish(repositoryPath, options) {
|
|
132
163
|
if (!options.publish || options.npmDryRun) {
|
|
133
|
-
LOGGER.info('Skip publishing to Github');
|
|
164
|
+
logger_1.LOGGER.info('Skip publishing to Github');
|
|
134
165
|
if (options.npmDryRun && options.component.releaseRepo === 'npm') {
|
|
135
|
-
fatalExec('lerna publish from-git --no-git-reset --no-git-tag-version --no-verify-access --no-push --dist-tag rc --yes', 'Dry-run publish failed', { silent: false });
|
|
166
|
+
(0, command_util_1.fatalExec)('lerna publish from-git --no-git-reset --no-git-tag-version --no-verify-access --no-push --dist-tag rc --yes', 'Dry-run publish failed', { silent: false });
|
|
136
167
|
}
|
|
137
168
|
return;
|
|
138
169
|
}
|
|
139
|
-
LOGGER.info(`Publish new GH release ${options.draft ? '[DRAFT]' : ''}`);
|
|
140
|
-
|
|
141
|
-
if (!options.force && hasGitChanges()) {
|
|
170
|
+
logger_1.LOGGER.info(`Publish new GH release ${options.draft ? '[DRAFT]' : ''}`);
|
|
171
|
+
shelljs_1.default.cd(repositoryPath);
|
|
172
|
+
if (!options.force && (0, git_util_1.hasGitChanges)()) {
|
|
142
173
|
throw new Error('Publish failed. The repository has pending changes');
|
|
143
174
|
}
|
|
144
|
-
const latestReleaseTag = getLatestGithubRelease();
|
|
145
|
-
const localTag = getLatestTag();
|
|
175
|
+
const latestReleaseTag = (0, git_util_1.getLatestGithubRelease)();
|
|
176
|
+
const localTag = (0, git_util_1.getLatestTag)();
|
|
146
177
|
validateTag(latestReleaseTag, localTag);
|
|
147
178
|
const preRelease = options.releaseType === 'rc' || localTag.includes('-');
|
|
148
179
|
doPublish(localTag, preRelease, latestReleaseTag, options.draft);
|
|
149
180
|
}
|
|
181
|
+
exports.publish = publish;
|
|
150
182
|
function doPublish(tag, preRelease, latestRelease, draft) {
|
|
151
|
-
fatalExec(`git push origin HEAD:${tag}`, 'Could not push release branch to Github', getShellConfig({ silent: false }));
|
|
152
|
-
fatalExec(`git push origin tag ${tag}`, 'Could not push tag to Github', getShellConfig({ silent: false }));
|
|
183
|
+
(0, command_util_1.fatalExec)(`git push origin HEAD:${tag}`, 'Could not push release branch to Github', (0, command_util_1.getShellConfig)({ silent: false }));
|
|
184
|
+
(0, command_util_1.fatalExec)(`git push origin tag ${tag}`, 'Could not push tag to Github', (0, command_util_1.getShellConfig)({ silent: false }));
|
|
153
185
|
const version = tagToVersion(tag);
|
|
154
186
|
const titleSuffix = preRelease ? ` Candidate ${version.substring(version.lastIndexOf('-RC') + 3)}` : '';
|
|
155
187
|
const title = `${version.replace(/-.*/, '')} Release${titleSuffix} `;
|
|
156
|
-
|
|
188
|
+
shelljs_1.default.exec(`gh release create ${tag} -t "${title}" --notes-start-tag ${latestRelease} --generate-notes ${draft ? '-d' : ''} ${preRelease ? '-p' : ''}`, (0, command_util_1.getShellConfig)());
|
|
157
189
|
}
|
|
158
190
|
function validateTag(currentReleaseTag, newTag) {
|
|
159
191
|
const releaseVersion = tagToVersion(currentReleaseTag);
|
|
@@ -167,85 +199,95 @@ function tagToVersion(tag) {
|
|
|
167
199
|
throw new Error(`Invalid format. The release tag should start with 'v': ${tag}`);
|
|
168
200
|
}
|
|
169
201
|
const version = tag.substring(1).replace('.RC', '-RC');
|
|
170
|
-
return validateVersion(version);
|
|
202
|
+
return (0, validation_util_1.validateVersion)(version);
|
|
171
203
|
}
|
|
172
|
-
|
|
173
|
-
LOGGER.info(`Bump version in ${repositoryPath} to: ${version}`);
|
|
174
|
-
|
|
175
|
-
fatalExec(`lerna version --exact ${version} --ignore-scripts --yes --no-push --no-git-tag-version`, 'Lerna version bump failed!', {
|
|
204
|
+
function lernaSetVersion(repositoryPath, version) {
|
|
205
|
+
logger_1.LOGGER.info(`Bump version in ${repositoryPath} to: ${version}`);
|
|
206
|
+
shelljs_1.default.cd(repositoryPath);
|
|
207
|
+
(0, command_util_1.fatalExec)(`lerna version --exact ${version} --ignore-scripts --yes --no-push --no-git-tag-version`, 'Lerna version bump failed!', {
|
|
176
208
|
silent: false
|
|
177
209
|
});
|
|
178
|
-
LOGGER.debug('Update root package.json version');
|
|
179
|
-
|
|
180
|
-
|
|
210
|
+
logger_1.LOGGER.debug('Update root package.json version');
|
|
211
|
+
shelljs_1.default.exec(`jq '.version="${version}"' package.json > temp.json`, (0, command_util_1.getShellConfig)());
|
|
212
|
+
shelljs_1.default.exec('mv temp.json package.json ', (0, command_util_1.getShellConfig)());
|
|
181
213
|
}
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
214
|
+
exports.lernaSetVersion = lernaSetVersion;
|
|
215
|
+
function yarnInstall(repositoryPath) {
|
|
216
|
+
logger_1.LOGGER.debug(`Build ${repositoryPath}`);
|
|
217
|
+
shelljs_1.default.cd(repositoryPath);
|
|
218
|
+
(0, command_util_1.fatalExec)('yarn', 'Yarn build failed', (0, command_util_1.getShellConfig)({ silent: false }));
|
|
186
219
|
}
|
|
187
|
-
|
|
188
|
-
|
|
220
|
+
exports.yarnInstall = yarnInstall;
|
|
221
|
+
function upgradeCommand(pckName, version) {
|
|
222
|
+
logger_1.LOGGER.debug(`Upgrade '${pckName}' to version ${version}`);
|
|
189
223
|
return `lernaupdate --non-interactive --dependency ${pckName}@${version}`;
|
|
190
224
|
}
|
|
191
|
-
|
|
225
|
+
exports.upgradeCommand = upgradeCommand;
|
|
226
|
+
function updateVersion(...packages) {
|
|
192
227
|
packages.forEach(pckg => {
|
|
193
|
-
const result =
|
|
228
|
+
const result = shelljs_1.default.exec(upgradeCommand(pckg.name, pckg.version), (0, command_util_1.getShellConfig)({ silent: false })).stdout.trim();
|
|
194
229
|
if (result.includes('An error occurred:')) {
|
|
195
230
|
const errorMsg = result.substring(result.lastIndexOf('An error occurred:')).trim();
|
|
196
231
|
throw new Error(errorMsg);
|
|
197
232
|
}
|
|
198
233
|
});
|
|
199
234
|
}
|
|
200
|
-
|
|
201
|
-
|
|
235
|
+
exports.updateVersion = updateVersion;
|
|
236
|
+
function asMvnVersion(version) {
|
|
237
|
+
logger_1.LOGGER.debug(`Convert to maven conform version: ${version}`);
|
|
202
238
|
const mavenVersion = version.replace('-', '.');
|
|
203
|
-
LOGGER.debug(`Maven version :${mavenVersion}`);
|
|
239
|
+
logger_1.LOGGER.debug(`Maven version :${mavenVersion}`);
|
|
204
240
|
return mavenVersion;
|
|
205
241
|
}
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
242
|
+
exports.asMvnVersion = asMvnVersion;
|
|
243
|
+
async function checkIfNpmVersionIsNew(pckgName, newVersion) {
|
|
244
|
+
logger_1.LOGGER.debug(`Check that the release version is new i.e. does not exist on npm: ${newVersion}`);
|
|
245
|
+
const response = await (0, node_fetch_1.default)(`https://registry.npmjs.org/${pckgName}/${newVersion}`);
|
|
209
246
|
const data = await response.json();
|
|
210
247
|
if (typeof data === 'string' && data.includes('version not found:')) {
|
|
211
|
-
LOGGER.debug(`Version '${newVersion}' does not exist on NPM. Continue with release`);
|
|
248
|
+
logger_1.LOGGER.debug(`Version '${newVersion}' does not exist on NPM. Continue with release`);
|
|
212
249
|
return;
|
|
213
250
|
}
|
|
214
251
|
throw new Error(`Version '${newVersion} is already present on NPM!}`);
|
|
215
252
|
}
|
|
216
|
-
|
|
217
|
-
|
|
253
|
+
exports.checkIfNpmVersionIsNew = checkIfNpmVersionIsNew;
|
|
254
|
+
function checkIfMavenVersionExists(groupId, artifactId, newVersion) {
|
|
255
|
+
logger_1.LOGGER.debug('Check if maven version exists');
|
|
218
256
|
if (isExistingMavenVersion(groupId, artifactId, newVersion)) {
|
|
219
257
|
throw new Error(`Version '${newVersion} is already present on maven central!}`);
|
|
220
258
|
}
|
|
221
|
-
LOGGER.debug(`Version '${newVersion}' does not exist on maven central. Continue with release`);
|
|
259
|
+
logger_1.LOGGER.debug(`Version '${newVersion}' does not exist on maven central. Continue with release`);
|
|
222
260
|
}
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
.exec(
|
|
261
|
+
exports.checkIfMavenVersionExists = checkIfMavenVersionExists;
|
|
262
|
+
function isExistingMavenVersion(groupId, artifactId, version) {
|
|
263
|
+
const versions = shelljs_1.default
|
|
264
|
+
.exec(`wget -q -O - https://repo1.maven.org/maven2/${groupId.replace(/\./g, '/')}/${artifactId}/maven-metadata.xml`, (0, command_util_1.getShellConfig)())
|
|
265
|
+
.exec("grep -P '<version>\\K[^<]*'", (0, command_util_1.getShellConfig)())
|
|
227
266
|
.stdout.replace(/<\/?version>/g, '')
|
|
228
267
|
.split('\n')
|
|
229
268
|
.map(versionString => versionString.trim());
|
|
230
|
-
LOGGER.debug(`${versions.length} released versions found:`, versions);
|
|
269
|
+
logger_1.LOGGER.debug(`${versions.length} released versions found:`, versions);
|
|
231
270
|
return versions.includes(version);
|
|
232
271
|
}
|
|
233
|
-
|
|
272
|
+
exports.isExistingMavenVersion = isExistingMavenVersion;
|
|
273
|
+
function checkJavaServerVersion(version, force = false) {
|
|
234
274
|
const mvnVersion = asMvnVersion(version);
|
|
235
275
|
if (!isExistingMavenVersion('org.eclipse.glsp', 'org.eclipse.glsp.server', mvnVersion)) {
|
|
236
276
|
// eslint-disable-next-line max-len
|
|
237
277
|
const errorMsg = `No Java GLSP server with version ${mvnVersion} found on maven central!. Please release a new Java GLSP Server version before publishing this release!`;
|
|
238
|
-
LOGGER.warn(errorMsg);
|
|
278
|
+
logger_1.LOGGER.warn(errorMsg);
|
|
239
279
|
if (force || readline.keyInYN('No Java GLSP server with corresponding version found. Do you want to continue anyways?')) {
|
|
240
280
|
return;
|
|
241
281
|
}
|
|
242
282
|
throw new Error(errorMsg);
|
|
243
283
|
}
|
|
244
284
|
}
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
285
|
+
exports.checkJavaServerVersion = checkJavaServerVersion;
|
|
286
|
+
function updateLernaForDryRun() {
|
|
287
|
+
logger_1.LOGGER.debug('Update lerna.json to use local publish registry');
|
|
288
|
+
shelljs_1.default.exec(`jq '.command.publish.registry="${exports.VERDACCIO_REGISTRY}"' lerna.json > temp.json`, (0, command_util_1.getShellConfig)());
|
|
289
|
+
shelljs_1.default.exec('mv temp.json lerna.json', (0, command_util_1.getShellConfig)());
|
|
290
|
+
shelljs_1.default.exec(`npm set registry ${exports.VERDACCIO_REGISTRY}`);
|
|
250
291
|
}
|
|
292
|
+
exports.updateLernaForDryRun = updateLernaForDryRun;
|
|
251
293
|
//# sourceMappingURL=common.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/commands/release/common.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/commands/release/common.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElF,uCAAyB;AACzB,4DAA+B;AAC/B,+BAA+B;AAC/B,wDAA0C;AAC1C,+CAAiC;AACjC,sDAAyB;AACzB,0DAAoE;AACpE,kDAA2G;AAC3G,8CAA2C;AAC3C,gEAA6D;AAEhD,QAAA,kBAAkB,GAAG,wBAAwB,CAAC;AAuB3D,IAAiB,SAAS,CA4DzB;AA5DD,WAAiB,SAAS;IACT,gBAAM,GAAc;QAC7B,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,0BAA0B;QACtC,WAAW,EAAE,KAAK;QAClB,SAAS,EAAE,aAAa;KAC3B,CAAC;IACW,2BAAiB,GAAc;QACxC,IAAI,EAAE,mBAAmB;QACzB,UAAU,EAAE,qCAAqC;QACjD,WAAW,EAAE,KAAK;QAClB,SAAS,EAAE,wBAAwB;KACtC,CAAC;IACW,4BAAkB,GAAc;QACzC,IAAI,EAAE,oBAAoB;QAC1B,UAAU,EAAE,sCAAsC;QAClD,WAAW,EAAE,KAAK;QAClB,SAAS,EAAE,yBAAyB;KACvC,CAAC;IACW,qBAAW,GAAc;QAClC,IAAI,EAAE,aAAa;QACnB,UAAU,EAAE,+BAA+B;QAC3C,WAAW,EAAE,KAAK;QAClB,SAAS,EAAE,YAAY;KAC1B,CAAC;IACW,qBAAW,GAAc;QAClC,IAAI,EAAE,aAAa;QACnB,UAAU,EAAE,0BAA0B;QACtC,WAAW,EAAE,OAAO;QACpB,SAAS,EAAE,aAAa;KAC3B,CAAC;IACW,6BAAmB,GAAc;QAC1C,IAAI,EAAE,qBAAqB;QAC3B,UAAU,EAAE,uCAAuC;QACnD,WAAW,EAAE,IAAI;QACjB,SAAS,EAAE,0BAA0B;KACxC,CAAC;IAEW,aAAG,GAAgB,CAAC,UAAA,MAAM,EAAE,UAAA,iBAAiB,EAAE,UAAA,kBAAkB,EAAE,UAAA,mBAAmB,EAAE,UAAA,WAAW,EAAE,UAAA,WAAW,CAAC,CAAC;IAClH,qBAAW,GAAG;QACvB,QAAQ;QACR,mBAAmB;QACnB,oBAAoB;QACpB,qBAAqB;QACrB,aAAa;QACb,aAAa;KACP,CAAC;IAEX,SAAgB,KAAK,CAAC,SAAiB;QACnC,MAAM,GAAG,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACtD,MAAM,SAAS,GAAe,SAAiB,CAAC,GAAG,CAAC,CAAC;QACrD,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,uCAAuC,SAAS,EAAE,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAPe,eAAK,QAOpB,CAAA;IAED,SAAgB,EAAE,CAAC,MAAW;QAC1B,OAAO,OAAO,MAAM,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC;IACzE,CAAC;IAFe,YAAE,KAEjB,CAAA;AACL,CAAC,EA5DgB,SAAS,yBAAT,SAAS,QA4DzB;AAED,IAAiB,WAAW,CAE3B;AAFD,WAAiB,WAAW;IACX,uBAAW,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAU,CAAC;AACpF,CAAC,EAFgB,WAAW,2BAAX,WAAW,QAE3B;AAID,SAAgB,aAAa,CAAC,OAAuB;IACjD,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC;IAC3C,eAAM,CAAC,IAAI,CAAC,qBAAqB,KAAK,mBAAmB,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAChF,iBAAE,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC3B,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9D,MAAM,QAAQ,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACzD,IAAI,EAAE,CAAC,UAAU,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC;QACzD,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAChB,eAAM,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;YACnE,eAAM,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;YACrE,IAAA,wBAAS,EAAC,UAAU,QAAQ,EAAE,EAAE,+BAA+B,QAAQ,EAAE,CAAC,CAAC;QAC/E,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACxE,CAAC;IACL,CAAC;IACD,iBAAE,CAAC,IAAI,CAAC,iBAAiB,KAAK,EAAE,EAAE,IAAA,6BAAc,GAAE,CAAC,CAAC;IACpD,eAAM,CAAC,KAAK,CAAC,0BAA0B,SAAS,EAAE,CAAC,CAAC;IACpD,iBAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;IACjB,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;QAC3D,iBAAE,CAAC,IAAI,CAAC,gBAAgB,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,iBAAE,CAAC,GAAG,EAAE,CAAC;AACpB,CAAC;AAtBD,sCAsBC;AAED,SAAgB,YAAY,CAAC,OAAe,EAAE,cAAsB;IAChE,eAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;IACjD,iBAAE,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC;IAEtB,eAAM,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;IAC/D,IAAI,CAAC,IAAA,0BAAe,EAAC,iBAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,2CAA2C,cAAc,EAAE,CAAC,CAAC;IACjF,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,OAAO,EAAE,CAAC;IAC1B,eAAM,CAAC,KAAK,CAAC,0BAA0B,GAAG,GAAG,CAAC,CAAC;IAC/C,iBAAE,CAAC,IAAI,CAAC,mBAAmB,GAAG,EAAE,EAAE,IAAA,6BAAc,GAAE,CAAC,CAAC;IACpD,iBAAE,CAAC,IAAI,CAAC,WAAW,EAAE,IAAA,6BAAc,GAAE,CAAC,CAAC;IACvC,iBAAE,CAAC,IAAI,CAAC,kBAAkB,GAAG,GAAG,EAAE,IAAA,6BAAc,GAAE,CAAC,CAAC;IACpD,iBAAE,CAAC,IAAI,CAAC,WAAW,GAAG,EAAE,EAAE,IAAA,6BAAc,GAAE,CAAC,CAAC;IAC5C,OAAO,GAAG,CAAC;AACf,CAAC;AAfD,oCAeC;AAED,SAAgB,OAAO,CAAC,cAAsB,EAAE,OAAuB;IACnE,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACxC,eAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QACzC,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,WAAW,KAAK,KAAK,EAAE,CAAC;YAC/D,IAAA,wBAAS,EACL,6GAA6G,EAC7G,wBAAwB,EACxB,EAAE,MAAM,EAAE,KAAK,EAAE,CACpB,CAAC;QACN,CAAC;QACD,OAAO;IACX,CAAC;IACD,eAAM,CAAC,IAAI,CAAC,0BAA0B,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACxE,iBAAE,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC;IACtB,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,IAAA,wBAAa,GAAE,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,gBAAgB,GAAG,IAAA,iCAAsB,GAAE,CAAC;IAClD,MAAM,QAAQ,GAAG,IAAA,uBAAY,GAAE,CAAC;IAChC,WAAW,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;IACxC,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,KAAK,IAAI,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC1E,SAAS,CAAC,QAAQ,EAAE,UAAU,EAAE,gBAAgB,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;AACrE,CAAC;AAvBD,0BAuBC;AAED,SAAS,SAAS,CAAC,GAAW,EAAE,UAAmB,EAAE,aAAqB,EAAE,KAAc;IACtF,IAAA,wBAAS,EAAC,wBAAwB,GAAG,EAAE,EAAE,yCAAyC,EAAE,IAAA,6BAAc,EAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACvH,IAAA,wBAAS,EAAC,uBAAuB,GAAG,EAAE,EAAE,8BAA8B,EAAE,IAAA,6BAAc,EAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAC3G,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IAClC,MAAM,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,cAAc,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACxG,MAAM,KAAK,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,WAAW,GAAG,CAAC;IACrE,iBAAE,CAAC,IAAI,CACH,qBAAqB,GAAG,QAAQ,KAAK,uBAAuB,aAAa,qBAAqB,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAC3G,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EACxB,EAAE,EACF,IAAA,6BAAc,GAAE,CACnB,CAAC;AACN,CAAC;AAED,SAAS,WAAW,CAAC,iBAAyB,EAAE,MAAc;IAC1D,MAAM,cAAc,GAAG,YAAY,CAAC,iBAAiB,CAAC,CAAC;IACvD,MAAM,UAAU,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACxC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,cAAc,EAAE,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QACnF,MAAM,IAAI,KAAK,CAAC,kDAAkD,MAAM,GAAG,CAAC,CAAC;IACjF,CAAC;AACL,CAAC;AAED,SAAS,YAAY,CAAC,GAAW;IAC7B,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,2DAA2D,GAAG,EAAE,CAAC,CAAC;IACtF,CAAC;IACD,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACvD,OAAO,IAAA,iCAAe,EAAC,OAAO,CAAC,CAAC;AACpC,CAAC;AAED,SAAgB,eAAe,CAAC,cAAsB,EAAE,OAAe;IACnE,eAAM,CAAC,IAAI,CAAC,mBAAmB,cAAc,QAAQ,OAAO,EAAE,CAAC,CAAC;IAChE,iBAAE,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC;IACtB,IAAA,wBAAS,EAAC,0BAA0B,OAAO,wDAAwD,EAAE,4BAA4B,EAAE;QAC/H,MAAM,EAAE,KAAK;KAChB,CAAC,CAAC;IACH,eAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACjD,iBAAE,CAAC,IAAI,CAAC,iBAAiB,OAAO,6BAA6B,EAAE,IAAA,6BAAc,GAAE,CAAC,CAAC;IACjF,iBAAE,CAAC,IAAI,CAAC,4BAA4B,EAAE,IAAA,6BAAc,GAAE,CAAC,CAAC;AAC5D,CAAC;AATD,0CASC;AAED,SAAgB,WAAW,CAAC,cAAsB;IAC9C,eAAM,CAAC,KAAK,CAAC,SAAS,cAAc,EAAE,CAAC,CAAC;IACxC,iBAAE,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC;IACtB,IAAA,wBAAS,EAAC,MAAM,EAAE,mBAAmB,EAAE,IAAA,6BAAc,EAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;AAC9E,CAAC;AAJD,kCAIC;AAED,SAAgB,cAAc,CAAC,OAAe,EAAE,OAAe;IAC3D,eAAM,CAAC,KAAK,CAAC,YAAY,OAAO,gBAAgB,OAAO,EAAE,CAAC,CAAC;IAC3D,OAAO,+CAA+C,OAAO,IAAI,OAAO,EAAE,CAAC;AAC/E,CAAC;AAHD,wCAGC;AAED,SAAgB,aAAa,CAAC,GAAG,QAA6C;IAC1E,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACpB,MAAM,MAAM,GAAG,iBAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,IAAA,6BAAc,EAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACjH,IAAI,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;YACxC,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACnF,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AARD,sCAQC;AAED,SAAgB,YAAY,CAAC,OAAe;IACxC,eAAM,CAAC,KAAK,CAAC,qCAAqC,OAAO,EAAE,CAAC,CAAC;IAC7D,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC/C,eAAM,CAAC,KAAK,CAAC,kBAAkB,YAAY,EAAE,CAAC,CAAC;IAC/C,OAAO,YAAY,CAAC;AACxB,CAAC;AALD,oCAKC;AAEM,KAAK,UAAU,sBAAsB,CAAC,QAAgB,EAAE,UAAkB;IAC7E,eAAM,CAAC,KAAK,CAAC,qEAAqE,UAAU,EAAE,CAAC,CAAC;IAEhG,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,8BAA8B,QAAQ,IAAI,UAAU,EAAE,CAAC,CAAC;IACrF,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACnC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;QAClE,eAAM,CAAC,KAAK,CAAC,YAAY,UAAU,gDAAgD,CAAC,CAAC;QACrF,OAAO;IACX,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,YAAY,UAAU,8BAA8B,CAAC,CAAC;AAC1E,CAAC;AAVD,wDAUC;AAED,SAAgB,yBAAyB,CAAC,OAAe,EAAE,UAAkB,EAAE,UAAkB;IAC7F,eAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAC9C,IAAI,sBAAsB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CAAC,YAAY,UAAU,wCAAwC,CAAC,CAAC;IACpF,CAAC;IACD,eAAM,CAAC,KAAK,CAAC,YAAY,UAAU,0DAA0D,CAAC,CAAC;AACnG,CAAC;AAND,8DAMC;AAED,SAAgB,sBAAsB,CAAC,OAAe,EAAE,UAAkB,EAAE,OAAe;IACvF,MAAM,QAAQ,GAAG,iBAAE;SACd,IAAI,CACD,+CAA+C,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,UAAU,qBAAqB,EAC7G,IAAA,6BAAc,GAAE,CACnB;SACA,IAAI,CAAC,6BAA6B,EAAE,IAAA,6BAAc,GAAE,CAAC;SACrD,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;SACnC,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;IAChD,eAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,MAAM,2BAA2B,EAAE,QAAQ,CAAC,CAAC;IACtE,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACtC,CAAC;AAZD,wDAYC;AAED,SAAgB,sBAAsB,CAAC,OAAe,EAAE,KAAK,GAAG,KAAK;IACjE,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,EAAE,yBAAyB,EAAE,UAAU,CAAC,EAAE,CAAC;QACrF,mCAAmC;QACnC,MAAM,QAAQ,GAAG,oCAAoC,UAAU,yGAAyG,CAAC;QACzK,eAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtB,IAAI,KAAK,IAAI,QAAQ,CAAC,OAAO,CAAC,wFAAwF,CAAC,EAAE,CAAC;YACtH,OAAO;QACX,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;AACL,CAAC;AAXD,wDAWC;AAED,SAAgB,oBAAoB;IAChC,eAAM,CAAC,KAAK,CAAC,iDAAiD,CAAC,CAAC;IAChE,iBAAE,CAAC,IAAI,CAAC,kCAAkC,0BAAkB,2BAA2B,EAAE,IAAA,6BAAc,GAAE,CAAC,CAAC;IAC3G,iBAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,IAAA,6BAAc,GAAE,CAAC,CAAC;IACrD,iBAAE,CAAC,IAAI,CAAC,oBAAoB,0BAAkB,EAAE,CAAC,CAAC;AACtD,CAAC;AALD,oDAKC"}
|