enable sonarjs/no-small-switch and sonarjs/no-duplicated-branches…

… rules (#2966)
graphql · Jan 9, 2023 · f9aa87d · f9aa87d
1 parent aa1097d
commit f9aa87d
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 49 deletions.
diff --git a/.changeset/funny-bats-lay.md b/.changeset/funny-bats-lay.md
@@ -0,0 +1,7 @@
+---
+'graphql-language-service-cli': patch
+'graphql-language-service-server': patch
+'vscode-graphql-execution': patch
+---
+
+enable `sonarjs/no-small-switch` and `sonarjs/no-duplicated-branches` rules
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -269,6 +269,8 @@ module.exports = {
     'unicorn/no-lonely-if': 'error',
     'no-unused-expressions': 'off',
     '@typescript-eslint/no-unused-expressions': 'error',
+    'sonarjs/no-small-switch': 'error',
+    'sonarjs/no-duplicated-branches': 'error',
   },
 
   plugins: ['@typescript-eslint', 'promise', 'sonarjs', 'unicorn'],

diff --git a/packages/graphql-language-service-cli/src/cli.ts b/packages/graphql-language-service-cli/src/cli.ts
@@ -107,37 +107,33 @@ if (!command) {
   process.exit(0);
 }
 
-switch (command) {
-  case 'server':
-    process.on('uncaughtException', error => {
-      process.stderr.write(
-        'An error was thrown from GraphQL language service: ' + String(error),
-      );
-      // don't exit at all if there is an uncaughtException
-      // process.exit(0);
-    });
+if (command === 'server') {
+  process.on('uncaughtException', error => {
+    process.stderr.write(
+      'An error was thrown from GraphQL language service: ' + String(error),
+    );
+    // don't exit at all if there is an uncaughtException
+    // process.exit(0);
+  });
 
-    const options: { [key: string]: any } = {};
-    if (argv?.port) {
-      options.port = argv.port;
-    }
-    if (argv?.method) {
-      options.method = argv.method;
-    }
-    if (argv?.configDir) {
-      options.configDir = argv.configDir;
-    }
-    try {
-      startServer(options);
-    } catch (error) {
-      const logger = new Logger();
-      logger.error(String(error));
-    }
-    break;
-  default: {
-    client(command as string, argv as { [key: string]: string });
-    break;
+  const options: { [key: string]: any } = {};
+  if (argv?.port) {
+    options.port = argv.port;
+  }
+  if (argv?.method) {
+    options.method = argv.method;
+  }
+  if (argv?.configDir) {
+    options.configDir = argv.configDir;
+  }
+  try {
+    startServer(options);
+  } catch (error) {
+    const logger = new Logger();
+    logger.error(String(error));
   }
+} else {
+  client(command as string, argv as { [key: string]: string });
 }
 
 // Exit the process when stream closes from remote end.

diff --git a/packages/graphql-language-service-server/src/MessageProcessor.ts b/packages/graphql-language-service-server/src/MessageProcessor.ts
@@ -255,11 +255,10 @@ export class MessageProcessor {
     }
   }
   _handleConfigError({ err }: { err: unknown; uri?: string }) {
-    if (err instanceof ConfigNotFoundError) {
+    if (err instanceof ConfigNotFoundError || err instanceof ConfigEmptyError) {
       // TODO: obviously this needs to become a map by workspace from uri
       // for workspaces support
       this._isGraphQLConfigMissing = true;
-
       this._logConfigError(err.message);
     } else if (err instanceof ProjectNotFoundError) {
       // this is the only case where we don't invalidate config;
@@ -270,9 +269,6 @@ export class MessageProcessor {
     } else if (err instanceof ConfigInvalidError) {
       this._isGraphQLConfigMissing = true;
       this._logConfigError(`Invalid configuration\n${err.message}`);
-    } else if (err instanceof ConfigEmptyError) {
-      this._isGraphQLConfigMissing = true;
-      this._logConfigError(err.message);
     } else if (err instanceof LoaderNoResultError) {
       this._isGraphQLConfigMissing = true;
       this._logConfigError(err.message);

diff --git a/packages/vscode-graphql-execution/src/helpers/source.ts b/packages/vscode-graphql-execution/src/helpers/source.ts
@@ -71,15 +71,7 @@ export class SourceHelper {
           }
           break;
         case 'String':
-          if (value.length && !Array.isArray(value)) {
-            return null;
-          }
-          break;
         case 'ID':
-          if (value.length && !Array.isArray(value)) {
-            return null;
-          }
-          break;
         case 'Enum':
           if (value.length && !Array.isArray(value)) {
             return null;
@@ -140,13 +132,7 @@ export class SourceHelper {
         FragmentDefinition(node) {
           const existingDef = fragmentDefinitions.get(node.name.value);
           const newVal = print(node);
-          if (existingDef && existingDef.content !== newVal) {
-            fragmentDefinitions.set(node.name.value, {
-              definition: node,
-              content: newVal,
-              filePath: source.location,
-            });
-          } else if (!existingDef) {
+          if ((existingDef && existingDef.content !== newVal) || !existingDef) {
             fragmentDefinitions.set(node.name.value, {
               definition: node,
               content: newVal,