@amerged/ohmyhost-cli 0.1.41 → 0.1.43

package/src/packages/contracts/src/database-access.ts

@@ -112,21 +112,12 @@ export interface ProjectDatabaseAccessFields {
     | "data_change"
     | null;
 }
-export type ProjectDatabaseAccess = ProjectDatabaseAccessFields &
-  (
-    | {
-        readonly database: "neondb";
-        readonly provider?: never;
-        readonly transport?: never;
-        readonly websocket_url?: never;
-      }
-    | {
-        readonly provider: "pgcf";
-        readonly transport: "wss";
-        readonly websocket_url: string;
-        readonly database: string;
-      }
-  );
+export type ProjectDatabaseAccess = ProjectDatabaseAccessFields & {
+  readonly provider: "pgcf";
+  readonly transport: "wss";
+  readonly websocket_url: string;
+  readonly database: string;
+};
 export type ProjectDatabaseAccessCredential = ProjectDatabaseAccess & {
   readonly connection_uri: string;
   readonly psql_command: string;
@@ -140,6 +131,9 @@ const ACCESS_KEYS = [
   "mode",
   "role_name",
   "host",
+  "provider",
+  "transport",
+  "websocket_url",
   "database",
   "label",
   "state",
@@ -177,26 +171,23 @@ export function parseProjectDatabaseAccessRequest(value: unknown): ProjectDataba
 export function assertProjectDatabaseAccess(
   value: unknown,
 ): asserts value is ProjectDatabaseAccess {
-  if (!record(value) || !exact(value, accessKeys(value)))
-    throw new TypeError("Invalid database access");
+  if (!record(value) || !exact(value, ACCESS_KEYS)) throw new TypeError("Invalid database access");
   assertAccessFields(value);
 }
 export function assertProjectDatabaseAccessCredential(
   value: unknown,
 ): asserts value is ProjectDatabaseAccessCredential {
-  if (!record(value) || !exact(value, [...accessKeys(value), "connection_uri", "psql_command"]))
+  if (!record(value) || !exact(value, [...ACCESS_KEYS, "connection_uri", "psql_command"]))
     throw new TypeError("Invalid database access credential");
   assertAccessFields(value);
   const uri = value["connection_uri"];
   if (
     typeof uri !== "string" ||
-    (value["provider"] === "pgcf"
-      ? typeof value["psql_command"] !== "string" ||
-        !new RegExp(
-          `^ohmyhost database psql --project [0-7][0-9A-HJKMNP-TV-Z]{25} --environment ${value["environment"]} --mode ${value["mode"]}$`,
-          "u",
-        ).test(value["psql_command"])
-      : value["psql_command"] !== `psql '${uri}'`)
+    typeof value["psql_command"] !== "string" ||
+    !new RegExp(
+      `^ohmyhost database psql --project [0-7][0-9A-HJKMNP-TV-Z]{25} --environment ${value["environment"]} --mode ${value["mode"]}$`,
+      "u",
+    ).test(value["psql_command"])
   )
     throw new TypeError("Invalid database access credential");
   let parsed: URL;
@@ -206,20 +197,14 @@ export function assertProjectDatabaseAccessCredential(
     throw new TypeError("Invalid database access credential");
   }
   if (
-    (value["provider"] === "pgcf"
-      ? !["postgres:", "postgresql:"].includes(parsed.protocol)
-      : parsed.protocol !== "postgresql:") ||
+    !["postgres:", "postgresql:"].includes(parsed.protocol) ||
     decodeURIComponent(parsed.username) !== value["role_name"] ||
     parsed.password === "" ||
     parsed.hostname !== value["host"] ||
-    (value["provider"] === "pgcf"
-      ? parsed.port !== "" && parsed.port !== "5432"
-      : parsed.host !== value["host"]) ||
+    (parsed.port !== "" && parsed.port !== "5432") ||
     decodeURIComponent(parsed.pathname.slice(1)) !== value["database"] ||
     parsed.hash !== "" ||
-    (value["provider"] === "pgcf"
-      ? !["", "?sslmode=require", "?sslmode=verify-full"].includes(parsed.search)
-      : parsed.search !== "?sslmode=require")
+    !["", "?sslmode=require", "?sslmode=verify-full"].includes(parsed.search)
   )
     throw new TypeError("Invalid database access credential");
 }
@@ -235,11 +220,6 @@ export function assertProjectDatabaseAccessPage(
     throw new TypeError("Invalid database access page");
   for (const item of value["items"]) assertProjectDatabaseAccess(item);
 }
-function accessKeys(value: Record<string, unknown>): readonly string[] {
-  return value["provider"] === "pgcf"
-    ? [...ACCESS_KEYS, "provider", "transport", "websocket_url"]
-    : ACCESS_KEYS;
-}
 function assertAccessFields(value: Record<string, unknown>): void {
   const revoked = value["revoked_at"],
     reason = value["revocation_reason"];
@@ -252,12 +232,11 @@ function assertAccessFields(value: Record<string, unknown>): void {
     !ACCESS_ROLE_PATTERN.test(value["role_name"]) ||
     typeof value["host"] !== "string" ||
     !/^[a-z0-9]([a-z0-9.-]{0,251}[a-z0-9])?$/u.test(value["host"]) ||
-    (value["provider"] === "pgcf"
-      ? typeof value["database"] !== "string" ||
-        !/^[a-z][a-z0-9]{19}$/u.test(value["database"]) ||
-        value["transport"] !== "wss" ||
-        value["websocket_url"] !== `wss://${value["host"]}/`
-      : value["database"] !== "neondb") ||
+    value["provider"] !== "pgcf" ||
+    value["transport"] !== "wss" ||
+    value["websocket_url"] !== `wss://${value["host"]}/` ||
+    typeof value["database"] !== "string" ||
+    !/^[a-z][a-z0-9]{19}$/u.test(value["database"]) ||
     (value["label"] !== null && accessLabel(value["label"]) !== value["label"]) ||
     !["active", "expired", "revoked"].includes(String(value["state"])) ||
     !timestamp(value["issued_at"]) ||