@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
|
@@ -0,0 +1,212 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The `.smartconfig.json` sections of the consolidated build tools.
|
|
3
|
+
*
|
|
4
|
+
* `@git.zone/tsrepo` carries one subsection per tool, each with exactly the
|
|
5
|
+
* shape of that tool's legacy section; `@git.zone/rsrepo` carries the tsrust
|
|
6
|
+
* fields plus the generic Cargo flows. Both tools read a new subsection first,
|
|
7
|
+
* fall back to the legacy section, and refuse a project that carries both,
|
|
8
|
+
* because the two are never merged silently.
|
|
9
|
+
*/
|
|
10
|
+
export const tsrepoNamespace = "@git.zone/tsrepo";
|
|
11
|
+
export const rsrepoNamespace = "@git.zone/rsrepo";
|
|
12
|
+
export const tsrustNamespace = "@git.zone/tsrust";
|
|
13
|
+
/** Each tsrepo subsection and the legacy section it replaces; build has none. */
|
|
14
|
+
export const tsrepoLegacySections = {
|
|
15
|
+
build: null,
|
|
16
|
+
test: "@git.zone/tstest",
|
|
17
|
+
bundle: "@git.zone/tsbundle",
|
|
18
|
+
docs: "@git.zone/tsdoc",
|
|
19
|
+
watch: "@git.zone/tswatch",
|
|
20
|
+
sea: "@git.zone/tssea",
|
|
21
|
+
};
|
|
22
|
+
const tsrepoSubsections = Object.keys(tsrepoLegacySections);
|
|
23
|
+
/** The tsrust fields, then the generic Cargo flow settings. */
|
|
24
|
+
export const rsrepoConfigKeys = [
|
|
25
|
+
"targets",
|
|
26
|
+
"targetsByHost",
|
|
27
|
+
"locked",
|
|
28
|
+
"static",
|
|
29
|
+
"rustflags",
|
|
30
|
+
"targetDir",
|
|
31
|
+
"pruneAfterBuild",
|
|
32
|
+
"matrix",
|
|
33
|
+
"notices",
|
|
34
|
+
"features",
|
|
35
|
+
"toolchains",
|
|
36
|
+
"members",
|
|
37
|
+
];
|
|
38
|
+
const isPlainObject = (valueArg) => typeof valueArg === "object" && valueArg !== null && !Array.isArray(valueArg);
|
|
39
|
+
const isStringArray = (valueArg) => Array.isArray(valueArg) && valueArg.every((entry) => typeof entry === "string");
|
|
40
|
+
/** True when package.json names the package as a dependency or devDependency. */
|
|
41
|
+
export const declaresPackage = (packageJsonArg, packageNameArg) => isPlainObject(packageJsonArg) &&
|
|
42
|
+
["dependencies", "devDependencies"].some((fieldArg) => {
|
|
43
|
+
const dependencies = packageJsonArg[fieldArg];
|
|
44
|
+
return (isPlainObject(dependencies) && Object.hasOwn(dependencies, packageNameArg));
|
|
45
|
+
});
|
|
46
|
+
/**
|
|
47
|
+
* One tsrepo tool section by tsrepo's own rule: the subsection when it
|
|
48
|
+
* exists, otherwise the legacy section; both present is an error.
|
|
49
|
+
*/
|
|
50
|
+
export const readTsrepoToolSection = (smartconfigDataArg, subsectionArg) => {
|
|
51
|
+
const tsrepoSection = smartconfigDataArg[tsrepoNamespace];
|
|
52
|
+
const subsection = isPlainObject(tsrepoSection)
|
|
53
|
+
? tsrepoSection[subsectionArg]
|
|
54
|
+
: undefined;
|
|
55
|
+
const legacyKey = tsrepoLegacySections[subsectionArg];
|
|
56
|
+
const legacy = legacyKey ? smartconfigDataArg[legacyKey] : undefined;
|
|
57
|
+
if (subsection !== undefined && legacy !== undefined) {
|
|
58
|
+
throw new Error(`.smartconfig.json carries both ${tsrepoNamespace}.${subsectionArg} and ${legacyKey}; tsrepo never merges them. Keep one of them.`);
|
|
59
|
+
}
|
|
60
|
+
const section = subsection ?? legacy;
|
|
61
|
+
return isPlainObject(section) ? section : undefined;
|
|
62
|
+
};
|
|
63
|
+
const collectTsrepoFindings = (smartconfigDataArg, declaresTsrepoArg) => {
|
|
64
|
+
const findings = [];
|
|
65
|
+
const section = smartconfigDataArg[tsrepoNamespace];
|
|
66
|
+
if (section !== undefined) {
|
|
67
|
+
if (!isPlainObject(section)) {
|
|
68
|
+
return [
|
|
69
|
+
{
|
|
70
|
+
level: "error",
|
|
71
|
+
message: `${tsrepoNamespace} must be an object`,
|
|
72
|
+
fix: `Give it the subsections ${tsrepoSubsections.join(", ")}.`,
|
|
73
|
+
},
|
|
74
|
+
];
|
|
75
|
+
}
|
|
76
|
+
const unknownKeys = Object.keys(section).filter((keyArg) => !tsrepoSubsections.includes(keyArg));
|
|
77
|
+
if (unknownKeys.length > 0) {
|
|
78
|
+
findings.push({
|
|
79
|
+
level: "error",
|
|
80
|
+
message: `${tsrepoNamespace} has unknown subsections: ${unknownKeys.join(", ")}`,
|
|
81
|
+
fix: `Use only ${tsrepoSubsections.join(", ")}.`,
|
|
82
|
+
});
|
|
83
|
+
}
|
|
84
|
+
for (const subsection of tsrepoSubsections) {
|
|
85
|
+
if (section[subsection] !== undefined && !isPlainObject(section[subsection]))
|
|
86
|
+
findings.push({
|
|
87
|
+
level: "error",
|
|
88
|
+
message: `${tsrepoNamespace}.${subsection} must be an object`,
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
if (!declaresTsrepoArg) {
|
|
92
|
+
findings.push({
|
|
93
|
+
level: "warn",
|
|
94
|
+
message: `${tsrepoNamespace} is configured, but package.json does not declare @git.zone/tsrepo; the single tools do not read it`,
|
|
95
|
+
fix: "Install @git.zone/tsrepo, or keep the settings in the single tools' sections.",
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
for (const subsection of tsrepoSubsections) {
|
|
100
|
+
const legacyKey = tsrepoLegacySections[subsection];
|
|
101
|
+
if (!legacyKey || smartconfigDataArg[legacyKey] === undefined)
|
|
102
|
+
continue;
|
|
103
|
+
if (isPlainObject(section) && section[subsection] !== undefined) {
|
|
104
|
+
findings.push({
|
|
105
|
+
level: "error",
|
|
106
|
+
message: `Both ${tsrepoNamespace}.${subsection} and ${legacyKey} are present; tsrepo refuses to merge them`,
|
|
107
|
+
fix: `Keep ${tsrepoNamespace}.${subsection} and remove ${legacyKey}.`,
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
else if (declaresTsrepoArg) {
|
|
111
|
+
findings.push({
|
|
112
|
+
level: "warn",
|
|
113
|
+
message: `${legacyKey} belongs in ${tsrepoNamespace}.${subsection} now that package.json declares @git.zone/tsrepo`,
|
|
114
|
+
fix: "Run `gitzone config fix` to move it.",
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
if (findings.length === 0 && section !== undefined) {
|
|
119
|
+
findings.push({ level: "ok", message: `${tsrepoNamespace} is valid` });
|
|
120
|
+
}
|
|
121
|
+
return findings;
|
|
122
|
+
};
|
|
123
|
+
const collectRsrepoFindings = (smartconfigDataArg) => {
|
|
124
|
+
const section = smartconfigDataArg[rsrepoNamespace];
|
|
125
|
+
if (section === undefined)
|
|
126
|
+
return [];
|
|
127
|
+
if (!isPlainObject(section)) {
|
|
128
|
+
return [{ level: "error", message: `${rsrepoNamespace} must be an object` }];
|
|
129
|
+
}
|
|
130
|
+
const findings = [];
|
|
131
|
+
if (smartconfigDataArg[tsrustNamespace] !== undefined) {
|
|
132
|
+
findings.push({
|
|
133
|
+
level: "error",
|
|
134
|
+
message: `Both ${rsrepoNamespace} and ${tsrustNamespace} are present; rsrepo refuses to merge them`,
|
|
135
|
+
fix: `Keep ${rsrepoNamespace} and remove ${tsrustNamespace}.`,
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
const unknownKeys = Object.keys(section).filter((keyArg) => !rsrepoConfigKeys.includes(keyArg));
|
|
139
|
+
if (unknownKeys.length > 0) {
|
|
140
|
+
findings.push({
|
|
141
|
+
level: "error",
|
|
142
|
+
message: `${rsrepoNamespace} has unknown keys: ${unknownKeys.join(", ")}`,
|
|
143
|
+
fix: `Use only ${rsrepoConfigKeys.join(", ")}.`,
|
|
144
|
+
});
|
|
145
|
+
}
|
|
146
|
+
const typeChecks = [
|
|
147
|
+
["targets", isStringArray, "a list of target names"],
|
|
148
|
+
[
|
|
149
|
+
"targetsByHost",
|
|
150
|
+
(valueArg) => isPlainObject(valueArg) && Object.values(valueArg).every(isStringArray),
|
|
151
|
+
"an object of target name lists",
|
|
152
|
+
],
|
|
153
|
+
["locked", (valueArg) => typeof valueArg === "boolean", "true or false"],
|
|
154
|
+
["static", (valueArg) => typeof valueArg === "boolean", "true or false"],
|
|
155
|
+
["rustflags", isStringArray, "a list of strings"],
|
|
156
|
+
["targetDir", (valueArg) => typeof valueArg === "string" && valueArg !== "", "a non-empty path"],
|
|
157
|
+
["pruneAfterBuild", (valueArg) => typeof valueArg === "boolean", "true or false"],
|
|
158
|
+
["matrix", isPlainObject, "an object"],
|
|
159
|
+
["notices", isPlainObject, "an object"],
|
|
160
|
+
["features", Array.isArray, "a list of feature sets"],
|
|
161
|
+
["toolchains", isStringArray, "a list of toolchain names"],
|
|
162
|
+
["members", isStringArray, "a list of crate names"],
|
|
163
|
+
];
|
|
164
|
+
for (const [key, check, expected] of typeChecks) {
|
|
165
|
+
if (section[key] !== undefined && !check(section[key])) {
|
|
166
|
+
findings.push({
|
|
167
|
+
level: "error",
|
|
168
|
+
message: `${rsrepoNamespace}.${key} must be ${expected}`,
|
|
169
|
+
});
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
if (findings.length === 0) {
|
|
173
|
+
findings.push({ level: "ok", message: `${rsrepoNamespace} is valid` });
|
|
174
|
+
}
|
|
175
|
+
return findings;
|
|
176
|
+
};
|
|
177
|
+
/** Doctor findings for the tsrepo and rsrepo sections. */
|
|
178
|
+
export const collectToolConfigFindings = (smartconfigDataArg, packageJsonArg) => [
|
|
179
|
+
...collectTsrepoFindings(smartconfigDataArg, declaresPackage(packageJsonArg, "@git.zone/tsrepo")),
|
|
180
|
+
...collectRsrepoFindings(smartconfigDataArg),
|
|
181
|
+
];
|
|
182
|
+
/**
|
|
183
|
+
* Moves every legacy tool section into its `@git.zone/tsrepo` subsection.
|
|
184
|
+
* Only a project that declares `@git.zone/tsrepo` may run this, because the
|
|
185
|
+
* single tools do not read the new key. A subsection that already exists
|
|
186
|
+
* beside its legacy section is never merged: both stay as they are and the
|
|
187
|
+
* conflict is returned for the caller to report.
|
|
188
|
+
*/
|
|
189
|
+
export const moveLegacyToolSectionsIntoTsrepo = (smartconfigDataArg) => {
|
|
190
|
+
const existing = smartconfigDataArg[tsrepoNamespace];
|
|
191
|
+
if (existing !== undefined && !isPlainObject(existing)) {
|
|
192
|
+
throw new Error(`${tsrepoNamespace} must be an object.`);
|
|
193
|
+
}
|
|
194
|
+
const result = { moved: [], conflicts: [] };
|
|
195
|
+
const section = { ...(existing ?? {}) };
|
|
196
|
+
for (const subsection of tsrepoSubsections) {
|
|
197
|
+
const legacyKey = tsrepoLegacySections[subsection];
|
|
198
|
+
if (!legacyKey || smartconfigDataArg[legacyKey] === undefined)
|
|
199
|
+
continue;
|
|
200
|
+
if (section[subsection] !== undefined) {
|
|
201
|
+
result.conflicts.push({ legacyKey, subsection });
|
|
202
|
+
continue;
|
|
203
|
+
}
|
|
204
|
+
section[subsection] = smartconfigDataArg[legacyKey];
|
|
205
|
+
delete smartconfigDataArg[legacyKey];
|
|
206
|
+
result.moved.push(legacyKey);
|
|
207
|
+
}
|
|
208
|
+
if (result.moved.length > 0)
|
|
209
|
+
smartconfigDataArg[tsrepoNamespace] = section;
|
|
210
|
+
return result;
|
|
211
|
+
};
|
|
212
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helpers.toolconfig.js","sourceRoot":"","sources":["../../ts/helpers.toolconfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,18 @@
|
|
|
1
|
-
import type { ITsseaOutputs } from '@git.zone/
|
|
2
|
-
export type { ITsseaOutput, ITsseaOutputs } from '@git.zone/
|
|
1
|
+
import type { ITsseaOutputs } from '@git.zone/tsrepo/sea/config';
|
|
2
|
+
export type { ITsseaOutput, ITsseaOutputs } from '@git.zone/tsrepo/sea/config';
|
|
3
3
|
/** The tssea package whose `./config` export resolves a project's executables. */
|
|
4
4
|
export declare const tsseaPackageName = "@git.zone/tssea";
|
|
5
5
|
/** The `@git.zone/tssea` versions whose `./config` export this CLI reads: `^1.1.0`. */
|
|
6
6
|
export declare const supportedTsseaRange = "^1.1.0";
|
|
7
7
|
/**
|
|
8
|
-
*
|
|
9
|
-
*
|
|
8
|
+
* `@git.zone/tsrepo` carries tssea as its `sea` module; its `./sea/config` export is
|
|
9
|
+
* tssea's `./config` contract. This CLI reads it from tsrepo `^1.0.0`.
|
|
10
|
+
*/
|
|
11
|
+
export declare const supportedTsrepoRange = "^1.0.0";
|
|
12
|
+
/**
|
|
13
|
+
* Resolves the executables of the project's sea configuration with the package the project
|
|
14
|
+
* itself installs, so the project's version interprets its own config: `@git.zone/tsrepo`
|
|
15
|
+
* (`./sea/config`, config `@git.zone/tsrepo.sea` or the legacy `@git.zone/tssea`) when the
|
|
16
|
+
* project declares it, otherwise `@git.zone/tssea` (`./config`, config `@git.zone/tssea`).
|
|
10
17
|
*/
|
|
11
18
|
export declare const resolveProjectTsseaOutputs: (projectDirArg: string, smartconfigDataArg: Record<string, unknown>) => Promise<ITsseaOutputs>;
|
package/dist_ts/helpers.tssea.js
CHANGED
|
@@ -1,21 +1,42 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import { isPlainObject } from './helpers.objects.js';
|
|
3
|
+
import { readTsrepoToolSection, tsrepoNamespace } from './helpers.toolconfig.js';
|
|
3
4
|
/** The tssea package whose `./config` export resolves a project's executables. */
|
|
4
5
|
export const tsseaPackageName = '@git.zone/tssea';
|
|
5
6
|
/** The `@git.zone/tssea` versions whose `./config` export this CLI reads: `^1.1.0`. */
|
|
6
7
|
export const supportedTsseaRange = '^1.1.0';
|
|
8
|
+
/**
|
|
9
|
+
* `@git.zone/tsrepo` carries tssea as its `sea` module; its `./sea/config` export is
|
|
10
|
+
* tssea's `./config` contract. This CLI reads it from tsrepo `^1.0.0`.
|
|
11
|
+
*/
|
|
12
|
+
export const supportedTsrepoRange = '^1.0.0';
|
|
7
13
|
/** A tssea failure, recognized by shape: `instanceof` fails across package copies. */
|
|
8
14
|
const isTsseaError = (errorArg) => errorArg instanceof Error &&
|
|
9
15
|
errorArg.name === 'TsseaError' &&
|
|
10
16
|
typeof errorArg.code === 'string';
|
|
11
|
-
/** Whether an exact `x.y.z` version
|
|
12
|
-
const
|
|
17
|
+
/** Whether an exact `x.y.z` version has the given major and at least the given minor; prereleases do not. */
|
|
18
|
+
const isStableVersionInMajor = (versionArg, majorArg, minimumMinorArg) => {
|
|
13
19
|
const match = /^(\d+)\.(\d+)\.(\d+)$/.exec(versionArg);
|
|
14
20
|
if (!match) {
|
|
15
21
|
return false;
|
|
16
22
|
}
|
|
17
23
|
const [major, minor] = [Number(match[1]), Number(match[2])];
|
|
18
|
-
return major ===
|
|
24
|
+
return major === majorArg && minor >= minimumMinorArg;
|
|
25
|
+
};
|
|
26
|
+
const tsseaProvider = {
|
|
27
|
+
packageName: tsseaPackageName,
|
|
28
|
+
configExport: `${tsseaPackageName}/config`,
|
|
29
|
+
range: supportedTsseaRange,
|
|
30
|
+
isSupportedVersion: (versionArg) => isStableVersionInMajor(versionArg, 1, 1),
|
|
31
|
+
readConfig: (smartconfigDataArg) => smartconfigDataArg[tsseaPackageName],
|
|
32
|
+
};
|
|
33
|
+
const tsrepoProvider = {
|
|
34
|
+
packageName: tsrepoNamespace,
|
|
35
|
+
configExport: `${tsrepoNamespace}/sea/config`,
|
|
36
|
+
range: supportedTsrepoRange,
|
|
37
|
+
isSupportedVersion: (versionArg) => isStableVersionInMajor(versionArg, 1, 0),
|
|
38
|
+
// tsrepo reads `@git.zone/tsrepo.sea`, falls back to `@git.zone/tssea` and refuses both.
|
|
39
|
+
readConfig: (smartconfigDataArg) => readTsrepoToolSection(smartconfigDataArg, 'sea'),
|
|
19
40
|
};
|
|
20
41
|
const readProjectManifest = async (projectDirArg) => {
|
|
21
42
|
const manifestPath = plugins.path.join(projectDirArg, 'package.json');
|
|
@@ -39,43 +60,52 @@ const declaresDependency = (manifestArg, nameArg) => ['dependencies', 'devDepend
|
|
|
39
60
|
return isPlainObject(field) && typeof field[nameArg] === 'string';
|
|
40
61
|
});
|
|
41
62
|
/**
|
|
42
|
-
* Resolves the executables of the project's
|
|
43
|
-
*
|
|
63
|
+
* Resolves the executables of the project's sea configuration with the package the project
|
|
64
|
+
* itself installs, so the project's version interprets its own config: `@git.zone/tsrepo`
|
|
65
|
+
* (`./sea/config`, config `@git.zone/tsrepo.sea` or the legacy `@git.zone/tssea`) when the
|
|
66
|
+
* project declares it, otherwise `@git.zone/tssea` (`./config`, config `@git.zone/tssea`).
|
|
44
67
|
*/
|
|
45
68
|
export const resolveProjectTsseaOutputs = async (projectDirArg, smartconfigDataArg) => {
|
|
46
69
|
const manifest = await readProjectManifest(projectDirArg);
|
|
47
|
-
|
|
48
|
-
|
|
70
|
+
const provider = declaresDependency(manifest, tsrepoProvider.packageName)
|
|
71
|
+
? tsrepoProvider
|
|
72
|
+
: declaresDependency(manifest, tsseaProvider.packageName)
|
|
73
|
+
? tsseaProvider
|
|
74
|
+
: undefined;
|
|
75
|
+
if (!provider) {
|
|
76
|
+
throw new Error(`binaryCli builds with ${tsrepoNamespace} (or the deprecated ${tsseaPackageName}); \`pnpm install --save-dev ${tsrepoNamespace}\`, then rerun.`);
|
|
49
77
|
}
|
|
78
|
+
const { packageName, range } = provider;
|
|
50
79
|
// The project's own direct link, never one an ancestor folder would resolve.
|
|
51
|
-
const installPath = plugins.path.join(projectDirArg, 'node_modules', ...
|
|
80
|
+
const installPath = plugins.path.join(projectDirArg, 'node_modules', ...packageName.split('/'));
|
|
52
81
|
try {
|
|
53
82
|
await plugins.fs.lstat(installPath);
|
|
54
83
|
}
|
|
55
84
|
catch {
|
|
56
|
-
throw new Error(`${
|
|
85
|
+
throw new Error(`${packageName} is declared but not installed in ${projectDirArg}: run \`pnpm install\`, then rerun.`);
|
|
57
86
|
}
|
|
58
87
|
const projectRequire = plugins.nodeModule.createRequire(plugins.path.join(projectDirArg, 'package.json'));
|
|
59
|
-
const installedManifest = projectRequire(`${
|
|
88
|
+
const installedManifest = projectRequire(`${packageName}/package.json`);
|
|
60
89
|
const installedVersion = isPlainObject(installedManifest) && typeof installedManifest.version === 'string'
|
|
61
90
|
? installedManifest.version
|
|
62
91
|
: 'unknown';
|
|
63
|
-
if (!
|
|
92
|
+
if (!provider.isSupportedVersion(installedVersion)) {
|
|
64
93
|
const newerMajor = /^(\d+)\./.exec(installedVersion);
|
|
65
94
|
throw new Error(newerMajor && Number(newerMajor[1]) > 1
|
|
66
|
-
? `The project installs ${
|
|
67
|
-
: `The project installs ${
|
|
95
|
+
? `The project installs ${packageName} ${installedVersion}, but this @git.zone/cli supports ${range}: update @git.zone/cli.`
|
|
96
|
+
: `The project installs ${packageName} ${installedVersion}, but this @git.zone/cli supports ${range}: upgrade ${packageName} in the project.`);
|
|
68
97
|
}
|
|
69
|
-
const
|
|
98
|
+
const rawConfig = provider.readConfig(smartconfigDataArg);
|
|
99
|
+
const configModuleUrl = plugins.nodeUrl.pathToFileURL(projectRequire.resolve(provider.configExport)).href;
|
|
70
100
|
const configModule = (await import(configModuleUrl));
|
|
71
101
|
try {
|
|
72
|
-
return configModule.resolveOutputs(
|
|
102
|
+
return configModule.resolveOutputs(rawConfig, projectDirArg);
|
|
73
103
|
}
|
|
74
104
|
catch (error) {
|
|
75
105
|
if (isTsseaError(error)) {
|
|
76
|
-
throw new Error(`${
|
|
106
|
+
throw new Error(`${packageName}: ${error.message} [${error.code}]`, { cause: error });
|
|
77
107
|
}
|
|
78
108
|
throw error;
|
|
79
109
|
}
|
|
80
110
|
};
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
111
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy50c3NlYS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2hlbHBlcnMudHNzZWEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLE9BQU8sTUFBTSxjQUFjLENBQUM7QUFDeEMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUlqRixrRkFBa0Y7QUFDbEYsTUFBTSxDQUFDLE1BQU0sZ0JBQWdCLEdBQUcsaUJBQWlCLENBQUM7QUFFbEQsdUZBQXVGO0FBQ3ZGLE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLFFBQVEsQ0FBQztBQUU1Qzs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBRyxRQUFRLENBQUM7QUFpQjdDLHNGQUFzRjtBQUN0RixNQUFNLFlBQVksR0FBRyxDQUFDLFFBQWlCLEVBQXdDLEVBQUUsQ0FDL0UsUUFBUSxZQUFZLEtBQUs7SUFDekIsUUFBUSxDQUFDLElBQUksS0FBSyxZQUFZO0lBQzlCLE9BQVEsUUFBdUMsQ0FBQyxJQUFJLEtBQUssUUFBUSxDQUFDO0FBRXBFLDZHQUE2RztBQUM3RyxNQUFNLHNCQUFzQixHQUFHLENBQUMsVUFBa0IsRUFBRSxRQUFnQixFQUFFLGVBQXVCLEVBQVcsRUFBRTtJQUN4RyxNQUFNLEtBQUssR0FBRyx1QkFBdUIsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDdkQsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ1gsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0lBQ0QsTUFBTSxDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJ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
|
|
@@ -5,11 +5,28 @@ import * as plugins from "./plugins.js";
|
|
|
5
5
|
* project that does not should simply skip the cleanup.
|
|
6
6
|
*/
|
|
7
7
|
export declare const getProjectTstestBinPath: (projectRootArg: string, platformArg?: NodeJS.Platform) => string;
|
|
8
|
+
/** The project's own `@git.zone/tsrepo` binary, which carries tstest as `tsrepo test`. */
|
|
9
|
+
export declare const getProjectTsrepoBinPath: (projectRootArg: string, platformArg?: NodeJS.Platform) => string;
|
|
8
10
|
export declare const hasInstalledProjectTstestBinary: (projectRootArg: string, platformArg?: NodeJS.Platform) => Promise<boolean>;
|
|
11
|
+
export declare const hasInstalledProjectTsrepoBinary: (projectRootArg: string, platformArg?: NodeJS.Platform) => Promise<boolean>;
|
|
12
|
+
/** The command that removes the project's test artifacts. */
|
|
13
|
+
export interface ITestCleanupCommand {
|
|
14
|
+
tool: "tsrepo" | "tstest";
|
|
15
|
+
binPath: string;
|
|
16
|
+
args: string[];
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* `tsrepo test clean` when the project installs `@git.zone/tsrepo`, which
|
|
20
|
+
* carries tstest, otherwise its own `tstest clean`. Both are legitimate
|
|
21
|
+
* installs; tsrepo wins when a project has both.
|
|
22
|
+
*/
|
|
23
|
+
export declare const getProjectTestCleanupCommand: (projectRootArg: string, platformArg?: NodeJS.Platform) => Promise<ITestCleanupCommand>;
|
|
9
24
|
/**
|
|
10
25
|
* Whether the project wants its test artifacts removed as part of a release.
|
|
11
26
|
* Defaults to true; a project opts out with
|
|
12
|
-
* `{"@git.zone/
|
|
27
|
+
* `{"@git.zone/tsrepo": {"test": {"cleanup": {"onRelease": false}}}}`, or the
|
|
28
|
+
* legacy `{"@git.zone/tstest": {"cleanup": {"onRelease": false}}}`. Like
|
|
29
|
+
* tsrepo itself, this refuses a project that carries both sections.
|
|
13
30
|
*/
|
|
14
31
|
export declare const readTstestCleanupOnRelease: (projectRootArg: string) => boolean;
|
|
15
32
|
/** First tstest version that understands the `clean` subcommand. */
|
|
@@ -20,16 +37,18 @@ export declare const satisfiesMinimumCleanVersion: (versionArg: string) => boole
|
|
|
20
37
|
*/
|
|
21
38
|
export declare const readProjectTstestVersion: (projectRootArg: string) => Promise<string | null>;
|
|
22
39
|
/**
|
|
23
|
-
* True when a release should
|
|
24
|
-
*
|
|
25
|
-
*
|
|
26
|
-
*
|
|
40
|
+
* True when a release should clean the project's test artifacts: the project
|
|
41
|
+
* has not opted out, and it installs tsrepo (every tsrepo has `tsrepo test
|
|
42
|
+
* clean`) or a tstest at a version that understands `tstest clean`. An older
|
|
43
|
+
* tstest would treat `clean` as a test path, so it is deliberately skipped
|
|
44
|
+
* rather than invoked.
|
|
27
45
|
*/
|
|
28
46
|
export declare const shouldCleanTestArtifactsOnRelease: (projectRootArg: string) => Promise<boolean>;
|
|
29
47
|
/** Single-quote a value for safe interpolation into a shell command. */
|
|
30
48
|
export declare const shellQuote: (valueArg: string) => string;
|
|
31
49
|
/**
|
|
32
|
-
* Run the project's `
|
|
33
|
-
* reported and swallowed rather than failing an
|
|
50
|
+
* Run the project's `tsrepo test clean`, or its `tstest clean`. Cleanup is
|
|
51
|
+
* housekeeping, so a failure is reported and swallowed rather than failing an
|
|
52
|
+
* otherwise complete release.
|
|
34
53
|
*/
|
|
35
|
-
export declare const
|
|
54
|
+
export declare const runTestArtifactCleanup: (smartshellArg: plugins.smartshell.Smartshell, projectRootArg: string) => Promise<void>;
|
|
@@ -1,35 +1,67 @@
|
|
|
1
1
|
import * as plugins from "./plugins.js";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
* project that does not should simply skip the cleanup.
|
|
6
|
-
*/
|
|
7
|
-
export const getProjectTstestBinPath = (projectRootArg, platformArg = process.platform) => {
|
|
8
|
-
return plugins.path.join(projectRootArg, "node_modules", ".bin", platformArg === "win32" ? "tstest.CMD" : "tstest");
|
|
9
|
-
};
|
|
10
|
-
export const hasInstalledProjectTstestBinary = async (projectRootArg, platformArg = process.platform) => {
|
|
2
|
+
import { readTsrepoToolSection } from "./helpers.toolconfig.js";
|
|
3
|
+
const getProjectBinPath = (projectRootArg, nameArg, platformArg) => plugins.path.join(projectRootArg, "node_modules", ".bin", platformArg === "win32" ? `${nameArg}.CMD` : nameArg);
|
|
4
|
+
const isAccessible = async (pathArg) => {
|
|
11
5
|
try {
|
|
12
|
-
await plugins.fs.access(
|
|
6
|
+
await plugins.fs.access(pathArg);
|
|
13
7
|
return true;
|
|
14
8
|
}
|
|
15
9
|
catch {
|
|
16
10
|
return false;
|
|
17
11
|
}
|
|
18
12
|
};
|
|
13
|
+
/**
|
|
14
|
+
* Resolve the project's own tstest binary. The CLI deliberately does not
|
|
15
|
+
* depend on tstest at runtime: a project that tests already has it, and a
|
|
16
|
+
* project that does not should simply skip the cleanup.
|
|
17
|
+
*/
|
|
18
|
+
export const getProjectTstestBinPath = (projectRootArg, platformArg = process.platform) => getProjectBinPath(projectRootArg, "tstest", platformArg);
|
|
19
|
+
/** The project's own `@git.zone/tsrepo` binary, which carries tstest as `tsrepo test`. */
|
|
20
|
+
export const getProjectTsrepoBinPath = (projectRootArg, platformArg = process.platform) => getProjectBinPath(projectRootArg, "tsrepo", platformArg);
|
|
21
|
+
export const hasInstalledProjectTstestBinary = async (projectRootArg, platformArg = process.platform) => isAccessible(getProjectTstestBinPath(projectRootArg, platformArg));
|
|
22
|
+
export const hasInstalledProjectTsrepoBinary = async (projectRootArg, platformArg = process.platform) => isAccessible(getProjectTsrepoBinPath(projectRootArg, platformArg));
|
|
23
|
+
/**
|
|
24
|
+
* `tsrepo test clean` when the project installs `@git.zone/tsrepo`, which
|
|
25
|
+
* carries tstest, otherwise its own `tstest clean`. Both are legitimate
|
|
26
|
+
* installs; tsrepo wins when a project has both.
|
|
27
|
+
*/
|
|
28
|
+
export const getProjectTestCleanupCommand = async (projectRootArg, platformArg = process.platform) => (await hasInstalledProjectTsrepoBinary(projectRootArg, platformArg))
|
|
29
|
+
? {
|
|
30
|
+
tool: "tsrepo",
|
|
31
|
+
binPath: getProjectTsrepoBinPath(projectRootArg, platformArg),
|
|
32
|
+
args: ["test", "clean"],
|
|
33
|
+
}
|
|
34
|
+
: {
|
|
35
|
+
tool: "tstest",
|
|
36
|
+
binPath: getProjectTstestBinPath(projectRootArg, platformArg),
|
|
37
|
+
args: ["clean"],
|
|
38
|
+
};
|
|
19
39
|
/**
|
|
20
40
|
* Whether the project wants its test artifacts removed as part of a release.
|
|
21
41
|
* Defaults to true; a project opts out with
|
|
22
|
-
* `{"@git.zone/
|
|
42
|
+
* `{"@git.zone/tsrepo": {"test": {"cleanup": {"onRelease": false}}}}`, or the
|
|
43
|
+
* legacy `{"@git.zone/tstest": {"cleanup": {"onRelease": false}}}`. Like
|
|
44
|
+
* tsrepo itself, this refuses a project that carries both sections.
|
|
23
45
|
*/
|
|
24
46
|
export const readTstestCleanupOnRelease = (projectRootArg) => {
|
|
47
|
+
let smartconfigData;
|
|
25
48
|
try {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
return tstestConfig?.cleanup?.onRelease !== false;
|
|
49
|
+
smartconfigData = new plugins.smartconfig.Smartconfig(projectRootArg)
|
|
50
|
+
.smartconfigJsonData;
|
|
29
51
|
}
|
|
30
52
|
catch {
|
|
31
53
|
return true;
|
|
32
54
|
}
|
|
55
|
+
if (typeof smartconfigData !== "object" ||
|
|
56
|
+
smartconfigData === null ||
|
|
57
|
+
Array.isArray(smartconfigData)) {
|
|
58
|
+
return true;
|
|
59
|
+
}
|
|
60
|
+
const testConfig = readTsrepoToolSection(smartconfigData, "test");
|
|
61
|
+
const cleanup = testConfig?.cleanup;
|
|
62
|
+
return !(typeof cleanup === "object" &&
|
|
63
|
+
cleanup !== null &&
|
|
64
|
+
cleanup.onRelease === false);
|
|
33
65
|
};
|
|
34
66
|
/** First tstest version that understands the `clean` subcommand. */
|
|
35
67
|
export const MINIMUM_TSTEST_CLEAN_VERSION = "6.1.0";
|
|
@@ -64,15 +96,19 @@ export const readProjectTstestVersion = async (projectRootArg) => {
|
|
|
64
96
|
}
|
|
65
97
|
};
|
|
66
98
|
/**
|
|
67
|
-
* True when a release should
|
|
68
|
-
*
|
|
69
|
-
*
|
|
70
|
-
*
|
|
99
|
+
* True when a release should clean the project's test artifacts: the project
|
|
100
|
+
* has not opted out, and it installs tsrepo (every tsrepo has `tsrepo test
|
|
101
|
+
* clean`) or a tstest at a version that understands `tstest clean`. An older
|
|
102
|
+
* tstest would treat `clean` as a test path, so it is deliberately skipped
|
|
103
|
+
* rather than invoked.
|
|
71
104
|
*/
|
|
72
105
|
export const shouldCleanTestArtifactsOnRelease = async (projectRootArg) => {
|
|
73
106
|
if (!readTstestCleanupOnRelease(projectRootArg)) {
|
|
74
107
|
return false;
|
|
75
108
|
}
|
|
109
|
+
if (await hasInstalledProjectTsrepoBinary(projectRootArg)) {
|
|
110
|
+
return true;
|
|
111
|
+
}
|
|
76
112
|
if (!(await hasInstalledProjectTstestBinary(projectRootArg))) {
|
|
77
113
|
return false;
|
|
78
114
|
}
|
|
@@ -82,21 +118,23 @@ export const shouldCleanTestArtifactsOnRelease = async (projectRootArg) => {
|
|
|
82
118
|
/** Single-quote a value for safe interpolation into a shell command. */
|
|
83
119
|
export const shellQuote = (valueArg) => `'${valueArg.replaceAll("'", `'\\''`)}'`;
|
|
84
120
|
/**
|
|
85
|
-
* Run the project's `
|
|
86
|
-
* reported and swallowed rather than failing an
|
|
121
|
+
* Run the project's `tsrepo test clean`, or its `tstest clean`. Cleanup is
|
|
122
|
+
* housekeeping, so a failure is reported and swallowed rather than failing an
|
|
123
|
+
* otherwise complete release.
|
|
87
124
|
*/
|
|
88
|
-
export const
|
|
89
|
-
const
|
|
125
|
+
export const runTestArtifactCleanup = async (smartshellArg, projectRootArg) => {
|
|
126
|
+
const command = await getProjectTestCleanupCommand(projectRootArg);
|
|
127
|
+
const label = `${command.tool} ${command.args.join(" ")}`;
|
|
90
128
|
console.log("cleaning test artifacts");
|
|
91
129
|
try {
|
|
92
130
|
// Quoted: a project path may contain spaces or shell metacharacters.
|
|
93
|
-
const execResult = await smartshellArg.exec(`cd ${shellQuote(projectRootArg)} && ${shellQuote(
|
|
131
|
+
const execResult = await smartshellArg.exec(`cd ${shellQuote(projectRootArg)} && ${[command.binPath, ...command.args].map(shellQuote).join(" ")}`);
|
|
94
132
|
if (execResult.exitCode !== 0) {
|
|
95
|
-
console.error(
|
|
133
|
+
console.error(`${label} exited with ${execResult.exitCode}; leaving test artifacts in place`);
|
|
96
134
|
}
|
|
97
135
|
}
|
|
98
136
|
catch (error) {
|
|
99
|
-
console.error(
|
|
137
|
+
console.error(`${label} failed: ${error}`);
|
|
100
138
|
}
|
|
101
139
|
};
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
140
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy50c3Rlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9oZWxwZXJzLnRzdGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVoRSxNQUFNLGlCQUFpQixHQUFHLENBQ3hCLGNBQXNCLEVBQ3RCLE9BQWUsRUFDZixXQUE0QixFQUNwQixFQUFFLENBQ1YsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQ2YsY0FBYyxFQUNkLGNBQWMsRUFDZCxNQUFNLEVBQ04sV0FBVyxLQUFLLE9BQU8sQ0FBQyxDQUFDLENBQUMsR0FBRyxPQUFPLE1BQU0sQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUNyRCxDQUFDO0FBRUosTUFBTSxZQUFZLEdBQUcsS0FBSyxFQUFFLE9BQWUsRUFBb0IsRUFBRTtJQUMvRCxJQUFJLENBQUM7UUFDSCxNQUFNLE9BQU8sQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2pDLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUFDLE1BQU0sQ0FBQztRQUNQLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztBQUNILENBQUMsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsTUFBTSx1QkFBdUIsR0FBRyxDQUNyQyxjQUFzQixFQUN0QixXQUFXLEdBQW9CLE9BQU8sQ0FBQyxRQUFRLEVBQ3ZDLEVBQUUsQ0FBQyxpQkFBaUIsQ0FBQyxjQUFjLEVBQUUsUUFBUSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0FBRXRFLDBGQUEwRjtBQUMxRixNQUFNLENBQUMsTUFBTSx1QkFBdUIsR0FBRyxDQUNyQyxjQUFzQixFQUN0QixXQUFXLEdBQW9CLE9BQU8sQ0FBQyxRQUFRLEVBQ3ZDLEVBQUUsQ0FBQyxpQkFBaUIsQ0FBQyxjQUFjLEVBQUUsUUFBUSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0FBRXRFLE1BQU0sQ0FBQyxNQUFNLCtCQUErQixHQUFHLEtBQUssRUFDbEQsY0FBc0IsRUFDdEIsV0FBVyxHQUFvQixPQUFPLENBQUMsUUFBUSxFQUM3QixFQUFFLENBQ3BCLFlBQVksQ0FBQyx1QkFBdUIsQ0FBQyxjQUFjLEVBQUUsV0FBVyxDQUFDLENBQUMsQ0FBQztBQUVyRSxNQUFNLENBQUMsTUFBTSwrQkFBK0IsR0FBRyxLQUFLLEVBQ2xELGNBQXNCLEVBQ3RCLFdBQVcsR0FBb0IsT0FBTyxDQUFDLFFBQVEsRUFDN0IsRUFBRSxDQUNwQixZQUFZLENBQUMsdUJBQXVCLENBQUMsY0FBYyxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUM7QUFTckU7Ozs7R0FJRztBQUNILE1BQU0sQ0FBQyxNQUFNLDRCQUE0QixHQUFHLEtBQUssRUFDL0MsY0FBc0IsRUFDdEIsV0FBVyxHQUFvQixPQUFPLENBQUMsUUFBUSxFQUNqQixFQUFFLENBQ2hDLENBQUMsTUFBTSwrQkFBK0IsQ0FBQyxjQUFjLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDbEUsQ0FBQyxDQUFDO1FBQ0UsSUFBSSxFQUFFLFFBQVE7UUFDZCxPQUFPLEVBQUUsdUJBQXVCLENBQUMsY0FBYyxFQUFFLFdBQVcsQ0FBQztRQUM3RCxJQUFJLEVBQUUsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDO0tBQ3hCO0lBQ0gsQ0FBQyxDQUFDO1FBQ0UsSUFBSSxFQUFFLFFBQVE7UUFDZCxPQUFPLEVBQUUsdUJBQXVCLENBQUMsY0FBYyxFQUFFLFdBQVcsQ0FBQztRQUM3RCxJQUFJLEVBQUUsQ0FBQyxPQUFPLENBQUM7S0FDaEIsQ0FBQztBQUVSOzs7Ozs7R0FNRztBQUNILE1BQU0sQ0FBQyxNQUFNLDBCQUEwQixHQUFHLENBQUMsY0FBc0IsRUFBVyxFQUFFO0lBQzVFLElBQUksZUFBd0IsQ0FBQztJQUM3QixJQUFJLENBQUM7UUFDSCxlQUFlLEdBQUcsSUFBSSxPQUFPLENBQUMsV0FBVyxDQUFDLFdBQVcsQ0FBQyxjQUFjLENBQUM7YUFDbEUsbUJBQW1CLENBQUM7SUFDekIsQ0FBQztJQUFDLE1BQU0sQ0FBQztRQUNQLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUNELElBQ0UsT0FBTyxlQUFlLEtBQUssUUFBUTtRQUNuQyxlQUFlLEtBQUssSUFBSTtRQUN4QixLQUFLLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxFQUM5QixDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBQ0QsTUFBTSxVQUFVLEdBQUcscUJBQXFCLENBQ3RDLGVBQTBDLEVBQzFDLE1BQU0sQ0FDUCxDQUFDO0lBQ0YsTUFBTSxPQUFPLEdBQUcsVUFBVSxFQUFFLE9BQU8sQ0FBQztJQUNwQyxPQUFPLENBQUMsQ0FDTixPQUFPLE9BQU8sS0FBSyxRQUFRO1FBQzNCLE9BQU8sS0FBSyxJQUFJO1FBQ2YsT0FBbUMsQ0FBQyxTQUFTLEtBQUssS0FBSyxDQUN6RCxDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBRUYsb0VBQW9FO0FBQ3BFLE1BQU0sQ0FBQyxNQUFNLDRCQUE0QixHQUFHLE9BQU8sQ0FBQztBQUVwRCxNQUFNLFlBQVksR0FBRyxDQUFDLFVBQWtCLEVBQVksRUFBRSxDQUNwRCxVQUFVO0tBQ1AsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUNiLEtBQUssQ0FBQyxHQUFHLENBQUM7S0FDVixHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO0FBRW5ELE1BQU0sQ0FBQyxNQUFNLDRCQUE0QixHQUFHLENBQUMsVUFBa0IsRUFBVyxFQUFFO0lBQzFFLE1BQU0sTUFBTSxHQUFHLFlBQVksQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUN4QyxNQUFNLFFBQVEsR0FBRyxZQUFZLENBQUMsNEJBQTRCLENBQUMsQ0FBQztJQUM1RCxLQUFLLElBQUksS0FBSyxHQUFHLENBQUMsRUFBRSxLQUFLLEdBQUcsUUFBUSxDQUFDLE1BQU0sRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUFDO1FBQ3JELE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDdEMsSUFBSSxVQUFVLEdBQUcsUUFBUSxDQUFDLEtBQUssQ0FBQztZQUFFLE9BQU8sSUFBSSxDQUFDO1FBQzlDLElBQUksVUFBVSxHQUFHLFFBQVEsQ0FBQyxLQUFLLENBQUM7WUFBRSxPQUFPLEtBQUssQ0FBQztJQUNqRCxDQUFDO0lBQ0QsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDLENBQUM7QUFFRjs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLHdCQUF3QixHQUFHLEtBQUssRUFDM0MsY0FBc0IsRUFDRSxFQUFFO0lBQzFCLElBQUksQ0FBQztRQUNILE1BQU0sZUFBZSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUN2QyxjQUFjLEVBQ2QsY0FBYyxFQUNkLFdBQVcsRUFDWCxRQUFRLEVBQ1IsY0FBYyxDQUNmLENBQUM7UUFDRixNQUFNLFFBQVEsR0FBRyxNQUFNLE9BQU8sQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLGVBQWUsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUNwRSxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBeUIsQ0FBQztRQUM1RCxPQUFPLE1BQU0sQ0FBQyxPQUFPLElBQUksSUFBSSxDQUFDO0lBQ2hDLENBQUM7SUFBQyxNQUFNLENBQUM7UUFDUCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7QUFDSCxDQUFDLENBQUM7QUFFRjs7Ozs7O0dBTUc7QUFDSCxNQUFNLENBQUMsTUFBTSxpQ0FBaUMsR0FBRyxLQUFLLEVBQ3BELGNBQXNCLEVBQ0osRUFBRTtJQUNwQixJQUFJLENBQUMsMEJBQTBCLENBQUMsY0FBYyxDQUFDLEVBQUUsQ0FBQztRQUNoRCxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFDRCxJQUFJLE1BQU0sK0JBQStCLENBQUMsY0FBYyxDQUFDLEVBQUUsQ0FBQztRQUMxRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFDRCxJQUFJLENBQUMsQ0FBQyxNQUFNLCtCQUErQixDQUFDLGNBQWMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUM3RCxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFDRCxNQUFNLE9BQU8sR0FBRyxNQUFNLHdCQUF3QixDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQy9ELE9BQU8sT0FBTyxDQUFDLENBQUMsQ0FBQyw0QkFBNEIsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDO0FBQ2pFLENBQUMsQ0FBQztBQUVGLHdFQUF3RTtBQUN4RSxNQUFNLENBQUMsTUFBTSxVQUFVLEdBQUcsQ0FBQyxRQUFnQixFQUFVLEVBQUUsQ0FDckQsSUFBSSxRQUFRLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDO0FBRTNDOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBRyxLQUFLLEVBQ3pDLGFBQTRDLEVBQzVDLGNBQXNCLEVBQ1AsRUFBRTtJQUNqQixNQUFNLE9BQU8sR0FBRyxNQUFNLDRCQUE0QixDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQ25FLE1BQU0sS0FBSyxHQUFHLEdBQUcsT0FBTyxDQUFDLElBQUksSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO0lBQzFELE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLENBQUMsQ0FBQztJQUN2QyxJQUFJLENBQUM7UUFDSCxxRUFBcUU7UUFDckUsTUFBTSxVQUFVLEdBQUcsTUFBTSxhQUFhLENBQUMsSUFBSSxDQUN6QyxNQUFNLFVBQVUsQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUN0RyxDQUFDO1FBQ0YsSUFBSSxVQUFVLENBQUMsUUFBUSxLQUFLLENBQUMsRUFBRSxDQUFDO1lBQzlCLE9BQU8sQ0FBQyxLQUFLLENBQ1gsR0FBRyxLQUFLLGdCQUFnQixVQUFVLENBQUMsUUFBUSxtQ0FBbUMsQ0FDL0UsQ0FBQztRQUNKLENBQUM7SUFDSCxDQUFDO0lBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztRQUNmLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxLQUFLLFlBQVksS0FBSyxFQUFFLENBQUMsQ0FBQztJQUM3QyxDQUFDO0FBQ0gsQ0FBQyxDQUFDIn0=
|