Remove unnecessary complex types (#7451)

#7290 introduced these types, but during development we switched over to specifying dependencies in type parameters instead of an object. This change meant we no longer needed these `Type` or `ShapeToInstance` types, greatly simplifying the types related to derived state.

apps/browser/src/platform/state/background-derived-state.provider.ts

@@ -3,15 +3,15 @@ import { Observable } from "rxjs";
 import { DeriveDefinition, DerivedState } from "@bitwarden/common/platform/state";
 // eslint-disable-next-line import/no-restricted-paths -- extending this class for this client
 import { DefaultDerivedStateProvider } from "@bitwarden/common/platform/state/implementations/default-derived-state.provider";
-import { ShapeToInstances, Type } from "@bitwarden/common/src/types/state";
+import { DerivedStateDependencies } from "@bitwarden/common/src/types/state";
 
 import { BackgroundDerivedState } from "./background-derived-state";
 
 export class BackgroundDerivedStateProvider extends DefaultDerivedStateProvider {
-  override buildDerivedState<TFrom, TTo, TDeps extends Record<string, Type<unknown>>>(
+  override buildDerivedState<TFrom, TTo, TDeps extends DerivedStateDependencies>(
     parentState$: Observable<TFrom>,
     deriveDefinition: DeriveDefinition<TFrom, TTo, TDeps>,
-    dependencies: ShapeToInstances<TDeps>,
+    dependencies: TDeps,
   ): DerivedState<TTo> {
     return new BackgroundDerivedState(
       parentState$,

apps/browser/src/platform/state/background-derived-state.ts

@@ -9,14 +9,14 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { DeriveDefinition } from "@bitwarden/common/platform/state";
 // eslint-disable-next-line import/no-restricted-paths -- extending this class for this client
 import { DefaultDerivedState } from "@bitwarden/common/platform/state/implementations/default-derived-state";
-import { ShapeToInstances, Type } from "@bitwarden/common/types/state";
+import { DerivedStateDependencies } from "@bitwarden/common/types/state";
 
 import { BrowserApi } from "../browser/browser-api";
 
 export class BackgroundDerivedState<
   TFrom,
   TTo,
-  TDeps extends Record<string, Type<unknown>>,
+  TDeps extends DerivedStateDependencies,
 > extends DefaultDerivedState<TFrom, TTo, TDeps> {
   private portSubscriptions: Map<
     chrome.runtime.Port,
@@ -27,7 +27,7 @@ export class BackgroundDerivedState<
     parentState$: Observable<TFrom>,
     deriveDefinition: DeriveDefinition<TFrom, TTo, TDeps>,
     memoryStorage: AbstractStorageService & ObservableStorageService,
-    dependencies: ShapeToInstances<TDeps>,
+    dependencies: TDeps,
   ) {
     super(parentState$, deriveDefinition, memoryStorage, dependencies);
     const portName = deriveDefinition.buildCacheKey();

apps/browser/src/platform/state/derived-state-service-interactions.spec.ts

@@ -10,7 +10,6 @@ import { Subject, firstValueFrom } from "rxjs";
 import { DeriveDefinition } from "@bitwarden/common/platform/state";
 // eslint-disable-next-line import/no-restricted-paths -- needed to define a derive definition
 import { StateDefinition } from "@bitwarden/common/platform/state/state-definition";
-import { Type } from "@bitwarden/common/types/state";
 
 import { mockPorts } from "../../../spec/mock-port.spec-util";
 
@@ -25,7 +24,7 @@ const deriveDefinition = new DeriveDefinition(stateDefinition, "test", {
 
 describe("foreground background derived state interactions", () => {
   let foreground: ForegroundDerivedState<Date>;
-  let background: BackgroundDerivedState<string, Date, Record<string, Type<unknown>>>;
+  let background: BackgroundDerivedState<string, Date, Record<string, unknown>>;
   let parentState$: Subject<string>;
   let memoryStorage: FakeStorageService;
   const initialParent = "2020-01-01";

apps/browser/src/platform/state/foreground-derived-state.provider.ts

@@ -3,15 +3,15 @@ import { Observable } from "rxjs";
 import { DeriveDefinition, DerivedState } from "@bitwarden/common/platform/state";
 // eslint-disable-next-line import/no-restricted-paths -- extending this class for this client
 import { DefaultDerivedStateProvider } from "@bitwarden/common/platform/state/implementations/default-derived-state.provider";
-import { ShapeToInstances, Type } from "@bitwarden/common/src/types/state";
+import { DerivedStateDependencies } from "@bitwarden/common/src/types/state";
 
 import { ForegroundDerivedState } from "./foreground-derived-state";
 
 export class ForegroundDerivedStateProvider extends DefaultDerivedStateProvider {
-  override buildDerivedState<TFrom, TTo, TDeps extends Record<string, Type<unknown>>>(
+  override buildDerivedState<TFrom, TTo, TDeps extends DerivedStateDependencies>(
     _parentState$: Observable<TFrom>,
     deriveDefinition: DeriveDefinition<TFrom, TTo, TDeps>,
-    _dependencies: ShapeToInstances<TDeps>,
+    _dependencies: TDeps,
   ): DerivedState<TTo> {
     return new ForegroundDerivedState(deriveDefinition);
   }

apps/browser/src/platform/state/foreground-derived-state.ts

@@ -12,7 +12,7 @@ import {
 
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { DeriveDefinition, DerivedState } from "@bitwarden/common/platform/state";
-import { Type } from "@bitwarden/common/types/state";
+import { DerivedStateDependencies } from "@bitwarden/common/types/state";
 
 import { fromChromeEvent } from "../browser/from-chrome-event";
 
@@ -23,9 +23,7 @@ export class ForegroundDerivedState<TTo> implements DerivedState<TTo> {
   private backgroundResponses$: Observable<DerivedStateMessage>;
   state$: Observable<TTo>;
 
-  constructor(
-    private deriveDefinition: DeriveDefinition<unknown, TTo, Record<string, Type<unknown>>>,
-  ) {
+  constructor(private deriveDefinition: DeriveDefinition<unknown, TTo, DerivedStateDependencies>) {
     this.state$ = defer(() => this.initializePort()).pipe(
       filter((message) => message.action === "nextState"),
       map((message) => this.hydrateNext(message.data)),