Update test expectations

example/c_json/cjson_generated_bindings.dart

@@ -1268,6 +1268,7 @@ final class cJSON_Hooks extends ffi.Struct {
 }
 
 typedef cJSON_bool = ffi.Int;
+typedef cJSON_bool_dart = int;
 
 const int CJSON_VERSION_MAJOR = 1;
 

lib/src/code_generator/typealias.dart

@@ -102,7 +102,8 @@ class Typealias extends BindingType {
     final typeString =
         _useFfiDartType ? type.getFfiDartType(w) : type.getCType(w);
     final dartTypeString = type.getDartType(w);
-    if (_dartAliasName == null && typeString != dartTypeString) {
+    if (_dartAliasName == null && type is! Typealias &&
+        typeString != dartTypeString) {
       _dartAliasName = w.topLevelUniqueNamer.makeUnique('${name}_dart');
     }
 

test/header_parser_tests/expected_bindings/_expected_dart_handle_bindings.dart

@@ -70,6 +70,7 @@ class NativeLibrary {
 
 typedef Typedef1 = ffi.Pointer<ffi.NativeFunction<Typedef1_function>>;
 typedef Typedef1_function = ffi.Void Function(ffi.Handle);
+typedef Typedef1_function_dart = void Function(Object);
 
 final class Struct1 extends ffi.Opaque {}
 

test/header_parser_tests/expected_bindings/_expected_native_func_typedef_bindings.dart

@@ -78,6 +78,7 @@ typedef WithTypedefReturnType_function = InsideReturnType Function();
 typedef InsideReturnType
     = ffi.Pointer<ffi.NativeFunction<InsideReturnType_function>>;
 typedef InsideReturnType_function = ffi.Void Function();
+typedef InsideReturnType_function_dart = void Function();
 
 final class Struct2 extends ffi.Struct {
   external VoidFuncPointer constFuncPointer;
@@ -86,3 +87,4 @@ final class Struct2 extends ffi.Struct {
 typedef VoidFuncPointer
     = ffi.Pointer<ffi.NativeFunction<VoidFuncPointer_function>>;
 typedef VoidFuncPointer_function = ffi.Void Function();
+typedef VoidFuncPointer_function_dart = void Function();

test/header_parser_tests/expected_bindings/_expected_struct_fptr_fields_bindings.dart

@@ -71,3 +71,4 @@ final class S extends ffi.Struct {
 typedef ArithmeticOperation
     = ffi.Pointer<ffi.NativeFunction<ArithmeticOperation_function>>;
 typedef ArithmeticOperation_function = ffi.Int Function(ffi.Int a, ffi.Int b);
+typedef ArithmeticOperation_function_dart = int Function(int a, int b);

test/header_parser_tests/expected_bindings/_expected_typedef_bindings.dart

@@ -94,6 +94,7 @@ final class Struct1 extends ffi.Struct {
 typedef NamedFunctionProto
     = ffi.Pointer<ffi.NativeFunction<NamedFunctionProto_function>>;
 typedef NamedFunctionProto_function = ffi.Void Function();
+typedef NamedFunctionProto_function_dart = void Function();
 
 final class AnonymousStructInTypedef extends ffi.Opaque {}
 
@@ -113,6 +114,7 @@ abstract class _NamedEnumInTypedef {
 }
 
 typedef NestingASpecifiedType = ffi.IntPtr;
+typedef NestingASpecifiedType_dart = int;
 
 final class Struct2 extends ffi.Opaque {}
 

test/regen.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:args/args.dart';
@@ -18,12 +19,15 @@ e.g. with this command:
 $ dart run test/setup.dart && dart run test/regen.dart && dart test
 ''';
 
-Future<void> _regenConfig(File yamlConfig, File bindingOutput) async {
-  yamlConfig = yamlConfig.absolute;
-  bindingOutput = bindingOutput.absolute;
-  final config = testConfigFromPath(yamlConfig.path);
-  final library = parse(config);
-  library.generateFile(bindingOutput);
+Future<void> _regenConfig(
+    String yamlConfigPath, String bindingOutputPath) async {
+  final yamlConfig = File(yamlConfigPath).absolute;
+  final bindingOutput = File(bindingOutputPath).absolute;
+  await withChDir(yamlConfig.path, () {
+    final config = testConfigFromPath(yamlConfig.path);
+    final library = parse(config);
+    library.generateFile(bindingOutput);
+  });
 }
 
 Future<void> main(List<String> args) async {
@@ -50,25 +54,12 @@ Future<void> main(List<String> args) async {
     print('${record.level.name}: ${record.time}: ${record.message}');
   });
 
-  final nativeTestConfig = File('test/native_test/config.yaml').absolute;
-  final nativeTestOut =
-      File('test/native_test/_expected_native_test_bindings.dart').absolute;
-  await withChDir(nativeTestConfig.path,
-      () => _regenConfig(nativeTestConfig, nativeTestOut));
-
-  final libclangConfig = File('example/libclang-example/config.yaml').absolute;
-  final libclangOut =
-      File('example/libclang-example/generated_bindings.dart').absolute;
-  await withChDir(
-      libclangConfig.path, () => _regenConfig(libclangConfig, libclangOut));
-
-  final simpleConfig = File('example/simple/config.yaml').absolute;
-  final simpleOut = File('example/simple/generated_bindings.dart').absolute;
-  await withChDir(
-      simpleConfig.path, () => _regenConfig(simpleConfig, simpleOut));
-
-  final cJsonConfig = File('example/c_json/config.yaml').absolute;
-  final cJsonOut =
-      File('example/c_json/cjson_generated_bindings.dart').absolute;
-  await withChDir(cJsonConfig.path, () => _regenConfig(cJsonConfig, cJsonOut));
+  await _regenConfig('test/native_test/config.yaml',
+      'test/native_test/_expected_native_test_bindings.dart');
+  await _regenConfig('example/libclang-example/config.yaml',
+      'example/libclang-example/generated_bindings.dart');
+  await _regenConfig(
+      'example/simple/config.yaml', 'example/simple/generated_bindings.dart');
+  await _regenConfig('example/c_json/config.yaml',
+      'example/c_json/cjson_generated_bindings.dart');
 }