Update TypeScript serialization wrapper, add new field to DeviceRegis…

…trationBuilder()
cph-cachet · Sep 26, 2024 · 7f1572f · 7f1572f
1 parent 2891f3c
commit 7f1572f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/carp.common/src/commonMain/kotlin/dk/cachet/carp/common/application/devices/AltBeacon.kt b/carp.common/src/commonMain/kotlin/dk/cachet/carp/common/application/devices/AltBeacon.kt
@@ -79,6 +79,7 @@ data class AltBeaconDeviceRegistration(
     val referenceRssi: Short,
     @Required
     override val deviceDisplayName: String? = null, // TODO: We could map known manufacturerId's to display names.
+
     override val additionalSpecifications: String? = null
 ) : DeviceRegistration()
 {
@@ -135,6 +136,7 @@ class AltBeaconDeviceRegistrationBuilder : DeviceRegistrationBuilder<AltBeaconDe
         majorId,
         minorId,
         referenceRssi,
-        deviceDisplayName
+        deviceDisplayName,
+        additionalSpecifications
     )
 }
diff --git a/...ain/kotlin/dk/cachet/carp/common/application/devices/BLESerialNumberDeviceRegistration.kt b/...ain/kotlin/dk/cachet/carp/common/application/devices/BLESerialNumberDeviceRegistration.kt
@@ -42,5 +42,5 @@ class BLESerialNumberDeviceRegistrationBuilder : DeviceRegistrationBuilder<BLESe
     var serialNumber: String = ""
 
     override fun build(): BLESerialNumberDeviceRegistration =
-        BLESerialNumberDeviceRegistration( serialNumber, deviceDisplayName )
+        BLESerialNumberDeviceRegistration( serialNumber, deviceDisplayName, additionalSpecifications )
 }
diff --git a/...mmonMain/kotlin/dk/cachet/carp/common/application/devices/MACAddressDeviceRegistration.kt b/...mmonMain/kotlin/dk/cachet/carp/common/application/devices/MACAddressDeviceRegistration.kt
@@ -31,5 +31,5 @@ class MACAddressDeviceRegistrationBuilder : DeviceRegistrationBuilder<MACAddress
     var macAddress: String = ""
 
     override fun build(): MACAddressDeviceRegistration =
-        MACAddressDeviceRegistration( MACAddress.parse( macAddress ), deviceDisplayName )
+        MACAddressDeviceRegistration( MACAddress.parse( macAddress ), deviceDisplayName, additionalSpecifications )
 }
diff --git a/carp.common/src/commonMain/kotlin/dk/cachet/carp/common/application/devices/Website.kt b/carp.common/src/commonMain/kotlin/dk/cachet/carp/common/application/devices/Website.kt
@@ -75,5 +75,6 @@ class WebsiteDeviceRegistrationBuilder : DeviceRegistrationBuilder<WebsiteDevice
      */
     var userAgent: String = ""
 
-    override fun build(): WebsiteDeviceRegistration = WebsiteDeviceRegistration( url, userAgent, deviceDisplayName )
+    override fun build(): WebsiteDeviceRegistration =
+        WebsiteDeviceRegistration( url, userAgent, deviceDisplayName, additionalSpecifications )
 }
diff --git a/typescript-declarations/carp-kotlinx-serialization/index.ts b/typescript-declarations/carp-kotlinx-serialization/index.ts
@@ -7,7 +7,7 @@ import extendJson from "@cachet/kotlinx-serialization-kotlinx-serialization-json
 // Facade with better method names and type conversions for internal types.
 export namespace kotlinx.serialization
 {
-    export function getSerializer( type: any ) { return type.Companion.m16() }
+    export function getSerializer( type: any ) { return type.Companion.j16() }
 }
 export namespace kotlinx.serialization.json
 {