Fix/dynamite/numbers

packages/dynamite/dynamite/lib/src/builder/imports.dart

@@ -16,8 +16,9 @@ List<Spec> generateImports(final AssetId outputId) => [
       Directive.import('package:built_value/serializer.dart'),
       Directive.import('package:built_value/standard_json_plugin.dart'),
       Directive.import('package:collection/collection.dart'),
-      Directive.import('package:dynamite_runtime/content_string.dart'),
+      Directive.import('package:dynamite_runtime/built_value.dart'),
       Directive.import('package:dynamite_runtime/http_client.dart'),
+      Directive.import('package:dynamite_runtime/models.dart'),
       Directive.import('package:dynamite_runtime/utils.dart'),
       Directive.import('package:meta/meta.dart'),
       Directive.import('package:universal_io/io.dart'),

packages/dynamite/dynamite/lib/src/builder/resolve_object.dart

@@ -29,7 +29,7 @@ TypeResultObject resolveObject(
         final result = resolveType(
           spec,
           state,
-          propertySchema.type!,
+          propertySchema.type!.name,
           propertySchema,
         );
         defaults.add('..${toDartName(property.key)} = ${valueToEscapedValue(result, value)}');

packages/dynamite/dynamite/lib/src/builder/resolve_type.dart

@@ -60,35 +60,42 @@ TypeResult resolveType(
     );
   } else {
     switch (schema.type) {
-      case 'boolean':
+      case openapi.SchemaType.boolean:
         result = TypeResultBase(
           'bool',
           nullable: nullable,
         );
-      case 'integer':
+      case openapi.SchemaType.integer:
         result = TypeResultBase(
           'int',
           nullable: nullable,
         );
-      case 'number':
-        result = TypeResultBase(
-          'num',
-          nullable: nullable,
-        );
-      case 'string':
-        switch (schema.format) {
-          case 'binary':
-            result = TypeResultBase(
+
+      case openapi.SchemaType.number:
+        result = switch (schema.format) {
+          'float' || 'double' => TypeResultBase(
+              'double',
+              nullable: nullable,
+            ),
+          _ => TypeResultBase(
+              'num',
+              nullable: nullable,
+            ),
+        };
+
+      case openapi.SchemaType.string:
+        result = switch (schema.format) {
+          'binary' => TypeResultBase(
               'Uint8List',
               nullable: nullable,
-            );
-        }
+            ),
+          _ => TypeResultBase(
+              'String',
+              nullable: nullable,
+            ),
+        };
 
-        result = TypeResultBase(
-          'String',
-          nullable: nullable,
-        );
-      case 'array':
+      case openapi.SchemaType.array:
         if (schema.items != null) {
           final subResult = resolveType(
             spec,
@@ -108,7 +115,7 @@ TypeResult resolveType(
             nullable: nullable,
           );
         }
-      case 'object':
+      case openapi.SchemaType.object:
         if (schema.properties == null) {
           if (schema.additionalProperties == null) {
             result = TypeResultBase(

packages/dynamite/dynamite/lib/src/builder/serializer.dart

@@ -14,7 +14,7 @@ List<Spec> buildSerializer(final State state) {
       const Code(').build();'),
       const Code(''),
       const Code(
-        'final Serializers _jsonSerializers = (_serializers.toBuilder()..addPlugin(StandardJsonPlugin())..addPlugin(const ContentStringPlugin())).build();',
+        'final Serializers _jsonSerializers = (_serializers.toBuilder()..add(DynamiteDoubleSerializer())..addPlugin(StandardJsonPlugin())..addPlugin(const ContentStringPlugin())).build();',
       ),
       const Code('// coverage:ignore-end'),
     ];

packages/dynamite/dynamite/lib/src/models/openapi/schema.dart

@@ -3,6 +3,7 @@ import 'package:built_value/built_value.dart';
 import 'package:built_value/json_object.dart';
 import 'package:built_value/serializer.dart';
 import 'package:dynamite/src/helpers/docs.dart';
+import 'package:dynamite/src/models/exceptions.dart';
 import 'package:dynamite/src/models/openapi/discriminator.dart';
 
 part 'schema.g.dart';
@@ -30,7 +31,7 @@ abstract class Schema implements Built<Schema, SchemaBuilder> {
 
   bool get deprecated;
 
-  String? get type;
+  SchemaType? get type;
 
   String? get format;
 
@@ -62,7 +63,8 @@ abstract class Schema implements Built<Schema, SchemaBuilder> {
 
   bool get nullable;
 
-  bool get isContentString => type == 'string' && (contentMediaType?.isNotEmpty ?? false) && contentSchema != null;
+  bool get isContentString =>
+      type == SchemaType.string && (contentMediaType?.isNotEmpty ?? false) && contentSchema != null;
 
   Iterable<String> get formattedDescription => descriptionToDocs(description);
 
@@ -71,5 +73,37 @@ abstract class Schema implements Built<Schema, SchemaBuilder> {
     b
       ..deprecated ??= false
       ..nullable ??= false;
+
+    const allowedNumberFormats = [null, 'float', 'double'];
+    if (b.type == SchemaType.number && !allowedNumberFormats.contains(b.format)) {
+      throw OpenAPISpecError('Format "${b.format}" is not allowed for ${b.type}. Use one of $allowedNumberFormats.');
+    }
+    const allowedIntegerFormats = [null, 'int32', 'int64'];
+    if (b.type == SchemaType.integer) {
+      if (!allowedIntegerFormats.contains(b.format)) {
+        throw OpenAPISpecError('Format "${b.format}" is not allowed for ${b.type}. Use one of $allowedIntegerFormats.');
+      } else if (b.format != null) {
+        print(
+          'All integers are represented as `int` meaning 64bit precision in the VM/wasm and 53bit precision on js.',
+        );
+      }
+    }
   }
 }
+
+class SchemaType extends EnumClass {
+  const SchemaType._(super.name);
+
+  static const SchemaType boolean = _$schemaTypeBoolean;
+  static const SchemaType integer = _$schemaTypeInteger;
+  static const SchemaType number = _$schemaTypeNumber;
+  static const SchemaType string = _$schemaTypeString;
+  static const SchemaType array = _$schemaTypeArray;
+  static const SchemaType object = _$schemaTypeObject;
+
+  static BuiltSet<SchemaType> get values => _$schemaTypeValues;
+
+  static SchemaType valueOf(final String name) => _$schemaType(name);
+
+  static Serializer<SchemaType> get serializer => _$schemaTypeSerializer;
+}

packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.dart

@@ -7,7 +7,7 @@ import 'package:built_value/built_value.dart';
 import 'package:built_value/json_object.dart';
 import 'package:built_value/serializer.dart';
 import 'package:built_value/standard_json_plugin.dart';
-import 'package:dynamite_runtime/content_string.dart';
+import 'package:dynamite_runtime/built_value.dart';
 import 'package:dynamite_runtime/http_client.dart';
 
 part 'nested_ofs.openapi.g.dart';
@@ -521,6 +521,7 @@ final Serializers _serializers = (Serializers().toBuilder()
     .build();
 
 final Serializers _jsonSerializers = (_serializers.toBuilder()
+      ..add(DynamiteDoubleSerializer())
       ..addPlugin(StandardJsonPlugin())
       ..addPlugin(const ContentStringPlugin()))
     .build();

packages/dynamite/dynamite_runtime/lib/built_value.dart

@@ -0,0 +1,2 @@
+export 'src/built_value/content_string_serializer.dart';
+export 'src/built_value/double_serializer.dart';

packages/dynamite/dynamite_runtime/lib/models.dart

@@ -0,0 +1 @@
+export 'src/models/content_string.dart';

packages/dynamite/dynamite_runtime/lib/src/content_string.dart → packages/dynamite/dynamite_runtime/lib/src/built_value/content_string_serializer.dart

@@ -1,22 +1,7 @@
 import 'dart:convert';
 
-import 'package:built_value/built_value.dart';
 import 'package:built_value/serializer.dart';
-
-part 'content_string.g.dart';
-
-/// Json data encoded in a `String` as defined by [json-schema](https://json-schema.org/understanding-json-schema/reference/non_json_data.html#contentschema).
-abstract class ContentString<T> implements Built<ContentString<T>, ContentStringBuilder<T>> {
-  /// Creates a new content `String`.
-  factory ContentString([final void Function(ContentStringBuilder<T>)? b]) = _$ContentString<T>;
-  const ContentString._();
-
-  /// The decoded value of the content `String`.
-  T get content;
-
-  /// The serializer for a content `String`.
-  static Serializer<ContentString<Object?>> get serializer => _$contentStringSerializer;
-}
+import 'package:dynamite_runtime/src/models/content_string.dart';
 
 /// Serialization plugin for decoding [ContentString]s.
 ///

packages/dynamite/dynamite_runtime/lib/src/built_value/double_serializer.dart

@@ -0,0 +1,48 @@
+import 'package:built_collection/built_collection.dart';
+import 'package:built_value/serializer.dart';
+
+/// A built_value serializer for `double` values that does not accept integers.
+class DynamiteDoubleSerializer implements PrimitiveSerializer<double> {
+  // Constant names match those in [double].
+  static const String _nan = 'NaN';
+  static const String _infinity = 'INF';
+  static const String _negativeInfinity = '-INF';
+
+  @override
+  final Iterable<Type> types = BuiltList<Type>([double]);
+
+  @override
+  final String wireName = 'double';
+
+  @override
+  Object serialize(
+    final Serializers serializers,
+    final double aDouble, {
+    final FullType specifiedType = FullType.unspecified,
+  }) {
+    if (aDouble.isNaN) {
+      return _nan;
+    } else if (aDouble.isInfinite) {
+      return aDouble.isNegative ? _negativeInfinity : _infinity;
+    } else {
+      return aDouble;
+    }
+  }
+
+  @override
+  double deserialize(
+    final Serializers serializers,
+    final Object serialized, {
+    final FullType specifiedType = FullType.unspecified,
+  }) {
+    if (serialized == _nan) {
+      return double.nan;
+    } else if (serialized == _negativeInfinity) {
+      return double.negativeInfinity;
+    } else if (serialized == _infinity) {
+      return double.infinity;
+    } else {
+      return serialized as double;
+    }
+  }
+}

packages/dynamite/dynamite_runtime/lib/src/models/content_string.dart

@@ -0,0 +1,17 @@
+import 'package:built_value/built_value.dart';
+import 'package:built_value/serializer.dart';
+
+part 'content_string.g.dart';
+
+/// Json data encoded in a `String` as defined by [json-schema](https://json-schema.org/understanding-json-schema/reference/non_json_data.html#contentschema).
+abstract class ContentString<T> implements Built<ContentString<T>, ContentStringBuilder<T>> {
+  /// Creates a new content `String`.
+  factory ContentString([final void Function(ContentStringBuilder<T>)? b]) = _$ContentString<T>;
+  const ContentString._();
+
+  /// The decoded value of the content `String`.
+  T get content;
+
+  /// The serializer for a content `String`.
+  static Serializer<ContentString<Object?>> get serializer => _$contentStringSerializer;
+}