[feature][dart] Add support for uniqueItems/sets (#8375)

* [dart][dart-dio] Add support for set types

* copy `uniqueItems` usage from 2.0 fake spec to `3.0`
* add support for sets in parameters, responses and properties

* Regenerate all other samples

* Fix broken tests due to invalid cast

* Update documentation

* Regenerate samples

* update samples

Co-authored-by: William Cheng <wing328hk@gmail.com>

Author: kuhnroyal

docs/generators/dart-dio.md

@@ -41,8 +41,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 
 | Type/Alias | Instantiated By |
 | ---------- | --------------- |
-|array|List|
-|map|Map|
 
 
 ## LANGUAGE PRIMITIVES

docs/generators/dart-jaguar.md

@@ -36,8 +36,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 
 | Type/Alias | Instantiated By |
 | ---------- | --------------- |
-|array|List|
-|map|Map|
 
 
 ## LANGUAGE PRIMITIVES

docs/generators/dart.md

@@ -34,8 +34,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 
 | Type/Alias | Instantiated By |
 | ---------- | --------------- |
-|array|List|
-|map|Map|
 
 
 ## LANGUAGE PRIMITIVES

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java

@@ -141,14 +141,13 @@ public DartClientCodegen() {
             "double",
             "dynamic"
         );
-        instantiationTypes.put("array", "List");
-        instantiationTypes.put("map", "Map");
 
         typeMapping = new HashMap<>();
         typeMapping.put("Array", "List");
         typeMapping.put("array", "List");
         typeMapping.put("map", "Map");
         typeMapping.put("List", "List");
+        typeMapping.put("set", "Set");
         typeMapping.put("boolean", "bool");
         typeMapping.put("string", "String");
         typeMapping.put("char", "String");
@@ -468,9 +467,10 @@ public String toModelTestFilename(String name) {
 
     @Override
     public String toDefaultValue(Schema schema) {
-        if (ModelUtils.isMapSchema(schema)) {
+        if (ModelUtils.isMapSchema(schema) || ModelUtils.isSet(schema)) {
             return "const {}";
-        } else if (ModelUtils.isArraySchema(schema)) {
+        }
+        if (ModelUtils.isArraySchema(schema)) {
             return "const []";
         }
 
@@ -494,7 +494,8 @@ public String getTypeDeclaration(Schema p) {
         if (ModelUtils.isArraySchema(target)) {
             Schema<?> items = getSchemaItems((ArraySchema) schema);
             return getSchemaType(target) + "<" + getTypeDeclaration(items) + ">";
-        } else if (ModelUtils.isMapSchema(target)) {
+        }
+        if (ModelUtils.isMapSchema(target)) {
             // Note: ModelUtils.isMapSchema(p) returns true when p is a composed schema that also defines
             // additionalproperties: true
             Schema<?> inner = getAdditionalProperties(target);

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java

@@ -127,6 +127,9 @@ protected ImmutableMap.Builder<String, Mustache.Lambda> addMustacheLambdas() {
     public String toDefaultValue(Schema schema) {
         if (schema.getDefault() != null) {
             if (ModelUtils.isArraySchema(schema)) {
+                if (ModelUtils.isSet(schema)) {
+                    return "SetBuilder()";
+                }
                 return "ListBuilder()";
             }
             if (ModelUtils.isMapSchema(schema)) {
@@ -318,6 +321,7 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
                 if (param.isContainer) {
                     final Map<String, Object> serializer = new HashMap<>();
                     serializer.put("isArray", param.isArray);
+                    serializer.put("uniqueItems", param.uniqueItems);
                     serializer.put("isMap", param.isMap);
                     serializer.put("baseType", param.baseType);
                     serializers.add(serializer);
@@ -347,7 +351,8 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
 
             if (op.returnContainer != null) {
                 final Map<String, Object> serializer = new HashMap<>();
-                serializer.put("isArray", Objects.equals("array", op.returnContainer));
+                serializer.put("isArray", Objects.equals("array", op.returnContainer) || Objects.equals("set", op.returnContainer));
+                serializer.put("uniqueItems", op.uniqueItems);
                 serializer.put("isMap", Objects.equals("map", op.returnContainer));
                 serializer.put("baseType", op.returnBaseType);
                 serializers.add(serializer);

modules/openapi-generator/src/main/resources/dart-dio/api.mustache

@@ -69,7 +69,7 @@ class {{classname}} {
 
         {{#isContainer}}
         {{#isArray}}
-        const type = FullType(BuiltList, [FullType({{baseType}})]);
+        const type = FullType(Built{{#uniqueItems}}Built{{/uniqueItems}}{{^uniqueItems}}List{{/uniqueItems}}, [FullType({{baseType}})]);
         final serializedBody = _serializers.serialize({{paramName}}, specifiedType: type);
         {{/isArray}}
         {{#isMap}}
@@ -135,8 +135,7 @@ class {{classname}} {
         {{/returnTypeIsPrimitive}}
         {{/returnSimpleType}}
         {{^returnSimpleType}}
-            const collectionType = {{#isMap}}BuiltMap{{/isMap}}{{^isMap}}BuiltList{{/isMap}};
-            const type = FullType(collectionType, [{{#isMap}}FullType(String), {{/isMap}}FullType({{{returnBaseType}}})]);
+            const type = FullType(Built{{#isMap}}Map{{/isMap}}{{#isArray}}{{#uniqueItems}}Set{{/uniqueItems}}{{^uniqueItems}}List{{/uniqueItems}}{{/isArray}}, [{{#isMap}}FullType(String), {{/isMap}}FullType({{{returnBaseType}}})]);
             final data = _serializers.deserialize(
                 response.data is String
                 ? jsonDecode(response.data as String)

modules/openapi-generator/src/main/resources/dart-dio/serializers.mustache

@@ -18,8 +18,8 @@ part 'serializers.g.dart';
 Serializers serializers = (_$serializers.toBuilder(){{#apiInfo}}{{#apis}}{{#serializers}}
       ..addBuilderFactory(
 {{#isArray}}
-        const FullType(BuiltList, [FullType({{baseType}})]),
-        () => ListBuilder<{{baseType}}>(),
+        const FullType(Built{{#uniqueItems}}Set{{/uniqueItems}}{{^uniqueItems}}List{{/uniqueItems}}, [FullType({{baseType}})]),
+        () => {{#uniqueItems}}Set{{/uniqueItems}}{{^uniqueItems}}List{{/uniqueItems}}Builder<{{baseType}}>(),
 {{/isArray}}
 {{#isMap}}
         const FullType(BuiltMap, [FullType(String), FullType({{baseType}})]),

modules/openapi-generator/src/main/resources/dart2/api.mustache

@@ -187,8 +187,8 @@ class {{{classname}}} {
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       {{#isArray}}
       return (apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}') as List)
-        .map((item) => item as {{{returnBaseType}}})
-        .toList(growable: false);
+        .cast<{{{returnBaseType}}}>()
+        .{{#uniqueItems}}toSet(){{/uniqueItems}}{{^uniqueItems}}toList(growable: false){{/uniqueItems}};
       {{/isArray}}
       {{^isArray}}
         {{#isMap}}

modules/openapi-generator/src/main/resources/dart2/api_client.mustache

@@ -194,6 +194,12 @@ class ApiClient {
               .map((v) => _deserialize(v, newTargetType, growable: growable))
               .toList(growable: true == growable);
           }
+          if (value is Set && (match = _regSet.firstMatch(targetType)) != null) {
+            final newTargetType = match[1];
+            return value
+              .map((v) => _deserialize(v, newTargetType, growable: growable))
+              .toSet();
+          }
           if (value is Map && (match = _regMap.firstMatch(targetType)) != null) {
             final newTargetType = match[1];
             return Map.fromIterables(

modules/openapi-generator/src/main/resources/dart2/apilib.mustache

@@ -26,6 +26,7 @@ const _delimiters = {'csv': ',', 'ssv': ' ', 'tsv': '\t', 'pipes': '|'};
 const _dateEpochMarker = 'epoch';
 final _dateFormatter = DateFormat('yyyy-MM-dd');
 final _regList = RegExp(r'^List<(.*)>$');
+final _regSet = RegExp(r'^Set<(.*)>$');
 final _regMap = RegExp(r'^Map<String,(.*)>$');
 
 ApiClient defaultApiClient = ApiClient();