fix: strip typenames added to the GQL query result (#352)

* fix: strip typenames added to the GQL query result

* fix: lint errors

Author: sunshastry

src/api/nes.client.ts

@@ -8,6 +8,7 @@ import type {
 } from '@herodevs/eol-shared';
 import { config } from '../config/constants.ts';
 import { debugLogger } from '../service/log.svc.ts';
+import { stripTypename } from '../utils/strip-typename.ts';
 import { createReportMutation, getEolReportQuery } from './gql-operations.ts';
 
 export const createApollo = (uri: string) =>
@@ -70,7 +71,10 @@ export const SbomScanner = (client: ReturnType<typeof createApollo>) => {
       throw new Error('Failed to fetch EOL report');
     }
 
-    return { ...reportMetadata, components };
+    return stripTypename({
+      ...reportMetadata,
+      components,
+    }) as EolReport;
   };
 };
 

src/utils/strip-typename.ts

@@ -0,0 +1,18 @@
+export function stripTypename<T>(obj: T): T {
+  if (Array.isArray(obj)) {
+    return obj.map(stripTypename) as any;
+  }
+
+  if (obj !== null && typeof obj === 'object') {
+    const result: any = {};
+
+    for (const key of Object.keys(obj)) {
+      if (key === '__typename') continue;
+      result[key] = stripTypename((obj as any)[key]);
+    }
+
+    return result;
+  }
+
+  return obj;
+}

test/api/strip-typename.test.ts

@@ -0,0 +1,52 @@
+import assert from 'node:assert';
+import { describe, it } from 'node:test';
+import { stripTypename } from '../../src/utils/strip-typename';
+
+describe('stripTypename', () => {
+  it('removes __typename from objects and nested structures', () => {
+    const input = {
+      __typename: 'Root',
+      id: '1',
+      name: 'Test',
+      nested: {
+        __typename: 'Nested',
+        value: 42,
+        array: [
+          { __typename: 'Item', itemId: 'a' },
+          { __typename: 'Item', itemId: 'b' },
+        ],
+      },
+      list: [
+        { __typename: 'ListItem', listId: 'x' },
+        { __typename: 'ListItem', listId: 'y' },
+      ],
+    };
+
+    const expectedOutput = {
+      id: '1',
+      name: 'Test',
+      nested: {
+        value: 42,
+        array: [{ itemId: 'a' }, { itemId: 'b' }],
+      },
+      list: [{ listId: 'x' }, { listId: 'y' }],
+    };
+
+    const output = stripTypename(input);
+    assert.deepStrictEqual(output, expectedOutput);
+  });
+
+  it('handles null and primitive values correctly', () => {
+    assert.strictEqual(stripTypename(null), null);
+    assert.strictEqual(stripTypename(42), 42);
+    assert.strictEqual(stripTypename('string'), 'string');
+    assert.strictEqual(stripTypename(true), true);
+  });
+
+  it('handles arrays of primitives correctly', () => {
+    const input = [1, 2, 3, { __typename: 'Item', id: 'a' }];
+    const expectedOutput = [1, 2, 3, { id: 'a' }];
+    const output = stripTypename(input);
+    assert.deepStrictEqual(output, expectedOutput);
+  });
+});