Fix packaging

Author: codetheweb

Diff for: ava.config.js

@@ -2,4 +2,7 @@ module.exports = {
   files: ["src/**/*.test.ts"],
   extensions: ["ts"],
   require: ["esbuild-register"],
+  environmentVariables: {
+    IS_TESTING_AVA_POSTGRES: "true",
+  },
 }

Diff for: package.json

@@ -17,7 +17,9 @@
     "dist"
   ],
   "version": "0.1.0",
-  "main": "index.js",
+  "main": "dist/index.js",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
   "repository": "[email protected]:seamapi/ava-postgres.git",
   "author": "Max Isom <[email protected]>",
   "license": "MIT",

Diff for: src/index.ts

@@ -1,7 +1,6 @@
-import { SharedWorker } from "ava/plugin"
+import { registerSharedWorker, SharedWorker } from "ava/plugin"
 import hash from "object-hash"
 import path from "node:path"
-import { registerSharedTypeScriptWorker } from "ava-typescript-worker"
 import {
   ConnectionDetailsFromWorker,
   InitialWorkerData,
@@ -25,6 +24,36 @@ const mapWorkerConnectionDetailsToConnectionDetails = (
   }),
 })
 
+const getWorker = async (
+  initialData: InitialWorkerData,
+  options?: GetTestPostgresDatabaseFactoryOptions<any>
+) => {
+  const key = hash({
+    initialData,
+    key: options?.key,
+  })
+
+  if (process.env.IS_TESTING_AVA_POSTGRES) {
+    const { registerSharedTypeScriptWorker } = await import(
+      "ava-typescript-worker"
+    )
+    return registerSharedTypeScriptWorker({
+      filename: new URL(
+        `file:${path.resolve(__dirname, "worker-wrapper.ts")}#${key}`
+      ),
+      initialData: initialData as any,
+    })
+  }
+
+  return registerSharedWorker({
+    filename: new URL(
+      `file:${path.resolve(__dirname, "worker-wrapper.mjs")}#${key}`
+    ),
+    initialData: initialData as any,
+    supportedProtocols: ["ava-4"],
+  })
+}
+
 export const getTestPostgresDatabaseFactory = <
   Params extends JsonObject = never
 >(
@@ -35,19 +64,12 @@ export const getTestPostgresDatabaseFactory = <
     containerOptions: options?.container,
   }
 
-  const worker = registerSharedTypeScriptWorker({
-    filename: new URL(
-      `file:${path.resolve(__dirname, "worker-wrapper.ts")}#${hash({
-        initialData,
-        key: options?.key,
-      })}`
-    ),
-    initialData: initialData as any,
-  })
+  const workerPromise = getWorker(initialData, options)
 
   const getTestPostgresDatabase: GetTestPostgresDatabase<Params> = async (
     params
   ) => {
+    const worker = await workerPromise
     await worker.available
 
     const waitForAndHandleReply = async (

Diff for: src/worker-wrapper.ts

@@ -1,7 +1,21 @@
 import { SharedWorker } from "ava/plugin"
 import { Worker } from "./worker"
 
-const workerWrapper = async (protocol: SharedWorker.Protocol) => {
+const needsToNegotiateProtocol = (
+  arg: SharedWorker.FactoryOptions | SharedWorker.Protocol
+): arg is SharedWorker.FactoryOptions => {
+  return (
+    typeof (arg as SharedWorker.FactoryOptions).negotiateProtocol === "function"
+  )
+}
+
+const workerWrapper = async (
+  arg: SharedWorker.FactoryOptions | SharedWorker.Protocol
+) => {
+  const protocol = needsToNegotiateProtocol(arg)
+    ? arg.negotiateProtocol(["ava-4"]).ready()
+    : arg
+
   const { initialData } = protocol
 
   const worker = new Worker(initialData as any)

Diff for: src/worker.ts

@@ -1,4 +1,4 @@
-import { Pool } from "pg"
+import pg from "pg"
 import { GenericContainer } from "testcontainers"
 import { Mutex } from "async-mutex"
 import hash from "object-hash"
@@ -216,7 +216,7 @@ export class Worker {
 
     return {
       container: startedContainer,
-      postgresClient: new Pool({
+      postgresClient: new pg.Pool({
         connectionString: `postgresql://postgres:@${startedContainer.getHost()}:${startedContainer.getMappedPort(
           5432
         )}/postgres`,

Diff for: tsup.config.ts

@@ -1,8 +1,9 @@
 import { defineConfig } from "tsup"
 
 export default defineConfig({
-  entry: ["src/index.ts"],
+  entry: ["src/index.ts", "src/worker-wrapper.ts"],
   dts: true,
   sourcemap: true,
   format: ["cjs", "esm"],
+  external: ["ava-typescript-worker"],
 })