Merge pull request #29 from bartektartanus/master

Option to use flutter wrapper - fvm or flutterw

Author: gibahjoe

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

@@ -119,6 +119,9 @@ class AdditionalProperties {
   /// Allow the 'x-enum-values' extension for enums
   final bool useEnumExtension;
 
+  /// Flutter wrapper to use (none|flutterw|fvm)
+  final Wrapper wrapper;
+
   const AdditionalProperties(
       {this.allowUnicodeIdentifiers = false,
       this.ensureUniqueParams = true,
@@ -132,7 +135,8 @@ class AdditionalProperties {
       this.pubVersion,
       this.sortModelPropertiesByRequiredFlag = true,
       this.sortParamsByRequiredFlag = true,
-      this.sourceFolder});
+      this.sourceFolder,
+      this.wrapper = Wrapper.none});
 }
 
 class JaguarProperties extends AdditionalProperties {
@@ -220,3 +224,4 @@ enum SerializationFormat { JSON, PROTO }
 
 /// The name of the generator to use
 enum Generator { DART, DART_DIO, DART2_API, DART_JAGUAR }
+enum Wrapper {fvm, flutterw, none}

openapi-generator-annotations/pubspec.yaml

@@ -1,6 +1,6 @@
 name: openapi_generator_annotations
 description: Annotation package for openapi_generator https://pub.dev/packages/openapi_generator.
-version: 2.0.0
+version: 2.1.0
 homepage: https://github.com/gibahjoe/openapi-generator-dart
 
 

openapi-generator-cli/pubspec.yaml

@@ -1,6 +1,6 @@
 name: openapi_generator_cli
 description: A dart wrapper around openapi-generator inspired by the node implementation.
-version: 2.0.0
+version: 2.1.0
 homepage: https://github.com/gibahjoe/openapi-generator-dart
 
 environment:

openapi-generator/lib/src/openapi_generator_runner.dart

@@ -106,7 +106,8 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
       }
 
       if (exitCode == 0) {
-        var installOutput = await Process.run('flutter', ['pub', 'get'],
+        final command = _getCommandWithWrapper('flutter', ['pub', 'get'], annotation);
+        var installOutput = await Process.run(command.executable, command.arguments,
             runInShell: Platform.isWindows,
             workingDirectory: '$outputDirectory');
 
@@ -133,7 +134,7 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
           case annots.Generator.DART_DIO:
           case annots.Generator.DART_JAGUAR:
             try {
-              var runnerOutput = await runSourceGen(outputDirectory);
+              var runnerOutput = await runSourceGen(annotation, outputDirectory);
               print(
                   'OpenapiGenerator :: build runner exited with code ${runnerOutput.exitCode} ::');
             } catch (e) {
@@ -150,11 +151,12 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
     return '';
   }
 
-  Future<ProcessResult> runSourceGen(String outputDirectory) async {
+  Future<ProcessResult> runSourceGen(ConstantReader annotation, String outputDirectory) async {
     print('OpenapiGenerator :: running source code generation ::');
     var c = 'pub run build_runner build --delete-conflicting-outputs';
+    final command = _getCommandWithWrapper('flutter', c.split(' ').toList(), annotation);
     ProcessResult runnerOutput;
-    runnerOutput = await Process.run('flutter', c.split(' ').toList(),
+    runnerOutput = await Process.run(command.executable, command.arguments,
         runInShell: Platform.isWindows, workingDirectory: '$outputDirectory');
     print(runnerOutput.stderr);
     return runnerOutput;
@@ -259,6 +261,19 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
         .join(',');
   }
 
+  Command _getCommandWithWrapper(String command, List<String> arguments, ConstantReader annotation){
+    final wrapper = annotation.read('additionalProperties')?.read('wrapper')?.enumValue<annots.Wrapper>() ?? annots.Wrapper.none;
+    switch(wrapper){
+      case annots.Wrapper.flutterw:
+        return Command('./flutterw', arguments);
+      case annots.Wrapper.fvm:
+        return Command('fvm', [command, ...arguments]);
+      case annots.Wrapper.none:
+      default:
+        return Command(command, arguments);
+    }
+  }
+
   String _readFieldValueAsString(ConstantReader annotation, String fieldName,
       [String defaultValue]) {
     var reader = annotation.read(fieldName);
@@ -280,3 +295,10 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
     return reader.isNull ? defaultValue : reader.boolValue ?? defaultValue;
   }
 }
+
+class Command {
+  final String executable;
+  final List<String> arguments;
+
+  Command(this.executable, this.arguments);
+}

openapi-generator/pubspec.yaml

@@ -1,6 +1,6 @@
 name: openapi_generator
 description: Generator for openapi client sdk inspired by the npm impplementation of openapi-generator-cli.
-version: 2.0.0
+version: 2.1.0
 homepage: https://github.com/gibahjoe/openapi-generator-dart
 
 environment:
@@ -10,9 +10,9 @@ dependencies:
   build: '>=1.3.0 <=1.10.3'
   source_gen: ^0.9.10+1
   path: ^1.7.0
-  openapi_generator_annotations: ^2.0.0
+  openapi_generator_annotations: ^2.1.0
   analyzer: '>=0.40.0 <=0.41.1'
-  openapi_generator_cli: ^2.0.0
+  openapi_generator_cli: ^2.1.0
 
 dev_dependencies:
   pedantic: ^1.9.2