docrev 0.9.5 → 0.9.6

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.
Files changed (76) hide show
  1. package/dist/lib/commands/file-ops.d.ts +11 -0
  2. package/dist/lib/commands/file-ops.d.ts.map +1 -0
  3. package/dist/lib/commands/file-ops.js +301 -0
  4. package/dist/lib/commands/file-ops.js.map +1 -0
  5. package/dist/lib/commands/index.d.ts +9 -1
  6. package/dist/lib/commands/index.d.ts.map +1 -1
  7. package/dist/lib/commands/index.js +17 -1
  8. package/dist/lib/commands/index.js.map +1 -1
  9. package/dist/lib/commands/merge-resolve.d.ts +12 -0
  10. package/dist/lib/commands/merge-resolve.d.ts.map +1 -0
  11. package/dist/lib/commands/merge-resolve.js +318 -0
  12. package/dist/lib/commands/merge-resolve.js.map +1 -0
  13. package/dist/lib/commands/preview.d.ts +11 -0
  14. package/dist/lib/commands/preview.d.ts.map +1 -0
  15. package/dist/lib/commands/preview.js +138 -0
  16. package/dist/lib/commands/preview.js.map +1 -0
  17. package/dist/lib/commands/project-info.d.ts +11 -0
  18. package/dist/lib/commands/project-info.d.ts.map +1 -0
  19. package/dist/lib/commands/project-info.js +187 -0
  20. package/dist/lib/commands/project-info.js.map +1 -0
  21. package/dist/lib/commands/quality.d.ts +11 -0
  22. package/dist/lib/commands/quality.d.ts.map +1 -0
  23. package/dist/lib/commands/quality.js +384 -0
  24. package/dist/lib/commands/quality.js.map +1 -0
  25. package/dist/lib/commands/sections.d.ts +3 -2
  26. package/dist/lib/commands/sections.d.ts.map +1 -1
  27. package/dist/lib/commands/sections.js +4 -736
  28. package/dist/lib/commands/sections.js.map +1 -1
  29. package/dist/lib/commands/sync.d.ts +11 -0
  30. package/dist/lib/commands/sync.d.ts.map +1 -0
  31. package/dist/lib/commands/sync.js +441 -0
  32. package/dist/lib/commands/sync.js.map +1 -0
  33. package/dist/lib/commands/text-ops.d.ts +11 -0
  34. package/dist/lib/commands/text-ops.d.ts.map +1 -0
  35. package/dist/lib/commands/text-ops.js +357 -0
  36. package/dist/lib/commands/text-ops.js.map +1 -0
  37. package/dist/lib/commands/utilities.d.ts +2 -4
  38. package/dist/lib/commands/utilities.d.ts.map +1 -1
  39. package/dist/lib/commands/utilities.js +3 -1572
  40. package/dist/lib/commands/utilities.js.map +1 -1
  41. package/dist/lib/commands/word-tools.d.ts +11 -0
  42. package/dist/lib/commands/word-tools.d.ts.map +1 -0
  43. package/dist/lib/commands/word-tools.js +272 -0
  44. package/dist/lib/commands/word-tools.js.map +1 -0
  45. package/dist/lib/diff-engine.d.ts +25 -0
  46. package/dist/lib/diff-engine.d.ts.map +1 -0
  47. package/dist/lib/diff-engine.js +354 -0
  48. package/dist/lib/diff-engine.js.map +1 -0
  49. package/dist/lib/import.d.ts +37 -117
  50. package/dist/lib/import.d.ts.map +1 -1
  51. package/dist/lib/import.js +10 -1030
  52. package/dist/lib/import.js.map +1 -1
  53. package/dist/lib/restore-references.d.ts +35 -0
  54. package/dist/lib/restore-references.d.ts.map +1 -0
  55. package/dist/lib/restore-references.js +188 -0
  56. package/dist/lib/restore-references.js.map +1 -0
  57. package/dist/lib/word-extraction.d.ts +77 -0
  58. package/dist/lib/word-extraction.d.ts.map +1 -0
  59. package/dist/lib/word-extraction.js +515 -0
  60. package/dist/lib/word-extraction.js.map +1 -0
  61. package/lib/commands/file-ops.ts +372 -0
  62. package/lib/commands/index.ts +24 -0
  63. package/lib/commands/merge-resolve.ts +378 -0
  64. package/lib/commands/preview.ts +178 -0
  65. package/lib/commands/project-info.ts +244 -0
  66. package/lib/commands/quality.ts +517 -0
  67. package/lib/commands/sections.ts +3 -870
  68. package/lib/commands/sync.ts +536 -0
  69. package/lib/commands/text-ops.ts +449 -0
  70. package/lib/commands/utilities.ts +62 -2043
  71. package/lib/commands/word-tools.ts +340 -0
  72. package/lib/diff-engine.ts +465 -0
  73. package/lib/import.ts +78 -1338
  74. package/lib/restore-references.ts +240 -0
  75. package/lib/word-extraction.ts +666 -0
  76. package/package.json +1 -1
@@ -0,0 +1,318 @@
1
+ /**
2
+ * MERGE, CONFLICTS, and MERGE-RESOLVE commands
3
+ *
4
+ * Commands for three-way merge of reviewer feedback and conflict resolution.
5
+ * Split from sections.ts for maintainability.
6
+ */
7
+ import { chalk, fs, path, fmt, } from './context.js';
8
+ import * as readline from 'readline';
9
+ /**
10
+ * Register merge, conflicts, and merge-resolve commands with the program
11
+ */
12
+ export function register(program) {
13
+ // ==========================================================================
14
+ // MERGE command - Combine feedback from multiple reviewers (three-way merge)
15
+ // ==========================================================================
16
+ program
17
+ .command('merge')
18
+ .description('Merge feedback from multiple Word documents using three-way merge')
19
+ .argument('<docx...>', 'Word documents from reviewers')
20
+ .option('-b, --base <file>', 'Base document (original sent to reviewers). Auto-detected if not specified.')
21
+ .option('-o, --output <file>', 'Output file (default: writes to section files)')
22
+ .option('--names <names>', 'Reviewer names (comma-separated, in order of docx files)')
23
+ .option('--strategy <strategy>', 'Conflict resolution: first, latest, or interactive (default)', 'interactive')
24
+ .option('--diff-level <level>', 'Diff granularity: sentence or word (default: sentence)', 'sentence')
25
+ .option('--dry-run', 'Show conflicts without writing')
26
+ .option('--sections', 'Split merged output back to section files')
27
+ .action(async (docxFiles, options) => {
28
+ const { mergeThreeWay, formatConflict, resolveConflict, getBaseDocument, checkBaseMatch, saveConflicts, } = await import('../merge.js');
29
+ // Validate reviewer files exist
30
+ for (const docx of docxFiles) {
31
+ if (!fs.existsSync(docx)) {
32
+ console.error(fmt.status('error', `Reviewer file not found: ${docx}`));
33
+ process.exit(1);
34
+ }
35
+ }
36
+ // Determine base document
37
+ let basePath = options.base;
38
+ let baseSource = 'specified';
39
+ if (!basePath) {
40
+ // Try to use .rev/base.docx
41
+ const projectDir = process.cwd();
42
+ basePath = getBaseDocument(projectDir) ?? undefined;
43
+ if (basePath) {
44
+ baseSource = 'auto (.rev/base.docx)';
45
+ }
46
+ else {
47
+ console.log(chalk.yellow('\n No base document found in .rev/base.docx'));
48
+ console.log(chalk.dim(' Tip: Run "rev build docx" to automatically save the base document.\n'));
49
+ console.error(fmt.status('error', 'Base document required. Use --base <file.docx>'));
50
+ process.exit(1);
51
+ }
52
+ }
53
+ if (!fs.existsSync(basePath)) {
54
+ console.error(fmt.status('error', `Base document not found: ${basePath}`));
55
+ process.exit(1);
56
+ }
57
+ // Check similarity between base and reviewer docs
58
+ const { matches, similarity } = await checkBaseMatch(basePath, docxFiles[0]);
59
+ if (!matches) {
60
+ console.log(chalk.yellow(`\n Warning: Base document may not match reviewer file (${Math.round(similarity * 100)}% similar)`));
61
+ console.log(chalk.dim(' If this is wrong, use --base to specify the correct original document.\n'));
62
+ }
63
+ // Parse reviewer names
64
+ const names = options.names
65
+ ? options.names.split(',').map(n => n.trim())
66
+ : docxFiles.map((f, i) => {
67
+ // Try to extract name from filename (e.g., paper_reviewer_A.docx)
68
+ const basename = path.basename(f, '.docx');
69
+ const match = basename.match(/_([A-Za-z]+)$/);
70
+ return match ? match[1] : `Reviewer ${i + 1}`;
71
+ });
72
+ // Pad names if needed
73
+ while (names.length < docxFiles.length) {
74
+ names.push(`Reviewer ${names.length + 1}`);
75
+ }
76
+ const reviewerDocs = docxFiles.map((p, i) => ({
77
+ path: p,
78
+ name: names[i],
79
+ }));
80
+ console.log(fmt.header('Three-Way Merge'));
81
+ console.log();
82
+ console.log(chalk.dim(` Base: ${path.basename(basePath)} (${baseSource})`));
83
+ console.log(chalk.dim(` Reviewers: ${names.join(', ')}`));
84
+ console.log(chalk.dim(` Diff level: ${options.diffLevel}`));
85
+ console.log();
86
+ const spin = fmt.spinner('Analyzing changes...').start();
87
+ try {
88
+ const { merged, conflicts, stats, baseText } = await mergeThreeWay(basePath, reviewerDocs, {
89
+ diffLevel: options.diffLevel,
90
+ });
91
+ spin.stop();
92
+ // Display stats
93
+ console.log(fmt.table(['Metric', 'Count'], [
94
+ ['Total changes', stats.totalChanges.toString()],
95
+ ['Non-conflicting', stats.nonConflicting.toString()],
96
+ ['Conflicts', stats.conflicts.toString()],
97
+ ['Comments', stats.comments.toString()],
98
+ ]));
99
+ console.log();
100
+ let finalMerged = merged;
101
+ // Handle conflicts
102
+ if (conflicts.length > 0) {
103
+ console.log(chalk.yellow(`Found ${conflicts.length} conflict(s):\n`));
104
+ if (options.strategy === 'first') {
105
+ // Auto-resolve: take first reviewer's change
106
+ for (const conflict of conflicts) {
107
+ console.log(chalk.dim(` Conflict ${conflict.id}: using ${conflict.changes[0].reviewer}'s change`));
108
+ resolveConflict(conflict, 0);
109
+ }
110
+ }
111
+ else if (options.strategy === 'latest') {
112
+ // Auto-resolve: take last reviewer's change
113
+ for (const conflict of conflicts) {
114
+ const lastIdx = conflict.changes.length - 1;
115
+ console.log(chalk.dim(` Conflict ${conflict.id}: using ${conflict.changes[lastIdx].reviewer}'s change`));
116
+ resolveConflict(conflict, lastIdx);
117
+ }
118
+ }
119
+ else if (!options.dryRun) {
120
+ // Interactive resolution
121
+ for (let i = 0; i < conflicts.length; i++) {
122
+ const conflict = conflicts[i];
123
+ console.log(chalk.bold(`\nConflict ${i + 1}/${conflicts.length} (${conflict.id}):`));
124
+ console.log(formatConflict(conflict, baseText));
125
+ console.log();
126
+ const rl = readline.createInterface({
127
+ input: process.stdin,
128
+ output: process.stdout,
129
+ });
130
+ const answer = await new Promise((resolve) => rl.question(chalk.cyan(` Choose (1-${conflict.changes.length}, s=skip): `), resolve));
131
+ rl.close();
132
+ if (answer.toLowerCase() !== 's' && !isNaN(parseInt(answer))) {
133
+ const choice = parseInt(answer) - 1;
134
+ if (choice >= 0 && choice < conflict.changes.length) {
135
+ resolveConflict(conflict, choice);
136
+ console.log(chalk.green(` ✓ Applied: ${conflict.changes[choice].reviewer}'s change`));
137
+ }
138
+ }
139
+ else {
140
+ console.log(chalk.dim(' Skipped (will need manual resolution)'));
141
+ }
142
+ }
143
+ }
144
+ // Save unresolved conflicts for later
145
+ const unresolved = conflicts.filter(c => c.resolved === null);
146
+ if (unresolved.length > 0) {
147
+ saveConflicts(process.cwd(), conflicts, basePath);
148
+ console.log(chalk.yellow(`\n ${unresolved.length} unresolved conflict(s) saved to .rev/conflicts.json`));
149
+ console.log(chalk.dim(' Run "rev conflicts" to view, "rev merge-resolve" to resolve'));
150
+ }
151
+ }
152
+ // Write output
153
+ if (!options.dryRun) {
154
+ if (options.output) {
155
+ // Write to single file
156
+ fs.writeFileSync(options.output, finalMerged, 'utf-8');
157
+ console.log(fmt.status('success', `Merged output written to ${options.output}`));
158
+ }
159
+ else if (options.sections) {
160
+ // Split to section files (TODO: implement section splitting)
161
+ console.log(chalk.yellow(' Section splitting not yet implemented'));
162
+ console.log(chalk.dim(' Use -o to specify output file'));
163
+ }
164
+ else {
165
+ // Default: write to merged.md
166
+ const outPath = 'merged.md';
167
+ fs.writeFileSync(outPath, finalMerged, 'utf-8');
168
+ console.log(fmt.status('success', `Merged output written to ${outPath}`));
169
+ }
170
+ console.log();
171
+ console.log(chalk.dim('Next steps:'));
172
+ console.log(chalk.dim(' 1. rev review merged.md - Accept/reject changes'));
173
+ console.log(chalk.dim(' 2. rev comments merged.md - Address comments'));
174
+ if (conflicts.some(c => c.resolved === null)) {
175
+ console.log(chalk.dim(' 3. rev merge-resolve - Resolve remaining conflicts'));
176
+ }
177
+ }
178
+ else {
179
+ console.log(fmt.status('info', 'Dry run - no output written'));
180
+ }
181
+ }
182
+ catch (err) {
183
+ spin.stop();
184
+ const error = err;
185
+ console.error(fmt.status('error', error.message));
186
+ if (process.env.DEBUG)
187
+ console.error(error.stack);
188
+ process.exit(1);
189
+ }
190
+ });
191
+ // ==========================================================================
192
+ // CONFLICTS command - List unresolved conflicts
193
+ // ==========================================================================
194
+ program
195
+ .command('conflicts')
196
+ .description('List unresolved merge conflicts')
197
+ .action(async () => {
198
+ const { loadConflicts, formatConflict } = await import('../merge.js');
199
+ const projectDir = process.cwd();
200
+ const data = loadConflicts(projectDir);
201
+ if (!data) {
202
+ console.log(fmt.status('info', 'No conflicts file found'));
203
+ return;
204
+ }
205
+ const unresolved = data.conflicts.filter((c) => c.resolved === null);
206
+ if (unresolved.length === 0) {
207
+ console.log(fmt.status('success', 'All conflicts resolved!'));
208
+ return;
209
+ }
210
+ console.log(fmt.header(`Unresolved Conflicts (${unresolved.length})`));
211
+ console.log();
212
+ console.log(chalk.dim(` Base: ${data.base}`));
213
+ console.log(chalk.dim(` Merged: ${data.merged}`));
214
+ console.log();
215
+ for (const conflict of unresolved) {
216
+ console.log(chalk.bold(`Conflict ${conflict.id}:`));
217
+ // Show abbreviated info
218
+ console.log(chalk.dim(` Original: "${conflict.original.slice(0, 50)}${conflict.original.length > 50 ? '...' : ''}"`));
219
+ console.log(chalk.dim(` Options: ${conflict.changes.map((c) => c.reviewer).join(', ')}`));
220
+ console.log();
221
+ }
222
+ console.log(chalk.dim('Run "rev merge-resolve" to resolve conflicts interactively'));
223
+ });
224
+ // ==========================================================================
225
+ // MERGE-RESOLVE command - Interactively resolve merge conflicts
226
+ // ==========================================================================
227
+ program
228
+ .command('merge-resolve')
229
+ .alias('mresolve')
230
+ .description('Resolve merge conflicts interactively')
231
+ .option('--theirs', 'Accept all changes from last reviewer')
232
+ .option('--ours', 'Accept all changes from first reviewer')
233
+ .action(async (options) => {
234
+ const { loadConflicts, saveConflicts, clearConflicts, resolveConflict, formatConflict } = await import('../merge.js');
235
+ const projectDir = process.cwd();
236
+ const data = loadConflicts(projectDir);
237
+ if (!data) {
238
+ console.log(fmt.status('info', 'No conflicts to resolve'));
239
+ return;
240
+ }
241
+ const unresolved = data.conflicts.filter((c) => c.resolved === null);
242
+ if (unresolved.length === 0) {
243
+ console.log(fmt.status('success', 'All conflicts already resolved!'));
244
+ clearConflicts(projectDir);
245
+ return;
246
+ }
247
+ console.log(fmt.header(`Resolving ${unresolved.length} Conflict(s)`));
248
+ console.log();
249
+ if (options.theirs) {
250
+ // Accept all from last reviewer
251
+ for (const conflict of unresolved) {
252
+ const lastIdx = conflict.changes.length - 1;
253
+ resolveConflict(conflict, lastIdx);
254
+ console.log(chalk.dim(` ${conflict.id}: accepted ${conflict.changes[lastIdx].reviewer}'s change`));
255
+ }
256
+ saveConflicts(projectDir, data.conflicts, data.base);
257
+ console.log(fmt.status('success', `Resolved ${unresolved.length} conflicts (--theirs)`));
258
+ }
259
+ else if (options.ours) {
260
+ // Accept all from first reviewer
261
+ for (const conflict of unresolved) {
262
+ resolveConflict(conflict, 0);
263
+ console.log(chalk.dim(` ${conflict.id}: accepted ${conflict.changes[0].reviewer}'s change`));
264
+ }
265
+ saveConflicts(projectDir, data.conflicts, data.base);
266
+ console.log(fmt.status('success', `Resolved ${unresolved.length} conflicts (--ours)`));
267
+ }
268
+ else {
269
+ // Interactive resolution
270
+ // Read base text for context display
271
+ let baseText = '';
272
+ try {
273
+ const { extractFromWord } = await import('../import.js');
274
+ const { text } = await extractFromWord(data.base);
275
+ baseText = text;
276
+ }
277
+ catch {
278
+ // Can't read base, show without context
279
+ }
280
+ for (let i = 0; i < unresolved.length; i++) {
281
+ const conflict = unresolved[i];
282
+ console.log(chalk.bold(`\nConflict ${i + 1}/${unresolved.length} (${conflict.id}):`));
283
+ console.log(formatConflict(conflict, baseText));
284
+ console.log();
285
+ const rl = readline.createInterface({
286
+ input: process.stdin,
287
+ output: process.stdout,
288
+ });
289
+ const answer = await new Promise((resolve) => rl.question(chalk.cyan(` Choose (1-${conflict.changes.length}, s=skip, q=quit): `), resolve));
290
+ rl.close();
291
+ if (answer.toLowerCase() === 'q') {
292
+ console.log(chalk.dim('\n Saving progress...'));
293
+ break;
294
+ }
295
+ if (answer.toLowerCase() !== 's' && !isNaN(parseInt(answer))) {
296
+ const choice = parseInt(answer) - 1;
297
+ if (choice >= 0 && choice < conflict.changes.length) {
298
+ resolveConflict(conflict, choice);
299
+ console.log(chalk.green(` ✓ Applied: ${conflict.changes[choice].reviewer}'s change`));
300
+ }
301
+ }
302
+ else {
303
+ console.log(chalk.dim(' Skipped'));
304
+ }
305
+ }
306
+ saveConflicts(projectDir, data.conflicts, data.base);
307
+ const remaining = data.conflicts.filter((c) => c.resolved === null).length;
308
+ if (remaining === 0) {
309
+ console.log(fmt.status('success', '\nAll conflicts resolved!'));
310
+ clearConflicts(projectDir);
311
+ }
312
+ else {
313
+ console.log(chalk.yellow(`\n ${remaining} conflict(s) remaining`));
314
+ }
315
+ }
316
+ });
317
+ }
318
+ //# sourceMappingURL=merge-resolve.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"merge-resolve.js","sourceRoot":"","sources":["../../../lib/commands/merge-resolve.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,KAAK,EACL,EAAE,EACF,IAAI,EACJ,GAAG,GACJ,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AAYrC;;GAEG;AACH,MAAM,UAAU,QAAQ,CAAC,OAAgB;IACvC,6EAA6E;IAC7E,6EAA6E;IAC7E,6EAA6E;IAE7E,OAAO;SACJ,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,mEAAmE,CAAC;SAChF,QAAQ,CAAC,WAAW,EAAE,+BAA+B,CAAC;SACtD,MAAM,CAAC,mBAAmB,EAAE,6EAA6E,CAAC;SAC1G,MAAM,CAAC,qBAAqB,EAAE,gDAAgD,CAAC;SAC/E,MAAM,CAAC,iBAAiB,EAAE,0DAA0D,CAAC;SACrF,MAAM,CAAC,uBAAuB,EAAE,8DAA8D,EAAE,aAAa,CAAC;SAC9G,MAAM,CAAC,sBAAsB,EAAE,wDAAwD,EAAE,UAAU,CAAC;SACpG,MAAM,CAAC,WAAW,EAAE,gCAAgC,CAAC;SACrD,MAAM,CAAC,YAAY,EAAE,2CAA2C,CAAC;SACjE,MAAM,CAAC,KAAK,EAAE,SAAmB,EAAE,OAAqB,EAAE,EAAE;QAC3D,MAAM,EACJ,aAAa,EACb,cAAc,EACd,eAAe,EACf,eAAe,EACf,cAAc,EACd,aAAa,GACd,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;QAEhC,gCAAgC;QAChC,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;YAC7B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,4BAA4B,IAAI,EAAE,CAAC,CAAC,CAAC;gBACvE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;QAED,0BAA0B;QAC1B,IAAI,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;QAC5B,IAAI,UAAU,GAAG,WAAW,CAAC;QAE7B,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,4BAA4B;YAC5B,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;YACjC,QAAQ,GAAG,eAAe,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC;YAEpD,IAAI,QAAQ,EAAE,CAAC;gBACb,UAAU,GAAG,uBAAuB,CAAC;YACvC,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,8CAA8C,CAAC,CAAC,CAAC;gBAC1E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,wEAAwE,CAAC,CAAC,CAAC;gBACjG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,gDAAgD,CAAC,CAAC,CAAC;gBACrF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;QAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,4BAA4B,QAAQ,EAAE,CAAC,CAAC,CAAC;YAC3E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,kDAAkD;QAClD,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,MAAM,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7E,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,2DAA2D,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;YAC/H,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,4EAA4E,CAAC,CAAC,CAAC;QACvG,CAAC;QAED,uBAAuB;QACvB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK;YACzB,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC7C,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACvB,kEAAkE;gBAClE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;gBAC3C,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBAC9C,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;YAChD,CAAC,CAAC,CAAC;QAEL,sBAAsB;QACtB,OAAO,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC;YACvC,KAAK,CAAC,IAAI,CAAC,YAAY,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC;QAC7C,CAAC;QAED,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5C,IAAI,EAAE,CAAC;YACP,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;SACf,CAAC,CAAC,CAAC;QAEJ,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAC3C,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,UAAU,GAAG,CAAC,CAAC,CAAC;QAC7E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,gBAAgB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAC7D,OAAO,CAAC,GAAG,EAAE,CAAC;QAEd,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,KAAK,EAAE,CAAC;QAEzD,IAAI,CAAC;YACH,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,YAAY,EAAE;gBACzF,SAAS,EAAE,OAAO,CAAC,SAAS;aAC7B,CAAC,CAAC;YAEH,IAAI,CAAC,IAAI,EAAE,CAAC;YAEZ,gBAAgB;YAChB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE;gBACzC,CAAC,eAAe,EAAE,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;gBAChD,CAAC,iBAAiB,EAAE,KAAK,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;gBACpD,CAAC,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;gBACzC,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;aACxC,CAAC,CAAC,CAAC;YACJ,OAAO,CAAC,GAAG,EAAE,CAAC;YAEd,IAAI,WAAW,GAAG,MAAM,CAAC;YAEzB,mBAAmB;YACnB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,SAAS,CAAC,MAAM,iBAAiB,CAAC,CAAC,CAAC;gBAEtE,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;oBACjC,6CAA6C;oBAC7C,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;wBACjC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,QAAQ,CAAC,EAAE,WAAW,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,WAAW,CAAC,CAAC,CAAC;wBACpG,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;oBAC/B,CAAC;gBACH,CAAC;qBAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBACzC,4CAA4C;oBAC5C,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;wBACjC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;wBAC5C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,QAAQ,CAAC,EAAE,WAAW,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,WAAW,CAAC,CAAC,CAAC;wBAC1G,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;oBACrC,CAAC;gBACH,CAAC;qBAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;oBAC3B,yBAAyB;oBACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wBAC1C,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;wBAC9B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,MAAM,KAAK,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;wBACrF,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;wBAChD,OAAO,CAAC,GAAG,EAAE,CAAC;wBAEd,MAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC;4BAClC,KAAK,EAAE,OAAO,CAAC,KAAK;4BACpB,MAAM,EAAE,OAAO,CAAC,MAAM;yBACvB,CAAC,CAAC;wBAEH,MAAM,MAAM,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,EAAE,CACnD,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,QAAQ,CAAC,OAAO,CAAC,MAAM,aAAa,CAAC,EAAE,OAAO,CAAC,CACtF,CAAC;wBACF,EAAE,CAAC,KAAK,EAAE,CAAC;wBAEX,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;4BAC7D,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;4BACpC,IAAI,MAAM,IAAI,CAAC,IAAI,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gCACpD,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gCAClC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,WAAW,CAAC,CAAC,CAAC;4BACzF,CAAC;wBACH,CAAC;6BAAM,CAAC;4BACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC,CAAC;wBACpE,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,sCAAsC;gBACtC,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC;gBAC9D,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC1B,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;oBAClD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,UAAU,CAAC,MAAM,sDAAsD,CAAC,CAAC,CAAC;oBAC1G,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,+DAA+D,CAAC,CAAC,CAAC;gBAC1F,CAAC;YACH,CAAC;YAED,eAAe;YACf,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gBACpB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;oBACnB,uBAAuB;oBACvB,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;oBACvD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,4BAA4B,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBACnF,CAAC;qBAAM,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;oBAC5B,6DAA6D;oBAC7D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,yCAAyC,CAAC,CAAC,CAAC;oBACrE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC,CAAC;gBAC5D,CAAC;qBAAM,CAAC;oBACN,8BAA8B;oBAC9B,MAAM,OAAO,GAAG,WAAW,CAAC;oBAC5B,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;oBAChD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,4BAA4B,OAAO,EAAE,CAAC,CAAC,CAAC;gBAC5E,CAAC;gBAED,OAAO,CAAC,GAAG,EAAE,CAAC;gBACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;gBACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC,CAAC;gBAChF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC,CAAC;gBAC3E,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,EAAE,CAAC;oBAC7C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,6DAA6D,CAAC,CAAC,CAAC;gBACxF,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,MAAM,KAAK,GAAG,GAAY,CAAC;YAC3B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAClD,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK;gBAAE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAClD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,6EAA6E;IAC7E,gDAAgD;IAChD,6EAA6E;IAE7E,OAAO;SACJ,OAAO,CAAC,WAAW,CAAC;SACpB,WAAW,CAAC,iCAAiC,CAAC;SAC9C,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;QACtE,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;QAEvC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC;QAE1E,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC,CAAC;YAC9D,OAAO;QACT,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,yBAAyB,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACvE,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC/C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACnD,OAAO,CAAC,GAAG,EAAE,CAAC;QAEd,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;YAClC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;YACpD,wBAAwB;YACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,gBAAgB,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;YACvH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YAChG,OAAO,CAAC,GAAG,EAAE,CAAC;QAChB,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,4DAA4D,CAAC,CAAC,CAAC;IACvF,CAAC,CAAC,CAAC;IAEL,6EAA6E;IAC7E,gEAAgE;IAChE,6EAA6E;IAE7E,OAAO;SACJ,OAAO,CAAC,eAAe,CAAC;SACxB,KAAK,CAAC,UAAU,CAAC;SACjB,WAAW,CAAC,uCAAuC,CAAC;SACpD,MAAM,CAAC,UAAU,EAAE,uCAAuC,CAAC;SAC3D,MAAM,CAAC,QAAQ,EAAE,wCAAwC,CAAC;SAC1D,MAAM,CAAC,KAAK,EAAE,OAA6C,EAAE,EAAE;QAC9D,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;QACtH,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;QAEvC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC;QAE1E,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,iCAAiC,CAAC,CAAC,CAAC;YACtE,cAAc,CAAC,UAAU,CAAC,CAAC;YAC3B,OAAO;QACT,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,UAAU,CAAC,MAAM,cAAc,CAAC,CAAC,CAAC;QACtE,OAAO,CAAC,GAAG,EAAE,CAAC;QAEd,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,gCAAgC;YAChC,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;gBAClC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;gBAC5C,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;gBACnC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,EAAE,cAAc,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,WAAW,CAAC,CAAC,CAAC;YACtG,CAAC;YACD,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACrD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,YAAY,UAAU,CAAC,MAAM,uBAAuB,CAAC,CAAC,CAAC;QAC3F,CAAC;aAAM,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACxB,iCAAiC;YACjC,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;gBAClC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;gBAC7B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,EAAE,cAAc,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,WAAW,CAAC,CAAC,CAAC;YAChG,CAAC;YACD,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACrD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,YAAY,UAAU,CAAC,MAAM,qBAAqB,CAAC,CAAC,CAAC;QACzF,CAAC;aAAM,CAAC;YACN,yBAAyB;YACzB,qCAAqC;YACrC,IAAI,QAAQ,GAAG,EAAE,CAAC;YAClB,IAAI,CAAC;gBACH,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;gBACzD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAClD,QAAQ,GAAG,IAAI,CAAC;YAClB,CAAC;YAAC,MAAM,CAAC;gBACP,wCAAwC;YAC1C,CAAC;YAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC3C,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;gBAC/B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,MAAM,KAAK,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;gBACtF,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;gBAChD,OAAO,CAAC,GAAG,EAAE,CAAC;gBAEd,MAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC;oBAClC,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;iBACvB,CAAC,CAAC;gBAEH,MAAM,MAAM,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,EAAE,CACnD,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,QAAQ,CAAC,OAAO,CAAC,MAAM,qBAAqB,CAAC,EAAE,OAAO,CAAC,CAC9F,CAAC;gBACF,EAAE,CAAC,KAAK,EAAE,CAAC;gBAEX,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,EAAE,CAAC;oBACjC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC;oBACjD,MAAM;gBACR,CAAC;gBAED,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;oBAC7D,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBACpC,IAAI,MAAM,IAAI,CAAC,IAAI,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;wBACpD,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;wBAClC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,WAAW,CAAC,CAAC,CAAC;oBACzF,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;gBACtC,CAAC;YACH,CAAC;YAED,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAErD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,MAAM,CAAC;YAChF,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;gBACpB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,2BAA2B,CAAC,CAAC,CAAC;gBAChE,cAAc,CAAC,UAAU,CAAC,CAAC;YAC7B,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,SAAS,wBAAwB,CAAC,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
@@ -0,0 +1,11 @@
1
+ /**
2
+ * Preview commands: preview, watch
3
+ *
4
+ * Commands for building and viewing documents with live reload.
5
+ */
6
+ import type { Command } from 'commander';
7
+ /**
8
+ * Register preview commands with the program
9
+ */
10
+ export declare function register(program: Command): void;
11
+ //# sourceMappingURL=preview.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"preview.d.ts","sourceRoot":"","sources":["../../../lib/commands/preview.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAqBzC;;GAEG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAmJ/C"}
@@ -0,0 +1,138 @@
1
+ /**
2
+ * Preview commands: preview, watch
3
+ *
4
+ * Commands for building and viewing documents with live reload.
5
+ */
6
+ import { chalk, fs, fmt, loadBuildConfig, } from './context.js';
7
+ /**
8
+ * Register preview commands with the program
9
+ */
10
+ export function register(program) {
11
+ // ==========================================================================
12
+ // PREVIEW command - Build and open document
13
+ // ==========================================================================
14
+ program
15
+ .command('preview')
16
+ .description('Build and open document in default app')
17
+ .argument('[format]', 'Format to preview: pdf, docx', 'pdf')
18
+ .action(async (format, _options) => {
19
+ const { exec } = await import('child_process');
20
+ const { build } = await import('../build.js');
21
+ let config = {};
22
+ try {
23
+ config = loadBuildConfig('.') || {};
24
+ }
25
+ catch (err) {
26
+ console.error(chalk.red('Not in a rev project directory (no rev.yaml found)'));
27
+ process.exit(1);
28
+ }
29
+ console.log(chalk.dim(`Building ${format}...`));
30
+ const result = await build('.', [format]);
31
+ const buildResult = result.results.find(r => r.format === format);
32
+ if (!buildResult?.success) {
33
+ const errorMsg = buildResult?.error || 'Unknown error';
34
+ console.error(chalk.red(`Build failed: ${errorMsg}`));
35
+ process.exit(1);
36
+ }
37
+ const outputFile = buildResult.outputPath;
38
+ if (!outputFile || !fs.existsSync(outputFile)) {
39
+ console.error(chalk.red(`Output file not found: ${outputFile}`));
40
+ process.exit(1);
41
+ }
42
+ // Open with system default
43
+ const openCmd = process.platform === 'darwin' ? 'open' :
44
+ process.platform === 'win32' ? 'start' : 'xdg-open';
45
+ exec(`${openCmd} "${outputFile}"`, (err) => {
46
+ if (err) {
47
+ console.error(chalk.red(`Could not open file: ${err.message}`));
48
+ }
49
+ else {
50
+ console.log(fmt.status('success', `Opened ${outputFile}`));
51
+ }
52
+ });
53
+ });
54
+ // ==========================================================================
55
+ // WATCH command - Auto-rebuild on changes
56
+ // ==========================================================================
57
+ program
58
+ .command('watch')
59
+ .description('Watch files and auto-rebuild on changes')
60
+ .argument('[format]', 'Format to build: pdf, docx, all', 'pdf')
61
+ .option('--no-open', 'Do not open after first build')
62
+ .action(async (format, options) => {
63
+ const { exec } = await import('child_process');
64
+ const { build } = await import('../build.js');
65
+ let config = {};
66
+ try {
67
+ config = loadBuildConfig('.') || {};
68
+ }
69
+ catch (err) {
70
+ console.error(chalk.red('Not in a rev project directory (no rev.yaml found)'));
71
+ process.exit(1);
72
+ }
73
+ let sections = config.sections || [];
74
+ if (sections.length === 0) {
75
+ sections = fs.readdirSync('.').filter(f => f.endsWith('.md') && !['README.md', 'CLAUDE.md', 'paper.md'].includes(f));
76
+ }
77
+ const filesToWatch = [
78
+ ...sections,
79
+ 'rev.yaml',
80
+ config.bibliography || 'references.bib'
81
+ ].filter(f => fs.existsSync(f));
82
+ console.log(fmt.header('Watch Mode'));
83
+ console.log(chalk.dim(`Watching: ${filesToWatch.join(', ')}`));
84
+ console.log(chalk.dim('Press Ctrl+C to stop\n'));
85
+ let building = false;
86
+ let pendingBuild = false;
87
+ const doBuild = async () => {
88
+ if (building) {
89
+ pendingBuild = true;
90
+ return;
91
+ }
92
+ building = true;
93
+ console.log(chalk.dim(`\n[${new Date().toLocaleTimeString()}] Rebuilding...`));
94
+ try {
95
+ const formats = format === 'all' ? ['pdf', 'docx'] : [format];
96
+ const result = await build('.', formats);
97
+ for (const r of result.results) {
98
+ if (r.success) {
99
+ console.log(chalk.green(` ✓ ${r.format}: ${r.outputPath}`));
100
+ }
101
+ else {
102
+ console.log(chalk.red(` ✗ ${r.format}: ${r.error}`));
103
+ }
104
+ }
105
+ }
106
+ catch (err) {
107
+ console.error(chalk.red(` Build error: ${err.message}`));
108
+ }
109
+ building = false;
110
+ if (pendingBuild) {
111
+ pendingBuild = false;
112
+ doBuild();
113
+ }
114
+ };
115
+ // Initial build
116
+ await doBuild();
117
+ // Open after first build
118
+ if (options.open) {
119
+ const outputFile = format === 'docx' ?
120
+ (config.title?.replace(/[^a-zA-Z0-9]/g, '-').toLowerCase() || 'paper') + '.docx' :
121
+ (config.title?.replace(/[^a-zA-Z0-9]/g, '-').toLowerCase() || 'paper') + '.pdf';
122
+ if (fs.existsSync(outputFile)) {
123
+ const openCmd = process.platform === 'darwin' ? 'open' :
124
+ process.platform === 'win32' ? 'start' : 'xdg-open';
125
+ exec(`${openCmd} "${outputFile}"`);
126
+ }
127
+ }
128
+ // Watch files
129
+ for (const file of filesToWatch) {
130
+ fs.watch(file, { persistent: true }, (eventType) => {
131
+ if (eventType === 'change') {
132
+ doBuild();
133
+ }
134
+ });
135
+ }
136
+ });
137
+ }
138
+ //# sourceMappingURL=preview.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"preview.js","sourceRoot":"","sources":["../../../lib/commands/preview.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,11 @@
1
+ /**
2
+ * Project information commands: word-count (wc), stats, search
3
+ *
4
+ * Read-only queries about the project state.
5
+ */
6
+ import type { Command } from 'commander';
7
+ /**
8
+ * Register project-info commands with the program
9
+ */
10
+ export declare function register(program: Command): void;
11
+ //# sourceMappingURL=project-info.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"project-info.d.ts","sourceRoot":"","sources":["../../../lib/commands/project-info.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA+BzC;;GAEG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA2M/C"}