Moved deduplicateVariableArray to a separate file…

Author: matt-aitken

apps/webapp/app/v3/deduplicateVariableArray.server.ts

@@ -0,0 +1,14 @@
+import { type EnvironmentVariable } from "./environmentVariables/repository";
+
+/** Later variables override earlier ones */
+export function deduplicateVariableArray(variables: EnvironmentVariable[]) {
+  const result: EnvironmentVariable[] = [];
+  // Process array in reverse order so later variables override earlier ones
+  for (const variable of [...variables].reverse()) {
+    if (!result.some((v) => v.key === variable.key)) {
+      result.push(variable);
+    }
+  }
+  // Reverse back to maintain original order but with later variables taking precedence
+  return result.reverse();
+}

apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts

@@ -16,6 +16,7 @@ import {
   type Result,
 } from "./repository";
 import { removeBlacklistedVariables } from "../environmentVariableRules.server";
+import { deduplicateVariableArray } from "../deduplicateVariableArray.server";
 
 function secretKeyProjectPrefix(projectId: string) {
   return `environmentvariable:${projectId}:`;
@@ -842,19 +843,6 @@ export async function resolveVariablesForEnvironment(
   ]);
 }
 
-/** Later variables override earlier ones */
-export function deduplicateVariableArray(variables: EnvironmentVariable[]) {
-  const result: EnvironmentVariable[] = [];
-  // Process array in reverse order so later variables override earlier ones
-  for (const variable of [...variables].reverse()) {
-    if (!result.some((v) => v.key === variable.key)) {
-      result.push(variable);
-    }
-  }
-  // Reverse back to maintain original order but with later variables taking precedence
-  return result.reverse();
-}
-
 async function resolveOverridableTriggerVariables(
   runtimeEnvironment: RuntimeEnvironmentForEnvRepo
 ) {

apps/webapp/test/environmentVariableDeduplication.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect } from "vitest";
-import { deduplicateVariableArray } from "../app/v3/environmentVariables/environmentVariablesRepository.server";
 import type { EnvironmentVariable } from "../app/v3/environmentVariables/repository";
+import { deduplicateVariableArray } from "~/v3/deduplicateVariableArray.server";
 
 describe("Deduplicate variables", () => {
   it("should keep later variables when there are duplicates", () => {