Merge pull request #320 from psteinroe/fix/normalize-response

fix: normalize response for subscription query
psteinroe · Nov 7, 2023 · 7d9e27e · 7d9e27e · vercel · Nov 7, 2023
2 parents f2d5ef9 + 92936c6
commit 7d9e27e
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 5 deletions.
diff --git a/.changeset/funny-fans-arrive.md b/.changeset/funny-fans-arrive.md
@@ -0,0 +1,5 @@
+---
+"@supabase-cache-helpers/postgrest-core": patch
+---
+
+chore: export normalizeResponse function
diff --git a/.changeset/thin-pigs-wonder.md b/.changeset/thin-pigs-wonder.md
@@ -0,0 +1,6 @@
+---
+"@supabase-cache-helpers/postgrest-react-query": patch
+"@supabase-cache-helpers/postgrest-swr": patch
+---
+
+fix: normalize response of useSubscriptionQuery
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
           max_attempts: 3
           timeout_minutes: 5
           retry_on: error
-          command: supabase start
+          command: supabase start -x edge-runtime,logflare,vector,studio,imgproxy,pgadmin-schema-diff,migra,postgres-meta --ignore-health-check
 
       - name: 🦺 Check Format and Lint
         id: static

diff --git a/packages/postgrest-core/__tests__/index.spec.ts b/packages/postgrest-core/__tests__/index.spec.ts
@@ -2,6 +2,6 @@ import * as Import from '../src';
 
 describe('index exports', () => {
   it('should export', () => {
-    expect(Object.keys(Import)).toHaveLength(35);
+    expect(Object.keys(Import)).toHaveLength(36);
   });
 });
diff --git a/packages/postgrest-core/src/fetch/build-mutation-fetcher-response.ts b/packages/postgrest-core/src/fetch/build-mutation-fetcher-response.ts
@@ -43,7 +43,7 @@ export const buildMutationFetcherResponse = <R>(
 /**
  * Normalize the response by removing the dedupe alias and flattening it
  **/
-const normalizeResponse = <R>(paths: Path[], obj: R): R => {
+export const normalizeResponse = <R>(paths: Path[], obj: R): R => {
   const groups = groupPathsRecursive(paths);
 
   return groups.reduce<R>((prev, curr) => {

diff --git a/packages/postgrest-react-query/src/subscribe/use-subscription-query.ts b/packages/postgrest-react-query/src/subscribe/use-subscription-query.ts
@@ -13,6 +13,7 @@ import {
 } from '@supabase/supabase-js';
 import {
   buildNormalizedQuery,
+  normalizeResponse,
   RevalidateOpts,
 } from '@supabase-cache-helpers/postgrest-core';
 import { MutationOptions as ReactQueryMutatorOptions } from '@tanstack/react-query';
@@ -118,7 +119,9 @@ function useSubscriptionQuery<
               qb.eq(pk.toString(), data[pk]);
             }
             const res = await qb.single();
-            if (res.data) data = res.data as R;
+            if (res.data) {
+              data = normalizeResponse(selectQuery.paths, res.data) as R;
+            }
           }
 
           if (

diff --git a/packages/postgrest-swr/src/subscribe/use-subscription-query.ts b/packages/postgrest-swr/src/subscribe/use-subscription-query.ts
@@ -13,6 +13,7 @@ import {
 } from '@supabase/supabase-js';
 import {
   buildNormalizedQuery,
+  normalizeResponse,
   RevalidateOpts,
 } from '@supabase-cache-helpers/postgrest-core';
 import { useEffect, useState } from 'react';
@@ -118,7 +119,9 @@ function useSubscriptionQuery<
               qb.eq(pk.toString(), data[pk]);
             }
             const res = await qb.single();
-            if (res.data) data = res.data as R;
+            if (res.data) {
+              data = normalizeResponse(selectQuery.paths, res.data) as R;
+            }
           }
 
           if (