@reqlan/language 1.4.0 → 1.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (222) hide show
  1. package/README.md +121 -24
  2. package/README.template.md +32 -0
  3. package/out/generated/ast.d.ts +39 -1
  4. package/out/generated/ast.js +35 -1
  5. package/out/generated/ast.js.map +1 -1
  6. package/out/generated/grammar.js +365 -110
  7. package/out/generated/grammar.js.map +1 -1
  8. package/out/reqlan-definition-provider.js +2 -2
  9. package/out/reqlan-definition-provider.js.map +1 -1
  10. package/out/reqlan-file-link-resolver.js +6 -1
  11. package/out/reqlan-file-link-resolver.js.map +1 -1
  12. package/out/reqlan-import-bindings.d.ts +6 -1
  13. package/out/reqlan-import-bindings.js +18 -1
  14. package/out/reqlan-import-bindings.js.map +1 -1
  15. package/out/reqlan-namespace-import-links.js +4 -3
  16. package/out/reqlan-namespace-import-links.js.map +1 -1
  17. package/out/reqlan-path-resolve.d.ts +1 -0
  18. package/out/reqlan-path-resolve.js +3 -0
  19. package/out/reqlan-path-resolve.js.map +1 -1
  20. package/out/reqlan-references.js +3 -2
  21. package/out/reqlan-references.js.map +1 -1
  22. package/out/reqlan-scope.js +9 -4
  23. package/out/reqlan-scope.js.map +1 -1
  24. package/out/reqlan-semantic-token-provider.js +23 -5
  25. package/out/reqlan-semantic-token-provider.js.map +1 -1
  26. package/out/reqlan-validator.d.ts +7 -0
  27. package/out/reqlan-validator.js +35 -3
  28. package/out/reqlan-validator.js.map +1 -1
  29. package/out/reqlan-workspace-attribute-catalog.js +37 -15
  30. package/out/reqlan-workspace-attribute-catalog.js.map +1 -1
  31. package/package.json +2 -2
  32. package/src/generated/ast.ts +53 -2
  33. package/src/generated/grammar.ts +365 -110
  34. package/src/reqlan-definition-provider.ts +2 -1
  35. package/src/reqlan-file-link-resolver.ts +6 -1
  36. package/src/reqlan-import-bindings.ts +26 -1
  37. package/src/reqlan-namespace-import-links.ts +4 -3
  38. package/src/reqlan-path-resolve.ts +4 -0
  39. package/src/reqlan-references.ts +3 -2
  40. package/src/reqlan-scope.ts +9 -5
  41. package/src/reqlan-semantic-token-provider.ts +22 -4
  42. package/src/reqlan-validator.ts +50 -2
  43. package/src/reqlan-workspace-attribute-catalog.ts +50 -15
  44. package/src/reqlan.langium +18 -2
  45. package/out/src/file-path-rewrite.d.ts +0 -25
  46. package/out/src/file-path-rewrite.js +0 -56
  47. package/out/src/file-path-rewrite.js.map +0 -1
  48. package/out/src/generated/ast.d.ts +0 -1173
  49. package/out/src/generated/ast.js +0 -994
  50. package/out/src/generated/ast.js.map +0 -1
  51. package/out/src/generated/grammar.d.ts +0 -7
  52. package/out/src/generated/grammar.js +0 -3045
  53. package/out/src/generated/grammar.js.map +0 -1
  54. package/out/src/generated/module.d.ts +0 -20
  55. package/out/src/generated/module.js +0 -32
  56. package/out/src/generated/module.js.map +0 -1
  57. package/out/src/index.d.ts +0 -29
  58. package/out/src/index.js +0 -30
  59. package/out/src/index.js.map +0 -1
  60. package/out/src/reqlan-attribute-catalog.d.ts +0 -19
  61. package/out/src/reqlan-attribute-catalog.js +0 -87
  62. package/out/src/reqlan-attribute-catalog.js.map +0 -1
  63. package/out/src/reqlan-code-action-provider.d.ts +0 -34
  64. package/out/src/reqlan-code-action-provider.js +0 -206
  65. package/out/src/reqlan-code-action-provider.js.map +0 -1
  66. package/out/src/reqlan-comment-resolver.d.ts +0 -35
  67. package/out/src/reqlan-comment-resolver.js +0 -308
  68. package/out/src/reqlan-comment-resolver.js.map +0 -1
  69. package/out/src/reqlan-completion-context.d.ts +0 -46
  70. package/out/src/reqlan-completion-context.js +0 -244
  71. package/out/src/reqlan-completion-context.js.map +0 -1
  72. package/out/src/reqlan-completion-provider.d.ts +0 -41
  73. package/out/src/reqlan-completion-provider.js +0 -320
  74. package/out/src/reqlan-completion-provider.js.map +0 -1
  75. package/out/src/reqlan-definition-provider.d.ts +0 -31
  76. package/out/src/reqlan-definition-provider.js +0 -240
  77. package/out/src/reqlan-definition-provider.js.map +0 -1
  78. package/out/src/reqlan-document-highlight-provider.d.ts +0 -10
  79. package/out/src/reqlan-document-highlight-provider.js +0 -11
  80. package/out/src/reqlan-document-highlight-provider.js.map +0 -1
  81. package/out/src/reqlan-document-link-provider.d.ts +0 -14
  82. package/out/src/reqlan-document-link-provider.js +0 -24
  83. package/out/src/reqlan-document-link-provider.js.map +0 -1
  84. package/out/src/reqlan-embedded-file-references.d.ts +0 -11
  85. package/out/src/reqlan-embedded-file-references.js +0 -50
  86. package/out/src/reqlan-embedded-file-references.js.map +0 -1
  87. package/out/src/reqlan-file-link-resolver.d.ts +0 -44
  88. package/out/src/reqlan-file-link-resolver.js +0 -347
  89. package/out/src/reqlan-file-link-resolver.js.map +0 -1
  90. package/out/src/reqlan-file-references.d.ts +0 -15
  91. package/out/src/reqlan-file-references.js +0 -72
  92. package/out/src/reqlan-file-references.js.map +0 -1
  93. package/out/src/reqlan-grammar-config.d.ts +0 -5
  94. package/out/src/reqlan-grammar-config.js +0 -9
  95. package/out/src/reqlan-grammar-config.js.map +0 -1
  96. package/out/src/reqlan-idea-summary.d.ts +0 -6
  97. package/out/src/reqlan-idea-summary.js +0 -78
  98. package/out/src/reqlan-idea-summary.js.map +0 -1
  99. package/out/src/reqlan-ignore-error.d.ts +0 -10
  100. package/out/src/reqlan-ignore-error.js +0 -42
  101. package/out/src/reqlan-ignore-error.js.map +0 -1
  102. package/out/src/reqlan-import-bindings.d.ts +0 -12
  103. package/out/src/reqlan-import-bindings.js +0 -65
  104. package/out/src/reqlan-import-bindings.js.map +0 -1
  105. package/out/src/reqlan-import-edits.d.ts +0 -17
  106. package/out/src/reqlan-import-edits.js +0 -96
  107. package/out/src/reqlan-import-edits.js.map +0 -1
  108. package/out/src/reqlan-imports.d.ts +0 -22
  109. package/out/src/reqlan-imports.js +0 -61
  110. package/out/src/reqlan-imports.js.map +0 -1
  111. package/out/src/reqlan-inbound-reference-inlay-label.d.ts +0 -23
  112. package/out/src/reqlan-inbound-reference-inlay-label.js +0 -128
  113. package/out/src/reqlan-inbound-reference-inlay-label.js.map +0 -1
  114. package/out/src/reqlan-inlay-hint-provider.d.ts +0 -15
  115. package/out/src/reqlan-inlay-hint-provider.js +0 -54
  116. package/out/src/reqlan-inlay-hint-provider.js.map +0 -1
  117. package/out/src/reqlan-inlay-hint-settings.d.ts +0 -10
  118. package/out/src/reqlan-inlay-hint-settings.js +0 -10
  119. package/out/src/reqlan-inlay-hint-settings.js.map +0 -1
  120. package/out/src/reqlan-linker.d.ts +0 -26
  121. package/out/src/reqlan-linker.js +0 -86
  122. package/out/src/reqlan-linker.js.map +0 -1
  123. package/out/src/reqlan-markdown-links.d.ts +0 -28
  124. package/out/src/reqlan-markdown-links.js +0 -113
  125. package/out/src/reqlan-markdown-links.js.map +0 -1
  126. package/out/src/reqlan-module.d.ts +0 -41
  127. package/out/src/reqlan-module.js +0 -76
  128. package/out/src/reqlan-module.js.map +0 -1
  129. package/out/src/reqlan-name-catalog.d.ts +0 -23
  130. package/out/src/reqlan-name-catalog.js +0 -63
  131. package/out/src/reqlan-name-catalog.js.map +0 -1
  132. package/out/src/reqlan-name-provider.d.ts +0 -10
  133. package/out/src/reqlan-name-provider.js +0 -38
  134. package/out/src/reqlan-name-provider.js.map +0 -1
  135. package/out/src/reqlan-namespace-import-links.d.ts +0 -10
  136. package/out/src/reqlan-namespace-import-links.js +0 -81
  137. package/out/src/reqlan-namespace-import-links.js.map +0 -1
  138. package/out/src/reqlan-path-completion.d.ts +0 -50
  139. package/out/src/reqlan-path-completion.js +0 -304
  140. package/out/src/reqlan-path-completion.js.map +0 -1
  141. package/out/src/reqlan-path-references.d.ts +0 -5
  142. package/out/src/reqlan-path-references.js +0 -124
  143. package/out/src/reqlan-path-references.js.map +0 -1
  144. package/out/src/reqlan-path-resolve.d.ts +0 -59
  145. package/out/src/reqlan-path-resolve.js +0 -173
  146. package/out/src/reqlan-path-resolve.js.map +0 -1
  147. package/out/src/reqlan-quoted-strings.d.ts +0 -9
  148. package/out/src/reqlan-quoted-strings.js +0 -26
  149. package/out/src/reqlan-quoted-strings.js.map +0 -1
  150. package/out/src/reqlan-reference-at-position.d.ts +0 -20
  151. package/out/src/reqlan-reference-at-position.js +0 -89
  152. package/out/src/reqlan-reference-at-position.js.map +0 -1
  153. package/out/src/reqlan-references.d.ts +0 -16
  154. package/out/src/reqlan-references.js +0 -51
  155. package/out/src/reqlan-references.js.map +0 -1
  156. package/out/src/reqlan-scope.d.ts +0 -25
  157. package/out/src/reqlan-scope.js +0 -266
  158. package/out/src/reqlan-scope.js.map +0 -1
  159. package/out/src/reqlan-semantic-token-provider.d.ts +0 -8
  160. package/out/src/reqlan-semantic-token-provider.js +0 -97
  161. package/out/src/reqlan-semantic-token-provider.js.map +0 -1
  162. package/out/src/reqlan-token-builder.d.ts +0 -12
  163. package/out/src/reqlan-token-builder.js +0 -459
  164. package/out/src/reqlan-token-builder.js.map +0 -1
  165. package/out/src/reqlan-validator.d.ts +0 -25
  166. package/out/src/reqlan-validator.js +0 -119
  167. package/out/src/reqlan-validator.js.map +0 -1
  168. package/out/src/reqlan-workspace-attribute-catalog.d.ts +0 -6
  169. package/out/src/reqlan-workspace-attribute-catalog.js +0 -54
  170. package/out/src/reqlan-workspace-attribute-catalog.js.map +0 -1
  171. package/out/test/code-actions.test.d.ts +0 -1
  172. package/out/test/code-actions.test.js +0 -126
  173. package/out/test/code-actions.test.js.map +0 -1
  174. package/out/test/comment-in-string.test.d.ts +0 -1
  175. package/out/test/comment-in-string.test.js +0 -100
  176. package/out/test/comment-in-string.test.js.map +0 -1
  177. package/out/test/completion.test.d.ts +0 -1
  178. package/out/test/completion.test.js +0 -467
  179. package/out/test/completion.test.js.map +0 -1
  180. package/out/test/file-path-rewrite.test.d.ts +0 -1
  181. package/out/test/file-path-rewrite.test.js +0 -64
  182. package/out/test/file-path-rewrite.test.js.map +0 -1
  183. package/out/test/ignore-error.test.d.ts +0 -1
  184. package/out/test/ignore-error.test.js +0 -87
  185. package/out/test/ignore-error.test.js.map +0 -1
  186. package/out/test/implicit-import-extension.test.d.ts +0 -1
  187. package/out/test/implicit-import-extension.test.js +0 -203
  188. package/out/test/implicit-import-extension.test.js.map +0 -1
  189. package/out/test/import-edits.test.d.ts +0 -1
  190. package/out/test/import-edits.test.js +0 -20
  191. package/out/test/import-edits.test.js.map +0 -1
  192. package/out/test/inlay-hints.test.d.ts +0 -1
  193. package/out/test/inlay-hints.test.js +0 -238
  194. package/out/test/inlay-hints.test.js.map +0 -1
  195. package/out/test/linking.test.d.ts +0 -1
  196. package/out/test/linking.test.js +0 -754
  197. package/out/test/linking.test.js.map +0 -1
  198. package/out/test/naked-strings.test.d.ts +0 -1
  199. package/out/test/naked-strings.test.js +0 -50
  200. package/out/test/naked-strings.test.js.map +0 -1
  201. package/out/test/parsing.test.d.ts +0 -1
  202. package/out/test/parsing.test.js +0 -773
  203. package/out/test/parsing.test.js.map +0 -1
  204. package/out/test/path-resolve.test.d.ts +0 -1
  205. package/out/test/path-resolve.test.js +0 -88
  206. package/out/test/path-resolve.test.js.map +0 -1
  207. package/out/test/references.test.d.ts +0 -1
  208. package/out/test/references.test.js +0 -168
  209. package/out/test/references.test.js.map +0 -1
  210. package/out/test/rqconfig.test.d.ts +0 -1
  211. package/out/test/rqconfig.test.js +0 -275
  212. package/out/test/rqconfig.test.js.map +0 -1
  213. package/out/test/test-requirement-refs.d.ts +0 -8
  214. package/out/test/test-requirement-refs.js +0 -35
  215. package/out/test/test-requirement-refs.js.map +0 -1
  216. package/out/test/testing.test.d.ts +0 -1
  217. package/out/test/testing.test.js +0 -23
  218. package/out/test/testing.test.js.map +0 -1
  219. package/out/test/validating.test.d.ts +0 -1
  220. package/out/test/validating.test.js +0 -117
  221. package/out/test/validating.test.js.map +0 -1
  222. package/out/tsconfig.tsbuildinfo +0 -1
@@ -1,275 +0,0 @@
1
- import { readFileSync } from 'node:fs';
2
- import { dirname, join } from 'node:path';
3
- import { fileURLToPath } from 'node:url';
4
- import { describe, expect, test } from 'vitest';
5
- import { URI } from 'langium';
6
- import { VirtualFileSystemProvider } from 'langium/test';
7
- import { createSourceTextDocument, DEFAULT_IMPORT_ROOT_ALIAS, defaultRqConfig, loadApplyingRqConfig, matchImportRootMapping, resolveDocumentPathUri, resolveRqConfig } from 'reqlan-language';
8
- const repoDir = join(dirname(fileURLToPath(import.meta.url)), '../../..');
9
- function insertConfig(fs, uri, body) {
10
- fs.insert(uri, typeof body === 'string' ? body : JSON.stringify(body));
11
- }
12
- describe('rqconfig schema file', () => {
13
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_schema_file]
14
- test('schema file documents importRoots mappings', () => {
15
- const schemaPath = join(repoDir, 'packages/extension/schemas/rqconfig.schema.json');
16
- const schema = JSON.parse(readFileSync(schemaPath, 'utf8'));
17
- expect(schema.properties?.importRoots?.items?.required).toEqual(['alias']);
18
- expect(schema.properties?.importRoots?.items?.properties).toHaveProperty('alias');
19
- expect(schema.properties?.importRoots?.items?.properties).toHaveProperty('root');
20
- const packageJson = JSON.parse(readFileSync(join(repoDir, 'packages/extension/package.json'), 'utf8'));
21
- const validation = packageJson.contributes?.jsonValidation?.find(entry => entry.fileMatch?.includes('.rqconfig.json'));
22
- expect(validation?.url).toBe('./schemas/rqconfig.schema.json');
23
- });
24
- });
25
- describe('rqconfig location', () => {
26
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_location]
27
- test('returns undefined when no rqconfig exists', () => {
28
- const fs = new VirtualFileSystemProvider();
29
- fs.insert('file:///workspace/pkg/a.rq', 'idea body');
30
- expect(loadApplyingRqConfig(URI.parse('file:///workspace/pkg'), fs)).toBeUndefined();
31
- });
32
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_location]
33
- test('loads rqconfig from the same directory as the start path', () => {
34
- const fs = new VirtualFileSystemProvider();
35
- insertConfig(fs, 'file:///workspace/pkg/.rqconfig.json', {
36
- importRoots: [{ alias: '~' }]
37
- });
38
- const loaded = loadApplyingRqConfig(URI.parse('file:///workspace/pkg'), fs);
39
- expect(loaded?.importRoots).toEqual([{ alias: '~' }]);
40
- });
41
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_location]
42
- test('loads rqconfig from an ancestor directory', () => {
43
- const fs = new VirtualFileSystemProvider();
44
- insertConfig(fs, 'file:///workspace/.rqconfig.json', {
45
- importRoots: [{ alias: '#' }]
46
- });
47
- fs.insert('file:///workspace/pkg/src/a.rq', 'idea body');
48
- const loaded = loadApplyingRqConfig(URI.parse('file:///workspace/pkg/src'), fs);
49
- expect(loaded?.importRoots[0]?.alias).toBe('#');
50
- });
51
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_location]
52
- test('nearest ancestor rqconfig wins over farther ones', () => {
53
- const fs = new VirtualFileSystemProvider();
54
- insertConfig(fs, 'file:///workspace/.rqconfig.json', {
55
- importRoots: [{ alias: '#' }]
56
- });
57
- insertConfig(fs, 'file:///workspace/pkg/.rqconfig.json', {
58
- importRoots: [{ alias: '~' }]
59
- });
60
- const loaded = loadApplyingRqConfig(URI.parse('file:///workspace/pkg/src'), fs);
61
- expect(loaded?.importRoots[0]?.alias).toBe('~');
62
- });
63
- });
64
- describe('rqconfig schema edges', () => {
65
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
66
- test('empty object uses default alias mapping', () => {
67
- const fs = new VirtualFileSystemProvider();
68
- insertConfig(fs, 'file:///workspace/.rqconfig.json', {});
69
- const loaded = loadApplyingRqConfig(URI.parse('file:///workspace'), fs);
70
- expect(loaded).toEqual(defaultRqConfig());
71
- expect(loaded?.importRoots[0]?.alias).toBe(DEFAULT_IMPORT_ROOT_ALIAS);
72
- expect(loaded?.importRoots[0]?.rootUri).toBeUndefined();
73
- });
74
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
75
- test('importRoots alias only overrides the alias', () => {
76
- const fs = new VirtualFileSystemProvider();
77
- insertConfig(fs, 'file:///workspace/.rqconfig.json', {
78
- importRoots: [{ alias: '~' }]
79
- });
80
- const loaded = loadApplyingRqConfig(URI.parse('file:///workspace'), fs);
81
- expect(loaded?.importRoots).toEqual([{ alias: '~' }]);
82
- });
83
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
84
- test('relative root resolves against the config file directory', () => {
85
- const fs = new VirtualFileSystemProvider();
86
- insertConfig(fs, 'file:///workspace/pkg/.rqconfig.json', {
87
- importRoots: [{ alias: '@', root: './lib' }]
88
- });
89
- const loaded = loadApplyingRqConfig(URI.parse('file:///workspace/pkg'), fs);
90
- expect(loaded?.importRoots[0]?.alias).toBe('@');
91
- expect(loaded?.importRoots[0]?.rootUri?.toString()).toBe(URI.parse('file:///workspace/pkg/lib').toString());
92
- });
93
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
94
- test('absolute filesystem root is used directly', () => {
95
- const fs = new VirtualFileSystemProvider();
96
- insertConfig(fs, 'file:///workspace/.rqconfig.json', {
97
- importRoots: [{ alias: '@', root: '/abs/lib' }]
98
- });
99
- const loaded = loadApplyingRqConfig(URI.parse('file:///workspace'), fs);
100
- expect(loaded?.importRoots[0]?.rootUri?.toString()).toBe(URI.file('/abs/lib').toString());
101
- });
102
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
103
- test('file URI root is used directly', () => {
104
- const fs = new VirtualFileSystemProvider();
105
- insertConfig(fs, 'file:///workspace/.rqconfig.json', {
106
- importRoots: [{ alias: '@', root: 'file:///elsewhere/lib' }]
107
- });
108
- const loaded = loadApplyingRqConfig(URI.parse('file:///workspace'), fs);
109
- expect(loaded?.importRoots[0]?.rootUri?.toString()).toBe(URI.parse('file:///elsewhere/lib').toString());
110
- });
111
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
112
- // rq:["../../../reqlan rq/language/imports.rq".configuration_import_root_alias]
113
- test('multiple importRoots map aliases to different roots', () => {
114
- const fs = new VirtualFileSystemProvider();
115
- insertConfig(fs, 'file:///workspace/.rqconfig.json', {
116
- importRoots: [
117
- { alias: '@', root: './src' },
118
- { alias: '#', root: './lib' }
119
- ]
120
- });
121
- const loaded = loadApplyingRqConfig(URI.parse('file:///workspace'), fs);
122
- expect(loaded?.importRoots).toHaveLength(2);
123
- expect(loaded?.importRoots[0]?.alias).toBe('@');
124
- expect(loaded?.importRoots[0]?.rootUri?.toString()).toBe(URI.parse('file:///workspace/src').toString());
125
- expect(loaded?.importRoots[1]?.alias).toBe('#');
126
- expect(loaded?.importRoots[1]?.rootUri?.toString()).toBe(URI.parse('file:///workspace/lib').toString());
127
- const document = createSourceTextDocument('file:///workspace/pkg/a.rq', 'idea body');
128
- expect(resolveDocumentPathUri('@/a.rq', document, {
129
- fileSystem: fs,
130
- workspaceFolderUri: URI.parse('file:///workspace')
131
- }).toString()).toBe(URI.parse('file:///workspace/src/a.rq').toString());
132
- expect(resolveDocumentPathUri('#/b.rq', document, {
133
- fileSystem: fs,
134
- workspaceFolderUri: URI.parse('file:///workspace')
135
- }).toString()).toBe(URI.parse('file:///workspace/lib/b.rq').toString());
136
- });
137
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
138
- // rq:["../../../reqlan rq/language/imports.rq".configuration_import_root_alias]
139
- test('longest alias wins when mappings overlap', () => {
140
- expect(matchImportRootMapping('@pkg/x.rq', [
141
- { alias: '@' },
142
- { alias: '@pkg' }
143
- ])?.mapping.alias).toBe('@pkg');
144
- const fs = new VirtualFileSystemProvider();
145
- insertConfig(fs, 'file:///workspace/.rqconfig.json', {
146
- importRoots: [
147
- { alias: '@', root: './src' },
148
- { alias: '@pkg', root: './packages' }
149
- ]
150
- });
151
- const document = createSourceTextDocument('file:///workspace/a.rq', 'idea body');
152
- expect(resolveDocumentPathUri('@pkg/util.rq', document, {
153
- fileSystem: fs,
154
- workspaceFolderUri: URI.parse('file:///workspace')
155
- }).toString()).toBe(URI.parse('file:///workspace/packages/util.rq').toString());
156
- });
157
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
158
- test('empty string alias entries are skipped', () => {
159
- const fs = new VirtualFileSystemProvider();
160
- insertConfig(fs, 'file:///workspace/.rqconfig.json', {
161
- importRoots: [{ alias: '' }, { alias: '~' }]
162
- });
163
- const loaded = loadApplyingRqConfig(URI.parse('file:///workspace'), fs);
164
- expect(loaded?.importRoots).toEqual([{ alias: '~' }]);
165
- });
166
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
167
- test('empty string root is ignored on a mapping', () => {
168
- const fs = new VirtualFileSystemProvider();
169
- insertConfig(fs, 'file:///workspace/.rqconfig.json', {
170
- importRoots: [{ alias: '~', root: '' }]
171
- });
172
- const loaded = loadApplyingRqConfig(URI.parse('file:///workspace'), fs);
173
- expect(loaded?.importRoots).toEqual([{ alias: '~' }]);
174
- });
175
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
176
- test('invalid importRoots entries are skipped', () => {
177
- const fs = new VirtualFileSystemProvider();
178
- insertConfig(fs, 'file:///workspace/.rqconfig.json', {
179
- importRoots: [
180
- null,
181
- 'bad',
182
- { alias: 12 },
183
- { root: './lib' },
184
- { alias: '~', root: true },
185
- { alias: '#' }
186
- ]
187
- });
188
- const loaded = loadApplyingRqConfig(URI.parse('file:///workspace'), fs);
189
- expect(loaded?.importRoots).toEqual([{ alias: '~' }, { alias: '#' }]);
190
- });
191
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
192
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_schema_file]
193
- test('unknown properties are ignored while known keys still apply', () => {
194
- const fs = new VirtualFileSystemProvider();
195
- insertConfig(fs, 'file:///workspace/.rqconfig.json', {
196
- importRoots: [{ alias: '~', extra: 1 }],
197
- futureFlag: true
198
- });
199
- const loaded = loadApplyingRqConfig(URI.parse('file:///workspace'), fs);
200
- expect(loaded?.importRoots).toEqual([{ alias: '~' }]);
201
- });
202
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
203
- test('invalid JSON falls back to undefined load', () => {
204
- const fs = new VirtualFileSystemProvider();
205
- insertConfig(fs, 'file:///workspace/.rqconfig.json', '{ not json');
206
- expect(loadApplyingRqConfig(URI.parse('file:///workspace'), fs)).toBeUndefined();
207
- });
208
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
209
- test('non-object JSON falls back to undefined load', () => {
210
- const fs = new VirtualFileSystemProvider();
211
- insertConfig(fs, 'file:///workspace/array/.rqconfig.json', ['~']);
212
- insertConfig(fs, 'file:///workspace/string/.rqconfig.json', '"@"');
213
- insertConfig(fs, 'file:///workspace/null/.rqconfig.json', 'null');
214
- expect(loadApplyingRqConfig(URI.parse('file:///workspace/array'), fs)).toBeUndefined();
215
- expect(loadApplyingRqConfig(URI.parse('file:///workspace/string'), fs)).toBeUndefined();
216
- expect(loadApplyingRqConfig(URI.parse('file:///workspace/null'), fs)).toBeUndefined();
217
- });
218
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
219
- test('non-array importRoots falls back to undefined load', () => {
220
- const fs = new VirtualFileSystemProvider();
221
- insertConfig(fs, 'file:///workspace/.rqconfig.json', { importRoots: { alias: '~' } });
222
- expect(loadApplyingRqConfig(URI.parse('file:///workspace'), fs)).toBeUndefined();
223
- });
224
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
225
- test('empty importRoots array uses default alias mapping', () => {
226
- const fs = new VirtualFileSystemProvider();
227
- insertConfig(fs, 'file:///workspace/.rqconfig.json', { importRoots: [] });
228
- expect(loadApplyingRqConfig(URI.parse('file:///workspace'), fs)).toEqual(defaultRqConfig());
229
- });
230
- });
231
- describe('rqconfig applied to path resolution', () => {
232
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_location]
233
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
234
- test('resolveRqConfig uses defaults when no applying file exists', () => {
235
- const fs = new VirtualFileSystemProvider();
236
- const document = createSourceTextDocument('file:///workspace/pkg/a.rq', 'idea body');
237
- expect(resolveRqConfig(document, { fileSystem: fs })).toEqual(defaultRqConfig());
238
- });
239
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
240
- test('resolveRqConfig falls back to defaults when applying JSON is invalid', () => {
241
- const fs = new VirtualFileSystemProvider();
242
- insertConfig(fs, 'file:///workspace/.rqconfig.json', '{ broken');
243
- const document = createSourceTextDocument('file:///workspace/a.rq', 'idea body');
244
- expect(resolveRqConfig(document, { fileSystem: fs })).toEqual(defaultRqConfig());
245
- });
246
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
247
- // rq:["../../../reqlan rq/language/imports.rq".configuration_import_root_alias]
248
- test('aliased path uses relative root from applying config', () => {
249
- const fs = new VirtualFileSystemProvider();
250
- insertConfig(fs, 'file:///workspace/.rqconfig.json', {
251
- importRoots: [{ alias: '#', root: './lib' }]
252
- });
253
- const document = createSourceTextDocument('file:///workspace/pkg/a.rq', 'idea body');
254
- const resolved = resolveDocumentPathUri('#/target.rq', document, {
255
- fileSystem: fs,
256
- workspaceFolderUri: URI.parse('file:///workspace')
257
- });
258
- expect(resolved.toString()).toBe(URI.parse('file:///workspace/lib/target.rq').toString());
259
- });
260
- // rq:["../../../reqlan rq/extension/configuration.rq".configuration_import_roots]
261
- // rq:["../../../reqlan rq/language/imports.rq".configuration_import_root_alias]
262
- test('aliased path uses workspace folder when root is omitted', () => {
263
- const fs = new VirtualFileSystemProvider();
264
- insertConfig(fs, 'file:///workspace/.rqconfig.json', {
265
- importRoots: [{ alias: '~' }]
266
- });
267
- const document = createSourceTextDocument('file:///workspace/pkg/a.rq', 'idea body');
268
- const resolved = resolveDocumentPathUri('~/shared.rq', document, {
269
- fileSystem: fs,
270
- workspaceFolderUri: URI.parse('file:///workspace')
271
- });
272
- expect(resolved.toString()).toBe(URI.parse('file:///workspace/shared.rq').toString());
273
- });
274
- });
275
- //# sourceMappingURL=rqconfig.test.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"rqconfig.test.js","sourceRoot":"","sources":["../../test/rqconfig.test.ts"],"names":[],"mappings":"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"}
@@ -1,8 +0,0 @@
1
- export declare const RQ: {
2
- readonly core: "../../../reqlan rq/development/core.rq";
3
- readonly syntax: "../../../reqlan rq/language/syntax.rq";
4
- readonly featuresSyntax: "../../../reqlan rq/extension/syntax/features-syntax.rq";
5
- readonly commentRefs: "../../../reqlan rq/extension/features-non-rq-code-comment/functional-code-comment-references.rq";
6
- readonly syntaxHighlighting: "../../../reqlan rq/extension/features-syntax-highlighting.rq";
7
- };
8
- export declare function findTestsMissingRequirementReferences(text: string): string[];
@@ -1,35 +0,0 @@
1
- /**
2
- * Helpers for rq: requirement comment references in test files.
3
- */
4
- import { findCommentReferencesInText } from '../src/reqlan-comment-resolver.js';
5
- export const RQ = {
6
- core: '../../../reqlan rq/development/core.rq',
7
- syntax: '../../../reqlan rq/language/syntax.rq',
8
- featuresSyntax: '../../../reqlan rq/extension/syntax/features-syntax.rq',
9
- commentRefs: '../../../reqlan rq/extension/features-non-rq-code-comment/functional-code-comment-references.rq',
10
- syntaxHighlighting: '../../../reqlan rq/extension/features-syntax-highlighting.rq'
11
- };
12
- const TEST_DECLARATION_PATTERN = /^\s*test(?:\.(?:only|skip|todo|concurrent))?\(\s*['`]/;
13
- export function findTestsMissingRequirementReferences(text) {
14
- const lines = text.split(/\r?\n/);
15
- const missing = [];
16
- for (let index = 0; index < lines.length; index++) {
17
- if (!TEST_DECLARATION_PATTERN.test(lines[index])) {
18
- continue;
19
- }
20
- const nameMatch = /test(?:\.(?:only|skip|todo|concurrent))?\(\s*['`]([^'`]+)['`]/.exec(lines[index]);
21
- if (!nameMatch) {
22
- continue;
23
- }
24
- let predecessor = index - 1;
25
- while (predecessor >= 0 && lines[predecessor].trim() === '') {
26
- predecessor--;
27
- }
28
- const referenceLine = predecessor >= 0 ? lines[predecessor] : '';
29
- if (findCommentReferencesInText(referenceLine).length === 0) {
30
- missing.push(nameMatch[1]);
31
- }
32
- }
33
- return missing;
34
- }
35
- //# sourceMappingURL=test-requirement-refs.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"test-requirement-refs.js","sourceRoot":"","sources":["../../test/test-requirement-refs.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,2BAA2B,EAAE,MAAM,mCAAmC,CAAC;AAEhF,MAAM,CAAC,MAAM,EAAE,GAAG;IACd,IAAI,EAAE,wCAAwC;IAC9C,MAAM,EAAE,uCAAuC;IAC/C,cAAc,EAAE,wDAAwD;IACxE,WAAW,EAAE,iGAAiG;IAC9G,kBAAkB,EAAE,8DAA8D;CAC5E,CAAC;AAEX,MAAM,wBAAwB,GAAG,uDAAuD,CAAC;AAEzF,MAAM,UAAU,qCAAqC,CAAC,IAAY;IAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAClC,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QAChD,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAE,CAAC,EAAE,CAAC;YAChD,SAAS;QACb,CAAC;QACD,MAAM,SAAS,GAAG,+DAA+D,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAE,CAAC,CAAC;QACtG,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,SAAS;QACb,CAAC;QACD,IAAI,WAAW,GAAG,KAAK,GAAG,CAAC,CAAC;QAC5B,OAAO,WAAW,IAAI,CAAC,IAAI,KAAK,CAAC,WAAW,CAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YAC3D,WAAW,EAAE,CAAC;QAClB,CAAC;QACD,MAAM,aAAa,GAAG,WAAW,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClE,IAAI,2BAA2B,CAAC,aAAa,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1D,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAE,CAAC,CAAC;QAChC,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC"}
@@ -1 +0,0 @@
1
- export {};
@@ -1,23 +0,0 @@
1
- import { readdirSync, readFileSync } from 'node:fs';
2
- import { dirname, join } from 'node:path';
3
- import { fileURLToPath } from 'node:url';
4
- import { describe, expect, test } from 'vitest';
5
- import { findTestsMissingRequirementReferences } from './test-requirement-refs.js';
6
- const testDir = dirname(fileURLToPath(import.meta.url));
7
- describe('Testing requirements', () => {
8
- // rq:["../../../reqlan rq/development/core.rq".testing]
9
- test('each test file includes rq comment references to its requirements', () => {
10
- const testFiles = readdirSync(testDir)
11
- .filter(name => name.endsWith('.test.ts') && name !== 'testing.test.ts');
12
- const violations = [];
13
- for (const fileName of testFiles) {
14
- const text = readFileSync(join(testDir, fileName), 'utf8');
15
- const missing = findTestsMissingRequirementReferences(text);
16
- for (const testName of missing) {
17
- violations.push(`${fileName}: ${testName}`);
18
- }
19
- }
20
- expect(violations).toEqual([]);
21
- });
22
- });
23
- //# sourceMappingURL=testing.test.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"testing.test.js","sourceRoot":"","sources":["../../test/testing.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,qCAAqC,EAAE,MAAM,4BAA4B,CAAC;AAEnF,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAExD,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IAClC,wDAAwD;IACxD,IAAI,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC;aACjC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,IAAI,KAAK,iBAAiB,CAAC,CAAC;QAC7E,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAC/B,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;YAC3D,MAAM,OAAO,GAAG,qCAAqC,CAAC,IAAI,CAAC,CAAC;YAC5D,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE,CAAC;gBAC7B,UAAU,CAAC,IAAI,CAAC,GAAG,QAAQ,KAAK,QAAQ,EAAE,CAAC,CAAC;YAChD,CAAC;QACL,CAAC;QACD,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
@@ -1 +0,0 @@
1
- export {};
@@ -1,117 +0,0 @@
1
- import { readFileSync } from 'node:fs';
2
- import { dirname, join } from 'node:path';
3
- import { fileURLToPath, pathToFileURL } from 'node:url';
4
- import { afterEach, beforeAll, describe, expect, test } from 'vitest';
5
- import { EmptyFileSystem, URI } from 'langium';
6
- import { expandToString as s } from 'langium/generate';
7
- import { NodeFileSystem } from 'langium/node';
8
- import { clearDocuments, parseHelper } from 'langium/test';
9
- import { createReqlanServices, isModel } from 'reqlan-language';
10
- const exampleDir = join(dirname(fileURLToPath(import.meta.url)), '../../../example_rq_project');
11
- let services;
12
- let parse;
13
- beforeAll(async () => {
14
- services = createReqlanServices(EmptyFileSystem);
15
- const doParse = parseHelper(services.Reqlan);
16
- parse = (input) => doParse(input, { validation: true });
17
- });
18
- afterEach(async () => {
19
- const documents = services.shared.workspace.LangiumDocuments.all.toArray();
20
- if (documents.length > 0) {
21
- clearDocuments(services.shared, documents);
22
- }
23
- });
24
- describe('Validating', () => {
25
- // rq:["../../../reqlan rq/extension/features-syntax.rq".syntax_features]
26
- test('check no errors for exampleimport1.rq', async () => {
27
- const document = await parse(readFileSync(join(exampleDir, 'exampleimport1.rq'), 'utf8'));
28
- expect(checkDocumentValid(document) || document?.diagnostics?.map(diagnosticToString)?.join('\n')).toHaveLength(0);
29
- });
30
- // rq:["../../../reqlan rq/extension/features-syntax.rq".duplicate_error]
31
- test('reports duplicate import alias in sub idea.rq', async () => {
32
- const document = await parse(readFileSync(join(exampleDir, 'sub idea.rq'), 'utf8'));
33
- const duplicateAliasErrors = (document.diagnostics ?? []).filter(diagnostic => typeof diagnostic.message === 'string'
34
- && diagnostic.message.includes("'exampleimport2' is already defined in this file."));
35
- expect(duplicateAliasErrors).toHaveLength(1);
36
- expect(duplicateAliasErrors[0].range.start.line).toBe(3);
37
- });
38
- // rq:["../../../reqlan rq/extension/features-syntax.rq".duplicate_error]
39
- test('reports duplicate when local idea shares imported idea name', async () => {
40
- const document = await parse(s `
41
- from "subreqs.rq" import myidea as myideaalias
42
- myidea local idea body
43
- `);
44
- const duplicateErrors = (document.diagnostics ?? []).filter(diagnostic => typeof diagnostic.message === 'string'
45
- && diagnostic.message.includes("'myidea' is already defined in this file."));
46
- expect(duplicateErrors).toHaveLength(1);
47
- expect(duplicateErrors[0].range.start.line).toBe(1);
48
- });
49
- // rq:["../../../reqlan rq/extension/features-syntax.rq".duplicate_error]
50
- test('reports duplicate when local idea shares unaliased import binding', async () => {
51
- const document = await parse(s `
52
- from "subreqs.rq" import myidea
53
- myidea local idea body
54
- `);
55
- const duplicateErrors = (document.diagnostics ?? []).filter(diagnostic => typeof diagnostic.message === 'string'
56
- && diagnostic.message.includes("'myidea' is already defined in this file."));
57
- expect(duplicateErrors).toHaveLength(1);
58
- expect(duplicateErrors[0].range.start.line).toBe(1);
59
- });
60
- // rq:["../../../reqlan rq/extension/language-support/features-imports.rq".import_does_not_exist_error]
61
- test('reports an error when an import path file does not exist', async () => {
62
- services = createReqlanServices(NodeFileSystem);
63
- parse = parseHelper(services.Reqlan);
64
- const importerUri = URI.parse(pathToFileURL(join(exampleDir, 'missing-import.rq')).href);
65
- const document = services.shared.workspace.LangiumDocumentFactory.fromString('import "./does-not-exist.rq" as missing\n', importerUri);
66
- services.shared.workspace.LangiumDocuments.addDocument(document);
67
- await services.shared.workspace.DocumentBuilder.build([document], { validation: true });
68
- const missingFileErrors = (document.diagnostics ?? []).filter(diagnostic => typeof diagnostic.message === 'string'
69
- && diagnostic.message.includes("Could not resolve import './does-not-exist.rq'."));
70
- expect(missingFileErrors.length).toBeGreaterThanOrEqual(1);
71
- expect(missingFileErrors[0]?.severity).toBe(1);
72
- });
73
- // rq:["../../../reqlan rq/extension/language-support/features-imports.rq".import_does_not_exist_error]
74
- test('reports an error when a from-import path file does not exist', async () => {
75
- services = createReqlanServices(NodeFileSystem);
76
- parse = parseHelper(services.Reqlan);
77
- const importerUri = URI.parse(pathToFileURL(join(exampleDir, 'missing-from-import.rq')).href);
78
- const document = services.shared.workspace.LangiumDocumentFactory.fromString('from "./does-not-exist.rq" import ghost\n', importerUri);
79
- services.shared.workspace.LangiumDocuments.addDocument(document);
80
- await services.shared.workspace.DocumentBuilder.build([document], { validation: true });
81
- const missingFileErrors = (document.diagnostics ?? []).filter(diagnostic => typeof diagnostic.message === 'string'
82
- && diagnostic.message.includes("Could not resolve import './does-not-exist.rq'."));
83
- expect(missingFileErrors.length).toBeGreaterThanOrEqual(1);
84
- });
85
- // rq:["../../../reqlan rq/extension/language-support/features-imports.rq".import_does_not_exist_error]
86
- test('reports an error when an imported idea does not exist in the target file', async () => {
87
- services = createReqlanServices(NodeFileSystem);
88
- parse = parseHelper(services.Reqlan);
89
- const targetUri = URI.parse(pathToFileURL(join(exampleDir, 'exampleimport.rq')).href);
90
- const target = services.shared.workspace.LangiumDocumentFactory.fromString(readFileSync(join(exampleDir, 'exampleimport.rq'), 'utf8'), targetUri);
91
- services.shared.workspace.LangiumDocuments.addDocument(target);
92
- const importerUri = URI.parse(pathToFileURL(join(exampleDir, 'missing-idea-import.rq')).href);
93
- const document = services.shared.workspace.LangiumDocumentFactory.fromString('from "./exampleimport.rq" import missing_idea\n', importerUri);
94
- services.shared.workspace.LangiumDocuments.addDocument(document);
95
- await services.shared.workspace.DocumentBuilder.build([target, document], { validation: true });
96
- const missingIdeaErrors = (document.diagnostics ?? []).filter(diagnostic => typeof diagnostic.message === 'string'
97
- && diagnostic.message.includes("Could not resolve reference to IdeaDeclaration named 'missing_idea'."));
98
- expect(missingIdeaErrors.length).toBeGreaterThanOrEqual(1);
99
- expect(missingIdeaErrors[0]?.severity).toBe(1);
100
- const missingFileErrors = (document.diagnostics ?? []).filter(diagnostic => typeof diagnostic.message === 'string'
101
- && diagnostic.message.includes('Could not resolve import'));
102
- expect(missingFileErrors).toHaveLength(0);
103
- });
104
- });
105
- function checkDocumentValid(document) {
106
- return document.parseResult.parserErrors.length && s `
107
- Parser errors:
108
- ${document.parseResult.parserErrors.map(e => e.message).join('\n ')}
109
- `
110
- || document.parseResult.value === undefined && `ParseResult is 'undefined'.`
111
- || !isModel(document.parseResult.value) && `Root AST object is a ${document.parseResult.value.$type}, expected a 'Model'.`
112
- || undefined;
113
- }
114
- function diagnosticToString(d) {
115
- return `[${d.range.start.line}:${d.range.start.character}..${d.range.end.line}:${d.range.end.character}]: ${d.message}`;
116
- }
117
- //# sourceMappingURL=validating.test.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"validating.test.js","sourceRoot":"","sources":["../../test/validating.test.ts"],"names":[],"mappings":"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"}