revert to ts-rs v9

core/models/Cargo.toml

@@ -31,7 +31,7 @@ rustls = "0.23"
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_json = "1.0"
 ssh-key = "0.6.2"
-ts-rs = "11"
+ts-rs = "9"
 thiserror = "2.0"
 tokio = { version = "1", features = ["full"] }
 tracing = "0.1.39"

core/startos/Cargo.toml

@@ -135,7 +135,7 @@ id-pool = { version = "0.2.2", default-features = false, features = [
   "u16",
 ] }
 imbl = { version = "6", features = ["serde", "small-chunks"] }
-imbl-value = { version = "0.4.1", features = ["ts-rs"] }
+imbl-value = { version = "0.4.3", features = ["ts-rs"] }
 include_dir = { version = "0.7.3", features = ["metadata"] }
 indexmap = { version = "2.0.2", features = ["serde"] }
 indicatif = { version = "0.17.7", features = ["tokio"] }
@@ -236,7 +236,7 @@ tracing-error = "0.2.0"
 tracing-futures = "0.2.5"
 tracing-journald = "0.3.0"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
-ts-rs = "11.0.1"
+ts-rs = "9.0.1"
 typed-builder = "0.21.0"
 unix-named-pipe = "0.2.0"
 url = { version = "2.4.1", features = ["serde"] }

sdk/base/lib/osBindings/AllPackageData.ts

@@ -2,4 +2,4 @@
 import type { PackageDataEntry } from "./PackageDataEntry"
 import type { PackageId } from "./PackageId"
 
-export type AllPackageData = { [key in PackageId]?: PackageDataEntry }
+export type AllPackageData = { [key: PackageId]: PackageDataEntry }

sdk/base/lib/osBindings/CheckDependenciesResult.ts

@@ -12,6 +12,6 @@ export type CheckDependenciesResult = {
   installedVersion: Version | null
   satisfies: Array<Version>
   isRunning: boolean
-  tasks: { [key in ReplayId]?: TaskEntry }
-  healthChecks: { [key in HealthCheckId]?: NamedHealthCheckResult }
+  tasks: { [key: ReplayId]: TaskEntry }
+  healthChecks: { [key: HealthCheckId]: NamedHealthCheckResult }
 }

sdk/base/lib/osBindings/CurrentDependencies.ts

@@ -2,4 +2,4 @@
 import type { CurrentDependencyInfo } from "./CurrentDependencyInfo"
 import type { PackageId } from "./PackageId"
 
-export type CurrentDependencies = { [key in PackageId]?: CurrentDependencyInfo }
+export type CurrentDependencies = { [key: PackageId]: CurrentDependencyInfo }

sdk/base/lib/osBindings/Dependencies.ts

@@ -2,4 +2,4 @@
 import type { DepInfo } from "./DepInfo"
 import type { PackageId } from "./PackageId"
 
-export type Dependencies = { [key in PackageId]?: DepInfo }
+export type Dependencies = { [key: PackageId]: DepInfo }

sdk/base/lib/osBindings/FullIndex.ts

@@ -10,5 +10,5 @@ export type FullIndex = {
   icon: DataUrl | null
   package: PackageIndex
   os: OsIndex
-  signers: { [key in Guid]?: SignerInfo }
+  signers: { [key: Guid]: SignerInfo }
 }

sdk/base/lib/osBindings/GetPackageResponse.ts

@@ -5,6 +5,6 @@ import type { Version } from "./Version"
 
 export type GetPackageResponse = {
   categories: string[]
-  best: { [key in Version]?: PackageVersionInfo }
-  otherVersions?: { [key in Version]?: PackageInfoShort }
+  best: { [key: Version]: PackageVersionInfo }
+  otherVersions?: { [key: Version]: PackageInfoShort }
 }

sdk/base/lib/osBindings/GetPackageResponseFull.ts

@@ -4,6 +4,6 @@ import type { Version } from "./Version"
 
 export type GetPackageResponseFull = {
   categories: string[]
-  best: { [key in Version]?: PackageVersionInfo }
-  otherVersions: { [key in Version]?: PackageVersionInfo }
+  best: { [key: Version]: PackageVersionInfo }
+  otherVersions: { [key: Version]: PackageVersionInfo }
 }

sdk/base/lib/osBindings/Host.ts

@@ -4,12 +4,12 @@ import type { HostnameInfo } from "./HostnameInfo"
 import type { PublicDomainConfig } from "./PublicDomainConfig"
 
 export type Host = {
-  bindings: { [key in number]?: BindInfo }
+  bindings: { [key: number]: BindInfo }
   onions: string[]
-  publicDomains: { [key in string]?: PublicDomainConfig }
+  publicDomains: { [key: string]: PublicDomainConfig }
   privateDomains: Array<string>
   /**
    * COMPUTED: NetService::update
    */
-  hostnameInfo: { [key in number]?: Array<HostnameInfo> }
+  hostnameInfo: { [key: number]: Array<HostnameInfo> }
 }

sdk/base/lib/osBindings/Hosts.ts

@@ -2,4 +2,4 @@
 import type { Host } from "./Host"
 import type { HostId } from "./HostId"
 
-export type Hosts = { [key in HostId]?: Host }
+export type Hosts = { [key: HostId]: Host }

sdk/base/lib/osBindings/ImageSource.ts

@@ -7,7 +7,7 @@ export type ImageSource =
       dockerBuild: {
         workdir?: string
         dockerfile?: string
-        buildArgs?: { [key in string]?: BuildArg }
+        buildArgs?: { [key: string]: BuildArg }
       }
     }
   | { dockerTag: string }

sdk/base/lib/osBindings/MainStatus.ts

@@ -15,11 +15,11 @@ export type MainStatus =
   | { main: "stopping" }
   | {
       main: "starting"
-      health: { [key in HealthCheckId]?: NamedHealthCheckResult }
+      health: { [key: HealthCheckId]: NamedHealthCheckResult }
     }
   | {
       main: "running"
       started: string
-      health: { [key in HealthCheckId]?: NamedHealthCheckResult }
+      health: { [key: HealthCheckId]: NamedHealthCheckResult }
     }
   | { main: "backingUp"; onComplete: StartStop }

sdk/base/lib/osBindings/Manifest.ts

@@ -26,7 +26,7 @@ export type Manifest = {
   donationUrl: string | null
   docsUrl: string | null
   description: Description
-  images: { [key in ImageId]?: ImageConfig }
+  images: { [key: ImageId]: ImageConfig }
   volumes: Array<VolumeId>
   alerts: Alerts
   dependencies: Dependencies

sdk/base/lib/osBindings/NetworkInfo.ts

@@ -10,7 +10,7 @@ import type { WifiInfo } from "./WifiInfo"
 export type NetworkInfo = {
   wifi: WifiInfo
   host: Host
-  gateways: { [key in GatewayId]?: NetworkInterfaceInfo }
-  acme: { [key in AcmeProvider]?: AcmeSettings }
+  gateways: { [key: GatewayId]: NetworkInterfaceInfo }
+  acme: { [key: AcmeProvider]: AcmeSettings }
   dns: DnsSettings
 }

sdk/base/lib/osBindings/OsVersionInfo.ts

@@ -8,7 +8,7 @@ export type OsVersionInfo = {
   releaseNotes: string
   sourceVersion: string
   authorized: Array<Guid>
-  iso: { [key in string]?: RegistryAsset<Blake3Commitment> }
-  squashfs: { [key in string]?: RegistryAsset<Blake3Commitment> }
-  img: { [key in string]?: RegistryAsset<Blake3Commitment> }
+  iso: { [key: string]: RegistryAsset<Blake3Commitment> }
+  squashfs: { [key: string]: RegistryAsset<Blake3Commitment> }
+  img: { [key: string]: RegistryAsset<Blake3Commitment> }
 }

sdk/base/lib/osBindings/OsVersionInfoMap.ts

@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { OsVersionInfo } from "./OsVersionInfo"
 
-export type OsVersionInfoMap = { [key in string]?: OsVersionInfo }
+export type OsVersionInfoMap = { [key: string]: OsVersionInfo }

sdk/base/lib/osBindings/PackageDataEntry.ts

@@ -20,9 +20,9 @@ export type PackageDataEntry = {
   icon: DataUrl
   lastBackup: string | null
   currentDependencies: CurrentDependencies
-  actions: { [key in ActionId]?: ActionMetadata }
-  tasks: { [key in ReplayId]?: TaskEntry }
-  serviceInterfaces: { [key in ServiceInterfaceId]?: ServiceInterface }
+  actions: { [key: ActionId]: ActionMetadata }
+  tasks: { [key: ReplayId]: TaskEntry }
+  serviceInterfaces: { [key: ServiceInterfaceId]: ServiceInterface }
   hosts: Hosts
   storeExposedDependents: string[]
 }

sdk/base/lib/osBindings/PackageIndex.ts

@@ -4,6 +4,6 @@ import type { PackageId } from "./PackageId"
 import type { PackageInfo } from "./PackageInfo"
 
 export type PackageIndex = {
-  categories: { [key in string]?: Category }
-  packages: { [key in PackageId]?: PackageInfo }
+  categories: { [key: string]: Category }
+  packages: { [key: PackageId]: PackageInfo }
 }

sdk/base/lib/osBindings/PackageInfo.ts

@@ -5,6 +5,6 @@ import type { Version } from "./Version"
 
 export type PackageInfo = {
   authorized: Array<Guid>
-  versions: { [key in Version]?: PackageVersionInfo }
+  versions: { [key: Version]: PackageVersionInfo }
   categories: string[]
 }

sdk/base/lib/osBindings/PackageVersionInfo.ts

@@ -23,7 +23,7 @@ export type PackageVersionInfo = {
   donationUrl: string | null
   docsUrl: string | null
   alerts: Alerts
-  dependencyMetadata: { [key in PackageId]?: DependencyMetadata }
+  dependencyMetadata: { [key: PackageId]: DependencyMetadata }
   osVersion: string
   sdkVersion: string | null
   hardwareRequirements: HardwareRequirements

sdk/base/lib/osBindings/RegistryAsset.ts

@@ -6,5 +6,5 @@ export type RegistryAsset<Commitment> = {
   publishedAt: string
   url: string
   commitment: Commitment
-  signatures: { [key in AnyVerifyingKey]?: AnySignature }
+  signatures: { [key: AnyVerifyingKey]: AnySignature }
 }

sdk/base/lib/osBindings/RegistryInfo.ts

@@ -5,5 +5,5 @@ import type { DataUrl } from "./DataUrl"
 export type RegistryInfo = {
   name: string | null
   icon: DataUrl | null
-  categories: { [key in string]?: Category }
+  categories: { [key: string]: Category }
 }

sdk/base/lib/osBindings/ServerStatus.ts

@@ -4,7 +4,7 @@ import type { FullProgress } from "./FullProgress"
 import type { PackageId } from "./PackageId"
 
 export type ServerStatus = {
-  backupProgress: { [key in PackageId]?: BackupProgress } | null
+  backupProgress: { [key: PackageId]: BackupProgress } | null
   updated: boolean
   updateProgress: FullProgress | null
   shuttingDown: boolean

sdk/base/lib/osBindings/Sessions.ts

@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Session } from "./Session"
 
-export type Sessions = { [key in string]?: Session }
+export type Sessions = { [key: string]: Session }