@neo4j-cypher/react-codemirror 2.0.0-next.40 → 2.0.0-next.41

package/src/lang-cypher/parser-adapter.ts

@@ -1,16 +1,17 @@
-import { Facet } from '@codemirror/state';
-import { Input, NodeType, Parser, PartialParse, Tree } from '@lezer/common';
-import { ParsedCypherToken } from '@neo4j-cypher/language-support';
+import type { Facet } from '@codemirror/state';
+import type { Input, NodeType, PartialParse } from '@lezer/common';
+import { Parser, Tree } from '@lezer/common';
+import type { ParsedCypherToken } from '@neo4j-cypher/language-support';
 
 import Prism from 'prismjs';
-import {
-  CodemirrorParseTokenType,
-  cypherTokenTypeToNode,
-  parserAdapterNodeSet,
-} from './constants';
+import type { CodemirrorParseTokenType } from './constants';
+import { cypherTokenTypeToNode, parserAdapterNodeSet } from './constants';
+// Must come before prism-cypher: it publishes the global `Prism` that the
+// component script assigns onto.
+import './prism-global.js';
 // This import will load the cypher support in prisma
 import 'prismjs/components/prism-cypher';
-import { CypherConfig } from './langCypher';
+import type { CypherConfig } from './langCypher';
 
 const DEFAULT_NODE_GROUP_SIZE = 4;
 Prism.manual = true;

package/src/lang-cypher/prism-global.ts

@@ -0,0 +1,7 @@
+import Prism from 'prismjs';
+
+// `prismjs/components/prism-cypher` (used in parser-adapter) is a plain script that mutates the global
+// `Prism`. Bundlers keep prismjs' CJS core lazy and may evaluate the component
+// before the core has run, so force the core to initialise (and publish the
+// global) from a module that is imported first.
+(globalThis as { Prism?: typeof Prism }).Prism = Prism;

package/src/lang-cypher/signatureHelp.ts

@@ -1,10 +1,10 @@
-import { EditorState, StateField } from '@codemirror/state';
-import { showTooltip, Tooltip } from '@codemirror/view';
-import {
-  MarkupContent,
-  SignatureInformation,
-} from 'vscode-languageserver-types';
-import { CypherConfig } from './langCypher';
+import type { EditorState } from '@codemirror/state';
+import { StateField } from '@codemirror/state';
+import type { Tooltip } from '@codemirror/view';
+import { showTooltip } from '@codemirror/view';
+import type { SignatureInformation } from 'vscode-languageserver-types';
+import { MarkupContent } from 'vscode-languageserver-types';
+import type { CypherConfig } from './langCypher';
 import { getDocString } from './utils';
 
 function getTriggerCharacter(query: string, caretPosition: number) {

package/src/lang-cypher/syntaxValidation.ts

@@ -1,5 +1,6 @@
-import { Diagnostic, linter } from '@codemirror/lint';
-import { Extension } from '@codemirror/state';
+import type { Diagnostic } from '@codemirror/lint';
+import { linter } from '@codemirror/lint';
+import type { Extension } from '@codemirror/state';
 import { DiagnosticSeverity, DiagnosticTag } from 'vscode-languageserver-types';
 import workerpool from 'workerpool';
 import type { CypherConfig } from './langCypher';
@@ -64,8 +65,12 @@ export const cypherLinter: (config: CypherConfig) => Extension = (config) =>
       }
       return a;
     } catch (err) {
-      if (!String(err).includes('Worker terminated')) {
-        console.error(String(err) + ' ' + query);
+      if (err instanceof Error) {
+        if (!err.message.includes('Worker terminated')) {
+          console.error(String(err) + ' ' + query);
+        }
+      } else {
+        console.error(JSON.stringify(err));
       }
     }
     return [];

package/src/neo4jSetup.tsx

@@ -25,15 +25,15 @@ import {
   syntaxHighlighting,
 } from '@codemirror/language';
 import { highlightSelectionMatches, searchKeymap } from '@codemirror/search';
-import { EditorState, Extension, StateCommand } from '@codemirror/state';
+import type { Extension, StateCommand } from '@codemirror/state';
+import { EditorState } from '@codemirror/state';
+import type { Command, KeyBinding } from '@codemirror/view';
 import {
-  Command,
   crosshairCursor,
   drawSelection,
   dropCursor,
   EditorView,
   highlightSpecialChars,
-  KeyBinding,
   keymap,
   rectangularSelection,
 } from '@codemirror/view';

package/src/richClipboardCopier.test.ts

@@ -1,6 +1,6 @@
 // @vitest-environment jsdom
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { EditorView } from '@codemirror/view';
+import type { EditorView } from '@codemirror/view';
 import { getHTML, getCSSStyleForClass } from './richClipboardCopier';
 
 function createStyleSheet(rules: string): CSSStyleSheet {
@@ -47,10 +47,12 @@ describe('getHTML', () => {
     document.body.appendChild(wrapper);
 
     const mockView = {
-      domAtPos: vi.fn((pos: number) => ({
-        node: wrapper,
-        offset: pos === 0 ? 0 : 1,
-      })),
+      domAtPos: vi.fn<(pos: number) => { node: Node; offset: number }>(
+        (pos) => ({
+          node: wrapper,
+          offset: pos === 0 ? 0 : 1,
+        }),
+      ),
     } as unknown as EditorView;
 
     const html = getHTML(mockView, 0, 1);

package/src/richClipboardCopier.ts

@@ -3,8 +3,8 @@ import { EditorView } from '@codemirror/view';
 export function getCSSStyleForClass(className: string): string {
   return Array.from(document.styleSheets).reduce((cssText, sheet) => {
     try {
-      const rules = sheet.cssRules ?? [];
-      for (const rule of Array.from(rules)) {
+      const rules = Array.from(sheet.cssRules ?? []);
+      for (const rule of rules) {
         if (
           rule instanceof CSSStyleRule &&
           rule.selectorText

package/src/themes.ts

@@ -1,8 +1,8 @@
-import { Extension } from '@codemirror/state';
+import type { Extension } from '@codemirror/state';
+import type { ThemeOptions } from './lang-cypher/createCypherTheme';
 import {
   createCypherTheme,
   type DiffColors,
-  ThemeOptions,
 } from './lang-cypher/createCypherTheme';
 import { tokens } from './ndlTokensCopy';