another attempt

add_imports.yaml

@@ -6,4 +6,5 @@ classes_map:
   'mod.ts':
     - QueryClient
     - Client
+    - 'Client': PostgresClient
     - Transaction

bin/add_imports.dart

@@ -37,13 +37,20 @@ String createNewSource(String sourceString, Config config) {
       .map((e) => e.group(1))
       .whereNotNull()
       .toSet()
-      .intersection(config.classes)
+      .where((alias) => config.classes.any((e) => e.$2 == alias))
       .whereNot((e) => sourceString.contains('import { $e }'))
       .toList();
 
   return [
-    ...[config.importStringForClass, (e) => 'self.$e = $e;']
-        .map(classes.map)
+    ...[
+      ((String, String) e) => config.importStringForClass(e.$1),
+      ((String, String) e) => 'self.${e.$2} = ${e.$1};',
+    ]
+        .map(
+          classes
+              .map((alias) => config.classes.firstWhere((e) => e.$2 == alias))
+              .map,
+        )
         .flattened,
     sourceString,
   ].join('\n');

lib/src/add_imports/config.dart

@@ -6,9 +6,9 @@ import 'package:yaml/yaml.dart';
 
 class Config {
   final String fileUrlPrefix;
-  final Map<String, List<String>> classesMap;
+  final Map<String, List<(String, String)>> classesMap;
 
-  Set<String> get classes => classesMap.values.flattened.toSet();
+  Set<(String, String)> get classes => classesMap.values.flattened.toSet();
 
   Config({required this.fileUrlPrefix, required this.classesMap});
 
@@ -19,7 +19,13 @@ class Config {
       final classesMap = (parsedYaml['classes_map'] as YamlMap).map(
         (key, value) => MapEntry(
           key as String,
-          [...value as YamlList].cast<String>(),
+          [...value as YamlList]
+              .map(
+                (e) => e is YamlMap
+                    ? (e.keys.first as String, e.values.first as String)
+                    : (e as String, e),
+              )
+              .toList(),
         ),
       );
 
@@ -32,8 +38,13 @@ class Config {
     }
   }
 
-  String _filenameForClass(String classname) =>
-      classesMap.entries.firstWhere((e) => e.value.contains(classname)).key;
+  String _filenameForClass(String classname) => classesMap.entries
+      .firstWhere(
+        (e) => e.value.any(
+          (classnamePair) => classnamePair.$1 == classname,
+        ),
+      )
+      .key;
 
   String importStringForClass(String classname) {
     final filename = _filenameForClass(classname);

lib/src/postgres_client.dart

@@ -5,15 +5,15 @@ import 'package:deno_postgres_interop/src/client_options.dart';
 import 'package:deno_postgres_interop/src/query_client.dart';
 
 /// [deno-postgres@v​0.17.0/Client](https://deno.land/x/[email protected]/mod.ts?s=Client).
-@JS('Client')
+@JS()
 class PostgresClient extends QueryClient {
   /// [deno-postgres@v​0.17.0/Client/constructor](https://deno.land/x/[email protected]/mod.ts?s=Client#ctor_0).
   external factory PostgresClient(String dbUrl);
 
   /// [deno-postgres@v​0.17.0/Client/constructor](https://deno.land/x/[email protected]/mod.ts?s=Client#ctor_0).
   factory PostgresClient.config(ClientOptions config) =>
-      callConstructor('Client', [config]);
+      callConstructor('PostgresClient', [config]);
 
   /// [deno-postgres@v​0.17.0/Client/constructor](https://deno.land/x/[email protected]/mod.ts?s=Client#ctor_0).
-  factory PostgresClient.empty() => callConstructor('Client', null);
+  factory PostgresClient.empty() => callConstructor('PostgresClient', null);
 }