Separate functions into files

src/lib.ts → src/connection-uri-object.ts

@@ -1,4 +1,4 @@
-import { parseKeywordValueConnectionString } from "./parser";
+import { KeyValuePair } from "./parser";
 
 interface ConnectionUriObject {
   userspec?: {
@@ -16,57 +16,9 @@ interface ConnectionUriObject {
   }[];
 }
 
-function connectionUriObjectToString(uriObject: ConnectionUriObject): string {
-  let userspec: string = "";
-  if (uriObject.userspec) {
-    const { user, password } = uriObject.userspec;
-    userspec += user;
-    if (password) {
-      userspec += `:${encodeURIComponent(password)}`;
-    }
-
-    userspec += "@";
-  }
-
-  let hostspec: string = "";
-  if (uriObject.hostspec) {
-    const { host, port } = uriObject.hostspec;
-    if (host) {
-      hostspec += host;
-    }
-    if (typeof port !== "undefined") {
-      hostspec += `:${port}`;
-    }
-  }
-
-  let dbname: string = "";
-  if (typeof uriObject.dbname !== "undefined") {
-    dbname += `/${encodeURIComponent(uriObject.dbname)}`;
-  }
-
-  let paramspec: string = "";
-  if (uriObject.paramspec) {
-    paramspec += "?";
-
-    paramspec += uriObject.paramspec
-      .map((item) => {
-        const { name, value } = item;
-        return `${encodeURIComponent(name)}=${encodeURIComponent(value)}`;
-      })
-      .join("&");
-  }
-
-  return `postgresql://${userspec}${hostspec}${dbname}${paramspec}`;
-}
-
-export function keywordValueToUri(kvConnectionString: string): string {
-  if (kvConnectionString === "") {
-    return "postgresql://";
-  }
-
-  const pairs = parseKeywordValueConnectionString(kvConnectionString);
-
+function pairsToConnectionUriObject(pairs: KeyValuePair[]): ConnectionUriObject {
   const uriObject: ConnectionUriObject = {};
+
   pairs.forEach((pair) => {
     const { key, value } = pair;
     switch (key) {
@@ -123,7 +75,55 @@ export function keywordValueToUri(kvConnectionString: string): string {
     }
   });
 
-  const connectionStringUri = connectionUriObjectToString(uriObject);
+  return uriObject;
+}
+
+function connectionUriObjectToString(uriObject: ConnectionUriObject): string {
+  let userspec: string = "";
+  if (uriObject.userspec) {
+    const { user, password } = uriObject.userspec;
+    userspec += user;
+    if (password) {
+      userspec += `:${encodeURIComponent(password)}`;
+    }
+
+    userspec += "@";
+  }
+
+  let hostspec: string = "";
+  if (uriObject.hostspec) {
+    const { host, port } = uriObject.hostspec;
+    if (host) {
+      hostspec += host;
+    }
+    if (typeof port !== "undefined") {
+      hostspec += `:${port}`;
+    }
+  }
+
+  let dbname: string = "";
+  if (typeof uriObject.dbname !== "undefined") {
+    dbname += `/${encodeURIComponent(uriObject.dbname)}`;
+  }
+
+  let paramspec: string = "";
+  if (uriObject.paramspec) {
+    paramspec += "?";
+
+    paramspec += uriObject.paramspec
+      .map((item) => {
+        const { name, value } = item;
+        return `${encodeURIComponent(name)}=${encodeURIComponent(value)}`;
+      })
+      .join("&");
+  }
+
+  return `postgresql://${userspec}${hostspec}${dbname}${paramspec}`;
+}
+
+export function pairsToConnectionString(pairs: KeyValuePair[]): string {
+  const connectionUriObject = pairsToConnectionUriObject(pairs);
+  const connectionStringUri = connectionUriObjectToString(connectionUriObject);
 
   return connectionStringUri;
 }

src/index.ts

@@ -1 +1 @@
-export * from "./lib";
+export { keywordValueToUri } from "./keyword-value";

src/lib.test.ts → src/keyword-value.test.ts

@@ -1,7 +1,7 @@
 import { strict as assert } from "node:assert";
 import { describe, it } from "node:test";
 
-import { keywordValueToUri } from "./lib";
+import { keywordValueToUri } from "./keyword-value";
 
 const TEST_CASES: Record<string, string> = {
   "": "postgresql://",
@@ -12,7 +12,7 @@ const TEST_CASES: Record<string, string> = {
     "postgresql://user_name:correct%20horse%20battery%20staple@postgresql/database_name?sslmode=disable",
 };
 
-describe("lib", () => {
+describe("keyword-value", () => {
   describe("keywordValueToUri", () => {
     Object.entries(TEST_CASES).forEach(([input, expectedOutput]) => {
       it(`converts ${JSON.stringify(input)} as ${JSON.stringify(expectedOutput)}`, () => {

src/keyword-value.ts

@@ -0,0 +1,13 @@
+import { parseKeywordValueConnectionString } from "./parser";
+import { pairsToConnectionString } from "./connection-uri-object";
+
+export function keywordValueToUri(kvConnectionString: string): string {
+  if (kvConnectionString === "") {
+    return "postgresql://";
+  }
+
+  const pairs = parseKeywordValueConnectionString(kvConnectionString);
+  const connectionStringUri = pairsToConnectionString(pairs);
+
+  return connectionStringUri;
+}

src/parser.ts

@@ -1,4 +1,4 @@
-interface KeyValuePair {
+export interface KeyValuePair {
   key: string;
   value: string;
 }