reduce

Author: mydea

packages/core/src/integration.ts

@@ -170,16 +170,8 @@ function findIndex<T>(arr: T[], callback: (item: T) => boolean): number {
  * This will ensure to add the given name both to the function definition (as id),
  * as well as to the integration return value.
  */
-export function makeIntegrationFn<
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  Fn extends (...rest: any[]) => Partial<IntegrationFnResult>,
->(name: string, fn: Fn): ((...rest: Parameters<Fn>) => ReturnType<Fn> & { name: string }) & { id: string } {
-  const patchedFn = addNameToIntegrationFnResult(name, fn) as ((
-    ...rest: Parameters<Fn>
-  ) => ReturnType<Fn> & { name: string }) & { id: string };
-
-  patchedFn.id = name;
-  return patchedFn;
+export function makeIntegrationFn<Fn extends IntegrationFn>(fn: Fn): Fn {
+  return fn;
 }
 
 /**
@@ -188,33 +180,19 @@ export function makeIntegrationFn<
  *
  * @deprecated This will be removed in v8!
  */
-export function convertIntegrationFnToClass<
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  Fn extends IntegrationFn<(...rest: any[]) => IntegrationFnResult>,
->(fn: Fn): IntegrationClass<Integration> {
+export function convertIntegrationFnToClass<Fn extends IntegrationFn>(
+  name: string,
+  fn: Fn,
+): IntegrationClass<Integration> {
   return Object.assign(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     function ConvertedIntegration(...rest: any[]) {
       return {
         // eslint-disable-next-line @typescript-eslint/no-empty-function
         setupOnce: () => {},
         ...fn(...rest),
-        name: fn.id,
       };
     },
-    { id: fn.id },
+    { id: name },
   ) as unknown as IntegrationClass<Integration>;
 }
-
-function addNameToIntegrationFnResult<
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  Fn extends (...rest: any[]) => Partial<IntegrationFnResult>,
->(name: string, fn: Fn): (...rest: Parameters<Fn>) => ReturnType<Fn> & { name: string } {
-  const patchedFn = (...rest: Parameters<Fn>): ReturnType<Fn> & { name: string } => {
-    const result = fn(...rest);
-    result.name = name;
-    return result as ReturnType<Fn> & { name: string };
-  };
-
-  return patchedFn;
-}

packages/core/src/integrations/inboundfilters.ts

@@ -29,8 +29,10 @@ export interface InboundFiltersOptions {
   disableTransactionDefaults: boolean;
 }
 
-const inboundFiltersIntegration = makeIntegrationFn('InboundFilters', (options: Partial<InboundFiltersOptions>) => {
+const INTEGRATION_NAME = 'InboundFilters';
+const inboundFiltersIntegration = makeIntegrationFn((options: Partial<InboundFiltersOptions>) => {
   return {
+    name: INTEGRATION_NAME,
     processEvent(event, _hint, client) {
       const clientOptions = client.getOptions();
       const mergedOptions = _mergeOptions(options, clientOptions);
@@ -41,7 +43,7 @@ const inboundFiltersIntegration = makeIntegrationFn('InboundFilters', (options:
 
 /** Inbound filters configurable by the user */
 // eslint-disable-next-line deprecation/deprecation
-export const InboundFilters = convertIntegrationFnToClass(inboundFiltersIntegration);
+export const InboundFilters = convertIntegrationFnToClass(INTEGRATION_NAME, inboundFiltersIntegration);
 
 function _mergeOptions(
   internalOptions: Partial<InboundFiltersOptions> = {},

packages/core/test/lib/integration.test.ts

@@ -657,12 +657,12 @@ describe('addIntegration', () => {
 
 describe('makeIntegrationFn', () => {
   it('works with a minimal integration', () => {
-    const myIntegration = makeIntegrationFn('testName', () => {
-      return {};
+    const myIntegration = makeIntegrationFn(() => {
+      return {
+        name: 'testName'
+      };
     });
 
-    expect(myIntegration.id).toBe('testName');
-
     const integration = myIntegration();
     expect(integration).toEqual({
       name: 'testName',
@@ -673,12 +673,12 @@ describe('makeIntegrationFn', () => {
   });
 
   it('works with integration options', () => {
-    const myIntegration = makeIntegrationFn('testName', (_options: { xxx: string }) => {
-      return {};
+    const myIntegration = makeIntegrationFn((_options: { xxx: string }) => {
+      return {
+        name: 'testName'
+      };
     });
 
-    expect(myIntegration.id).toBe('testName');
-
     const integration = myIntegration({ xxx: 'aa' });
     expect(integration).toEqual({
       name: 'testName',
@@ -696,17 +696,16 @@ describe('makeIntegrationFn', () => {
     const processEvent = jest.fn();
     const preprocessEvent = jest.fn();
 
-    const myIntegration = makeIntegrationFn('testName', () => {
+    const myIntegration = makeIntegrationFn(() => {
       return {
+        name: 'testName',
         setup,
         setupOnce,
         processEvent,
         preprocessEvent,
       };
     });
 
-    expect(myIntegration.id).toBe('testName');
-
     const integration = myIntegration();
     expect(integration).toEqual({
       name: 'testName',
@@ -724,9 +723,9 @@ describe('makeIntegrationFn', () => {
 describe('convertIntegrationFnToClass', () => {
   /* eslint-disable deprecation/deprecation */
   it('works with a minimal integration', () => {
-    const integrationFn = makeIntegrationFn('testName', () => ({}));
+    const integrationFn = makeIntegrationFn(() => ({ name: 'testName'}));
 
-    const IntegrationClass = convertIntegrationFnToClass(integrationFn);
+    const IntegrationClass = convertIntegrationFnToClass('testName', integrationFn);
 
     expect(IntegrationClass.id).toBe('testName');
 
@@ -743,16 +742,17 @@ describe('convertIntegrationFnToClass', () => {
     const processEvent = jest.fn();
     const preprocessEvent = jest.fn();
 
-    const integrationFn = makeIntegrationFn('testName', () => {
+    const integrationFn = makeIntegrationFn( () => {
       return {
+        name: 'testName',
         setup,
         setupOnce,
         processEvent,
         preprocessEvent,
       };
     });
 
-    const IntegrationClass = convertIntegrationFnToClass(integrationFn);
+    const IntegrationClass = convertIntegrationFnToClass('testName', integrationFn);
 
     expect(IntegrationClass.id).toBe('testName');
 

packages/types/src/integration.ts

@@ -16,9 +16,8 @@ export interface IntegrationClass<T> {
 /**
  * An integration in function form.
  * This is expected to return an integration result,
- * and also have a `name` property that holds the integration name (so we can e.g. filter these before actually calling them).
  */
-export type IntegrationFn<Fn extends (...rest: any[]) => IntegrationFnResult> = { id: string } & Fn;
+export type IntegrationFn = (...rest: any[]) => IntegrationFnResult;
 
 export interface IntegrationFnResult {
   /**