@commentray/core 0.3.5 → 0.4.1
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/blocks.d.ts +43 -0
- package/dist/blocks.d.ts.map +1 -1
- package/dist/blocks.js +297 -4
- package/dist/blocks.js.map +1 -1
- package/dist/commentray-active-editor-ui-context.d.ts +1 -0
- package/dist/commentray-active-editor-ui-context.d.ts.map +1 -1
- package/dist/commentray-active-editor-ui-context.js +8 -0
- package/dist/commentray-active-editor-ui-context.js.map +1 -1
- package/dist/companion-bootstrap.d.ts +14 -0
- package/dist/companion-bootstrap.d.ts.map +1 -0
- package/dist/companion-bootstrap.js +72 -0
- package/dist/companion-bootstrap.js.map +1 -0
- package/dist/index.d.ts +9 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -2
- package/dist/index.js.map +1 -1
- package/dist/init-project.d.ts +17 -0
- package/dist/init-project.d.ts.map +1 -0
- package/dist/init-project.js +131 -0
- package/dist/init-project.js.map +1 -0
- package/dist/marker-validation.d.ts +5 -1
- package/dist/marker-validation.d.ts.map +1 -1
- package/dist/marker-validation.js +75 -1
- package/dist/marker-validation.js.map +1 -1
- package/dist/self-healing.d.ts +13 -0
- package/dist/self-healing.d.ts.map +1 -0
- package/dist/self-healing.js +67 -0
- package/dist/self-healing.js.map +1 -0
- package/dist/validate-project.d.ts.map +1 -1
- package/dist/validate-project.js +6 -4
- package/dist/validate-project.js.map +1 -1
- package/package.json +2 -2
package/dist/blocks.d.ts
CHANGED
|
@@ -63,6 +63,25 @@ export declare function createBlockForRange(input: CreateBlockForRangeInput): Cr
|
|
|
63
63
|
* single blank-line separator regardless of how the existing content ended.
|
|
64
64
|
*/
|
|
65
65
|
export declare function appendBlockToCommentray(existing: string, blockMarkdown: string): string;
|
|
66
|
+
export type CommentrayBlockMarkerHit = {
|
|
67
|
+
id: string;
|
|
68
|
+
start: number;
|
|
69
|
+
};
|
|
70
|
+
/**
|
|
71
|
+
* Inserts `blockMarkdown` into companion markdown based on source-region order.
|
|
72
|
+
*
|
|
73
|
+
* The insertion point is chosen from existing `<!-- commentray:block id=... -->`
|
|
74
|
+
* sections: the new block is inserted before the first section whose marker id
|
|
75
|
+
* appears *after* `markerId` in source order. If ordering cannot be resolved,
|
|
76
|
+
* falls back to {@link appendBlockToCommentray}.
|
|
77
|
+
*/
|
|
78
|
+
export declare function insertBlockBySourceMarkerOrder(args: {
|
|
79
|
+
existingCommentray: string;
|
|
80
|
+
blockMarkdown: string;
|
|
81
|
+
sourceText: string;
|
|
82
|
+
markerId: string;
|
|
83
|
+
}): string;
|
|
84
|
+
export declare function findCommentrayBlockMarkerHits(markdown: string): CommentrayBlockMarkerHit[];
|
|
66
85
|
export type AddBlockToIndexInput = {
|
|
67
86
|
sourcePath: string;
|
|
68
87
|
commentrayPath: string;
|
|
@@ -81,4 +100,28 @@ export declare function addBlockToIndex(index: CommentrayIndex, input: AddBlockT
|
|
|
81
100
|
* comfortably larger than any plausible per-file block count.
|
|
82
101
|
*/
|
|
83
102
|
export declare function generateBlockId(rng?: () => number): string;
|
|
103
|
+
export declare function snippetFromRange(sourceText: string, range: BlockRange): string;
|
|
104
|
+
export declare function removeBlockFromCommentray(markdown: string, blockId: string): string;
|
|
105
|
+
export declare function removeSourceMarkersFromText(sourceText: string, markerId: string): string;
|
|
106
|
+
export declare function removeBlockFromIndex(index: CommentrayIndex, commentrayPath: string, blockId: string): CommentrayIndex;
|
|
107
|
+
export type AlignAndCleanRegionsInput = {
|
|
108
|
+
sourceText: string;
|
|
109
|
+
commentrayMarkdown: string;
|
|
110
|
+
index: CommentrayIndex;
|
|
111
|
+
commentrayPath: string;
|
|
112
|
+
sourcePath: string;
|
|
113
|
+
};
|
|
114
|
+
export declare function alignAndCleanRegions(args: AlignAndCleanRegionsInput): {
|
|
115
|
+
commentrayMarkdown: string;
|
|
116
|
+
index: CommentrayIndex;
|
|
117
|
+
};
|
|
118
|
+
export declare function recoverSourceMarkersFromSnippet(args: {
|
|
119
|
+
sourceText: string;
|
|
120
|
+
languageId: string;
|
|
121
|
+
block: CommentrayBlock;
|
|
122
|
+
}): {
|
|
123
|
+
sourceText: string;
|
|
124
|
+
healed: boolean;
|
|
125
|
+
range?: BlockRange;
|
|
126
|
+
};
|
|
84
127
|
//# sourceMappingURL=blocks.d.ts.map
|
package/dist/blocks.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blocks.d.ts","sourceRoot":"","sources":["../src/blocks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"blocks.d.ts","sourceRoot":"","sources":["../src/blocks.ts"],"names":[],"mappings":"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"}
|
package/dist/blocks.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { buildCommentraySnippetV1 } from "./block-snippet.js";
|
|
1
|
+
import { buildCommentraySnippetV1, parseCommentraySnippetV1 } from "./block-snippet.js";
|
|
2
2
|
import { formatMarkerAnchor } from "./anchors.js";
|
|
3
3
|
import { assertValidMarkerId } from "./marker-ids.js";
|
|
4
|
-
import { leadingIndentOfLine } from "./region-marker-convert.js";
|
|
5
|
-
import { commentrayRegionInsertions } from "./source-markers.js";
|
|
4
|
+
import { findCommentrayMarkerPairs, leadingIndentOfLine } from "./region-marker-convert.js";
|
|
5
|
+
import { commentrayRegionInsertions, parseCommentrayRegionBoundary, sourceLineRangeForMarkerId, } from "./source-markers.js";
|
|
6
6
|
const BLOCK_MARKER_PREFIX = "<!-- commentray:block id=";
|
|
7
7
|
const BLOCK_MARKER_SUFFIX = " -->";
|
|
8
8
|
const CARET_PLACEHOLDER = "_(write commentary here)_";
|
|
@@ -50,6 +50,86 @@ export function appendBlockToCommentray(existing, blockMarkdown) {
|
|
|
50
50
|
const fragment = blockMarkdown.endsWith("\n") ? blockMarkdown : `${blockMarkdown}\n`;
|
|
51
51
|
return `${body}${fragment}`;
|
|
52
52
|
}
|
|
53
|
+
/**
|
|
54
|
+
* Inserts `blockMarkdown` into companion markdown based on source-region order.
|
|
55
|
+
*
|
|
56
|
+
* The insertion point is chosen from existing `<!-- commentray:block id=... -->`
|
|
57
|
+
* sections: the new block is inserted before the first section whose marker id
|
|
58
|
+
* appears *after* `markerId` in source order. If ordering cannot be resolved,
|
|
59
|
+
* falls back to {@link appendBlockToCommentray}.
|
|
60
|
+
*/
|
|
61
|
+
export function insertBlockBySourceMarkerOrder(args) {
|
|
62
|
+
const markerId = assertValidMarkerId(args.markerId);
|
|
63
|
+
const order = markerStartOrderMap(args.sourceText);
|
|
64
|
+
const targetRank = order.get(markerId);
|
|
65
|
+
if (targetRank === undefined) {
|
|
66
|
+
return appendBlockToCommentray(args.existingCommentray, args.blockMarkdown);
|
|
67
|
+
}
|
|
68
|
+
const hits = findCommentrayBlockMarkerHits(args.existingCommentray);
|
|
69
|
+
if (hits.length === 0) {
|
|
70
|
+
return appendBlockToCommentray(args.existingCommentray, args.blockMarkdown);
|
|
71
|
+
}
|
|
72
|
+
let insertionIndex = null;
|
|
73
|
+
for (const hit of hits) {
|
|
74
|
+
const rank = order.get(hit.id);
|
|
75
|
+
if (rank === undefined || rank <= targetRank)
|
|
76
|
+
continue;
|
|
77
|
+
insertionIndex = hit.start;
|
|
78
|
+
break;
|
|
79
|
+
}
|
|
80
|
+
if (insertionIndex === null) {
|
|
81
|
+
return appendBlockToCommentray(args.existingCommentray, args.blockMarkdown);
|
|
82
|
+
}
|
|
83
|
+
const left = args.existingCommentray.slice(0, insertionIndex).trimEnd();
|
|
84
|
+
const right = args.existingCommentray.slice(insertionIndex).trimStart();
|
|
85
|
+
const fragment = args.blockMarkdown.endsWith("\n")
|
|
86
|
+
? args.blockMarkdown
|
|
87
|
+
: `${args.blockMarkdown}\n`;
|
|
88
|
+
const leftPart = left.length === 0 ? "" : `${left}\n\n`;
|
|
89
|
+
const rightPart = right.length === 0 ? "" : `\n\n${right}`;
|
|
90
|
+
return `${leftPart}${fragment.trimEnd()}${rightPart}\n`;
|
|
91
|
+
}
|
|
92
|
+
function markerStartOrderMap(sourceText) {
|
|
93
|
+
const order = new Map();
|
|
94
|
+
let next = 0;
|
|
95
|
+
// Prefer first explicit start-boundary position so ordering still works while a region is mid-edit.
|
|
96
|
+
const lines = sourceText.replaceAll("\r\n", "\n").split("\n");
|
|
97
|
+
for (const line of lines) {
|
|
98
|
+
const hit = parseCommentrayRegionBoundary(line);
|
|
99
|
+
if (!hit || hit.kind !== "start")
|
|
100
|
+
continue;
|
|
101
|
+
if (order.has(hit.id))
|
|
102
|
+
continue;
|
|
103
|
+
order.set(hit.id, next++);
|
|
104
|
+
}
|
|
105
|
+
// Keep pair-based fallback for any id represented by a full pair but missing from start scan.
|
|
106
|
+
for (const pair of findCommentrayMarkerPairs(sourceText)) {
|
|
107
|
+
if (order.has(pair.id))
|
|
108
|
+
continue;
|
|
109
|
+
order.set(pair.id, next++);
|
|
110
|
+
}
|
|
111
|
+
return order;
|
|
112
|
+
}
|
|
113
|
+
export function findCommentrayBlockMarkerHits(markdown) {
|
|
114
|
+
const hits = [];
|
|
115
|
+
const markerRe = /<!--\s*commentray:block\s+id=([a-z0-9](?:[a-z0-9_-]{0,62}[a-z0-9])?)\s*-->/gi;
|
|
116
|
+
for (const m of markdown.matchAll(markerRe)) {
|
|
117
|
+
const idRaw = m[1];
|
|
118
|
+
if (idRaw === undefined)
|
|
119
|
+
continue;
|
|
120
|
+
const start = m.index ?? -1;
|
|
121
|
+
if (start < 0)
|
|
122
|
+
continue;
|
|
123
|
+
try {
|
|
124
|
+
hits.push({ id: assertValidMarkerId(idRaw), start });
|
|
125
|
+
}
|
|
126
|
+
catch {
|
|
127
|
+
/* ignore malformed marker ids */
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
hits.sort((a, b) => a.start - b.start);
|
|
131
|
+
return hits;
|
|
132
|
+
}
|
|
53
133
|
/**
|
|
54
134
|
* Return a new index with the block added under the given source file.
|
|
55
135
|
* The source entry is created lazily when it does not exist yet. Throws
|
|
@@ -97,7 +177,7 @@ function clampRange(range, sourceText) {
|
|
|
97
177
|
const end = Math.min(endRaw, lineCount);
|
|
98
178
|
return { startLine: start, endLine: end };
|
|
99
179
|
}
|
|
100
|
-
function snippetFromRange(sourceText, range) {
|
|
180
|
+
export function snippetFromRange(sourceText, range) {
|
|
101
181
|
const lines = sourceText.split("\n");
|
|
102
182
|
const trimmed = [];
|
|
103
183
|
for (let ln = range.startLine; ln <= range.endLine; ln++) {
|
|
@@ -119,4 +199,217 @@ function placeholderLineOffset(markdown) {
|
|
|
119
199
|
const lines = markdown.split("\n");
|
|
120
200
|
return Math.max(0, lines.indexOf(CARET_PLACEHOLDER));
|
|
121
201
|
}
|
|
202
|
+
export function removeBlockFromCommentray(markdown, blockId) {
|
|
203
|
+
const normalizedId = assertValidMarkerId(blockId);
|
|
204
|
+
const hits = findCommentrayBlockMarkerHits(markdown);
|
|
205
|
+
const targetHitIndex = hits.findIndex((h) => h.id === normalizedId);
|
|
206
|
+
if (targetHitIndex === -1) {
|
|
207
|
+
return markdown;
|
|
208
|
+
}
|
|
209
|
+
const targetHit = hits[targetHitIndex];
|
|
210
|
+
if (!targetHit)
|
|
211
|
+
return markdown;
|
|
212
|
+
const firstHit = hits[0];
|
|
213
|
+
if (!firstHit)
|
|
214
|
+
return markdown;
|
|
215
|
+
// The prelude is from 0 to the start of the first hit.
|
|
216
|
+
const prelude = markdown.slice(0, firstHit.start);
|
|
217
|
+
// We filter out the block that has the target ID
|
|
218
|
+
const segments = [];
|
|
219
|
+
for (let i = 0; i < hits.length; i++) {
|
|
220
|
+
if (i === targetHitIndex)
|
|
221
|
+
continue;
|
|
222
|
+
const hit = hits[i];
|
|
223
|
+
if (!hit)
|
|
224
|
+
continue;
|
|
225
|
+
const nextHit = hits[i + 1];
|
|
226
|
+
const end = nextHit ? nextHit.start : markdown.length;
|
|
227
|
+
segments.push(markdown.slice(hit.start, end));
|
|
228
|
+
}
|
|
229
|
+
// Combine prelude and other segments
|
|
230
|
+
let result = prelude;
|
|
231
|
+
for (const segment of segments) {
|
|
232
|
+
result = appendBlockToCommentray(result, segment);
|
|
233
|
+
}
|
|
234
|
+
return result;
|
|
235
|
+
}
|
|
236
|
+
export function removeSourceMarkersFromText(sourceText, markerId) {
|
|
237
|
+
const normalizedId = assertValidMarkerId(markerId);
|
|
238
|
+
const lines = sourceText.replaceAll("\r\n", "\n").split("\n");
|
|
239
|
+
const filtered = lines.filter((line) => {
|
|
240
|
+
const hit = parseCommentrayRegionBoundary(line);
|
|
241
|
+
return hit === null || hit.id !== normalizedId;
|
|
242
|
+
});
|
|
243
|
+
return filtered.join("\n");
|
|
244
|
+
}
|
|
245
|
+
export function removeBlockFromIndex(index, commentrayPath, blockId) {
|
|
246
|
+
const entry = index.byCommentrayPath[commentrayPath];
|
|
247
|
+
if (!entry) {
|
|
248
|
+
return index;
|
|
249
|
+
}
|
|
250
|
+
const nextBlocks = entry.blocks.filter((b) => b.id !== blockId);
|
|
251
|
+
if (nextBlocks.length === entry.blocks.length) {
|
|
252
|
+
return index;
|
|
253
|
+
}
|
|
254
|
+
if (nextBlocks.length === 0) {
|
|
255
|
+
const { [commentrayPath]: _, ...nextByCommentrayPath } = index.byCommentrayPath;
|
|
256
|
+
return {
|
|
257
|
+
...index,
|
|
258
|
+
byCommentrayPath: nextByCommentrayPath,
|
|
259
|
+
};
|
|
260
|
+
}
|
|
261
|
+
return {
|
|
262
|
+
...index,
|
|
263
|
+
byCommentrayPath: {
|
|
264
|
+
...index.byCommentrayPath,
|
|
265
|
+
[commentrayPath]: {
|
|
266
|
+
...entry,
|
|
267
|
+
blocks: nextBlocks,
|
|
268
|
+
},
|
|
269
|
+
},
|
|
270
|
+
};
|
|
271
|
+
}
|
|
272
|
+
export function alignAndCleanRegions(args) {
|
|
273
|
+
const sourcePairs = findCommentrayMarkerPairs(args.sourceText);
|
|
274
|
+
const sourceMarkerIds = Array.from(new Set(sourcePairs.map((p) => p.id)));
|
|
275
|
+
// 1. Extract prelude and existing blocks from markdown
|
|
276
|
+
const hits = findCommentrayBlockMarkerHits(args.commentrayMarkdown);
|
|
277
|
+
const firstHit = hits[0];
|
|
278
|
+
const prelude = hits.length > 0 && firstHit
|
|
279
|
+
? args.commentrayMarkdown.slice(0, firstHit.start)
|
|
280
|
+
: args.commentrayMarkdown;
|
|
281
|
+
const segmentMap = new Map();
|
|
282
|
+
for (let i = 0; i < hits.length; i++) {
|
|
283
|
+
const hit = hits[i];
|
|
284
|
+
if (!hit)
|
|
285
|
+
continue;
|
|
286
|
+
const nextHit = hits[i + 1];
|
|
287
|
+
const end = nextHit ? nextHit.start : args.commentrayMarkdown.length;
|
|
288
|
+
const segment = args.commentrayMarkdown.slice(hit.start, end);
|
|
289
|
+
// Keep the first segment if duplicates exist
|
|
290
|
+
if (!segmentMap.has(hit.id)) {
|
|
291
|
+
segmentMap.set(hit.id, segment);
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
// 2. Reconstruct markdown and index blocks based on source order
|
|
295
|
+
const entry = args.index.byCommentrayPath[args.commentrayPath];
|
|
296
|
+
const nextBlocks = [];
|
|
297
|
+
let nextMarkdown = prelude;
|
|
298
|
+
for (const markerId of sourceMarkerIds) {
|
|
299
|
+
const rawRange = sourceLineRangeForMarkerId(args.sourceText, markerId);
|
|
300
|
+
if (!rawRange)
|
|
301
|
+
continue;
|
|
302
|
+
const range = { startLine: rawRange.start, endLine: rawRange.end };
|
|
303
|
+
const snippet = snippetFromRange(args.sourceText, range);
|
|
304
|
+
// Get or create markdown segment
|
|
305
|
+
let prose = "";
|
|
306
|
+
const existingSegment = segmentMap.get(markerId);
|
|
307
|
+
if (existingSegment !== undefined) {
|
|
308
|
+
const parsed = parseBlockSegment(existingSegment);
|
|
309
|
+
prose = parsed.prose;
|
|
310
|
+
}
|
|
311
|
+
// Construct segment
|
|
312
|
+
const marker = `${BLOCK_MARKER_PREFIX}${markerId}${BLOCK_MARKER_SUFFIX}`;
|
|
313
|
+
const heading = `## \`${args.sourcePath}\` ${rangeLabel(range)}`;
|
|
314
|
+
const newSegment = `${marker}\n${heading}\n\n${prose || CARET_PLACEHOLDER}\n`;
|
|
315
|
+
nextMarkdown = appendBlockToCommentray(nextMarkdown, newSegment);
|
|
316
|
+
// Get or create index block
|
|
317
|
+
const existingBlock = entry?.blocks.find((b) => b.id === markerId);
|
|
318
|
+
const updatedBlock = {
|
|
319
|
+
...existingBlock,
|
|
320
|
+
id: markerId,
|
|
321
|
+
anchor: `marker:${markerId}`,
|
|
322
|
+
markerId,
|
|
323
|
+
snippet,
|
|
324
|
+
};
|
|
325
|
+
nextBlocks.push(updatedBlock);
|
|
326
|
+
}
|
|
327
|
+
// 3. Construct new index
|
|
328
|
+
let nextByCommentrayPath;
|
|
329
|
+
if (nextBlocks.length > 0) {
|
|
330
|
+
nextByCommentrayPath = {
|
|
331
|
+
...args.index.byCommentrayPath,
|
|
332
|
+
[args.commentrayPath]: {
|
|
333
|
+
sourcePath: args.sourcePath,
|
|
334
|
+
commentrayPath: args.commentrayPath,
|
|
335
|
+
blocks: nextBlocks,
|
|
336
|
+
},
|
|
337
|
+
};
|
|
338
|
+
}
|
|
339
|
+
else {
|
|
340
|
+
const { [args.commentrayPath]: _, ...rest } = args.index.byCommentrayPath;
|
|
341
|
+
nextByCommentrayPath = rest;
|
|
342
|
+
}
|
|
343
|
+
return {
|
|
344
|
+
commentrayMarkdown: nextMarkdown,
|
|
345
|
+
index: {
|
|
346
|
+
...args.index,
|
|
347
|
+
byCommentrayPath: nextByCommentrayPath,
|
|
348
|
+
},
|
|
349
|
+
};
|
|
350
|
+
}
|
|
351
|
+
function parseBlockSegment(segment) {
|
|
352
|
+
const lines = segment.split("\n");
|
|
353
|
+
let headingIdx = -1;
|
|
354
|
+
for (let i = 0; i < lines.length; i++) {
|
|
355
|
+
if (lines[i]?.startsWith("## ")) {
|
|
356
|
+
headingIdx = i;
|
|
357
|
+
break;
|
|
358
|
+
}
|
|
359
|
+
}
|
|
360
|
+
if (headingIdx === -1) {
|
|
361
|
+
return { heading: "", prose: segment.trim() };
|
|
362
|
+
}
|
|
363
|
+
const heading = lines[headingIdx] ?? "";
|
|
364
|
+
const prose = lines
|
|
365
|
+
.slice(headingIdx + 1)
|
|
366
|
+
.join("\n")
|
|
367
|
+
.trim();
|
|
368
|
+
return { heading, prose };
|
|
369
|
+
}
|
|
370
|
+
export function recoverSourceMarkersFromSnippet(args) {
|
|
371
|
+
if (!args.block.snippet) {
|
|
372
|
+
return { sourceText: args.sourceText, healed: false };
|
|
373
|
+
}
|
|
374
|
+
const snippetLines = parseCommentraySnippetV1(args.block.snippet);
|
|
375
|
+
if (!snippetLines || snippetLines.length === 0) {
|
|
376
|
+
return { sourceText: args.sourceText, healed: false };
|
|
377
|
+
}
|
|
378
|
+
const sourceLines = args.sourceText.replaceAll("\r\n", "\n").split("\n");
|
|
379
|
+
const S = sourceLines.length;
|
|
380
|
+
const N = snippetLines.length;
|
|
381
|
+
const matches = [];
|
|
382
|
+
for (let i = 0; i <= S - N; i++) {
|
|
383
|
+
let match = true;
|
|
384
|
+
for (let j = 0; j < N; j++) {
|
|
385
|
+
if ((sourceLines[i + j] ?? "").trim() !== snippetLines[j]) {
|
|
386
|
+
match = false;
|
|
387
|
+
break;
|
|
388
|
+
}
|
|
389
|
+
}
|
|
390
|
+
if (match) {
|
|
391
|
+
matches.push(i);
|
|
392
|
+
}
|
|
393
|
+
}
|
|
394
|
+
if (matches.length !== 1) {
|
|
395
|
+
return { sourceText: args.sourceText, healed: false };
|
|
396
|
+
}
|
|
397
|
+
const matchIdx = matches[0];
|
|
398
|
+
if (matchIdx === undefined) {
|
|
399
|
+
return { sourceText: args.sourceText, healed: false };
|
|
400
|
+
}
|
|
401
|
+
const startLine = matchIdx + 1;
|
|
402
|
+
const endLine = matchIdx + N;
|
|
403
|
+
const wrapped = wrapSourceLineRangeWithCommentrayMarkers({
|
|
404
|
+
sourceText: args.sourceText,
|
|
405
|
+
range: { startLine, endLine },
|
|
406
|
+
languageId: args.languageId,
|
|
407
|
+
markerId: args.block.id,
|
|
408
|
+
});
|
|
409
|
+
return {
|
|
410
|
+
sourceText: wrapped.sourceText,
|
|
411
|
+
healed: true,
|
|
412
|
+
range: wrapped.innerRange,
|
|
413
|
+
};
|
|
414
|
+
}
|
|
122
415
|
//# sourceMappingURL=blocks.js.map
|
package/dist/blocks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blocks.js","sourceRoot":"","sources":["../src/blocks.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"blocks.js","sourceRoot":"","sources":["../src/blocks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAC5F,OAAO,EACL,0BAA0B,EAC1B,6BAA6B,EAC7B,0BAA0B,GAC3B,MAAM,qBAAqB,CAAC;AAyC7B,MAAM,mBAAmB,GAAG,2BAA2B,CAAC;AACxD,MAAM,mBAAmB,GAAG,MAAM,CAAC;AACnC,MAAM,iBAAiB,GAAG,2BAA2B,CAAC;AAqBtD;;;;GAIG;AACH,MAAM,UAAU,wCAAwC,CACtD,KAAoD;IAEpD,MAAM,EAAE,GAAG,mBAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACvE,MAAM,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC;IAC/B,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;IAC3B,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACzC,MAAM,MAAM,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC9C,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,0BAA0B,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;IAChF,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,QAAQ,GACZ,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,SAAS,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC;IAC7F,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,QAAQ,GAAG,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,GAAG,YAAY,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC;IAC9F,OAAO;QACL,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;QAC/B,UAAU,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,GAAG,CAAC,EAAE;KACzD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAA+B;IACjE,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACxD,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/F,MAAM,MAAM,GAAG,kBAAkB,CAAC,EAAE,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,gBAAgB,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAoB,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC;IACrE,MAAM,QAAQ,GAAG,mBAAmB,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;IACrF,MAAM,eAAe,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IACxD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;AAC9C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CAAC,QAAgB,EAAE,aAAqB;IAC7E,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;IACnC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM,CAAC;IAC1D,MAAM,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,IAAI,CAAC;IACrF,OAAO,GAAG,IAAI,GAAG,QAAQ,EAAE,CAAC;AAC9B,CAAC;AAOD;;;;;;;GAOG;AACH,MAAM,UAAU,8BAA8B,CAAC,IAK9C;IACC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACpD,MAAM,KAAK,GAAG,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACnD,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,uBAAuB,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9E,CAAC;IAED,MAAM,IAAI,GAAG,6BAA6B,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACpE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,uBAAuB,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9E,CAAC;IAED,IAAI,cAAc,GAAkB,IAAI,CAAC;IACzC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC/B,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,IAAI,UAAU;YAAE,SAAS;QACvD,cAAc,GAAG,GAAG,CAAC,KAAK,CAAC;QAC3B,MAAM;IACR,CAAC;IACD,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;QAC5B,OAAO,uBAAuB,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9E,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC;IACxE,MAAM,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,SAAS,EAAE,CAAC;IACxE,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC;QAChD,CAAC,CAAC,IAAI,CAAC,aAAa;QACpB,CAAC,CAAC,GAAG,IAAI,CAAC,aAAa,IAAI,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,MAAM,CAAC;IACxD,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,EAAE,CAAC;IAC3D,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC,OAAO,EAAE,GAAG,SAAS,IAAI,CAAC;AAC1D,CAAC;AAED,SAAS,mBAAmB,CAAC,UAAkB;IAC7C,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;IACxC,IAAI,IAAI,GAAG,CAAC,CAAC;IAEb,oGAAoG;IACpG,MAAM,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,6BAA6B,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO;YAAE,SAAS;QAC3C,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,SAAS;QAChC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,8FAA8F;IAC9F,KAAK,MAAM,IAAI,IAAI,yBAAyB,CAAC,UAAU,CAAC,EAAE,CAAC;QACzD,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAAE,SAAS;QACjC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7B,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,QAAgB;IAC5D,MAAM,IAAI,GAA+B,EAAE,CAAC;IAC5C,MAAM,QAAQ,GAAG,8EAA8E,CAAC;IAChG,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5C,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACnB,IAAI,KAAK,KAAK,SAAS;YAAE,SAAS;QAClC,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;QAC5B,IAAI,KAAK,GAAG,CAAC;YAAE,SAAS;QACxB,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,mBAAmB,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACvD,CAAC;QAAC,MAAM,CAAC;YACP,iCAAiC;QACnC,CAAC;IACH,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IACvC,OAAO,IAAI,CAAC;AACd,CAAC;AAQD;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAC7B,KAAsB,EACtB,KAA2B;IAE3B,MAAM,GAAG,GAAG,KAAK,CAAC,cAAc,CAAC;IACjC,MAAM,QAAQ,GAAG,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,QAAQ,IAAI,QAAQ,CAAC,UAAU,KAAK,KAAK,CAAC,UAAU,EAAE,CAAC;QACzD,MAAM,IAAI,KAAK,CACb,kBAAkB,GAAG,2BAA2B,QAAQ,CAAC,UAAU,SAAS,KAAK,CAAC,UAAU,EAAE,CAC/F,CAAC;IACJ,CAAC;IACD,MAAM,cAAc,GAAG,QAAQ,EAAE,MAAM,IAAI,EAAE,CAAC;IAC9C,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CACb,YAAY,KAAK,CAAC,KAAK,CAAC,EAAE,yBAAyB,GAAG,yBAAyB,CAChF,CAAC;IACJ,CAAC;IACD,MAAM,SAAS,GAAyB;QACtC,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,MAAM,EAAE,CAAC,GAAG,cAAc,EAAE,KAAK,CAAC,KAAK,CAAC;KACzC,CAAC;IACF,OAAO;QACL,aAAa,EAAE,KAAK,CAAC,aAAa;QAClC,gBAAgB,EAAE,EAAE,GAAG,KAAK,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE;KAClE,CAAC;AACJ,CAAC;AAED,MAAM,WAAW,GAAG,sCAAsC,CAAC;AAC3D,MAAM,SAAS,GAAG,CAAC,CAAC;AAEpB;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,MAAoB,IAAI,CAAC,MAAM;IAC7D,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;QACnC,EAAE,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,UAAU,CAAC,KAAiB,EAAE,UAAkB;IACvD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACxC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,UAAkB,EAAE,KAAiB;IACpE,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,IAAI,EAAE,GAAG,KAAK,CAAC,SAAS,EAAE,EAAE,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC;QACzD,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,wBAAwB,CAAC,OAAO,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,mBAAmB,CAAC,IAI5B;IACC,MAAM,MAAM,GAAG,GAAG,mBAAmB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,mBAAmB,EAAE,CAAC;IAC9E,MAAM,OAAO,GAAG,QAAQ,IAAI,CAAC,UAAU,MAAM,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IACtE,OAAO,GAAG,MAAM,KAAK,OAAO,OAAO,iBAAiB,IAAI,CAAC;AAC3D,CAAC;AAED,SAAS,UAAU,CAAC,KAAiB;IACnC,IAAI,KAAK,CAAC,SAAS,KAAK,KAAK,CAAC,OAAO;QAAE,OAAO,QAAQ,KAAK,CAAC,SAAS,EAAE,CAAC;IACxE,OAAO,SAAS,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;AACrD,CAAC;AAED,SAAS,qBAAqB,CAAC,QAAgB;IAC7C,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,QAAgB,EAAE,OAAe;IACzE,MAAM,YAAY,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,IAAI,GAAG,6BAA6B,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,YAAY,CAAC,CAAC;IACpE,IAAI,cAAc,KAAK,CAAC,CAAC,EAAE,CAAC;QAC1B,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;IACvC,IAAI,CAAC,SAAS;QAAE,OAAO,QAAQ,CAAC;IAEhC,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,IAAI,CAAC,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC/B,uDAAuD;IACvD,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IAElD,iDAAiD;IACjD,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,IAAI,CAAC,KAAK,cAAc;YAAE,SAAS;QACnC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,CAAC,GAAG;YAAE,SAAS;QACnB,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5B,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;QACtD,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,qCAAqC;IACrC,IAAI,MAAM,GAAG,OAAO,CAAC;IACrB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,GAAG,uBAAuB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,UAAkB,EAAE,QAAgB;IAC9E,MAAM,YAAY,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9D,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACrC,MAAM,GAAG,GAAG,6BAA6B,CAAC,IAAI,CAAC,CAAC;QAChD,OAAO,GAAG,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,KAAK,YAAY,CAAC;IACjD,CAAC,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,KAAsB,EACtB,cAAsB,EACtB,OAAe;IAEf,MAAM,KAAK,GAAG,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;IACrD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC;IAChE,IAAI,UAAU,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAC9C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,GAAG,oBAAoB,EAAE,GAAG,KAAK,CAAC,gBAAgB,CAAC;QAChF,OAAO;YACL,GAAG,KAAK;YACR,gBAAgB,EAAE,oBAAoB;SACvC,CAAC;IACJ,CAAC;IACD,OAAO;QACL,GAAG,KAAK;QACR,gBAAgB,EAAE;YAChB,GAAG,KAAK,CAAC,gBAAgB;YACzB,CAAC,cAAc,CAAC,EAAE;gBAChB,GAAG,KAAK;gBACR,MAAM,EAAE,UAAU;aACnB;SACF;KACF,CAAC;AACJ,CAAC;AAUD,MAAM,UAAU,oBAAoB,CAAC,IAA+B;IAIlE,MAAM,WAAW,GAAG,yBAAyB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/D,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAE1E,uDAAuD;IACvD,MAAM,IAAI,GAAG,6BAA6B,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,MAAM,OAAO,GACX,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ;QACzB,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;QAClD,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC;IAE9B,MAAM,UAAU,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC7C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,CAAC,GAAG;YAAE,SAAS;QACnB,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5B,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;QACrE,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC9D,6CAA6C;QAC7C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YAC5B,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,iEAAiE;IACjE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC/D,MAAM,UAAU,GAAsB,EAAE,CAAC;IACzC,IAAI,YAAY,GAAG,OAAO,CAAC;IAE3B,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE,CAAC;QACvC,MAAM,QAAQ,GAAG,0BAA0B,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACvE,IAAI,CAAC,QAAQ;YAAE,SAAS;QACxB,MAAM,KAAK,GAAe,EAAE,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,GAAG,EAAE,CAAC;QAC/E,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAEzD,iCAAiC;QACjC,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,MAAM,eAAe,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAClC,MAAM,MAAM,GAAG,iBAAiB,CAAC,eAAe,CAAC,CAAC;YAClD,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QACvB,CAAC;QAED,oBAAoB;QACpB,MAAM,MAAM,GAAG,GAAG,mBAAmB,GAAG,QAAQ,GAAG,mBAAmB,EAAE,CAAC;QACzE,MAAM,OAAO,GAAG,QAAQ,IAAI,CAAC,UAAU,MAAM,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QACjE,MAAM,UAAU,GAAG,GAAG,MAAM,KAAK,OAAO,OAAO,KAAK,IAAI,iBAAiB,IAAI,CAAC;QAE9E,YAAY,GAAG,uBAAuB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAEjE,4BAA4B;QAC5B,MAAM,aAAa,GAAG,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;QACnE,MAAM,YAAY,GAAoB;YACpC,GAAG,aAAa;YAChB,EAAE,EAAE,QAAQ;YACZ,MAAM,EAAE,UAAU,QAAQ,EAAE;YAC5B,QAAQ;YACR,OAAO;SACR,CAAC;QACF,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC;IAED,yBAAyB;IACzB,IAAI,oBAAyD,CAAC;IAC9D,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,oBAAoB,GAAG;YACrB,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB;YAC9B,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;gBACrB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,MAAM,EAAE,UAAU;aACnB;SACF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC;QAC1E,oBAAoB,GAAG,IAAI,CAAC;IAC9B,CAAC;IAED,OAAO;QACL,kBAAkB,EAAE,YAAY;QAChC,KAAK,EAAE;YACL,GAAG,IAAI,CAAC,KAAK;YACb,gBAAgB,EAAE,oBAAoB;SACvC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAe;IACxC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC;IACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YAChC,UAAU,GAAG,CAAC,CAAC;YACf,MAAM;QACR,CAAC;IACH,CAAC;IACD,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;QACtB,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;IAChD,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IACxC,MAAM,KAAK,GAAG,KAAK;SAChB,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC;SACrB,IAAI,CAAC,IAAI,CAAC;SACV,IAAI,EAAE,CAAC;IACV,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,IAI/C;IACC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACxB,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACxD,CAAC;IACD,MAAM,YAAY,GAAG,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAClE,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/C,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACxD,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzE,MAAM,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC;IAC7B,MAAM,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC;IAE9B,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAChC,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3B,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1D,KAAK,GAAG,KAAK,CAAC;gBACd,MAAM;YACR,CAAC;QACH,CAAC;QACD,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACxD,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACxD,CAAC;IACD,MAAM,SAAS,GAAG,QAAQ,GAAG,CAAC,CAAC;IAC/B,MAAM,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;IAE7B,MAAM,OAAO,GAAG,wCAAwC,CAAC;QACvD,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,KAAK,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE;QAC7B,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;KACxB,CAAC,CAAC;IAEH,OAAO;QACL,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,OAAO,CAAC,UAAU;KAC1B,CAAC;AACJ,CAAC"}
|
|
@@ -15,5 +15,6 @@ export declare function commentrayActiveEditorUiFlags(input: {
|
|
|
15
15
|
normalizedRepoRelativePath: string;
|
|
16
16
|
storageDir: string;
|
|
17
17
|
repoRoot: string;
|
|
18
|
+
staticSiteCommentrayMarkdownFile?: string;
|
|
18
19
|
}): CommentrayActiveEditorUiFlags;
|
|
19
20
|
//# sourceMappingURL=commentray-active-editor-ui-context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commentray-active-editor-ui-context.d.ts","sourceRoot":"","sources":["../src/commentray-active-editor-ui-context.ts"],"names":[],"mappings":"AAGA,+GAA+G;AAC/G,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAGxE;AAED,MAAM,MAAM,6BAA6B,GAAG;IAC1C,mDAAmD;IACnD,wBAAwB,EAAE,OAAO,CAAC;IAClC,2EAA2E;IAC3E,6BAA6B,EAAE,OAAO,CAAC;CACxC,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE;IACnD,0BAA0B,EAAE,MAAM,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"commentray-active-editor-ui-context.d.ts","sourceRoot":"","sources":["../src/commentray-active-editor-ui-context.ts"],"names":[],"mappings":"AAGA,+GAA+G;AAC/G,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAGxE;AAED,MAAM,MAAM,6BAA6B,GAAG;IAC1C,mDAAmD;IACnD,wBAAwB,EAAE,OAAO,CAAC;IAClC,2EAA2E;IAC3E,6BAA6B,EAAE,OAAO,CAAC;CACxC,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE;IACnD,0BAA0B,EAAE,MAAM,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,gCAAgC,CAAC,EAAE,MAAM,CAAC;CAC3C,GAAG,6BAA6B,CA0BhC"}
|
|
@@ -12,8 +12,16 @@ export function commentrayStorageSourcePrefix(storageDir) {
|
|
|
12
12
|
*/
|
|
13
13
|
export function commentrayActiveEditorUiFlags(input) {
|
|
14
14
|
const normalized = normalizeRepoRelativePath(input.normalizedRepoRelativePath.replaceAll("\\", "/"));
|
|
15
|
+
const configuredStaticCompanion = input.staticSiteCommentrayMarkdownFile
|
|
16
|
+
? normalizeRepoRelativePath(input.staticSiteCommentrayMarkdownFile.replaceAll("\\", "/"))
|
|
17
|
+
: "";
|
|
15
18
|
const sourcePrefix = commentrayStorageSourcePrefix(input.storageDir);
|
|
16
19
|
if (!normalized.startsWith(sourcePrefix)) {
|
|
20
|
+
if (configuredStaticCompanion.length > 0 &&
|
|
21
|
+
normalized === configuredStaticCompanion &&
|
|
22
|
+
normalized.endsWith(".md")) {
|
|
23
|
+
return { underCompanionSourceTree: true, isResolvableCompanionMarkdown: true };
|
|
24
|
+
}
|
|
17
25
|
return { underCompanionSourceTree: false, isResolvableCompanionMarkdown: false };
|
|
18
26
|
}
|
|
19
27
|
const relFromSourceDir = normalized.slice(sourcePrefix.length);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commentray-active-editor-ui-context.js","sourceRoot":"","sources":["../src/commentray-active-editor-ui-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,6BAA6B,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAEtF,+GAA+G;AAC/G,MAAM,UAAU,6BAA6B,CAAC,UAAkB;IAC9D,MAAM,EAAE,GAAG,UAAU,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC5C,OAAO,GAAG,EAAE,UAAU,CAAC;AACzB,CAAC;AASD;;;;GAIG;AACH,MAAM,UAAU,6BAA6B,CAAC,
|
|
1
|
+
{"version":3,"file":"commentray-active-editor-ui-context.js","sourceRoot":"","sources":["../src/commentray-active-editor-ui-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,6BAA6B,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAEtF,+GAA+G;AAC/G,MAAM,UAAU,6BAA6B,CAAC,UAAkB;IAC9D,MAAM,EAAE,GAAG,UAAU,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC5C,OAAO,GAAG,EAAE,UAAU,CAAC;AACzB,CAAC;AASD;;;;GAIG;AACH,MAAM,UAAU,6BAA6B,CAAC,KAK7C;IACC,MAAM,UAAU,GAAG,yBAAyB,CAC1C,KAAK,CAAC,0BAA0B,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CACvD,CAAC;IACF,MAAM,yBAAyB,GAAG,KAAK,CAAC,gCAAgC;QACtE,CAAC,CAAC,yBAAyB,CAAC,KAAK,CAAC,gCAAgC,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACzF,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,YAAY,GAAG,6BAA6B,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACrE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACzC,IACE,yBAAyB,CAAC,MAAM,GAAG,CAAC;YACpC,UAAU,KAAK,yBAAyB;YACxC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAC1B,CAAC;YACD,OAAO,EAAE,wBAAwB,EAAE,IAAI,EAAE,6BAA6B,EAAE,IAAI,EAAE,CAAC;QACjF,CAAC;QACD,OAAO,EAAE,wBAAwB,EAAE,KAAK,EAAE,6BAA6B,EAAE,KAAK,EAAE,CAAC;IACnF,CAAC;IACD,MAAM,gBAAgB,GAAG,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC/D,MAAM,WAAW,GAAG,yBAAyB,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IACtF,MAAM,QAAQ,GAAG,6BAA6B,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACjF,MAAM,IAAI,GAAG,2BAA2B,CAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;IAClF,OAAO;QACL,wBAAwB,EAAE,IAAI;QAC9B,6BAA6B,EAAE,OAAO,CAAC,IAAI,CAAC;KAC7C,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
export type EnsureCompanionForSourceOptions = {
|
|
2
|
+
angleId?: string | null;
|
|
3
|
+
initialMarkdown?: string;
|
|
4
|
+
commentrayPath?: string;
|
|
5
|
+
};
|
|
6
|
+
export type EnsureCompanionForSourceResult = {
|
|
7
|
+
sourcePath: string;
|
|
8
|
+
commentrayPath: string;
|
|
9
|
+
createdMarkdown: boolean;
|
|
10
|
+
createdIndexEntry: boolean;
|
|
11
|
+
};
|
|
12
|
+
export declare function companionPlaceholderMarkdown(sourcePath?: string): string;
|
|
13
|
+
export declare function ensureCompanionForSource(repoRoot: string, sourcePath: string, opts?: EnsureCompanionForSourceOptions): Promise<EnsureCompanionForSourceResult>;
|
|
14
|
+
//# sourceMappingURL=companion-bootstrap.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"companion-bootstrap.d.ts","sourceRoot":"","sources":["../src/companion-bootstrap.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,+BAA+B,GAAG;IAC5C,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,wBAAgB,4BAA4B,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAIxE;AAqBD,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,IAAI,GAAE,+BAAoC,GACzC,OAAO,CAAC,8BAA8B,CAAC,CAqDzC"}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import fs from "node:fs/promises";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { loadCommentrayConfig } from "./config.js";
|
|
4
|
+
import { emptyIndex } from "./metadata.js";
|
|
5
|
+
import { resolveCommentrayMarkdownPath } from "./commentray-path-resolution.js";
|
|
6
|
+
import { normalizeRepoRelativePath } from "./paths.js";
|
|
7
|
+
import { readIndex, writeIndex } from "./validate-project.js";
|
|
8
|
+
export function companionPlaceholderMarkdown(sourcePath) {
|
|
9
|
+
const normalized = sourcePath?.trim();
|
|
10
|
+
if (!normalized)
|
|
11
|
+
return "# Commentray\n\n";
|
|
12
|
+
return `# ${normalized}\n\nWrite documentation for ${normalized} here.\n`;
|
|
13
|
+
}
|
|
14
|
+
async function pathExists(p) {
|
|
15
|
+
try {
|
|
16
|
+
await fs.access(p);
|
|
17
|
+
return true;
|
|
18
|
+
}
|
|
19
|
+
catch {
|
|
20
|
+
return false;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
function ensureEntryMatchesSource(entry, sourcePath) {
|
|
24
|
+
const existing = normalizeRepoRelativePath(entry.sourcePath);
|
|
25
|
+
const requested = normalizeRepoRelativePath(sourcePath);
|
|
26
|
+
if (existing !== requested) {
|
|
27
|
+
throw new Error(`commentray path ${entry.commentrayPath} is already indexed for ${entry.sourcePath}, not ${sourcePath}`);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
export async function ensureCompanionForSource(repoRoot, sourcePath, opts = {}) {
|
|
31
|
+
const cfg = await loadCommentrayConfig(repoRoot);
|
|
32
|
+
const normalizedSourcePath = normalizeRepoRelativePath(sourcePath.replaceAll("\\", "/"));
|
|
33
|
+
const explicitCommentrayPath = opts.commentrayPath?.trim();
|
|
34
|
+
const commentrayPath = explicitCommentrayPath && explicitCommentrayPath.length > 0
|
|
35
|
+
? normalizeRepoRelativePath(explicitCommentrayPath.replaceAll("\\", "/"))
|
|
36
|
+
: resolveCommentrayMarkdownPath(repoRoot, normalizedSourcePath, cfg, opts.angleId ?? undefined).commentrayPath;
|
|
37
|
+
const mdAbs = path.resolve(repoRoot, commentrayPath);
|
|
38
|
+
let createdMarkdown = false;
|
|
39
|
+
if (!(await pathExists(mdAbs))) {
|
|
40
|
+
await fs.mkdir(path.dirname(mdAbs), { recursive: true });
|
|
41
|
+
await fs.writeFile(mdAbs, opts.initialMarkdown ?? companionPlaceholderMarkdown(normalizedSourcePath), "utf8");
|
|
42
|
+
createdMarkdown = true;
|
|
43
|
+
}
|
|
44
|
+
let index = (await readIndex(repoRoot)) ?? emptyIndex();
|
|
45
|
+
const existing = index.byCommentrayPath[commentrayPath];
|
|
46
|
+
let createdIndexEntry = false;
|
|
47
|
+
if (!existing) {
|
|
48
|
+
index = {
|
|
49
|
+
...index,
|
|
50
|
+
byCommentrayPath: {
|
|
51
|
+
...index.byCommentrayPath,
|
|
52
|
+
[commentrayPath]: {
|
|
53
|
+
sourcePath: normalizedSourcePath,
|
|
54
|
+
commentrayPath,
|
|
55
|
+
blocks: [],
|
|
56
|
+
},
|
|
57
|
+
},
|
|
58
|
+
};
|
|
59
|
+
await writeIndex(repoRoot, index);
|
|
60
|
+
createdIndexEntry = true;
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
ensureEntryMatchesSource(existing, normalizedSourcePath);
|
|
64
|
+
}
|
|
65
|
+
return {
|
|
66
|
+
sourcePath: normalizedSourcePath,
|
|
67
|
+
commentrayPath,
|
|
68
|
+
createdMarkdown,
|
|
69
|
+
createdIndexEntry,
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
//# sourceMappingURL=companion-bootstrap.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"companion-bootstrap.js","sourceRoot":"","sources":["../src/companion-bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAe9D,MAAM,UAAU,4BAA4B,CAAC,UAAmB;IAC9D,MAAM,UAAU,GAAG,UAAU,EAAE,IAAI,EAAE,CAAC;IACtC,IAAI,CAAC,UAAU;QAAE,OAAO,kBAAkB,CAAC;IAC3C,OAAO,KAAK,UAAU,+BAA+B,UAAU,UAAU,CAAC;AAC5E,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,CAAS;IACjC,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,wBAAwB,CAAC,KAA2B,EAAE,UAAkB;IAC/E,MAAM,QAAQ,GAAG,yBAAyB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC7D,MAAM,SAAS,GAAG,yBAAyB,CAAC,UAAU,CAAC,CAAC;IACxD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CACb,mBAAmB,KAAK,CAAC,cAAc,2BAA2B,KAAK,CAAC,UAAU,SAAS,UAAU,EAAE,CACxG,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,QAAgB,EAChB,UAAkB,EAClB,OAAwC,EAAE;IAE1C,MAAM,GAAG,GAAG,MAAM,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IACjD,MAAM,oBAAoB,GAAG,yBAAyB,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IACzF,MAAM,sBAAsB,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC;IAC3D,MAAM,cAAc,GAClB,sBAAsB,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC;QACzD,CAAC,CAAC,yBAAyB,CAAC,sBAAsB,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACzE,CAAC,CAAC,6BAA6B,CAC3B,QAAQ,EACR,oBAAoB,EACpB,GAAG,EACH,IAAI,CAAC,OAAO,IAAI,SAAS,CAC1B,CAAC,cAAc,CAAC;IACvB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IAErD,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,CAAC,CAAC,MAAM,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAC/B,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACzD,MAAM,EAAE,CAAC,SAAS,CAChB,KAAK,EACL,IAAI,CAAC,eAAe,IAAI,4BAA4B,CAAC,oBAAoB,CAAC,EAC1E,MAAM,CACP,CAAC;QACF,eAAe,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,IAAI,KAAK,GAAG,CAAC,MAAM,SAAS,CAAC,QAAQ,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC;IACxD,MAAM,QAAQ,GAAG,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;IACxD,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAC9B,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,KAAK,GAAG;YACN,GAAG,KAAK;YACR,gBAAgB,EAAE;gBAChB,GAAG,KAAK,CAAC,gBAAgB;gBACzB,CAAC,cAAc,CAAC,EAAE;oBAChB,UAAU,EAAE,oBAAoB;oBAChC,cAAc;oBACd,MAAM,EAAE,EAAE;iBACX;aACF;SACF,CAAC;QACF,MAAM,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAClC,iBAAiB,GAAG,IAAI,CAAC;IAC3B,CAAC;SAAM,CAAC;QACN,wBAAwB,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO;QACL,UAAU,EAAE,oBAAoB;QAChC,cAAc;QACd,eAAe;QACf,iBAAiB;KAClB,CAAC;AACJ,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
export type { CommentrayBlock, CommentrayIndex, SourceFileIndexEntry } from "./model.js";
|
|
2
2
|
export { coerceIndexSchemaVersion, CURRENT_SCHEMA_VERSION } from "./model.js";
|
|
3
|
-
export type { AddBlockToIndexInput, BlockRange, CreateBlockForRangeInput, CreatedBlock, WrapSourceLineRangeWithCommentrayMarkersInput, WrapSourceLineRangeWithCommentrayMarkersResult, } from "./blocks.js";
|
|
4
|
-
export { addBlockToIndex, appendBlockToCommentray, createBlockForRange, generateBlockId, wrapSourceLineRangeWithCommentrayMarkers, } from "./blocks.js";
|
|
3
|
+
export type { AddBlockToIndexInput, AlignAndCleanRegionsInput, BlockRange, CreateBlockForRangeInput, CreatedBlock, WrapSourceLineRangeWithCommentrayMarkersInput, WrapSourceLineRangeWithCommentrayMarkersResult, } from "./blocks.js";
|
|
4
|
+
export { addBlockToIndex, alignAndCleanRegions, appendBlockToCommentray, createBlockForRange, generateBlockId, insertBlockBySourceMarkerOrder, removeBlockFromCommentray, removeBlockFromIndex, removeSourceMarkersFromText, wrapSourceLineRangeWithCommentrayMarkers, } from "./blocks.js";
|
|
5
|
+
export { healSourceFile } from "./self-healing.js";
|
|
5
6
|
export { assertValidAngleId } from "./angles.js";
|
|
6
7
|
export { applyAnglesFlatMigrationToCommentrayToml, ensureAnglesSentinelFile, upsertAngleDefinitionInCommentrayToml, } from "./angles-toml.js";
|
|
7
8
|
export type { ApplyAnglesFlatMigrationTomlInput, UpsertAngleDefinitionInput, } from "./angles-toml.js";
|
|
@@ -36,6 +37,11 @@ export type { BlockDiagnostic } from "./staleness.js";
|
|
|
36
37
|
export { diagnoseBlock } from "./staleness.js";
|
|
37
38
|
export type { ValidationIssue, ValidationResult, ValidateProjectOptions, } from "./validate-project.js";
|
|
38
39
|
export { readIndex, refreshIndexMigrationsOnDisk, validateProject, writeIndex, } from "./validate-project.js";
|
|
40
|
+
export { DEFAULT_COMMENTRAY_TOML, initializeCommentrayProject, isCommentrayProjectInitialized, pathExists, } from "./init-project.js";
|
|
41
|
+
export type { InitializeCommentrayProjectOptions, InitializeCommentrayProjectResult, } from "./init-project.js";
|
|
42
|
+
export { ensureCompanionForSource } from "./companion-bootstrap.js";
|
|
43
|
+
export type { EnsureCompanionForSourceOptions, EnsureCompanionForSourceResult, } from "./companion-bootstrap.js";
|
|
44
|
+
export { companionPlaceholderMarkdown } from "./companion-bootstrap.js";
|
|
39
45
|
export { plannedSymbolResolutionStrategy } from "./language-intelligence.js";
|
|
40
46
|
export type { SymbolResolutionStrategy } from "./language-intelligence.js";
|
|
41
47
|
export type { HeightAdjustable, Identifiable, SyncRegionContinuationKind, WithHeight, } from "./height-adjustable.js";
|
|
@@ -55,5 +61,5 @@ export type { CommentrayMarkerPair } from "./region-marker-convert.js";
|
|
|
55
61
|
export { convertCommentraySourceMarkersToLanguage, findCommentrayMarkerPairs, leadingIndentOfLine, } from "./region-marker-convert.js";
|
|
56
62
|
export { MARKER_ID_BODY, assertValidMarkerId, normaliseMarkerSlugOrThrow } from "./marker-ids.js";
|
|
57
63
|
export type { MarkerValidationIssue } from "./marker-validation.js";
|
|
58
|
-
export { extractCommentrayBlockIdsFromMarkdown, validateIndexMarkerSemantics, validateMarkerBoundariesInSource, validateMarkerRegionsAgainstIndexedSources, validateOverlappingMarkerInnerRangesInSource, } from "./marker-validation.js";
|
|
64
|
+
export { extractCommentrayBlockIdsInMarkdownOrder, extractCommentrayBlockIdsFromMarkdown, validateIndexMarkerSemantics, validateMarkerBoundariesInSource, validateMarkerRegionsAgainstIndexedSources, validateOverlappingMarkerInnerRangesInSource, } from "./marker-validation.js";
|
|
59
65
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|