@take-out/scripts 0.0.47 → 0.0.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@take-out/scripts",
-  "version": "0.0.47",
+  "version": "0.0.48",
   "type": "module",
   "main": "./src/run.ts",
   "sideEffects": false,
@@ -24,7 +24,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@take-out/helpers": "0.0.47",
+    "@take-out/helpers": "workspace:*",
     "glob": "^11.0.0"
   },
   "devDependencies": {

package/src/helpers/get-test-env.ts

@@ -4,14 +4,34 @@ import { loadEnv } from './env-load'
 import { getDockerHost } from './get-docker-host'
 import { getZeroVersion } from './zero-get-version'
 
+// extract the port from a postgres connection string
+function getPortFromConnectionString(url: string | undefined): string | undefined {
+  if (!url) return undefined
+  try {
+    // handle postgresql:// URLs
+    const match = url.match(/:(\d+)\//)
+    return match?.[1]
+  } catch {
+    return undefined
+  }
+}
+
 export async function getTestEnv() {
   const zeroVersion = getZeroVersion()
   const devEnv = await loadEnv('development')
   const dockerHost = getDockerHost()
   const serverEnvFallback = await import(join(process.cwd(), 'src/server/env-server'))
 
-  // explicit URLs required since vxrn loadEnv doesn't override existing env vars
-  const dockerDbBase = `postgresql://user:password@127.0.0.1:5433`
+  // determine db port from (in order of priority):
+  // 1. DOCKER_DB_PORT env var
+  // 2. port from ZERO_UPSTREAM_DB in devEnv
+  // 3. default 5432
+  const dbPort =
+    process.env.DOCKER_DB_PORT ||
+    getPortFromConnectionString(devEnv.ZERO_UPSTREAM_DB as string) ||
+    '5432'
+
+  const dockerDbBase = `postgresql://user:password@127.0.0.1:${dbPort}`
 
   return {
     ...serverEnvFallback,