@git.zone/cli 9.2.2 → 11.0.0
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/.smartconfig.json +5 -3
- package/assets/templates/asset_binary_installer/install.sh +109 -34
- package/assets/templates/asset_binary_release_gitea/.gitea/workflows/release.yml +17 -4
- package/assets/templates/ci_rust/.gitea/workflows/rust_nottags.yaml +29 -0
- package/assets/templates/ci_rust/.gitea/workflows/rust_tags.yaml +32 -0
- package/assets/templates/cli/cli.ts.js +1 -1
- package/assets/templates/gitignore/_gitignore +1 -1
- package/assets/templates/gitignore_rust/_gitignore +31 -0
- package/assets/templates/license_mit/license +4 -1
- package/assets/templates/npm/.package.json +4 -6
- package/assets/templates/npm/test/test.ts +1 -1
- package/assets/templates/rust/.smartscaf.yml +16 -0
- package/assets/templates/rust/_Cargo.toml +12 -0
- package/assets/templates/rust/_crate_Cargo.toml +10 -0
- package/assets/templates/rust/_crate_lib.rs +19 -0
- package/assets/templates/rust/_smartconfig.json +27 -0
- package/assets/templates/rust/readme.md +23 -0
- package/assets/templates/service/.package.json +3 -6
- package/assets/templates/wcc/.package.json +3 -6
- package/assets/templates/wcc_update/html/index.html +2 -2
- package/assets/templates/website/.package.json +3 -6
- package/assets/templates/website/npmextra.json +3 -1
- package/assets/templates/website_update/html/index.html +4 -4
- package/dist_ts/00_commitinfo_data.js +2 -2
- package/dist_ts/classes.gitzoneconfig.d.ts +3 -1
- package/dist_ts/classes.gitzoneconfig.js +9 -1
- package/dist_ts/helpers.managedassets.d.ts +1 -1
- package/dist_ts/helpers.managedassets.js +58 -14
- package/dist_ts/helpers.packagefiles.js +2 -2
- package/dist_ts/helpers.releasetargets.d.ts +6 -0
- package/dist_ts/helpers.releasetargets.js +13 -0
- package/dist_ts/helpers.smartconfigmigrations.js +42 -1
- package/dist_ts/helpers.toolconfig.d.ts +50 -0
- package/dist_ts/helpers.toolconfig.js +212 -0
- package/dist_ts/helpers.tssea.d.ts +11 -4
- package/dist_ts/helpers.tssea.js +47 -17
- package/dist_ts/helpers.tstest.d.ts +27 -8
- package/dist_ts/helpers.tstest.js +64 -26
- package/dist_ts/helpers.versionsource.d.ts +37 -0
- package/dist_ts/helpers.versionsource.js +112 -0
- package/dist_ts/helpers.workflow.d.ts +45 -1
- package/dist_ts/helpers.workflow.js +120 -5
- package/dist_ts/mod_commit/mod.helpers.d.ts +0 -24
- package/dist_ts/mod_commit/mod.helpers.js +1 -94
- package/dist_ts/mod_commit/mod.plugins.d.ts +1 -1
- package/dist_ts/mod_commit/mod.plugins.js +2 -2
- package/dist_ts/mod_config/index.js +131 -18
- package/dist_ts/mod_format/formatters/assets.formatter.js +30 -28
- package/dist_ts/mod_format/formatters/gitignore.formatter.d.ts +4 -2
- package/dist_ts/mod_format/formatters/gitignore.formatter.js +10 -7
- package/dist_ts/mod_format/formatters/license.formatter.d.ts +8 -0
- package/dist_ts/mod_format/formatters/license.formatter.js +25 -2
- package/dist_ts/mod_format/formatters/packagejson.formatter.js +14 -3
- package/dist_ts/mod_format/formatters/rustfmt.formatter.d.ts +19 -0
- package/dist_ts/mod_format/formatters/rustfmt.formatter.js +97 -0
- package/dist_ts/mod_format/formatters/smartconfig.formatter.js +5 -2
- package/dist_ts/mod_format/formatters/templates.formatter.d.ts +3 -2
- package/dist_ts/mod_format/formatters/templates.formatter.js +61 -14
- package/dist_ts/mod_format/formatters/tsconfig.formatter.js +2 -2
- package/dist_ts/mod_format/index.js +3 -1
- package/dist_ts/mod_format/interfaces.format.js +2 -1
- package/dist_ts/mod_release/classes.releasejournal.d.ts +38 -2
- package/dist_ts/mod_release/classes.releasejournal.js +238 -66
- package/dist_ts/mod_release/helpers.cargorelease.d.ts +52 -0
- package/dist_ts/mod_release/helpers.cargorelease.js +195 -0
- package/dist_ts/mod_release/helpers.npmpackages.d.ts +18 -0
- package/dist_ts/mod_release/helpers.npmpackages.js +40 -2
- package/dist_ts/mod_release/helpers.releasecheck.d.ts +73 -0
- package/dist_ts/mod_release/helpers.releasecheck.js +269 -0
- package/dist_ts/mod_release/helpers.releasepreparation.d.ts +22 -8
- package/dist_ts/mod_release/helpers.releasepreparation.js +74 -26
- package/dist_ts/mod_release/helpers.releasepublication.d.ts +21 -1
- package/dist_ts/mod_release/helpers.releasepublication.js +249 -4
- package/dist_ts/mod_release/helpers.releaseversionsource.d.ts +10 -0
- package/dist_ts/mod_release/helpers.releaseversionsource.js +18 -0
- package/dist_ts/mod_release/helpers.rsrepoengine.d.ts +192 -0
- package/dist_ts/mod_release/helpers.rsrepoengine.js +457 -0
- package/dist_ts/mod_release/index.d.ts +3 -0
- package/dist_ts/mod_release/index.js +177 -65
- package/dist_ts/mod_template/index.js +6 -2
- package/dist_ts/mod_tools/index.js +3 -8
- package/dist_ts/plugins.d.ts +1 -1
- package/dist_ts/plugins.js +2 -2
- package/package.json +6 -11
- package/readme.md +244 -26
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.gitzoneconfig.ts +10 -1
- package/ts/helpers.managedassets.ts +64 -14
- package/ts/helpers.packagefiles.ts +1 -1
- package/ts/helpers.releasetargets.ts +13 -0
- package/ts/helpers.smartconfigmigrations.ts +48 -0
- package/ts/helpers.toolconfig.ts +280 -0
- package/ts/helpers.tssea.ts +62 -19
- package/ts/helpers.tstest.ts +105 -35
- package/ts/helpers.versionsource.ts +169 -0
- package/ts/helpers.workflow.ts +197 -5
- package/ts/mod_commit/mod.helpers.ts +0 -119
- package/ts/mod_commit/mod.plugins.ts +1 -1
- package/ts/mod_config/index.ts +169 -19
- package/ts/mod_format/formatters/assets.formatter.ts +29 -28
- package/ts/mod_format/formatters/gitignore.formatter.ts +10 -6
- package/ts/mod_format/formatters/license.formatter.ts +26 -1
- package/ts/mod_format/formatters/packagejson.formatter.ts +14 -2
- package/ts/mod_format/formatters/rustfmt.formatter.ts +107 -0
- package/ts/mod_format/formatters/smartconfig.formatter.ts +8 -1
- package/ts/mod_format/formatters/templates.formatter.ts +80 -14
- package/ts/mod_format/formatters/tsconfig.formatter.ts +1 -1
- package/ts/mod_format/index.ts +2 -0
- package/ts/mod_format/interfaces.format.ts +1 -0
- package/ts/mod_release/classes.releasejournal.ts +312 -39
- package/ts/mod_release/helpers.cargorelease.ts +289 -0
- package/ts/mod_release/helpers.npmpackages.ts +76 -1
- package/ts/mod_release/helpers.releasecheck.ts +409 -0
- package/ts/mod_release/helpers.releasepreparation.ts +116 -36
- package/ts/mod_release/helpers.releasepublication.ts +462 -1
- package/ts/mod_release/helpers.releaseversionsource.ts +29 -0
- package/ts/mod_release/helpers.rsrepoengine.ts +790 -0
- package/ts/mod_release/index.ts +277 -84
- package/ts/mod_template/index.ts +5 -1
- package/ts/mod_tools/index.ts +2 -7
- package/ts/plugins.ts +1 -1
|
@@ -5,6 +5,7 @@ import { ScafTemplate } from '../../mod_template/classes.scaftemplate.js';
|
|
|
5
5
|
import { logger, logVerbose } from '../../gitzone.logging.js';
|
|
6
6
|
import { getCliConfigValue, readSmartconfigFile } from '../../helpers.smartconfig.js';
|
|
7
7
|
import { getSealedReleaseConfigError } from '../../helpers.sealedrelease.js';
|
|
8
|
+
import { shellQuote } from '../../helpers.tstest.js';
|
|
8
9
|
import { assertManagedAssetsCurrent, managedAssetKinds, readBinaryBuild, readBinaryExtras, } from '../../helpers.managedassets.js';
|
|
9
10
|
const isPlainObject = (value) => {
|
|
10
11
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
@@ -35,12 +36,10 @@ const normalizeRepository = (assetsConfig, moduleConfig) => {
|
|
|
35
36
|
const repository = isPlainObject(assetsConfig.repository) ? assetsConfig.repository : {};
|
|
36
37
|
const host = repository.host || moduleConfig.githost || 'code.foss.global';
|
|
37
38
|
const path = repository.path || [moduleConfig.gitscope, moduleConfig.gitrepo].filter(Boolean).join('/');
|
|
38
|
-
const branch = repository.branch || 'main';
|
|
39
39
|
const baseUrl = `https://${host}/${path}`;
|
|
40
40
|
return {
|
|
41
41
|
host,
|
|
42
42
|
path,
|
|
43
|
-
branch,
|
|
44
43
|
baseUrl,
|
|
45
44
|
apiBaseUrl: `https://${host}/api/v1/repos/${path}`,
|
|
46
45
|
gitUrl: `${baseUrl}.git`,
|
|
@@ -177,16 +176,6 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
177
176
|
},
|
|
178
177
|
];
|
|
179
178
|
}
|
|
180
|
-
const installer = isPlainObject(assetsConfig.installer) ? assetsConfig.installer : {};
|
|
181
|
-
if (installer.distribution && !['rawBranch', 'releaseAsset'].includes(installer.distribution)) {
|
|
182
|
-
return [
|
|
183
|
-
{
|
|
184
|
-
level: 'error',
|
|
185
|
-
module: this.name,
|
|
186
|
-
message: `Unsupported installer distribution: ${installer.distribution}`,
|
|
187
|
-
},
|
|
188
|
-
];
|
|
189
|
-
}
|
|
190
179
|
return [];
|
|
191
180
|
}
|
|
192
181
|
async applyChange(change) {
|
|
@@ -246,6 +235,9 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
246
235
|
? await readBinaryBuild(paths.cwd, await readSmartconfigFile(paths.cwd))
|
|
247
236
|
: { outDir: '', targets: [] };
|
|
248
237
|
const binaryTargets = binaryBuild.targets;
|
|
238
|
+
// install.sh installs on Linux and macOS only; Windows users take the release's .exe asset.
|
|
239
|
+
const installerTargets = binaryTargets.filter((target) => target.os !== 'windows');
|
|
240
|
+
const windowsTargets = binaryTargets.filter((target) => target.os === 'windows');
|
|
249
241
|
const binaryConfig = isPlainObject(assetsConfig.binary) ? assetsConfig.binary : {};
|
|
250
242
|
const installFileName = binaryConfig.installFileName || cliName;
|
|
251
243
|
const installerAssetName = plugins.path.basename((isPlainObject(assetsConfig.installer) && assetsConfig.installer.file) || 'install.sh');
|
|
@@ -279,6 +271,10 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
279
271
|
targets: binaryTargets,
|
|
280
272
|
supportedPlatformText: binaryTargets.map((target) => target.label).join(', '),
|
|
281
273
|
hasTargets: binaryTargets.length > 0,
|
|
274
|
+
installerTargets,
|
|
275
|
+
installerPlatformText: installerTargets.map((target) => target.label).join(', '),
|
|
276
|
+
windowsTargets,
|
|
277
|
+
hasWindowsTargets: windowsTargets.length > 0,
|
|
282
278
|
},
|
|
283
279
|
installer: installerConfig,
|
|
284
280
|
npmWrapper: npmWrapperConfig,
|
|
@@ -292,27 +288,27 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
292
288
|
const service = isPlainObject(installer.service) ? installer.service : {};
|
|
293
289
|
const file = installer.file || 'install.sh';
|
|
294
290
|
const releaseAssetName = plugins.path.basename(file);
|
|
295
|
-
// Release assets are readable without an account on every Gitea; `rawBranch` is an explicit opt-in for hosts
|
|
296
|
-
// that serve raw files anonymously (code.foss.global serves raw/src to signed-in users only).
|
|
297
|
-
const distribution = installer.distribution || 'releaseAsset';
|
|
298
291
|
const versionSelection = uniqueStringArray(installer.versionSelection, ['latest', 'version']);
|
|
299
292
|
const detectNames = uniqueStringArray(service.detectNames, service.name ? [service.name] : [cliName]);
|
|
300
293
|
const removeLegacyUnits = uniqueStringArray(service.removeLegacyUnits || []);
|
|
301
294
|
const ensureDirs = uniqueStringArray(installer.ensureDirs);
|
|
302
295
|
const preservePaths = uniqueStringArray(installer.preservePaths);
|
|
303
296
|
const successHints = uniqueStringArray(installer.successHints, [`${cliName} --version`, `${cliName} --help`]);
|
|
304
|
-
const
|
|
305
|
-
|
|
297
|
+
const refreshCommand = typeof service.refreshCommand === 'string' ? service.refreshCommand.trim() : '';
|
|
298
|
+
const sourceCommands = uniqueStringArray(source.commands);
|
|
299
|
+
const sourceValidateCommand = source.validate || `node ${source.executable || 'cli.js'} --version`;
|
|
300
|
+
// The installer is a release asset, which every Gitea serves without an account; raw/ and src/ URLs are not
|
|
301
|
+
// (code.foss.global serves them to signed-in users only), so no generated URL points there. Gitea (like
|
|
302
|
+
// GitHub) resolves the `latest` download path to the newest published release.
|
|
306
303
|
const releaseAssetInstallUrl = `${repository.baseUrl}/releases/download/latest/${releaseAssetName}`;
|
|
307
304
|
const releaseNotesInstallUrl = `${repository.baseUrl}/releases/download/$VERSION/${releaseAssetName}`;
|
|
308
305
|
return {
|
|
309
306
|
...installer,
|
|
310
307
|
enabled: installer.enabled !== false,
|
|
311
308
|
file,
|
|
312
|
-
distribution,
|
|
313
309
|
releaseAssetName,
|
|
314
|
-
publicInstallUrl:
|
|
315
|
-
releaseNotesInstallUrl
|
|
310
|
+
publicInstallUrl: releaseAssetInstallUrl,
|
|
311
|
+
releaseNotesInstallUrl,
|
|
316
312
|
installDir: installer.installDir || `/opt/${cliName}`,
|
|
317
313
|
binDir: installer.binDir || '/usr/local/bin',
|
|
318
314
|
defaultMode: modes.default || 'binary',
|
|
@@ -321,10 +317,12 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
321
317
|
source: {
|
|
322
318
|
...source,
|
|
323
319
|
enabled: source.enabled === true,
|
|
324
|
-
commands:
|
|
320
|
+
commands: sourceCommands,
|
|
321
|
+
commandShellWords: sourceCommands.map((command) => shellQuote(command)),
|
|
325
322
|
executable: source.executable || 'cli.js',
|
|
326
323
|
executableFiles: uniqueStringArray(source.executableFiles, source.executable ? [source.executable] : ['cli.js']),
|
|
327
|
-
validateCommand:
|
|
324
|
+
validateCommand: sourceValidateCommand,
|
|
325
|
+
validateCommandShellWord: shellQuote(sourceValidateCommand),
|
|
328
326
|
},
|
|
329
327
|
service: {
|
|
330
328
|
...service,
|
|
@@ -332,13 +330,18 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
332
330
|
removeLegacyUnits,
|
|
333
331
|
hasLegacyUnitRemoval: removeLegacyUnits.length > 0,
|
|
334
332
|
restartName: service.restartName || detectNames[0] || cliName,
|
|
335
|
-
hasRefreshCommand:
|
|
333
|
+
hasRefreshCommand: refreshCommand.length > 0,
|
|
334
|
+
// Configured commands and hints reach install.sh only as single-quoted shell words, so quotes, `$`,
|
|
335
|
+
// `#` and newlines in them can neither break the script nor change the code around them.
|
|
336
|
+
refreshCommandShellWord: shellQuote(refreshCommand),
|
|
337
|
+
startHintShellWord: shellQuote(typeof service.startHint === 'string' ? service.startHint : ''),
|
|
336
338
|
},
|
|
337
339
|
ensureDirs,
|
|
338
340
|
preservePaths,
|
|
339
341
|
primaryPreservePath: preservePaths[0],
|
|
340
342
|
hasPreservePaths: preservePaths.length > 0,
|
|
341
343
|
successHints,
|
|
344
|
+
successHintShellWords: successHints.map((hint) => shellQuote(hint)),
|
|
342
345
|
extraFiles: extrasArg.installed,
|
|
343
346
|
};
|
|
344
347
|
}
|
|
@@ -354,9 +357,8 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
354
357
|
}
|
|
355
358
|
normalizeReleaseWorkflowConfig(assetsConfig, binaryBuild, installerConfig, extrasArg) {
|
|
356
359
|
const releaseWorkflow = isPlainObject(assetsConfig.releaseWorkflow) ? assetsConfig.releaseWorkflow : {};
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
: installerConfig.enabled !== false && installerConfig.distribution === 'releaseAsset';
|
|
360
|
+
// The release uploads the installer exactly when it is enabled: its usage text names that release asset.
|
|
361
|
+
const includeInstallerAsset = installerConfig.enabled !== false;
|
|
360
362
|
// Exactly the files this release built: the output directory can still hold
|
|
361
363
|
// executables of removed targets or an interrupted build's work directory.
|
|
362
364
|
const releaseFileNames = binaryBuild.targets.flatMap((target) => [target.name, ...target.noticeFiles]);
|
|
@@ -369,7 +371,7 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
369
371
|
enabled: releaseWorkflow.enabled !== false,
|
|
370
372
|
file: releaseWorkflow.file || '.gitea/workflows/release.yml',
|
|
371
373
|
installCommand: releaseWorkflow.installCommand || 'pnpm install --frozen-lockfile --ignore-scripts',
|
|
372
|
-
compileCommand: releaseWorkflow.compileCommand || 'pnpm exec
|
|
374
|
+
compileCommand: releaseWorkflow.compileCommand || 'pnpm exec tsrepo bundle && pnpm exec tsrepo sea build',
|
|
373
375
|
packNpmArtifact: releaseWorkflow.packNpmArtifact === true,
|
|
374
376
|
includeInstallerAsset,
|
|
375
377
|
releaseFileNames,
|
|
@@ -380,4 +382,4 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
380
382
|
};
|
|
381
383
|
}
|
|
382
384
|
}
|
|
383
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"assets.formatter.js","sourceRoot":"","sources":["../../../../ts/mod_format/formatters/assets.formatter.ts"],"names":[],"mappings":"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"}
|
|
385
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"assets.formatter.js","sourceRoot":"","sources":["../../../../ts/mod_format/formatters/assets.formatter.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,10 @@ import type { IPlannedChange } from '../interfaces.format.js';
|
|
|
3
3
|
export declare class GitignoreFormatter extends BaseFormatter {
|
|
4
4
|
get name(): string;
|
|
5
5
|
/**
|
|
6
|
-
* Read the standard gitignore template from the asset file,
|
|
7
|
-
*
|
|
6
|
+
* Read the standard gitignore template from the asset file, stripping the
|
|
7
|
+
* YAML frontmatter. A projectType "rust" repository uses the `gitignore_rust`
|
|
8
|
+
* template, which also ignores Cargo's root `/target/`; the `rust` scaffold
|
|
9
|
+
* merges the same template.
|
|
8
10
|
*/
|
|
9
11
|
private getStandardTemplate;
|
|
10
12
|
analyze(): Promise<IPlannedChange[]>;
|
|
@@ -7,21 +7,24 @@ export class GitignoreFormatter extends BaseFormatter {
|
|
|
7
7
|
return 'gitignore';
|
|
8
8
|
}
|
|
9
9
|
/**
|
|
10
|
-
* Read the standard gitignore template from the asset file,
|
|
11
|
-
*
|
|
10
|
+
* Read the standard gitignore template from the asset file, stripping the
|
|
11
|
+
* YAML frontmatter. A projectType "rust" repository uses the `gitignore_rust`
|
|
12
|
+
* template, which also ignores Cargo's root `/target/`; the `rust` scaffold
|
|
13
|
+
* merges the same template.
|
|
12
14
|
*/
|
|
13
15
|
async getStandardTemplate() {
|
|
14
|
-
const
|
|
16
|
+
const templateName = this.project.gitzoneConfig?.data?.projectType === 'rust' ? 'gitignore_rust' : 'gitignore';
|
|
17
|
+
const templatePath = plugins.path.join(paths.templatesDir, templateName, '_gitignore');
|
|
15
18
|
const raw = (await plugins.smartfs
|
|
16
19
|
.file(templatePath)
|
|
17
20
|
.encoding('utf8')
|
|
18
21
|
.read());
|
|
19
|
-
// Strip YAML frontmatter (---\n...\n---)
|
|
22
|
+
// Strip YAML frontmatter (---\n...\n---); the callers add the final newline.
|
|
20
23
|
const frontmatterEnd = raw.indexOf('---', 3);
|
|
21
24
|
if (frontmatterEnd !== -1) {
|
|
22
|
-
return raw.slice(frontmatterEnd + 3).
|
|
25
|
+
return raw.slice(frontmatterEnd + 3).trim();
|
|
23
26
|
}
|
|
24
|
-
return raw;
|
|
27
|
+
return raw.trimEnd();
|
|
25
28
|
}
|
|
26
29
|
async analyze() {
|
|
27
30
|
const changes = [];
|
|
@@ -94,4 +97,4 @@ export class GitignoreFormatter extends BaseFormatter {
|
|
|
94
97
|
}
|
|
95
98
|
}
|
|
96
99
|
}
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
100
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2l0aWdub3JlLmZvcm1hdHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3RzL21vZF9mb3JtYXQvZm9ybWF0dGVycy9naXRpZ25vcmUuZm9ybWF0dGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUU1RCxPQUFPLEtBQUssT0FBTyxNQUFNLG1CQUFtQixDQUFDO0FBQzdDLE9BQU8sS0FBSyxLQUFLLE1BQU0sZ0JBQWdCLENBQUM7QUFDeEMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRWxELE1BQU0sT0FBTyxrQkFBbUIsU0FBUSxhQUFhO0lBQ25ELElBQUksSUFBSTtRQUNOLE9BQU8sV0FBVyxDQUFDO0lBQ3JCLENBQUM7SUFFRDs7Ozs7T0FLRztJQUNLLEtBQUssQ0FBQyxtQkFBbUI7UUFDL0IsTUFBTSxZQUFZLEdBQ2hCLElBQUksQ0FBQyxPQUFPLENBQUMsYUFBYSxFQUFFLElBQUksRUFBRSxXQUFXLEtBQUssTUFBTSxDQUFDLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDO1FBQzVGLE1BQU0sWUFBWSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLEVBQUUsWUFBWSxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBQ3ZGLE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxPQUFPLENBQUMsT0FBTzthQUMvQixJQUFJLENBQUMsWUFBWSxDQUFDO2FBQ2xCLFFBQVEsQ0FBQyxNQUFNLENBQUM7YUFDaEIsSUFBSSxFQUFFLENBQVcsQ0FBQztRQUVyQiw2RUFBNkU7UUFDN0UsTUFBTSxjQUFjLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDN0MsSUFBSSxjQUFjLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQztZ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
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { BaseFormatter } from '../classes.baseformatter.js';
|
|
2
2
|
import type { IFormatWarning, IPlannedChange } from '../interfaces.format.js';
|
|
3
|
+
/** A root license text: `license`, `license.md`, `LICENSE-MIT`, `COPYING`, any case. */
|
|
4
|
+
export declare const isLicenseFileName: (nameArg: string) => boolean;
|
|
3
5
|
export declare class LicenseFormatter extends BaseFormatter {
|
|
4
6
|
get name(): string;
|
|
5
7
|
get runsWithoutChanges(): boolean;
|
|
@@ -7,5 +9,11 @@ export declare class LicenseFormatter extends BaseFormatter {
|
|
|
7
9
|
validate(): Promise<IFormatWarning[]>;
|
|
8
10
|
execute(changes: IPlannedChange[]): Promise<void>;
|
|
9
11
|
applyChange(change: IPlannedChange): Promise<void>;
|
|
12
|
+
/**
|
|
13
|
+
* A Rust repository ships its crates' license text, so it must carry one at
|
|
14
|
+
* its root. Which license applies is the project's choice; format only
|
|
15
|
+
* checks that the text is there.
|
|
16
|
+
*/
|
|
17
|
+
private validateLicenseFile;
|
|
10
18
|
private checkLicenses;
|
|
11
19
|
}
|
|
@@ -4,6 +4,8 @@ import { findDependenciesWithLicenses, } from '../helpers.licensecheck.js';
|
|
|
4
4
|
import * as paths from '../../paths.js';
|
|
5
5
|
import { logger } from '../../gitzone.logging.js';
|
|
6
6
|
const INCOMPATIBLE_LICENSES = ['AGPL', 'GPL', 'SSPL'];
|
|
7
|
+
/** A root license text: `license`, `license.md`, `LICENSE-MIT`, `COPYING`, any case. */
|
|
8
|
+
export const isLicenseFileName = (nameArg) => /^(licen[cs]e|copying)([.-][^/]*)?$/i.test(nameArg);
|
|
7
9
|
export class LicenseFormatter extends BaseFormatter {
|
|
8
10
|
get name() {
|
|
9
11
|
return 'license';
|
|
@@ -18,11 +20,13 @@ export class LicenseFormatter extends BaseFormatter {
|
|
|
18
20
|
return [];
|
|
19
21
|
}
|
|
20
22
|
async validate() {
|
|
23
|
+
const warnings = await this.validateLicenseFile();
|
|
21
24
|
const result = await this.checkLicenses();
|
|
22
25
|
if (!result || result.failingModules.length === 0) {
|
|
23
|
-
return
|
|
26
|
+
return warnings;
|
|
24
27
|
}
|
|
25
28
|
return [
|
|
29
|
+
...warnings,
|
|
26
30
|
{
|
|
27
31
|
level: 'error',
|
|
28
32
|
module: this.name,
|
|
@@ -58,6 +62,25 @@ export class LicenseFormatter extends BaseFormatter {
|
|
|
58
62
|
async applyChange(change) {
|
|
59
63
|
// No file changes for license formatter
|
|
60
64
|
}
|
|
65
|
+
/**
|
|
66
|
+
* A Rust repository ships its crates' license text, so it must carry one at
|
|
67
|
+
* its root. Which license applies is the project's choice; format only
|
|
68
|
+
* checks that the text is there.
|
|
69
|
+
*/
|
|
70
|
+
async validateLicenseFile() {
|
|
71
|
+
if (this.project.gitzoneConfig?.data?.projectType !== 'rust')
|
|
72
|
+
return [];
|
|
73
|
+
const entries = await plugins.fs.readdir(process.cwd(), { withFileTypes: true });
|
|
74
|
+
if (entries.some((entry) => entry.isFile() && isLicenseFileName(entry.name)))
|
|
75
|
+
return [];
|
|
76
|
+
return [
|
|
77
|
+
{
|
|
78
|
+
level: 'error',
|
|
79
|
+
module: this.name,
|
|
80
|
+
message: 'No license file at the repository root: a Rust repository ships its license text with its crates. Add license.md (or LICENSE, LICENSE-MIT, ...).',
|
|
81
|
+
},
|
|
82
|
+
];
|
|
83
|
+
}
|
|
61
84
|
async checkLicenses() {
|
|
62
85
|
const nodeModulesPath = plugins.path.join(paths.cwd, 'node_modules');
|
|
63
86
|
const nodeModulesExists = await plugins.smartfs
|
|
@@ -71,4 +94,4 @@ export class LicenseFormatter extends BaseFormatter {
|
|
|
71
94
|
};
|
|
72
95
|
}
|
|
73
96
|
}
|
|
74
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGljZW5zZS5mb3JtYXR0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi90cy9tb2RfZm9ybWF0L2Zvcm1hdHRlcnMvbGljZW5zZS5mb3JtYXR0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRTVELE9BQU8sS0FBSyxPQUFPLE1BQU0sbUJBQW1CLENBQUM7QUFDN0MsT0FBTyxFQUNMLDRCQUE0QixHQUU3QixNQUFNLDRCQUE0QixDQUFDO0FBQ3BDLE9BQU8sS0FBSyxLQUFLLE1BQU0sZ0JBQWdCLENBQUM7QUFDeEMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRWxELE1BQU0scUJBQXFCLEdBQWEsQ0FBQyxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sQ0FBQyxDQUFDO0FBRWhFLHdGQUF3RjtBQUN4RixNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FBRyxDQUFDLE9BQWUsRUFBVyxFQUFFLENBQzVELHFDQUFxQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUV0RCxNQUFNLE9BQU8sZ0JBQWlCLFNBQVEsYUFBYTtJQUNqRCxJQUFJLElBQUk7UUFDTixPQUFPLFNBQVMsQ0FBQztJQUNuQixDQUFDO0lBRUQsSUFBSSxrQkFBa0I7UUFDcEIsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsS0FBSyxDQUFDLE9BQU87UUFDWCwwREFBMEQ7UUFDMUQsc0RBQXNEO1FBQ3RELCtEQUErRDtRQUMvRCxPQUFPLEVBQUUsQ0FBQztJQUNaLENBQUM7SUFFRCxLQUFLLENBQUMsUUFBUTtRQUNaLE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixFQUFFLENBQUM7UUFDbEQsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7UUFDMUMsSUFBSSxDQUFDLE1BQU0sSUFBSSxN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
|
|
@@ -3,6 +3,8 @@ import * as plugins from '../mod.plugins.js';
|
|
|
3
3
|
import * as paths from '../../paths.js';
|
|
4
4
|
import { logger, logVerbose } from '../../gitzone.logging.js';
|
|
5
5
|
import { resolvePackageFiles } from '../../helpers.packagefiles.js';
|
|
6
|
+
import { getCliConfigValue } from '../../helpers.smartconfig.js';
|
|
7
|
+
import { isNpmReleaseTargetEnabled } from '../../helpers.releasetargets.js';
|
|
6
8
|
export class PackageJsonFormatter extends BaseFormatter {
|
|
7
9
|
get name() {
|
|
8
10
|
return 'packagejson';
|
|
@@ -10,6 +12,12 @@ export class PackageJsonFormatter extends BaseFormatter {
|
|
|
10
12
|
async analyze() {
|
|
11
13
|
const changes = [];
|
|
12
14
|
const packageJsonPath = 'package.json';
|
|
15
|
+
// A Rust repository needs no package.json; one that installs tools
|
|
16
|
+
// through it keeps it as its own.
|
|
17
|
+
if (this.project.gitzoneConfig?.data?.projectType === 'rust') {
|
|
18
|
+
logVerbose('projectType rust: package.json is not formatted');
|
|
19
|
+
return changes;
|
|
20
|
+
}
|
|
13
21
|
// Check if file exists
|
|
14
22
|
const exists = await plugins.smartfs.file(packageJsonPath).exists();
|
|
15
23
|
if (!exists) {
|
|
@@ -41,8 +49,11 @@ export class PackageJsonFormatter extends BaseFormatter {
|
|
|
41
49
|
if (!packageJson.type) {
|
|
42
50
|
packageJson.type = 'module';
|
|
43
51
|
}
|
|
44
|
-
//
|
|
45
|
-
|
|
52
|
+
// A project without an npm release target is private by default. With one, `private` decides whether the
|
|
53
|
+
// release publishes the root package, so it stays the project's own choice: setting it would make a
|
|
54
|
+
// project that publishes its root package unpublishable.
|
|
55
|
+
const npmReleaseTarget = await getCliConfigValue('release.targets.npm', undefined, paths.cwd);
|
|
56
|
+
if (packageJson.private === undefined && !isNpmReleaseTargetEnabled(npmReleaseTarget)) {
|
|
46
57
|
packageJson.private = true;
|
|
47
58
|
}
|
|
48
59
|
// Ensure license field exists
|
|
@@ -127,4 +138,4 @@ export class PackageJsonFormatter extends BaseFormatter {
|
|
|
127
138
|
logger.log('info', 'Updated package.json');
|
|
128
139
|
}
|
|
129
140
|
}
|
|
130
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
141
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFja2FnZWpzb24uZm9ybWF0dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHMvbW9kX2Zvcm1hdC9mb3JtYXR0ZXJzL3BhY2thZ2Vqc29uLmZvcm1hdHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFNUQsT0FBTyxLQUFLLE9BQU8sTUFBTSxtQkFBbUIsQ0FBQztBQUM3QyxPQUFPLEtBQUssS0FBSyxNQUFNLGdCQUFnQixDQUFDO0FBQ3hDLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDcEUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDakUsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFNUUsTUFBTSxPQUFPLG9CQUFxQixTQUFRLGFBQWE7SUFDckQsSUFBSSxJQUFJO1FBQ04sT0FBTyxhQUFhLENBQUM7SUFDdkIsQ0FBQztJQUVELEtBQUssQ0FBQyxPQUFPO1FBQ1gsTUFBTSxPQUFPLEdBQXFCLEVBQUUsQ0FBQztRQUNyQyxNQUFNLGVBQWUsR0FBRyxjQUFjLENBQUM7UUFFdkMsbUVBQW1FO1FBQ25FLGtDQUFrQztRQUNsQyxJQUFJLElBQUksQ0FBQyxPQUFPLENBQUMsYUFBYSxFQUFFLElBQUksRUFBRSxXQUFXLEtBQUssTUFBTSxFQUFFLENBQUM7WUFDN0QsVUFBVSxDQUFDLGlEQUFpRCxDQUFDLENBQUM7WUFDOUQsT0FBTyxPQUFPLENBQUM7UUFDakIsQ0FBQztRQUVELHVCQUF1QjtRQUN2QixNQUFNLE1BQU0sR0FBRyxNQUFNLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQ3BF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
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { BaseFormatter } from '../classes.baseformatter.js';
|
|
2
|
+
import type { IPlannedChange } from '../interfaces.format.js';
|
|
3
|
+
/** Every `Diff in <file>:<line>:` heading of `cargo fmt --check`, as absolute file paths. */
|
|
4
|
+
export declare const parseRustfmtDiffFiles: (outputArg: string) => string[];
|
|
5
|
+
/**
|
|
6
|
+
* Rust sources of a projectType "rust" workspace, formatted by rustfmt
|
|
7
|
+
* through the project's rsrepo (`rsrepo fmt --check` to plan, `rsrepo fmt`
|
|
8
|
+
* to write). The plan names each file rustfmt would change; rustfmt owns the
|
|
9
|
+
* content, so the write formats the workspace in one run.
|
|
10
|
+
*/
|
|
11
|
+
export declare class RustfmtFormatter extends BaseFormatter {
|
|
12
|
+
get name(): string;
|
|
13
|
+
private get isRustProject();
|
|
14
|
+
private runRsrepoFmt;
|
|
15
|
+
analyze(): Promise<IPlannedChange[]>;
|
|
16
|
+
/** rustfmt formats the whole workspace in one run. */
|
|
17
|
+
execute(changes: IPlannedChange[]): Promise<void>;
|
|
18
|
+
applyChange(_change: IPlannedChange): Promise<void>;
|
|
19
|
+
}
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
import { BaseFormatter } from '../classes.baseformatter.js';
|
|
2
|
+
import * as plugins from '../mod.plugins.js';
|
|
3
|
+
import { logger } from '../../gitzone.logging.js';
|
|
4
|
+
import { resolveRsrepoEngineBinary } from '../../mod_release/helpers.rsrepoengine.js';
|
|
5
|
+
import { formatCommandFailure } from '../../mod_release/helpers.commandfailure.js';
|
|
6
|
+
const rsrepoFmtTimeoutMs = 10 * 60_000;
|
|
7
|
+
/** Every `Diff in <file>:<line>:` heading of `cargo fmt --check`, as absolute file paths. */
|
|
8
|
+
export const parseRustfmtDiffFiles = (outputArg) => {
|
|
9
|
+
// rustfmt colours its diff even when it writes into a pipe.
|
|
10
|
+
const plain = outputArg.replace(/\u001b\[[0-9;]*[A-Za-z]|\u001b\(B/g, '');
|
|
11
|
+
const files = [];
|
|
12
|
+
for (const match of plain.matchAll(/^Diff in (.+?):\d+:\s*$/gm)) {
|
|
13
|
+
if (!files.includes(match[1]))
|
|
14
|
+
files.push(match[1]);
|
|
15
|
+
}
|
|
16
|
+
return files;
|
|
17
|
+
};
|
|
18
|
+
/**
|
|
19
|
+
* Rust sources of a projectType "rust" workspace, formatted by rustfmt
|
|
20
|
+
* through the project's rsrepo (`rsrepo fmt --check` to plan, `rsrepo fmt`
|
|
21
|
+
* to write). The plan names each file rustfmt would change; rustfmt owns the
|
|
22
|
+
* content, so the write formats the workspace in one run.
|
|
23
|
+
*/
|
|
24
|
+
export class RustfmtFormatter extends BaseFormatter {
|
|
25
|
+
get name() {
|
|
26
|
+
return 'rustfmt';
|
|
27
|
+
}
|
|
28
|
+
get isRustProject() {
|
|
29
|
+
return this.project.gitzoneConfig?.data?.projectType === 'rust';
|
|
30
|
+
}
|
|
31
|
+
async runRsrepoFmt(checkArg) {
|
|
32
|
+
let binary;
|
|
33
|
+
try {
|
|
34
|
+
binary = await resolveRsrepoEngineBinary(process.cwd());
|
|
35
|
+
}
|
|
36
|
+
catch (error) {
|
|
37
|
+
throw new Error(`Rust formatting runs through rsrepo: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
|
|
38
|
+
}
|
|
39
|
+
const smartshellInstance = new plugins.smartshell.Smartshell({ executor: 'bash', sourceFilePaths: [] });
|
|
40
|
+
return smartshellInstance.execSpawn(binary, checkArg ? ['fmt', '--check'] : ['fmt'], {
|
|
41
|
+
cwd: process.cwd(),
|
|
42
|
+
silent: true,
|
|
43
|
+
timeout: rsrepoFmtTimeoutMs,
|
|
44
|
+
timeoutKillGraceMs: 5_000,
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
async analyze() {
|
|
48
|
+
if (!this.isRustProject)
|
|
49
|
+
return [];
|
|
50
|
+
const result = await this.runRsrepoFmt(true);
|
|
51
|
+
if (result.exitCode === 0 && !result.timedOut)
|
|
52
|
+
return [];
|
|
53
|
+
const files = parseRustfmtDiffFiles(result.combinedOutput);
|
|
54
|
+
// A failure without a diff is not a formatting difference: a missing
|
|
55
|
+
// rustfmt, a parse error or a broken workspace.
|
|
56
|
+
if (files.length === 0 || result.timedOut) {
|
|
57
|
+
throw new Error(formatCommandFailure('`rsrepo fmt --check` failed without a formatting diff.', result, {
|
|
58
|
+
command: 'rsrepo fmt --check',
|
|
59
|
+
timeoutMs: rsrepoFmtTimeoutMs,
|
|
60
|
+
output: 'combined',
|
|
61
|
+
}));
|
|
62
|
+
}
|
|
63
|
+
return files.map((file) => ({
|
|
64
|
+
type: 'modify',
|
|
65
|
+
path: plugins.path.relative(process.cwd(), file) || file,
|
|
66
|
+
module: this.name,
|
|
67
|
+
description: 'Format with rustfmt (rsrepo fmt)',
|
|
68
|
+
}));
|
|
69
|
+
}
|
|
70
|
+
/** rustfmt formats the whole workspace in one run. */
|
|
71
|
+
async execute(changes) {
|
|
72
|
+
const startTime = this.stats.moduleStartTime(this.name);
|
|
73
|
+
this.stats.startModule(this.name);
|
|
74
|
+
try {
|
|
75
|
+
const result = await this.runRsrepoFmt(false);
|
|
76
|
+
const succeeded = result.exitCode === 0 && !result.timedOut;
|
|
77
|
+
for (const change of changes) {
|
|
78
|
+
this.stats.recordFileOperation(this.name, change.type, succeeded);
|
|
79
|
+
}
|
|
80
|
+
if (!succeeded) {
|
|
81
|
+
throw new Error(formatCommandFailure('`rsrepo fmt` failed.', result, {
|
|
82
|
+
command: 'rsrepo fmt',
|
|
83
|
+
timeoutMs: rsrepoFmtTimeoutMs,
|
|
84
|
+
output: 'combined',
|
|
85
|
+
}));
|
|
86
|
+
}
|
|
87
|
+
logger.log('info', `Formatted ${changes.length} Rust file(s) with rsrepo fmt`);
|
|
88
|
+
}
|
|
89
|
+
finally {
|
|
90
|
+
this.stats.endModule(this.name, startTime);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
async applyChange(_change) {
|
|
94
|
+
// execute() runs rustfmt once for every planned file.
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVzdGZtdC5mb3JtYXR0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi90cy9tb2RfZm9ybWF0L2Zvcm1hdHRlcnMvcnVzdGZtdC5mb3JtYXR0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRTVELE9BQU8sS0FBSyxPQUFPLE1BQU0sbUJBQW1CLENBQUM7QUFDN0MsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ2xELE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBQ3RGLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDZDQUE2QyxDQUFDO0FBRW5GLE1BQU0sa0JBQWtCLEdBQUcsRUFBRSxHQUFHLE1BQU0sQ0FBQztBQUV2Qyw2RkFBNkY7QUFDN0YsTUFBTSxDQUFDLE1BQU0scUJBQXFCLEdBQUcsQ0FBQyxTQUFpQixFQUFZLEVBQUU7SUFDbkUsNERBQTREO0lBQzVELE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxPQUFPLENBQUMsb0NBQW9DLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDMUUsTUFBTSxLQUFLLEdBQWEsRUFBRSxDQUFDO0lBQzNCLEtBQUssTUFBTSxLQUFLLElBQUksS0FBSyxDQUFDLFFBQVEsQ0FBQywyQkFBMkIsQ0FBQyxFQUFFLENBQUM7UUFDaEUsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN0RCxDQUFDO0lBQ0QsT0FBTyxLQUFLLENBQUM7QUFDZixDQUFDLENBQUM7QUFFRjs7Ozs7R0FLRztBQUNILE1BQU0sT0FBTyxnQkFBaUIsU0FBUSxhQUFhO0lBQ2pELElBQUksSUFBSTtRQUNOLE9BQU8sU0FBUyxDQUFD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
|