refactor: update to dioc v3 (#4009)

Co-authored-by: jamesgeorge007 <jamesgeorge998001@gmail.com>

packages/hoppscotch-common/package.json

@@ -50,7 +50,7 @@
     "axios": "1.6.2",
     "buffer": "6.0.3",
     "cookie-es": "1.0.0",
-    "dioc": "1.0.1",
+    "dioc": "3.0.1",
     "esprima": "4.0.1",
     "events": "3.3.0",
     "fp-ts": "2.16.1",

packages/hoppscotch-common/src/components.d.ts

@@ -32,6 +32,7 @@ declare module 'vue' {
     AppSpotlightEntryRESTHistory: typeof import('./components/app/spotlight/entry/RESTHistory.vue')['default']
     AppSpotlightEntryRESTRequest: typeof import('./components/app/spotlight/entry/RESTRequest.vue')['default']
     AppSpotlightEntryRESTTeamRequestEntry: typeof import('./components/app/spotlight/entry/RESTTeamRequestEntry.vue')['default']
+    AppSpotlightSearch: typeof import('./components/app/SpotlightSearch.vue')['default']
     AppSupport: typeof import('./components/app/Support.vue')['default']
     Collections: typeof import('./components/collections/index.vue')['default']
     CollectionsAdd: typeof import('./components/collections/Add.vue')['default']

packages/hoppscotch-common/src/helpers/teams/TeamsSearch.service.ts

@@ -201,7 +201,7 @@ export class TeamSearchService extends Service {
   expandingCollections: Ref<string[]> = ref([])
   expandedCollections: Ref<string[]> = ref([])
 
-  // FUTURE-TODO: ideally this should return the search results / formatted results instead of directly manipulating the result set
+  // TODO: ideally this should return the search results / formatted results instead of directly manipulating the result set
   // eg: do the spotlight formatting in the spotlight searcher and not here
   searchTeams = async (query: string, teamID: string) => {
     if (!query.length) {

packages/hoppscotch-common/src/modules/dioc.ts

@@ -1,5 +1,5 @@
 import { HoppModule } from "."
-import { Container, Service } from "dioc"
+import { Container, ServiceClassInstance } from "dioc"
 import { diocPlugin } from "dioc/vue"
 import { DebugService } from "~/services/debug.service"
 import { platform } from "~/platform"
@@ -22,7 +22,7 @@ if (import.meta.env.DEV) {
  * services. Please use `useService` if within components or try to convert your
  * legacy subsystem into a service if possible.
  */
-export function getService<T extends typeof Service<any> & { ID: string }>(
+export function getService<T extends ServiceClassInstance<any>>(
   service: T
 ): InstanceType<T> {
   return serviceContainer.bind(service)
@@ -30,11 +30,10 @@ export function getService<T extends typeof Service<any> & { ID: string }>(
 
 export default <HoppModule>{
   onVueAppInit(app) {
-    // TODO: look into this
-    // @ts-expect-error Something weird with Vue versions
     app.use(diocPlugin, {
       container: serviceContainer,
     })
+
     for (const service of platform.addedServices ?? []) {
       serviceContainer.bind(service)
     }

packages/hoppscotch-common/src/platform/index.ts

@@ -8,14 +8,14 @@ import { AnalyticsPlatformDef } from "./analytics"
 import { InterceptorsPlatformDef } from "./interceptors"
 import { HoppModule } from "~/modules"
 import { InspectorsPlatformDef } from "./inspectors"
-import { Service } from "dioc"
+import { ServiceClassInstance } from "dioc"
 import { IOPlatformDef } from "./io"
 import { SpotlightPlatformDef } from "./spotlight"
 
 export type PlatformDef = {
   ui?: UIPlatformDef
   addedHoppModules?: HoppModule[]
-  addedServices?: Array<typeof Service<unknown> & { ID: string }>
+  addedServices?: Array<ServiceClassInstance<unknown>>
   auth: AuthPlatformDef
   analytics?: AnalyticsPlatformDef
   io: IOPlatformDef

packages/hoppscotch-common/src/platform/inspectors.ts

@@ -1,4 +1,4 @@
-import { Service } from "dioc"
+import { Container, ServiceClassInstance } from "dioc"
 import { Inspector } from "~/services/inspection"
 
 /**
@@ -8,8 +8,9 @@ export type PlatformInspectorsDef = {
   // We are keeping this as the only mode for now
   // So that if we choose to add other modes, we can do without breaking
   type: "service"
-  service: typeof Service<unknown> & { ID: string } & {
+  // TODO: I don't think this type is effective, we have to come up with a better impl
-    new (): Service & Inspector
+  service: ServiceClassInstance<unknown> & {
+    new (c: Container): Inspector
   }
 }
 

packages/hoppscotch-common/src/platform/interceptors.ts

@@ -1,12 +1,13 @@
-import { Service } from "dioc"
+import { Container, ServiceClassInstance } from "dioc"
 import { Interceptor } from "~/services/interceptor.service"
 
 export type PlatformInterceptorDef =
   | { type: "standalone"; interceptor: Interceptor }
   | {
       type: "service"
-      service: typeof Service<unknown> & { ID: string } & {
+      // TODO: I don't think this type is effective, we have to come up with a better impl
-        new (): Service & Interceptor
+      service: ServiceClassInstance<unknown> & {
+        new (c: Container): Interceptor
       }
     }
 

packages/hoppscotch-common/src/platform/spotlight.ts

@@ -1,10 +1,10 @@
-import { Service } from "dioc"
+import { Container, ServiceClassInstance } from "dioc"
 import { SpotlightSearcher } from "~/services/spotlight"
 
 export type SpotlightPlatformDef = {
   additionalSearchers?: Array<
-    typeof Service<unknown> & { ID: string } & {
+    ServiceClassInstance<unknown> & {
-      new (): Service & SpotlightSearcher
+      new (c: Container): SpotlightSearcher
     }
   >
 }

packages/hoppscotch-common/src/platform/std/inspections/extension.inspector.ts

@@ -31,9 +31,7 @@ export class ExtensionInspectorService extends Service implements Inspector {
 
   private readonly inspection = this.bind(InspectionService)
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     this.inspection.registerInspector(this)
   }
 

packages/hoppscotch-common/src/platform/std/interceptors/extension.ts

@@ -133,9 +133,7 @@ export class ExtensionInterceptorService
 
   public selectable = { type: "selectable" as const }
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     this.listenForExtensionStatus()
   }
 

packages/hoppscotch-common/src/services/context-menu/menu/environment.menu.ts

@@ -24,9 +24,7 @@ export class EnvironmentMenuService extends Service implements ContextMenu {
 
   private readonly contextMenu = this.bind(ContextMenuService)
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     this.contextMenu.registerMenu(this)
   }
 

packages/hoppscotch-common/src/services/context-menu/menu/parameter.menu.ts

@@ -41,9 +41,7 @@ export class ParameterMenuService extends Service implements ContextMenu {
 
   private readonly contextMenu = this.bind(ContextMenuService)
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     this.contextMenu.registerMenu(this)
   }
 

packages/hoppscotch-common/src/services/context-menu/menu/url.menu.ts

@@ -39,9 +39,7 @@ export class URLMenuService extends Service implements ContextMenu {
   private readonly contextMenu = this.bind(ContextMenuService)
   private readonly restTab = this.bind(RESTTabService)
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     this.contextMenu.registerMenu(this)
   }
 

packages/hoppscotch-common/src/services/cookie-jar.service.ts

@@ -20,10 +20,6 @@ export class CookieJarService extends Service {
    */
   public cookieJar = ref(new Map<string, string[]>())
 
-  constructor() {
-    super()
-  }
-
   public parseSetCookieString(setCookieString: string) {
     return setCookieParse(setCookieString)
   }

packages/hoppscotch-common/src/services/debug.service.ts

@@ -14,9 +14,7 @@ import { Service } from "dioc"
 export class DebugService extends Service {
   public static readonly ID = "DEBUG_SERVICE"
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     console.log("DebugService is initialized...")
 
     const container = this.getContainer()

packages/hoppscotch-common/src/services/inspection/index.ts

@@ -107,9 +107,7 @@ export class InspectionService extends Service {
 
   private readonly restTab = this.bind(RESTTabService)
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     this.initializeListeners()
   }
 

packages/hoppscotch-common/src/services/inspection/inspectors/environment.inspector.ts

@@ -53,9 +53,7 @@ export class EnvironmentInspectorService extends Service implements Inspector {
     }
   )[0]
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     this.inspection.registerInspector(this)
   }
 

packages/hoppscotch-common/src/services/inspection/inspectors/header.inspector.ts

@@ -22,9 +22,7 @@ export class HeaderInspectorService extends Service implements Inspector {
   private readonly inspection = this.bind(InspectionService)
   private readonly interceptorService = this.bind(InterceptorService)
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     this.inspection.registerInspector(this)
   }
 

packages/hoppscotch-common/src/services/inspection/inspectors/response.inspector.ts

@@ -23,9 +23,7 @@ export class ResponseInspectorService extends Service implements Inspector {
 
   private readonly inspection = this.bind(InspectionService)
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     this.inspection.registerInspector(this)
   }
 

packages/hoppscotch-common/src/services/interceptor.service.ts

@@ -178,9 +178,7 @@ export class InterceptorService extends Service {
     return this.interceptors.get(this.currentInterceptorID.value)
   })
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     // If the current interceptor is unselectable, select the first selectable one, else null
     watch([() => this.interceptors, this.currentInterceptorID], () => {
       if (!this.currentInterceptorID.value) return

packages/hoppscotch-common/src/services/oauth/oauth.service.ts

@@ -109,10 +109,6 @@ export class OauthAuthService extends Service {
   public static readonly ID = "OAUTH_AUTH_SERVICE"
 
   static redirectURI = `${window.location.origin}/oauth`
-
-  constructor() {
-    super()
-  }
 }
 
 export const generateRandomString = () => {

packages/hoppscotch-common/src/services/persistence/index.ts

@@ -89,10 +89,6 @@ export class PersistenceService extends Service {
 
   public hoppLocalConfigStorage: StorageLike = localStorage
 
-  constructor() {
-    super()
-  }
-
   private showErrorToast(localStorageKey: string) {
     const toast = useToast()
     toast.error(

packages/hoppscotch-common/src/services/secret-environment.service.ts

@@ -27,10 +27,6 @@ export class SecretEnvironmentService extends Service {
    */
   public secretEnvironments = reactive(new Map<string, SecretVariable[]>())
 
-  constructor() {
-    super()
-  }
-
   /**
    * Add a new secret environment.
    * @param id ID of the environment

packages/hoppscotch-common/src/services/spotlight/searchers/base/__tests__/static.searcher.spec.ts

@@ -6,6 +6,7 @@ import {
 import { nextTick, reactive, ref } from "vue"
 import { SpotlightSearcherResult } from "../../.."
 import { TestContainer } from "dioc/testing"
+import { Container } from "dioc"
 
 async function flushPromises() {
   return await new Promise((r) => setTimeout(r))
@@ -32,12 +33,15 @@ describe("StaticSpotlightSearcherService", () => {
         },
       })
 
-      constructor() {
+      // TODO: dioc > v3 does not recommend using constructors, move to onServiceInit
-        super({
+      constructor(c: Container) {
+        super(c, {
           searchFields: ["text"],
           fieldWeights: {},
         })
+      }
 
+      override onServiceInit() {
         this.setDocuments(this.documents)
       }
 
@@ -94,12 +98,15 @@ describe("StaticSpotlightSearcherService", () => {
         },
       })
 
-      constructor() {
+      // TODO: dioc > v3 does not recommend using constructors, move to onServiceInit
-        super({
+      constructor(c: Container) {
+        super(c, {
           searchFields: ["text"],
           fieldWeights: {},
         })
+      }
 
+      override onServiceInit() {
         this.setDocuments(this.documents)
       }
 
@@ -159,12 +166,15 @@ describe("StaticSpotlightSearcherService", () => {
         },
       })
 
-      constructor() {
+      // TODO: dioc > v3 does not recommend using constructors, move to onServiceInit
-        super({
+      constructor(c: Container) {
+        super(c, {
           searchFields: ["text"],
           fieldWeights: {},
         })
+      }
 
+      override onServiceInit() {
         this.setDocuments(this.documents)
       }
 
@@ -224,12 +234,15 @@ describe("StaticSpotlightSearcherService", () => {
         },
       })
 
-      constructor() {
+      // TODO: dioc > v3 does not recommend using constructors, move to onServiceInit
-        super({
+      constructor(c: Container) {
+        super(c, {
           searchFields: ["text"],
           fieldWeights: {},
         })
+      }
 
+      override onServiceInit() {
         this.setDocuments(this.documents)
       }
 
@@ -285,12 +298,15 @@ describe("StaticSpotlightSearcherService", () => {
         },
       })
 
-      constructor() {
+      // TODO: dioc > v3 does not recommend using constructors, move to onServiceInit
-        super({
+      constructor(c: Container) {
+        super(c, {
           searchFields: ["text"],
           fieldWeights: {},
         })
+      }
 
+      override onServiceInit() {
         this.setDocuments(this.documents)
       }
 
@@ -354,12 +370,15 @@ describe("StaticSpotlightSearcherService", () => {
         },
       })
 
-      constructor() {
+      // TODO: dioc > v3 does not recommend using constructors, move to onServiceInit
-        super({
+      constructor(c: Container) {
+        super(c, {
           searchFields: ["text", "alternate"],
           fieldWeights: {},
         })
+      }
 
+      override onServiceInit() {
         this.setDocuments(this.documents)
       }
 

packages/hoppscotch-common/src/services/spotlight/searchers/base/static.searcher.ts

@@ -1,4 +1,4 @@
-import { Service } from "dioc"
+import { Container, Service } from "dioc"
 import {
   type SpotlightSearcher,
   type SpotlightSearcherResult,
@@ -67,8 +67,12 @@ export abstract class StaticSpotlightSearcherService<
 
   private _documents: Record<string, Doc> = {}
 
-  constructor(private opts: StaticSpotlightSearcherOptions<Doc>) {
+  // TODO: This pattern is no longer recommended in dioc > 3, move to something else
-    super()
+  constructor(
+    c: Container,
+    private opts: StaticSpotlightSearcherOptions<Doc>
+  ) {
+    super(c)
 
     this.minisearch = new MiniSearch({
       fields: opts.searchFields as string[],

packages/hoppscotch-common/src/services/spotlight/searchers/collections.searcher.ts

@@ -50,9 +50,7 @@ export class CollectionsSpotlightSearcherService
   private readonly spotlight = this.bind(SpotlightService)
   private readonly workspaceService = this.bind(WorkspaceService)
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     this.spotlight.registerSearcher(this)
   }
 

packages/hoppscotch-common/src/services/spotlight/searchers/environment.searcher.ts

@@ -26,7 +26,7 @@ import IconEdit from "~icons/lucide/edit"
 import IconLayers from "~icons/lucide/layers"
 import IconTrash2 from "~icons/lucide/trash-2"
 
-import { Service } from "dioc"
+import { Container, Service } from "dioc"
 import * as TE from "fp-ts/TaskEither"
 import { pipe } from "fp-ts/function"
 import { cloneDeep } from "lodash-es"
@@ -164,15 +164,18 @@ export class EnvironmentsSpotlightSearcherService extends StaticSpotlightSearche
     },
   })
 
-  constructor() {
+  // TODO: This pattern is no longer recommended in dioc > 3, move to something else
-    super({
+  constructor(c: Container) {
+    super(c, {
       searchFields: ["text", "alternates"],
       fieldWeights: {
         text: 2,
         alternates: 1,
       },
     })
+  }
 
+  override onServiceInit() {
     this.setDocuments(this.documents)
     this.spotlight.registerSearcher(this)
   }
@@ -277,9 +280,7 @@ export class SwitchEnvSpotlightSearcherService
   private readonly workspaceService = this.bind(WorkspaceService)
   private teamEnvironmentList: TeamEnvironment[] = []
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     this.spotlight.registerSearcher(this)
   }
 

packages/hoppscotch-common/src/services/spotlight/searchers/general.searcher.ts

@@ -15,6 +15,7 @@ import IconBook from "~icons/lucide/book"
 import IconLifeBuoy from "~icons/lucide/life-buoy"
 import IconZap from "~icons/lucide/zap"
 import { platform } from "~/platform"
+import { Container } from "dioc"
 
 type Doc = {
   text: string | string[]
@@ -89,15 +90,18 @@ export class GeneralSpotlightSearcherService extends StaticSpotlightSearcherServ
     },
   })
 
-  constructor() {
+  // TODO: This is not recommended as of dioc > 3. Move to onServiceInit instead
-    super({
+  constructor(c: Container) {
+    super(c, {
       searchFields: ["text", "alternates"],
       fieldWeights: {
         text: 2,
         alternates: 1,
       },
     })
+  }
 
+  override onServiceInit() {
     this.setDocuments(this.documents)
     this.spotlight.registerSearcher(this)
   }

packages/hoppscotch-common/src/services/spotlight/searchers/history.searcher.ts

@@ -66,9 +66,7 @@ export class HistorySpotlightSearcherService
     }
   )[0]
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     this.spotlight.registerSearcher(this)
   }
 

packages/hoppscotch-common/src/services/spotlight/searchers/interceptor.searcher.ts

@@ -31,9 +31,7 @@ export class InterceptorSpotlightSearcherService
   private readonly spotlight = this.bind(SpotlightService)
   private interceptorService = this.bind(InterceptorService)
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     this.spotlight.registerSearcher(this)
   }
 

packages/hoppscotch-common/src/services/spotlight/searchers/miscellaneous.searcher.ts

@@ -8,6 +8,7 @@ import {
 } from "./base/static.searcher"
 
 import IconShare from "~icons/lucide/share"
+import { Container } from "dioc"
 
 type Doc = {
   text: string
@@ -39,15 +40,18 @@ export class MiscellaneousSpotlightSearcherService extends StaticSpotlightSearch
     },
   })
 
-  constructor() {
+  // TODO: Constructors are no longer recommended as of dioc > 3, move to onServiceInit
-    super({
+  constructor(c: Container) {
+    super(c, {
       searchFields: ["text", "alternates"],
       fieldWeights: {
         text: 2,
         alternates: 1,
       },
     })
+  }
 
+  override onServiceInit() {
     this.setDocuments(this.documents)
     this.spotlight.registerSearcher(this)
   }

packages/hoppscotch-common/src/services/spotlight/searchers/navigation.searcher.ts

@@ -8,6 +8,7 @@ import {
 } from "./base/static.searcher"
 
 import IconArrowRight from "~icons/lucide/arrow-right"
+import { Container } from "dioc"
 
 type Doc = {
   text: string
@@ -61,15 +62,18 @@ export class NavigationSpotlightSearcherService extends StaticSpotlightSearcherS
 
   private docKeys = Object.keys(this.documents)
 
-  constructor() {
+  // TODO: Constructors are no longer recommended as of dioc > 3, use onServiceInit instead
-    super({
+  constructor(c: Container) {
+    super(c, {
       searchFields: ["text", "alternates"],
       fieldWeights: {
         text: 2,
         alternates: 1,
       },
     })
+  }
 
+  override onServiceInit() {
     this.setDocuments(this.documents)
     this.spotlight.registerSearcher(this)
   }

packages/hoppscotch-common/src/services/spotlight/searchers/request.searcher.ts

@@ -20,6 +20,7 @@ import IconRotateCCW from "~icons/lucide/rotate-ccw"
 import IconSave from "~icons/lucide/save"
 import { GQLOptionTabs } from "~/components/graphql/RequestOptions.vue"
 import { RESTTabService } from "~/services/tab/rest"
+import { Container } from "dioc"
 
 type Doc = {
   text: string | string[]
@@ -224,15 +225,18 @@ export class RequestSpotlightSearcherService extends StaticSpotlightSearcherServ
     },
   })
 
-  constructor() {
+  // TODO: Constructors are no longer recommended as of dioc > 3, use onServiceInit instead
-    super({
+  constructor(c: Container) {
+    super(c, {
       searchFields: ["text", "alternates"],
       fieldWeights: {
         text: 2,
         alternates: 1,
       },
     })
+  }
 
+  override onServiceInit() {
     this.setDocuments(this.documents)
     this.spotlight.registerSearcher(this)
   }

packages/hoppscotch-common/src/services/spotlight/searchers/response.searcher.ts

@@ -9,6 +9,7 @@ import {
 
 import IconDownload from "~icons/lucide/download"
 import IconCopy from "~icons/lucide/copy"
+import { Container } from "dioc"
 
 type Doc = {
   text: string
@@ -56,15 +57,18 @@ export class ResponseSpotlightSearcherService extends StaticSpotlightSearcherSer
     },
   })
 
-  constructor() {
+  // TODO: Constructors are no longer recommended as of dioc > 3, move to onServiceInit
-    super({
+  constructor(c: Container) {
+    super(c, {
       searchFields: ["text", "alternates"],
       fieldWeights: {
         text: 2,
         alternates: 1,
       },
     })
+  }
 
+  override onServiceInit() {
     this.setDocuments(this.documents)
     this.spotlight.registerSearcher(this)
   }

packages/hoppscotch-common/src/services/spotlight/searchers/settings.searcher.ts

@@ -15,6 +15,7 @@ import IconMonitor from "~icons/lucide/monitor"
 import IconMoon from "~icons/lucide/moon"
 import IconSun from "~icons/lucide/sun"
 import IconCheckCircle from "~icons/lucide/check-circle"
+import { Container } from "dioc"
 
 type Doc = {
   text: string | string[]
@@ -100,15 +101,18 @@ export class SettingsSpotlightSearcherService extends StaticSpotlightSearcherSer
     },
   })
 
-  constructor() {
+  // TODO: Constuctors are no longer recommended as of dioc > 3, move to onServiceInit
-    super({
+  constructor(c: Container) {
+    super(c, {
       searchFields: ["text", "alternates"],
       fieldWeights: {
         text: 2,
         alternates: 1,
       },
     })
+  }
 
+  override onServiceInit() {
     this.setDocuments(this.documents)
     this.spotlight.registerSearcher(this)
   }

packages/hoppscotch-common/src/services/spotlight/searchers/tab.searcher.ts

@@ -14,6 +14,7 @@ import IconXSquare from "~icons/lucide/x-square"
 import { invokeAction } from "~/helpers/actions"
 import { RESTTabService } from "~/services/tab/rest"
 import { GQLTabService } from "~/services/tab/graphql"
+import { Container } from "dioc"
 
 type Doc = {
   text: string | string[]
@@ -89,15 +90,18 @@ export class TabSpotlightSearcherService extends StaticSpotlightSearcherService<
     },
   })
 
-  constructor() {
+  // TODO: Constructors are no longer recommended as of dioc > 3, use onServiceInit instead
-    super({
+  constructor(c: Container) {
+    super(c, {
       searchFields: ["text", "alternates"],
       fieldWeights: {
         text: 2,
         alternates: 1,
       },
     })
+  }
 
+  override onServiceInit() {
     this.setDocuments(this.documents)
     this.spotlight.registerSearcher(this)
   }

packages/hoppscotch-common/src/services/spotlight/searchers/teamRequest.searcher.ts

@@ -39,9 +39,7 @@ export class TeamsSpotlightSearcherService
 
   private readonly tabs = this.bind(RESTTabService)
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     this.spotlight.registerSearcher(this)
   }
 

packages/hoppscotch-common/src/services/spotlight/searchers/user.searcher.ts

@@ -9,6 +9,7 @@ import { useStreamStatic } from "~/composables/stream"
 import IconLogin from "~icons/lucide/log-in"
 import IconLogOut from "~icons/lucide/log-out"
 import { activeActions$, invokeAction } from "~/helpers/actions"
+import { Container } from "dioc"
 
 type Doc = {
   text: string
@@ -59,15 +60,18 @@ export class UserSpotlightSearcherService extends StaticSpotlightSearcherService
     },
   })
 
-  constructor() {
+  // TODO: Constructors are no longer recommended as of dioc > 3, move to onServiceInit
-    super({
+  constructor(c: Container) {
+    super(c, {
       searchFields: ["text", "alternates"],
       fieldWeights: {
         text: 2,
         alternates: 1,
       },
     })
+  }
 
+  override onServiceInit(): void {
     this.setDocuments(this.documents)
     this.spotlight.registerSearcher(this)
   }

packages/hoppscotch-common/src/services/spotlight/searchers/workspace.searcher.ts

@@ -21,7 +21,7 @@ import {
   StaticSpotlightSearcherService,
 } from "./base/static.searcher"
 
-import { Service } from "dioc"
+import { Container, Service } from "dioc"
 import * as E from "fp-ts/Either"
 import MiniSearch from "minisearch"
 import IconCheckCircle from "~/components/app/spotlight/entry/IconSelected.vue"
@@ -102,15 +102,18 @@ export class WorkspaceSpotlightSearcherService extends StaticSpotlightSearcherSe
     },
   })
 
-  constructor() {
+  // TODO: Constructors are no longer recommended as of dioc > 3, move to onServiceInit
-    super({
+  constructor(c: Container) {
+    super(c, {
       searchFields: ["text", "alternates"],
       fieldWeights: {
         text: 2,
         alternates: 1,
       },
     })
+  }
 
+  override onServiceInit() {
     this.setDocuments(this.documents)
     this.spotlight.registerSearcher(this)
   }
@@ -166,9 +169,7 @@ export class SwitchWorkspaceSpotlightSearcherService
   private readonly spotlight = this.bind(SpotlightService)
   private readonly workspaceService = this.bind(WorkspaceService)
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     this.spotlight.registerSearcher(this)
   }
 

packages/hoppscotch-common/src/services/tab/__tests__/tab.service.spec.ts

@@ -6,9 +6,7 @@ import { reactive } from "vue"
 class MockTabService extends TabService<{ request: string }> {
   public static readonly ID = "MOCK_TAB_SERVICE"
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     this.tabMap = reactive(
       new Map([
         [

packages/hoppscotch-common/src/services/tab/graphql.ts

@@ -7,9 +7,7 @@ import { computed } from "vue"
 export class GQLTabService extends TabService<HoppGQLDocument> {
   public static readonly ID = "GQL_TAB_SERVICE"
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     this.tabMap.set("test", {
       id: "test",
       document: {

packages/hoppscotch-common/src/services/tab/rest.ts

@@ -7,9 +7,7 @@ import { TabService } from "./tab"
 export class RESTTabService extends TabService<HoppRESTDocument> {
   public static readonly ID = "REST_TAB_SERVICE"
 
-  constructor() {
+  override onServiceInit() {
-    super()
-
     this.tabMap.set("test", {
       id: "test",
       document: {

packages/hoppscotch-common/src/services/workspace.service.ts

@@ -48,8 +48,7 @@ export class WorkspaceService extends Service<WorkspaceServiceEvent> {
       -1
   )
 
-  constructor() {
+  override onServiceInit() {
-    super()
     // Dispose the managed team list adapter when the user logs out
     // and initialize it when the user logs in
     watch(

packages/hoppscotch-selfhost-desktop/package.json

@@ -23,7 +23,7 @@
     "@vueuse/core": "10.5.0",
     "axios": "0.21.4",
     "buffer": "6.0.3",
-    "dioc": "1.0.1",
+    "dioc": "3.0.1",
     "environments.api": "link:@platform/environments/environments.api",
     "event": "link:@tauri-apps/api/event",
     "fp-ts": "2.16.1",

packages/hoppscotch-selfhost-desktop/src/platform/interceptors/native.ts

@@ -138,10 +138,6 @@ export class NativeInterceptorService extends Service implements Interceptor {
 
   public cookieJarService = this.bind(CookieJarService)
 
-  constructor() {
-    super()
-  }
-
   public runRequest(req: any) {
     const processedReq = preProcessRequest(req)
 

pnpm-lock.yaml

@@ -455,8 +455,8 @@ importers:
         specifier: 1.0.0
         version: 1.0.0
       dioc:
-        specifier: 1.0.1
+        specifier: 3.0.1
-        version: 1.0.1(vue@3.3.9(typescript@5.3.2))
+        version: 3.0.1(vue@3.3.9(typescript@5.3.2))
       esprima:
         specifier: 4.0.1
         version: 4.0.1
@@ -923,8 +923,8 @@ importers:
         specifier: 6.0.3
         version: 6.0.3
       dioc:
-        specifier: 1.0.1
+        specifier: 3.0.1
-        version: 1.0.1(vue@3.3.9(typescript@4.9.5))
+        version: 3.0.1(vue@3.3.9(typescript@4.9.5))
       environments.api:
         specifier: link:@platform/environments/environments.api
         version: link:@platform/environments/environments.api
@@ -3511,6 +3511,10 @@ packages:
     resolution: {integrity: sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==}
     engines: {node: '>= 14'}
 
+  '@intlify/message-compiler@10.0.0-alpha.2':
+    resolution: {integrity: sha512-OGwttsMwB2BUzhZLraoAfAqcza5UyLMEU013ort3LbmdE6ke/pFONFyxjNQdmFWzW2K868AIVgwx4zo8lbmhjg==}
+    engines: {node: '>= 16'}
+
   '@intlify/message-compiler@9.2.2':
     resolution: {integrity: sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==}
     engines: {node: '>= 14'}
@@ -3519,14 +3523,14 @@ packages:
     resolution: {integrity: sha512-hwqQXyTnDzAVZ300SU31jO0+3OJbpOdfVU6iBkrmNpS7t2HRnVACo0EwcEXzJa++4EVDreqz5OeqJbt+PeSGGA==}
     engines: {node: '>= 16'}
 
-  '@intlify/message-compiler@9.4.1':
-    resolution: {integrity: sha512-aN2N+dUx320108QhH51Ycd2LEpZ+NKbzyQ2kjjhqMcxhHdxtOnkgdx+MDBhOy/CObwBmhC3Nygzc6hNlfKvPNw==}
-    engines: {node: '>= 16'}
-
   '@intlify/message-compiler@9.8.0':
     resolution: {integrity: sha512-McnYWhcoYmDJvssVu6QGR0shqlkJuL1HHdi5lK7fNqvQqRYaQ4lSLjYmZxwc8tRNMdIe9/KUKfyPxU9M6yCtNQ==}
     engines: {node: '>= 16'}
 
+  '@intlify/shared@10.0.0-alpha.2':
+    resolution: {integrity: sha512-pWlpsC3IqkDuIH/5bNlyyiUbAXYymeNXkznORzPWT3qpAe8MazPOm14wMHGn/wESCdB5b9txQson4+CH0ym1hQ==}
+    engines: {node: '>= 16'}
+
   '@intlify/shared@9.2.2':
     resolution: {integrity: sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==}
     engines: {node: '>= 14'}
@@ -3535,10 +3539,6 @@ packages:
     resolution: {integrity: sha512-RucSPqh8O9FFxlYUysQTerSw0b9HIRpyoN1Zjogpm0qLiHK+lBNSa5sh1nCJ4wSsNcjphzgpLQCyR60GZlRV8g==}
     engines: {node: '>= 16'}
 
-  '@intlify/shared@9.4.1':
-    resolution: {integrity: sha512-A51elBmZWf1FS80inf/32diO9DeXoqg9GR9aUDHFcfHoNDuT46Q+fpPOdj8jiJnSHSBh8E1E+6qWRhAZXdK3Ng==}
-    engines: {node: '>= 16'}
-
   '@intlify/shared@9.8.0':
     resolution: {integrity: sha512-TmgR0RCLjzrSo+W3wT0ALf9851iFMlVI9EYNGeWvZFUQTAJx0bvfsMlPdgVtV1tDNRiAfhkFsMKu6jtUY1ZLKQ==}
     engines: {node: '>= 16'}
@@ -6457,8 +6457,8 @@ packages:
     resolution: {integrity: sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==}
     engines: {node: '>=0.3.1'}
 
-  dioc@1.0.1:
+  dioc@3.0.1:
-    resolution: {integrity: sha512-G3T8ThO2WehWJFrKp687wpXU//WLueJA6t5L7yirhWN/jn7BFNRKwskbJn0LEEd6gqI6rwiQE48f2Zqt5jvYVw==}
+    resolution: {integrity: sha512-LawhI08/B5f5sA6zqrNdtZY9URCjIzmebKVZhmR8lH05HFlx/spAoz4kJ7x1E6pRf/kvWsePSkudv18OR5FT6Q==}
     peerDependencies:
       vue: 3.3.9
     peerDependenciesMeta:
@@ -9163,8 +9163,8 @@ packages:
   no-case@3.0.4:
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
 
-  node-abi@3.60.0:
+  node-abi@3.57.0:
-    resolution: {integrity: sha512-zcGgwoXbzw9NczqbGzAWL/ToDYAxv1V8gL1D67ClbdkIfeeDBbY0GelZtC25ayLvVjr2q2cloHeQV1R0QAWqRQ==}
+    resolution: {integrity: sha512-Dp+A9JWxRaKuHP35H77I4kCKesDy5HUDEmScia2FyncMTOXASMyg251F5PhFoDA5uqBrDDffiLpbqnrZmNXW+g==}
     engines: {node: '>=10'}
 
   node-abort-controller@3.1.1:
@@ -12132,6 +12132,7 @@ packages:
 
   workbox-google-analytics@7.0.0:
     resolution: {integrity: sha512-MEYM1JTn/qiC3DbpvP2BVhyIH+dV/5BjHk756u9VbwuAhu0QHyKscTnisQuz21lfRpOwiS9z4XdqeVAKol0bzg==}
+    deprecated: It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained
 
   workbox-navigation-preload@7.0.0:
     resolution: {integrity: sha512-juWCSrxo/fiMz3RsvDspeSLGmbgC0U9tKqcUPZBCf35s64wlaLXyn2KdHHXVQrb2cqF7I0Hc9siQalainmnXJA==}
@@ -15444,8 +15445,8 @@ snapshots:
 
   '@intlify/bundle-utils@3.4.0(vue-i18n@9.8.0(vue@3.3.9(typescript@5.3.2)))':
     dependencies:
-      '@intlify/message-compiler': 9.4.1
+      '@intlify/message-compiler': 10.0.0-alpha.2
-      '@intlify/shared': 9.4.1
+      '@intlify/shared': 10.0.0-alpha.2
       jsonc-eslint-parser: 1.4.1
       source-map: 0.6.1
       yaml-eslint-parser: 0.3.2
@@ -15498,6 +15499,11 @@ snapshots:
     dependencies:
       '@intlify/shared': 9.2.2
 
+  '@intlify/message-compiler@10.0.0-alpha.2':
+    dependencies:
+      '@intlify/shared': 10.0.0-alpha.2
+      source-map-js: 1.0.2
+
   '@intlify/message-compiler@9.2.2':
     dependencies:
       '@intlify/shared': 9.2.2
@@ -15508,22 +15514,17 @@ snapshots:
       '@intlify/shared': 9.3.0-beta.20
       source-map-js: 1.0.2
 
-  '@intlify/message-compiler@9.4.1':
-    dependencies:
-      '@intlify/shared': 9.4.1
-      source-map-js: 1.0.2
-
   '@intlify/message-compiler@9.8.0':
     dependencies:
       '@intlify/shared': 9.8.0
       source-map-js: 1.0.2
 
+  '@intlify/shared@10.0.0-alpha.2': {}
+
   '@intlify/shared@9.2.2': {}
 
   '@intlify/shared@9.3.0-beta.20': {}
 
-  '@intlify/shared@9.4.1': {}
-
   '@intlify/shared@9.8.0': {}
 
   '@intlify/unplugin-vue-i18n@1.2.0(rollup@3.29.4)(vue-i18n@9.2.2(vue@3.3.9(typescript@4.9.3)))':
@@ -15549,7 +15550,7 @@ snapshots:
   '@intlify/vite-plugin-vue-i18n@6.0.1(vite@4.5.0(@types/node@18.18.8)(sass@1.69.5)(terser@5.27.0))(vue-i18n@9.8.0(vue@3.3.9(typescript@4.9.5)))':
     dependencies:
       '@intlify/bundle-utils': 7.0.0(vue-i18n@9.8.0(vue@3.3.9(typescript@4.9.5)))
-      '@intlify/shared': 9.4.1
+      '@intlify/shared': 10.0.0-alpha.2
       '@rollup/pluginutils': 4.2.1
       debug: 4.3.4(supports-color@9.2.2)
       fast-glob: 3.3.2
@@ -15563,7 +15564,7 @@ snapshots:
   '@intlify/vite-plugin-vue-i18n@7.0.0(vite@4.5.0(@types/node@18.18.8)(sass@1.69.5)(terser@5.27.0))(vue-i18n@9.8.0(vue@3.3.9(typescript@5.3.2)))':
     dependencies:
       '@intlify/bundle-utils': 3.4.0(vue-i18n@9.8.0(vue@3.3.9(typescript@5.3.2)))
-      '@intlify/shared': 9.4.1
+      '@intlify/shared': 10.0.0-alpha.2
       '@rollup/pluginutils': 4.2.1
       debug: 4.3.4(supports-color@9.2.2)
       fast-glob: 3.3.2
@@ -16673,7 +16674,7 @@ snapshots:
 
   '@types/graceful-fs@4.1.5':
     dependencies:
-      '@types/node': 18.18.8
+      '@types/node': 17.0.45
 
   '@types/har-format@1.2.15': {}
 
@@ -19340,13 +19341,13 @@ snapshots:
 
   diff@5.0.0: {}
 
-  dioc@1.0.1(vue@3.3.9(typescript@4.9.5)):
+  dioc@3.0.1(vue@3.3.9(typescript@4.9.5)):
     dependencies:
       rxjs: 7.8.1
     optionalDependencies:
       vue: 3.3.9(typescript@4.9.5)
 
-  dioc@1.0.1(vue@3.3.9(typescript@5.3.2)):
+  dioc@3.0.1(vue@3.3.9(typescript@5.3.2)):
     dependencies:
       rxjs: 7.8.1
     optionalDependencies:
@@ -23232,7 +23233,7 @@ snapshots:
       lower-case: 2.0.2
       tslib: 2.6.2
 
-  node-abi@3.60.0:
+  node-abi@3.57.0:
     dependencies:
       semver: 7.6.0
 
@@ -23808,7 +23809,7 @@ snapshots:
       minimist: 1.2.6
       mkdirp-classic: 0.5.3
       napi-build-utils: 1.0.2
-      node-abi: 3.60.0
+      node-abi: 3.57.0
       pump: 3.0.0
       rc: 1.2.8
       simple-get: 4.0.1