@markup-carve/carve-lsp 0.1.2 → 0.1.4

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 (176) hide show
  1. package/README.md +61 -14
  2. package/dist/analyze.d.ts +15 -1
  3. package/dist/analyze.js +214 -16
  4. package/dist/analyze.js.map +1 -1
  5. package/dist/analyze.test.js +29 -1
  6. package/dist/analyze.test.js.map +1 -1
  7. package/dist/captions.d.ts +49 -0
  8. package/dist/captions.js +124 -0
  9. package/dist/captions.js.map +1 -0
  10. package/dist/codelens.js +12 -0
  11. package/dist/codelens.js.map +1 -1
  12. package/dist/codelens.test.js +5 -0
  13. package/dist/codelens.test.js.map +1 -1
  14. package/dist/colon-fence-kinds.test.d.ts +1 -0
  15. package/dist/colon-fence-kinds.test.js +128 -0
  16. package/dist/colon-fence-kinds.test.js.map +1 -0
  17. package/dist/colon-fences.d.ts +24 -0
  18. package/dist/colon-fences.js +174 -0
  19. package/dist/colon-fences.js.map +1 -0
  20. package/dist/colon-fences.test.d.ts +1 -0
  21. package/dist/colon-fences.test.js +23 -0
  22. package/dist/colon-fences.test.js.map +1 -0
  23. package/dist/completion.d.ts +6 -2
  24. package/dist/completion.js +84 -8
  25. package/dist/completion.js.map +1 -1
  26. package/dist/completion.test.js +7 -0
  27. package/dist/completion.test.js.map +1 -1
  28. package/dist/composite-figure-crossref.test.d.ts +1 -0
  29. package/dist/composite-figure-crossref.test.js +265 -0
  30. package/dist/composite-figure-crossref.test.js.map +1 -0
  31. package/dist/composite-figure.test.d.ts +1 -0
  32. package/dist/composite-figure.test.js +76 -0
  33. package/dist/composite-figure.test.js.map +1 -0
  34. package/dist/definition.d.ts +4 -2
  35. package/dist/definition.js +28 -5
  36. package/dist/definition.js.map +1 -1
  37. package/dist/dependencies.d.ts +15 -0
  38. package/dist/dependencies.js +59 -0
  39. package/dist/dependencies.js.map +1 -0
  40. package/dist/diagnostic-scheduler.d.ts +58 -0
  41. package/dist/diagnostic-scheduler.js +70 -0
  42. package/dist/diagnostic-scheduler.js.map +1 -0
  43. package/dist/diagnostic-scheduler.test.d.ts +1 -0
  44. package/dist/diagnostic-scheduler.test.js +75 -0
  45. package/dist/diagnostic-scheduler.test.js.map +1 -0
  46. package/dist/document-highlights.d.ts +2 -0
  47. package/dist/document-highlights.js +21 -0
  48. package/dist/document-highlights.js.map +1 -0
  49. package/dist/document-highlights.test.d.ts +1 -0
  50. package/dist/document-highlights.test.js +13 -0
  51. package/dist/document-highlights.test.js.map +1 -0
  52. package/dist/document-links.d.ts +3 -0
  53. package/dist/document-links.js +36 -0
  54. package/dist/document-links.js.map +1 -0
  55. package/dist/document-links.test.d.ts +1 -0
  56. package/dist/document-links.test.js +12 -0
  57. package/dist/document-links.test.js.map +1 -0
  58. package/dist/folding.d.ts +1 -0
  59. package/dist/folding.js +36 -1
  60. package/dist/folding.js.map +1 -1
  61. package/dist/folding.test.js +6 -1
  62. package/dist/folding.test.js.map +1 -1
  63. package/dist/format-corpus.test.d.ts +1 -0
  64. package/dist/format-corpus.test.js +16 -0
  65. package/dist/format-corpus.test.js.map +1 -0
  66. package/dist/format.d.ts +3 -0
  67. package/dist/format.js +38 -74
  68. package/dist/format.js.map +1 -1
  69. package/dist/format.test.js +27 -32
  70. package/dist/format.test.js.map +1 -1
  71. package/dist/hover.js +78 -19
  72. package/dist/hover.js.map +1 -1
  73. package/dist/include-cache.d.ts +26 -0
  74. package/dist/include-cache.js +74 -0
  75. package/dist/include-cache.js.map +1 -0
  76. package/dist/include-completion.d.ts +3 -0
  77. package/dist/include-completion.js +68 -0
  78. package/dist/include-completion.js.map +1 -0
  79. package/dist/include-completion.test.d.ts +1 -0
  80. package/dist/include-completion.test.js +15 -0
  81. package/dist/include-completion.test.js.map +1 -0
  82. package/dist/include-definition-denial.test.d.ts +1 -0
  83. package/dist/include-definition-denial.test.js +86 -0
  84. package/dist/include-definition-denial.test.js.map +1 -0
  85. package/dist/include-definition.d.ts +3 -0
  86. package/dist/include-definition.js +37 -0
  87. package/dist/include-definition.js.map +1 -0
  88. package/dist/include-features.test.d.ts +1 -0
  89. package/dist/include-features.test.js +133 -0
  90. package/dist/include-features.test.js.map +1 -0
  91. package/dist/include-path.d.ts +6 -0
  92. package/dist/include-path.js +31 -2
  93. package/dist/include-path.js.map +1 -1
  94. package/dist/include-settings.d.ts +2 -0
  95. package/dist/include-settings.js +1 -0
  96. package/dist/include-settings.js.map +1 -1
  97. package/dist/includes.d.ts +8 -0
  98. package/dist/includes.js +28 -7
  99. package/dist/includes.js.map +1 -1
  100. package/dist/inlay-hints.d.ts +3 -0
  101. package/dist/inlay-hints.js +43 -0
  102. package/dist/inlay-hints.js.map +1 -0
  103. package/dist/inlay-hints.test.d.ts +1 -0
  104. package/dist/inlay-hints.test.js +10 -0
  105. package/dist/inlay-hints.test.js.map +1 -0
  106. package/dist/lint-actions.d.ts +3 -0
  107. package/dist/lint-actions.js +90 -0
  108. package/dist/lint-actions.js.map +1 -0
  109. package/dist/lint-actions.test.d.ts +1 -0
  110. package/dist/lint-actions.test.js +31 -0
  111. package/dist/lint-actions.test.js.map +1 -0
  112. package/dist/no-git-dependencies.test.d.ts +1 -0
  113. package/dist/no-git-dependencies.test.js +243 -0
  114. package/dist/no-git-dependencies.test.js.map +1 -0
  115. package/dist/packaging.test.d.ts +1 -0
  116. package/dist/packaging.test.js +69 -0
  117. package/dist/packaging.test.js.map +1 -0
  118. package/dist/references.d.ts +2 -0
  119. package/dist/references.js +113 -21
  120. package/dist/references.js.map +1 -1
  121. package/dist/selection.d.ts +2 -0
  122. package/dist/selection.js +36 -0
  123. package/dist/selection.js.map +1 -0
  124. package/dist/selection.test.d.ts +1 -0
  125. package/dist/selection.test.js +10 -0
  126. package/dist/selection.test.js.map +1 -0
  127. package/dist/semantic.d.ts +5 -3
  128. package/dist/semantic.js +45 -4
  129. package/dist/semantic.js.map +1 -1
  130. package/dist/semantic.test.js +11 -0
  131. package/dist/semantic.test.js.map +1 -1
  132. package/dist/server-capabilities.test.d.ts +1 -0
  133. package/dist/server-capabilities.test.js +84 -0
  134. package/dist/server-capabilities.test.js.map +1 -0
  135. package/dist/server.js +353 -24
  136. package/dist/server.js.map +1 -1
  137. package/dist/settings.d.ts +11 -0
  138. package/dist/settings.js +50 -0
  139. package/dist/settings.js.map +1 -0
  140. package/dist/settings.test.d.ts +1 -0
  141. package/dist/settings.test.js +22 -0
  142. package/dist/settings.test.js.map +1 -0
  143. package/dist/spec-0-1-4-constructs.test.d.ts +1 -0
  144. package/dist/spec-0-1-4-constructs.test.js +101 -0
  145. package/dist/spec-0-1-4-constructs.test.js.map +1 -0
  146. package/dist/table-diagnostics.d.ts +3 -0
  147. package/dist/table-diagnostics.js +60 -0
  148. package/dist/table-diagnostics.js.map +1 -0
  149. package/dist/table-diagnostics.test.d.ts +1 -0
  150. package/dist/table-diagnostics.test.js +12 -0
  151. package/dist/table-diagnostics.test.js.map +1 -0
  152. package/dist/versioned-cache.d.ts +8 -0
  153. package/dist/versioned-cache.js +17 -0
  154. package/dist/versioned-cache.js.map +1 -0
  155. package/dist/versioned-cache.test.d.ts +1 -0
  156. package/dist/versioned-cache.test.js +13 -0
  157. package/dist/versioned-cache.test.js.map +1 -0
  158. package/dist/workspace-graph.d.ts +25 -0
  159. package/dist/workspace-graph.js +94 -0
  160. package/dist/workspace-graph.js.map +1 -0
  161. package/dist/workspace-graph.test.d.ts +1 -0
  162. package/dist/workspace-graph.test.js +31 -0
  163. package/dist/workspace-graph.test.js.map +1 -0
  164. package/dist/workspace-index.d.ts +40 -0
  165. package/dist/workspace-index.js +254 -0
  166. package/dist/workspace-index.js.map +1 -0
  167. package/dist/workspace-index.test.d.ts +1 -0
  168. package/dist/workspace-index.test.js +65 -0
  169. package/dist/workspace-index.test.js.map +1 -0
  170. package/dist/workspace-loader.d.ts +11 -0
  171. package/dist/workspace-loader.js +50 -0
  172. package/dist/workspace-loader.js.map +1 -0
  173. package/dist/workspace-loader.test.d.ts +1 -0
  174. package/dist/workspace-loader.test.js +19 -0
  175. package/dist/workspace-loader.test.js.map +1 -0
  176. package/package.json +4 -3
@@ -0,0 +1,68 @@
1
+ import { readdirSync, readFileSync, realpathSync } from 'node:fs';
2
+ import path from 'node:path';
3
+ import { CompletionItemKind } from 'vscode-languageserver/node.js';
4
+ import { scanDocument } from './workspace-index.js';
5
+ export function includeCompletions(source, position, options) {
6
+ if (!options?.sourcePath || !options.includeRoot)
7
+ return [];
8
+ const line = source.replace(/\r\n?/g, '\n').split('\n')[position.line] ?? '';
9
+ const prefix = line.slice(0, position.character);
10
+ const match = /\{\{\s*([^\s}@]*)$/.exec(prefix);
11
+ if (!match)
12
+ return [];
13
+ const authored = match[1];
14
+ const [filePart, fragment] = authored.split('#', 2);
15
+ const root = realpathSafe(options.includeRoot);
16
+ if (!root)
17
+ return [];
18
+ const base = path.resolve(path.dirname(options.sourcePath), path.dirname(filePart || '.'));
19
+ const contained = realpathSafe(base);
20
+ if (!contained || !isInside(root, contained))
21
+ return [];
22
+ const replaceStart = position.character - (fragment === undefined ? path.basename(filePart) : fragment).length;
23
+ if (fragment !== undefined) {
24
+ const target = realpathSafe(path.resolve(path.dirname(options.sourcePath), filePart));
25
+ if (!target || !isInside(root, target))
26
+ return [];
27
+ let targetSource;
28
+ try {
29
+ targetSource = readFileSync(target, 'utf8');
30
+ }
31
+ catch {
32
+ return [];
33
+ }
34
+ return scanDocument(target, targetSource)
35
+ .filter((token) => token.kind === 'heading' && token.declaration)
36
+ .map((token) => item(token.key, CompletionItemKind.Reference, position, replaceStart, 'Section in included file'));
37
+ }
38
+ const partial = path.basename(filePart);
39
+ let entries;
40
+ try {
41
+ entries = readdirSync(contained, { withFileTypes: true });
42
+ }
43
+ catch {
44
+ return [];
45
+ }
46
+ return entries
47
+ .filter((entry) => entry.name.startsWith(partial) && (entry.isDirectory() || entry.name.endsWith('.crv')))
48
+ .map((entry) => item(entry.name + (entry.isDirectory() ? '/' : ''), entry.isDirectory() ? CompletionItemKind.Folder : CompletionItemKind.File, position, replaceStart, 'Contained include path'));
49
+ }
50
+ function item(label, kind, position, start, detail) {
51
+ return { label, kind, detail, textEdit: {
52
+ range: { start: { line: position.line, character: start }, end: position },
53
+ newText: label,
54
+ } };
55
+ }
56
+ function realpathSafe(value) {
57
+ try {
58
+ return realpathSync(value);
59
+ }
60
+ catch {
61
+ return null;
62
+ }
63
+ }
64
+ function isInside(root, target) {
65
+ const relative = path.relative(root, target);
66
+ return relative === '' || (!path.isAbsolute(relative) && !relative.split(path.sep).includes('..'));
67
+ }
68
+ //# sourceMappingURL=include-completion.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"include-completion.js","sourceRoot":"","sources":["../src/include-completion.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,15 @@
1
+ import test from 'node:test';
2
+ import assert from 'node:assert/strict';
3
+ import { mkdtempSync, writeFileSync } from 'node:fs';
4
+ import { tmpdir } from 'node:os';
5
+ import path from 'node:path';
6
+ import { includeCompletions } from './include-completion.js';
7
+ test('completes contained files and their heading fragments', () => {
8
+ const root = mkdtempSync(path.join(tmpdir(), 'carve-include-complete-'));
9
+ const sourcePath = path.join(root, 'main.crv');
10
+ writeFileSync(path.join(root, 'chapter.crv'), '# First section\n');
11
+ const options = { sourcePath, includeRoot: root };
12
+ assert.deepEqual(includeCompletions('{{ cha', { line: 0, character: 6 }, options).map((item) => item.label), ['chapter.crv']);
13
+ assert.deepEqual(includeCompletions('{{ chapter.crv#Fir', { line: 0, character: 18 }, options).map((item) => item.label), ['First-section']);
14
+ });
15
+ //# sourceMappingURL=include-completion.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"include-completion.test.js","sourceRoot":"","sources":["../src/include-completion.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,MAAM,MAAM,oBAAoB,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAChC,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAE5D,IAAI,CAAC,uDAAuD,EAAE,GAAG,EAAE;IACjE,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,yBAAyB,CAAC,CAAC,CAAA;IACxE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;IAC9C,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,EAAE,mBAAmB,CAAC,CAAA;IAClE,MAAM,OAAO,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,CAAA;IACjD,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;IAC7H,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,oBAAoB,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAA;AAC9I,CAAC,CAAC,CAAA"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,86 @@
1
+ import assert from 'node:assert/strict';
2
+ import test from 'node:test';
3
+ import { mkdtempSync, writeFileSync, symlinkSync } from 'node:fs';
4
+ import { tmpdir } from 'node:os';
5
+ import path from 'node:path';
6
+ import { pathToFileURL } from 'node:url';
7
+ import { definitionAt } from './definition.js';
8
+ import { includeDefinitionAt } from './include-definition.js';
9
+ import { fileSystemResolver } from './include-path.js';
10
+ /*
11
+ * THE DENIAL HALF of include go-to-definition.
12
+ *
13
+ * `include-features.test.ts` covers the resolvable case - a directive whose
14
+ * target exists inside the root navigates to it. What no test covered is the
15
+ * other branch: a target the resolver REFUSES must not navigate at all.
16
+ *
17
+ * That branch is the whole security value of routing navigation through
18
+ * `include-path.ts` rather than joining the path locally. Without it,
19
+ * go-to-definition is a way around the containment PART 9 section 19 puts on
20
+ * include resolution: the editor opens a file the include pass would not read.
21
+ *
22
+ * It was verified to be uncovered before these were written. Replacing
23
+ * `if (!resolved.ok) return null` in include-definition.ts with a best-effort
24
+ * location left the whole suite green at 224 of 224 - a guard that cannot fail.
25
+ * Each test below fails under that mutation.
26
+ */
27
+ function workspace() {
28
+ const root = mkdtempSync(path.join(tmpdir(), 'carve-lsp-incdef-'));
29
+ const child = path.join(root, 'chapter-1.crv');
30
+ writeFileSync(child, '# Chapter One\n');
31
+ return { root, doc: path.join(root, 'book.crv'), child };
32
+ }
33
+ const optionsFor = (root, sourcePath) => ({
34
+ resolver: fileSystemResolver(root, {}),
35
+ includeRoot: root,
36
+ sourcePath,
37
+ });
38
+ test('a target outside the root does not navigate', () => {
39
+ const { root, doc } = workspace();
40
+ writeFileSync(path.join(path.dirname(root), 'outside.crv'), 'secret\n');
41
+ const at = includeDefinitionAt('{{ ../outside.crv }}\n', { line: 0, character: 4 }, optionsFor(root, doc));
42
+ assert.equal(at, null);
43
+ });
44
+ test('a symlink escaping the root does not navigate', () => {
45
+ const { root, doc } = workspace();
46
+ const outsideDir = mkdtempSync(path.join(tmpdir(), 'carve-lsp-outside-'));
47
+ const secret = path.join(outsideDir, 'secret.crv');
48
+ writeFileSync(secret, 'secret\n');
49
+ symlinkSync(secret, path.join(root, 'link.crv'));
50
+ const at = includeDefinitionAt('{{ link.crv }}\n', { line: 0, character: 4 }, optionsFor(root, doc));
51
+ assert.equal(at, null);
52
+ });
53
+ test('an absolute path does not navigate while absolutes are denied', () => {
54
+ const { root, doc, child } = workspace();
55
+ const at = includeDefinitionAt(`{{ ${child} }}\n`, { line: 0, character: 4 }, optionsFor(root, doc));
56
+ assert.equal(at, null);
57
+ });
58
+ test('a missing target does not navigate', () => {
59
+ const { root, doc } = workspace();
60
+ const at = includeDefinitionAt('{{ nope.crv }}\n', { line: 0, character: 4 }, optionsFor(root, doc));
61
+ assert.equal(at, null);
62
+ });
63
+ /*
64
+ * Three properties around the branch rather than inside it. The first two are
65
+ * NOT killed by the denial mutation above - they are controls for different
66
+ * mistakes, and are labelled as such rather than presented as proof of the
67
+ * guard.
68
+ */
69
+ test('with no resolver the include branch is inert (control)', () => {
70
+ const { root, doc } = workspace();
71
+ const uri = pathToFileURL(doc).toString();
72
+ assert.equal(includeDefinitionAt('{{ chapter-1.crv }}\n', { line: 0, character: 4 }, {}), null);
73
+ assert.equal(definitionAt(uri, '{{ chapter-1.crv }}\n', { line: 0, character: 4 }), null);
74
+ assert.ok(root);
75
+ });
76
+ test('a directive inside verbatim content is not a directive (control)', () => {
77
+ const { root, doc } = workspace();
78
+ const at = includeDefinitionAt('`{{ chapter-1.crv }}`\n', { line: 0, character: 6 }, optionsFor(root, doc));
79
+ assert.equal(at, null);
80
+ });
81
+ test('a CRLF document resolves the same offsets as LF', () => {
82
+ const { root, doc, child } = workspace();
83
+ const at = includeDefinitionAt('a\r\nb\r\n{{ chapter-1.crv }}\r\n', { line: 2, character: 5 }, optionsFor(root, doc));
84
+ assert.equal(at?.uri, pathToFileURL(child).toString());
85
+ });
86
+ //# sourceMappingURL=include-definition-denial.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"include-definition-denial.test.js","sourceRoot":"","sources":["../src/include-definition-denial.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,3 @@
1
+ import { type Location, type Position } from 'vscode-languageserver/node.js';
2
+ import type { IncludeOptions } from './includes.js';
3
+ export declare function includeDefinitionAt(source: string, position: Position, options: IncludeOptions | undefined): Location | null;
@@ -0,0 +1,37 @@
1
+ import { pathToFileURL } from 'node:url';
2
+ import { findDirectives } from './include-directive.js';
3
+ export function includeDefinitionAt(source, position, options) {
4
+ if (!options?.resolver)
5
+ return null;
6
+ const normalized = source.replace(/\r\n?/g, '\n');
7
+ const offset = offsetAt(normalized, position);
8
+ const directive = findDirectives(normalized).find((candidate) => offset >= candidate.start && offset < candidate.end);
9
+ if (!directive)
10
+ return null;
11
+ const stack = options.sourcePath === undefined ? [] : [options.sourcePath];
12
+ const resolved = options.resolver(directive.path, {
13
+ stack,
14
+ depth: 0,
15
+ ...(options.sourcePath === undefined ? {} : { sourcePath: options.sourcePath }),
16
+ });
17
+ if (!resolved.ok)
18
+ return null;
19
+ return {
20
+ uri: pathToFileURL(resolved.id).toString(),
21
+ range: {
22
+ start: { line: 0, character: 0 },
23
+ end: { line: 0, character: 0 },
24
+ },
25
+ };
26
+ }
27
+ function offsetAt(source, position) {
28
+ let offset = 0;
29
+ for (let line = 0; line < position.line; line += 1) {
30
+ const newline = source.indexOf('\n', offset);
31
+ if (newline < 0)
32
+ return source.length;
33
+ offset = newline + 1;
34
+ }
35
+ return Math.min(source.length, offset + position.character);
36
+ }
37
+ //# sourceMappingURL=include-definition.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"include-definition.js","sourceRoot":"","sources":["../src/include-definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAGvD,MAAM,UAAU,mBAAmB,CACjC,MAAc,EACd,QAAkB,EAClB,OAAmC;IAEnC,IAAI,CAAC,OAAO,EAAE,QAAQ;QAAE,OAAO,IAAI,CAAA;IACnC,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IACjD,MAAM,MAAM,GAAG,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IAC7C,MAAM,SAAS,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,IAAI,CAC/C,CAAC,SAAS,EAAE,EAAE,CAAC,MAAM,IAAI,SAAS,CAAC,KAAK,IAAI,MAAM,GAAG,SAAS,CAAC,GAAG,CACnE,CAAA;IACD,IAAI,CAAC,SAAS;QAAE,OAAO,IAAI,CAAA;IAC3B,MAAM,KAAK,GAAG,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IAC1E,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE;QAChD,KAAK;QACL,KAAK,EAAE,CAAC;QACR,GAAG,CAAC,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC;KAChF,CAAC,CAAA;IACF,IAAI,CAAC,QAAQ,CAAC,EAAE;QAAE,OAAO,IAAI,CAAA;IAC7B,OAAO;QACL,GAAG,EAAE,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;QAC1C,KAAK,EAAE;YACL,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;YAChC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;SAC/B;KACF,CAAA;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,MAAc,EAAE,QAAkB;IAClD,IAAI,MAAM,GAAG,CAAC,CAAA;IACd,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,QAAQ,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC;QACnD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAC5C,IAAI,OAAO,GAAG,CAAC;YAAE,OAAO,MAAM,CAAC,MAAM,CAAA;QACrC,MAAM,GAAG,OAAO,GAAG,CAAC,CAAA;IACtB,CAAC;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAA;AAC7D,CAAC"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,133 @@
1
+ import assert from 'node:assert/strict';
2
+ import test from 'node:test';
3
+ import { mkdirSync, mkdtempSync, readFileSync, realpathSync, rmSync, statSync, symlinkSync, utimesSync, writeFileSync } from 'node:fs';
4
+ import { tmpdir } from 'node:os';
5
+ import path from 'node:path';
6
+ import { pathToFileURL } from 'node:url';
7
+ import { analyzeCarve } from './analyze.js';
8
+ import { DependencyIndex, watcherFor } from './dependencies.js';
9
+ import { definitionAt } from './definition.js';
10
+ import { IncludeSourceCache } from './include-cache.js';
11
+ import { fileSystemResolver } from './include-path.js';
12
+ import { parse, resolve } from '@markup-carve/carve';
13
+ import { IncludeParseCache } from './include-cache.js';
14
+ function fixture() {
15
+ const dir = realpathSync(mkdtempSync(path.join(tmpdir(), 'carve-lsp-features-')));
16
+ test.after(() => rmSync(dir, { recursive: true, force: true }));
17
+ return dir;
18
+ }
19
+ test('include cache is metadata-validated and LRU-bounded', () => {
20
+ const cache = new IncludeSourceCache(2);
21
+ cache.set('/a', 1, 1, { source: 'a', bytes: 1 });
22
+ cache.set('/b', 1, 1, { source: 'b', bytes: 1 });
23
+ assert.equal(cache.get('/a', 1, 1)?.source, 'a');
24
+ cache.set('/c', 1, 1, { source: 'c', bytes: 1 });
25
+ assert.equal(cache.get('/b', 1, 1), undefined);
26
+ assert.equal(cache.get('/a', 2, 1), undefined);
27
+ assert.equal(cache.size, 1);
28
+ });
29
+ test('parsed-child cache is version-validated', () => {
30
+ const cache = new IncludeParseCache();
31
+ const document = resolve(parse('# Cached\n'));
32
+ cache.set('/child', '1:9', document);
33
+ assert.equal(cache.get('/child', '1:9'), document);
34
+ assert.equal(cache.get('/child', '2:9'), undefined);
35
+ });
36
+ test('filesystem cache invalidates after an included file changes', () => {
37
+ const dir = fixture();
38
+ const child = path.join(dir, 'child.crv');
39
+ writeFileSync(child, '# Before\n');
40
+ const cache = new IncludeSourceCache();
41
+ const resolver = fileSystemResolver(dir, { cache });
42
+ const context = { stack: [path.join(dir, 'main.crv')], depth: 0 };
43
+ const first = resolver('child.crv', context);
44
+ assert.match(first.ok ? first.source : '', /Before/);
45
+ const prior = statSync(child).mtimeMs;
46
+ writeFileSync(child, '# After!\n');
47
+ utimesSync(child, new Date(), new Date(prior + 1000));
48
+ const next = resolver('child.crv', context);
49
+ assert.equal(next.ok && next.source, '# After!\n');
50
+ });
51
+ test('missing contained targets expose an absolute watch candidate', () => {
52
+ const dir = fixture();
53
+ const result = fileSystemResolver(dir)('later.crv', {
54
+ stack: [path.join(dir, 'main.crv')],
55
+ depth: 0,
56
+ });
57
+ assert.equal(result.ok, false);
58
+ assert.equal(result.ok ? undefined : result.watch, path.join(dir, 'later.crv'));
59
+ });
60
+ test('same missing spelling in different child directories produces two watchers', () => {
61
+ const dir = fixture();
62
+ mkdirSync(path.join(dir, 'a'));
63
+ mkdirSync(path.join(dir, 'b'));
64
+ writeFileSync(path.join(dir, 'a', 'chapter.crv'), '{{ missing.crv }}\n');
65
+ writeFileSync(path.join(dir, 'b', 'chapter.crv'), '{{ missing.crv }}\n');
66
+ const analysis = analyzeCarve('{{ a/chapter.crv }}\n{{ b/chapter.crv }}\n', {
67
+ includes: {
68
+ resolver: fileSystemResolver(dir),
69
+ sourcePath: path.join(dir, 'main.crv'),
70
+ includeRoot: dir,
71
+ },
72
+ });
73
+ const missing = analysis.dependencies.filter((dependency) => !dependency.resolved);
74
+ assert.deepEqual(missing.map((dependency) => dependency.watch).sort(), [path.join(dir, 'a', 'missing.crv'), path.join(dir, 'b', 'missing.crv')]);
75
+ });
76
+ test('a missing target below an escaping symlink is never watched', () => {
77
+ const dir = fixture();
78
+ const outside = fixture();
79
+ mkdirSync(path.join(dir, 'inside'));
80
+ symlinkSync(outside, path.join(dir, 'inside', 'escape'));
81
+ const result = fileSystemResolver(dir)('inside/escape/later.crv', {
82
+ stack: [path.join(dir, 'main.crv')],
83
+ depth: 0,
84
+ });
85
+ assert.equal(result.ok, false);
86
+ assert.equal(result.ok ? undefined : result.denial, 'outside-root');
87
+ assert.equal(result.ok ? undefined : result.watch, undefined);
88
+ });
89
+ test('dependency index tracks reverse edges and meaningful watch-set changes', () => {
90
+ const index = new DependencyIndex();
91
+ assert.equal(index.update('file:///a', ['/child', '/missing']), true);
92
+ assert.equal(index.update('file:///a', ['/missing', '/child']), false);
93
+ index.update('file:///b', ['/child']);
94
+ assert.deepEqual(index.documentsFor('/child').sort(), ['file:///a', 'file:///b']);
95
+ assert.equal(index.remove('file:///a'), true);
96
+ assert.deepEqual(index.watchedPaths(), ['/child']);
97
+ });
98
+ test('watchers for missing directory trees root at an existing ancestor', () => {
99
+ const dir = fixture();
100
+ const watcher = watcherFor(path.join(dir, 'future', 'chapter.crv'));
101
+ assert.equal(watcher.globPattern.baseUri, pathToFileURL(dir).toString());
102
+ assert.equal(watcher.globPattern.pattern, 'future/chapter.crv');
103
+ });
104
+ test('go-to-definition on an include uses the guarded resolver', () => {
105
+ const dir = fixture();
106
+ const main = path.join(dir, 'main.crv');
107
+ const child = path.join(dir, 'child.crv');
108
+ writeFileSync(main, '{{ child.crv }}\n');
109
+ writeFileSync(child, '# Child\n');
110
+ const source = readFileSync(main, 'utf8');
111
+ const location = definitionAt(pathToFileURL(main).toString(), source, { line: 0, character: 5 }, {
112
+ resolver: fileSystemResolver(dir),
113
+ sourcePath: main,
114
+ includeRoot: dir,
115
+ });
116
+ assert.equal(location?.uri, pathToFileURL(child).toString());
117
+ });
118
+ test('included headings contribute symbols attributed to the child file', () => {
119
+ const dir = fixture();
120
+ const main = path.join(dir, 'main.crv');
121
+ const child = path.join(dir, 'child.crv');
122
+ writeFileSync(child, '# Child heading\n');
123
+ const analysis = analyzeCarve('{{ child.crv }}\n', {
124
+ includes: {
125
+ resolver: fileSystemResolver(dir),
126
+ sourcePath: main,
127
+ includeRoot: dir,
128
+ },
129
+ });
130
+ assert.equal(analysis.includedSymbols[0]?.name, 'Child heading');
131
+ assert.equal(analysis.includedSymbols[0]?.location.uri, pathToFileURL(child).toString());
132
+ });
133
+ //# sourceMappingURL=include-features.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"include-features.test.js","sourceRoot":"","sources":["../src/include-features.test.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
+ import type { IncludeSourceCache } from './include-cache.js';
1
2
  /**
2
3
  * Why a resolver refused a target. Reported on {@link IncludeWarning.detail},
3
4
  * never folded into the diagnostic message: §19 I7 requires a
@@ -24,10 +25,13 @@ export type IncludeResolved = {
24
25
  id: string;
25
26
  source: string;
26
27
  bytes: number;
28
+ watch?: string;
29
+ version?: string;
27
30
  } | {
28
31
  ok: false;
29
32
  id: string;
30
33
  denial: IncludeDenial;
34
+ watch?: string;
31
35
  };
32
36
  export type IncludeResolver = (includePath: string, ctx: IncludeContext) => IncludeResolved;
33
37
  export interface FileSystemResolverOptions {
@@ -44,6 +48,8 @@ export interface FileSystemResolverOptions {
44
48
  * later gains a fetcher has the gate already in place.
45
49
  */
46
50
  allowedRemoteHosts?: string[];
51
+ /** Process-level child-source cache, consulted only after containment. */
52
+ cache?: IncludeSourceCache;
47
53
  }
48
54
  /**
49
55
  * Filesystem resolver with canonical root containment, for a workspace the
@@ -56,6 +56,22 @@ export function fileSystemResolver(includeRoot, opts = {}) {
56
56
  // an escape the way a startsWith('..') prefix test would.
57
57
  return rel.split(path.sep)[0] !== '..';
58
58
  };
59
+ const missingCandidate = (candidate) => {
60
+ let ancestor = path.dirname(candidate);
61
+ const suffix = [path.basename(candidate)];
62
+ while (ancestor !== path.dirname(ancestor)) {
63
+ try {
64
+ const ancestorReal = realpathSync(ancestor);
65
+ const canonicalCandidate = path.join(ancestorReal, ...suffix);
66
+ return contains(canonicalCandidate) ? canonicalCandidate : undefined;
67
+ }
68
+ catch {
69
+ suffix.unshift(path.basename(ancestor));
70
+ ancestor = path.dirname(ancestor);
71
+ }
72
+ }
73
+ return undefined;
74
+ };
59
75
  return (includePath, ctx) => {
60
76
  // GUARD 1 (§19: MUST NOT fetch remote URLs unless an allowlist is
61
77
  // explicitly configured). Checked before any path join, so a URL can never
@@ -89,7 +105,12 @@ export function fileSystemResolver(includeRoot, opts = {}) {
89
105
  real = realpathSync(joined);
90
106
  }
91
107
  catch {
92
- return { ok: false, id: includePath, denial: 'not-found' };
108
+ // A missing but lexically contained candidate is safe and useful to
109
+ // watch: its later creation must revalidate the including document.
110
+ const watch = missingCandidate(joined);
111
+ return watch === undefined
112
+ ? { ok: false, id: includePath, denial: 'outside-root' }
113
+ : { ok: false, id: includePath, denial: 'not-found', watch };
93
114
  }
94
115
  // GUARD 3 (§19: only files under the configured project root AFTER symlink
95
116
  // resolution). Catches `..` that leaves the root, a symlink that points out
@@ -110,6 +131,10 @@ export function fileSystemResolver(includeRoot, opts = {}) {
110
131
  // or stream without end, and neither is a document.
111
132
  if (!stat.isFile())
112
133
  return { ok: false, id: real, denial: 'not-a-file' };
134
+ const cached = opts.cache?.get(real, stat.mtimeMs, stat.size);
135
+ const version = `${stat.mtimeMs}:${stat.size}`;
136
+ if (cached)
137
+ return { ok: true, id: real, watch: real, version, ...cached };
113
138
  const buffer = Buffer.allocUnsafe(stat.size);
114
139
  let read = 0;
115
140
  while (read < stat.size) {
@@ -118,14 +143,18 @@ export function fileSystemResolver(includeRoot, opts = {}) {
118
143
  break;
119
144
  read += n;
120
145
  }
121
- return {
146
+ const value = {
122
147
  ok: true,
123
148
  id: real,
149
+ watch: real,
150
+ version,
124
151
  source: buffer.subarray(0, read).toString('utf8'),
125
152
  // Encoded bytes, not JavaScript characters, so the budget counts what
126
153
  // the include-bomb actually costs.
127
154
  bytes: read,
128
155
  };
156
+ opts.cache?.set(real, stat.mtimeMs, stat.size, value);
157
+ return value;
129
158
  }
130
159
  finally {
131
160
  closeSync(fd);
@@ -1 +1 @@
1
- {"version":3,"file":"include-path.js","sourceRoot":"","sources":["../src/include-path.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"include-path.js","sourceRoot":"","sources":["../src/include-path.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
+ import type { IncludeSourceCache } from './include-cache.js';
1
2
  import type { IncludeOptions } from './includes.js';
2
3
  export interface IncludeSettings {
3
4
  /**
@@ -36,6 +37,7 @@ export interface IncludeGateInput {
36
37
  * reject its ordinary relative includes as escapes.
37
38
  */
38
39
  workspaceRoots?: string[];
40
+ cache?: IncludeSourceCache;
39
41
  }
40
42
  /**
41
43
  * Build the include options for one document, or undefined to leave its
@@ -118,6 +118,7 @@ export function includeOptionsFor(input) {
118
118
  resolver = fileSystemResolver(root, {
119
119
  allowAbsolute: input.settings.allowAbsolute ?? false,
120
120
  allowedRemoteHosts: input.settings.allowedRemoteHosts ?? [],
121
+ ...(input.cache === undefined ? {} : { cache: input.cache }),
121
122
  });
122
123
  }
123
124
  catch {
@@ -1 +1 @@
1
- {"version":3,"file":"include-settings.js","sourceRoot":"","sources":["../src/include-settings.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"include-settings.js","sourceRoot":"","sources":["../src/include-settings.ts"],"names":[],"mappings":"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"}
@@ -39,6 +39,8 @@ export interface IncludeDependency {
39
39
  id: string;
40
40
  /** True when the resolver produced source text for this target. */
41
41
  resolved: boolean;
42
+ /** Absolute legal filesystem candidate a host can watch. */
43
+ watch?: string;
42
44
  }
43
45
  export interface IncludeOptions {
44
46
  /** Resolve an include path to source text. Absent means the pass is inert. */
@@ -65,6 +67,12 @@ export interface IncludeResolution {
65
67
  dependencies: IncludeDependency[];
66
68
  /** Bytes charged against the budget. */
67
69
  bytes: number;
70
+ /** Successfully read child documents, de-duplicated by canonical id. */
71
+ documents: Array<{
72
+ id: string;
73
+ source: string;
74
+ version?: string;
75
+ }>;
68
76
  }
69
77
  /**
70
78
  * Walk the include graph rooted at `source`.