Merge branch 'main' into objcstaticfunc

.github/workflows/test-package.yml

@@ -22,8 +22,8 @@ jobs:
         # TODO: Change to 3.2.0 stable once it's released.
         sdk: [3.2.0-114.0.dev]
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
-      - uses: dart-lang/setup-dart@8a4b97ea2017cc079571daec46542f76189836b1
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d
         with:
           sdk: ${{ matrix.sdk }}
       - id: install
@@ -42,8 +42,8 @@ jobs:
     needs: analyze
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
-      - uses: dart-lang/setup-dart@8a4b97ea2017cc079571daec46542f76189836b1
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d
         with:
           sdk: 3.2.0-114.0.dev
       - name: Install dependencies
@@ -59,8 +59,8 @@ jobs:
     needs: analyze
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
-      - uses: dart-lang/setup-dart@8a4b97ea2017cc079571daec46542f76189836b1
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d
         with:
           sdk: 3.2.0-114.0.dev
       - name: Install dependencies
@@ -81,8 +81,8 @@ jobs:
     needs: analyze
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
-      - uses: dart-lang/setup-dart@8a4b97ea2017cc079571daec46542f76189836b1
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d
         with:
           sdk: 3.2.0-114.0.dev
       - name: Install dependencies
@@ -106,8 +106,8 @@ jobs:
     needs: analyze
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
-      - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225
         with:
           channel: "master"
       - name: Install dependencies

CHANGELOG.md

@@ -11,6 +11,7 @@
 - Use Dart wrapper types in args and returns of ObjCBlocks.
 - Use Dart wrapper types in args and returns of static functions.
 - Bump min SDK version to 3.2.0-114.0.dev.
+- Renamed `asset` to `assetId` for `ffi-native`.  
 
 # 9.0.1
 

README.md

@@ -543,7 +543,7 @@ type-map:
 
 ```yaml
 ffi-native:
-  asset: 'myasset' # Optional.
+  assetId: 'myasset' # Optional.
 ```
   </td>
   </tr>

example/ffinative/config.yaml

@@ -2,9 +2,9 @@
 
 name: NativeLibrary
 ffi-native:
-  # asset: 'assetname' # (optional)
+  assetId: 'package:ffinative_example/generated_bindings.dart' # (optional)
 description: Bindings to `headers/example.h`.
-output: 'generated_bindings.dart'
+output: 'lib/generated_bindings.dart'
 headers:
   entry-points:
     - 'headers/example.h'

example/ffinative/generated_bindings.dart → example/ffinative/lib/generated_bindings.dart

@@ -7,36 +7,44 @@
 import 'dart:ffi' as ffi;
 
 /// Adds 2 integers.
-@ffi.Native<ffi.Int Function(ffi.Int, ffi.Int)>(symbol: 'sum')
+@ffi.Native<ffi.Int Function(ffi.Int, ffi.Int)>(
+    symbol: 'sum', assetId: 'package:ffinative_example/generated_bindings.dart')
 external int sum(
   int a,
   int b,
 );
 
 /// Subtracts 2 integers.
-@ffi.Native<ffi.Int Function(ffi.Int, ffi.Int)>(symbol: 'subtract')
+@ffi.Native<ffi.Int Function(ffi.Int, ffi.Int)>(
+    symbol: 'subtract',
+    assetId: 'package:ffinative_example/generated_bindings.dart')
 external int subtract(
   int a,
   int b,
 );
 
 /// Multiplies 2 integers, returns pointer to an integer,.
-@ffi.Native<ffi.Pointer<ffi.Int> Function(ffi.Int, ffi.Int)>(symbol: 'multiply')
+@ffi.Native<ffi.Pointer<ffi.Int> Function(ffi.Int, ffi.Int)>(
+    symbol: 'multiply',
+    assetId: 'package:ffinative_example/generated_bindings.dart')
 external ffi.Pointer<ffi.Int> multiply(
   int a,
   int b,
 );
 
 /// Divides 2 integers, returns pointer to a float.
-@ffi.Native<ffi.Pointer<ffi.Float> Function(ffi.Int, ffi.Int)>(symbol: 'divide')
+@ffi.Native<ffi.Pointer<ffi.Float> Function(ffi.Int, ffi.Int)>(
+    symbol: 'divide',
+    assetId: 'package:ffinative_example/generated_bindings.dart')
 external ffi.Pointer<ffi.Float> divide(
   int a,
   int b,
 );
 
 /// Divides 2 floats, returns a pointer to double.
 @ffi.Native<ffi.Pointer<ffi.Double> Function(ffi.Float, ffi.Float)>(
-    symbol: 'dividePrecision')
+    symbol: 'dividePrecision',
+    assetId: 'package:ffinative_example/generated_bindings.dart')
 external ffi.Pointer<ffi.Double> dividePrecision(
   double a,
   double b,

ffigen.schema.json

@@ -418,12 +418,12 @@
           "type": "object",
           "additionalProperties": false,
           "properties": {
-            "asset": {
+            "assetId": {
               "type": "string"
             }
           },
           "required": [
-            "asset"
+            "assetId"
           ]
         }
       ]

lib/src/code_generator/func.dart

@@ -146,8 +146,8 @@ class Func extends LookUpBinding {
     }
 
     if (ffiNativeConfig.enabled) {
-      final assetString = ffiNativeConfig.asset != null
-          ? ", asset: '${ffiNativeConfig.asset}'"
+      final assetString = ffiNativeConfig.assetId != null
+          ? ", assetId: '${ffiNativeConfig.assetId}'"
           : '';
       final nativeFuncName = needsWrapper ? funcVarName : enclosingFuncName;
       s.write('''

lib/src/config_provider/config_types.dart

@@ -384,9 +384,9 @@ class ObjCModulePrefixer {
 
 class FfiNativeConfig {
   final bool enabled;
-  final String? asset;
+  final String? assetId;
 
-  const FfiNativeConfig({required this.enabled, this.asset});
+  const FfiNativeConfig({required this.enabled, this.assetId});
 }
 
 class SymbolFile {

lib/src/config_provider/spec_utils.dart

@@ -602,6 +602,6 @@ FfiNativeConfig ffiNativeExtractor(dynamic yamlConfig) {
   final yamlMap = yamlConfig as Map?;
   return FfiNativeConfig(
     enabled: true,
-    asset: yamlMap?[strings.ffiNativeAsset] as String?,
+    assetId: yamlMap?[strings.ffiNativeAsset] as String?,
   );
 }

lib/src/strings.dart

@@ -263,7 +263,7 @@ const doubleNaN = 'double.nan';
 const dartHandleUsr = 'c:@S@_Dart_Handle';
 
 const ffiNative = 'ffi-native';
-const ffiNativeAsset = 'asset';
+const ffiNativeAsset = 'assetId';
 
 Directory? _tmpDir;
 

test/native_test/native_test.dart

@@ -58,6 +58,7 @@ void main() {
         rethrow;
       }
     });
+
     test('bool', () {
       expect(bindings.Function1Bool(true), false);
       expect(bindings.Function1Bool(false), true);
@@ -112,6 +113,7 @@ void main() {
         }
       }
     });
+
     test('Array Workaround: Range Errors', () {
       final struct1 = bindings.getStruct1();
       // Index (get) above range.