@@ -339,11 +339,12 @@ class SchemaAnalyzer {
339339 isNullable: false ,
340340 pattern: schemas.patternPropertiesSchemas.keys.firstOrNull,
341341 );
342- final additionalPropertiesType = additionalPropertiesSchema.type;
342+ final (additionalPropertiesType, additionalNullable) =
343+ additionalPropertiesSchema.typeAndNullable;
343344 switch (additionalPropertiesType) {
344345 case SchemaType .array:
345346 final items = additionalPropertiesSchema.items;
346- final itemType = items.type ;
347+ final ( itemType, itemNullable) = items.typeAndNullable ;
347348 switch (itemType) {
348349 case SchemaType .object:
349350 _analyzeClass (items);
@@ -353,9 +354,9 @@ class SchemaAnalyzer {
353354 valueType: ListDartType (
354355 itemType: ClassDartType (
355356 classInfo: itemClass,
356- isNullable: false ,
357+ isNullable: itemNullable ,
357358 ),
358- isNullable: false ,
359+ isNullable: additionalNullable ,
359360 ),
360361 isNullable: isNullable,
361362 );
@@ -370,15 +371,18 @@ class SchemaAnalyzer {
370371 final clazz = _classes[additionalPropertiesSchema.className]! ;
371372 dartType = MapDartType (
372373 keyType: keyDartType,
373- valueType: ClassDartType (classInfo: clazz, isNullable: false ),
374+ valueType: ClassDartType (
375+ classInfo: clazz,
376+ isNullable: additionalNullable,
377+ ),
374378 isNullable: isNullable,
375379 );
376380 } else {
377381 dartType = MapDartType (
378382 keyType: keyDartType,
379- valueType: const MapDartType (
380- valueType: ObjectDartType (isNullable: true ),
381- isNullable: false ,
383+ valueType: MapDartType (
384+ valueType: const ObjectDartType (isNullable: true ),
385+ isNullable: additionalNullable ,
382386 ),
383387 isNullable: isNullable,
384388 );
@@ -431,13 +435,13 @@ class SchemaAnalyzer {
431435 case SchemaType .string:
432436 dartType = MapDartType (
433437 keyType: keyDartType,
434- valueType: const StringDartType (isNullable: false ),
438+ valueType: StringDartType (isNullable: additionalNullable ),
435439 isNullable: isNullable,
436440 );
437441 case SchemaType .integer:
438442 dartType = MapDartType (
439443 keyType: keyDartType,
440- valueType: const IntDartType (isNullable: false ),
444+ valueType: IntDartType (isNullable: additionalNullable ),
441445 isNullable: isNullable,
442446 );
443447 default :
0 commit comments