Skip to content

Expose TypeOverrides in esm & cjs from root of package #3433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 44 additions & 1 deletion packages/pg-esm-test/pg.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
import assert from 'node:assert'
import { describe, it } from 'node:test'
import pg, { Client, Pool } from 'pg'
import pg, {
Client,
Pool,
Connection,
defaults,
types,
DatabaseError,
escapeIdentifier,
escapeLiteral,
Result,
TypeOverrides,
} from 'pg'

describe('pg', () => {
it('should export Client constructor', () => {
Expand All @@ -14,4 +25,36 @@ describe('pg', () => {
it('should still provide default export', () => {
assert.ok(new pg.Pool())
})

it('should export Connection constructor', () => {
assert.ok(new Connection())
})

it('should export defaults', () => {
assert.ok(defaults)
})

it('should export types', () => {
assert.ok(types)
})

it('should export DatabaseError', () => {
assert.ok(DatabaseError)
})

it('should export escapeIdentifier', () => {
assert.ok(escapeIdentifier)
})

it('should export escapeLiteral', () => {
assert.ok(escapeLiteral)
})

it('should export Result', () => {
assert.ok(Result)
})

it('should export TypeOverrides', () => {
assert.ok(TypeOverrides)
})
})
2 changes: 2 additions & 0 deletions packages/pg/esm/index.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ export const Query = pg.Query
export const DatabaseError = pg.DatabaseError
export const escapeIdentifier = pg.escapeIdentifier
export const escapeLiteral = pg.escapeLiteral
export const Result = pg.Result
export const TypeOverrides = pg.TypeOverrides

// Also export the defaults
export const defaults = pg.defaults
Expand Down
14 changes: 8 additions & 6 deletions packages/pg/lib/index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
'use strict'

var Client = require('./client')
var defaults = require('./defaults')
var Connection = require('./connection')
var Result = require('./result')
var utils = require('./utils')
var Pool = require('pg-pool')
const Client = require('./client')
const defaults = require('./defaults')
const Connection = require('./connection')
const Result = require('./result')
const utils = require('./utils')
const Pool = require('pg-pool')
const TypeOverrides = require('./type-overrides')
const { DatabaseError } = require('pg-protocol')
const { escapeIdentifier, escapeLiteral } = require('./utils')

Expand All @@ -26,6 +27,7 @@ var PG = function (clientConstructor) {
this.Connection = Connection
this.types = require('pg-types')
this.DatabaseError = DatabaseError
this.TypeOverrides = TypeOverrides
this.escapeIdentifier = escapeIdentifier
this.escapeLiteral = escapeLiteral
this.Result = Result
Expand Down