Skip to content

Commit 9c9006f

Browse files
tarrinnealtarrinneal
authored
[pigeon] reorg generator files (#8532)
Just moves a few files into folders to clean things up a bit. Future organizing is likely, but I wanted to move the files with no changes first
1 parent 3960c96 commit 9c9006f

38 files changed

+106
-101
lines changed

‎packages/pigeon/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 24.0.0
2+
3+
* **Breaking Change** Relocates some files in `lib` that were not intended for direct client use to `lib/src`.
4+
15
## 23.0.0
26

37
* **Breaking Change** [swift] Fixes a compile error about PigeonError's sendability conformance in Swift 6.

‎packages/pigeon/CONTRIBUTING.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ generators with that AST.
1818

1919
## Source Index
2020

21-
* [ast.dart](./lib/ast.dart) - The data structure for representing the Abstract Syntax Tree.
22-
* [dart_generator.dart](./lib/dart_generator.dart) - The Dart code generator.
23-
* [java_generator.dart](./lib/java_generator.dart) - The Java code generator.
24-
* [kotlin_generator.dart](./lib/kotlin_generator.dart) - The Kotlin code generator.
25-
* [objc_generator.dart](./lib/objc_generator.dart) - The Objective-C code
21+
* [ast.dart](./lib/src/ast.dart) - The data structure for representing the Abstract Syntax Tree.
22+
* [dart_generator.dart](./lib/src/dart_generator.dart) - The Dart code generator.
23+
* [java_generator.dart](./lib/src/java_generator.dart) - The Java code generator.
24+
* [kotlin_generator.dart](./lib/src/kotlin_generator.dart) - The Kotlin code generator.
25+
* [objc_generator.dart](./lib/src/objc_generator.dart) - The Objective-C code
2626
generator (header and source files).
27-
* [swift_generator.dart](./lib/swift_generator.dart) - The Swift code generator.
28-
* [cpp_generator.dart](./lib/cpp_generator.dart) - The C++ code generator.
29-
* [generator_tools.dart](./lib/generator_tools.dart) - Shared code between generators.
30-
* [pigeon_cl.dart](./lib/pigeon_cl.dart) - The top-level function executed by
27+
* [swift_generator.dart](./lib/src/swift_generator.dart) - The Swift code generator.
28+
* [cpp_generator.dart](./lib/src/cpp_generator.dart) - The C++ code generator.
29+
* [generator_tools.dart](./lib/src/generator_tools.dart) - Shared code between generators.
30+
* [pigeon_cl.dart](./lib/src/pigeon_cl.dart) - The top-level function executed by
3131
the command line tool in [bin/][./bin].
32-
* [pigeon_lib.dart](./lib/pigeon_lib.dart) - The top-level function for the
32+
* [pigeon_lib.dart](./lib/src/pigeon_lib.dart) - The top-level function for the
3333
PigeonIsolate and the AST generation code.
3434
* [pigeon.dart](./lib/pigeon.dart) - A file of exported modules, the intended
3535
import for users of Pigeon.

‎packages/pigeon/bin/pigeon.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import 'dart:io' show exit;
66

7-
import 'package:pigeon/pigeon_cl.dart';
7+
import 'package:pigeon/src/pigeon_cl.dart';
88

99
Future<void> main(List<String> args) async {
1010
exit(await runCommandLine(args));

‎packages/pigeon/lib/pigeon.dart

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44

55
export 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List;
66

7-
export 'cpp_generator.dart' show CppOptions;
8-
export 'dart_generator.dart' show DartOptions;
9-
export 'gobject_generator.dart' show GObjectOptions;
10-
export 'java_generator.dart' show JavaOptions;
11-
export 'kotlin_generator.dart' show KotlinOptions, KotlinProxyApiOptions;
12-
export 'objc_generator.dart' show ObjcOptions;
13-
export 'pigeon_lib.dart';
14-
export 'swift_generator.dart' show SwiftOptions, SwiftProxyApiOptions;
7+
export 'src/cpp/cpp_generator.dart' show CppOptions;
8+
export 'src/dart/dart_generator.dart' show DartOptions;
9+
export 'src/gobject/gobject_generator.dart' show GObjectOptions;
10+
export 'src/java/java_generator.dart' show JavaOptions;
11+
export 'src/kotlin/kotlin_generator.dart'
12+
show KotlinOptions, KotlinProxyApiOptions;
13+
export 'src/objc/objc_generator.dart' show ObjcOptions;
14+
export 'src/pigeon_lib.dart';
15+
export 'src/swift/swift_generator.dart' show SwiftOptions, SwiftProxyApiOptions;

‎packages/pigeon/lib/ast.dart renamed to ‎packages/pigeon/lib/src/ast.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import 'package:collection/collection.dart' show ListEquality;
66
import 'package:meta/meta.dart';
77

88
import 'generator_tools.dart';
9-
import 'kotlin_generator.dart' show KotlinProxyApiOptions;
9+
import 'kotlin/kotlin_generator.dart' show KotlinProxyApiOptions;
1010
import 'pigeon_lib.dart';
11-
import 'swift_generator.dart' show SwiftProxyApiOptions;
11+
import 'swift/swift_generator.dart' show SwiftProxyApiOptions;
1212

1313
typedef _ListEquals = bool Function(List<Object?>, List<Object?>);
1414

‎packages/pigeon/lib/ast_generator.dart renamed to ‎packages/pigeon/lib/src/ast_generator.dart

File renamed without changes.

‎packages/pigeon/lib/cpp_generator.dart renamed to ‎packages/pigeon/lib/src/cpp/cpp_generator.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'ast.dart';
6-
import 'functional.dart';
7-
import 'generator.dart';
8-
import 'generator_tools.dart';
9-
import 'pigeon_lib.dart' show Error;
5+
import '../ast.dart';
6+
import '../functional.dart';
7+
import '../generator.dart';
8+
import '../generator_tools.dart';
9+
import '../pigeon_lib.dart' show Error;
1010

1111
/// General comment opening token.
1212
const String _commentPrefix = '//';

‎packages/pigeon/lib/dart_generator.dart renamed to ‎packages/pigeon/lib/src/dart/dart_generator.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import 'package:dart_style/dart_style.dart';
77
import 'package:path/path.dart' as path;
88
import 'package:pub_semver/pub_semver.dart';
99

10-
import 'ast.dart';
11-
import 'dart/templates.dart';
12-
import 'functional.dart';
13-
import 'generator.dart';
14-
import 'generator_tools.dart';
10+
import '../ast.dart';
11+
import '../functional.dart';
12+
import '../generator.dart';
13+
import '../generator_tools.dart';
14+
import 'templates.dart';
1515

1616
/// Documentation comment open symbol.
1717
const String _docCommentPrefix = '///';

‎packages/pigeon/lib/dart/templates.dart renamed to ‎packages/pigeon/lib/src/dart/templates.dart

File renamed without changes.

‎packages/pigeon/lib/functional.dart renamed to ‎packages/pigeon/lib/src/functional.dart

File renamed without changes.

‎packages/pigeon/lib/generator.dart renamed to ‎packages/pigeon/lib/src/generator.dart

File renamed without changes.

‎packages/pigeon/lib/generator_tools.dart renamed to ‎packages/pigeon/lib/src/generator_tools.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import 'ast.dart';
1414
/// The current version of pigeon.
1515
///
1616
/// This must match the version in pubspec.yaml.
17-
const String pigeonVersion = '23.0.0';
17+
const String pigeonVersion = '24.0.0';
1818

1919
/// Read all the content from [stdin] to a String.
2020
String readStdin() {

‎packages/pigeon/lib/gobject_generator.dart renamed to ‎packages/pigeon/lib/src/gobject/gobject_generator.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'ast.dart';
6-
import 'generator.dart';
7-
import 'generator_tools.dart';
5+
import '../ast.dart';
6+
import '../generator.dart';
7+
import '../generator_tools.dart';
88

99
/// Documentation comment spec.
1010
const DocumentCommentSpecification _docCommentSpec =

‎packages/pigeon/lib/java_generator.dart renamed to ‎packages/pigeon/lib/src/java/java_generator.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'ast.dart';
6-
import 'functional.dart';
7-
import 'generator.dart';
8-
import 'generator_tools.dart';
9-
import 'pigeon_lib.dart' show TaskQueueType;
5+
import '../ast.dart';
6+
import '../functional.dart';
7+
import '../generator.dart';
8+
import '../generator_tools.dart';
9+
import '../pigeon_lib.dart' show TaskQueueType;
1010

1111
/// Documentation open symbol.
1212
const String _docCommentPrefix = '/**';

‎packages/pigeon/lib/kotlin_generator.dart renamed to ‎packages/pigeon/lib/src/kotlin/kotlin_generator.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
import 'package:graphs/graphs.dart';
66

7-
import 'ast.dart';
8-
import 'functional.dart';
9-
import 'generator.dart';
10-
import 'generator_tools.dart';
11-
import 'kotlin/templates.dart';
12-
import 'pigeon_lib.dart' show TaskQueueType;
7+
import '../ast.dart';
8+
import '../functional.dart';
9+
import '../generator.dart';
10+
import '../generator_tools.dart';
11+
import '../pigeon_lib.dart' show TaskQueueType;
12+
import 'templates.dart';
1313

1414
/// Documentation open symbol.
1515
const String _docCommentPrefix = '/**';

‎packages/pigeon/lib/kotlin/templates.dart renamed to ‎packages/pigeon/lib/src/kotlin/templates.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// found in the LICENSE file.
44

55
import '../generator_tools.dart';
6-
import '../kotlin_generator.dart';
6+
import 'kotlin_generator.dart';
77

88
/// Name of the Kotlin `InstanceManager`.
99
String kotlinInstanceManagerClassName(KotlinOptions options) =>

‎packages/pigeon/lib/objc_generator.dart renamed to ‎packages/pigeon/lib/src/objc/objc_generator.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'ast.dart';
6-
import 'functional.dart';
7-
import 'generator.dart';
8-
import 'generator_tools.dart';
9-
import 'pigeon_lib.dart' show Error, TaskQueueType;
5+
import '../ast.dart';
6+
import '../functional.dart';
7+
import '../generator.dart';
8+
import '../generator_tools.dart';
9+
import '../pigeon_lib.dart' show Error, TaskQueueType;
1010

1111
/// Documentation comment open symbol.
1212
const String _docCommentPrefix = '///';

‎packages/pigeon/lib/pigeon_cl.dart renamed to ‎packages/pigeon/lib/src/pigeon_cl.dart

File renamed without changes.

‎packages/pigeon/lib/pigeon_lib.dart renamed to ‎packages/pigeon/lib/src/pigeon_lib.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ import 'package:pub_semver/pub_semver.dart';
2727

2828
import 'ast.dart';
2929
import 'ast_generator.dart';
30-
import 'cpp_generator.dart';
31-
import 'dart_generator.dart';
30+
import 'cpp/cpp_generator.dart';
31+
import 'dart/dart_generator.dart';
3232
import 'generator_tools.dart';
3333
import 'generator_tools.dart' as generator_tools;
34-
import 'gobject_generator.dart';
35-
import 'java_generator.dart';
36-
import 'kotlin_generator.dart';
37-
import 'objc_generator.dart';
38-
import 'swift_generator.dart';
34+
import 'gobject/gobject_generator.dart';
35+
import 'java/java_generator.dart';
36+
import 'kotlin/kotlin_generator.dart';
37+
import 'objc/objc_generator.dart';
38+
import 'swift/swift_generator.dart';
3939

4040
class _Asynchronous {
4141
const _Asynchronous();

‎packages/pigeon/lib/swift_generator.dart renamed to ‎packages/pigeon/lib/src/swift/swift_generator.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
import 'package:graphs/graphs.dart';
66
import 'package:pub_semver/pub_semver.dart';
77

8-
import 'ast.dart';
9-
import 'functional.dart';
10-
import 'generator.dart';
11-
import 'generator_tools.dart';
12-
import 'swift/templates.dart';
8+
import '../ast.dart';
9+
import '../functional.dart';
10+
import '../generator.dart';
11+
import '../generator_tools.dart';
12+
import 'templates.dart';
1313

1414
/// Documentation comment open symbol.
1515
const String _docCommentPrefix = '///';

‎packages/pigeon/lib/swift/templates.dart renamed to ‎packages/pigeon/lib/src/swift/templates.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
import '../../pigeon.dart';
56
import '../generator_tools.dart';
6-
import '../pigeon.dart';
77

88
/// Name of delegate that handles the callback when an object is deallocated
99
/// in an `InstanceManager`.

‎packages/pigeon/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: pigeon
22
description: Code generator tool to make communication between Flutter and the host platform type-safe and easier.
33
repository: https://github.com/flutter/packages/tree/main/packages/pigeon
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22
5-
version: 23.0.0 # This must match the version in lib/generator_tools.dart
5+
version: 24.0.0 # This must match the version in lib/src/generator_tools.dart
66

77
environment:
88
sdk: ^3.4.0

‎packages/pigeon/test/ast_generator_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:pigeon/ast.dart';
6-
import 'package:pigeon/ast_generator.dart';
5+
import 'package:pigeon/src/ast.dart';
6+
import 'package:pigeon/src/ast_generator.dart';
77
import 'package:test/test.dart';
88

99
void main() {

‎packages/pigeon/test/cpp_generator_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:pigeon/ast.dart';
6-
import 'package:pigeon/cpp_generator.dart';
7-
import 'package:pigeon/generator_tools.dart';
85
import 'package:pigeon/pigeon.dart' show Error;
6+
import 'package:pigeon/src/ast.dart';
7+
import 'package:pigeon/src/cpp/cpp_generator.dart';
8+
import 'package:pigeon/src/generator_tools.dart';
99
import 'package:test/test.dart';
1010

1111
const String DEFAULT_PACKAGE_NAME = 'test_package';

‎packages/pigeon/test/dart/proxy_api_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:pigeon/ast.dart';
6-
import 'package:pigeon/dart_generator.dart';
5+
import 'package:pigeon/src/ast.dart';
6+
import 'package:pigeon/src/dart/dart_generator.dart';
77
import 'package:test/test.dart';
88

99
const String DEFAULT_PACKAGE_NAME = 'test_package';

‎packages/pigeon/test/dart_generator_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import 'dart:io' show Directory, File;
66

77
import 'package:path/path.dart' as path;
8-
import 'package:pigeon/ast.dart';
9-
import 'package:pigeon/dart_generator.dart';
10-
import 'package:pigeon/generator_tools.dart';
8+
import 'package:pigeon/src/ast.dart';
9+
import 'package:pigeon/src/dart/dart_generator.dart';
10+
import 'package:pigeon/src/generator_tools.dart';
1111
import 'package:test/test.dart';
1212

1313
const String DEFAULT_PACKAGE_NAME = 'test_package';

‎packages/pigeon/test/functional_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:pigeon/functional.dart';
5+
import 'package:pigeon/src/functional.dart';
66
import 'package:test/test.dart';
77

88
void main() {

‎packages/pigeon/test/generator_tools_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:pigeon/ast.dart';
6-
import 'package:pigeon/generator_tools.dart';
5+
import 'package:pigeon/src/ast.dart';
6+
import 'package:pigeon/src/generator_tools.dart';
77
import 'package:test/test.dart';
88

99
bool _equalSet<T>(Set<T> x, Set<T> y) {

‎packages/pigeon/test/gobject_generator_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:pigeon/ast.dart';
6-
import 'package:pigeon/generator_tools.dart';
7-
import 'package:pigeon/gobject_generator.dart';
5+
import 'package:pigeon/src/ast.dart';
6+
import 'package:pigeon/src/generator_tools.dart';
7+
import 'package:pigeon/src/gobject/gobject_generator.dart';
88
import 'package:test/test.dart';
99

1010
const String DEFAULT_PACKAGE_NAME = 'test_package';

‎packages/pigeon/test/java_generator_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:pigeon/ast.dart';
6-
import 'package:pigeon/java_generator.dart';
75
import 'package:pigeon/pigeon.dart';
6+
import 'package:pigeon/src/ast.dart';
7+
import 'package:pigeon/src/java/java_generator.dart';
88
import 'package:test/test.dart';
99

1010
const String DEFAULT_PACKAGE_NAME = 'test_package';

‎packages/pigeon/test/kotlin/proxy_api_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:pigeon/ast.dart';
6-
import 'package:pigeon/kotlin_generator.dart';
5+
import 'package:pigeon/src/ast.dart';
6+
import 'package:pigeon/src/kotlin/kotlin_generator.dart';
77
import 'package:test/test.dart';
88

99
const String DEFAULT_PACKAGE_NAME = 'test_package';

‎packages/pigeon/test/kotlin_generator_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:pigeon/ast.dart';
6-
import 'package:pigeon/kotlin_generator.dart';
5+
import 'package:pigeon/src/ast.dart';
6+
import 'package:pigeon/src/kotlin/kotlin_generator.dart';
77
import 'package:test/test.dart';
88

99
const String DEFAULT_PACKAGE_NAME = 'test_package';

‎packages/pigeon/test/objc_generator_test.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:pigeon/ast.dart';
6-
import 'package:pigeon/generator_tools.dart';
7-
import 'package:pigeon/objc_generator.dart';
8-
import 'package:pigeon/pigeon_lib.dart';
5+
import 'package:pigeon/src/ast.dart';
6+
import 'package:pigeon/src/generator_tools.dart';
7+
import 'package:pigeon/src/objc/objc_generator.dart';
8+
import 'package:pigeon/src/pigeon_lib.dart';
99
import 'package:test/test.dart';
1010

1111
const String DEFAULT_PACKAGE_NAME = 'test_package';

‎packages/pigeon/test/pigeon_lib_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import 'dart:async';
66
import 'dart:io';
77

8-
import 'package:pigeon/ast.dart';
9-
import 'package:pigeon/generator_tools.dart';
10-
import 'package:pigeon/pigeon_lib.dart';
8+
import 'package:pigeon/src/ast.dart';
9+
import 'package:pigeon/src/generator_tools.dart';
10+
import 'package:pigeon/src/pigeon_lib.dart';
1111
import 'package:test/test.dart';
1212

1313
class _ValidatorGeneratorAdapter implements GeneratorAdapter {

0 commit comments

Comments
 (0)