File-per-class and single file bindings (#98)

Author: mahesh-hegde

.github/workflows/test-package.yml

@@ -331,11 +331,11 @@ jobs:
       - run: flutter build apk
         working-directory: ./jnigen/example/notification_plugin/example
       - name: re-generate bindings
-        run: flutter pub run jnigen -Doutput.dart.path=_dart -Doutput.c.path=_c --config jnigen.yaml
+        run: flutter pub run jnigen -Doutput.dart.path=_temp.dart -Doutput.c.path=_c/ --config jnigen.yaml
       - name: compare generated dart bindings
-        run: diff -qr lib/ _dart
+        run: diff lib/notifications.dart _temp.dart
       - name: compare generated C bindings
-        run: diff -qr src/ _c
+        run: diff -r src/ _c
 
   build_in_app_java_example:
     runs-on: ubuntu-latest
@@ -361,11 +361,11 @@ jobs:
       - run: flutter analyze
       - run: flutter build apk
       - name: re-generate bindings
-        run: flutter pub run jnigen -Doutput.dart.path=_dart -Doutput.c.path=_c --config jnigen.yaml
+        run: flutter pub run jnigen -Doutput.dart.path=_temp.dart -Doutput.c.path=_c/ --config jnigen.yaml
       - name: compare generated dart bindings
-        run: diff -qr lib/android_utils _dart
+        run: diff lib/android_utils.dart _temp.dart
       - name: compare generated C bindings
-        run: diff -qr src/android_utils _c
+        run: diff -r src/android_utils _c
 
   run_pdfbox_example_linux:
     runs-on: ubuntu-latest
@@ -390,13 +390,13 @@ jobs:
       - run: dart pub get
       - name: Generate bindings
         run: |
-          dart run jnigen -Doutput.c.path=_c -Doutput.dart.path=_dart --config jnigen.yaml
+          dart run jnigen -Doutput.c.path=_c/ -Doutput.dart.path=_dart/ --config jnigen.yaml
       - name: Compare generated bindings
         run: |
-          diff -qr _c src/
-          diff -qr _dart lib/src/third_party
+          diff -r _c src/
+          diff -r _dart lib/src/third_party
       - name: Generate full bindings
-        run: dart run jnigen --config jnigen.yaml --override classes="org.apache.pdfbox.pdmodel;org.apache.pdfbox.text"
+        run: dart run jnigen --config jnigen.yaml --override classes="org.apache.pdfbox"
       - name: Analyze generated bindings
         run: |
           flutter pub get # dart-analyze errors on flutter example

jnigen/example/in_app_java/jnigen.yaml

@@ -4,9 +4,10 @@ android_sdk_config:
 output:
   c:
     library_name: android_utils
-    path: src/android_utils
+    path: src/android_utils/
   dart:
-    path: lib/android_utils
+    path: lib/android_utils.dart
+    structure: single_file
 
 source_path:
   - 'android/app/src/main/java'

jnigen/example/in_app_java/lib/android_utils/com/example/in_app_java.dart renamed to jnigen/example/in_app_java/lib/android_utils.dart

@@ -1,6 +1,8 @@
 // Autogenerated by jnigen. DO NOT EDIT!
 
 // ignore_for_file: camel_case_types
+// ignore_for_file: file_names
+// ignore_for_file: unused_import
 // ignore_for_file: non_constant_identifier_names
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: annotate_overrides
@@ -11,7 +13,10 @@ import "dart:ffi" as ffi;
 import "package:jni/internal_helpers_for_jnigen.dart";
 import "package:jni/jni.dart" as jni;
 
-import "../../_init.dart" show jniLookup;
+// Auto-generated initialization code.
+
+final ffi.Pointer<T> Function<T extends ffi.NativeType>(String sym) jniLookup =
+    ProtectedJniExtensions.initGeneratedLibrary("android_utils");
 
 /// from: com.example.in_app_java.AndroidUtils
 class AndroidUtils extends jni.JniObject {

jnigen/example/in_app_java/lib/android_utils/_init.dart

@@ -6,9 +6,8 @@ import 'package:flutter/material.dart';
 import 'package:jni/jni.dart';
 
 // The hierarchy created in generated code will mirror the java package
-// structure. This is an implementation convenience and we may allow
-// more customization in future.
-import 'android_utils/com/example/in_app_java.dart';
+// structure.
+import 'android_utils.dart';
 
 JniObject activity = JniObject.fromRef(Jni.getCurrentActivity());
 

jnigen/example/in_app_java/lib/main.dart

@@ -8,7 +8,7 @@ import 'package:jni/jni.dart';
 // The hierarchy created in generated code will mirror the java package
 // structure. This is an implementation convenience and we may allow
 // more customization in future.
-import 'package:notification_plugin/com/example/notification_plugin.dart';
+import 'package:notification_plugin/notifications.dart';
 
 JniObject activity = JniObject.fromRef(Jni.getCurrentActivity());
 

jnigen/example/notification_plugin/example/lib/main.dart

@@ -17,4 +17,8 @@ output:
     path: 'src/'
     library_name: notification_plugin
   dart:
-    path: 'lib/'
+    path: 'lib/notifications.dart'
+    ## Output to single file instead of recreating source's file structure.
+    ## This will be useful to reduce clutter when binding a small number of
+    ## classes.
+    structure: 'single_file'

jnigen/example/notification_plugin/jnigen.yaml

@@ -5,6 +5,8 @@
 // Autogenerated by jnigen. DO NOT EDIT!
 
 // ignore_for_file: camel_case_types
+// ignore_for_file: file_names
+// ignore_for_file: unused_import
 // ignore_for_file: non_constant_identifier_names
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: annotate_overrides
@@ -15,7 +17,10 @@ import "dart:ffi" as ffi;
 import "package:jni/internal_helpers_for_jnigen.dart";
 import "package:jni/jni.dart" as jni;
 
-import "../../_init.dart" show jniLookup;
+// Auto-generated initialization code.
+
+final ffi.Pointer<T> Function<T extends ffi.NativeType>(String sym) jniLookup =
+    ProtectedJniExtensions.initGeneratedLibrary("notification_plugin");
 
 /// from: com.example.notification_plugin.Notifications
 class Notifications extends jni.JniObject {

jnigen/example/notification_plugin/lib/_init.dart

@@ -43,6 +43,11 @@ classes:
   - 'org.apache.pdfbox.pdmodel.PDDocumentInformation'
   - 'org.apache.pdfbox.text.PDFTextStripper'
 
+## Exclude a problematic field
+exclude:
+  fields:
+    - 'org.apache.pdfbox.contentstream.operator.OperatorName#SHOW_TEXT_LINE_AND_SPACE'
+
 ## Dependencies to be downloaded using Maven (Invokes `mvn` command). These
 ## dependencies are always downloaded along with their transitive dependencies.
 ##

jnigen/example/notification_plugin/lib/com/example/notification_plugin.dart renamed to jnigen/example/notification_plugin/lib/notifications.dart

@@ -1,5 +1,6 @@
 /// File merely exporting the generated bindings from lib/src/third_party
 library pdfbox_plugin;
 
-export 'src/third_party/org/apache/pdfbox/pdmodel.dart';
-export 'src/third_party/org/apache/pdfbox/text.dart';
+export 'src/third_party/org/apache/pdfbox/pdmodel/PDDocument.dart';
+export 'src/third_party/org/apache/pdfbox/pdmodel/PDDocumentInformation.dart';
+export 'src/third_party/org/apache/pdfbox/text/PDFTextStripper.dart';

jnigen/example/pdfbox_plugin/jnigen.yaml

@@ -16,8 +16,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import "dart:ffi";
+import "dart:ffi" as ffi;
 import "package:jni/internal_helpers_for_jnigen.dart";
 
-final Pointer<T> Function<T extends NativeType>(String sym) jniLookup =
+// Auto-generated initialization code.
+
+final ffi.Pointer<T> Function<T extends ffi.NativeType>(String sym) jniLookup =
     ProtectedJniExtensions.initGeneratedLibrary("pdfbox_plugin");