reduce duplicates

dracomithril · michalgrezel · commit 2e36dcd6ffc1 · 2025-08-19T09:36:16.000+02:00
diff --git a/packages/openapi-ts/src/openApi/2.0.x/parser/operation.ts b/packages/openapi-ts/src/openApi/2.0.x/parser/operation.ts
@@ -261,7 +261,7 @@ const operationToIrOperation = ({
   }
 
   if (operation.security) {
-    const securitySchemeObjects: Array<IR.SecurityObject> = [];
+    const securitySchemeObjects: Map<string, IR.SecurityObject> = new Map();
 
     for (const securityRequirementObject of operation.security) {
       for (const name in securityRequirementObject) {
@@ -325,12 +325,12 @@ const operationToIrOperation = ({
           continue;
         }
 
-        securitySchemeObjects.push(irSecuritySchemeObject);
+        securitySchemeObjects.set(name, irSecuritySchemeObject);
       }
     }
 
-    if (securitySchemeObjects.length) {
-      irOperation.security = securitySchemeObjects;
+    if (securitySchemeObjects.size) {
+      irOperation.security = Array.from(securitySchemeObjects.values());
     }
   }
 
diff --git a/packages/openapi-ts/src/openApi/3.0.x/parser/__tests__/operation.test.ts b/packages/openapi-ts/src/openApi/3.0.x/parser/__tests__/operation.test.ts
@@ -0,0 +1,61 @@
+import { describe, expect, it } from 'vitest';
+
+import type { IR } from '../../../../ir/types';
+import type { SecuritySchemeObject } from '../../types/spec';
+import { parseOperation } from '../operation';
+
+type ParseOperationProps = Parameters<typeof parseOperation>[0];
+
+describe('operation', () => {
+  const context = {
+    config: {
+      plugins: {},
+    },
+    ir: {
+      paths: {},
+      servers: [],
+    },
+  } as unknown as IR.Context;
+
+  it('should parse operation correctly', () => {
+    const method = 'get';
+    const operation: ParseOperationProps['operation'] = {
+      operationId: 'testOperation',
+      responses: {},
+      security: [
+        {
+          apiKeyAuth: [],
+        },
+        {
+          apiKeyAuth: [],
+        },
+      ],
+      summary: 'Test Operation',
+    };
+    const path = '/test';
+    const securitySchemesMap = new Map<string, SecuritySchemeObject>([
+      ['apiKeyAuth', { in: 'header', name: 'apiKey', type: 'apiKey' }],
+    ]);
+    const state: ParseOperationProps['state'] = {
+      ids: new Map<string, string>(),
+    };
+
+    parseOperation({
+      context,
+      method,
+      operation,
+      path,
+      securitySchemesMap,
+      state,
+    });
+
+    expect(context.ir.paths?.[path]?.[method]).toEqual({
+      id: 'testOperation',
+      method,
+      operationId: 'testOperation',
+      path,
+      security: [{ in: 'header', name: 'apiKey', type: 'apiKey' }],
+      summary: 'Test Operation',
+    });
+  });
+});
diff --git a/packages/openapi-ts/src/openApi/3.0.x/parser/operation.ts b/packages/openapi-ts/src/openApi/3.0.x/parser/operation.ts
@@ -203,7 +203,7 @@ const operationToIrOperation = ({
   }
 
   if (operation.security) {
-    const securitySchemeObjects: Array<IR.SecurityObject> = [];
+    const securitySchemeObjects: Map<string, IR.SecurityObject> = new Map();
 
     for (const securityRequirementObject of operation.security) {
       for (const name in securityRequirementObject) {
@@ -213,12 +213,12 @@ const operationToIrOperation = ({
           continue;
         }
 
-        securitySchemeObjects.push(securitySchemeObject);
+        securitySchemeObjects.set(name, securitySchemeObject);
       }
     }
 
-    if (securitySchemeObjects.length) {
-      irOperation.security = securitySchemeObjects;
+    if (securitySchemeObjects.size) {
+      irOperation.security = Array.from(securitySchemeObjects.values());
     }
   }
 
diff --git a/packages/openapi-ts/src/openApi/3.1.x/parser/__tests__/operation.test.ts b/packages/openapi-ts/src/openApi/3.1.x/parser/__tests__/operation.test.ts
@@ -0,0 +1,61 @@
+import { describe, expect, it } from 'vitest';
+
+import type { IR } from '../../../../ir/types';
+import type { SecuritySchemeObject } from '../../types/spec';
+import { parseOperation } from '../operation';
+
+type ParseOperationProps = Parameters<typeof parseOperation>[0];
+
+describe('operation', () => {
+  const context = {
+    config: {
+      plugins: {},
+    },
+    ir: {
+      paths: {},
+      servers: [],
+    },
+  } as unknown as IR.Context;
+
+  it('should parse operation correctly', () => {
+    const method = 'get';
+    const operation: ParseOperationProps['operation'] = {
+      operationId: 'testOperation',
+      responses: {},
+      security: [
+        {
+          apiKeyAuth: [],
+        },
+        {
+          apiKeyAuth: [],
+        },
+      ],
+      summary: 'Test Operation',
+    };
+    const path = '/test';
+    const securitySchemesMap = new Map<string, SecuritySchemeObject>([
+      ['apiKeyAuth', { in: 'header', name: 'apiKey', type: 'apiKey' }],
+    ]);
+    const state: ParseOperationProps['state'] = {
+      ids: new Map<string, string>(),
+    };
+
+    parseOperation({
+      context,
+      method,
+      operation,
+      path,
+      securitySchemesMap,
+      state,
+    });
+
+    expect(context.ir.paths?.[path]?.[method]).toEqual({
+      id: 'testOperation',
+      method,
+      operationId: 'testOperation',
+      path,
+      security: [{ in: 'header', name: 'apiKey', type: 'apiKey' }],
+      summary: 'Test Operation',
+    });
+  });
+});
diff --git a/packages/openapi-ts/src/openApi/3.1.x/parser/operation.ts b/packages/openapi-ts/src/openApi/3.1.x/parser/operation.ts
@@ -188,7 +188,7 @@ const operationToIrOperation = ({
   }
 
   if (operation.security) {
-    const securitySchemeObjects: Array<IR.SecurityObject> = [];
+    const securitySchemeObjects: Map<string, IR.SecurityObject> = new Map();
 
     for (const securityRequirementObject of operation.security) {
       for (const name in securityRequirementObject) {
@@ -198,12 +198,12 @@ const operationToIrOperation = ({
           continue;
         }
 
-        securitySchemeObjects.push(securitySchemeObject);
+        securitySchemeObjects.set(name, securitySchemeObject);
       }
     }
 
-    if (securitySchemeObjects.length) {
-      irOperation.security = securitySchemeObjects;
+    if (securitySchemeObjects.size) {
+      irOperation.security = Array.from(securitySchemeObjects.values());
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ const operationToIrOperation = ({`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`if (operation.security) {`
`264`		`- const securitySchemeObjects: Array<IR.SecurityObject> = [];`
	`264`	`+ const securitySchemeObjects: Map<string, IR.SecurityObject> = new Map();`
`265`	`265`
`266`	`266`	`for (const securityRequirementObject of operation.security) {`
`267`	`267`	`for (const name in securityRequirementObject) {`
`@@ -325,12 +325,12 @@ const operationToIrOperation = ({`
`325`	`325`	`continue;`
`326`	`326`	`}`
`327`	`327`
`328`		`- securitySchemeObjects.push(irSecuritySchemeObject);`
	`328`	`+ securitySchemeObjects.set(name, irSecuritySchemeObject);`
`329`	`329`	`}`
`330`	`330`	`}`
`331`	`331`
`332`		`- if (securitySchemeObjects.length) {`
`333`		`- irOperation.security = securitySchemeObjects;`
	`332`	`+ if (securitySchemeObjects.size) {`
	`333`	`+ irOperation.security = Array.from(securitySchemeObjects.values());`
`334`	`334`	`}`
`335`	`335`	`}`
`336`	`336`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ const operationToIrOperation = ({`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`if (operation.security) {`
`206`		`- const securitySchemeObjects: Array<IR.SecurityObject> = [];`
	`206`	`+ const securitySchemeObjects: Map<string, IR.SecurityObject> = new Map();`
`207`	`207`
`208`	`208`	`for (const securityRequirementObject of operation.security) {`
`209`	`209`	`for (const name in securityRequirementObject) {`
`@@ -213,12 +213,12 @@ const operationToIrOperation = ({`
`213`	`213`	`continue;`
`214`	`214`	`}`
`215`	`215`
`216`		`- securitySchemeObjects.push(securitySchemeObject);`
	`216`	`+ securitySchemeObjects.set(name, securitySchemeObject);`
`217`	`217`	`}`
`218`	`218`	`}`
`219`	`219`
`220`		`- if (securitySchemeObjects.length) {`
`221`		`- irOperation.security = securitySchemeObjects;`
	`220`	`+ if (securitySchemeObjects.size) {`
	`221`	`+ irOperation.security = Array.from(securitySchemeObjects.values());`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ const operationToIrOperation = ({`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`if (operation.security) {`
`191`		`- const securitySchemeObjects: Array<IR.SecurityObject> = [];`
	`191`	`+ const securitySchemeObjects: Map<string, IR.SecurityObject> = new Map();`
`192`	`192`
`193`	`193`	`for (const securityRequirementObject of operation.security) {`
`194`	`194`	`for (const name in securityRequirementObject) {`
`@@ -198,12 +198,12 @@ const operationToIrOperation = ({`
`198`	`198`	`continue;`
`199`	`199`	`}`
`200`	`200`
`201`		`- securitySchemeObjects.push(securitySchemeObject);`
	`201`	`+ securitySchemeObjects.set(name, securitySchemeObject);`
`202`	`202`	`}`
`203`	`203`	`}`
`204`	`204`
`205`		`- if (securitySchemeObjects.length) {`
`206`		`- irOperation.security = securitySchemeObjects;`
	`205`	`+ if (securitySchemeObjects.size) {`
	`206`	`+ irOperation.security = Array.from(securitySchemeObjects.values());`
`207`	`207`	`}`
`208`	`208`	`}`
`209`	`209`