sdk tweaks (#2791)

* sdk tweaks

* switch back to deeppartial

sdk/base/lib/dependencies/setupDependencies.ts

@@ -1,12 +1,42 @@
 import * as T from "../types"
 import { once } from "../util"
 
-type DependencyType<Manifest extends T.SDKManifest> = {
-  [K in keyof Manifest["dependencies"]]: Omit<T.DependencyRequirement, "id">
-}
+export type RequiredDependenciesOf<Manifest extends T.SDKManifest> = {
+  [K in keyof Manifest["dependencies"]]: Manifest["dependencies"][K]["optional"] extends false
+    ? K
+    : never
+}[keyof Manifest["dependencies"]]
+export type OptionalDependenciesOf<Manifest extends T.SDKManifest> = Exclude<
+  keyof Manifest["dependencies"],
+  RequiredDependenciesOf<Manifest>
+>
+
+type DependencyRequirement =
+  | {
+      kind: "running"
+      healthChecks: Array<T.HealthCheckId>
+      versionRange: string
+    }
+  | {
+      kind: "exists"
+      versionRange: string
+    }
+type Matches<T, U> = T extends U ? (U extends T ? null : never) : never
+const _checkType: Matches<
+  DependencyRequirement & { id: T.PackageId },
+  T.DependencyRequirement
+> = null
+
+export type CurrentDependenciesResult<Manifest extends T.SDKManifest> = {
+  [K in RequiredDependenciesOf<Manifest>]: DependencyRequirement
+} & {
+  [K in OptionalDependenciesOf<Manifest>]?: DependencyRequirement
+} & Record<string, DependencyRequirement>
 
 export function setupDependencies<Manifest extends T.SDKManifest>(
-  fn: (options: { effects: T.Effects }) => Promise<DependencyType<Manifest>>,
+  fn: (options: {
+    effects: T.Effects
+  }) => Promise<CurrentDependenciesResult<Manifest>>,
 ): (options: { effects: T.Effects }) => Promise<null> {
   const cell = { updater: async (_: { effects: T.Effects }) => null }
   cell.updater = async (options: { effects: T.Effects }) => {
@@ -21,7 +51,7 @@ export function setupDependencies<Manifest extends T.SDKManifest>(
       dependencies: Object.entries(dependencyType).map(
         ([id, { versionRange, ...x }, ,]) =>
           ({
-            id,
+            // id,
             ...x,
             versionRange: versionRange.toString(),
           }) as T.DependencyRequirement,