Merge pull request #14 from gibahjoe/1.1.x

released 1.1.1

Author: gibahjoe

README.md

@@ -41,7 +41,7 @@ Annotate a dart class with @Openapi() annotation
     additionalProperties:
     AdditionalProperties(pubName: 'petstore_api', pubAuthor: 'Johnny dep'),
     inputSpecFile: 'example/openapi-spec.yaml',
-    generatorName: 'dart',
+    generatorName: Generator.DART2_API,
     outputDirectory: 'api/petstore_api')
 class Example extends OpenapiGeneratorConfig {}
 ```

example/spec/openapi-spec.yaml

@@ -58,8 +58,13 @@ paths:
           in: query
           required: false
           schema:
-            type: integer
-            format: int64
+            type: array
+            items:
+              type: string
+              enum:
+                - IOS
+                - MAC_OS
+                - TV_OS
         - name: offset
           in: query
           required: false

openapi-generator-annotations/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.1.1
+
+- Fixed build issue
+
+## 1.1.0
+
+- Added support for **_dart2-api_** from [dart-ogurets](https://github.com/dart-ogurets/dart-openapi-maven) 
+thanks to [Robert Csakany](https://github.com/robertcsakany)
+- [Breaking change] - Changed generator name to enum
+
 ## 1.0.8
 
 - fixed typo

openapi-generator-annotations/example/example.dart

@@ -4,6 +4,6 @@ import 'package:openapi_generator_annotations/openapi_generator_annotations.dart
     additionalProperties:
         AdditionalProperties(pubName: 'petstore_api', pubAuthor: 'Johnny dep'),
     inputSpecFile: 'example/openapi-spec.yaml',
-    generatorName: 'dart-jaguar',
+    generatorName: Generator.DART_JAGUAR,
     outputDirectory: 'api/petstore_api')
 class Example extends OpenapiGeneratorConfig {}

openapi-generator-annotations/lib/src/openapi_generator_annotations_base.dart

@@ -8,6 +8,11 @@ class Openapi {
   /// --additional-properties
   final AdditionalProperties additionalProperties;
 
+  /// The package of the api. defaults to lib.api
+  ///
+  /// --api-package
+  final String apiPackage;
+
   /// relative path or url to spec file
   ///
   /// -i
@@ -21,7 +26,7 @@ class Openapi {
   /// Generator to use (dart|dart2-api|dart-jaguar|dart-dio)
   ///
   /// -g, --generator-name
-  final String generatorName;
+  final Generator generatorName;
 
   ///  Where to write the generated files (current dir by default)
   ///
@@ -36,20 +41,24 @@ class Openapi {
   /// Skips the default behavior of validating an input specification.
   ///
   /// --skip-validate-spec
-  final bool skipValidateSpec;
+  final bool skipSpecValidation;
 
   /// Tells openapi-generator to always run during the build process
   /// if set to false (the default), openapi-generator will skip processing if the [outputDirectory] already exists
   final bool alwaysRun;
 
+  final Map<String, String> typeMappings;
+
   const Openapi(
       {this.additionalProperties,
       this.overwriteExistingFiles,
-      this.skipValidateSpec = false,
+      this.skipSpecValidation = false,
       this.inputSpecFile,
       this.templateDirectory,
       this.generatorName,
       this.outputDirectory,
+      this.typeMappings,
+      this.apiPackage,
       this.alwaysRun = false});
 }
 
@@ -109,11 +118,14 @@ class AdditionalProperties {
       this.sourceFolder});
 }
 
-class DartJaguarConfig extends AdditionalProperties {
-  final String serialization;
+class JaguarProperties extends AdditionalProperties {
+  /// Choose serialization format JSON or PROTO is supported
+  final SerializationFormat serialization;
+
+  /// Is the null fields should be in the JSON payload
   final bool nullableFields;
 
-  const DartJaguarConfig(
+  const JaguarProperties(
       {this.serialization,
       this.nullableFields,
       bool allowUnicodeIdentifiers = false,
@@ -144,3 +156,46 @@ class DartJaguarConfig extends AdditionalProperties {
             sourceFolder: sourceFolder,
             useEnumExtension: useEnumExtension);
 }
+
+class DioProperties extends AdditionalProperties {
+  /// Choose serialization format JSON or PROTO is supported
+  final DioDateLibrary dateLibrary;
+
+  /// Is the null fields should be in the JSON payload
+  final bool nullableFields;
+
+  const DioProperties(
+      {this.dateLibrary,
+      this.nullableFields,
+      bool allowUnicodeIdentifiers = false,
+      bool ensureUniqueParams = true,
+      bool prependFormOrBodyParameters = false,
+      String pubAuthor,
+      String pubAuthorEmail,
+      String pubDescription,
+      String pubHomepage,
+      String pubName,
+      String pubVersion,
+      bool sortModelPropertiesByRequiredFlag = true,
+      bool sortParamsByRequiredFlag = true,
+      bool useEnumExtension = true,
+      String sourceFolder})
+      : super(
+            allowUnicodeIdentifiers: allowUnicodeIdentifiers,
+            ensureUniqueParams: ensureUniqueParams,
+            prependFormOrBodyParameters: prependFormOrBodyParameters,
+            pubAuthor: pubAuthor,
+            pubAuthorEmail: pubAuthorEmail,
+            pubDescription: pubDescription,
+            pubHomepage: pubHomepage,
+            pubVersion: pubVersion,
+            sortModelPropertiesByRequiredFlag:
+                sortModelPropertiesByRequiredFlag,
+            sortParamsByRequiredFlag: sortParamsByRequiredFlag,
+            sourceFolder: sourceFolder,
+            useEnumExtension: useEnumExtension);
+}
+enum DioDateLibrary { core, timemachine }
+enum SerializationFormat { JSON, PROTO }
+/// The name of the generator to use
+enum Generator { DART, DART_DIO, DART2_API, DART_JAGUAR }

openapi-generator-annotations/pubspec.yaml

@@ -1,12 +1,12 @@
 name: openapi_generator_annotations
 description: Annotation package for openapi_generator https://pub.dev/packages/openapi_generator.
-version: 1.0.8
+version: 1.1.1
 homepage: https://github.com/gibahjoe/openapi-generator-dart
 
 
 environment:
   sdk: '>=2.7.0 <3.0.0'
 
 dev_dependencies:
-  pedantic: ^1.9.0
-  test: ^1.14.3
+  pedantic: ^1.9.2
+  test: ^1.15.3

openapi-generator-cli/.gitignore

@@ -66,7 +66,7 @@ Icon
 Network Trash Folder
 Temporary Items
 .apdisk
-
+target
 ### Windows template
 # Windows thumbnail cache files
 Thumbs.db

openapi-generator-cli/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1.0
+
+- Added support for **_dart2-api_** from [dart-ogurets](https://github.com/dart-ogurets/dart-openapi-maven) 
+thanks to [Robert Csakany](https://github.com/robertcsakany)
+
 ## 1.0.8
 
 - Updated Generator to 4.3.1 [Check here for details](https://github.com/OpenAPITools/openapi-generator)

openapi-generator-cli/example/example.dart

@@ -0,0 +1 @@
+class Example {}