Merge pull request #114 from malthe/dts-bundle-generator

Roll up type declarations

Author: malthe

.github/workflows/main.yml

@@ -45,6 +45,8 @@ jobs:
           npm run build:esm
           echo '{"type": "commonjs"}' > dist/commonjs/package.json
           echo '{"type": "module"}' > dist/module/package.json
+          npm i --no-save dts-bundle-generator
+          npx dts-bundle-generator -o dist/index.d.ts src/index.ts
           mkdir dest
           npm pack --pack-destination=dest
       - name: Typedoc

package.json

@@ -13,10 +13,18 @@
     "homepage": "https://github.com/malthe/ts-postgres",
     "author": "Malthe Borch <[email protected]>",
     "main": "./dist/module/index.js",
-    "types": "./dist/module/index.d.ts",
+    "types": "./dist/index.d.ts",
     "exports": {
-        "require": "./dist/commonjs/index.js",
-        "import": "./dist/module/index.js"
+        ".": {
+            "require": {
+                "types": "./dist/index.d.ts",
+                "default": "./dist/commonjs/index.js"
+            },
+            "import": {
+                "types": "./dist/index.d.ts",
+                "default": "./dist/module/index.js"
+            }
+        }
     },
     "files": [
         "/dist"
@@ -58,6 +66,7 @@
         "@typescript-eslint/eslint-plugin": "^6",
         "@typescript-eslint/parser": "^6",
         "colors": "^1",
+        "dts-bundle-generator": "^9.3.1",
         "eslint": "^8",
         "eslint-config-standard": "^17",
         "eslint-plugin-import": "^2",

src/client.ts

@@ -40,7 +40,6 @@ import {
 } from './protocol.js';
 
 import {
-    BufferEncoding,
     DataFormat,
     DataType,
     ValueTypeReader,

src/index.ts

@@ -14,7 +14,6 @@ import type { Configuration } from './client.js';
 export {
     DataFormat,
     DataType,
-    type BufferEncoding,
     type Point,
     type ValueTypeReader,
 } from './types.js';

src/protocol.ts

@@ -8,7 +8,6 @@ import { sum } from './utils.js';
 import {
     arrayDataTypeMapping,
     isPoint,
-    BufferEncoding,
     DataFormat,
     DataType,
     ValueTypeReader,

src/types.ts

@@ -1,10 +1,5 @@
 import { Buffer } from 'node:buffer';
 
-// This type isn't really exposed, but we can tease it out using some type gymnastics.
-export type BufferEncoding = NonNullable<
-    Required<Parameters<Buffer['toString']>[0]>
->;
-
 export const enum DataType {
     Bool = 16,
     Bytea = 17,

tsconfig.json

@@ -7,7 +7,7 @@
         "strict": true,
         "sourceMap": true,
         "inlineSourceMap": false,
-        "declaration": true,
+        "declaration": false,
         "noImplicitAny": true,
         "isolatedModules": true,
         "noUnusedParameters": true,