clean up logic when flattening options object

Author: baileympearson

src/connection_string.ts

@@ -204,6 +204,13 @@ function getUint(name: string, value: unknown): number {
   return parsedValue;
 }
 
+
+function toArray<T>(value: T): T[];
+function toArray<T>(value: T[]): T[];
+function toArray<T>(value: T | T[]): T[] {
+  return Array.isArray(value) ? value : [value];
+}
+
 function toRecord(value: string): Record<string, any> {
   const record = Object.create(null);
   const keyValuePairs = value.split(',');
@@ -324,23 +331,11 @@ export function parseOptions(
   ]);
 
   for (const key of allKeys) {
-    const values = [];
-    if (objectOptions.has(key)) {
-      const options = Array.isArray(objectOptions.get(key))
-        ? objectOptions.get(key)
-        : [objectOptions.get(key)];
-      values.push(...options);
-    }
-    if (urlOptions.has(key)) {
-      const options = urlOptions.get(key) ?? [];
-      values.push(...options);
-    }
-    if (DEFAULT_OPTIONS.has(key)) {
-      const options = Array.isArray(DEFAULT_OPTIONS.get(key))
-        ? DEFAULT_OPTIONS.get(key)
-        : [DEFAULT_OPTIONS.get(key)];
-      values.push(...options);
-    }
+    const values = [objectOptions, urlOptions, DEFAULT_OPTIONS].flatMap(optionsObject => {
+      const options = optionsObject.get(key) ?? [];
+      return toArray(options);
+    });
+
     allOptions.set(key, values);
   }
 

test/unit/assorted/uri_options.spec.test.ts

@@ -28,10 +28,7 @@ describe('URI option spec tests', function () {
     'tlsDisableCertificateRevocationCheck can be set to true',
     'tlsDisableCertificateRevocationCheck can be set to false',
     'tlsDisableOCSPEndpointCheck can be set to true',
-    'tlsDisableOCSPEndpointCheck can be set to false',
-
-    // TODO(NODE-3813): read preference tag issue: parsing rack:1 as rack:true
-    'Valid read preference options are parsed correctly'
+    'tlsDisableOCSPEndpointCheck can be set to false'
   ];
 
   const testsThatDoNotThrowOnWarn = [
@@ -60,6 +57,7 @@ describe('URI option spec tests', function () {
 
       for (const test of suite.tests) {
         it(`${test.description}`, function () {
+          console.error(test);
           if (skipTests.includes(test.description)) {
             return this.skip();
           }