fix: ensure correct order if cli args are used (#773)

Author: AnWeber

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [unreleased]
+
+### Fix
+- ensure correct order if cli args are used (#773)
+
+
 ## [6.16.4] (2024-11-03)
 
 ### Features

src/httpYacApi.spec.ts

@@ -0,0 +1,71 @@
+import { getVariables } from './httpYacApi';
+
+import { initFileProvider, parseHttp } from './test/testUtils';
+
+describe('httpYacApi', () => {
+  describe('getVariables', () => {
+    it('should return secret provided by environment', async () => {
+      initFileProvider({
+        '.env': 'secret=from .env',
+      });
+      const httpFile = await parseHttp(`
+      # @name test
+`);
+
+      const variables = await getVariables({
+        httpFile,
+      });
+
+      expect(variables).toEqual(
+        expect.objectContaining({
+          secret: 'from .env',
+        })
+      );
+    });
+    it('should return secret provided by context variables', async () => {
+      initFileProvider({
+        '.env': 'secret=from.env',
+      });
+      const httpFile = await parseHttp(`
+      # @name test
+`);
+
+      const variables = await getVariables({
+        httpFile,
+        variables: {
+          secret: 'cli args',
+        },
+      });
+
+      expect(variables).toEqual(
+        expect.objectContaining({
+          secret: 'cli args',
+        })
+      );
+    });
+    it('should return secret provided by intellij', async () => {
+      initFileProvider({
+        '.env': 'secret=from.env',
+        'http-client.env.json': JSON.stringify({
+          dev: {
+            secret: 'intellij variable',
+          },
+        }),
+      });
+      const httpFile = await parseHttp(`
+      # @name test
+`);
+
+      const variables = await getVariables({
+        httpFile,
+        activeEnvironment: ['dev'],
+      });
+
+      expect(variables).toEqual(
+        expect.objectContaining({
+          secret: 'intellij variable',
+        })
+      );
+    });
+  });
+});

src/httpYacApi.ts

@@ -78,10 +78,13 @@ export async function getVariables(context: models.VariableProviderContext): Pro
   if (vars === HookCancel) {
     return context.variables || {};
   }
+  const contextVars = {
+    ...context.variables,
+  };
   const variables = Object.assign(
     context.variables || {},
     ...vars.map(variables => utils.cleanVariables(variables)),
-    context.variables
+    contextVars
   );
   log.debug('current environment variables', variables);
   return variables;