@git.zone/cli 2.13.13 → 2.14.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/dist_ts/00_commitinfo_data.js +2 -2
- package/dist_ts/gitzone.cli.js +46 -35
- package/dist_ts/helpers.climode.d.ts +22 -0
- package/dist_ts/helpers.climode.js +158 -0
- package/dist_ts/helpers.smartconfig.d.ts +11 -0
- package/dist_ts/helpers.smartconfig.js +139 -0
- package/dist_ts/mod_commit/index.d.ts +2 -0
- package/dist_ts/mod_commit/index.js +204 -92
- package/dist_ts/mod_config/index.d.ts +7 -2
- package/dist_ts/mod_config/index.js +390 -176
- package/dist_ts/mod_format/classes.formatcontext.d.ts +11 -2
- package/dist_ts/mod_format/classes.formatcontext.js +14 -4
- package/dist_ts/mod_format/formatters/packagejson.formatter.js +1 -67
- package/dist_ts/mod_format/formatters/smartconfig.formatter.d.ts +2 -7
- package/dist_ts/mod_format/formatters/smartconfig.formatter.js +57 -93
- package/dist_ts/mod_format/index.d.ts +4 -1
- package/dist_ts/mod_format/index.js +235 -67
- package/dist_ts/mod_format/mod.plugins.d.ts +1 -2
- package/dist_ts/mod_format/mod.plugins.js +2 -3
- package/dist_ts/mod_services/index.d.ts +2 -0
- package/dist_ts/mod_services/index.js +366 -168
- package/dist_ts/mod_standard/index.d.ts +3 -1
- package/dist_ts/mod_standard/index.js +159 -59
- package/package.json +1 -1
- package/readme.hints.md +25 -32
- package/readme.md +87 -65
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/gitzone.cli.ts +50 -38
- package/ts/helpers.climode.ts +212 -0
- package/ts/helpers.smartconfig.ts +192 -0
- package/ts/mod_commit/index.ts +325 -98
- package/ts/mod_config/index.ts +490 -182
- package/ts/mod_format/classes.formatcontext.ts +20 -3
- package/ts/mod_format/formatters/packagejson.formatter.ts +0 -91
- package/ts/mod_format/formatters/smartconfig.formatter.ts +67 -94
- package/ts/mod_format/index.ts +294 -81
- package/ts/mod_format/mod.plugins.ts +0 -2
- package/ts/mod_services/index.ts +550 -183
- package/ts/mod_standard/index.ts +191 -58
|
@@ -1,19 +1,47 @@
|
|
|
1
|
-
import * as plugins from
|
|
2
|
-
import { Project } from
|
|
3
|
-
import { FormatContext } from
|
|
4
|
-
import { FormatPlanner } from
|
|
5
|
-
import { BaseFormatter } from
|
|
6
|
-
import { logger, setVerboseMode } from
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
13
|
-
import {
|
|
14
|
-
import {
|
|
15
|
-
import {
|
|
16
|
-
import {
|
|
1
|
+
import * as plugins from "./mod.plugins.js";
|
|
2
|
+
import { Project } from "../classes.project.js";
|
|
3
|
+
import { FormatContext } from "./classes.formatcontext.js";
|
|
4
|
+
import { FormatPlanner } from "./classes.formatplanner.js";
|
|
5
|
+
import { BaseFormatter } from "./classes.baseformatter.js";
|
|
6
|
+
import { logger, setVerboseMode } from "../gitzone.logging.js";
|
|
7
|
+
import { getCliMode, printJson, runWithSuppressedOutput, } from "../helpers.climode.js";
|
|
8
|
+
import { getCliConfigValue } from "../helpers.smartconfig.js";
|
|
9
|
+
import { CleanupFormatter } from "./formatters/cleanup.formatter.js";
|
|
10
|
+
import { SmartconfigFormatter } from "./formatters/smartconfig.formatter.js";
|
|
11
|
+
import { LicenseFormatter } from "./formatters/license.formatter.js";
|
|
12
|
+
import { PackageJsonFormatter } from "./formatters/packagejson.formatter.js";
|
|
13
|
+
import { TemplatesFormatter } from "./formatters/templates.formatter.js";
|
|
14
|
+
import { GitignoreFormatter } from "./formatters/gitignore.formatter.js";
|
|
15
|
+
import { TsconfigFormatter } from "./formatters/tsconfig.formatter.js";
|
|
16
|
+
import { PrettierFormatter } from "./formatters/prettier.formatter.js";
|
|
17
|
+
import { ReadmeFormatter } from "./formatters/readme.formatter.js";
|
|
18
|
+
import { CopyFormatter } from "./formatters/copy.formatter.js";
|
|
19
|
+
/**
|
|
20
|
+
* Rename npmextra.json or smartconfig.json to .smartconfig.json
|
|
21
|
+
* before any formatter tries to read config.
|
|
22
|
+
*/
|
|
23
|
+
async function migrateConfigFile(allowWrite) {
|
|
24
|
+
const target = ".smartconfig.json";
|
|
25
|
+
const targetExists = await plugins.smartfs.file(target).exists();
|
|
26
|
+
if (targetExists)
|
|
27
|
+
return;
|
|
28
|
+
for (const oldName of ["smartconfig.json", "npmextra.json"]) {
|
|
29
|
+
const exists = await plugins.smartfs.file(oldName).exists();
|
|
30
|
+
if (exists) {
|
|
31
|
+
if (!allowWrite) {
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
const content = (await plugins.smartfs
|
|
35
|
+
.file(oldName)
|
|
36
|
+
.encoding("utf8")
|
|
37
|
+
.read());
|
|
38
|
+
await plugins.smartfs.file(`./${target}`).encoding("utf8").write(content);
|
|
39
|
+
await plugins.smartfs.file(oldName).delete();
|
|
40
|
+
logger.log("info", `Migrated ${oldName} to ${target}`);
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
17
45
|
// Shared formatter class map used by both run() and runFormatter()
|
|
18
46
|
const formatterMap = {
|
|
19
47
|
cleanup: CleanupFormatter,
|
|
@@ -28,99 +56,173 @@ const formatterMap = {
|
|
|
28
56
|
copy: CopyFormatter,
|
|
29
57
|
};
|
|
30
58
|
// Formatters that don't require projectType to be set
|
|
31
|
-
const formattersNotRequiringProjectType = [
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
const
|
|
39
|
-
|
|
40
|
-
const smartconfigInstance = new plugins.smartconfig.Smartconfig();
|
|
41
|
-
const formatConfig = smartconfigInstance.dataFor('@git.zone/cli.format', {
|
|
59
|
+
const formattersNotRequiringProjectType = [
|
|
60
|
+
"smartconfig",
|
|
61
|
+
"prettier",
|
|
62
|
+
"cleanup",
|
|
63
|
+
"packagejson",
|
|
64
|
+
];
|
|
65
|
+
const getFormatConfig = async () => {
|
|
66
|
+
const rawFormatConfig = await getCliConfigValue("format", {});
|
|
67
|
+
return {
|
|
42
68
|
interactive: true,
|
|
43
69
|
showDiffs: false,
|
|
44
70
|
autoApprove: false,
|
|
71
|
+
showStats: true,
|
|
45
72
|
modules: {
|
|
46
73
|
skip: [],
|
|
47
74
|
only: [],
|
|
75
|
+
...(rawFormatConfig.modules || {}),
|
|
48
76
|
},
|
|
77
|
+
...rawFormatConfig,
|
|
78
|
+
};
|
|
79
|
+
};
|
|
80
|
+
const createActiveFormatters = async (options) => {
|
|
81
|
+
const project = await Project.fromCwd({ requireProjectType: false });
|
|
82
|
+
const context = new FormatContext(options);
|
|
83
|
+
const planner = new FormatPlanner();
|
|
84
|
+
const formatConfig = await getFormatConfig();
|
|
85
|
+
const formatters = Object.entries(formatterMap).map(([, FormatterClass]) => new FormatterClass(context, project));
|
|
86
|
+
const activeFormatters = formatters.filter((formatter) => {
|
|
87
|
+
if (formatConfig.modules.only.length > 0) {
|
|
88
|
+
return formatConfig.modules.only.includes(formatter.name);
|
|
89
|
+
}
|
|
90
|
+
if (formatConfig.modules.skip.includes(formatter.name)) {
|
|
91
|
+
return false;
|
|
92
|
+
}
|
|
93
|
+
return true;
|
|
94
|
+
});
|
|
95
|
+
return {
|
|
96
|
+
context,
|
|
97
|
+
planner,
|
|
98
|
+
formatConfig,
|
|
99
|
+
activeFormatters,
|
|
100
|
+
};
|
|
101
|
+
};
|
|
102
|
+
const buildFormatPlan = async (options) => {
|
|
103
|
+
const { context, planner, formatConfig, activeFormatters } = await createActiveFormatters({
|
|
104
|
+
interactive: options.interactive,
|
|
105
|
+
jsonOutput: options.jsonOutput,
|
|
49
106
|
});
|
|
50
|
-
const
|
|
107
|
+
const plan = options.fromPlan
|
|
108
|
+
? JSON.parse((await plugins.smartfs
|
|
109
|
+
.file(options.fromPlan)
|
|
110
|
+
.encoding("utf8")
|
|
111
|
+
.read()))
|
|
112
|
+
: await planner.planFormat(activeFormatters);
|
|
113
|
+
return {
|
|
114
|
+
context,
|
|
115
|
+
planner,
|
|
116
|
+
formatConfig,
|
|
117
|
+
activeFormatters,
|
|
118
|
+
plan,
|
|
119
|
+
};
|
|
120
|
+
};
|
|
121
|
+
const serializePlan = (plan) => {
|
|
122
|
+
return {
|
|
123
|
+
summary: plan.summary,
|
|
124
|
+
warnings: plan.warnings,
|
|
125
|
+
changes: plan.changes.map((change) => ({
|
|
126
|
+
type: change.type,
|
|
127
|
+
path: change.path,
|
|
128
|
+
module: change.module,
|
|
129
|
+
description: change.description,
|
|
130
|
+
})),
|
|
131
|
+
};
|
|
132
|
+
};
|
|
133
|
+
export let run = async (options = {}) => {
|
|
134
|
+
const mode = await getCliMode(options);
|
|
135
|
+
const subcommand = options?._?.[1];
|
|
136
|
+
if (mode.help || subcommand === "help") {
|
|
137
|
+
showHelp(mode);
|
|
138
|
+
return;
|
|
139
|
+
}
|
|
140
|
+
if (options.verbose) {
|
|
141
|
+
setVerboseMode(true);
|
|
142
|
+
}
|
|
143
|
+
const shouldWrite = options.write ?? options.dryRun === false;
|
|
144
|
+
const treatAsPlan = subcommand === "plan";
|
|
145
|
+
if (mode.json && shouldWrite) {
|
|
146
|
+
printJson({
|
|
147
|
+
ok: false,
|
|
148
|
+
error: "JSON output is only supported for read-only format planning. Use `gitzone format plan --json` or omit `--json` when applying changes.",
|
|
149
|
+
});
|
|
150
|
+
return;
|
|
151
|
+
}
|
|
152
|
+
// Migrate config file before anything reads it
|
|
153
|
+
await migrateConfigFile(shouldWrite);
|
|
154
|
+
const formatConfig = await getFormatConfig();
|
|
155
|
+
const interactive = options.interactive ?? (mode.interactive && formatConfig.interactive);
|
|
51
156
|
const autoApprove = options.yes ?? formatConfig.autoApprove;
|
|
52
157
|
try {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
.encoding('utf8')
|
|
71
|
-
.read()))
|
|
72
|
-
: await planner.planFormat(activeFormatters);
|
|
158
|
+
const planBuilder = async () => {
|
|
159
|
+
return await buildFormatPlan({
|
|
160
|
+
fromPlan: options.fromPlan,
|
|
161
|
+
interactive,
|
|
162
|
+
jsonOutput: mode.json,
|
|
163
|
+
});
|
|
164
|
+
};
|
|
165
|
+
if (!mode.json) {
|
|
166
|
+
logger.log("info", "Analyzing project for format operations...");
|
|
167
|
+
}
|
|
168
|
+
const { context, planner, activeFormatters, plan } = mode.json
|
|
169
|
+
? await runWithSuppressedOutput(planBuilder)
|
|
170
|
+
: await planBuilder();
|
|
171
|
+
if (mode.json) {
|
|
172
|
+
printJson(serializePlan(plan));
|
|
173
|
+
return;
|
|
174
|
+
}
|
|
73
175
|
// Display plan
|
|
74
176
|
await planner.displayPlan(plan, options.detailed);
|
|
75
177
|
// Save plan if requested
|
|
76
178
|
if (options.savePlan) {
|
|
77
179
|
await plugins.smartfs
|
|
78
180
|
.file(options.savePlan)
|
|
79
|
-
.encoding(
|
|
181
|
+
.encoding("utf8")
|
|
80
182
|
.write(JSON.stringify(plan, null, 2));
|
|
81
|
-
logger.log(
|
|
183
|
+
logger.log("info", `Plan saved to ${options.savePlan}`);
|
|
82
184
|
}
|
|
83
|
-
if (options.planOnly) {
|
|
185
|
+
if (options.planOnly || treatAsPlan) {
|
|
84
186
|
return;
|
|
85
187
|
}
|
|
86
188
|
// Show diffs if explicitly requested or before interactive write confirmation
|
|
87
189
|
const showDiffs = options.diff || (shouldWrite && interactive && !autoApprove);
|
|
88
190
|
if (showDiffs) {
|
|
89
|
-
logger.log(
|
|
90
|
-
console.log(
|
|
191
|
+
logger.log("info", "Showing file diffs:");
|
|
192
|
+
console.log("");
|
|
91
193
|
for (const formatter of activeFormatters) {
|
|
92
194
|
const checkResult = await formatter.check();
|
|
93
195
|
if (checkResult.hasDiff) {
|
|
94
|
-
logger.log(
|
|
196
|
+
logger.log("info", `[${formatter.name}]`);
|
|
95
197
|
formatter.displayAllDiffs(checkResult);
|
|
96
|
-
console.log(
|
|
198
|
+
console.log("");
|
|
97
199
|
}
|
|
98
200
|
}
|
|
99
201
|
}
|
|
100
202
|
// Dry-run mode (default behavior)
|
|
101
203
|
if (!shouldWrite) {
|
|
102
|
-
logger.log(
|
|
204
|
+
logger.log("info", "Dry-run mode - use --write (-w) to apply changes");
|
|
103
205
|
return;
|
|
104
206
|
}
|
|
105
207
|
// Interactive confirmation
|
|
106
208
|
if (interactive && !autoApprove) {
|
|
107
209
|
const interactInstance = new plugins.smartinteract.SmartInteract();
|
|
108
210
|
const response = await interactInstance.askQuestion({
|
|
109
|
-
type:
|
|
110
|
-
name:
|
|
111
|
-
message:
|
|
211
|
+
type: "confirm",
|
|
212
|
+
name: "proceed",
|
|
213
|
+
message: "Proceed with formatting?",
|
|
112
214
|
default: true,
|
|
113
215
|
});
|
|
114
216
|
if (!response.value) {
|
|
115
|
-
logger.log(
|
|
217
|
+
logger.log("info", "Format operation cancelled by user");
|
|
116
218
|
return;
|
|
117
219
|
}
|
|
118
220
|
}
|
|
119
221
|
// Execute phase
|
|
120
|
-
logger.log(
|
|
222
|
+
logger.log("info", "Executing format operations...");
|
|
121
223
|
await planner.executePlan(plan, activeFormatters, context);
|
|
122
224
|
context.getFormatStats().finish();
|
|
123
|
-
const showStats =
|
|
225
|
+
const showStats = formatConfig.showStats ?? true;
|
|
124
226
|
if (showStats) {
|
|
125
227
|
context.getFormatStats().displayStats();
|
|
126
228
|
}
|
|
@@ -128,10 +230,11 @@ export let run = async (options = {}) => {
|
|
|
128
230
|
const statsPath = `.nogit/format-stats-${Date.now()}.json`;
|
|
129
231
|
await context.getFormatStats().saveReport(statsPath);
|
|
130
232
|
}
|
|
131
|
-
logger.log(
|
|
233
|
+
logger.log("success", "Format operations completed successfully!");
|
|
132
234
|
}
|
|
133
235
|
catch (error) {
|
|
134
|
-
|
|
236
|
+
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
237
|
+
logger.log("error", `Format operation failed: ${errorMessage}`);
|
|
135
238
|
throw error;
|
|
136
239
|
}
|
|
137
240
|
};
|
|
@@ -141,7 +244,7 @@ export let run = async (options = {}) => {
|
|
|
141
244
|
export const runFormatter = async (formatterName, options = {}) => {
|
|
142
245
|
const requireProjectType = !formattersNotRequiringProjectType.includes(formatterName);
|
|
143
246
|
const project = await Project.fromCwd({ requireProjectType });
|
|
144
|
-
const context = new FormatContext();
|
|
247
|
+
const context = new FormatContext({ interactive: true, jsonOutput: false });
|
|
145
248
|
const FormatterClass = formatterMap[formatterName];
|
|
146
249
|
if (!FormatterClass) {
|
|
147
250
|
throw new Error(`Unknown formatter: ${formatterName}`);
|
|
@@ -159,7 +262,72 @@ export const runFormatter = async (formatterName, options = {}) => {
|
|
|
159
262
|
await formatter.applyChange(change);
|
|
160
263
|
}
|
|
161
264
|
if (!options.silent) {
|
|
162
|
-
logger.log(
|
|
265
|
+
logger.log("success", `Formatter '${formatterName}' completed`);
|
|
163
266
|
}
|
|
164
267
|
};
|
|
165
|
-
|
|
268
|
+
export function showHelp(mode) {
|
|
269
|
+
if (mode?.json) {
|
|
270
|
+
printJson({
|
|
271
|
+
command: "format",
|
|
272
|
+
usage: "gitzone format [plan] [options]",
|
|
273
|
+
description: "Plans formatting changes by default and applies them only with --write.",
|
|
274
|
+
flags: [
|
|
275
|
+
{ flag: "--write, -w", description: "Apply planned changes" },
|
|
276
|
+
{
|
|
277
|
+
flag: "--yes",
|
|
278
|
+
description: "Skip the interactive confirmation before writing",
|
|
279
|
+
},
|
|
280
|
+
{
|
|
281
|
+
flag: "--plan-only",
|
|
282
|
+
description: "Show the plan without applying changes",
|
|
283
|
+
},
|
|
284
|
+
{
|
|
285
|
+
flag: "--save-plan <file>",
|
|
286
|
+
description: "Write the format plan to a file",
|
|
287
|
+
},
|
|
288
|
+
{
|
|
289
|
+
flag: "--from-plan <file>",
|
|
290
|
+
description: "Load a previously saved plan",
|
|
291
|
+
},
|
|
292
|
+
{
|
|
293
|
+
flag: "--detailed",
|
|
294
|
+
description: "Show detailed diffs and save stats",
|
|
295
|
+
},
|
|
296
|
+
{ flag: "--verbose", description: "Enable verbose logging" },
|
|
297
|
+
{
|
|
298
|
+
flag: "--diff",
|
|
299
|
+
description: "Show per-file diffs before applying changes",
|
|
300
|
+
},
|
|
301
|
+
{ flag: "--json", description: "Emit a read-only format plan as JSON" },
|
|
302
|
+
],
|
|
303
|
+
examples: [
|
|
304
|
+
"gitzone format",
|
|
305
|
+
"gitzone format plan --json",
|
|
306
|
+
"gitzone format --write --yes",
|
|
307
|
+
],
|
|
308
|
+
});
|
|
309
|
+
return;
|
|
310
|
+
}
|
|
311
|
+
console.log("");
|
|
312
|
+
console.log("Usage: gitzone format [plan] [options]");
|
|
313
|
+
console.log("");
|
|
314
|
+
console.log("Plans formatting changes by default and applies them only with --write.");
|
|
315
|
+
console.log("");
|
|
316
|
+
console.log("Flags:");
|
|
317
|
+
console.log(" --write, -w Apply planned changes");
|
|
318
|
+
console.log(" --yes Skip the interactive confirmation before writing");
|
|
319
|
+
console.log(" --plan-only Show the plan without applying changes");
|
|
320
|
+
console.log(" --save-plan <file> Write the format plan to a file");
|
|
321
|
+
console.log(" --from-plan <file> Load a previously saved plan");
|
|
322
|
+
console.log(" --detailed Show detailed diffs and save stats");
|
|
323
|
+
console.log(" --verbose Enable verbose logging");
|
|
324
|
+
console.log(" --diff Show per-file diffs before applying changes");
|
|
325
|
+
console.log(" --json Emit a read-only format plan as JSON");
|
|
326
|
+
console.log("");
|
|
327
|
+
console.log("Examples:");
|
|
328
|
+
console.log(" gitzone format");
|
|
329
|
+
console.log(" gitzone format plan --json");
|
|
330
|
+
console.log(" gitzone format --write --yes");
|
|
331
|
+
console.log("");
|
|
332
|
+
}
|
|
333
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_format/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE/D,OAAO,EACL,UAAU,EACV,SAAS,EACT,uBAAuB,GACxB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D;;;GAGG;AACH,KAAK,UAAU,iBAAiB,CAAC,UAAmB;IAClD,MAAM,MAAM,GAAG,mBAAmB,CAAC;IACnC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;IACjE,IAAI,YAAY;QAAE,OAAO;IAEzB,KAAK,MAAM,OAAO,IAAI,CAAC,kBAAkB,EAAE,eAAe,CAAC,EAAE,CAAC;QAC5D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;QAC5D,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,OAAO;YACT,CAAC;YACD,MAAM,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC,OAAO;iBACnC,IAAI,CAAC,OAAO,CAAC;iBACb,QAAQ,CAAC,MAAM,CAAC;iBAChB,IAAI,EAAE,CAAW,CAAC;YACrB,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC1E,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;YAC7C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,OAAO,OAAO,MAAM,EAAE,CAAC,CAAC;YACvD,OAAO;QACT,CAAC;IACH,CAAC;AACH,CAAC;AAED,mEAAmE;AACnE,MAAM,YAAY,GAGd;IACF,OAAO,EAAE,gBAAgB;IACzB,WAAW,EAAE,oBAAoB;IACjC,OAAO,EAAE,gBAAgB;IACzB,WAAW,EAAE,oBAAoB;IACjC,SAAS,EAAE,kBAAkB;IAC7B,SAAS,EAAE,kBAAkB;IAC7B,QAAQ,EAAE,iBAAiB;IAC3B,QAAQ,EAAE,iBAAiB;IAC3B,MAAM,EAAE,eAAe;IACvB,IAAI,EAAE,aAAa;CACpB,CAAC;AAEF,sDAAsD;AACtD,MAAM,iCAAiC,GAAG;IACxC,aAAa;IACb,UAAU;IACV,SAAS;IACT,aAAa;CACd,CAAC;AAEF,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE;IACjC,MAAM,eAAe,GAAG,MAAM,iBAAiB,CAC7C,QAAQ,EACR,EAAE,CACH,CAAC;IACF,OAAO;QACL,WAAW,EAAE,IAAI;QACjB,SAAS,EAAE,KAAK;QAChB,WAAW,EAAE,KAAK;QAClB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE;YACP,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,EAAE;YACR,GAAG,CAAC,eAAe,CAAC,OAAO,IAAI,EAAE,CAAC;SACnC;QACD,GAAG,eAAe;KACnB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,KAAK,EAAE,OAGrC,EAAE,EAAE;IACH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAAC;IACrE,MAAM,OAAO,GAAG,IAAI,aAAa,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,IAAI,aAAa,EAAE,CAAC;IAEpC,MAAM,YAAY,GAAG,MAAM,eAAe,EAAE,CAAC;IAC7C,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,CACjD,CAAC,CAAC,EAAE,cAAc,CAAC,EAAE,EAAE,CAAC,IAAI,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAC7D,CAAC;IAEF,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;QACvD,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzC,OAAO,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5D,CAAC;QACD,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YACvD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,OAAO;QACP,OAAO;QACP,YAAY;QACZ,gBAAgB;KACjB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,KAAK,EAAE,OAI9B,EAAE,EAAE;IACH,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,GACxD,MAAM,sBAAsB,CAAC;QAC3B,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,UAAU,EAAE,OAAO,CAAC,UAAU;KAC/B,CAAC,CAAC;IAEL,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ;QAC3B,CAAC,CAAC,IAAI,CAAC,KAAK,CACR,CAAC,MAAM,OAAO,CAAC,OAAO;aACnB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;aACtB,QAAQ,CAAC,MAAM,CAAC;aAChB,IAAI,EAAE,CAAW,CACrB;QACH,CAAC,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAE/C,OAAO;QACL,OAAO;QACP,OAAO;QACP,YAAY;QACZ,gBAAgB;QAChB,IAAI;KACL,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,IAAS,EAAE,EAAE;IAClC,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,CAAC;YAC1C,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,WAAW,EAAE,MAAM,CAAC,WAAW;SAChC,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,IAAI,GAAG,GAAG,KAAK,EACpB,UAYI,EAAE,EACQ,EAAE;IAChB,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,OAAc,CAAC,CAAC;IAC9C,MAAM,UAAU,GAAI,OAAe,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAE5C,IAAI,IAAI,CAAC,IAAI,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;QACvC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACf,OAAO;IACT,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,cAAc,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,CAAC;IAC9D,MAAM,WAAW,GAAG,UAAU,KAAK,MAAM,CAAC;IAE1C,IAAI,IAAI,CAAC,IAAI,IAAI,WAAW,EAAE,CAAC;QAC7B,SAAS,CAAC;YACR,EAAE,EAAE,KAAK;YACT,KAAK,EACH,uIAAuI;SAC1I,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,+CAA+C;IAC/C,MAAM,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAErC,MAAM,YAAY,GAAG,MAAM,eAAe,EAAE,CAAC;IAC7C,MAAM,WAAW,GACf,OAAO,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,IAAI,YAAY,CAAC,WAAW,CAAC;IAE5D,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;YAC7B,OAAO,MAAM,eAAe,CAAC;gBAC3B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,WAAW;gBACX,UAAU,EAAE,IAAI,CAAC,IAAI;aACtB,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4CAA4C,CAAC,CAAC;QACnE,CAAC;QACD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI;YAC5D,CAAC,CAAC,MAAM,uBAAuB,CAAC,WAAW,CAAC;YAC5C,CAAC,CAAC,MAAM,WAAW,EAAE,CAAC;QAExB,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;YAC/B,OAAO;QACT,CAAC;QAED,eAAe;QACf,MAAM,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QAElD,yBAAyB;QACzB,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACrB,MAAM,OAAO,CAAC,OAAO;iBAClB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;iBACtB,QAAQ,CAAC,MAAM,CAAC;iBAChB,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACxC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1D,CAAC;QAED,IAAI,OAAO,CAAC,QAAQ,IAAI,WAAW,EAAE,CAAC;YACpC,OAAO;QACT,CAAC;QAED,8EAA8E;QAC9E,MAAM,SAAS,GACb,OAAO,CAAC,IAAI,IAAI,CAAC,WAAW,IAAI,WAAW,IAAI,CAAC,WAAW,CAAC,CAAC;QAC/D,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;YAC1C,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAEhB,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;gBACzC,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;gBAC5C,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;oBACxB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,CAAC;oBAC1C,SAAS,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;oBACvC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAClB,CAAC;YACH,CAAC;QACH,CAAC;QAED,kCAAkC;QAClC,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kDAAkD,CAAC,CAAC;YACvE,OAAO;QACT,CAAC;QAED,2BAA2B;QAC3B,IAAI,WAAW,IAAI,CAAC,WAAW,EAAE,CAAC;YAChC,MAAM,gBAAgB,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;YACnE,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC;gBAClD,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,0BAA0B;gBACnC,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;YAEH,IAAI,CAAE,QAAgB,CAAC,KAAK,EAAE,CAAC;gBAC7B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oCAAoC,CAAC,CAAC;gBACzD,OAAO;YACT,CAAC;QACH,CAAC;QAED,gBAAgB;QAChB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAC;QACrD,MAAM,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;QAE3D,OAAO,CAAC,cAAc,EAAE,CAAC,MAAM,EAAE,CAAC;QAElC,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,IAAI,IAAI,CAAC;QACjD,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,CAAC,cAAc,EAAE,CAAC,YAAY,EAAE,CAAC;QAC1C,CAAC;QAED,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACrB,MAAM,SAAS,GAAG,uBAAuB,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC;YAC3D,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,2CAA2C,CAAC,CAAC;IACrE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5E,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,4BAA4B,YAAY,EAAE,CAAC,CAAC;QAChE,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAKF;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAC/B,aAAqB,EACrB,UAII,EAAE,EACwB,EAAE;IAChC,MAAM,kBAAkB,GACtB,CAAC,iCAAiC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,IAAI,aAAa,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;IAE5E,MAAM,cAAc,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;IACnD,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,sBAAsB,aAAa,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAEvD,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACtB,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;QACvC,IAAI,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACvC,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;IAE1C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,cAAc,aAAa,aAAa,CAAC,CAAC;IAClE,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,UAAU,QAAQ,CAAC,IAAe;IACtC,IAAI,IAAI,EAAE,IAAI,EAAE,CAAC;QACf,SAAS,CAAC;YACR,OAAO,EAAE,QAAQ;YACjB,KAAK,EAAE,iCAAiC;YACxC,WAAW,EACT,yEAAyE;YAC3E,KAAK,EAAE;gBACL,EAAE,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,uBAAuB,EAAE;gBAC7D;oBACE,IAAI,EAAE,OAAO;oBACb,WAAW,EAAE,kDAAkD;iBAChE;gBACD;oBACE,IAAI,EAAE,aAAa;oBACnB,WAAW,EAAE,wCAAwC;iBACtD;gBACD;oBACE,IAAI,EAAE,oBAAoB;oBAC1B,WAAW,EAAE,iCAAiC;iBAC/C;gBACD;oBACE,IAAI,EAAE,oBAAoB;oBAC1B,WAAW,EAAE,8BAA8B;iBAC5C;gBACD;oBACE,IAAI,EAAE,YAAY;oBAClB,WAAW,EAAE,oCAAoC;iBAClD;gBACD,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,wBAAwB,EAAE;gBAC5D;oBACE,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,6CAA6C;iBAC3D;gBACD,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,sCAAsC,EAAE;aACxE;YACD,QAAQ,EAAE;gBACR,gBAAgB;gBAChB,4BAA4B;gBAC5B,8BAA8B;aAC/B;SACF,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CACT,yEAAyE,CAC1E,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACtB,OAAO,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;IAC5D,OAAO,CAAC,GAAG,CACT,yEAAyE,CAC1E,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,+DAA+D,CAAC,CAAC;IAC7E,OAAO,CAAC,GAAG,CAAC,wDAAwD,CAAC,CAAC;IACtE,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,2DAA2D,CAAC,CAAC;IACzE,OAAO,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;IAC7D,OAAO,CAAC,GAAG,CACT,oEAAoE,CACrE,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,6DAA6D,CAAC,CAAC;IAC3E,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACzB,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC"}
|
|
@@ -4,8 +4,7 @@ import * as smartfile from '@push.rocks/smartfile';
|
|
|
4
4
|
import * as smartinteract from '@push.rocks/smartinteract';
|
|
5
5
|
import * as smartlegal from '@push.rocks/smartlegal';
|
|
6
6
|
import * as smartobject from '@push.rocks/smartobject';
|
|
7
|
-
import * as smartnpm from '@push.rocks/smartnpm';
|
|
8
7
|
import * as smartconfig from '@push.rocks/smartconfig';
|
|
9
8
|
import * as smartdiff from '@push.rocks/smartdiff';
|
|
10
9
|
import * as smartscaf from '@push.rocks/smartscaf';
|
|
11
|
-
export { path, smartfile, smartinteract, smartlegal, smartobject,
|
|
10
|
+
export { path, smartfile, smartinteract, smartlegal, smartobject, smartconfig, smartdiff, smartscaf, };
|
|
@@ -4,9 +4,8 @@ import * as smartfile from '@push.rocks/smartfile';
|
|
|
4
4
|
import * as smartinteract from '@push.rocks/smartinteract';
|
|
5
5
|
import * as smartlegal from '@push.rocks/smartlegal';
|
|
6
6
|
import * as smartobject from '@push.rocks/smartobject';
|
|
7
|
-
import * as smartnpm from '@push.rocks/smartnpm';
|
|
8
7
|
import * as smartconfig from '@push.rocks/smartconfig';
|
|
9
8
|
import * as smartdiff from '@push.rocks/smartdiff';
|
|
10
9
|
import * as smartscaf from '@push.rocks/smartscaf';
|
|
11
|
-
export { path, smartfile, smartinteract, smartlegal, smartobject,
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
export { path, smartfile, smartinteract, smartlegal, smartobject, smartconfig, smartdiff, smartscaf, };
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfZm9ybWF0L21vZC5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsZUFBZSxDQUFDO0FBRTlCLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLGFBQWEsTUFBTSwyQkFBMkIsQ0FBQztBQUMzRCxPQUFPLEtBQUssVUFBVSxNQUFNLHdCQUF3QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxXQUFXLE1BQU0seUJBQXlCLENBQUM7QUFDdkQsT0FBTyxLQUFLLFdBQVcsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssU0FBUyxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFFbkQsT0FBTyxFQUNMLElBQUksRUFDSixTQUFTLEVBQ1QsYUFBYSxFQUNiLFVBQVUsRUFDVixXQUFXLEVBQ1gsV0FBVyxFQUNYLFNBQVMsRUFDVCxTQUFTLEdBQ1YsQ0FBQyJ9
|