@reqlan/language 1.4.0

package/out/src/reqlan-workspace-attribute-catalog.js

@@ -0,0 +1,54 @@
+import { AstUtils } from 'langium';
+import { isAttribute, isModel, isScalarValue } from './generated/ast.js';
+export function collectWorkspaceAttributeCatalog(documents) {
+    const keys = new Set();
+    const valuesByKey = new Map();
+    for (const document of documents.all.toArray()) {
+        const model = document.parseResult.value;
+        if (!isModel(model)) {
+            continue;
+        }
+        for (const attribute of AstUtils.streamAst(model).filter(isAttribute)) {
+            keys.add(attribute.name);
+            const values = valuesForAttribute(attribute);
+            if (values.length === 0) {
+                continue;
+            }
+            if (!valuesByKey.has(attribute.name)) {
+                valuesByKey.set(attribute.name, new Set());
+            }
+            for (const value of values) {
+                valuesByKey.get(attribute.name).add(value);
+            }
+        }
+    }
+    return {
+        keys: [...keys].sort((left, right) => left.localeCompare(right)),
+        valuesByKey: Object.fromEntries([...valuesByKey.entries()].map(([key, values]) => [key, [...values].sort()]))
+    };
+}
+function valuesForAttribute(attribute) {
+    if (!attribute.value) {
+        return [];
+    }
+    if (isScalarValue(attribute.value)) {
+        const text = attribute.value.parts
+            .map(part => typeof part === 'string' ? part : '')
+            .join('')
+            .trim();
+        return text ? [text] : [];
+    }
+    if (attribute.value.$type === 'ListValue') {
+        return attribute.value.items.flatMap(item => {
+            if (item.$type === 'OneLinerListItem') {
+                return item.body.content
+                    .map(part => typeof part === 'string' ? part : '')
+                    .join('')
+                    .trim();
+            }
+            return [];
+        }).filter(Boolean);
+    }
+    return [];
+}
+//# sourceMappingURL=reqlan-workspace-attribute-catalog.js.map

package/out/src/reqlan-workspace-attribute-catalog.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reqlan-workspace-attribute-catalog.js","sourceRoot":"","sources":["../../src/reqlan-workspace-attribute-catalog.ts"],"names":[],"mappings":"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"}

package/out/test/code-actions.test.d.ts

@@ -0,0 +1 @@
+export {};

package/out/test/code-actions.test.js

@@ -0,0 +1,126 @@
+/**
+ * Tests for unresolved-reference import quick fixes.
+ * rq:["../../../reqlan rq/extension/language-support/features-imports.rq".import_error]
+ */
+import { afterEach, beforeAll, describe, expect, test } from 'vitest';
+import { EmptyFileSystem, URI } from 'langium';
+import { clearDocuments, parseHelper } from 'langium/test';
+import { expandToString as s } from 'langium/generate';
+import { collectImportErrorCodeActions, createReqlanServices, REQLAN_IMPORT_ERROR_CREATE_COMMAND, REQLAN_IMPORT_ERROR_SEARCH_COMMAND, sharedNameCatalog } from 'reqlan-language';
+let services;
+let parse;
+beforeAll(() => {
+    services = createReqlanServices(EmptyFileSystem);
+    parse = parseHelper(services.Reqlan);
+});
+afterEach(async () => {
+    const documents = services.shared.workspace.LangiumDocuments.all.toArray();
+    if (documents.length > 0) {
+        await clearDocuments(services.shared, documents);
+    }
+    sharedNameCatalog.reset();
+});
+async function parseUri(text, uri) {
+    const document = services.shared.workspace.LangiumDocumentFactory.fromString(text, URI.parse(uri));
+    services.shared.workspace.LangiumDocuments.addDocument(document);
+    return document;
+}
+function isCodeAction(value) {
+    return typeof value === 'object' && value !== null && 'title' in value;
+}
+describe('Import error code actions', () => {
+    // rq:["../../../reqlan rq/extension/language-support/features-imports.rq".import_error]
+    test('offers add-import and rewrite when a matching idea exists elsewhere', async () => {
+        const library = await parseUri(s `
+            shared_idea {
+                body
+            }
+        `, 'file:///workspace/lib/shared.rq');
+        const document = await parseUri(s `
+            consumer {
+                [shared_idea] should resolve after import.
+            }
+        `, 'file:///workspace/app/consumer.rq');
+        await services.shared.workspace.DocumentBuilder.build([library, document], { validation: true });
+        const unresolved = (document.diagnostics ?? []).filter(diagnostic => typeof diagnostic.message === 'string'
+            && diagnostic.message.includes('Could not resolve reference'));
+        expect(unresolved.length).toBeGreaterThan(0);
+        const provider = services.Reqlan.lsp.CodeActionProvider;
+        const actions = collectImportErrorCodeActions(provider, document).filter(isCodeAction);
+        const titles = actions.map(action => action.title);
+        expect(titles.some(title => title.includes('Add import from') && title.includes('shared.rq'))).toBe(true);
+        expect(titles.some(title => title.includes('Change to') && title.includes('shared_idea'))).toBe(true);
+        expect(titles).toContain(`Search index for 'shared_idea'…`);
+        expect(titles).toContain(`Create 'shared_idea' in a new file and import it…`);
+        const addImport = actions.find(action => action.title.includes('Add import from'));
+        expect(addImport?.edit?.changes?.[document.textDocument.uri]?.[0]?.newText)
+            .toContain('from "../lib/shared.rq" import shared_idea');
+        expect(addImport?.isPreferred).toBe(true);
+    });
+    // rq:["../../../reqlan rq/extension/language-support/features-imports.rq".import_error]
+    test('uses name catalog matches when documents are not loaded', async () => {
+        const catalog = {
+            entries: [{
+                    name: 'catalog_only',
+                    kind: 'idea',
+                    fileUri: 'file:///workspace/remote/catalog.rq'
+                }]
+        };
+        sharedNameCatalog.update(catalog);
+        const document = await parse(s `
+            consumer {
+                [catalog_only]
+            }
+        `);
+        await services.shared.workspace.DocumentBuilder.build([document], { validation: true });
+        const provider = services.Reqlan.lsp.CodeActionProvider;
+        const actions = collectImportErrorCodeActions(provider, document).filter(isCodeAction);
+        const addImport = actions.find(action => action.title.includes('Add import from'));
+        expect(addImport).toBeDefined();
+        expect(addImport?.edit?.changes?.[document.textDocument.uri]?.[0]?.newText)
+            .toContain('import catalog_only');
+    });
+    // rq:["../../../reqlan rq/extension/language-support/features-imports.rq".import_error]
+    test('search and create actions invoke extension commands', async () => {
+        const document = await parse(s `
+            consumer {
+                [missing_target]
+            }
+        `);
+        await services.shared.workspace.DocumentBuilder.build([document], { validation: true });
+        const provider = services.Reqlan.lsp.CodeActionProvider;
+        const actions = collectImportErrorCodeActions(provider, document).filter(isCodeAction);
+        const search = actions.find(action => action.title.startsWith('Search index'));
+        expect(search?.command?.command).toBe(REQLAN_IMPORT_ERROR_SEARCH_COMMAND);
+        expect(search?.command?.arguments?.[0]).toMatchObject({
+            refText: 'missing_target',
+            documentUri: document.textDocument.uri
+        });
+        const create = actions.find(action => action.title.startsWith('Create'));
+        expect(create?.command?.command).toBe(REQLAN_IMPORT_ERROR_CREATE_COMMAND);
+    });
+    // rq:["../../../reqlan rq/extension/language-support/features-imports.rq".import_error]
+    test('appends to an existing from-import for the same path', async () => {
+        const library = await parseUri(s `
+            alpha {
+                a
+            }
+            beta {
+                b
+            }
+        `, 'file:///workspace/lib/pair.rq');
+        const document = await parseUri(s `
+            from "./pair.rq" import alpha
+
+            consumer {
+                [beta]
+            }
+        `, 'file:///workspace/lib/consumer.rq');
+        await services.shared.workspace.DocumentBuilder.build([library, document], { validation: true });
+        const provider = services.Reqlan.lsp.CodeActionProvider;
+        const actions = collectImportErrorCodeActions(provider, document).filter(isCodeAction);
+        const addImport = actions.find(action => action.title.includes('Add import from'));
+        expect(addImport?.edit?.changes?.[document.textDocument.uri]?.[0]?.newText).toBe(', beta');
+    });
+});
+//# sourceMappingURL=code-actions.test.js.map

package/out/test/code-actions.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"code-actions.test.js","sourceRoot":"","sources":["../../test/code-actions.test.ts"],"names":[],"mappings":"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"}

package/out/test/comment-in-string.test.d.ts

@@ -0,0 +1 @@
+export {};

package/out/test/comment-in-string.test.js

@@ -0,0 +1,100 @@
+import { beforeAll, describe, expect, test } from 'vitest';
+import { EmptyFileSystem, AstUtils } from 'langium';
+import { parseHelper } from 'langium/test';
+import { createReqlanServices, isBodyLine, isFromImport, isModel, isOneLinerIdea, isRichTextPart } from 'reqlan-language';
+let parse;
+beforeAll(async () => {
+    const services = createReqlanServices(EmptyFileSystem);
+    parse = parseHelper(services.Reqlan);
+});
+async function expectValid(input) {
+    const document = await parse(input);
+    expect(document.parseResult.parserErrors).toEqual([]);
+    expect(document.parseResult.lexerErrors ?? []).toEqual([]);
+    expect(isModel(document.parseResult.value)).toBe(true);
+    return document;
+}
+function oneLinerText(idea) {
+    return idea.body.content
+        .filter((part) => typeof part === 'string')
+        .join('');
+}
+function blockBodyText(document) {
+    return [...AstUtils.streamAst(document.parseResult.value)]
+        .filter(isBodyLine)
+        .flatMap(line => line.parts)
+        .map(part => {
+        if (typeof part === 'string') {
+            return part;
+        }
+        if (isRichTextPart(part) && part.$type === 'RichTextPart') {
+            return part.text ?? part.inlineCode ?? part.punct ?? '';
+        }
+        return '';
+    })
+        .join('');
+}
+describe('comments in string context', () => {
+    // rq:["../../../reqlan rq/language/syntax.rq".comments]
+    test('lexer does not treat URL slashes as line comments', () => {
+        const services = createReqlanServices(EmptyFileSystem);
+        const result = services.Reqlan.parser.Lexer.tokenize('use https://not a comment.com');
+        const visible = result.tokens.map(token => token.image).join('');
+        expect(visible).toContain('https://');
+        expect(visible).toContain('comment.com');
+    });
+    // rq:["../../../reqlan rq/language/syntax.rq".comments]
+    test('import path with https URL preserves full path', async () => {
+        const document = await expectValid('from "https://not a comment.com" import foo');
+        const importDecl = document.parseResult.value.imports[0];
+        expect(isFromImport(importDecl) && importDecl.path).toBe('https://not a comment.com');
+    });
+    // rq:["../../../reqlan rq/language/syntax.rq".comments]
+    // rq:["../../../reqlan rq/language/syntax.rq".naked_strings_in_body]
+    test('quoted string containing // parses in block body', async () => {
+        const document = await expectValid('demo { note "//also not a comment" here }');
+        const bodyLine = [...AstUtils.streamAst(document.parseResult.value)]
+            .find(node => node.$type === 'BodyLine');
+        expect(bodyLine?.$cstNode?.text).toContain('"//also not a comment"');
+    });
+    // rq:["../../../reqlan rq/language/syntax.rq".comments]
+    test('unquoted URL with // in one-liner body preserves text', async () => {
+        const document = await expectValid('url_example use https://not a comment.com in body');
+        const idea = document.parseResult.value.elements.find(isOneLinerIdea);
+        expect(oneLinerText(idea)).toContain('https://');
+        expect(oneLinerText(idea)).toContain('comment.com');
+    });
+    // rq:["../../../reqlan rq/language/syntax.rq".comments]
+    // rq:["../../../reqlan rq/language/syntax.rq".naked_strings_in_body]
+    test('quoted one-liner with // inside preserves text', async () => {
+        const document = await expectValid('url_example "https://not a comment.com //still not"');
+        const idea = document.parseResult.value.elements.find(isOneLinerIdea);
+        expect(idea?.$cstNode?.text).toContain('"https://not a comment.com //still not"');
+    });
+    // rq:["../../../reqlan rq/language/syntax.rq".comments]
+    test('unquoted URL with // in block body preserves text', async () => {
+        const document = await expectValid('demo { see https://not a comment.com for details }');
+        expect(blockBodyText(document)).toContain('https://');
+        expect(blockBodyText(document)).toContain('comment.com');
+    });
+    // rq:["../../../reqlan rq/language/syntax.rq".comments]
+    // rq:["../../../reqlan rq/language/syntax.rq".naked_strings_in_body]
+    test('single-quoted URL in block body is naked prose', async () => {
+        const document = await expectValid("demo { e.g. a 'https://not a comment.com' in prose }");
+        const bodyLine = [...AstUtils.streamAst(document.parseResult.value)]
+            .find(node => node.$type === 'BodyLine');
+        expect(bodyLine?.$cstNode?.text).toContain("'https://not a comment.com'");
+    });
+    // rq:["../../../reqlan rq/language/syntax.rq".comments]
+    test('meta line comments after content still work', async () => {
+        const document = await expectValid('demo {\n    keep this // meta comment\n}');
+        expect(blockBodyText(document)).toContain('keep');
+        expect(blockBodyText(document)).toContain('this');
+        expect(blockBodyText(document)).not.toContain('meta comment');
+    });
+    // rq:["../../../reqlan rq/language/syntax.rq".comments]
+    test('full-line comments still work', async () => {
+        await expectValid('// leading comment\ndemo { body }');
+    });
+});
+//# sourceMappingURL=comment-in-string.test.js.map

package/out/test/comment-in-string.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"comment-in-string.test.js","sourceRoot":"","sources":["../../test/comment-in-string.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAwB,MAAM,SAAS,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EACH,oBAAoB,EACpB,UAAU,EACV,YAAY,EACZ,OAAO,EACP,cAAc,EACd,cAAc,EAGjB,MAAM,iBAAiB,CAAC;AAEzB,IAAI,KAA4C,CAAC;AAEjD,SAAS,CAAC,KAAK,IAAI,EAAE;IACjB,MAAM,QAAQ,GAAG,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACvD,KAAK,GAAG,WAAW,CAAQ,QAAQ,CAAC,MAAM,CAAC,CAAC;AAChD,CAAC,CAAC,CAAC;AAEH,KAAK,UAAU,WAAW,CAAC,KAAa;IACpC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;IACpC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACtD,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC3D,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvD,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,SAAS,YAAY,CAAC,IAAkB;IACpC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO;SACnB,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC;SAC1D,IAAI,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC;AAED,SAAS,aAAa,CAAC,QAAgC;IACnD,OAAO,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SACrD,MAAM,CAAC,UAAU,CAAC;SAClB,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;SAC3B,GAAG,CAAC,IAAI,CAAC,EAAE;QACR,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,KAAK,cAAc,EAAE,CAAC;YACxD,OAAO,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;QAC5D,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC;AAED,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACxC,wDAAwD;IACxD,IAAI,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,QAAQ,GAAG,oBAAoB,CAAC,eAAe,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC;QACtF,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjE,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACtC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,wDAAwD;IACxD,IAAI,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,6CAA6C,CAAC,CAAC;QAClF,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACzD,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAC1F,CAAC,CAAC,CAAC;IAEH,wDAAwD;IACxD,qEAAqE;IACrE,IAAI,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,2CAA2C,CAAC,CAAC;QAChF,MAAM,QAAQ,GAAG,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;aAC/D,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC;QAC7C,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,wDAAwD;IACxD,IAAI,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QACrE,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,mDAAmD,CAAC,CAAC;QACxF,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACtE,MAAM,CAAC,YAAY,CAAC,IAAK,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAClD,MAAM,CAAC,YAAY,CAAC,IAAK,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,wDAAwD;IACxD,qEAAqE;IACrE,IAAI,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,qDAAqD,CAAC,CAAC;QAC1F,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACtE,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,SAAS,CAAC,yCAAyC,CAAC,CAAC;IACtF,CAAC,CAAC,CAAC;IAEH,wDAAwD;IACxD,IAAI,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;QACjE,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,oDAAoD,CAAC,CAAC;QACzF,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACtD,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,wDAAwD;IACxD,qEAAqE;IACrE,IAAI,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,sDAAsD,CAAC,CAAC;QAC3F,MAAM,QAAQ,GAAG,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;aAC/D,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC;QAC7C,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,SAAS,CAAC,6BAA6B,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEH,wDAAwD;IACxD,IAAI,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;QAC3D,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,0CAA0C,CAAC,CAAC;QAC/E,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,wDAAwD;IACxD,IAAI,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;QAC7C,MAAM,WAAW,CAAC,mCAAmC,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/out/test/completion.test.d.ts

@@ -0,0 +1 @@
+export {};