Renames every package to be @neo4j-cypher

neo4j · Oct 19, 2023 · 05dec58 · 05dec58
1 parent 24be6b0
commit 05dec58
Show file tree

Hide file tree

Showing 28 changed files with 108 additions and 79 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -85,5 +85,5 @@ jobs:
         if: always()
         with:
           name: playwright-report
-          path: packages/react-codemirror-experimental/playwright-report/
+          path: packages/react-codemirror/playwright-report/
           retention-days: 30
diff --git a/.github/workflows/deploy-cypher-editor.yaml b/.github/workflows/deploy-cypher-editor.yaml
@@ -36,5 +36,5 @@ jobs:
         uses: JS-DevTools/npm-publish@v2
         with:
           token: ${{ secrets.NPM_TOKEN }}
-          package: 'packages/react-codemirror-experimental/package.json'
+          package: 'packages/react-codemirror/package.json'
           access: 'restricted'
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,12 +1,12 @@
 {
-  "name": "cypher-lsp",
-  "description": "Cypher LSP",
+  "name": "@neo4j-cypher",
+  "description": "Cypher Language Support",
   "license": "Apache",
   "version": "1.0.0",
   "categories": [],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/neo4j/cypher-lsp.git"
+    "url": "git+https://github.com/neo4j/cypher-language-support.git"
   },
   "workspaces": [
     "packages/*"

diff --git a/packages/language-server/package.json b/packages/language-server/package.json
@@ -1,15 +1,15 @@
 {
-  "name": "cypher-language-server",
+  "name": "@neo4j-cypher/language-server",
   "description": "Cypher Language Server",
   "author": "neo4j",
   "license": "Apache-2.0",
   "version": "0.0.1",
   "main": "dist/server.js",
   "types": "src/server.ts",
   "dependencies": {
-    "language-support": "*",
+    "@neo4j-cypher/language-support": "*",
+    "@neo4j-cypher/schema-poller": "*",
     "neo4j-driver": "^5.3.0",
-    "schema-poller": "*",
     "vscode-languageserver": "^8.1.0",
     "vscode-languageserver-textdocument": "^1.0.8"
   },

diff --git a/packages/language-server/src/autocompletion.ts b/packages/language-server/src/autocompletion.ts
@@ -6,8 +6,8 @@ import {
 
 import { Range } from 'vscode-languageserver-types';
 
-import { autocomplete } from 'language-support';
-import { Neo4jSchemaPoller } from 'schema-poller';
+import { autocomplete } from '@neo4j-cypher/language-support';
+import { Neo4jSchemaPoller } from '@neo4j-cypher/schema-poller';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 
 export function doAutoCompletion(

diff --git a/packages/language-server/src/server.ts b/packages/language-server/src/server.ts
@@ -11,8 +11,11 @@ import {
 
 import { TextDocument } from 'vscode-languageserver-textdocument';
 
-import { syntaxColouringLegend, validateSyntax } from 'language-support';
-import { Neo4jSchemaPoller } from 'schema-poller';
+import {
+  syntaxColouringLegend,
+  validateSyntax,
+} from '@neo4j-cypher/language-support';
+import { Neo4jSchemaPoller } from '@neo4j-cypher/schema-poller';
 import { doAutoCompletion } from './autocompletion';
 import { doSignatureHelp } from './signatureHelp';
 import { applySyntaxColouringForDocument } from './syntaxColouring';

diff --git a/packages/language-server/src/signatureHelp.ts b/packages/language-server/src/signatureHelp.ts
@@ -1,4 +1,4 @@
-import { signatureHelp } from 'language-support';
+import { signatureHelp } from '@neo4j-cypher/language-support';
 import {
   Position,
   Range,
@@ -7,7 +7,7 @@ import {
   TextDocuments,
 } from 'vscode-languageserver/node';
 
-import { Neo4jSchemaPoller } from 'schema-poller';
+import { Neo4jSchemaPoller } from '@neo4j-cypher/schema-poller';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 
 export const emptyResult: SignatureHelp = {

diff --git a/packages/language-server/src/syntaxColouring.ts b/packages/language-server/src/syntaxColouring.ts
@@ -1,7 +1,7 @@
 import {
   applySyntaxColouring,
   mapCypherToSemanticTokenIndex,
-} from 'language-support';
+} from '@neo4j-cypher/language-support';
 import {
   SemanticTokensBuilder,
   SemanticTokensParams,

diff --git a/packages/language-support/package.json b/packages/language-support/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "language-support",
+  "name": "@neo4j-cypher/language-support",
   "description": "Cypher language support",
   "author": "neo4j",
   "license": "Apache-2.0",

diff --git a/packages/react-codemirror-playground/package.json b/packages/react-codemirror-playground/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "codemirror-playground",
+  "name": "@neo4j-cypher/react-codemirror-playground",
   "private": true,
   "version": "0.0.0",
   "type": "module",
@@ -9,14 +9,14 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@neo4j-cypher/language-support": "*",
     "@codemirror/autocomplete": "^6.5.1",
     "@codemirror/commands": "^6.2.2",
     "@codemirror/language": "^6.6.0",
     "@lezer/common": "^1.0.2",
     "@lezer/highlight": "^1.1.3",
     "@neo4j-cypher/react-codemirror-experimental": "*",
     "@uiw/react-codemirror": "^4.19.9",
-    "language-support": "*",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "vite-plugin-node-stdlib-browser": "^0.2.1",

diff --git a/packages/react-codemirror-playground/src/App.tsx b/packages/react-codemirror-playground/src/App.tsx
@@ -1,5 +1,5 @@
-import { CypherEditor } from '@neo4j-cypher/react-codemirror-experimental';
-import { DbSchema } from 'language-support';
+import { DbSchema } from '@neo4j-cypher/language-support';
+import { CypherEditor } from '@neo4j-cypher/react-codemirror';
 import { useMemo, useState } from 'react';
 import { Tree } from 'react-d3-tree';
 import { dummyDbSchema } from './mock-schema.js';

diff --git a/packages/react-codemirror-playground/src/TokenTable.tsx b/packages/react-codemirror-playground/src/TokenTable.tsx
@@ -1,4 +1,4 @@
-import { applySyntaxColouring } from 'language-support';
+import { applySyntaxColouring } from '@neo4j-cypher/language-support';
 import React from 'react';
 
 export function TokenTable({ document }: { document: string }) {

diff --git a/packages/react-codemirror-playground/src/tree-util.ts b/packages/react-codemirror-playground/src/tree-util.ts
@@ -8,7 +8,7 @@ import {
   CypherParser,
   parse,
   ParserRuleContext,
-} from 'language-support';
+} from '@neo4j-cypher/language-support';
 
 export function getDebugTree(cypher: string): SimpleTree {
   const statements = parse(cypher);

diff --git a/packages/react-codemirror/package.json b/packages/react-codemirror/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@neo4j-cypher/react-codemirror-experimental",
+  "name": "@neo4j-cypher/react-codemirror",
   "license": "Apache-2.0",
   "files": [
     "dist",

diff --git a/packages/react-codemirror/playwright.config.ts b/packages/react-codemirror/playwright.config.ts
@@ -34,8 +34,7 @@ export default defineConfig({
   ],
 
   webServer: {
-    command:
-      'npm run e2e-http-server -w @neo4j-cypher/react-codemirror-experimental',
+    command: 'npm run e2e-http-server -w @neo4j-cypher/react-codemirror',
     url: 'http://localhost:3000',
     reuseExistingServer: !process.env.CI,
   },

diff --git a/packages/react-codemirror/src/CypherEditor.tsx b/packages/react-codemirror/src/CypherEditor.tsx
@@ -1,9 +1,9 @@
 import { EditorView, KeyBinding, keymap } from '@codemirror/view';
+import type { DbSchema } from '@neo4j-cypher/language-support';
 import CodeEditor, {
   ReactCodeMirrorProps,
   ReactCodeMirrorRef,
 } from '@uiw/react-codemirror';
-import type { DbSchema } from 'language-support';
 import React from 'react';
 import { cypher } from './lang-cypher/lang-cypher';
 import { basicNeo4jSetup } from './neo4j-setup';

diff --git a/packages/react-codemirror/src/index.ts b/packages/react-codemirror/src/index.ts
@@ -1,5 +1,5 @@
+export { CypherParser, parse } from '@neo4j-cypher/language-support';
 export * as ReactCodemirror from '@uiw/react-codemirror';
-export { CypherParser, parse } from 'language-support';
 export { CypherEditor } from './CypherEditor';
 export { cypher } from './lang-cypher/lang-cypher';
 export { darkThemeConstants, lightThemeConstants } from './themes';
diff --git a/packages/react-codemirror/src/lang-cypher/ParserAdapter.ts b/packages/react-codemirror/src/lang-cypher/ParserAdapter.ts
@@ -4,7 +4,7 @@ import {
   applySyntaxColouring,
   CypherTokenType,
   ParsedCypherToken,
-} from 'language-support';
+} from '@neo4j-cypher/language-support';
 import { cypherTokenTypeToNode, parserAdapterNodeSet } from './constants';
 
 const DEFAULT_NODE_GROUP_SIZE = 4;

diff --git a/packages/react-codemirror/src/lang-cypher/autocomplete.ts b/packages/react-codemirror/src/lang-cypher/autocomplete.ts
@@ -1,5 +1,5 @@
 import { CompletionSource } from '@codemirror/autocomplete';
-import { autocomplete, DbSchema } from 'language-support';
+import { autocomplete, DbSchema } from '@neo4j-cypher/language-support';
 import { CompletionItemKind } from 'vscode-languageserver-types';
 import { CompletionItemIcons } from '../icons';
 

diff --git a/packages/react-codemirror/src/lang-cypher/constants.ts b/packages/react-codemirror/src/lang-cypher/constants.ts
@@ -2,7 +2,7 @@ import { languageDataProp } from '@codemirror/language';
 import type { Facet } from '@codemirror/state';
 import { NodeSet, NodeType } from '@lezer/common';
 import { styleTags, Tag, tags } from '@lezer/highlight';
-import { CypherTokenType } from 'language-support';
+import { CypherTokenType } from '@neo4j-cypher/language-support';
 
 export const cypherTokenTypeToNode = (facet: Facet<unknown>) => ({
   topNode: NodeType.define({

diff --git a/packages/react-codemirror/src/lang-cypher/lang-cypher.ts b/packages/react-codemirror/src/lang-cypher/lang-cypher.ts
@@ -3,7 +3,7 @@ import {
   Language,
   LanguageSupport,
 } from '@codemirror/language';
-import type { DbSchema } from 'language-support';
+import type { DbSchema } from '@neo4j-cypher/language-support';
 import { cypherAutocomplete } from './autocomplete';
 import { ParserAdapter } from './ParserAdapter';
 import { cypherLinter } from './syntax-validation';