review

Signed-off-by: flakey5 <73616808+flakey5@users.noreply.github.com>

Author: flakey5

e2e-tests/util.ts

@@ -28,7 +28,7 @@ async function populateR2BucketDirectory(directory: Directory): Promise<void> {
   await Promise.all(promises);
 }
 
-function populateDirectoryCache(directory: Directory): Array<Promise<unknown>> {
+async function populateDirectoryCache(directory: Directory): Promise<void> {
   let hasIndexHtmlFile = false;
   const cachedDirectory: ReadDirectoryResult = {
     subdirectories: Object.keys(directory.subdirectories),
@@ -58,7 +58,7 @@ function populateDirectoryCache(directory: Directory): Array<Promise<unknown>> {
     ...Object.values(directory.subdirectories).map(populateDirectoryCache),
   ];
 
-  return promises;
+  await Promise.all(promises);
 }
 
 /**
@@ -77,7 +77,7 @@ export async function populateDirectoryCacheWithDevBucket(): Promise<void> {
   const devBucket = inject('devBucket');
 
   // Write it to KV
-  await Promise.all(populateDirectoryCache(devBucket));
+  await populateDirectoryCache(devBucket);
 }
 
 declare module 'cloudflare:test' {

scripts/utils/addSymlinksToDirectoryCache.mjs

@@ -98,8 +98,8 @@ export async function addVersionSymlinksToCachedDocsDirectory(
       subdirectory.startsWith('v') || subdirectory.startsWith('latest')
   );
 
-  docsDirectory.subdirectories = Array.from(
-    new Set([...docsDirectory.subdirectories, ...versionDirectories])
+  docsDirectory.subdirectories = makeArrayUnique(
+    docsDirectory.subdirectories.concat(versionDirectories)
   ).sort();
 }
 
@@ -243,3 +243,30 @@ export async function addSymlinksToDirectoryCache(
 
   await addStaticFileSymlinksToCache(client, cachedDirectories, latestVersion);
 }
+
+/**
+ * Make an array unique without needing to copy its contents or do things
+ * more inefficiently
+ *
+ * @template {Array<unknown>} T
+ *
+ * @param {T} array
+ * @returns {T}
+ */
+function makeArrayUnique(array) {
+  /**
+   * @type {Record<T[number], boolean>}
+   */
+  const seen = {};
+
+  return array.filter(value => {
+    // eslint-disable-next-line no-prototype-builtins
+    if (seen.hasOwnProperty(value)) {
+      return false;
+    }
+
+    seen[value] = true;
+
+    return true;
+  });
+}