fixed monaco-graphql severity, it was hardcoded to 5 which is not valid value of monaco severity (#3983)

* remove unused `MonacoCompletionItem` type

fix `types` field in `package.json`, should be first, before `import` or `require` fields

* Update packages/monaco-graphql/src/utils.ts

Author: dimaMachina

.changeset/twenty-turkeys-compare.md

@@ -0,0 +1,9 @@
+---
+'monaco-graphql': patch
+---
+
+remove unused `MonacoCompletionItem` type
+
+fix `types` field in `package.json`, should be first, before `import` or `require` fields
+
+fixed `monaco-graphql` severity, it was hardcoded to `5` which is not valid value of monaco severity

packages/monaco-graphql/package.json

@@ -18,37 +18,37 @@
   ],
   "exports": {
     ".": {
+      "types": "./esm/monaco.contribution.d.ts",
       "import": "./esm/monaco.contribution.js",
       "require": "./dist/monaco.contribution.js",
-      "types": "./esm/monaco.contribution.d.ts",
       "default": "./dist/monaco.contribution.js"
     },
     "./*": {
+      "types": "./*",
       "import": "./*",
       "require": "./*",
-      "types": "./*",
       "default": "./*"
     },
     "./esm/graphql.worker": {
+      "types": "./esm/graphql.worker.d.ts",
       "import": "./esm/graphql.worker.js",
-      "require": "./dist/graphql.worker.js",
-      "types": "./esm/graphql.worker.d.ts"
+      "require": "./dist/graphql.worker.js"
     },
     "./lite": {
-      "import": "./esm/lite.js",
       "types": "./esm/lite.d.ts",
+      "import": "./esm/lite.js",
       "require": "./dist/lite.js",
       "default": "./dist/lite.js"
     },
     "./graphql.worker": {
-      "import": "./esm/graphql.worker.js",
       "types": "./esm/graphql.worker.d.ts",
+      "import": "./esm/graphql.worker.js",
       "require": "./dist/graphql.worker.js",
       "default": "./dist/graphql.worker.js"
     },
     "./initializeMode": {
-      "import": "./esm/initializeMode.js",
       "types": "./esm/initializeMode.d.ts",
+      "import": "./esm/initializeMode.js",
       "require": "./dist/initializeMode.js",
       "default": "./dist/initializeMode.js"
     }

packages/monaco-graphql/src/GraphQLWorker.ts

@@ -17,14 +17,11 @@ import {
   GraphQLWorkerCompletionItem,
 } from './utils';
 
-export type MonacoCompletionItem = monaco.languages.CompletionItem & {
-  isDeprecated?: boolean;
-  deprecationReason?: string | null;
-};
 export class GraphQLWorker {
   private _ctx: monaco.worker.IWorkerContext;
   private _languageService: LanguageService;
   private _formattingOptions: FormattingOptions | undefined;
+
   constructor(ctx: monaco.worker.IWorkerContext, createData: ICreateData) {
     this._ctx = ctx;
     this._languageService = new LanguageService(createData.languageConfig);
@@ -82,24 +79,18 @@ export class GraphQLWorker {
         return null;
       }
       const graphQLPosition = toGraphQLPosition(position);
-
       const hover = this._languageService.getHover(
         uri,
         document,
         graphQLPosition,
       );
-
+      const location = {
+        column: graphQLPosition.character,
+        line: graphQLPosition.line,
+      };
       return {
         content: hover,
-        range: toMonacoRange(
-          getRange(
-            {
-              column: graphQLPosition.character,
-              line: graphQLPosition.line,
-            },
-            document,
-          ),
-        ),
+        range: toMonacoRange(getRange(location, document)),
       };
     } catch (err) {
       // eslint-disable-next-line no-console
@@ -157,9 +148,11 @@ export class GraphQLWorker {
     }
     return null;
   }
+
   public doUpdateSchema(schema: SchemaConfig) {
     return this._languageService.updateSchema(schema);
   }
+
   public doUpdateSchemas(schemas: SchemaConfig[]) {
     return this._languageService.updateSchemas(schemas);
   }

packages/monaco-graphql/src/languageFeatures.ts

@@ -242,10 +242,9 @@ export class CompletionAdapter implements languages.CompletionItemProvider {
     _token: monaco.CancellationToken,
   ): Promise<languages.CompletionList> {
     try {
-      const resource = model.uri;
       const worker = await this._worker(model.uri);
       const completionItems = await worker.doComplete(
-        resource.toString(),
+        model.uri.toString(),
         position,
       );
       return {

packages/monaco-graphql/src/utils.ts

@@ -26,11 +26,6 @@ export const getModelLanguageId = (model: monaco.editor.ITextModel) => {
   return model.getLanguageId();
 };
 
-export type MonacoCompletionItem = monaco.languages.CompletionItem & {
-  isDeprecated?: boolean;
-  deprecationReason?: string | null;
-};
-
 export function toMonacoRange(range: GraphQLRange): monaco.IRange {
   return {
     startLineNumber: range.start.line + 1,
@@ -81,30 +76,25 @@ export function toCompletion(
 }
 
 /**
- * Monaco and Vscode have slightly different ideas of marker severity.
+ * Monaco and VSCode have slightly different ideas of marker severity.
  * for example, vscode has Error = 1, whereas monaco has Error = 8. this takes care of that
- * @param severity {DiagnosticSeverity} optional vscode diagnostic severity to convert to monaco MarkerSeverity
- * @returns {monaco.MarkerSeverity} the matching marker severity level on monaco's terms
+ * @param severity - optional vscode diagnostic severity to convert to monaco MarkerSeverity
+ * @returns the matching marker severity level on monaco's terms
  */
-// export function toMonacoSeverity(severity?: Diagnostic['severity']): monaco.MarkerSeverity {
-//   switch (severity) {
-//     case 1: {
-//       return monaco.MarkerSeverity.Error
-//     }
-//     case 4: {
-//       return monaco.MarkerSeverity.Hint
-//     }
-//     case 3: {
-//       return monaco.MarkerSeverity.Info
-//     }
-//     case 2: {
-//       return monaco.MarkerSeverity.Warning
-//     }
-//     default: {
-//       return monaco.MarkerSeverity.Warning
-//     }
-//   }
-// }
+export function toMonacoSeverity(
+  severity?: Diagnostic['severity'],
+): monaco.MarkerSeverity {
+  // Can't use `monaco.MarkerSeverity` type due error:
+  // ReferenceError: window is not defined
+  const severityMap = {
+    1: 8, // MarkerSeverity.Error
+    2: 4, // MarkerSeverity.Warning
+    3: 2, // MarkerSeverity.Info
+    4: 1, // MarkerSeverity.Hint
+  };
+
+  return severity ? severityMap[severity] : severityMap[2];
+}
 
 export function toMarkerData(
   diagnostic: Diagnostic,
@@ -115,8 +105,7 @@ export function toMarkerData(
     startColumn: diagnostic.range.start.character + 1,
     endColumn: diagnostic.range.end.character,
     message: diagnostic.message,
-    severity: 5,
-    // severity: toMonacoSeverity(diagnostic.severity),
+    severity: toMonacoSeverity(diagnostic.severity),
     code: (diagnostic.code as string) || undefined,
   };
 }