@neo4j-cypher/react-codemirror 2.0.0-next.16 → 2.0.0-next.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +24 -0
- package/dist/CypherEditor.d.ts +5 -1
- package/dist/CypherEditor.js +20 -0
- package/dist/CypherEditor.js.map +1 -1
- package/dist/e2e_tests/autoCompletion.spec.js +80 -35
- package/dist/e2e_tests/autoCompletion.spec.js.map +1 -1
- package/dist/e2e_tests/e2eUtils.d.ts +1 -0
- package/dist/e2e_tests/e2eUtils.js +13 -2
- package/dist/e2e_tests/e2eUtils.js.map +1 -1
- package/dist/e2e_tests/performanceTest.spec.js +1 -1
- package/dist/e2e_tests/performanceTest.spec.js.map +1 -1
- package/dist/e2e_tests/signatureHelp.spec.js +59 -13
- package/dist/e2e_tests/signatureHelp.spec.js.map +1 -1
- package/dist/e2e_tests/snippets.spec.js +2 -2
- package/dist/e2e_tests/snippets.spec.js.map +1 -1
- package/dist/e2e_tests/syntaxValidation.spec.js +25 -10
- package/dist/e2e_tests/syntaxValidation.spec.js.map +1 -1
- package/dist/lang-cypher/autocomplete.js +9 -4
- package/dist/lang-cypher/autocomplete.js.map +1 -1
- package/dist/lang-cypher/langCypher.d.ts +1 -0
- package/dist/lang-cypher/langCypher.js +1 -8
- package/dist/lang-cypher/langCypher.js.map +1 -1
- package/dist/lang-cypher/lintWorker.d.ts +8 -4
- package/dist/lang-cypher/lintWorker.js +12 -2
- package/dist/lang-cypher/lintWorker.js.map +1 -1
- package/dist/lang-cypher/syntaxValidation.d.ts +0 -1
- package/dist/lang-cypher/syntaxValidation.js +2 -25
- package/dist/lang-cypher/syntaxValidation.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/CypherEditor.tsx +32 -4
- package/src/e2e_tests/autoCompletion.spec.tsx +119 -54
- package/src/e2e_tests/e2eUtils.ts +14 -2
- package/src/e2e_tests/performanceTest.spec.tsx +1 -1
- package/src/e2e_tests/signatureHelp.spec.tsx +74 -13
- package/src/e2e_tests/snippets.spec.tsx +2 -2
- package/src/e2e_tests/syntaxValidation.spec.tsx +58 -17
- package/src/lang-cypher/autocomplete.ts +13 -7
- package/src/lang-cypher/langCypher.ts +3 -12
- package/src/lang-cypher/lintWorker.ts +24 -7
- package/src/lang-cypher/syntaxValidation.ts +2 -39
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signatureHelp.spec.js","sourceRoot":"","sources":["../../src/e2e_tests/signatureHelp.spec.tsx"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,IAAI,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;AAOrD,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"signatureHelp.spec.js","sourceRoot":"","sources":["../../src/e2e_tests/signatureHelp.spec.tsx"],"names":[],"mappings":"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"}
|
|
@@ -43,10 +43,10 @@ test('can accept completion inside pattern snippet', async ({ page, mount, }) =>
|
|
|
43
43
|
// get & accept completion
|
|
44
44
|
await textField.press(':');
|
|
45
45
|
await expect(page.locator('.cm-tooltip-autocomplete').getByText('City')).toBeVisible();
|
|
46
|
-
await textField.press('Tab');
|
|
46
|
+
await textField.press('Tab', { delay: 300 });
|
|
47
47
|
await expect(page.locator('.cm-tooltip-autocomplete')).not.toBeVisible();
|
|
48
48
|
// tab out of the snippet
|
|
49
|
-
await textField.press('Tab');
|
|
49
|
+
await textField.press('Tab', { delay: 300 });
|
|
50
50
|
await expect(textField).toHaveText('MATCH ()-[]->()-[ ]->(:City)');
|
|
51
51
|
});
|
|
52
52
|
test('does not automatically open completion panel for expressions after snippet trigger char', async ({ page, mount, }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snippets.spec.js","sourceRoot":"","sources":["../../src/e2e_tests/snippets.spec.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"snippets.spec.js","sourceRoot":"","sources":["../../src/e2e_tests/snippets.spec.tsx"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ test('Prop lint set to false disables syntax validation', async ({ page, mount,
|
|
|
8
8
|
const query = 'METCH (n) RETURN n';
|
|
9
9
|
await mount(_jsx(CypherEditor, { value: query, lint: false }));
|
|
10
10
|
await expect(page.locator('.cm-lintRange-error').last()).not.toBeVisible({
|
|
11
|
-
timeout:
|
|
11
|
+
timeout: 10000,
|
|
12
12
|
});
|
|
13
13
|
});
|
|
14
14
|
test('Can turn linting back on', async ({ page, mount }) => {
|
|
@@ -16,17 +16,23 @@ test('Can turn linting back on', async ({ page, mount }) => {
|
|
|
16
16
|
const query = 'METCH (n) RETURN n';
|
|
17
17
|
const component = await mount(_jsx(CypherEditor, { value: query, lint: false }));
|
|
18
18
|
await expect(page.locator('.cm-lintRange-error').last()).not.toBeVisible({
|
|
19
|
-
timeout:
|
|
19
|
+
timeout: 10000,
|
|
20
20
|
});
|
|
21
21
|
await component.update(_jsx(CypherEditor, { value: query, lint: true }));
|
|
22
22
|
await editorPage.getEditor().fill('METCH (n) RETURN n');
|
|
23
|
-
await editorPage.checkErrorMessage('METCH', '
|
|
23
|
+
await editorPage.checkErrorMessage('METCH', `Invalid input 'METCH': expected 'FOREACH', 'ALTER', 'ORDER BY', 'CALL', 'USING PERIODIC COMMIT', 'CREATE', 'LOAD CSV', 'START DATABASE', 'STOP DATABASE', 'DEALLOCATE', 'DELETE', 'DENY', 'DETACH', 'DROP', 'DRYRUN', 'FINISH', 'GRANT', 'INSERT', 'LIMIT', 'MATCH', 'MERGE', 'NODETACH', 'OFFSET', 'OPTIONAL', 'REALLOCATE', 'REMOVE', 'RENAME', 'RETURN', 'REVOKE', 'ENABLE SERVER', 'SET', 'SHOW', 'SKIP', 'TERMINATE', 'UNWIND', 'USE' or 'WITH'`);
|
|
24
24
|
});
|
|
25
25
|
test('Syntactic errors are surfaced', async ({ page, mount }) => {
|
|
26
26
|
const editorPage = new CypherEditorPage(page);
|
|
27
27
|
const query = 'METCH (n) RETURN n';
|
|
28
28
|
await mount(_jsx(CypherEditor, { value: query }));
|
|
29
|
-
await editorPage.checkErrorMessage('METCH', '
|
|
29
|
+
await editorPage.checkErrorMessage('METCH', `Invalid input 'METCH': expected 'FOREACH', 'ALTER', 'ORDER BY', 'CALL', 'USING PERIODIC COMMIT', 'CREATE', 'LOAD CSV', 'START DATABASE', 'STOP DATABASE', 'DEALLOCATE', 'DELETE', 'DENY', 'DETACH', 'DROP', 'DRYRUN', 'FINISH', 'GRANT', 'INSERT', 'LIMIT', 'MATCH', 'MERGE', 'NODETACH', 'OFFSET', 'OPTIONAL', 'REALLOCATE', 'REMOVE', 'RENAME', 'RETURN', 'REVOKE', 'ENABLE SERVER', 'SET', 'SHOW', 'SKIP', 'TERMINATE', 'UNWIND', 'USE' or 'WITH'`);
|
|
30
|
+
});
|
|
31
|
+
test('Does not trigger syntax errors for backticked parameters in parameter creation', async ({ page, mount, }) => {
|
|
32
|
+
const editorPage = new CypherEditorPage(page);
|
|
33
|
+
const query = ':param x => "abc"';
|
|
34
|
+
await mount(_jsx(CypherEditor, { value: query }));
|
|
35
|
+
await editorPage.checkNoNotificationMessage('error');
|
|
30
36
|
});
|
|
31
37
|
test('Errors for undefined labels are surfaced', async ({ page, mount }) => {
|
|
32
38
|
const editorPage = new CypherEditorPage(page);
|
|
@@ -84,18 +90,27 @@ test('Validation errors are correctly overlapped', async ({ page, mount }) => {
|
|
|
84
90
|
await editorPage.checkErrorMessage('-1', 'Query cannot conclude with CALL (must be a RETURN clause, a FINISH clause, an update clause, a unit subquery call, or a procedure call with no YIELD).');
|
|
85
91
|
await editorPage.checkErrorMessage('-1', "Invalid input. '-1' is not a valid value. Must be a positive integer");
|
|
86
92
|
});
|
|
87
|
-
test('Strikethroughs are shown for deprecated functions', async ({ page, mount }) => {
|
|
93
|
+
test('Strikethroughs are shown for deprecated functions', async ({ page, mount, }) => {
|
|
88
94
|
const editorPage = new CypherEditorPage(page);
|
|
89
95
|
const query = `RETURN id()`;
|
|
90
96
|
await mount(_jsx(CypherEditor, { value: query, schema: testData.mockSchema }));
|
|
91
|
-
await expect(editorPage.page.locator('.cm-deprecated-element').last()).toBeVisible({ timeout:
|
|
92
|
-
await editorPage.checkWarningMessage('id',
|
|
97
|
+
await expect(editorPage.page.locator('.cm-deprecated-element').last()).toBeVisible({ timeout: 10000 });
|
|
98
|
+
await editorPage.checkWarningMessage('id', 'Function id is deprecated.');
|
|
93
99
|
});
|
|
94
|
-
test('Strikethroughs are shown for deprecated procedures', async ({ page, mount }) => {
|
|
100
|
+
test('Strikethroughs are shown for deprecated procedures', async ({ page, mount, }) => {
|
|
95
101
|
const editorPage = new CypherEditorPage(page);
|
|
96
102
|
const query = `CALL apoc.create.uuids()`;
|
|
97
103
|
await mount(_jsx(CypherEditor, { value: query, schema: testData.mockSchema }));
|
|
98
|
-
await expect(editorPage.page.locator('.cm-deprecated-element').last()).toBeVisible({ timeout:
|
|
99
|
-
await editorPage.checkWarningMessage('apoc.create.uuids',
|
|
104
|
+
await expect(editorPage.page.locator('.cm-deprecated-element').last()).toBeVisible({ timeout: 10000 });
|
|
105
|
+
await editorPage.checkWarningMessage('apoc.create.uuids', 'Procedure apoc.create.uuids is deprecated.');
|
|
106
|
+
});
|
|
107
|
+
test('Syntax validation depends on the Cypher version', async ({ page, mount, }) => {
|
|
108
|
+
await mount(_jsx(CypherEditor, { schema: testData.mockSchema, featureFlags: { cypher25: true } }));
|
|
109
|
+
const editorPage = new CypherEditorPage(page);
|
|
110
|
+
const textField = page.getByRole('textbox');
|
|
111
|
+
await textField.fill('CYPHER 5 CALL apoc.create.uuids(5)');
|
|
112
|
+
await editorPage.checkWarningMessage('apoc.create.uuids', 'Procedure apoc.create.uuids is deprecated.');
|
|
113
|
+
await textField.fill('CYPHER 25 CALL apoc.create.uuids(5)');
|
|
114
|
+
await editorPage.checkErrorMessage('apoc.create.uuids', 'Procedure apoc.create.uuids is not present in the database.');
|
|
100
115
|
});
|
|
101
116
|
//# sourceMappingURL=syntaxValidation.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syntaxValidation.spec.js","sourceRoot":"","sources":["../../src/e2e_tests/syntaxValidation.spec.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C,IAAI,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;AACrD,IAAI,CAAC,mDAAmD,EAAE,KAAK,EAAE,EAC/D,IAAI,EACJ,KAAK,GACN,EAAE,EAAE;IACH,MAAM,KAAK,GAAG,oBAAoB,CAAC;IAEnC,MAAM,KAAK,CAAC,KAAC,YAAY,IAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,GAAI,CAAC,CAAC;IAEzD,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC;QACvE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"syntaxValidation.spec.js","sourceRoot":"","sources":["../../src/e2e_tests/syntaxValidation.spec.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { snippet, } from '@codemirror/autocomplete';
|
|
2
|
-
import { autocomplete } from '@neo4j-cypher/language-support';
|
|
2
|
+
import { autocomplete, shouldAutoCompleteYield, } from '@neo4j-cypher/language-support';
|
|
3
3
|
import { CompletionItemKind, CompletionItemTag, } from 'vscode-languageserver-types';
|
|
4
4
|
import { getDocString } from './utils';
|
|
5
5
|
const completionKindToCodemirrorIcon = (c) => {
|
|
@@ -43,11 +43,16 @@ export const completionStyles = (completion) => {
|
|
|
43
43
|
};
|
|
44
44
|
export const cypherAutocomplete = (config) => (context) => {
|
|
45
45
|
const documentText = context.state.doc.toString();
|
|
46
|
+
const offset = context.pos;
|
|
46
47
|
const triggerCharacters = ['.', ':', '{', '$', ')'];
|
|
47
|
-
const lastCharacter = documentText.at(
|
|
48
|
+
const lastCharacter = documentText.at(offset - 1);
|
|
49
|
+
const yieldTriggered = shouldAutoCompleteYield(documentText, offset);
|
|
48
50
|
const lastWord = context.matchBefore(/\w*/);
|
|
49
51
|
const inWord = lastWord.from !== lastWord.to;
|
|
50
|
-
const shouldTriggerCompletion = inWord ||
|
|
52
|
+
const shouldTriggerCompletion = inWord ||
|
|
53
|
+
context.explicit ||
|
|
54
|
+
triggerCharacters.includes(lastCharacter) ||
|
|
55
|
+
yieldTriggered;
|
|
51
56
|
if (config.useLightVersion && !context.explicit) {
|
|
52
57
|
return null;
|
|
53
58
|
}
|
|
@@ -56,7 +61,7 @@ export const cypherAutocomplete = (config) => (context) => {
|
|
|
56
61
|
}
|
|
57
62
|
const options = autocomplete(
|
|
58
63
|
// TODO This is a temporary hack because completions are not working well
|
|
59
|
-
documentText.slice(0,
|
|
64
|
+
documentText.slice(0, offset), config.schema ?? {}, offset, context.explicit);
|
|
60
65
|
return {
|
|
61
66
|
from: context.matchBefore(/(\w|\$)*$/).from,
|
|
62
67
|
options: options.map((o) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autocomplete.js","sourceRoot":"","sources":["../../src/lang-cypher/autocomplete.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,OAAO,GACR,MAAM,0BAA0B,CAAC;AAClC,OAAO,
|
|
1
|
+
{"version":3,"file":"autocomplete.js","sourceRoot":"","sources":["../../src/lang-cypher/autocomplete.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,14 @@
|
|
|
1
1
|
import { autocompletion } from '@codemirror/autocomplete';
|
|
2
2
|
import { defineLanguageFacet, Language, LanguageSupport, } from '@codemirror/language';
|
|
3
|
-
import { _internalFeatureFlags, } from '@neo4j-cypher/language-support';
|
|
4
3
|
import { completionStyles, cypherAutocomplete } from './autocomplete';
|
|
5
4
|
import { ParserAdapter } from './parser-adapter';
|
|
6
5
|
import { signatureHelpTooltip } from './signatureHelp';
|
|
7
|
-
import { cypherLinter
|
|
6
|
+
import { cypherLinter } from './syntaxValidation';
|
|
8
7
|
const facet = defineLanguageFacet({
|
|
9
8
|
commentTokens: { block: { open: '/*', close: '*/' }, line: '//' },
|
|
10
9
|
closeBrackets: { brackets: ['(', '[', '{', "'", '"', '`'] },
|
|
11
10
|
});
|
|
12
11
|
export function cypher(config) {
|
|
13
|
-
const featureFlags = config.featureFlags;
|
|
14
|
-
// We allow to override the consoleCommands feature flag
|
|
15
|
-
if (featureFlags.consoleCommands !== undefined) {
|
|
16
|
-
_internalFeatureFlags.consoleCommands = featureFlags.consoleCommands;
|
|
17
|
-
}
|
|
18
12
|
const parserAdapter = new ParserAdapter(facet, config);
|
|
19
13
|
const cypherLanguage = new Language(facet, parserAdapter, [], 'cypher');
|
|
20
14
|
return new LanguageSupport(cypherLanguage, [
|
|
@@ -23,7 +17,6 @@ export function cypher(config) {
|
|
|
23
17
|
optionClass: completionStyles,
|
|
24
18
|
}),
|
|
25
19
|
cypherLinter(config),
|
|
26
|
-
semanticAnalysisLinter(config),
|
|
27
20
|
signatureHelpTooltip(config),
|
|
28
21
|
]);
|
|
29
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"langCypher.js","sourceRoot":"","sources":["../../src/lang-cypher/langCypher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,mBAAmB,EACnB,QAAQ,EACR,eAAe,GAChB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"langCypher.js","sourceRoot":"","sources":["../../src/lang-cypher/langCypher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,mBAAmB,EACnB,QAAQ,EACR,eAAe,GAChB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,KAAK,GAAG,mBAAmB,CAAC;IAChC,aAAa,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;IACjE,aAAa,EAAE,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE;CAC5D,CAAC,CAAC;AAcH,MAAM,UAAU,MAAM,CAAC,MAAoB;IACzC,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAEvD,MAAM,cAAc,GAAG,IAAI,QAAQ,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;IAExE,OAAO,IAAI,eAAe,CAAC,cAAc,EAAE;QACzC,cAAc,CAAC;YACb,QAAQ,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;YACtC,WAAW,EAAE,gBAAgB;SAC9B,CAAC;QACF,YAAY,CAAC,MAAM,CAAC;QACpB,oBAAoB,CAAC,MAAM,CAAC;KAC7B,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { DbSchema } from '@neo4j-cypher/language-support';
|
|
2
2
|
import workerpool from 'workerpool';
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
declare function lintCypherQuery(query: string, dbSchema: DbSchema, featureFlags?: {
|
|
4
|
+
consoleCommands?: boolean;
|
|
5
|
+
cypher25?: boolean;
|
|
6
|
+
}): import("@neo4j-cypher/language-support").SyntaxDiagnostic[];
|
|
7
|
+
type LinterArgs = Parameters<typeof lintCypherQuery>;
|
|
8
|
+
export type LinterTask = workerpool.Promise<ReturnType<typeof lintCypherQuery>>;
|
|
5
9
|
export type LintWorker = {
|
|
6
|
-
|
|
10
|
+
lintCypherQuery: (...args: LinterArgs) => LinterTask;
|
|
7
11
|
};
|
|
8
12
|
export {};
|
|
@@ -1,4 +1,14 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { lintCypherQuery as _lintCypherQuery, _internalFeatureFlags, } from '@neo4j-cypher/language-support';
|
|
2
2
|
import workerpool from 'workerpool';
|
|
3
|
-
|
|
3
|
+
function lintCypherQuery(query, dbSchema, featureFlags = {}) {
|
|
4
|
+
// We allow to override the consoleCommands feature flag
|
|
5
|
+
if (featureFlags.consoleCommands !== undefined) {
|
|
6
|
+
_internalFeatureFlags.consoleCommands = featureFlags.consoleCommands;
|
|
7
|
+
}
|
|
8
|
+
if (featureFlags.cypher25 !== undefined) {
|
|
9
|
+
_internalFeatureFlags.cypher25 = featureFlags.cypher25;
|
|
10
|
+
}
|
|
11
|
+
return _lintCypherQuery(query, dbSchema);
|
|
12
|
+
}
|
|
13
|
+
workerpool.worker({ lintCypherQuery });
|
|
4
14
|
//# sourceMappingURL=lintWorker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lintWorker.js","sourceRoot":"","sources":["../../src/lang-cypher/lintWorker.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"lintWorker.js","sourceRoot":"","sources":["../../src/lang-cypher/lintWorker.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,IAAI,gBAAgB,EACnC,qBAAqB,GACtB,MAAM,gCAAgC,CAAC;AACxC,OAAO,UAAU,MAAM,YAAY,CAAC;AAEpC,SAAS,eAAe,CACtB,KAAa,EACb,QAAkB,EAClB,eAAkE,EAAE;IAEpE,wDAAwD;IACxD,IAAI,YAAY,CAAC,eAAe,KAAK,SAAS,EAAE;QAC9C,qBAAqB,CAAC,eAAe,GAAG,YAAY,CAAC,eAAe,CAAC;KACtE;IACD,IAAI,YAAY,CAAC,QAAQ,KAAK,SAAS,EAAE;QACvC,qBAAqB,CAAC,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC;KACxD;IACD,OAAO,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;AAC3C,CAAC;AAED,UAAU,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { Extension } from '@codemirror/state';
|
|
2
2
|
import type { CypherConfig } from './langCypher';
|
|
3
3
|
export declare const cypherLinter: (config: CypherConfig) => Extension;
|
|
4
|
-
export declare const semanticAnalysisLinter: (config: CypherConfig) => Extension;
|
|
5
4
|
export declare const cleanupWorkers: () => void;
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { linter } from '@codemirror/lint';
|
|
2
|
-
import { parserWrapper, validateSyntax } from '@neo4j-cypher/language-support';
|
|
3
2
|
import { DiagnosticSeverity, DiagnosticTag } from 'vscode-languageserver-types';
|
|
4
3
|
import workerpool from 'workerpool';
|
|
5
4
|
import WorkerURL from './lintWorker?worker&url';
|
|
@@ -9,22 +8,7 @@ const pool = workerpool.pool(WorkerURL, {
|
|
|
9
8
|
workerTerminateTimeout: 2000,
|
|
10
9
|
});
|
|
11
10
|
let lastSemanticJob;
|
|
12
|
-
export const cypherLinter = (config) => linter((view) => {
|
|
13
|
-
if (!config.lint) {
|
|
14
|
-
return [];
|
|
15
|
-
}
|
|
16
|
-
const query = view.state.doc.toString();
|
|
17
|
-
const syntaxErrors = validateSyntax(query, config.schema ?? {});
|
|
18
|
-
return syntaxErrors.map((diagnostic) => ({
|
|
19
|
-
from: diagnostic.offsets.start,
|
|
20
|
-
to: diagnostic.offsets.end,
|
|
21
|
-
severity: diagnostic.severity === DiagnosticSeverity.Error
|
|
22
|
-
? 'error'
|
|
23
|
-
: 'warning',
|
|
24
|
-
message: diagnostic.message,
|
|
25
|
-
}));
|
|
26
|
-
});
|
|
27
|
-
export const semanticAnalysisLinter = (config) => linter(async (view) => {
|
|
11
|
+
export const cypherLinter = (config) => linter(async (view) => {
|
|
28
12
|
if (!config.lint) {
|
|
29
13
|
return [];
|
|
30
14
|
}
|
|
@@ -32,19 +16,12 @@ export const semanticAnalysisLinter = (config) => linter(async (view) => {
|
|
|
32
16
|
if (query.length === 0) {
|
|
33
17
|
return [];
|
|
34
18
|
}
|
|
35
|
-
// we want to avoid the ANTLR4 reparse in the worker thread, this should hit our main thread cache
|
|
36
|
-
const parse = parserWrapper.parse(query);
|
|
37
|
-
const statements = parse.statementsParsing;
|
|
38
|
-
const anySyntacticError = statements.some((statement) => statement.syntaxErrors.length !== 0);
|
|
39
|
-
if (anySyntacticError) {
|
|
40
|
-
return [];
|
|
41
|
-
}
|
|
42
19
|
try {
|
|
43
20
|
if (lastSemanticJob !== undefined && !lastSemanticJob.resolved) {
|
|
44
21
|
void lastSemanticJob.cancel();
|
|
45
22
|
}
|
|
46
23
|
const proxyWorker = (await pool.proxy());
|
|
47
|
-
lastSemanticJob = proxyWorker.
|
|
24
|
+
lastSemanticJob = proxyWorker.lintCypherQuery(query, config.schema ?? {}, config.featureFlags ?? {});
|
|
48
25
|
const result = await lastSemanticJob;
|
|
49
26
|
const a = result.map((diagnostic) => {
|
|
50
27
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syntaxValidation.js","sourceRoot":"","sources":["../../src/lang-cypher/syntaxValidation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"syntaxValidation.js","sourceRoot":"","sources":["../../src/lang-cypher/syntaxValidation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,UAAU,MAAM,YAAY,CAAC;AAGpC,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAEhD,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE;IACtC,UAAU,EAAE,CAAC;IACb,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;IAC9B,sBAAsB,EAAE,IAAI;CAC7B,CAAC,CAAC;AAEH,IAAI,eAAuC,CAAC;AAE5C,MAAM,CAAC,MAAM,YAAY,GAAwC,CAAC,MAAM,EAAE,EAAE,CAC1E,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;IACpB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;QAChB,OAAO,EAAE,CAAC;KACX;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;IACxC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IAED,IAAI;QACF,IAAI,eAAe,KAAK,SAAS,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE;YAC9D,KAAK,eAAe,CAAC,MAAM,EAAE,CAAC;SAC/B;QAED,MAAM,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAA0B,CAAC;QAClE,eAAe,GAAG,WAAW,CAAC,eAAe,CAC3C,KAAK,EACL,MAAM,CAAC,MAAM,IAAI,EAAE,EACnB,MAAM,CAAC,YAAY,IAAI,EAAE,CAC1B,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC;QAErC,MAAM,CAAC,GAAiB,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;YAChD,OAAO;gBACL,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK;gBAC9B,EAAE,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG;gBAC1B,QAAQ,EACN,UAAU,CAAC,QAAQ,KAAK,kBAAkB,CAAC,KAAK;oBAC9C,CAAC,CAAC,OAAO;oBACT,CAAC,CAAC,SAAS;gBACf,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,GAAG,CAAC,UAAU,CAAC,IAAI,KAAK,SAAS;oBACjC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC;oBAChD,CAAC,CAAC,EAAE,SAAS,EAAE,uBAAuB,EAAE;oBACxC,CAAC,CAAC,EAAE,CAAC;aACR,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,CAAC;KACV;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,CAAC,CAAC,GAAG,YAAY,UAAU,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE;YAC1D,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC,CAAC;SAC1C;KACF;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE;IACjC,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;AACxB,CAAC,CAAC"}
|