closer

Author: kevmoo

functions_framework_builder/lib/builder.dart

@@ -22,7 +22,7 @@
 /// details, and `build.yaml` for how this builder is configured by default.
 library;
 
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:build/build.dart';
 import 'package:dart_style/dart_style.dart';
 import 'package:functions_framework/functions_framework.dart';
@@ -53,7 +53,7 @@ class _FunctionsFrameworkBuilder implements Builder {
 
     for (var annotatedElement in _fromLibrary(libraryElement)) {
       final element = annotatedElement.element;
-      if (element is! FunctionElement || element.isPrivate) {
+      if (element is! TopLevelFunctionElement || element.isPrivate) {
         throw InvalidGenerationSourceError(
           'Only top-level, public functions are supported.',
           element: element,
@@ -63,7 +63,7 @@ class _FunctionsFrameworkBuilder implements Builder {
       final targetReader = annotatedElement.annotation.read('target');
 
       final targetName = targetReader.isNull
-          ? element.name
+          ? element.name3!
           : targetReader.stringValue;
 
       if (entries.containsKey(targetName)) {
@@ -138,13 +138,14 @@ ${cases.join('\n')}
   }
 }
 
-Iterable<AnnotatedElement> _fromLibrary(LibraryElement library) sync* {
+Iterable<AnnotatedElement> _fromLibrary(LibraryElement2 library) sync* {
   // Merging the `topLevelElements` picks up private elements and fields.
   // While neither is supported, it allows us to provide helpful errors if devs
   // are using the annotations incorrectly.
-  final mergedElements = {
-    ...library.topLevelElements,
-    ...library.exportNamespace.definedNames.values,
+  final mergedElements = <Element2>{
+    ...library.topLevelFunctions,
+    ...library.topLevelVariables,
+    ...library.exportNamespace.definedNames2.values,
   };
 
   for (var element in mergedElements) {

functions_framework_builder/lib/src/function_type_validator.dart

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:build/build.dart';
 import 'package:source_gen/source_gen.dart';
 
@@ -25,9 +25,9 @@ class FunctionTypeValidator {
   FunctionTypeValidator._(this._types);
 
   FactoryData validate(
-    LibraryElement library,
+    LibraryElement2 library,
     String targetName,
-    FunctionElement element,
+    TopLevelFunctionElement element,
   ) {
     for (var type in _types) {
       final reference = type.createReference(library, targetName, element);

functions_framework_builder/lib/src/generic_function_type.dart

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:build/build.dart';
 import 'package:source_gen/source_gen.dart';
@@ -72,15 +73,15 @@ class GenericFunctionType implements SupportedFunctionType {
 
   @override
   FactoryData? createReference(
-    LibraryElement library,
+    LibraryElement2 library,
     String targetName,
-    FunctionElement element,
+    TopLevelFunctionElement element,
   ) {
-    if (element.parameters.isEmpty) {
+    if (element.formalParameters.isEmpty) {
       return null;
     }
 
-    final firstParamType = element.parameters.first.type;
+    final firstParamType = element.formalParameters.first.type;
 
     final paramInfo = validJsonParamType(firstParamType);
 
@@ -106,8 +107,8 @@ class GenericFunctionType implements SupportedFunctionType {
           // TODO: add a test for this!
           throw InvalidGenerationSourceError(
             'The type `${paramInfo.paramType!.element.name}` is not exposed '
-            'by the function library `${library.source.uri}` so it cannot '
-            'be used.',
+            'by the function library `${library.firstFragment.source.uri}` so '
+            'it cannot be used.',
           );
         }
       }
@@ -117,7 +118,7 @@ class GenericFunctionType implements SupportedFunctionType {
         returnKind == JsonReturnKind.isVoid,
         paramInfo,
         escapeDartString(targetName),
-        '$functionsLibraryPrefix.${element.name}',
+        '$functionsLibraryPrefix.${element.name3}',
       );
     }
     return null;

functions_framework_builder/lib/src/supported_function_type.dart

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:build/build.dart';
@@ -64,15 +65,15 @@ class SupportedFunctionType {
   }
 
   FactoryData? createReference(
-    LibraryElement library,
+    LibraryElement2 library,
     String targetName,
-    FunctionElement element,
+    TopLevelFunctionElement element,
   ) {
-    if (element.library.typeSystem.isSubtypeOf(element.type, _type)) {
+    if (element.library2.typeSystem.isSubtypeOf(element.type, _type)) {
       return _TrivialFactoryData(
         escapeDartString(targetName),
         '$_constructor('
-        '$functionsLibraryPrefix.${element.name},)',
+        '$functionsLibraryPrefix.${element.name3},)',
       );
     }
     return null;

functions_framework_builder/pubspec.yaml

@@ -8,7 +8,7 @@ environment:
   sdk: ^3.8.0
 
 dependencies:
-  analyzer: '>=6.9.0 <8.0.0'
+  analyzer: ^7.5.0
   build: ^3.0.0
   build_config: ^1.0.0
   collection: ^1.17.0

integration_test/test/cloud_behavior_test.dart

@@ -58,7 +58,7 @@ void main() {
         cloudLoggingMiddleware(_projectId),
       ),
       zoneSpecification: ZoneSpecification(
-        print: (_, __, ___, line) => lines.add(line),
+        print: (_, _, _, line) => lines.add(line),
       ),
     );