Remove @CloudFunction and related codegen

dartfn/templates/cloudevent/README.md

@@ -8,17 +8,7 @@ producer. They generally perform some work and print output for logging.
 The basic shape of the function handler looks like this:
 
 ```dart
-@CloudFunction()
-void function(CloudEvent event, RequestContext context) {
-}
-```
-
-Or like this if it needs to perform work that will complete sometime in the
-future:
-
-```dart
-@CloudFunction()
-FutureOr<void> function(CloudEvent event, RequestContext context) async {
+Future<void> function(CloudEvent event, RequestContext context) async {
 }
 ```
 
@@ -34,8 +24,7 @@ import 'package:functions_framework/functions_framework.dart';
 
 const _encoder = JsonEncoder.withIndent(' ');
 
-@CloudFunction()
-void function(CloudEvent event, RequestContext context) {
+Future<void> function(CloudEvent event, RequestContext context) async {
   context.logger.info('event subject: ${event.subject}');
   stderr.writeln(_encoder.convert(event));
 }

dartfn/templates/cloudevent/bin/server.dart

@@ -1,4 +1,3 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
 // Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,8 +20,6 @@ Future<void> main(List<String> args) async {
 }
 
 FunctionTarget? _nameToFunctionTarget(String name) => switch (name) {
-      'function' => FunctionTarget.cloudEventWithContext(
-          function_library.function,
-        ),
-      _ => null
-    };
+  'function' => FunctionTarget.cloudEventWithContext(function_library.function),
+  _ => null,
+};

dartfn/templates/cloudevent/lib/functions.dart

@@ -5,16 +5,11 @@ import 'package:functions_framework/functions_framework.dart';
 
 const _encoder = JsonEncoder();
 
-@CloudFunction()
-void function(CloudEvent event, RequestContext context) {
-  context.logger
-      .info('[CloudEvent] source: ${event.source}, subject: ${event.subject}');
+Future<void> function(CloudEvent event, RequestContext context) async {
+  context.logger.info(
+    '[CloudEvent] source: ${event.source}, subject: ${event.subject}',
+  );
   stderr.writeln(
-    _encoder.convert(
-      {
-        'message': event,
-        'severity': LogSeverity.info,
-      },
-    ),
+    _encoder.convert({'message': event, 'severity': LogSeverity.info}),
   );
 }

dartfn/templates/cloudevent/pubspec.yaml

@@ -13,7 +13,6 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^2.0.0
-  functions_framework_builder: ^0.4.1
   http: ^1.0.0
   dart_flutter_team_lints: ^3.0.0
   test: ^1.16.6

dartfn/templates/helloworld/README.md

@@ -4,11 +4,9 @@ This example handles HTTP GET requests by responding with 'Hello, World!'.
 
 ```dart
 // lib/functions.dart
-import 'package:functions_framework/functions_framework.dart';
 import 'package:shelf/shelf.dart';
 
-@CloudFunction()
-Response function(Request request) => Response.ok('Hello, World!');
+Future<Response> function(Request request) async => Response.ok('Hello, World!');
 ```
 
 ## Simulate a hosted environment on your own machine
@@ -48,8 +46,7 @@ variable is set to the new function name.
 For example:
 
 ```dart
-@CloudFunction()
-Response handleGet(Request request) => Response.ok('Hello, World!');
+Future<Response> handleGet(Request request) async => Response.ok('Hello, World!');
 ```
 
 Run the `build_runner` to regenerate `bin/server.dart` from `lib/functions.dart`

dartfn/templates/helloworld/bin/server.dart

@@ -1,4 +1,3 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
 // Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,8 +20,6 @@ Future<void> main(List<String> args) async {
 }
 
 FunctionTarget? _nameToFunctionTarget(String name) => switch (name) {
-      'function' => FunctionTarget.http(
-          function_library.function,
-        ),
-      _ => null
-    };
+  'function' => FunctionTarget.http(function_library.function),
+  _ => null,
+};

dartfn/templates/helloworld/lib/functions.dart

@@ -1,5 +1,4 @@
-import 'package:functions_framework/functions_framework.dart';
 import 'package:shelf/shelf.dart';
 
-@CloudFunction()
-Response function(Request request) => Response.ok('Hello, World!');
+Future<Response> function(Request request) async =>
+    Response.ok('Hello, World!');

dartfn/templates/helloworld/pubspec.yaml

@@ -13,7 +13,6 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^2.0.0
-  functions_framework_builder: ^0.4.1
   http: ^1.0.0
   dart_flutter_team_lints: ^3.0.0
   test: ^1.16.6

dartfn/templates/json/README.md

@@ -5,8 +5,7 @@ This example demonstrates writing a function that accepts and returns JSON.
 The basic shape of the function handler looks like this:
 
 ```dart
-@CloudFunction()
-GreetingResponse function(GreetingRequest request) {
+Future<GreetingResponse> function(GreetingRequest request) async {
 }
 ```
 
@@ -34,21 +33,19 @@ The Functions Framework parses the request data to fit the shape of a
 the request, the function implementation provides a default name: `World`.
 
 ```dart
-@CloudFunction()
-GreetingResponse function(GreetingRequest request) {
+Future<GreetingResponse> function(GreetingRequest request) async {
   final name = request.name ?? 'World';
 }
 ```
 
 Finally, the function creates an object returns it. The Functions Framework will
 take this and attempt "do the right" thing. In this case, the function is typed
-to return a `FutureOr<GreetingResponse>`, which has a `toJson()` method, so the
+to return a `Future<GreetingResponse>`, which has a `toJson()` method, so the
 framework will invoke this, then set the response body to the stringified result
 and set the response header (`content-type`) to `application/json`).
 
 ```dart
-@CloudFunction()
-GreetingResponse function(Map<String, dynamic> request) {
+Future<GreetingResponse> function(Map<String, dynamic> request) async {
   final name = request['name'] as String ?? 'World';
   final json = GreetingResponse(salutation: 'Hello', name: name);
   return json;
@@ -94,8 +91,7 @@ class GreetingResponse {
 // operator, and therefore also `hashCode`.
 }
 
-@CloudFunction()
-GreetingResponse function(GreetingRequest request) {
+Future<GreetingResponse> function(GreetingRequest request) async {
   final name = request.name ?? 'World';
   final json = GreetingResponse(salutation: 'Hello', name: name);
   return json;

dartfn/templates/json/bin/server.dart

@@ -1,4 +1,3 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
 // Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,27 +20,24 @@ Future<void> main(List<String> args) async {
 }
 
 FunctionTarget? _nameToFunctionTarget(String name) => switch (name) {
-      'function' => JsonFunctionTarget(
-          function_library.function,
-          (json) {
-            if (json is Map<String, dynamic>) {
-              try {
-                return function_library.GreetingRequest.fromJson(json);
-              } catch (e, stack) {
-                throw BadRequestException(
-                  400,
-                  'There was an error parsing the provided JSON data.',
-                  innerError: e,
-                  innerStack: stack,
-                );
-              }
-            }
-            throw BadRequestException(
-              400,
-              'The provided JSON is not the expected type '
-              '`Map<String, dynamic>`.',
-            );
-          },
-        ),
-      _ => null
-    };
+  'function' => JsonFunctionTarget(function_library.function, (json) {
+    if (json is Map<String, dynamic>) {
+      try {
+        return function_library.GreetingRequest.fromJson(json);
+      } catch (e, stack) {
+        throw BadRequestException(
+          400,
+          'There was an error parsing the provided JSON data.',
+          innerError: e,
+          innerStack: stack,
+        );
+      }
+    }
+    throw BadRequestException(
+      400,
+      'The provided JSON is not the expected type '
+      '`Map<String, dynamic>`.',
+    );
+  }),
+  _ => null,
+};

dartfn/templates/json/lib/functions.dart

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import 'package:functions_framework/functions_framework.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 part 'functions.g.dart';
@@ -58,8 +57,7 @@ class GreetingResponse {
   int get hashCode => salutation.hashCode ^ name.hashCode;
 }
 
-@CloudFunction()
-GreetingResponse function(GreetingRequest request) {
+Future<GreetingResponse> function(GreetingRequest request) async {
   final name = request.name ?? 'World';
   final json = GreetingResponse(salutation: 'Hello', name: name);
   return json;

dartfn/templates/json/pubspec.yaml

@@ -14,7 +14,6 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^2.2.1
-  functions_framework_builder: ^0.4.7
   http: ^1.0.0
   json_serializable: ^6.6.0
   dart_flutter_team_lints: ^3.0.0

docs/01-introduction.md

@@ -35,11 +35,9 @@ Here is a simple example of how to write a function that responds to HTTP
 request events with a "Hello, World!" greeting:
 
 ```dart
-import 'package:functions_framework/functions_framework.dart';
 import 'package:shelf/shelf.dart';
 
-@CloudFunction()
-Response function(Request request) => Response.ok('Hello, World!');
+Future<Response> function(Request request) async => Response.ok('Hello, World!');
 ```
 
 If you deploy this simple example to [Cloud Run], you can easily choose to make

docs/quickstarts/01-quickstart-dart.md

@@ -126,8 +126,7 @@ the `FUNCTION_TARGET` environment variable is set to the new function name.
 For example:
 
 ```dart
-@CloudFunction()
-Response handleGet(Request request) => Response.ok('Hello, World!');
+Future<Response> handleGet(Request request) async => Response.ok('Hello, World!');
 ```
 
 Run `build_runner` to regenerate `bin/server.dart` from `lib/functions.dart`

examples/fullstack/backend/README.md

@@ -8,8 +8,7 @@ The backend demonstrates writing a function that accepts and returns JSON.
 The function handler looks like this:
 
 ```dart
-@CloudFunction()
-GreetingResponse function(GreetingRequest request) {
+Future<GreetingResponse> function(GreetingRequest request) async {
   final name = request.name ?? 'World';
   final json = GreetingResponse(salutation: getSalutation(), name: name);
   return json;

examples/fullstack/backend/bin/server.dart

@@ -1,4 +1,3 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
 // Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,31 +16,10 @@ import 'package:backend/functions.dart' as function_library;
 import 'package:functions_framework/serve.dart';
 
 Future<void> main(List<String> args) async {
-  await serve(args, _nameToFunctionTarget);
+  await serve(args, {
+    'function': FunctionTarget.jsonable(
+      function_library.greeting,
+      function_library.GreetingRequest.fromJson,
+    ),
+  });
 }
-
-FunctionTarget? _nameToFunctionTarget(String name) => switch (name) {
-      'function' => JsonWithContextFunctionTarget(
-          function_library.function,
-          (json) {
-            if (json is Map<String, dynamic>) {
-              try {
-                return function_library.GreetingRequest.fromJson(json);
-              } catch (e, stack) {
-                throw BadRequestException(
-                  400,
-                  'There was an error parsing the provided JSON data.',
-                  innerError: e,
-                  innerStack: stack,
-                );
-              }
-            }
-            throw BadRequestException(
-              400,
-              'The provided JSON is not the expected type '
-              '`Map<String, dynamic>`.',
-            );
-          },
-        ),
-      _ => null
-    };

examples/fullstack/backend/lib/functions.dart

@@ -21,11 +21,15 @@ import 'api_types.dart';
 // Export api_types so builder can use them when generating `bin/server.dart`.
 export 'api_types.dart';
 
-@CloudFunction()
-GreetingResponse function(GreetingRequest request, RequestContext context) {
+Future<GreetingResponse> greeting(
+  GreetingRequest request,
+  RequestContext context,
+) async {
   final name = request.name ?? 'World';
-  final response =
-      GreetingResponse(salutation: _randomSalutation(), name: name);
+  final response = GreetingResponse(
+    salutation: _randomSalutation(),
+    name: name,
+  );
   context.logger.info('greetingResponse: ${response.toJson()}');
   return response;
 }

examples/fullstack/backend/pubspec.yaml

@@ -13,7 +13,6 @@ dependencies:
 dev_dependencies:
   build_runner: ^2.2.1
   dart_flutter_team_lints: ^3.0.0
-  functions_framework_builder: ^0.4.7
   http: ^1.0.0
   json_serializable: ^6.6.0
   test: ^1.21.6

examples/hello/Makefile

@@ -3,18 +3,8 @@
 FUNCTION_TARGET = function
 PORT = 8080
 
-# bin/server.dart is the generated target for lib/functions.dart
-bin/server.dart:
-	dart run build_runner build --delete-conflicting-outputs
-
-build: bin/server.dart
-
-test: clean build
+test:
 	dart test
 
-clean:
-	dart run build_runner clean
-	rm -rf bin/server.dart
-
-run: build
+run:
 	dart run bin/server.dart --port=$(PORT) --target=$(FUNCTION_TARGET)