Merge remote-tracking branch 'origin/main' into deprecatedBy

neo4j · Dec 23, 2024 · 9d5d8b9 · 9d5d8b9
2 parents 73ce5a1 + 3f09c38
commit 9d5d8b9
Show file tree

Hide file tree

Showing 15 changed files with 115 additions and 56 deletions.
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -21,13 +21,16 @@
     "clean-apes-pay",
     "curvy-singers-greet",
     "eleven-scissors-type",
+    "four-tools-leave",
     "fuzzy-rice-train",
     "gentle-pans-rescue",
     "healthy-turtles-change",
     "hungry-beans-eat",
     "little-vans-begin",
     "loud-meals-attend",
     "loud-shrimps-push",
+    "lovely-mails-ring",
+    "moody-fireants-guess",
     "nervous-rabbits-greet",
     "nice-elephants-prove",
     "nice-jokes-give",

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/language-server/CHANGELOG.md b/packages/language-server/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @neo4j-cypher/language-server
 
+## 2.0.0-next.14
+
+### Patch Changes
+
+- Updated dependencies [84a12fc]
+- Updated dependencies [d329252]
+- Updated dependencies [b0e419e]
+  - @neo4j-cypher/language-support@2.0.0-next.13
+
 ## 2.0.0-next.13
 
 ### Patch Changes

diff --git a/packages/language-server/package.json b/packages/language-server/package.json
@@ -16,7 +16,7 @@
     "cypher",
     "language server"
   ],
-  "version": "2.0.0-next.13",
+  "version": "2.0.0-next.14",
   "main": "./dist/server.js",
   "types": "src/server.ts",
   "repository": {
@@ -34,7 +34,7 @@
     "cypher-language-server": "./dist/cypher-language-server"
   },
   "dependencies": {
-    "@neo4j-cypher/language-support": "2.0.0-next.12",
+    "@neo4j-cypher/language-support": "2.0.0-next.13",
     "lodash.debounce": "^4.0.8",
     "neo4j-driver": "^5.3.0",
     "vscode-languageserver": "^8.1.0",

diff --git a/packages/language-support/CHANGELOG.md b/packages/language-support/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @neo4j-cypher/language-support
 
+## 2.0.0-next.13
+
+### Patch Changes
+
+- 84a12fc: Added parsing of CYPHER <version> and CYPHER <optionName> = <value>
+- d329252: Adds deprecation warning tags on deprecated functions/procedures
+- b0e419e: Adds backticking when needed on autocompletions of aliases and database names
+
 ## 2.0.0-next.12
 
 ### Patch Changes

diff --git a/packages/language-support/package.json b/packages/language-support/package.json
@@ -18,7 +18,7 @@
     "linting",
     "highlighting"
   ],
-  "version": "2.0.0-next.12",
+  "version": "2.0.0-next.13",
   "main": "./dist/cjs/index.cjs",
   "module": "./dist/esm/index.mjs",
   "types": "./dist/types/index.d.js",

diff --git a/packages/react-codemirror-playground/CHANGELOG.md b/packages/react-codemirror-playground/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @neo4j-cypher/react-codemirror-playground
 
+## 2.0.0-next.16
+
+### Patch Changes
+
+- Updated dependencies [84a12fc]
+- Updated dependencies [d329252]
+- Updated dependencies [b0e419e]
+  - @neo4j-cypher/language-support@2.0.0-next.13
+  - @neo4j-cypher/react-codemirror@2.0.0-next.16
+
 ## 2.0.0-next.15
 
 ### Patch Changes

diff --git a/packages/react-codemirror-playground/package.json b/packages/react-codemirror-playground/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@neo4j-cypher/react-codemirror-playground",
   "private": true,
-  "version": "2.0.0-next.15",
+  "version": "2.0.0-next.16",
   "type": "module",
   "scripts": {
     "dev": "vite --open",
@@ -21,8 +21,8 @@
     "node": ">=18.18.2"
   },
   "dependencies": {
-    "@neo4j-cypher/language-support": "2.0.0-next.12",
-    "@neo4j-cypher/react-codemirror": "2.0.0-next.15",
+    "@neo4j-cypher/language-support": "2.0.0-next.13",
+    "@neo4j-cypher/react-codemirror": "2.0.0-next.16",
     "@codemirror/autocomplete": "^6.5.1",
     "@codemirror/commands": "^6.2.2",
     "@codemirror/language": "^6.6.0",

diff --git a/packages/react-codemirror/CHANGELOG.md b/packages/react-codemirror/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @neo4j-cypher/react-codemirror
 
+## 2.0.0-next.16
+
+### Patch Changes
+
+- Updated dependencies [84a12fc]
+- Updated dependencies [d329252]
+- Updated dependencies [b0e419e]
+  - @neo4j-cypher/language-support@2.0.0-next.13
+
 ## 2.0.0-next.15
 
 ### Patch Changes

diff --git a/packages/react-codemirror/package.json b/packages/react-codemirror/package.json
@@ -17,7 +17,7 @@
     "codemirror",
     "codemirror 6"
   ],
-  "version": "2.0.0-next.15",
+  "version": "2.0.0-next.16",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",
@@ -51,7 +51,7 @@
     "@codemirror/view": "^6.29.1",
     "@lezer/common": "^1.0.2",
     "@lezer/highlight": "^1.1.3",
-    "@neo4j-cypher/language-support": "2.0.0-next.12",
+    "@neo4j-cypher/language-support": "2.0.0-next.13",
     "@types/prismjs": "^1.26.3",
     "@types/workerpool": "^6.4.7",
     "ayu": "^8.0.1",

diff --git a/packages/react-codemirror/src/e2e_tests/debounce.spec.tsx b/packages/react-codemirror/src/e2e_tests/debounce.spec.tsx
@@ -27,43 +27,48 @@ test.fail(
   },
 );
 
-test('onExecute updates should override debounce updates', async ({
-  mount,
-  page,
-}) => {
-  const editorPage = new CypherEditorPage(page);
-  let value = '';
+// TODO Fix this test
+test.fixme(
+  'onExecute updates should override debounce updates',
+  async ({ mount, page }) => {
+    const editorPage = new CypherEditorPage(page);
+    let value = '';
 
-  const onExecute = () => {
-    value = '';
-    void component.update(
-      <CypherEditor value={value} onChange={onChange} onExecute={onExecute} />,
-    );
-  };
+    const onExecute = () => {
+      value = '';
+      void component.update(
+        <CypherEditor
+          value={value}
+          onChange={onChange}
+          onExecute={onExecute}
+        />,
+      );
+    };
 
-  const onChange = (val: string) => {
-    value = val;
-    void component.update(
-      <CypherEditor value={val} onChange={onChange} onExecute={onExecute} />,
-    );
-  };
+    const onChange = (val: string) => {
+      value = val;
+      void component.update(
+        <CypherEditor value={val} onChange={onChange} onExecute={onExecute} />,
+      );
+    };
 
-  const component = await mount(
-    <CypherEditor value={value} onChange={onChange} onExecute={onExecute} />,
-  );
+    const component = await mount(
+      <CypherEditor value={value} onChange={onChange} onExecute={onExecute} />,
+    );
 
-  await editorPage.getEditor().pressSequentially('RETURN 1');
-  await editorPage.getEditor().press('Enter');
-  await page.waitForTimeout(DEBOUNCE_TIME_WITH_MARGIN);
-  await expect(component).not.toContainText('RETURN 1');
+    await editorPage.getEditor().pressSequentially('RETURN 1');
+    await editorPage.getEditor().press('Enter');
+    await page.waitForTimeout(DEBOUNCE_TIME_WITH_MARGIN);
+    await expect(component).not.toContainText('RETURN 1');
 
-  await editorPage.getEditor().pressSequentially('RETURN 1');
-  await editorPage.getEditor().pressSequentially('');
-  await editorPage.getEditor().pressSequentially('RETURN 1');
-  await editorPage.getEditor().press('Enter');
-  await page.waitForTimeout(DEBOUNCE_TIME_WITH_MARGIN);
-  await expect(component).not.toContainText('RETURN 1');
-});
+    await editorPage.getEditor().pressSequentially('RETURN 1');
+    await editorPage.getEditor().pressSequentially('');
+    await editorPage.getEditor().pressSequentially('RETURN 1');
+    await editorPage.getEditor().press('Enter');
+    await page.waitForTimeout(DEBOUNCE_TIME_WITH_MARGIN);
+    await expect(component).not.toContainText('RETURN 1');
+  },
+);
 
 test('onExecute should fire after debounced updates', async ({
   mount,

diff --git a/packages/schema-poller/CHANGELOG.md b/packages/schema-poller/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @neo4j-cypher/schema-poller
 
+## 2.0.0-next.13
+
+### Patch Changes
+
+- Updated dependencies [84a12fc]
+- Updated dependencies [d329252]
+- Updated dependencies [b0e419e]
+  - @neo4j-cypher/language-support@2.0.0-next.13
+
 ## 2.0.0-next.12
 
 ### Patch Changes

diff --git a/packages/schema-poller/package.json b/packages/schema-poller/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "author": "Neo4j Inc.",
   "license": "Apache-2.0",
-  "version": "2.0.0-next.12",
+  "version": "2.0.0-next.13",
   "main": "./dist/cjs/src/index.js",
   "module": "./dist/esm/src/index.js",
   "exports": {
@@ -26,7 +26,7 @@
     "node": ">=18.18.2"
   },
   "dependencies": {
-    "@neo4j-cypher/language-support": "2.0.0-next.12",
+    "@neo4j-cypher/language-support": "2.0.0-next.13",
     "ajv": "^8.12.0",
     "neo4j-driver": "^5.12.0"
   },

diff --git a/packages/vscode-extension/CHANGELOG.md b/packages/vscode-extension/CHANGELOG.md
@@ -1,5 +1,11 @@
 # neo4j-for-vscode
 
+## 1.6.1
+
+- Makes the editor relint all documents when connecting / disconnecting from a database
+- Adds warnings for deprecated procedures / functions
+- Improves backticking of completions
+
 ## 1.6.0
 
 - Updates grammar to LTS version

diff --git a/packages/vscode-extension/package.json b/packages/vscode-extension/package.json
@@ -6,7 +6,7 @@
   "publisher": "neo4j-extensions",
   "author": "Neo4j Inc.",
   "license": "Apache-2.0",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "preview": true,
   "categories": [
     "Programming Languages",
@@ -310,7 +310,7 @@
     "test:webviews": "wdio run ./dist/tests/runWebviewTests.js"
   },
   "dependencies": {
-    "@neo4j-cypher/language-server": "2.0.0-next.13",
+    "@neo4j-cypher/language-server": "2.0.0-next.14",
     "@neo4j-ndl/base": "^2.12.3",
     "@neo4j-ndl/react": "^2.16.5",
     "neo4j-driver": "^5.12.0",