@shivaedev/sql 0.46.3 → 0.46.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.46.4 - 2026-11-08
+
+### Changed
+
+- Update `@shivaedev/service` from 0.8.2 to 0.9.0.
+
 ## 0.46.3 - 2026-11-07
 
 ### Fixed

package/dist/databaseAddress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"databaseAddress.d.ts","sourceRoot":"","sources":["../src/databaseAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC,CAqBrG"}
+{"version":3,"file":"databaseAddress.d.ts","sourceRoot":"","sources":["../src/databaseAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAgBlC,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC,CAyBrG"}

package/dist/databaseAddress.js

@@ -1,25 +1,41 @@
 import { Redacted } from "effect";
+function isDecodableHost(hostname) {
+    const runs = hostname.match(/(?:%[\da-f]{2})+/giu) ?? [];
+    if (hostname.replace(/(?:%[\da-f]{2})+/giu, "").includes("%")) {
+        return false;
+    }
+    const encoder = new TextEncoder();
+    const decoder = new TextDecoder();
+    return runs.every((run) => {
+        const bytes = Uint8Array.from(run.match(/[\da-f]{2}/giu) ?? [], (byte) => Number.parseInt(byte, 16));
+        const decoded = encoder.encode(decoder.decode(bytes));
+        return decoded.length === bytes.length && decoded.every((byte, index) => byte === bytes[index]);
+    });
+}
 export function databaseAddress(value) {
-    try {
-        const url = new URL(Redacted.value(value));
-        if (url.protocol !== "postgres:" && url.protocol !== "postgresql:") {
-            return {};
-        }
-        const hostname = url.hostname.startsWith("[") ? url.hostname.slice(1, -1) : decodeURIComponent(url.hostname);
-        // PgConnection applies query parameters in order, after the authority.
-        const host = url.searchParams.getAll("host").at(-1) ?? hostname;
-        const rawPort = url.searchParams.getAll("port").at(-1) ?? url.port;
-        const port = rawPort === "" ? undefined : Number(rawPort);
-        if (host.includes(",") || (port !== undefined && (!Number.isInteger(port) || port < 1 || port > 65_535))) {
-            return {};
-        }
-        return {
-            ...(host === "" && !url.searchParams.has("host") ? {} : { host }),
-            ...(port === undefined ? {} : { port }),
-        };
+    const address = Redacted.value(value);
+    if (!URL.canParse(address)) {
+        return {};
+    }
+    const url = new URL(address);
+    if (url.protocol !== "postgres:" && url.protocol !== "postgresql:") {
+        return {};
+    }
+    const rawHostname = url.hostname.startsWith("[") ? url.hostname.slice(1, -1) : url.hostname;
+    if (!isDecodableHost(rawHostname)) {
+        return {};
     }
-    catch {
+    const hostname = decodeURIComponent(rawHostname);
+    // PgConnection applies query parameters in order, after the authority.
+    const host = url.searchParams.getAll("host").at(-1) ?? hostname;
+    const rawPort = url.searchParams.getAll("port").at(-1) ?? url.port;
+    const port = rawPort === "" ? undefined : Number(rawPort);
+    if (host.includes(",") || (port !== undefined && (!Number.isInteger(port) || port < 1 || port > 65_535))) {
         return {};
     }
+    return {
+        ...(host === "" && !url.searchParams.has("host") ? {} : { host }),
+        ...(port === undefined ? {} : { port }),
+    };
 }
 //# sourceMappingURL=databaseAddress.js.map

package/dist/databaseAddress.js.map

@@ -1 +1 @@
-{"version":3,"file":"databaseAddress.js","sourceRoot":"","sources":["../src/databaseAddress.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,MAAM,UAAU,eAAe,CAAC,KAAgC;IAC/D,IAAI,CAAC;QACJ,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAC3C,IAAI,GAAG,CAAC,QAAQ,KAAK,WAAW,IAAI,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;YACpE,OAAO,EAAE,CAAC;QACX,CAAC;QACD,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC7G,uEAAuE;QACvE,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;QAChE,MAAM,OAAO,GAAG,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC;QACnE,MAAM,IAAI,GAAG,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC1D,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC;YAC1G,OAAO,EAAE,CAAC;QACX,CAAC;QACD,OAAO;YACN,GAAG,CAAC,IAAI,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;YACjE,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;SACvC,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,EAAE,CAAC;IACX,CAAC;AACF,CAAC"}
+{"version":3,"file":"databaseAddress.js","sourceRoot":"","sources":["../src/databaseAddress.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shivaedev/sql",
-  "version": "0.46.3",
+  "version": "0.46.4",
   "description": "Schema-derived repositories over native Effect SQL",
   "keywords": [
     "effect"
@@ -44,18 +44,18 @@
   ],
   "dependencies": {
     "@shivaedev/changes": "0.11.1",
-    "@shivaedev/service": "0.8.2"
+    "@shivaedev/service": "0.9.0"
   },
   "devDependencies": {
     "@effect/platform-node": "4.1.1",
     "@effect/sql-pg": "4.1.1",
     "@effect/sql-sqlite-node": "4.1.1",
-    "@shivaedev/contract": "0.43.2",
-    "@shivaedev/jobs": "0.41.4",
-    "@shivaedev/quality": "0.73.1",
-    "@shivaedev/test-kits": "0.10.5",
-    "@shivaedev/test-sql": "0.24.7",
-    "@shivaedev/test-story": "0.45.4",
+    "@shivaedev/contract": "0.43.4",
+    "@shivaedev/jobs": "0.42.0",
+    "@shivaedev/quality": "0.74.3",
+    "@shivaedev/test-kits": "0.10.7",
+    "@shivaedev/test-sql": "0.24.8",
+    "@shivaedev/test-story": "0.45.6",
     "@types/node": "24.19.2",
     "effect": "4.1.1",
     "typescript": "7.0.2",

package/src/databaseAddress.ts

@@ -1,25 +1,43 @@
 import type { PgPoolConfig } from "@effect/sql-pg/PgClient";
 import { Redacted } from "effect";
 
+function isDecodableHost(hostname: string): boolean {
+	const runs = hostname.match(/(?:%[\da-f]{2})+/giu) ?? [];
+	if (hostname.replace(/(?:%[\da-f]{2})+/giu, "").includes("%")) {
+		return false;
+	}
+	const encoder = new TextEncoder();
+	const decoder = new TextDecoder();
+	return runs.every((run) => {
+		const bytes = Uint8Array.from(run.match(/[\da-f]{2}/giu) ?? [], (byte) => Number.parseInt(byte, 16));
+		const decoded = encoder.encode(decoder.decode(bytes));
+		return decoded.length === bytes.length && decoded.every((byte, index) => byte === bytes[index]);
+	});
+}
+
 export function databaseAddress(value: Redacted.Redacted<string>): Pick<PgPoolConfig, "host" | "port"> {
-	try {
-		const url = new URL(Redacted.value(value));
-		if (url.protocol !== "postgres:" && url.protocol !== "postgresql:") {
-			return {};
-		}
-		const hostname = url.hostname.startsWith("[") ? url.hostname.slice(1, -1) : decodeURIComponent(url.hostname);
-		// PgConnection applies query parameters in order, after the authority.
-		const host = url.searchParams.getAll("host").at(-1) ?? hostname;
-		const rawPort = url.searchParams.getAll("port").at(-1) ?? url.port;
-		const port = rawPort === "" ? undefined : Number(rawPort);
-		if (host.includes(",") || (port !== undefined && (!Number.isInteger(port) || port < 1 || port > 65_535))) {
-			return {};
-		}
-		return {
-			...(host === "" && !url.searchParams.has("host") ? {} : { host }),
-			...(port === undefined ? {} : { port }),
-		};
-	} catch {
+	const address = Redacted.value(value);
+	if (!URL.canParse(address)) {
+		return {};
+	}
+	const url = new URL(address);
+	if (url.protocol !== "postgres:" && url.protocol !== "postgresql:") {
+		return {};
+	}
+	const rawHostname = url.hostname.startsWith("[") ? url.hostname.slice(1, -1) : url.hostname;
+	if (!isDecodableHost(rawHostname)) {
+		return {};
+	}
+	const hostname = decodeURIComponent(rawHostname);
+	// PgConnection applies query parameters in order, after the authority.
+	const host = url.searchParams.getAll("host").at(-1) ?? hostname;
+	const rawPort = url.searchParams.getAll("port").at(-1) ?? url.port;
+	const port = rawPort === "" ? undefined : Number(rawPort);
+	if (host.includes(",") || (port !== undefined && (!Number.isInteger(port) || port < 1 || port > 65_535))) {
 		return {};
 	}
+	return {
+		...(host === "" && !url.searchParams.has("host") ? {} : { host }),
+		...(port === undefined ? {} : { port }),
+	};
 }