some sonar fixes

Author: pandeymangg

packages/react-native/src/lib/common/api.ts

@@ -1,5 +1,9 @@
 import { wrapThrowsAsync } from "@/lib/common/utils";
-import { ApiResponse, ApiSuccessResponse, CreateOrUpdateUserResponse } from "@/types/api";
+import {
+  ApiResponse,
+  ApiSuccessResponse,
+  CreateOrUpdateUserResponse,
+} from "@/types/api";
 import { TEnvironmentState } from "@/types/config";
 import { ApiErrorResponse, Result, err, ok } from "@/types/error";
 
@@ -40,7 +44,9 @@ export const makeRequest = async <T>(
       status: response.status,
       message: errorResponse.message || "Something went wrong",
       url,
-      ...(Object.keys(errorResponse.details ?? {}).length > 0 && { details: errorResponse.details }),
+      ...(Object.keys(errorResponse.details ?? {}).length > 0 && {
+        details: errorResponse.details,
+      }),
     });
   }
 
@@ -50,9 +56,9 @@ export const makeRequest = async <T>(
 
 // Simple API client using fetch
 export class ApiClient {
-  private appUrl: string;
-  private environmentId: string;
-  private isDebug: boolean;
+  private readonly appUrl: string;
+  private readonly environmentId: string;
+  private readonly isDebug: boolean;
 
   constructor({
     appUrl,
@@ -90,7 +96,9 @@ export class ApiClient {
     );
   }
 
-  async getEnvironmentState(): Promise<Result<TEnvironmentState, ApiErrorResponse>> {
+  async getEnvironmentState(): Promise<
+    Result<TEnvironmentState, ApiErrorResponse>
+  > {
     return makeRequest(
       this.appUrl,
       `/api/v1/client/${this.environmentId}/environment`,

packages/react-native/src/lib/common/command-queue.ts

@@ -4,8 +4,10 @@ import { wrapThrowsAsync } from "@/lib/common/utils";
 import type { Result } from "@/types/error";
 
 export class CommandQueue {
-  private queue: {
-    command: (...args: any[]) => Promise<Result<void, unknown>> | Result<void, unknown> | Promise<void>;
+  private readonly queue: {
+    command: (
+      ...args: any[]
+    ) => Promise<Result<void, unknown>> | Result<void, unknown> | Promise<void>;
     checkSetup: boolean;
     commandArgs: any[];
   }[] = [];
@@ -14,11 +16,17 @@ export class CommandQueue {
   private commandPromise: Promise<void> | null = null;
 
   public add<A>(
-    command: (...args: A[]) => Promise<Result<void, unknown>> | Result<void, unknown> | Promise<void>,
+    command: (
+      ...args: A[]
+    ) => Promise<Result<void, unknown>> | Result<void, unknown> | Promise<void>,
     shouldCheckSetup = true,
     ...args: A[]
   ): void {
-    this.queue.push({ command, checkSetup: shouldCheckSetup, commandArgs: args });
+    this.queue.push({
+      command,
+      checkSetup: shouldCheckSetup,
+      commandArgs: args,
+    });
 
     if (!this.running) {
       this.commandPromise = new Promise((resolve) => {
@@ -52,7 +60,10 @@ export class CommandQueue {
       }
 
       const executeCommand = async (): Promise<Result<void, unknown>> => {
-        return (await currentItem.command.apply(null, currentItem.commandArgs)) as Result<void, unknown>;
+        return (await currentItem.command.apply(
+          null,
+          currentItem.commandArgs
+        )) as Result<void, unknown>;
       };
 
       const result = await wrapThrowsAsync(executeCommand)();

packages/react-native/src/lib/common/config.ts

@@ -24,9 +24,7 @@ export class RNConfig {
   }
 
   static getInstance(): RNConfig {
-    if (!RNConfig.instance) {
-      RNConfig.instance = new RNConfig();
-    }
+    RNConfig.instance ??= new RNConfig();
 
     return RNConfig.instance;
   }
@@ -46,7 +44,9 @@ export class RNConfig {
 
   public get(): TConfig {
     if (!this.config) {
-      throw new Error("config is null, maybe the init function was not called?");
+      throw new Error(
+        "config is null, maybe the init function was not called?"
+      );
     }
     return this.config;
   }
@@ -77,7 +77,10 @@ export class RNConfig {
 
   private async saveToStorage(): Promise<Result<void>> {
     return wrapThrowsAsync(async () => {
-      await AsyncStorage.setItem(RN_ASYNC_STORAGE_KEY, JSON.stringify(this.config));
+      await AsyncStorage.setItem(
+        RN_ASYNC_STORAGE_KEY,
+        JSON.stringify(this.config)
+      );
     })();
   }
 

packages/react-native/src/lib/common/file-upload.ts

@@ -1,9 +1,12 @@
 /* eslint-disable no-console -- used for error logging */
-import { type TUploadFileConfig, type TUploadFileResponse } from "@/types/storage";
+import {
+  type TUploadFileConfig,
+  type TUploadFileResponse,
+} from "@/types/storage";
 
 export class StorageAPI {
-  private appUrl: string;
-  private environmentId: string;
+  private readonly appUrl: string;
+  private readonly environmentId: string;
 
   constructor(appUrl: string, environmentId: string) {
     this.appUrl = appUrl;
@@ -29,13 +32,16 @@ export class StorageAPI {
       surveyId,
     };
 
-    const response = await fetch(`${this.appUrl}/api/v1/client/${this.environmentId}/storage`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(payload),
-    });
+    const response = await fetch(
+      `${this.appUrl}/api/v1/client/${this.environmentId}/storage`,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify(payload),
+      }
+    );
 
     if (!response.ok) {
       throw new Error(`Upload failed with status: ${String(response.status)}`);
@@ -45,7 +51,13 @@ export class StorageAPI {
 
     const { data } = json;
 
-    const { signedUrl, fileUrl, signingData, presignedFields, updatedFileName } = data;
+    const {
+      signedUrl,
+      fileUrl,
+      signingData,
+      presignedFields,
+      updatedFileName,
+    } = data;
 
     let localUploadDetails: Record<string, string> = {};
 
@@ -86,7 +98,10 @@ export class StorageAPI {
 
     let uploadResponse: Response = {} as Response;
 
-    const signedUrlCopy = signedUrl.replace("http://localhost:3000", this.appUrl);
+    const signedUrlCopy = signedUrl.replace(
+      "http://localhost:3000",
+      this.appUrl
+    );
 
     try {
       uploadResponse = await fetch(signedUrlCopy, {
@@ -114,12 +129,16 @@ export class StorageAPI {
       // if s3 is used, we'll use the text response:
       const errorText = await uploadResponse.text();
       if (presignedFields && errorText.includes("EntityTooLarge")) {
-        const error = new Error("File size exceeds the size limit for your plan");
+        const error = new Error(
+          "File size exceeds the size limit for your plan"
+        );
         error.name = "FileTooLargeError";
         throw error;
       }
 
-      throw new Error(`Upload failed with status: ${String(uploadResponse.status)}`);
+      throw new Error(
+        `Upload failed with status: ${String(uploadResponse.status)}`
+      );
     }
 
     return fileUrl;

packages/react-native/src/lib/common/logger.ts

@@ -10,9 +10,7 @@ export class Logger {
   private logLevel: LogLevel = "error";
 
   static getInstance(): Logger {
-    if (!Logger.instance) {
-      Logger.instance = new Logger();
-    }
+    Logger.instance ??= new Logger();
     return Logger.instance;
   }
 

packages/react-native/src/lib/common/storage.ts

@@ -1,8 +1,9 @@
 import AsyncStorageModule from "@react-native-async-storage/async-storage";
 
-const AsyncStorageWithDefault = AsyncStorageModule as typeof AsyncStorageModule & {
-  default?: typeof AsyncStorageModule;
-};
+const AsyncStorageWithDefault =
+  AsyncStorageModule as typeof AsyncStorageModule & {
+    default?: typeof AsyncStorageModule;
+  };
 
 const AsyncStorage = AsyncStorageWithDefault.default ?? AsyncStorageModule;
 

packages/react-native/src/lib/common/tests/command-queue.test.ts

@@ -21,30 +21,24 @@ describe("CommandQueue", () => {
   test("executes commands in FIFO order", async () => {
     const executionOrder: string[] = [];
 
+    function delayedResult<T>(value: T, delayMs = 10): Promise<T> {
+      return new Promise((resolve) =>
+        setTimeout(() => resolve(value), delayMs)
+      );
+    }
+
     // Mock commands with proper Result returns
     const cmdA = vi.fn(async (): Promise<Result<void, unknown>> => {
-      return new Promise((resolve) => {
-        setTimeout(() => {
-          executionOrder.push("A");
-          resolve({ ok: true, data: undefined });
-        }, 10);
-      });
+      executionOrder.push("A");
+      return delayedResult({ ok: true, data: undefined });
     });
     const cmdB = vi.fn(async (): Promise<Result<void, unknown>> => {
-      return new Promise((resolve) => {
-        setTimeout(() => {
-          executionOrder.push("B");
-          resolve({ ok: true, data: undefined });
-        }, 10);
-      });
+      executionOrder.push("B");
+      return delayedResult({ ok: true, data: undefined });
     });
     const cmdC = vi.fn(async (): Promise<Result<void, unknown>> => {
-      return new Promise((resolve) => {
-        setTimeout(() => {
-          executionOrder.push("C");
-          resolve({ ok: true, data: undefined });
-        }, 10);
-      });
+      executionOrder.push("C");
+      return delayedResult({ ok: true, data: undefined });
     });
 
     // We'll assume checkSetup always ok for this test
@@ -107,12 +101,14 @@ describe("CommandQueue", () => {
 
   test("logs errors if a command throws or returns error", async () => {
     // Spy on console.error to see if it's called
-    const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {
-      return {
-        ok: true,
-        data: undefined,
-      };
-    });
+    const consoleErrorSpy = vi
+      .spyOn(console, "error")
+      .mockImplementation(() => {
+        return {
+          ok: true,
+          data: undefined,
+        };
+      });
 
     // Force checkSetup to succeed
     vi.mocked(checkSetup).mockReturnValue({ ok: true, data: undefined });
@@ -131,7 +127,10 @@ describe("CommandQueue", () => {
     queue.add(failingCmd, true);
     await queue.wait();
 
-    expect(consoleErrorSpy).toHaveBeenCalledWith("🧱 Formbricks - Global error: ", expect.any(Error));
+    expect(consoleErrorSpy).toHaveBeenCalledWith(
+      "🧱 Formbricks - Global error: ",
+      expect.any(Error)
+    );
     consoleErrorSpy.mockRestore();
   });
 

packages/react-native/src/lib/common/tests/utils.test.ts

@@ -25,6 +25,10 @@ const mockSurveyId2 = "qo9rwjmms42hoy3k85fp8vgu";
 const mockSegmentId1 = "p6yrnz3s2tvoe5r0l28unq7k";
 const mockSegmentId2 = "wz43zrxeddhb1uo9cicustar";
 
+function delay(ms: number) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
 describe("utils.ts", () => {
   // ---------------------------------------------------------------------------------
   // diffInDays
@@ -54,9 +58,7 @@ describe("utils.ts", () => {
   describe("wrapThrowsAsync()", () => {
     test("returns ok on success", async () => {
       const fn = vi.fn(async (x: number) => {
-        await new Promise((r) => {
-          setTimeout(r, 10);
-        });
+        await delay(10);
         return x * 2;
       });
 
@@ -71,9 +73,7 @@ describe("utils.ts", () => {
 
     test("returns err on error", async () => {
       const fn = vi.fn(async () => {
-        await new Promise((r) => {
-          setTimeout(r, 10);
-        });
+        await delay(10);
         throw new Error("Something broke");
       });
       const wrapped = wrapThrowsAsync(fn);
@@ -359,7 +359,7 @@ describe("utils.ts", () => {
       const survey = {
         languages: [{ language: { code: "en" }, default: true, enabled: true }],
       } as unknown as TSurvey;
-      const code = getLanguageCode(survey, undefined);
+      const code = getLanguageCode(survey);
       expect(code).toBe("default");
     });
 

packages/react-native/src/lib/common/utils.ts

@@ -90,6 +90,7 @@ export const filterSurveys = (
 
     // if survey has recontactDays, check if the last display was more than recontactDays ago
     // The previous approach checked the last display for each survey which is why we still have a surveyId in the displays array.
+    // NOSONAR
     // TODO: Remove the surveyId from the displays array
     if (survey.recontactDays !== null) {
       return (

packages/react-native/src/lib/survey/store.ts

@@ -5,12 +5,10 @@ type Listener = (state: TSurvey | null, prevSurvey: TSurvey | null) => void;
 export class SurveyStore {
   private static instance: SurveyStore | undefined;
   private survey: TSurvey | null = null;
-  private listeners = new Set<Listener>();
+  private readonly listeners = new Set<Listener>();
 
   static getInstance(): SurveyStore {
-    if (!SurveyStore.instance) {
-      SurveyStore.instance = new SurveyStore();
-    }
+    SurveyStore.instance ??= new SurveyStore();
     return SurveyStore.instance;
   }