fix: address PR comments (#335)

Author: makdeniss

projects/lib/services/resource/resource.service.spec.ts

@@ -679,29 +679,6 @@ describe('ResourceService', () => {
     });
   });
 
-  describe('stripTypename (private)', () => {
-    it('should return primitives as-is', () => {
-      // @ts-ignore accessing private method for test
-      expect((service as any).stripTypename(42)).toBe(42);
-      // @ts-ignore
-      expect((service as any).stripTypename('x')).toBe('x');
-      // @ts-ignore
-      expect((service as any).stripTypename(null)).toBe(null);
-      // @ts-ignore
-      expect((service as any).stripTypename(undefined)).toBe(undefined);
-    });
-
-    it('should clean nested objects and arrays', () => {
-      const input = {
-        __typename: 'Root',
-        a: { __typename: 'A', b: 1 },
-        arr: [{ __typename: 'X', v: 1 }, [{ __typename: 'Y', z: 2 }, 3]],
-      } as any;
-      // @ts-ignore
-      const output = (service as any).stripTypename(input);
-      expect(output).toEqual({ a: { b: 1 }, arr: [{ v: 1 }, [{ z: 2 }, 3]] });
-    });
-  });
 
   describe('readAccountInfo', () => {
     it('should read account info', (done) => {

projects/lib/services/resource/resource.service.ts

@@ -7,6 +7,7 @@ import { LuigiCoreService } from '@openmfp/portal-ui-lib';
 import {
   getValueByPath,
   replaceDotsAndHyphensWithUnderscores,
+  stripTypename,
 } from '@platform-mesh/portal-ui-lib/utils';
 import { gql } from 'apollo-angular';
 import * as gqlBuilder from 'gql-query-builder';
@@ -286,7 +287,7 @@ export class ResourceService {
     const kind = resourceDefinition.kind;
     const namespace = nodeContext.namespaceId;
 
-    const cleanResource = this.stripTypename(resource);
+    const cleanResource = stripTypename(resource);
 
     const mutation = gqlBuilder.mutation({
       operation: group,
@@ -367,17 +368,4 @@ export class ResourceService {
     return nodeContext?.resourceDefinition?.scope === 'Namespaced';
   }
 
-  private stripTypename<T>(value: T): T {
-    if (Array.isArray(value)) {
-      return (value as any[]).map((v) => this.stripTypename(v)) as T;
-    }
-    if (value && typeof value === 'object') {
-      const { __typename, ...rest } = value as Record<string, unknown>;
-      for (const k of Object.keys(rest)) {
-        rest[k] = this.stripTypename(rest[k]);
-      }
-      return rest as T;
-    }
-    return value;
-  }
 }

projects/lib/utils/utils/index.ts

@@ -2,3 +2,4 @@ export * from './columns-to-gql-fields';
 export * from './get-value-by-path';
 export * from './group-name-sanitizer';
 export * from './resource-field-by-path';
+export * from './resource-sanitizer';

projects/lib/utils/utils/resource-sanitizer.spec.ts

@@ -0,0 +1,21 @@
+import { stripTypename } from '@platform-mesh/portal-ui-lib/utils';
+
+describe('stripTypename (utils)', () => {
+  it('should return primitives as-is', () => {
+    expect(stripTypename(42 as any)).toBe(42);
+    expect(stripTypename('x' as any)).toBe('x');
+    expect(stripTypename(null as any)).toBe(null);
+    expect(stripTypename(undefined as any)).toBe(undefined);
+  });
+
+  it('should clean nested objects and arrays', () => {
+    const input = {
+      __typename: 'Root',
+      a: { __typename: 'A', b: 1 },
+      arr: [{ __typename: 'X', v: 1 }, [{ __typename: 'Y', z: 2 }, 3]],
+    } as any;
+
+    const output = stripTypename(input);
+    expect(output).toEqual({ a: { b: 1 }, arr: [{ v: 1 }, [{ z: 2 }, 3]] });
+  });
+});

projects/lib/utils/utils/resource-sanitizer.ts

@@ -0,0 +1,16 @@
+export function stripTypename<T>(value: T): T {
+  if (Array.isArray(value)) {
+    return (value as unknown as any[]).map((v) => stripTypename(v)) as T;
+  }
+  if (value && typeof value === 'object') {
+    const { __typename, ...rest } = value as Record<string, unknown> & {
+      __typename?: string;
+    };
+    for (const k of Object.keys(rest)) {
+      // @ts-ignore - rest is an indexable object
+      rest[k] = stripTypename((rest as any)[k]);
+    }
+    return rest as T;
+  }
+  return value;
+}