Merge pull request #306 from psteinroe/fix/query-without-wildcard

fix: drop QueryWithoutWildcard type
psteinroe · Oct 23, 2023 · b9e8205 · b9e8205 · vercel · Oct 23, 2023
2 parents f5ccb7a + e6cb820
commit b9e8205
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 29 deletions.
diff --git a/.changeset/smooth-melons-report.md b/.changeset/smooth-melons-report.md
@@ -0,0 +1,7 @@
+---
+"@supabase-cache-helpers/postgrest-react-query": patch
+"@supabase-cache-helpers/postgrest-core": patch
+"@supabase-cache-helpers/postgrest-swr": patch
+---
+
+fix: drop QueryWithoutWildcard type
diff --git a/packages/postgrest-core/src/fetch/build-normalized-query.ts b/packages/postgrest-core/src/fetch/build-normalized-query.ts
@@ -2,15 +2,11 @@ import { buildSelectStatement } from './build-select-statement';
 import { buildDedupePath } from './dedupe';
 import { extractPathsFromFilters } from '../lib/extract-paths-from-filter';
 import { parseSelectParam } from '../lib/parse-select-param';
-import {
-  FilterDefinitions,
-  Path,
-  QueryWithoutWildcard,
-} from '../lib/query-types';
+import { FilterDefinitions, Path } from '../lib/query-types';
 import { removeAliasFromDeclaration } from '../lib/remove-alias-from-declaration';
 
 export type BuildNormalizedQueryOps<Q extends string = '*'> = {
-  query?: QueryWithoutWildcard<Q> | null;
+  query?: Q | null;
   // if true, will not add any paths from the cache to the query
   disabled?: boolean;
   queriesForTable: () => { paths: Path[]; filters: FilterDefinitions }[];

diff --git a/packages/postgrest-core/src/lib/query-types.ts b/packages/postgrest-core/src/lib/query-types.ts
@@ -116,8 +116,3 @@ export type OrderDefinition = {
   nullsFirst: boolean;
   foreignTable?: string;
 };
-
-export type QueryWithoutWildcard<QueryString extends string> =
-  QueryString extends `${infer Any}*${infer Any}`
-    ? 'Wildcard selector is not allowed'
-    : QueryString;
diff --git a/packages/postgrest-react-query/src/mutate/use-delete-mutation.ts b/packages/postgrest-react-query/src/mutate/use-delete-mutation.ts
@@ -7,7 +7,6 @@ import {
 import {
   buildDeleteFetcher,
   getTable,
-  QueryWithoutWildcard,
 } from '@supabase-cache-helpers/postgrest-core';
 import { useMutation } from '@tanstack/react-query';
 
@@ -32,7 +31,7 @@ function useDeleteMutation<
 >(
   qb: PostgrestQueryBuilder<S, T, Re>,
   primaryKeys: (keyof T['Row'])[],
-  query?: QueryWithoutWildcard<Q> | null,
+  query?: Q | null,
   opts?: Omit<
     UsePostgrestMutationOpts<S, T, Re, 'DeleteOne', Q, R>,
     'mutationFn'

diff --git a/packages/postgrest-react-query/src/mutate/use-insert-mutation.ts b/packages/postgrest-react-query/src/mutate/use-insert-mutation.ts
@@ -7,7 +7,6 @@ import {
 import {
   buildInsertFetcher,
   getTable,
-  QueryWithoutWildcard,
 } from '@supabase-cache-helpers/postgrest-core';
 import { useMutation } from '@tanstack/react-query';
 
@@ -33,7 +32,7 @@ function useInsertMutation<
 >(
   qb: PostgrestQueryBuilder<S, T, Re>,
   primaryKeys: (keyof T['Row'])[],
-  query?: QueryWithoutWildcard<Q> | null,
+  query?: Q | null,
   opts?: Omit<UsePostgrestMutationOpts<S, T, Re, 'Insert', Q, R>, 'mutationFn'>,
 ) {
   const queriesForTable = useQueriesForTableLoader(getTable(qb));

diff --git a/packages/postgrest-react-query/src/mutate/use-update-mutation.ts b/packages/postgrest-react-query/src/mutate/use-update-mutation.ts
@@ -7,7 +7,6 @@ import {
 import {
   buildUpdateFetcher,
   getTable,
-  QueryWithoutWildcard,
 } from '@supabase-cache-helpers/postgrest-core';
 import { useMutation } from '@tanstack/react-query';
 
@@ -32,7 +31,7 @@ function useUpdateMutation<
 >(
   qb: PostgrestQueryBuilder<S, T, Re>,
   primaryKeys: (keyof T['Row'])[],
-  query?: QueryWithoutWildcard<Q> | null,
+  query?: Q | null,
   opts?: Omit<
     UsePostgrestMutationOpts<S, T, Re, 'UpdateOne', Q, R>,
     'mutationFn'

diff --git a/packages/postgrest-react-query/src/mutate/use-upsert-mutation.ts b/packages/postgrest-react-query/src/mutate/use-upsert-mutation.ts
@@ -7,7 +7,6 @@ import {
 import {
   buildUpsertFetcher,
   getTable,
-  QueryWithoutWildcard,
 } from '@supabase-cache-helpers/postgrest-core';
 import { useMutation } from '@tanstack/react-query';
 
@@ -33,7 +32,7 @@ function useUpsertMutation<
 >(
   qb: PostgrestQueryBuilder<S, T, Re>,
   primaryKeys: (keyof T['Row'])[],
-  query?: QueryWithoutWildcard<Q> | null,
+  query?: Q | null,
   opts?: Omit<UsePostgrestMutationOpts<S, T, Re, 'Upsert', Q, R>, 'mutationFn'>,
 ) {
   const queriesForTable = useQueriesForTableLoader(getTable(qb));

diff --git a/packages/postgrest-swr/src/mutate/use-delete-mutation.ts b/packages/postgrest-swr/src/mutate/use-delete-mutation.ts
@@ -7,7 +7,6 @@ import {
 import {
   buildDeleteFetcher,
   getTable,
-  QueryWithoutWildcard,
 } from '@supabase-cache-helpers/postgrest-core';
 import useMutation, { SWRMutationResponse } from 'swr/mutation';
 
@@ -34,7 +33,7 @@ function useDeleteMutation<
 >(
   qb: PostgrestQueryBuilder<S, T, Re>,
   primaryKeys: (keyof T['Row'])[],
-  query?: QueryWithoutWildcard<Q> | null,
+  query?: Q | null,
   opts?: UsePostgrestSWRMutationOpts<S, T, Re, 'DeleteOne', Q, R>,
 ): SWRMutationResponse<R | null, PostgrestError, string, Partial<T['Row']>> {
   const key = useRandomKey();

diff --git a/packages/postgrest-swr/src/mutate/use-insert-mutation.ts b/packages/postgrest-swr/src/mutate/use-insert-mutation.ts
@@ -7,7 +7,6 @@ import {
 import {
   buildInsertFetcher,
   getTable,
-  QueryWithoutWildcard,
 } from '@supabase-cache-helpers/postgrest-core';
 import useMutation, { SWRMutationResponse } from 'swr/mutation';
 
@@ -35,7 +34,7 @@ function useInsertMutation<
 >(
   qb: PostgrestQueryBuilder<S, T, Re>,
   primaryKeys: (keyof T['Row'])[],
-  query?: QueryWithoutWildcard<Q> | null,
+  query?: Q | null,
   opts?: UsePostgrestSWRMutationOpts<S, T, Re, 'Insert', Q, R>,
 ): SWRMutationResponse<R[] | null, PostgrestError, string, T['Insert'][]> {
   const key = useRandomKey();

diff --git a/packages/postgrest-swr/src/mutate/use-update-mutation.ts b/packages/postgrest-swr/src/mutate/use-update-mutation.ts
@@ -7,7 +7,6 @@ import {
 import {
   buildUpdateFetcher,
   getTable,
-  QueryWithoutWildcard,
 } from '@supabase-cache-helpers/postgrest-core';
 import useSWRMutation, { SWRMutationResponse } from 'swr/mutation';
 
@@ -34,7 +33,7 @@ function useUpdateMutation<
 >(
   qb: PostgrestQueryBuilder<S, T, Re>,
   primaryKeys: (keyof T['Row'])[],
-  query?: QueryWithoutWildcard<Q> | null,
+  query?: Q | null,
   opts?: UsePostgrestSWRMutationOpts<S, T, Re, 'UpdateOne', Q, R>,
 ): SWRMutationResponse<R | null, PostgrestError, string, T['Update']> {
   const key = useRandomKey();

diff --git a/packages/postgrest-swr/src/mutate/use-upsert-mutation.ts b/packages/postgrest-swr/src/mutate/use-upsert-mutation.ts
@@ -7,7 +7,6 @@ import {
 import {
   buildUpsertFetcher,
   getTable,
-  QueryWithoutWildcard,
 } from '@supabase-cache-helpers/postgrest-core';
 import useMutation, { SWRMutationResponse } from 'swr/mutation';
 
@@ -35,7 +34,7 @@ function useUpsertMutation<
 >(
   qb: PostgrestQueryBuilder<S, T, Re>,
   primaryKeys: (keyof T['Row'])[],
-  query?: QueryWithoutWildcard<Q> | null,
+  query?: Q | null,
   opts?: UsePostgrestSWRMutationOpts<S, T, Re, 'Upsert', Q, R>,
 ): SWRMutationResponse<R[] | null, PostgrestError, string, T['Insert'][]> {
   const key = useRandomKey();

diff --git a/packages/postgrest-swr/src/subscribe/use-subscription-query.ts b/packages/postgrest-swr/src/subscribe/use-subscription-query.ts
@@ -14,7 +14,6 @@ import {
 import {
   buildNormalizedQuery,
   PostgrestMutatorOpts,
-  QueryWithoutWildcard,
 } from '@supabase-cache-helpers/postgrest-core';
 import { useEffect, useState } from 'react';
 import { MutatorOptions as SWRMutatorOptions } from 'swr';
@@ -77,7 +76,7 @@ function useSubscriptionQuery<
     'table'
   > & { table: string },
   primaryKeys: (keyof T['Row'])[],
-  query?: QueryWithoutWildcard<Q> | null,
+  query?: Q | null,
   opts?: UseSubscriptionQueryOpts<S, T, Re, Q, R>,
 ) {
   const [status, setStatus] = useState<string>();