From fcf1c6d35631b5c9e7607b6ebd95ecd7cca5cc61 Mon Sep 17 00:00:00 2001 From: psteinroe Date: Wed, 5 Jun 2024 10:04:14 +0200 Subject: [PATCH 1/3] feat: support abort signal in react query --- .changeset/ten-otters-vanish.md | 5 ++++ .changeset/tricky-donuts-do.md | 5 ++++ package.json | 2 +- packages/postgrest-core/src/index.ts | 1 + .../src/lib/is-postgrest-transform-builder.ts | 30 +++++++++++++++++++ .../src/query/build-query-opts.ts | 6 +++- 6 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 .changeset/ten-otters-vanish.md create mode 100644 .changeset/tricky-donuts-do.md create mode 100644 packages/postgrest-core/src/lib/is-postgrest-transform-builder.ts diff --git a/.changeset/ten-otters-vanish.md b/.changeset/ten-otters-vanish.md new file mode 100644 index 00000000..e7871215 --- /dev/null +++ b/.changeset/ten-otters-vanish.md @@ -0,0 +1,5 @@ +--- +"@supabase-cache-helpers/postgrest-react-query": minor +--- + +feat: support abort signal diff --git a/.changeset/tricky-donuts-do.md b/.changeset/tricky-donuts-do.md new file mode 100644 index 00000000..8c4570f5 --- /dev/null +++ b/.changeset/tricky-donuts-do.md @@ -0,0 +1,5 @@ +--- +"@supabase-cache-helpers/postgrest-core": patch +--- + +feat: is transform builder helper diff --git a/package.json b/package.json index b6766938..004790bc 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@changesets/cli": "2.27.0", "eslint": "8.54.0", "prettier": "3.2.0", - "supabase": "^1.145.4", + "supabase": "latest", "turbo": "1.10.16" }, "engines": { diff --git a/packages/postgrest-core/src/index.ts b/packages/postgrest-core/src/index.ts index 9c8209d7..510e93fd 100644 --- a/packages/postgrest-core/src/index.ts +++ b/packages/postgrest-core/src/index.ts @@ -8,6 +8,7 @@ export * from './lib/cache-data-types'; export * from './lib/response-types'; export * from './lib/encode-object'; export * from './lib/is-postgrest-builder'; +export * from './lib/is-postgrest-transform-builder'; export * from './lib/get'; export * from './lib/set-filter-value'; export * from './lib/parse-value'; diff --git a/packages/postgrest-core/src/lib/is-postgrest-transform-builder.ts b/packages/postgrest-core/src/lib/is-postgrest-transform-builder.ts new file mode 100644 index 00000000..a5a17655 --- /dev/null +++ b/packages/postgrest-core/src/lib/is-postgrest-transform-builder.ts @@ -0,0 +1,30 @@ +import { PostgrestTransformBuilder } from '@supabase/postgrest-js'; +import { GenericSchema } from '@supabase/postgrest-js/dist/module/types'; + +export const isPostgrestTransformBuilder = < + Schema extends GenericSchema, + Row extends Record, + Result, + RelationName = unknown, + Relationships = unknown, +>( + q: unknown, +): q is PostgrestTransformBuilder< + Schema, + Row, + Result, + RelationName, + Relationships +> => { + return ( + typeof ( + q as PostgrestTransformBuilder< + Schema, + Row, + Result, + RelationName, + Relationships + > + ).abortSignal === 'function' + ); +}; diff --git a/packages/postgrest-react-query/src/query/build-query-opts.ts b/packages/postgrest-react-query/src/query/build-query-opts.ts index 627cdb71..1c20de16 100644 --- a/packages/postgrest-react-query/src/query/build-query-opts.ts +++ b/packages/postgrest-react-query/src/query/build-query-opts.ts @@ -2,6 +2,7 @@ import { PostgrestError } from '@supabase/postgrest-js'; import { AnyPostgrestResponse, isPostgrestBuilder, + isPostgrestTransformBuilder, } from '@supabase-cache-helpers/postgrest-core'; import { UseQueryOptions as UseReactQueryOptions } from '@tanstack/react-query'; @@ -16,7 +17,10 @@ export function buildQueryOpts( ): UseReactQueryOptions, PostgrestError> { return { queryKey: encode(query, false), - queryFn: async () => { + queryFn: async ({ signal }) => { + if (isPostgrestTransformBuilder(query)) { + query = query.abortSignal(signal); + } if (isPostgrestBuilder(query)) { query = query.throwOnError(); } From 65b1ab3173e1c095ab3bad5f14aff1e559e23c51 Mon Sep 17 00:00:00 2001 From: psteinroe Date: Wed, 5 Jun 2024 10:07:53 +0200 Subject: [PATCH 2/3] fix: lockfile --- pnpm-lock.yaml | 108 ++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 59 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e6e42f88..4d0474d3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ importers: specifier: 3.2.0 version: 3.2.0 supabase: - specifier: ^1.145.4 - version: 1.149.4 + specifier: latest + version: 1.172.2 turbo: specifier: 1.10.16 version: 1.10.16 @@ -1981,7 +1981,13 @@ packages: strip-ansi-cjs: /strip-ansi@6.0.1 wrap-ansi: 8.1.0 wrap-ansi-cjs: /wrap-ansi@7.0.0 - dev: false + + /@isaacs/fs-minipass@4.0.1: + resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==} + engines: {node: '>=18.0.0'} + dependencies: + minipass: 7.1.2 + dev: true /@istanbuljs/load-nyc-config@1.1.0: resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==} @@ -2650,7 +2656,6 @@ packages: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} requiresBuild: true - dev: false optional: true /@pkgr/utils@2.3.1: @@ -4799,7 +4804,6 @@ packages: /ansi-regex@6.0.1: resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} engines: {node: '>=12'} - dev: false /ansi-sequence-parser@1.1.0: resolution: {integrity: sha512-lEm8mt52to2fT8GhciPCGeCXACSz2UwIN4X2e2LJSnZ5uAbn2/dsYdOmUXq0AtWS5cpAupysIneExOgH0Vd2TQ==} @@ -4824,7 +4828,6 @@ packages: /ansi-styles@6.2.1: resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} engines: {node: '>=12'} - dev: false /any-promise@1.3.0: resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} @@ -5110,7 +5113,6 @@ packages: resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} dependencies: balanced-match: 1.0.2 - dev: false /braces@3.0.2: resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} @@ -5320,9 +5322,9 @@ packages: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} dev: false - /chownr@2.0.0: - resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} - engines: {node: '>=10'} + /chownr@3.0.0: + resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==} + engines: {node: '>=18'} dev: true /ci-info@3.9.0: @@ -6150,7 +6152,6 @@ packages: /eastasianwidth@0.2.0: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} - dev: false /electron-to-chromium@1.4.325: resolution: {integrity: sha512-K1C03NT4I7BuzsRdCU5RWkgZxtswnKDYM6/eMhkEXqKu4e5T+ck610x3FPzu1y7HVFSiQKZqP16gnJzPpji1TQ==} @@ -7107,7 +7108,6 @@ packages: dependencies: cross-spawn: 7.0.3 signal-exit: 4.1.0 - dev: false /form-data@4.0.0: resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==} @@ -7151,13 +7151,6 @@ packages: universalify: 0.1.2 dev: true - /fs-minipass@2.1.0: - resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==} - engines: {node: '>= 8'} - dependencies: - minipass: 3.3.6 - dev: true - /fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} @@ -7274,7 +7267,6 @@ packages: minimatch: 9.0.3 minipass: 7.0.4 path-scurry: 1.10.1 - dev: false /glob@7.1.6: resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==} @@ -8040,7 +8032,6 @@ packages: '@isaacs/cliui': 8.0.2 optionalDependencies: '@pkgjs/parseargs': 0.11.0 - dev: false /jest-changed-files@29.7.0: resolution: {integrity: sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==} @@ -8703,7 +8694,6 @@ packages: /lru-cache@10.1.0: resolution: {integrity: sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==} engines: {node: 14 || >=16.14} - dev: false /lru-cache@4.1.5: resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==} @@ -9454,7 +9444,6 @@ packages: engines: {node: '>=16 || 14 >=14.17'} dependencies: brace-expansion: 2.0.1 - dev: false /minimist-options@4.1.0: resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==} @@ -9468,29 +9457,21 @@ packages: /minimist@1.2.6: resolution: {integrity: sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==} - /minipass@3.3.6: - resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==} - engines: {node: '>=8'} - dependencies: - yallist: 4.0.0 - dev: true - - /minipass@5.0.0: - resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} - engines: {node: '>=8'} - dev: true - /minipass@7.0.4: resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} engines: {node: '>=16 || 14 >=14.17'} - dev: false - /minizlib@2.1.2: - resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} - engines: {node: '>= 8'} + /minipass@7.1.2: + resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==} + engines: {node: '>=16 || 14 >=14.17'} + dev: true + + /minizlib@3.0.1: + resolution: {integrity: sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==} + engines: {node: '>= 18'} dependencies: - minipass: 3.3.6 - yallist: 4.0.0 + minipass: 7.1.2 + rimraf: 5.0.7 dev: true /mixme@0.5.10: @@ -9502,8 +9483,8 @@ packages: resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==} dev: false - /mkdirp@1.0.4: - resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==} + /mkdirp@3.0.1: + resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==} engines: {node: '>=10'} hasBin: true dev: true @@ -10061,7 +10042,6 @@ packages: dependencies: lru-cache: 10.1.0 minipass: 7.0.4 - dev: false /path-type@4.0.0: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} @@ -10751,6 +10731,14 @@ packages: dependencies: glob: 7.2.3 + /rimraf@5.0.7: + resolution: {integrity: sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==} + engines: {node: '>=14.18'} + hasBin: true + dependencies: + glob: 10.3.10 + dev: true + /robust-predicates@3.0.2: resolution: {integrity: sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==} dev: false @@ -11101,7 +11089,6 @@ packages: eastasianwidth: 0.2.0 emoji-regex: 9.2.2 strip-ansi: 7.1.0 - dev: false /string.prototype.matchall@4.0.8: resolution: {integrity: sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==} @@ -11161,7 +11148,6 @@ packages: engines: {node: '>=12'} dependencies: ansi-regex: 6.0.1 - dev: false /strip-bom-string@1.0.0: resolution: {integrity: sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==} @@ -11242,8 +11228,8 @@ packages: pirates: 4.0.5 ts-interface-checker: 0.1.13 - /supabase@1.149.4: - resolution: {integrity: sha512-yijNJCq2SNoG14IFDXjfy9DkJYbtgKqzUZxOVySJcMkjbVI3q5P8IdUOt7b8Zn3AYo6eSAOHxJR+UISOHSYIVw==} + /supabase@1.172.2: + resolution: {integrity: sha512-h2J6kKEikXnZyurUcCYg215qkQpINOhdWkiclHcWAuVeqXsNrfrYaf1s0qbbcdRyMtrVW48I+VdVTw71Cnn20Q==} engines: {npm: '>=8'} hasBin: true requiresBuild: true @@ -11251,7 +11237,7 @@ packages: bin-links: 4.0.3 https-proxy-agent: 7.0.4 node-fetch: 3.3.2 - tar: 6.2.0 + tar: 7.2.0 transitivePeerDependencies: - supports-color dev: true @@ -11421,16 +11407,16 @@ packages: readable-stream: 3.6.1 dev: false - /tar@6.2.0: - resolution: {integrity: sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==} - engines: {node: '>=10'} + /tar@7.2.0: + resolution: {integrity: sha512-hctwP0Nb4AB60bj8WQgRYaMOuJYRAPMGiQUAotms5igN8ppfQM+IvjQ5HcKu1MaZh2Wy2KWVTe563Yj8dfc14w==} + engines: {node: '>=18'} dependencies: - chownr: 2.0.0 - fs-minipass: 2.1.0 - minipass: 5.0.0 - minizlib: 2.1.2 - mkdirp: 1.0.4 - yallist: 4.0.0 + '@isaacs/fs-minipass': 4.0.1 + chownr: 3.0.0 + minipass: 7.1.2 + minizlib: 3.0.1 + mkdirp: 3.0.1 + yallist: 5.0.0 dev: true /term-size@2.2.1: @@ -12380,7 +12366,6 @@ packages: ansi-styles: 6.2.1 string-width: 5.1.2 strip-ansi: 7.1.0 - dev: false /wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} @@ -12457,6 +12442,11 @@ packages: /yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} + /yallist@5.0.0: + resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==} + engines: {node: '>=18'} + dev: true + /yaml@2.3.4: resolution: {integrity: sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==} engines: {node: '>= 14'} From eefa8e681de350638157deefbaad58a0aade8b17 Mon Sep 17 00:00:00 2001 From: psteinroe Date: Wed, 5 Jun 2024 10:15:59 +0200 Subject: [PATCH 3/3] fix: tests --- packages/postgrest-core/__tests__/index.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/postgrest-core/__tests__/index.spec.ts b/packages/postgrest-core/__tests__/index.spec.ts index b0f4cc65..cb036be2 100644 --- 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(38); + expect(Object.keys(Import)).toHaveLength(39); }); });