added support for jaguar

Author: gibahjoe

example/lib/openAPiConfig.dart

@@ -7,5 +7,5 @@ import 'package:openapi_generator_annotations/openapi_generator_annotations.dart
         AdditionalProperties(pubName: 'petstore_api', pubAuthor: 'Johnny dep'),
     inputSpecFile: 'spec/openapi-spec.yaml',
     generatorName: 'dart-jaguar',
-    outputDirectory: 'petstore/api')
+    outputDirectory: 'api/petstore_api')
 class OpenapiGeneratorCo extends OpenapiGeneratorConfig {}

example/pubspec.yaml

@@ -21,8 +21,6 @@ dependencies:
     sdk: flutter
   openapi_generator_annotations:
     path: ../openapi-generator-annotations
-  petstore_api:
-    path: petstore/api
 
 
   # The following adds the Cupertino Icons font to your application.

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

@@ -1,50 +1,44 @@
-// TODO: Put public facing types in this file.
-/// Checks if you are awesome. Spoiler: you are.
-class Awesome {
-  bool get isAwesome => true;
-}
-
-abstract class OpenapiGeneratorConfig {
-  Map<String, String> additionalProperties;
-  String inputSpecFile;
-  String generator;
-  String outputDirectory;
-
-  ///  specifies if the existing files should be overwritten during the generation
-  ///  -s, --skip-overwrite
-  bool overwriteExistingFiles;
-}
+/// Config base class
+/// Your annotated class must extend this config class
+abstract class OpenapiGeneratorConfig {}
 
 class Openapi {
-  final String baseUrl;
-
+  /// Additional properties to pass to tge compiler (CSV)
+  /// --additional-properties
   final AdditionalProperties additionalProperties;
+
+  /// relative path or url to spec file
+  /// -i
   final String inputSpecFile;
 
-  /// generator to use (see list command for list)
+  /// Generator to use (see list command for list)
   /// -g, --generator-name
   final String generatorName;
 
-  ///  where to write the generated files (current dir by default)
+  ///  Where to write the generated files (current dir by default)
   ///  -o, --output
   final String outputDirectory;
 
-  ///  specifies if the existing files should be overwritten during the generation
+  ///  Specifies if the existing files should be overwritten during the generation
   ///  -s, --skip-overwrite
   final bool overwriteExistingFiles;
 
   /// Skips the default behavior of validating an input specification.
   /// --skip-validate-spec
-  final bool validateSpec;
+  final bool skipValidateSpec;
+
+  /// 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;
 
   const Openapi(
       {this.additionalProperties,
       this.overwriteExistingFiles,
-      this.validateSpec = true,
+      this.skipValidateSpec = false,
       this.inputSpecFile,
       this.generatorName,
       this.outputDirectory,
-      this.baseUrl});
+      this.alwaysRun = false});
 }
 
 class AdditionalProperties {

openapi-generator-annotations/test/openapi_generator_annotations_test.dart

@@ -3,14 +3,14 @@ import 'package:test/test.dart';
 
 void main() {
   group('A group of tests', () {
-    Awesome awesome;
-
-    setUp(() {
-      awesome = Awesome();
-    });
-
-    test('First Test', () {
-      expect(awesome.isAwesome, isTrue);
-    });
+//    Awesome awesome;
+//
+//    setUp(() {
+//      awesome = Awesome();
+//    });
+//
+//    test('First Test', () {
+//      expect(awesome.isAwesome, isTrue);
+//    });
   });
 }

openapi-generator/bin/main.dart

@@ -1,8 +1,6 @@
 import 'dart:io';
 import 'dart:isolate';
 
-import 'package:openapi_generator/openapi_generator.dart' as openapi_generator;
-
 void main(List<String> arguments) async{
   exitCode = 0; // presume success
 
@@ -13,7 +11,7 @@ void main(List<String> arguments) async{
     print("$binPath exists ===>");
   }
   print(Platform.resolvedExecutable);
-  Process.run('java', ["-jar", "${"${binPath}"}",  ...arguments,])
+  await Process.run('java', ['-jar', "${"${binPath}"}",  ...arguments,])
       .then((ProcessResult pr) {
     print(pr.exitCode);
     print(pr.stdout);

openapi-generator/build.yaml

@@ -6,10 +6,11 @@ targets:
 
 builders:
   openapi_generator:
+#    runs_before: ["jaguarRetrofitBuilder"]
     target: ":openapi_generator"
     import: "package:openapi_generator/src/builder.dart"
     builder_factories: ["openApiClientSdk"]
     build_extensions: {".dart": [".g.part"]}
     auto_apply: dependents
     build_to: cache
-    applies_builders: ["source_gen|combining_builder"]
+    applies_builders: ["source_gen|combining_builder","jaguarRetrofitBuilder"]

openapi-generator/lib/openapi_generator.dart

@@ -84,7 +84,6 @@ class OpenapiGenerator extends GeneratorForAnnotation<Openapi> {
       command =
           '$command$separator--additional-properties=${additionalProperties}';
     }
-    command = '$command$separator-Dcolor';
 
     print(command);
     var binPath = await Isolate.resolvePackageUri(
@@ -104,6 +103,18 @@ class OpenapiGenerator extends GeneratorForAnnotation<Openapi> {
       print(pr.stdout);
       print(pr.stderr);
     });
+
+var c='pub run build_runner build --delete-conflicting-outputs';
+    await Process.run('flutter', ['pub','get'],workingDirectory: '$outputDirectory').then((ProcessResult pr) {
+      print(pr.exitCode);
+      print(pr.stdout);
+      print(pr.stderr);
+    });
+    await Process.run('flutter', c.split(' ').toList(),workingDirectory: '$outputDirectory').then((ProcessResult pr) {
+      print(pr.exitCode);
+      print(pr.stdout);
+      print(pr.stderr);
+    });
     return '';
   }
 
@@ -115,13 +126,6 @@ class OpenapiGenerator extends GeneratorForAnnotation<Openapi> {
   String getMapAsString(Map<dynamic, dynamic> data) {
     return data.entries.map((entry) => '${entry.key}=${entry.value}').join(',');
   }
-
-  AdditionalProperties _reviveAdditionalProperties(ConstantReader read) {
-    var reviveable = read.revive();
-    return AdditionalProperties(
-        allowUnicodeIdentifiers:
-            reviveable.namedArguments['allowUnicodeIdentifiers'].toBoolValue());
-  }
 }
 
 //abstract class RevivableInstance implements ConstantReader {

openapi-generator/lib/src/openapi_generator_runner.dart

@@ -14,6 +14,8 @@ dependencies:
   source_gen: ^0.9.0
   path: ^1.6.4
   cli_util: ^0.1.3+2
+  jaguar_retrofit: ^2.8.8
+  jaguar_serializer: ^2.2.12
   openapi_generator_annotations:
     path: ../openapi-generator-annotations/
 
@@ -22,6 +24,8 @@ dev_dependencies:
   build_config: ^0.4.2
   build_runner: ^1.7.4
   test: ^1.6.0
+  jaguar_retrofit_gen: ^2.8.10
+  jaguar_serializer_cli: ^2.2.8
 
 executables:
   openapi-generator: main

openapi-generator/pubspec.yaml

@@ -1,8 +1,7 @@
-import 'package:openapi_generator/openapi_generator.dart';
 import 'package:test/test.dart';
 
 void main() {
   test('calculate', () {
-    expect(calculate(), 42);
+//    expect(calculate(), 42);
   });
 }