Fix TypeScript build errors and double-wrap guard

Author: onurtemizkan

packages/core/src/integrations/supabase/constants.ts

@@ -50,7 +50,7 @@ export const FILTER_MAPPINGS = {
   not: 'not',
 };
 
-export const DB_OPERATIONS_TO_INSTRUMENT = ['select', 'insert', 'upsert', 'update', 'delete'] as const;
+export const DB_OPERATIONS_TO_INSTRUMENT = ['select', 'insert', 'upsert', 'update', 'delete'];
 
 export const QUEUE_RPC_OPERATIONS = new Set(['send', 'send_batch', 'pop', 'receive', 'read']);
 

packages/core/src/integrations/supabase/postgrest.ts

@@ -228,12 +228,8 @@ export function _instrumentPostgRESTFilterBuilderInstance(builder: PostgRESTFilt
     return;
   }
 
-  // Check if the instance has its own .then property (not inherited from prototype)
-  const hasOwnThen = Object.prototype.hasOwnProperty.call(builder, 'then');
-
-  // If the instance has its own .then that's not instrumented, we need to instrument it
-  // even if the prototype's .then is already instrumented
-  if (_isInstrumented(originalThen) && !hasOwnThen) {
+  // Skip if already instrumented (whether from prototype or own property)
+  if (_isInstrumented(originalThen)) {
     return;
   }
 
@@ -259,22 +255,18 @@ export function _instrumentPostgRESTQueryBuilder(PostgRESTQueryBuilder: new () =
   // We need to wrap _all_ operations despite them sharing the same `PostgRESTFilterBuilder`
   // constructor, as we don't know which method will be called first, and we don't want to miss any calls.
   for (const operation of DB_OPERATIONS_TO_INSTRUMENT) {
-    type PostgRESTOperation = keyof Pick<PostgRESTQueryBuilder, 'select' | 'insert' | 'upsert' | 'update' | 'delete'>;
-    const prototypeWithOps = PostgRESTQueryBuilder.prototype as Partial<
-      Record<PostgRESTOperation, PostgRESTQueryBuilder[PostgRESTOperation]>
-    >;
-
-    const originalOperation = prototypeWithOps[operation];
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const prototypeWithOps = PostgRESTQueryBuilder.prototype as Record<string, any>;
 
-    if (_isInstrumented(originalOperation)) {
+    if (_isInstrumented(prototypeWithOps[operation])) {
       continue;
     }
 
-    if (!originalOperation) {
+    if (!prototypeWithOps[operation]) {
       continue;
     }
 
-    const wrappedOperation = new Proxy(originalOperation, {
+    prototypeWithOps[operation] = new Proxy(prototypeWithOps[operation], {
       apply(target: PostgRESTQueryOperationFn, thisArg: unknown, argumentsList: Parameters<PostgRESTQueryOperationFn>) {
         const rv = Reflect.apply(target, thisArg, argumentsList);
         const PostgRESTFilterBuilderCtor = rv.constructor;
@@ -288,9 +280,7 @@ export function _instrumentPostgRESTQueryBuilder(PostgRESTQueryBuilder: new () =
       },
     });
 
-    prototypeWithOps[operation] = wrappedOperation;
-
-    _markAsInstrumented(wrappedOperation);
+    _markAsInstrumented(prototypeWithOps[operation]);
   }
 }