fix: Consume testing version of the source_gen branch to simplify testing.

Nexushunter · Nexushunter · commit 37af696ac90f · 2023-09-19T09:42:23.000-04:00
diff --git a/openapi-generator-annotations/lib/src/openapi_generator_annotations_base.dart b/openapi-generator-annotations/lib/src/openapi_generator_annotations_base.dart
@@ -1,8 +1,11 @@
+library openapi_generator_annotations;
+
 import 'dart:convert';
 import 'dart:io';
 
 import 'package:crypto/crypto.dart';
 import 'package:meta/meta.dart';
+import 'package:source_gen/source_gen.dart';
 
 /// Config base class
 /// Your annotated class must extend this config class
@@ -226,11 +229,6 @@ class RemoteSpec extends InputSpec {
   const RemoteSpec.empty() : this(path: 'http://localhost:8080/');
 
   Uri get url => Uri.parse(path);
-
-  RemoteSpec.fromMap(Map<String, dynamic> map)
-      : headerDelegate =
-            map['headerDelegate'] ?? const RemoteSpecHeaderDelegate(),
-        super.fromMap(map);
 }
 
 /// Default [RemoteSpecHeaderDelegate] used when retrieving a remote OAS spec.
@@ -266,12 +264,6 @@ class AWSRemoteSpecHeaderDelegate extends RemoteSpecHeaderDelegate {
     this.accessKeyId = null,
   }) : super();
 
-  AWSRemoteSpecHeaderDelegate.fromMap(Map<String, dynamic> map)
-      : bucket = map['bucket'],
-        accessKeyId = map['accessKeyId'],
-        secretAccessKey = map['secretAccessKey'],
-        super.fromMap(map);
-
   /// Generates the [header] map used within the GET request.
   ///
   /// Assumes that the user's auth AWS credentials
diff --git a/openapi-generator-annotations/pubspec.yaml b/openapi-generator-annotations/pubspec.yaml
@@ -10,8 +10,16 @@ environment:
 dependencies:
   crypto: '>=3.0.0 <4.0.0'
   meta: '>=1.3.0 <2.0.0'
+  source_gen: 
 
 dev_dependencies:
   test:
   source_gen_test:
   lint:
+
+dependency_overrides:
+  source_gen:
+    git:
+      ref: reviver
+      url: git@github.com:Nexushunter/source_gen.git
+      path: source_gen
diff --git a/openapi-generator-annotations/test/openapi_generator_annotations_test.dart b/openapi-generator-annotations/test/openapi_generator_annotations_test.dart
@@ -91,6 +91,7 @@ void main() {
             expect(remote.path, 'http://localhost:8080/');
             expect(remote.headerDelegate, isA<RemoteSpecHeaderDelegate>());
           });
+
           test('uses path', () {
             final remote = RemoteSpec(path: 'https://example.com/path');
             expect(remote.path, 'https://example.com/path');
@@ -112,7 +113,6 @@ void main() {
               accessKeyId: 'test',
               secretAccessKey: 'test',
             );
-
             test('signs the url correctly', () {
               final now = DateTime.now();
               final actual = delegate.authHeaderContent(
diff --git a/openapi-generator/.gitignore b/openapi-generator/.gitignore
@@ -169,5 +169,6 @@ example/.dart_tool
 
 # Generated test output
 test/specs/test-cached.json
+test/specs/commands-cache.json
 test/specs/localstack
 test/mocks.mocks.dart
diff --git a/openapi-generator/lib/src/extensions/type_methods.dart b/openapi-generator/lib/src/extensions/type_methods.dart
@@ -1,8 +1,6 @@
 import 'dart:mirrors';
 
 import 'package:analyzer/dart/element/type.dart';
-import 'package:openapi_generator/src/utils.dart';
-import 'package:openapi_generator_annotations/openapi_generator_annotations.dart';
 import 'package:source_gen/source_gen.dart' show ConstantReader, TypeChecker;
 
 /// Extension adding the type methods to `ConstantReader`.
@@ -73,99 +71,3 @@ extension TypeMethods on ConstantReader {
     return values[enumIndex];
   }
 }
-
-extension ReadProperty on ConstantReader {
-  T readPropertyOrDefault<T>(String name, T defaultValue) {
-    final v = peek(name);
-    if (v == null) {
-      return defaultValue;
-    }
-
-    if (isA(v, InputSpec)) {
-      final revived = v.revive();
-
-      if (isA(v, RemoteSpec)) {
-        final map = revived.namedArguments;
-        final delegate = map['headerDelegate'];
-        final mapped = <String, dynamic>{
-          'path': convertToPropertyValue(map['path']!),
-        };
-        if (delegate?.isNull ?? true) {
-          return RemoteSpec.fromMap(mapped) as T;
-        } else {
-          final delegateReader = ConstantReader(delegate);
-          if (isA(delegateReader, AWSRemoteSpecHeaderDelegate)) {
-            mapped['headerDelegate'] = AWSRemoteSpecHeaderDelegate.fromMap(
-              delegateReader.revive().namedArguments.map(
-                    (key, value) => MapEntry(
-                      key,
-                      convertToPropertyValue(value),
-                    ),
-                  ),
-            );
-          }
-          return RemoteSpec.fromMap(mapped) as T;
-        }
-      } else {
-        final map = revived.namedArguments.map(
-          (key, value) => MapEntry(
-            key,
-            convertToPropertyValue(value),
-          ),
-        );
-        return InputSpec.fromMap(map) as T;
-      }
-    }
-
-    if (isA(v, AdditionalProperties)) {
-      final map = v.revive().namedArguments.map(
-            (key, value) => MapEntry(
-              key,
-              convertToPropertyValue(value),
-            ),
-          );
-      if (isA(v, DioProperties)) {
-        return DioProperties.fromMap(map) as T;
-      } else if (isA(v, DioAltProperties)) {
-        return DioAltProperties.fromMap(map) as T;
-      } else {
-        return AdditionalProperties.fromMap(map) as T;
-      }
-    }
-
-    if (isA(v, InlineSchemaOptions)) {
-      return InlineSchemaOptions.fromMap(
-        v.revive().namedArguments.map(
-              (key, value) => MapEntry(
-                key,
-                convertToPropertyValue(value),
-              ),
-            ),
-      ) as T;
-    }
-
-    if (isA(v, Map)) {
-      return v.mapValue.map((key, value) => MapEntry(
-          convertToPropertyValue(key!), convertToPropertyValue(value!))) as T;
-    } else if (isA(v, bool)) {
-      return v.boolValue as T;
-    } else if (isA(v, double)) {
-      return v.doubleValue as T;
-    } else if (isA(v, int)) {
-      return v.intValue as T;
-    } else if (isA(v, String)) {
-      return v.stringValue as T;
-    } else if (isA(v, Set)) {
-      return v.setValue.map(convertToPropertyValue) as T;
-    } else if (isA(v, List)) {
-      return v.listValue.map(convertToPropertyValue) as T;
-    } else if (isA(v, Enum)) {
-      return v.enumValue();
-    } else {
-      return defaultValue;
-    }
-  }
-}
-
-bool isA(ConstantReader? v, Type t) =>
-    v?.instanceOf(TypeChecker.fromRuntime(t)) ?? false;
diff --git a/openapi-generator/lib/src/gen_on_spec_changes.dart b/openapi-generator/lib/src/gen_on_spec_changes.dart
@@ -59,23 +59,23 @@ FutureOr<Map<String, dynamic>> loadSpec(
     }
   } else {
     Map<String, String>? headers;
-    if (specConfig.headerDelegate is AWSRemoteSpecHeaderDelegate) {
-      try {
-        headers = (specConfig.headerDelegate as AWSRemoteSpecHeaderDelegate)
-            .header(path: specConfig.url.path);
-      } catch (e, st) {
-        return Future.error(
-          OutputMessage(
-            message: 'failed to generate AWS headers',
-            additionalContext: e,
-            stackTrace: st,
-            level: Level.SEVERE,
-          ),
-        );
-      }
-    } else {
-      headers = specConfig.headerDelegate.header();
-    }
+    // if (specConfig.headerDelegate is AWSRemoteSpecHeaderDelegate) {
+    //   try {
+    //     headers = (specConfig.headerDelegate as AWSRemoteSpecHeaderDelegate)
+    //         .header(path: specConfig.url.path);
+    //   } catch (e, st) {
+    //     return Future.error(
+    //       OutputMessage(
+    //         message: 'failed to generate AWS headers',
+    //         additionalContext: e,
+    //         stackTrace: st,
+    //         level: Level.SEVERE,
+    //       ),
+    //     );
+    //   }
+    // } else {
+    //   headers = specConfig.headerDelegate.header();
+    // }
 
     final resp = await http.get(specConfig.url, headers: headers);
     if (resp.statusCode == 200) {
diff --git a/openapi-generator/lib/src/models/generator_arguments.dart b/openapi-generator/lib/src/models/generator_arguments.dart
@@ -2,10 +2,8 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:logging/logging.dart';
-import 'package:openapi_generator/src/extensions/type_methods.dart';
 import 'package:openapi_generator/src/models/output_message.dart';
 import 'package:openapi_generator_annotations/openapi_generator_annotations.dart';
-import 'package:source_gen/source_gen.dart' as src_gen;
 
 import '../utils.dart';
 
@@ -74,6 +72,7 @@ class GeneratorArguments {
   /// Use the provided spec instead of one located in [Directory.current].
   ///
   /// Default: openapi.(ya?ml) | openapi.json
+  @Deprecated('Use inputSpec instead.')
   String _inputFile;
 
   /// Provides an OAS spec file.
@@ -114,12 +113,12 @@ class GeneratorArguments {
   final InlineSchemaOptions? inlineSchemaOptions;
 
   GeneratorArguments({
-    required src_gen.ConstantReader annotations,
+    required Openapi annotation,
     bool alwaysRun = false,
-    String inputSpecFile = '',
+    String? inputSpecFile,
     InputSpec inputSpec = const InputSpec.empty(),
     String templateDirectory = '',
-    Generator generator = Generator.dart,
+    Generator? generator,
     Map<String, String> typeMapping = const {},
     Map<String, String> importMapping = const {},
     Map<String, String> reservedWordsMapping = const {},
@@ -130,47 +129,39 @@ class GeneratorArguments {
     bool runSourceGen = true,
     String? outputDirectory,
     bool fetchDependencies = true,
-    bool useNextGen = false,
+    bool? useNextGen,
     String? cachePath,
     String? pubspecPath,
     bool isDebug = false,
-  })  : alwaysRun = annotations.readPropertyOrDefault('alwaysRun', alwaysRun),
-        _inputFile =
-            annotations.readPropertyOrDefault('inputSpecFile', inputSpecFile),
-        templateDirectory = annotations.readPropertyOrDefault(
-            'templateDirectory', templateDirectory),
-        generator =
-            annotations.readPropertyOrDefault('generatorName', generator),
-        typeMappings =
-            annotations.readPropertyOrDefault('typeMappings', typeMapping),
-        importMappings =
-            annotations.readPropertyOrDefault('importMappings', importMapping),
-        reservedWordsMappings = annotations.readPropertyOrDefault(
-            'reservedWordsMappings', reservedWordsMapping),
-        inlineSchemaNameMappings = annotations.readPropertyOrDefault(
-            'inlineSchemaNameMappings', inlineSchemaNameMapping),
-        additionalProperties = annotations.readPropertyOrDefault(
-            'additionalProperties', additionalProperties),
-        inlineSchemaOptions = annotations.readPropertyOrDefault(
-            'inlineSchemaOptions', inlineSchemaOptions),
-        skipValidation = annotations.readPropertyOrDefault(
-            'skipSpecValidation', skipValidation),
-        runSourceGen = annotations.readPropertyOrDefault(
-            'runSourceGenOnOutput', runSourceGen),
-        shouldFetchDependencies = annotations.readPropertyOrDefault(
-            'fetchDependencies', fetchDependencies),
-        outputDirectory = annotations.readPropertyOrDefault(
-            'outputDirectory', outputDirectory ?? Directory.current.path),
-        useNextGen =
-            annotations.readPropertyOrDefault('useNextGen', useNextGen),
-        cachePath = annotations.readPropertyOrDefault(
-            'cachePath', cachePath ?? defaultCachedPath),
-        pubspecPath = annotations.readPropertyOrDefault<String>(
-            'projectPubspecPath',
+  })  : alwaysRun = annotation.alwaysRun ?? alwaysRun,
+        _inputFile = inputSpecFile ?? annotation.inputSpecFile,
+        templateDirectory = annotation.templateDirectory ?? templateDirectory,
+        generator = generator ?? annotation.generatorName,
+        typeMappings = annotation.typeMappings ?? typeMapping,
+        importMappings = annotation.importMappings ?? importMapping,
+        reservedWordsMappings =
+            annotation.reservedWordsMappings ?? reservedWordsMapping,
+        inlineSchemaNameMappings =
+            annotation.inlineSchemaNameMappings ?? inlineSchemaNameMapping,
+        additionalProperties =
+            additionalProperties ?? annotation.additionalProperties,
+        inlineSchemaOptions = inlineSchemaOptions,
+        // ?? annotations.readPropertyOrDefault(
+        // 'inlineSchemaOptions', inlineSchemaOptions),
+        skipValidation = annotation.skipSpecValidation ?? skipValidation,
+        runSourceGen = annotation.runSourceGenOnOutput ?? runSourceGen,
+        shouldFetchDependencies =
+            annotation.fetchDependencies ?? fetchDependencies,
+        outputDirectory = annotation.outputDirectory ??
+            outputDirectory ??
+            Directory.current.path,
+        useNextGen = useNextGen ?? annotation.useNextGen,
+        cachePath = cachePath ?? annotation.cachePath ?? defaultCachedPath,
+        pubspecPath = annotation.projectPubspecPath ??
             pubspecPath ??
-                '${Directory.current.path}${Platform.pathSeparator}pubspec.yaml'),
-        isDebug = annotations.readPropertyOrDefault('debugLogging', isDebug),
-        inputSpec = annotations.readPropertyOrDefault('inputSpec', inputSpec);
+            '${Directory.current.path}${Platform.pathSeparator}pubspec.yaml',
+        isDebug = annotation.debugLogging,
+        inputSpec = annotation.inputSpec ?? inputSpec;
 
   /// The stringified name of the [Generator].
   String get generatorName => generator == Generator.dart
diff --git a/openapi-generator/lib/src/openapi_generator_runner.dart b/openapi-generator/lib/src/openapi_generator_runner.dart
@@ -49,13 +49,14 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
         todo: 'Remove the [Openapi] annotation from `$friendlyName`.',
       );
     } else {
-      if (!(annotations.read('useNextGen').literalValue as bool) &&
-          annotations.read('cachePath').literalValue != null) {
+      final apiAnnotation = Reviver(annotations) as annots.Openapi;
+
+      if (!apiAnnotation.useNextGen && apiAnnotation.cachePath != null) {
         throw AssertionError('useNextGen must be set when using cachePath');
       }
       try {
         // Transform the annotations.
-        final args = GeneratorArguments(annotations: annotations);
+        final args = GeneratorArguments(annotation: apiAnnotation);
         // Determine if the project has a dependency on the flutter sdk or not.
         final baseCommand = await runner.checkForFlutterEnvironemt(
                 wrapper: args.wrapper, providedPubspecPath: args.pubspecPath)
diff --git a/openapi-generator/pubspec.yaml b/openapi-generator/pubspec.yaml
@@ -25,3 +25,12 @@ dev_dependencies:
   pedantic:
   coverage: ^1.6.3
   mockito: 
+
+dependency_overrides:
+  openapi_generator_annotations:
+    path: ../openapi-generator-annotations
+  source_gen:
+    git:
+      ref: reviver
+      url: git@github.com:Nexushunter/source_gen.git
+      path: source_gen
diff --git a/openapi-generator/test/command_test.dart b/openapi-generator/test/command_test.dart
diff --git a/openapi-generator/test/generator_arguments_test.dart b/openapi-generator/test/generator_arguments_test.dart
diff --git a/openapi-generator/test/generator_test.dart b/openapi-generator/test/generator_test.dart
diff --git a/openapi-generator/test/specs/next_gen_builder_test_config.dart b/openapi-generator/test/specs/next_gen_builder_test_config.dart
