fixup! feat: improve DataSchemaValue handling

lib/src/core/codecs/content_codec.dart

@@ -11,13 +11,13 @@ import '../../scripting_api/data_schema_value.dart';
 abstract class ContentCodec {
   /// Converts an [Object] to its byte representation in the given media type.
   List<int> valueToBytes(
-    DataSchemaValue? value,
+    DataSchemaValue<Object?>? value,
     DataSchema? dataSchema,
     Map<String, String>? parameters,
   );
 
   /// Converts a payload of the given media type to an [Object].
-  DataSchemaValue? bytesToValue(
+  DataSchemaValue<Object?>? bytesToValue(
     List<int> bytes,
     DataSchema? dataSchema,
     Map<String, String>? parameters,

lib/src/core/codecs/text_codec.dart

@@ -11,6 +11,8 @@ import '../../definitions/data_schema.dart';
 import '../../scripting_api/data_schema_value.dart';
 import 'content_codec.dart';
 
+const _utf8Coding = 'utf-8';
+
 /// A [ContentCodec] that encodes and decodes plain text data.
 class TextCodec extends ContentCodec {
   @override
@@ -23,14 +25,16 @@ class TextCodec extends ContentCodec {
       return [];
     }
 
-    final rawValue = value.value;
+    final rawValue = value.value.toString();
 
-    if (rawValue is! String) {
-      throw ArgumentError.value(value);
-    }
+    final coding = parameters.coding;
 
-    // TODO: Support other codings
-    return utf8.encode(rawValue);
+    switch (coding) {
+      case _utf8Coding:
+        return utf8.encode(rawValue);
+      default:
+        throw FormatException('Encountered unsupported text coding $coding');
+    }
   }
 
   @override
@@ -39,13 +43,21 @@ class TextCodec extends ContentCodec {
     DataSchema? dataSchema,
     Map<String, String>? parameters,
   ) {
-    // TODO(JKRhb): Use dataSchema for validation
-
     if (bytes.isEmpty) {
       return null;
     }
 
-    // TODO: Support other codings
-    return DataSchemaValue.fromString(utf8.decoder.convert(bytes));
+    final coding = parameters.coding;
+
+    switch (coding) {
+      case _utf8Coding:
+        return DataSchemaValue.fromString(utf8.decoder.convert(bytes));
+      default:
+        throw FormatException('Encountered unsupported text coding $coding');
+    }
   }
 }
+
+extension _ParametersExtension on Map<String, String>? {
+  String get coding => this?['charset']?.toLowerCase() ?? _utf8Coding;
+}

lib/src/core/content_serdes.dart

@@ -16,7 +16,6 @@ import 'codecs/cbor_codec.dart';
 import 'codecs/codec_media_type.dart';
 import 'codecs/content_codec.dart';
 import 'codecs/json_codec.dart';
-import 'codecs/link_format_codec.dart';
 import 'codecs/text_codec.dart';
 import 'content.dart';
 
@@ -25,7 +24,6 @@ const defaultMediaType = 'application/json';
 
 /// Custom [Exception] that is thrown when Serialization or Deserialization
 /// fails.
-// TODO(JKRhb): Add codecs for text-based media types
 // TODO(JKRhb): Add codecs for XML based media types
 // TODO(JKRhb): Add codecs for Base64 media types
 // TODO(JKRhb): Add codec for OctetStream media type
@@ -54,11 +52,11 @@ class ContentSerdes {
   /// The supported codecs by this [ContentSerdes] object.
   ///
   /// Is initialized with support for JSON, CBOR, and the CoRE Link-Format.
-  final _codecs = {
-    CodecMediaType('application', 'json'): JsonCodec(),
-    CodecMediaType('application', 'cbor'): CborCodec(),
-    CodecMediaType('application', 'link-format'): LinkFormatCodec(),
-    CodecMediaType('text', 'plain'): TextCodec(),
+  final _codecs = <MediaType, ContentCodec>{
+    (type: 'application', subtype: 'json'): JsonCodec(),
+    (type: 'application', subtype: 'cbor'): CborCodec(),
+    (type: 'application', subtype: 'link-format'): TextCodec(),
+    (type: 'text', subtype: 'plain'): TextCodec(),
   };
 
   final Set<String> _offeredMediaTypes = {

lib/src/core/interaction_output.dart

@@ -35,8 +35,7 @@ class InteractionOutput implements scripting_api.InteractionOutput {
   bool _dataUsed = false;
 
   // TODO: Name these fields
-  (bool, scripting_api.DataSchemaValue?) _value =
-      (false, scripting_api.DataSchemaValue.fromNull());
+  (bool, Object?) _value = (false, null);
 
   @override
   Future<ByteBuffer> arrayBuffer() async {
@@ -48,7 +47,7 @@ class InteractionOutput implements scripting_api.InteractionOutput {
   bool get dataUsed => _dataUsed;
 
   @override
-  Future<scripting_api.DataSchemaValue?> value() async {
+  Future<Object?> value() async {
     if (_value.$1) {
       return _value.$2;
     }

lib/src/core/servient.dart

@@ -8,7 +8,6 @@ import 'package:uuid/uuid.dart';
 
 import '../definitions/interaction_affordances/interaction_affordance.dart';
 import '../definitions/thing_description.dart';
-import '../scripting_api/data_schema_value.dart';
 import 'consumed_thing.dart';
 import 'content_serdes.dart';
 import 'credentials/callbacks.dart';
@@ -235,12 +234,12 @@ class Servient {
 
     final value = await contentSerdes.contentToValue(content, null);
 
-    if (value is! ObjectValue) {
+    if (value is! Map<String, Object?>) {
       throw DiscoveryException(
         'Could not parse Thing Description obtained from $url',
       );
     }
 
-    return ThingDescription.fromJson(value.value);
+    return ThingDescription.fromJson(value);
   }
 }

lib/src/core/thing_discovery.dart

@@ -13,7 +13,6 @@ import 'package:multicast_dns/multicast_dns.dart';
 import '../../core.dart';
 import '../../scripting_api.dart' as scripting_api;
 import '../definitions/thing_description.dart';
-import '../scripting_api/data_schema_value.dart';
 import '../scripting_api/discovery/discovery_method.dart';
 import 'content.dart';
 
@@ -107,13 +106,13 @@ class ThingDiscovery extends Stream<ThingDescription>
     DiscoveryContent content,
   ) async {
     final value = await _servient.contentSerdes.contentToValue(content, null);
-    if (value is! ObjectValue) {
+    if (value is! Map<String, Object?>) {
       throw DiscoveryException(
         'Could not parse Thing Description obtained from ${content.sourceUri}',
       );
     }
 
-    return ThingDescription.fromJson(value.value);
+    return ThingDescription.fromJson(value);
   }
 
   Stream<ThingDescription> _discoverDirectly(Uri uri) async* {
@@ -125,16 +124,13 @@ class ThingDiscovery extends Stream<ThingDescription>
   }
 
   Future<List<CoapWebLink>?> _getCoreWebLinks(Content content) async {
-    throw UnimplementedError();
+    final value = await _servient.contentSerdes.contentToValue(content, null);
 
-    // final value = await _servient.contentSerdes.contentToValue(content, null);
-    // if (value is CoapWebLink) {
-    //   return [value];
-    // } else if (value is List<CoapWebLink>) {
-    //   return value;
-    // }
+    if (value is String) {
+      return CoapLinkFormat.parse(value).toList();
+    }
 
-    // return null;
+    return null;
   }
 
   Future<Iterable<Uri>> _filterCoreWebLinks(

lib/src/core/wot.dart

@@ -8,7 +8,6 @@ import 'dart:async';
 
 import '../../scripting_api.dart' as scripting_api;
 import '../definitions/thing_description.dart';
-import '../scripting_api/data_schema_value.dart';
 import '../scripting_api/discovery/discovery_method.dart';
 import 'consumed_thing.dart';
 import 'exposed_thing.dart';
@@ -119,15 +118,15 @@ class WoT implements scripting_api.WoT {
         await consumedDirectoryThing.readProperty('things');
     final rawThingDescriptions = await interactionOutput.value();
 
-    if (rawThingDescriptions is! ArrayValue) {
+    if (rawThingDescriptions is! List<Object?>) {
       throw DiscoveryException(
         'Expected an array of Thing Descriptions but received an '
         'invalid output instead.',
       );
     }
 
     final thingDescriptionStream = Stream.fromIterable(
-      rawThingDescriptions.value.whereType<Map<String, Object?>>(),
+      rawThingDescriptions.whereType<Map<String, Object?>>(),
     ).toThingDescriptionStream();
 
     return ThingDiscoveryProcess(thingDescriptionStream, filter);

lib/src/scripting_api/data_schema_value.dart

@@ -184,3 +184,27 @@ final class ObjectValue extends DataSchemaValue<Map<String, Object?>> {
     return ObjectValue._fromValue(result);
   }
 }
+
+extension NullDataSchemaValueExtension on Null {
+  DataSchemaValue asDataSchemaValue() => DataSchemaValue.fromNull();
+}
+
+extension StringDataSchemaValueExtension on String {
+  DataSchemaValue asDataSchemaValue() => DataSchemaValue.fromString(this);
+}
+
+extension IntegerDataSchemaValueExtension on int {
+  DataSchemaValue asDataSchemaValue() => DataSchemaValue.fromInteger(this);
+}
+
+extension NumberDataSchemaValueExtension on double {
+  DataSchemaValue asDataSchemaValue() => DataSchemaValue.fromNumber(this);
+}
+
+extension ArrayDataSchemaValueExtension on List<Object?> {
+  DataSchemaValue asDataSchemaValue() => DataSchemaValue.fromArray(this);
+}
+
+extension ObjectDataSchemaValueExtension on Map<String, Object?> {
+  DataSchemaValue asDataSchemaValue() => DataSchemaValue.fromObject(this);
+}

lib/src/scripting_api/interaction_input.dart

@@ -64,6 +64,10 @@ final class StreamInput extends InteractionInput {
   final Stream<List<int>> byteStream;
 }
 
+extension NullInteractionInputExtension on Null {
+  InteractionInput asInteractionInput() => InteractionInput.fromNull();
+}
+
 extension StringInteractionInputExtension on String {
   InteractionInput asInteractionInput() => InteractionInput.fromString(this);
 }

lib/src/scripting_api/interaction_output.dart

@@ -8,7 +8,6 @@ import 'dart:typed_data';
 
 import '../definitions/data_schema.dart';
 import '../definitions/form.dart';
-import 'data_schema_value.dart';
 
 /// Exposes the data obtained by Thing interactions.
 ///
@@ -35,5 +34,5 @@ abstract interface class InteractionOutput {
   Future<ByteBuffer> arrayBuffer();
 
   /// The parsed value of the [InteractionOutput].
-  Future<DataSchemaValue?> value();
+  Future<Object?> value();
 }

test/core/content_serdes_test.dart

@@ -29,7 +29,7 @@ void main() {
 
       expect(
         await contentSerdes.contentToValue(testContent1, successfulSchema),
-        DataSchemaValue.tryParse(42),
+        42,
       );
 
       final testContent2 = _getTestContent('42');