🤖 Merge PR DefinitelyTyped#72710 fix(pg): named exports by @perrin4869

Author: perrin4869

types/pg/index.d.mts

@@ -1,21 +1,4 @@
-import type * as pg from "./index.d.ts";
-
-import TypeOverrides = require("./lib/type-overrides");
-
-export type * from "./index.d.ts";
-
-export const defaults: typeof pg.defaults;
-export const Client: typeof pg.Client;
-export const Query: typeof pg.Query;
-export const Pool: typeof pg.Pool;
-export const Connection: typeof pg.Connection;
-export const types: typeof pg.types;
-export const DatabaseError: typeof pg.DatabaseError;
-export const escapeIdentifier: typeof pg.escapeIdentifier;
-export const escapeLiteral: typeof pg.escapeLiteral;
-export const Result: typeof pg.Result;
-
-export { TypeOverrides };
+import * as pg from "./index.js";
 
 declare const PG: {
     defaults: typeof pg.defaults;
@@ -25,10 +8,46 @@ declare const PG: {
     Connection: typeof pg.Connection;
     types: typeof pg.types;
     DatabaseError: typeof pg.DatabaseError;
-    TypeOverrides: typeof TypeOverrides;
+    TypeOverrides: typeof pg.TypeOverrides;
     escapeIdentifier: typeof pg.escapeIdentifier;
     escapeLiteral: typeof pg.escapeLiteral;
     Result: typeof pg.Result;
 };
 
+declare namespace PG {
+    type QueryConfigValues<T> = pg.QueryConfigValues<T>;
+    type ClientConfig = pg.ClientConfig;
+    type ConnectionConfig = pg.ConnectionConfig;
+    type Defaults = pg.Defaults;
+    type PoolConfig = pg.PoolConfig;
+    type QueryConfig<I = any[]> = pg.QueryConfig<I>;
+    type CustomTypesConfig = pg.CustomTypesConfig;
+    type Submittable = pg.Submittable;
+    type QueryArrayConfig<I = any[]> = pg.QueryArrayConfig<I>;
+    type FieldDef = pg.FieldDef;
+    type QueryResultBase = pg.QueryResultBase;
+    type QueryResultRow = pg.QueryResultRow;
+    type QueryResult<R extends QueryResultRow = any> = pg.QueryResult<R>;
+    type QueryArrayResult<R extends any[] = any[]> = pg.QueryArrayResult<R>;
+    type Notification = pg.Notification;
+    type ResultBuilder<R extends QueryResultRow = any> = pg.ResultBuilder<R>;
+    type QueryParse = pg.QueryParse;
+    type BindConfig = pg.BindConfig;
+    type ExecuteConfig = pg.ExecuteConfig;
+    type MessageConfig = pg.MessageConfig;
+    type PoolOptions = pg.PoolOptions;
+    type PoolClient = pg.PoolClient;
+
+    type ClientBase = pg.ClientBase;
+    type Client = pg.Client;
+    type Query = pg.Query;
+    type Events = pg.Events;
+    type Pool = pg.Pool;
+    type Connection = pg.Connection;
+    type DatabaseError = pg.DatabaseError;
+    type TypeOverrides = pg.TypeOverrides;
+    type Result = pg.Result;
+}
+
+export * from "./index.js";
 export default PG;

types/pg/index.d.ts

@@ -326,6 +326,8 @@ import * as Pg from ".";
 export const native: typeof Pg | null;
 
 export { DatabaseError } from "pg-protocol";
+import TypeOverrides = require("./lib/type-overrides");
+export { TypeOverrides };
 
 export class Result<R extends QueryResultRow = any> implements QueryResult<R> {
     command: string;

types/pg/pg-tests.mts

@@ -42,3 +42,10 @@ const client2 = new Client({
 });
 client2.setTypeParser(20, val => Number(val));
 client2.getTypeParser(20);
+
+const myFunc = (c: Client) => {
+    c.on("drain", () => {});
+};
+const myFunc2 = (c: pg.Client) => {
+    c.on("drain", () => {});
+};

types/pg/pg-tests.ts

@@ -1,6 +1,16 @@
 import { connect } from "net";
 import * as pg from "pg";
-import { Client, Connection, CustomTypesConfig, DatabaseError, defaults, Pool, QueryArrayConfig, types } from "pg";
+import {
+    Client,
+    Connection,
+    CustomTypesConfig,
+    DatabaseError,
+    defaults,
+    Pool,
+    QueryArrayConfig,
+    TypeOverrides as TypeOverridesNamed,
+    types,
+} from "pg";
 import TypeOverrides = require("pg/lib/type-overrides");
 import { NoticeMessage } from "pg-protocol/dist/messages.js";
 
@@ -208,6 +218,9 @@ customTypeOverrides.setTypeParser(types.builtins.INT8, BigInt);
 const customCustomTypeOverrides = new TypeOverrides(customTypes);
 customTypeOverrides.setTypeParser(types.builtins.INT8, BigInt);
 
+const customTypeOverridesFromNamed = new TypeOverridesNamed();
+customTypeOverrides.setTypeParser(types.builtins.INT8, BigInt);
+
 client.connection.once("rowDescription", () => {
     console.log("client connection rowDescription event");
 });